Merge from head@274682

1 files changed, 66 insertions, 66 deletions

diff --git a/share/vt/keymaps/ua.kbd b/share/vt/keymaps/ua.kbd
index a93800f..d031f1d 100644
--- a/share/vt/keymaps/ua.kbd
+++ b/share/vt/keymaps/ua.kbd
@@ -19,43 +19,43 @@
   013   '='    '+'    nop    nop    '='    '+'    nop    nop     O
   014   bs     bs     del    del    bs     bs     del    del     O
   015   ht     btab   nop    nop    btab   btab   nop    nop     O
-  016   'q'    'Q'    dc1    dc1    1081    1049    dc1    dc1     C
-  017   'w'    'W'    etb    etb    1094    1062    etb    etb     C
-  018   'e'    'E'    enq    enq    1091    1059    enq    enq     C
-  019   'r'    'R'    dc2    dc2    1082    1050    dc2    dc2     C
-  020   't'    'T'    dc4    dc4    1077    1045    dc4    dc4     C
-  021   'y'    'Y'    em     em     1085    1053    em     em      C
-  022   'u'    'U'    nak    nak    1075    1043    nak    nak     C
-  023   'i'    'I'    ht     ht     1096    1064    ht     ht      C
-  024   'o'    'O'    si     si     1097    1065    si     si      C
-  025   'p'    'P'    dle    dle    1079    1047    dle    dle     C
-  026   '['    '{'    esc    esc    1093    1061    esc    esc     O
-  027   ']'    '}'    gs     gs     1111    1031    1098    1066     O
+  016   'q'    'Q'    dc1    dc1    0x0439 0x0419 dc1    dc1     C
+  017   'w'    'W'    etb    etb    0x0446 0x0426 etb    etb     C
+  018   'e'    'E'    enq    enq    0x0443 0x0423 enq    enq     C
+  019   'r'    'R'    dc2    dc2    0x043a 0x041a dc2    dc2     C
+  020   't'    'T'    dc4    dc4    0x0435 0x0415 dc4    dc4     C
+  021   'y'    'Y'    em     em     0x043d 0x041d em     em      C
+  022   'u'    'U'    nak    nak    0x0433 0x0413 nak    nak     C
+  023   'i'    'I'    ht     ht     0x0448 0x0428 ht     ht      C
+  024   'o'    'O'    si     si     0x0449 0x0429 si     si      C
+  025   'p'    'P'    dle    dle    0x0437 0x0417 dle    dle     C
+  026   '['    '{'    esc    esc    0x0445 0x0425 esc    esc     O
+  027   ']'    '}'    gs     gs     0x0457 0x0407 0x044a 0x042a  O
   028   cr     cr     nl     nl     cr     cr     nl     nl      O
   029   lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl   O
-  030   'a'    'A'    soh    soh    1092    1060    soh    soh     C
-  031   's'    'S'    dc3    dc3    1110    1030    1099    1067     C
-  032   'd'    'D'    eot    eot    1074    1042    eot    eot     C
-  033   'f'    'F'    ack    ack    1072    1040    ack    ack     C
-  034   'g'    'G'    bel    bel    1087    1055    bel    bel     C
-  035   'h'    'H'    bs     bs     1088    1056    bs     bs      C
-  036   'j'    'J'    nl     nl     1086    1054    nl     nl      C
-  037   'k'    'K'    vt     vt     1083    1051    vt     vt      C
-  038   'l'    'L'    ff     ff     1076    1044    ff     ff      C
-  039   ';'    ':'    nop    nop    1078    1046    nop    nop     O
-  040   '''    '"'    nop    nop    1108    1028    1101    1069     O
-  041   '`'    '~'    nop    nop    1169    1168    1105    1025     O
+  030   'a'    'A'    soh    soh    0x0444 0x0424 soh    soh     C
+  031   's'    'S'    dc3    dc3    0x0456 0x0406 0x044b 0x042b  C
+  032   'd'    'D'    eot    eot    0x0432 0x0412 eot    eot     C
+  033   'f'    'F'    ack    ack    0x0430 0x0410 ack    ack     C
+  034   'g'    'G'    bel    bel    0x043f 0x041f bel    bel     C
+  035   'h'    'H'    bs     bs     0x0440 0x0420 bs     bs      C
+  036   'j'    'J'    nl     nl     0x043e 0x041e nl     nl      C
+  037   'k'    'K'    vt     vt     0x043b 0x041b vt     vt      C
+  038   'l'    'L'    ff     ff     0x0434 0x0414 ff     ff      C
+  039   ';'    ':'    nop    nop    0x0436 0x0416 nop    nop     O
+  040   '''    '"'    nop    nop    0x0454 0x0404 0x044d 0x042d  O
+  041   '`'    '~'    nop    nop    0x0491 0x0490 0x0451 0x0401  O
   042   lshift lshift lshift lshift lshift lshift lshift lshift  O
   043   '\'    '|'    fs     fs     '\'    '|'    fs     fs      O
-  044   'z'    'Z'    sub    sub    1103    1071    sub    sub     C
-  045   'x'    'X'    can    can    1095    1063    can    can     C
-  046   'c'    'C'    etx    etx    1089    1057    etx    etx     C
-  047   'v'    'V'    syn    syn    1084    1052    syn    syn     C
-  048   'b'    'B'    stx    stx    1080    1048    stx    stx     C
-  049   'n'    'N'    so     so     1090    1058    so     so      C
-  050   'm'    'M'    cr     cr     1100    1068    cr     cr      C
-  051   ','    '<'    nop    nop    1073    1041    nop    nop     O
-  052   '.'    '>'    nop    nop    1102    1070    nop    nop     O
+  044   'z'    'Z'    sub    sub    0x044f 0x042f sub    sub     C
+  045   'x'    'X'    can    can    0x0447 0x0427 can    can     C
+  046   'c'    'C'    etx    etx    0x0441 0x0421 etx    etx     C
+  047   'v'    'V'    syn    syn    0x043c 0x041c syn    syn     C
+  048   'b'    'B'    stx    stx    0x0438 0x0418 stx    stx     C
+  049   'n'    'N'    so     so     0x0442 0x0422 so     so      C
+  050   'm'    'M'    cr     cr     0x044c 0x042c cr     cr      C
+  051   ','    '<'    nop    nop    0x0431 0x0411 nop    nop     O
+  052   '.'    '>'    nop    nop    0x044e 0x042e nop    nop     O
   053   '/'    '?'    nop    nop    '/'    '?'    nop    nop     O
   054   rshift rshift rshift rshift rshift rshift rshift rshift  O
   055   '*'    '*'    nl     nl     '*'    '*'    nl     nl      O
@@ -148,43 +148,43 @@
   141   '='    '+'    nop    nop    '='    '+'    nop    nop     O
   142   bs     bs     del    del    bs     bs     del    del     O
   143   ht     btab   nop    nop    btab   btab   nop    nop     O
-  144   1081    1049    dc1    dc1    'q'    'Q'    dc1    dc1     C
-  145   1094    1062    etb    etb    'w'    'W'    etb    etb     C
-  146   1091    1059    enq    enq    'e'    'E'    enq    enq     C
-  147   1082    1050    dc2    dc2    'r'    'R'    dc2    dc2     C
-  148   1077    1045    dc4    dc4    't'    'T'    dc4    dc4     C
-  149   1085    1053    em     em     'y'    'Y'    em     em      C
-  150   1075    1043    nak    nak    'u'    'U'    nak    nak     C
-  151   1096    1064    ht     ht     'i'    'I'    ht     ht      C
-  152   1097    1065    si     si     'o'    'O'    si     si      C
-  153   1079    1047    dle    dle    'p'    'P'    dle    dle     C
-  154   1093    1061    esc    esc    '['    '{'    esc    esc     C
-  155   1111    1031    gs     gs     ']'    '}'    1098    1066     C
+  144   0x0439 0x0419 dc1    dc1    'q'    'Q'    dc1    dc1     C
+  145   0x0446 0x0426 etb    etb    'w'    'W'    etb    etb     C
+  146   0x0443 0x0423 enq    enq    'e'    'E'    enq    enq     C
+  147   0x043a 0x041a dc2    dc2    'r'    'R'    dc2    dc2     C
+  148   0x0435 0x0415 dc4    dc4    't'    'T'    dc4    dc4     C
+  149   0x043d 0x041d em     em     'y'    'Y'    em     em      C
+  150   0x0433 0x0413 nak    nak    'u'    'U'    nak    nak     C
+  151   0x0448 0x0428 ht     ht     'i'    'I'    ht     ht      C
+  152   0x0449 0x0429 si     si     'o'    'O'    si     si      C
+  153   0x0437 0x0417 dle    dle    'p'    'P'    dle    dle     C
+  154   0x0445 0x0425 esc    esc    '['    '{'    esc    esc     C
+  155   0x0457 0x0407 gs     gs     ']'    '}'    0x044a 0x042a  C
   156   cr     cr     nl     nl     cr     cr     nl     nl      O
   157   lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl   O
-  158   1092    1060    soh    soh    'a'    'A'    soh    soh     C
-  159   1110    1030    dc3    dc3    's'    'S'    1099    1067     C
-  160   1074    1042    eot    eot    'd'    'D'    eot    eot     C
-  161   1072    1040    ack    ack    'f'    'F'    ack    ack     C
-  162   1087    1055    bel    bel    'g'    'G'    bel    bel     C
-  163   1088    1056    bs     bs     'h'    'H'    bs     bs      C
-  164   1086    1054    nl     nl     'j'    'J'    nl     nl      C
-  165   1083    1051    vt     vt     'k'    'K'    vt     vt      C
-  166   1076    1044    ff     ff     'l'    'L'    ff     ff      C
-  167   1078    1046    nop    nop    ';'    ':'    nop    nop     C
-  168   1108    1028    nop    nop    '''    '"'    1101    1069     C
-  169   1169    1168    nop    nop    '`'    '~'    1105    1025     C
+  158   0x0444 0x0424 soh    soh    'a'    'A'    soh    soh     C
+  159   0x0456 0x0406 dc3    dc3    's'    'S'    0x044b 0x042b  C
+  160   0x0432 0x0412 eot    eot    'd'    'D'    eot    eot     C
+  161   0x0430 0x0410 ack    ack    'f'    'F'    ack    ack     C
+  162   0x043f 0x041f bel    bel    'g'    'G'    bel    bel     C
+  163   0x0440 0x0420 bs     bs     'h'    'H'    bs     bs      C
+  164   0x043e 0x041e nl     nl     'j'    'J'    nl     nl      C
+  165   0x043b 0x041b vt     vt     'k'    'K'    vt     vt      C
+  166   0x0434 0x0414 ff     ff     'l'    'L'    ff     ff      C
+  167   0x0436 0x0416 nop    nop    ';'    ':'    nop    nop     C
+  168   0x0454 0x0404 nop    nop    '''    '"'    0x044d 0x042d  C
+  169   0x0491 0x0490 nop    nop    '`'    '~'    0x0451 0x0401  C
   170   lshift lshift lshift lshift lshift lshift lshift lshift  O
   171   '\'    '|'    fs     fs     '\'    '|'    fs     fs      O
-  172   1103    1071    sub    sub    'z'    'Z'    sub    sub     C
-  173   1095    1063    can    can    'x'    'X'    can    can     C
-  174   1089    1057    etx    etx    'c'    'C'    etx    etx     C
-  175   1084    1052    syn    syn    'v'    'V'    syn    syn     C
-  176   1080    1048    stx    stx    'b'    'B'    stx    stx     C
-  177   1090    1058    so     so     'n'    'N'    so     so      C
-  178   1100    1068    cr     cr     'm'    'M'    cr     cr      C
-  179   1073    1041    nop    nop    ','    '<'    nop    nop     C
-  180   1102    1070    nop    nop    '.'    '>'    nop    nop     C
+  172   0x044f 0x042f sub    sub    'z'    'Z'    sub    sub     C
+  173   0x0447 0x0427 can    can    'x'    'X'    can    can     C
+  174   0x0441 0x0421 etx    etx    'c'    'C'    etx    etx     C
+  175   0x043c 0x041c syn    syn    'v'    'V'    syn    syn     C
+  176   0x0438 0x0418 stx    stx    'b'    'B'    stx    stx     C
+  177   0x0442 0x0422 so     so     'n'    'N'    so     so      C
+  178   0x044c 0x042c cr     cr     'm'    'M'    cr     cr      C
+  179   0x0431 0x0411 nop    nop    ','    '<'    nop    nop     C
+  180   0x044e 0x042e nop    nop    '.'    '>'    nop    nop     C
   181   '/'    '?'    nop    nop    '/'    '?'    nop    nop     O
   182   rshift rshift rshift rshift rshift rshift rshift rshift  O
   183   '*'    '*'    nl     nl     '*'    '*'    nl     nl      O