aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/rules
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-09-30 15:43:57 +0000
committermarha <marha@users.sourceforge.net>2010-09-30 15:43:57 +0000
commit54fffe7283b49dcaae81e826eb0dff213552c4ec (patch)
treec3a8c65ebffb5841251bd16edec93f0576f77418 /xorg-server/xkeyboard-config/rules
parentd718b0dd8ed27c6f8497077b8d4b088d9b7f7bd3 (diff)
parentf952d0d771de6d9b8ecc3cbbe3624203723bbb25 (diff)
downloadvcxsrv-54fffe7283b49dcaae81e826eb0dff213552c4ec.tar.gz
vcxsrv-54fffe7283b49dcaae81e826eb0dff213552c4ec.tar.bz2
vcxsrv-54fffe7283b49dcaae81e826eb0dff213552c4ec.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.o_s.part1
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in23
2 files changed, 19 insertions, 5 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part
index f8f5e5421..95e81ddb3 100644
--- a/xorg-server/xkeyboard-config/rules/base.o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.o_s.part
@@ -81,6 +81,7 @@
eurosign:2 = +eurosign(2)
eurosign:4 = +eurosign(4)
eurosign:5 = +eurosign(5)
+ rupeesign:4 = +rupeesign(4)
keypad:oss = +keypad(oss)
keypad:legacy = +keypad(legacy)
keypad:legacy_wang = +keypad(legacy_wang)
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 4ac238c7d..8c9b23d82 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1783,6 +1783,13 @@
<languageList><iso639Id>hin</iso639Id></languageList>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>eng</name>
+ <_description>English with RupeeSign</_description>
+ <languageList><iso639Id>eng</iso639Id></languageList>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -5302,30 +5309,36 @@
<!-- Special shortcuts for the Euro character -->
<configItem>
<name>eurosign</name>
- <_description>Adding EuroSign to certain keys</_description>
+ <_description>Adding currency signs to certain keys</_description>
</configItem>
<option>
<configItem>
<name>eurosign:e</name>
- <_description>E</_description>
+ <_description>Euro on E</_description>
</configItem>
</option>
<option>
<configItem>
<name>eurosign:2</name>
- <_description>2</_description>
+ <_description>Euro on 2</_description>
</configItem>
</option>
<option>
<configItem>
<name>eurosign:4</name>
- <_description>4</_description>
+ <_description>Euro on 4</_description>
</configItem>
</option>
<option>
<configItem>
<name>eurosign:5</name>
- <_description>5</_description>
+ <_description>Euro on 5</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>rupeesign:4</name>
+ <_description>Rupee on 4</_description>
</configItem>
</option>
</group>