From c07009bc84b312e8733f4632c75186757078dc8c Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Thu, 22 Jan 2004 11:54:48 +0000
Subject: merge

---
 po/uz.po | 93 ++++++++++++++++++++++++----------------------------------------
 1 file changed, 34 insertions(+), 59 deletions(-)

(limited to 'po/uz.po')

diff --git a/po/uz.po b/po/uz.po
index b28677f3..731f8194 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-uz@Cyrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-21 18:52+0100\n"
+"POT-Creation-Date: 2004-01-22 12:55+0100\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"
@@ -206,7 +206,7 @@ msgstr ""
 msgid "Backups"
 msgstr ""
 
-#: ../control-center:107
+#: ../control-center:107 ../drakxconf:32
 #, c-format
 msgid "Boot loader"
 msgstr ""
@@ -221,7 +221,7 @@ msgstr "Qo'shimcha mavzular"
 msgid "Boot floppy"
 msgstr ""
 
-#: ../control-center:110
+#: ../control-center:110 ../drakxconf:34
 #, c-format
 msgid "Internet connection sharing"
 msgstr ""
@@ -276,7 +276,7 @@ msgstr ""
 msgid "Graphical server"
 msgstr ""
 
-#: ../control-center:122
+#: ../control-center:122 ../drakxconf:35
 #, c-format
 msgid "Partitions"
 msgstr ""
@@ -291,7 +291,7 @@ msgstr "Asbob-uskunalar"
 msgid "Install"
 msgstr ""
 
-#: ../control-center:125
+#: ../control-center:125 ../drakxconf:26
 #, c-format
 msgid "Keyboard"
 msgstr ""
@@ -316,7 +316,7 @@ msgstr ""
 msgid "Monitor"
 msgstr ""
 
-#: ../control-center:130
+#: ../control-center:130 ../drakxconf:27
 #, fuzzy, c-format
 msgid "Mouse"
 msgstr "Yopish"
@@ -381,7 +381,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: ../control-center:143
+#: ../control-center:143 ../drakxconf:30
 #, fuzzy, c-format
 msgid "Services"
 msgstr "Server:"
@@ -396,7 +396,7 @@ msgstr ""
 msgid "TV card"
 msgstr ""
 
-#: ../control-center:146
+#: ../control-center:146 ../drakxconf:29
 #, c-format
 msgid "Users and groups"
 msgstr ""
@@ -653,7 +653,7 @@ msgid ""
 "current one):"
 msgstr ""
 
-#: ../control-center:369 ../control-center:402 ../control-center:528
+#: ../control-center:369 ../control-center:402 ../control-center:527
 #, c-format
 msgid "Cancel"
 msgstr "Bekor qilish"
@@ -727,7 +727,7 @@ msgstr ""
 msgid "Please wait..."
 msgstr "Iltimos kutib turing..."
 
-#: ../control-center:533 ../gecko.pm:56
+#: ../control-center:532
 #, c-format
 msgid "Previous"
 msgstr "Oldingisi"
@@ -854,66 +854,31 @@ msgstr "Mandrake boshqaruv markazi %s\n"
 msgid "Copyright (C) 1999-2004 Mandrakesoft SA"
 msgstr "Copyright © 1999-2004 Mandrakesoft SA"
 
-#: ../control-center:996
+#: ../control-center:998
 #, c-format
 msgid "Authors"
 msgstr "Mualliflar"
 
-#: ../control-center:997
+#: ../control-center:999
 #, c-format
 msgid "Mandrake Linux Contributors"
 msgstr "Mandrake Linux'ga hissa qo'shuvchilar"
 
 #: ../drakxconf:25
 #, fuzzy, c-format
-msgid "Display Configuration"
-msgstr "Serverni moslash"
-
-#: ../drakxconf:26
-#, fuzzy, c-format
-msgid "KeyBoard Configuration"
-msgstr "Serverni moslash"
-
-#: ../drakxconf:27
-#, fuzzy, c-format
-msgid "Mouse Configuration"
-msgstr "Serverni moslash"
+msgid "Display"
+msgstr "Displey boshqaruvchisini tanlagich"
 
 #: ../drakxconf:28
 #, c-format
 msgid "Internet & Network"
 msgstr ""
 
-#: ../drakxconf:29
-#, c-format
-msgid "Add new users"
-msgstr ""
-
-#: ../drakxconf:30
-#, fuzzy, c-format
-msgid "Service Configuration"
-msgstr "Serverni moslash"
-
-#: ../drakxconf:32
-#, fuzzy, c-format
-msgid "Boot Configuration"
-msgstr "Serverni moslash"
-
 #: ../drakxconf:33
 #, c-format
 msgid "Auto Install"
 msgstr ""
 
-#: ../drakxconf:34
-#, c-format
-msgid "Connection Sharing"
-msgstr ""
-
-#: ../drakxconf:35
-#, c-format
-msgid "Disk Partionning"
-msgstr ""
-
 #: ../drakxconf:38
 #, fuzzy, c-format
 msgid "Control Center"
@@ -927,16 +892,6 @@ msgstr ""
 "\n"
 "Siz moslamog'chi bo'lgan menyuni tanlang"
 
-#: ../gecko.pm:52
-#, c-format
-msgid "Next"
-msgstr ""
-
-#: ../gecko.pm:60
-#, c-format
-msgid "Skip Wizard"
-msgstr ""
-
 #: ../menus_launcher.pl:19 ../menus_launcher.pl:41
 #, c-format
 msgid "Menu Configuration Center"
@@ -983,6 +938,26 @@ msgstr "Bosib chiqarish sistemasini moslash uchun bu erni bosing"
 msgid "Done"
 msgstr "Tayyor"
 
+#, fuzzy
+#~ msgid "Display Configuration"
+#~ msgstr "Serverni moslash"
+
+#, fuzzy
+#~ msgid "KeyBoard Configuration"
+#~ msgstr "Serverni moslash"
+
+#, fuzzy
+#~ msgid "Mouse Configuration"
+#~ msgstr "Serverni moslash"
+
+#, fuzzy
+#~ msgid "Service Configuration"
+#~ msgstr "Serverni moslash"
+
+#, fuzzy
+#~ msgid "Boot Configuration"
+#~ msgstr "Serverni moslash"
+
 #~ msgid ""
 #~ "Mandrake Control Center is Mandrake Linux's main configuration\n"
 #~ "tool. It enables the system administrator to configure the hardware\n"
-- 
cgit v1.2.1