summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarja van Waes <marja@mageia.org>2016-06-19 12:04:04 +0200
committerMarja van Waes <marja@mageia.org>2016-06-19 12:04:04 +0200
commit692e43c54cfebca5dc2929ab5fa657ae8c2a3317 (patch)
treefeb2c9a68b738636b8901ec2eaa8692127c26498
parent1dd9cae55faf858f9b577af0c79197306fc9d8ed (diff)
downloaddrakx-kbd-mouse-x11-692e43c54cfebca5dc2929ab5fa657ae8c2a3317.tar
drakx-kbd-mouse-x11-692e43c54cfebca5dc2929ab5fa657ae8c2a3317.tar.gz
drakx-kbd-mouse-x11-692e43c54cfebca5dc2929ab5fa657ae8c2a3317.tar.bz2
drakx-kbd-mouse-x11-692e43c54cfebca5dc2929ab5fa657ae8c2a3317.tar.xz
drakx-kbd-mouse-x11-692e43c54cfebca5dc2929ab5fa657ae8c2a3317.zip
add US Apple keyboard (mga#7519)
-rw-r--r--NEWS4
-rw-r--r--lib/keyboard.pm3
2 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index f2d3004..04c5303 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+
+- add US Macintosh keyboard (mga#7519)
+- translation updates
+
Version 1.10 - 15 June 2016
- replace "Bépo" with "Bepo" in keyboard.pm, because an English "é" breaks
diff --git a/lib/keyboard.pm b/lib/keyboard.pm
index f8d3e2b..ed1e33b 100644
--- a/lib/keyboard.pm
+++ b/lib/keyboard.pm
@@ -53,7 +53,7 @@ our %lang2keyboard =
'en_IE' => 'ie:80 gb:70 dvorak_gb:10',
'en_NG' => 'ng:80 us:60',
'en_NZ' => 'us:80 us3:70 us_intl:50 gb:40 dvorak:10 dvorak_gb:5',
-'en_US' => 'us:89 us3:80 us_intl:50 dvorak:10',
+'en_US' => 'us:89 us3:80 us_intl:50 dvorak:10 us_mac:5',
'eo' => 'us_intl:89 dvorak_eo:30 dvorak:10',
'es' => 'es:85 lat:80 us_intl:50',
'et' => 'ee:90',
@@ -326,6 +326,7 @@ arch() =~ /^sparc/ ? (
"urd" => [ N_("_: keyboard\nUrdu keyboard"), "us", "urd", 1 ],
"us" => [ N_("US keyboard"), "us", "us", 0 ],
"us_intl" => [ N_("US keyboard (international)"), "us-intl", "us(alt-intl)", 0 ],
+ "us_mac" => [ N_("US keyboard (Macintosh)"), "mac-us", "us(mac)", 0 ],
"us3" => [ N_("ISO9995-3 (US keyboard with 3 levels per key)"), "us", "latin+level3(ralt_switch)", 0 ],
"uz" => [ N_("_: keyboard\nUzbek (cyrillic)"), "uz", "uz", 1 ],
# old XKB layout