diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-15 15:08:38 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-15 15:08:38 +0000 |
| commit | 205a4bdae76f287126db9f45a4f0ba631e3efca1 (patch) | |
| tree | 6327d3e449dfe53ad6ee6125290581aae6f5ed35 /xorg-server/xkeyboard-config/rules | |
| parent | 898081f31f99dc35a1602a607a07d1aaff49ac40 (diff) | |
| parent | 71372d36e1a3f0230b88808f70d35446fda12260 (diff) | |
| download | vcxsrv-205a4bdae76f287126db9f45a4f0ba631e3efca1.tar.gz vcxsrv-205a4bdae76f287126db9f45a4f0ba631e3efca1.tar.bz2 vcxsrv-205a4bdae76f287126db9f45a4f0ba631e3efca1.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.extras.xml.in | 24 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 14 |
2 files changed, 24 insertions, 14 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in index f845488e0..c3dcaa46f 100644 --- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in @@ -14,6 +14,30 @@ </layout>
<layout>
<configItem>
+ <name>ca</name>
+ <_shortDescription>fr</_shortDescription>
+ <_description>French (Canada)</_description>
+ <languageList><iso639Id>fr</iso639Id></languageList>
+ </configItem>
+ <variantList>
+ <variant>
+ <configItem>
+ <name>kut</name>
+ <_shortDescription>kut</_shortDescription>
+ <_description>Kutenai</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>shs</name>
+ <_shortDescription>shs</_shortDescription>
+ <_description>Secwepemctsin</_description>
+ </configItem>
+ </variant>
+ </variantList>
+ </layout>
+ <layout>
+ <configItem>
<name>ir</name>
<_shortDescription>Iran</_shortDescription>
<_description>Iran</_description>
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 74666dcd3..fddc4c44b 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -2179,20 +2179,6 @@ </variant>
<variant>
<configItem>
- <name>shs</name>
- <_shortDescription>shs</_shortDescription>
- <_description>Secwepemctsin</_description>
- </configItem>
- </variant>
- <variant>
- <configItem>
- <name>kut</name>
- <_shortDescription>kut</_shortDescription>
- <_description>Kutenai</_description>
- </configItem>
- </variant>
- <variant>
- <configItem>
<name>eng</name>
<_shortDescription>en</_shortDescription>
<_description>English (Canada)</_description>
|