Update $INSTALLED check to fix syntax error

[grml-autoconfig.git] / language-functions

diff --git a/language-functions b/language-functions
index 839b583..def9853 100644 (file)
--- 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: Fre Apr 06 23:41:38 CEST 2007 [mika]
+# Latest change: Son Jul 01 22:55:38 CEST 2007 [mika]
 ################################################################################
 
 # The default language/keyboard to use. This CAN NOT be autoprobed.
@@ -330,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"
@@ -560,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