Merge message, new French translations

1 files changed, 229 insertions, 87 deletions

diff --git a/po/ky.pom b/po/ky.pom
index d73ed771..af2d9f17 100644
--- a/po/ky.pom
+++ b/po/ky.pom
@@ -9,91 +9,141 @@ 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:27
+#, fuzzy, c-format
+msgid ""
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+msgstr ""
+"Офис программалары: текст процессорлору (kword, abiword), электрондук "
+"таблицалар  (kspread, gnumeric), pdf файлдарын көрүү программалары, ж.б."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:11
+#: share/compssUsers.pl:28
 #, c-format
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
+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:15
+#: share/compssUsers.pl:33
 #, c-format
-msgid "Postfix mail server"
-msgstr "Postfix почта сервери"
+msgid "Game station"
+msgstr "Оюн станциясы"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:18
+#: share/compssUsers.pl:34
 #, c-format
-msgid "Database"
-msgstr "Берилиштер базасы"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+"Оюн-зоок программалары: аркада оюндары, тактай оюндары, стратегия оюндары, ж."
+"б."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:19
+#: share/compssUsers.pl:37
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL же MySQL берилиштер базасынын сервери"
+msgid "Multimedia station"
+msgstr "Мультимедиа станциясы"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:22
+#: share/compssUsers.pl:38
 #, c-format
-msgid "Firewall/Router"
-msgstr "Файрволл/Маршруттагыч"
+msgid "Sound and video playing/editing programs"
+msgstr "Үн жана видео ойнотуу/терүү программалары"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:23
+#: share/compssUsers.pl:43
 #, c-format
-msgid "Internet gateway"
-msgstr "Интернет дарбазасы"
+msgid "Internet station"
+msgstr "Интернет станциясы"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:26
+#: share/compssUsers.pl:44
 #, c-format
-msgid "Network Computer server"
-msgstr "Тармак сервери"
+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:27
+#: share/compssUsers.pl:49
 #, c-format
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS сервери, SMB сервери, Proxy сервери, ssh сервери"
+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: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:35
+#: share/compssUsers.pl:65 share/compssUsers.pl:165
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr ""
 "C жана C++ иштеп чыгуу библиотекалары, программалар жана include файлдары"
 
 # 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 жана Free Software жөнүндөгү китептер жана 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 ""
@@ -101,101 +151,145 @@ 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 ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:88
+#, fuzzy, c-format
+msgid "Groupware"
+msgstr "Группа"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:89
+#, fuzzy, c-format
+msgid "Kolab Server"
+msgstr "Samba сервери"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:51
+#: share/compssUsers.pl:92 share/compssUsers.pl:133
 #, c-format
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Офис программалары: текст процессорлору (kword, abiword), электрондук "
-"таблицалар  (kspread, gnumeric), pdf файлдарын көрүү программалары, ж.б."
+msgid "Firewall/Router"
+msgstr "Файрволл/Маршруттагыч"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:55
+#: share/compssUsers.pl:93 share/compssUsers.pl:134
 #, c-format
-msgid "Game station"
-msgstr "Оюн станциясы"
+msgid "Internet gateway"
+msgstr "Интернет дарбазасы"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:96
+#, fuzzy, c-format
+msgid "Mail/News"
+msgstr "/Файл/_Жаңы"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:97
+#, fuzzy, c-format
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix почта сервери"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:56
+#: share/compssUsers.pl:100
+#, fuzzy, c-format
+msgid "Directory Server"
+msgstr "Веб-сервери"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:104
+#, fuzzy, c-format
+msgid "FTP Server"
+msgstr "FTP сервери"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:105
 #, c-format
-msgid "Amusement programs: arcade, boards, strategy, etc"
+msgid "ProFTPd"
 msgstr ""
-"Оюн-зоок программалары: аркада оюндары, тактай оюндары, стратегия оюндары, ж."
-"б."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:59
-#, c-format
-msgid "Multimedia station"
-msgstr "Мультимедиа станциясы"
+#: share/compssUsers.pl:108
+#, fuzzy, c-format
+msgid "DNS/NIS"
+msgstr "NIS"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:60
+#: share/compssUsers.pl:109
+#, fuzzy, c-format
+msgid "Domain Name and Network Information Server"
+msgstr "Домендик аттар системасы"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:112
 #, c-format
-msgid "Sound and video playing/editing programs"
-msgstr "Үн жана видео ойнотуу/терүү программалары"
+msgid "File and Printer Sharing Server"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:113
+#, fuzzy, c-format
+msgid "NFS Server, Samba server"
+msgstr "Samba сервери"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:64
+#: share/compssUsers.pl:116 share/compssUsers.pl:129
 #, c-format
-msgid "Internet station"
-msgstr "Интернет станциясы"
+msgid "Database"
+msgstr "Берилиштер базасы"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:117
+#, fuzzy, c-format
+msgid "PostgreSQL and MySQL Database Server"
+msgstr "PostgreSQL же MySQL берилиштер базасынын сервери"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:65
+#: share/compssUsers.pl:121
 #, c-format
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
-msgstr ""
-"Почтаны жана жаңылыктарды (mutt, tin..) окууга жана жөнөтүүгө, жана вебде "
-"иштөөгө арналган куралдар тобу"
+msgid "Web/FTP"
+msgstr "Web/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:69
+#: share/compssUsers.pl:122
 #, c-format
-msgid "Network Computer (client)"
-msgstr "Тармак компьютери (клиент)"
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:70
+#: share/compssUsers.pl:126
 #, c-format
-msgid "Clients for different protocols including ssh"
-msgstr "Ар түрдүү протоколдор клиенттери, ssh да кошулган"
+msgid "Postfix mail server"
+msgstr "Postfix почта сервери"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:74
+#: share/compssUsers.pl:130
 #, c-format
-msgid "Tools to ease the configuration of your computer"
-msgstr "Компьютериңизди жеңил конфигурациялоо куралдары"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL же MySQL берилиштер базасынын сервери"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:78
+#: share/compssUsers.pl:137
 #, c-format
-msgid "Console Tools"
-msgstr "Консоль куралдары"
+msgid "Network Computer server"
+msgstr "Тармак сервери"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:79
+#: share/compssUsers.pl:138
 #, c-format
-msgid "Editors, shells, file tools, terminals"
-msgstr "Редакторлор, шелдер, файл куралдары, терминалдар"
+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:87
+#: 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 "
@@ -205,13 +299,13 @@ msgstr ""
 "коллекциясы менен"
 
 # 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 "
@@ -221,14 +315,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
+#, fuzzy, c-format
+msgid "Webmin"
+msgstr "Веб-камера"
+
+# 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
+#, fuzzy, 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
+#, fuzzy, c-format
+msgid "MandrakeSoft Wizards"
+msgstr "<b>Mandrakeexpert</b>"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:197
+#, fuzzy, c-format
+msgid "Wizards to configure server"
+msgstr "Кызматтарды конфигурациялоо"
+