automerging

1 files changed, 13 insertions, 345 deletions

diff --git a/po/uz@Latn.po b/po/uz@Latn.po
index 8374004..b292237 100644
--- a/po/uz@Latn.po
+++ b/po/uz@Latn.po
@@ -1,4 +1,8 @@
 # translation of userdrake-uz@Cyrl.po to Uzbek
+# ###
+# ### Cyrilic version atuomatically built from the latin one;
+# ### Needs proofreading!
+# ###
 #
 # Latest versions of po files are at http://www.mandrakelinux.com/l10n/uz@Cyrl.php3
 #
@@ -9,7 +13,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: userdrake-uz@Latn\n"
+"Project-Id-Version: userdrake-uz\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-02-09 13:30+0100\n"
 "PO-Revision-Date: 2003-11-16 10:52+0100\n"
@@ -21,9 +25,9 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 
 #: ../USER/USER.xs:84
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading `%s': %s"
-msgstr "Rasm faylini (%s) yuklashda xato"
+msgstr ""
 
 #: ../USER/USER.xs:91
 #, c-format
@@ -36,18 +40,16 @@ msgid "Error removing `%s': %s"
 msgstr "Foydalanuvchi olib tashlanmoqda: %s"
 
 #: ../USER/USER.xs:531
-#, fuzzy
 msgid "Error creating mail spool.\n"
-msgstr "Rasm faylini (%s) yuklashda xato"
+msgstr ""
 
 #: ../USER/USER.xs:617
 msgid "unknown error"
-msgstr ""
+msgstr "noma'lum xato"
 
 #: ../USER/USER.xs:880
-#, fuzzy
 msgid "Error deleting mail spool.\n"
-msgstr "Rasm faylini (%s) yuklashda xato"
+msgstr ""
 
 #: ../userdrake:55 ../userdrake:1010
 #, c-format
@@ -655,349 +657,15 @@ msgstr "Xato"
 #~ msgid "Warning : Deleting Group"
 #~ msgstr "Diqqat: Guruh o'chirilmoqda"
 
-#~ msgid "File"
-#~ msgstr "Fayl"
-
-#~ msgid "Reload"
-#~ msgstr "Qayta yuklash"
-
-#~ msgid "Save"
-#~ msgstr "Saqlash"
-
-#~ msgid "Exit"
-#~ msgstr "Chiqish"
-
-#~ msgid "Actions"
-#~ msgstr "Amallar"
-
-#~ msgid "Settings"
-#~ msgstr "Moslamalar"
-
-#~ msgid "Show tools bar"
-#~ msgstr "Asboblar panelini ko'rsatish"
-
-#~ msgid "View users"
-#~ msgstr "Foydalanuvchilarni ko'rish"
-
-#~ msgid "View groups"
-#~ msgstr "Guruhlarni ko'rish"
-
-#~ msgid "Preferences"
-#~ msgstr "Moslash"
-
-#~ msgid "Ldap Server"
-#~ msgstr "LDAP server"
-
-#~ msgid "Help"
-#~ msgstr "Yordam"
-
-#~ msgid "About"
-#~ msgstr "Haqida"
-
-#~ msgid "Save change"
-#~ msgstr "O'zgarishlarni saqlash"
-
-#~ msgid "Add"
-#~ msgstr "Qo'shish"
-
-#~ msgid "Add a user"
-#~ msgstr "Foydalanuvchini qo'shish"
-
-#~ msgid "Edit user(s)"
-#~ msgstr "Foydalanuvchi(lar)ni tuzatish"
-
-#~ msgid "Remove"
-#~ msgstr "Olib tashlash"
-
-#~ msgid "Remove user(s)"
-#~ msgstr "Foydalanuvchi(lar)ni o'chirish"
-
-#~ msgid "Add a group"
-#~ msgstr "Guruhni qo'shish"
-
-#~ msgid "Edit group(s)"
-#~ msgstr "Guruh(lar)ni tuzatish"
-
-#~ msgid "Remove group(s)"
-#~ msgstr "Guruh(lar)ni o'chirish"
-
-#~ msgid "User id"
-#~ msgstr "Foydalanuvchi ID"
-
-#~ msgid "Group id"
-#~ msgstr "Guruh ID"
-
-#~ msgid "Comments"
-#~ msgstr "Izoh"
-
-#~ msgid "Shell"
-#~ msgstr "Shell"
-
-#~ msgid "name"
-#~ msgstr "Nomi"
-
-#~ msgid "gid"
-#~ msgstr "Guruh ID"
-
-#~ msgid "passwd"
-#~ msgstr "Maxfiy so'z"
-
-#~ msgid "users"
-#~ msgstr "Foydalanuvchilar"
-
-#~ msgid "Parameters"
-#~ msgstr "Parameterlar"
-
-#~ msgid "Edit accounts on a LDAP directory"
-#~ msgstr "LDAP direktoriyasidagi hisoblarni tahrirlash"
-
-#~ msgid "Active autologin support"
-#~ msgstr "Avtokirish imkoniyati"
-
-#~ msgid "User creation"
-#~ msgstr "Foydalanuvchini yaratish"
-
-#~ msgid "Default shell:"
-#~ msgstr "Andoza shell:"
-
-#~ msgid "Default home dir:"
-#~ msgstr "Andoza uy dir:"
-
-#~ msgid "Default face:"
-#~ msgstr "Andoza qiyofa:"
-
-#~ msgid "Default group:"
-#~ msgstr "Andoza guruh:"
-
-#~ msgid "General"
-#~ msgstr "Umumiy"
-
-#~ msgid "Don't show user with id less than 500"
-#~ msgstr "500 dan kam bo'lgan foydalanuvchi IDni ko'rsatmash"
-
-#~ msgid "User list"
-#~ msgstr "Foydalanuvchilarni ro'yxati"
-
-#~ msgid "Default Group"
-#~ msgstr "Andoza guruh"
-
-#~ msgid "User home directory"
-#~ msgstr "Foydalanuvchining uy direktoriyasi"
-
-#~ msgid "Groups list"
-#~ msgstr "Guruhlar ro'yxati"
-
-#~ msgid "Users View"
-#~ msgstr "Foydalanuvchilarni ko'rish"
-
-#~ msgid "Group list"
-#~ msgstr "Guruhlar ro'yxati"
-
-#~ msgid "Users list"
-#~ msgstr "Foydalanuvchilar ro'yxati"
-
-#~ msgid "Groups View"
-#~ msgstr "Guruhlarni ko'rish"
-
-#~ msgid "User"
-#~ msgstr "Foydalanuvchi"
-
-#~ msgid "/bin/bash"
-#~ msgstr "/bin/bash"
-
-#~ msgid "Login:"
-#~ msgstr "Foydalanuvchi:"
-
-#~ msgid "uid:"
-#~ msgstr "Foydalanuvchi ID:"
-
-#~ msgid "Comment:"
-#~ msgstr "Izoh:"
-
-#~ msgid "Shell:"
-#~ msgstr "Shell:"
-
-#~ msgid "Home dir:"
-#~ msgstr "Uy dir:"
-
-#~ msgid "passwd:"
-#~ msgstr "Maxfiy so'z:"
-
-#~ msgid "Retype passwd:"
-#~ msgstr "Tasdiqlang:"
-
-#~ msgid "In groups"
-#~ msgstr "Guruhlarda"
-
-#~ msgid "Available groups"
-#~ msgstr "Mavjud guruhlar"
-
-#~ msgid "Extended"
-#~ msgstr "Qo'shimcha"
-
-#~ msgid "About UserDrake"
-#~ msgstr "UserDrake haqida"
-
-#~ msgid "Group"
-#~ msgstr "Guruh"
-
-#~ msgid "Name:"
-#~ msgstr "Nomi:"
-
-#~ msgid "gid:"
-#~ msgstr "Guruh ID:"
-
-#~ msgid "In group"
-#~ msgstr "Guruhda"
-
-#~ msgid "Not in group"
-#~ msgstr "Guruhda emas"
-
-#~ msgid "Quit userdrake?"
-#~ msgstr "Userdrake dasturidan chiqishni istaysizmi?"
-
-#~ msgid ""
-#~ "You have made changes\n"
-#~ "since the last save.\n"
-#~ "Do you really want to quit\n"
-#~ "userdrake?"
-#~ msgstr ""
-#~ "Oxirgi saqlashdan so'ng\n"
-#~ "siz o'zgarishlar kiritingiz.\n"
-#~ "Rosdan Userdake'dan\n"
-#~ "chiqmoqchimisiz?"
-
-#~ msgid "Enter new passwd"
-#~ msgstr "Yangi maxfiy so'zni kiriting"
-
-#~ msgid "new passwd:"
-#~ msgstr "Yangi maxfiy so'z:"
-
-#~ msgid "Change"
-#~ msgstr "O'zgartirish"
-
-#~ msgid "Add user"
-#~ msgstr "Foydalanuvchini qo'shish"
-
-#~ msgid "Change face"
-#~ msgstr "Qiyofani o'zgartirish"
-
-#~ msgid "Set passwd"
-#~ msgstr "Maxfiy so'zni o'rnatish"
-
-#~ msgid "User autologin"
-#~ msgstr "Foydalanuvchining avtokirishi"
-
-#~ msgid "Add group"
-#~ msgstr "Guruhni qo'shish"
-
-#~ msgid "UserDrake - Error"
-#~ msgstr "UserDrake - Xato"
-
-#~ msgid "couldn't find blue color in /usr/lib/X11/rgb.txt file"
-#~ msgstr "/usr/lib/X11/rgb.txt faylida ko'k rangni topolmadim"
-
-#~ msgid "Select the image to use"
-#~ msgstr "Rasmni tanlang"
-
-#~ msgid "Custom..."
-#~ msgstr "Boshqa..."
-
-#~ msgid "couldn't find grey color in /usr/lib/X11/rgb.txt file"
-#~ msgstr "/usr/lib/X11/rgb.txt faylida kul rangni topolmadim"
-
-#~ msgid "couldn't find black color in /usr/lib/X11/rgb.txt file"
-#~ msgstr "/usr/lib/X11/rgb.txt faylida qora rangni topolmadim"
-
-#~ msgid "login empty"
-#~ msgstr "Foydalanuvchining ismi aniqlanmagan!"
-
-#~ msgid "This login already exists on the system"
-#~ msgstr "Bu foydalanuvchining ismi sistemada allaqachon mavjud!"
-
-#~ msgid "The login is similar to a name's group"
-#~ msgstr "Foydalanuvchining ismi guruh nomi bilan mos keladi"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "User id already in use"
-#~ msgstr ""
-#~ "%s\n"
-#~ "Foydalanuvchi ID allaqachon band"
-
-#~ msgid "User id already in use"
-#~ msgstr "Foydalanuvchi ID allaqachon band"
-
-#~ msgid "name empty"
-#~ msgstr "Guruhning nomi aniqlanmagan!"
-
-#~ msgid "This name already exists on the system"
-#~ msgstr "Bu guruhning nomi sistemada allaqachon mavjud!"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "Group id already in use"
-#~ msgstr ""
-#~ "%s\n"
-#~ "Guruh ID allaqachon band"
-
-#~ msgid "Group id already in use"
-#~ msgstr "Guruh ID allaqachon band"
-
-#~ msgid "Couldn't find pixmap file: %s"
-#~ msgstr "Rasm faylini (%s) topolmadim"
-
-#~ msgid "%s: the file %s is busy (%s present)\n"
-#~ msgstr "%s: %s fayli band (%s mavjud)\n"
-
-#~ msgid "%s: no changes made\n"
-#~ msgstr "%s: hech qanday o'zgarishlar kiritilmadi\n"
-
-#~ msgid "Select LDAP Directory"
-#~ msgstr "LDAP direktoriyasini tanlash"
-
-#~ msgid "Server address:"
-#~ msgstr "Serverning manzili:"
-
-#~ msgid "Password:"
-#~ msgstr "Maxfiy so'z:"
-
-#~ msgid "Connection Type :"
-#~ msgstr "Ulanishning turi:"
-
-#~ msgid "Start tls"
-#~ msgstr "tls'ni boshlash"
-
-#~ msgid "ssl"
-#~ msgstr "SSL"
-
-#~ msgid "Clear"
-#~ msgstr "Tozalash"
-
-#~ msgid "Test"
-#~ msgstr "Sinash"
-
-#~ msgid "cannot change ldap version to 3: %s"
-#~ msgstr "LDAP versiyasini 3ga o'zgartirolmayapman: %s"
-
-#~ msgid "cannot connect to the ldap server\n"
-#~ msgstr "LDAP serveriga ulanolmayapman\n"
-
-#~ msgid "cannot bind to the ldap server, %d\n"
-#~ msgstr "LDAP serveriga bog'lanolmayapman, %d\n"
-
-#~ msgid "Cannot bind to ldap server"
-#~ msgstr "LDAP serveriga bog'lanolmayapman"
-
-#~ msgid "cannot save because the cannot connect to the ldap server"
-#~ msgstr "Saqlolmayapman. Chunki LDAP serveriga ulanolmayapman."
-
 #~ msgid "Copyright (C) 2003 Mandrakesoft SA"
 #~ msgstr "Copyright (C) 2003 Mandrakesoft SA"
 
 #~ msgid "Generic help on userdrake"
 #~ msgstr "Userdrake bo'yicha umumiy yordam"
 
+#~ msgid "Help"
+#~ msgstr "Yordam"
+
 #~ msgid ""
 #~ "This password is too simple. \n"
 #~ " Good passwords should be > 6 caracters"