Merge message, new French translations

1 files changed, 235 insertions, 93 deletions

diff --git a/po/mk.pom b/po/mk.pom
index 6ef6d860..8b9b0f34 100644
--- a/po/mk.pom
+++ b/po/mk.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
-#, c-format
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
+#: share/compssUsers.pl:27
+#, fuzzy, c-format
+msgid ""
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+msgstr ""
+"Канцелариски програми: wordprocessors (kword, abiword), spreadsheets "
+"(kspread, "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:15
+#: share/compssUsers.pl:28
 #, fuzzy, c-format
-msgid "Postfix mail server"
-msgstr "Postfix Маил сервер"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Канцелариски програми: wordprocessors (kword, abiword), spreadsheets "
+"(kspread, "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:18
-#, fuzzy, c-format
-msgid "Database"
-msgstr "База на податоци"
+#: share/compssUsers.pl:33
+#, c-format
+msgid "Game station"
+msgstr "Игри"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:19
+#: share/compssUsers.pl:34
 #, fuzzy, 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 "Firewall/Router"
+msgid "Multimedia station"
+msgstr "Мултимедија"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, fuzzy, c-format
+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 "Интернет gateway"
+msgid "Internet station"
+msgstr "Интернет"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:26
+#: share/compssUsers.pl:44
 #, fuzzy, c-format
-msgid "Network Computer server"
+msgid ""
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
+msgstr ""
+"Алатки за читање и пракање е-маил и новости (pine, mutt, tin..) и "
+"пребарување на Интернет"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:49
+#, fuzzy, c-format
+msgid "Network Computer (client)"
 msgstr "Мрежа (Клиент)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:27
+#: share/compssUsers.pl:50
 #, c-format
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr ""
+msgid "Clients for different protocols including ssh"
+msgstr "Клиенти за различни протоколи, бклучувајќи и ssh"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:55
+#, fuzzy, 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
 #, fuzzy, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C и C++ програми, датотеки и датотеки"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:38
-#, fuzzy, c-format
+#: 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
 #, fuzzy, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Книги и -Како да- за Linux Бесплатен Софтвер"
 
 # 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
 #, fuzzy, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Стандардна База"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:50
+#: share/compssUsers.pl:85
 #, fuzzy, c-format
-msgid "Office Workstation"
-msgstr "Канцелариски"
+msgid "Apache"
+msgstr "Пат"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:51
+#: share/compssUsers.pl:88
 #, fuzzy, c-format
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Канцелариски програми: wordprocessors (kword, abiword), spreadsheets "
-"(kspread, "
+msgid "Groupware"
+msgstr "Група"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:55
+#: share/compssUsers.pl:89
 #, fuzzy, c-format
-msgid "Game station"
-msgstr "Игри"
+msgid "Kolab Server"
+msgstr "Samba Сервер"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:92 share/compssUsers.pl:133
+#, c-format
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
 
 # 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 "Internet gateway"
+msgstr "Интернет gateway"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:96
 #, fuzzy, c-format
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Занимација"
+msgid "Mail/News"
+msgstr "/Дадотека/_Нова"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:59
+#: share/compssUsers.pl:97
 #, fuzzy, c-format
-msgid "Multimedia station"
-msgstr "Мултимедија"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix сервер за пошта"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:60
+#: share/compssUsers.pl:100
 #, fuzzy, c-format
-msgid "Sound and video playing/editing programs"
-msgstr "Програми за музика и видео"
+msgid "Directory Server"
+msgstr "Поврати од CD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:64
+#: share/compssUsers.pl:104
+#, fuzzy, c-format
+msgid "FTP Server"
+msgstr "NTP сервер"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:105
 #, c-format
-msgid "Internet station"
-msgstr "Интернет"
+msgid "ProFTPd"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:65
+#: share/compssUsers.pl:108
 #, fuzzy, c-format
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
-msgstr ""
-"Алатки за читање и пракање е-маил и новости (pine, mutt, tin..) и "
-"пребарување на Интернет"
+msgid "DNS/NIS"
+msgstr "DNS"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:69
+#: share/compssUsers.pl:109
 #, fuzzy, c-format
-msgid "Network Computer (client)"
-msgstr "Мрежа (Клиент)"
+msgid "Domain Name and Network Information Server"
+msgstr "DNS сервер"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:70
-#, c-format
-msgid "Clients for different protocols including ssh"
-msgstr "Клиенти за различни протоколи, бклучувајќи и ssh"
+#: 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
 #, fuzzy, c-format
-msgid "Tools to ease the configuration of your computer"
-msgstr "Алатки за бришење на конфигурацијата на системот"
+msgid "NFS Server, Samba server"
+msgstr "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
 #, fuzzy, 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:87
-#, fuzzy, c-format
+#: 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: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
 #, fuzzy, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -199,13 +293,13 @@ msgstr ""
 "К Десктоп Опкружување, основно графичко опкружување со колекција на алатки."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:92
-#, fuzzy, c-format
+#: share/compssUsers.pl:151
+#, c-format
 msgid "GNOME Workstation"
-msgstr "KDE"
+msgstr "GNOME"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:93
+#: share/compssUsers.pl:152
 #, fuzzy, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -213,14 +307,62 @@ msgid ""
 msgstr "Графичко опкружување со user-friendly и алатки за десктоп"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:96
-#, fuzzy, c-format
+#: share/compssUsers.pl:155
+#, c-format
 msgid "Other Graphical Desktops"
-msgstr "Други Графички Десктопови"
+msgstr "Други Графички Работни околини"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:97
+#: share/compssUsers.pl:156
 #, fuzzy, 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
+#, fuzzy, 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 "Mandrake Конфигурација на Терминал Сервер"
+
+# 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 "Лансирај го волшебникот"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:197
+#, fuzzy, c-format
+msgid "Wizards to configure server"
+msgstr "Не успеа да го конфигурира принтерот \"%s\"!"
+