From a8a1489bf2f37bdbefe67194a0db3f6693e9bb51 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 2 Jul 2014 12:54:47 +0200 Subject: [PATCH] livedvd: added german language --- platforms/livedvd-root/Makefile | 2 ++ platforms/livedvd-root/post.inc.sh | 3 +++ platforms/livedvd-root/settings.inc | 2 +- platforms/livedvd/post.inc.sh | 1 + platforms/livedvd/settings.inc | 2 +- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/platforms/livedvd-root/Makefile b/platforms/livedvd-root/Makefile index 5504c05..545f072 100644 --- a/platforms/livedvd-root/Makefile +++ b/platforms/livedvd-root/Makefile @@ -24,6 +24,8 @@ $(MAKEDIST_TARGET)-livedvd-root-fr: \ kde-l10n-fr $(MAKEDIST_TARGET)-livedvd-root-it: \ kde-l10n-it +$(MAKEDIST_TARGET)-livedvd-root-de: \ + kde-l10n-de # FIXME: add kdepim syslog-ng: @echo diff --git a/platforms/livedvd-root/post.inc.sh b/platforms/livedvd-root/post.inc.sh index f6816eb..cc48ddb 100644 --- a/platforms/livedvd-root/post.inc.sh +++ b/platforms/livedvd-root/post.inc.sh @@ -32,6 +32,9 @@ chroot $MOUNTDIR update-alternatives-set-dri case $LANGUAGE in it) timezone=Europe/Rome ;; es) timezone=Europe/Madrid ;; + fr) timezone=Europe/Paris ;; + de) timezone=Europe/Berlin ;; + en) timezone=Europe/London ;; *) timezone=UTC ;; esac echo $timezone > $MOUNTDIR/etc/timezone diff --git a/platforms/livedvd-root/settings.inc b/platforms/livedvd-root/settings.inc index 621119d..7ce67a9 100644 --- a/platforms/livedvd-root/settings.inc +++ b/platforms/livedvd-root/settings.inc @@ -1,6 +1,6 @@ PRODUCT_NAME=livedvd MEDIA=squash_xz -MULTILANGUAGE="en it es fr" +MULTILANGUAGE="en it es fr de" if [ "$ARCH" = "i586" ]; then KERNEL_EXTRAVER=mamba diff --git a/platforms/livedvd/post.inc.sh b/platforms/livedvd/post.inc.sh index a3ba71c..ef67465 100644 --- a/platforms/livedvd/post.inc.sh +++ b/platforms/livedvd/post.inc.sh @@ -50,6 +50,7 @@ for l in $MULTILANGUAGE; do "it") LABEL="Italiano"; LOCALELANG="it_IT.UTF-8"; VCONSOLEKEYMAP="it" ;; "fr") LABEL="Français"; LOCALELANG="fr_FR.UTF-8"; VCONSOLEKEYMAP="fr" ;; "es") LABEL="Español"; LOCALELANG="es_ES.UTF-8"; VCONSOLEKEYMAP="es" ;; + "de") LABEL="Deutsch"; LOCALELANG="de_DE.UTF-8"; VCONSOLEKEYMAP="de" ;; *) LABEL="$l" esac cat >> $MOUNTDIR2/boot/isolinux/isolinux.cfg.utf8 << _EOF diff --git a/platforms/livedvd/settings.inc b/platforms/livedvd/settings.inc index 2c8ef09..d1ce389 100644 --- a/platforms/livedvd/settings.inc +++ b/platforms/livedvd/settings.inc @@ -1,5 +1,5 @@ MEDIA=iso -MULTILANGUAGE="en it es fr" +MULTILANGUAGE="en it es fr de" DISTROMATIC=off if [ "$ARCH" = "i586" ]; then