svn commit: r283164 - in stable/10/share: syscons/keymaps vt/keymaps

[Ed Maste]

Author: emaste
Date: Thu May 21 01:47:12 2015
New Revision: 283164
URL: https://svnweb.freebsd.org/changeset/base/283164

Log:
  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

Modified:
  stable/10/share/syscons/keymaps/INDEX.keymaps
  stable/10/share/vt/keymaps/INDEX.keymaps
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/syscons/keymaps/INDEX.keymaps
==============================================================================
--- stable/10/share/syscons/keymaps/INDEX.keymaps	Wed May 20 23:15:56 2015	(r283163)
+++ stable/10/share/syscons/keymaps/INDEX.keymaps	Thu May 21 01:47:12 2015	(r283164)
@@ -123,7 +123,7 @@ danish.cp865.kbd:fr:Danois Code page 865
 danish.cp865.kbd:pt:Dinamarquês Codepage 865
 danish.cp865.kbd:es:Danés 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:Dänisch ISO-8859-1 (Macbook)
 danish.iso.macbook.kbd:fr:Danois ISO-8859-1 (macbook)

Modified: stable/10/share/vt/keymaps/INDEX.keymaps
==============================================================================
--- stable/10/share/vt/keymaps/INDEX.keymaps	Wed May 20 23:15:56 2015	(r283163)
+++ stable/10/share/vt/keymaps/INDEX.keymaps	Thu May 21 01:47:12 2015	(r283164)
@@ -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 
 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:Británico (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