merge

1 files changed, 28 insertions, 23 deletions

diff --git a/po/uz.po b/po/uz.po
index 929e789a..779a123c 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-03 17:51+0100\n"
+"POT-Creation-Date: 2004-03-04 16:55+0100\n"
 "PO-Revision-Date: 2004-02-29 22:31-0500\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -70,76 +70,76 @@ msgstr "Тармоқни мослаш"
 msgid "Configure Now!"
 msgstr "Мослаш"
 
-#: ../mdkapplet:121
+#: ../mdkapplet:123
 msgid "Mandrake Updates Applet"
 msgstr ""
 
-#: ../mdkapplet:128
+#: ../mdkapplet:130
 msgid "Actions"
 msgstr "Амаллар"
 
-#: ../mdkapplet:130
+#: ../mdkapplet:132
 msgid "Install updates"
 msgstr "Янгиланишларни ўрнатиш"
 
-#: ../mdkapplet:131
+#: ../mdkapplet:133
 msgid "Configure"
 msgstr "Мослаш"
 
-#: ../mdkapplet:132
+#: ../mdkapplet:134
 msgid "Check updates"
 msgstr "Янгиланишларни текшириш"
 
-#: ../mdkapplet:133
+#: ../mdkapplet:135
 msgid "See logs"
 msgstr "Логларни кўриш"
 
-#: ../mdkapplet:136
+#: ../mdkapplet:138
 msgid "Status"
 msgstr "Ҳолати"
 
-#: ../mdkapplet:139
+#: ../mdkapplet:141
 msgid "Network Connection: "
 msgstr "Тармоқ: "
 
-#: ../mdkapplet:140
+#: ../mdkapplet:142
 msgid "Down"
 msgstr "Ишламаяпти"
 
-#: ../mdkapplet:140
+#: ../mdkapplet:142
 msgid "Up"
 msgstr "Ишлаяпти"
 
-#: ../mdkapplet:143
+#: ../mdkapplet:145
 msgid "New Updates: "
 msgstr "Янги янгиланишлар: "
 
-#: ../mdkapplet:144
+#: ../mdkapplet:146
 msgid "Available"
 msgstr "Мавжуд"
 
-#: ../mdkapplet:144
+#: ../mdkapplet:146
 msgid "Not Available"
 msgstr "Мавжуд эмас"
 
-#: ../mdkapplet:147
+#: ../mdkapplet:149
 msgid "Last check: "
 msgstr "Охирги текширув:"
 
-#: ../mdkapplet:153
+#: ../mdkapplet:155
 msgid "Close"
 msgstr "Ёпиш"
 
-#: ../mdkapplet:220
+#: ../mdkapplet:222
 #, fuzzy
 msgid "No check"
 msgstr "Охирги текширув:"
 
-#: ../mdkapplet:280
+#: ../mdkapplet:287
 msgid "About.."
 msgstr "Ҳақида"
 
-#: ../mdkapplet:281
+#: ../mdkapplet:288
 msgid "Quit"
 msgstr "Чиқиш"
 
@@ -203,6 +203,11 @@ msgstr ""
 msgid "Machine name:"
 msgstr "Компьютернинг номи:"
 
+#: ../mdkonline:138
+#, fuzzy
+msgid "Send Configuration"
+msgstr "Мослаш"
+
 #: ../mdkonline:139
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
@@ -223,6 +228,10 @@ msgid ""
 "provided to you."
 msgstr ""
 
+#: ../mdkonline:144 ../mdkonline:247 ../mdkonline:275
+msgid "Finish"
+msgstr "Тайёр"
+
 #: ../mdkonline:145
 msgid ""
 "From now you will receive on security and updates \n"
@@ -323,10 +332,6 @@ msgstr ""
 msgid "Sending configuration..."
 msgstr "Мосламалар жўнатилмоқда..."
 
-#: ../mdkonline:247 ../mdkonline:275
-msgid "Finish"
-msgstr "Тайёр"
-
 #: ../mdkonline:251 ../mdkonline:326 ../mdkupdate:77
 msgid "Connection problem"
 msgstr "Алоқа ўрнатишда муаммо"