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

diff --git a/language-functions b/language-functions
index 766e1fe..def9853 100644
--- a/language-functions
+++ b/language-functions
@@ -3,7 +3,7 @@
 # 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: Sam Dez 16 17:45:30 CET 2006 [mika]
+# Latest change: Son Jul 01 22:55:38 CEST 2007 [mika]
 ################################################################################
 
 # The default language/keyboard to use. This CAN NOT be autoprobed.
@@ -59,9 +59,9 @@ case "$LANGUAGE" in
                 KDEKEYBOARDS="us,fr"
                 TZ="Australia/Sydney"
                 ;;
-        be-iso)
-                # Belgian version
-                LANGUAGE="be"
+        be-iso|bed-iso)
+                # Belgian version (default and dutch one)
+                LANGUAGE="nl"
                 COUNTRY="be"
                 LANG="C"
                 KEYTABLE="be2-latin1"
@@ -71,11 +71,61 @@ case "$LANGUAGE" in
                 KDEKEYBOARDS="us,de,fr"
                 TZ="Europe/Brussels"
                 ;;
-        be|be-utf8)
-                # Belgian version (UTF8)
-                LANGUAGE="be_BY:be"
+        be|be-utf8|bed|bed-utf8)
+                # Belgian version (default and dutch one) (UTF8)
+                LANGUAGE="nl_BE:nl"
                 COUNTRY="be"
-                LANG="be_BY.UTF-8"
+                LANG="nl_BE.UTF-8"
+                KEYTABLE="be2-latin1"
+                XKEYBOARD="be"
+                KDEKEYBOARD="be"
+                CHARSET="utf8"
+                # Additional KDE Keyboards
+                KDEKEYBOARDS="us,de,fr"
+                TZ="Europe/Brussels"
+                ;;
+        bef-iso)
+                # Belgian version (french)
+                LANGUAGE="fr"
+                COUNTRY="be"
+                LANG="C"
+                KEYTABLE="be2-latin1"
+                XKEYBOARD="be"
+                KDEKEYBOARD="be"
+                CHARSET="iso8859-15"
+                KDEKEYBOARDS="us,de,fr"
+                TZ="Europe/Brussels"
+                ;;
+        bef|bef-utf8)
+                # Belgian version (french) (UTF8)
+                LANGUAGE="fr_BE:fr"
+                COUNTRY="be"
+                LANG="fr_BE.UTF-8"
+                KEYTABLE="be2-latin1"
+                XKEYBOARD="be"
+                KDEKEYBOARD="be"
+                CHARSET="utf8"
+                # Additional KDE Keyboards
+                KDEKEYBOARDS="us,de,fr"
+                TZ="Europe/Brussels"
+                ;;
+        beg-iso)
+                # Belgian version (german)
+                LANGUAGE="de"
+                COUNTRY="be"
+                LANG="C"
+                KEYTABLE="be2-latin1"
+                XKEYBOARD="be"
+                KDEKEYBOARD="be"
+                CHARSET="iso8859-15"
+                KDEKEYBOARDS="us,de,fr"
+                TZ="Europe/Brussels"
+                ;;
+        beg|beg-utf8)
+                # Belgian version (german) (UTF8)
+                LANGUAGE="de_BE:de"
+                COUNTRY="be"
+                LANG="de_BE.UTF-8"
                 KEYTABLE="be2-latin1"
                 XKEYBOARD="be"
                 KDEKEYBOARD="be"
@@ -280,6 +330,30 @@ case "$LANGUAGE" in
                 KDEKEYBOARDS="dk,de,us,fr"
                 TZ="Europe/Copenhagen"
                 ;;
+        dvorak|dvorak-utf8)
+                # Dvorak layout (UTF8)
+                LANGUAGE="us"
+                COUNTRY="at"
+                LANG="en_US.UTF-8"
+                KEYTABLE="dvorak"
+                XKEYBOARD="dvorak"
+                KDEKEYBOARD="dvorak,us,de"
+                CHARSET="utf8"
+                KDEKEYBOARDS="dvorak,us,de,fr"
+                TZ="Europe/Vienna"
+                ;;
+        dvorak-iso)
+                # Dvorak layout (ISO)
+                LANGUAGE="us"
+                COUNTRY="at"
+                LANG="en_US.iso885915"
+                KEYTABLE="dvorak"
+                XKEYBOARD="dvorak"
+                KDEKEYBOARD="dvorak,us,de"
+                CHARSET="iso8859-15"
+                KDEKEYBOARDS="dvorak,us,de,fr"
+                TZ="Europe/Vienna"
+                ;;
         en-iso)
                 # English in Austria [see us + uk for american and english version!]
                 # LANGUAGE="en_US:en_GB:en"
@@ -510,26 +584,28 @@ case "$LANGUAGE" in
                 KDEKEYBOARDS="fr,us,de"
                 TZ="Europe/Rome"
                 ;;
-        ja-iso)
+        ja-iso|jp-iso)
                 # (limited) Japanese version
                 COUNTRY="jp"
                 LANG="ja_JP"
                 LANGUAGE="ja"
-                KEYTABLE="us"
-                XKEYBOARD="us"
+                KEYTABLE="jp106"
+                XKEYMODEL="jp106"
+                XKEYBOARD="jp"
                 KDEKEYBOARD="us"
                 CHARSET="iso8859-15"
                 KDEKEYBOARDS="fr,us,de"
                 TZ="Asia/Tokyo"
                 ;;
-        ja|ja-utf8)
+        ja|ja-utf8|jp|jp-utf8)
                 # (limited) Japanese version (UTF8)
                 LANGUAGE="ja_JP:ja"
                 COUNTRY="jp"
                 LANG="ja_JP.UTF-8"
                 LANGUAGE="ja"
-                KEYTABLE="us"
-                XKEYBOARD="us"
+                KEYTABLE="jp106"
+                XKEYMODEL="jp106"
+                XKEYBOARD="jp"
                 KDEKEYBOARD="us"
                 CHARSET="utf8"
                 # Additional KDE Keyboards