Merge message, new French translations

1 files changed, 227 insertions, 85 deletions

diff --git a/po/uz.pom b/po/uz.pom
index dae4368d..16fee242 100644
--- a/po/uz.pom
+++ b/po/uz.pom
@@ -9,188 +9,282 @@ msgid "Workstation"
 msgstr "Иш станцияси"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:164
+#, c-format
+msgid "Development"
+msgstr "Тузиш"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "График муҳит"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:10
+#: share/compssUsers.pl:25
 #, c-format
-msgid "Web/FTP"
-msgstr "Web/FTP"
+msgid "Office Workstation"
+msgstr "Идора станцияси"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:11
+#: share/compssUsers.pl:27
 #, c-format
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
+msgid ""
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+msgstr ""
+"Идора учун дастурлар: матн процессорлари (OpenOffice.org Writer, Kword), "
+"электрон жадваллар (OpenOffice.org Calc, Kspread), PDF кўрувчилар ва ҳоказо"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:15
+#: share/compssUsers.pl:28
 #, c-format
-msgid "Postfix mail server"
-msgstr "Postfix хат-хабар сервери"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Идора учун дастурлар: матн процессорлари (kword, abiword), электрон "
+"жадваллар (kspread, gnumeric), PDF кўрувчилар ва ҳоказо"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:18
+#: share/compssUsers.pl:33
 #, c-format
-msgid "Database"
-msgstr "Маълумот базаси"
+msgid "Game station"
+msgstr "Ўйин станцияси"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:19
+#: share/compssUsers.pl:34
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL ёки MySQL маълумот базаси"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Овунчоқ дастурлар: аркада, стол ўйинлари, стратегия ва ҳоказо"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:22
+#: share/compssUsers.pl:37
 #, c-format
-msgid "Firewall/Router"
-msgstr "Файервол/Рутер"
+msgid "Multimedia station"
+msgstr "Мултимедиа станцияси"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:23
+#: share/compssUsers.pl:38
 #, c-format
-msgid "Internet gateway"
-msgstr "Интернет гейтвэйи"
+msgid "Sound and video playing/editing programs"
+msgstr "Аудио ва видеони ўйнаш/таҳрирлаш учун дастурлар"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:26
+#: share/compssUsers.pl:43
 #, c-format
-msgid "Network Computer server"
-msgstr "Тармоқдаги компьютер (сервер)"
+msgid "Internet station"
+msgstr "Интернет станцияси"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:27
+#: share/compssUsers.pl:44
 #, c-format
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS сервери, SMB сервери, Proxy сервери, SSH сервери"
+msgid ""
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
+msgstr ""
+"Хат-хабар, янгиликларни ўқиш ва жўнатиш (mutt, tin..) ва Интернетда сайр "
+"қилиш учун воситалар тўплами"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:49
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Тармоқдаги компьютер (клиент)"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
+msgid "Clients for different protocols including ssh"
+msgstr "Турли протоколлар, шу жумлада SSH, учун клиентлар"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:55
+#, c-format
+msgid "Tools to ease the configuration of your computer"
+msgstr "Компьютерни мослашни енгилаштириш учун воситалар"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:35
+#: share/compssUsers.pl:59
+#, c-format
+msgid "Console Tools"
+msgstr "Консол воситалари"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:60
+#, c-format
+msgid "Editors, shells, file tools, terminals"
+msgstr "Таҳрирчилар, консоллар, файл воситалари, терминаллар"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:65 share/compssUsers.pl:165
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:38
+#: share/compssUsers.pl:69 share/compssUsers.pl:169
 #, c-format
 msgid "Documentation"
 msgstr "Қўлланмалар"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:39
+#: share/compssUsers.pl:70 share/compssUsers.pl:170
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Linux ва эркин дастурлар ҳақида китоблар ва Howto'лар"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:42
+#: share/compssUsers.pl:74 share/compssUsers.pl:173
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:43
+#: share/compssUsers.pl:75 share/compssUsers.pl:174
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:50
+#: share/compssUsers.pl:85
 #, c-format
-msgid "Office Workstation"
-msgstr "Идора станцияси"
+msgid "Apache"
+msgstr "Apache"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:51
+#: share/compssUsers.pl:88
+#, fuzzy, c-format
+msgid "Groupware"
+msgstr "Гуруҳ"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:89
 #, c-format
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Идора учун дастурлар: матн процессорлари (kword, abiword), электрон "
-"жадваллар (kspread, gnumeric), PDF кўрувчилар ва ҳоказо"
+msgid "Kolab Server"
+msgstr "Kolab сервери"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:55
+#: share/compssUsers.pl:92 share/compssUsers.pl:133
 #, c-format
-msgid "Game station"
-msgstr "Ўйин станцияси"
+msgid "Firewall/Router"
+msgstr "Файервол/Рутер"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:56
+#: share/compssUsers.pl:93 share/compssUsers.pl:134
 #, c-format
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Овунчоқ дастурлар: аркада, стол ўйинлари, стратегия ва ҳоказо"
+msgid "Internet gateway"
+msgstr "Интернет гейтвэйи"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:59
+#: share/compssUsers.pl:96
 #, c-format
-msgid "Multimedia station"
-msgstr "Мултимедиа станцияси"
+msgid "Mail/News"
+msgstr "Хат-хабар/Янгиликлар"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:60
+#: share/compssUsers.pl:97
 #, c-format
-msgid "Sound and video playing/editing programs"
-msgstr "Аудио ва видеони ўйнаш/таҳрирлаш учун дастурлар"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix хат-хабар сервери, Inn янгиликлар сервери"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:64
+#: share/compssUsers.pl:100
 #, c-format
-msgid "Internet station"
-msgstr "Интернет станцияси"
+msgid "Directory Server"
+msgstr "Директория сервери"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:65
+#: share/compssUsers.pl:104
 #, c-format
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
-msgstr ""
-"Хат-хабар, янгиликларни ўқиш ва жўнатиш (mutt, tin..) ва Интернетда сайр "
-"қилиш учун воситалар тўплами"
+msgid "FTP Server"
+msgstr "FTP сервери"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:69
+#: share/compssUsers.pl:105
 #, c-format
-msgid "Network Computer (client)"
-msgstr "Тармоқдаги принтер (клиент)"
+msgid "ProFTPd"
+msgstr "ProFTPd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:70
+#: share/compssUsers.pl:108
 #, c-format
-msgid "Clients for different protocols including ssh"
-msgstr "Турли протоколлар, шу жумлада SSH, учун клиентлар"
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:109
+#, fuzzy, c-format
+msgid "Domain Name and Network Information Server"
+msgstr "DNS сервери"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:112
+#, fuzzy, c-format
+msgid "File and Printer Sharing Server"
+msgstr "Босиб чиқариш сервери"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:74
+#: share/compssUsers.pl:113
 #, c-format
-msgid "Tools to ease the configuration of your computer"
-msgstr "Компьютерни мослашни енгилаштириш учун воситалар"
+msgid "NFS Server, Samba server"
+msgstr "NFS сервери, Samba сервери"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:78
+#: share/compssUsers.pl:116 share/compssUsers.pl:129
 #, c-format
-msgid "Console Tools"
-msgstr "Консол воситалари"
+msgid "Database"
+msgstr "Маълумот базаси"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:79
+#: share/compssUsers.pl:117
 #, c-format
-msgid "Editors, shells, file tools, terminals"
-msgstr "Таҳрирчилар, консоллар, файл воситалари, терминаллар"
+msgid "PostgreSQL and MySQL Database Server"
+msgstr "PostgreSQL ва MySQL маълумот базаси"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:121
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:122
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:87
+#: share/compssUsers.pl:126
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix хат-хабар сервери"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:130
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL ёки MySQL маълумот базаси"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:137
+#, c-format
+msgid "Network Computer server"
+msgstr "Тармоқдаги компьютер (сервер)"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:138
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS сервери, SMB сервери, Proxy сервери, SSH сервери"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:146
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE станцияси"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:88
+#: share/compssUsers.pl:147
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -198,13 +292,13 @@ msgid ""
 msgstr "KDE - воситалар тўплами билан бирга асосий график муҳит"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:92
+#: share/compssUsers.pl:151
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME станцияси"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:93
+#: share/compssUsers.pl:152
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -214,14 +308,62 @@ msgstr ""
 "муҳит"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:96
+#: share/compssUsers.pl:155
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Бошқа график иш столлари"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:97
+#: share/compssUsers.pl:156
 #, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ва ҳоказо"
 
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:179
+#, c-format
+msgid "Utilities"
+msgstr "Воситалар"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:181 share/compssUsers.pl:182 standalone/logdrake:381
+#, c-format
+msgid "SSH Server"
+msgstr "SSH сервери"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:186
+#, c-format
+msgid "Webmin"
+msgstr "Webmin"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:187
+#, fuzzy, c-format
+msgid "Webmin Remote Configuration Server"
+msgstr "Терминал серверини мослаш"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:191
+#, c-format
+msgid "Network Utilities/Monitoring"
+msgstr "Тармоқ воситалари/Назорат қилиш"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:192
+#, c-format
+msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:196
+#, c-format
+msgid "MandrakeSoft Wizards"
+msgstr "Mandrakesoft ёрдамчилари"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:197
+#, c-format
+msgid "Wizards to configure server"
+msgstr "Серверни мослаш учун ёрдамчилар"
+