Merge message, new French translations

1 files changed, 227 insertions, 85 deletions

diff --git a/po/uz@Latn.pom b/po/uz@Latn.pom
index 6e24bf78..f8001d29 100644
--- a/po/uz@Latn.pom
+++ b/po/uz@Latn.pom
@@ -9,188 +9,282 @@ msgid "Workstation"
 msgstr "Ish stantsiyasi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:164
+#, c-format
+msgid "Development"
+msgstr "Tuzish"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Grafik muhit"
 
 # 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 "Idora stantsiyasi"
 
 # 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 ""
+"Idora uchun dasturlar: matn protsessorlari (OpenOffice.org Writer, Kword), "
+"elektron jadvallar (OpenOffice.org Calc, Kspread), PDF ko'ruvchilar va hokazo"
 
 # 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 xat-xabar serveri"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Idora uchun dasturlar: matn protsessorlari (kword, abiword), elektron "
+"jadvallar (kspread, gnumeric), PDF ko'ruvchilar va hokazo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:18
+#: share/compssUsers.pl:33
 #, c-format
-msgid "Database"
-msgstr "Ma'lumot bazasi"
+msgid "Game station"
+msgstr "O'yin stantsiyasi"
 
 # 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 yoki MySQL ma'lumot bazasi"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Ovunchoq dasturlar: arkada, stol o'yinlari, strategiya va hokazo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:22
+#: share/compssUsers.pl:37
 #, c-format
-msgid "Firewall/Router"
-msgstr "Fayervol/Ruter"
+msgid "Multimedia station"
+msgstr "Multimedia stantsiyasi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:23
+#: share/compssUsers.pl:38
 #, c-format
-msgid "Internet gateway"
-msgstr "Internet geytveyi"
+msgid "Sound and video playing/editing programs"
+msgstr "Audio va videoni o'ynash/tahrirlash uchun dasturlar"
 
 # 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 "Tarmoqdagi kompyuter (server)"
+msgid "Internet station"
+msgstr "Internet stantsiyasi"
 
 # 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 serveri, SMB serveri, Proxy serveri, SSH serveri"
+msgid ""
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
+msgstr ""
+"Xat-xabar, yangiliklarni o'qish va jo'natish (mutt, tin..) va Internetda "
+"sayr qilish uchun vositalar to'plami"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:49
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Tarmoqdagi kompyuter (klient)"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
+msgid "Clients for different protocols including ssh"
+msgstr "Turli protokollar, shu jumlada SSH, uchun klientlar"
+
+# 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 "Kompyuterni moslashni engilashtirish uchun vositalar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:35
+#: share/compssUsers.pl:59
+#, c-format
+msgid "Console Tools"
+msgstr "Konsol vositalari"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:60
+#, c-format
+msgid "Editors, shells, file tools, terminals"
+msgstr "Tahrirchilar, konsollar, fayl vositalari, terminallar"
+
+# 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 "Qo'llanmalar"
 
 # 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 va erkin dasturlar haqida kitoblar va Howto'lar"
 
 # 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 "Idora stantsiyasi"
+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 "Guruh"
+
+# 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 ""
-"Idora uchun dasturlar: matn protsessorlari (kword, abiword), elektron "
-"jadvallar (kspread, gnumeric), PDF ko'ruvchilar va hokazo"
+msgid "Kolab Server"
+msgstr "Kolab serveri"
 
 # 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 "O'yin stantsiyasi"
+msgid "Firewall/Router"
+msgstr "Fayervol/Ruter"
 
 # 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 "Ovunchoq dasturlar: arkada, stol o'yinlari, strategiya va hokazo"
+msgid "Internet gateway"
+msgstr "Internet geytveyi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:59
+#: share/compssUsers.pl:96
 #, c-format
-msgid "Multimedia station"
-msgstr "Multimedia stantsiyasi"
+msgid "Mail/News"
+msgstr "Xat-xabar/Yangiliklar"
 
 # 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 "Audio va videoni o'ynash/tahrirlash uchun dasturlar"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix xat-xabar serveri, Inn yangiliklar serveri"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:64
+#: share/compssUsers.pl:100
 #, c-format
-msgid "Internet station"
-msgstr "Internet stantsiyasi"
+msgid "Directory Server"
+msgstr "Direktoriya serveri"
 
 # 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 ""
-"Xat-xabar, yangiliklarni o'qish va jo'natish (mutt, tin..) va Internetda "
-"sayr qilish uchun vositalar to'plami"
+msgid "FTP Server"
+msgstr "FTP serveri"
 
 # 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 "Tarmoqdagi printer (klient)"
+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 "Turli protokollar, shu jumlada SSH, uchun klientlar"
+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 serveri"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:112
+#, fuzzy, c-format
+msgid "File and Printer Sharing Server"
+msgstr "Bosib chiqarish serveri"
 
 # 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 "Kompyuterni moslashni engilashtirish uchun vositalar"
+msgid "NFS Server, Samba server"
+msgstr "NFS serveri, Samba serveri"
 
 # 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 "Konsol vositalari"
+msgid "Database"
+msgstr "Ma'lumot bazasi"
 
 # 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 "Tahrirchilar, konsollar, fayl vositalari, terminallar"
+msgid "PostgreSQL and MySQL Database Server"
+msgstr "PostgreSQL va MySQL ma'lumot bazasi"
+
+# 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 xat-xabar serveri"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:130
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL yoki MySQL ma'lumot bazasi"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:137
+#, c-format
+msgid "Network Computer server"
+msgstr "Tarmoqdagi kompyuter (server)"
+
+# 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 serveri, SMB serveri, Proxy serveri, SSH serveri"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:146
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE stantsiyasi"
 
 # 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 - vositalar to'plami bilan birga asosiy grafik muhit"
 
 # 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 stantsiyasi"
 
 # 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 ""
 "grafik muhit"
 
 # 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 "Boshqa grafik ish stollari"
 
 # 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, va hokazo"
 
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:179
+#, c-format
+msgid "Utilities"
+msgstr "Vositalar"
+
+# 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 serveri"
+
+# 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 "Terminal serverini moslash"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:191
+#, c-format
+msgid "Network Utilities/Monitoring"
+msgstr "Tarmoq vositalari/Nazorat qilish"
+
+# 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 yordamchilari"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:197
+#, c-format
+msgid "Wizards to configure server"
+msgstr "Serverni moslash uchun yordamchilar"
+