merge

1 files changed, 24 insertions, 26 deletions

diff --git a/po/af.pom b/po/af.pom
index 81e5fc72..83cad614 100644
--- a/po/af.pom
+++ b/po/af.pom
@@ -6,7 +6,7 @@ msgstr "Werkstasie"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Graphical Environment"
-msgstr "Grafiese omgewing"
+msgstr "Grafiese Omgewing"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -59,9 +59,10 @@ msgstr "Internetstasie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
+#, fuzzy
 msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
 msgstr ""
 "Stel hulpprogramme om e-pos en netnuus te lees en te stuur (pine, mutt, tin) "
 "en om ook die web deur te blaai."
@@ -74,7 +75,7 @@ msgstr "Netwerkrekenaar (kliënt)"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Clients for different protocols including ssh"
-msgstr "Kliëntprogramme vir 'n verkeidenheid protokolle insluitende SSH"
+msgstr "Kliëntprogramme vir 'n verkeidenheid protokolle insluitend SSH"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -84,34 +85,34 @@ msgstr "Konfigurasie"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Tools to ease the configuration of your computer"
-msgstr "Hulpprogramme vir u rekenaarkonfigurasie te vergemaklik"
+msgstr "Nutsprogramme wat u rekenaarkonfigurasie vergemaklik"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Scientific Workstation"
-msgstr "Wetenskaplike werkstasie"
+msgstr "Wetenskaplike Werkstasie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Scientific applications such as gnuplot"
-msgstr ""
+msgstr "Wetenskaplike programme soos gnuplot"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Console Tools"
-msgstr "Konsole hulpprogramme"
+msgstr "Konsole Hulpprogramme"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Editors, shells, file tools, terminals"
 msgstr ""
-"Redigeerders. teksverwerkers, instruksiedoppe, lêernutsprogramme, "
-"terminaalprogramme"
+"Redigeerders. teksverwerkers, instruksiedoppe, lêer-nutsprogramme, terminaal-"
+"programme"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "KDE Workstation"
-msgstr "KDE werkstasie"
+msgstr "KDE Werkstasie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -125,7 +126,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Gnome Workstation"
-msgstr "Gnome werkstasie"
+msgstr "Gnome Werkstasie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -134,12 +135,12 @@ msgid ""
 "tools"
 msgstr ""
 "'n Grafiese omgewing met  gebruikersvriendelike stel applikasies en "
-"werkskermhulpprogramme"
+"werkskerm-hulpprogramme"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Other Graphical Desktops"
-msgstr "Ander grafiese werkskerms"
+msgstr "Ander Grafiese Werkskerms"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -154,7 +155,7 @@ msgstr "C en C++ ontwikkelingsprogrammateke, programme en insluitlêers"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Documentation"
-msgstr "dokumentasie"
+msgstr "Dokumentasie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -164,12 +165,12 @@ msgstr "Boeke en HOWTO's oor Linux en Vrye Sagteware"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "LSB"
-msgstr ""
+msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Linux Standard Base. Third party applications support"
-msgstr ""
+msgstr "Linux Standard Base. Derdeparty ondersteuning van programme"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -184,18 +185,17 @@ msgstr "Apache, Pro-ftpd"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Mail"
-msgstr ""
+msgstr "e-Pos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
 msgid "Postfix mail server"
-msgstr "Postfix e-posbediener, Inn netnuusbediener"
+msgstr "Postfix e-pos-bediener"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Database"
-msgstr "Datbasis"
+msgstr "Databasis"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -220,12 +220,12 @@ msgstr "DNS/NIS "
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Domain Name and Network Information Server"
-msgstr "Domeinnaam en Netwerk Informasie Bediener (DNS/NIS)"
+msgstr "Domeinnaam en Netwerk-informasie-bediener (DNS/NIS)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Network Computer server"
-msgstr "Netwerkrekenaarbediener"
+msgstr "Netwerkrekenaar-bediener"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -234,9 +234,7 @@ msgstr "NFS, SMB, Instaan- , SSH (Bedieners)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
-#, fuzzy
 msgid "Set of tools to read and send mail and news and to browse the Web"
 msgstr ""
-"Stel hulpprogramme om e-pos en netnuus te lees en te stuur (pine, mutt, tin) "
-"en om ook die web deur te blaai."
+"Programme vir die lees en stuur van e-pos, netnuus en op die Web te rits."