X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=language-functions;h=b575f4746d73533ca238d70ac4da3bbdb7eb81b5;hp=def9853226abcc28db3ab9d54ddd2c3073d56096;hb=HEAD;hpb=350d48080b3a5e73b55b6fce417b0611e14162b9

diff --git a/language-functions b/language-functions
index def9853..b575f47 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
@@ -653,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"
@@ -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
@@ -743,6 +746,32 @@ case "$LANGUAGE" in
                 KDEKEYBOARDS="de,us,fr"
                 TZ="Europe/Moscow"
                 ;;
+        se-iso)
+                # Swedish version
+                LANGUAGE="sv_SE:sv"
+                COUNTRY="se"
+                LANG="sv_SE.iso885915"
+                KEYTABLE="se-latin1"
+                XKEYBOARD="se"
+                KDEKEYBOARD="se"
+                CHARSET="sv_SE.iso885915"
+                # Additional KDE Keyboards
+                KDEKEYBOARDS="us,fi"
+                TZ="Europe/Stockholm"
+                ;;
+        se|se-utf8)
+                # Swedish version (UTF8)
+                LANGUAGE="sv_SE:sv"
+                COUNTRY="se"
+                LANG="sv_SE.utf8"
+                KEYTABLE="se-latin1"
+                XKEYBOARD="se"
+                KDEKEYBOARD="se"
+                CHARSET="utf8"
+                # Additional KDE Keyboards
+                KDEKEYBOARDS="us,fi"
+                TZ="Europe/Stockholm"
+                ;;
         sk-iso)
                 # Slovak version (guessed)
                 COUNTRY="sk"
@@ -912,7 +941,7 @@ case "$LANGUAGE" in
                 KDEKEYBOARD="us"
                 CHARSET="utf8"
                 KDEKEYBOARDS="de,fr"
-                TZ="Europe/Vienna"
+                TZ="UTC"
                 ;;
 esac