merge

1 files changed, 106 insertions, 91 deletions

diff --git a/po/uz.po b/po/uz.po
index 3e83bb1d..51e6f2da 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -8,14 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-uz@Cyrl\n"
-"POT-Creation-Date: 2004-01-12 10:26+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-16 14:38+0000\n"
 "PO-Revision-Date: 2003-11-17 20:54+0100\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 "X-Generator: KBabel 1.0.2\n"
 
 #: ../contributors.pl_.c:11
@@ -172,7 +172,7 @@ msgid "Backups"
 msgstr ""
 
 #: ../control-center_.c:107
-msgid "Bootstrapping"
+msgid "Boot loader"
 msgstr ""
 
 #: ../control-center_.c:108
@@ -235,7 +235,7 @@ msgstr ""
 msgid "Partitions"
 msgstr ""
 
-#: ../control-center_.c:124 ../control-center_.c:161
+#: ../control-center_.c:124 ../control-center_.c:162
 msgid "Hardware"
 msgstr "Asbob-uskunalar"
 
@@ -344,183 +344,198 @@ msgstr "WebDAV ulash nuqtalarini o'rnatish"
 msgid "Boot"
 msgstr "Sistemani yuklash"
 
-#: ../control-center_.c:174
+#: ../control-center_.c:175
 msgid "Mount Points"
 msgstr "Ulash nuqtalari"
 
-#: ../control-center_.c:189
+#: ../control-center_.c:190
 msgid "CD-ROM"
 msgstr "Kompakt-disk"
 
-#: ../control-center_.c:190
+#: ../control-center_.c:191
 msgid "DVD"
 msgstr "DVD"
 
-#: ../control-center_.c:190
+#: ../control-center_.c:191
 #, fuzzy
 msgid "DVD-ROM"
 msgstr "Kompakt-disk"
 
-#: ../control-center_.c:191
+#: ../control-center_.c:192
 msgid "CD Burner"
 msgstr "Kompakt-diskga yozgich"
 
-#: ../control-center_.c:191
+#: ../control-center_.c:192
 #, fuzzy
 msgid "CD/DVD"
 msgstr "DVD"
 
-#: ../control-center_.c:192
+#: ../control-center_.c:193
 msgid "Floppy"
 msgstr "Disket"
 
-#: ../control-center_.c:192
+#: ../control-center_.c:193
 #, fuzzy
 msgid "Floppy drive"
 msgstr "Disket"
 
-#: ../control-center_.c:193
+#: ../control-center_.c:194
 msgid "ZIP drive"
 msgstr ""
 
-#: ../control-center_.c:193
+#: ../control-center_.c:194
 msgid "Zip"
 msgstr "Zip"
 
-#: ../control-center_.c:202
+#: ../control-center_.c:203
 msgid "Network & Internet"
 msgstr "Tarmoq va Internet"
 
-#: ../control-center_.c:213
+#: ../control-center_.c:214
 msgid "Security"
 msgstr "Xavfsizlik"
 
-#: ../control-center_.c:220
+#: ../control-center_.c:221
 msgid "System"
 msgstr "Sistema"
 
-#: ../control-center_.c:236
+#: ../control-center_.c:237
 msgid "Software Management"
 msgstr "Dasturlar boshqaruvi"
 
-#: ../control-center_.c:245
+#: ../control-center_.c:246
 msgid "Server wizards"
 msgstr ""
 
-#: ../control-center_.c:252
+#: ../control-center_.c:253
 #, fuzzy
 msgid "Configure DHCP"
 msgstr "Moslash..."
 
-#: ../control-center_.c:253
+#: ../control-center_.c:254
 msgid "Add a DNS client"
 msgstr ""
 
-#: ../control-center_.c:254
+#: ../control-center_.c:255
 #, fuzzy
 msgid "Configure DNS"
 msgstr "Moslash..."
 
-#: ../control-center_.c:255
+#: ../control-center_.c:256
 #, fuzzy
 msgid "Configure FTP"
 msgstr "Moslash..."
 
-#: ../control-center_.c:256
+#: ../control-center_.c:257
 #, fuzzy
 msgid "Configure news"
 msgstr "Moslash..."
 
-#: ../control-center_.c:257
+#: ../control-center_.c:258
 #, fuzzy
 msgid "Configure mail"
 msgstr "Moslash..."
 
-#: ../control-center_.c:258
+#: ../control-center_.c:259
 #, fuzzy
 msgid "Configure proxy"
 msgstr "Moslash..."
 
-#: ../control-center_.c:259
+#: ../control-center_.c:260
 #, fuzzy
 msgid "Configure Samba"
 msgstr "Moslash..."
 
-#: ../control-center_.c:260
+#: ../control-center_.c:261
 #, fuzzy
 msgid "Configure time"
 msgstr "Moslash..."
 
-#: ../control-center_.c:261
+#: ../control-center_.c:262
 #, fuzzy
 msgid "Configure web"
 msgstr "Moslash..."
 
-#: ../control-center_.c:266
+#: ../control-center_.c:263
+#, fuzzy
+msgid "Configure NIS and Autofs"
+msgstr "Moslash..."
+
+#: ../control-center_.c:264
+#, fuzzy
+msgid "Configure installation server"
+msgstr "Menyuni moslash markazi"
+
+#: ../control-center_.c:265
+#, fuzzy
+msgid "Configure PXE"
+msgstr "Moslash..."
+
+#: ../control-center_.c:271
 msgid "Online Administration"
 msgstr ""
 
-#: ../control-center_.c:273
+#: ../control-center_.c:278
 msgid "Local administration"
 msgstr ""
 
-#: ../control-center_.c:274
+#: ../control-center_.c:279
 msgid "Remote administration"
 msgstr ""
 
-#: ../control-center_.c:302
+#: ../control-center_.c:307
 msgid "/Display _Logs"
 msgstr ""
 
 #. -PO Translators, please keep all "/" charaters !!!
-#: ../control-center_.c:302 ../control-center_.c:303 ../control-center_.c:304
-#: ../control-center_.c:323
+#: ../control-center_.c:307 ../control-center_.c:308 ../control-center_.c:309
+#: ../control-center_.c:328
 msgid "/_Options"
 msgstr "/_Parametrlar"
 
-#: ../control-center_.c:303
+#: ../control-center_.c:308
 msgid "/_Embedded Mode"
 msgstr ""
 
-#: ../control-center_.c:304
+#: ../control-center_.c:309
 msgid "/Expert mode in _wizards"
 msgstr "/Yordamchilarda _ekspert usuli"
 
-#: ../control-center_.c:308
+#: ../control-center_.c:313
 #, fuzzy
 msgid "/_Profiles"
 msgstr "/_Fayl"
 
-#: ../control-center_.c:309
+#: ../control-center_.c:314
 msgid "/_Delete"
 msgstr ""
 
-#: ../control-center_.c:310
+#: ../control-center_.c:315
 msgid "/_New"
 msgstr ""
 
-#: ../control-center_.c:321 ../control-center_.c:322
+#: ../control-center_.c:326 ../control-center_.c:327
 msgid "/_File"
 msgstr "/_Fayl"
 
-#: ../control-center_.c:322
+#: ../control-center_.c:327
 msgid "/_Quit"
 msgstr "/Chi_qish"
 
-#: ../control-center_.c:322
+#: ../control-center_.c:327
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../control-center_.c:322
+#: ../control-center_.c:327
 #, fuzzy
 msgid "Quit"
 msgstr "/Chi_qish"
 
-#: ../control-center_.c:338 ../control-center_.c:341 ../control-center_.c:354
+#: ../control-center_.c:343 ../control-center_.c:346 ../control-center_.c:359
 msgid "/_Themes"
 msgstr "/_Mavzular"
 
-#: ../control-center_.c:344
+#: ../control-center_.c:349
 msgid ""
 "This action will restart the control center.\n"
 "Any change not applied will be lost."
@@ -528,72 +543,72 @@ msgstr ""
 "Bu amal boshqaruv markazini boshqadan ishga tushiradi.\n"
 "Qo'llanmagan o'zgarishlar saqlanmaydi."
 
-#: ../control-center_.c:354
+#: ../control-center_.c:359
 msgid "/_More themes"
 msgstr "/_Ko'proq mavzular"
 
-#: ../control-center_.c:358
+#: ../control-center_.c:363
 msgid "New profile..."
 msgstr ""
 
-#: ../control-center_.c:361
+#: ../control-center_.c:366
 msgid ""
 "Name of the profile to create (the new profile is created as a copy of the "
 "current one):"
 msgstr ""
 
-#: ../control-center_.c:365 ../control-center_.c:398 ../control-center_.c:524
+#: ../control-center_.c:370 ../control-center_.c:403 ../control-center_.c:529
 msgid "Cancel"
 msgstr "Bekor qilish"
 
-#: ../control-center_.c:367 ../control-center_.c:399
+#: ../control-center_.c:372 ../control-center_.c:404
 msgid "Ok"
 msgstr ""
 
-#: ../control-center_.c:373
+#: ../control-center_.c:378
 msgid "Error"
 msgstr ""
 
-#: ../control-center_.c:373
+#: ../control-center_.c:378
 #, c-format
 msgid "The \"%s\" profile already exists!"
 msgstr ""
 
-#: ../control-center_.c:391
+#: ../control-center_.c:396
 msgid "Delete profile"
 msgstr ""
 
-#: ../control-center_.c:393
+#: ../control-center_.c:398
 msgid "Profile to delete:"
 msgstr ""
 
-#: ../control-center_.c:402 ../control-center_.c:462 ../control-center_.c:913
+#: ../control-center_.c:407 ../control-center_.c:467 ../control-center_.c:918
 msgid "Warning"
 msgstr "Diqqat"
 
-#: ../control-center_.c:402
+#: ../control-center_.c:407
 msgid "You can not delete the current profile"
 msgstr ""
 
-#: ../control-center_.c:417 ../control-center_.c:418 ../control-center_.c:419
-#: ../control-center_.c:420
+#: ../control-center_.c:422 ../control-center_.c:423 ../control-center_.c:424
+#: ../control-center_.c:425
 msgid "/_Help"
 msgstr "/_Yordam"
 
-#: ../control-center_.c:418
+#: ../control-center_.c:423
 #, fuzzy
 msgid "Help"
 msgstr "/_Yordam"
 
-#: ../control-center_.c:419
+#: ../control-center_.c:424
 msgid "/_Report Bug"
 msgstr "/_Xato haqida xabar qilish"
 
-#: ../control-center_.c:420
+#: ../control-center_.c:425
 msgid "/_About..."
 msgstr "/_Haqida"
 
-#: ../control-center_.c:463
+#: ../control-center_.c:468
 #, c-format
 msgid ""
 "We are about to switch from the \"%s\" profile to the \"%s\" profile.\n"
@@ -601,125 +616,125 @@ msgid ""
 "Are you sure you want to do the switch?"
 msgstr ""
 
-#: ../control-center_.c:513
+#: ../control-center_.c:518
 msgid "Please wait..."
 msgstr "Iltimos kutib turing..."
 
-#: ../control-center_.c:529
+#: ../control-center_.c:534
 msgid "Previous"
 msgstr "Oldingisi"
 
-#: ../control-center_.c:544
+#: ../control-center_.c:549
 #, fuzzy, c-format
 msgid "Mandrake Control Center %s [on %s]"
 msgstr "Mandrake boshqaruv markazi %s"
 
-#: ../control-center_.c:555
+#: ../control-center_.c:560
 msgid ""
 "_banner font:\n"
 "Sans 15"
 msgstr ""
 
-#: ../control-center_.c:557
+#: ../control-center_.c:562
 msgid "Welcome to the Mandrake Control Center"
 msgstr "Mandrake boshqaruv markaziga marhamat!"
 
-#: ../control-center_.c:700
+#: ../control-center_.c:705
 msgid "The modifications done in the current module won't be saved."
 msgstr "Joriy modulga kiritilgan o'zgarishlar saqlanilmaydi."
 
-#: ../control-center_.c:776
+#: ../control-center_.c:781
 #, c-format
 msgid "cannot fork: %s"
 msgstr ""
 
-#: ../control-center_.c:786
+#: ../control-center_.c:791
 #, c-format
 msgid "cannot fork and exec \"%s\" since it is not executable"
 msgstr ""
 
-#: ../control-center_.c:904
+#: ../control-center_.c:909
 msgid "This program has exited abnormally"
 msgstr "Bu dastur xato bilan tugadi"
 
-#: ../control-center_.c:923
+#: ../control-center_.c:928
 msgid "Close"
 msgstr "Yopish"
 
-#: ../control-center_.c:930
+#: ../control-center_.c:935
 msgid "More themes"
 msgstr "Qo'shimcha mavzular"
 
-#: ../control-center_.c:932
+#: ../control-center_.c:937
 msgid "Getting new themes"
 msgstr "Yangi mavzularni olish"
 
-#: ../control-center_.c:933
+#: ../control-center_.c:938
 msgid "Additional themes"
 msgstr "Qo'shimcha mavzular"
 
-#: ../control-center_.c:935
+#: ../control-center_.c:940
 msgid "Get additional themes on www.damz.net"
 msgstr "www.damz.net saytidan qo'shimcha mavzularni olish"
 
-#: ../control-center_.c:943
+#: ../control-center_.c:948
 msgid "About - Mandrake Control Center"
 msgstr "Haqida - Mandrake boshqaruv markazi"
 
-#: ../control-center_.c:953
+#: ../control-center_.c:958
 msgid "Authors: "
 msgstr "Mualliflar:"
 
-#: ../control-center_.c:954
+#: ../control-center_.c:959
 msgid "(original C version)"
 msgstr "(S tilida yozilgan asl nusxasi)"
 
 #. -PO "perl" here is the programming language
-#: ../control-center_.c:956 ../control-center_.c:959
+#: ../control-center_.c:961 ../control-center_.c:964
 msgid "(perl version)"
 msgstr "(Perl tilida yozilgan nusxasi)"
 
-#: ../control-center_.c:961
+#: ../control-center_.c:966
 msgid "Artwork: "
 msgstr "Tashqi ko'rinishi: "
 
-#: ../control-center_.c:962
+#: ../control-center_.c:967
 msgid "(design)"
 msgstr "(dizayn)"
 
 #. -PO If your language allows it, use eacute for first "e" and egrave for 2nd one.
-#: ../control-center_.c:964
+#: ../control-center_.c:969
 msgid "Helene Durosini"
 msgstr "Helene Durosini"
 
 #. -PO Add your Name here to find it in the About section in your language.
-#: ../control-center_.c:978
+#: ../control-center_.c:983
 msgid "~ * ~"
 msgstr "Mashrab Quvatov"
 
 #. -PO Add your E-Mail address here if you want to show it in the about doialog.
-#: ../control-center_.c:980
+#: ../control-center_.c:985
 msgid "~ @ ~"
 msgstr "kmashrab@uni-bremen.de"
 
-#: ../control-center_.c:982
+#: ../control-center_.c:987
 msgid "Translator: "
 msgstr "Tarjimon: "
 
-#: ../control-center_.c:988
+#: ../control-center_.c:993
 #, c-format
 msgid "Mandrake Control Center %s\n"
 msgstr "Mandrake boshqaruv markazi %s\n"
 
-#: ../control-center_.c:989
+#: ../control-center_.c:994
 msgid "Copyright (C) 1999-2003 Mandrakesoft SA"
 msgstr "Copyright © 1999-2003 Mandrakesoft SA"
 
-#: ../control-center_.c:993
+#: ../control-center_.c:998
 msgid "Authors"
 msgstr "Mualliflar"
 
-#: ../control-center_.c:994
+#: ../control-center_.c:999
 msgid "Mandrake Linux Contributors"
 msgstr "Mandrake Linux'ga hissa qo'shuvchilar"