merge

1 files changed, 304 insertions, 261 deletions

diff --git a/po/uz.po b/po/uz.po
index 70e1a3d0..628525df 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-06-18 19:02+0200\n"
+"POT-Creation-Date: 2003-06-27 14:18+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"
@@ -20,7 +20,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
+msgid "Enlightenment"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Remote access"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
@@ -28,6 +33,11 @@ msgstr ""
 msgid "Please wait, updating media..."
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -35,12 +45,7 @@ msgstr "Kanada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -58,24 +63,19 @@ msgstr "hamma narsa to'g'ri o'rnatildi"
 msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr ""
-
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Other"
+msgid "File transfer"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Networking"
-msgstr ""
+#, fuzzy, c-format
+msgid "KDE and Qt"
+msgstr "Rivojlanish Apdeytlari"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
@@ -107,6 +107,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Qidirish natijalari"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -128,11 +133,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr ""
 
@@ -146,6 +146,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "O'rnatishga paketlar tayyorlanmoqda..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Select the media you wish to update:"
@@ -163,19 +168,29 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "O'rnat"
+msgid "True type"
+msgstr "Turi"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Base"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
+msgid "Graphics"
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "O'rnat"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -189,11 +204,6 @@ msgstr ""
 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:"
@@ -211,7 +221,7 @@ msgstr "Xato..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -303,21 +313,11 @@ msgid "Password:"
 msgstr "Parol:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "O'rnatishga paketlar tayyorlanmoqda..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "in descriptions"
 msgstr "Tavsiflar"
@@ -337,6 +337,11 @@ msgstr ""
 msgid "All packages, by update availability"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure media"
@@ -353,6 +358,11 @@ msgid "Greece"
 msgstr "Gretsiya"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Hech narsa qilmash"
@@ -405,11 +415,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-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"
@@ -475,6 +480,11 @@ msgstr "Port:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "`%s' (%s/%s) paketi olinmoqda..."
 
@@ -485,6 +495,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Boshqa"
 
@@ -493,60 +508,50 @@ msgstr "Boshqa"
 msgid "Sweden"
 msgstr "Shvetsiya"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Avstriya"
+msgid "Boards"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Ma'lumot"
+msgid "Austria"
+msgstr "Avstriya"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
+msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Other"
-msgstr "Rivojlanish Apdeytlari"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Ma'lumot"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Tekshirish..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
 msgstr "Yaponiya"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Summary: "
 msgstr "Xulosa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
+msgid "Backup"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/C"
-msgstr "Rivojlanish Apdeytlari"
+#, c-format
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -563,6 +568,11 @@ msgstr ""
 msgid "Importance: "
 msgstr "Muhimligi: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -599,11 +609,6 @@ msgid "Medium"
 msgstr "Belgiya"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "Hajm"
@@ -628,11 +633,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Manba(lar)ni yangilash"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Databases"
-msgstr "Rivojlanish Apdeytlari"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -668,6 +668,11 @@ msgstr "O'rnatish paytida xatolar yuzaga keldi"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -678,16 +683,6 @@ msgstr "Tuzatish"
 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 "Books/Other"
-msgstr "Boshqa"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -710,11 +705,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "fayllarda"
 
@@ -724,13 +714,18 @@ msgid "All packages, by group"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel"
+msgstr "umumiy"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
+msgid "Console"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
+msgid "C++"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -745,6 +740,16 @@ msgstr "Qidirish natijalari (hech qanaqa)"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Adventure"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Cd burning"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -758,11 +763,26 @@ msgstr ""
 msgid "Stop"
 msgstr "To'xtatish"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Qidirayapman, iltimos kutib turing..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Mathematics"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Internationalization"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Edit a medium"
@@ -811,6 +831,11 @@ msgstr "Paketni o'rnatish mumkin emas"
 msgid "Finland"
 msgstr "Finlyandiya"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -827,13 +852,13 @@ msgid "Save changes"
 msgstr "O'zgarishlarni saqlash"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/News"
-msgstr "Tarmoq sharoiti:"
+#, c-format
+msgid "Instant messaging"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
+msgid "News"
 msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
@@ -844,6 +869,11 @@ msgstr "Qo'shimcha ma'lumot"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "Qidirish"
 
@@ -864,16 +894,6 @@ msgstr "Ispaniya"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Kernel"
-msgstr "Rivojlanish Apdeytlari"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Already existing update media"
 msgstr ""
 
@@ -883,11 +903,6 @@ msgid "Files:\n"
 msgstr "/_Fayl"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Unable to get source packages."
 msgstr "Paketlaringizni tanlang"
@@ -897,6 +912,11 @@ msgstr "Paketlaringizni tanlang"
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Xitoy"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -908,11 +928,6 @@ msgid "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Chat"
-msgstr "Tarmoq"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Running in user mode"
 msgstr ""
@@ -964,9 +979,9 @@ msgid "Find:"
 msgstr "Qidirish:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Perl"
-msgstr "Rivojlanish Apdeytlari"
+#, c-format
+msgid "XFree86"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -979,11 +994,6 @@ msgid "Removable device"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "O'rnatishga paketlar tayyorlanmoqda..."
@@ -1000,21 +1010,11 @@ msgstr ""
 msgid "Please wait, adding medium..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Boshqa"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Foydalanuvchi:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Other"
-msgstr "Tarmoq"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1025,21 +1025,16 @@ msgstr "Belgiya"
 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:1
+#, fuzzy, c-format
+msgid "Printing"
+msgstr "Ogohlantirish"
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1047,11 +1042,6 @@ msgstr "`%s' imzosi tekshirilmoqda..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1065,16 +1055,6 @@ msgstr "Fayl xatosi"
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Java"
-msgstr "Rivojlanish Apdeytlari"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1086,12 +1066,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1106,25 +1081,20 @@ msgstr ""
 msgid "Communications"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Manbani (\"%s\") tuzatayapman:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Yangilash uchun sabab: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Manbalarni moslash"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "Yangilash uchun sabab: "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1153,7 +1123,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1178,23 +1148,38 @@ msgid "No package found for installation."
 msgstr "O'rnatishga paketlar tayyorlanmoqda..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Type1"
+msgstr "Turi"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Medium: "
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Description: "
 msgstr "Tavsiflar"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Archiving"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "%s KB"
 msgstr "%.1f KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
+msgid "System"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1202,6 +1187,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1229,11 +1224,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/IRC"
-msgstr "Tarmoq"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid "Name: "
 msgstr "Nom: %s"
 
@@ -1279,7 +1269,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1296,12 +1286,22 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "Eng ko'p ma'lumot"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1355,8 +1355,8 @@ msgstr "Xato tuzatish apdeytlarini ko'rsat"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/WWW"
-msgstr "Tarmoq"
+msgid "Java"
+msgstr "Yaponiya"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -1375,19 +1375,14 @@ msgstr ""
 msgid "Cancel"
 msgstr "Bekor"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr ""
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
+msgid "Sciences"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/Fonts/Console"
+msgid "Enabled?"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1415,16 +1410,6 @@ msgstr "O'rnatilgan"
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/KDE and Qt"
-msgstr "Rivojlanish Apdeytlari"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1432,12 +1417,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
+msgid "Too many packages are selected"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
+msgid "Physics"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1450,17 +1435,17 @@ msgstr "Hech narsa qilmash"
 msgid "Danmark"
 msgstr "Daniya"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Mail"
-msgstr "Tarmoq"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Download paytida xato"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Braziliya"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Yordam"
@@ -1470,6 +1455,11 @@ msgstr "Yordam"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Paketlarni o'rnatish uchun root bo'lish shart, uzr"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1497,7 +1487,7 @@ msgstr "manba bo'yicha"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1510,6 +1500,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Rivojlanish Apdeytlari"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1537,11 +1532,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Tanlashni tiklash"
 
@@ -1550,6 +1540,11 @@ msgstr "Tanlashni tiklash"
 msgid "Mandrake Update"
 msgstr "MandrakeUpdate Tanlovlari"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Boshqa"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1562,12 +1557,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Computer books"
+msgid "Howtos"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
+msgid "Icewm"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1581,6 +1576,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1612,22 +1612,12 @@ msgstr "O'rnatilgan versiyasi: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Development/C++"
-msgstr "Rivojlanish Apdeytlari"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+msgid "Games"
+msgstr "Boshqa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1652,7 +1642,7 @@ msgstr "Nom"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1660,6 +1650,11 @@ msgstr ""
 msgid "No update"
 msgstr "Yangila"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Tarmoq"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1670,6 +1665,16 @@ msgstr "Ok"
 msgid "Text tools"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Cards"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Group name:"
@@ -1682,6 +1687,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1690,11 +1700,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Manbani (\"%s\") tuzatayapman:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1754,11 +1759,6 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "User:"
@@ -2058,6 +2058,58 @@ msgid "Software Sources Manager"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP server"
+
+#, fuzzy
+#~ msgid "Development/Python"
+#~ msgstr "Rivojlanish Apdeytlari"
+
+#, fuzzy
+#~ msgid "Development/Other"
+#~ msgstr "Rivojlanish Apdeytlari"
+
+#, fuzzy
+#~ msgid "Development/Databases"
+#~ msgstr "Rivojlanish Apdeytlari"
+
+#, fuzzy
+#~ msgid "Networking/News"
+#~ msgstr "Tarmoq sharoiti:"
+
+#, fuzzy
+#~ msgid "Development/Kernel"
+#~ msgstr "Rivojlanish Apdeytlari"
+
+#, fuzzy
+#~ msgid "Networking/Chat"
+#~ msgstr "Tarmoq"
+
+#, fuzzy
+#~ msgid "Development/Perl"
+#~ msgstr "Rivojlanish Apdeytlari"
+
+#, fuzzy
+#~ msgid "Networking/Other"
+#~ msgstr "Tarmoq"
+
+#, fuzzy
+#~ msgid "Development/Java"
+#~ msgstr "Rivojlanish Apdeytlari"
+
+#, fuzzy
+#~ msgid "Networking/WWW"
+#~ msgstr "Tarmoq"
+
+#, fuzzy
+#~ msgid "Networking/Mail"
+#~ msgstr "Tarmoq"
+
+#, fuzzy
+#~ msgid "Development/C++"
+#~ msgstr "Rivojlanish Apdeytlari"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "bu bilan ziddiyat"
 
@@ -2311,9 +2363,6 @@ msgstr ""
 #~ msgid "security"
 #~ msgstr "xavfsizlik"
 
-#~ msgid "general"
-#~ msgstr "umumiy"
-
 #~ msgid "bugfix"
 #~ msgstr "xatoni to'g'rilash"
 
@@ -2331,9 +2380,6 @@ msgstr ""
 #~ "Yangilanadigan paketlar ro'yxatini ola olmadim\n"
 #~ "Boshqa ko'zgu bilan urinib ko'ring"
 
-#~ msgid "Warning"
-#~ msgstr "Ogohlantirish"
-
 #~ msgid ""
 #~ "Caution! These packages are NOT well tested.\n"
 #~ "You really can screw up your system\n"
@@ -2402,9 +2448,6 @@ msgstr ""
 #~ msgid "/Help/_About..."
 #~ msgstr "/Yordam/_Haqida..."
 
-#~ msgid "Type"
-#~ msgstr "Turi"
-
 #~ msgid "MandrakeUpdate, version 7.2\n"
 #~ msgstr "MandrakeUpdate, 7.2 versiyasi\n"