sync with code and merge strings from mcc & drakxtools

1 files changed, 29 insertions, 12 deletions

diff --git a/po/uz.po b/po/uz.po
index 88394f4..abbb864 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-17 16:58+0100\n"
+"POT-Creation-Date: 2007-03-13 13:35+0000\n"
 "PO-Revision-Date: 2003-11-16 10:52+0100\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -158,7 +158,13 @@ msgstr "Фойдаланувчилар"
 msgid "Groups"
 msgstr "Гуруҳлар"
 
-#: ../userdrake:154
+#. -PO: do not translate, this is already translated in mcc
+#: ../userdrake:142
+#, c-format
+msgid "Users and groups"
+msgstr "Фойдаланувчи ва гуруҳлар"
+
+#: ../userdrake:157
 #, c-format
 msgid "User Name"
 msgstr "Фойдаланувчи"
@@ -623,17 +629,28 @@ msgstr "Фойдаланувчини \"%s\" асосий гуруҳидан ўч
 msgid "Close"
 msgstr "Ёпиш"
 
-#: ../userdrake:1025
+#: ../userdrake:1033
 #, c-format
-msgid "Authors: "
-msgstr "Муаллифлар: "
+msgid "Copyright (C) %s by Mandriva"
+msgstr "Copyright (C) %s by Mandriva"
 
-#: ../userdrake:1031
-#, c-format
-msgid "Users Management \n"
+#: ../userdrake:1036
+#, fuzzy, c-format
+msgid "Users Management."
 msgstr "Фойдаланувчилар бошқаруви\n"
 
-#: ../userdrake:1037
+#: ../userdrake:1038
+#, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../userdrake:1044
+#, c-format
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr "Машраб Қуватов <kmashrab@uni-bremen.de>\n"
+
+#: ../userdrake:1051
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "Фойдаланувчи майдони бўш. Илтимос фойдаланувчини киритинг."
@@ -656,6 +673,9 @@ msgstr "Фойдаланувчининг исми жуда узун"
 msgid "Error"
 msgstr "Хато"
 
+#~ msgid "Authors: "
+#~ msgstr "Муаллифлар: "
+
 #~ msgid "Yes"
 #~ msgstr "Ҳа"
 
@@ -672,9 +692,6 @@ msgstr "Хато"
 #~ msgid "Warning : Deleting Group"
 #~ msgstr "Диққат: Гуруҳ ўчирилмоқда"
 
-#~ msgid "Copyright (C) 2003 Mandriva SA"
-#~ msgstr "Copyright (C) 2003 Mandriva SA"
-
 #~ msgid "Generic help on userdrake"
 #~ msgstr "Userdrake бўйича умумий ёрдам"