4 files changed, 9 insertions, 1 deletions
diff --git a/opie-taskbar/opie-taskbar/beagle/locale.conf b/opie-taskbar/opie-taskbar/beagle/locale.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-taskbar/opie-taskbar/beagle/locale.conf
diff --git a/opie-taskbar/opie-taskbar/locale.conf b/opie-taskbar/opie-taskbar/locale.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-taskbar/opie-taskbar/locale.conf
diff --git a/opie-taskbar/opie-taskbar/opie b/opie-taskbar/opie-taskbar/opie
index 91bdff1901..e12ec6bf15 100644
--- a/opie-taskbar/opie-taskbar/opie
+++ b/opie-taskbar/opie-taskbar/opie
@@ -43,6 +43,10 @@ if [ ! -e "$HOME/Settings/qpe.conf" ] ; then
     cat $OPIEDIR/etc/skel/qpe.conf >$HOME/Settings/qpe.conf
 fi
 
+if [ ! -e "$HOME/Settings/locale.conf" -a -e "$OPIEDIR/etc/skel/locale.conf" ] ; then
+    cat $OPIEDIR/etc/skel/locale.conf >$HOME/Settings/locale.conf
+fi
+
 case $1 in
 'start')
     /sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0
diff --git a/opie-taskbar/opie-taskbar_cvs.oe b/opie-taskbar/opie-taskbar_cvs.oe
index e43388faee..876a9ef91c 100644
--- a/opie-taskbar/opie-taskbar_cvs.oe
+++ b/opie-taskbar/opie-taskbar_cvs.oe
@@ -18,7 +18,8 @@ SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/cal
            file://server.pro \
            file://opie-reorgfiles \
            file://opie \
-           file://qpe.conf"
+           file://qpe.conf \
+	   file://locale.conf "
 
 S = "${WORKDIR}/launcher"
 
@@ -91,6 +92,9 @@ do_install() {
 
 	install -m 0755 ${WORKDIR}/opie ${D}/etc/init.d/opie
 	install -m 0644 ${WORKDIR}/qpe.conf ${D}/${palmtopdir}/etc/skel/
+	if [ -s ${WORKDIR}/locale.conf ]; then
+	    install -m 0644 ${WORKDIR}/locale.conf ${D}/${palmtopdir}/etc/skel/
+	fi
 }
 
 # These two should be installed only on devices with keyboard