Author: se
Date: Thu Aug 21 21:48:33 2014
New Revision: 270307
URL: http://svnweb.freebsd.org/changeset/base/270307
Log:
MFC 270153, 270098:
Apply a fixes to problems found while converting to NEWCONS.
Modified:
stable/10/share/syscons/keymaps/INDEX.keymaps
stable/10/share/syscons/keymaps/be.iso.acc.kbd
stable/10/share/syscons/keymaps/cs.latin2.qwertz.kbd
stable/10/share/syscons/keymaps/uk.iso-ctrl.kbd
stable/10/share/syscons/keymaps/uk.iso.kbd
Modified: stable/10/share/syscons/keymaps/INDEX.keymaps
==============================================================================
--- stable/10/share/syscons/keymaps/INDEX.keymaps Thu Aug 21 21:36:06
2014 (r270306)
+++ stable/10/share/syscons/keymaps/INDEX.keymaps Thu Aug 21 21:48:33
2014 (r270307)
@@ -4,7 +4,7 @@
#
# Format <file>:<lang>:<description>
#
-# lang: ar bg cs da de el en es fi fr hr hu hy is it iw ja kk ko nl no pl
+# lang: ar bg cs da de el en es fi fr he hr hu hy is it ja kk ko nl no pl
# pt ro ru sh sk sl sv tr uk zh
# lang: lang,lang
#
@@ -27,7 +27,7 @@ MENU:fr:Choisissez la nationalit� de vot
MENU:pl:Wybierz uk�ad klawiatury
MENU:pt:Escolha o layout do teclado
MENU:es:Seleccione el idioma de su teclado
-MENU:iw:��� ������ ��� �� ���
+MENU:he:��� ������ ��� �� ���
MENU:uk:B���Ҧ�� ��������� ���צ�����
MENU:el:�������� �� ������������ ��� ��������
MENU:hy:������ ����ݳ߳�� ���������������
@@ -36,7 +36,7 @@ FONT:en:cp437-8x16.fnt
FONT:de,fr,da,no,sv,pt,es:iso-8x16.fnt
FONT:ru:koi8-r-8x16.fnt
FONT:pl:iso02-8x16.fnt
-FONT:iw:iso08-8x16.fnt
+FONT:he:iso08-8x16.fnt
FONT:uk:koi8-u-8x16.fnt
FONT:el:iso07-8x16.fnt
FONT:hy:haik8-8x16.fnt
@@ -52,8 +52,10 @@ be.iso.acc.kbd:fr:Belge ISO-8859-1 (avec
be.iso.acc.kbd:pt:Belga ISO-8859-1 (com acentos)
be.iso.acc.kbd:es:Belga ISO-8859-1 (con acentos)
-bg.bds.ctrlcaps.kbd:bg:Bulgarian BDS
-bg.phonetic.ctrlcaps.kbd:bg:Bulgarian Phonetic
+bg.bds.ctrlcaps.kbd:en:Bulgarian (BDS)
+bg.bds.ctrlcaps.kbd:de:Bulgarisch (BDS)
+bg.phonetic.ctrlcaps.kbd:en:Bulgarian (Phonetic)
+bg.phonetic.ctrlcaps.kbd:de:Bulgarisch (phonetisch)
br275.iso.kbd:en:Brazilian 275 ISO-8859-1
br275.iso.kbd:de:Brasilianisch 275 ISO-8859-1
@@ -74,10 +76,13 @@ br275.cp850.kbd:pt:Brasileiro 275 Codepa
br275.cp850.kbd:es:Brasile�o 275 Codepage 850
by.cp1131.kbd:en:Belarusian Codepage 1131
+by.cp1131.kbd:de:Wei�russisch Code page 1131
by.cp1131.kbd:fr:Bi�lorusse Code page 1131
+by.cp1251.kbd:de:Wei�russisch Codepage 1251
by.cp1251.kbd:en:Belarusian Codepage 1251
by.cp1251.kbd:fr:Bi�lorusse Code page 1251
by.iso5.kbd:en:Belarusian ISO-8859-5
+by.iso5.kbd:de:Wei�russisch ISO-8859-5
by.iso5.kbd:fr:Bi�lorusse ISO-8859-5
ce.iso2.kbd:en:Central European ISO-8859-2
@@ -88,6 +93,7 @@ ce.iso2.kbd:es:Centroeuropeo ISO-8859-2
colemak.iso15.acc.kbd:en:Colemak ergonomic alternative
cs.latin2.qwertz.kbd:en:Czech ISO-8859-2 (QWERTZ, accent keys)
+cs.latin2.qwertz.kbd:de:Tschechisch ISO-8859-2 (QWERTZ, mit Akzenten)
cs.latin2.qwertz.kbd:fr:Tch�que ISO-8859-2 (QWERTZ, avec accents)
cs.latin2.qwertz.kbd:es:Checo ISO-8859-2 (QWERTZ, con acentos)
@@ -118,8 +124,14 @@ danish.cp865.kbd:pt:Dinamarqu�s Codepage
danish.cp865.kbd:es:Dan�s Codepage 865
danish.iso.macbook.kbd:da:Danish ISO-8859-1 (macbook)
+danish.iso.macbook.kbd:da:Dansk ISO-8859-1 (macbook)
+danish.iso.macbook.kbd:de:D�nisch ISO-8859-1 (Macbook)
+danish.iso.macbook.kbd:fr:Danois ISO-8859-1 (macbook)
+danish.iso.macbook.kbd:pt:Dinamarqu�s ISO-8859-1 (macbook)
+danish.iso.macbook.kbd:es:Dan�s ISO-8859-1 (macbook)
dutch.iso.acc.kbd:en:Dutch ISO keymap (accent keys)
+dutch.iso.acc.kbd:de:Holl�ndisch (mit Akzenten)
eee_nordic.kbd:en:Nordic layout on Asus eeePC
eee_nordic.kbd:fr:Norv�gien phon�tique sur Asus eeePC
@@ -193,19 +205,19 @@ fr_CA.iso.acc.kbd:fr:Fran�ais Canadien I
fr_CA.iso.acc.kbd:es:Francocanadiense ISO-8859-1 (con acentos)
fr_CA.iso.acc.kbd:uk:����������-��������� ISO-8859-1 (accent keys)
-german.iso.kbd:en:German ISO-8859-1
-german.iso.kbd:de:Deutsch ISO-8859-1
-german.iso.kbd:fr:Allemand ISO-8859-1
-german.iso.kbd:pt:Alem�o ISO-8859-1
-german.iso.kbd:es:Alem�n ISO-8859-1
-german.iso.kbd:uk:�������� ISO-8859-1
-
-german.iso.acc.kbd:en:German ISO-8859-1 (accent keys)
-german.iso.acc.kbd:de:Deutsch ISO-8859-1 (mit Akzenten)
-german.iso.acc.kbd:fr:Allemand ISO-8859-1 (avec accents)
-german.iso.acc.kbd:pt:Alem�o ISO-8859-1 (com acentos)
-german.iso.acc.kbd:es:Alem�n ISO-8859-1 (con acentos)
-german.iso.acc.kbd:uk:�������� ISO-8859-1 (accent keys)
+german.iso.kbd:en:German ISO-8859-15
+german.iso.kbd:de:Deutsch ISO-8859-15
+german.iso.kbd:fr:Allemand ISO-8859-15
+german.iso.kbd:pt:Alem�o ISO-8859-15
+german.iso.kbd:es:Alem�n ISO-8859-15
+german.iso.kbd:uk:�������� ISO-8859-15
+
+german.iso.acc.kbd:en:German ISO-8859-15 (accent keys)
+german.iso.acc.kbd:de:Deutsch ISO-8859-15 (mit Akzenten)
+german.iso.acc.kbd:fr:Allemand ISO-8859-15 (avec accents)
+german.iso.acc.kbd:pt:Alem�o ISO-8859-15 (com acentos)
+german.iso.acc.kbd:es:Alem�n ISO-8859-15 (con acentos)
+german.iso.acc.kbd:uk:�������� ISO-8859-15 (accent keys)
german.cp850.kbd:en:German Codepage 850
german.cp850.kbd:de:Deutsch Codeseite 850
@@ -215,14 +227,17 @@ german.cp850.kbd:es:Alem�n Codepage 850
german.cp850.kbd:uk:�������� CP-850
gr.elot.acc.kbd:en:Greek ISO-8859-7 ELOT
+gr.elot.acc.kbd:de:Grieschisch ISO-8859-7 ELOT
gr.elot.acc.kbd:fr:Grec ISO-8859-7 ELOT
gr.elot.acc.kbd:el:�������� ISO-8859-7 ����
gr.us101.acc.kbd:en:Greek ISO-8859-7 (101 keys)
+gr.us101.acc.kbd:de:Grieschisch ISO-8859-7 (101 Tasten)
gr.us101.acc.kbd:fr:Grec ISO-8859-7 (101 touches)
gr.us101.acc.kbd:el:�������� ISO-8859-7 (101 ��������)
iw.iso8.kbd:en:Hebrew ISO-8859-8
+iw.iso8.kbd:de:Hebr�isch ISO-8859-8
iw.iso8.kbd:fr:H�breu ISO-8859-8
iw.iso8.kbd:he:ISO-8859-8 �����
@@ -280,15 +295,25 @@ jp.106x.kbd:es:Japon�s 106x
jp.106x.kbd:uk:�������� 106x
jp.pc98.kbd:en:Japanese PC-98x1
+jp.pc98.kbd:de:Japanisch PC-98x1
jp.pc98.kbd:fr:Japonais PC-98x1
+jp.pc98.kbd:pt:Japon�s PC-98x1
+jp.pc98.kbd:es:Japon�s PC-98x1
+jp.pc98.kbd:uk:�������� PC-98x1
jp.pc98.iso.kbd:en:Japanese PC-98x1 (ISO)
+jp.pc98.iso.kbd:de:Japanisch PC-98x1 (ISO)
jp.pc98.iso.kbd:fr:Japonais PC-98x1 (ISO)
+jp.pc98.iso.kbd:pt:Japon�s PC-98x1 (ISO)
+jp.pc98.iso.kbd:es:Japon�s PC-98x1 (ISO)
+jp.pc98.iso.kbd:uk:�������� PC-98x1 (ISO)
kk.pt154.kst.kbd:en:Kazakh PT154 codepage
+kk.pt154.kst.kbd:de:Kasachisch PT154 codepage
kk.pt154.kst.kbd:fr:Kazakh PT154 code page
-kk.pt154.io.kbd:en:Kazakh PT154 codepage
-kk.pt154.io.kbd:fr:Kazakh PT154 code page
+kk.pt154.io.kbd:en:Kazakh PT154 codepage (with IO)
+kk.pt154.io.kbd:de:Kasachisch PT154 codepage (mit IO)
+kk.pt154.io.kbd:fr:Kazakh PT154 code page (avec IO)
latinamerican.kbd:en:Latin American
latinamerican.kbd:de:Latein Amerikanisch
@@ -301,6 +326,7 @@ latinamerican.iso.acc.kbd:fr:Am�rique la
latinamerican.iso.acc.kbd:pt,es:Am�rica Latina (com acentos)
lt.iso4.kbd:en:Lithuanian ISO-8859-4
+lt.iso4.kbd:de:Litauisch ISO-8859-4
lt.iso4.kbd:fr:Lithuanien ISO-8859-4
lt.iso4.kbd:es:Lituano ISO-8859-4
@@ -310,6 +336,7 @@ norwegian.iso.kbd:de:Norwegisch ISO-8859
norwegian.iso.kbd:fr:Norv�gien ISO-8859-1
norwegian.iso.kbd:pt:Noruegu�s ISO-8859-1
norwegian.iso.kbd:es:Noruego ISO-8859-1
+
norwegian.dvorak.kbd:en:Norwegian dvorak
norwegian.dvorak.kbd:no:Norsk dvorak
norwegian.dvorak.kbd:de:Norwegisch dvorak
@@ -352,8 +379,11 @@ ru.cp866.kbd:es:Ruso Codepage 866 (alter
ru.cp866.kbd:uk:��Ӧ����� CP-866 (�������������)
ru.iso5.kbd:en:Russian ISO-8859-5
+ru.iso5.kbd:de:Russisch ISO-8859-5
ru.iso5.kbd:fr:Russe ISO-8859-5
ru.iso5.kbd:ru:������� ISO-8859-5
+ru.iso5.kbd:pt:Russo ISO-8859-5
+ru.iso5.kbd:es:Ruso ISO-8859-5
ru.iso5.kbd:uk:��Ӧ������ ISO-8859-5
ru.koi8-r.kbd:en:Russian koi8-r
@@ -465,6 +495,7 @@ swissgerman.macbook.acc.kbd:pt:Sui�o-Ale
swissgerman.macbook.acc.kbd:es:Germanosuizo Macbook/Macbook Pro (con acentos)
tr.iso9.q.kbd:en:Turkish ISO-8859-9
+tr.iso9.q.kbd:de:T�rkisch ISO-8859-9
tr.iso9.q.kbd:fr:Turc ISO-8859-9
tr.iso9.q.kbd:uk:�������� ISO-8859-9
@@ -475,6 +506,10 @@ uk.iso.kbd:pt:Reino Unido ISO-8859-1
uk.iso.kbd:es:Brit�nico ISO-8859-1
uk.iso-ctrl.kbd:en:United Kingdom ISO-8859-1 (Caps Lock acts as Left Ctrl)
+uk.iso-ctrl.kbd:de:Vereinigtes K�nigreich ISO-8859-1 (Caps Lock als linke Strg)
+#uk.iso-ctrl.kbd:fr:Royaume Uni ISO-8859-1 (caps lock acts as Left Ctrl)
+#uk.iso-ctrl.kbd:pt:Reino Unido ISO-8859-1 (caps lock acts as Left Ctrl)
+#uk.iso-ctrl.kbd:es:Brit�nico ISO-8859-1 (caps lock acts as Left Ctrl)
uk.cp850.kbd:en:United Kingdom Codepage 850
uk.cp850.kbd:de:Vereinigtes K�nigreich Codeseite 850
@@ -483,9 +518,13 @@ uk.cp850.kbd:pt:Reino Unido Codepage 850
uk.cp850.kbd:es:Brit�nico Codepage 850
uk.cp850-ctrl.kbd:en:United Kingdom Codepage 850 (Caps Lock acts as Left Ctrl)
+uk.cp850.kbd:de:Vereinigtes K�nigreich ISO-8859-1 (Caps Lock als linke Strg)
+#uk.cp850.kbd:fr:Royaume Uni ISO-8859-1 (caps lock acts as Left Ctrl)
+#uk.cp850.kbd:pt:Reino Unido ISO-8859-1 (caps lock acts as Left Ctrl)
+#uk.cp850.kbd:es:Brit�nico ISO-8859-1 (caps lock acts as Left Ctrl)
uk.dvorak.kbd:en:United Kingdom Dvorak
-uk.dvorak.kbd:de:Vereinigtes K\xf6nigreich Dvorak
+uk.dvorak.kbd:de:Vereinigtes K�nigreich Dvorak
uk.dvorak.kbd:fr:Royaume Uni Dvorak
uk.dvorak.kbd:pt:Reino Unido Dvorak
uk.dvorak.kbd:es:Brit�nico Dvorak
@@ -521,6 +560,10 @@ us.dvorakl.kbd:pt:Estados Unidos da Am�r
us.dvorakl.kbd:es:Estadounidense dvorak zurdo
us.dvorakp.kbd:en:United States of America Programmer Dvorak
+us.dvorakp.kbd:de:US-amerikanisch (Dvorak f�r Programmierer)
+us.dvorakp.kbd:fr:�tats Unis d'Am�rique dvorakp
+us.dvorakp.kbd:pt:Estados Unidos da Am�rica dvorakp
+us.dvorakp.kbd:es:Estadounidense dvorakp
us.dvorakx.kbd:en:United States of America dvorakx
us.dvorakx.kbd:de:US-amerikanisch dvorakx
@@ -543,14 +586,17 @@ us.unix.kbd:pt:Estados Unidos da Am�rica
us.unix.kbd:es:Estadounidense Unix tradicional
ua.iso5.kbd:en:Ukrainian ISO-8859-5
+ua.iso5.kbd:de:Ukrainisch ISO-8859-5
ua.iso5.kbd:fr:Ukrainien ISO-8859-5
ua.iso5.kbd:ru:���������� ISO-8859-5
ua.iso5.kbd:uk:���������� ISO-8859-5
ua.koi8-u.kbd:en:Ukrainian koi8-u
+ua.koi8-u.kbd:de:Ukrainisch koi8-u
ua.koi8-u.kbd:fr:Ukrainien koi8-u
ua.koi8-u.kbd:uk:���������� koi8-u
ua.koi8-u.shift.alt.kbd:en:Ukrainian koi8-u with koi8-r (shift)
+ua.koi8-u.shift.alt.kbd:de:Ukrainisch koi8-u mit koi8-r (shift)
ua.koi8-u.shift.alt.kbd:fr:Ukrainien koi8-u avec koi8-r (shift)
ua.koi8-u.shift.alt.kbd:uk:���������� koi8-u � koi8-r (shift)
Modified: stable/10/share/syscons/keymaps/be.iso.acc.kbd
==============================================================================
--- stable/10/share/syscons/keymaps/be.iso.acc.kbd Thu Aug 21 21:36:06
2014 (r270306)
+++ stable/10/share/syscons/keymaps/be.iso.acc.kbd Thu Aug 21 21:48:33
2014 (r270307)
@@ -42,7 +42,7 @@
036 'j' 'J' nl nl 'j' 'J' nl nl C
037 'k' 'K' vt vt 'k' 'K' vt vt C
038 'l' 'L' ff ff 'l' 'L' ff ff C
- 039 'm' 'M' cr cr 'm' 'M' cr cr O
+ 039 'm' 'M' cr cr 'm' 'M' cr cr C
040 249 '%' nop nop dacu dacu nop nop O
041 178 179 nop nop 178 179 nop nop O
042 lshift lshift lshift lshift lshift lshift lshift lshift O
@@ -53,7 +53,7 @@
047 'v' 'V' syn syn 'v' 'V' syn syn C
048 'b' 'B' stx stx 'b' 'B' stx stx C
049 'n' 'N' so so 'n' 'N' so so C
- 050 ',' '?' nop nop ',' '?' nop nop C
+ 050 ',' '?' nop nop ',' '?' nop nop O
051 ';' '.' nop nop ';' '.' nop nop O
052 ':' '/' nop nop ':' '/' nop nop O
053 '=' '+' nop nop dtil dtil nop nop O
Modified: stable/10/share/syscons/keymaps/cs.latin2.qwertz.kbd
==============================================================================
--- stable/10/share/syscons/keymaps/cs.latin2.qwertz.kbd Thu Aug 21
21:36:06 2014 (r270306)
+++ stable/10/share/syscons/keymaps/cs.latin2.qwertz.kbd Thu Aug 21
21:48:33 2014 (r270307)
@@ -1,5 +1,5 @@
# Czech Standard Typewriter QWERTZ Keyboard
-# by Rudolf Cejka <cej...@dcse.fee.vutbr.cz>
+# by Rudolf Cejka <cej...@fit.vutbr.cz>
#
# $FreeBSD$
#
Modified: stable/10/share/syscons/keymaps/uk.iso-ctrl.kbd
==============================================================================
--- stable/10/share/syscons/keymaps/uk.iso-ctrl.kbd Thu Aug 21 21:36:06
2014 (r270306)
+++ stable/10/share/syscons/keymaps/uk.iso-ctrl.kbd Thu Aug 21 21:48:33
2014 (r270307)
@@ -46,7 +46,7 @@
040 ''' '@' nul nul ''' '@' nul nul O
041 '`' 172 nop nop '|' '|' nop nop O
042 lshift lshift lshift lshift lshift lshift lshift lshift O
- 043 '#' '~' nop nop '~' '~' nop nop O
+ 043 '#' '~' nop nop '#' '~' nop nop O
044 'z' 'Z' sub sub 'z' 'Z' sub sub C
045 'x' 'X' can can 'x' 'X' can can C
046 'c' 'C' etx etx 'c' 'C' etx etx C
Modified: stable/10/share/syscons/keymaps/uk.iso.kbd
==============================================================================
--- stable/10/share/syscons/keymaps/uk.iso.kbd Thu Aug 21 21:36:06 2014
(r270306)
+++ stable/10/share/syscons/keymaps/uk.iso.kbd Thu Aug 21 21:48:33 2014
(r270307)
@@ -46,7 +46,7 @@
040 ''' '@' nul nul ''' '@' nul nul O
041 '`' 172 nop nop '|' '|' nop nop O
042 lshift lshift lshift lshift lshift lshift lshift lshift O
- 043 '#' '~' nop nop '~' '~' nop nop O
+ 043 '#' '~' nop nop '#' '~' nop nop O
044 'z' 'Z' sub sub 'z' 'Z' sub sub C
045 'x' 'X' can can 'x' 'X' can can C
046 'c' 'C' etx etx 'c' 'C' etx etx C
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
