s/Mandrake/Mandriva/

1 files changed, 442 insertions, 354 deletions

diff --git a/po/uz.po b/po/uz.po
index 5841c446..ec007220 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-uz\n"
-"POT-Creation-Date: 2005-03-02 10:52+0100\n"
+"POT-Creation-Date: 2005-05-05 22:04+0200\n"
 "PO-Revision-Date: 2004-09-05 01:51+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <kmashrab@uni-bremen.de>\n"
@@ -24,7 +24,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"
@@ -52,12 +52,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"
 "Давом этишни истайсизми?"
@@ -118,7 +118,7 @@ msgstr "Танлаш"
 msgid "Login:"
 msgstr "Фойдаланувчи:"
 
-#: ../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 "Махфий сўз:"
@@ -171,9 +171,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:164 ../rpmdrake:699
-#: ../rpmdrake:1502 ../rpmdrake:1510 ../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 "Бекор қилиш"
@@ -183,9 +183,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:164 ../rpmdrake:699 ../rpmdrake:716
-#: ../rpmdrake:721 ../rpmdrake:1444 ../rpmdrake:1502 ../rpmdrake:1647
-#: ../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 "Ок"
@@ -356,7 +356,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:1179
+#: ../edit-urpm-sources.pl:700 ../edit-urpm-sources.pl:955 ../rpmdrake:1181
 #, c-format
 msgid "Remove"
 msgstr "Олиб ташлаш"
@@ -391,8 +391,8 @@ msgstr "Манба чегараси"
 msgid "Command"
 msgstr "Буйруқ"
 
-#: ../edit-urpm-sources.pl:684 ../rpmdrake:363 ../rpmdrake:380 ../rpmdrake:511
-#: ../rpmdrake:627
+#: ../edit-urpm-sources.pl:684 ../rpmdrake:364 ../rpmdrake:382 ../rpmdrake:516
+#: ../rpmdrake:629
 #, c-format
 msgid "(none)"
 msgstr "(йўқ)"
@@ -419,8 +419,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
@@ -479,7 +481,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 "Манба янгиланмоқда, илтимос кутиб туринг..."
@@ -519,7 +521,7 @@ msgstr ""
 msgid "Help"
 msgstr "Ёрдам"
 
-#: ../edit-urpm-sources.pl:1002 ../gurpmi.addmedia:75 ../rpmdrake:1758
+#: ../edit-urpm-sources.pl:1002 ../gurpmi.addmedia:74 ../rpmdrake:1759
 #, c-format
 msgid ""
 "%s\n"
@@ -554,12 +556,12 @@ msgid ""
 "packages as well?)."
 msgstr ""
 
-#: ../gurpmi.addmedia:70
+#: ../gurpmi.addmedia:69
 #, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 
-#: ../gurpmi.addmedia:78
+#: ../gurpmi.addmedia:77
 #, c-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
@@ -567,22 +569,88 @@ msgid ""
 "to your system from that new medium."
 msgstr ""
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:86
 #, c-format
 msgid "Successfully added medium `%s'."
 msgstr "\"%s\" манбаси муваффақиятли қўшилди."
 
-#: ../rpmdrake:28
+#: ../rpmdrake:31
 #, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Фойдаланиш: %s [ПАРАМЕТРЛАР]..."
 
-#: ../rpmdrake:161
+#: ../rpmdrake:32
+#, c-format
+msgid ""
+"  --changelog-first      display changelog before filelist in the "
+"description window"
+msgstr ""
+
+#: ../rpmdrake:33
+#, c-format
+msgid "  --media=medium1,..     limit to given media"
+msgstr ""
+
+#: ../rpmdrake:34
+#, c-format
+msgid ""
+"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+msgstr ""
+
+#: ../rpmdrake:35
+#, c-format
+msgid "  --mode=MODE            set mode (install (default), remove, update)"
+msgstr ""
+
+#: ../rpmdrake:36
+#, c-format
+msgid ""
+"  --no-confirmation      don't ask first confirmation question in update mode"
+msgstr ""
+
+#: ../rpmdrake:37
+#, fuzzy, c-format
+msgid "  --no-media-update      don't update media at startup"
+msgstr "  --update       - фақат янгилаш манбасидан фойдаланиш.\n"
+
+#: ../rpmdrake:38
+#, fuzzy, c-format
+msgid "  --no-verify-rpm        don't verify packages signatures"
+msgstr "  --name         - фақат пакетнинг номини кўрсатиш.\n"
+
+#: ../rpmdrake:39
+#, c-format
+msgid ""
+"  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
+"\" machine to show needed deps"
+msgstr ""
+
+#: ../rpmdrake:40
+#, c-format
+msgid "  --pkg-nosel=pkg1,..    show only these packages"
+msgstr ""
+
+#: ../rpmdrake:41
+#, c-format
+msgid "  --pkg-sel=pkg1,..      preselect these packages"
+msgstr ""
+
+#: ../rpmdrake:42
+#, c-format
+msgid "  --root                 force to run as root"
+msgstr ""
+
+#: ../rpmdrake:43
+#, c-format
+msgid "  --search=pkg           run search for \"pkg\""
+msgstr ""
+
+#: ../rpmdrake:162
 #, c-format
 msgid "Running in user mode"
 msgstr "Фойдаланувчи усулида ишга туширилмоқда"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:163
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -593,632 +661,628 @@ msgstr ""
 "тушираяпсиз. Тизимга ўзгаришлар киритиб бўлмайди,\n"
 "аммо мавжуд бўлган маълумот базасини кўришингиз мумкин."
 
-#: ../rpmdrake:171
+#: ../rpmdrake:172
 #, c-format
 msgid "Accessibility"
 msgstr "Қулайликлар"
 
-#: ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #, c-format
 msgid "Archiving"
 msgstr "Архивлаш"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:173
 #, c-format
 msgid "Backup"
 msgstr "Заҳира нусхаси"
 
-#: ../rpmdrake:173
+#: ../rpmdrake:174
 #, c-format
 msgid "Cd burning"
 msgstr "Компакт-дискга ёзиш"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:175
 #, c-format
 msgid "Compression"
 msgstr "Қисиш"
 
-#: ../rpmdrake:175 ../rpmdrake:180 ../rpmdrake:192 ../rpmdrake:203
-#: ../rpmdrake:212 ../rpmdrake:224 ../rpmdrake:236 ../rpmdrake:244
-#: ../rpmdrake:332
+#: ../rpmdrake:176 ../rpmdrake:181 ../rpmdrake:193 ../rpmdrake:204
+#: ../rpmdrake:213 ../rpmdrake:225 ../rpmdrake:237 ../rpmdrake:245
+#: ../rpmdrake:333
 #, c-format
 msgid "Other"
 msgstr "Бошқа"
 
-#: ../rpmdrake:176 ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179
-#: ../rpmdrake:180
+#: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
+#: ../rpmdrake:181
 #, c-format
 msgid "Books"
 msgstr "Китоблар"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:177
 #, c-format
 msgid "Computer books"
 msgstr "Компьютер ҳақида китоблар"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:178
 #, c-format
 msgid "Faqs"
 msgstr "Тез-тез сўраладиган саволлар"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:179
 #, c-format
 msgid "Howtos"
 msgstr "Howto'лар"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:180
 #, c-format
 msgid "Literature"
 msgstr "Адабиёт"
 
-#: ../rpmdrake:181 ../rpmdrake:182
+#: ../rpmdrake:182 ../rpmdrake:183
 #, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:181
+#: ../rpmdrake:182
 #, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:182
+#: ../rpmdrake:183
 #, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:183
+#: ../rpmdrake:184
 #, c-format
 msgid "Communications"
 msgstr "Алоқа"
 
-#: ../rpmdrake:184 ../rpmdrake:187
+#: ../rpmdrake:185 ../rpmdrake:188
 #, c-format
 msgid "Databases"
 msgstr "Маълумот базалари"
 
-#: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192 ../rpmdrake:193
+#: ../rpmdrake:194 ../rpmdrake:195
 #, c-format
 msgid "Development"
 msgstr "Тузиш"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:186
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:187
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:189
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME ва GTK+"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:190
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:191
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE ва Qt"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:192
 #, c-format
 msgid "Kernel"
 msgstr "Кернел"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:194
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:195
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:196
 #, c-format
 msgid "Editors"
 msgstr "Таҳрирчилар"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:197
 #, c-format
 msgid "Education"
 msgstr "Таълим"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:198
 #, c-format
 msgid "Emulators"
 msgstr "Эмуляторлар"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:199
 #, c-format
 msgid "File tools"
 msgstr "Файл воситалари"
 
-#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202 ../rpmdrake:203
+#: ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206 ../rpmdrake:207
 #, c-format
 msgid "Games"
 msgstr "Ўйинлар"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:200
 #, c-format
 msgid "Adventure"
 msgstr "Саргузаштлар"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:201
 #, c-format
 msgid "Arcade"
 msgstr "Аркада"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:202
 #, c-format
 msgid "Boards"
 msgstr "Стол ўйинлари"
 
-#: ../rpmdrake:202
+#: ../rpmdrake:203
 #, c-format
 msgid "Cards"
 msgstr "Қарталар"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:205
 #, c-format
 msgid "Puzzles"
 msgstr "Бошқотирмалар"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:206
 #, c-format
 msgid "Sports"
 msgstr "Спорт"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:207
 #, c-format
 msgid "Strategy"
 msgstr "Стратегия"
 
-#: ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209 ../rpmdrake:210
-#: ../rpmdrake:211 ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214
+#: ../rpmdrake:208 ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
 #, c-format
 msgid "Graphical desktop"
 msgstr "График ишчи столи"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:208
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:208
+#: ../rpmdrake:209
 #, c-format
 msgid "FVWM based"
 msgstr "FVWM асосида"
 
-#: ../rpmdrake:209
+#: ../rpmdrake:210
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:210
+#: ../rpmdrake:211
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:212
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:213
+#: ../rpmdrake:214
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:214
+#: ../rpmdrake:215
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:216
 #, c-format
 msgid "Graphics"
 msgstr "Графика"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:217
 #, c-format
 msgid "Monitoring"
 msgstr "Назорат қилиш"
 
-#: ../rpmdrake:217
+#: ../rpmdrake:218
 #, c-format
 msgid "Multimedia"
 msgstr "Мултимедиа"
 
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
-#: ../rpmdrake:226 ../rpmdrake:243
+#: ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+#: ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226
+#: ../rpmdrake:227 ../rpmdrake:244
 #, c-format
 msgid "Networking"
 msgstr "Тармоқда ишлаш"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:219
 #, c-format
 msgid "Chat"
 msgstr "Чат"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:220
 #, c-format
 msgid "File transfer"
 msgstr "Файл узатиш"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:221
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:222
 #, c-format
 msgid "Instant messaging"
 msgstr "Хабар алмашиш"
 
-#: ../rpmdrake:222
+#: ../rpmdrake:223
 #, c-format
 msgid "Mail"
 msgstr "Хат-хабар"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:224
 #, c-format
 msgid "News"
 msgstr "Янгиликлар"
 
-#: ../rpmdrake:225
+#: ../rpmdrake:226
 #, c-format
 msgid "Remote access"
 msgstr "Масофадан уланиш"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:227
 #, c-format
 msgid "WWW"
 msgstr "Интернет"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:228
 #, c-format
 msgid "Office"
 msgstr "Идора учун дастурлар"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:229
 #, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:229
+#: ../rpmdrake:230
 #, c-format
 msgid "Publishing"
 msgstr "Нашр этиш"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
 #, c-format
 msgid "Sciences"
 msgstr "Табиий фанлар"
 
-#: ../rpmdrake:230
+#: ../rpmdrake:231
 #, c-format
 msgid "Astronomy"
 msgstr "Астрономия"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:232
 #, c-format
 msgid "Biology"
 msgstr "Биология"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:233
 #, c-format
 msgid "Chemistry"
 msgstr "Кимё"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:234
 #, c-format
 msgid "Computer science"
 msgstr "Информатика"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:235
 #, c-format
 msgid "Geosciences"
 msgstr "Ер ҳақида фанлар"
 
-#: ../rpmdrake:235
+#: ../rpmdrake:236
 #, c-format
 msgid "Mathematics"
 msgstr "Математика"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:238
 #, c-format
 msgid "Physics"
 msgstr "Физика"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:239
 #, c-format
 msgid "Shells"
 msgstr "Консоллар"
 
-#: ../rpmdrake:239
+#: ../rpmdrake:240
 #, c-format
 msgid "Sound"
 msgstr "Товуш"
 
-#: ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242 ../rpmdrake:243
-#: ../rpmdrake:244 ../rpmdrake:245 ../rpmdrake:246 ../rpmdrake:247
-#: ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250 ../rpmdrake:251
-#: ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254 ../rpmdrake:255
-#: ../rpmdrake:256 ../rpmdrake:257
+#: ../rpmdrake:241 ../rpmdrake:242 ../rpmdrake:243 ../rpmdrake:244
+#: ../rpmdrake:245 ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248
+#: ../rpmdrake:249 ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252
+#: ../rpmdrake:253 ../rpmdrake:254 ../rpmdrake:255 ../rpmdrake:256
+#: ../rpmdrake:257 ../rpmdrake:258
 #, c-format
 msgid "System"
 msgstr "Тизим"
 
-#: ../rpmdrake:240
+#: ../rpmdrake:241
 #, c-format
 msgid "Base"
 msgstr "Асосий"
 
-#: ../rpmdrake:241 ../rpmdrake:242 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:245 ../rpmdrake:246
+#: ../rpmdrake:242 ../rpmdrake:243 ../rpmdrake:244 ../rpmdrake:245
+#: ../rpmdrake:246 ../rpmdrake:247
 #, c-format
 msgid "Configuration"
 msgstr "Мослаш"
 
-#: ../rpmdrake:241
+#: ../rpmdrake:242
 #, c-format
 msgid "Boot and Init"
 msgstr "Тизимни юклаш"
 
-#: ../rpmdrake:242
+#: ../rpmdrake:243
 #, c-format
 msgid "Hardware"
 msgstr "Асбоб-ускуналар"
 
-#: ../rpmdrake:245
+#: ../rpmdrake:246
 #, c-format
 msgid "Packaging"
 msgstr "Пакетлар"
 
-#: ../rpmdrake:246
+#: ../rpmdrake:247
 #, c-format
 msgid "Printing"
 msgstr "Босиб чиқариш"
 
-#: ../rpmdrake:247
+#: ../rpmdrake:248
 #, fuzzy, c-format
 msgid "Deploiement"
 msgstr "Тузиш"
 
-#: ../rpmdrake:248
+#: ../rpmdrake:249
 #, fuzzy, c-format
 msgid "Deployment"
 msgstr "Тузиш"
 
-#: ../rpmdrake:249 ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
 #, c-format
 msgid "Fonts"
 msgstr "Шрифтлар"
 
-#: ../rpmdrake:249
+#: ../rpmdrake:250
 #, c-format
 msgid "Console"
 msgstr "Консол"
 
-#: ../rpmdrake:250
+#: ../rpmdrake:251
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:251
+#: ../rpmdrake:252
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:252
+#: ../rpmdrake:253
 #, c-format
 msgid "X11 bitmap"
 msgstr ""
 
-#: ../rpmdrake:253
+#: ../rpmdrake:254
 #, c-format
 msgid "Internationalization"
 msgstr "Таржималар"
 
-#: ../rpmdrake:254
+#: ../rpmdrake:255
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Кернел ва асбоб-ускуналар"
 
-#: ../rpmdrake:255
+#: ../rpmdrake:256
 #, c-format
 msgid "Libraries"
 msgstr "Кутубхоналар"
 
-#: ../rpmdrake:256
+#: ../rpmdrake:257
 #, c-format
 msgid "Servers"
 msgstr "Серверлар"
 
-#: ../rpmdrake:257
+#: ../rpmdrake:258
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:258
+#: ../rpmdrake:259
 #, c-format
 msgid "Terminals"
 msgstr "Терминаллар"
 
-#: ../rpmdrake:259
+#: ../rpmdrake:260
 #, c-format
 msgid "Text tools"
 msgstr "Матн воситалари"
 
-#: ../rpmdrake:260
+#: ../rpmdrake:261
 #, c-format
 msgid "Toys"
 msgstr "Ўйинчоқлар"
 
-#: ../rpmdrake:261
+#: ../rpmdrake:262
 #, c-format
 msgid "Video"
 msgstr "Видео"
 
-#: ../rpmdrake:386 ../rpmdrake:528 ../rpmdrake:530
+#: ../rpmdrake:388 ../rpmdrake:533 ../rpmdrake:535
 #, c-format
 msgid "(Not available)"
 msgstr "(Мавжуд эмас)"
 
-#: ../rpmdrake:415 ../rpmdrake:492
+#: ../rpmdrake:417 ../rpmdrake:497
 #, c-format
 msgid "Search results"
 msgstr "Қидирув натижалари"
 
-#: ../rpmdrake:415
+#: ../rpmdrake:417
 #, c-format
 msgid "Search results (none)"
 msgstr "Қидирув натижалари (йўқ)"
 
-#: ../rpmdrake:426 ../rpmdrake:450
+#: ../rpmdrake:428 ../rpmdrake:455
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Қирилмоқда, илтимос кутиб туринг..."
 
-#: ../rpmdrake:445 ../rpmdrake:1233 ../rpmdrake:1543 ../rpmdrake:1757
+#: ../rpmdrake:450 ../rpmdrake:576 ../rpmdrake:1235 ../rpmdrake:1546
+#: ../rpmdrake:1758
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:455
+#: ../rpmdrake:460
 #, c-format
 msgid "Stop"
 msgstr "Тўхтатиш"
 
-#: ../rpmdrake:493 ../rpmdrake:662
+#: ../rpmdrake:498 ../rpmdrake:664
 #, c-format
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake:493 ../rpmdrake:662
+#: ../rpmdrake:498 ../rpmdrake:664
 #, c-format
 msgid "Addable"
 msgstr "Қўшса бўлади"
 
-#: ../rpmdrake:495
+#: ../rpmdrake:500
 #, c-format
 msgid "Selected"
 msgstr "Танланган"
 
-#: ../rpmdrake:495
+#: ../rpmdrake:500
 #, c-format
 msgid "Not selected"
 msgstr "Танланмаган"
 
-#: ../rpmdrake:525
+#: ../rpmdrake:530
 #, c-format
 msgid "Files:\n"
 msgstr "Файллар:\n"
 
-#: ../rpmdrake:530
+#: ../rpmdrake:535
 #, c-format
 msgid "Changelog:\n"
 msgstr "Changelog:\n"
 
-#: ../rpmdrake:535
+#: ../rpmdrake:540
 #, c-format
 msgid "Medium: "
 msgstr "Манба: "
 
-#: ../rpmdrake:537
+#: ../rpmdrake:542
 #, c-format
 msgid "Currently installed version: "
 msgstr "Ўрнатилган версияси: "
 
-#: ../rpmdrake:545
+#: ../rpmdrake:550
 #, c-format
 msgid "Name: "
 msgstr "Номи: "
 
-#: ../rpmdrake:546
+#: ../rpmdrake:551
 #, c-format
 msgid "Version: "
 msgstr "Версия: "
 
-#: ../rpmdrake:547
+#: ../rpmdrake:552
 #, c-format
 msgid "Size: "
 msgstr "Ҳажми: "
 
-#: ../rpmdrake:547
+#: ../rpmdrake:552
 #, c-format
 msgid "%s KB"
 msgstr "%s Кб"
 
-#: ../rpmdrake:550
+#: ../rpmdrake:555
 #, c-format
 msgid "Importance: "
 msgstr "Муҳимлиги: "
 
-#: ../rpmdrake:553
+#: ../rpmdrake:558
 #, c-format
 msgid "Summary: "
 msgstr "Ҳисобот: "
 
-#: ../rpmdrake:556
+#: ../rpmdrake:561
 #, c-format
 msgid "Reason for update: "
 msgstr "Янгилаш учун сабаб: "
 
-#: ../rpmdrake:558
+#: ../rpmdrake:563
 #, c-format
 msgid "Description: "
 msgstr "Таърифи: "
 
-#: ../rpmdrake:558
+#: ../rpmdrake:563
 #, fuzzy, c-format
 msgid "No description"
 msgstr "таърифларда"
 
-#: ../rpmdrake:573
-#, c-format
-msgid "Rpmdrake %s"
-msgstr "Rpmdrake %s"
-
-#: ../rpmdrake:590 ../rpmdrake:712 ../rpmdrake:714 ../rpmdrake:1637
+#: ../rpmdrake:592 ../rpmdrake:714 ../rpmdrake:716 ../rpmdrake:1638
 #, c-format
 msgid "More information on package..."
 msgstr "Пакет ҳақида қўшимча маълумот..."
 
-#: ../rpmdrake:591
+#: ../rpmdrake:593
 #, c-format
 msgid "Please choose"
 msgstr "Илтимос танланг"
 
-#: ../rpmdrake:591
+#: ../rpmdrake:593
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Қуйидаги пакетлардан биттаси керак:"
 
-#: ../rpmdrake:612
+#: ../rpmdrake:614
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Пакетлар рўйхати яратилмоқда, илтимос куриб туринг..."
 
-#: ../rpmdrake:629
+#: ../rpmdrake:631
 #, c-format
 msgid "No update"
 msgstr ""
 
-#: ../rpmdrake:630
+#: ../rpmdrake:632
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1226,28 +1290,28 @@ msgid ""
 "or you already installed all of them."
 msgstr ""
 
-#: ../rpmdrake:653
+#: ../rpmdrake:655
 #, c-format
 msgid "All"
 msgstr "Ҳаммаси"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:699 ../rpmdrake:704
+#: ../rpmdrake:701 ../rpmdrake:706
 #, c-format
 msgid "More info"
 msgstr "Қўшимча маълумот"
 
-#: ../rpmdrake:707 ../rpmdrake:1626
+#: ../rpmdrake:709 ../rpmdrake:1627
 #, c-format
 msgid "Information on packages"
 msgstr "Пакетлар ҳақида маълумот"
 
-#: ../rpmdrake:729
+#: ../rpmdrake:731
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Баъзи бир қўшимча пакетларни олиб ташлаш керак"
 
-#: ../rpmdrake:730
+#: ../rpmdrake:732
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1258,12 +1322,12 @@ msgstr ""
 "ташлаш керак:\n"
 "\n"
 
-#: ../rpmdrake:736 ../rpmdrake:745
+#: ../rpmdrake:738 ../rpmdrake:747
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Баъзи бир пакетларни олиб ташлаб бўлмайди"
 
-#: ../rpmdrake:737
+#: ../rpmdrake:739
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1272,7 +1336,7 @@ msgstr ""
 "Бу пакетларни олиб ташлаш тизимни ишдан чиқаради, узр:\n"
 "\n"
 
-#: ../rpmdrake:746 ../rpmdrake:808
+#: ../rpmdrake:748 ../rpmdrake:810
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1280,12 +1344,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:775
+#: ../rpmdrake:777
 #, c-format
 msgid "Additional packages needed"
 msgstr "Қўшимча пакетлар керак"
 
-#: ../rpmdrake:776
+#: ../rpmdrake:778
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1296,17 +1360,17 @@ msgstr ""
 "ҳам ўрнатилиши керак:\n"
 "\n"
 
-#: ../rpmdrake:791
+#: ../rpmdrake:793
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:793
+#: ../rpmdrake:795
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Баъзи бир пакетларни ўрнатиб бўлмайди"
 
-#: ../rpmdrake:794
+#: ../rpmdrake:796
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1317,122 +1381,122 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:807 ../rpmdrake:1073
+#: ../rpmdrake:809 ../rpmdrake:1075
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Баъзи бир пакетларни олиб ташлаш керак"
 
-#: ../rpmdrake:832
+#: ../rpmdrake:834
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Танланган: %d Мб / Дискдаги бўш жой: %d Мб"
 
-#: ../rpmdrake:833
+#: ../rpmdrake:835
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Танланган ҳажм: %d Мб"
 
-#: ../rpmdrake:839
+#: ../rpmdrake:841
 #, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:906
+#: ../rpmdrake:908
 #, c-format
 msgid "Security updates"
 msgstr "Хавфсизликга оид янгиланишлар"
 
-#: ../rpmdrake:906
+#: ../rpmdrake:908
 #, c-format
 msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:906
+#: ../rpmdrake:908
 #, c-format
 msgid "Normal updates"
 msgstr "Оддий янгилаш"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:928
 #, c-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:926
+#: ../rpmdrake:928
 #, c-format
-msgid "Mandrakelinux choices"
-msgstr "Mandrakelinux термаси"
+msgid "Mandriva Linux choices"
+msgstr "Mandriva Linux термаси"
 
-#: ../rpmdrake:929
+#: ../rpmdrake:931
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Ҳамма пакетлар: алифбо бўйича"
 
-#: ../rpmdrake:937
+#: ../rpmdrake:939
 #, c-format
 msgid "All packages, by group"
 msgstr "Ҳамма пакетлар: гуруҳ бўйича"
 
-#: ../rpmdrake:938
+#: ../rpmdrake:940
 #, c-format
 msgid "All packages, by size"
 msgstr "Ҳамма пакетлар: ҳажми бўйича"
 
-#: ../rpmdrake:939
+#: ../rpmdrake:941
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Ҳамма пакетлар: танлаш ҳолати бўйича"
 
-#: ../rpmdrake:943
+#: ../rpmdrake:945
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Ҳамма пакетлар: манба бўйича"
 
-#: ../rpmdrake:944
+#: ../rpmdrake:946
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Ҳамма пакетлар: янгилаш имконияти бўйича"
 
-#: ../rpmdrake:948
+#: ../rpmdrake:950
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1022
+#: ../rpmdrake:1024
 #, c-format
 msgid "in names"
 msgstr "номларда"
 
-#: ../rpmdrake:1024
+#: ../rpmdrake:1026
 #, c-format
 msgid "in descriptions"
 msgstr "таърифларда"
 
-#: ../rpmdrake:1026
+#: ../rpmdrake:1028
 #, c-format
 msgid "in file names"
 msgstr "файл номларида"
 
-#: ../rpmdrake:1035
+#: ../rpmdrake:1037
 #, c-format
 msgid "Normal information"
 msgstr "Қисқа маълумот"
 
-#: ../rpmdrake:1035
+#: ../rpmdrake:1037
 #, c-format
 msgid "Maximum information"
 msgstr "Тўлиқ маълумот"
 
-#: ../rpmdrake:1055
+#: ../rpmdrake:1057
 #, c-format
 msgid "You need to select some packages first."
 msgstr "Аввало, баъзи бир пакетларни танлашингиз керак"
 
-#: ../rpmdrake:1060
+#: ../rpmdrake:1062
 #, c-format
 msgid "Too many packages are selected"
 msgstr "Жуда кўп пакетлар танланган"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1063
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
@@ -1449,7 +1513,7 @@ msgstr ""
 "\n"
 "Танланган пакетларни ростдан ўрнатишни истайсизми?"
 
-#: ../rpmdrake:1074
+#: ../rpmdrake:1076
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1464,89 +1528,98 @@ msgstr ""
 "\n"
 "Давом этишни истайсизми?"
 
-#: ../rpmdrake:1107
+#: ../rpmdrake:1109
 #, c-format
 msgid "Software Packages Removal"
 msgstr "Дастур пакетларини олиб ташлаш"
 
-#: ../rpmdrake:1108
+#: ../rpmdrake:1110
 #, fuzzy, c-format
 msgid "Software Packages Update"
 msgstr "Дастур пакетларини олиб ташлаш"
 
-#: ../rpmdrake:1109
+#: ../rpmdrake:1111
 #, c-format
 msgid "Software Packages Installation"
 msgstr "Дастур пакетларини ўрнатиш"
 
-#: ../rpmdrake:1115 ../rpmdrake:1118 ../rpmdrake:1127 ../rpmdrake:1138
-#: ../rpmdrake:1143
+#: ../rpmdrake:1117 ../rpmdrake:1120 ../rpmdrake:1129 ../rpmdrake:1140
+#: ../rpmdrake:1145
 #, c-format
 msgid "/_File"
 msgstr "/_Файл"
 
-#: ../rpmdrake:1118
+#: ../rpmdrake:1120
+#, c-format
 msgid "/_Update media"
 msgstr "/_Манбани янгилаш"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1129
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_Танлашни тиклаш"
 
-#: ../rpmdrake:1138
+#: ../rpmdrake:1140
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/_Пакетлар рўйхатини қайтадан юклаш"
 
-#: ../rpmdrake:1143
+#: ../rpmdrake:1145
 #, c-format
 msgid "/_Quit"
 msgstr "/Чи_қиш"
 
-#: ../rpmdrake:1146 ../rpmdrake:1147 ../rpmdrake:1154
+#: ../rpmdrake:1145
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../rpmdrake:1148 ../rpmdrake:1149 ../rpmdrake:1156
 #, c-format
 msgid "/_Options"
 msgstr "/_Параметрлар"
 
-#: ../rpmdrake:1147 ../rpmdrake:1154
+#: ../rpmdrake:1149 ../rpmdrake:1156
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/_Автоматик равишда танланган пакетларни кўрсатиш"
 
-#: ../rpmdrake:1151 ../rpmdrake:1152
+#: ../rpmdrake:1153 ../rpmdrake:1154
 #, c-format
 msgid "/_Help"
 msgstr "/_Ёрдам"
 
-#: ../rpmdrake:1168
+#: ../rpmdrake:1170
 #, c-format
 msgid "Find:"
 msgstr "Қидириш:"
 
-#: ../rpmdrake:1173
+#: ../rpmdrake:1175
 #, c-format
 msgid "Search"
 msgstr "Қидириш"
 
-#: ../rpmdrake:1179
+#: ../rpmdrake:1181
 #, c-format
 msgid "Install"
 msgstr "Ўрнатиш"
 
-#: ../rpmdrake:1184
+#: ../rpmdrake:1186
 #, c-format
 msgid "Quit"
 msgstr "Чиқиш"
 
-#: ../rpmdrake:1225
+#: ../rpmdrake:1227
 #, c-format
 msgid "Fatal error"
 msgstr "Жуда жиддий хато"
 
-#: ../rpmdrake:1226
+#: ../rpmdrake:1228
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Жуда жиддий хато рўй берди: %s."
 
-#: ../rpmdrake:1234
+#: ../rpmdrake:1236
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1555,12 +1628,12 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake:1243
+#: ../rpmdrake:1245
 #, c-format
 msgid "Already existing update media"
 msgstr ""
 
-#: ../rpmdrake:1244
+#: ../rpmdrake:1246
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1571,12 +1644,12 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1254
+#: ../rpmdrake:1256
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../rpmdrake:1255
+#: ../rpmdrake:1257
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1586,62 +1659,62 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1288
+#: ../rpmdrake:1290
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Мавжуд бўлган пакетлар қидирилмоқда, илтимос кутиб туринг..."
 
-#: ../rpmdrake:1366
+#: ../rpmdrake:1368
 #, c-format
 msgid "Inspecting %s"
 msgstr "%s текширилмоқда"
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1391
 #, c-format
 msgid "changes:"
 msgstr "ўзгаришлар:"
 
-#: ../rpmdrake:1397
+#: ../rpmdrake:1399
 #, c-format
 msgid "Remove .%s"
 msgstr ""
 
-#: ../rpmdrake:1401
+#: ../rpmdrake:1403
 #, c-format
 msgid "Use .%s as main file"
 msgstr "Файлни (.%s) асосий файл сифатида ишлатиш"
 
-#: ../rpmdrake:1405
+#: ../rpmdrake:1407
 #, c-format
 msgid "Do nothing"
 msgstr "Ҳеч нарса қилмаш"
 
-#: ../rpmdrake:1421
+#: ../rpmdrake:1423
 #, c-format
 msgid "Installation finished"
 msgstr "Ўрнатиш тугади"
 
-#: ../rpmdrake:1436
+#: ../rpmdrake:1438
 #, c-format
 msgid "Inspect..."
 msgstr "Текшириш..."
 
-#: ../rpmdrake:1465 ../rpmdrake:1622
+#: ../rpmdrake:1468 ../rpmdrake:1623
 #, c-format
 msgid "Everything installed successfully"
 msgstr "Ҳамма нарса муваффақиятли ўрнатилди"
 
-#: ../rpmdrake:1466 ../rpmdrake:1623
+#: ../rpmdrake:1469 ../rpmdrake:1624
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Талаб қилинган ҳамма пакетлар муваффақиятли ўрнатилди."
 
-#: ../rpmdrake:1468 ../rpmdrake:1607
+#: ../rpmdrake:1471 ../rpmdrake:1608
 #, c-format
 msgid "Problem during installation"
 msgstr "Ўрнатишда хато юзага келди"
 
-#: ../rpmdrake:1469 ../rpmdrake:1608 ../rpmdrake:1663
+#: ../rpmdrake:1472 ../rpmdrake:1609 ../rpmdrake:1664
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1652,17 +1725,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1482
+#: ../rpmdrake:1485
 #, c-format
 msgid "Unable to get source packages."
 msgstr ""
 
-#: ../rpmdrake:1483
+#: ../rpmdrake:1486
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr ""
 
-#: ../rpmdrake:1484 ../rpmdrake:1555
+#: ../rpmdrake:1487 ../rpmdrake:1558
 #, c-format
 msgid ""
 "\n"
@@ -1675,37 +1748,37 @@ msgstr ""
 "Хатолар:\n"
 "%s"
 
-#: ../rpmdrake:1491
+#: ../rpmdrake:1494
 #, c-format
 msgid "Package installation..."
 msgstr "Пакетларни ўрнатиш"
 
-#: ../rpmdrake:1491
+#: ../rpmdrake:1494
 #, c-format
 msgid "Initializing..."
 msgstr "Ишга тайёрланмоқда..."
 
-#: ../rpmdrake:1500
+#: ../rpmdrake:1503
 #, c-format
 msgid "Change medium"
 msgstr "Манбани ўзгартириш"
 
-#: ../rpmdrake:1501
+#: ../rpmdrake:1504
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Илтимос \"%s\" номли манбани [%s] ускунага қўйинг"
 
-#: ../rpmdrake:1508
+#: ../rpmdrake:1511
 #, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "\"%s\" (%s/%s) пакети олинмоқда..."
 
-#: ../rpmdrake:1531
+#: ../rpmdrake:1534
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "Пакетларнинг имзолари текширилмоқда..."
 
-#: ../rpmdrake:1544
+#: ../rpmdrake:1547
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1720,12 +1793,12 @@ msgstr ""
 "\n"
 "Ўрнатишни давом эттиришни истайсизми?"
 
-#: ../rpmdrake:1552 ../rpmdrake:1662
+#: ../rpmdrake:1555 ../rpmdrake:1663
 #, c-format
 msgid "Installation failed"
 msgstr "Ўрнатиш муваффақиятсиз тугади"
 
-#: ../rpmdrake:1553
+#: ../rpmdrake:1556
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1738,22 +1811,22 @@ msgstr ""
 "\n"
 "Балки манба маълумот базасини янгилашингиз керак."
 
-#: ../rpmdrake:1566
+#: ../rpmdrake:1569
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "Ўрнатишга пакетлар тайёрланмоқда..."
 
-#: ../rpmdrake:1569
+#: ../rpmdrake:1572
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "\"%s\" (%s/%s) пакети ўрнатилмоқда..."
 
-#: ../rpmdrake:1585
+#: ../rpmdrake:1588
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "RPM-файлига (%s) мурожаат қилиб бўлмади"
 
-#: ../rpmdrake:1620
+#: ../rpmdrake:1621
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -1762,47 +1835,47 @@ msgid ""
 "you may now inspect some in order to take actions:"
 msgstr ""
 
-#: ../rpmdrake:1620
+#: ../rpmdrake:1621
 #, c-format
 msgid "everything was installed correctly"
 msgstr "ҳамма нарса тўғри ўрнатилди"
 
-#: ../rpmdrake:1628
+#: ../rpmdrake:1629
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1640
+#: ../rpmdrake:1641
 #, fuzzy, c-format
 msgid "More information on package... [%s]"
 msgstr "Пакет ҳақида қўшимча маълумот..."
 
-#: ../rpmdrake:1653
+#: ../rpmdrake:1654
 #, c-format
 msgid "No package found for installation."
 msgstr "Ўрнатиш учун пакет топилмади."
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1655
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 
-#: ../rpmdrake:1676
+#: ../rpmdrake:1677
 #, c-format
 msgid "Please wait, reading packages database..."
 msgstr "Пакетлар маълумот базаси ўқилмоқда, илтимос кутиб туринг..."
 
-#: ../rpmdrake:1723
+#: ../rpmdrake:1724
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "Пакетлар олиб ташланмоқда, илтимос кутиб туринг..."
 
-#: ../rpmdrake:1728
+#: ../rpmdrake:1729
 #, c-format
 msgid "Problem during removal"
 msgstr "Олиб ташлашда муаммо юзага келди"
 
-#: ../rpmdrake:1729
+#: ../rpmdrake:1730
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -1813,7 +1886,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1762
+#: ../rpmdrake:1763
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1826,7 +1899,7 @@ msgstr ""
 "Бу восита компьютерингиздан олиб ташламоқчи бўлган дастурларни\n"
 "танлашда сизга ёрдам беради."
 
-#: ../rpmdrake:1767
+#: ../rpmdrake:1768
 #, c-format
 msgid ""
 "Welcome to %s!\n"
@@ -1839,203 +1912,213 @@ msgstr ""
 "Бу восита компьютерингизга ўрнатмоқчи бўлган янгиланишларни танлашда\n"
 "сизга ёрдам беради."
 
-#: ../rpmdrake:1772
+#: ../rpmdrake:1773
 #, c-format
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1773
+#: ../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 тизими билан бирга минглаб дастурлар\n"
+"Mandriva Linux тизими билан бирга минглаб дастурлар\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:123
+#, fuzzy, c-format
+msgid "User name:"
+msgstr "Фойдаланувчи:"
 
-#: ../rpmdrake.pm:183
+#: ../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"
@@ -2043,41 +2126,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 "Манба янгиланмоқда, илтимос кутиб туринг..."
 
-#: ../rpmdrake.pm:444
+#: ../rpmdrake.pm:479
 #, c-format
-msgid ""
-"Please wait, downloading mirror addresses from the Mandrakesoft website."
+msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 
-#: ../rpmdrake.pm:450
+#: ../rpmdrake.pm:485
 #, c-format
 msgid "Error during download"
 msgstr "Олишда хато рўй берди"
 
-#: ../rpmdrake.pm:452
+#: ../rpmdrake.pm:487
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2087,93 +2169,93 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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"
@@ -2184,27 +2266,27 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../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"
@@ -2213,7 +2295,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:717 ../rpmdrake.pm:726
+#: ../rpmdrake.pm:751 ../rpmdrake.pm:760
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2221,17 +2303,17 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../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"
@@ -2242,7 +2324,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:757
+#: ../rpmdrake.pm:791
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
@@ -2250,20 +2332,20 @@ msgid ""
 "It will be disabled."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
@@ -2539,6 +2621,12 @@ msgstr "Дастурларни олиб ташлаш"
 msgid "Software Media Manager"
 msgstr "Танлаш"
 
+#~ msgid "Keys"
+#~ msgstr "Калитлар"
+
+#~ msgid "Rpmdrake %s"
+#~ msgstr "Rpmdrake %s"
+
 #~ msgid "Choose a mirror..."
 #~ msgstr "Ойнани танлаш..."