svn merge ^/branches/released .

1 files changed, 10 insertions, 10 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/es b/xorg-server/xkeyboard-config/symbols/es
index 7f92d8767..e33a3c277 100644
--- a/xorg-server/xkeyboard-config/symbols/es
+++ b/xorg-server/xkeyboard-config/symbols/es
@@ -7,7 +7,7 @@ xkb_symbols "basic" {
 

     include "latin(type4)"

 

-    name[Group1]="Spain";

+    name[Group1]="Spanish";

 

     key <AE01>	{ [         1,     exclam,          bar,   exclamdown ]	};

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

@@ -42,7 +42,7 @@ xkb_symbols "sundeadkeys" {
 

     include "es(Sundeadkeys)"

 

-    name[Group1]="Spain - Sun dead keys";

+    name[Group1]="Spanish (Sun dead keys)";

 };

 

 partial alphanumeric_keys

@@ -50,7 +50,7 @@ xkb_symbols "nodeadkeys" {
 

     include "es(basic)"

 

-    name[Group1]="Spain - Eliminate dead keys";

+    name[Group1]="Spanish (eliminate dead keys)";

 

     key <AD11>	{ [     grave, asciicircum,  bracketleft,      degree ]	};

     key <AD12>	{ [      plus,   asterisk, bracketright,       macron ]	};

@@ -64,7 +64,7 @@ xkb_symbols "nodeadkeys" {
 partial alphanumeric_keys

 xkb_symbols "dvorak" {

 

-    name[Group1]="Spain - Dvorak";

+    name[Group1]="Spanish (Dvorak)";

 

     // Alphanumeric section

     key <TLDE> {[  masculine, ordfeminine, backslash, degree		]};

@@ -127,7 +127,7 @@ xkb_symbols "cat" {
 

     include "es(basic)"

 

-    name[Group1]="Spain - Catalan variant with middle-dot L";

+    name[Group1]="Catalan (Spain, with middle-dot L)";

 

     key <AC09>  { [	    l,      L,		0x1000140,  0x100013F ] };

 };

@@ -137,7 +137,7 @@ xkb_symbols "ast" {
 

     include "es(basic)"

 

-    name[Group1]="Spain - Asturian variant with bottom-dot H and bottom-dot L";

+    name[Group1]="Asturian (Spain, with bottom-dot H and bottom-dot L)";

 

     key <AC06>  { [	    h,      H,		0x1001E25,  0x1001E24 ] };

     key <AC09>  { [	    l,      L,		0x1001E37,  0x1001E36 ] };

@@ -151,7 +151,7 @@ xkb_symbols "mac" {
     // keyboard and a very simple Spanish keybaord

 

     include "es"

-    name[Group1]= "Spain - Macintosh";

+    name[Group1]= "Spanish (Macintosh)";

 

 };

 

@@ -159,7 +159,7 @@ partial alphanumeric_keys
 xkb_symbols "olpc" {

 

     include "us(basic)"

-    name[Group1]="Spain";

+    name[Group1]="Spanish";

 

     key <TLDE> { [    masculine,    ordfeminine      ] };

     key <AE01> { [            1,         exclam,             bar ] };

@@ -196,7 +196,7 @@ xkb_symbols "deadtilde" {
 

     include "es(basic)"

 

-    name[Group1]="Spain - Include dead tilde";

+    name[Group1]="Spanish (include dead tilde)";

 

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

 };

@@ -208,7 +208,7 @@ xkb_symbols "olpc2" {
     // Contact: Sayamindu Dasgupta <sayamindu@laptop.org>

 

     include "us(olpc)"

-    name[Group1]="Spain - OLPC2";

+    name[Group1]="Spanish (OLPC2)";

 

     key <AE03> { [  3, numbersign,   dead_grave,  dead_grave] }; // combining grave

     key <I236>  { [ XF86Start ] };