diff --git a/rules/base.xml.in b/rules/base.xml.in index de88d40..9b08e99 100644 --- a/rules/base.xml.in +++ b/rules/base.xml.in @@ -3230,7 +3230,7 @@ us - <_description>French (US keyboard with French letters) + <_description>French (US, with French letters) diff --git a/symbols/fr b/symbols/fr index bf828b9..bfb8893 100644 --- a/symbols/fr +++ b/symbols/fr @@ -986,7 +986,7 @@ partial alphanumeric_keys xkb_symbols "us" { include "us(euro)" - name[Group1]= "French (US keyboard with French letters)"; + name[Group1]= "French (US, with French letters)"; key { [ z, Z, acircumflex, Acircumflex ] }; // â Â key { [ c, C, ccedilla, Ccedilla ] }; // ç Ç @@ -998,6 +998,7 @@ xkb_symbols "us" { key { [ h, H, udiaeresis, Udiaeresis ] }; // ü Ü key { [ j, J, ucircumflex, Ucircumflex ] }; // û Û key { [ k, K, icircumflex, Icircumflex ] }; // î Î + key { [apostrophe, quotedbl,dead_diaeresis ] }; key { [ e, E, eacute, Eacute ] }; // é É key { [ r, R, egrave, Egrave ] }; // è È @@ -1009,7 +1010,10 @@ xkb_symbols "us" { key { [ bracketleft, braceleft, guillemotleft, leftdoublequotemark ] }; // « “ key { [bracketright, braceright, guillemotright, rightdoublequotemark ] }; // » ” - key { [ 4, dollar, EuroSign, currency ] }; // € ¤ + key { [ grave, asciitilde, dead_grave ] }; + key { [ 4, dollar, EuroSign, currency ] }; // € ¤ + key { [ 6,asciicircum,dead_circumflex ] }; + }; // EXTRAS: