Sort order of the submodules

2 files changed, 303 insertions, 303 deletions

diff --git a/.gitmodules b/.gitmodules
index 8eec551cc..d36add7e3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,30 @@
-[submodule "main/dependencies/qt3"]
-	path = main/dependencies/qt3
-	url = http://system@scm.trinitydesktop.org/scm/git/qt3
-[submodule "main/common/cmake"]
-	path = main/common/cmake
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
+[submodule "scripts"]
+	path = scripts
+	url = http://system@scm.trinitydesktop.org/scm/git/scripts
+[submodule "experimental"]
+	path = experimental
+	url = http://system@scm.trinitydesktop.org/scm/git/experimental
 [submodule "main/common/admin"]
 	path = main/common/admin
 	url = http://system@scm.trinitydesktop.org/scm/git/tde-common-admin
+[submodule "main/common/cmake"]
+	path = main/common/cmake
+	url = http://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
+[submodule "main/common/libltdl"]
+	path = main/common/libltdl
+	url = http://system@scm.trinitydesktop.org/scm/git/libltdl
 [submodule "main/common/other"]
 	path = main/common/other
 	url = http://system@scm.trinitydesktop.org/scm/git/tde-common-other
+[submodule "main/dependencies/qt3"]
+	path = main/dependencies/qt3
+	url = http://system@scm.trinitydesktop.org/scm/git/qt3
+[submodule "main/dependencies/tqt3"]
+	path = main/dependencies/tqt3
+	url = http://system@scm.trinitydesktop.org/scm/git/tqt3
+[submodule "main/dependencies/tqtinterface"]
+	path = main/dependencies/tqtinterface
+	url = http://system@scm.trinitydesktop.org/scm/git/tqtinterface
 [submodule "main/dependencies/arts"]
 	path = main/dependencies/arts
 	url = http://system@scm.trinitydesktop.org/scm/git/arts
@@ -22,12 +37,90 @@
 [submodule "main/dependencies/dbus-tqt"]
 	path = main/dependencies/dbus-tqt
 	url = http://system@scm.trinitydesktop.org/scm/git/dbus-tqt
-[submodule "main/dependencies/tqtinterface"]
-	path = main/dependencies/tqtinterface
-	url = http://system@scm.trinitydesktop.org/scm/git/tqtinterface
-[submodule "main/libraries/kipi-plugins"]
-	path = main/libraries/kipi-plugins
-	url = http://system@scm.trinitydesktop.org/scm/git/kipi-plugins
+[submodule "main/dependencies/libart-lgpl"]
+	path = main/dependencies/libart-lgpl
+	url = http://system@scm.trinitydesktop.org/scm/git/libart-lgpl
+[submodule "main/dependencies/libcaldav"]
+	path = main/dependencies/libcaldav
+	url = http://system@scm.trinitydesktop.org/scm/git/libcaldav
+[submodule "main/dependencies/libcarddav"]
+	path = main/dependencies/libcarddav
+	url = http://system@scm.trinitydesktop.org/scm/git/libcarddav
+[submodule "main/dependencies/sip4-tqt"]
+	path = main/dependencies/sip4-tqt
+	url = http://system@scm.trinitydesktop.org/scm/git/sip4-tqt
+[submodule "main/dependencies/tqscintilla"]
+	path = main/dependencies/tqscintilla
+	url = http://system@scm.trinitydesktop.org/scm/git/tqscintilla
+[submodule "main/dependencies/python-tqt"]
+	path = main/dependencies/python-tqt
+	url = http://system@scm.trinitydesktop.org/scm/git/python-tqt
+[submodule "main/dependencies/tqca"]
+	path = main/dependencies/tqca
+	url = http://system@scm.trinitydesktop.org/scm/git/tqca
+[submodule "main/dependencies/tqca-tls"]
+	path = main/dependencies/tqca-tls
+	url = http://system@scm.trinitydesktop.org/scm/git/tqca-tls
+[submodule "main/tdelibs"]
+	path = main/tdelibs
+	url = http://system@scm.trinitydesktop.org/scm/git/tdelibs
+[submodule "main/tdebase"]
+	path = main/tdebase
+	url = http://system@scm.trinitydesktop.org/scm/git/tdebase
+[submodule "main/tdepim"]
+	path = main/tdepim
+	url = http://system@scm.trinitydesktop.org/scm/git/tdepim
+[submodule "main/tdemultimedia"]
+	path = main/tdemultimedia
+	url = http://system@scm.trinitydesktop.org/scm/git/tdemultimedia
+[submodule "main/tdenetwork"]
+	path = main/tdenetwork
+	url = http://system@scm.trinitydesktop.org/scm/git/tdenetwork
+[submodule "main/tdegraphics"]
+	path = main/tdegraphics
+	url = http://system@scm.trinitydesktop.org/scm/git/tdegraphics
+[submodule "main/tdetoys"]
+	path = main/tdetoys
+	url = http://system@scm.trinitydesktop.org/scm/git/tdetoys
+[submodule "main/tdeutils"]
+	path = main/tdeutils
+	url = http://system@scm.trinitydesktop.org/scm/git/tdeutils
+[submodule "main/tdeedu"]
+	path = main/tdeedu
+	url = http://system@scm.trinitydesktop.org/scm/git/tdeedu
+[submodule "main/tdegames"]
+	path = main/tdegames
+	url = http://system@scm.trinitydesktop.org/scm/git/tdegames
+[submodule "main/tdeaccessibility"]
+	path = main/tdeaccessibility
+	url = http://system@scm.trinitydesktop.org/scm/git/tdeaccessibility
+[submodule "main/tdeaddons"]
+	path = main/tdeaddons
+	url = http://system@scm.trinitydesktop.org/scm/git/tdeaddons
+[submodule "main/tdeadmin"]
+	path = main/tdeadmin
+	url = http://system@scm.trinitydesktop.org/scm/git/tdeadmin
+[submodule "main/tdeartwork"]
+	path = main/tdeartwork
+	url = http://system@scm.trinitydesktop.org/scm/git/tdeartwork
+[submodule "main/tdebindings"]
+	path = main/tdebindings
+	url = http://system@scm.trinitydesktop.org/scm/git/tdebindings
+[submodule "main/tdesdk"]
+	path = main/tdesdk
+	url = http://system@scm.trinitydesktop.org/scm/git/tdesdk
+[submodule "main/tdevelop"]
+	path = main/tdevelop
+	url = http://system@scm.trinitydesktop.org/scm/git/tdevelop
+[submodule "main/tdewebdev"]
+	path = main/tdewebdev
+	url = http://system@scm.trinitydesktop.org/scm/git/tdewebdev
+[submodule "main/tde-i18n"]
+	path = main/tde-i18n
+	url = http://system@scm.trinitydesktop.org/scm/git/tde-i18n
+[submodule "main/tde-construct"]
+	path = main/tde-construct
+	url = http://system@scm.trinitydesktop.org/scm/git/tde-construct
 [submodule "main/libraries/libkdcraw"]
 	path = main/libraries/libkdcraw
 	url = http://system@scm.trinitydesktop.org/scm/git/libkdcraw
@@ -40,18 +133,27 @@
 [submodule "main/libraries/libksquirrel"]
 	path = main/libraries/libksquirrel
 	url = http://system@scm.trinitydesktop.org/scm/git/libksquirrel
+[submodule "main/libraries/libtdeldap"]
+	path = main/libraries/libtdeldap
+	url = http://system@scm.trinitydesktop.org/scm/git/libtdeldap
+[submodule "main/libraries/libtqt-perl"]
+	path = main/libraries/libtqt-perl
+	url = http://system@scm.trinitydesktop.org/scm/git/libtqt-perl
+[submodule "main/libraries/kipi-plugins"]
+	path = main/libraries/kipi-plugins
+	url = http://system@scm.trinitydesktop.org/scm/git/kipi-plugins
 [submodule "main/libraries/mlt"]
 	path = main/libraries/mlt
 	url = http://system@scm.trinitydesktop.org/scm/git/mlt
 [submodule "main/libraries/mlt++"]
 	path = main/libraries/mlt++
 	url = http://system@scm.trinitydesktop.org/scm/git/mlt++
-[submodule "main/libraries/pytdeextensions"]
-	path = main/libraries/pytdeextensions
-	url = http://system@scm.trinitydesktop.org/scm/git/pytdeextensions
 [submodule "main/libraries/python-trinity"]
 	path = main/libraries/python-trinity
 	url = http://system@scm.trinitydesktop.org/scm/git/python-trinity
+[submodule "main/libraries/pytdeextensions"]
+	path = main/libraries/pytdeextensions
+	url = http://system@scm.trinitydesktop.org/scm/git/pytdeextensions
 [submodule "main/applications/abakus"]
 	path = main/applications/abakus
 	url = http://system@scm.trinitydesktop.org/scm/git/abakus
@@ -91,12 +193,21 @@
 [submodule "main/applications/gtk-qt-engine"]
 	path = main/applications/gtk-qt-engine
 	url = http://system@scm.trinitydesktop.org/scm/git/gtk-qt-engine
+[submodule "main/applications/gtk3-tqt-engine"]
+	path = main/applications/gtk3-tqt-engine
+	url = http://system@scm.trinitydesktop.org/scm/git/gtk3-tqt-engine
 [submodule "main/applications/gwenview"]
 	path = main/applications/gwenview
 	url = http://system@scm.trinitydesktop.org/scm/git/gwenview
+[submodule "main/applications/gwenview-i18n"]
+	path = main/applications/gwenview-i18n
+	url = http://system@scm.trinitydesktop.org/scm/git/gwenview-i18n
 [submodule "main/applications/k3b"]
 	path = main/applications/k3b
 	url = http://system@scm.trinitydesktop.org/scm/git/k3b
+[submodule "main/applications/k3b-i18n"]
+	path = main/applications/k3b-i18n
+	url = http://system@scm.trinitydesktop.org/scm/git/k3b-i18n
 [submodule "main/applications/k9copy"]
 	path = main/applications/k9copy
 	url = http://system@scm.trinitydesktop.org/scm/git/k9copy
@@ -106,6 +217,9 @@
 [submodule "main/applications/kaffeine-mozilla"]
 	path = main/applications/kaffeine-mozilla
 	url = http://system@scm.trinitydesktop.org/scm/git/kaffeine-mozilla
+[submodule "main/applications/kasablanca"]
+	path = main/applications/kasablanca
+	url = http://system@scm.trinitydesktop.org/scm/git/kasablanca
 [submodule "main/applications/katapult"]
 	path = main/applications/katapult
 	url = http://system@scm.trinitydesktop.org/scm/git/katapult
@@ -127,6 +241,18 @@
 [submodule "main/applications/kchmviewer"]
 	path = main/applications/kchmviewer
 	url = http://system@scm.trinitydesktop.org/scm/git/kchmviewer
+[submodule "main/applications/kcmautostart"]
+	path = main/applications/kcmautostart
+	url = http://system@scm.trinitydesktop.org/scm/git/kcmautostart
+[submodule "main/applications/kcmldap"]
+	path = main/applications/kcmldap
+	url = http://system@scm.trinitydesktop.org/scm/git/kcmldap
+[submodule "main/applications/kcmldapcontroller"]
+	path = main/applications/kcmldapcontroller
+	url = http://system@scm.trinitydesktop.org/scm/git/kcmldapcontroller
+[submodule "main/applications/kcmldapmanager"]
+	path = main/applications/kcmldapmanager
+	url = http://system@scm.trinitydesktop.org/scm/git/kcmldapmanager
 [submodule "main/applications/kcpuload"]
 	path = main/applications/kcpuload
 	url = http://system@scm.trinitydesktop.org/scm/git/kcpuload
@@ -136,42 +262,27 @@
 [submodule "main/applications/kdbusnotification"]
 	path = main/applications/kdbusnotification
 	url = http://system@scm.trinitydesktop.org/scm/git/kdbusnotification
-[submodule "main/applications/tde-guidance"]
-	path = main/applications/tde-guidance
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-guidance
-[submodule "main/applications/tde-style-lipstik"]
-	path = main/applications/tde-style-lipstik
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-style-lipstik
-[submodule "main/applications/tde-style-qtcurve"]
-	path = main/applications/tde-style-qtcurve
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-style-qtcurve
-[submodule "main/applications/tde-systemsettings"]
-	path = main/applications/tde-systemsettings
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-systemsettings
-[submodule "main/applications/tdesudo"]
-	path = main/applications/tdesudo
-	url = http://system@scm.trinitydesktop.org/scm/git/tdesudo
-[submodule "main/applications/tdesvn"]
-	path = main/applications/tdesvn
-	url = http://system@scm.trinitydesktop.org/scm/git/tdesvn
 [submodule "main/applications/kdiff3"]
 	path = main/applications/kdiff3
 	url = http://system@scm.trinitydesktop.org/scm/git/kdiff3
 [submodule "main/applications/kdirstat"]
 	path = main/applications/kdirstat
 	url = http://system@scm.trinitydesktop.org/scm/git/kdirstat
-[submodule "main/applications/tdmtheme"]
-	path = main/applications/tdmtheme
-	url = http://system@scm.trinitydesktop.org/scm/git/tdmtheme
 [submodule "main/applications/kdpkg"]
 	path = main/applications/kdpkg
 	url = http://system@scm.trinitydesktop.org/scm/git/kdpkg
 [submodule "main/applications/keep"]
 	path = main/applications/keep
 	url = http://system@scm.trinitydesktop.org/scm/git/keep
+[submodule "main/applications/kerberostray"]
+	path = main/applications/kerberostray
+	url = http://system@scm.trinitydesktop.org/scm/git/kerberostray
 [submodule "main/applications/kerry"]
 	path = main/applications/kerry
 	url = http://system@scm.trinitydesktop.org/scm/git/kerry
+[submodule "main/applications/kftpgrabber"]
+	path = main/applications/kftpgrabber
+	url = http://system@scm.trinitydesktop.org/scm/git/kftpgrabber
 [submodule "main/applications/kgtk-qt3"]
 	path = main/applications/kgtk-qt3
 	url = http://system@scm.trinitydesktop.org/scm/git/kgtk-qt3
@@ -181,18 +292,15 @@
 [submodule "main/applications/kima"]
 	path = main/applications/kima
 	url = http://system@scm.trinitydesktop.org/scm/git/kima
-[submodule "main/applications/tdeio-apt"]
-	path = main/applications/tdeio-apt
-	url = http://system@scm.trinitydesktop.org/scm/git/tdeio-apt
-[submodule "main/applications/tdeio-locate"]
-	path = main/applications/tdeio-locate
-	url = http://system@scm.trinitydesktop.org/scm/git/tdeio-locate
-[submodule "main/applications/tdeio-umountwrapper"]
-	path = main/applications/tdeio-umountwrapper
-	url = http://system@scm.trinitydesktop.org/scm/git/tdeio-umountwrapper
 [submodule "main/applications/kiosktool"]
 	path = main/applications/kiosktool
 	url = http://system@scm.trinitydesktop.org/scm/git/kiosktool
+[submodule "main/applications/kkbswitch"]
+	path = main/applications/kkbswitch
+	url = http://system@scm.trinitydesktop.org/scm/git/kkbswitch
+[submodule "main/applications/klcddimmer"]
+	path = main/applications/klcddimmer
+	url = http://system@scm.trinitydesktop.org/scm/git/klcddimmer
 [submodule "main/applications/kmplayer"]
 	path = main/applications/kmplayer
 	url = http://system@scm.trinitydesktop.org/scm/git/kmplayer
@@ -217,6 +325,9 @@
 [submodule "main/applications/knights"]
 	path = main/applications/knights
 	url = http://system@scm.trinitydesktop.org/scm/git/knights
+[submodule "main/applications/knmap"]
+	path = main/applications/knmap
+	url = http://system@scm.trinitydesktop.org/scm/git/knmap
 [submodule "main/applications/knowit"]
 	path = main/applications/knowit
 	url = http://system@scm.trinitydesktop.org/scm/git/knowit
@@ -226,6 +337,9 @@
 [submodule "main/applications/koffice"]
 	path = main/applications/koffice
 	url = http://system@scm.trinitydesktop.org/scm/git/koffice
+[submodule "main/applications/koffice-i18n"]
+	path = main/applications/koffice-i18n
+	url = http://system@scm.trinitydesktop.org/scm/git/koffice-i18n
 [submodule "main/applications/konversation"]
 	path = main/applications/konversation
 	url = http://system@scm.trinitydesktop.org/scm/git/konversation
@@ -241,15 +355,24 @@
 [submodule "main/applications/kpowersave"]
 	path = main/applications/kpowersave
 	url = http://system@scm.trinitydesktop.org/scm/git/kpowersave
-[submodule "main/applications/tderadio"]
-	path = main/applications/tderadio
-	url = http://system@scm.trinitydesktop.org/scm/git/tderadio
+[submodule "main/applications/krecipes"]
+	path = main/applications/krecipes
+	url = http://system@scm.trinitydesktop.org/scm/git/krecipes
 [submodule "main/applications/krename"]
 	path = main/applications/krename
 	url = http://system@scm.trinitydesktop.org/scm/git/krename
 [submodule "main/applications/krusader"]
 	path = main/applications/krusader
 	url = http://system@scm.trinitydesktop.org/scm/git/krusader
+[submodule "main/applications/ksensors"]
+	path = main/applications/ksensors
+	url = http://system@scm.trinitydesktop.org/scm/git/ksensors
+[submodule "main/applications/kshowmail"]
+	path = main/applications/kshowmail
+	url = http://system@scm.trinitydesktop.org/scm/git/kshowmail
+[submodule "main/applications/kshutdown"]
+	path = main/applications/kshutdown
+	url = http://system@scm.trinitydesktop.org/scm/git/kshutdown
 [submodule "main/applications/ksplash-engine-moodin"]
 	path = main/applications/ksplash-engine-moodin
 	url = http://system@scm.trinitydesktop.org/scm/git/ksplash-engine-moodin
@@ -277,15 +400,21 @@
 [submodule "main/applications/kvkbd"]
 	path = main/applications/kvkbd
 	url = http://system@scm.trinitydesktop.org/scm/git/kvkbd
-[submodule "main/applications/twin-style-crystal"]
-	path = main/applications/twin-style-crystal
-	url = http://system@scm.trinitydesktop.org/scm/git/twin-style-crystal
+[submodule "main/applications/kvpnc"]
+	path = main/applications/kvpnc
+	url = http://system@scm.trinitydesktop.org/scm/git/kvpnc
+[submodule "main/applications/mplayerthumbs"]
+	path = main/applications/mplayerthumbs
+	url = http://system@scm.trinitydesktop.org/scm/git/mplayerthumbs
 [submodule "main/applications/piklab"]
 	path = main/applications/piklab
 	url = http://system@scm.trinitydesktop.org/scm/git/piklab
 [submodule "main/applications/potracegui"]
 	path = main/applications/potracegui
 	url = http://system@scm.trinitydesktop.org/scm/git/potracegui
+[submodule "main/applications/qt4-tqt-theme-engine"]
+	path = main/applications/qt4-tqt-theme-engine
+	url = http://system@scm.trinitydesktop.org/scm/git/qt4-tqt-theme-engine
 [submodule "main/applications/rosegarden"]
 	path = main/applications/rosegarden
 	url = http://system@scm.trinitydesktop.org/scm/git/rosegarden
@@ -298,198 +427,69 @@
 [submodule "main/applications/soundkonverter"]
 	path = main/applications/soundkonverter
 	url = http://system@scm.trinitydesktop.org/scm/git/soundkonverter
+[submodule "main/applications/tde-guidance"]
+	path = main/applications/tde-guidance
+	url = http://system@scm.trinitydesktop.org/scm/git/tde-guidance
+[submodule "main/applications/tde-style-lipstik"]
+	path = main/applications/tde-style-lipstik
+	url = http://system@scm.trinitydesktop.org/scm/git/tde-style-lipstik
+[submodule "main/applications/tde-style-qtcurve"]
+	path = main/applications/tde-style-qtcurve
+	url = http://system@scm.trinitydesktop.org/scm/git/tde-style-qtcurve
+[submodule "main/applications/tde-systemsettings"]
+	path = main/applications/tde-systemsettings
+	url = http://system@scm.trinitydesktop.org/scm/git/tde-systemsettings
+[submodule "main/applications/tdeio-apt"]
+	path = main/applications/tdeio-apt
+	url = http://system@scm.trinitydesktop.org/scm/git/tdeio-apt
+[submodule "main/applications/tdeio-ftps"]
+	path = main/applications/tdeio-ftps
+	url = http://system@scm.trinitydesktop.org/scm/git/tdeio-ftps
+[submodule "main/applications/tdeio-locate"]
+	path = main/applications/tdeio-locate
+	url = http://system@scm.trinitydesktop.org/scm/git/tdeio-locate
 [submodule "main/applications/tdeio-sword"]
 	path = main/applications/tdeio-sword
 	url = http://system@scm.trinitydesktop.org/scm/git/tdeio-sword
+[submodule "main/applications/tdeio-umountwrapper"]
+	path = main/applications/tdeio-umountwrapper
+	url = http://system@scm.trinitydesktop.org/scm/git/tdeio-umountwrapper
+[submodule "main/applications/tdenetworkmanager"]
+	path = main/applications/tdenetworkmanager
+	url = http://system@scm.trinitydesktop.org/scm/git/tdenetworkmanager
+[submodule "main/applications/tdepowersave"]
+	path = main/applications/tdepowersave
+	url = http://system@scm.trinitydesktop.org/scm/git/tdepowersave
+[submodule "main/applications/tderadio"]
+	path = main/applications/tderadio
+	url = http://system@scm.trinitydesktop.org/scm/git/tderadio
+[submodule "main/applications/tdesudo"]
+	path = main/applications/tdesudo
+	url = http://system@scm.trinitydesktop.org/scm/git/tdesudo
+[submodule "main/applications/tdesvn"]
+	path = main/applications/tdesvn
+	url = http://system@scm.trinitydesktop.org/scm/git/tdesvn
+[submodule "main/applications/tdmtheme"]
+	path = main/applications/tdmtheme
+	url = http://system@scm.trinitydesktop.org/scm/git/tdmtheme
 [submodule "main/applications/tellico"]
 	path = main/applications/tellico
 	url = http://system@scm.trinitydesktop.org/scm/git/tellico
+[submodule "main/applications/tork"]
+	path = main/applications/tork
+	url = http://system@scm.trinitydesktop.org/scm/git/tork
+[submodule "main/applications/twin-style-crystal"]
+	path = main/applications/twin-style-crystal
+	url = http://system@scm.trinitydesktop.org/scm/git/twin-style-crystal
 [submodule "main/applications/wlassistant"]
 	path = main/applications/wlassistant
 	url = http://system@scm.trinitydesktop.org/scm/git/wlassistant
 [submodule "main/applications/yakuake"]
 	path = main/applications/yakuake
 	url = http://system@scm.trinitydesktop.org/scm/git/yakuake
-[submodule "main/tde-i18n"]
-	path = main/tde-i18n
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-i18n
-[submodule "main/tdeaccessibility"]
-	path = main/tdeaccessibility
-	url = http://system@scm.trinitydesktop.org/scm/git/tdeaccessibility
-[submodule "main/tdeaddons"]
-	path = main/tdeaddons
-	url = http://system@scm.trinitydesktop.org/scm/git/tdeaddons
-[submodule "main/tdeadmin"]
-	path = main/tdeadmin
-	url = http://system@scm.trinitydesktop.org/scm/git/tdeadmin
-[submodule "main/tdeartwork"]
-	path = main/tdeartwork
-	url = http://system@scm.trinitydesktop.org/scm/git/tdeartwork
-[submodule "main/tdebase"]
-	path = main/tdebase
-	url = http://system@scm.trinitydesktop.org/scm/git/tdebase
-[submodule "main/tdebindings"]
-	path = main/tdebindings
-	url = http://system@scm.trinitydesktop.org/scm/git/tdebindings
-[submodule "main/tdeedu"]
-	path = main/tdeedu
-	url = http://system@scm.trinitydesktop.org/scm/git/tdeedu
-[submodule "main/tdegames"]
-	path = main/tdegames
-	url = http://system@scm.trinitydesktop.org/scm/git/tdegames
-[submodule "main/tdegraphics"]
-	path = main/tdegraphics
-	url = http://system@scm.trinitydesktop.org/scm/git/tdegraphics
-[submodule "main/tdelibs"]
-	path = main/tdelibs
-	url = http://system@scm.trinitydesktop.org/scm/git/tdelibs
-[submodule "main/tdemultimedia"]
-	path = main/tdemultimedia
-	url = http://system@scm.trinitydesktop.org/scm/git/tdemultimedia
-[submodule "main/tdenetwork"]
-	path = main/tdenetwork
-	url = http://system@scm.trinitydesktop.org/scm/git/tdenetwork
-[submodule "main/tdepim"]
-	path = main/tdepim
-	url = http://system@scm.trinitydesktop.org/scm/git/tdepim
-[submodule "main/tdesdk"]
-	path = main/tdesdk
-	url = http://system@scm.trinitydesktop.org/scm/git/tdesdk
-[submodule "main/tdetoys"]
-	path = main/tdetoys
-	url = http://system@scm.trinitydesktop.org/scm/git/tdetoys
-[submodule "main/tdeutils"]
-	path = main/tdeutils
-	url = http://system@scm.trinitydesktop.org/scm/git/tdeutils
-[submodule "main/tdevelop"]
-	path = main/tdevelop
-	url = http://system@scm.trinitydesktop.org/scm/git/tdevelop
-[submodule "main/tdewebdev"]
-	path = main/tdewebdev
-	url = http://system@scm.trinitydesktop.org/scm/git/tdewebdev
-[submodule "main/tde-construct"]
-	path = main/tde-construct
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-construct
-[submodule "experimental"]
-	path = experimental
-	url = http://system@scm.trinitydesktop.org/scm/git/experimental
-[submodule "main/dependencies/tqt3"]
-	path = main/dependencies/tqt3
-	url = http://system@scm.trinitydesktop.org/scm/git/tqt3
-[submodule "main/dependencies/sip4-tqt"]
-	path = main/dependencies/sip4-tqt
-	url = http://system@scm.trinitydesktop.org/scm/git/sip4-tqt
-[submodule "main/dependencies/python-tqt"]
-	path = main/dependencies/python-tqt
-	url = http://system@scm.trinitydesktop.org/scm/git/python-tqt
-[submodule "main/dependencies/tqscintilla"]
-	path = main/dependencies/tqscintilla
-	url = http://system@scm.trinitydesktop.org/scm/git/tqscintilla
-[submodule "main/applications/kvpnc"]
-	path = main/applications/kvpnc
-	url = http://system@scm.trinitydesktop.org/scm/git/kvpnc
-[submodule "main/dependencies/libart-lgpl"]
-	path = main/dependencies/libart-lgpl
-	url = http://system@scm.trinitydesktop.org/scm/git/libart-lgpl
-[submodule "main/dependencies/libcaldav"]
-	path = main/dependencies/libcaldav
-	url = http://system@scm.trinitydesktop.org/scm/git/libcaldav
-[submodule "main/dependencies/libcarddav"]
-	path = main/dependencies/libcarddav
-	url = http://system@scm.trinitydesktop.org/scm/git/libcarddav
-[submodule "main/dependencies/tqca-tls"]
-	path = main/dependencies/tqca-tls
-	url = http://system@scm.trinitydesktop.org/scm/git/tqca-tls
-[submodule "main/libraries/libtqt-perl"]
-	path = main/libraries/libtqt-perl
-	url = http://system@scm.trinitydesktop.org/scm/git/libtqt-perl
-[submodule "main/dependencies/tqca"]
-	path = main/dependencies/tqca
-	url = http://system@scm.trinitydesktop.org/scm/git/tqca
-[submodule "main/applications/qt4-tqt-theme-engine"]
-	path = main/applications/qt4-tqt-theme-engine
-	url = http://system@scm.trinitydesktop.org/scm/git/qt4-tqt-theme-engine
-[submodule "main/applications/kcmautostart"]
-	path = main/applications/kcmautostart
-	url = http://system@scm.trinitydesktop.org/scm/git/kcmautostart
-[submodule "main/common/libltdl"]
-	path = main/common/libltdl
-	url = http://system@scm.trinitydesktop.org/scm/git/libltdl
-[submodule "main/applications/k3b-i18n"]
-	path = main/applications/k3b-i18n
-	url = http://system@scm.trinitydesktop.org/scm/git/k3b-i18n
-[submodule "main/applications/koffice-i18n"]
-	path = main/applications/koffice-i18n
-	url = http://system@scm.trinitydesktop.org/scm/git/koffice-i18n
-[submodule "main/applications/gwenview-i18n"]
-	path = main/applications/gwenview-i18n
-	url = http://system@scm.trinitydesktop.org/scm/git/gwenview-i18n
 [submodule "main/infrastructure/website"]
 	path = main/infrastructure/website
 	url = http://system@scm.trinitydesktop.org/scm/git/trinitydesktopwebsite
-[submodule "main/libraries/libtdeldap"]
-	path = main/libraries/libtdeldap
-	url = http://system@scm.trinitydesktop.org/scm/git/libtdeldap
-[submodule "main/applications/kerberostray"]
-	path = main/applications/kerberostray
-	url = http://system@scm.trinitydesktop.org/scm/git/kerberostray
-[submodule "main/applications/gtk3-tqt-engine"]
-	path = main/applications/gtk3-tqt-engine
-	url = http://system@scm.trinitydesktop.org/scm/git/gtk3-tqt-engine
-[submodule "main/applications/kcmldap"]
-	path = main/applications/kcmldap
-	url = http://system@scm.trinitydesktop.org/scm/git/kcmldap
-[submodule "main/applications/kcmldapmanager"]
-	path = main/applications/kcmldapmanager
-	url = http://system@scm.trinitydesktop.org/scm/git/kcmldapmanager
-[submodule "main/applications/kcmldapcontroller"]
-	path = main/applications/kcmldapcontroller
-	url = http://system@scm.trinitydesktop.org/scm/git/kcmldapcontroller
-[submodule "scripts"]
-	path = scripts
-	url = http://system@scm.trinitydesktop.org/scm/git/scripts
 [submodule "main/thirdparty"]
 	path = main/thirdparty
 	url = http://system@scm.trinitydesktop.org/scm/git/thirdparty
-[submodule "main/applications/tdenetworkmanager"]
-	path = main/applications/tdenetworkmanager
-	url = http://system@scm.trinitydesktop.org/scm/git/tdenetworkmanager
-[submodule "main/applications/tdepowersave"]
-	path = main/applications/tdepowersave
-	url = http://system@scm.trinitydesktop.org/scm/git/tdepowersave
-[submodule "main/applications/mplayerthumbs"]
-	path = main/applications/mplayerthumbs
-	url = http://system@scm.trinitydesktop.org/scm/git/mplayerthumbs
-[submodule "main/applications/kasablanca"]
-	path = main/applications/kasablanca
-	url = http://system@scm.trinitydesktop.org/scm/git/kasablanca
-[submodule "main/applications/ksensors"]
-	path = main/applications/ksensors
-	url = http://system@scm.trinitydesktop.org/scm/git/ksensors
-[submodule "main/applications/knmap"]
-	path = main/applications/knmap
-	url = http://system@scm.trinitydesktop.org/scm/git/knmap
-[submodule "main/applications/tdeio-ftps"]
-	path = main/applications/tdeio-ftps
-	url = http://system@scm.trinitydesktop.org/scm/git/tdeio-ftps
-[submodule "main/applications/kftpgrabber"]
-	path = main/applications/kftpgrabber
-	url = http://system@scm.trinitydesktop.org/scm/git/kftpgrabber
-[submodule "main/applications/kshowmail"]
-	path = main/applications/kshowmail
-	url = http://system@scm.trinitydesktop.org/scm/git/kshowmail
-[submodule "main/applications/tork"]
-	path = main/applications/tork
-	url = http://system@scm.trinitydesktop.org/scm/git/tork
-[submodule "main/applications/kshutdown"]
-	path = main/applications/kshutdown
-	url = http://system@scm.trinitydesktop.org/scm/git/kshutdown
-[submodule "main/applications/krecipes"]
-	path = main/applications/krecipes
-	url = http://system@scm.trinitydesktop.org/scm/git/krecipes
-[submodule "main/applications/kkbswitch"]
-	path = main/applications/kkbswitch
-	url = http://system@scm.trinitydesktop.org/scm/git/kkbswitch
-[submodule "main/applications/klcddimmer"]
-	path = main/applications/klcddimmer
-	url = http://system@scm.trinitydesktop.org/scm/git/klcddimmer
diff --git a/submodules b/submodules
index 7f41d3eb5..ec5ee80f3 100644
--- a/submodules
+++ b/submodules
@@ -128,6 +128,9 @@ main/applications/kaffeine/cmake
 main/applications/kaffeine-mozilla
 main/applications/kaffeine-mozilla/admin
 main/applications/kaffeine-mozilla/cmake
+main/applications/kasablanca
+main/applications/kasablanca/admin
+main/applications/kasablanca/cmake
 main/applications/katapult
 main/applications/katapult/admin
 main/applications/katapult/cmake
@@ -149,54 +152,33 @@ main/applications/kbookreader/cmake
 main/applications/kchmviewer
 main/applications/kchmviewer/admin
 main/applications/kchmviewer/cmake
-main/applications/kcpuload
-main/applications/kcpuload/admin
-main/applications/kcpuload/cmake
-main/applications/kdbg
-main/applications/kdbg/admin
-main/applications/kdbg/cmake
-main/applications/kdbusnotification
-main/applications/kdbusnotification/admin
-main/applications/kdbusnotification/cmake
-main/applications/tde-guidance
-main/applications/tde-guidance/admin
-main/applications/tde-guidance/cmake
-main/applications/tde-style-lipstik
-main/applications/tde-style-lipstik/admin
-main/applications/tde-style-lipstik/cmake
-main/applications/tde-style-qtcurve
-main/applications/tde-style-qtcurve/admin
-main/applications/tde-style-qtcurve/cmake
-main/applications/tde-systemsettings
-main/applications/tde-systemsettings/admin
-main/applications/tde-systemsettings/cmake
-main/applications/tdesudo
-main/applications/tdesudo/admin
-main/applications/tdesudo/cmake
-main/applications/tdesvn
-main/applications/tdesvn/admin
-main/applications/tdesvn/cmake
 main/applications/kcmautostart
 main/applications/kcmautostart/admin
 main/applications/kcmautostart/cmake
 main/applications/kcmldap
 main/applications/kcmldap/admin
 main/applications/kcmldap/cmake
-main/applications/kcmldapmanager
-main/applications/kcmldapmanager/admin
-main/applications/kcmldapmanager/cmake
 main/applications/kcmldapcontroller
 main/applications/kcmldapcontroller/admin
 main/applications/kcmldapcontroller/cmake
+main/applications/kcmldapmanager
+main/applications/kcmldapmanager/admin
+main/applications/kcmldapmanager/cmake
+main/applications/kcpuload
+main/applications/kcpuload/admin
+main/applications/kcpuload/cmake
+main/applications/kdbg
+main/applications/kdbg/admin
+main/applications/kdbg/cmake
+main/applications/kdbusnotification
+main/applications/kdbusnotification/admin
+main/applications/kdbusnotification/cmake
 main/applications/kdiff3
 main/applications/kdiff3/admin
 main/applications/kdiff3/cmake
 main/applications/kdirstat
 main/applications/kdirstat/admin
 main/applications/kdirstat/cmake
-main/applications/tdmtheme
-main/applications/tdmtheme/admin
-main/applications/tdmtheme/cmake
 main/applications/kdpkg
 main/applications/kdpkg/admin
 main/applications/kdpkg/cmake
@@ -209,6 +191,9 @@ main/applications/kerberostray/cmake
 main/applications/kerry
 main/applications/kerry/admin
 main/applications/kerry/cmake
+main/applications/kftpgrabber
+main/applications/kftpgrabber/admin
+main/applications/kftpgrabber/cmake
 main/applications/kgtk-qt3
 main/applications/kgtk-qt3/admin
 main/applications/kgtk-qt3/cmake
@@ -218,15 +203,6 @@ main/applications/kile/cmake
 main/applications/kima
 main/applications/kima/admin
 main/applications/kima/cmake
-main/applications/tdeio-apt
-main/applications/tdeio-apt/admin
-main/applications/tdeio-apt/cmake
-main/applications/tdeio-locate
-main/applications/tdeio-locate/admin
-main/applications/tdeio-locate/cmake
-main/applications/tdeio-umountwrapper
-main/applications/tdeio-umountwrapper/admin
-main/applications/tdeio-umountwrapper/cmake
 main/applications/kiosktool
 main/applications/kiosktool/admin
 main/applications/kiosktool/cmake
@@ -257,12 +233,12 @@ main/applications/knetstats/cmake
 main/applications/knetworkmanager8
 main/applications/knetworkmanager8/admin
 main/applications/knetworkmanager8/cmake
-main/applications/tdenetworkmanager
-main/applications/tdenetworkmanager/admin
-main/applications/tdenetworkmanager/cmake
 main/applications/knights
 main/applications/knights/admin
 main/applications/knights/cmake
+main/applications/knmap
+main/applications/knmap/admin
+main/applications/knmap/cmake
 main/applications/knowit
 main/applications/knowit/admin
 main/applications/knowit/cmake
@@ -290,12 +266,6 @@ main/applications/kpilot/cmake
 main/applications/kpowersave
 main/applications/kpowersave/admin
 main/applications/kpowersave/cmake
-main/applications/tdepowersave
-main/applications/tdepowersave/admin
-main/applications/tdepowersave/cmake
-main/applications/tderadio
-main/applications/tderadio/admin
-main/applications/tderadio/cmake
 main/applications/krecipes
 main/applications/krecipes/admin
 main/applications/krecipes/cmake
@@ -305,6 +275,15 @@ main/applications/krename/cmake
 main/applications/krusader
 main/applications/krusader/admin
 main/applications/krusader/cmake
+main/applications/ksensors
+main/applications/ksensors/admin
+main/applications/ksensors/cmake
+main/applications/kshowmail
+main/applications/kshowmail/admin
+main/applications/kshowmail/cmake
+main/applications/kshutdown
+main/applications/kshutdown/admin
+main/applications/kshutdown/cmake
 main/applications/ksplash-engine-moodin
 main/applications/ksplash-engine-moodin/admin
 main/applications/ksplash-engine-moodin/cmake
@@ -317,27 +296,6 @@ main/applications/kstreamripper/cmake
 main/applications/ksystemlog
 main/applications/ksystemlog/admin
 main/applications/ksystemlog/cmake
-main/applications/kasablanca
-main/applications/kasablanca/admin
-main/applications/kasablanca/cmake
-main/applications/ksensors
-main/applications/ksensors/admin
-main/applications/ksensors/cmake
-main/applications/knmap
-main/applications/knmap/admin
-main/applications/knmap/cmake
-main/applications/tdeio-ftps
-main/applications/tdeio-ftps/admin
-main/applications/tdeio-ftps/cmake
-main/applications/kftpgrabber
-main/applications/kftpgrabber/admin
-main/applications/kftpgrabber/cmake
-main/applications/kshowmail
-main/applications/kshowmail/admin
-main/applications/kshowmail/cmake
-main/applications/kshutdown
-main/applications/kshutdown/admin
-main/applications/kshutdown/cmake
 main/applications/ktechlab
 main/applications/ktechlab/admin
 main/applications/ktechlab/cmake
@@ -356,9 +314,6 @@ main/applications/kvkbd/cmake
 main/applications/kvpnc
 main/applications/kvpnc/admin
 main/applications/kvpnc/cmake
-main/applications/twin-style-crystal
-main/applications/twin-style-crystal/admin
-main/applications/twin-style-crystal/cmake
 main/applications/mplayerthumbs
 main/applications/mplayerthumbs/admin
 main/applications/mplayerthumbs/cmake
@@ -381,15 +336,60 @@ main/applications/smb4k/cmake
 main/applications/soundkonverter
 main/applications/soundkonverter/admin
 main/applications/soundkonverter/cmake
+main/applications/tde-guidance
+main/applications/tde-guidance/admin
+main/applications/tde-guidance/cmake
+main/applications/tde-style-lipstik
+main/applications/tde-style-lipstik/admin
+main/applications/tde-style-lipstik/cmake
+main/applications/tde-style-qtcurve
+main/applications/tde-style-qtcurve/admin
+main/applications/tde-style-qtcurve/cmake
+main/applications/tde-systemsettings
+main/applications/tde-systemsettings/admin
+main/applications/tde-systemsettings/cmake
+main/applications/tdeio-apt
+main/applications/tdeio-apt/admin
+main/applications/tdeio-apt/cmake
+main/applications/tdeio-ftps
+main/applications/tdeio-ftps/admin
+main/applications/tdeio-ftps/cmake
+main/applications/tdeio-locate
+main/applications/tdeio-locate/admin
+main/applications/tdeio-locate/cmake
 main/applications/tdeio-sword
 main/applications/tdeio-sword/admin
 main/applications/tdeio-sword/cmake
+main/applications/tdeio-umountwrapper
+main/applications/tdeio-umountwrapper/admin
+main/applications/tdeio-umountwrapper/cmake
+main/applications/tdenetworkmanager
+main/applications/tdenetworkmanager/admin
+main/applications/tdenetworkmanager/cmake
+main/applications/tdepowersave
+main/applications/tdepowersave/admin
+main/applications/tdepowersave/cmake
+main/applications/tderadio
+main/applications/tderadio/admin
+main/applications/tderadio/cmake
+main/applications/tdesudo
+main/applications/tdesudo/admin
+main/applications/tdesudo/cmake
+main/applications/tdesvn
+main/applications/tdesvn/admin
+main/applications/tdesvn/cmake
+main/applications/tdmtheme
+main/applications/tdmtheme/admin
+main/applications/tdmtheme/cmake
 main/applications/tellico
 main/applications/tellico/admin
 main/applications/tellico/cmake
 main/applications/tork
 main/applications/tork/admin
 main/applications/tork/cmake
+main/applications/twin-style-crystal
+main/applications/twin-style-crystal/admin
+main/applications/twin-style-crystal/cmake
 main/applications/wlassistant
 main/applications/wlassistant/admin
 main/applications/wlassistant/cmake