summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--usr.sbin/sade/menus.c9
-rw-r--r--usr.sbin/sysinstall/menus.c9
2 files changed, 6 insertions, 12 deletions
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index cd62ddb..2fe6f8b 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -1469,8 +1469,7 @@ DMenu MenuSysconsKeymap = {
{ "Polish ISO", "Polish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=pl_PL.ISO_8859-2" },
{ " Portuguese (accent)", "Portuguese ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=pt.iso.acc" },
{ " Portuguese", "Portuguese ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=pt.iso" },
- { "Russia CP866", "Russian CP866 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.cp866" },
- { " Russia KOI8-R", "Russian KOI8-R keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.koi8-r" },
+ { "Russia KOI8-R", "Russian KOI8-R keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.koi8-r" },
{ "Slovenian", "Slovenian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=si.iso" },
{ " Spanish (accent)", "Spanish ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=spanish.iso.acc" },
{ " Spanish", "Spanish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=spanish.iso" },
@@ -1589,16 +1588,14 @@ DMenu MenuSysconsFont = {
"font8x8=cp850-8x8,font8x14=cp850-8x14,font8x16=cp850-8x16" },
{ "4 IBM 865", "Norwegian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL,
"font8x8=cp865-8x8,font8x14=cp865-8x14,font8x16=cp865-8x16" },
- { "5 IBM 866", "Russian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL,
- "font8x8=cp866-8x8,font8x14=cp866-8x14,font8x16=cp866-8x16" },
+ { "5 IBM 866", "Russian, IBM encoding (use with screenmap)", dmenuVarCheck, dmenuSetVariables, NULL,
+ "font8x8=cp866-8x8,font8x14=cp866-8x14,font8x16=cp866b-8x16" },
{ "6 IBM 866u", "Ukrainian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL,
"font8x8=cp866u-8x8,font8x14=cp866u-8x14,font8x16=cp866u-8x16" },
{ "7 ISO 8859-1", "Western Europe, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL,
"font8x8=iso-8x8,font8x14=iso-8x14,font8x16=iso-8x16" },
{ "8 ISO 8859-2", "Eastern Europe, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL,
"font8x8=iso02-8x8,font8x14=iso02-8x14,font8x16=iso02-8x16" },
- { "9 KOI8-R", "Russian, KOI8-R encoding", dmenuVarCheck, dmenuSetVariables, NULL,
- "font8x8=koi8-r-8x8,font8x14=koi8-r-8x14,font8x16=koi8-r-8x16" },
{ "0 KOI8-U", "Ukrainian, KOI8-U encoding", dmenuVarCheck, dmenuSetVariables, NULL,
"font8x8=koi8-u-8x8,font8x14=koi8-u-8x14,font8x16=koi8-u-8x16" },
{ "S SWISS", "English, better resolution", dmenuVarCheck, dmenuSetVariables, NULL,
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index cd62ddb..2fe6f8b 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -1469,8 +1469,7 @@ DMenu MenuSysconsKeymap = {
{ "Polish ISO", "Polish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=pl_PL.ISO_8859-2" },
{ " Portuguese (accent)", "Portuguese ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=pt.iso.acc" },
{ " Portuguese", "Portuguese ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=pt.iso" },
- { "Russia CP866", "Russian CP866 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.cp866" },
- { " Russia KOI8-R", "Russian KOI8-R keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.koi8-r" },
+ { "Russia KOI8-R", "Russian KOI8-R keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.koi8-r" },
{ "Slovenian", "Slovenian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=si.iso" },
{ " Spanish (accent)", "Spanish ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=spanish.iso.acc" },
{ " Spanish", "Spanish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=spanish.iso" },
@@ -1589,16 +1588,14 @@ DMenu MenuSysconsFont = {
"font8x8=cp850-8x8,font8x14=cp850-8x14,font8x16=cp850-8x16" },
{ "4 IBM 865", "Norwegian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL,
"font8x8=cp865-8x8,font8x14=cp865-8x14,font8x16=cp865-8x16" },
- { "5 IBM 866", "Russian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL,
- "font8x8=cp866-8x8,font8x14=cp866-8x14,font8x16=cp866-8x16" },
+ { "5 IBM 866", "Russian, IBM encoding (use with screenmap)", dmenuVarCheck, dmenuSetVariables, NULL,
+ "font8x8=cp866-8x8,font8x14=cp866-8x14,font8x16=cp866b-8x16" },
{ "6 IBM 866u", "Ukrainian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL,
"font8x8=cp866u-8x8,font8x14=cp866u-8x14,font8x16=cp866u-8x16" },
{ "7 ISO 8859-1", "Western Europe, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL,
"font8x8=iso-8x8,font8x14=iso-8x14,font8x16=iso-8x16" },
{ "8 ISO 8859-2", "Eastern Europe, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL,
"font8x8=iso02-8x8,font8x14=iso02-8x14,font8x16=iso02-8x16" },
- { "9 KOI8-R", "Russian, KOI8-R encoding", dmenuVarCheck, dmenuSetVariables, NULL,
- "font8x8=koi8-r-8x8,font8x14=koi8-r-8x14,font8x16=koi8-r-8x16" },
{ "0 KOI8-U", "Ukrainian, KOI8-U encoding", dmenuVarCheck, dmenuSetVariables, NULL,
"font8x8=koi8-u-8x8,font8x14=koi8-u-8x14,font8x16=koi8-u-8x16" },
{ "S SWISS", "English, better resolution", dmenuVarCheck, dmenuSetVariables, NULL,
OpenPOWER on IntegriCloud