Merge message, new French translations

1 files changed, 230 insertions, 88 deletions

diff --git a/po/cy.pom b/po/cy.pom
index 3d0204ff..5034ef49 100644
--- a/po/cy.pom
+++ b/po/cy.pom
@@ -9,188 +9,282 @@ msgid "Workstation"
 msgstr "Man Gwaith"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:164
+#, c-format
+msgid "Development"
+msgstr "Datblygiad"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Amgylchedd Graffig"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:10
+#: share/compssUsers.pl:25
 #, c-format
-msgid "Web/FTP"
-msgstr "Gwe/FTP"
+msgid "Office Workstation"
+msgstr "Gweithfan Swyddfa"
+
+# 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 ""
+"Rhaglenni swyddfa: prosesydd geiriau (Kword, abiword, taenlenni (kspread, "
+"gnumeric), ddarllenydd pdf, ag ati"
 
 # 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 ""
+"Rhaglenni swyddfa: prosesydd geiriau (Kword, abiword, taenlenni (kspread, "
+"gnumeric), ddarllenydd pdf, ag ati"
 
 # 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 "Gweinydd e-bost Postfix"
+msgid "Game station"
+msgstr "Man chwarae"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:18
+#: share/compssUsers.pl:34
 #, c-format
-msgid "Database"
-msgstr "Cronfa Ddata"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Rhaglenni difyrrwch: arcêd, gemau bwrdd, strategaeth, ag ati"
 
 # 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 "Gweinydd cronfa data PostgreSQL neu MySQL"
+msgid "Multimedia station"
+msgstr "Man aml-gyfrwng"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:22
+#: share/compssUsers.pl:38
 #, c-format
-msgid "Firewall/Router"
-msgstr "Mur Gwarchod/Llwybrydd"
+msgid "Sound and video playing/editing programs"
+msgstr "Chwarae sain a fideo/rhaglenni golygu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:23
+#: share/compssUsers.pl:43
 #, c-format
-msgid "Internet gateway"
-msgstr "Porth i'r rhyngrwyd"
+msgid "Internet station"
+msgstr "Man Rhyngrwyd"
 
 # 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 "Gweinydd Cyfrifiadur Rhwydwaith"
+msgid ""
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
+msgstr ""
+"Casgliad o offer i ddarllen ac anfon e-bost a newyddion (mutt, tin..) ac i "
+"bori'r We"
 
 # 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 "Gweinydd NFS, gweinydd SMB, gweinydd dirprwyol, gweinydd ssh"
+msgid "Network Computer (client)"
+msgstr "Cyfrifiadur Rhwydwaith (cleient)"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
+msgid "Clients for different protocols including ssh"
+msgstr "Cleientiaid ar gyfer protocolau amrywiol yn cynnwys 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 "Offer i wneud ffurfweddu'ch cyfrifiadur yn haws"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:35
+#: share/compssUsers.pl:59
+#, c-format
+msgid "Console Tools"
+msgstr "Offer y Consol"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:60
+#, c-format
+msgid "Editors, shells, file tools, terminals"
+msgstr "Golygyddion, cregyn, offer ffeilio, terfynellau"
+
+# 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 "Llyfrgelloedd datblygiadol C a C++, rhaglenni a ffeiliau cynnwys"
 
 # 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 "Dogfennaeth"
 
 # 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 "Llyfrau a Howto's ar Linux a Meddalwedd Rhydd"
 
 # 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 "Linux Standard Base. Cefnogaeth i raglenni trydydd parti"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:50
-#, c-format
-msgid "Office Workstation"
-msgstr "Gweithfan Swyddfa"
+#: share/compssUsers.pl:85
+#, fuzzy, c-format
+msgid "Apache"
+msgstr "llwybr"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:51
-#, c-format
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Rhaglenni swyddfa: prosesydd geiriau (Kword, abiword, taenlenni (kspread, "
-"gnumeric), ddarllenydd pdf, ag ati"
+#: share/compssUsers.pl:88
+#, fuzzy, c-format
+msgid "Groupware"
+msgstr "Grwp"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:55
-#, c-format
-msgid "Game station"
-msgstr "Man chwarae"
+#: share/compssUsers.pl:89
+#, fuzzy, c-format
+msgid "Kolab Server"
+msgstr "Gweinydd Samba"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:56
+#: share/compssUsers.pl:92 share/compssUsers.pl:133
 #, c-format
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Rhaglenni difyrrwch: arcêd, gemau bwrdd, strategaeth, ag ati"
+msgid "Firewall/Router"
+msgstr "Mur Gwarchod/Llwybrydd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:59
+#: share/compssUsers.pl:93 share/compssUsers.pl:134
 #, c-format
-msgid "Multimedia station"
-msgstr "Man aml-gyfrwng"
+msgid "Internet gateway"
+msgstr "Porth i'r rhyngrwyd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:60
+#: share/compssUsers.pl:96
+#, fuzzy, c-format
+msgid "Mail/News"
+msgstr "/Ffeil/_Newydd"
+
+# 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 "Gweinydd e-bost Postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:100
+#, fuzzy, c-format
+msgid "Directory Server"
+msgstr "Cyfeiriadur i Adfer Ohono"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:104
+#, fuzzy, c-format
+msgid "FTP Server"
+msgstr "Gweinydd NTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:105
 #, c-format
-msgid "Sound and video playing/editing programs"
-msgstr "Chwarae sain a fideo/rhaglenni golygu"
+msgid "ProFTPd"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:108
+#, fuzzy, c-format
+msgid "DNS/NIS"
+msgstr "DNS"
+
+# 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 "Gweinydd Enw Parth"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:64
+#: share/compssUsers.pl:112
+#, fuzzy, c-format
+msgid "File and Printer Sharing Server"
+msgstr "Gweinydd Argraffydd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:113
+#, fuzzy, c-format
+msgid "NFS Server, Samba server"
+msgstr "Gweinydd Samba"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:116 share/compssUsers.pl:129
 #, c-format
-msgid "Internet station"
-msgstr "Man Rhyngrwyd"
+msgid "Database"
+msgstr "Cronfa Ddata"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:65
+#: share/compssUsers.pl:117
+#, fuzzy, c-format
+msgid "PostgreSQL and MySQL Database Server"
+msgstr "Gweinydd cronfa data PostgreSQL neu MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: 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 ""
-"Casgliad o offer i ddarllen ac anfon e-bost a newyddion (mutt, tin..) ac i "
-"bori'r We"
+msgid "Web/FTP"
+msgstr "Gwe/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 "Cyfrifiadur Rhwydwaith (cleient)"
+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 "Cleientiaid ar gyfer protocolau amrywiol yn cynnwys ssh"
+msgid "Postfix mail server"
+msgstr "Gweinydd e-bost 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 "Offer i wneud ffurfweddu'ch cyfrifiadur yn haws"
+msgid "PostgreSQL or MySQL database server"
+msgstr "Gweinydd cronfa data PostgreSQL neu 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 "Offer y Consol"
+msgid "Network Computer server"
+msgstr "Gweinydd Cyfrifiadur Rhwydwaith"
 
 # 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 "Golygyddion, cregyn, offer ffeilio, terfynellau"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Gweinydd NFS, gweinydd SMB, gweinydd dirprwyol, gweinydd 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 "Man Gwaith 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 "
@@ -200,13 +294,13 @@ msgstr ""
 "chasgliad o offer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:92
+#: share/compssUsers.pl:151
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Man Gwaith 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 "
@@ -216,14 +310,62 @@ msgstr ""
 "defnyddio."
 
 # 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 "Byrddau Gwaith Graffigol Eraill"
 
 # 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, ag ati"
 
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "Utilities"
+msgstr "Philippines"
+
+# 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 "Gweinydd SSH"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "Webmin"
+msgstr "Camera Gwe"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:187
+#, fuzzy, c-format
+msgid "Webmin Remote Configuration Server"
+msgstr "Enwch Wasanaethwr Ffurfweddiad"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:191
+#, fuzzy, c-format
+msgid "Network Utilities/Monitoring"
+msgstr "Monitro'r Rhwydwaith"
+
+# 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>Mandrakestore</b>"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:197
+#, fuzzy, c-format
+msgid "Wizards to configure server"
+msgstr "Methu ffurfweddu argraffydd \"%s\"!"
+