X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=language-functions;h=2fc86ff06fcbd401ecdb16bbf7e85b4a68db5211;hp=839b583c6c202a0c2bbb3779922ac5c3176e8cd5;hb=72ba5ea05b79f66cc7db732ec22ac58f96683990;hpb=a77bee3682d1ce4068f4e6d57f1d689a80b05ec0

diff --git a/language-functions b/language-functions
index 839b583..2fc86ff 100644
--- a/language-functions
+++ b/language-functions
@@ -560,26 +560,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