Synchronised line endinge with release branch

1 files changed, 42 insertions, 42 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/za b/xorg-server/xkeyboard-config/symbols/za
index 191284fd4..c5f699463 100644
--- a/xorg-server/xkeyboard-config/symbols/za
+++ b/xorg-server/xkeyboard-config/symbols/za
@@ -1,42 +1,42 @@
-// based on the Latvian and GB keyboard maps

-

-partial default alphanumeric_keys modifier_keys

-xkb_symbols "basic" {

-

-    // Describes the differences between an en_US 

-    // keyboard and a South African layout with 

-    // dead keys. By Dwayne Bailey (dwayne@translate.org.za) 

-

-    include "latin"

-

-    name[Group1]="English (South Africa)";

-

-    key <TLDE>  { [     grave,  asciitilde,  dead_grave ] };

-    key <AE02>	{ [         2,         at,      yen ]	};

-    key <AE03>	{ [         3,  numbersign,     sterling ]	};

-    key <AE04>	{ [         4,     dollar,        dollar ]	};

-    key <AE05>	{ [         5,     percent,     EuroSign ]	};

-    key <AE06>  { [         6, asciicircum, dead_circumflex ] };

-

-    key <AD03>	{ [         e,          E,  ediaeresis,  Ediaeresis ]	};

-    key <AD04>	{ [         r,          R,  ecircumflex,  Ecircumflex ]	};

-    key <AD05>	{ [         t,          T,  U1e71,  U1e70 ]	};

-    key <AD06>	{ [         y,          Y,  ucircumflex,  Ucircumflex ]	};

-    key <AD07>	{ [         u,          U,  udiaeresis,  Udiaeresis ]	};

-    key <AD08>	{ [         i,          I,   idiaeresis,   Idiaeresis ]	};

-    key <AD09>	{ [         o,          O,  odiaeresis,  Odiaeresis ]	};

-    key <AD10>	{ [         p,          P,  ocircumflex,  Ocircumflex ]	};

-

-    key <AC01>	{ [         a,          A,  adiaeresis, Adiaeresis ]	};

-    key <AC02>	{ [         s,          S,       scaron,       Scaron ]	};

-    key <AC03>	{ [         d,          D,  U1e13,  U1e12 ]	};

-    key <AC09>	{ [         l,          L,  U1e3d,  U1e3c ]	};

-    key <AC10>  { [ semicolon,      colon,  dead_diaeresis ] };

-    key <AC11>  { [apostrophe,   quotedbl,  dead_acute ] };

-

-    key <AB06>	{ [         n,          N,  U1e4b,  U1e4a ]	};

-    key <AB07>	{ [         m,          M,  U1e45,  U1e44 ]	};

-    key <AB09>  { [    period,    greater, dead_abovedot ] };

-

-    include "level3(ralt_switch)"

-};

+// based on the Latvian and GB keyboard maps
+
+partial default alphanumeric_keys modifier_keys
+xkb_symbols "basic" {
+
+    // Describes the differences between an en_US 
+    // keyboard and a South African layout with 
+    // dead keys. By Dwayne Bailey (dwayne@translate.org.za) 
+
+    include "latin"
+
+    name[Group1]="English (South Africa)";
+
+    key <TLDE>  { [     grave,  asciitilde,  dead_grave ] };
+    key <AE02>	{ [         2,         at,      yen ]	};
+    key <AE03>	{ [         3,  numbersign,     sterling ]	};
+    key <AE04>	{ [         4,     dollar,        dollar ]	};
+    key <AE05>	{ [         5,     percent,     EuroSign ]	};
+    key <AE06>  { [         6, asciicircum, dead_circumflex ] };
+
+    key <AD03>	{ [         e,          E,  ediaeresis,  Ediaeresis ]	};
+    key <AD04>	{ [         r,          R,  ecircumflex,  Ecircumflex ]	};
+    key <AD05>	{ [         t,          T,  U1e71,  U1e70 ]	};
+    key <AD06>	{ [         y,          Y,  ucircumflex,  Ucircumflex ]	};
+    key <AD07>	{ [         u,          U,  udiaeresis,  Udiaeresis ]	};
+    key <AD08>	{ [         i,          I,   idiaeresis,   Idiaeresis ]	};
+    key <AD09>	{ [         o,          O,  odiaeresis,  Odiaeresis ]	};
+    key <AD10>	{ [         p,          P,  ocircumflex,  Ocircumflex ]	};
+
+    key <AC01>	{ [         a,          A,  adiaeresis, Adiaeresis ]	};
+    key <AC02>	{ [         s,          S,       scaron,       Scaron ]	};
+    key <AC03>	{ [         d,          D,  U1e13,  U1e12 ]	};
+    key <AC09>	{ [         l,          L,  U1e3d,  U1e3c ]	};
+    key <AC10>  { [ semicolon,      colon,  dead_diaeresis ] };
+    key <AC11>  { [apostrophe,   quotedbl,  dead_acute ] };
+
+    key <AB06>	{ [         n,          N,  U1e4b,  U1e4a ]	};
+    key <AB07>	{ [         m,          M,  U1e45,  U1e44 ]	};
+    key <AB09>  { [    period,    greater, dead_abovedot ] };
+
+    include "level3(ralt_switch)"
+};