merge and translate french

1 files changed, 1001 insertions, 563 deletions

diff --git a/po/uz.po b/po/uz.po
index 2d60df88..3fcac41f 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-28 16:30+0200\n"
+"POT-Creation-Date: 2003-05-28 20:14+0200\n"
 "PO-Revision-Date: 2003-03-04 13:14+0000\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -17,157 +17,174 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, by size"
+msgid "Archiving/Other"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
+msgid "Please wait, updating media..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Yo'l yoki ulash nuqtasi:"
+msgid "Canada"
+msgstr "Kanada"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Portugal"
-msgstr "Port:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Sciences/Computer science"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake 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."
+msgid "Sciences/Physics"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name:"
-msgstr "Nom"
+msgid "Upgradable"
+msgstr "Apdeyt"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Italy"
-msgstr "O'rnat"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "hamma narsa to'g'ri o'rnatildi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
+msgid "Verifying packages signatures..."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Manbalarni moslash"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "You need to fill up at least the two first entries."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
+msgid "System/Configuration/Other"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "All packages, by selection state"
-msgstr "tanlash holati bo'yicha"
+#, c-format
+msgid "System/Configuration/Networking"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
+msgid "System/XFree86"
 msgstr ""
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
-msgstr "Ha"
+#, fuzzy, c-format
+msgid "France"
+msgstr "Majburla"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
 "\n"
+"Is it ok to continue?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "everything was installed correctly"
-msgstr "hamma narsa to'g'ri o'rnatildi"
+msgid "Search results"
+msgstr "Qidirish natijalari"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f KB"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Ha"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Medias Manager, and then add a `Security\n"
-"updates' media.\n"
+"The installation is finished; %s.\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+msgid "System/Configuration/Hardware"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+msgid "Publishing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Saqlash va chiqish"
+msgid "How to choose manually your mirror"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
+msgid "Package installation..."
+msgstr "O'rnatishga paketlar tayyorlanmoqda..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
 msgstr ""
-"Paketlarni o'rnatish paytida xato yuzaga keldi:\n"
-"\n"
-"%s"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Size: "
-msgstr "Hajm"
+#, c-format
+msgid "Shells"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, by update availability"
+msgid "Graphics"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Security updates"
-msgstr "Xavfsizlik apdeytlarini ko'rsat"
+msgid "Italy"
+msgstr "O'rnat"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Already existing update medias"
+msgid "System/Kernel and hardware"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Eng ko'p ma'lumot"
+msgid ""
+"You are launching this program as a normal user.\n"
+"You will not be able to perform modifications on the system,\n"
+"but you may still browse the existing database."
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development/Python"
+msgstr "Rivojlanish Apdeytlari"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "Paketni ocholmadim"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -176,76 +193,52 @@ msgstr "Xato..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your medias database."
+msgid "System/Configuration/Boot and Init"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Buyuk Britaniya"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "in names"
-msgstr "nomlarda"
+msgid "Russia"
+msgstr "Rossiya"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, 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 Mandrake Linux Official Updates."
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr ""
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Finland"
-msgstr "Finlyandiya"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Do you want to continue installation?"
 msgstr ""
-"Ushbu fayl haqiqiy emas:\n"
-"\n"
-"%s\n"
-"\n"
-"Baribir davom etasizmi (bu paketni tashlab ketib)?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of media `%s'..."
+msgid "Sound"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "Majburla"
+#, c-format
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "More info"
-msgstr "Qo'shimcha ma'lumot"
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Qidirayapman, iltimos kutib turing..."
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -260,115 +253,148 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
+msgid "Initializing..."
+msgstr "Boshlanish..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The list of updates is void. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Emulators"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Choose a mirror..."
+msgid "Password:"
+msgstr "Parol:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "System/Servers"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Paketni o'rnatish mumkin emas"
+msgid "Software Packages Installation"
+msgstr "O'rnatishga paketlar tayyorlanmoqda..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop/KDE"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "O'rnatishga paketlar tayyorlanmoqda..."
+msgid "in descriptions"
+msgstr "Tavsiflar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Type of media:"
-msgstr "Manbaning turi:"
+msgid " failed!"
+msgstr "fayllarda"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "fayllarda"
+msgid "Some additional packages need to be removed"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
+msgid "All packages, by update availability"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "Proksi yuzer nomi:"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Qo'shma Shtatlar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Local files"
-msgstr "Lokal fayllar"
+msgid "Greece"
+msgstr "Gretsiya"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "%s tekshirilmoqda"
+#, fuzzy, c-format
+msgid "Monitoring"
+msgstr "Hech narsa qilmash"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "O'rnat"
+#, c-format
+msgid "Costa Rica"
+msgstr "Kosta Rika"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/_Yordam"
+msgid "Some packages can't be installed"
+msgstr "Paketni o'rnatish mumkin emas"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP server"
+msgid ""
+"The help window has been started, it should appear shortly on your desktop."
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Hammasini o'rnat"
+msgid "No mirror"
+msgstr "ko'zgu:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Manbani qo'shish"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Faylni (.%s) asosiy fayl safatida islatish"
+msgid "Poland"
+msgstr "Polsha"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Qidirish natijalari"
+msgid "Reload the packages list"
+msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid " failed!"
-msgstr "fayllarda"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Yo'l yoki ulash nuqtasi:"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Brazil"
-msgstr "Braziliya"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+msgid "Choose a mirror..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Qidirish:"
+msgid "Graphical desktop/WindowMaker"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Please wait, searching..."
-msgstr "Qidirayapman, iltimos kutib turing..."
+#, fuzzy, c-format
+msgid "Selected size: %d MB"
+msgstr "%dta tanlangan paket: %.1f MB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -377,45 +403,31 @@ msgstr ""
 "Iltimos Kuting\n"
 "Paketlar saralanmoqda"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Paketni ocholmadim"
-
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Reset the selection"
-msgstr "Tanlashni tiklash"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
+msgid "All packages, by size"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Costa Rica"
-msgstr "Kosta Rika"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr ""
@@ -424,70 +436,129 @@ msgstr ""
 "%s"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "Port:"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "`%s' (%s/%s) paketi olinmoqda..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Boshqa"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Shvetsiya"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the media(s) you wish to update:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Password:"
-msgstr "Parol:"
+msgid "Austria"
+msgstr "Avstriya"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Taiwan"
-msgstr "Tayvan"
+msgid "Info..."
+msgstr "Ma'lumot"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Networking/File transfer"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "Yuzer nomi:"
+msgid "Type of media:"
+msgstr "Manbaning turi:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development/Other"
+msgstr "Rivojlanish Apdeytlari"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating medium..."
+msgid "Inspect..."
+msgstr "Tekshirish..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Games/Cards"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, listing packages..."
+#, c-format
+msgid ""
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Yaponiya"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Networking/Remote access"
 msgstr ""
-"Iltimos Kuting\n"
-"Paketlar saralanmoqda"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "All packages, by media repository"
-msgstr "manba bo'yicha"
+msgid "Summary: "
+msgstr "Xulosa"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "Paketni ocholmadim"
+msgid "%s conflicts with %s"
+msgstr "bu bilan ziddiyat"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Bekor"
+msgid "System/Fonts/Type1"
+msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development/C"
+msgstr "Rivojlanish Apdeytlari"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Hamma narsa muvaffaqiyatli o'rnatildi"
+msgid "FTP server"
+msgstr "FTP server"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the media(s) you wish to update:"
+msgid "Remove .%s"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr ""
+msgid "Importance: "
+msgstr "Muhimligi: "
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages, by media repository"
+msgstr "manba bo'yicha"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "A fatal error occurred: %s."
+msgid "Unable to create medium."
 msgstr ""
 
 #: ../rpmdrake:1
@@ -501,90 +572,184 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "System/Internationalization"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Examining file of media `%s'..."
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in descriptions"
-msgstr "Tavsiflar"
+msgid "Size: "
+msgstr "Hajm"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
+msgid "Office"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
+msgid "Everything installed successfully"
+msgstr "Hamma narsa muvaffaqiyatli o'rnatildi"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Paketni ocholmadim"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development/Databases"
+msgstr "Rivojlanish Apdeytlari"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Iltimos tanlang"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "`%s' (%s/%s) paketi o'rnatilmoqda..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "%dta tanlangan paket: %.1f MB"
+msgid "Not selected"
+msgstr "Ziddiyatlar aniqlandi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Boshlanish..."
+msgid "in names"
+msgstr "nomlarda"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "O'rnatish paytida xatolar yuzaga keldi"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Terminals"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Save changes"
-msgstr "O'zgarishlarni saqlash"
+msgid "Edit"
+msgstr "Tuzatish"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Download paytida xato"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Tanlangan: %d Mb / Diskdagi bo'sh joy: %d Mb"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "O'rnatishga paketlar tayyorlanmoqda..."
+msgid "Books/Other"
+msgstr "Boshqa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Muhimligi: "
+msgid "Sciences/Other"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Avstraliya"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Security updates"
+msgstr "Xavfsizlik apdeytlarini ko'rsat"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "Majburla"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Games/Adventure"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "fayllarda"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, by group"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop/FVWM based"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Media: "
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Games/Sports"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Gollandiya"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Qidirish natijalari (hech qanaqa)"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
+"Welcome to the software installation tool!\n"
 "\n"
+"Your Mandrake 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 ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Qo'shish"
+msgid "Stop"
+msgstr "To'xtatish"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Unable to create medium."
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Browse..."
-msgstr "Tanlash..."
+msgid "HTTP server"
+msgstr "HTTP server"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "O'rnatishga paketlar tayyorlanmoqda..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -593,179 +758,317 @@ msgstr "Paketni o'rnatish mumkin emas"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Ma'lumot"
+msgid "Finland"
+msgstr "Finlyandiya"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You need to insert the medium to continue"
+msgid "Save changes"
+msgstr "O'zgarishlarni saqlash"
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking/News"
+msgstr "Tarmoq sharoiti:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Books/Faqs"
+msgstr ""
+
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Qo'shimcha ma'lumot"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Qidirish"
+
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for media `%s'..."
+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 Mandrake Linux Official Updates."
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Remove"
-msgstr "Olibtashlash"
+msgid "Spain"
+msgstr "Ispaniya"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sciences/Astronomy"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "O'rnatishga paketlar tayyorlanmoqda..."
+msgid "Development/Kernel"
+msgstr "Rivojlanish Apdeytlari"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "ko'zgu:"
+msgid "Update media(s)"
+msgstr "Manba(lar)ni yangilash"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "/_Fayl"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
+msgid "Games/Arcade"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages."
+msgstr "Paketlaringizni tanlang"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Install"
-msgstr "O'rnat"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Japan"
-msgstr "Yaponiya"
+msgid "Update"
+msgstr "Apdeyt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Hech narsa qilmash"
+msgid "Additional packages needed"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No update"
-msgstr "Yangila"
+msgid "Networking/Chat"
+msgstr "Tarmoq"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Description: "
-msgstr "Tavsiflar"
+#, c-format
+msgid "Running in user mode"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
-"Do you really want to install all the selected packages?"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing media \"%s\":"
+msgstr "Manbani (\"%s\") tuzatayapman:"
+
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name: "
-msgstr "Nom: %s"
+msgid "Please wait, listing packages..."
+msgstr ""
+"Iltimos Kuting\n"
+"Paketlar saralanmoqda"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Tekshirish..."
+msgid "Find:"
+msgstr "Qidirish:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing media \"%s\":"
-msgstr "Manbani (\"%s\") tuzatayapman:"
+msgid "Development/Perl"
+msgstr "Rivojlanish Apdeytlari"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "O'rnatishga paketlar tayyorlanmoqda..."
+#, c-format
+msgid "Normal information"
+msgstr "Oddiy ma'lumot"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Australia"
-msgstr "Avstraliya"
+msgid "Copying file for media `%s'..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop/Icewm"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "O'rnatilgan"
+msgid "Preparing packages installation..."
+msgstr "O'rnatishga paketlar tayyorlanmoqda..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
+msgstr ""
+"Iltimos Kuting\n"
+"Paketlar saralanmoqda"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Poland"
-msgstr "Polsha"
+msgid "Please wait, adding medium..."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Version: "
-msgstr "Versiya:"
+msgid "Games/Other"
+msgstr "Boshqa"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr ""
+msgid "Login:"
+msgstr "Foydalanuvchi:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "Apdeyt"
+msgid "Networking/Other"
+msgstr "Tarmoq"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
+msgid "Belgium"
+msgstr "Belgiya"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "File tools"
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Archiving/Cd burning"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sciences/Biology"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr ""
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "O'rnatishga paketlar tayyorlanmoqda..."
+msgid "Starting download of `%s'..."
+msgstr "`%s' imzosi tekshirilmoqda..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Additional packages needed"
+msgid "System/Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Leaves only, sorted by install date"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Xato tuzatish apdeytlarini ko'rsat"
+msgid "Fatal error"
+msgstr "Fayl xatosi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid "A fatal error occurred: %s."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Olmoniya"
+msgid "Games/Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development/Java"
+msgstr "Rivojlanish Apdeytlari"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Russia"
-msgstr "Rossiya"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "Norvegiya"
+msgid "Archiving/Compression"
+msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Books/Litterature"
+msgstr ""
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "O'rnatish paytida xatolar yuzaga keldi"
+msgid "Please choose the desired mirror."
+msgstr ""
+"Iltimos Kuting\n"
+"Ko'zgular ro'yxati yuklanmoqda"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Qidirish"
+msgid "Communications"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop/Sawfish"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Yangilash uchun sabab: "
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sciences/Mathematics"
+msgstr ""
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Olibtashlash"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Edit a media"
-msgstr "Manbani tuzatish"
+msgid "Portugal"
+msgstr "Port:"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -774,145 +1077,239 @@ msgstr "Chex Respublikasi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update media configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Medias Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Some packages need to be removed"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "To'xtatish"
+msgid "Problem during removal"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update"
-msgstr "Apdeyt"
+msgid "Graphical desktop/Enlightenment"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, removing packages..."
+#, c-format
+msgid "Help launched in background"
 msgstr ""
-"Iltimos Kuting\n"
-"Paketlar saralanmoqda"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal information"
-msgstr "Oddiy ma'lumot"
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Paketlarni o'rnatish paytida xato yuzaga keldi:\n"
+"\n"
+"%s"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "O'rnatishga paketlar tayyorlanmoqda..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "Tavsiflar"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s KB"
+msgstr "%.1f KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Media: "
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "`%s' (%s/%s) paketi olinmoqda..."
+msgid "Sciences/Chemistry"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Tanlangan: %d Mb / Diskdagi bo'sh joy: %d Mb"
+msgid "All requested packages were installed successfully."
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Media"
-msgstr ""
+msgid "Local files"
+msgstr "Lokal fayllar"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Spain"
-msgstr "Ispaniya"
+msgid "Addable"
+msgstr "Qo'shsa bo'ladi"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Oddiy Apdeytlar"
+#, c-format
+msgid "Please choose"
+msgstr "Iltimos tanlang"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid "Databases"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking/IRC"
+msgstr "Tarmoq"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Login:"
-msgstr "Foydalanuvchi:"
+msgid "Media"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Name: "
+msgstr "Nom: %s"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Adding a media:"
-msgstr "Manbani qo'shayapman:"
+msgid "Proxy hostname:"
+msgstr "Proksi yuzer nomi:"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"The following packages have bad signatures:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
+msgstr ""
+"Ushbu fayl haqiqiy emas:\n"
+"\n"
+"%s\n"
+"\n"
+"Baribir davom etasizmi (bu paketni tashlab ketib)?"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Austria"
-msgstr "Avstriya"
+msgid "Download of `%s', speed:%s"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Fayl xatosi"
+#, c-format
+msgid "Inspecting %s"
+msgstr "%s tekshirilmoqda"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Video"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Development/GNOME and GTK+"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Update..."
-msgstr "Apdeyt"
+msgid "Normal updates"
+msgstr "Oddiy Apdeytlar"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "`%s' imzosi tekshirilmoqda..."
+msgid "Selected"
+msgstr ""
+"Hammasini\n"
+"tanla"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(hech qanaqa)"
+msgid "Maximum information"
+msgstr "Eng ko'p ma'lumot"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
+msgid "Examining distant file of media `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "`%s' (%s/%s) paketi o'rnatilmoqda..."
+msgid "Archiving/Backup"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "O'rnatilgan versiyasi: "
+msgid "Quit"
+msgstr "Chiqish"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Version: "
+msgstr "Versiya:"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Other"
-msgstr "Boshqa"
+msgid "Norway"
+msgstr "Norvegiya"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Yangilash uchun sabab: "
+msgid "Use .%s as main file"
+msgstr "Faylni (.%s) asosiy fayl safatida islatish"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
+msgid "Israel"
+msgstr "O'rnat"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Xitoy"
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
-"Iltimos Kuting\n"
-"Ko'zgular ro'yxati yuklanmoqda"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit"
-msgstr "Tuzatish"
+msgid "(Not available)"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Bugfixes updates"
+msgstr "Xato tuzatish apdeytlarini ko'rsat"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking/WWW"
+msgstr "Tarmoq"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Update..."
+msgstr "Apdeyt"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -921,85 +1318,100 @@ msgstr ""
 "Iltimos Kuting\n"
 "Paketlar saralanmoqda"
 
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Bekor"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
+msgid "Enabled?"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Qidirish natijalari (hech qanaqa)"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Daniya"
+msgid "Sciences/Geosciences"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "China"
-msgstr "Xitoy"
+msgid "System/Fonts/Console"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "Qo'shma Shtatlar"
+msgid "All packages, alphabetical"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "changes:"
-msgstr "o'zgarishlar:"
+msgid "Mandrake choices"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some additional packages need to be removed"
+msgid "Toys"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "O'rnatilgan"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No"
-msgstr "Jo'q"
+msgid " done."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Configure medias"
-msgstr "Manbalarni moslash"
+msgid "Development/KDE and Qt"
+msgstr "Rivojlanish Apdeytlari"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Books/Howtos"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Add a media"
-msgstr "Manbani qo'shish"
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Summary: "
-msgstr "Xulosa"
+#, c-format
+msgid "Games/Boards"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+msgid "Too many packages are selected"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Greece"
-msgstr "Gretsiya"
+msgid "Danmark"
+msgstr "Daniya"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Hech narsa qilmash"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking/Mail"
+msgstr "Tarmoq"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was an error downloading the mirrors list:\n"
-"\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
-msgstr ""
+msgid "Error during download"
+msgstr "Download paytida xato"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Help"
+msgstr "/_Yordam"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -1008,67 +1420,110 @@ msgstr "Paketlarni o'rnatish uchun root bo'lish shart, uzr"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Path:"
-msgstr "Port:"
+msgid "Edit a media"
+msgstr "Manbani tuzatish"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Tayvan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, by group"
-msgstr ""
+msgid "(none)"
+msgstr "(hech qanaqa)"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Olmoniya"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during removal"
+msgid "System/Fonts/X11 bitmap"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Selected"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
-"Hammasini\n"
-"tanla"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Gollandiya"
+msgid "No"
+msgstr "Jo'q"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Addable"
-msgstr "Qo'shsa bo'ladi"
+msgid "Install"
+msgstr "O'rnat"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Qo'shish"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(Not available)"
+msgid "Change medium"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Graphical desktop/GNOME"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Manbani qo'shayapman:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Tanlashni tiklash"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake Update"
+msgstr "MandrakeUpdate Tanlovlari"
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
 "%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Ziddiyatlar aniqlandi"
+#, c-format
+msgid "Books/Computer books"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Removal"
+msgid "System/Base"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Sweden"
-msgstr "Shvetsiya"
+msgid "Brazil"
+msgstr "Braziliya"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Hammasini o'rnat"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1081,149 +1536,138 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The list of updates is void. This means that either there is\n"
-"no available update for the packages installed on your computer,\n"
-"or you already installed all of them."
+msgid "Already existing update medias"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of media `%s'..."
-msgstr ""
+msgid "Currently installed version: "
+msgstr "O'rnatilgan versiyasi: "
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development/C++"
+msgstr "Rivojlanish Apdeytlari"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
+msgid "System/Configuration/Printing"
 msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Quit"
-msgstr "Chiqish"
-
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
+msgid "Games/Puzzles"
 msgstr ""
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Update media(s)"
-msgstr "Manba(lar)ni yangilash"
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "System/Configuration/Packaging"
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, adding medium..."
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages."
+msgid "You need to select some packages first."
 msgstr "Paketlaringizni tanlang"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Too many packages are selected"
-msgstr ""
+#, fuzzy, c-format
+msgid "All packages, by selection state"
+msgstr "tanlash holati bo'yicha"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "Nom"
+
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to the Software Medias Manager!\n"
-"\n"
-"This tool will help you configure the packages medias you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+msgid "Graphical desktop/Other"
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr "bu bilan ziddiyat"
+msgid "No update"
+msgstr "Yangila"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
+msgid "Ok"
+msgstr "Ok"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake choices"
+msgid "Text tools"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Korea"
-msgstr "Majburla"
+#: ../rpmdrake:1
+#, c-format
+msgid "Networking/Instant messaging"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Removable device"
+msgid "Please wait, removing medium..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Belgium"
-msgstr "Belgiya"
+msgid "Accessibility"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr ""
+msgid "changes:"
+msgstr "o'zgarishlar:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "MandrakeUpdate Tanlovlari"
+msgid "Editors"
+msgstr "Tuzatish"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Buyuk Britaniya"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP server"
+msgid "Relative path to synthesis/hdlist:"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/_Fayl"
-
-#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
+"Welcome to MandrakeUpdate!\n"
 "\n"
-"Errors:\n"
-"%s"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Leaves only, sorted by install date"
+msgid "System/Fonts/True type"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "User:"
+msgstr "Yuzer nomi:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
+msgstr "Tanlash..."
+
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
 msgstr "Olingan fayl qo'yiladigan papka mavjud bo'lishi kerak"
@@ -1512,6 +1956,9 @@ msgstr "Dasturni olib tashlash"
 msgid "Software Sources Manager"
 msgstr ""
 
+#~ msgid "Save and quit"
+#~ msgstr "Saqlash va chiqish"
+
 #~ msgid "by group"
 #~ msgstr "guruh bo'yicha"
 
@@ -1890,9 +2337,6 @@ msgstr ""
 #~ "updates"
 #~ msgstr "Yangila"
 
-#~ msgid "Development Updates"
-#~ msgstr "Rivojlanish Apdeytlari"
-
 #~ msgid ""
 #~ "The packages are the updates for Mandrake\n"
 #~ "Select the one(s) you want to update\n"
@@ -1946,15 +2390,9 @@ msgstr ""
 #~ msgid "Disk"
 #~ msgstr "Disk"
 
-#~ msgid "Network"
-#~ msgstr "Tarmoq"
-
 #~ msgid "RPM directory"
 #~ msgstr "RPM katalogi"
 
-#~ msgid "Network settings:"
-#~ msgstr "Tarmoq sharoiti:"
-
 #~ msgid "Show general updates"
 #~ msgstr "Umumiy apdeytlarni ko'rsat"