summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/Xconfigurator_consts.pm3
-rw-r--r--perl-install/keyboard.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/Xconfigurator_consts.pm b/perl-install/Xconfigurator_consts.pm
index 9e86d36d1..3fe7f8112 100644
--- a/perl-install/Xconfigurator_consts.pm
+++ b/perl-install/Xconfigurator_consts.pm
@@ -330,7 +330,8 @@ $default_monitor = "High Frequency SVGA, 1024x768 at 70 Hz";
);
%xkb_options = (
- 'ru' => [ 'XkbVariant "winkeys"', 'XkbOptions "grp:caps_toggle"' ],
+ 'ru(winkeys)' => [ 'XkbVariant "winkeys"', 'XkbOptions "grp:caps_toggle"' ],
+ 'jp' => [ 'XkbModel "jp106"' ],
);
$XF86firstchunk_text = q(
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index fcbf3e27d..e6629571c 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -62,6 +62,7 @@ my %lang2keyboard =
'hy' => 'am',
'is' => 'is',
'it' => 'it',
+ 'ja' => 'jp',
'ka' => 'ge_la',
'lt' => 'lt',
'nb' => 'no',
@@ -143,6 +144,7 @@ arch() eq "ppc" ? (
#"ir" => [ __("Iranian"), "ir-isiri3342","ir" ],
"is" => [ __("Icelandic"), "is-latin1", "is" ],
"it" => [ __("Italian"), "it-latin1", "it" ],
+ "jp" => [ __("Japanese 106 keys"), "jp106", "jp" ],
"la" => [ __("Latin American"), "la-latin1", "la" ],
"nl" => [ __("Dutch"), "nl-latin1", "nl" ],
"lt" => [ __("Lithuanian AZERTY (old)"), "lt-latin7","lt" ],