diff options
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
4 files changed, 21 insertions, 8 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.ml_c.part b/xorg-server/xkeyboard-config/rules/base.ml_c.part index ec8f02291..793ebe168 100644 --- a/xorg-server/xkeyboard-config/rules/base.ml_c.part +++ b/xorg-server/xkeyboard-config/rules/base.ml_c.part @@ -1,4 +1,5 @@ pc98 nec_vndr/jp = pc98(basic) * jp = complete+japan - olpc * = olpc + olpc * = olpc + olpcm * = olpc * * = complete diff --git a/xorg-server/xkeyboard-config/rules/base.ml_s.part b/xorg-server/xkeyboard-config/rules/base.ml_s.part index 552693dbf..76c05d2b2 100644 --- a/xorg-server/xkeyboard-config/rules/base.ml_s.part +++ b/xorg-server/xkeyboard-config/rules/base.ml_s.part @@ -24,6 +24,8 @@ nokiasu8w * = nokia_vndr/su-8w(%l) olpc $olpclayouts = olpc+%l%(m) olpc * = olpc+%l%(v) + olpcm $olpclayouts = olpc+%l%(m) + olpcm * = olpc+%l%(v) $thinkpads br = pc+br(thinkpad) sl-c3x00 * = pc+sharp_vndr/sl-c3x00(basic) ws003sh * = pc+sharp_vndr/ws003sh(basic) diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 1d346238e..450154bb5 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -1642,12 +1642,6 @@ <variantList> <variant> <configItem> - <name>legacy</name> - <_description>German (legacy)</_description> - </configItem> - </variant> - <variant> - <configItem> <name>nodeadkeys</name> <_description>German (Austria, eliminate dead keys)</_description> </configItem> @@ -3223,12 +3217,20 @@ <variant> <configItem> <name>ru</name> + <!-- Keyboard indicator for Russian layouts --> + <_shortDescription>ru</_shortDescription> <_description>Russian (Germany, phonetic)</_description> <languageList> <iso639Id>rus</iso639Id> </languageList> </configItem> </variant> + <variant> + <configItem> + <name>legacy</name> + <_description>German (legacy)</_description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -4266,6 +4268,12 @@ </variant> <variant> <configItem> + <name>mac</name> + <_description>Russian (Macintosh)</_description> + </configItem> + </variant> + <variant> + <configItem> <name>srp</name> <_description>Serbian (Russia)</_description> <languageList><iso639Id>rus</iso639Id> @@ -5115,7 +5123,7 @@ <name>CloGaelach</name> <_description>CloGaelach</_description> <languageList> - <iso639Id>gla</iso639Id> + <iso639Id>gle</iso639Id> </languageList> </configItem> </variant> diff --git a/xorg-server/xkeyboard-config/rules/evdev.m_k.part b/xorg-server/xkeyboard-config/rules/evdev.m_k.part index 810675463..783326b55 100644 --- a/xorg-server/xkeyboard-config/rules/evdev.m_k.part +++ b/xorg-server/xkeyboard-config/rules/evdev.m_k.part @@ -1,3 +1,5 @@ pc98 = evdev(pc98) applealu_jis = evdev+macintosh(jisevdev) + olpc = evdev+olpc(olpc) + olpcm = evdev+olpc(olpcm) * = evdev |