svn merge ^/branches/released .

1 files changed, 18 insertions, 18 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/fr b/xorg-server/xkeyboard-config/symbols/fr
index c804eb09e..d9f654b25 100644
--- a/xorg-server/xkeyboard-config/symbols/fr
+++ b/xorg-server/xkeyboard-config/symbols/fr
@@ -5,7 +5,7 @@ xkb_symbols "basic" {
 

     include "latin"

 

-    name[Group1]="France";

+    name[Group1]="French";

 

     key <AE01>	{ [ ampersand,          1,  onesuperior,   exclamdown ]	};

     key <AE02>	{ [    eacute,          2,   asciitilde,    oneeighth ]	};

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

     include "fr(basic)"

 

-    name[Group1]="France";

+    name[Group1]="French";

 

     key <AD02>	{ [ z,  Z,  VoidSymbol, guillemotleft ]	};

 

@@ -72,7 +72,7 @@ partial alphanumeric_keys
 xkb_symbols "sundeadkeys" {

     include "fr(Sundeadkeys)"

 

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

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

 };

 

 partial alphanumeric_keys

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

     include "fr(basic)"

 

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

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

 

     key <AE12>	{ [     equal,       plus,   braceright,       ogonek ]	};

     key <AD11>	{ [asciicircum,  diaeresis ]	};

@@ -128,7 +128,7 @@ xkb_symbols "oss" {
     include "nbsp(level4nl)"

     include "keypad(oss)"

 

-    name[Group1]="France - Alternative";

+    name[Group1]="French (alternative)";

 

     // First row

     key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,          dead_cedilla ] }; // ² ³ ¹ ¸ 

@@ -195,7 +195,7 @@ xkb_symbols "oss_latin9" {
     include "fr(oss)"

     include "keypad(oss_latin9)"

 

-    name[Group1]="France - Alternative, latin-9 only";

+    name[Group1]="French (alternative, latin-9 only)";

 

     // First row

     key <AE01>	{ [        ampersand,                1,           dead_caron,          dead_cedilla ] }; // & 1 ˇ ¸

@@ -249,7 +249,7 @@ xkb_symbols "oss_sundeadkeys" {
 

     include "fr(oss_Sundeadkeys)"

 

-    name[Group1]="France - Alternative, Sun dead keys";

+    name[Group1]="French (alternative, Sun dead keys)";

 };

 

 partial alphanumeric_keys

@@ -259,7 +259,7 @@ xkb_symbols "oss_nodeadkeys" {
 

     include "fr(oss)"

 

-    name[Group1]="France - Alternative, eliminate dead keys";

+    name[Group1]="French (alternative, eliminate dead keys)";

 

     key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,               cedilla ] }; // ² ³ ¹ ¸ 

     key <AE01>	{ [        ampersand,                1,                caron,                ogonek ] }; // & 1 ˇ ̨

@@ -342,7 +342,7 @@ xkb_symbols "latin9" {
     include "latin"

     include "nbsp(level3)"

 

-    name[Group1]="France - (Legacy) Alternative";

+    name[Group1]="French (legacy, alternative)";

 

     key <TLDE>	{ [              oe,              OE, leftdoublequotemark, rightdoublequotemark ] };

     key <AE01>	{ [       ampersand,               1,          dead_acute,       periodcentered ] };

@@ -421,7 +421,7 @@ xkb_symbols "latin9_sundeadkeys" {
 

     include "fr(latin9_Sundeadkeys)"

 

-    name[Group1]="France - (Legacy) Alternative, Sun dead keys";

+    name[Group1]="French (legacy, alternative, Sun dead keys)";

 };

 

 partial alphanumeric_keys

@@ -431,7 +431,7 @@ xkb_symbols "latin9_nodeadkeys" {
 

     include "fr(latin9)"

 

-    name[Group1]="France - (Legacy) Alternative, eliminate dead keys";

+    name[Group1]="French (legacy, alternative, eliminate dead keys)";

 

     key <AE01>	{ [       ampersand,               1,          apostrophe,       periodcentered ] };

     key <AE07>	{ [          egrave,               7,               grave,               Egrave ] };

@@ -473,7 +473,7 @@ xkb_symbols "bepo" {
     include "level3(ralt_switch)"

     include "keypad(oss)"

 

-    name[Group1]= "France - Bepo, ergonomic, Dvorak way";

+    name[Group1]= "French (Bepo, ergonomic, Dvorak way)";

 

     // First row

     key <TLDE> { [          dollar,   numbersign,        endash,       paragraph ] }; // $ # – ¶

@@ -542,7 +542,7 @@ xkb_symbols "bepo_latin9" {
     include "fr(bepo)"

     include "keypad(oss_latin9)"

 

-    name[Group1]="France - Bepo, ergonomic, Dvorak way, latin-9 only";

+    name[Group1]="French (Bepo, ergonomic, Dvorak way, latin-9 only)";

 

     key <TLDE> { [          dollar,   numbersign,        dollar,       paragraph ] }; // $ # $ ¶

 

@@ -622,7 +622,7 @@ xkb_symbols "bepo_latin9" {
 

 partial alphanumeric_keys modifier_keys

 xkb_symbols "dvorak" {

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

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

 

   // First row

   key <TLDE> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [       underscore,   asterisk                  ] };

@@ -713,7 +713,7 @@ xkb_symbols "bre" {
 

     include "keypad(oss)"

 

-    name[Group1]= "France - Breton";

+    name[Group1]= "French (Breton)";

 

     // First row

     key <TLDE> { [     twosuperior,     dead_tilde,   dead_abovedot,    Greek_GAMMA ] };

@@ -811,7 +811,7 @@ xkb_symbols "oci" {
 

     include "keypad(oss)"

 

-    name[Group1]= "France - Occitan";

+    name[Group1]= "Occitan";

 

     // First row

     key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,          dead_cedilla ] }; // ² ³ ¹ ¸ 

@@ -896,7 +896,7 @@ xkb_symbols "oci" {
 partial alphanumeric_keys

 xkb_symbols "mac" {

 

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

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

 

     // Alphanumeric section

     key <TLDE> {	[          at,     numbersign, periodcentered,  Ydiaeresis	]	}; // MISSING: Ydiaeresis; eherlent : ok in Latin9

@@ -964,7 +964,7 @@ partial alphanumeric_keys
 xkb_symbols "geo" {

     include "ge(basic)"

 

-    name[Group1]= "France - Georgian AZERTY Tskapo";

+    name[Group1]= "Georgian (France, AZERTY Tskapo)";

 

     key <TLDE> { [ exclam, noSymbol ] };

     key <AE01> { [ 0x0100201e, 1 ] };