X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=language-functions;h=b575f4746d73533ca238d70ac4da3bbdb7eb81b5;hp=3c74fa979c8b6973ee40fe103a0447d7bf9772cd;hb=HEAD;hpb=9bc079508a6358e38f335657021736f047a9b835

diff --git a/language-functions b/language-functions
index 3c74fa9..b575f47 100644
--- a/language-functions
+++ b/language-functions
@@ -206,8 +206,8 @@ case "$LANGUAGE" in
                 COUNTRY="ch"
                 LANG="de_CH.UTF-8"
                 KEYTABLE="sg-latin1"
-                XKEYBOARD="de_CH"
-                KDEKEYBOARD="de_CH"
+                XKEYBOARD="ch"
+                KDEKEYBOARD="ch"
                 CHARSET="utf8"
                 # Additional KDE Keyboards
                 KDEKEYBOARDS="de,us,fr"
@@ -220,7 +220,7 @@ case "$LANGUAGE" in
                 LANG="fr_FR.ISO-8859-1"
                 KEYTABLE="cf"
                 CHARSET="iso8859-1"
-                CONSOLEFONT="lat1-16"
+                CONSOLEFONT="Lat15-Terminus16"
                 XKEYBOARD="ca_enhanced"
                 KDEKEYBOARD="ca_enhanced"
                 KDEKEYBOARDS="us"
@@ -343,7 +343,7 @@ case "$LANGUAGE" in
                 KDEKEYBOARD="dvorak,us,de"
                 CHARSET="utf8"
                 KDEKEYBOARDS="dvorak,us,de,fr"
-                TZ="Europe/Vienna"
+                TZ="UTC"
                 ;;
         dvorak-iso)
                 # Dvorak layout (ISO)
@@ -355,7 +355,7 @@ case "$LANGUAGE" in
                 KDEKEYBOARD="dvorak,us,de"
                 CHARSET="iso8859-15"
                 KDEKEYBOARDS="dvorak,us,de,fr"
-                TZ="Europe/Vienna"
+                TZ="UTC"
                 ;;
         en-iso)
                 # English in Austria [see us + uk for american and english version!]
@@ -368,7 +368,7 @@ case "$LANGUAGE" in
                 KDEKEYBOARD="us"
                 CHARSET="iso8859-15"
                 KDEKEYBOARDS="de,fr"
-                TZ="Europe/Vienna"
+                TZ="UTC"
                 ;;
         en|en-utf8)
                 # English in Austria [see us + uk for american and english version!] (UTF8)
@@ -381,7 +381,7 @@ case "$LANGUAGE" in
                 CHARSET="utf8"
                 # Additional KDE Keyboards
                 KDEKEYBOARDS="de,fr"
-                TZ="Europe/Vienna"
+                TZ="UTC"
                 ;;
         el-iso)
                 # Greek version
@@ -440,7 +440,7 @@ case "$LANGUAGE" in
                 # Additional KDE Keyboards
                 KDEKEYBOARDS="de,us,fr"
                 TZ="Europe/Madrid"
-                CONSOLEFONT="lat10-16"
+                CONSOLEFONT="Lat15-Terminus16"
                 ;;
         fi-iso)
                 # Finnish version
@@ -656,7 +656,7 @@ case "$LANGUAGE" in
                 COUNTRY="no"
                 LANG="nb_NO.UTF-8"
                 LANGUAGE="no:nb_NO"
-                # Keytable "no*" is correct if æøå (the 3 final letters in the
+                # Keytable "no*" is correct if  (the 3 final letters in the
                 # norse alphabet) shows up as "a+e", "oslash" and "aring".
                 # Otherwise try the other variants no-latin1 etc.
                 KEYTABLE="no"
@@ -704,7 +704,7 @@ case "$LANGUAGE" in
                 # Additional KDE Keyboards
                 KDEKEYBOARDS="de,us,fr"
                 TZ="Europe/Lisbon"
-                CONSOLEFONT="lat10-16"
+                CONSOLEFONT="Lat15-Terminus16"
                 ;;
         pt|pt-utf8)
                 # Portuguese version (UTF8)
@@ -718,7 +718,7 @@ case "$LANGUAGE" in
                 # Additional KDE Keyboards
                 KDEKEYBOARDS="de,us,fr"
                 TZ="Europe/Lisbon"
-                CONSOLEFONT="lat10-16"
+                CONSOLEFONT="Lat15-Terminus16"
                 ;;
         ru-iso)
                 # Russian version
@@ -941,7 +941,7 @@ case "$LANGUAGE" in
                 KDEKEYBOARD="us"
                 CHARSET="utf8"
                 KDEKEYBOARDS="de,fr"
-                TZ="Europe/Vienna"
+                TZ="UTC"
                 ;;
 esac