Merge remote-tracking branch 'origin/released'

2 files changed, 5 insertions, 5 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/no b/xorg-server/xkeyboard-config/symbols/no
index 21e317f8b..53c83da62 100644
--- a/xorg-server/xkeyboard-config/symbols/no
+++ b/xorg-server/xkeyboard-config/symbols/no
@@ -64,7 +64,7 @@ xkb_symbols "dvorak" {
     key <AE01> { [	    1,	exclam, exclamdown, onesuperior	] };
     key <AE02> { [	    2,	quotedbl,   at,     twosuperior	] };
     key <AE03> { [	    3,	numbersign, sterling, threesuperior ] };
-    key <AE04> { [	    4,	dollar,     currency,onequarter	] };
+    key <AE04> { [	    4,	currency,     dollar,onequarter	] };
     key <AE05> { [	    5,	percent,    onehalf,	onehalf	] };
     key <AE06> { [	    6,	ampersand,  threequarters, threequarters ] };
     key <AE07> { [	    7,	slash,      braceleft, division	] };
diff --git a/xorg-server/xkeyboard-config/symbols/ru b/xorg-server/xkeyboard-config/symbols/ru
index 408e40806..a3dabefdf 100644
--- a/xorg-server/xkeyboard-config/symbols/ru
+++ b/xorg-server/xkeyboard-config/symbols/ru
@@ -273,13 +273,13 @@ xkb_symbols "cv" {
     key.type[group1]="FOUR_LEVEL";
 
     key        <AD03> {        [      Cyrillic_u,	Cyrillic_U,
-                            0x010004f3,    0x010004f2      ]       };
+                          U04F3,    U04F2      ]       };
     key        <AD05> {        [      Cyrillic_ie,     Cyrillic_IE,
-                       0x01000115,	0x01000114     ]       };
+                          U04D7,    U04D6     ]       };
     key        <AC04> {        [      Cyrillic_a,	Cyrillic_A,
-                          abreve,  Abreve      ]       };
+                          U04D1,    U04D0      ]       };
     key        <AB03> {        [      Cyrillic_es,     Cyrillic_ES,
-                            ccedilla,    Ccedilla      ]       };
+                          U04AB,    U04AA      ]       };
 
     include "level3(ralt_switch)"
 };