From 44a643f73fbb9a1d83fea952326f26fedc407842 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 11 Jul 2016 22:00:08 +0200 Subject: switch from legacy (KOI8-R) 'ru4' keyboard to 'ru' --- NEWS | 1 + lib/keyboard.pm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 8d7098f..d9e6b43 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,4 @@ +- switch from legacy (KOI8-R) 'ru4' keyboard to 'ru' - display_driver_helper: o detect grub2 when checking for liveCD/DVD diff --git a/lib/keyboard.pm b/lib/keyboard.pm index f6381f5..dceda25 100644 --- a/lib/keyboard.pm +++ b/lib/keyboard.pm @@ -287,7 +287,7 @@ arch() =~ /^sparc/ ? ( "ro_qwertz" => [ N_("_: keyboard\nRomanian (qwertz)"), "ro2", "ro", "winkeys", 0 ], "ro" => [ N_("_: keyboard\nRomanian (qwerty)"), "ro", "ro", "std_cedilla", 0 ], "ro_basic" => [ N_("_: keyboard\nRomanian (basic)"), "ro", "ro", "basic", 0 ], - "ru" => [ N_("_: keyboard\nRussian"), "ru4", "ru", "", 1 ], + "ru" => [ N_("_: keyboard\nRussian"), "ru", "ru", "", 1 ], "ru_yawerty" => [ N_("_: keyboard\nRussian (phonetic)"), "ru-yawerty", "ru", "phonetic", 1 ], "se" => [ N_("_: keyboard\nSwedish"), "se-latin1", "se", "", 0 ], "si" => [ N_("_: keyboard\nSlovenian"), "slovene", "si", "", 0 ], @@ -315,7 +315,7 @@ arch() =~ /^sparc/ ? ( "tifinagh" => [ N_("_: keyboard\nTifinagh (moroccan layout) (+latin/arabic)"), "fr-tifinagh", "fr,ma,ara", ",tifinagh,azerty", 1 ], "tifinagh_p" => [ N_("_: keyboard\nTifinagh (phonetic) (+latin/arabic)"), "fr-tifinaghp", "fr,ma,ara", ",tifinagh-phonetic,azerty", 1 ], # TODO: console map - "tj" => [ N_("_: keyboard\nTajik"), "ru4", "tj", "", 1 ], + "tj" => [ N_("_: keyboard\nTajik"), "ru", "tj", "", 1 ], # TODO: console map "tm" => [ N_("_: keyboard\nTurkmen"), "us", "tm", "", 0 ], "tr_f" => [ N_("_: keyboard\nTurkish (\"F\" model)"), "trf", "tr", "f", 0 ], -- cgit v1.2.1