68 files changed, 8369 insertions, 6708 deletions

diff --git a/po/af.pom b/po/af.pom
index b7244931..c80fb2b1 100644
--- a/po/af.pom
+++ b/po/af.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Bediener"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Werkstasie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Grafiese Omgewing"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix e-pos-bediener"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Databasis"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL of MySQL databasisbediener"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Vuurmuur/Netwerkroteerder"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Internetpoort"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Netwerkrekenaar-bediener"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS, SMB, Instaan- , SSH (Bedieners)"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C en C++ ontwikkelingsprogrammateke, programme en insluitlêers"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentasie"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Boeke en HOWTO's oor Linux en Vrye Sagteware"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Derdeparty ondersteuning van programme"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Kantoorwerkstasie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "gnumeric), PDF-sigprogramme, ens."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Speletjiesrekenaar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Vermaak: Arkade, Bordspel, Strategie ens."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimediastasie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Klank- en videospelers/redigeerders"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Internetstasie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,39 +154,46 @@ msgstr ""
 "ook die web deur te blaai."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Netwerkrekenaar (kliënt)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Kliëntprogramme vir 'n verkeidenheid protokolle insluitend SSH"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Nutsprogramme wat u rekenaarkonfigurasie vergemaklik"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Konsole Hulpprogramme"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr ""
 "Redigeerders. teksverwerkers, instruksiedoppe, lêer-nutsprogramme, terminaal-"
 "programme"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE Werkstasie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -103,12 +202,14 @@ msgstr ""
 "versameling bygaande hulpprogramme"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME-werkstasie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -117,88 +218,14 @@ msgstr ""
 "werkskerm-hulpprogramme"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Ander Grafiese Werkskerms"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ens."
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-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"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-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 "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Derdeparty ondersteuning van programme"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix e-pos-bediener"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Databasis"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL of MySQL databasisbediener"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Vuurmuur/Netwerkroteerder"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internetpoort"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Netwerkrekenaar-bediener"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS, SMB, Instaan- , SSH (Bedieners)"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Programme vir die lees en stuur van e-pos, netnuus en op die Web te rits."
-
diff --git a/po/am.pom b/po/am.pom
index a755c6b9..73e6a302 100644
--- a/po/am.pom
+++ b/po/am.pom
@@ -1,193 +1,221 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "ሰርቨር"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Game station"
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr ""
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "ዳታቤዝ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet station"
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
+#: share/compssUsers.pl:35
+#, 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:999
-msgid "Console Tools"
-msgstr ""
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "ማስረጃ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "KDE Workstation"
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "GNOME Workstation"
+#: share/compssUsers.pl:50
+#, c-format
+msgid "Office Workstation"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
+#: share/compssUsers.pl:55
+#, c-format
+msgid "Game station"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+#: share/compssUsers.pl:56
+#, c-format
+msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
+#: share/compssUsers.pl:59
+#, c-format
+msgid "Multimedia station"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
+#: share/compssUsers.pl:60
+#, c-format
+msgid "Sound and video playing/editing programs"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
+#: share/compssUsers.pl:64
+#, c-format
+msgid "Internet station"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
+#: share/compssUsers.pl:65
+#, c-format
+msgid ""
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
+#: share/compssUsers.pl:69
+#, c-format
+msgid "Network Computer (client)"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
+#: share/compssUsers.pl:70
+#, c-format
+msgid "Clients for different protocols including ssh"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
+#: share/compssUsers.pl:74
+#, c-format
+msgid "Tools to ease the configuration of your computer"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
+#: share/compssUsers.pl:78
+#, c-format
+msgid "Console Tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "ዳታቤዝ"
+#: share/compssUsers.pl:79
+#, c-format
+msgid "Editors, shells, file tools, terminals"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
+#: share/compssUsers.pl:87
+#, c-format
+msgid "KDE Workstation"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
+#: share/compssUsers.pl:88
+#, c-format
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
+#: share/compssUsers.pl:92
+#, c-format
+msgid "GNOME Workstation"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
+#: share/compssUsers.pl:93
+#, c-format
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
+#: share/compssUsers.pl:96
+#, c-format
+msgid "Other Graphical Desktops"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
+#: share/compssUsers.pl:97
+#, c-format
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
diff --git a/po/ar.pom b/po/ar.pom
index 679aaa31..9e7e794e 100644
--- a/po/ar.pom
+++ b/po/ar.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "خادم"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "محطة عمل"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "بيئات رسومية"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "ويب/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache، Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "خادم البريد Postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "قاعدة البيانات"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "خادم قواعد البيانات PostgreSQL أو MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "جدار ناري/موجِّه"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "بوابة إنترنت"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "خادم شبكات"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "خادم NFS، خادم SMB، خادم بروكسي، خادم ssh"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, 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
+#, c-format
+msgid "Documentation"
+msgstr "التّوثيق"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "كتب و مذكرات 'كيف أعمل' حول لينكس و البرامج الحرة"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "القاعدة القياسيّة للينكس (LSB). دعم تطبيقات الأطراف الثالثة"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "محطّة عمل مكتبية"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "gnumeric) ، برامج عرض pdf، الخ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "محطّة ألعاب"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "برامج التسلية: ألعاب فيديو، ألعاب لوحات، ألعاب ستراتيجية، الخ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "محطة وسائط متعدّدة"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "برامج تحرير/تشغيل الفيديو و الصوت"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "محطّة إنترنت"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +154,44 @@ msgstr ""
 "الإنترنت"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "جهاز شبكة (عميل)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "عملاء لبروتوكولات مختلفة مثل ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "أدوات لتسهيل إعداد جهازك"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "أدوات سطر الأوامر"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "محررات نصوص، أغلفة، أدوات ملفات، طرفيات"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "محطّة عمل كيدي"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -100,12 +199,14 @@ msgstr ""
 "بيئة سطح مكتب كيدي، البيئة الرسومية الأساسية مع مجموعة من الأدوات المصاحبة"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "محطّة عمل غنومي"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -114,87 +215,14 @@ msgstr ""
 "العاديين"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "سطوح مكتب رسومية أخرى"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, 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:999
-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:999
-msgid "Documentation"
-msgstr "التّوثيق"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "كتب و مذكرات 'كيف أعمل' حول لينكس و البرامج الحرة"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "القاعدة القياسيّة للينكس (LSB). دعم تطبيقات الأطراف الثالثة"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "ويب/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache، Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "خادم البريد Postfix"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "قاعدة البيانات"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "خادم قواعد البيانات PostgreSQL أو MySQL"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "جدار ناري/موجِّه"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "بوابة إنترنت"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "خادم شبكات"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "خادم NFS، خادم SMB، خادم بروكسي، خادم ssh"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "مجموعة من الأدوات لقراءة وإرسال البريد والأخبار و تصفح الإنترنت"
-
diff --git a/po/az.pom b/po/az.pom
index 01963d09..9105564e 100644
--- a/po/az.pom
+++ b/po/az.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Verici"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "İş Stansiyası"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Qrafiki Mühit"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Veb/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix poçt vericisi"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Mə'lumat Bazası"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL ya da MySQL mə'lumat bazası vericisi"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Atəş Divarı/İstiqamətləndirici"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "İnternet keçidi"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Şəbəkə Kompüter vericisi"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS vericisi, SMB vericisi, Vəkil vericisi, SSH verici"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C və C++ inkişaf kitabxanaları, proqramları və daxil ediləcək fayllar"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Sənədlər"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Linuks və sərbəst proqram tə'minatı haqqında Kitablar və Howtolar"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standartları Bazası. Üçüncü partiya tə'minat dəstəyi"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Ofis İş Stansiyası"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "göstəriciləri, vs."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Oyun stansiyası"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Məzəli proqramlar: arkad, lövhə oyunları, strategiya, vs"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimedya stansiyası"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Səs və video çalınması/düzəliş proqramları"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "İnternet stansiyası"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,49 +154,58 @@ msgstr ""
 "Veb səyyahları"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Şəbəkə Kompüteri (alıcı)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "SSH daxil bir çox protokolların alıcıları"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Kompüter qurğularını asandlaşdıran vasitələr"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Konsol Vasitələri"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editorlar, rəflər, fayl vasitələri, terminallar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE iş stansiyası"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "KDE, əsas qrafiki ara üz və yardımçi proqramlar kolleksiyası"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME iş stansiyası"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -112,87 +213,14 @@ msgstr ""
 "İstifadəçi dostu proqram və masa üstü ilə bərabər qrafiki ara üz vasitələri"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Başqa qrafiki ara üzlər"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, vs."
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C və C++ inkişaf kitabxanaları, proqramları və daxil ediləcək fayllar"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Sənədlər"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Linuks və sərbəst proqram tə'minatı haqqında Kitablar və Howtolar"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standartları Bazası. Üçüncü partiya tə'minat dəstəyi"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Veb/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix poçt vericisi"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Mə'lumat Bazası"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL ya da MySQL mə'lumat bazası vericisi"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Atəş Divarı/İstiqamətləndirici"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "İnternet keçidi"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Şəbəkə Kompüter vericisi"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS vericisi, SMB vericisi, Vəkil vericisi, SSH verici"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "Poçt və xəbər alıb göndərmək üçün və vebi gəzmək üçün vasitələr dəsti"
-
diff --git a/po/be.pom b/po/be.pom
index f66fd35b..16660b1f 100644
--- a/po/be.pom
+++ b/po/be.pom
@@ -1,26 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Сервак"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Канфігурацыя"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Абалонка"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, fuzzy, c-format
+msgid "Database"
+msgstr "База даньняў дыскаў"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, fuzzy, c-format
+msgid "Firewall/Router"
+msgstr "Рэстарт"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, fuzzy, c-format
+msgid "Internet gateway"
+msgstr "Інтэрнэт"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, fuzzy, c-format
+msgid "Network Computer server"
+msgstr "Сеткавыя інтэрфэйсы"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, 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
+#, fuzzy, c-format
+msgid "Documentation"
+msgstr "Аўтэнтыфікацыя"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "нігі і Howto па Linux і Free Software"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, fuzzy, c-format
 msgid "Office Workstation"
 msgstr "Працоўныя мейсцы"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -29,75 +114,82 @@ msgstr ""
 "аглядальнікі pdf-файлаў, і г.д."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:55
+#, fuzzy, c-format
 msgid "Game station"
 msgstr "Аўтэнтыфікацыя"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Забаўляльныя праграмы: аркады, стратэгіі і г.д."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:59
+#, fuzzy, c-format
 msgid "Multimedia station"
 msgstr "Мульцімедыя"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Рэдактары і прайгравальнікі гуку і відэа"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:64
+#, fuzzy, c-format
 msgid "Internet station"
 msgstr "Інтэрнэт"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:69
+#, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "Сеткавы прынтэр (TCP/Socket)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:74
+#, 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:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Кансольныя інструментальныя сродкі"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Рэдактары, абалонкі, тэрміналы"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:87
+#, fuzzy, c-format
 msgid "KDE Workstation"
 msgstr "Канфігурацыя"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -106,13 +198,14 @@ msgstr ""
 "інструментальных сродкаў"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:92
+#, fuzzy, c-format
 msgid "GNOME Workstation"
 msgstr "Інфармацыя аб памяці"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -121,92 +214,14 @@ msgstr ""
 "інструментальных сродкаў"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Іншыя графічныя Працоўныя сталы"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Бібліятэкі і праграмы для распрацоўкі на С і С++"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Documentation"
-msgstr "Аўтэнтыфікацыя"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "нігі і Howto па Linux і Free Software"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Database"
-msgstr "База даньняў дыскаў"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Firewall/Router"
-msgstr "Рэстарт"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet gateway"
-msgstr "Інтэрнэт"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Network Computer server"
-msgstr "Сеткавыя інтэрфэйсы"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-
diff --git a/po/bg.pom b/po/bg.pom
index 99c956e0..cd116a7d 100644
--- a/po/bg.pom
+++ b/po/bg.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Сървър"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Работна станция"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Графична среда"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Сървър, Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache и Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix пощенски сървър"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Сървър, Бази-данни"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL или MySQL сървър за бази-данни"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Сървър, Firewall/Рутер"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Интернет gateway"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Мрежов компютър, сървър"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, 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:35
+#, 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
+#, c-format
+msgid "Documentation"
+msgstr "Документация"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Книги и HOTWO-та за Linux и свободния софтуер"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, c-format
 msgid "Office Workstation"
 msgstr "Офисна работна станция"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,33 +114,38 @@ msgstr ""
 "преглед на PDF, и т.н."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Игрална станция"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Забавни програми: аркадни игри, игри на маса, стратегии и т.н."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Мутимедийна станция"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Програми за пускане/поправяне на звук и видео"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Интернет станция"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:65
+#, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -63,37 +154,44 @@ msgstr ""
 "tin..) и за обикаляне из Мрежата"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Мрежов компютър (клиент)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Клиенти за различни протоколи включително SSH"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Инструменти за улесняване настройката на компютъра ви"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Конзолни инструменти"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Редактори, шелове, файлови инстрименти, терминали"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE работна станция"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -102,12 +200,14 @@ msgstr ""
 "инструменти"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome работна станция"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -115,89 +215,14 @@ msgstr ""
 "Графична среда с потребителски набор от приложения и desktop инструменти"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Други графични desktop-и"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, 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:999
-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:999
-msgid "Documentation"
-msgstr "Документация"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Книги и HOTWO-та за Linux и свободния софтуер"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Сървър, Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache и Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix пощенски сървър"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Сървър, Бази-данни"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL или MySQL сървър за бази-данни"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Сървър, Firewall/Рутер"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Интернет gateway"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Мрежов компютър, сървър"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-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:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Набор от инструменти за четене и изпращане на поща и новини и за сърфиране "
-"из Мрежата"
-
diff --git a/po/bn.pom b/po/bn.pom
index 8982afa8..b98216ab 100644
--- a/po/bn.pom
+++ b/po/bn.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "সার্ভার"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "ওয়ার্কষ্টেশন"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "গ্রাফিকাল পরিবেশ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "ওয়েব/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "এ্যপাচি, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix মেইল সার্ভার"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "ডেটাবেস"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL অথবা MySQL ডেটাবেস সার্ভার"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "ফায়ারওয়াল/রাউটার"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "ইন্টারনেট গেটওয়ে"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "নেটওয়ার্ক কম্পিউটার সার্ভার"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, 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:35
+#, 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
+#, c-format
+msgid "Documentation"
+msgstr "ডকুমেন্টেশন"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "লিনাক্স এবং ফ্রী সফটওয়ার সংক্রান্ত বই ও হাউটু (HOWTO)"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, c-format
 msgid "Office Workstation"
 msgstr "অফিস ওয়ার্কষ্টেশন"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "PDF ফাইল প্রদর্শক ইত্যাদী"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "গেশ ষ্টেশন"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "উদ্দীপনামূলক প্রোগ্রামসমূহ: আর্কেড, বোর্ড, স্ট্রেটেজি, ইত্যাদি"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "মাল্টিমিডিয়া ষ্টেশন"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "সাউন্ড এবং ভিডিও দেখার/এডিট করার প্রোগ্রামসমূহ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "ইন্টারনেট ষ্টেশন"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -61,49 +153,58 @@ msgstr ""
 "মেইল আদানপ্রদান, খবর পড়া এবং ওয়েব ব্রাউজিং (mutt, tin..) এর জন্য কিছু টুলের সেট"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "নেটওয়ার্ক কম্পিউটার (ক্লাইন্ট)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "SSH সহ বিভিন্ন প্রোটকলের জন্য ক্লাইন্টসমূহ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "আপনার কম্পিউটারের কনফিগারেশন সহজ করার জন্য কিছু টুল"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "কনসল টুল"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "এডিটর, শেল, ফাইল টুল, টার্মিনাল সমূহ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE ওয়ার্কষ্টেশন"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "K ডেক্সটপ, কিছু সহযোগীমূলক টুলের সমন্বয়ে একটি সাধারণ গ্রাফিকাল পরিবেশ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "গুহনোম ওয়ার্কষ্টেশন"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -111,87 +212,14 @@ msgstr ""
 "ব্যবহারকারীর বন্ধুসূলভ কিছু এপ্লিকেশন এবং ডোক্সটপ টুলের সমন্বয়ে একটি গ্রাফিকাল পরিবেশ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "অন্যান্য গ্রাফিকাল ডেক্সটপ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, 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:999
-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:999
-msgid "Documentation"
-msgstr "ডকুমেন্টেশন"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "লিনাক্স এবং ফ্রী সফটওয়ার সংক্রান্ত বই ও হাউটু (HOWTO)"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "লিনাক্সের সাধারণ আধার। তৃতীয়পক্ষ এপ্লিকেশন সমূহের সাপোর্ট"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "ওয়েব/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "এ্যপাচি, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix মেইল সার্ভার"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "ডেটাবেস"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL অথবা MySQL ডেটাবেস সার্ভার"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "ফায়ারওয়াল/রাউটার"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "ইন্টারনেট গেটওয়ে"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "নেটওয়ার্ক কম্পিউটার সার্ভার"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-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:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "মেইল আদানপ্রদান, খবর পড়া এবং ওয়েব ব্রাউজিং এর জন্য কিছু টুলের সেট"
-
diff --git a/po/br.pom b/po/br.pom
index 4c3b5df0..85804d92 100644
--- a/po/br.pom
+++ b/po/br.pom
@@ -1,197 +1,221 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Servijer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Titouroù"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Servijer mailh Postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Stlennvon"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Servijer stlennvon PostgreSQL pe MySQL "
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Moger tan"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Dreuzell an Internet"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Servijer rouedad "
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, 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
+#, c-format
+msgid "Documentation"
+msgstr "Teuliadur"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, fuzzy, c-format
 msgid "Office Workstation"
 msgstr "Titouroù"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "C'hoarioù"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:59
+#, fuzzy, c-format
 msgid "Multimedia station"
 msgstr "Liesvedia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:64
+#, fuzzy, c-format
 msgid "Internet station"
 msgstr "Kefluniañ ar proksioù"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Arval rouedad"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:74
+#, fuzzy, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Mennout a rit amprouiñ ar c'hefluniadur ?"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "Burev KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Burev GNOME"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "All burevioù c'hrafek"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Teuliadur"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Servijer mailh Postfix"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Stlennvon"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Servijer stlennvon PostgreSQL pe MySQL "
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Moger tan"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Dreuzell an Internet"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Servijer rouedad "
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-
diff --git a/po/bs.pom b/po/bs.pom
index 9fd01981..4b5284fc 100644
--- a/po/bs.pom
+++ b/po/bs.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Grafičko okruženje"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix mail server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Baze podataka"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL ili MySQL baza podataka"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Internet gateway"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Network Computer server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS server, SMB server, Proxy server, ssh server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C i C++ biblioteke, programi i include datoteke"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentacija"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Knjige i howto-i na temu Linuxa i slobodnog softvera"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Podrška za programe trećih lica"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Uredska radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "gnumeric), pdf preglednici itd."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Stanica za igru"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Zabavni programi: arkadne igre, stolne igre, strategije itd."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimedijalna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programi za pregled i editovanje zvuka i videa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Internet stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +154,44 @@ msgstr ""
 "Weba"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Mrežni računar (klijent)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klijenti za razne protokole uključujući ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Alati za lakše podešavanje računara"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Alati za konzolu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editori, shellovi, alati za datoteke, terminali"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -100,12 +199,14 @@ msgstr ""
 "K Desktop Environment, osnovno grafičko okruženje sa izborom pratećih alata"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -114,87 +215,14 @@ msgstr ""
 "površinu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Ostale grafičke okoline"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, itd."
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C i C++ biblioteke, programi i include datoteke"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentacija"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Knjige i howto-i na temu Linuxa i slobodnog softvera"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Podrška za programe trećih lica"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix mail server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Baze podataka"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL ili MySQL baza podataka"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Router"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet gateway"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Network Computer server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS server, SMB server, Proxy server, ssh server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "Skup alata za čitanje i slanje pošte i news-a i pregledanje weba"
-
diff --git a/po/ca.pom b/po/ca.pom
index f280b9bf..89d2abbd 100644
--- a/po/ca.pom
+++ b/po/ca.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Servidor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Estació de treball"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Entorn gràfic"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache i Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Servidor de correu Postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Base de dades"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Servidor de bases de dades PostgreSQL o MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Tallafoc/Encaminador"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Passarel·la a Internet"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Servidor d'ordinador de xarxa"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Servidor NFS, Servidor SMB, Servidor Proxy, Servidor SSH"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Biblioteques de desenvolupament C i C++, programes i fitxers include"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Documentació"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Llibres i Com es fa... sobre el Linux i el programari lliure"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Base Estàndard de Linux (LSB). Suport a aplicacions de tercers"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Estació de treball d'oficina"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "càlcul (kspread, gnumeric), visualitzadors pdf, etc."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Estació de jocs"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programes d'entreteniment: acció, jocs de taula, estratègia, etc."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Estació multimèdia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programes de reproducció/edició de so i vídeo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Estació d'Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +154,44 @@ msgstr ""
 "navegar pel Web"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Ordinador de xarxa (client)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clients per a diferents protocols, incloent l'ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Eines per facilitar la configuració de l'ordinador"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Eines de consola"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editors, intèrprets d'ordres, eines de fitxer, terminals"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "Estació de treball KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,12 +200,14 @@ msgstr ""
 "eines"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Estació de treball GNOME"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -115,88 +216,14 @@ msgstr ""
 "d'utilitzar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Altres escriptoris gràfics"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Biblioteques de desenvolupament C i C++, programes i fitxers include"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentació"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Llibres i Com es fa... sobre el Linux i el programari lliure"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Base Estàndard de Linux (LSB). Suport a aplicacions de tercers"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache i Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Servidor de correu Postfix"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Base de dades"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Servidor de bases de dades PostgreSQL o MySQL"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Tallafoc/Encaminador"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Passarel·la a Internet"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Servidor d'ordinador de xarxa"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Servidor NFS, Servidor SMB, Servidor Proxy, Servidor SSH"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Conjunt d'eines per llegir i enviar correu i notícies i per navegar pel Web"
-
diff --git a/po/cs.pom b/po/cs.pom
index 8f424160..12006e9f 100644
--- a/po/cs.pom
+++ b/po/cs.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Pracovní stanice"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Grafické prostředí"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache a Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Poštovní server Postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Databáze"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Databázové servery PostgreSQL nebo MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Internetová brána"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Síťový server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS server, SMB server, Proxy server, SSH server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Knihovny pro vývoj v C a C++, programy a hlavičkové soubory"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentace"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Knihy a Howto o Linuxu a Svobodném Software"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Standardní Báze Linuxu (LSB): Podpora aplikací jiných dodavatelů"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Kancelářská stanice"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "procesory (KSpread, Gnumeric), prohlížeče PDF a další"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Hry"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Zábavné programy: deskové hry, strategie, atd."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimediální stanice"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programy pro přehrávání/editaci zvuku a videa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Internetová stanice"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +154,44 @@ msgstr ""
 "skupin (mutt, tin..) a pro prohlížení Webu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Síťový počítač (klient)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klienti pro různé verze protokolu ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Nástroje pro snadnou konfiguraci počítače"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Konzolové nástroje"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editory, shelly, souborové nástroje, terminály"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "Pracovní stanice s KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,12 +200,14 @@ msgstr ""
 "nástrojů"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Pracovní stanice s GNOME"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -115,89 +216,14 @@ msgstr ""
 "plochou"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Další grafické desktopy"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "IceWM, Window Maker, Enlightenment, Fvwm a další"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Knihovny pro vývoj v C a C++, programy a hlavičkové soubory"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentace"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Knihy a Howto o Linuxu a Svobodném Software"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Standardní Báze Linuxu (LSB): Podpora aplikací jiných dodavatelů"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache a Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Poštovní server Postfix"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Databáze"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Databázové servery PostgreSQL nebo MySQL"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Router"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internetová brána"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Síťový server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS server, SMB server, Proxy server, SSH server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Kolekce nástrojů pro čtení a posílaní el. pošty a příspěvků do diskusních "
-"skupin a pro prohlížení webu"
-
diff --git a/po/cy.pom b/po/cy.pom
index 79a4fad4..3d0204ff 100644
--- a/po/cy.pom
+++ b/po/cy.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Gweinydd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Man Gwaith"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Amgylchedd Graffig"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Gwe/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Gweinydd e-bost Postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Cronfa Ddata"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+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:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Mur Gwarchod/Llwybrydd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Porth i'r rhyngrwyd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Gweinydd Cyfrifiadur Rhwydwaith"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+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:35
+#, 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
+#, c-format
+msgid "Documentation"
+msgstr "Dogfennaeth"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, 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
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "gnumeric), ddarllenydd pdf, ag ati"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Man chwarae"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 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:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Man aml-gyfrwng"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 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:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Man Rhyngrwyd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +154,44 @@ msgstr ""
 "bori'r We"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Cyfrifiadur Rhwydwaith (cleient)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, 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:999
+#: share/compssUsers.pl:74
+#, 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:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Offer y Consol"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, 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:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "Man Gwaith KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,12 +200,14 @@ msgstr ""
 "chasgliad o offer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Man Gwaith Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -115,87 +216,14 @@ msgstr ""
 "defnyddio."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Byrddau Gwaith Graffigol Eraill"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, 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:999
-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:999
-msgid "Documentation"
-msgstr "Dogfennaeth"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-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:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-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:999
-msgid "Web/FTP"
-msgstr "Gwe/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Gweinydd e-bost Postfix"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Cronfa Ddata"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-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:999
-msgid "Firewall/Router"
-msgstr "Mur Gwarchod/Llwybrydd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Porth i'r rhyngrwyd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Gweinydd Cyfrifiadur Rhwydwaith"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-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:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "Casgliad o offer i ddarllen ac anfon e-bost a newyddion ac i bori'r We"
-
diff --git a/po/da.pom b/po/da.pom
index 1e18144e..b56eeaa8 100644
--- a/po/da.pom
+++ b/po/da.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Arbejdsstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Grafisk miljø"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache og Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix postserver"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Database"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL eller MySQL database-server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Brandmur/ruter"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Internetadgang"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Netværksmaskine server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS-vært, SMB-vært, mellemvært (proxy), SSH-vært"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C og C++ udviklingsbiblioteker, programmer, og include-filer."
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentation"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Bøger og vejledninger om Linux og Frit Programmel"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Understøttelse for tredjeparts-programmer"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Kontor-arbejdsstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "gnumeric), pdf-visere, o.lign."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Spillemaskine"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Underholdnings-programmer: arkade, bræt, strategi, osv."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimedie-station"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Lyd- og video-afspillere og redigeringsværktøjer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Internet-station"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +154,44 @@ msgstr ""
 "browse på nettet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Netværksmaskine (klient)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klienter for forskellige protokoller inklusiv ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Værktøjer til at lette indstillingen af din maskine"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Konsolværktøjer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Redigeringsværktøjer, skaller, filværktøjer, terminaler"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE-arbejdsstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,101 +200,28 @@ msgstr ""
 "supplerende værktøjer."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome-arbejdsstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "Et grafisk miljø med brugervenlig samling af programmer og værktøjer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Andre grafiske miljøer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C og C++ udviklingsbiblioteker, programmer, og include-filer."
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentation"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Bøger og vejledninger om Linux og Frit Programmel"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Understøttelse for tredjeparts-programmer"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache og Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix postserver"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Database"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL eller MySQL database-server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Brandmur/ruter"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internetadgang"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Netværksmaskine server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS-vært, SMB-vært, mellemvært (proxy), SSH-vært"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Værktøjssæt til at læse samt sende post og nyheder, og til at browse på "
-"nettet"
-
diff --git a/po/de.pom b/po/de.pom
index 4540fbcb..437ff2a5 100644
--- a/po/de.pom
+++ b/po/de.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Arbeitsplatzrechner"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Grafische Arbeitsoberfläche"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix Mail-Server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Datenbank"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL oder MySQL-Datenbankserver"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Firewall / Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Internet-Gateway"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Netzwerkrechner-Server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS-Server, SMB-Server, Proxy-Server, SSH-Server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C und C++ Entwicklungsbibliotheken, Programme und Include-Dateien"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentation"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Bücher und HOWTOs zu GNU/Linux und Freier Software"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux-Standard-Base. Drittanbieterunterstützung"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Büro-Arbeitsplatz"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "(KSpread, Gnumeric), PDF-Betrachter, usw."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Spiele-Station"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Spiele: Arcade-, Brett-, Strategiespiele, usw."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimedia-Station"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programme, um Sound und Video abzuspielen und zu bearbeiten"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Internet-Station"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +154,44 @@ msgstr ""
 "und um im Internet zu surfen"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Netzwerk-Computer (Client)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clients für verschiedene Protokolle, u.a. SSH"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Werkzeuge, die die Konfiguration Ihres Computers erleichtern"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Konsolen-Werkzeuge"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editoren, Shells, Dateiwerkzeuge, Konsolen"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE-Arbeitsplatz"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,12 +200,14 @@ msgstr ""
 "zugehöriger Programme"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome-Arbeitsplatz"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -114,89 +215,14 @@ msgstr ""
 "Eine grafische Umgebung mit anwenderfreundlichen Anwendungen und Werkzeugen"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Andere grafische Arbeitsflächen"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, usw."
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C und C++ Entwicklungsbibliotheken, Programme und Include-Dateien"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentation"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Bücher und HOWTOs zu GNU/Linux und Freier Software"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux-Standard-Base. Drittanbieterunterstützung"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix Mail-Server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Datenbank"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL oder MySQL-Datenbankserver"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall / Router"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet-Gateway"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Netzwerkrechner-Server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS-Server, SMB-Server, Proxy-Server, SSH-Server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Programme um E-Mails und News zu lesen und zu versenden und um im Internet "
-"zu surfen"
-
diff --git a/po/el.pom b/po/el.pom
index 93575dd5..3ebdda21 100644
--- a/po/el.pom
+++ b/po/el.pom
@@ -1,25 +1,112 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Εξυπηρετητής"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Σταθμός Εργασίας"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Γραφικό Περιβάλλον"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Εξυπηρετητής ταχυδρομείου Postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Βάση Δεδομένων"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Εξυπηρετητής βάσης δεδομένων PostgreSQL ή MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Τοίχος Προστασίας/Δρομολογητής"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Πύλη Διαδικτύου"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Εξυπηρετητής δικτύου"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, 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:35
+#, 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
+#, c-format
+msgid "Documentation"
+msgstr "Τεκμηρίωση"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, 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
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Υποστήριξη εφαρμογών τρίτων"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Σταθμός Εργασίας Γραφείου"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,33 +115,38 @@ msgstr ""
 "(kspread, gnumeric), αρχεία pdf κλπ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Σταθμός παιχνιδιών"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Διασκέδαση (παιχνίδια)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Σταθμός πολυμέσων"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Προγράμματα αναπαραγωγής και διαχείρισης video και ήχου"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Σταθμός Διαδικτύου"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:65
+#, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -63,139 +155,72 @@ msgstr ""
 "tin...) και περιήγηση στο Διαδίκτυο"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Υπολογιστής Δικτύου (πελάτης)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Πελάτες για διαφορετικά πρωτόκολλα συμπεριλαμβανομένου του ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Εργαλεία για διευκόλυνση της ρύθμισης του υπολογιστή σας"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Εργαλεία Κονσόλας"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Επεξεργαστές κειμένου, κελύφη, εργαλεία αρχείων, τερματικά"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "Σταθμός εργασίας KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "Το περιβάλλον γραφείου KDE με μια συλλογή συνοδευτικών εργαλείων"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Σταθμός Εργασίας Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "Γραφικό περιβάλλον με φιλικά εργαλεία και εφαρμογές"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Άλλα γραφικά περιβάλλοντα"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, 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:999
-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:999
-msgid "Documentation"
-msgstr "Τεκμηρίωση"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Βιβλία και οδηγοί για το Linux και το Ελεύθερο Λογισμικό"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Υποστήριξη εφαρμογών τρίτων"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Εξυπηρετητής ταχυδρομείου Postfix"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Βάση Δεδομένων"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Εξυπηρετητής βάσης δεδομένων PostgreSQL ή MySQL"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Τοίχος Προστασίας/Δρομολογητής"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Πύλη Διαδικτύου"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Εξυπηρετητής δικτύου"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-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:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Σετ εργαλείων για την αποστολή και λήψη αλληλογραφίας, ειδήσεων  και "
-"περιήγηση στο Διαδίκτυο"
-
diff --git a/po/eo.pom b/po/eo.pom
index 2c4e8e07..b5ccbf3c 100644
--- a/po/eo.pom
+++ b/po/eo.pom
@@ -1,203 +1,221 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Servilo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Laborstacio"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "TTT/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, fuzzy, c-format
+msgid "Postfix mail server"
+msgstr "Datumbazoj"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, fuzzy, c-format
+msgid "Database"
+msgstr "Datumbazoj"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, fuzzy, c-format
+msgid "Internet gateway"
+msgstr "Interreto"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, fuzzy, c-format
+msgid "Network Computer server"
+msgstr "Reta Printilo (ingo)"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C kaj C++ programadaj bibliotekoj, programoj kaj ĉapdosieroj"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentaro"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, fuzzy, c-format
 msgid "Office Workstation"
 msgstr "Laborstacio"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:55
+#, fuzzy, c-format
 msgid "Game station"
 msgstr "Dokumentaro"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:59
+#, fuzzy, c-format
 msgid "Multimedia station"
 msgstr "Plurmedia - Sono"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:64
+#, fuzzy, c-format
 msgid "Internet station"
 msgstr "Interreta Konfigurado"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:69
+#, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "Reta Printilo (ingo)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:74
+#, fuzzy, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Ĉu vi deziras provi la konfiguraĵon?"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Redaktiloj, ŝeloj, dosieriloj, terminaloj"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE Laborstacio"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Gnoma Laborstacio"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C kaj C++ programadaj bibliotekoj, programoj kaj ĉapdosieroj"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentaro"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "TTT/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Postfix mail server"
-msgstr "Datumbazoj"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Database"
-msgstr "Datumbazoj"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet gateway"
-msgstr "Interreto"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Network Computer server"
-msgstr "Reta Printilo (ingo)"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-
diff --git a/po/es.pom b/po/es.pom
index bbedf734..59030f70 100644
--- a/po/es.pom
+++ b/po/es.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Servidor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Estación de trabajo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Entorno gráfico"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Servidor, Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache y Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Servidor de correo Postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Servidor, Bases de Datos"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Servidor de base de datos PostgreSQL o MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Servidor, Cortafuegos/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Pasarela de acceso a Internet"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Computadora servidor de red"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Servidor NFS, servidor SMB, servidor proxy, servidor SSH"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Bibliotecas de desarrollo C y C++, programas y archivos *.h"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Documentación"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Libros y COMOs sobre Linux y Software Libre"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Soporte de aplicaciones de terceros"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Estación de trabajo de Oficina"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "de cálculo (kspread, gnumeric), visualizadores PDF, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Estación de Juegos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programas de entretenimiento: arcade, tableros, estrategia, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Estación Multimedios"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programas de reproducción/edición de sonido y vídeo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Estación Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +154,44 @@ msgstr ""
 "y para navegar por la Web"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Computadora de Red (cliente)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clientes para los distintos protocolos incluyendo a ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Herramientas para facilitar la configuración de su computadora"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Herramientas para la consola"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editores, shells, manipulación de archivos, terminales"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "Estación de trabajo KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,12 +200,14 @@ msgstr ""
 "herramientas que lo acompañan"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Estación de trabajo GNOME"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -115,89 +216,14 @@ msgstr ""
 "amigables"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Otros entornos gráficos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Bibliotecas de desarrollo C y C++, programas y archivos *.h"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentación"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Libros y COMOs sobre Linux y Software Libre"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Soporte de aplicaciones de terceros"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Servidor, Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache y Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Servidor de correo Postfix"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Servidor, Bases de Datos"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Servidor de base de datos PostgreSQL o MySQL"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Servidor, Cortafuegos/Router"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Pasarela de acceso a Internet"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Computadora servidor de red"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Servidor NFS, servidor SMB, servidor proxy, servidor SSH"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Conjunto de herramientas para leer y enviar correo y noticias y para navegar "
-"por la Web"
-
diff --git a/po/et.pom b/po/et.pom
index 51732b5e..fe0d3d10 100644
--- a/po/et.pom
+++ b/po/et.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Tööjaam"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Graafiline keskkond"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Veeb/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache ja Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix meiliserver"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Andmebaasid"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL või MySQL andmebaasiserver"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Tulemüür/marsruuter"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Internetiasjad"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Võrguserver"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS, SMB, SSH server, vahendaja (proxy)"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C ja C++ arendusteegid, rakendused ja include-failid"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentatsioon"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Raamatud ja HOWTO-d Linuxi ja vabavara kohta"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Võõraste rakenduste toetus"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Kontori tööjaam"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "(kspread, gnumeric), PDF vaatajad jne"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Mänguvahend"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Meelelahutus: põnevus-, laua-, strateegiamängud jne"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimeedia tööjaam"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Heli ja video mängimine ja redigeerimine"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Interneti-tööjaam"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +154,44 @@ msgstr ""
 "lehitsemiseks"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Võrguarvuti (klient)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Mitme protokolli, sealhulgas ssh kliendid"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Vahendid süsteemi lihtsamaks administreerimiseks"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Konsoolivahendid"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Redaktorid, shellid, terminalid, failihaldus"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE tööjaam"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -100,100 +199,28 @@ msgstr ""
 "K töölaua keskkond: graafiline töökeskkond ja rida seonduvaid rakendusi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME tööjaam"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "Graafiline töökeskkond koos kasutajasõbralike rakendustega"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Muud graafilised töölauad"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, WindowMaker, Enlightenment, Fvwm jt"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C ja C++ arendusteegid, rakendused ja include-failid"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentatsioon"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Raamatud ja HOWTO-d Linuxi ja vabavara kohta"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Võõraste rakenduste toetus"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Veeb/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache ja Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix meiliserver"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Andmebaasid"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL või MySQL andmebaasiserver"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Tulemüür/marsruuter"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internetiasjad"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Võrguserver"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS, SMB, SSH server, vahendaja (proxy)"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Valik rakendusi e-posti lugemiseks ja saatmiseks ning veebi lehitsemiseks"
-
diff --git a/po/eu.pom b/po/eu.pom
index 98416ab5..682ef6fd 100644
--- a/po/eu.pom
+++ b/po/eu.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Zerbitzaria"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Lanpostua"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Ingurune grafikoa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix posta-zerbitzaria"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Datu-basea"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL edo MySQL datu-baseen zerbitzaria"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Suebakia/Bideratzailea"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Interneteko atebidea"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Sare-zerbitzaria"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS zerbitzaria, SMB zerbitzaria, Proxy zerbitzaria, ssh zerbitzaria"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C eta C++ garapen-liburutegiak, programak eta fitxategiak"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentazioa"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Linux eta Software libreari buruzko liburuak eta azalpenak"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Beste batzuek egindako aplikazioen euskarria"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Bulegoko lanpostua"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,33 +114,39 @@ msgstr ""
 "orriak (kspread, gnumeric), pdf ikustaileak, etab."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Jokoak"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 "Denbora-pasako programak: makina-jokoak, taula-jokoak, estrategiakoak, etab."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimedia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Soinua eta bideoa jotzeko/editatzeko programak"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -63,37 +155,44 @@ msgstr ""
 "eta Interneten nabigatzeko tresna-multzoa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Sare-ordenagailua (bezeroa)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Hainbat protokolotako bezeroak, ssh-renak barne"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Zure ordenagailuaren konfigurazioa errazteko tresnak"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Kontsola-tresnak"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editoreak, shell-ak, fitxategi-tresnak, terminalak"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE lanpostua"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,12 +200,14 @@ msgstr ""
 "K Desktop Environment, hainbat tresna dituen oinarrizko ingurune grafikoa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME lanpostua"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -115,89 +216,14 @@ msgstr ""
 "ingurune grafikoa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Beste mahaigain grafiko batzuk"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etab."
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C eta C++ garapen-liburutegiak, programak eta fitxategiak"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentazioa"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Linux eta Software libreari buruzko liburuak eta azalpenak"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Beste batzuek egindako aplikazioen euskarria"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix posta-zerbitzaria"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Datu-basea"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL edo MySQL datu-baseen zerbitzaria"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Suebakia/Bideratzailea"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Interneteko atebidea"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Sare-zerbitzaria"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS zerbitzaria, SMB zerbitzaria, Proxy zerbitzaria, ssh zerbitzaria"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Posta eta berri-taldeetako mezuak irakurtzeko eta bidaltzeko eta Interneten "
-"nabigatzeko tresna-multzoa"
-
diff --git a/po/fa.pom b/po/fa.pom
index f593331d..8f151e4b 100644
--- a/po/fa.pom
+++ b/po/fa.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "کارگزار‌"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "ایستگاه‌کار"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "محیط گرافیکی"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "کارگزار پست Postfix "
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "بانک ‌اطلاعات"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "کارگزار بانک اطلاعاتی PostgreSQL یا MySQL "
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "دیوار‌آتش/مسیریاب"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "دروازه‌ی اینترنت"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "کارگزار شبکه‌ی رایانه"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, 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:35
+#, 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
+#, c-format
+msgid "Documentation"
+msgstr "نوشتار"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "کتاب‌ها و چگونگی‌ها در لینوکس و نرم‌افزار آزاد"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, c-format
 msgid "Office Workstation"
 msgstr "ایستگاه‌کار دفتری"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,168 +114,110 @@ msgstr ""
 "gnumeric), نماگرهای pdf و غیره"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "ایستگاه بازی"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "برنامه‌های سرگرمی: آرکید، تخته‌ها، تاکتیکی، غیره"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "ایستگاه چندرسانه‌ای"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "برنامه‌های ویرایش/پخش ویدیو و صوت"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "ایستگاه اینترنت"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 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:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "رایانه‌ی شبکه (کارگیر)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "کارگیرها برای پایان‌نامه‌های گوناگون از جمله ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "ابزارهای برای آسان‌ کردن پیکربندی رایانه‌اتان"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "ابزارهای کنسول"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "ویرایش‌گرها، پوسته‌ها، ابزار پرونده، پایانه‌ها"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "ایستگاه‌کار KDE "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "محیط رومیزی K، محیط گرافیکی پایه با مجموعه‌ای از ابزارهای ضمیمه"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "ایستگاه‌کار گنوم"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "محیط گرافیکی کاربر-دوستانه با مجموعه‌ای از برنامه‌ها و ابزارهای رومیزی"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "دیگر رومیزی‌های گرافیکی"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-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:999
-msgid "Documentation"
-msgstr "نوشتار"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "کتاب‌ها و چگونگی‌ها در لینوکس و نرم‌افزار آزاد"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "پایه‌ی استاندارد لینوکس. حمایت برنامه‌های شخص سوم"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "کارگزار پست Postfix "
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "بانک ‌اطلاعات"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "کارگزار بانک اطلاعاتی PostgreSQL یا MySQL "
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "دیوار‌آتش/مسیریاب"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "دروازه‌ی اینترنت"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "کارگزار شبکه‌ی رایانه"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-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:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "مجموعه‌ای از ابزارها برای خواندن و فرستادن پست و اخبار و برای مرور وب"
-
diff --git a/po/fi.pom b/po/fi.pom
index 5ca3e874..28d8482c 100644
--- a/po/fi.pom
+++ b/po/fi.pom
@@ -1,25 +1,113 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Palvelin"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Työasema"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Graafinen ympäristö"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache WWW-palvelin ja Pro-ftpd FTP-palvelin"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix sähköpostipalvelin"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Tietokanta"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL tai MySQL tietokantapalvelin"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Palomuuri / Reititys"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Internetin yhdyskäytävä"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Verkkotietokone (palvelin)"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS-, SMB-, SSH- ja välityspalvelin"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C ja C++ ohjelmointityökalut, kirjastot ja include-tiedostot"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentaatio"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Kirjoja ja ohjeita Linuxista sekä vapaan lähdekoodin ohjelmista"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr ""
+"Linux Standard Base (Linux Standardi Perusta)\n"
+" - Kolmannen osapuolen ohjelmistojen tuki"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Toimistotyöasema"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +116,38 @@ msgstr ""
 "(kspread,gnumeric), pdf-lukijat jne"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Pelikone"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Pelit: tasohyppely, korttipelit, strategia jne"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimediakone"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Äänen sekä videon toisto- ja editointiohjelmat"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Internetkone"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +156,44 @@ msgstr ""
 "sekä Internetissä surffailuun"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Verkkopääte (asiakas)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Asiakasohjelmat eri protokollille (SSH jne)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Työkalut, jotka helpottavat tietokoneesi asetusten muokkaamista"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Komentorivityökalut"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editorit, komentotulkit, tiedostotyökalut, päätteet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE-työasema"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -100,12 +201,14 @@ msgstr ""
 "K-työpöytäympäristö. Graafinen perusympäristö ja sen mukana tulevat työkalut"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME-työasema"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -113,91 +216,14 @@ msgstr ""
 "Graafinen ympäristö käyttäjäystävällisellä ohjelmistolla ja työkaluilla."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Muut graafiset käyttöympäristöt"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "IceWM, Window Maker, Enlightenment, FVWM, jne"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C ja C++ ohjelmointityökalut, kirjastot ja include-tiedostot"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentaatio"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Kirjoja ja ohjeita Linuxista sekä vapaan lähdekoodin ohjelmista"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
-"Linux Standard Base (Linux Standardi Perusta)\n"
-" - Kolmannen osapuolen ohjelmistojen tuki"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache WWW-palvelin ja Pro-ftpd FTP-palvelin"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix sähköpostipalvelin"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Tietokanta"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL tai MySQL tietokantapalvelin"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Palomuuri / Reititys"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internetin yhdyskäytävä"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Verkkotietokone (palvelin)"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS-, SMB-, SSH- ja välityspalvelin"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Valikoima työkaluja sähköpostin ja uutisryhmien lukemiseen sekä Internetin "
-"selailuun"
-
diff --git a/po/fr.pom b/po/fr.pom
index f078e80a..3c3c00cd 100644
--- a/po/fr.pom
+++ b/po/fr.pom
@@ -1,25 +1,112 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Serveur"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Station de travail"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Environnement graphique"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache et Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Serveur de courrier Postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Base de Données"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Serveurs de bases de données PostgreSQL ou MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Pare Feu/Routeur"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Passerelle internet"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Serveur réseau"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Serveur NFS, serveur SMB, serveur Proxy (mandataire), serveur SSH"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr ""
+"Bibliothèques de développement C et C++, programmes et fichiers d'en-tête"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Documentation"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Livres et Howto's sur Linux et le Logiciel Libre"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "« Linux Standard Base ». Support des programmes tiers"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Machine de bureau"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,33 +115,39 @@ msgstr ""
 "tableurs (kspread, gnumeric), visualiseur pdf, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Jeux"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 "Programmes de divertissement : jeux d'arcade, de plateaux, de stratégie, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimédia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programmes pour jouer/éditer du son et de la vidéo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -63,37 +156,44 @@ msgstr ""
 "messages de forums (mutt, tin, ...), ainsi que pour naviguer sur Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Ordinateur réseau (client)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clients pour différents protocoles, dont ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Outils pour faciliter la configuration de votre ordinateur"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Utilitaires console"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Éditeurs, interpréteurs, outils fichiers, terminaux"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "Station de travail KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -102,12 +202,14 @@ msgstr ""
 "collection d'outils"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Station de travail GNOME"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -116,90 +218,14 @@ msgstr ""
 "intuitifs"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Autres Environnements de Bureau"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr ""
-"Bibliothèques de développement C et C++, programmes et fichiers d'en-tête"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentation"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Livres et Howto's sur Linux et le Logiciel Libre"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "« Linux Standard Base ». Support des programmes tiers"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache et Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Serveur de courrier Postfix"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Base de Données"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Serveurs de bases de données PostgreSQL ou MySQL"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Pare Feu/Routeur"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Passerelle internet"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Serveur réseau"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Serveur NFS, serveur SMB, serveur Proxy (mandataire), serveur SSH"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Ensemble d'outils pour lire et envoyer des courriers électroniques, des "
-"messages de forums, et pour naviguer sur Internet"
-
diff --git a/po/fur.pom b/po/fur.pom
index 27af57dc..2596dfba 100644
--- a/po/fur.pom
+++ b/po/fur.pom
@@ -1,193 +1,221 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Ambient Grafic"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Game station"
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Multimedia station"
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet station"
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
+#: share/compssUsers.pl:35
+#, 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:999
-msgid "Console Tools"
-msgstr ""
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Documentazion"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "KDE Workstation"
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "GNOME Workstation"
+#: share/compssUsers.pl:50
+#, c-format
+msgid "Office Workstation"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
+#: share/compssUsers.pl:55
+#, c-format
+msgid "Game station"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+#: share/compssUsers.pl:56
+#, c-format
+msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
+#: share/compssUsers.pl:59
+#, c-format
+msgid "Multimedia station"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentazion"
+#: share/compssUsers.pl:60
+#, c-format
+msgid "Sound and video playing/editing programs"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
+#: share/compssUsers.pl:64
+#, c-format
+msgid "Internet station"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
+#: share/compssUsers.pl:65
+#, c-format
+msgid ""
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
+#: share/compssUsers.pl:69
+#, c-format
+msgid "Network Computer (client)"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
+#: share/compssUsers.pl:70
+#, c-format
+msgid "Clients for different protocols including ssh"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
+#: share/compssUsers.pl:74
+#, c-format
+msgid "Tools to ease the configuration of your computer"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
+#: share/compssUsers.pl:78
+#, c-format
+msgid "Console Tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
+#: share/compssUsers.pl:79
+#, c-format
+msgid "Editors, shells, file tools, terminals"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
+#: share/compssUsers.pl:87
+#, c-format
+msgid "KDE Workstation"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
+#: share/compssUsers.pl:88
+#, c-format
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
+#: share/compssUsers.pl:92
+#, c-format
+msgid "GNOME Workstation"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
+#: share/compssUsers.pl:93
+#, c-format
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
+#: share/compssUsers.pl:96
+#, c-format
+msgid "Other Graphical Desktops"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
+#: share/compssUsers.pl:97
+#, c-format
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
diff --git a/po/ga.pom b/po/ga.pom
index ff65861f..c5b05697 100644
--- a/po/ga.pom
+++ b/po/ga.pom
@@ -1,201 +1,221 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Freastalaí"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Stáisiún Oibre"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Grafaic"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Greasan/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, fuzzy, c-format
+msgid "Postfix mail server"
+msgstr "Freastalaí Printéir"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, fuzzy, c-format
+msgid "Database"
+msgstr "Freastalaí Printéir"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, fuzzy, c-format
+msgid "Internet gateway"
+msgstr "suimiúil"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, fuzzy, c-format
+msgid "Network Computer server"
+msgstr "Cláréadan Gréasán"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, 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
+#, fuzzy, c-format
+msgid "Documentation"
+msgstr "Áit"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, c-format
 msgid "Office Workstation"
 msgstr "Stáisiún Oibre"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Stáisiún Cluichí"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:59
+#, fuzzy, c-format
 msgid "Multimedia station"
 msgstr "Stáisiún Ilmheánach"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Stáisiún Idirlíon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:69
+#, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "Printéir Gréasán (lpd)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:74
+#, fuzzy, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "An bhfuil tú ag iarraidh an cumraíocht a thrial?"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "Stáisiún KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Stáisiún Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Deasc Graphaicí Eile"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Documentation"
-msgstr "Áit"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Greasan/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Postfix mail server"
-msgstr "Freastalaí Printéir"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Database"
-msgstr "Freastalaí Printéir"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet gateway"
-msgstr "suimiúil"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Network Computer server"
-msgstr "Cláréadan Gréasán"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-
diff --git a/po/get_from_compssusers.pl b/po/get_from_compssusers.pl
index e9c7adf7..43895f28 100755
--- a/po/get_from_compssusers.pl
+++ b/po/get_from_compssusers.pl
@@ -17,10 +17,10 @@ uc($enc_rpmdrake) ne uc($enc_drakx) and die "Encodings differ for $po! rpmdrake'
 our $current;
 our $entry;
 foreach my $line (cat_($drakxfile)) {
-    $line =~ m|^\Q#: ../../share/compssUsers:999| || ($line =~ m|^msgid "([^"]+)"| && member($1, @miss)) and do {
+    $line =~ m|^\Q#: share/compssUsers.pl:| || ($line =~ m|^msgid "([^"]+)"| && member($1, @miss)) and do {
 	$current = 'inside';
         $entry = "# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO\n";
-        $line =~ m|^#:| or $entry .= "#: ../../share/compssUsers:999\n";
+        $line =~ m|^#:| or $entry .= "#: share/compssUsers.pl:999\n";
     };
     $current eq 'inside' and $entry .= $line;
     $line =~ m|^msgid "([^"]+)"| && member($1, @exceptions) and $current = 'outside';
diff --git a/po/gl.pom b/po/gl.pom
index 0c0afb37..8776546a 100644
--- a/po/gl.pom
+++ b/po/gl.pom
@@ -1,25 +1,112 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Servidor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Estación de traballo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Entorno Gráfico"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Servidor de correo Postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Bases de datos"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Servidores de bases de datos PostgreSQL ou MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Cortalumes/Encamiñador"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, fuzzy, c-format
+msgid "Internet gateway"
+msgstr "Acceso á Internet"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Servidor de Redes de Ordenadores"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Servidor NFS, servidor SMB, servidor Proxy, servidor ssh"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr ""
+"Bibliotecas de desenvolvemento en C e C++, programas e ficheiros include"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Documentación"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Libros e Howtos sobre Linux e o Software Libre"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, c-format
 msgid "Office Workstation"
 msgstr "Estación de Traballo de Oficina"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +115,38 @@ msgstr ""
 "cálculo (kspread, gnumeric), visualizadores de pdf, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Estación de xogos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programas de diversión: arcade, taboleiros, estratexia, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Estación multimedia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programas de reproducción e edición de son e vídeo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Estación de Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +155,44 @@ msgstr ""
 "para navegar pola Web"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Ordenador de Rede (cliente)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clientes para diferentes protocolos incluindo ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Ferramentas para facilita-la configuración do ordenador"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Ferramentas da Consola"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editores, shells, ferramentas de ficheiro, terminais"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "Estación de Traballo KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,12 +201,14 @@ msgstr ""
 "ferramentas que o acompañan"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Estación de Traballo Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -115,91 +217,14 @@ msgstr ""
 "escritorio"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Outros Escritorios Gráficos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr ""
-"Bibliotecas de desenvolvemento en C e C++, programas e ficheiros include"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentación"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Libros e Howtos sobre Linux e o Software Libre"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Servidor de correo Postfix"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Bases de datos"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Servidores de bases de datos PostgreSQL ou MySQL"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Cortalumes/Encamiñador"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet gateway"
-msgstr "Acceso á Internet"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Servidor de Redes de Ordenadores"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Servidor NFS, servidor SMB, servidor Proxy, servidor ssh"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Conxunto de ferramentas para ler e enviar correo-e e novas e para navegar "
-"pola Web"
-
diff --git a/po/he.pom b/po/he.pom
index c49bc3a8..dd9e2c32 100644
--- a/po/he.pom
+++ b/po/he.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "שרת"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "תחנת עבודה"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "סביבה גרפית"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "שרת דואר Postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "בסיס נתונים"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "שרת בסיס-מידע של MySQL או PostgreSQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "חומת אש/נתב"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "שער לאינטרנט"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "שרת מחשב רשת"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, 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:35
+#, 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
+#, c-format
+msgid "Documentation"
+msgstr "מסמכים"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "ספרים ומדריכים לשימוש בלינוקס ותוכנה חופשית"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "תמיכה בתוכנות צד שלישי. Linux Standard Base"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "תחנת עבודה משרדית"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "gnumeric),מציגי pdf, ועוד"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "תחנת עבודה למשחקים"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "תוכנות לבידור: ארקייד, לוח, אסטרטגיה, ועוד"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "תחנת עבודה למולטימדיה"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "תוכנות להשמעה או עריכה של קול ווידאו"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "תחנת עבודה לאינטרנט"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -61,136 +153,72 @@ msgstr ""
 "ערכת כלים לקריאה וכתיבת דוא\"ל וחדשות  (pine, mutt, tin..) ולגלישה באינטרנט"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "מחשב רשת (לקוח)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "לקוחות לפרוטוקולים שונים כולל ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "כלי עזר לביצוע הגדרות המחשב שלך"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "כלי מסוף"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "עורכים, מעטפות, כלי קבצים, מסופים"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "תחנת עבודה של KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "סביבת שולחן העבודה K, סביבה גרפית בסיסית עם כלים"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "תחנת עבודה של GNOME"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "סביבה גרפית עם מערך של תוכנות ידידותיות למשתמש וכלי שולחן עבודה"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "שולחנות העבודה הגרפיים האחרים"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, 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:999
-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:999
-msgid "Documentation"
-msgstr "מסמכים"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "ספרים ומדריכים לשימוש בלינוקס ותוכנה חופשית"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "תמיכה בתוכנות צד שלישי. Linux Standard Base"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "שרת דואר Postfix"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "בסיס נתונים"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "שרת בסיס-מידע של MySQL או PostgreSQL"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "חומת אש/נתב"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "שער לאינטרנט"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "שרת מחשב רשת"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-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:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "כלים לקריאה וכתיבת דוא\"ל וחדשות  (pine, mutt, tin..) ולגלישה באינטרנט"
-
diff --git a/po/hi.pom b/po/hi.pom
index 0b0f53f7..384dc62f 100644
--- a/po/hi.pom
+++ b/po/hi.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "सर्वर"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "कार्यकेंद्र"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "सचित्र वातावरण"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "वेब/एफ़०टी०पी०"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "आपाचे, प्रो-एफ़०टी०पी०डी०"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "पोस्टफ़िक्स विपत्र सर्वर"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "डाटाबेस"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "पोस्टग्रीसीक्यूअल या माईसीक्यूअल डाटाबेस सर्वर"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "अग्नि-भीतिका/रूटर"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "इन्टरनेट गेटवे"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "नेटवर्क कम्प्यूटर सर्वर"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "एन०एफ़०एस० सर्वर, एस०एम०बी० सर्वर, प्रोक्सी सर्वर, एस०एस०एच० सर्वर"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, 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
+#, c-format
+msgid "Documentation"
+msgstr "प्रलेखन"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "लिनक्स और मुक्त सॉफ़्टवेयर पर किताबें और कैसे-करेंअस्तकें"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "एल०एस०बी०"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, c-format
 msgid "Office Workstation"
 msgstr "ऑफ़िस कार्यकेन्द्र"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "अवलोक्क, इत्यादि"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "खेल स्टेशन"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "मनोरंजक कार्यक्रम: आरकेड, बोर्ड, व्यूह-रचना, इत्यादि "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "मल्टीमीडीया केन्द्र"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "ध्वनि और वीडीयो के खेलने वाले/संपादन करने वाले कार्यक्रम"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "इन्टरनेट केन्द्र"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,49 +154,58 @@ msgstr ""
 "औज़ारों का समूह"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "नेटवर्क कम्प्यूटर (ग्राहक)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "एस०एस०एच० को शामिल करते हुए विभिन्न प्रोटोकॉलों के लिए ग्राहक"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "आपके कम्प्यूटर की संरचना कार्य को सहज बनाने हेतु अनेक औजार"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "कन्सोल के औज़ार"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "अनेकों संपादक, कोश, संचिका औजार, टर्मिनल"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "केडीई कार्यकेन्द्र"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "के डेस्कटाप वातावरण, मूलभूत सचित्र वातावरणसंलग्न औजारों के एक समूह के साथ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "गनोम कार्यकेन्द्र"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -112,87 +213,14 @@ msgstr ""
 "एक सचित्र वातावरण, उपयोगकर्ता-मित्रवत कार्यक्रमों के समुच्चय और डेस्कटाप औजारों के साथ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "अन्य सचित्र डेस्कटाप"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "आईसीडब्लूएम, विण्डो मेकर, एनलाइटमेन्ट, एफ़वीडब्लूएम, इत्यादि"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "सी और सी++ विकास लेखागार, कार्यक्रम और इन्क्लूड संचिकायें"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "प्रलेखन"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "लिनक्स और मुक्त सॉफ़्टवेयर पर किताबें और कैसे-करेंअस्तकें"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "एल०एस०बी०"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "लिनक्स मानकीकरण आधार ! त्रितीय पक्ष कार्यक्रमों को समर्थन"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "वेब/एफ़०टी०पी०"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "आपाचे, प्रो-एफ़०टी०पी०डी०"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "पोस्टफ़िक्स विपत्र सर्वर"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "डाटाबेस"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "पोस्टग्रीसीक्यूअल या माईसीक्यूअल डाटाबेस सर्वर"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "अग्नि-भीतिका/रूटर"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "इन्टरनेट गेटवे"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "नेटवर्क कम्प्यूटर सर्वर"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "एन०एफ़०एस० सर्वर, एस०एम०बी० सर्वर, प्रोक्सी सर्वर, एस०एस०एच० सर्वर"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "विपत्र व समाचारों को पढ़ने और भेजने के लिए तथा वेब पर ब्राउज करने हेतु औजारों का सेट"
-
diff --git a/po/hr.pom b/po/hr.pom
index 77560d9c..515e3c43 100644
--- a/po/hr.pom
+++ b/po/hr.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Poslužitelj"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Grafičko Okružje"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache i Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, fuzzy, c-format
+msgid "Postfix mail server"
+msgstr "Postfix mail poslužitelj, Inn news poslužitelj"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Baze"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL ili MySQL poslužitelj baza"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Vatrozid/Ruter"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Internet gateway"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Mrežni računalni poslužitelj"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS poslužitelj, SMB poslužitelj, Proxy poslužitelj, SSH poslužitelj"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C i C++ razvojne biblioteke, programi i uključujuće datoteke"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentacija"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Knjige i Howto-i o Linux-u i slobodnom software-u"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, c-format
 msgid "Office Workstation"
 msgstr "Uredska radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,33 +114,38 @@ msgstr ""
 "(kspread, gnumeric), pdf preglednici, itd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Igračka radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Zabavni programi: arkade, ploče, strategije, itd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimedijska stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Zvučni i video svirački/uređivački programi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Internet stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:65
+#, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -63,37 +154,44 @@ msgstr ""
 "pregled Web-a"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Mrežno računalo (klijent)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klijenti za razne protokole uključujući ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Alati za lako podešavanje vašeg računala"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Konzolni Alati"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Uređivači, ljuske, datotečni alati, terminali"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,12 +199,14 @@ msgstr ""
 "K Radno Okružje, osnovno grafičko okružje sa kolekcijom pripadajućih alata"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -115,91 +215,14 @@ msgstr ""
 "radno okružje"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Druga grafička radna okružja"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, itd"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C i C++ razvojne biblioteke, programi i uključujuće datoteke"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentacija"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Knjige i Howto-i o Linux-u i slobodnom software-u"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache i Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Postfix mail server"
-msgstr "Postfix mail poslužitelj, Inn news poslužitelj"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Baze"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL ili MySQL poslužitelj baza"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Vatrozid/Ruter"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet gateway"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Mrežni računalni poslužitelj"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS poslužitelj, SMB poslužitelj, Proxy poslužitelj, SSH poslužitelj"
-
-# 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 ""
-"Pribor alata za čitanje i slanje mail-a i news-a (pine, mutt, tin..) i za "
-"pregled Web-a"
-
diff --git a/po/hu.pom b/po/hu.pom
index 5b80fc53..3b50d565 100644
--- a/po/hu.pom
+++ b/po/hu.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Kiszolgáló"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Munkaállomás"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Grafikus környezet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix email-kiszolgáló"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Adatbázis"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL vagy MySQL adatbázis-kiszolgáló"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Tűzfal/útválasztó (router)"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Internet-átjáró"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Kiszolgáló hálózati számítógépekhez"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS-, SMB-, proxy- és SSH-kiszolgáló"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C/C++ fejlesztőkönyvtárak, programok és include fájlok"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentáció"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Könyvek és HOGYAN-ok a Linuxról és a szabad szoftverekről"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Külső társaságok alkalmazásainak támogatása."
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Irodai munkaállomás"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,70 +114,82 @@ msgstr ""
 "(KSpread, Gnumeric), PDF-nézegetők, ..."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Játékgép"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Játékprogramok: lövöldözős, táblás, stratégiai, ..."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimédiás munkaállomás"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Lejátszó- és szerkesztőprogramok hang- és videóanyagokhoz"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Internetes munkaállomás"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
-msgstr ""
-"Eszközök levelezéshez, hírkezeléshez (mutt, tin, ...) és a web böngészéséhez"
+msgstr "Eszközök levelezéshez, hírkezeléshez (mutt, tin, ...) és a web böngészéséhez"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Hálózati számítógép (kliens)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Kliensprogramok különféle protokollokhoz (például: ssh)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Segédprogramok a számítógép beállításához"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Parancssori eszközök"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Szövegszerkesztők, parancsértelmezők, fájlkezelők, terminálprogramok"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE-munkaállomás"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -100,100 +198,28 @@ msgstr ""
 "eszközökkel együtt"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME-munkaállomás"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
-msgstr ""
-"Grafikus környezet felhasználóbarát alkalmazásokkal és segédprogramokkal"
+msgstr "Grafikus környezet felhasználóbarát alkalmazásokkal és segédprogramokkal"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Más grafikus környezetek"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "IceWM, WindowMaker, Enlightenment, Fvwm, ..."
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C/C++ fejlesztőkönyvtárak, programok és include fájlok"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentáció"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Könyvek és HOGYAN-ok a Linuxról és a szabad szoftverekről"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Külső társaságok alkalmazásainak támogatása."
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix email-kiszolgáló"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Adatbázis"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL vagy MySQL adatbázis-kiszolgáló"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Tűzfal/útválasztó (router)"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet-átjáró"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Kiszolgáló hálózati számítógépekhez"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS-, SMB-, proxy- és SSH-kiszolgáló"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "Eszközök levelezéshez, hírkezeléshez és a web böngészéséhez"
-
diff --git a/po/id.pom b/po/id.pom
index 2973f953..6296678b 100644
--- a/po/id.pom
+++ b/po/id.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Stasiunkerja"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Mode Grafis"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Server, Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache dan Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Server mail Postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Database"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Server database PostgreSQL atau MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Server, Firewall/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Gerbang Internet"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Komputer Server Jaringan"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "server NFS, SMB, Proxy, SSH"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Librari, program, dan file include untuk pemrograman C dan C++"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentasi"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Buku dan Howto untuk Linux dan Free Software"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Basis Standar Linux. Tunjangan aplikasi partai ketiga"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Komputer Kantor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,33 +114,38 @@ msgstr ""
 "gnumeric), viewer pdf,dsb"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Komputer Game"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Program permainan: arcade, board, strategi, dsb"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Komputer Multimedia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Program untuk memainkan/mengedit suara dan video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Komputer Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:65
+#, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -63,37 +154,44 @@ msgstr ""
 "tin..) dan untuk membrowse Web"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Komputer Jaringan (klien)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klien untuk berbagai protokol, termasuk ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Alat untuk memudahkan konfigurasi komputer."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Alat konsol"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editor, shell, tool untuk file, terminal"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "Workstation KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -102,12 +200,14 @@ msgstr ""
 "yang menyertainya"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Stasiunkerja Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -116,87 +216,14 @@ msgstr ""
 "digunakan"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Desktop Grafis lainnya"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, dsb"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Librari, program, dan file include untuk pemrograman C dan C++"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentasi"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Buku dan Howto untuk Linux dan Free Software"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Basis Standar Linux. Tunjangan aplikasi partai ketiga"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Server, Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache dan Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Server mail Postfix"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Database"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Server database PostgreSQL atau MySQL"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Server, Firewall/Router"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Gerbang Internet"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Komputer Server Jaringan"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "server NFS, SMB, Proxy, SSH"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "Kumpulan tool utk membaca, mengirim email dan news serta membrowse Web"
-
diff --git a/po/is.pom b/po/is.pom
index 16a4ad50..b48ead35 100644
--- a/po/is.pom
+++ b/po/is.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Þjónn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Vinnustöð"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Grafískt viðmót"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Vefur/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix póstþjónn"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Gagnagrunnar"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL eða MySQL gagnagrunnsmiðlarar"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Eldveggur/beinir"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Internet gátt"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Netþjónar"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS-þjónn, SMB-þjónn, Proxy-þjónn ssh-þjónn"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C og C++ undirforritasöfn, forrit og lýsingaskrár"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Handbækur"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Bækur og leiðbeinngar um Linux og frjálsan hugbúnað"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, c-format
 msgid "Office Workstation"
 msgstr "Skrifstofu-vinnustöð"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,33 +114,38 @@ msgstr ""
 "gnumeric) pdf skoðarar, o.s.frv"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Leikja-(vinnu)stöð"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Leikjaforrit, skotleikir, borðleikir, herkænskuleikir og fleira"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Margmiðlunar-vinnustöð"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Spila og breyta hljóðskrám og kvikmyndum"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Internet-vinnustöð"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:65
+#, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -63,137 +154,72 @@ msgstr ""
 "að flakka á vefnum"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Netbiðlarar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Biðlarar fyrir ýmsar samskiptareglur þ.m.t ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Tæki til að auðvelda uppsetningu tölvunnar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Skjától"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Ritlar, skeljar, skráartól, skjáhermar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE Vinnustöð"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "KDE (K Desktop Environment). Gluggastjóri með safni hjálparforrita"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome vinnustöð"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "Gluggastjóri með notendavænum forritum og skjáborðstólum"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Aðrir gluggastjórar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, o.s.frv"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C og C++ undirforritasöfn, forrit og lýsingaskrár"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Handbækur"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Bækur og leiðbeinngar um Linux og frjálsan hugbúnað"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Vefur/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix póstþjónn"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Gagnagrunnar"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL eða MySQL gagnagrunnsmiðlarar"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Eldveggur/beinir"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet gátt"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Netþjónar"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS-þjónn, SMB-þjónn, Proxy-þjónn ssh-þjónn"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Tól og tæki til að lesa og senda póst og fréttir og til að flakka á vefnum"
-
diff --git a/po/it.pom b/po/it.pom
index 0933bbf0..b9681414 100644
--- a/po/it.pom
+++ b/po/it.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Workstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Ambiente grafico"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache e Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Server di posta Postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Database"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Server di database PostgreSQL o MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Gateway per Internet"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Server di rete"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Server NFS, server SMB, server proxy, server SSH"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Librerie di sviluppo, programmi e file \"include\" per C e C++"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Documentazione"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Libri e Howto su Linux e sul Software Libero"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Supporto per applicazioni di terze parti"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Postazione di lavoro con programmi da ufficio"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "(kspread, gnumeric), visualizzatori pdf, ecc."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Computer per giocare"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programmi di svago: arcade, da tavolo, di strategia, ecc."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Computer multimediale"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programmi di riproduzione/modifica audio e video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Computer con accesso ad Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +154,44 @@ msgstr ""
 "navigare il Web"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Computer in rete (client)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Client per vari protocolli, incluso ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Strumenti per semplificare la configurazione del computer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Programmi da riga di comando"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editor, shell, gestione file, terminali"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "Workstation grafica con KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,12 +200,14 @@ msgstr ""
 "collezione di strumenti"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Workstation grafica con GNOME"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -115,87 +216,14 @@ msgstr ""
 "per il desktop"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Altri desktop grafici"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ecc."
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Librerie di sviluppo, programmi e file \"include\" per C e C++"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentazione"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Libri e Howto su Linux e sul Software Libero"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Supporto per applicazioni di terze parti"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache e Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Server di posta Postfix"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Database"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Server di database PostgreSQL o MySQL"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Router"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Gateway per Internet"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Server di rete"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Server NFS, server SMB, server proxy, server SSH"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "Gruppo di programmi per navigare il Web e per scambiarsi posta e news"
-
diff --git a/po/ja.pom b/po/ja.pom
index 06ce49d7..0e961dfe 100644
--- a/po/ja.pom
+++ b/po/ja.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "サーバ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "ワークステーション"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "グラフィカル環境"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache,Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfixメールサーバ"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "データベース"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL/MySQL データベースサーバ"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "ファイアウォール/ルータ"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "インターネットゲートウェイ"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "ネットワークコンピュータサーバ"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFSサーバ,SMBサーバ,プロクシサーバ,SSHサーバ"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, 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
+#, c-format
+msgid "Documentation"
+msgstr "ドキュメンテーション"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Linux/フリーソフト関連の文書とHowto"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base,サードパーティのアプリケーションをサポート"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "オフィスワークステーション"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,168 +114,110 @@ msgstr ""
 "pdfビューアなど"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "ゲームステーション"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "ゲームプログラム: アーケードゲーム/ボードゲーム/戦略ゲームなど"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "マルチメディアステーション"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "サウンドと動画の再生/編集ソフト"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "インターネットステーション"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 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:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "ネットワーク(クライアント)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "sshなどの各種プロトコル用クライアント"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "お使いのコンピュータを簡単に設定するツール"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "コンソールツール"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "エディタ/シェル/ファイル関連ツール/ターミナル"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDEワークステーション"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "KDE - さまざまなツールを含む定番グラフィカル環境"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "GNOMEワークステーション"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "使いやすいアプリケーションとデスクトップツールを含むグラフィカル環境"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "その他のグラフィカルデスクトップ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, 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:999
-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:999
-msgid "Documentation"
-msgstr "ドキュメンテーション"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Linux/フリーソフト関連の文書とHowto"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base,サードパーティのアプリケーションをサポート"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache,Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfixメールサーバ"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "データベース"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL/MySQL データベースサーバ"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "ファイアウォール/ルータ"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "インターネットゲートウェイ"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "ネットワークコンピュータサーバ"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFSサーバ,SMBサーバ,プロクシサーバ,SSHサーバ"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "メールとニュースの閲覧/送信ツールと、ウェブブラウズ用ツール"
-
diff --git a/po/ko.pom b/po/ko.pom
index d5e994a7..e49f17e4 100644
--- a/po/ko.pom
+++ b/po/ko.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "서버"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "워크스테이션"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "그래픽 환경"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "웹/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "아파치와 프로FTPD"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, fuzzy, c-format
+msgid "Postfix mail server"
+msgstr "포스트픽스 메일 서버"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "데이터베이스"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL 또는 MySQL 데이터베이스 서버"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "방화벽/라우터"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "인터넷 게이트웨이"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "네트웍 컴퓨터 서버"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS 서버, 삼바 서버, 프락시 서버, SSH 서버"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, 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
+#, c-format
+msgid "Documentation"
+msgstr "문서"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "리눅스 및 자유 소프트웨어에 대한 서적과 Howto문서"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, c-format
 msgid "Office Workstation"
 msgstr "오피스 워크스테이션"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,171 +114,110 @@ msgstr ""
 "gnumeric), pdf 뷰어, 등등"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "게임 스테이션"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "장난감 프로그램: arcade, boards, strategy, 등등"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "멀티미디어 스테이션"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "사운드 및 비디오 연주/편집 프로그램"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "인터넷 스테이션"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:65
+#, 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...)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "네트웍 컴퓨터 (클라이언트)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "SSH 및 다른 프로토콜의 클라이언트"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "쉬운 컴퓨터 설정을 위한 도구"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "콘솔 도구"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "에디터, 쉘, 파일도구, 터미널"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE 워크스테이션"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "K Desktop 환경, 여러가지 도구를 수반한 기본 그래픽 환경"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME 워크스테이션"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "사용자 친화적 프로그램과 데스크탑 도구를 가진 그래픽 환경"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "기타 그래픽 데스크탑"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, 윈도우 메이커, 인라이튼먼트, Fvwm, 등등"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-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:999
-msgid "Documentation"
-msgstr "문서"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "리눅스 및 자유 소프트웨어에 대한 서적과 Howto문서"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "리눅스 표준 기반. 외부 애플리케이션 지원"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "웹/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "아파치와 프로FTPD"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Postfix mail server"
-msgstr "포스트픽스 메일 서버"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "데이터베이스"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL 또는 MySQL 데이터베이스 서버"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "방화벽/라우터"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "인터넷 게이트웨이"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "네트웍 컴퓨터 서버"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS 서버, 삼바 서버, 프락시 서버, SSH 서버"
-
-# 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 "메일/뉴스를 일고 보내며 웹검색을 위한 도구모음(pine, mutt, tin...)"
-
diff --git a/po/ky.pom b/po/ky.pom
index ef697320..d73ed771 100644
--- a/po/ky.pom
+++ b/po/ky.pom
@@ -1,25 +1,114 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Сервер"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Иш станциясы"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Графикалык чөйрө"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix почта сервери"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Берилиштер базасы"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL же MySQL берилиштер базасынын сервери"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Файрволл/Маршруттагыч"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Интернет дарбазасы"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Тармак сервери"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, 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:35
+#, 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
+#, c-format
+msgid "Documentation"
+msgstr "Документация"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, 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
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, c-format
 msgid "Office Workstation"
 msgstr "Офис станциясы"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,34 +117,40 @@ msgstr ""
 "таблицалар  (kspread, gnumeric), pdf файлдарын көрүү программалары, ж.б."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Оюн станциясы"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 "Оюн-зоок программалары: аркада оюндары, тактай оюндары, стратегия оюндары, ж."
 "б."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Мультимедиа станциясы"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Үн жана видео ойнотуу/терүү программалары"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Интернет станциясы"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -64,37 +159,44 @@ msgstr ""
 "иштөөгө арналган куралдар тобу"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Тармак компьютери (клиент)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Ар түрдүү протоколдор клиенттери, ssh да кошулган"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Компьютериңизди жеңил конфигурациялоо куралдары"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Консоль куралдары"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Редакторлор, шелдер, файл куралдары, терминалдар"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE иш станциясы"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -103,12 +205,14 @@ msgstr ""
 "коллекциясы менен"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME иш станциясы"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -117,90 +221,14 @@ msgstr ""
 "графикалык чөйрө"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Башка графикалык иш столдору"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, 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:999
-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:999
-msgid "Documentation"
-msgstr "Документация"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-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:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
-"Linux стандарттык базасы. Үчүнчү тараптык иштеп чыгуучулардын тиркемелерин "
-"колдоо"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix почта сервери"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Берилиштер базасы"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL же MySQL берилиштер базасынын сервери"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Файрволл/Маршруттагыч"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Интернет дарбазасы"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Тармак сервери"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-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:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-
diff --git a/po/lt.pom b/po/lt.pom
index 03d8a582..1e416da9 100644
--- a/po/lt.pom
+++ b/po/lt.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "serveris"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "KDE darbo stotis"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Serveris, Tinklapių/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, fuzzy, c-format
+msgid "Postfix mail server"
+msgstr "Serveris, Duomenų bazių"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Serveris, Duomenų bazių"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Serveris, Firewall/Routeris"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, fuzzy, c-format
+msgid "Internet gateway"
+msgstr "Priėjimas prie Interneto"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, fuzzy, c-format
+msgid "Network Computer server"
+msgstr "Serveris, Tinklo Kompiuterio serveris"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C bei C++ kūrimo bibliotekos, programos ir include bylos"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentacija"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Knygos ir HOWTO apie Linux ir Free Software"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, c-format
 msgid "Office Workstation"
 msgstr "Biuro darbo stotis"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,34 +114,39 @@ msgstr ""
 "gnumeric), pdf peržiūros programos ir pan."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Žaidimų stotis"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 "Programos pasilinksminimui: lentos, strateginiai, kortų žaidimai ir pan."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimedija stotis"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Garso ir vaizdo grojimo/redagavimo programos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Interneto stotis"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:65
+#, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -64,39 +155,44 @@ msgstr ""
 "naršyti žiniatinklį (WWW)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:69
+#, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "Tinklo Kompiuteris, X klientas"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:74
+#, fuzzy, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Ar tu nori išbandyti nustatymus?"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Konsolės įrankiai"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Redaktoriai, shell'ai, bylų įrankiai, terminalai"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE darbo stotis"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -105,12 +201,14 @@ msgstr ""
 "pritaikytų programų"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome darbo stotis"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -119,93 +217,14 @@ msgstr ""
 "rinkiniu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Kiti grafiniai darbalaukiai"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "IceWM, Window Maker, Enlightenment, Fvwm ir pan."
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C bei C++ kūrimo bibliotekos, programos ir include bylos"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentacija"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Knygos ir HOWTO apie Linux ir Free Software"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Serveris, Tinklapių/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Postfix mail server"
-msgstr "Serveris, Duomenų bazių"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Serveris, Duomenų bazių"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Serveris, Firewall/Routeris"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet gateway"
-msgstr "Priėjimas prie Interneto"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Network Computer server"
-msgstr "Serveris, Tinklo Kompiuterio serveris"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr ""
-
-# 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 ""
-"Rinkinys įrankių skaityti ir siųsti paštą bei naujienas (pine, mutt, tin) ir "
-"naršyti žiniatinklį (WWW)"
-
diff --git a/po/ltg.pom b/po/ltg.pom
index 66928489..5f3107b4 100644
--- a/po/ltg.pom
+++ b/po/ltg.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Servers"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Dorbastaceja"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Grafiskuo vide"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Teimeklis/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix posta servers"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Datubāzis"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL voi MySQL datubāžu servers"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Gunsmyurs/Maršrutizators"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Interneta vuorteja"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Teikla datoru servers"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS servers, SMB servers, storpnīkservers (Proxy), ssh servers"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C i C++ izstruodis bibliotekys, programmys i īkļautī faili"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentaceja"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Gruomotys i vaicuojumu (Howto) faili par Linux i Breivū programmaturu"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, c-format
 msgid "Office Workstation"
 msgstr "Biroja dators"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "gnumeric), pdf skateituoji, u.c."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Spēļu dators"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Izklaidis programmys: arkade, goldaspēlis, strategeja u.c."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimedeju dators"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Skanis i video atskaņuošonys/redigeišonys programmys"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Interneta dators"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +154,44 @@ msgstr ""
 "puorlyukuotu Puorstaipteiklu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Teikla dators (klients)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klienti dažaidim protokolim, īskaitūt ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Reiki datora konfigureišonys atvīgluošonai"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Konsolis reiki"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Redaktori, čaulys, failu reiki, terminali"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE dorbastaceja"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,12 +200,14 @@ msgstr ""
 "kolekceju"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome dorbastaceja"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -115,89 +216,14 @@ msgstr ""
 "reikim"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Cytys grafiskuos dorbaviersmys"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm u.c."
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C i C++ izstruodis bibliotekys, programmys i īkļautī faili"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentaceja"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Gruomotys i vaicuojumu (Howto) faili par Linux i Breivū programmaturu"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Teimeklis/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix posta servers"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Datubāzis"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL voi MySQL datubāžu servers"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Gunsmyurs/Maršrutizators"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Interneta vuorteja"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Teikla datoru servers"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS servers, SMB servers, storpnīkservers (Proxy), ssh servers"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Reiku komplekts, lai laseitu i syuteitu postu i jaunumus, i puorlyukuotu "
-"Puorstaipteiklu"
-
diff --git a/po/lv.pom b/po/lv.pom
index a6e42a6c..7c2f436e 100644
--- a/po/lv.pom
+++ b/po/lv.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Serveris"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Darbastacija"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Grafiskā vide"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Tīmeklis/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, fuzzy, c-format
+msgid "Postfix mail server"
+msgstr "Postfix pasta serveris"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Datubāzes"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL vai MySQL datubāzu serveris"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Ugunsmūris/Maršrutizators"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Interneta vārteja"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Tīkla datoru serveris"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS serveris, SMB serveris, Proxy serveris, ssh serveris"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C un C++ izstrādes bibliotēkas, programmas un include faili"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentācija"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Grāmatas un Howto faili par Linux un Brīvo programmatūru"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, c-format
 msgid "Office Workstation"
 msgstr "Biroja dators"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,33 +114,38 @@ msgstr ""
 "gnumeric), pdf skatītāji, u.c."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Spēļu dators"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Izklaides programmas: arkāde, galdiņspēles, stratēģija u.c."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimēdiju dators"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Skaņas un video atskaņošanas/rediģēšanas programmas"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Interneta dators"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:65
+#, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -63,37 +154,44 @@ msgstr ""
 "un pārlūkotu Tīmekli"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Tīkla dators (klients)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klienti dažādiem protokoliem, ieskaitot ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Rīki datora konfigurēšanas atvieglošanai"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Konsoles rīki"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Redaktori, čaulas, failu rīki, termināļi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE darbastacija"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,12 +199,14 @@ msgstr ""
 "K Desktop Environment, galvenā grafiskā vide kopā ar papildus rīku kolekciju"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome darbastacija"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -115,91 +215,14 @@ msgstr ""
 "rīkiem"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Citas grafiskās darbavirsmas"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm u.c."
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C un C++ izstrādes bibliotēkas, programmas un include faili"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentācija"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Grāmatas un Howto faili par Linux un Brīvo programmatūru"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Tīmeklis/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Postfix mail server"
-msgstr "Postfix pasta serveris"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Datubāzes"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL vai MySQL datubāzu serveris"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Ugunsmūris/Maršrutizators"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Interneta vārteja"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Tīkla datoru serveris"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS serveris, SMB serveris, Proxy serveris, ssh serveris"
-
-# 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 ""
-"Rīku komplekts, lai lasītu un sūtītu pastu vai jaunumus (pine, mutt, tin..) "
-"un pārlūkotu Tīmekli"
-
diff --git a/po/mk.pom b/po/mk.pom
index cf550057..6ef6d860 100644
--- a/po/mk.pom
+++ b/po/mk.pom
@@ -1,27 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Сервер"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Работна станица"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Графичка Околина"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, fuzzy, c-format
+msgid "Postfix mail server"
+msgstr "Postfix Маил сервер"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, fuzzy, c-format
+msgid "Database"
+msgstr "База на податоци"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, fuzzy, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL или MySQL сервер за бази на податоци"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Интернет gateway"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, fuzzy, c-format
+msgid "Network Computer server"
+msgstr "Мрежа (Клиент)"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, 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
+msgid "Documentation"
+msgstr "Документација"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, 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
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, fuzzy, c-format
 msgid "Office Workstation"
 msgstr "Канцелариски"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:51
+#, fuzzy, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -30,37 +114,38 @@ msgstr ""
 "(kspread, "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:55
+#, fuzzy, c-format
 msgid "Game station"
 msgstr "Игри"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:56
+#, fuzzy, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Занимација"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:59
+#, fuzzy, c-format
 msgid "Multimedia station"
 msgstr "Мултимедија"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:60
+#, fuzzy, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Програми за музика и видео"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Интернет"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:65
+#, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -69,42 +154,44 @@ msgstr ""
 "пребарување на Интернет"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:69
+#, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "Мрежа (Клиент)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Клиенти за различни протоколи, бклучувајќи и ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:74
+#, 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:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Конзолски алатки"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:79
+#, fuzzy, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Уредувачи, школки, алатки, терминали"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:87
+#, fuzzy, c-format
 msgid "KDE Workstation"
 msgstr "KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:88
+#, fuzzy, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -112,114 +199,28 @@ msgstr ""
 "К Десктоп Опкружување, основно графичко опкружување со колекција на алатки."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:92
+#, fuzzy, c-format
 msgid "GNOME Workstation"
 msgstr "KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:93
+#, fuzzy, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "Графичко опкружување со user-friendly и алатки за десктоп"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:96
+#, fuzzy, c-format
 msgid "Other Graphical Desktops"
 msgstr "Други Графички Десктопови"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:97
+#, 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:999
-#, fuzzy
-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:999
-#, fuzzy
-msgid "Documentation"
-msgstr "Документација"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Книги и -Како да- за Linux Бесплатен Софтвер"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Стандардна База"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Postfix mail server"
-msgstr "Postfix Маил сервер"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Database"
-msgstr "База на податоци"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL или MySQL сервер за бази на податоци"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Router"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Интернет gateway"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Network Computer server"
-msgstr "Мрежа (Клиент)"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr ""
-
-# 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 ""
-"Алатки за читање и пракање е-маил и новости (pine, mutt, tin..) и "
-"пребарување на Интернет"
-
diff --git a/po/ms.pom b/po/ms.pom
index bca20731..de9ccac7 100644
--- a/po/ms.pom
+++ b/po/ms.pom
@@ -1,217 +1,221 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Pelayan"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Grafikal"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:10
+#, fuzzy, c-format
+msgid "Web/FTP"
+msgstr "&Dalam pelayar web"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, fuzzy, c-format
+msgid "Postfix mail server"
+msgstr "Terima Notis Pelayan"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, fuzzy, c-format
+msgid "Internet gateway"
+msgstr "Internet"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, fuzzy, c-format
+msgid "Network Computer server"
+msgstr "Terima Notis Pelayan"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, fuzzy, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C dan C dan"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentasi"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, fuzzy, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "dan on dan Bebas"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, fuzzy, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Asas"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, fuzzy, c-format
 msgid "Office Workstation"
 msgstr "Pejabat"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:51
+#, fuzzy, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
 msgstr "Pejabat"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:55
+#, fuzzy, c-format
 msgid "Game station"
 msgstr "Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:59
+#, fuzzy, c-format
 msgid "Multimedia station"
 msgstr "Multimedia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:60
+#, fuzzy, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Bunyi dan"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:64
+#, fuzzy, c-format
 msgid "Internet station"
 msgstr "Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:65
+#, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr "dan dan dan"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:69
+#, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "_Tambah rangkaian baru"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:70
+#, fuzzy, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "protokol"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:74
+#, fuzzy, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Ujian"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:79
+#, fuzzy, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Penyunting fail"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:87
+#, fuzzy, c-format
 msgid "KDE Workstation"
 msgstr "KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:88
+#, fuzzy, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "Desktop Persekitaran asas"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:92
+#, fuzzy, c-format
 msgid "GNOME Workstation"
 msgstr "Jam Lunar GNOME"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:93
+#, fuzzy, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "A pengguna dan"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:96
+#, fuzzy, c-format
 msgid "Other Graphical Desktops"
 msgstr "Cari lain-lain tanda kurungan"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C dan C dan"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentasi"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "dan on dan Bebas"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Asas"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Web/FTP"
-msgstr "&Dalam pelayar web"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Postfix mail server"
-msgstr "Terima Notis Pelayan"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet gateway"
-msgstr "Internet"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Network Computer server"
-msgstr "Terima Notis Pelayan"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr ""
-
-# 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 "dan dan dan"
-
diff --git a/po/mt.pom b/po/mt.pom
index bf58925f..65d4bdb0 100644
--- a/po/mt.pom
+++ b/po/mt.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Workstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Ambjent Grafiku"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Server tal-imejl Postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Database"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Server tad-database PostgreSQL jew MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Gateway tal-internet"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Kompjuter Server tan-Network"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Servers NFS, SMB, Proxy, ssh"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Libreriji, programmi u fajls għal żviluppar C u C++"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentazzjoni"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Kotba u \"HOWTO\" dwar il-Linux u Softwer Ħieles"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Sapport ta' programmi ta' terzi partiti"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Kompjuter tal-Uffiċċju"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,33 +114,38 @@ msgstr ""
 "(kspread, gnumeric) eċċ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Logħob"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programmi ta' divertiment: logħob tal-arcades, karti, strateġija eċċ"
+msgstr "Programmi ta' divertiment: logħob tal-arcaDES, karti, strateġija eċċ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimedja"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programmi għad-daqq u editjar ta' awdjo u video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:65
+#, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +153,44 @@ msgstr ""
 "Sett għodda biex taqra u tibgħat imejl u \"news\", u biex tibbrawżja l-web"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Kompjuter fuq network (klijent)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klijenti għal protokolli differenti, eż. SSH"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Għodda biex tiffaċilita l-konfigurazzjoni tal-kompjuter"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Għodda tal-konsol"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Edituri, shells, għodda tal-fajls, terminals"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "Stazzjon KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,100 +199,28 @@ msgstr ""
 "jakkumpanjawha"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Stazzjon GNOME"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "Ambjent grafiku b' għażla ta' programmi u għodda faċli"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Desktops Grafiċi Oħrajn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, eċċ"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Libreriji, programmi u fajls għal żviluppar C u C++"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentazzjoni"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Kotba u \"HOWTO\" dwar il-Linux u Softwer Ħieles"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Sapport ta' programmi ta' terzi partiti"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Server tal-imejl Postfix"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Database"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Server tad-database PostgreSQL jew MySQL"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Router"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Gateway tal-internet"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Kompjuter Server tan-Network"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Servers NFS, SMB, Proxy, ssh"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Sett għodda biex taqra u tibgħat imejl u \"news\", u biex tibbrawżja l-web"
-
diff --git a/po/nb.pom b/po/nb.pom
index f2bf4569..a6eeb178 100644
--- a/po/nb.pom
+++ b/po/nb.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Tjener"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Arbeidstasjon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Grafisk miljø"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix eposttjener"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Database"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL eller MySQL database tjener"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Tjener, Brannmur/ruter"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Internett-gateway"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Nettverk datamaskintjener"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS-tjener, SMB-tjener, Proxy-tjener, SSH-tjener"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C og C++ utviklingsbibliotek, programmer og include-filer"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentasjon"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Bøker og howto's om Linux og fri programvare"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Tredjeparts programvarestøtte"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Kontor og arbeidsmaskin"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "gnumeric), pdf fremvisere etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Spillstasjon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Underholdningsprogrammer: arkade, bordspill, strategi etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimediastasjon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Lyd og bilde avspilling/redigeringsprogrammer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Internettstasjon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +154,44 @@ msgstr ""
 "se på webben"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Nettverksmaskin (klient)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klienter for forskjellige protokoller inkludert ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Verktøy for å forenkle konfigurasjonen av maskinen din"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Konsollverktøy"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Tekstprogrammer, skall, filverktøy, terminaler"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE-arbeidsstasjon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -100,12 +199,14 @@ msgstr ""
 "K Desktop Environment, basis grafikkmiljø med en samling av passende verktøy"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME-arbeidsstasjon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -114,88 +215,14 @@ msgstr ""
 "verktøy"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Andre grafiske skrivebord"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm etc"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C og C++ utviklingsbibliotek, programmer og include-filer"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentasjon"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Bøker og howto's om Linux og fri programvare"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Tredjeparts programvarestøtte"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix eposttjener"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Database"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL eller MySQL database tjener"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Tjener, Brannmur/ruter"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internett-gateway"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Nettverk datamaskintjener"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS-tjener, SMB-tjener, Proxy-tjener, SSH-tjener"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Sett med verktøy for å lese og sende e-post og nyheter og for å surfe på nett"
-
diff --git a/po/nl.pom b/po/nl.pom
index 0e639ca6..0051cce7 100644
--- a/po/nl.pom
+++ b/po/nl.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Werkstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Grafische omgeving"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix e-mailserver"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Database"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL of MySQL database-server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Internet gateway"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Netwerk-computer server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS server, SMB server, Proxy server, ssh server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C and C++ ontwikkelingsbibliotheken, programma's en include-bestanden"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Documentatie"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Boeken en Howto's over Linux en Vrije Software"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standaard-Basis. Ondersteuning voor toepassingen van derden."
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Kantoorwerkstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "gnumeric), PDF-lezers, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Game-station"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Amusementsprogramma's: arcade, bordspellen, strategie etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimedia-station"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Geluids- en video-afspeel- en bewerkingsprogramma's"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Internet-station"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +154,44 @@ msgstr ""
 "schrijven, en om het Web mee door te bladeren"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Netwerk-computer (client)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clients voor verschillende protcollen waaronder ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Programma's om de configuratie van uw computer te vergemakkelijken"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Hulpprogramma's voor de opdrachtregel"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editors, shells, bestandsbeheer, terminals"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE werkstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,12 +200,14 @@ msgstr ""
 "van bijbehorende programma's"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME werkstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -115,89 +216,14 @@ msgstr ""
 "en bureaublad-programma's"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Andere grafische bureaubladen"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C and C++ ontwikkelingsbibliotheken, programma's en include-bestanden"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentatie"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Boeken en Howto's over Linux en Vrije Software"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standaard-Basis. Ondersteuning voor toepassingen van derden."
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix e-mailserver"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Database"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL of MySQL database-server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Router"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet gateway"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Netwerk-computer server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS server, SMB server, Proxy server, ssh server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Verzameling programma's om e-mail en usenet nieuws mee te lezen en te "
-"sturen, en om het Web mee door te bladeren"
-
diff --git a/po/nn.pom b/po/nn.pom
index 20defa3a..57c38619 100644
--- a/po/nn.pom
+++ b/po/nn.pom
@@ -1,193 +1,221 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Tenar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Arbeidstasjon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Grafisk miljø"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Vev/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix-e-posttenar"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Database"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL- eller MySQL-databasetenar"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Brannmur/rutar"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Internett-portnar"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Nettverkstenar"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS-tenar, SMB-tenar, mellomtenar, ssh-tenar"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, 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
+#, c-format
+msgid "Documentation"
+msgstr "Hjelpetekst"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, c-format
 msgid "Office Workstation"
 msgstr "Kontormaskin"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Spelmaskin"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimediemaskin"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Internett-maskin"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Nettverksmaskin (klient)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Konsollverktøy"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE-arbeidsstasjon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME-arbeidsstasjon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Andre grafiske skrivebord"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Hjelpetekst"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Vev/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix-e-posttenar"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Database"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL- eller MySQL-databasetenar"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Brannmur/rutar"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internett-portnar"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Nettverkstenar"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS-tenar, SMB-tenar, mellomtenar, ssh-tenar"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "Program for lesing og sending av e-post, samt nettlesing"
-
diff --git a/po/pl.pom b/po/pl.pom
index 72a534ab..8da35d79 100644
--- a/po/pl.pom
+++ b/po/pl.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Serwer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Stacja robocza"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Środowisko graficzne"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Serwer pocztowy Postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Baza danych"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Serwer bazodanowy PostgreSQL i MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Zapora sieciowa/router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Bramka internetowa"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Serwer sieciowy"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Serwer NIS, serwer SMB, serwer pośrednika, serwer ssh"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Biblioteki programistyczne C i C++, programy i pliki nagłówkowe"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentacja"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Książki i dokumenty HOWTO o Linuksie i Wolnym Oprogramowaniu"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Obsługa aplikacji firm trzecich"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Stacja biurowa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "(kspread, gnumeric), przedlądarki pdf, itd."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Stacja rozrywkowa (gry)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programy do zabawy: gry przygodowe, planszowe, strategie, itd."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Stacja multimedialna"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programy do odtwarzania/edycji dźwięku i obrazu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Stacja internetowa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +154,44 @@ msgstr ""
 "tin...) oraz przeglądania sieci"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Komputer sieciowy (klient)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Programy klienckie dla różnych protokołów włączając ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Narzędzia do łatwego zarządzania komputerem"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Narzędzia konsolowe"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Edytory, powłoki, narzędzia plikowe, terminale"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "Stacja KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,12 +200,14 @@ msgstr ""
 "narzędzi towarzyszących"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Stacja GNOME"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -115,89 +216,14 @@ msgstr ""
 "narzędzi graficznych"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Inne środowiska graficzne"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, itd."
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Biblioteki programistyczne C i C++, programy i pliki nagłówkowe"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentacja"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Książki i dokumenty HOWTO o Linuksie i Wolnym Oprogramowaniu"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Obsługa aplikacji firm trzecich"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Serwer pocztowy Postfix"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Baza danych"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Serwer bazodanowy PostgreSQL i MySQL"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Zapora sieciowa/router"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Bramka internetowa"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Serwer sieciowy"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Serwer NIS, serwer SMB, serwer pośrednika, serwer ssh"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Zbiór narzędzi do odczytu i wysyłania poczty i grup dyskusyjnych oraz do "
-"przeglądania sieci"
-
diff --git a/po/pt.pom b/po/pt.pom
index 773f3086..3167a168 100644
--- a/po/pt.pom
+++ b/po/pt.pom
@@ -1,25 +1,112 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Servidor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Estação de Trabalho"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Ambiente Gráfico"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache e Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix servidor de correio"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Base de Dados"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Servidor de Bases de Dados PostgreSQL ou MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Ponte Internet"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Computador de Rede Servidor"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Servidor NFS, Servidor SMB, Servidor Proxy, Servidor SSH"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr ""
+"C e C++ bibliotecas de desenvolvimento, programas e ficheiros 'include'"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Documentação"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Livros e Howto's sobre o Linux e Software Livre"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Base Padrão Linux (LSB). Suporte de aplicações exteriores."
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Estação de Trabalho de Escritório"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +115,38 @@ msgstr ""
 "gnumeric), visualizadores pdf, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Estação de Jogo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programas de divertimento: arcada, tabuleiros, estratégia, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Estação Multimédia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Aplicações de som e vídeo reprodução/edição"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Estação de Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,38 +155,45 @@ msgstr ""
 "mutt, tin...) e para navegar na Web"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Computador de Rede (cliente)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clientes para diferentes protocolos incluindo ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Ferramentas para facilitar a configuração do seu computador"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Ferramentas de terminal"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr ""
 "Editores, Linha de Comandos (shell), ferramentas de ficheiro, terminais"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "Estação de Trabalho KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -102,12 +202,14 @@ msgstr ""
 "ferramentas que o acompanham"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Estação de Trabalho Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -116,90 +218,14 @@ msgstr ""
 "de trabalho fáceis de usar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Outros Ambientes de Trabalho Gráficos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr ""
-"C e C++ bibliotecas de desenvolvimento, programas e ficheiros 'include'"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentação"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Livros e Howto's sobre o Linux e Software Livre"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Base Padrão Linux (LSB). Suporte de aplicações exteriores."
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache e Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix servidor de correio"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Base de Dados"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Servidor de Bases de Dados PostgreSQL ou MySQL"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Router"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Ponte Internet"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Computador de Rede Servidor"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Servidor NFS, Servidor SMB, Servidor Proxy, Servidor SSH"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Conjunto de ferramentas para ler e enviar e-mails e notícias e para navegar "
-"na Web"
-
diff --git a/po/pt_BR.pom b/po/pt_BR.pom
index da497ee1..25a72749 100644
--- a/po/pt_BR.pom
+++ b/po/pt_BR.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Servidor"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Estação de Trabalho"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Ambiente Gráfico"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache; Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Servidor de e-mail Postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Bancos de dados"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Servidor de banco de dados PostgreSQL ou MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Firewall/Roteador"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Internet Gateway"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Servidor de Rede"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Servidor NFS, servidor SMB, servidor Proxy, servidor SSH"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Bibliotecas de desenvolvimento C e C++, programas e arquivos include"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Documentação"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Livros e Howto's sobre Linux e Software Livre"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base: suporte a aplicativos de terceiros"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Estação de Trabalho de Escritório"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "(kspread, gnumeric), visualizadores pdf, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Estação de Jogos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programas de divertimento: arcade, estratégia, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Estação de Multimídia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programas editores/tocadores de som e vídeo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Estação de Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +154,44 @@ msgstr ""
 "tin...) e para navegar na Web"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Computador de rede (cliente)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clientes para protocolos diferentes incluindo ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Ferramentas para facilitar a configuração do seu computador"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Ferramentas do Console"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editores, shells, ferramentas de arquivos, terminais"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "Estação de Trabalho KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,12 +200,14 @@ msgstr ""
 "coleção de ferramentas"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Estação de Trabalho GNOME"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -115,89 +216,14 @@ msgstr ""
 "amigáveis"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Outros Desktops Gráficos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Bibliotecas de desenvolvimento C e C++, programas e arquivos include"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentação"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Livros e Howto's sobre Linux e Software Livre"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base: suporte a aplicativos de terceiros"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache; Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Servidor de e-mail Postfix"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Bancos de dados"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Servidor de banco de dados PostgreSQL ou MySQL"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Roteador"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet Gateway"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Servidor de Rede"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Servidor NFS, servidor SMB, servidor Proxy, servidor SSH"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Conjunto de ferramentas para ler e enviar mensagens e notícias e para "
-"navegar na Web"
-
diff --git a/po/ro.pom b/po/ro.pom
index cad0d38e..9bc9e338 100644
--- a/po/ro.pom
+++ b/po/ro.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Staţie de lucru"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Mediu Grafic"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Server de poştă Postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Baze de date"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Server de baze de date MySQL sau PostgreSQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Gateway Internet"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Server în reţea"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Server NFS, SMB, Proxy, SSH"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Biblioteci de dezvoltare C şi C++, programe şi fişiere include"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Documentaţie"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Cărţi şi HowTo despre Linux şi programele libere"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Baza standard Linux. Sprijin pentru aplicaţii ale altora."
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Staţie de lucru de birou"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,33 +114,38 @@ msgstr ""
 "(kspread, gnumeric), vizualizatoare de fişiere pdf etc."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Staţie de lucru pt. jocuri"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programe de amuzament: arcade, boards, strategie etc."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Staţie de lucru multimedia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programe de editare/redare pt. sunet şi video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Staţie de lucru în Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:65
+#, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -63,37 +154,44 @@ msgstr ""
 "navigare pe Web"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Calculator în reţea (client)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clienţi pt. diverse protocoale, inclusiv ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Unelete pentru uşurarea configurării calculatorului dvs."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Unelte consolă"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editoare, interpretoare, terminale, unelte fişiere"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "Staţie de lucru KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,101 +199,28 @@ msgstr ""
 "Mediul de birou K, mediul grafic de bază cu o colecţie de unelte asociate"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Staţie de lucru Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "Un mediu grafic cu un set de aplicaţii prietenoase şi unelte de birou"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Alte desktopuri grafice"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Biblioteci de dezvoltare C şi C++, programe şi fişiere include"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentaţie"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Cărţi şi HowTo despre Linux şi programele libere"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Baza standard Linux. Sprijin pentru aplicaţii ale altora."
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Server de poştă Postfix"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Baze de date"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Server de baze de date MySQL sau PostgreSQL"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Router"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Gateway Internet"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Server în reţea"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Server NFS, SMB, Proxy, SSH"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Set de unelte pentru citire şi trimitere poştă şi ştiri şi pentru navigare "
-"pe Web"
-
diff --git a/po/ru.pom b/po/ru.pom
index 539efd2f..48807542 100644
--- a/po/ru.pom
+++ b/po/ru.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Сервер"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Рабочая станция"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Графическая среда"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Почтовый сервер Postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "База данных"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Сервер баз данных PostgreSQL или MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Файервол/Маршрутизатор"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Интернет-шлюз"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Сервер сети"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, 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:35
+#, 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
+#, c-format
+msgid "Documentation"
+msgstr "Документация"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Книги и HowTo по Linux и свободном программном обеспечении"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, c-format
 msgid "Office Workstation"
 msgstr "Офисная рабочая станция"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "таблицы (kspread, gnumeric), просмотрщики pdf и т.д."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Игровая станция"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Развлекательные программы: аркады, настольные игры, стратегии и т.д."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Мультимедиа станция"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Программы для проигрывания/редактирования звука и видео"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Станция Интернет"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +154,44 @@ msgstr ""
 "серфинга"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Сетевой компьютер (клиент)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Клиенты для различных протоколов, включая ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Сервисные программы для облегчения настройки вашего компьютера"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Сервисные программы для консоли"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Редакторы, командные процессоры, файловые утилиты, терминалы"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "Рабочая станция KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,12 +200,14 @@ msgstr ""
 "сопроводительных сервисных программ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Рабочая станция Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -115,87 +216,14 @@ msgstr ""
 "программ рабочего стола"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Другие графические рабочие столы"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, 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:999
-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:999
-msgid "Documentation"
-msgstr "Документация"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Книги и HowTo по Linux и свободном программном обеспечении"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Стандартная база Linux. Поддержка приложений третьих разработчиков"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Почтовый сервер Postfix"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "База данных"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Сервер баз данных PostgreSQL или MySQL"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Файервол/Маршрутизатор"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Интернет-шлюз"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Сервер сети"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-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:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "Набор утилит для чтения и отправки почты и новостей и навигации по Web"
-
diff --git a/po/sk.pom b/po/sk.pom
index b44fc6fd..88dcf6cf 100644
--- a/po/sk.pom
+++ b/po/sk.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Pracovná stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Grafické prostredie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache a Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix mail server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Databázy"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL, alebo MySQL databázový server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Brána k Internetu"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Sieťový server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS server, SMB server, Proxy server, SSH server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C a C++ vývojove knižnice, programy a include súbory"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentácia"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Knihy a návody pre Linux a iný voľný softvér"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Aplikačná podpora od tretej strany"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Kancelárska stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "(kspread, gnumeric), pdf prehliadače, atď"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Hracia stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Zábavne programy: stolové, stratégie, atď"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimediálna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programy na prehrávanie/editovanie zvuku a videa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Internetová stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +154,44 @@ msgstr ""
 "prehliadanie www"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Sieťovy počítač (klient)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klientovia pre rôzne protokoly vrátane ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Nástroje na jednoduchú konfiguráciu vášho počítača"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Konzolové nástroje"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editory, shelly, súborové nástroje, terminály"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE pracovná stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -100,101 +199,28 @@ msgstr ""
 "K Desktop Enviroment, grafické prostredie s množstvom pribalených programov"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME pracovná stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "Grafické rozhranie s aplikáciami a desktopovými nástrojmi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Iné grafické prostredia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, atď"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C a C++ vývojove knižnice, programy a include súbory"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentácia"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Knihy a návody pre Linux a iný voľný softvér"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Aplikačná podpora od tretej strany"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache a Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix mail server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Databázy"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL, alebo MySQL databázový server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Router"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Brána k Internetu"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Sieťový server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS server, SMB server, Proxy server, SSH server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Nástroje na čítanie a odosielanie emailov alebo správ do Usenet news, "
-"prehliadače www"
-
diff --git a/po/sl.pom b/po/sl.pom
index 8bdab7b8..9466fb62 100644
--- a/po/sl.pom
+++ b/po/sl.pom
@@ -1,207 +1,221 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Strežnik"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Delovna postaja"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Grafično okolje"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, fuzzy, c-format
+msgid "Postfix mail server"
+msgstr "Izberite strežnik"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Zbirka podatkov"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, fuzzy, c-format
+msgid "Firewall/Router"
+msgstr "Požarni zid"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, fuzzy, c-format
+msgid "Internet gateway"
+msgstr "Nastavitev zaslona"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, fuzzy, c-format
+msgid "Network Computer server"
+msgstr "Izberite strežnik"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, 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
+#, fuzzy, c-format
+msgid "Documentation"
+msgstr "Nastavitve modula:"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, fuzzy, c-format
+msgid "LSB"
+msgstr "USB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, fuzzy, c-format
 msgid "Office Workstation"
 msgstr "Nastavitev zaslona"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:55
+#, fuzzy, c-format
 msgid "Game station"
 msgstr "Nastavitev zaslona"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:59
+#, fuzzy, c-format
 msgid "Multimedia station"
 msgstr "Večpredstavnost"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:64
+#, fuzzy, c-format
 msgid "Internet station"
 msgstr "Nastavitev zaslona"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:69
+#, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "Izberite strežnik"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:74
+#, fuzzy, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Želite preizkusiti nastavitev?"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:87
+#, fuzzy, c-format
 msgid "KDE Workstation"
 msgstr "Nastavitev zaslona"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:92
+#, fuzzy, c-format
 msgid "GNOME Workstation"
 msgstr "Nastavitev zaslona"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Documentation"
-msgstr "Nastavitve modula:"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "LSB"
-msgstr "USB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Postfix mail server"
-msgstr "Izberite strežnik"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Zbirka podatkov"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Firewall/Router"
-msgstr "Požarni zid"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet gateway"
-msgstr "Nastavitev zaslona"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Network Computer server"
-msgstr "Izberite strežnik"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-
diff --git a/po/sq.pom b/po/sq.pom
index dc2fb0ce..6d6bdd69 100644
--- a/po/sq.pom
+++ b/po/sq.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Stacion punues"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Mjedis Grafikë"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Server i letrave (mail) Postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Bazë e të dhënave"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Server PostgreSQL apo MySQL i bazës së të dhënave"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Murë-i-Zjarrtë/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Portë kaluese Interneti"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Server Kompjuter Rrjeti"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Server NFS, server SMB, server Proxy, server ssh"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Bibloteka ndërtuese e C dhe C++, programe dhe skedare me përfshirje"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentacioni"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Libra dhe Howto's për Linux dhe Softver gratis"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Bazë Standarde e Linux. Përkrahë aplikacione të pjesës së tretë"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Stacioni Punues në Tryezë"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,33 +114,38 @@ msgstr ""
 "(kspread, gnumeric), çfaqës pdf, etj."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Stacion Lojërash"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programe ahengi: lojë arkade, lojë me stenda, strategji, etj"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Stacion Multimedia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programe për lojëra/botime të zërit dhe videos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Stacion Interneti"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:65
+#, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -63,37 +154,44 @@ msgstr ""
 "lajmeve (pine, mutt, tin...) dhe për të lundruar në internet."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Kompjuter Rrjeti (klient)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klient për protokole të ndryshme me përfshirje në ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Vegla për të konfiguruar kompjuterin tuaj"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Vegla në konsolë"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Botues, interpretues, vegla skedaresh, terminale"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "Stacioni punues KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,12 +199,14 @@ msgstr ""
 "Mjedisi i Tryezës K, dhe grafiku basic, i mjedisit me koleksionimin e veglave"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Stacioni punues Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -115,89 +215,14 @@ msgstr ""
 "vegla në tryezë"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Mjedise të Tjera Grafike në Tryezë"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etj."
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Bibloteka ndërtuese e C dhe C++, programe dhe skedare me përfshirje"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentacioni"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Libra dhe Howto's për Linux dhe Softver gratis"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Bazë Standarde e Linux. Përkrahë aplikacione të pjesës së tretë"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Server i letrave (mail) Postfix"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Bazë e të dhënave"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Server PostgreSQL apo MySQL i bazës së të dhënave"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Murë-i-Zjarrtë/Router"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Portë kaluese Interneti"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Server Kompjuter Rrjeti"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Server NFS, server SMB, server Proxy, server ssh"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Përgjithësia a veglave për leximin, dërgimin e letrave elektronike dhe "
-"shfletimin e Webit."
-
diff --git a/po/sr.pom b/po/sr.pom
index 52d7ad8e..1bbdd64d 100644
--- a/po/sr.pom
+++ b/po/sr.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Сервер"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Радна станица"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Графичко Окружење"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Сервер, Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix mail сервер"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Сервер,Базе података"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL или MySQL сервер за базу података"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Сервер, Firewall/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Интернет gateway"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Мрежни Сервер"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, 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:35
+#, 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
+#, c-format
+msgid "Documentation"
+msgstr "Документација"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Књиге и Како? (Howto's) за Linux и Бесплатни Софтвер"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Линуксова Стандардна База. Подршка за Third party апликаицје"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Радна(Office) станица"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,33 +114,38 @@ msgstr ""
 "gnumeric), pdf прегледници, итд"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Станица за игру"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Забавни програми: аркаде, иге на табли, стратегије, итд"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Мултимедијална станица"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Програми за пуштање звука и видеа"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Интернет станица"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:65
+#, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -63,37 +154,44 @@ msgstr ""
 "претраживање Интернета"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Мрежни компјутер, (клијент)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Клијенти за различите протоколе укључујући и ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Алати за лако конфигурисање компјутера"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Конзолни алати"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "едитори,шелови, алати за датотеке, терминали"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE падна станица"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,12 +199,14 @@ msgstr ""
 "K Десктоп окружење, основно графичко окружење са колекцијом пратећих алата"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome радна станица"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -115,90 +215,14 @@ msgstr ""
 "NFS server, SMB server, Proxy серверих апликација и десктопалата"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Други графички десктопови"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, 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:999
-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:999
-msgid "Documentation"
-msgstr "Документација"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Књиге и Како? (Howto's) за Linux и Бесплатни Софтвер"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Линуксова Стандардна База. Подршка за Third party апликаицје"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Сервер, Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix mail сервер"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Сервер,Базе података"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL или MySQL сервер за базу података"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Сервер, Firewall/Router"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Интернет gateway"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Мрежни Сервер"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-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:999
-#, fuzzy
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Скуп алата за читање и слање ел.поште и вести (pine, mutt, tin..) и за "
-"претраживање Интернета"
-
diff --git a/po/sr@Latn.pom b/po/sr@Latn.pom
index cfb27d64..a41e2def 100644
--- a/po/sr@Latn.pom
+++ b/po/sr@Latn.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Grafičko Okruženje"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Server, Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix mail server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Server,Baze podataka"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL ili MySQL server za bazu podataka"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Server, Firewall/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Internet gateway"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Mrežni Server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS server, SMB server, Proxy server, SSH server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C i C++ razvojne biblioteke, programi  i propratne datoteke"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentacija"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Knjige i Kako? (Howto's) za Linux i Besplatni Softver"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux-ova Standardna Baza. Podrška za Third party aplikaicje"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Radna(Office) stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,33 +114,38 @@ msgstr ""
 "gnumeric), pdf preglednici, itd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Stanica za igru"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Zabavni programi: arkade, ige na tabli, strategije, itd"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimedijalna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programi za puštanje zvuka i videa"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Internet stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:65
+#, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -63,37 +154,44 @@ msgstr ""
 "pretraživanje Interneta"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Mrežni kompjuter, (klijent)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klijenti za različite protokole uključujući i ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Alati za lako konfigurisanje kompjutera"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Konzolni alati"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "editori,šelovi, alati za datoteke, terminali"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE padna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,12 +199,14 @@ msgstr ""
 "K Desktop okruženje, osnovno grafičko okruženje sa kolekcijom pratećih alata"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome radna stanica"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -115,90 +215,14 @@ msgstr ""
 "NFS server, SMB server, Proxy serverih aplikacija i desktopalata"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Drugi grafički desktopovi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, itd"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C i C++ razvojne biblioteke, programi  i propratne datoteke"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentacija"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Knjige i Kako? (Howto's) za Linux i Besplatni Softver"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux-ova Standardna Baza. Podrška za Third party aplikaicje"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Server, Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix mail server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Server,Baze podataka"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL ili MySQL server za bazu podataka"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Server, Firewall/Router"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet gateway"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Mrežni Server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS server, SMB server, Proxy server, SSH server"
-
-# 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 ""
-"Skup alata za čitanje i slanje el.pošte i vesti (pine, mutt, tin..) i za "
-"pretraživanje Interneta"
-
diff --git a/po/sv.pom b/po/sv.pom
index 521a45a7..b713863a 100644
--- a/po/sv.pom
+++ b/po/sv.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Arbetsstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Grafisk miljö"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Webb/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "E-postservern Postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Databas"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL- eller MySQL-databasserver"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Brandvägg/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Internet-gateway"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Nätverksserver"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS-server, SMB-server, Proxyserver, SSH-server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Utvecklingsbibliotek, program och include-filer för C och C++"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentation"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Böcker och \"Howto's\" om Linux och fri mjukvara"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Stöd för tredjepartsprogram"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Kontorsarbetsstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,33 +114,38 @@ msgstr ""
 "Gnumeric), PDF-visare, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Spelstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Underhållande program: arkad, brädspel, strategi, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimediastation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Redigerings- och uppspelningsprogram för video och ljud"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Internetstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:65
+#, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -63,37 +154,44 @@ msgstr ""
 "Tin...) och för att utforska Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Nätverksdator (klient)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klienter för olika protokoll inkluderande SSH"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Verktyg för att underlätta konfigurationen av datorn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Konsollverktyg"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editorer, skal, filverktyg, terminaler"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE-arbetsstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -102,12 +200,14 @@ msgstr ""
 "tillhörande verktyg"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome-arbetsstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -115,89 +215,14 @@ msgstr ""
 "Grafisk miljö med en samling användarvänliga program och skrivbordsverktyg"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Andra grafiska skrivbordsmiljöer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Utvecklingsbibliotek, program och include-filer för C och C++"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentation"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Böcker och \"Howto's\" om Linux och fri mjukvara"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Stöd för tredjepartsprogram"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Webb/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "E-postservern Postfix"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Databas"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL- eller MySQL-databasserver"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Brandvägg/Router"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet-gateway"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Nätverksserver"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS-server, SMB-server, Proxyserver, SSH-server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Samling verktyg för att läsa och skicka e-post och nyheter och för att "
-"utforska Internet"
-
diff --git a/po/ta.pom b/po/ta.pom
index 610ec63d..24fabe1b 100644
--- a/po/ta.pom
+++ b/po/ta.pom
@@ -1,196 +1,221 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "சேவையகம்"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "வேலைக்களம்"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "வரைவியல்வழி சூழல்கள்"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "இணையதள/கோப்புப் பாிமாற்றம்"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "அப்பாச்சி, ftpd போன்ற பரிமாற்று நிரல்கள்"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, fuzzy, c-format
+msgid "Postfix mail server"
+msgstr "மின்னஞ்சல் பரிமாறி"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "தரவுதளங்கள்"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL/MySQL தரவுத்தள பரிமாறிகள்"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "நெருப்புச்சுவர்/வழிப்படுத்தி"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "இணைய நுழைவாயில்"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "வலையமைப்பக பரிமாறி"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS /சம்பா/பினாமி/ssh பரிமாறிகள்"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, 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
+#, c-format
+msgid "Documentation"
+msgstr "உதவிநூல்"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "புத்தகங்கள் மற்றும் எப்படிச் செய்வது போன்ற உதவி நூல்"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "LSB- லினக்ஸ் தரக்கட்டுப்பாட்டுக்கு தேவையான நிரல்கள்."
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "அலுவல் கருவிகள்"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
 msgstr "அலுவல் கருவிகள்(விாிதாள், நிகழ்த்தி,வரைபடக் கருவிகள்)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "விளையாட்டுகள்"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "விளையாட்டுகள்"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "பல்லூடக கணினி"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "பல்லூடக இயக்கிகள்/உருவாக்க நிரல்கள்"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "இணையக் கணினி"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:65
+#, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr "நீங்கள் மின்னஞ்சல், மற்றும் இணையத்ைத மேலோட உதவுங்கருவிகள்"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "வலையமைப்புக் கணினி(வேண்டி)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "ssh முதலிய வலையமைப்புக் கருவிகள்"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "உங்கள் கணினியை எளிதாக வடிவமைக்க உதவுங்கருவிகள்"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "முனையக் கருவிகள்"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "முனையம்,தொகுப்பாளர்கள், கோப்பு மேலாளர்கள் மற்றும் ஓடுகள்"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "Kசாளரமைப்பு பணிக்கணினி"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "Kசாளரமைப்பு-  ஓர் பயன்படுத்துவதற்கு எளிதான வரைவியல்வழி  மேலாளர்"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "குேனாம் பணிக்கணினி"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "ஓர் பயன்படுத்துவதற்கு எளிதான வரைவியல்வழி  மேலாளர்"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "மற்ற வரைவியல்வழி  மேலாளர்கள்"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "குேனாம், ஐஸ்விம் ஆகிய பயன்படுத்துவதற்கு எளிதான வரைவியல்வழி  மேலாளர்கள்"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-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:999
-msgid "Documentation"
-msgstr "உதவிநூல்"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "புத்தகங்கள் மற்றும் எப்படிச் செய்வது போன்ற உதவி நூல்"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "LSB- லினக்ஸ் தரக்கட்டுப்பாட்டுக்கு தேவையான நிரல்கள்."
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "இணையதள/கோப்புப் பாிமாற்றம்"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "அப்பாச்சி, ftpd போன்ற பரிமாற்று நிரல்கள்"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Postfix mail server"
-msgstr "மின்னஞ்சல் பரிமாறி"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "தரவுதளங்கள்"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL/MySQL தரவுத்தள பரிமாறிகள்"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "நெருப்புச்சுவர்/வழிப்படுத்தி"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "இணைய நுழைவாயில்"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "வலையமைப்பக பரிமாறி"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS /சம்பா/பினாமி/ssh பரிமாறிகள்"
-
-# 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 "நீங்கள் மின்னஞ்சல், மற்றும் இணையத்ைத மேலோட உதவுங்கருவிகள்"
-
diff --git a/po/tg.pom b/po/tg.pom
index 4ee98bf2..ec1a1710 100644
--- a/po/tg.pom
+++ b/po/tg.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Хидматрасон"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Истгоҳи корӣ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Муҳити Графикӣ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Хидматрасони пости Postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Манбаи маълумот"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Хидматрасони манбаи маълумоти PostgreSQL ё MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Фейрвол/Масиргузор"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Даричаи тадохули Интернет"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Хидматрасони Компютери Шабакавӣ"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, 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:35
+#, 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
+#, c-format
+msgid "Documentation"
+msgstr "Санадсозӣ"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, 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
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, c-format
 msgid "Office Workstation"
 msgstr "Истгоҳи Кории Идораӣ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "(kspread, gnumeric), pdf баррасҳо ва ғайра"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Истгоҳи бозӣ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Барномаҳои шавқовар: аркадаҳо, бозиҳои рӯи мизӣ, стратегия ва ғайра"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Истгоҳи бисёрмуҳита"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Барномаҳо барои бозикунии/таҳрири овоз ва видео"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Истгоҳи Интернет"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +154,44 @@ msgstr ""
 "баррасии Web"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Компютери Шабакавӣ (мизоҷ)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Мизоҷон барои қарордодҳои гуногун, аз он ҷумла ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Асбобҳо барои осоннамоии танзими компютери шумо"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Асбобҳои Нозиргоҳ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Муҳаррирон, пардозандаи фармонҳо, асбобҳои файлӣ, поёнаҳо"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "Истгоҳи кории KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -100,12 +199,14 @@ msgstr ""
 "K Муҳити Мизи Корӣ, ин муҳити графикии асосӣ бо маҷмӯи асбобҳои ҳамроҳкунанда"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Истгоҳи кории Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -114,88 +215,14 @@ msgstr ""
 "дошта"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Дигар Мизҳои Кории Графикӣ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, 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:999
-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:999
-msgid "Documentation"
-msgstr "Санадсозӣ"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Китобҳо ва Чӣ тавр дар Linux ва Таъминоти Барномавии Озод"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Манбаи Низоммеъёри Linux. Пуштибонии замимаҳои коргардонони сеюм"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Хидматрасони пости Postfix"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Манбаи маълумот"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Хидматрасони манбаи маълумоти PostgreSQL ё MySQL"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Фейрвол/Масиргузор"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Даричаи тадохули Интернет"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Хидматрасони Компютери Шабакавӣ"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-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:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Маҷмӯи асбобҳо барои хондан ва фиристодаи пост ё ахборот ва баррасии Web"
-
diff --git a/po/th.pom b/po/th.pom
index 2866f2dc..a53dacd8 100644
--- a/po/th.pom
+++ b/po/th.pom
@@ -1,206 +1,221 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "เซิร์ฟเวอร์"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Workstation ที่ทำงาน"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "การทำงานแบบกราฟฟิก"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, fuzzy, c-format
+msgid "Postfix mail server"
+msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, fuzzy, c-format
+msgid "Database"
+msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, fuzzy, c-format
+msgid "Internet gateway"
+msgstr "การติดต่อ internet"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, fuzzy, c-format
+msgid "Network Computer server"
+msgstr "เครื่องพิมพ์ในระบบ Network (Socket)"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, 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
+#, fuzzy, c-format
+msgid "Documentation"
+msgstr "ตำแหน่ง"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, c-format
 msgid "Office Workstation"
 msgstr "Workstation ที่ทำงาน"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:55
+#, fuzzy, c-format
 msgid "Game station"
 msgstr "Workstation ที่ทำงาน"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:59
+#, fuzzy, c-format
 msgid "Multimedia station"
 msgstr "Multimedia - เขียน CD "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:64
+#, fuzzy, c-format
 msgid "Internet station"
 msgstr "การเชื่อมต่อกับ Internet แบบ sharing"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:65
+#, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr "เครื่องมือในการอ่านและส่ง mail และ news (pine, mutt, tin..) และท่องอินเตอร์เน็ต"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:69
+#, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "เครื่องพิมพ์ในระบบ Network (Socket)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clients for different protocols including ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "เครืองมือที่ช่วยในการปรับแต่งเครื่องชองคุณให้ง่ายขึ้น"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:87
+#, fuzzy, c-format
 msgid "KDE Workstation"
 msgstr "Workstation ที่ทำงาน"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:92
+#, fuzzy, c-format
 msgid "GNOME Workstation"
 msgstr "Workstation ที่ทำงาน"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Graphical Desktops อื่นๆ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Documentation"
-msgstr "ตำแหน่ง"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Postfix mail server"
-msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Database"
-msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Internet gateway"
-msgstr "การติดต่อ internet"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Network Computer server"
-msgstr "เครื่องพิมพ์ในระบบ Network (Socket)"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr ""
-
-# 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 "เครื่องมือในการอ่านและส่ง mail และ news (pine, mutt, tin..) และท่องอินเตอร์เน็ต"
-
diff --git a/po/tl.pom b/po/tl.pom
index 130e9c2d..3518672f 100644
--- a/po/tl.pom
+++ b/po/tl.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Workstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Graphical na Kapaligiran"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix mail server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Database"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL o MySQL database server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Internet gateway"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Network Computer server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS server, SMB server, Proxy server, ssh server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "mga C at C++ development library, program at include file"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentasyon"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Mga Libro at Howto tungkol sa Linux at Free Software"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Suporta para sa mga third party application"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Pang-opisina na Workstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "spreadsheet (kspread, gnumeric), mga pdf viewer, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Pang-laro na istasyon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Mga nakakalibang na program: arcade, mga board game, strategy, etc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Pang-multimedia na istasyon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Mga program na pang-play/edit ng tunog, musika at video"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Pang-internet na istasyon"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +154,44 @@ msgstr ""
 "at pang-browse ng Web"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Network Computer (client)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Mga client para sa iba't-ibang mga protocol kasama ang ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Kagamitang pangpadali ng configuration ng inyong computer"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Kagamitang Pang-Console"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Mga editor, shell, file tool, terminal"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE Workstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,12 +200,14 @@ msgstr ""
 "koleksyon ng mga kasabay na kagamitan"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME Workstation"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -115,89 +216,14 @@ msgstr ""
 "gamitin) na application at kagamitang pang-desktop"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Ibang Mga Graphical Desktop"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "mga C at C++ development library, program at include file"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentasyon"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Mga Libro at Howto tungkol sa Linux at Free Software"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Suporta para sa mga third party application"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix mail server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Database"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL o MySQL database server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Router"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet gateway"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Network Computer server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS server, SMB server, Proxy server, ssh server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Kumpol ng mga kagamitang pangbasa at pangsulat ng mail at news at pang-"
-"browse ng Web"
-
diff --git a/po/tr.pom b/po/tr.pom
index 8b20d873..2466173e 100644
--- a/po/tr.pom
+++ b/po/tr.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Sunucu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "İş istasyonu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Grafik Ortamı"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache ve Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix posta sunucu"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Veritabanı"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL veya MySQL veritabanı sunucusu"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Güvenlik Kalkanı/Router"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Internet ağ geçidi"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Ağ Makinası sunucusu"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS sunucusu, SMB sunucusu, Vekil Sunucu, ssh Sunucu"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C ve C++ geliştirme kütüphaneleri, programlar ve include dosyaları"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Belgeler"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Serbest Yazılım ve Linux üzerine Kitaplar ve Nasıl belgeleri"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standartları Temeli. Üçüncü parti uygulama desteği"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Ofis iş istasyonu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,33 +114,38 @@ msgstr ""
 "göstericiler, vb.."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Oyun Konsolu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Eğlence programları: kart oyunları, taktik ve strateji, vb.."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Çoklu ortam konsolu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Ses ve video çalma/düzenleme uygulamaları"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Internet konsolu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:65
+#, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -63,49 +154,58 @@ msgstr ""
 "web istemcileri "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Ağ Makinası (client)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "ssh içeren diğer ağ öğeleri için protokoller"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Sisteminizin ayarlarını düzenleyecek uygulama"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Konsol Araçları"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Metin düzenleyiciler, kabuklar, dosya araçları, terminaller"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE İş istasyonu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "KDE Masaüstü Ortamı, temel grafik ortamla birlikte birleşik araçlar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME İş istasyonu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -113,87 +213,14 @@ msgstr ""
 "Kullanıcı dostu uygulamalar ve masaüstü araçlarına sahip görsel bir ortam "
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Diğer Görsel Masaüstleri"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C ve C++ geliştirme kütüphaneleri, programlar ve include dosyaları"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Belgeler"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Serbest Yazılım ve Linux üzerine Kitaplar ve Nasıl belgeleri"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standartları Temeli. Üçüncü parti uygulama desteği"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache ve Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix posta sunucu"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Veritabanı"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL veya MySQL veritabanı sunucusu"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Güvenlik Kalkanı/Router"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet ağ geçidi"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Ağ Makinası sunucusu"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS sunucusu, SMB sunucusu, Vekil Sunucu, ssh Sunucu"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "Webde dolaşmak , posta , haber okumak ve yollamak için araçları ayarla"
-
diff --git a/po/uk.pom b/po/uk.pom
index a7e67491..193a2ba0 100644
--- a/po/uk.pom
+++ b/po/uk.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Сервер"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Робоча станція"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Графічне середовище"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Тенета/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Поштовий сервер postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "База даних"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Сервери баз даних PostgreSQL або MySQL "
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Захисний шлюз/Маршрутизатор"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Інтернет-шлюз"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Мережевий комп'ютер (сервер)"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Сервер NFS, сервер SMB, проксі-сервер, сервер ssh"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, 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
+#, c-format
+msgid "Documentation"
+msgstr "Документація"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Книжки та ЯК ЗРОБИТИ про Лінакс та вільне програмне забезпечення"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, c-format
 msgid "Office Workstation"
 msgstr "Офісна робоча станція"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "таблиці (kspread, gnumeric), переглядачі файлів pdf, тощо"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Ігрова станція"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Програми для розваг: ігри-перегони, ігри на дошці, стратегічні, тощо"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Мультимедійна станція"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Звукові та відео програвачі та редактори"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Станція для Інтернету"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +154,44 @@ msgstr ""
 "(pine, mutt, tin..), та для перегляду інформаційних тенет"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Мережевий Комп'ютер (клієнт)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Клієнти для різних протоколів (ssh включно)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Засоби для полегшення конфіґурування Вашого комп'ютера"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Засоби для консолі"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Редактори, командні оболонки, файлові засоби та термінали"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "Робоча станція KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,12 +200,14 @@ msgstr ""
 "засобів"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Робоча станція Gnome"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -114,89 +215,14 @@ msgstr ""
 "Графічне середовище з дружнім інтерфейсом та програмами, засоби для стільниці"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Інші робочі середовища"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, 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:999
-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:999
-msgid "Documentation"
-msgstr "Документація"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Книжки та ЯК ЗРОБИТИ про Лінакс та вільне програмне забезпечення"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Стандартна база Лінакс. Підтримка програм сторонніх виробників"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Тенета/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Поштовий сервер postfix"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "База даних"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Сервери баз даних PostgreSQL або MySQL "
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Захисний шлюз/Маршрутизатор"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Інтернет-шлюз"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Мережевий комп'ютер (сервер)"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Сервер NFS, сервер SMB, проксі-сервер, сервер ssh"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Набір засобів для читання та передавання електронної пошти та новин,\n"
-"а також для перегляду тенет"
-
diff --git a/po/uz.pom b/po/uz.pom
index efdfb2ac..dae4368d 100644
--- a/po/uz.pom
+++ b/po/uz.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Сервер"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Иш станцияси"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "График муҳит"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix хат-хабар сервери"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Маълумот базаси"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL ёки MySQL маълумот базаси"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Файервол/Рутер"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Интернет гейтвэйи"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Тармоқдаги компьютер (сервер)"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, 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:35
+#, 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
+#, c-format
+msgid "Documentation"
+msgstr "Қўлланмалар"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Linux ва эркин дастурлар ҳақида китоблар ва Howto'лар"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, c-format
 msgid "Office Workstation"
 msgstr "Идора станцияси"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "жадваллар (kspread, gnumeric), PDF кўрувчилар ва ҳоказо"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Ўйин станцияси"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Овунчоқ дастурлар: аркада, стол ўйинлари, стратегия ва ҳоказо"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Мултимедиа станцияси"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Аудио ва видеони ўйнаш/таҳрирлаш учун дастурлар"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Интернет станцияси"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,49 +154,58 @@ msgstr ""
 "қилиш учун воситалар тўплами"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Тармоқдаги принтер (клиент)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Турли протоколлар, шу жумлада SSH, учун клиентлар"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Компьютерни мослашни енгилаштириш учун воситалар"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Консол воситалари"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Таҳрирчилар, консоллар, файл воситалари, терминаллар"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE станцияси"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "KDE - воситалар тўплами билан бирга асосий график муҳит"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME станцияси"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -113,89 +214,14 @@ msgstr ""
 "муҳит"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Бошқа график иш столлари"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, 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:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Қўлланмалар"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Linux ва эркин дастурлар ҳақида китоблар ва Howto'лар"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix хат-хабар сервери"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Маълумот базаси"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL ёки MySQL маълумот базаси"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Файервол/Рутер"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Интернет гейтвэйи"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Тармоқдаги компьютер (сервер)"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-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:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Хат-хабар, янгиликларни ўқиш ва жўнатиш ва Интернетда сайр қилиш учун "
-"воситалар тўплами"
-
diff --git a/po/uz@Latn.pom b/po/uz@Latn.pom
index 11dac64a..6e24bf78 100644
--- a/po/uz@Latn.pom
+++ b/po/uz@Latn.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Server"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Ish stantsiyasi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Grafik muhit"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix xat-xabar serveri"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Ma'lumot bazasi"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, 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:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Fayervol/Ruter"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Internet geytveyi"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Tarmoqdagi kompyuter (server)"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, 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:35
+#, 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
+#, c-format
+msgid "Documentation"
+msgstr "Qo'llanmalar"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, 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
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, 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
+#, c-format
 msgid "Office Workstation"
 msgstr "Idora stantsiyasi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,174 +114,114 @@ msgstr ""
 "jadvallar (kspread, gnumeric), PDF ko'ruvchilar va hokazo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "O'yin stantsiyasi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 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:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimedia stantsiyasi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 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:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Internet stantsiyasi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, 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"
+"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:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Tarmoqdagi printer (klient)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, 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:999
+#: share/compssUsers.pl:74
+#, 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:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Konsol vositalari"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, 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:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE stantsiyasi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "KDE - vositalar to'plami bilan birga asosiy grafik muhit"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME stantsiyasi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr ""
-"Foydalanuvchilar uchun qulay dasturlar va ish stoli vositalaridan iborat grafik "
-"muhit"
+"Foydalanuvchilar uchun qulay dasturlar va ish stoli vositalaridan iborat "
+"grafik muhit"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Boshqa grafik ish stollari"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, 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:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Qo'llanmalar"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-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:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix xat-xabar serveri"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Ma'lumot bazasi"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-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:999
-msgid "Firewall/Router"
-msgstr "Fayervol/Ruter"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet geytveyi"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Tarmoqdagi kompyuter (server)"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-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:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Xat-xabar, yangiliklarni o'qish va jo'natish va Internetda sayr qilish uchun "
-"vositalar to'plami"
-
diff --git a/po/vi.pom b/po/vi.pom
index 534a1fd6..79c8cd65 100644
--- a/po/vi.pom
+++ b/po/vi.pom
@@ -1,25 +1,112 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Máy chủ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Trạm làm việc"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Môi trường đồ hoạ"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache và Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Máy chủ thư Postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Cơ sở dữ liệu"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL hay MySQL máy chủ cơ sở dữ liệu"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Tường lửa/Định tuyến"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Cổng kết nối Internet"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Máy chủ mạng"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Máy chủ NFS, SMB, SSH, ủy nhiệm"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr ""
+"Các thư viện phát triển C và C++, các chương trình và các tập tin đi kèm"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Tài liệu"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Các sách, how-to cho Linux và phần mềm miễn phí"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Cơ Sở Về Chuẩn Linux (LSB). Hỗ trợ ứng dụng cho hãng thứ ba."
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Văn phòng"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,69 +115,82 @@ msgstr ""
 "(kspread, gnumeric), pdf viewers, v.v..."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Trò chơi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Các chương trình giải trí: arcade, boards, strategy, v.v..."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Đa phương tiện"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Các chương trình chơi Audio-Video/soạn thảo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Internet"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr "Bộ công cụ đọc gửi thư tín và tin tức (mutt, tin..) và để duyệt Web"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Máy tính mạng (khách)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Máy khách cho các giao thức khác bao gồm ssh"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Công cụ xoá cấu hình máy tính của bạn"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Các công cụ console"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Các trình soạn thảo, các tiện ích tập tin, các thiết bị đầu cuối"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -98,13 +198,14 @@ msgstr ""
 "K Desktop Environment, một môi trường đồ họa với một sưu tập tiện ích đi kèm"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:92
+#, fuzzy, c-format
 msgid "GNOME Workstation"
 msgstr "KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -112,88 +213,14 @@ msgstr ""
 "Môi trường đồ họa thân thiện cho các ứng dụng và các tiện ích màn hình nền"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Các màn hình nền đồ hoạ khác"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, v.v..."
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr ""
-"Các thư viện phát triển C và C++, các chương trình và các tập tin đi kèm"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Tài liệu"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Các sách, how-to cho Linux và phần mềm miễn phí"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Cơ Sở Về Chuẩn Linux (LSB). Hỗ trợ ứng dụng cho hãng thứ ba."
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache và Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Máy chủ thư Postfix"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Cơ sở dữ liệu"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL hay MySQL máy chủ cơ sở dữ liệu"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Tường lửa/Định tuyến"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Cổng kết nối Internet"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Máy chủ mạng"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Máy chủ NFS, SMB, SSH, ủy nhiệm"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "Bộ công cụ đọc và gửi thư, tin tức và duyệt Web"
-
diff --git a/po/wa.pom b/po/wa.pom
index 48ec0378..74f7cfaa 100644
--- a/po/wa.pom
+++ b/po/wa.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "Sierveu"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "Posse éndjolrece"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "Evironmint grafike"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Sierveu, Waibe/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache eyet Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Sierveu d' emilaedje postfix"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "Sierveu, båzes di dnêyes"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Sierveu båze di dnêyes PostgreSQL ou MySQL"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "Côpe feu/Routeu"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Pasrele pol rantoele daegnrece"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "Copiutrece sierveu sol rantoele"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Sierveu NFS, sierveu SMB, sierveu procsi, sierveu SSH"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Livreyes di programaedje C et C++, programes et fitchîs *.h"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Documentation"
+msgstr "Documintåcion"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Lives et Howtos so GNU/Linux et les libes programes"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Li «Linux Standard Base». Sopoirt po les programes tîces"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "Posse di buro"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,32 +114,38 @@ msgstr ""
 "gnumeric), håyneus pdf, evnd."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "Posse di djeus"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programes pasmints d' tins: årcåde, plateas, stratedjeye, evnd."
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "Posse multimedia"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programes po vey/schoûter/candjî des sons et videyos"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Posse pol rantoele daegnrece"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
@@ -62,37 +154,44 @@ msgstr ""
 "po naivyî so les pådjes waibe"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Copiutrece rantoele (cliyint)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Cliyints po les protocoles k' i gn a (ssh avou)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Usteyes po vos aveur pus åjhey d' apontyî vosse copiutrece"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Usteyes pol conzôle"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Aspougneus, shells, usteyes po fitchîs, terminås"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "Posse éndjolrece KDE"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
@@ -101,12 +200,14 @@ msgstr ""
 "coleccion d' usteyes ki vnèt avou"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Posse éndjolrece GNOME"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
@@ -115,89 +216,14 @@ msgstr ""
 "pol sicribanne"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Ôtes sicribannes grafikes"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, WindowMaker, Enlightenment, Fvwm, evnd."
 
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Livreyes di programaedje C et C++, programes et fitchîs *.h"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documintåcion"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Lives et Howtos so GNU/Linux et les libes programes"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Li «Linux Standard Base». Sopoirt po les programes tîces"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Sierveu, Waibe/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache eyet Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Sierveu d' emilaedje postfix"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Sierveu, båzes di dnêyes"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Sierveu båze di dnêyes PostgreSQL ou MySQL"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Côpe feu/Routeu"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Pasrele pol rantoele daegnrece"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Copiutrece sierveu sol rantoele"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Sierveu NFS, sierveu SMB, sierveu procsi, sierveu SSH"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Eshonna d' usteyes po lére et evoyî des messaedjes et po naivyî so les "
-"pådjes waibe"
-
diff --git a/po/zh_CN.pom b/po/zh_CN.pom
index ef866751..53ea3b16 100644
--- a/po/zh_CN.pom
+++ b/po/zh_CN.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "服务器"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "工作站"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "图形环境"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache 和 Pro-ftpd"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix 邮件服务器"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "数据库"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL 或 MySQL 数据库服务"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "防火墙/路由器"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Internet 网关"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "网络计算机服务器"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS 服务器，SMB 服务器，代理服务器，SSH 服务器"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, 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
+#, c-format
+msgid "Documentation"
+msgstr "文档"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, 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
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base。第三方应用程序支持"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "办公工作站"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -27,168 +113,110 @@ msgstr ""
 "办公程序: 字处理(kword、abiword)，电子表格(kspread、gnumeric)、pdf 阅读器等"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "游戏机"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "游戏程序: 街机、棋盘、战略等等"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "多媒体工作站"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "声音和视频播放/编辑程序"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Internet 工作站"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:65
+#, c-format
 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:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "网络计算机(客户端)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "SSH 等不同协议客户端"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "简化计算机配置的工具"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "控制台工具"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "编辑器，shell，文件工具，终端"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE 工作站"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "KDE 桌面环境，基本的图形环境和一组配套的工具"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME 工作站"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "配备了用户友善的应用程序与桌面工具的图形环境"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "其它图形桌面"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, 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:999
-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:999
-msgid "Documentation"
-msgstr "文档"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "有关 Linux 和自由软件的书籍和指南"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base。第三方应用程序支持"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache 和 Pro-ftpd"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix 邮件服务器"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "数据库"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL 或 MySQL 数据库服务"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "防火墙/路由器"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet 网关"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "网络计算机服务器"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS 服务器，SMB 服务器，代理服务器，SSH 服务器"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "一组上网工具，用于收发邮件和新闻，或者浏览网站"
-
diff --git a/po/zh_TW.pom b/po/zh_TW.pom
index 997db88c..01564712 100644
--- a/po/zh_TW.pom
+++ b/po/zh_TW.pom
@@ -1,25 +1,111 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Server"
 msgstr "伺服器"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Workstation"
 msgstr "工作站"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "圖形環境"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:10
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:11
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache、ProFTPD"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:15
+#, fuzzy, c-format
+msgid "Postfix mail server"
+msgstr "Postfix 郵件伺服器"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:18
+#, c-format
+msgid "Database"
+msgstr "資料庫軟體"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:19
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL、MySQL 資料庫"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:22
+#, c-format
+msgid "Firewall/Router"
+msgstr "防火牆/路由器"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:23
+#, c-format
+msgid "Internet gateway"
+msgstr "Internet 閘道器"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:26
+#, c-format
+msgid "Network Computer server"
+msgstr "網路伺服器"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS server、SMB server、Proxy server、Ssh server"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:35
+#, 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
+#, c-format
+msgid "Documentation"
+msgstr "文件檔案"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:39
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Linux 系統與一些免費軟體的書籍、HOWTO 文件"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:42
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "LSB 的支援，包含第三類協力廠商軟體支援"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:50
+#, c-format
 msgid "Office Workstation"
 msgstr "辦公軟體平台"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:51
+#, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
@@ -28,170 +114,111 @@ msgstr ""
 "讀程式等等"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:55
+#, c-format
 msgid "Game station"
 msgstr "遊戲平台"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:56
+#, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "娛樂的一些程式： 紙牌、益智、動作、策略 等"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:59
+#, c-format
 msgid "Multimedia station"
 msgstr "多媒體平台"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:60
+#, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "音效以及影像撥放編輯程式"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:64
+#, c-format
 msgid "Internet station"
 msgstr "Internet 平台"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
+#: share/compssUsers.pl:65
+#, 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 ..) 與及 web 瀏覽工具"
+msgstr ""
+"包含讀信、寫信以及閱讀網路論壇的工具 (pine、mutt、tin ..) 與及 web 瀏覽工具"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:69
+#, c-format
 msgid "Network Computer (client)"
 msgstr "用戶端網路環境"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:70
+#, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "包含 ssh 等其他不同通訊協定的用戶端程式"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:74
+#, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "讓您方便設定您系統的工具"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:78
+#, c-format
 msgid "Console Tools"
 msgstr "Console 工具"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:79
+#, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "編輯器, shell, 檔案工具, 終端機"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:87
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE 環境"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:88
+#, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "KDE 圖形桌面介面環境，包含許多好用的圖型介面工具程式"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:92
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome 環境"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:93
+#, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "包含友善的應用程式、桌面軟體的圖型化使用環境"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:96
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "其他圖型桌面軟體"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
+#: share/compssUsers.pl:97
+#, 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:999
-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:999
-msgid "Documentation"
-msgstr "文件檔案"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Linux 系統與一些免費軟體的書籍、HOWTO 文件"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "LSB 的支援，包含第三類協力廠商軟體支援"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache、ProFTPD"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Postfix mail server"
-msgstr "Postfix 郵件伺服器"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "資料庫軟體"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL、MySQL 資料庫"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "防火牆/路由器"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet 閘道器"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "網路伺服器"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS server、SMB server、Proxy server、Ssh server"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "包含讀信、寫信以及閱讀網路論壇的工具 (pine、mutt、tin ..) 與及 web 瀏覽工具"
-