diff --git a/comps-f7.xml.in b/comps-f7.xml.in
index d20c70f7..b04ceb6e 100644
--- a/comps-f7.xml.in
+++ b/comps-f7.xml.in
@@ -42,6 +42,7 @@
aspell-af
hunspell-af
+ moodle-af
openoffice.org-langpack-af_ZA
@@ -55,7 +56,9 @@
fonts-arabic
aspell-ar
+ eclipse-sdk-nls-ar
kde-i18n-Arabic
+ moodle-ar
openoffice.org-langpack-ar
dejavu-fonts
dejavu-fonts-experimental
@@ -363,7 +366,9 @@
false
eu
+ gcompris-sound-eu
koffice-langpack-eu
+ moodle-eu
openoffice.org-langpack-eu_ES
@@ -433,6 +438,7 @@
fonts-ISO8859-2-75dpi
hunspell-bg
kde-i18n-Bulgarian
+ moodle-bg
openoffice.org-langpack-bg_BG
@@ -448,6 +454,7 @@
hunspell-ca
kde-i18n-Catalan
koffice-langpack-ca
+ moodle-ca
openoffice.org-langpack-ca_ES
@@ -460,6 +467,7 @@
zh
fonts-chinese
+ eclipse-sdk-nls-zh
kde-i18n-Chinese
kde-i18n-Chinese-Big5
koffice-langpack-zh_CN
@@ -552,6 +560,7 @@
fonts-ISO8859-2-100dpi
fonts-ISO8859-2-75dpi
hunspell-hr
+ moodle-hr
openoffice.org-langpack-hr_HR
m17n-db-croatian
@@ -566,12 +575,15 @@
fonts-ISO8859-2
aspell-cs
+ eclipse-sdk-nls-cs
fonts-ISO8859-2-100dpi
fonts-ISO8859-2-75dpi
+ gcompris-sound-cs
hunspell-cs
kde-i18n-Czech
koffice-langpack-cs
man-pages-cs
+ moodle-cs
openoffice.org-dict-cs_CZ
openoffice.org-langpack-cs_CZ
@@ -585,10 +597,13 @@
da
aspell-da
+ eclipse-sdk-nls-da
+ gcompris-sound-da
hunspell-da
kde-i18n-Danish
koffice-langpack-da
man-pages-da
+ moodle-da
openoffice.org-langpack-da_DK
@@ -865,9 +880,12 @@
nl
aspell-nl
+ eclipse-sdk-nls-nl
+ gcompris-sound-nl
hunspell-nl
kde-i18n-Dutch
koffice-langpack-nl
+ moodle-nl
openoffice.org-langpack-nl
@@ -1054,6 +1072,7 @@
hunspell-ee
kde-i18n-Estonian
koffice-langpack-et
+ moodle-et
openoffice.org-langpack-et_EE
@@ -1088,8 +1107,11 @@
false
fi
+ eclipse-sdk-nls-fi
+ gcompris-sound-fi
kde-i18n-Finnish
koffice-langpack-fi
+ moodle-fi
openoffice.org-langpack-fi_FI
@@ -1102,10 +1124,13 @@
fr
aspell-fr
+ eclipse-sdk-nls-fr
+ gcompris-sound-fr
hunspell-fr
kde-i18n-French
koffice-langpack-fr
man-pages-fr
+ moodle-fr
openoffice.org-langpack-fr
@@ -1144,6 +1169,7 @@
aspell-gl
hunspell-gl
koffice-langpack-gl
+ moodle-gl
openoffice.org-langpack-gl_ES
@@ -1301,10 +1327,13 @@
de
aspell-de
+ eclipse-sdk-nls-de
+ gcompris-sound-de
hunspell-de
kde-i18n-German
koffice-langpack-de
man-pages-de
+ moodle-de
openoffice.org-langpack-de
@@ -1640,9 +1669,11 @@
el
aspell-el
+ eclipse-sdk-nls-el
hunspell-el
kde-i18n-Greek
koffice-langpack-el
+ moodle-el
openoffice.org-langpack-el_GR
m17n-db-greek
@@ -1658,6 +1689,7 @@
fonts-gujarati
m17n-db-gujarati
aspell-gu
+ moodle-gu
openoffice.org-langpack-gu_IN
@@ -1702,6 +1734,7 @@
aspell-he
hunspell-he
kde-i18n-Hebrew
+ moodle-he
openoffice.org-langpack-he_IL
dejavu-fonts
dejavu-fonts-experimental
@@ -1721,6 +1754,7 @@
m17n-db-hindi
aspell-hi
kde-i18n-Hindi
+ moodle-hi
openoffice.org-langpack-hi_IN
@@ -1733,11 +1767,14 @@
hu
fonts-ISO8859-2
+ eclipse-sdk-nls-hu
fonts-ISO8859-2-100dpi
fonts-ISO8859-2-75dpi
+ gcompris-sound-hu
hunspell-hu
kde-i18n-Hungarian
koffice-langpack-hu
+ moodle-hu
openoffice.org-langpack-hu_HU
@@ -1751,6 +1788,7 @@
aspell-is
kde-i18n-Icelandic
+ moodle-is
@@ -1762,6 +1800,7 @@
id
aspell-id
+ moodle-id
@@ -1775,6 +1814,7 @@
aspell-ga
hunspell-ga
koffice-langpack-ga
+ moodle-ga
openoffice.org-langpack-ga_IE
@@ -1787,10 +1827,13 @@
it
aspell-it
+ eclipse-sdk-nls-it
+ gcompris-sound-it
hunspell-it
kde-i18n-Italian
koffice-langpack-it
man-pages-it
+ moodle-it
openoffice.org-langpack-it
@@ -1803,9 +1846,11 @@
ja
fonts-japanese
+ eclipse-sdk-nls-ja
kde-i18n-Japanese
koffice-langpack-ja
man-pages-ja
+ moodle-ja
openoffice.org-langpack-ja_JP
scim-anthy
anthy
@@ -1967,6 +2012,7 @@
fonts-kannada
m17n-db-kannada
+ moodle-kn
openoffice.org-langpack-kn_IN
@@ -2085,11 +2131,12 @@
khmer-support
<_name>Khmer Support
<_description/>
- false
+ false
false
km
koffice-langpack-km
+ moodle-km
@@ -2101,8 +2148,10 @@
ko
fonts-korean
+ eclipse-sdk-nls-ko
kde-i18n-Korean
man-pages-ko
+ moodle-ko
openoffice.org-langpack-ko_KR
scim-hangul
lv
@@ -2112,11 +2161,12 @@
latvian-support
<_name>Latvian Support
<_description/>
- false
+ false
false
lv
koffice-langpack-lv
+ moodle-lv
@@ -2180,6 +2230,7 @@
hunspell-lt
kde-i18n-Lithuanian
+ moodle-lt
openoffice.org-langpack-lt_LT
@@ -2230,6 +2281,7 @@
hunspell-ms
koffice-langpack-ms
+ moodle-ms
openoffice.org-langpack-ms_MY
@@ -2243,6 +2295,7 @@
fonts-malayalam
m17n-db-malayalam
+ moodle-ml
openoffice.org-langpack-ml_IN
@@ -2257,6 +2310,7 @@
fonts-hindi
m17n-db-marathi
aspell-mr
+ gcompris-sound-mr
openoffice.org-langpack-mr_IN
@@ -2453,11 +2507,12 @@
persian-support
<_name>Persian Support
<_description/>
- false
+ false
false
fa
koffice-langpack-fa
+ moodle-fa
@@ -2470,12 +2525,14 @@
fonts-ISO8859-2
aspell-pl
+ eclipse-sdk-nls-pl
fonts-ISO8859-2-100dpi
fonts-ISO8859-2-75dpi
hunspell-pl
kde-i18n-Polish
koffice-langpack-pl
man-pages-pl
+ moodle-pl
openoffice.org-langpack-pl_PL
@@ -2488,9 +2545,12 @@
pt
aspell-pt
+ eclipse-sdk-nls-pt
+ gcompris-sound-pt
hunspell-pt
kde-i18n-Portuguese
koffice-langpack-pt
+ moodle-pt
openoffice.org-langpack-pt_PT
@@ -2540,6 +2600,7 @@
fonts-ISO8859-2-100dpi
fonts-ISO8859-2-75dpi
kde-i18n-Romanian
+ moodle-ro
@@ -2567,10 +2628,13 @@
fonts-KOI8-R
fonts-KOI8-R-100dpi
aspell-ru
+ eclipse-sdk-nls-ru
+ gcompris-sound-ru
hunspell-ru
kde-i18n-Russian
koffice-langpack-ru
man-pages-ru
+ moodle-ru
openoffice.org-langpack-ru
xorg-x11-fonts-cyrillic
fonts-KOI8-R-75dpi
@@ -2624,6 +2688,7 @@
fonts-sinhala
m17n-db-sinhala
+ moodle-si
scim-sinhala
@@ -2641,6 +2706,7 @@
hunspell-sk
kde-i18n-Slovak
koffice-langpack-sk
+ moodle-sk
openoffice.org-langpack-sk_SK
m17n-db-slovak
@@ -2660,6 +2726,7 @@
hunspell-sl
kde-i18n-Slovenian
koffice-langpack-sl
+ moodle-sl
openoffice.org-langpack-sl_SI
@@ -2800,10 +2867,13 @@
es
aspell-es
+ eclipse-sdk-nls-es
+ gcompris-sound-es
hunspell-es
kde-i18n-Spanish
koffice-langpack-es
man-pages-es
+ moodle-es
openoffice.org-langpack-es
@@ -2852,9 +2922,12 @@
sv
aspell-sv
+ eclipse-sdk-nls-sv
+ gcompris-sound-sv
hunspell-sv
kde-i18n-Swedish
koffice-langpack-sv
+ moodle-sv
openoffice.org-langpack-sv
m17n-db-swedish
@@ -3038,6 +3111,7 @@
m17n-db-tamil
aspell-ta
kde-i18n-Tamil
+ moodle-ta
openoffice.org-langpack-ta_IN
@@ -3105,6 +3179,7 @@
m17n-db-thai
hunspell-th
+ moodle-th
openoffice.org-langpack-th_TH
@@ -3150,8 +3225,11 @@
false
tr
+ eclipse-sdk-nls-tr
+ gcompris-sound-tr
kde-i18n-Turkish
koffice-langpack-tr
+ moodle-tr
openoffice.org-langpack-tr_TR
xorg-x11-fonts-ISO8859-9-100dpi
xorg-x11-fonts-ISO8859-9-75dpi
@@ -3169,6 +3247,8 @@
fonts-KOI8-R-100dpi
kde-i18n-Ukrainian
koffice-langpack-uk
+ man-pages-uk
+ moodle-uk
xorg-x11-fonts-cyrillic
fonts-KOI8-R-75dpi