merge in contributors list

1 files changed, 89 insertions, 73 deletions

diff --git a/po/uz@Cyrl.po b/po/uz@Cyrl.po
index 5c700206..f4d15573 100644
--- a/po/uz@Cyrl.po
+++ b/po/uz@Cyrl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-uz@Cyrl\n"
-"POT-Creation-Date: 2003-11-06 16:17+0000\n"
+"POT-Creation-Date: 2003-11-14 20:16+0000\n"
 "PO-Revision-Date: 2003-09-07 13:30+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -17,137 +17,138 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../clock.pl_.c:29
-msgid "DrakClock"
-msgstr "DrakClock"
-
-#: ../clock.pl_.c:36
-msgid "Time Zone"
-msgstr "Вақт зонаси"
+#: ../contributors.pl_.c:11
+msgid "Per Oyvind Karlsen"
+msgstr ""
 
-#: ../clock.pl_.c:42
-msgid "Timezone - DrakClock"
-msgstr "Вақт зонаси - DrakClock"
+#: ../contributors.pl_.c:11
+msgid ""
+"massive packages rebuilding and cleaning, Norwegian Bokml (nb) translation, "
+"i18n work, games"
+msgstr ""
 
-#: ../clock.pl_.c:42
-msgid "Which is your timezone?"
-msgstr "Вақт зонангизни танланг?"
+#: ../contributors.pl_.c:12
+msgid "Guillaume Rousse"
+msgstr ""
 
-#: ../clock.pl_.c:44
-msgid "GMT - DrakClock"
-msgstr "GMT - DrakClock"
+#: ../contributors.pl_.c:12
+msgid "cowsay introduction"
+msgstr ""
 
-#: ../clock.pl_.c:44
-msgid "Is your hardware clock set to GMT?"
+#: ../contributors.pl_.c:13
+msgid "Olivier Thauvin"
 msgstr ""
 
-#: ../clock.pl_.c:71
-msgid "Network Time Protocol"
+#: ../contributors.pl_.c:13
+msgid "figlet introduction, Distriblint (checking rpm in the distro)"
 msgstr ""
 
-#: ../clock.pl_.c:73
-msgid ""
-"Your computer can synchronize its clock\n"
-" with a remote time server using NTP"
+#: ../contributors.pl_.c:14
+msgid "Marcel Pol"
 msgstr ""
 
-#: ../clock.pl_.c:74
-msgid "Enable Network Time Protocol"
+#: ../contributors.pl_.c:14
+msgid "mono introduction, updated abiword"
 msgstr ""
 
-#: ../clock.pl_.c:81
-msgid "Server:"
+#: ../contributors.pl_.c:15
+msgid "Ben Reser"
 msgstr ""
 
-#: ../clock.pl_.c:199
+#: ../contributors.pl_.c:15
 msgid ""
-"We need to install ntp package\n"
-" to enable Network Time Protocol"
+"updated nc with debian patches, fixed some perl packages, dnotify startup "
+"script, urpmc, hddtemp, wipe, etc..."
 msgstr ""
 
-#: ../clock.pl_.c:202
-msgid "Yes"
+#: ../contributors.pl_.c:16
+msgid ""
+"\"deep and broad\" kernel work (many new patches before integration in "
+"official kernel)"
 msgstr ""
 
-#: ../clock.pl_.c:206
-msgid "No"
+#: ../contributors.pl_.c:16
+msgid "Thomas Backlund"
 msgstr ""
 
-#: ../contributors.pl_.c:6
-msgid "Per Oyvind Karlsen"
+#: ../contributors.pl_.c:17
+msgid "Svetoslav Slavtchev"
 msgstr ""
 
-#: ../contributors.pl_.c:8
-msgid "Guillaume Rousse"
+#: ../contributors.pl_.c:17
+msgid "kernel work (audio- and video-related patches)"
 msgstr ""
 
-#: ../contributors.pl_.c:10
-msgid "Olivier Thauvin"
+#: ../contributors.pl_.c:18
+msgid "Danny Tholen"
 msgstr ""
 
-#: ../contributors.pl_.c:12
-msgid "Marcel Pol"
+#: ../contributors.pl_.c:18
+msgid "multimedia kernel"
 msgstr ""
 
-#: ../contributors.pl_.c:14
-msgid "Ben Reser"
+#: ../contributors.pl_.c:19
+msgid "Buchan Milne"
 msgstr ""
 
-#: ../contributors.pl_.c:16
-msgid "Thomas Backlund"
+#: ../contributors.pl_.c:19
+msgid ""
+"Samba 3.0 (prerelease) that co-exists with Samba 2.2.x, Samba-2.2.x, GIS "
+"software (grass, mapserver), cursor_themes collection, misc server-side "
+"contributions"
 msgstr ""
 
-#: ../contributors.pl_.c:18
-msgid "Svetoslav Slavtchev?"
+#: ../contributors.pl_.c:20
+msgid "Goetz Waschk"
 msgstr ""
 
 #: ../contributors.pl_.c:20
-msgid "Danny Tholen"
+msgid ""
+"many multimedia packages (xine, mplayer, vlc, vcdimager), gnome-python, rox "
+"desktop"
 msgstr ""
 
-#: ../contributors.pl_.c:22
-msgid "Buchan Milne"
+#: ../contributors.pl_.c:21
+msgid "Austin Acton"
 msgstr ""
 
-#: ../contributors.pl_.c:24
-msgid "Goetz Waschk"
+#: ../contributors.pl_.c:21
+msgid ""
+"audio/video/MIDI apps, scientific apps, audio/video production howtos, "
+"bluetooth, pyqt & related"
 msgstr ""
 
-#: ../contributors.pl_.c:26
-msgid "Austin Acton"
+#: ../contributors.pl_.c:22
+msgid "ATI/gatos/DRM stuff"
 msgstr ""
 
-#: ../contributors.pl_.c:28
+#: ../contributors.pl_.c:22
 #, fuzzy
 msgid "Spencer Anderson"
 msgstr "(Perl тилида ёзилган нусхаси)"
 
-#: ../contributors.pl_.c:30
+#: ../contributors.pl_.c:23
 msgid "Andrey Borzenkov"
 msgstr ""
 
-#: ../contributors.pl_.c:32
-msgid "Oden Eriksson"
+#: ../contributors.pl_.c:23
+msgid "supermount-ng and other kernel work"
 msgstr ""
 
-#: ../contributors.pl_.c:34
-msgid "Stefan Van Der Eijk"
-msgstr ""
-
-#: ../contributors.pl_.c:36
-msgid "David Walser"
+#: ../contributors.pl_.c:24
+msgid "Oden Eriksson"
 msgstr ""
 
-#: ../contributors.pl_.c:38
-msgid "Andi Payn"
+#: ../contributors.pl_.c:24
+msgid "most web-based packages and many security-related packages"
 msgstr ""
 
-#: ../contributors.pl_.c:40
-msgid "Tibor Pittich"
+#: ../contributors.pl_.c:25
+msgid "Warly"
 msgstr ""
 
-#: ../contributors.pl_.c:42
-msgid "Pascal Terjan"
+#: ../contributors.pl_.c:25
+msgid "bootsplash, databases, drakwizard, various other stuffs."
 msgstr ""
 
 #: ../control-center_.c:72
@@ -698,6 +699,21 @@ msgstr "Босиб чиқариш системасини мослаш учун �
 msgid "Done"
 msgstr "Тайёр"
 
+#~ msgid "DrakClock"
+#~ msgstr "DrakClock"
+
+#~ msgid "Time Zone"
+#~ msgstr "Вақт зонаси"
+
+#~ msgid "Timezone - DrakClock"
+#~ msgstr "Вақт зонаси - DrakClock"
+
+#~ msgid "Which is your timezone?"
+#~ msgstr "Вақт зонангизни танланг?"
+
+#~ msgid "GMT - DrakClock"
+#~ msgstr "GMT - DrakClock"
+
 #~ msgid "OK"
 #~ msgstr "Ok"