X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=language-functions;h=fde4c96a64cced01fead2f98a7e4add1da65c4b8;hp=3a2fc219567f726a12bed0ef9da9c3b77de46847;hb=20dad4dfd752de6254eeb874234bd8b96b40530f;hpb=efd6786e49003dac27e4ff9f038a1e134ce43cca

diff --git a/language-functions b/language-functions
index 3a2fc21..fde4c96 100644
--- a/language-functions
+++ b/language-functions
@@ -282,7 +282,8 @@ case "$LANGUAGE" in
                 ;;
         en)
                 # English in Austria [see us + uk for american and english version!]
-                LANGUAGE="us"
+                # LANGUAGE="en_US:en_GB:en"
+                LANGUAGE="en"
                 COUNTRY="at"
                 LANG="en_US.iso885915"
                 KEYTABLE="us"
@@ -294,7 +295,7 @@ case "$LANGUAGE" in
                 ;;
         en-utf8)
                 # English in Austria [see us + uk for american and english version!] (UTF8)
-                LANGUAGE="us"
+                LANGUAGE="en"
                 COUNTRY="at"
                 LANG="en_US.UTF-8"
                 KEYTABLE="us"
@@ -559,6 +560,33 @@ case "$LANGUAGE" in
                 KDEKEYBOARDS="nl,de,fr"
                 TZ="Europe/Amsterdam"
                 ;;
+        no|nb|nn)
+                # Norsk versjon
+                COUNTRY="no"
+                LANG="nb_NO"
+                LANGUAGE="no:nb_NO"
+                KEYTABLE="no"
+                XKEYBOARD="no"
+                KDEKEYBOARD="no"
+                CHARSET="iso8859-15"
+                KDEKEYBOARDS="no-latin1,us,no,no-dvorak"
+                TZ="Europe/Oslo"
+                ;;
+        no-utf8|nb-utf8|nn-utf8)
+                # Norsk versjon (UTF8)
+                COUNTRY="no"
+                LANG="nb_NO.UTF-8"
+                LANGUAGE="no:nb_NO"
+                # 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"
+                XKEYBOARD="no"
+                KDEKEYBOARD="no"
+                CHARSET="utf8"
+                KDEKEYBOARDS="no,us,no-dvorak,dk,no-latin1"
+                TZ="Europe/Oslo"
+                ;;
         pl)
                 # Polish version
                 COUNTRY="pl"