diff --git a/po/Makefile b/po/Makefile
index b9635c42..8c52eb3b 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,7 +1,26 @@
-all: refresh-po
+XMLFILES=$(addprefix ../, $(shell cat POTFILES.in))
+POFILES=$(wildcard *.po)
 
-refresh-po:
+# intltool hack
+top_srcdir=..
+
+all:
+
+refresh-po: comps.pot $(POFILES)
+
+%.po: comps.pot
+	@if msgmerge $@ comps.pot > $@.new ; then \
+		echo "msgmerge of $@ succeeded" ; \
+		mv $@.new $@ ; \
+		msgfmt -o /dev/null --statistics $@ ; \
+	else \
+		echo "msgmerge of $@ failed" ; \
+		rm -f $@.new ; \
+	fi
+
+comps.pot: $(XMLFILES)
 	intltool-update --pot --gettext-package=comps
+	
 
 report:
 	for cat in *.po; do \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 575bbb6d..451921f7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1 +1,3 @@
 comps-fe5.xml.in
+comps-fe6.xml.in
+comps-f7.xml.in
diff --git a/po/comps.pot b/po/comps.pot
index bac05772..bc4366fb 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: 2007-03-29 10:21+0200\n"
+"POT-Creation-Date: 2007-04-19 17:26-0400\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"
@@ -16,360 +16,826 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../comps-fe5.xml.in.h:1
+#: ../comps-fe5.xml.in.h:1 ../comps-fe6.xml.in.h:1 ../comps-f7.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:2
+#: ../comps-fe5.xml.in.h:2 ../comps-fe6.xml.in.h:2 ../comps-f7.xml.in.h:2
 msgid "Administration Tools"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:3
+#: ../comps-fe5.xml.in.h:3 ../comps-fe6.xml.in.h:3 ../comps-f7.xml.in.h:4
 msgid "Applications"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:4
+#: ../comps-fe5.xml.in.h:4 ../comps-fe6.xml.in.h:4
 msgid "Applications for a variety of tasks"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:5
+#: ../comps-fe5.xml.in.h:5 ../comps-fe6.xml.in.h:5 ../comps-f7.xml.in.h:6
 msgid "Arabic Support"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:6
+#: ../comps-fe5.xml.in.h:6 ../comps-fe6.xml.in.h:6 ../comps-f7.xml.in.h:7
 msgid "Armenian Support"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:7
+#: ../comps-fe5.xml.in.h:7 ../comps-fe6.xml.in.h:7 ../comps-f7.xml.in.h:9
 msgid "Authoring and Publishing"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:8
+#: ../comps-fe5.xml.in.h:8 ../comps-fe6.xml.in.h:8 ../comps-f7.xml.in.h:11
 msgid "Base System"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:9
+#: ../comps-fe5.xml.in.h:9 ../comps-fe6.xml.in.h:10 ../comps-f7.xml.in.h:27
 msgid "Desktop Environments"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:10
+#: ../comps-fe5.xml.in.h:10 ../comps-fe6.xml.in.h:11 ../comps-f7.xml.in.h:28
 msgid "Desktop environments"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:11
+#: ../comps-fe5.xml.in.h:11 ../comps-fe6.xml.in.h:12 ../comps-f7.xml.in.h:29
 msgid "Development"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:12
+#: ../comps-fe5.xml.in.h:12 ../comps-fe6.xml.in.h:13 ../comps-f7.xml.in.h:31
 msgid "Development Tools"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:13
+#: ../comps-fe5.xml.in.h:13 ../comps-fe6.xml.in.h:14
 msgid "Dialup Networking Support"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:14
+#: ../comps-fe5.xml.in.h:14 ../comps-fe6.xml.in.h:15 ../comps-f7.xml.in.h:35
 msgid "Editors"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:15
+#: ../comps-fe5.xml.in.h:15 ../comps-fe6.xml.in.h:16 ../comps-f7.xml.in.h:36
 msgid "Educational Software"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:16
+#: ../comps-fe5.xml.in.h:16 ../comps-fe6.xml.in.h:17 ../comps-f7.xml.in.h:37
 msgid "Educational software for learning"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:17
+#: ../comps-fe5.xml.in.h:17 ../comps-fe6.xml.in.h:18 ../comps-f7.xml.in.h:39
 msgid "Engineering and Scientific"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:18
+#: ../comps-fe5.xml.in.h:18 ../comps-fe6.xml.in.h:19 ../comps-f7.xml.in.h:43
 msgid "FTP Server"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:19
+#: ../comps-fe5.xml.in.h:19 ../comps-fe6.xml.in.h:20 ../comps-f7.xml.in.h:47
 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:20
+#: ../comps-fe5.xml.in.h:20 ../comps-fe6.xml.in.h:21 ../comps-f7.xml.in.h:48
 msgid "GNOME Desktop Environment"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:21
+#: ../comps-fe5.xml.in.h:21 ../comps-fe6.xml.in.h:22 ../comps-f7.xml.in.h:49
 msgid "GNOME Software Development"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:22
+#: ../comps-fe5.xml.in.h:22 ../comps-fe6.xml.in.h:23
 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:23
+#: ../comps-fe5.xml.in.h:23 ../comps-fe6.xml.in.h:24 ../comps-f7.xml.in.h:53
 msgid "Games and Entertainment"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:24
+#: ../comps-fe5.xml.in.h:24 ../comps-fe6.xml.in.h:25 ../comps-f7.xml.in.h:55
 msgid "Graphical Internet"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:25
+#: ../comps-fe5.xml.in.h:25 ../comps-fe6.xml.in.h:26 ../comps-f7.xml.in.h:56
 msgid "Graphics"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:26
+#: ../comps-fe5.xml.in.h:26 ../comps-fe6.xml.in.h:27 ../comps-f7.xml.in.h:59
 msgid "Hardware Support"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:27
+#: ../comps-fe5.xml.in.h:27 ../comps-fe6.xml.in.h:28 ../comps-f7.xml.in.h:60
 msgid "Hebrew Support"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:28
+#: ../comps-fe5.xml.in.h:28 ../comps-fe6.xml.in.h:29 ../comps-f7.xml.in.h:65
 msgid ""
 "Install these packages in order to develop GTK+ and GNOME graphical "
 "applications."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:29
+#: ../comps-fe5.xml.in.h:29 ../comps-fe6.xml.in.h:30 ../comps-f7.xml.in.h:66
 msgid ""
 "Install these packages in order to develop GTK+ and XFCE graphical "
 "applications."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:30
+#: ../comps-fe5.xml.in.h:30 ../comps-fe6.xml.in.h:31 ../comps-f7.xml.in.h:67
 msgid "Install these packages to develop QT and KDE graphical applications."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:31
+#: ../comps-fe5.xml.in.h:31 ../comps-fe6.xml.in.h:32 ../comps-f7.xml.in.h:69
 msgid ""
 "Install this group of packages to use the base graphical (X) user interface."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:32
+#: ../comps-fe5.xml.in.h:32 ../comps-fe6.xml.in.h:33 ../comps-f7.xml.in.h:72
 msgid "Japanese Support"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:33
+#: ../comps-fe5.xml.in.h:33 ../comps-f7.xml.in.h:73
 msgid "Java"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:34
+#: ../comps-fe5.xml.in.h:34 ../comps-f7.xml.in.h:74
 msgid "Java Development"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:35
+#: ../comps-fe5.xml.in.h:35 ../comps-fe6.xml.in.h:34 ../comps-f7.xml.in.h:75
 msgid "KDE (K Desktop Environment)"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:36
+#: ../comps-fe5.xml.in.h:36 ../comps-fe6.xml.in.h:35 ../comps-f7.xml.in.h:76
 msgid "KDE Software Development"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:37
+#: ../comps-fe5.xml.in.h:37 ../comps-fe6.xml.in.h:36
 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:38
+#: ../comps-fe5.xml.in.h:38 ../comps-fe6.xml.in.h:37 ../comps-f7.xml.in.h:85
 msgid "Mail Server"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:39
+#: ../comps-fe5.xml.in.h:39 ../comps-fe6.xml.in.h:38 ../comps-f7.xml.in.h:90
 msgid "Network Servers"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:40
+#: ../comps-fe5.xml.in.h:40 ../comps-fe6.xml.in.h:39 ../comps-f7.xml.in.h:91
 msgid "News Server"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:41
+#: ../comps-fe5.xml.in.h:41 ../comps-fe6.xml.in.h:40 ../comps-f7.xml.in.h:94
 msgid "Office/Productivity"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:42
+#: ../comps-fe5.xml.in.h:42 ../comps-fe6.xml.in.h:41 ../comps-f7.xml.in.h:96
 msgid ""
 "Packages which provide functionality for developing and building "
 "applications."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:43
+#: ../comps-fe5.xml.in.h:43 ../comps-fe6.xml.in.h:42 ../comps-f7.xml.in.h:107
 msgid "Servers"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:44
+#: ../comps-fe5.xml.in.h:44 ../comps-fe6.xml.in.h:43 ../comps-f7.xml.in.h:108
 msgid ""
 "Simple window managers that aren't part of a larger desktop environment."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:45
+#: ../comps-fe5.xml.in.h:45 ../comps-fe6.xml.in.h:44 ../comps-f7.xml.in.h:113
 msgid "Software used for running network servers"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:46
+#: ../comps-fe5.xml.in.h:46 ../comps-fe6.xml.in.h:45
 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:47
+#: ../comps-fe5.xml.in.h:47 ../comps-fe6.xml.in.h:46 ../comps-f7.xml.in.h:115
 msgid "Sound and Video"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:48
+#: ../comps-fe5.xml.in.h:48 ../comps-f7.xml.in.h:119
 msgid "Support for developing programs in the Java programming language."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:49
+#: ../comps-fe5.xml.in.h:49 ../comps-f7.xml.in.h:120
 msgid "Support for running programs written in the Java programming language."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:50
+#: ../comps-fe5.xml.in.h:50 ../comps-fe6.xml.in.h:47 ../comps-f7.xml.in.h:123
 msgid "System Tools"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:51
+#: ../comps-fe5.xml.in.h:51 ../comps-fe6.xml.in.h:48 ../comps-f7.xml.in.h:126
 msgid "Text-based Internet"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:52
+#: ../comps-fe5.xml.in.h:52 ../comps-fe6.xml.in.h:49 ../comps-f7.xml.in.h:130
 msgid "The XEmacs text editor."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:53
+#: ../comps-fe5.xml.in.h:53 ../comps-fe6.xml.in.h:50 ../comps-f7.xml.in.h:131
 msgid "The applications include office suites, PDF viewers, and more."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:54
+#: ../comps-fe5.xml.in.h:54 ../comps-fe6.xml.in.h:51 ../comps-f7.xml.in.h:133
 msgid "These packages allow you to configure an IMAP or SMTP mail server."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:55
+#: ../comps-fe5.xml.in.h:55 ../comps-fe6.xml.in.h:52 ../comps-f7.xml.in.h:135
 msgid ""
 "These packages are helpful when developing web applications or web pages."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:56
+#: ../comps-fe5.xml.in.h:56 ../comps-fe6.xml.in.h:53
 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:57
+#: ../comps-fe5.xml.in.h:57 ../comps-fe6.xml.in.h:54 ../comps-f7.xml.in.h:142
 msgid "These tools allow you to run a Web server on the system."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:58
+#: ../comps-fe5.xml.in.h:58 ../comps-fe6.xml.in.h:55 ../comps-f7.xml.in.h:143
 msgid "These tools allow you to run an FTP server on the system."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:59
+#: ../comps-fe5.xml.in.h:59 ../comps-fe6.xml.in.h:56 ../comps-f7.xml.in.h:144
 msgid ""
 "These tools include core development tools such as automake, gcc, perl, "
 "python, and debuggers."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:60
+#: ../comps-fe5.xml.in.h:60 ../comps-fe6.xml.in.h:57 ../comps-f7.xml.in.h:145
 msgid "This group allows you to configure the system as a news server."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:61
+#: ../comps-fe5.xml.in.h:61 ../comps-fe6.xml.in.h:58 ../comps-f7.xml.in.h:148
 msgid "This group includes graphical email, Web, and chat clients."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:62
+#: ../comps-fe5.xml.in.h:62 ../comps-fe6.xml.in.h:59 ../comps-f7.xml.in.h:149
 msgid ""
 "This group includes packages for performing mathematical and scientific "
 "computations and plotting, as well as unit conversion."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:63
+#: ../comps-fe5.xml.in.h:63 ../comps-fe6.xml.in.h:60 ../comps-f7.xml.in.h:150
 msgid "This group includes packages to help you manipulate and scan images."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:64
+#: ../comps-fe5.xml.in.h:64 ../comps-fe6.xml.in.h:61 ../comps-f7.xml.in.h:151
 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:65
+#: ../comps-fe5.xml.in.h:65 ../comps-fe6.xml.in.h:62 ../comps-f7.xml.in.h:152
 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:66
+#: ../comps-fe5.xml.in.h:66 ../comps-fe6.xml.in.h:63
 msgid "This group is a collection of network servers for specific purposes"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:67
+#: ../comps-fe5.xml.in.h:67 ../comps-fe6.xml.in.h:64
 msgid ""
 "This group is a collection of tools and resources of Arabic environments."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:68
+#: ../comps-fe5.xml.in.h:68 ../comps-fe6.xml.in.h:65 ../comps-f7.xml.in.h:153
 msgid ""
 "This group is a collection of tools and resources of Armenian environments."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:69
+#: ../comps-fe5.xml.in.h:69 ../comps-fe6.xml.in.h:67
 msgid ""
 "This group is a collection of tools and resources of Hebrew environments."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:70
+#: ../comps-fe5.xml.in.h:70 ../comps-fe6.xml.in.h:68
 msgid ""
 "This group is a collection of tools and resources of Japanese environments."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:71
+#: ../comps-fe5.xml.in.h:71 ../comps-fe6.xml.in.h:69 ../comps-f7.xml.in.h:154
 msgid ""
 "This group is a collection of tools for various hardware specific utilities."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:72
+#: ../comps-fe5.xml.in.h:72 ../comps-fe6.xml.in.h:70 ../comps-f7.xml.in.h:155
 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:73
+#: ../comps-fe5.xml.in.h:73 ../comps-fe6.xml.in.h:71 ../comps-f7.xml.in.h:166
 msgid "Various core pieces of the system."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:74
+#: ../comps-fe5.xml.in.h:74 ../comps-fe6.xml.in.h:72 ../comps-f7.xml.in.h:167
 msgid "Various ways to relax and spend your free time."
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:75
+#: ../comps-fe5.xml.in.h:75 ../comps-fe6.xml.in.h:73 ../comps-f7.xml.in.h:170
 msgid "Web Development"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:76
+#: ../comps-fe5.xml.in.h:76 ../comps-fe6.xml.in.h:74 ../comps-f7.xml.in.h:171
 msgid "Web Server"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:77
+#: ../comps-fe5.xml.in.h:77 ../comps-fe6.xml.in.h:75 ../comps-f7.xml.in.h:173
 msgid "Window Managers"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:78
+#: ../comps-fe5.xml.in.h:78 ../comps-fe6.xml.in.h:76 ../comps-f7.xml.in.h:176
 msgid "X Window System"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:79
+#: ../comps-fe5.xml.in.h:79 ../comps-fe6.xml.in.h:77 ../comps-f7.xml.in.h:177
 msgid "XEmacs"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:80
+#: ../comps-fe5.xml.in.h:80 ../comps-fe6.xml.in.h:78 ../comps-f7.xml.in.h:178
 msgid "XFCE"
 msgstr ""
 
-#: ../comps-fe5.xml.in.h:81
+#: ../comps-fe5.xml.in.h:81 ../comps-fe6.xml.in.h:79 ../comps-f7.xml.in.h:179
 msgid "XFCE Software Development"
 msgstr ""
+
+#: ../comps-fe6.xml.in.h:9 ../comps-f7.xml.in.h:24
+msgid "Czech Support"
+msgstr ""
+
+#: ../comps-fe6.xml.in.h:66
+msgid ""
+"This group is a collection of tools and resources of Czech environments."
+msgstr ""
+
+#: ../comps-f7.xml.in.h:3
+msgid "Afrikaans Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:5
+msgid "Applications to perform a variety of tasks"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:8
+msgid "Assamese Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:10
+msgid "Base"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:12
+msgid "Basic support for the Ruby programming language."
+msgstr ""
+
+#: ../comps-f7.xml.in.h:13
+msgid "Basque Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:14
+msgid "Bengali Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:15
+msgid "Brazilian Portuguese Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:16
+msgid "Breton Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:17
+msgid "Bulgarian Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:18
+msgid "Catalan Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:19
+msgid "Chinese Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:20
+msgid "Clustering"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:21
+msgid "Clustering Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:22
+msgid "Core"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:23
+msgid "Croatian Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:25
+msgid "DNS Name Server"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:26
+msgid "Danish Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:30
+msgid "Development Libraries"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:32
+msgid "Dial-up Networking Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:33
+msgid "Dutch Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:34
+msgid "Eclipse"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:38
+msgid "Emacs"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:40
+msgid "English (UK) Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:41
+msgid "Estonian Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:42
+msgid "Ethiopic Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:44
+msgid "Faeroese Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:45
+msgid "Finnish Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:46
+msgid "French Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:50
+msgid ""
+"GNOME is a powerful graphical user interface which includes a panel, "
+"desktop, system icons, and a graphical file manager."
+msgstr ""
+
+#: ../comps-f7.xml.in.h:51
+msgid "Gaelic Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:52
+msgid "Galician Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:54
+msgid "German Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:57
+msgid "Greek Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:58
+msgid "Gujarati Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:61
+msgid "Hindi Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:62
+msgid "Hungarian Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:63
+msgid "Icelandic Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:64
+msgid "Indonesian Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:68
+msgid ""
+"Install these tools to enable the system to print or act as a print server."
+msgstr ""
+
+#: ../comps-f7.xml.in.h:70
+msgid "Irish Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:71
+msgid "Italian Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:77
+msgid ""
+"KDE is a powerful graphical user interface which includes a panel, desktop, "
+"system icons, and a graphical file manager."
+msgstr ""
+
+#: ../comps-f7.xml.in.h:78
+msgid "Kannada Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:79
+msgid "Korean Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:80
+msgid "Languages"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:81
+msgid "Legacy Network Server"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:82
+msgid "Legacy Software Development"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:83
+msgid "Legacy Software Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:84
+msgid "Lithuanian Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:86
+msgid "Malay Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:87
+msgid "Malayalam Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:88
+msgid "Marathi Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:89
+msgid "MySQL Database"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:92
+msgid "Northern Sotho Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:93
+msgid "Norwegian Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:95
+msgid "Oriya Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:97
+msgid "Polish Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:98
+msgid "Portuguese Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:99
+msgid "PostgreSQL Database"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:100
+msgid "Printing Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:101
+msgid "Punjabi Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:102
+msgid "Romanian Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:103
+msgid "Ruby"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:104
+msgid "Russian Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:105
+msgid "Serbian Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:106
+msgid "Server Configuration Tools"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:109
+msgid "Sinhala Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:110
+msgid "Slovak Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:111
+msgid "Slovenian Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:112
+msgid "Smallest possible installation"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:114
+msgid ""
+"Sometimes called text editors, these are programs that allow you to create "
+"and edit text files. This includes Emacs and Vi."
+msgstr ""
+
+#: ../comps-f7.xml.in.h:116
+msgid "Southern Ndebele Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:117
+msgid "Southern Sotho Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:118
+msgid "Spanish Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:121
+msgid "Swati Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:122
+msgid "Swedish Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:124
+msgid "Tamil Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:125
+msgid "Telugu Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:127
+msgid "Thai Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:128
+msgid "The Eclipse Integrated Development Environment."
+msgstr ""
+
+#: ../comps-f7.xml.in.h:129
+msgid "The GNU Emacs text editor."
+msgstr ""
+
+#: ../comps-f7.xml.in.h:132
+msgid ""
+"The packages in this group are core libraries needed to develop applications."
+msgstr ""
+
+#: ../comps-f7.xml.in.h:134
+msgid ""
+"These packages allow you to develop applications for the X Window System."
+msgstr ""
+
+#: ../comps-f7.xml.in.h:136
+msgid ""
+"These packages include network-based servers such as DHCP, Kerberos and NIS."
+msgstr ""
+
+#: ../comps-f7.xml.in.h:137
+msgid ""
+"These packages include servers for old network protocols such as rsh and "
+"telnet."
+msgstr ""
+
+#: ../comps-f7.xml.in.h:138
+msgid "These packages provide a virtualization environment."
+msgstr ""
+
+#: ../comps-f7.xml.in.h:139
+msgid "These packages provide compatibility with previous releases."
+msgstr ""
+
+#: ../comps-f7.xml.in.h:140
+msgid ""
+"These packages provide support for various locales including fonts and input "
+"methods."
+msgstr ""
+
+#: ../comps-f7.xml.in.h:141
+msgid ""
+"These tools allow you to create documents in the DocBook format and convert "
+"them into HTML, PDF, Postscript, and text."
+msgstr ""
+
+#: ../comps-f7.xml.in.h:146
+msgid "This group contains all of Red Hat's custom server configuration tools."
+msgstr ""
+
+#: ../comps-f7.xml.in.h:147
+msgid ""
+"This group includes a minimal set of packages. Useful for creating small "
+"router/firewall boxes, for example."
+msgstr ""
+
+#: ../comps-f7.xml.in.h:156
+msgid ""
+"This package group allows you to run a DNS name server (BIND) on the system."
+msgstr ""
+
+#: ../comps-f7.xml.in.h:157
+msgid ""
+"This package group allows you to share files between Linux and MS Windows"
+"(tm) systems."
+msgstr ""
+
+#: ../comps-f7.xml.in.h:158
+msgid "This package group contains packages useful for use with MySQL."
+msgstr ""
+
+#: ../comps-f7.xml.in.h:159
+msgid "This package group includes packages useful for use with Postgresql."
+msgstr ""
+
+#: ../comps-f7.xml.in.h:160
+msgid "Tibetan Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:161
+msgid "Tsonga Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:162
+msgid "Tswana Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:163
+msgid "Turkish Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:164
+msgid "Ukrainian Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:165
+msgid "Urdu Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:168
+msgid "Venda Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:169
+msgid "Virtualization"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:172
+msgid "Welsh Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:174
+msgid "Windows File Server"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:175
+msgid "X Software Development"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:180
+msgid "Xhosa Support"
+msgstr ""
+
+#: ../comps-f7.xml.in.h:181
+msgid "Zulu Support"
+msgstr ""
diff --git a/update-comps b/update-comps
index d1ce9602..7e835dc0 100755
--- a/update-comps
+++ b/update-comps
@@ -7,15 +7,5 @@ if [ -z "$COMPSFILE" ]; then
     exit 1
 fi
 
-cd po
-POS=$(ls *.po)
-LANGS=
-for po in $POS ; do
-  lang=$(echo $po |sed s/\.po//)
-  echo -n "$lang: "
-  LANG=C intltool-update --gettext-package=comps $lang
-done
-
-cd ..
 LANG=C intltool-merge -x -u po/ $COMPSFILE.in $COMPSFILE