diff --git a/installer/installer.kmdr b/installer/installer.kmdr
index 079b58e..5b6a94f 100755
--- a/installer/installer.kmdr
+++ b/installer/installer.kmdr
@@ -760,28 +760,6 @@ dcop @dcopid KommanderIf setText licenseBrowser "`cat /usr/share/openmamba/insta
-
-
- setTimeLabel
-
-
-
- 520
- 10
- 32
- 32
-
-
-
-
- @execBegin
-currdate=`date +"%x %H:%M %Z"`
-dcop @dcopid KommanderIf setText timelabel "$currdate"
-@execEnd
-
-
-
-
Label32
@@ -800,7 +778,7 @@ dcop @dcopid KommanderIf setText timelabel "$currdate"
- ExecButton1
+ timebutton
@@ -820,6 +798,29 @@ dcop @dcopid KommanderIf setText timelabel "$currdate"
@exec("kcmshell4 clock")
@setTimeLabel.execute()
+
+
+
+
+
+
+ setTimeLabel
+
+
+
+ 520
+ 10
+ 32
+ 32
+
+
+
+
+ @execBegin
+currdate=`date +"%x %H:%M %Z"`
+dcop @dcopid KommanderIf setText timelabel "$currdate"
+[ -e /opt/kde/lib/kde4/kcm_clock.so ] || dcop @dcopid KommanderIf setEnabled timebutton "false"
+@execEnd
@@ -920,6 +921,48 @@ dcop @dcopid KommanderIf setText timelabel "$currdate"
+
+
+ langbutton
+
+
+
+ 280
+ 40
+ 261
+ 41
+
+
+
+ Configure &language and country
+
+
+
+ @exec("kcmshell4 language")
+@execBegin
+if [ -r ~/.kde4/share/config/kdeglobals ]; then
+ eval `grep -i Language ~/.kde4/share/config/kdeglobals`
+ Language=${Language/:*}
+ if [ "$Language" ]; then
+ case ${Language} in
+ it|it_IT) LANGUAGE="it_IT" ;;
+ en|en_US) LANGUAGE="en_US" ;;
+ es|es_ES) LANGUAGE="es_ES" ;;
+ fr|fr_FR) LANGUAGE="fr_FR" ;;
+ en_GB) LANGUAGE="en_GB" ;;
+ *) LANGUAGE="${Language}" ;;
+ esac
+ LANGUAGE=${LANGUAGE:0:5}.UTF-8
+ sed -i "s|LANG=.*|LANG=$LANGUAGE|" /etc/sysconfig/i18n
+ sed -i "s|LANG=.*|LANG=$LANGUAGE|" /etc/locale.conf
+ fi
+fi
+@execEnd
+@setLangLabel.execute()
+
+
+
+
setLangLabel
@@ -963,49 +1006,7 @@ case ${LANGUAGE:0:5} in
esac
dcop @dcopid KommanderIf setText langlabel "$LANGUAGE"
dcop @dcopid KommanderIf setText countrylabel $"$COUNTRY"
-
-
-
-
-
-
- ExecButton1_2_2
-
-
-
- 280
- 40
- 261
- 41
-
-
-
- Configure &language and country
-
-
-
- @exec("kcmshell4 language")
-@execBegin
-if [ -r ~/.kde4/share/config/kdeglobals ]; then
- eval `grep -i Language ~/.kde4/share/config/kdeglobals`
- Language=${Language/:*}
- if [ "$Language" ]; then
- case ${Language} in
- it|it_IT) LANGUAGE="it_IT" ;;
- en|en_US) LANGUAGE="en_US" ;;
- es|es_ES) LANGUAGE="es_ES" ;;
- fr|fr_FR) LANGUAGE="fr_FR" ;;
- en_GB) LANGUAGE="en_GB" ;;
- *) LANGUAGE="${Language}" ;;
- esac
- LANGUAGE=${LANGUAGE:0:5}.UTF-8
- sed -i "s|LANG=.*|LANG=$LANGUAGE|" /etc/sysconfig/i18n
- sed -i "s|LANG=.*|LANG=$LANGUAGE|" /etc/locale.conf
- fi
-fi
-@execEnd
-@setLangLabel.execute()
-
+[ -e /opt/kde/lib/kde4/kcm_locale.so ] || dcop @dcopid KommanderIf setEnabled langbutton "false"