X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=language-functions;h=3f4091f5c6ad158777650bdf9aca4239205e55d5;hp=300d0e829b2b61e4cdac8750e1838479dc7e6ff4;hb=79b3fa623f0f25e88a0bbdbea0bfa8de078f8f5d;hpb=e3b050ac536b951adb1a24c65a80ed9cd3a09eb3

diff --git a/language-functions b/language-functions
index 300d0e8..3f4091f 100644
--- a/language-functions
+++ b/language-functions
@@ -3,11 +3,14 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Son Jul 01 22:55:38 CEST 2007 [mika]
 ################################################################################
 
 # The default language/keyboard to use. This CAN NOT be autoprobed.
 case "$LANGUAGE" in
+        C|POSIX)
+                LANG="C"
+                LANGUAGE="C"
+                ;;
         at-iso)
                 # Austrian version
                 COUNTRY="at"
@@ -203,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"
@@ -217,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"
@@ -340,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)
@@ -352,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!]
@@ -365,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)
@@ -378,7 +381,7 @@ case "$LANGUAGE" in
                 CHARSET="utf8"
                 # Additional KDE Keyboards
                 KDEKEYBOARDS="de,fr"
-                TZ="Europe/Vienna"
+                TZ="UTC"
                 ;;
         el-iso)
                 # Greek version
@@ -437,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
@@ -701,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)
@@ -715,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
@@ -938,7 +941,7 @@ case "$LANGUAGE" in
                 KDEKEYBOARD="us"
                 CHARSET="utf8"
                 KDEKEYBOARDS="de,fr"
-                TZ="Europe/Vienna"
+                TZ="UTC"
                 ;;
 esac