Merge remote-tracking branch 'origin/released'

* origin/released:
  Changed file permissions
  dos -> unix

Conflicts:
	libX11/include/X11/Xregion.h
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/StrKeysym.c
	libX11/src/Window.c
	libX11/src/xkb/XKBBind.c
	libX11/src/xkb/XKBGetMap.c
	libX11/src/xkb/XKBSetGeom.c
	libX11/src/xkb/XKBUse.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libXdmcp/Key.c
	libXdmcp/Write.c
	libxcb/src/xcb_windefs.h
	xkbcomp/keycodes.c
	xkbcomp/xkbpath.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mln_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

9 files changed, 1380 insertions, 1380 deletions

diff --git a/xorg-server/xkeyboard-config/docs/HOWTO.testing b/xorg-server/xkeyboard-config/docs/HOWTO.testing
index 5ab9dd477..01aa0500c 100644
--- a/xorg-server/xkeyboard-config/docs/HOWTO.testing
+++ b/xorg-server/xkeyboard-config/docs/HOWTO.testing
@@ -1,22 +1,22 @@
-A mini-HOWTO test the XKB config without modifying the system configuration.

-(Only tested with XFree86 4.3+.) 

-

-First see what your configuration is. Note the model and layout.

-   $ setxkbmap -print

-

-Then unpack the sources locally ...

-   $ gzip -dc xkeyboard-config*.tar.gz | tar -tf -

-... and change to the delivered directory

-   $ cd xkeyboard-config-<version>

-

-Then try to load the current keyboard using the local rules

-   $ setxkbmap -v 10 -I$PWD -rules base

-

-Now try to set different keyboards using the -model and -layout.

-   $ setxkbmap -v 10 -I$PWD -rules base -model pc102 -layout intl

-Look in the file rules/base for other example models and layouts

-

-If there was a problem, you can reset the keyboard like so:

-   $ setxkbmap -rules xfree86 -model <noted model> -layout <noted layout>

-

-If that doesn't work, you may have to log out and log back in.

+A mini-HOWTO test the XKB config without modifying the system configuration.
+(Only tested with XFree86 4.3+.) 
+
+First see what your configuration is. Note the model and layout.
+   $ setxkbmap -print
+
+Then unpack the sources locally ...
+   $ gzip -dc xkeyboard-config*.tar.gz | tar -tf -
+... and change to the delivered directory
+   $ cd xkeyboard-config-<version>
+
+Then try to load the current keyboard using the local rules
+   $ setxkbmap -v 10 -I$PWD -rules base
+
+Now try to set different keyboards using the -model and -layout.
+   $ setxkbmap -v 10 -I$PWD -rules base -model pc102 -layout intl
+Look in the file rules/base for other example models and layouts
+
+If there was a problem, you can reset the keyboard like so:
+   $ setxkbmap -rules xfree86 -model <noted model> -layout <noted layout>
+
+If that doesn't work, you may have to log out and log back in.
diff --git a/xorg-server/xkeyboard-config/docs/HOWTO.transition b/xorg-server/xkeyboard-config/docs/HOWTO.transition
index 1b7cce216..24add85f5 100644
--- a/xorg-server/xkeyboard-config/docs/HOWTO.transition
+++ b/xorg-server/xkeyboard-config/docs/HOWTO.transition
@@ -1,19 +1,19 @@
-PURPOSE

-

-This document describes the procedure for replacing the standard XKB configuration repository shipped with an X Window System implementation. The procedure should work for XFree86 4.3 and higher and X11R7 implementation from X.Org. Any other X server supporting so called "multiple layouts" can be powered with XKeyboardConfig in a similar way (at the moment NO known commercial X Window System implementations support "multiple layouts"). X servers which do not support "multiple layouts" can be used with XKeyboardConfig as well - but users should be aware that only one group will be accessible with each possible XKB configuration.

-

-PROCEDURE

-

-1. Find your current XKB configuration data directory. In most cases it is /usr/X11R6/lib/X11/xkb. This directory usually contain subdirectores: compat, compiled, geometry, keycodes, keymap, rules, semantics, symbols etc.

-

-2. Backup your current XKB configuration data directory (for example, rename it to xkb.orig) - so you would be able to restore your original configuration in case of troubles.

-

-3. Untar XKeyboardConfiguration tarball (tar -xzvf xkeyboard-config-0.2.tar.gz). Change to the root project directory. Run the configure script with appropriate options. There are several useful options:

-  

-  --with-xkb-rules-symlink=NAME - this option creates symlinks for the rules and registry files. The default file names are base and base.xml correspondingly. Using this option allows to create symlinks for configuration files compatibility (for example, --with-xkb-rules-symlink=xfree86 creates symlinks xfree86 and xfree86.xml - so users would be able to use rules set "xfree86").

-  

-  --enable-xkbcomp-symlink - creates symlink from original xkbcomp utility (usually found in /usr/X111R6/bin) to XKB configuration directory (usually it is required by XKB server). By default, this option is enabled - but user can disable it.

-  

-4. Run "make" and (as root) "make install". At that point, new /usr/X11R6/lib/X11/xkb should be created.

-

-5. Adjust the configuration files (XF86Config, xorg.conf etc.). If you don't use the symlinks, you should use the rules set "base" (as the "XkbRules" value). If you added --with-xkb-rules-symlink option, you can use either "base" or the name of the rules symlink you created (for example, "xfree86").

+PURPOSE
+
+This document describes the procedure for replacing the standard XKB configuration repository shipped with an X Window System implementation. The procedure should work for XFree86 4.3 and higher and X11R7 implementation from X.Org. Any other X server supporting so called "multiple layouts" can be powered with XKeyboardConfig in a similar way (at the moment NO known commercial X Window System implementations support "multiple layouts"). X servers which do not support "multiple layouts" can be used with XKeyboardConfig as well - but users should be aware that only one group will be accessible with each possible XKB configuration.
+
+PROCEDURE
+
+1. Find your current XKB configuration data directory. In most cases it is /usr/X11R6/lib/X11/xkb. This directory usually contain subdirectores: compat, compiled, geometry, keycodes, keymap, rules, semantics, symbols etc.
+
+2. Backup your current XKB configuration data directory (for example, rename it to xkb.orig) - so you would be able to restore your original configuration in case of troubles.
+
+3. Untar XKeyboardConfiguration tarball (tar -xzvf xkeyboard-config-0.2.tar.gz). Change to the root project directory. Run the configure script with appropriate options. There are several useful options:
+  
+  --with-xkb-rules-symlink=NAME - this option creates symlinks for the rules and registry files. The default file names are base and base.xml correspondingly. Using this option allows to create symlinks for configuration files compatibility (for example, --with-xkb-rules-symlink=xfree86 creates symlinks xfree86 and xfree86.xml - so users would be able to use rules set "xfree86").
+  
+  --enable-xkbcomp-symlink - creates symlink from original xkbcomp utility (usually found in /usr/X111R6/bin) to XKB configuration directory (usually it is required by XKB server). By default, this option is enabled - but user can disable it.
+  
+4. Run "make" and (as root) "make install". At that point, new /usr/X11R6/lib/X11/xkb should be created.
+
+5. Adjust the configuration files (XF86Config, xorg.conf etc.). If you don't use the symlinks, you should use the rules set "base" (as the "XkbRules" value). If you added --with-xkb-rules-symlink option, you can use either "base" or the name of the rules symlink you created (for example, "xfree86").
diff --git a/xorg-server/xkeyboard-config/docs/Makefile.am b/xorg-server/xkeyboard-config/docs/Makefile.am
index 835e673e0..5ae0e80a1 100644
--- a/xorg-server/xkeyboard-config/docs/Makefile.am
+++ b/xorg-server/xkeyboard-config/docs/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST= README.config README.enhancing README.symbols HOWTO.transition HOWTO.testing

+EXTRA_DIST= README.config README.enhancing README.symbols HOWTO.transition HOWTO.testing
diff --git a/xorg-server/xkeyboard-config/docs/README.config b/xorg-server/xkeyboard-config/docs/README.config
index 215449a01..4a068867d 100644
--- a/xorg-server/xkeyboard-config/docs/README.config
+++ b/xorg-server/xkeyboard-config/docs/README.config
@@ -1,195 +1,195 @@
-                         The XKB Configuration Guide

-

-                         Kamil Toman, Ivan U. Pascal

-

-                              25 November 2002

-

-                                  Abstract

-

-     This document describes how to configure XFree86 XKB from a user's

-     point a few. It converts basic configuration syntax and gives also

-     a few examples.

-

-1.  Overview

-

-The XKB configuration is decomposed into a number of components. Selecting

-proper parts and combining them back you can achieve most of configurations

-you might need. Unless you have a completely atypical keyboard you really

-don't need to touch any of xkb configuration files.

-

-2.  Selecting XKB Configuration

-

-The easiest and the most natural way how to specify a keyboard mapping is to

-use rules component. As its name suggests it describes a number of general

-rules how to combine all bits and pieces into a valid and useful keyboard

-mapping. All you need to do is to select a suitable rules file and then to

-feed it with a few parameters that will adjust the keyboard behaviour to ful-

-fill your needs.

-

-The parameters are:

-

-   o XkbRules - files of rules to be used for keyboard mapping composition

-

-   o XkbModel - name of model of your keyboard type

-

-   o XkbLayout - layout(s) you intend to use

-

-   o XkbVariant - variant(s) of layout you intend to use

-

-   o XkbOptions - extra xkb configuration options

-

-The proper rules file depends on your vendor. In reality, the commonest file

-of rules is xfree86. For each rules file there is a description file named

-<vendor-rules>.lst, for instance xfree86.lst which is located in xkb configu-

-ration subdirectory rules (for example /etc/X11/xkb/rules).

-

-2.1  Basic Configuration

-

-Let's say you want to configure a PC style America keyboard with 104 keys as

-described in xfree86.lst. It can be done by simply writing several lines from

-below to you XFree86 configuration file (often found as /etc/X11/XF86Config-4

-or /etc/X11/XF86Config):

-

-     Section "InputDevice"

-         Identifier "Keyboard1"

-         Driver "Keyboard"

-

-         Option "XkbModel" "pc104"

-         Option "XkbLayout" "us"

-         Option "XKbOptions" ""

-     EndSection

-

-The values of parameters XkbModel and XkbLayout are really not surprising.

-The parameters XkbOptions has been explicitly set to empty set of parameters.

-The parameter XkbVariant has been left out.  That means the default variant

-named basic is loaded.

-

-Of course, this can be also done at runtime using utility setxkbmap.  Shell

-command loading the same keyboard mapping would look like:

-

-     setxkbmap -rules xfree86 -model pc104 -layout us -option ""

-

-The configuration and the shell command would be very analogical for most

-other layouts (internationalized mappings).

-

-2.2  Advanced Configuration

-

-Since XFree86 4.3.x you can use multi-layouts xkb configuration.  What does

-it mean? Basically it allows to load up to four different keyboard layouts at

-a time. Each such layout would reside in its own group. The groups (unlike

-complete keyboard remapping) can be switched very fast from one to another by

-a combination of keys.

-

-Let's say you want to configure your new Logitech cordless desktop keyboard,

-you intend to use three different layouts at the same time - us, czech and

-german (in this order), and that you are used to Alt-Shift combination for

-switching among them.

-

-Then the configuration snippet could look like this:

-

-     Section "InputDevice"

-         Identifier "Keyboard1"

-         Driver "Keyboard"

-

-         Option "XkbModel" "logicordless"

-         Option "XkbLayout" "us,cz,de"

-         Option "XKbOptions" "grp:alt_shift_toggle"

-     EndSection

-

-Of course, this can be also done at runtime using utility setxkbmap.  Shell

-command loading the same keyboard mapping would look like:

-

-     setxkbmap -rules xfree86 -model logicordless -layout "us,cz,de" \

-              -option "grp:alt_shift_toggle"

-

-2.3  Even More Advanced Configuration

-

-Okay, let's say you are more demanding. You do like the example above but you

-want it to change a bit. Let's imagine you want the czech keyboard mapping to

-use another variant but basic.  The configuration snippet then changes into:

-

-     Section "InputDevice"

-         Identifier "Keyboard1"

-         Driver "Keyboard"

-

-         Option "XkbModel" "logicordless"

-         Option "XkbLayout" "us,cz,de"

-         Option "XkbVariant" ",bksl,"

-         Option "XKbOptions" "grp:alt_shift_toggle"

-     EndSection

-

-That's seems tricky but it is not. The logic for settings of variants is the

-same as for layouts, that means the first and the third variant settings are

-left out (set to basic), the second is set to bksl (a special variant with an

-enhanced definition of the backslash key).

-

-Analogically, the loading runtime will change to:

-

-     setxkmap -rules xfree86 -model logicordless -layout "us,cz,de" \

-              -variant ",bksl," -option "grp:alt_shift_toggle"

-

-2.4  Basic Global Options

-

-See rules/*.lst files.

-

-3.  Direct XKB Configuration

-

-Generally, you can directly prescribe what configuration of each of basic xkb

-components should be used to form the resulting keyboard mapping.  This

-method is rather "brute force". You precisely need to know the structure and

-the meaning of all of used configuration components.

-

-This method also exposes all xkb configuration details directly into XFree86

-configuration file which is a not very fortunate fact.  In rare occasions it

-may be needed, though. So how does it work?

-

-3.1  Basic Components

-

-There are five basic components used to form a keyboard mapping:

-

-   o key codes - a translation of the scan codes produced by the keyboard

-     into a suitable symbolic form

-

-   o types - a specification of what various combinations of modifiers pro-

-     duce

-

-   o key symbols - a translation of symbolic key codes into actual symbols

-

-   o geometry - a description of physical keyboard geometry

-

-   o compatibility maps - a specification of what action should each key pro-

-     duce in order to preserve compatibility with XKB-unware clients

-

-3.2  Example Configuration

-

-Look at the following example:

-

-     Section "InputDevice"

-         Identifier "Keyboard0"

-         Driver "Keyboard"

-

-         Option "XkbKeycodes" "xfree86"

-         Option "XkbTypes"    "default"

-         Option "XkbSymbols"  "en_US(pc104)+de+swapcaps"

-         Option "XkbGeometry" "pc(pc104)"

-         Option "XkbCompat"   "basic+pc+iso9995"

-     EndSection

-

-This configuration sets the standard XFree86 default interpretation of key-

-board keycodes, sets the default modificator types. The symbol table is com-

-posed of extended US keyboard layout in its variant for pc keyboards with 104

-keys plus all keys for german layout are redefined respectively. Also the

-logical meaning of Caps-lock and Control keys is swapped.  The standard key-

-board geometry (physical look) is set to pc style keyboard with 104 keys. The

-compatibility map is set to allow basic shifting, to allow Alt keys to be

-interpreted and also to allow iso9995 group shifting.

-

-4.  Keymap XKB Configuration

-

-It is the formerly used way to configure xkb. The user included a special

-keymap file which specified the direct xkb configuration. This method has

-been obsoleted by previously described rules files which are far more flexi-

-ble and allow simpler and more intuitive syntax. It is preserved merely for

-compatibility reasons. Avoid using it if it is possible.

-

-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Config.sgml,v 1.4 dawes Exp $

+                         The XKB Configuration Guide
+
+                         Kamil Toman, Ivan U. Pascal
+
+                              25 November 2002
+
+                                  Abstract
+
+     This document describes how to configure XFree86 XKB from a user's
+     point a few. It converts basic configuration syntax and gives also
+     a few examples.
+
+1.  Overview
+
+The XKB configuration is decomposed into a number of components. Selecting
+proper parts and combining them back you can achieve most of configurations
+you might need. Unless you have a completely atypical keyboard you really
+don't need to touch any of xkb configuration files.
+
+2.  Selecting XKB Configuration
+
+The easiest and the most natural way how to specify a keyboard mapping is to
+use rules component. As its name suggests it describes a number of general
+rules how to combine all bits and pieces into a valid and useful keyboard
+mapping. All you need to do is to select a suitable rules file and then to
+feed it with a few parameters that will adjust the keyboard behaviour to ful-
+fill your needs.
+
+The parameters are:
+
+   o XkbRules - files of rules to be used for keyboard mapping composition
+
+   o XkbModel - name of model of your keyboard type
+
+   o XkbLayout - layout(s) you intend to use
+
+   o XkbVariant - variant(s) of layout you intend to use
+
+   o XkbOptions - extra xkb configuration options
+
+The proper rules file depends on your vendor. In reality, the commonest file
+of rules is xfree86. For each rules file there is a description file named
+<vendor-rules>.lst, for instance xfree86.lst which is located in xkb configu-
+ration subdirectory rules (for example /etc/X11/xkb/rules).
+
+2.1  Basic Configuration
+
+Let's say you want to configure a PC style America keyboard with 104 keys as
+described in xfree86.lst. It can be done by simply writing several lines from
+below to you XFree86 configuration file (often found as /etc/X11/XF86Config-4
+or /etc/X11/XF86Config):
+
+     Section "InputDevice"
+         Identifier "Keyboard1"
+         Driver "Keyboard"
+
+         Option "XkbModel" "pc104"
+         Option "XkbLayout" "us"
+         Option "XKbOptions" ""
+     EndSection
+
+The values of parameters XkbModel and XkbLayout are really not surprising.
+The parameters XkbOptions has been explicitly set to empty set of parameters.
+The parameter XkbVariant has been left out.  That means the default variant
+named basic is loaded.
+
+Of course, this can be also done at runtime using utility setxkbmap.  Shell
+command loading the same keyboard mapping would look like:
+
+     setxkbmap -rules xfree86 -model pc104 -layout us -option ""
+
+The configuration and the shell command would be very analogical for most
+other layouts (internationalized mappings).
+
+2.2  Advanced Configuration
+
+Since XFree86 4.3.x you can use multi-layouts xkb configuration.  What does
+it mean? Basically it allows to load up to four different keyboard layouts at
+a time. Each such layout would reside in its own group. The groups (unlike
+complete keyboard remapping) can be switched very fast from one to another by
+a combination of keys.
+
+Let's say you want to configure your new Logitech cordless desktop keyboard,
+you intend to use three different layouts at the same time - us, czech and
+german (in this order), and that you are used to Alt-Shift combination for
+switching among them.
+
+Then the configuration snippet could look like this:
+
+     Section "InputDevice"
+         Identifier "Keyboard1"
+         Driver "Keyboard"
+
+         Option "XkbModel" "logicordless"
+         Option "XkbLayout" "us,cz,de"
+         Option "XKbOptions" "grp:alt_shift_toggle"
+     EndSection
+
+Of course, this can be also done at runtime using utility setxkbmap.  Shell
+command loading the same keyboard mapping would look like:
+
+     setxkbmap -rules xfree86 -model logicordless -layout "us,cz,de" \
+              -option "grp:alt_shift_toggle"
+
+2.3  Even More Advanced Configuration
+
+Okay, let's say you are more demanding. You do like the example above but you
+want it to change a bit. Let's imagine you want the czech keyboard mapping to
+use another variant but basic.  The configuration snippet then changes into:
+
+     Section "InputDevice"
+         Identifier "Keyboard1"
+         Driver "Keyboard"
+
+         Option "XkbModel" "logicordless"
+         Option "XkbLayout" "us,cz,de"
+         Option "XkbVariant" ",bksl,"
+         Option "XKbOptions" "grp:alt_shift_toggle"
+     EndSection
+
+That's seems tricky but it is not. The logic for settings of variants is the
+same as for layouts, that means the first and the third variant settings are
+left out (set to basic), the second is set to bksl (a special variant with an
+enhanced definition of the backslash key).
+
+Analogically, the loading runtime will change to:
+
+     setxkmap -rules xfree86 -model logicordless -layout "us,cz,de" \
+              -variant ",bksl," -option "grp:alt_shift_toggle"
+
+2.4  Basic Global Options
+
+See rules/*.lst files.
+
+3.  Direct XKB Configuration
+
+Generally, you can directly prescribe what configuration of each of basic xkb
+components should be used to form the resulting keyboard mapping.  This
+method is rather "brute force". You precisely need to know the structure and
+the meaning of all of used configuration components.
+
+This method also exposes all xkb configuration details directly into XFree86
+configuration file which is a not very fortunate fact.  In rare occasions it
+may be needed, though. So how does it work?
+
+3.1  Basic Components
+
+There are five basic components used to form a keyboard mapping:
+
+   o key codes - a translation of the scan codes produced by the keyboard
+     into a suitable symbolic form
+
+   o types - a specification of what various combinations of modifiers pro-
+     duce
+
+   o key symbols - a translation of symbolic key codes into actual symbols
+
+   o geometry - a description of physical keyboard geometry
+
+   o compatibility maps - a specification of what action should each key pro-
+     duce in order to preserve compatibility with XKB-unware clients
+
+3.2  Example Configuration
+
+Look at the following example:
+
+     Section "InputDevice"
+         Identifier "Keyboard0"
+         Driver "Keyboard"
+
+         Option "XkbKeycodes" "xfree86"
+         Option "XkbTypes"    "default"
+         Option "XkbSymbols"  "en_US(pc104)+de+swapcaps"
+         Option "XkbGeometry" "pc(pc104)"
+         Option "XkbCompat"   "basic+pc+iso9995"
+     EndSection
+
+This configuration sets the standard XFree86 default interpretation of key-
+board keycodes, sets the default modificator types. The symbol table is com-
+posed of extended US keyboard layout in its variant for pc keyboards with 104
+keys plus all keys for german layout are redefined respectively. Also the
+logical meaning of Caps-lock and Control keys is swapped.  The standard key-
+board geometry (physical look) is set to pc style keyboard with 104 keys. The
+compatibility map is set to allow basic shifting, to allow Alt keys to be
+interpreted and also to allow iso9995 group shifting.
+
+4.  Keymap XKB Configuration
+
+It is the formerly used way to configure xkb. The user included a special
+keymap file which specified the direct xkb configuration. This method has
+been obsoleted by previously described rules files which are far more flexi-
+ble and allow simpler and more intuitive syntax. It is preserved merely for
+compatibility reasons. Avoid using it if it is possible.
+
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Config.sgml,v 1.4 dawes Exp $
diff --git a/xorg-server/xkeyboard-config/docs/README.symbols b/xorg-server/xkeyboard-config/docs/README.symbols
index 2382f0a15..749618e77 100644
--- a/xorg-server/xkeyboard-config/docs/README.symbols
+++ b/xorg-server/xkeyboard-config/docs/README.symbols
@@ -1,51 +1,51 @@
-

-The files in the symbols directory describe possible layouts for a given 

-keyboard.

-

-The default layout in each file should describe the most common layout

-for its kind, usually the symbols printed on the keys. Layout variants

-can describe common differences that are not necessarily printed on the keys.

-(e.g. a phonetic version of Cyrillic).

-

-The names of the files are referenced throughout the XKB rules, and may be

-exposed in the X server configuration and in user configuration tools.

-The filenames use the following convention:

-

-Country layouts:

-

-  Keyboard layouts for a country must use the 2-letter code from the

-  ISO-3166 standard.

-

-Language layouts:

-

-  Keyboard layouts for a language must use the 3-letter code from the

-  ISO-639 standard.

-

-Script layouts:

-

-  Keyboard layouts for a script must use the 4-letter code from the

-  ISO-15924 standard.

-

-Other:

-

-  Keyboard layouts that do not fit in the above model and directories

-  must use a filename between 5 and 8 characters.

-

-The ISO codes can be found at the following addressed:

-

-Country layouts:  http://www.iso.org/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/iso_3166-1_decoding_table.html

-Language layouts: http://www.loc.gov/standards/iso639-2/langcodes.html

-Script layouts:   http://www.unicode.org/iso15924/iso15924-codes.html

-

-The description in the directory file base.xml.in should match the group names 

-in the symbols file. 

-

-If the layout is country-based, this has to be the full 

-name of the country. It is highly not recommended to use the forms 

-"Republic of XXX" or "XXX Republic" - the form "XXX" should be used instead.

-The only exception is "United Kingdom".

-

-If the layout is language-based, this has to be the name of the language.

-

-Within single symbols file, all the variants should have the same group name 

-(implemented using the "include" directive wherever possible).

+
+The files in the symbols directory describe possible layouts for a given 
+keyboard.
+
+The default layout in each file should describe the most common layout
+for its kind, usually the symbols printed on the keys. Layout variants
+can describe common differences that are not necessarily printed on the keys.
+(e.g. a phonetic version of Cyrillic).
+
+The names of the files are referenced throughout the XKB rules, and may be
+exposed in the X server configuration and in user configuration tools.
+The filenames use the following convention:
+
+Country layouts:
+
+  Keyboard layouts for a country must use the 2-letter code from the
+  ISO-3166 standard.
+
+Language layouts:
+
+  Keyboard layouts for a language must use the 3-letter code from the
+  ISO-639 standard.
+
+Script layouts:
+
+  Keyboard layouts for a script must use the 4-letter code from the
+  ISO-15924 standard.
+
+Other:
+
+  Keyboard layouts that do not fit in the above model and directories
+  must use a filename between 5 and 8 characters.
+
+The ISO codes can be found at the following addressed:
+
+Country layouts:  http://www.iso.org/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/iso_3166-1_decoding_table.html
+Language layouts: http://www.loc.gov/standards/iso639-2/langcodes.html
+Script layouts:   http://www.unicode.org/iso15924/iso15924-codes.html
+
+The description in the directory file base.xml.in should match the group names 
+in the symbols file. 
+
+If the layout is country-based, this has to be the full 
+name of the country. It is highly not recommended to use the forms 
+"Republic of XXX" or "XXX Republic" - the form "XXX" should be used instead.
+The only exception is "United Kingdom".
+
+If the layout is language-based, this has to be the name of the language.
+
+Within single symbols file, all the variants should have the same group name 
+(implemented using the "include" directive wherever possible).
diff --git a/xorg-server/xkeyboard-config/docs/iso15924.csv b/xorg-server/xkeyboard-config/docs/iso15924.csv
index 60ee4ed9f..0c751839b 100644
--- a/xorg-server/xkeyboard-config/docs/iso15924.csv
+++ b/xorg-server/xkeyboard-config/docs/iso15924.csv
@@ -1,105 +1,105 @@
-Code,N°,"English Name","Nom français","Property Value Alias",Date

-Arab,160,Arabic,arabe,Arabic,38108

-Armn,230,Armenian,arménien,Armenian,38108

-Bali,360,Balinese,balinais,,38136

-Batk,365,Batak,batak,,38108

-Beng,325,Bengali,bengalî,Bengali,38108

-Blis,550,Blissymbols,"symboles Bliss",,38108

-Bopo,285,Bopomofo,bopomofo,Bopomofo,38108

-Brah,300,Brahmi,brâhmî,,38108

-Brai,570,Braille,braille,Braille,38108

-Bugi,367,Buginese,bouguis,,38108

-Buhd,372,Buhid,bouhide,Buhid,38108

-Cans,440,"Unified Canadian Aboriginal Syllabics","syllabaire autochtone canadien unifié",Canadian_Aboriginal,38136

-Cham,358,Cham,"cham (čam, tcham)",,38108

-Cher,445,Cherokee,tchérokî,Cherokee,38108

-Cirt,291,Cirth,cirth,,38108

-Copt,204,Coptic,copte,,38136

-Cprt,403,Cypriot,"syllabaire chypriote",Cypriot,38108

-Cyrl,220,Cyrillic,cyrillique,Cyrillic,38108

-Cyrs,221,"Cyrillic (Old Church Slavonic variant)","cyrillique (variante slavonne)",,38108

-Deva,315,"Devanagari (Nagari)",dévanâgarî,Devanagari,38108

-Dsrt,250,"Deseret (Mormon)","déseret (mormon)",Deseret,38108

-Egyd,70,"Egyptian demotic","démotique égyptien",,38108

-Egyh,60,"Egyptian hieratic","hiératique égyptien",,38108

-Egyp,50,"Egyptian hieroglyphs","hiéroglyphes égyptiens",,38108

-Ethi,430,"Ethiopic (Ge‘ez)","éthiopique (éthiopien, ge‘ez, guèze)",Ethiopic,38136

-Geor,240,"Georgian (Mkhedruli)","géorgien (mkhédrouli)",Georgian,38136

-Glag,225,Glagolitic,glagolitique,,38108

-Goth,206,Gothic,gotique,Gothic,38108

-Grek,200,Greek,grec,Greek,38108

-Gujr,320,Gujarati,"goudjarâtî (gujrâtî)",Gujarati,38108

-Guru,310,Gurmukhi,gourmoukhî,Gurmukhi,38108

-Hang,286,"Hangul (Hangŭl, Hangeul)","hangûl (hangŭl, hangeul)",Hangul,38136

-Hani,500,"Han (Hanzi, Kanji, Hanja)","idéogrammes han",Han,38108

-Hano,371,"Hanunoo (Hanunóo)",hanounóo,Hanunoo,38136

-Hans,501,"Han (Simplified variant)","idéogrammes han (variante simplifiée)",,38136

-Hant,502,"Han (Traditional variant)","idéogrammes han (variante traditionnelle)",,38136

-Hebr,125,Hebrew,hébreu,Hebrew,38108

-Hira,410,Hiragana,hiragana,Hiragana,38108

-Hmng,450,"Pahawh Hmong","pahawh hmong",,38108

-Hrkt,412,"(alias for Hiragana + Katakana)","(alias pour hiragana + katakana)",Katakana_Or_Hiragana,38108

-Hung,176,"Old Hungarian","ancien hongrois",,38108

-Inds,610,"Indus (Harappan)",indus,,38108

-Ital,210,"Old Italic (Etruscan, Oscan, etc.)","ancien italique (étrusque, osque, etc.)",Old_Italic,38136

-Java,361,Javanese,javanais,,38136

-Kali,357,"Kayah Li","kayah li",,38108

-Kana,411,Katakana,katakana,Katakana,38108

-Khar,305,Kharoshthi,kharochthî,,38136

-Khmr,355,Khmer,khmer,Khmer,38136

-Knda,345,Kannada,"kannara (canara)",Kannada,38136

-Laoo,356,Lao,laotien,Lao,38108

-Latf,217,"Latin (Fraktur variant)","latin (variante brisée)",,38108

-Latg,216,"Latin (Gaelic variant)","latin (variante gaélique)",,38108

-Latn,215,Latin,latin,Latin,38108

-Lepc,335,"Lepcha (Róng)","lepcha (róng)",,38108

-Limb,336,Limbu,limbou,Limbu,38136

-Lina,400,"Linear A","linéaire A",,38108

-Linb,401,"Linear B","linéaire B",Linear_B,38136

-Mand,140,Mandaean,mandéen,,38136

-Maya,90,"Mayan hieroglyphs","hiéroglyphes mayas",,38108

-Mero,100,Meroitic,méroïtique,,38108

-Mlym,347,Malayalam,malayâlam,Malayalam,38108

-Mong,145,Mongolian,mongol,Mongolian,38108

-Mymr,350,"Myanmar (Burmese)",birman,Myanmar,38108

-Ogam,212,Ogham,ogam,Ogham,38108

-Orkh,175,Orkhon,orkhon,,38108

-Orya,327,Oriya,oriyâ,Oriya,38108

-Osma,260,Osmanya,osmanais,Osmanya,38108

-Perm,227,"Old Permic","ancien permien",,38108

-Phag,331,Phags-pa,"’phags pa",,38136

-Phnx,115,Phoenician,phénicien,,38108

-Plrd,282,"Pollard Phonetic","phonétique de Pollard",,38108

-Qaaa,900,"Reserved for private use (start)","réservé à l’usage privé (début)",,38136

-Qabx,949,"Reserved for private use (end)","réservé à l’usage privé (fin)",,38136

-Roro,620,Rongorongo,rongorongo,,38108

-Runr,211,Runic,runique,Runic,38108

-Sara,292,Sarati,sarati,,38136

-Shaw,281,"Shavian (Shaw)","shavien (Shaw)",Shavian,38108

-Sinh,348,Sinhala,singhalais,Sinhala,38108

-Sylo,316,"Syloti Nagri","sylotî nâgrî",,38136

-Syrc,135,Syriac,syriaque,Syriac,38108

-Syre,138,"Syriac (Estrangelo variant)","syriaque (variante estranghélo)",,38108

-Syrj,137,"Syriac (Western variant)","syriaque (variante occidentale)",,38108

-Syrn,136,"Syriac (Eastern variant)","syriaque (variante orientale)",,38108

-Tagb,373,Tagbanwa,tagbanoua,Tagbanwa,38108

-Tale,353,"Tai Le","taï le",Tai_Le,38136

-Talu,354,"Tai Lue","taï lue",,38136

-Taml,346,Tamil,tamoul,Tamil,38108

-Telu,340,Telugu,télougou,Telugu,38108

-Teng,290,Tengwar,tengwar,,38108

-Tfng,120,"Tifinagh (Berber)","tifinagh (berbère)",,38108

-Tglg,370,Tagalog,tagal,Tagalog,38108

-Thaa,170,Thaana,thâna,Thaana,38108

-Thai,352,Thai,thaï,Thai,38108

-Tibt,330,Tibetan,tibétain,Tibetan,38108

-Ugar,40,Ugaritic,ougaritique,Ugaritic,38108

-Vaii,470,Vai,vaï,,38108

-Visp,280,"Visible Speech","parole visible",,38108

-Xpeo,30,"Old Persian","cunéiforme persépolitain",,38108

-Xsux,20,"Cuneiform, Sumero-Akkadian","cunéiforme suméro-akkadien",,38108

-Yiii,460,Yi,yi,Yi,38108

-Zxxx,997,"Code for unwritten languages","codet pour les langues non écrites",,38108

-Zyyy,998,"Code for undetermined script","codet pour écriture indéterminée",Common,38136

-Zzzz,999,"Code for uncoded script","codet pour écriture non codée",,38108

-Code,N°,"English Name","Nom français","Property Value Alias",Date

+Code,N°,"English Name","Nom français","Property Value Alias",Date
+Arab,160,Arabic,arabe,Arabic,38108
+Armn,230,Armenian,arménien,Armenian,38108
+Bali,360,Balinese,balinais,,38136
+Batk,365,Batak,batak,,38108
+Beng,325,Bengali,bengalî,Bengali,38108
+Blis,550,Blissymbols,"symboles Bliss",,38108
+Bopo,285,Bopomofo,bopomofo,Bopomofo,38108
+Brah,300,Brahmi,brâhmî,,38108
+Brai,570,Braille,braille,Braille,38108
+Bugi,367,Buginese,bouguis,,38108
+Buhd,372,Buhid,bouhide,Buhid,38108
+Cans,440,"Unified Canadian Aboriginal Syllabics","syllabaire autochtone canadien unifié",Canadian_Aboriginal,38136
+Cham,358,Cham,"cham (čam, tcham)",,38108
+Cher,445,Cherokee,tchérokî,Cherokee,38108
+Cirt,291,Cirth,cirth,,38108
+Copt,204,Coptic,copte,,38136
+Cprt,403,Cypriot,"syllabaire chypriote",Cypriot,38108
+Cyrl,220,Cyrillic,cyrillique,Cyrillic,38108
+Cyrs,221,"Cyrillic (Old Church Slavonic variant)","cyrillique (variante slavonne)",,38108
+Deva,315,"Devanagari (Nagari)",dévanâgarî,Devanagari,38108
+Dsrt,250,"Deseret (Mormon)","déseret (mormon)",Deseret,38108
+Egyd,70,"Egyptian demotic","démotique égyptien",,38108
+Egyh,60,"Egyptian hieratic","hiératique égyptien",,38108
+Egyp,50,"Egyptian hieroglyphs","hiéroglyphes égyptiens",,38108
+Ethi,430,"Ethiopic (Ge‘ez)","éthiopique (éthiopien, ge‘ez, guèze)",Ethiopic,38136
+Geor,240,"Georgian (Mkhedruli)","géorgien (mkhédrouli)",Georgian,38136
+Glag,225,Glagolitic,glagolitique,,38108
+Goth,206,Gothic,gotique,Gothic,38108
+Grek,200,Greek,grec,Greek,38108
+Gujr,320,Gujarati,"goudjarâtî (gujrâtî)",Gujarati,38108
+Guru,310,Gurmukhi,gourmoukhî,Gurmukhi,38108
+Hang,286,"Hangul (Hangŭl, Hangeul)","hangûl (hangŭl, hangeul)",Hangul,38136
+Hani,500,"Han (Hanzi, Kanji, Hanja)","idéogrammes han",Han,38108
+Hano,371,"Hanunoo (Hanunóo)",hanounóo,Hanunoo,38136
+Hans,501,"Han (Simplified variant)","idéogrammes han (variante simplifiée)",,38136
+Hant,502,"Han (Traditional variant)","idéogrammes han (variante traditionnelle)",,38136
+Hebr,125,Hebrew,hébreu,Hebrew,38108
+Hira,410,Hiragana,hiragana,Hiragana,38108
+Hmng,450,"Pahawh Hmong","pahawh hmong",,38108
+Hrkt,412,"(alias for Hiragana + Katakana)","(alias pour hiragana + katakana)",Katakana_Or_Hiragana,38108
+Hung,176,"Old Hungarian","ancien hongrois",,38108
+Inds,610,"Indus (Harappan)",indus,,38108
+Ital,210,"Old Italic (Etruscan, Oscan, etc.)","ancien italique (étrusque, osque, etc.)",Old_Italic,38136
+Java,361,Javanese,javanais,,38136
+Kali,357,"Kayah Li","kayah li",,38108
+Kana,411,Katakana,katakana,Katakana,38108
+Khar,305,Kharoshthi,kharochthî,,38136
+Khmr,355,Khmer,khmer,Khmer,38136
+Knda,345,Kannada,"kannara (canara)",Kannada,38136
+Laoo,356,Lao,laotien,Lao,38108
+Latf,217,"Latin (Fraktur variant)","latin (variante brisée)",,38108
+Latg,216,"Latin (Gaelic variant)","latin (variante gaélique)",,38108
+Latn,215,Latin,latin,Latin,38108
+Lepc,335,"Lepcha (Róng)","lepcha (róng)",,38108
+Limb,336,Limbu,limbou,Limbu,38136
+Lina,400,"Linear A","linéaire A",,38108
+Linb,401,"Linear B","linéaire B",Linear_B,38136
+Mand,140,Mandaean,mandéen,,38136
+Maya,90,"Mayan hieroglyphs","hiéroglyphes mayas",,38108
+Mero,100,Meroitic,méroïtique,,38108
+Mlym,347,Malayalam,malayâlam,Malayalam,38108
+Mong,145,Mongolian,mongol,Mongolian,38108
+Mymr,350,"Myanmar (Burmese)",birman,Myanmar,38108
+Ogam,212,Ogham,ogam,Ogham,38108
+Orkh,175,Orkhon,orkhon,,38108
+Orya,327,Oriya,oriyâ,Oriya,38108
+Osma,260,Osmanya,osmanais,Osmanya,38108
+Perm,227,"Old Permic","ancien permien",,38108
+Phag,331,Phags-pa,"’phags pa",,38136
+Phnx,115,Phoenician,phénicien,,38108
+Plrd,282,"Pollard Phonetic","phonétique de Pollard",,38108
+Qaaa,900,"Reserved for private use (start)","réservé à l’usage privé (début)",,38136
+Qabx,949,"Reserved for private use (end)","réservé à l’usage privé (fin)",,38136
+Roro,620,Rongorongo,rongorongo,,38108
+Runr,211,Runic,runique,Runic,38108
+Sara,292,Sarati,sarati,,38136
+Shaw,281,"Shavian (Shaw)","shavien (Shaw)",Shavian,38108
+Sinh,348,Sinhala,singhalais,Sinhala,38108
+Sylo,316,"Syloti Nagri","sylotî nâgrî",,38136
+Syrc,135,Syriac,syriaque,Syriac,38108
+Syre,138,"Syriac (Estrangelo variant)","syriaque (variante estranghélo)",,38108
+Syrj,137,"Syriac (Western variant)","syriaque (variante occidentale)",,38108
+Syrn,136,"Syriac (Eastern variant)","syriaque (variante orientale)",,38108
+Tagb,373,Tagbanwa,tagbanoua,Tagbanwa,38108
+Tale,353,"Tai Le","taï le",Tai_Le,38136
+Talu,354,"Tai Lue","taï lue",,38136
+Taml,346,Tamil,tamoul,Tamil,38108
+Telu,340,Telugu,télougou,Telugu,38108
+Teng,290,Tengwar,tengwar,,38108
+Tfng,120,"Tifinagh (Berber)","tifinagh (berbère)",,38108
+Tglg,370,Tagalog,tagal,Tagalog,38108
+Thaa,170,Thaana,thâna,Thaana,38108
+Thai,352,Thai,thaï,Thai,38108
+Tibt,330,Tibetan,tibétain,Tibetan,38108
+Ugar,40,Ugaritic,ougaritique,Ugaritic,38108
+Vaii,470,Vai,vaï,,38108
+Visp,280,"Visible Speech","parole visible",,38108
+Xpeo,30,"Old Persian","cunéiforme persépolitain",,38108
+Xsux,20,"Cuneiform, Sumero-Akkadian","cunéiforme suméro-akkadien",,38108
+Yiii,460,Yi,yi,Yi,38108
+Zxxx,997,"Code for unwritten languages","codet pour les langues non écrites",,38108
+Zyyy,998,"Code for undetermined script","codet pour écriture indéterminée",Common,38136
+Zzzz,999,"Code for uncoded script","codet pour écriture non codée",,38108
+Code,N°,"English Name","Nom français","Property Value Alias",Date
diff --git a/xorg-server/xkeyboard-config/docs/iso3166-3.csv b/xorg-server/xkeyboard-config/docs/iso3166-3.csv
index e0ecb96ca..0e5a44e17 100644
--- a/xorg-server/xkeyboard-config/docs/iso3166-3.csv
+++ b/xorg-server/xkeyboard-config/docs/iso3166-3.csv
@@ -1,246 +1,246 @@
-ABW 	Aruba

-AFG 	Afghanistan

-AGO 	Angola

-AIA 	Anguilla

-ALA 	Åland Islands

-ALB 	Albania

-AND 	Andorra

-ANT 	Netherlands Antilles

-ARE 	United Arab Emirates

-ARG 	Argentina

-ARM 	Armenia

-ASM 	American Samoa

-ATA 	Antarctica

-ATF 	French Southern Territories

-ATG 	Antigua and Barbuda

-AUS 	Australia

-AUT 	Austria

-AZE 	Azerbaijan

-BDI 	Burundi

-BEL 	Belgium

-BEN 	Benin

-BFA 	Burkina Faso

-BGD 	Bangladesh

-BGR 	Bulgaria

-BHR 	Bahrain

-BHS 	Bahamas

-BIH 	Bosnia and Herzegovina

-BLM 	Saint Barthélemy

-BLR 	Belarus

-BLZ 	Belize

-BMU 	Bermuda

-BOL 	Bolivia, Plurinational State of

-BRA 	Brazil

-BRB 	Barbados

-BRN 	Brunei Darussalam

-BTN 	Bhutan

-BVT 	Bouvet Island

-BWA 	Botswana

-CAF 	Central African Republic

-CAN 	Canada

-CCK 	Cocos (Keeling) Islands

-CHE 	Switzerland

-CHL 	Chile

-CHN 	China

-CIV 	Côte d'Ivoire

-CMR 	Cameroon

-COD 	Congo, the Democratic Republic of the

-COG 	Congo

-COK 	Cook Islands

-COL 	Colombia

-COM 	Comoros

-CPV 	Cape Verde

-CRI 	Costa Rica

-CUB 	Cuba

-CXR 	Christmas Island

-CYM 	Cayman Islands

-CYP 	Cyprus

-CZE 	Czech Republic

-DEU 	Germany

-DJI 	Djibouti

-DMA 	Dominica

-DNK 	Denmark

-DOM 	Dominican Republic

-DZA 	Algeria

-ECU 	Ecuador

-EGY 	Egypt

-ERI 	Eritrea

-ESH 	Western Sahara

-ESP 	Spain

-EST 	Estonia

-ETH 	Ethiopia

-FIN 	Finland

-FJI 	Fiji

-FLK 	Falkland Islands (Malvinas)

-FRA 	France

-FRO 	Faroe Islands

-FSM 	Micronesia, Federated States of

-GAB 	Gabon

-GBR 	United Kingdom

-GEO 	Georgia

-GGY 	Guernsey

-GHA 	Ghana

-GIB 	Gibraltar

-GIN 	Guinea

-GLP 	Guadeloupe

-GMB 	Gambia

-GNB 	Guinea-Bissau

-GNQ 	Equatorial Guinea

-GRC 	Greece

-GRD 	Grenada

-GRL 	Greenland

-GTM 	Guatemala

-GUF 	French Guiana

-GUM 	Guam

-GUY 	Guyana

-HKG 	Hong Kong

-HMD 	Heard Island and McDonald Islands

-HND 	Honduras

-HRV 	Croatia

-HTI 	Haiti

-HUN 	Hungary

-IDN 	Indonesia

-IMN 	Isle of Man

-IND 	India

-IOT 	British Indian Ocean Territory

-IRL 	Ireland

-IRN 	Iran, Islamic Republic of

-IRQ 	Iraq

-ISL 	Iceland

-ISR 	Israel

-ITA 	Italy

-JAM 	Jamaica

-JEY 	Jersey

-JOR 	Jordan

-JPN 	Japan

-KAZ 	Kazakhstan

-KEN 	Kenya

-KGZ 	Kyrgyzstan

-KHM 	Cambodia

-KIR 	Kiribati

-KNA 	Saint Kitts and Nevis

-KOR 	Korea, Republic of

-KWT 	Kuwait

-LAO 	Lao People's Democratic Republic

-LBN 	Lebanon

-LBR 	Liberia

-LBY 	Libyan Arab Jamahiriya

-LCA 	Saint Lucia

-LIE 	Liechtenstein

-LKA 	Sri Lanka

-LSO 	Lesotho

-LTU 	Lithuania

-LUX 	Luxembourg

-LVA 	Latvia

-MAC 	Macao

-MAF 	Saint Martin (French part)

-MAR 	Morocco

-MCO 	Monaco

-MDA 	Moldova, Republic of

-MDG 	Madagascar

-MDV 	Maldives

-MEX 	Mexico

-MHL 	Marshall Islands

-MKD 	Macedonia, the former Yugoslav Republic of

-MLI 	Mali

-MLT 	Malta

-MMR 	Myanmar

-MNE 	Montenegro

-MNG 	Mongolia

-MNP 	Northern Mariana Islands

-MOZ 	Mozambique

-MRT 	Mauritania

-MSR 	Montserrat

-MTQ 	Martinique

-MUS 	Mauritius

-MWI 	Malawi

-MYS 	Malaysia

-MYT 	Mayotte

-NAM 	Namibia

-NCL 	New Caledonia

-NER 	Niger

-NFK 	Norfolk Island

-NGA 	Nigeria

-NIC 	Nicaragua

-NIU 	Niue

-NLD 	Netherlands

-NOR 	Norway

-NPL 	Nepal

-NRU 	Nauru

-NZL 	New Zealand

-OMN 	Oman

-PAK 	Pakistan

-PAN 	Panama

-PCN 	Pitcairn

-PER 	Peru

-PHL 	Philippines

-PLW 	Palau

-PNG 	Papua New Guinea

-POL 	Poland

-PRI 	Puerto Rico

-PRK 	Korea, Democratic People's Republic of

-PRT 	Portugal

-PRY 	Paraguay

-PSE 	Palestinian Territory, Occupied

-PYF 	French Polynesia

-QAT 	Qatar

-REU 	Réunion

-ROU 	Romania

-RUS 	Russian Federation

-RWA 	Rwanda

-SAU 	Saudi Arabia

-SDN 	Sudan

-SEN 	Senegal

-SGP 	Singapore

-SGS 	South Georgia and the South Sandwich Islands

-SHN 	Saint Helena, Ascension and Tristan da Cunha

-SJM 	Svalbard and Jan Mayen

-SLB 	Solomon Islands

-SLE 	Sierra Leone

-SLV 	El Salvador

-SMR 	San Marino

-SOM 	Somalia

-SPM 	Saint Pierre and Miquelon

-SRB 	Serbia

-STP 	Sao Tome and Principe

-SUR 	Suriname

-SVK 	Slovakia

-SVN 	Slovenia

-SWE 	Sweden

-SWZ 	Swaziland

-SYC 	Seychelles

-SYR 	Syrian Arab Republic

-TCA 	Turks and Caicos Islands

-TCD 	Chad

-TGO 	Togo

-THA 	Thailand

-TJK 	Tajikistan

-TKL 	Tokelau

-TKM 	Turkmenistan

-TLS 	Timor-Leste

-TON 	Tonga

-TTO 	Trinidad and Tobago

-TUN 	Tunisia

-TUR 	Turkey

-TUV 	Tuvalu

-TWN 	Taiwan, Province of China

-TZA 	Tanzania, United Republic of

-UGA 	Uganda

-UKR 	Ukraine

-UMI 	United States Minor Outlying Islands

-URY 	Uruguay

-USA 	United States

-UZB 	Uzbekistan

-VAT 	Holy See (Vatican City State)

-VCT 	Saint Vincent and the Grenadines

-VEN 	Venezuela, Bolivarian Republic of

-VGB 	Virgin Islands, British

-VIR 	Virgin Islands, U.S.

-VNM 	Viet Nam

-VUT 	Vanuatu

-WLF 	Wallis and Futuna

-WSM 	Samoa

-YEM 	Yemen

-ZAF 	South Africa

-ZMB 	Zambia

-ZWE 	Zimbabwe

+ABW 	Aruba
+AFG 	Afghanistan
+AGO 	Angola
+AIA 	Anguilla
+ALA 	Åland Islands
+ALB 	Albania
+AND 	Andorra
+ANT 	Netherlands Antilles
+ARE 	United Arab Emirates
+ARG 	Argentina
+ARM 	Armenia
+ASM 	American Samoa
+ATA 	Antarctica
+ATF 	French Southern Territories
+ATG 	Antigua and Barbuda
+AUS 	Australia
+AUT 	Austria
+AZE 	Azerbaijan
+BDI 	Burundi
+BEL 	Belgium
+BEN 	Benin
+BFA 	Burkina Faso
+BGD 	Bangladesh
+BGR 	Bulgaria
+BHR 	Bahrain
+BHS 	Bahamas
+BIH 	Bosnia and Herzegovina
+BLM 	Saint Barthélemy
+BLR 	Belarus
+BLZ 	Belize
+BMU 	Bermuda
+BOL 	Bolivia, Plurinational State of
+BRA 	Brazil
+BRB 	Barbados
+BRN 	Brunei Darussalam
+BTN 	Bhutan
+BVT 	Bouvet Island
+BWA 	Botswana
+CAF 	Central African Republic
+CAN 	Canada
+CCK 	Cocos (Keeling) Islands
+CHE 	Switzerland
+CHL 	Chile
+CHN 	China
+CIV 	Côte d'Ivoire
+CMR 	Cameroon
+COD 	Congo, the Democratic Republic of the
+COG 	Congo
+COK 	Cook Islands
+COL 	Colombia
+COM 	Comoros
+CPV 	Cape Verde
+CRI 	Costa Rica
+CUB 	Cuba
+CXR 	Christmas Island
+CYM 	Cayman Islands
+CYP 	Cyprus
+CZE 	Czech Republic
+DEU 	Germany
+DJI 	Djibouti
+DMA 	Dominica
+DNK 	Denmark
+DOM 	Dominican Republic
+DZA 	Algeria
+ECU 	Ecuador
+EGY 	Egypt
+ERI 	Eritrea
+ESH 	Western Sahara
+ESP 	Spain
+EST 	Estonia
+ETH 	Ethiopia
+FIN 	Finland
+FJI 	Fiji
+FLK 	Falkland Islands (Malvinas)
+FRA 	France
+FRO 	Faroe Islands
+FSM 	Micronesia, Federated States of
+GAB 	Gabon
+GBR 	United Kingdom
+GEO 	Georgia
+GGY 	Guernsey
+GHA 	Ghana
+GIB 	Gibraltar
+GIN 	Guinea
+GLP 	Guadeloupe
+GMB 	Gambia
+GNB 	Guinea-Bissau
+GNQ 	Equatorial Guinea
+GRC 	Greece
+GRD 	Grenada
+GRL 	Greenland
+GTM 	Guatemala
+GUF 	French Guiana
+GUM 	Guam
+GUY 	Guyana
+HKG 	Hong Kong
+HMD 	Heard Island and McDonald Islands
+HND 	Honduras
+HRV 	Croatia
+HTI 	Haiti
+HUN 	Hungary
+IDN 	Indonesia
+IMN 	Isle of Man
+IND 	India
+IOT 	British Indian Ocean Territory
+IRL 	Ireland
+IRN 	Iran, Islamic Republic of
+IRQ 	Iraq
+ISL 	Iceland
+ISR 	Israel
+ITA 	Italy
+JAM 	Jamaica
+JEY 	Jersey
+JOR 	Jordan
+JPN 	Japan
+KAZ 	Kazakhstan
+KEN 	Kenya
+KGZ 	Kyrgyzstan
+KHM 	Cambodia
+KIR 	Kiribati
+KNA 	Saint Kitts and Nevis
+KOR 	Korea, Republic of
+KWT 	Kuwait
+LAO 	Lao People's Democratic Republic
+LBN 	Lebanon
+LBR 	Liberia
+LBY 	Libyan Arab Jamahiriya
+LCA 	Saint Lucia
+LIE 	Liechtenstein
+LKA 	Sri Lanka
+LSO 	Lesotho
+LTU 	Lithuania
+LUX 	Luxembourg
+LVA 	Latvia
+MAC 	Macao
+MAF 	Saint Martin (French part)
+MAR 	Morocco
+MCO 	Monaco
+MDA 	Moldova, Republic of
+MDG 	Madagascar
+MDV 	Maldives
+MEX 	Mexico
+MHL 	Marshall Islands
+MKD 	Macedonia, the former Yugoslav Republic of
+MLI 	Mali
+MLT 	Malta
+MMR 	Myanmar
+MNE 	Montenegro
+MNG 	Mongolia
+MNP 	Northern Mariana Islands
+MOZ 	Mozambique
+MRT 	Mauritania
+MSR 	Montserrat
+MTQ 	Martinique
+MUS 	Mauritius
+MWI 	Malawi
+MYS 	Malaysia
+MYT 	Mayotte
+NAM 	Namibia
+NCL 	New Caledonia
+NER 	Niger
+NFK 	Norfolk Island
+NGA 	Nigeria
+NIC 	Nicaragua
+NIU 	Niue
+NLD 	Netherlands
+NOR 	Norway
+NPL 	Nepal
+NRU 	Nauru
+NZL 	New Zealand
+OMN 	Oman
+PAK 	Pakistan
+PAN 	Panama
+PCN 	Pitcairn
+PER 	Peru
+PHL 	Philippines
+PLW 	Palau
+PNG 	Papua New Guinea
+POL 	Poland
+PRI 	Puerto Rico
+PRK 	Korea, Democratic People's Republic of
+PRT 	Portugal
+PRY 	Paraguay
+PSE 	Palestinian Territory, Occupied
+PYF 	French Polynesia
+QAT 	Qatar
+REU 	Réunion
+ROU 	Romania
+RUS 	Russian Federation
+RWA 	Rwanda
+SAU 	Saudi Arabia
+SDN 	Sudan
+SEN 	Senegal
+SGP 	Singapore
+SGS 	South Georgia and the South Sandwich Islands
+SHN 	Saint Helena, Ascension and Tristan da Cunha
+SJM 	Svalbard and Jan Mayen
+SLB 	Solomon Islands
+SLE 	Sierra Leone
+SLV 	El Salvador
+SMR 	San Marino
+SOM 	Somalia
+SPM 	Saint Pierre and Miquelon
+SRB 	Serbia
+STP 	Sao Tome and Principe
+SUR 	Suriname
+SVK 	Slovakia
+SVN 	Slovenia
+SWE 	Sweden
+SWZ 	Swaziland
+SYC 	Seychelles
+SYR 	Syrian Arab Republic
+TCA 	Turks and Caicos Islands
+TCD 	Chad
+TGO 	Togo
+THA 	Thailand
+TJK 	Tajikistan
+TKL 	Tokelau
+TKM 	Turkmenistan
+TLS 	Timor-Leste
+TON 	Tonga
+TTO 	Trinidad and Tobago
+TUN 	Tunisia
+TUR 	Turkey
+TUV 	Tuvalu
+TWN 	Taiwan, Province of China
+TZA 	Tanzania, United Republic of
+UGA 	Uganda
+UKR 	Ukraine
+UMI 	United States Minor Outlying Islands
+URY 	Uruguay
+USA 	United States
+UZB 	Uzbekistan
+VAT 	Holy See (Vatican City State)
+VCT 	Saint Vincent and the Grenadines
+VEN 	Venezuela, Bolivarian Republic of
+VGB 	Virgin Islands, British
+VIR 	Virgin Islands, U.S.
+VNM 	Viet Nam
+VUT 	Vanuatu
+WLF 	Wallis and Futuna
+WSM 	Samoa
+YEM 	Yemen
+ZAF 	South Africa
+ZMB 	Zambia
+ZWE 	Zimbabwe
diff --git a/xorg-server/xkeyboard-config/docs/iso3166.csv b/xorg-server/xkeyboard-config/docs/iso3166.csv
index cf971e300..f08b3da03 100644
--- a/xorg-server/xkeyboard-config/docs/iso3166.csv
+++ b/xorg-server/xkeyboard-config/docs/iso3166.csv
@@ -1,240 +1,240 @@
-AF,AFGHANISTAN

-AX,"ÅLAND ISLANDS"

-AL,ALBANIA

-DZ,ALGERIA

-AS,"AMERICAN SAMOA"

-AD,ANDORRA

-AO,ANGOLA

-AI,ANGUILLA

-AQ,ANTARCTICA

-AG,"ANTIGUA AND BARBUDA"

-AR,ARGENTINA

-AM,ARMENIA

-AW,ARUBA

-AU,AUSTRALIA

-AT,AUSTRIA

-AZ,AZERBAIJAN

-BS,BAHAMAS

-BH,BAHRAIN

-BD,BANGLADESH

-BB,BARBADOS

-BY,BELARUS

-BE,BELGIUM

-BZ,BELIZE

-BJ,BENIN

-BM,BERMUDA

-BT,BHUTAN

-BO,BOLIVIA

-BA,"BOSNIA AND HERZEGOVINA"

-BW,BOTSWANA

-BV,"BOUVET ISLAND"

-BR,BRAZIL

-IO,"BRITISH INDIAN OCEAN TERRITORY"

-BN,"BRUNEI DARUSSALAM"

-BG,BULGARIA

-BF,"BURKINA FASO"

-BI,BURUNDI

-KH,CAMBODIA

-CM,CAMEROON

-CA,CANADA

-CV,"CAPE VERDE"

-KY,"CAYMAN ISLANDS"

-CF,"CENTRAL AFRICAN REPUBLIC"

-TD,CHAD

-CL,CHILE

-CN,CHINA

-CX,"CHRISTMAS ISLAND"

-CC,"COCOS (KEELING) ISLANDS"

-CO,COLOMBIA

-KM,COMOROS

-CG,CONGO

-CD,"CONGO, THE DEMOCRATIC REPUBLIC OF THE"

-CK,"COOK ISLANDS"

-CR,"COSTA RICA"

-CI,"COTE D'IVOIRE"

-HR,CROATIA

-CU,CUBA

-CY,CYPRUS

-CZ,"CZECH REPUBLIC"

-DK,DENMARK

-DJ,DJIBOUTI

-DM,DOMINICA

-DO,"DOMINICAN REPUBLIC"

-EC,ECUADOR

-EG,EGYPT

-SV,"EL SALVADOR"

-GQ,"EQUATORIAL GUINEA"

-ER,ERITREA

-EE,ESTONIA

-ET,ETHIOPIA

-FK,"FALKLAND ISLANDS (MALVINAS)"

-FO,"FAROE ISLANDS"

-FJ,FIJI

-FI,FINLAND

-FR,FRANCE

-GF,"FRENCH GUIANA"

-PF,"FRENCH POLYNESIA"

-TF,"FRENCH SOUTHERN TERRITORIES"

-GA,GABON

-GM,GAMBIA

-GE,GEORGIA

-DE,GERMANY

-GH,GHANA

-GI,GIBRALTAR

-GR,GREECE

-GL,GREENLAND

-GD,GRENADA

-GP,GUADELOUPE

-GU,GUAM

-GT,GUATEMALA

-GN,GUINEA

-GW,GUINEA-BISSAU

-GY,GUYANA

-HT,HAITI

-HM,"HEARD ISLAND AND MCDONALD ISLANDS"

-VA,"HOLY SEE (VATICAN CITY STATE)"

-HN,HONDURAS

-HK,"HONG KONG"

-HU,HUNGARY

-IS,ICELAND

-IN,INDIA

-ID,INDONESIA

-IR,"IRAN, ISLAMIC REPUBLIC OF"

-IQ,IRAQ

-IE,IRELAND

-IL,ISRAEL

-IT,ITALY

-JM,JAMAICA

-JP,JAPAN

-JO,JORDAN

-KZ,KAZAKHSTAN

-KE,KENYA

-KI,KIRIBATI

-KP,"KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF"

-KR,"KOREA, REPUBLIC OF"

-KW,KUWAIT

-KG,KYRGYZSTAN

-LA,"LAO PEOPLE'S DEMOCRATIC REPUBLIC"

-LV,LATVIA

-LB,LEBANON

-LS,LESOTHO

-LR,LIBERIA

-LY,"LIBYAN ARAB JAMAHIRIYA"

-LI,LIECHTENSTEIN

-LT,LITHUANIA

-LU,LUXEMBOURG

-MO,MACAO

-MK,"MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF"

-MG,MADAGASCAR

-MW,MALAWI

-MY,MALAYSIA

-MV,MALDIVES

-ML,MALI

-MT,MALTA

-MH,"MARSHALL ISLANDS"

-MQ,MARTINIQUE

-MR,MAURITANIA

-MU,MAURITIUS

-YT,MAYOTTE

-MX,MEXICO

-FM,"MICRONESIA, FEDERATED STATES OF"

-MD,"MOLDOVA, REPUBLIC OF"

-MC,MONACO

-MN,MONGOLIA

-MS,MONTSERRAT

-MA,MOROCCO

-MZ,MOZAMBIQUE

-MM,MYANMAR

-NA,NAMIBIA

-NR,NAURU

-NP,NEPAL

-NL,NETHERLANDS

-AN,"NETHERLANDS ANTILLES"

-NC,"NEW CALEDONIA"

-NZ,"NEW ZEALAND"

-NI,NICARAGUA

-NE,NIGER

-NG,NIGERIA

-NU,NIUE

-NF,"NORFOLK ISLAND"

-MP,"NORTHERN MARIANA ISLANDS"

-NO,NORWAY

-OM,OMAN

-PK,PAKISTAN

-PW,PALAU

-PS,"PALESTINIAN TERRITORY, OCCUPIED"

-PA,PANAMA

-PG,"PAPUA NEW GUINEA"

-PY,PARAGUAY

-PE,PERU

-PH,PHILIPPINES

-PN,PITCAIRN

-PL,POLAND

-PT,PORTUGAL

-PR,"PUERTO RICO"

-QA,QATAR

-RE,REUNION

-RO,ROMANIA

-RU,"RUSSIAN FEDERATION"

-RW,RWANDA

-SH,"SAINT HELENA"

-KN,"SAINT KITTS AND NEVIS"

-LC,"SAINT LUCIA"

-PM,"SAINT PIERRE AND MIQUELON"

-VC,"SAINT VINCENT AND THE GRENADINES"

-WS,SAMOA

-SM,"SAN MARINO"

-ST,"SAO TOME AND PRINCIPE"

-SA,"SAUDI ARABIA"

-SN,SENEGAL

-CS,"SERBIA AND MONTENEGRO"

-SC,SEYCHELLES

-SL,"SIERRA LEONE"

-SG,SINGAPORE

-SK,SLOVAKIA

-SI,SLOVENIA

-SB,"SOLOMON ISLANDS"

-SO,SOMALIA

-ZA,"SOUTH AFRICA"

-GS,"SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS"

-ES,SPAIN

-LK,"SRI LANKA"

-SD,SUDAN

-SR,SURINAME

-SJ,"SVALBARD AND JAN MAYEN"

-SZ,SWAZILAND

-SE,SWEDEN

-CH,SWITZERLAND

-SY,"SYRIAN ARAB REPUBLIC"

-TW,"TAIWAN, PROVINCE OF CHINA"

-TJ,TAJIKISTAN

-TZ,"TANZANIA, UNITED REPUBLIC OF"

-TH,THAILAND

-TL,TIMOR-LESTE

-TG,TOGO

-TK,TOKELAU

-TO,TONGA

-TT,"TRINIDAD AND TOBAGO"

-TN,TUNISIA

-TR,TURKEY

-TM,TURKMENISTAN

-TC,"TURKS AND CAICOS ISLANDS"

-TV,TUVALU

-UG,UGANDA

-UA,UKRAINE

-AE,"UNITED ARAB EMIRATES"

-GB,"UNITED KINGDOM"

-US,"UNITED STATES"

-UM,"UNITED STATES MINOR OUTLYING ISLANDS"

-UY,URUGUAY

-UZ,UZBEKISTAN

-VU,VANUATU

-VE,VENEZUELA

-VN,"VIET NAM"

-VG,"VIRGIN ISLANDS, BRITISH"

-VI,"VIRGIN ISLANDS, U.S."

-WF,"WALLIS AND FUTUNA"

-EH,"WESTERN SAHARA"

-YE,YEMEN

-ZM,ZAMBIA

-ZW,ZIMBABWE

+AF,AFGHANISTAN
+AX,"ÅLAND ISLANDS"
+AL,ALBANIA
+DZ,ALGERIA
+AS,"AMERICAN SAMOA"
+AD,ANDORRA
+AO,ANGOLA
+AI,ANGUILLA
+AQ,ANTARCTICA
+AG,"ANTIGUA AND BARBUDA"
+AR,ARGENTINA
+AM,ARMENIA
+AW,ARUBA
+AU,AUSTRALIA
+AT,AUSTRIA
+AZ,AZERBAIJAN
+BS,BAHAMAS
+BH,BAHRAIN
+BD,BANGLADESH
+BB,BARBADOS
+BY,BELARUS
+BE,BELGIUM
+BZ,BELIZE
+BJ,BENIN
+BM,BERMUDA
+BT,BHUTAN
+BO,BOLIVIA
+BA,"BOSNIA AND HERZEGOVINA"
+BW,BOTSWANA
+BV,"BOUVET ISLAND"
+BR,BRAZIL
+IO,"BRITISH INDIAN OCEAN TERRITORY"
+BN,"BRUNEI DARUSSALAM"
+BG,BULGARIA
+BF,"BURKINA FASO"
+BI,BURUNDI
+KH,CAMBODIA
+CM,CAMEROON
+CA,CANADA
+CV,"CAPE VERDE"
+KY,"CAYMAN ISLANDS"
+CF,"CENTRAL AFRICAN REPUBLIC"
+TD,CHAD
+CL,CHILE
+CN,CHINA
+CX,"CHRISTMAS ISLAND"
+CC,"COCOS (KEELING) ISLANDS"
+CO,COLOMBIA
+KM,COMOROS
+CG,CONGO
+CD,"CONGO, THE DEMOCRATIC REPUBLIC OF THE"
+CK,"COOK ISLANDS"
+CR,"COSTA RICA"
+CI,"COTE D'IVOIRE"
+HR,CROATIA
+CU,CUBA
+CY,CYPRUS
+CZ,"CZECH REPUBLIC"
+DK,DENMARK
+DJ,DJIBOUTI
+DM,DOMINICA
+DO,"DOMINICAN REPUBLIC"
+EC,ECUADOR
+EG,EGYPT
+SV,"EL SALVADOR"
+GQ,"EQUATORIAL GUINEA"
+ER,ERITREA
+EE,ESTONIA
+ET,ETHIOPIA
+FK,"FALKLAND ISLANDS (MALVINAS)"
+FO,"FAROE ISLANDS"
+FJ,FIJI
+FI,FINLAND
+FR,FRANCE
+GF,"FRENCH GUIANA"
+PF,"FRENCH POLYNESIA"
+TF,"FRENCH SOUTHERN TERRITORIES"
+GA,GABON
+GM,GAMBIA
+GE,GEORGIA
+DE,GERMANY
+GH,GHANA
+GI,GIBRALTAR
+GR,GREECE
+GL,GREENLAND
+GD,GRENADA
+GP,GUADELOUPE
+GU,GUAM
+GT,GUATEMALA
+GN,GUINEA
+GW,GUINEA-BISSAU
+GY,GUYANA
+HT,HAITI
+HM,"HEARD ISLAND AND MCDONALD ISLANDS"
+VA,"HOLY SEE (VATICAN CITY STATE)"
+HN,HONDURAS
+HK,"HONG KONG"
+HU,HUNGARY
+IS,ICELAND
+IN,INDIA
+ID,INDONESIA
+IR,"IRAN, ISLAMIC REPUBLIC OF"
+IQ,IRAQ
+IE,IRELAND
+IL,ISRAEL
+IT,ITALY
+JM,JAMAICA
+JP,JAPAN
+JO,JORDAN
+KZ,KAZAKHSTAN
+KE,KENYA
+KI,KIRIBATI
+KP,"KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF"
+KR,"KOREA, REPUBLIC OF"
+KW,KUWAIT
+KG,KYRGYZSTAN
+LA,"LAO PEOPLE'S DEMOCRATIC REPUBLIC"
+LV,LATVIA
+LB,LEBANON
+LS,LESOTHO
+LR,LIBERIA
+LY,"LIBYAN ARAB JAMAHIRIYA"
+LI,LIECHTENSTEIN
+LT,LITHUANIA
+LU,LUXEMBOURG
+MO,MACAO
+MK,"MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF"
+MG,MADAGASCAR
+MW,MALAWI
+MY,MALAYSIA
+MV,MALDIVES
+ML,MALI
+MT,MALTA
+MH,"MARSHALL ISLANDS"
+MQ,MARTINIQUE
+MR,MAURITANIA
+MU,MAURITIUS
+YT,MAYOTTE
+MX,MEXICO
+FM,"MICRONESIA, FEDERATED STATES OF"
+MD,"MOLDOVA, REPUBLIC OF"
+MC,MONACO
+MN,MONGOLIA
+MS,MONTSERRAT
+MA,MOROCCO
+MZ,MOZAMBIQUE
+MM,MYANMAR
+NA,NAMIBIA
+NR,NAURU
+NP,NEPAL
+NL,NETHERLANDS
+AN,"NETHERLANDS ANTILLES"
+NC,"NEW CALEDONIA"
+NZ,"NEW ZEALAND"
+NI,NICARAGUA
+NE,NIGER
+NG,NIGERIA
+NU,NIUE
+NF,"NORFOLK ISLAND"
+MP,"NORTHERN MARIANA ISLANDS"
+NO,NORWAY
+OM,OMAN
+PK,PAKISTAN
+PW,PALAU
+PS,"PALESTINIAN TERRITORY, OCCUPIED"
+PA,PANAMA
+PG,"PAPUA NEW GUINEA"
+PY,PARAGUAY
+PE,PERU
+PH,PHILIPPINES
+PN,PITCAIRN
+PL,POLAND
+PT,PORTUGAL
+PR,"PUERTO RICO"
+QA,QATAR
+RE,REUNION
+RO,ROMANIA
+RU,"RUSSIAN FEDERATION"
+RW,RWANDA
+SH,"SAINT HELENA"
+KN,"SAINT KITTS AND NEVIS"
+LC,"SAINT LUCIA"
+PM,"SAINT PIERRE AND MIQUELON"
+VC,"SAINT VINCENT AND THE GRENADINES"
+WS,SAMOA
+SM,"SAN MARINO"
+ST,"SAO TOME AND PRINCIPE"
+SA,"SAUDI ARABIA"
+SN,SENEGAL
+CS,"SERBIA AND MONTENEGRO"
+SC,SEYCHELLES
+SL,"SIERRA LEONE"
+SG,SINGAPORE
+SK,SLOVAKIA
+SI,SLOVENIA
+SB,"SOLOMON ISLANDS"
+SO,SOMALIA
+ZA,"SOUTH AFRICA"
+GS,"SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS"
+ES,SPAIN
+LK,"SRI LANKA"
+SD,SUDAN
+SR,SURINAME
+SJ,"SVALBARD AND JAN MAYEN"
+SZ,SWAZILAND
+SE,SWEDEN
+CH,SWITZERLAND
+SY,"SYRIAN ARAB REPUBLIC"
+TW,"TAIWAN, PROVINCE OF CHINA"
+TJ,TAJIKISTAN
+TZ,"TANZANIA, UNITED REPUBLIC OF"
+TH,THAILAND
+TL,TIMOR-LESTE
+TG,TOGO
+TK,TOKELAU
+TO,TONGA
+TT,"TRINIDAD AND TOBAGO"
+TN,TUNISIA
+TR,TURKEY
+TM,TURKMENISTAN
+TC,"TURKS AND CAICOS ISLANDS"
+TV,TUVALU
+UG,UGANDA
+UA,UKRAINE
+AE,"UNITED ARAB EMIRATES"
+GB,"UNITED KINGDOM"
+US,"UNITED STATES"
+UM,"UNITED STATES MINOR OUTLYING ISLANDS"
+UY,URUGUAY
+UZ,UZBEKISTAN
+VU,VANUATU
+VE,VENEZUELA
+VN,"VIET NAM"
+VG,"VIRGIN ISLANDS, BRITISH"
+VI,"VIRGIN ISLANDS, U.S."
+WF,"WALLIS AND FUTUNA"
+EH,"WESTERN SAHARA"
+YE,YEMEN
+ZM,ZAMBIA
+ZW,ZIMBABWE
diff --git a/xorg-server/xkeyboard-config/docs/iso639.csv b/xorg-server/xkeyboard-config/docs/iso639.csv
index 374f2104b..d582d8cc5 100644
--- a/xorg-server/xkeyboard-config/docs/iso639.csv
+++ b/xorg-server/xkeyboard-config/docs/iso639.csv
@@ -1,501 +1,501 @@
-Abkhazian,abkhaze,abk,ab

-Achinese,aceh,ace,

-Acoli,acoli,ach,

-Adangme,adangme,ada,

-"Adygei; Adyghe",adyghé,ady,

-"Adyghe; Adygei",adygh,ady,

-Afar,afar,aar,aa

-Afrihili,afrihili,afh,

-Afrikaans,afrikaans,afr,af

-"Afro-Asiatic (Other)","afro-asiatiques, autres langues",afa,

-Akan,akan,aka,ak

-Akkadian,akkadien,akk,

-Albanian,albanais,alb/sqi,sq

-Aleut,aléoute,ale,

-"Algonquian languages","algonquines, langues",alg,

-"Altaic (Other)","altaïques, autres langues",tut,

-Amharic,amharique,amh,am

-"Apache languages",apache,apa,

-Arabic,arabe,ara,ar

-Aragonese,aragonais,arg,an

-Aramaic,araméen,arc,

-Arapaho,arapaho,arp,

-Araucanian,araucan,arn,

-Arawak,arawak,arw,

-Armenian,arménien,arm/hye,hy

-"Artificial (Other)","artificielles, autres langues",art,

-Assamese,assamais,asm,as

-"Asturian; Bable","asturien; bable",ast,

-"Athapascan languages","athapascanes, langues",ath,

-"Australian languages","australiennes, langues",aus,

-"Austronesian (Other)","malayo-polynésiennes, autres langues",map,

-Avaric,avar,ava,av

-Avestan,avestique,ave,ae

-Awadhi,awadhi,awa,

-Aymara,aymara,aym,ay

-Azerbaijani,azéri,aze,az

-"Bable; Asturian","bable; asturien",ast,

-Balinese,balinais,ban,

-"Baltic (Other)","baltiques, autres langues",bat,

-Baluchi,baloutchi,bal,

-Bambara,bambara,bam,bm

-"Bamileke languages","bamilékés, langues",bai,

-Banda,banda,bad,

-"Bantu (Other)","bantoues, autres langues",bnt,

-Basa,basa,bas,

-Bashkir,bachkir,bak,ba

-Basque,basque,baq/eus,eu

-"Batak (Indonesia)","batak (Indonésie)",btk,

-Beja,bedja,bej,

-Belarusian,biélorusse,bel,be

-Bemba,bemba,bem,

-Bengali,bengali,ben,bn

-"Berber (Other)","berbères, autres langues",ber,

-Bhojpuri,bhojpuri,bho,

-Bihari,bihari,bih,bh

-Bikol,bikol,bik,

-"Bilin; Blin","bilen; blin",byn,

-Bini,bini,bin,

-Bislama,bichlamar,bis,bi

-"Blin; Bilin","blin; bilen",byn,

-"Bokmål, Norwegian; Norwegian Bokmål","bokmål, norvégien; bokmål norvégien",nob,nb

-Bosnian,bosniaque,bos,bs

-Braj,braj,bra,

-Breton,breton,bre,br

-Buginese,bugi,bug,

-Bulgarian,bulgare,bul,bg

-Buriat,bouriate,bua,

-Burmese,birman,bur/mya,my

-Caddo,caddo,cad,

-Carib,caribe,car,

-"Castilian; Spanish","castillan; espagnol",spa,es

-"Catalan; Valencian","catalan; valencien",cat,ca

-"Caucasian (Other)","caucasiennes, autres langues",cau,

-Cebuano,cebuano,ceb,

-"Celtic (Other)","celtiques, autres langues",cel,

-"Central American Indian (Other)","indiennes d'Amérique centrale, autres langues",cai,

-Chagatai,djaghataï,chg,

-"Chamic languages","chames, langues",cmc,

-Chamorro,chamorro,cha,ch

-Chechen,tchétchène,che,ce

-Cherokee,cherokee,chr,

-"Chewa; Chichewa; Nyanja","chewa, chichewa, nyanja",nya,ny

-Cheyenne,cheyenne,chy,

-Chibcha,chibcha,chb,

-"Chichewa; Chewa; Nyanja","chichewa; chewa; nyanja",nya,ny

-Chinese,chinois,chi/zho,zh

-"Chinook jargon","chinook, jargon",chn,

-Chipewyan,chipewyan,chp,

-Choctaw,choctaw,cho,

-"Chuang; Zhuang","chuang; zhuang",zha,za

-"Church Slavic; Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic","slavon d'église; vieux slave; slavon liturgique; vieux bulgare",chu,cu

-"Church Slavonic; Church Slavic; Old Slavonic; Old Bulgarian; Old Church Slavonic","slavon liturgique; slavon d'église; vieux slave; vieux bulgare",chu,cu

-Chuukese,chuuk,chk,

-Chuvash,tchouvache,chv,cv

-"Classical Nepal Bhasa; Classical Newari; Old Newari","newari classique",nwc,

-"Classical Newari; Old Newari; Classical Nepal Bhasa","newari classique",nwc,

-Coptic,copte,cop,

-Cornish,cornique,cor,kw

-Corsican,corse,cos,co

-Cree,cree,cre,cr

-Creek,muskogee,mus,

-"Creoles and pidgins (Other)","créoles et pidgins divers",crp,

-"Creoles and pidgins, English-based (Other)","créoles et pidgins anglais, autres",cpe,

-"Creoles and pidgins, French-based (Other)","créoles et pidgins français, autres",cpf,

-"Creoles and pidgins, Portuguese-based (Other)","créoles et pidgins portugais, autres",cpp,

-"Crimean Tatar; Crimean Turkish","tatar de Crimé",crh,

-"Crimean Turkish; Crimean Tatar","tatar de Crimé",crh,

-Croatian,croate,scr/hrv,hr

-"Cushitic (Other)","couchitiques, autres langues",cus,

-Czech,tchèque,cze/ces,cs

-Dakota,dakota,dak,

-Danish,danois,dan,da

-Dargwa,dargwa,dar,

-Dayak,dayak,day,

-Delaware,delaware,del,

-Dinka,dinka,din,

-Divehi,maldivien,div,dv

-Dogri,dogri,doi,

-Dogrib,dogrib,dgr,

-"Dravidian (Other)","dravidiennes, autres langues",dra,

-Duala,douala,dua,

-"Dutch; Flemish","néerlandais; flamand",dut/nld,nl

-"Dutch, Middle (ca. 1050-1350)","néerlandais moyen (ca. 1050-1350)",dum,

-Dyula,dioula,dyu,

-Dzongkha,dzongkha,dzo,dz

-Efik,efik,efi,

-"Egyptian (Ancient)",égyptien,egy,

-Ekajuk,ekajuk,eka,

-Elamite,élamite,elx,

-English,anglais,eng,en

-"English, Middle (1100-1500)","anglais moyen (1100-1500)",enm,

-"English, Old (ca.450-1100)","anglo-saxon (ca.450-1100)",ang,

-Erzya,erza,myv,

-Esperanto,espéranto,epo,eo

-Estonian,estonien,est,et

-Ewe,éwé,ewe,ee

-Ewondo,éwondo,ewo,

-Fang,fang,fan,

-Fanti,fanti,fat,

-Faroese,féroïen,fao,fo

-Fijian,fidjien,fij,fj

-Finnish,finnois,fin,fi

-"Finno-Ugrian (Other)","finno-ougriennes, autres langues",fiu,

-"Flemish; Dutch","flamand; néerlandais",dut/nld,nl

-Fon,fon,fon,

-French,français,fre/fra,fr

-"French, Middle (ca.1400-1600)","français moyen (1400-1600)",frm,

-"French, Old (842-ca.1400)","français ancien (842-ca.1400)",fro,

-Frisian,frison,fry,fy

-Friulian,frioulan,fur,

-Fulah,peul,ful,ff

-"Gaelic; Scottish Gaelic","gaélique; gaélique écossais",gla,gd

-Gallegan,galicien,glg,gl

-Ganda,ganda,lug,lg

-Gayo,gayo,gay,

-Gbaya,gbaya,gba,

-Geez,guèze,gez,

-Georgian,géorgien,geo/kat,ka

-German,allemand,ger/deu,de

-"German, Low; Saxon, Low; Low German; Low Saxon","allemand, bas; saxon, bas; bas allemand; bas saxon",nds,

-"German, Middle High (ca.1050-1500)","allemand, moyen haut (ca. 1050-1500)",gmh,

-"German, Old High (ca.750-1050)","allemand, vieux haut (ca. 750-1050)",goh,

-"Germanic (Other)","germaniques, autres langues",gem,

-"Gikuyu; Kikuyu",kikuyu,kik,ki

-Gilbertese,kiribati,gil,

-Gondi,gond,gon,

-Gorontalo,gorontalo,gor,

-Gothic,gothique,got,

-Grebo,grebo,grb,

-"Greek, Ancient (to 1453)","grec ancien (jusqu'à 1453)",grc,

-"Greek, Modern (1453-)","grec moderne (après 1453)",gre/ell,el

-"Greenlandic; Kalaallisut",groenlandais,kal,kl

-Guarani,guarani,grn,gn

-Gujarati,goudjrati,guj,gu

-Gwich´in,gwich´in,gwi,

-Haida,haida,hai,

-"Haitian; Haitian Creole","haïtien; créole haïtien",hat,ht

-"Haitian Creole; Haitian","créole haïtien; haïtien",hat,ht

-Hausa,haoussa,hau,ha

-Hawaiian,hawaïen,haw,

-Hebrew,hébreu,heb,he

-Herero,herero,her,hz

-Hiligaynon,hiligaynon,hil,

-Himachali,himachali,him,

-Hindi,hindi,hin,hi

-"Hiri Motu","hiri motu",hmo,ho

-Hittite,hittite,hit,

-Hmong,hmong,hmn,

-Hungarian,hongrois,hun,hu

-Hupa,hupa,hup,

-Icelandic,islandais,ice/isl,is

-Ido,ido,ido,io

-Igbo,igbo,ibo,ig

-Ijo,ijo,ijo,

-Iloko,ilocano,ilo,

-"Inari Sami","sami d'Inari",smn,

-"Indic (Other)","indo-aryennes, autres langues",inc,

-"Indo-European (Other)","indo-européennes, autres langues",ine,

-Indonesian,indonésien,ind,id

-Ingush,ingouche,inh,

-"Interlingua (International Auxiliary Language Association)","interlingua (langue auxiliaire internationale)",ina,ia

-Interlingue,interlingue,ile,ie

-Inuktitut,inuktitut,iku,iu

-Inupiaq,inupiaq,ipk,ik

-"Iranian (Other)","iraniennes, autres langues",ira,

-Irish,irlandais,gle,ga

-"Irish, Middle (900-1200)","irlandais moyen (900-1200)",mga,

-"Irish, Old (to 900)","irlandais ancien (jusqu'à 900)",sga,

-"Iroquoian languages","iroquoises, langues (famille)",iro,

-Italian,italien,ita,it

-Japanese,japonais,jpn,ja

-Javanese,javanais,jav,jv

-Judeo-Arabic,judéo-arabe,jrb,

-Judeo-Persian,judéo-persan,jpr,

-Kabyle,kabyle,kab,

-Kachin,kachin,kac,

-"Kalaallisut; Greenlandic",groenlandais,kal,kl

-Kalmyk,kalmouk,xal,

-Kamba,kamba,kam,

-Kannada,kannada,kan,kn

-Kanuri,kanouri,kau,kr

-Karachay-Balkar,"karatchaï balkar",krc,

-Kara-Kalpak,karakalpak,kaa,

-Karen,karen,kar,

-Kashmiri,kashmiri,kas,ks

-Kashubian,kachoube,csb,

-Kawi,kawi,kaw,

-Kazakh,kazakh,kaz,kk

-Khasi,khasi,kha,

-Khmer,khmer,khm,km

-"Khoisan (Other)","khoisan, autres langues",khi,

-Khotanese,khotanais,kho,

-"Kikuyu; Gikuyu",kikuyu,kik,ki

-Kimbundu,kimbundu,kmb,

-Kinyarwanda,rwanda,kin,rw

-Kirghiz,kirghize,kir,ky

-"Klingon; tlhlngan-Hol",klingon,tlh,

-Komi,komi,kom,kv

-Kongo,kongo,kon,kg

-Konkani,konkani,kok,

-Korean,coréen,kor,ko

-Kosraean,kosrae,kos,

-Kpelle,kpellé,kpe,

-Kru,krou,kro,

-"Kuanyama; Kwanyama","kuanyama; kwanyama",kua,kj

-Kumyk,koumyk,kum,

-Kurdish,kurde,kur,ku

-Kurukh,kurukh,kru,

-Kutenai,kutenai,kut,

-"Kwanyama, Kuanyama","kwanyama; kuanyama",kua,kj

-Ladino,judéo-espagnol,lad,

-Lahnda,lahnda,lah,

-Lamba,lamba,lam,

-Lao,lao,lao,lo

-Latin,latin,lat,la

-Latvian,letton,lav,lv

-"Letzeburgesch; Luxembourgish",luxembourgeois,ltz,lb

-Lezghian,lezghien,lez,

-"Limburgan; Limburger; Limburgish",limbourgeois,lim,li

-"Limburger; Limburgan; Limburgish;",limbourgeois,lim,li

-"Limburgish; Limburger; Limburgan",limbourgeois,lim,li

-Lingala,lingala,lin,ln

-Lithuanian,lituanien,lit,lt

-Lojban,lojban,jbo,

-"Low German; Low Saxon; German, Low; Saxon, Low","bas allemand; bas saxon; allemand, bas; saxon, bas",nds,

-"Low Saxon; Low German; Saxon, Low; German, Low","bas saxon; bas allemand; saxon, bas; allemand, bas",nds,

-"Lower Sorbian",bas-sorabe,dsb,

-Lozi,lozi,loz,

-Luba-Katanga,luba-katanga,lub,lu

-Luba-Lulua,luba-lulua,lua,

-Luiseno,luiseno,lui,

-"Lule Sami","sami de Lule",smj,

-Lunda,lunda,lun,

-"Luo (Kenya and Tanzania)","luo (Kenya et Tanzanie)",luo,

-Lushai,lushai,lus,

-"Luxembourgish; Letzeburgesch",luxembourgeois,ltz,lb

-Macedonian,macédonien,mac/mkd,mk

-Madurese,madourais,mad,

-Magahi,magahi,mag,

-Maithili,maithili,mai,

-Makasar,makassar,mak,

-Malagasy,malgache,mlg,mg

-Malay,malais,may/msa,ms

-Malayalam,malayalam,mal,ml

-Maltese,maltais,mlt,mt

-Manchu,mandchou,mnc,

-Mandar,mandar,mdr,

-Mandingo,mandingue,man,

-Manipuri,manipuri,mni,

-"Manobo languages","manobo, langues",mno,

-Manx,"manx; mannois",glv,gv

-Maori,maori,mao/mri,mi

-Marathi,marathe,mar,mr

-Mari,mari,chm,

-Marshallese,marshall,mah,mh

-Marwari,marvari,mwr,

-Masai,massaï,mas,

-"Mayan languages","maya, langues",myn,

-Mende,mendé,men,

-Micmac,micmac,mic,

-Minangkabau,minangkabau,min,

-"Miscellaneous languages","diverses, langues",mis,

-Mohawk,mohawk,moh,

-Moksha,moksa,mdf,

-Moldavian,moldave,mol,mo

-"Mon-Khmer (Other)","môn-khmer, autres langues",mkh,

-Mongo,mongo,lol,

-Mongolian,mongol,mon,mn

-Mossi,moré,mos,

-"Multiple languages",multilingue,mul,

-"Munda languages","mounda, langues",mun,

-Nahuatl,nahuatl,nah,

-Nauru,nauruan,nau,na

-"Navaho, Navajo",navaho,nav,nv

-"Navajo; Navaho",navaho,nav,nv

-"Ndebele, North","ndébélé du Nord",nde,nd

-"Ndebele, South","ndébélé du Sud",nbl,nr

-Ndonga,ndonga,ndo,ng

-Neapolitan,napolitain,nap,

-"Nepal Bhasa ; Newari","nepal bhasa ; newari",new,

-Nepali,népalais,nep,ne

-"Newari; Nepal Bhasa","newari; nepal bhasa",new,

-Nias,nias,nia,

-"Niger-Kordofanian (Other)","nigéro-congolaises, autres langues",nic,

-"Nilo-Saharan (Other)","nilo-sahariennes, autres langues",ssa,

-Niuean,niué,niu,

-Nogai,"nogaï; nogay",nog,

-"Norse, Old","norrois, vieux",non,

-"North American Indian (Other)","indiennes d'Amérique du Nord, autres langues",nai,

-"Northern Sami","sami du Nord",sme,se

-"North Ndebele","ndébélé du Nord",nde,nd

-Norwegian,norvégien,nor,no

-"Norwegian Bokmål; Bokmål, Norwegian","norvégien bokmål; bokmål, norvégien",nob,nb

-"Norwegian Nynorsk; Nynorsk, Norwegian","norvégien nynorsk; nynorsk, norvégien",nno,nn

-"Nubian languages","nubiennes, langues",nub,

-Nyamwezi,nyamwezi,nym,

-"Nyanja; Chichewa; Chewa","nyanja; chichewa; chewa",nya,ny

-Nyankole,nyankolé,nyn,

-"Nynorsk, Norwegian; Norwegian Nynorsk","nynorsk, norvégien; norvégien nynorsk",nno,nn

-Nyoro,nyoro,nyo,

-Nzima,nzema,nzi,

-"Occitan (post 1500); Provençal","occitan (après 1500); provençal",oci,oc

-Ojibwa,ojibwa,oji,oj

-"Old Bulgarian; Old Slavonic; Church Slavonic; Church Slavic; Old Church Slavonic","vieux bulgare; vieux slave; slavon liturgique; slavon d'église",chu,cu

-"Old Church Slavonic; Old Slavonic; Church Slavonic; Old Bulgarian; Church Slavic","vieux slave; slavon liturgique; vieux bulgare; slavon d'église",chu,cu

-"Old Newari; Classical Newari; Classical Nepal Bhasa","newari classique",nwc,

-"Old Slavonic; Church Slavonic; Old Bulgarian; Church Slavic; Old Church Slavonic","vieux slave; slavon liturgique; vieux bulgare; slavon d'église",chu,cu

-Oriya,oriya,ori,or

-Oromo,galla,orm,om

-Osage,osage,osa,

-"Ossetian; Ossetic",ossète,oss,os

-"Ossetic; Ossetian",ossète,oss,os

-"Otomian languages","otomangue, langues",oto,

-Pahlavi,pahlavi,pal,

-Palauan,palau,pau,

-Pali,pali,pli,pi

-Pampanga,pampangan,pam,

-Pangasinan,pangasinan,pag,

-"Panjabi; Punjabi",pendjabi,pan,pa

-Papiamento,papiamento,pap,

-"Papuan (Other)","papoues, autres langues",paa,

-Persian,persan,per/fas,fa

-"Persian, Old (ca.600-400 B.C.)","perse, vieux (ca. 600-400 av. J.-C.)",peo,

-"Philippine (Other)","philippines, autres langues",phi,

-Phoenician,phénicien,phn,

-Pohnpeian,pohnpei,pon,

-Polish,polonais,pol,pl

-Portuguese,portugais,por,pt

-"Prakrit languages",prâkrit,pra,

-"Provençal; Occitan (post 1500)","provençal; occitan (après 1500)",oci,oc

-"Provençal, Old (to 1500)","provençal ancien (jusqu'à 1500)",pro,

-"Punjabi; Panjabi",pendjabi,pan,pa

-Pushto,pachto,pus,ps

-Rajasthani,rajasthani,raj,

-Rapanui,rapanui,rap,

-Rarotongan,rarotonga,rar,

-"Reserved for local use","réservée à l'usage local",qaa-qtz,

-"Romance (Other)","romanes, autres langues",roa,

-Romanian,roumain,rum/ron,ro

-Romany,tsigane,rom,

-Rundi,rundi,run,rn

-Russian,russe,rus,ru

-"Salishan languages","salish, langues",sal,

-"Samaritan Aramaic",samaritain,sam,

-"Sami languages (Other)","sami, autres langues",smi,

-Samoan,samoan,smo,sm

-Sandawe,sandawe,sad,

-Sango,sango,sag,sg

-Sanskrit,sanskrit,san,sa

-Santali,santal,sat,

-Sardinian,sarde,srd,sc

-Sasak,sasak,sas,

-"Saxon, Low; German, Low; Low Saxon; Low German","saxon, bas; allemand, bas; bas saxon; bas allemand",nds,

-Scots,écossais,sco,

-"Scottish Gaelic; Gaelic","gaélique écossais; gaélique",gla,gd

-Selkup,selkoupe,sel,

-"Semitic (Other)","sémitiques, autres langues",sem,

-Serbian,serbe,scc/srp,sr

-Serer,sérère,srr,

-Shan,chan,shn,

-Shona,shona,sna,sn

-"Sichuan Yi","yi de Sichuan",iii,ii

-Sidamo,sidamo,sid,

-"Sign languages","langues des signes",sgn,

-Siksika,blackfoot,bla,

-Sindhi,sindhi,snd,sd

-Sinhalese,singhalais,sin,si

-"Sino-Tibetan (Other)","sino-tibétaines, autres langues",sit,

-"Siouan languages","sioux, langues",sio,

-"Skolt Sami","sami skolt",sms,

-"Slave (Athapascan)","esclave (athapascan)",den,

-"Slavic (Other)","slaves, autres langues",sla,

-Slovak,slovaque,slo/slk,sk

-Slovenian,slovène,slv,sl

-Sogdian,sogdien,sog,

-Somali,somali,som,so

-Songhai,songhai,son,

-Soninke,soninké,snk,

-"Sorbian languages","sorabes, langues",wen,

-"Sotho, Northern","sotho du Nord",nso,

-"Sotho, Southern","sotho du Sud",sot,st

-"South American Indian (Other)","indiennes d'Amérique du Sud, autres langues",sai,

-"Southern Sami","sami du Sud",sma,

-"South Ndebele","ndébélé du Sud",nbl,nr

-"Spanish; Castilian","espagnol; castillan",spa,es

-Sukuma,sukuma,suk,

-Sumerian,sumérien,sux,

-Sundanese,soundanais,sun,su

-Susu,soussou,sus,

-Swahili,swahili,swa,sw

-Swati,swati,ssw,ss

-Swedish,suédois,swe,sv

-Syriac,syriaque,syr,

-Tagalog,tagalog,tgl,tl

-Tahitian,tahitien,tah,ty

-"Tai (Other)","thaïes, autres langues",tai,

-Tajik,tadjik,tgk,tg

-Tamashek,tamacheq,tmh,

-Tamil,tamoul,tam,ta

-Tatar,tatar,tat,tt

-Telugu,télougou,tel,te

-Tereno,tereno,ter,

-Tetum,tetum,tet,

-Thai,thaï,tha,th

-Tibetan,tibétain,tib/bod,bo

-Tigre,tigré,tig,

-Tigrinya,tigrigna,tir,ti

-Timne,temne,tem,

-Tiv,tiv,tiv,

-"tlhlngan-Hol; Klingon",klingon,tlh,

-Tlingit,tlingit,tli,

-"Tok Pisin","tok pisin",tpi,

-Tokelau,tokelau,tkl,

-"Tonga (Nyasa)","tonga (Nyasa)",tog,

-"Tonga (Tonga Islands)","tongan (Îles Tonga)",ton,to

-Tsimshian,tsimshian,tsi,

-Tsonga,tsonga,tso,ts

-Tswana,tswana,tsn,tn

-Tumbuka,tumbuka,tum,

-"Tupi languages","tupi, langues",tup,

-Turkish,turc,tur,tr

-"Turkish, Ottoman (1500-1928)","turc ottoman (1500-1928)",ota,

-Turkmen,turkmène,tuk,tk

-Tuvalu,tuvalu,tvl,

-Tuvinian,touva,tyv,

-Twi,twi,twi,tw

-Udmurt,oudmourte,udm,

-Ugaritic,ougaritique,uga,

-Uighur,ouïgour,uig,ug

-Ukrainian,ukrainien,ukr,uk

-Umbundu,umbundu,umb,

-Undetermined,indéterminée,und,

-"Upper Sorbian",haut-sorabe,hsb,

-Urdu,ourdou,urd,ur

-Uzbek,ouszbek,uzb,uz

-Vai,vaï,vai,

-"Valencian; Catalan","valencien; catalan",cat,ca

-Venda,venda,ven,ve

-Vietnamese,vietnamien,vie,vi

-Volapük,volapük,vol,vo

-Votic,vote,vot,

-"Wakashan languages","wakashennes, langues",wak,

-Walamo,walamo,wal,

-Walloon,wallon,wln,wa

-Waray,waray,war,

-Washo,washo,was,

-Welsh,gallois,wel/cym,cy

-Wolof,wolof,wol,wo

-Xhosa,xhosa,xho,xh

-Yakut,iakoute,sah,

-Yao,yao,yao,

-Yapese,yapois,yap,

-Yiddish,yiddish,yid,yi

-Yoruba,yoruba,yor,yo

-"Yupik languages","yupik, langues",ypk,

-Zande,zandé,znd,

-Zapotec,zapotèque,zap,

-Zenaga,zenaga,zen,

-"Zhuang; Chuang","zhuang; chuang",zha,za

-Zulu,zoulou,zul,zu

-Zuni,zuni,zun,

+Abkhazian,abkhaze,abk,ab
+Achinese,aceh,ace,
+Acoli,acoli,ach,
+Adangme,adangme,ada,
+"Adygei; Adyghe",adyghé,ady,
+"Adyghe; Adygei",adygh,ady,
+Afar,afar,aar,aa
+Afrihili,afrihili,afh,
+Afrikaans,afrikaans,afr,af
+"Afro-Asiatic (Other)","afro-asiatiques, autres langues",afa,
+Akan,akan,aka,ak
+Akkadian,akkadien,akk,
+Albanian,albanais,alb/sqi,sq
+Aleut,aléoute,ale,
+"Algonquian languages","algonquines, langues",alg,
+"Altaic (Other)","altaïques, autres langues",tut,
+Amharic,amharique,amh,am
+"Apache languages",apache,apa,
+Arabic,arabe,ara,ar
+Aragonese,aragonais,arg,an
+Aramaic,araméen,arc,
+Arapaho,arapaho,arp,
+Araucanian,araucan,arn,
+Arawak,arawak,arw,
+Armenian,arménien,arm/hye,hy
+"Artificial (Other)","artificielles, autres langues",art,
+Assamese,assamais,asm,as
+"Asturian; Bable","asturien; bable",ast,
+"Athapascan languages","athapascanes, langues",ath,
+"Australian languages","australiennes, langues",aus,
+"Austronesian (Other)","malayo-polynésiennes, autres langues",map,
+Avaric,avar,ava,av
+Avestan,avestique,ave,ae
+Awadhi,awadhi,awa,
+Aymara,aymara,aym,ay
+Azerbaijani,azéri,aze,az
+"Bable; Asturian","bable; asturien",ast,
+Balinese,balinais,ban,
+"Baltic (Other)","baltiques, autres langues",bat,
+Baluchi,baloutchi,bal,
+Bambara,bambara,bam,bm
+"Bamileke languages","bamilékés, langues",bai,
+Banda,banda,bad,
+"Bantu (Other)","bantoues, autres langues",bnt,
+Basa,basa,bas,
+Bashkir,bachkir,bak,ba
+Basque,basque,baq/eus,eu
+"Batak (Indonesia)","batak (Indonésie)",btk,
+Beja,bedja,bej,
+Belarusian,biélorusse,bel,be
+Bemba,bemba,bem,
+Bengali,bengali,ben,bn
+"Berber (Other)","berbères, autres langues",ber,
+Bhojpuri,bhojpuri,bho,
+Bihari,bihari,bih,bh
+Bikol,bikol,bik,
+"Bilin; Blin","bilen; blin",byn,
+Bini,bini,bin,
+Bislama,bichlamar,bis,bi
+"Blin; Bilin","blin; bilen",byn,
+"Bokmål, Norwegian; Norwegian Bokmål","bokmål, norvégien; bokmål norvégien",nob,nb
+Bosnian,bosniaque,bos,bs
+Braj,braj,bra,
+Breton,breton,bre,br
+Buginese,bugi,bug,
+Bulgarian,bulgare,bul,bg
+Buriat,bouriate,bua,
+Burmese,birman,bur/mya,my
+Caddo,caddo,cad,
+Carib,caribe,car,
+"Castilian; Spanish","castillan; espagnol",spa,es
+"Catalan; Valencian","catalan; valencien",cat,ca
+"Caucasian (Other)","caucasiennes, autres langues",cau,
+Cebuano,cebuano,ceb,
+"Celtic (Other)","celtiques, autres langues",cel,
+"Central American Indian (Other)","indiennes d'Amérique centrale, autres langues",cai,
+Chagatai,djaghataï,chg,
+"Chamic languages","chames, langues",cmc,
+Chamorro,chamorro,cha,ch
+Chechen,tchétchène,che,ce
+Cherokee,cherokee,chr,
+"Chewa; Chichewa; Nyanja","chewa, chichewa, nyanja",nya,ny
+Cheyenne,cheyenne,chy,
+Chibcha,chibcha,chb,
+"Chichewa; Chewa; Nyanja","chichewa; chewa; nyanja",nya,ny
+Chinese,chinois,chi/zho,zh
+"Chinook jargon","chinook, jargon",chn,
+Chipewyan,chipewyan,chp,
+Choctaw,choctaw,cho,
+"Chuang; Zhuang","chuang; zhuang",zha,za
+"Church Slavic; Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic","slavon d'église; vieux slave; slavon liturgique; vieux bulgare",chu,cu
+"Church Slavonic; Church Slavic; Old Slavonic; Old Bulgarian; Old Church Slavonic","slavon liturgique; slavon d'église; vieux slave; vieux bulgare",chu,cu
+Chuukese,chuuk,chk,
+Chuvash,tchouvache,chv,cv
+"Classical Nepal Bhasa; Classical Newari; Old Newari","newari classique",nwc,
+"Classical Newari; Old Newari; Classical Nepal Bhasa","newari classique",nwc,
+Coptic,copte,cop,
+Cornish,cornique,cor,kw
+Corsican,corse,cos,co
+Cree,cree,cre,cr
+Creek,muskogee,mus,
+"Creoles and pidgins (Other)","créoles et pidgins divers",crp,
+"Creoles and pidgins, English-based (Other)","créoles et pidgins anglais, autres",cpe,
+"Creoles and pidgins, French-based (Other)","créoles et pidgins français, autres",cpf,
+"Creoles and pidgins, Portuguese-based (Other)","créoles et pidgins portugais, autres",cpp,
+"Crimean Tatar; Crimean Turkish","tatar de Crimé",crh,
+"Crimean Turkish; Crimean Tatar","tatar de Crimé",crh,
+Croatian,croate,scr/hrv,hr
+"Cushitic (Other)","couchitiques, autres langues",cus,
+Czech,tchèque,cze/ces,cs
+Dakota,dakota,dak,
+Danish,danois,dan,da
+Dargwa,dargwa,dar,
+Dayak,dayak,day,
+Delaware,delaware,del,
+Dinka,dinka,din,
+Divehi,maldivien,div,dv
+Dogri,dogri,doi,
+Dogrib,dogrib,dgr,
+"Dravidian (Other)","dravidiennes, autres langues",dra,
+Duala,douala,dua,
+"Dutch; Flemish","néerlandais; flamand",dut/nld,nl
+"Dutch, Middle (ca. 1050-1350)","néerlandais moyen (ca. 1050-1350)",dum,
+Dyula,dioula,dyu,
+Dzongkha,dzongkha,dzo,dz
+Efik,efik,efi,
+"Egyptian (Ancient)",égyptien,egy,
+Ekajuk,ekajuk,eka,
+Elamite,élamite,elx,
+English,anglais,eng,en
+"English, Middle (1100-1500)","anglais moyen (1100-1500)",enm,
+"English, Old (ca.450-1100)","anglo-saxon (ca.450-1100)",ang,
+Erzya,erza,myv,
+Esperanto,espéranto,epo,eo
+Estonian,estonien,est,et
+Ewe,éwé,ewe,ee
+Ewondo,éwondo,ewo,
+Fang,fang,fan,
+Fanti,fanti,fat,
+Faroese,féroïen,fao,fo
+Fijian,fidjien,fij,fj
+Finnish,finnois,fin,fi
+"Finno-Ugrian (Other)","finno-ougriennes, autres langues",fiu,
+"Flemish; Dutch","flamand; néerlandais",dut/nld,nl
+Fon,fon,fon,
+French,français,fre/fra,fr
+"French, Middle (ca.1400-1600)","français moyen (1400-1600)",frm,
+"French, Old (842-ca.1400)","français ancien (842-ca.1400)",fro,
+Frisian,frison,fry,fy
+Friulian,frioulan,fur,
+Fulah,peul,ful,ff
+"Gaelic; Scottish Gaelic","gaélique; gaélique écossais",gla,gd
+Gallegan,galicien,glg,gl
+Ganda,ganda,lug,lg
+Gayo,gayo,gay,
+Gbaya,gbaya,gba,
+Geez,guèze,gez,
+Georgian,géorgien,geo/kat,ka
+German,allemand,ger/deu,de
+"German, Low; Saxon, Low; Low German; Low Saxon","allemand, bas; saxon, bas; bas allemand; bas saxon",nds,
+"German, Middle High (ca.1050-1500)","allemand, moyen haut (ca. 1050-1500)",gmh,
+"German, Old High (ca.750-1050)","allemand, vieux haut (ca. 750-1050)",goh,
+"Germanic (Other)","germaniques, autres langues",gem,
+"Gikuyu; Kikuyu",kikuyu,kik,ki
+Gilbertese,kiribati,gil,
+Gondi,gond,gon,
+Gorontalo,gorontalo,gor,
+Gothic,gothique,got,
+Grebo,grebo,grb,
+"Greek, Ancient (to 1453)","grec ancien (jusqu'à 1453)",grc,
+"Greek, Modern (1453-)","grec moderne (après 1453)",gre/ell,el
+"Greenlandic; Kalaallisut",groenlandais,kal,kl
+Guarani,guarani,grn,gn
+Gujarati,goudjrati,guj,gu
+Gwich´in,gwich´in,gwi,
+Haida,haida,hai,
+"Haitian; Haitian Creole","haïtien; créole haïtien",hat,ht
+"Haitian Creole; Haitian","créole haïtien; haïtien",hat,ht
+Hausa,haoussa,hau,ha
+Hawaiian,hawaïen,haw,
+Hebrew,hébreu,heb,he
+Herero,herero,her,hz
+Hiligaynon,hiligaynon,hil,
+Himachali,himachali,him,
+Hindi,hindi,hin,hi
+"Hiri Motu","hiri motu",hmo,ho
+Hittite,hittite,hit,
+Hmong,hmong,hmn,
+Hungarian,hongrois,hun,hu
+Hupa,hupa,hup,
+Icelandic,islandais,ice/isl,is
+Ido,ido,ido,io
+Igbo,igbo,ibo,ig
+Ijo,ijo,ijo,
+Iloko,ilocano,ilo,
+"Inari Sami","sami d'Inari",smn,
+"Indic (Other)","indo-aryennes, autres langues",inc,
+"Indo-European (Other)","indo-européennes, autres langues",ine,
+Indonesian,indonésien,ind,id
+Ingush,ingouche,inh,
+"Interlingua (International Auxiliary Language Association)","interlingua (langue auxiliaire internationale)",ina,ia
+Interlingue,interlingue,ile,ie
+Inuktitut,inuktitut,iku,iu
+Inupiaq,inupiaq,ipk,ik
+"Iranian (Other)","iraniennes, autres langues",ira,
+Irish,irlandais,gle,ga
+"Irish, Middle (900-1200)","irlandais moyen (900-1200)",mga,
+"Irish, Old (to 900)","irlandais ancien (jusqu'à 900)",sga,
+"Iroquoian languages","iroquoises, langues (famille)",iro,
+Italian,italien,ita,it
+Japanese,japonais,jpn,ja
+Javanese,javanais,jav,jv
+Judeo-Arabic,judéo-arabe,jrb,
+Judeo-Persian,judéo-persan,jpr,
+Kabyle,kabyle,kab,
+Kachin,kachin,kac,
+"Kalaallisut; Greenlandic",groenlandais,kal,kl
+Kalmyk,kalmouk,xal,
+Kamba,kamba,kam,
+Kannada,kannada,kan,kn
+Kanuri,kanouri,kau,kr
+Karachay-Balkar,"karatchaï balkar",krc,
+Kara-Kalpak,karakalpak,kaa,
+Karen,karen,kar,
+Kashmiri,kashmiri,kas,ks
+Kashubian,kachoube,csb,
+Kawi,kawi,kaw,
+Kazakh,kazakh,kaz,kk
+Khasi,khasi,kha,
+Khmer,khmer,khm,km
+"Khoisan (Other)","khoisan, autres langues",khi,
+Khotanese,khotanais,kho,
+"Kikuyu; Gikuyu",kikuyu,kik,ki
+Kimbundu,kimbundu,kmb,
+Kinyarwanda,rwanda,kin,rw
+Kirghiz,kirghize,kir,ky
+"Klingon; tlhlngan-Hol",klingon,tlh,
+Komi,komi,kom,kv
+Kongo,kongo,kon,kg
+Konkani,konkani,kok,
+Korean,coréen,kor,ko
+Kosraean,kosrae,kos,
+Kpelle,kpellé,kpe,
+Kru,krou,kro,
+"Kuanyama; Kwanyama","kuanyama; kwanyama",kua,kj
+Kumyk,koumyk,kum,
+Kurdish,kurde,kur,ku
+Kurukh,kurukh,kru,
+Kutenai,kutenai,kut,
+"Kwanyama, Kuanyama","kwanyama; kuanyama",kua,kj
+Ladino,judéo-espagnol,lad,
+Lahnda,lahnda,lah,
+Lamba,lamba,lam,
+Lao,lao,lao,lo
+Latin,latin,lat,la
+Latvian,letton,lav,lv
+"Letzeburgesch; Luxembourgish",luxembourgeois,ltz,lb
+Lezghian,lezghien,lez,
+"Limburgan; Limburger; Limburgish",limbourgeois,lim,li
+"Limburger; Limburgan; Limburgish;",limbourgeois,lim,li
+"Limburgish; Limburger; Limburgan",limbourgeois,lim,li
+Lingala,lingala,lin,ln
+Lithuanian,lituanien,lit,lt
+Lojban,lojban,jbo,
+"Low German; Low Saxon; German, Low; Saxon, Low","bas allemand; bas saxon; allemand, bas; saxon, bas",nds,
+"Low Saxon; Low German; Saxon, Low; German, Low","bas saxon; bas allemand; saxon, bas; allemand, bas",nds,
+"Lower Sorbian",bas-sorabe,dsb,
+Lozi,lozi,loz,
+Luba-Katanga,luba-katanga,lub,lu
+Luba-Lulua,luba-lulua,lua,
+Luiseno,luiseno,lui,
+"Lule Sami","sami de Lule",smj,
+Lunda,lunda,lun,
+"Luo (Kenya and Tanzania)","luo (Kenya et Tanzanie)",luo,
+Lushai,lushai,lus,
+"Luxembourgish; Letzeburgesch",luxembourgeois,ltz,lb
+Macedonian,macédonien,mac/mkd,mk
+Madurese,madourais,mad,
+Magahi,magahi,mag,
+Maithili,maithili,mai,
+Makasar,makassar,mak,
+Malagasy,malgache,mlg,mg
+Malay,malais,may/msa,ms
+Malayalam,malayalam,mal,ml
+Maltese,maltais,mlt,mt
+Manchu,mandchou,mnc,
+Mandar,mandar,mdr,
+Mandingo,mandingue,man,
+Manipuri,manipuri,mni,
+"Manobo languages","manobo, langues",mno,
+Manx,"manx; mannois",glv,gv
+Maori,maori,mao/mri,mi
+Marathi,marathe,mar,mr
+Mari,mari,chm,
+Marshallese,marshall,mah,mh
+Marwari,marvari,mwr,
+Masai,massaï,mas,
+"Mayan languages","maya, langues",myn,
+Mende,mendé,men,
+Micmac,micmac,mic,
+Minangkabau,minangkabau,min,
+"Miscellaneous languages","diverses, langues",mis,
+Mohawk,mohawk,moh,
+Moksha,moksa,mdf,
+Moldavian,moldave,mol,mo
+"Mon-Khmer (Other)","môn-khmer, autres langues",mkh,
+Mongo,mongo,lol,
+Mongolian,mongol,mon,mn
+Mossi,moré,mos,
+"Multiple languages",multilingue,mul,
+"Munda languages","mounda, langues",mun,
+Nahuatl,nahuatl,nah,
+Nauru,nauruan,nau,na
+"Navaho, Navajo",navaho,nav,nv
+"Navajo; Navaho",navaho,nav,nv
+"Ndebele, North","ndébélé du Nord",nde,nd
+"Ndebele, South","ndébélé du Sud",nbl,nr
+Ndonga,ndonga,ndo,ng
+Neapolitan,napolitain,nap,
+"Nepal Bhasa ; Newari","nepal bhasa ; newari",new,
+Nepali,népalais,nep,ne
+"Newari; Nepal Bhasa","newari; nepal bhasa",new,
+Nias,nias,nia,
+"Niger-Kordofanian (Other)","nigéro-congolaises, autres langues",nic,
+"Nilo-Saharan (Other)","nilo-sahariennes, autres langues",ssa,
+Niuean,niué,niu,
+Nogai,"nogaï; nogay",nog,
+"Norse, Old","norrois, vieux",non,
+"North American Indian (Other)","indiennes d'Amérique du Nord, autres langues",nai,
+"Northern Sami","sami du Nord",sme,se
+"North Ndebele","ndébélé du Nord",nde,nd
+Norwegian,norvégien,nor,no
+"Norwegian Bokmål; Bokmål, Norwegian","norvégien bokmål; bokmål, norvégien",nob,nb
+"Norwegian Nynorsk; Nynorsk, Norwegian","norvégien nynorsk; nynorsk, norvégien",nno,nn
+"Nubian languages","nubiennes, langues",nub,
+Nyamwezi,nyamwezi,nym,
+"Nyanja; Chichewa; Chewa","nyanja; chichewa; chewa",nya,ny
+Nyankole,nyankolé,nyn,
+"Nynorsk, Norwegian; Norwegian Nynorsk","nynorsk, norvégien; norvégien nynorsk",nno,nn
+Nyoro,nyoro,nyo,
+Nzima,nzema,nzi,
+"Occitan (post 1500); Provençal","occitan (après 1500); provençal",oci,oc
+Ojibwa,ojibwa,oji,oj
+"Old Bulgarian; Old Slavonic; Church Slavonic; Church Slavic; Old Church Slavonic","vieux bulgare; vieux slave; slavon liturgique; slavon d'église",chu,cu
+"Old Church Slavonic; Old Slavonic; Church Slavonic; Old Bulgarian; Church Slavic","vieux slave; slavon liturgique; vieux bulgare; slavon d'église",chu,cu
+"Old Newari; Classical Newari; Classical Nepal Bhasa","newari classique",nwc,
+"Old Slavonic; Church Slavonic; Old Bulgarian; Church Slavic; Old Church Slavonic","vieux slave; slavon liturgique; vieux bulgare; slavon d'église",chu,cu
+Oriya,oriya,ori,or
+Oromo,galla,orm,om
+Osage,osage,osa,
+"Ossetian; Ossetic",ossète,oss,os
+"Ossetic; Ossetian",ossète,oss,os
+"Otomian languages","otomangue, langues",oto,
+Pahlavi,pahlavi,pal,
+Palauan,palau,pau,
+Pali,pali,pli,pi
+Pampanga,pampangan,pam,
+Pangasinan,pangasinan,pag,
+"Panjabi; Punjabi",pendjabi,pan,pa
+Papiamento,papiamento,pap,
+"Papuan (Other)","papoues, autres langues",paa,
+Persian,persan,per/fas,fa
+"Persian, Old (ca.600-400 B.C.)","perse, vieux (ca. 600-400 av. J.-C.)",peo,
+"Philippine (Other)","philippines, autres langues",phi,
+Phoenician,phénicien,phn,
+Pohnpeian,pohnpei,pon,
+Polish,polonais,pol,pl
+Portuguese,portugais,por,pt
+"Prakrit languages",prâkrit,pra,
+"Provençal; Occitan (post 1500)","provençal; occitan (après 1500)",oci,oc
+"Provençal, Old (to 1500)","provençal ancien (jusqu'à 1500)",pro,
+"Punjabi; Panjabi",pendjabi,pan,pa
+Pushto,pachto,pus,ps
+Rajasthani,rajasthani,raj,
+Rapanui,rapanui,rap,
+Rarotongan,rarotonga,rar,
+"Reserved for local use","réservée à l'usage local",qaa-qtz,
+"Romance (Other)","romanes, autres langues",roa,
+Romanian,roumain,rum/ron,ro
+Romany,tsigane,rom,
+Rundi,rundi,run,rn
+Russian,russe,rus,ru
+"Salishan languages","salish, langues",sal,
+"Samaritan Aramaic",samaritain,sam,
+"Sami languages (Other)","sami, autres langues",smi,
+Samoan,samoan,smo,sm
+Sandawe,sandawe,sad,
+Sango,sango,sag,sg
+Sanskrit,sanskrit,san,sa
+Santali,santal,sat,
+Sardinian,sarde,srd,sc
+Sasak,sasak,sas,
+"Saxon, Low; German, Low; Low Saxon; Low German","saxon, bas; allemand, bas; bas saxon; bas allemand",nds,
+Scots,écossais,sco,
+"Scottish Gaelic; Gaelic","gaélique écossais; gaélique",gla,gd
+Selkup,selkoupe,sel,
+"Semitic (Other)","sémitiques, autres langues",sem,
+Serbian,serbe,scc/srp,sr
+Serer,sérère,srr,
+Shan,chan,shn,
+Shona,shona,sna,sn
+"Sichuan Yi","yi de Sichuan",iii,ii
+Sidamo,sidamo,sid,
+"Sign languages","langues des signes",sgn,
+Siksika,blackfoot,bla,
+Sindhi,sindhi,snd,sd
+Sinhalese,singhalais,sin,si
+"Sino-Tibetan (Other)","sino-tibétaines, autres langues",sit,
+"Siouan languages","sioux, langues",sio,
+"Skolt Sami","sami skolt",sms,
+"Slave (Athapascan)","esclave (athapascan)",den,
+"Slavic (Other)","slaves, autres langues",sla,
+Slovak,slovaque,slo/slk,sk
+Slovenian,slovène,slv,sl
+Sogdian,sogdien,sog,
+Somali,somali,som,so
+Songhai,songhai,son,
+Soninke,soninké,snk,
+"Sorbian languages","sorabes, langues",wen,
+"Sotho, Northern","sotho du Nord",nso,
+"Sotho, Southern","sotho du Sud",sot,st
+"South American Indian (Other)","indiennes d'Amérique du Sud, autres langues",sai,
+"Southern Sami","sami du Sud",sma,
+"South Ndebele","ndébélé du Sud",nbl,nr
+"Spanish; Castilian","espagnol; castillan",spa,es
+Sukuma,sukuma,suk,
+Sumerian,sumérien,sux,
+Sundanese,soundanais,sun,su
+Susu,soussou,sus,
+Swahili,swahili,swa,sw
+Swati,swati,ssw,ss
+Swedish,suédois,swe,sv
+Syriac,syriaque,syr,
+Tagalog,tagalog,tgl,tl
+Tahitian,tahitien,tah,ty
+"Tai (Other)","thaïes, autres langues",tai,
+Tajik,tadjik,tgk,tg
+Tamashek,tamacheq,tmh,
+Tamil,tamoul,tam,ta
+Tatar,tatar,tat,tt
+Telugu,télougou,tel,te
+Tereno,tereno,ter,
+Tetum,tetum,tet,
+Thai,thaï,tha,th
+Tibetan,tibétain,tib/bod,bo
+Tigre,tigré,tig,
+Tigrinya,tigrigna,tir,ti
+Timne,temne,tem,
+Tiv,tiv,tiv,
+"tlhlngan-Hol; Klingon",klingon,tlh,
+Tlingit,tlingit,tli,
+"Tok Pisin","tok pisin",tpi,
+Tokelau,tokelau,tkl,
+"Tonga (Nyasa)","tonga (Nyasa)",tog,
+"Tonga (Tonga Islands)","tongan (Îles Tonga)",ton,to
+Tsimshian,tsimshian,tsi,
+Tsonga,tsonga,tso,ts
+Tswana,tswana,tsn,tn
+Tumbuka,tumbuka,tum,
+"Tupi languages","tupi, langues",tup,
+Turkish,turc,tur,tr
+"Turkish, Ottoman (1500-1928)","turc ottoman (1500-1928)",ota,
+Turkmen,turkmène,tuk,tk
+Tuvalu,tuvalu,tvl,
+Tuvinian,touva,tyv,
+Twi,twi,twi,tw
+Udmurt,oudmourte,udm,
+Ugaritic,ougaritique,uga,
+Uighur,ouïgour,uig,ug
+Ukrainian,ukrainien,ukr,uk
+Umbundu,umbundu,umb,
+Undetermined,indéterminée,und,
+"Upper Sorbian",haut-sorabe,hsb,
+Urdu,ourdou,urd,ur
+Uzbek,ouszbek,uzb,uz
+Vai,vaï,vai,
+"Valencian; Catalan","valencien; catalan",cat,ca
+Venda,venda,ven,ve
+Vietnamese,vietnamien,vie,vi
+Volapük,volapük,vol,vo
+Votic,vote,vot,
+"Wakashan languages","wakashennes, langues",wak,
+Walamo,walamo,wal,
+Walloon,wallon,wln,wa
+Waray,waray,war,
+Washo,washo,was,
+Welsh,gallois,wel/cym,cy
+Wolof,wolof,wol,wo
+Xhosa,xhosa,xho,xh
+Yakut,iakoute,sah,
+Yao,yao,yao,
+Yapese,yapois,yap,
+Yiddish,yiddish,yid,yi
+Yoruba,yoruba,yor,yo
+"Yupik languages","yupik, langues",ypk,
+Zande,zandé,znd,
+Zapotec,zapotèque,zap,
+Zenaga,zenaga,zen,
+"Zhuang; Chuang","zhuang; chuang",zha,za
+Zulu,zoulou,zul,zu
+Zuni,zuni,zun,