diff options
| author | emaste <emaste@FreeBSD.org> | 2015-05-21 01:47:12 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2015-05-21 01:47:12 +0000 |
| commit | 83f65364f27f0614db609eb225c2fa8dcfb4a2ad (patch) | |
| tree | d4f83ac66ee37b07fc0609e2b4e023208482a517 /share | |
| parent | b1fc2fbae970fc4d2aad4e8411330f54d3073b9c (diff) | |
| download | FreeBSD-src-83f65364f27f0614db609eb225c2fa8dcfb4a2ad.zip FreeBSD-src-83f65364f27f0614db609eb225c2fa8dcfb4a2ad.tar.gz | |
MFC INDEX.keymaps fixes
r282898: Correct UTF-8 encoding in Británico
One á was ISO 8859-1 0xE1 instead of UTF-8 0xC3 0xA1.
r282902: Correct language code -- "Danish" is English
The menu entry "Danish ISO-8859-1 (macbook)" was first added to the
syscons(4) INDEX.keymaps in r241851 with no language code, and then in
r256367 incorrectly tagged with "da". It is a Danish keyboard map, but
the description is in English and therefore must be "en".
This error subsequently propagated into the vt(4) INDEX.keymaps.
r282905: Restore 'he' language code for Hebrew kbdmap(1) menu title
r282914: kbdmap(1): Correct menu title: keyboards have a layout, not a language
PR: 146793, 193656
Diffstat (limited to 'share')
| -rw-r--r-- | share/syscons/keymaps/INDEX.keymaps | 2 | ||||
| -rw-r--r-- | share/vt/keymaps/INDEX.keymaps | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/share/syscons/keymaps/INDEX.keymaps b/share/syscons/keymaps/INDEX.keymaps index 221bf5a..d8ca736 100644 --- a/share/syscons/keymaps/INDEX.keymaps +++ b/share/syscons/keymaps/INDEX.keymaps @@ -123,7 +123,7 @@ danish.cp865.kbd:fr:Danois Code page 865 danish.cp865.kbd:pt:Dinamarqus Codepage 865 danish.cp865.kbd:es:Dans Codepage 865 -danish.iso.macbook.kbd:da:Danish ISO-8859-1 (macbook) +danish.iso.macbook.kbd:en:Danish ISO-8859-1 (macbook) danish.iso.macbook.kbd:da:Dansk ISO-8859-1 (macbook) danish.iso.macbook.kbd:de:Dnisch ISO-8859-1 (Macbook) danish.iso.macbook.kbd:fr:Danois ISO-8859-1 (macbook) diff --git a/share/vt/keymaps/INDEX.keymaps b/share/vt/keymaps/INDEX.keymaps index 8a33bc8..3fac998 100644 --- a/share/vt/keymaps/INDEX.keymaps +++ b/share/vt/keymaps/INDEX.keymaps @@ -20,15 +20,15 @@ # # Language support: MENU, FONT # -MENU:en:Choose your keyboard language +MENU:en:Choose your keyboard layout MENU:da,no,sv:Vælg dit keyboard layout MENU:de:Wählen Sie Ihre Tastaturbelegung -MENU:fr:Choisissez la nationalité de votre clavier +MENU:fr:Choisissez la disposition de votre clavier MENU:pl:Wybierz układ klawiatury MENU:pt:Escolha o layout do teclado -MENU:es:Seleccione el idioma de su teclado -MENU::ךלש תדלקמה תפש תא רחב -MENU:uk:Bиберіть розкладку клавіатури +MENU:es:Seleccione la disposición de su teclado +MENU:he:ךלש תדלקמה תפש תא רחב +MENU:uk:Оберiть розкладку клавіатури MENU:el:Επιλέξτε το πληκτρολόγιο της κονσόλας MENU:hy:Ընտրեք ստեղնաշարի դասավորությունը @@ -121,7 +121,7 @@ dk.kbd.from-cp865:fr:Danois dk.kbd.from-cp865:pt:Dinamarquês dk.kbd.from-cp865:es:Danés -dk.macbook.kbd:da:Danish (macbook) +dk.macbook.kbd:en:Danish (macbook) dk.macbook.kbd:da:Dansk (macbook) dk.macbook.kbd:de:Dänisch (Macbook) dk.macbook.kbd:fr:Danois (macbook) @@ -517,7 +517,7 @@ uk.capsctrl.kbd:en:United Kingdom (Caps Lock acts as Left Ctrl) uk.capsctrl.kbd:de:Vereinigtes Königreich (Caps Lock als linke Strg) #uk.iso-ctrl.kbd:fr:Royaume Uni (caps lock acts as Left Ctrl) #uk.iso-ctrl.kbd:pt:Reino Unido (caps lock acts as Left Ctrl) -#uk.iso-ctrl.kbd:es:Britnico (caps lock acts as Left Ctrl) +#uk.iso-ctrl.kbd:es:Británico (caps lock acts as Left Ctrl) uk.dvorak.kbd:en:United Kingdom Dvorak uk.dvorak.kbd:de:Vereinigtes Königreich Dvorak |
