diff --git a/comps-f7.xml.in b/comps-f7.xml.in
index b7ca0031..c2aba55f 100644
--- a/comps-f7.xml.in
+++ b/comps-f7.xml.in
@@ -380,6 +380,7 @@
       <packagereq type="optional">cernlib-utils</packagereq>
       <packagereq type="optional">dx</packagereq>
       <packagereq type="optional">dx-samples</packagereq>
+      <packagereq type="optional">funtools</packagereq>
       <packagereq type="optional">galculator</packagereq>
       <packagereq type="optional">gchempaint</packagereq>
       <packagereq type="optional">gdl</packagereq>
diff --git a/comps-fe5.xml.in b/comps-fe5.xml.in
index cb083eed..759c70f8 100644
--- a/comps-fe5.xml.in
+++ b/comps-fe5.xml.in
@@ -248,6 +248,7 @@
       <packagereq type="optional">cernlib-utils</packagereq>
       <packagereq type="optional">dx</packagereq>
       <packagereq type="optional">dx-samples</packagereq>
+      <packagereq type="optional">funtools</packagereq>
       <packagereq type="optional">galculator</packagereq>
       <packagereq type="optional">gdl</packagereq>
       <packagereq type="optional">geant321</packagereq>
diff --git a/comps-fe6.xml.in b/comps-fe6.xml.in
index 16d1bdf4..4b1b94bb 100644
--- a/comps-fe6.xml.in
+++ b/comps-fe6.xml.in
@@ -290,6 +290,7 @@
       <packagereq type="optional">cernlib-utils</packagereq>
       <packagereq type="optional">dx</packagereq>
       <packagereq type="optional">dx-samples</packagereq>
+      <packagereq type="optional">funtools</packagereq>
       <packagereq type="optional">galculator</packagereq>
       <packagereq type="optional">gdl</packagereq>
       <packagereq type="optional">geant321</packagereq>
diff --git a/comps-fe7.xml.in b/comps-fe7.xml.in
index b7ca0031..c2aba55f 100644
--- a/comps-fe7.xml.in
+++ b/comps-fe7.xml.in
@@ -380,6 +380,7 @@
       <packagereq type="optional">cernlib-utils</packagereq>
       <packagereq type="optional">dx</packagereq>
       <packagereq type="optional">dx-samples</packagereq>
+      <packagereq type="optional">funtools</packagereq>
       <packagereq type="optional">galculator</packagereq>
       <packagereq type="optional">gchempaint</packagereq>
       <packagereq type="optional">gdl</packagereq>
diff --git a/po/comps.pot b/po/comps.pot
index bff9fa77..bac05772 100644
--- a/po/comps.pot
+++ b/po/comps.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-30 10:38-0500\n"
+"POT-Creation-Date: 2007-03-29 10:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,320 +33,343 @@ msgid "Applications for a variety of tasks"
 msgstr ""
 
 #: ../comps-fe5.xml.in.h:5
-msgid "Authoring and Publishing"
+msgid "Arabic Support"
 msgstr ""
 
 #: ../comps-fe5.xml.in.h:6
-msgid "Base System"
+msgid "Armenian Support"
 msgstr ""
 
 #: ../comps-fe5.xml.in.h:7
-msgid "Desktop Environments"
+msgid "Authoring and Publishing"
 msgstr ""
 
 #: ../comps-fe5.xml.in.h:8
-msgid "Desktop environments"
+msgid "Base System"
 msgstr ""
 
 #: ../comps-fe5.xml.in.h:9
-msgid "Development"
+msgid "Desktop Environments"
 msgstr ""
 
 #: ../comps-fe5.xml.in.h:10
-msgid "Development Tools"
+msgid "Desktop environments"
 msgstr ""
 
 #: ../comps-fe5.xml.in.h:11
-msgid "Dialup Networking Support"
+msgid "Development"
 msgstr ""
 
 #: ../comps-fe5.xml.in.h:12
-msgid "Editors"
+msgid "Development Tools"
 msgstr ""
 
 #: ../comps-fe5.xml.in.h:13
-msgid "Educational Software"
+msgid "Dialup Networking Support"
 msgstr ""
 
 #: ../comps-fe5.xml.in.h:14
-msgid "Educational software for learning"
+msgid "Editors"
 msgstr ""
 
 #: ../comps-fe5.xml.in.h:15
-msgid "Engineering and Scientific"
+msgid "Educational Software"
 msgstr ""
 
 #: ../comps-fe5.xml.in.h:16
-msgid "FTP Server"
+msgid "Educational software for learning"
 msgstr ""
 
 #: ../comps-fe5.xml.in.h:17
+msgid "Engineering and Scientific"
+msgstr ""
+
+#: ../comps-fe5.xml.in.h:18
+msgid "FTP Server"
+msgstr ""
+
+#: ../comps-fe5.xml.in.h:19
 msgid ""
 "From CD recording to playing audio CDs and multimedia files, this package "
 "group allows you to work with sound and video on the system."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:18
+#: ../comps-fe5.xml.in.h:20
 msgid "GNOME Desktop Environment"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:19
+#: ../comps-fe5.xml.in.h:21
 msgid "GNOME Software Development"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:20
+#: ../comps-fe5.xml.in.h:22
 msgid ""
 "GNOME is a powerful, graphical user interface which includes a panel, "
 "desktop, system icons, and a graphical file manager."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:21
+#: ../comps-fe5.xml.in.h:23
 msgid "Games and Entertainment"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:22
+#: ../comps-fe5.xml.in.h:24
 msgid "Graphical Internet"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:23
+#: ../comps-fe5.xml.in.h:25
 msgid "Graphics"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:24
+#: ../comps-fe5.xml.in.h:26
 msgid "Hardware Support"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:25
+#: ../comps-fe5.xml.in.h:27
+msgid "Hebrew Support"
+msgstr ""
+
+#: ../comps-fe5.xml.in.h:28
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:26
+#: ../comps-fe5.xml.in.h:29
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:27
+#: ../comps-fe5.xml.in.h:30
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:28
+#: ../comps-fe5.xml.in.h:31
 msgid ""
 "Install this group of packages to use the base graphical (X) user interface."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:29
+#: ../comps-fe5.xml.in.h:32
 msgid "Japanese Support"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:30
+#: ../comps-fe5.xml.in.h:33
 msgid "Java"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:31
+#: ../comps-fe5.xml.in.h:34
 msgid "Java Development"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:32
+#: ../comps-fe5.xml.in.h:35
 msgid "KDE (K Desktop Environment)"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:33
+#: ../comps-fe5.xml.in.h:36
 msgid "KDE Software Development"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:34
+#: ../comps-fe5.xml.in.h:37
 msgid ""
 "KDE is a powerful, graphical user interface which includes a panel, desktop, "
 "system icons, and a graphical file manager."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:35
+#: ../comps-fe5.xml.in.h:38
 msgid "Mail Server"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:36
+#: ../comps-fe5.xml.in.h:39
 msgid "Network Servers"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:37
+#: ../comps-fe5.xml.in.h:40
 msgid "News Server"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:38
+#: ../comps-fe5.xml.in.h:41
 msgid "Office/Productivity"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:39
+#: ../comps-fe5.xml.in.h:42
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:40
+#: ../comps-fe5.xml.in.h:43
 msgid "Servers"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:41
+#: ../comps-fe5.xml.in.h:44
 msgid ""
 "Simple window managers that aren't part of a larger desktop environment."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:42
+#: ../comps-fe5.xml.in.h:45
 msgid "Software used for running network servers"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:43
+#: ../comps-fe5.xml.in.h:46
 msgid ""
 "Sometimes called text editors, these are programs that allow you to create "
 "and edit files. These include Emacs and Vi."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:44
+#: ../comps-fe5.xml.in.h:47
 msgid "Sound and Video"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:45
+#: ../comps-fe5.xml.in.h:48
 msgid "Support for developing programs in the Java programming language."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:46
+#: ../comps-fe5.xml.in.h:49
 msgid "Support for running programs written in the Java programming language."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:47
+#: ../comps-fe5.xml.in.h:50
 msgid "System Tools"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:48
+#: ../comps-fe5.xml.in.h:51
 msgid "Text-based Internet"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:49
+#: ../comps-fe5.xml.in.h:52
 msgid "The XEmacs text editor."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:50
+#: ../comps-fe5.xml.in.h:53
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:51
-msgid "These packages allow you to configure an IMAP or Postfix mail server."
-msgstr ""
-
-#: ../comps-fe5.xml.in.h:52
+#: ../comps-fe5.xml.in.h:54
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:53
+#: ../comps-fe5.xml.in.h:55
 msgid ""
 "These packages are helpful when developing web applications or web pages."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:54
+#: ../comps-fe5.xml.in.h:56
 msgid ""
 "These tools allow you to create documentation in the DocBook format and "
 "convert them to HTML, PDF, Postscript, and text."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:55
+#: ../comps-fe5.xml.in.h:57
 msgid "These tools allow you to run a Web server on the system."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:56
+#: ../comps-fe5.xml.in.h:58
 msgid "These tools allow you to run an FTP server on the system."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:57
+#: ../comps-fe5.xml.in.h:59
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:58
+#: ../comps-fe5.xml.in.h:60
 msgid "This group allows you to configure the system as a news server."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:59
+#: ../comps-fe5.xml.in.h:61
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:60
+#: ../comps-fe5.xml.in.h:62
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:61
+#: ../comps-fe5.xml.in.h:63
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:62
+#: ../comps-fe5.xml.in.h:64
 msgid ""
 "This group includes text-based email, Web, and chat clients. These "
 "applications do not require the X Window System."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:63
+#: ../comps-fe5.xml.in.h:65
 msgid ""
 "This group is a collection of graphical administration tools for the system, "
 "such as for managing user accounts and configuring system hardware."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:64
+#: ../comps-fe5.xml.in.h:66
 msgid "This group is a collection of network servers for specific purposes"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:65
+#: ../comps-fe5.xml.in.h:67
+msgid ""
+"This group is a collection of tools and resources of Arabic environments."
+msgstr ""
+
+#: ../comps-fe5.xml.in.h:68
+msgid ""
+"This group is a collection of tools and resources of Armenian environments."
+msgstr ""
+
+#: ../comps-fe5.xml.in.h:69
+msgid ""
+"This group is a collection of tools and resources of Hebrew environments."
+msgstr ""
+
+#: ../comps-fe5.xml.in.h:70
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:66
+#: ../comps-fe5.xml.in.h:71
 msgid ""
 "This group is a collection of tools for various hardware specific utilities."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:67
+#: ../comps-fe5.xml.in.h:72
 msgid ""
 "This group is a collection of various tools for the system, such as the "
 "client for connecting to SMB shares and tools to monitor network traffic."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:68
+#: ../comps-fe5.xml.in.h:73
 msgid "Various core pieces of the system."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:69
+#: ../comps-fe5.xml.in.h:74
 msgid "Various ways to relax and spend your free time."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:70
+#: ../comps-fe5.xml.in.h:75
 msgid "Web Development"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:71
+#: ../comps-fe5.xml.in.h:76
 msgid "Web Server"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:72
+#: ../comps-fe5.xml.in.h:77
 msgid "Window Managers"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:73
+#: ../comps-fe5.xml.in.h:78
 msgid "X Window System"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:74
+#: ../comps-fe5.xml.in.h:79
 msgid "XEmacs"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:75
+#: ../comps-fe5.xml.in.h:80
 msgid "XFCE"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:76
+#: ../comps-fe5.xml.in.h:81
 msgid "XFCE Software Development"
 msgstr ""