diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-19 09:07:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-19 09:07:37 +0200 |
| commit | 2d042f719910c5aa1ba9f4a47b21009c729c345e (patch) | |
| tree | 2b20d89d5f1ca342ca6f1d817c18b324adf7086f /xorg-server/xkeyboard-config/symbols/fr | |
| parent | c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d (diff) | |
| parent | 854ec4da20ddff9b830be0a7d5b81d8cb4774132 (diff) | |
| download | vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.tar.gz vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.tar.bz2 vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 libXdmcp libxcb xkeyboard-config mesa pixman xserver git update 19 aug 2013
Conflicts:
fontconfig/src/fccache.c
Diffstat (limited to 'xorg-server/xkeyboard-config/symbols/fr')
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/fr | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/fr b/xorg-server/xkeyboard-config/symbols/fr index 0d1d13de8..418ff5200 100644 --- a/xorg-server/xkeyboard-config/symbols/fr +++ b/xorg-server/xkeyboard-config/symbols/fr @@ -200,7 +200,7 @@ xkb_symbols "oss_latin9" { include "fr(oss)" include "keypad(oss_latin9)" - name[Group1]="French (alternative, latin-9 only)"; + name[Group1]="French (alternative, Latin-9 only)"; // First row key <AE01> { [ ampersand, 1, dead_caron, dead_cedilla ] }; // & 1 ˇ ¸ @@ -547,7 +547,7 @@ xkb_symbols "bepo_latin9" { include "fr(bepo)" include "keypad(oss_latin9)" - name[Group1]="French (Bepo, ergonomic, Dvorak way, latin-9 only)"; + name[Group1]="French (Bepo, ergonomic, Dvorak way, Latin-9 only)"; key <TLDE> { [ dollar, numbersign, dollar, paragraph ] }; // $ # $ ¶ |