aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-02-01 09:35:49 +0100
committermarha <marha@users.sourceforge.net>2013-02-01 09:35:49 +0100
commitd78d8436d799f19f61642849e31e9ed6af3e6ae2 (patch)
tree436d3d26ae0fe678e3751a9dba65162ac54b2597 /xorg-server
parent49c196c1056aaed97ff5cf43beff5c436d783b99 (diff)
parenta6d5f8de1394c338d01b65be7dba3520bf8bdf4b (diff)
downloadvcxsrv-d78d8436d799f19f61642849e31e9ed6af3e6ae2.tar.gz
vcxsrv-d78d8436d799f19f61642849e31e9ed6af3e6ae2.tar.bz2
vcxsrv-d78d8436d799f19f61642849e31e9ed6af3e6ae2.zip
Merge remote-tracking branch 'origin/released'
* origin/released: xkeyboard-config fontconfig mesa git update 1 feb 2013
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in21
1 files changed, 16 insertions, 5 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index fd9cc274f..19380fa82 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -2495,7 +2495,7 @@
<_shortDescription>hr</_shortDescription>
<_description>Croatian</_description>
<languageList>
- <iso639Id>scr</iso639Id>
+ <iso639Id>hrv</iso639Id>
</languageList>
</configItem>
<variantList>
@@ -3887,7 +3887,7 @@
<_shortDescription>mn</_shortDescription>
<_description>Mongolian</_description>
<languageList>
- <iso639Id>mng</iso639Id>
+ <iso639Id>mon</iso639Id>
</languageList>
</configItem>
<variantList/>
@@ -4877,7 +4877,7 @@
<_shortDescription>zh</_shortDescription>
<_description>Taiwanese</_description>
<languageList>
- <iso639Id>trv</iso639Id>
+ <iso639Id>fox</iso639Id>
</languageList>
</configItem>
<variantList>
@@ -4897,6 +4897,11 @@
<iso639Id>ssf</iso639Id>
<iso639Id>tao</iso639Id>
<iso639Id>tsu</iso639Id>
+ <iso639Id>trv</iso639Id>
+ <iso639Id>xnb</iso639Id>
+ <iso639Id>sxr</iso639Id>
+ <iso639Id>uun</iso639Id>
+ <iso639Id>fos</iso639Id>
</languageList>
</configItem>
</variant>
@@ -5174,7 +5179,7 @@
<_shortDescription>sd</_shortDescription>
<_description>Sindhi</_description>
<languageList>
- <iso639Id>sd</iso639Id>
+ <iso639Id>snd</iso639Id>
</languageList>
</configItem>
</variant>
@@ -5362,7 +5367,7 @@
<_shortDescription>fr</_shortDescription>
<_description>French (Mali, alternative)</_description>
<languageList>
- <iso639Id>fr</iso639Id>
+ <iso639Id>fra</iso639Id>
</languageList>
</configItem>
</variant>
@@ -5372,6 +5377,9 @@
<!-- Keyboard indicator for English layouts -->
<_shortDescription>en</_shortDescription>
<_description>English (Mali, US Macintosh)</_description>
+ <languageList>
+ <iso639Id>eng</iso639Id>
+ </languageList>
</configItem>
</variant>
<variant>
@@ -5380,6 +5388,9 @@
<!-- Keyboard indicator for English layouts -->
<_shortDescription>en</_shortDescription>
<_description>English (Mali, US international)</_description>
+ <languageList>
+ <iso639Id>eng</iso639Id>
+ </languageList>
</configItem>
</variant>
</variantList>