merge ^/branches/released .

author: marha <marha@users.sourceforge.net> 2011-05-18 07:55:12 +0000
committer: marha <marha@users.sourceforge.net> 2011-05-18 07:55:12 +0000
commit: 32a666fa1f26defd3b4e508b75f1acf6e2900a40 (patch)
tree: 9735440d047c660e4966060a3020e2cae419d77c
parent: ab5c2d2c78273ccdc7c9734bcba482a33fcf9652 (diff)
parent: 35484135119fcf55fe1cbb1fcdd0e035f581fcfb (diff)
download: vcxsrv-32a666fa1f26defd3b4e508b75f1acf6e2900a40.tar.gz
vcxsrv-32a666fa1f26defd3b4e508b75f1acf6e2900a40.tar.bz2
vcxsrv-32a666fa1f26defd3b4e508b75f1acf6e2900a40.zip
20 files changed, 1779 insertions, 1685 deletions
diff --git a/libX11/include/X11/Xlibint.h b/libX11/include/X11/Xlibint.h
index 0a4f75df8..a55938b5b 100644
--- a/libX11/include/X11/Xlibint.h
+++ b/libX11/include/X11/Xlibint.h
@@ -792,7 +792,7 @@ typedef int (*FreeModmapType) (
  */
 typedef struct _XFreeFuncs {
     FreeFuncType atoms;		/* _XFreeAtomTable */
-    FreeModmapType modifiermap;	/* XFreeModifierMap */
+    FreeModmapType modifiermap;	/* XFreeModifiermap */
     FreeFuncType key_bindings;	/* _XFreeKeyBindings */
     FreeFuncType context_db;	/* _XFreeContextDB */
     FreeFuncType defaultCCCs;	/* _XcmsFreeDefaultCCCs */
diff --git a/libX11/man/DisplayOfCCC.man b/libX11/man/DisplayOfCCC.man
index 8f2aad6ab..fef9fb919 100644
--- a/libX11/man/DisplayOfCCC.man
+++ b/libX11/man/DisplayOfCCC.man
@@ -1,188 +1,188 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
-.\"
-.\" Permission is hereby granted, free of charge, to any person obtaining
-.\" a copy of this software and associated documentation files (the
-.\" "Software"), to deal in the Software without restriction, including
-.\" without limitation the rights to use, copy, modify, merge, publish,
-.\" distribute, sublicense, and/or sell copies of the Software, and to
-.\" permit persons to whom the Software is furnished to do so, subject to
-.\" the following conditions:
-.\"
-.\" The above copyright notice and this permission notice shall be included
-.\" in all copies or substantial portions of the Software.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-.\" IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
-.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-.\" OTHER DEALINGS IN THE SOFTWARE.
-.\"
-.\" Except as contained in this notice, the name of the X Consortium shall
-.\" not be used in advertising or otherwise to promote the sale, use or
-.\" other dealings in this Software without prior written authorization
-.\" from the X Consortium.
-.\"
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
-.\" Digital Equipment Corporation
-.\"
-.\" Portions Copyright \(co 1990, 1991 by
-.\" Tektronix, Inc.
-.\"
-.\" Permission to use, copy, modify and distribute this documentation for
-.\" any purpose and without fee is hereby granted, provided that the above
-.\" copyright notice appears in all copies and that both that copyright notice
-.\" and this permission notice appear in all copies, and that the names of
-.\" Digital and Tektronix not be used in in advertising or publicity pertaining
-.\" to this documentation without specific, written prior permission.
-.\" Digital and Tektronix makes no representations about the suitability
-.\" of this documentation for any purpose.
-.\" It is provided ``as is'' without express or implied warranty.
-.\" 
-.\"
-.ds xT X Toolkit Intrinsics \- C Language Interface
-.ds xW Athena X Widgets \- C Language X Toolkit Interface
-.ds xL Xlib \- C Language X Interface
-.ds xC Inter-Client Communication Conventions Manual
-.na
-.de Ds
-.nf
-.\\$1D \\$2 \\$1
-.ft 1
-.\".ps \\n(PS
-.\".if \\n(VS>=40 .vs \\n(VSu
-.\".if \\n(VS<=39 .vs \\n(VSp
-..
-.de De
-.ce 0
-.if \\n(BD .DF
-.nr BD 0
-.in \\n(OIu
-.if \\n(TM .ls 2
-.sp \\n(DDu
-.fi
-..
-.de FD
-.LP
-.KS
-.TA .5i 3i
-.ta .5i 3i
-.nf
-..
-.de FN
-.fi
-.KE
-.LP
-..
-.de IN		\" send an index entry to the stderr
-..
-.de C{
-.KS
-.nf
-.D
-.\"
-.\"	choose appropriate monospace font
-.\"	the imagen conditional, 480,
-.\"	may be changed to L if LB is too
-.\"	heavy for your eyes...
-.\"
-.ie "\\*(.T"480" .ft L
-.el .ie "\\*(.T"300" .ft L
-.el .ie "\\*(.T"202" .ft PO
-.el .ie "\\*(.T"aps" .ft CW
-.el .ft R
-.ps \\n(PS
-.ie \\n(VS>40 .vs \\n(VSu
-.el .vs \\n(VSp
-..
-.de C}
-.DE
-.R
-..
-.de Pn
-.ie t \\$1\fB\^\\$2\^\fR\\$3
-.el \\$1\fI\^\\$2\^\fP\\$3
-..
-.de ZN
-.ie t \fB\^\\$1\^\fR\\$2
-.el \fI\^\\$1\^\fP\\$2
-..
-.de hN
-.ie t <\fB\\$1\fR>\\$2
-.el <\fI\\$1\fP>\\$2
-..
-.de NT
-.ne 7
-.ds NO Note
-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2
-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1
-.ie n .sp
-.el .sp 10p
-.TB
-.ce
-\\*(NO
-.ie n .sp
-.el .sp 5p
-.if '\\$1'C' .ce 99
-.if '\\$2'C' .ce 99
-.in +5n
-.ll -5n
-.R
-..
-.		\" Note End -- doug kraft 3/85
-.de NE
-.ce 0
-.in -5n
-.ll +5n
-.ie n .sp
-.el .sp 10p
-..
-.ny0
-.TH DisplayOfCCC __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
-.SH NAME
-DisplayOfCCC, VisualOfCCC, ScreenNumberOfCCC, ScreenWhitePointOfCCC, ClientWhitePointOfCCC \- Color Conversion Context macros
-.SH SYNTAX
-.HP
-Display *DisplayOfCCC\^(\^XcmsCCC \fIccc\fP\^); 
-.HP
-Visual *VisualOfCCC\^(\^XcmsCCC \fIccc\fP\^); 
-.HP
-int ScreenNumberOfCCC\^(\^XcmsCCC \fIccc\fP\^); 
-.HP
-XcmsColor *ScreenWhitePointOfCCC\^(\^XcmsCCC \fIccc\fP\^); 
-.HP
-XcmsColor *ClientWhitePointOfCCC\^(\^XcmsCCC \fIccc\fP\^); 
-.SH ARGUMENTS
-.IP \fIccc\fP 1i
-Specifies the CCC.
-.SH DESCRIPTION
-The
-.ZN DisplayOfCCC
-macro returns the display associated with the specified CCC.
-.LP
-The
-.ZN VisualOfCCC
-macro returns the visual associated with the specified CCC.
-.LP
-The
-.ZN ScreenNumberOfCCC
-macro returns the number of the screen associated with the specified CCC.
-.LP
-The
-.ZN ScreenWhitePointOfCCC
-macro returns the screen white point of the screen associated with
-the specified CCC.
-.LP
-The
-.ZN ClientWhitePointOfCC
-macro returns the client white point of the screen associated with
-the specified CCC.
-.SH "SEE ALSO"
-XcmsCCCOfColormap(__libmansuffix__),
-XcmsConvertColors(__libmansuffix__),
-XcmsCreateCCC(__libmansuffix__),
-XcmsDefaultCCC(__libmansuffix__),
-XcmsSetWhitePoint(__libmansuffix__)
-.br
-\fI\*(xL\fP
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+.\" OTHER DEALINGS IN THE SOFTWARE.
+.\"
+.\" Except as contained in this notice, the name of the X Consortium shall
+.\" not be used in advertising or otherwise to promote the sale, use or
+.\" other dealings in this Software without prior written authorization
+.\" from the X Consortium.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft 1
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de FD
+.LP
+.KS
+.TA .5i 3i
+.ta .5i 3i
+.nf
+..
+.de FN
+.fi
+.KE
+.LP
+..
+.de IN		\" send an index entry to the stderr
+..
+.de C{
+.KS
+.nf
+.D
+.\"
+.\"	choose appropriate monospace font
+.\"	the imagen conditional, 480,
+.\"	may be changed to L if LB is too
+.\"	heavy for your eyes...
+.\"
+.ie "\\*(.T"480" .ft L
+.el .ie "\\*(.T"300" .ft L
+.el .ie "\\*(.T"202" .ft PO
+.el .ie "\\*(.T"aps" .ft CW
+.el .ft R
+.ps \\n(PS
+.ie \\n(VS>40 .vs \\n(VSu
+.el .vs \\n(VSp
+..
+.de C}
+.DE
+.R
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.de NT
+.ne 7
+.ds NO Note
+.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2
+.if \\n(.$ .if !'\\$1'C' .ds NO \\$1
+.ie n .sp
+.el .sp 10p
+.TB
+.ce
+\\*(NO
+.ie n .sp
+.el .sp 5p
+.if '\\$1'C' .ce 99
+.if '\\$2'C' .ce 99
+.in +5n
+.ll -5n
+.R
+..
+.		\" Note End -- doug kraft 3/85
+.de NE
+.ce 0
+.in -5n
+.ll +5n
+.ie n .sp
+.el .sp 10p
+..
+.ny0
+.TH DisplayOfCCC __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+DisplayOfCCC, VisualOfCCC, ScreenNumberOfCCC, ScreenWhitePointOfCCC, ClientWhitePointOfCCC \- Color Conversion Context macros
+.SH SYNTAX
+.HP
+Display *DisplayOfCCC\^(\^XcmsCCC \fIccc\fP\^); 
+.HP
+Visual *VisualOfCCC\^(\^XcmsCCC \fIccc\fP\^); 
+.HP
+int ScreenNumberOfCCC\^(\^XcmsCCC \fIccc\fP\^); 
+.HP
+XcmsColor *ScreenWhitePointOfCCC\^(\^XcmsCCC \fIccc\fP\^); 
+.HP
+XcmsColor *ClientWhitePointOfCCC\^(\^XcmsCCC \fIccc\fP\^); 
+.SH ARGUMENTS
+.IP \fIccc\fP 1i
+Specifies the CCC.
+.SH DESCRIPTION
+The
+.ZN DisplayOfCCC
+macro returns the display associated with the specified CCC.
+.LP
+The
+.ZN VisualOfCCC
+macro returns the visual associated with the specified CCC.
+.LP
+The
+.ZN ScreenNumberOfCCC
+macro returns the number of the screen associated with the specified CCC.
+.LP
+The
+.ZN ScreenWhitePointOfCCC
+macro returns the screen white point of the screen associated with
+the specified CCC.
+.LP
+The
+.ZN ClientWhitePointOfCCC
+macro returns the client white point of the screen associated with
+the specified CCC.
+.SH "SEE ALSO"
+XcmsCCCOfColormap(__libmansuffix__),
+XcmsConvertColors(__libmansuffix__),
+XcmsCreateCCC(__libmansuffix__),
+XcmsDefaultCCC(__libmansuffix__),
+XcmsSetWhitePoint(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/Makefile.am b/libX11/man/Makefile.am
index 2b4bedadb..da08e230d 100644
--- a/libX11/man/Makefile.am
+++ b/libX11/man/Makefile.am
@@ -498,7 +498,7 @@ XChangeKeyboardMapping_shadows =            \
     XNewModifiermap                         \
     XInsertModifiermapEntry                 \
     XDeleteModifiermapEntry                 \
-    XFreeModifierMap                        \
+    XFreeModifiermap                        \
     XModifierKeymap
 
 XChangePointerControl_shadows =             \
diff --git a/libX11/man/XChangeKeyboardMapping.man b/libX11/man/XChangeKeyboardMapping.man
index d4bb9a02f..37ee0ba43 100644
--- a/libX11/man/XChangeKeyboardMapping.man
+++ b/libX11/man/XChangeKeyboardMapping.man
@@ -1,447 +1,447 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
-.\"
-.\" Permission is hereby granted, free of charge, to any person obtaining
-.\" a copy of this software and associated documentation files (the
-.\" "Software"), to deal in the Software without restriction, including
-.\" without limitation the rights to use, copy, modify, merge, publish,
-.\" distribute, sublicense, and/or sell copies of the Software, and to
-.\" permit persons to whom the Software is furnished to do so, subject to
-.\" the following conditions:
-.\"
-.\" The above copyright notice and this permission notice shall be included
-.\" in all copies or substantial portions of the Software.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-.\" IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
-.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-.\" OTHER DEALINGS IN THE SOFTWARE.
-.\"
-.\" Except as contained in this notice, the name of the X Consortium shall
-.\" not be used in advertising or otherwise to promote the sale, use or
-.\" other dealings in this Software without prior written authorization
-.\" from the X Consortium.
-.\"
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
-.\" Digital Equipment Corporation
-.\"
-.\" Portions Copyright \(co 1990, 1991 by
-.\" Tektronix, Inc.
-.\"
-.\" Permission to use, copy, modify and distribute this documentation for
-.\" any purpose and without fee is hereby granted, provided that the above
-.\" copyright notice appears in all copies and that both that copyright notice
-.\" and this permission notice appear in all copies, and that the names of
-.\" Digital and Tektronix not be used in in advertising or publicity pertaining
-.\" to this documentation without specific, written prior permission.
-.\" Digital and Tektronix makes no representations about the suitability
-.\" of this documentation for any purpose.
-.\" It is provided ``as is'' without express or implied warranty.
-.\" 
-.\"
-.ds xT X Toolkit Intrinsics \- C Language Interface
-.ds xW Athena X Widgets \- C Language X Toolkit Interface
-.ds xL Xlib \- C Language X Interface
-.ds xC Inter-Client Communication Conventions Manual
-.na
-.de Ds
-.nf
-.\\$1D \\$2 \\$1
-.ft 1
-.\".ps \\n(PS
-.\".if \\n(VS>=40 .vs \\n(VSu
-.\".if \\n(VS<=39 .vs \\n(VSp
-..
-.de De
-.ce 0
-.if \\n(BD .DF
-.nr BD 0
-.in \\n(OIu
-.if \\n(TM .ls 2
-.sp \\n(DDu
-.fi
-..
-.de FD
-.LP
-.KS
-.TA .5i 3i
-.ta .5i 3i
-.nf
-..
-.de FN
-.fi
-.KE
-.LP
-..
-.de IN		\" send an index entry to the stderr
-..
-.de C{
-.KS
-.nf
-.D
-.\"
-.\"	choose appropriate monospace font
-.\"	the imagen conditional, 480,
-.\"	may be changed to L if LB is too
-.\"	heavy for your eyes...
-.\"
-.ie "\\*(.T"480" .ft L
-.el .ie "\\*(.T"300" .ft L
-.el .ie "\\*(.T"202" .ft PO
-.el .ie "\\*(.T"aps" .ft CW
-.el .ft R
-.ps \\n(PS
-.ie \\n(VS>40 .vs \\n(VSu
-.el .vs \\n(VSp
-..
-.de C}
-.DE
-.R
-..
-.de Pn
-.ie t \\$1\fB\^\\$2\^\fR\\$3
-.el \\$1\fI\^\\$2\^\fP\\$3
-..
-.de ZN
-.ie t \fB\^\\$1\^\fR\\$2
-.el \fI\^\\$1\^\fP\\$2
-..
-.de hN
-.ie t <\fB\\$1\fR>\\$2
-.el <\fI\\$1\fP>\\$2
-..
-.de NT
-.ne 7
-.ds NO Note
-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2
-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1
-.ie n .sp
-.el .sp 10p
-.TB
-.ce
-\\*(NO
-.ie n .sp
-.el .sp 5p
-.if '\\$1'C' .ce 99
-.if '\\$2'C' .ce 99
-.in +5n
-.ll -5n
-.R
-..
-.		\" Note End -- doug kraft 3/85
-.de NE
-.ce 0
-.in -5n
-.ll +5n
-.ie n .sp
-.el .sp 10p
-..
-.ny0
-.TH XChangeKeyboardMapping __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
-.SH NAME
-XChangeKeyboardMapping, XGetKeyboardMapping, XDisplayKeycodes, XSetModifierMapping, XGetModifierMapping, XNewModifiermap, XInsertModifiermapEntry, XDeleteModifiermapEntry, XFreeModifierMap XModifierKeymap \- manipulate keyboard encoding and keyboard encoding structure
-.SH SYNTAX
-.HP
-int XChangeKeyboardMapping(\^Display *\fIdisplay\fP, int \fIfirst_keycode\fP,
-int \fIkeysyms_per_keycode\fP, KeySym *\fIkeysyms\fP, int \fInum_codes\fP\^); 
-.HP
-KeySym *XGetKeyboardMapping(\^Display *\fIdisplay\fP, KeyCode
-\fIfirst_keycode\fP, int \fIkeycode_count\fP, int
-*\fIkeysyms_per_keycode_return\fP\^); 
-.HP
-int XDisplayKeycodes\^(\^Display *\fIdisplay\fP\^, int
-*\fImin_keycodes_return\fP\^, int *\fImax_keycodes_return\fP\^); 
-.HP
-int XSetModifierMapping(\^Display *\fIdisplay\fP, XModifierKeymap
-*\fImodmap\fP\^); 
-.HP
-XModifierKeymap *XGetModifierMapping(\^Display *\fIdisplay\fP\^); 
-.HP
-XModifierKeymap *XNewModifiermap(\^int \fImax_keys_per_mod\fP\^); 
-.HP
-XModifierKeymap *XInsertModifiermapEntry\^(\^XModifierKeymap *\fImodmap\fP,
-KeyCode \fIkeycode_entry\fP, int \fImodifier\fP\^); 
-.HP
-XModifierKeymap *XDeleteModifiermapEntry\^(\^XModifierKeymap *\fImodmap\fP,
-KeyCode \fIkeycode_entry\fP, int \fImodifier\fP\^); 
-.HP
-int XFreeModifiermap(\^XModifierKeymap *\fImodmap\fP\^); 
-.SH ARGUMENTS
-.IP \fIdisplay\fP 1i
-Specifies the connection to the X server.
-.ds Kc changed or returned
-.IP \fIfirst_keycode\fP 1i
-Specifies the first KeyCode that is to be \*(Kc.
-.IP \fIkeycode_count\fP 1i
-Specifies the number of KeyCodes that are to be returned.
-.IP \fIkeycode_entry\fP 1i
-Specifies the KeyCode. 
-.IP \fIkeysyms\fP 1i
-Specifies an array of KeySyms.
-.IP \fIkeysyms_per_keycode\fP 1i
-Specifies the number of KeySyms per KeyCode.
-.IP \fIkeysyms_per_keycode_return\fP 1i
-Returns the number of KeySyms per KeyCode.
-.IP \fImax_keys_per_mod\fP 1i
-Specifies the number of KeyCode entries preallocated to the modifiers
-in the map.
-.IP \fImax_keycodes_return\fP 1i
-Returns the maximum number of KeyCodes.
-.IP \fImin_keycodes_return\fP 1i
-Returns the minimum number of KeyCodes.
-.IP \fImodifier\fP 1i
-Specifies the modifier.
-.IP \fImodmap\fP 1i
-Specifies the 
-.ZN XModifierKeymap
-structure.
-.IP \fInum_codes\fP 1i
-Specifies the number of KeyCodes that are to be changed.
-.SH DESCRIPTION
-The
-.ZN XChangeKeyboardMapping
-function defines the symbols for the specified number of KeyCodes
-starting with first_keycode.
-The symbols for KeyCodes outside this range remain unchanged.  
-The number of elements in keysyms must be:
-.LP
-.Ds
-num_codes * keysyms_per_keycode
-.De
-.LP
-The specified first_keycode must be greater than or equal to min_keycode 
-returned by
-.ZN XDisplayKeycodes ,
-or a 
-.ZN BadValue 
-error results.
-In addition, the following expression must be less than or equal to 
-max_keycode as returned by
-.ZN XDisplayKeycodes ,
-or a
-.ZN BadValue 
-error results:
-.LP
-.Ds
-first_keycode + num_codes \- 1
-.De
-.LP
-KeySym number N, counting from zero, for KeyCode K has the following index
-in keysyms, counting from zero: 
-.LP
-.Ds 
-(K \- first_keycode) * keysyms_per_keycode + N
-.De
-.LP
-The specified keysyms_per_keycode can be chosen arbitrarily by the client
-to be large enough to hold all desired symbols. 
-A special KeySym value of 
-.ZN NoSymbol 
-should be used to fill in unused elements 
-for individual KeyCodes.  
-It is legal for 
-.ZN NoSymbol 
-to appear in nontrailing positions
-of the effective list for a KeyCode.
-.ZN XChangeKeyboardMapping
-generates a 
-.ZN MappingNotify 
-event.
-.LP
-There is no requirement that the X server interpret this mapping. 
-It is merely stored for reading and writing by clients.
-.LP
-.ZN XChangeKeyboardMapping
-can generate
-.ZN BadAlloc 
-and
-.ZN BadValue 
-errors.
-.LP
-The
-.ZN XGetKeyboardMapping
-function returns the symbols for the specified number of KeyCodes
-starting with first_keycode.
-The value specified in first_keycode must be greater than 
-or equal to min_keycode as returned by
-.ZN XDisplayKeycodes ,
-or a
-.ZN BadValue 
-error results.
-In addition, the following expression must be less than or equal 
-to max_keycode as returned by
-.ZN XDisplayKeycodes :
-.LP
-.Ds 
-first_keycode + keycode_count \- 1
-.De
-.LP
-If this is not the case, a 
-.ZN BadValue 
-error results. 
-The number of elements in the KeySyms list is:
-.LP
-.Ds 
-keycode_count * keysyms_per_keycode_return
-.De
-.LP
-KeySym number N, counting from zero, for KeyCode K has the following index
-in the list, counting from zero: 
-.Ds
-(K \- first_code) * keysyms_per_code_return + N
-.De
-.LP
-The X server arbitrarily chooses the keysyms_per_keycode_return value 
-to be large enough to report all requested symbols. 
-A special KeySym value of 
-.ZN NoSymbol 
-is used to fill in unused elements for
-individual KeyCodes.
-To free the storage returned by 
-.ZN XGetKeyboardMapping ,
-use
-.ZN XFree .
-.LP
-.ZN XGetKeyboardMapping
-can generate a
-.ZN BadValue 
-error.
-.LP
-The
-.ZN XDisplayKeycodes
-function returns the min-keycodes and max-keycodes supported by the
-specified display.
-The minimum number of KeyCodes returned is never less than 8,
-and the maximum number of KeyCodes returned is never greater than 255.
-Not all KeyCodes in this range are required to have corresponding keys.
-.LP
-The
-.ZN XSetModifierMapping
-function specifies the KeyCodes of the keys (if any) that are to be used 
-as modifiers.
-If it succeeds,
-the X server generates a
-.ZN MappingNotify
-event, and
-.ZN XSetModifierMapping
-returns
-.ZN MappingSuccess .
-X permits at most 8 modifier keys.
-If more than 8 are specified in the
-.ZN XModifierKeymap
-structure, a
-.ZN BadLength
-error results.
-.LP
-The modifiermap member of the 
-.ZN XModifierKeymap
-structure contains 8 sets of max_keypermod KeyCodes, 
-one for each modifier in the order 
-.ZN Shift , 
-.ZN Lock , 
-.ZN Control , 
-.ZN Mod1 , 
-.ZN Mod2 , 
-.ZN Mod3 , 
-.ZN Mod4 , 
-and 
-.ZN Mod5 .
-Only nonzero KeyCodes have meaning in each set, 
-and zero KeyCodes are ignored.
-In addition, all of the nonzero KeyCodes must be in the range specified by 
-min_keycode and max_keycode in the 
-.ZN Display 
-structure,
-or a 
-.ZN BadValue 
-error results.
-.LP
-An X server can impose restrictions on how modifiers can be changed, 
-for example,
-if certain keys do not generate up transitions in hardware,
-if auto-repeat cannot be disabled on certain keys,
-or if multiple modifier keys are not supported.  
-If some such restriction is violated, 
-the status reply is
-.ZN MappingFailed ,
-and none of the modifiers are changed.
-If the new KeyCodes specified for a modifier differ from those
-currently defined and any (current or new) keys for that modifier are
-in the logically down state, 
-.ZN XSetModifierMapping
-returns
-.ZN MappingBusy , 
-and none of the modifiers is changed.
-.LP
-.ZN XSetModifierMapping
-can generate
-.ZN BadAlloc
-and 
-.ZN BadValue
-errors.
-.LP
-The
-.ZN XGetModifierMapping
-function returns a pointer to a newly created
-.ZN XModifierKeymap
-structure that contains the keys being used as modifiers.
-The structure should be freed after use by calling
-.ZN XFreeModifiermap .
-If only zero values appear in the set for any modifier, 
-that modifier is disabled.
-.LP
-The
-.ZN XNewModifiermap
-function returns a pointer to
-.ZN XModifierKeymap
-structure for later use.
-.LP
-The
-.ZN XInsertModifiermapEntry
-function adds the specified KeyCode to the set that controls the specified
-modifier and returns the resulting
-.ZN XModifierKeymap
-structure (expanded as needed).
-.LP
-The
-.ZN XDeleteModifiermapEntry
-function deletes the specified KeyCode from the set that controls the
-specified modifier and returns a pointer to the resulting
-.ZN XModifierKeymap
-structure.
-.LP
-The
-.ZN XFreeModifiermap
-function frees the specified
-.ZN XModifierKeymap
-structure.
-.SH STRUCTURES
-The
-.ZN XModifierKeymap
-structure contains:
-.LP
-.Ds 0
-.TA .5i 2.5i
-.ta .5i 2.5i
-typedef struct {
-	int max_keypermod;	/\&* This server's max number of keys per modifier */
-	KeyCode *modifiermap;	/\&* An 8 by max_keypermod array of the modifiers */
-} XModifierKeymap;
-.De
-.SH DIAGNOSTICS
-.TP 1i
-.ZN BadAlloc
-The server failed to allocate the requested resource or server memory.
-.TP 1i
-.ZN BadValue
-Some numeric value falls outside the range of values accepted by the request.
-Unless a specific range is specified for an argument, the full range defined
-by the argument's type is accepted.  Any argument defined as a set of
-alternatives can generate this error.
-.SH "SEE ALSO"
-XFree(__libmansuffix__),
-XSetPointerMapping(__libmansuffix__) 
-.br
-\fI\*(xL\fP
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+.\" OTHER DEALINGS IN THE SOFTWARE.
+.\"
+.\" Except as contained in this notice, the name of the X Consortium shall
+.\" not be used in advertising or otherwise to promote the sale, use or
+.\" other dealings in this Software without prior written authorization
+.\" from the X Consortium.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft 1
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de FD
+.LP
+.KS
+.TA .5i 3i
+.ta .5i 3i
+.nf
+..
+.de FN
+.fi
+.KE
+.LP
+..
+.de IN		\" send an index entry to the stderr
+..
+.de C{
+.KS
+.nf
+.D
+.\"
+.\"	choose appropriate monospace font
+.\"	the imagen conditional, 480,
+.\"	may be changed to L if LB is too
+.\"	heavy for your eyes...
+.\"
+.ie "\\*(.T"480" .ft L
+.el .ie "\\*(.T"300" .ft L
+.el .ie "\\*(.T"202" .ft PO
+.el .ie "\\*(.T"aps" .ft CW
+.el .ft R
+.ps \\n(PS
+.ie \\n(VS>40 .vs \\n(VSu
+.el .vs \\n(VSp
+..
+.de C}
+.DE
+.R
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.de NT
+.ne 7
+.ds NO Note
+.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2
+.if \\n(.$ .if !'\\$1'C' .ds NO \\$1
+.ie n .sp
+.el .sp 10p
+.TB
+.ce
+\\*(NO
+.ie n .sp
+.el .sp 5p
+.if '\\$1'C' .ce 99
+.if '\\$2'C' .ce 99
+.in +5n
+.ll -5n
+.R
+..
+.		\" Note End -- doug kraft 3/85
+.de NE
+.ce 0
+.in -5n
+.ll +5n
+.ie n .sp
+.el .sp 10p
+..
+.ny0
+.TH XChangeKeyboardMapping __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XChangeKeyboardMapping, XGetKeyboardMapping, XDisplayKeycodes, XSetModifierMapping, XGetModifierMapping, XNewModifiermap, XInsertModifiermapEntry, XDeleteModifiermapEntry, XFreeModifiermap, XModifierKeymap \- manipulate keyboard encoding and keyboard encoding structure
+.SH SYNTAX
+.HP
+int XChangeKeyboardMapping(\^Display *\fIdisplay\fP, int \fIfirst_keycode\fP,
+int \fIkeysyms_per_keycode\fP, KeySym *\fIkeysyms\fP, int \fInum_codes\fP\^); 
+.HP
+KeySym *XGetKeyboardMapping(\^Display *\fIdisplay\fP, KeyCode
+\fIfirst_keycode\fP, int \fIkeycode_count\fP, int
+*\fIkeysyms_per_keycode_return\fP\^); 
+.HP
+int XDisplayKeycodes\^(\^Display *\fIdisplay\fP\^, int
+*\fImin_keycodes_return\fP\^, int *\fImax_keycodes_return\fP\^); 
+.HP
+int XSetModifierMapping(\^Display *\fIdisplay\fP, XModifierKeymap
+*\fImodmap\fP\^); 
+.HP
+XModifierKeymap *XGetModifierMapping(\^Display *\fIdisplay\fP\^); 
+.HP
+XModifierKeymap *XNewModifiermap(\^int \fImax_keys_per_mod\fP\^); 
+.HP
+XModifierKeymap *XInsertModifiermapEntry\^(\^XModifierKeymap *\fImodmap\fP,
+KeyCode \fIkeycode_entry\fP, int \fImodifier\fP\^); 
+.HP
+XModifierKeymap *XDeleteModifiermapEntry\^(\^XModifierKeymap *\fImodmap\fP,
+KeyCode \fIkeycode_entry\fP, int \fImodifier\fP\^); 
+.HP
+int XFreeModifiermap(\^XModifierKeymap *\fImodmap\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.ds Kc changed or returned
+.IP \fIfirst_keycode\fP 1i
+Specifies the first KeyCode that is to be \*(Kc.
+.IP \fIkeycode_count\fP 1i
+Specifies the number of KeyCodes that are to be returned.
+.IP \fIkeycode_entry\fP 1i
+Specifies the KeyCode. 
+.IP \fIkeysyms\fP 1i
+Specifies an array of KeySyms.
+.IP \fIkeysyms_per_keycode\fP 1i
+Specifies the number of KeySyms per KeyCode.
+.IP \fIkeysyms_per_keycode_return\fP 1i
+Returns the number of KeySyms per KeyCode.
+.IP \fImax_keys_per_mod\fP 1i
+Specifies the number of KeyCode entries preallocated to the modifiers
+in the map.
+.IP \fImax_keycodes_return\fP 1i
+Returns the maximum number of KeyCodes.
+.IP \fImin_keycodes_return\fP 1i
+Returns the minimum number of KeyCodes.
+.IP \fImodifier\fP 1i
+Specifies the modifier.
+.IP \fImodmap\fP 1i
+Specifies the 
+.ZN XModifierKeymap
+structure.
+.IP \fInum_codes\fP 1i
+Specifies the number of KeyCodes that are to be changed.
+.SH DESCRIPTION
+The
+.ZN XChangeKeyboardMapping
+function defines the symbols for the specified number of KeyCodes
+starting with first_keycode.
+The symbols for KeyCodes outside this range remain unchanged.  
+The number of elements in keysyms must be:
+.LP
+.Ds
+num_codes * keysyms_per_keycode
+.De
+.LP
+The specified first_keycode must be greater than or equal to min_keycode 
+returned by
+.ZN XDisplayKeycodes ,
+or a 
+.ZN BadValue 
+error results.
+In addition, the following expression must be less than or equal to 
+max_keycode as returned by
+.ZN XDisplayKeycodes ,
+or a
+.ZN BadValue 
+error results:
+.LP
+.Ds
+first_keycode + num_codes \- 1
+.De
+.LP
+KeySym number N, counting from zero, for KeyCode K has the following index
+in keysyms, counting from zero: 
+.LP
+.Ds 
+(K \- first_keycode) * keysyms_per_keycode + N
+.De
+.LP
+The specified keysyms_per_keycode can be chosen arbitrarily by the client
+to be large enough to hold all desired symbols. 
+A special KeySym value of 
+.ZN NoSymbol 
+should be used to fill in unused elements 
+for individual KeyCodes.  
+It is legal for 
+.ZN NoSymbol 
+to appear in nontrailing positions
+of the effective list for a KeyCode.
+.ZN XChangeKeyboardMapping
+generates a 
+.ZN MappingNotify 
+event.
+.LP
+There is no requirement that the X server interpret this mapping. 
+It is merely stored for reading and writing by clients.
+.LP
+.ZN XChangeKeyboardMapping
+can generate
+.ZN BadAlloc 
+and
+.ZN BadValue 
+errors.
+.LP
+The
+.ZN XGetKeyboardMapping
+function returns the symbols for the specified number of KeyCodes
+starting with first_keycode.
+The value specified in first_keycode must be greater than 
+or equal to min_keycode as returned by
+.ZN XDisplayKeycodes ,
+or a
+.ZN BadValue 
+error results.
+In addition, the following expression must be less than or equal 
+to max_keycode as returned by
+.ZN XDisplayKeycodes :
+.LP
+.Ds 
+first_keycode + keycode_count \- 1
+.De
+.LP
+If this is not the case, a 
+.ZN BadValue 
+error results. 
+The number of elements in the KeySyms list is:
+.LP
+.Ds 
+keycode_count * keysyms_per_keycode_return
+.De
+.LP
+KeySym number N, counting from zero, for KeyCode K has the following index
+in the list, counting from zero: 
+.Ds
+(K \- first_code) * keysyms_per_code_return + N
+.De
+.LP
+The X server arbitrarily chooses the keysyms_per_keycode_return value 
+to be large enough to report all requested symbols. 
+A special KeySym value of 
+.ZN NoSymbol 
+is used to fill in unused elements for
+individual KeyCodes.
+To free the storage returned by 
+.ZN XGetKeyboardMapping ,
+use
+.ZN XFree .
+.LP
+.ZN XGetKeyboardMapping
+can generate a
+.ZN BadValue 
+error.
+.LP
+The
+.ZN XDisplayKeycodes
+function returns the min-keycodes and max-keycodes supported by the
+specified display.
+The minimum number of KeyCodes returned is never less than 8,
+and the maximum number of KeyCodes returned is never greater than 255.
+Not all KeyCodes in this range are required to have corresponding keys.
+.LP
+The
+.ZN XSetModifierMapping
+function specifies the KeyCodes of the keys (if any) that are to be used 
+as modifiers.
+If it succeeds,
+the X server generates a
+.ZN MappingNotify
+event, and
+.ZN XSetModifierMapping
+returns
+.ZN MappingSuccess .
+X permits at most 8 modifier keys.
+If more than 8 are specified in the
+.ZN XModifierKeymap
+structure, a
+.ZN BadLength
+error results.
+.LP
+The modifiermap member of the 
+.ZN XModifierKeymap
+structure contains 8 sets of max_keypermod KeyCodes, 
+one for each modifier in the order 
+.ZN Shift , 
+.ZN Lock , 
+.ZN Control , 
+.ZN Mod1 , 
+.ZN Mod2 , 
+.ZN Mod3 , 
+.ZN Mod4 , 
+and 
+.ZN Mod5 .
+Only nonzero KeyCodes have meaning in each set, 
+and zero KeyCodes are ignored.
+In addition, all of the nonzero KeyCodes must be in the range specified by 
+min_keycode and max_keycode in the 
+.ZN Display 
+structure,
+or a 
+.ZN BadValue 
+error results.
+.LP
+An X server can impose restrictions on how modifiers can be changed, 
+for example,
+if certain keys do not generate up transitions in hardware,
+if auto-repeat cannot be disabled on certain keys,
+or if multiple modifier keys are not supported.  
+If some such restriction is violated, 
+the status reply is
+.ZN MappingFailed ,
+and none of the modifiers are changed.
+If the new KeyCodes specified for a modifier differ from those
+currently defined and any (current or new) keys for that modifier are
+in the logically down state, 
+.ZN XSetModifierMapping
+returns
+.ZN MappingBusy , 
+and none of the modifiers is changed.
+.LP
+.ZN XSetModifierMapping
+can generate
+.ZN BadAlloc
+and 
+.ZN BadValue
+errors.
+.LP
+The
+.ZN XGetModifierMapping
+function returns a pointer to a newly created
+.ZN XModifierKeymap
+structure that contains the keys being used as modifiers.
+The structure should be freed after use by calling
+.ZN XFreeModifiermap .
+If only zero values appear in the set for any modifier, 
+that modifier is disabled.
+.LP
+The
+.ZN XNewModifiermap
+function returns a pointer to
+.ZN XModifierKeymap
+structure for later use.
+.LP
+The
+.ZN XInsertModifiermapEntry
+function adds the specified KeyCode to the set that controls the specified
+modifier and returns the resulting
+.ZN XModifierKeymap
+structure (expanded as needed).
+.LP
+The
+.ZN XDeleteModifiermapEntry
+function deletes the specified KeyCode from the set that controls the
+specified modifier and returns a pointer to the resulting
+.ZN XModifierKeymap
+structure.
+.LP
+The
+.ZN XFreeModifiermap
+function frees the specified
+.ZN XModifierKeymap
+structure.
+.SH STRUCTURES
+The
+.ZN XModifierKeymap
+structure contains:
+.LP
+.Ds 0
+.TA .5i 2.5i
+.ta .5i 2.5i
+typedef struct {
+	int max_keypermod;	/\&* This server's max number of keys per modifier */
+	KeyCode *modifiermap;	/\&* An 8 by max_keypermod array of the modifiers */
+} XModifierKeymap;
+.De
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+XFree(__libmansuffix__),
+XSetPointerMapping(__libmansuffix__) 
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/xkb/XkbPtrActionX.man b/libX11/man/xkb/XkbPtrActionX.man
index fcb353001..f821245f6 100644
--- a/libX11/man/xkb/XkbPtrActionX.man
+++ b/libX11/man/xkb/XkbPtrActionX.man
@@ -80,7 +80,7 @@ determine the new pointer Y coordinate.
 T}
 .TE
 
-Each of the X and Y coordinantes of the XkbPtrAction structure is composed of 
+Each of the X and Y coordinates of the XkbPtrAction structure is composed of
 two signed 16-bit values, that is, the X coordinate is composed of 
 .I high_XXX 
 and 
diff --git a/libX11/man/xkb/XkbPtrActionY.man b/libX11/man/xkb/XkbPtrActionY.man
index 844277d88..f4afc180c 100644
--- a/libX11/man/xkb/XkbPtrActionY.man
+++ b/libX11/man/xkb/XkbPtrActionY.man
@@ -80,7 +80,7 @@ determine the new pointer Y coordinate.
 T}
 .TE
 
-Each of the X and Y coordinantes of the XkbPtrAction structure is composed of 
+Each of the X and Y coordinates of the XkbPtrAction structure is composed of
 two signed 16-bit values, that is, the X coordinate is composed of 
 .I high_XXX 
 and 
diff --git a/libX11/man/xkb/XkbSetPtrActionX.man b/libX11/man/xkb/XkbSetPtrActionX.man
index 5888d46dc..9b13cd402 100644
--- a/libX11/man/xkb/XkbSetPtrActionX.man
+++ b/libX11/man/xkb/XkbSetPtrActionX.man
@@ -84,7 +84,7 @@ determine the new pointer Y coordinate.
 T}
 .TE
 
-Each of the X and Y coordinantes of the XkbPtrAction structure is composed of 
+Each of the X and Y coordinates of the XkbPtrAction structure is composed of
 two signed 16-bit values, that is, the X coordinate is composed of 
 .I high_XXX 
 and 
diff --git a/libX11/man/xkb/XkbSetPtrActionY.man b/libX11/man/xkb/XkbSetPtrActionY.man
index 895454ea7..308970176 100644
--- a/libX11/man/xkb/XkbSetPtrActionY.man
+++ b/libX11/man/xkb/XkbSetPtrActionY.man
@@ -84,7 +84,7 @@ determine the new pointer Y coordinate.
 T}
 .TE
 
-Each of the X and Y coordinantes of the XkbPtrAction structure is composed of 
+Each of the X and Y coordinates of the XkbPtrAction structure is composed of
 two signed 16-bit values, that is, the X coordinate is composed of 
 .I high_XXX 
 and 
diff --git a/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c b/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
index 78e9df033..8a66c2e95 100644
--- a/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
+++ b/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
@@ -581,7 +581,12 @@ static void u_vbuf_mgr_compute_max_index(struct u_vbuf_mgr_priv *mgr)
        * for that when dividing by stride. */
       unused = vb->stride -
                (mgr->ve->ve[i].src_offset + mgr->ve->src_format_size[i]);
-      assert(unused >= 0);
+
+      /* If src_offset is greater than stride (which means it's a buffer
+       * offset rather than a vertex offset)... */
+      if (unused < 0) {
+         unused = 0;
+      }
 
       /* Compute the maximum index for this vertex element. */
       max_index =
diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c
index 64ef98509..b9c29cb84 100644
--- a/mesalib/src/mesa/main/dlist.c
+++ b/mesalib/src/mesa/main/dlist.c
@@ -5351,7 +5351,7 @@ save_SetFragmentShaderConstantATI(GLuint dst, const GLfloat *value)
 }
 #endif
 
-static void
+static void GLAPIENTRY
 save_Attr1fNV(GLenum attr, GLfloat x)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -5372,7 +5372,7 @@ save_Attr1fNV(GLenum attr, GLfloat x)
    }
 }
 
-static void
+static void GLAPIENTRY
 save_Attr2fNV(GLenum attr, GLfloat x, GLfloat y)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -5394,7 +5394,7 @@ save_Attr2fNV(GLenum attr, GLfloat x, GLfloat y)
    }
 }
 
-static void
+static void GLAPIENTRY
 save_Attr3fNV(GLenum attr, GLfloat x, GLfloat y, GLfloat z)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -5417,7 +5417,7 @@ save_Attr3fNV(GLenum attr, GLfloat x, GLfloat y, GLfloat z)
    }
 }
 
-static void
+static void GLAPIENTRY
 save_Attr4fNV(GLenum attr, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -5442,7 +5442,7 @@ save_Attr4fNV(GLenum attr, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 }
 
 
-static void
+static void GLAPIENTRY
 save_Attr1fARB(GLenum attr, GLfloat x)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -5463,7 +5463,7 @@ save_Attr1fARB(GLenum attr, GLfloat x)
    }
 }
 
-static void
+static void GLAPIENTRY
 save_Attr2fARB(GLenum attr, GLfloat x, GLfloat y)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -5485,7 +5485,7 @@ save_Attr2fARB(GLenum attr, GLfloat x, GLfloat y)
    }
 }
 
-static void
+static void GLAPIENTRY
 save_Attr3fARB(GLenum attr, GLfloat x, GLfloat y, GLfloat z)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -5508,7 +5508,7 @@ save_Attr3fARB(GLenum attr, GLfloat x, GLfloat y, GLfloat z)
    }
 }
 
-static void
+static void GLAPIENTRY
 save_Attr4fARB(GLenum attr, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -7040,7 +7040,7 @@ exec_GetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
 
 
 /* GL_ARB_instanced_arrays */
-static void
+static void GLAPIENTRY
 save_VertexAttribDivisor(GLuint index, GLuint divisor)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -7058,7 +7058,7 @@ save_VertexAttribDivisor(GLuint index, GLuint divisor)
 
 
 /* GL_NV_texture_barrier */
-static void
+static void GLAPIENTRY
 save_TextureBarrierNV(void)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -7071,7 +7071,7 @@ save_TextureBarrierNV(void)
 
 
 /* GL_ARB_sampler_objects */
-static void
+static void GLAPIENTRY
 save_BindSampler(GLuint unit, GLuint sampler)
 {
    Node *n;
diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c
index 68a141d29..5e54bbdf3 100644
--- a/mesalib/src/mesa/main/fbobject.c
+++ b/mesalib/src/mesa/main/fbobject.c
@@ -418,18 +418,16 @@ _mesa_validate_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb)
          case GL_RG:
             fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED;
             return;
-         case GL_RGB:
+
+         default:
             switch (rb->Format) {
+            /* XXX This list is likely incomplete. */
             case MESA_FORMAT_RGB9_E5_FLOAT:
                fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED;
                return;
             default:;
+               /* render buffer format is supported by software rendering */
             }
-            break;
-
-         default:
-            /* render buffer format is supported by software rendering */
-            ;
          }
       }
    }
diff --git a/mesalib/src/mesa/main/texrender.c b/mesalib/src/mesa/main/texrender.c
index 4bcef9899..2766bd6c5 100644
--- a/mesalib/src/mesa/main/texrender.c
+++ b/mesalib/src/mesa/main/texrender.c
@@ -530,7 +530,6 @@ update_wrapper(struct gl_context *ctx, struct gl_renderbuffer_attachment *att)
 {
    struct texture_renderbuffer *trb
       = (struct texture_renderbuffer *) att->Renderbuffer;
-   GLuint unused;
 
    (void) ctx;
    ASSERT(trb);
@@ -603,10 +602,8 @@ update_wrapper(struct gl_context *ctx, struct gl_renderbuffer_attachment *att)
       trb->Base._BaseFormat = GL_RGBA;
       break;
    default:
-      _mesa_format_to_type_and_comps(trb->TexImage->TexFormat,
-                                     &trb->Base.DataType, &unused);
-      trb->Base._BaseFormat =
-         _mesa_base_fbo_format(ctx, trb->TexImage->InternalFormat);
+      trb->Base.DataType = CHAN_TYPE;
+      trb->Base._BaseFormat = GL_RGBA;
    }
    trb->Base.Data = trb->TexImage->Data;
 }
diff --git a/pixman/test/composite.c b/pixman/test/composite.c
index ea10f8a6e..fccf18b53 100644
--- a/pixman/test/composite.c
+++ b/pixman/test/composite.c
@@ -877,7 +877,7 @@ main (int argc, char **argv)
 {
 #define N_TESTS (8 * 1024 * 1024)
     int result = 0;
-    uint32_t i;
+    uint32_t i, seed;
 
     if (argc > 1)
     {
@@ -899,8 +899,6 @@ main (int argc, char **argv)
 	}
     }
 
-    uint32_t seed;
-    
     if (getenv ("PIXMAN_RANDOMIZE_TESTS"))
 	seed = get_random_seed();
     else
diff --git a/xorg-server/xkeyboard-config/configure.in b/xorg-server/xkeyboard-config/configure.in
index d272aa1bc..77e492731 100644
--- a/xorg-server/xkeyboard-config/configure.in
+++ b/xorg-server/xkeyboard-config/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(xkeyboard-config, 2.2)
+AC_INIT(xkeyboard-config, 2.3)
 AC_CONFIG_SRCDIR(rules/base.xml.in)
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
diff --git a/xorg-server/xkeyboard-config/po/xkeyboard-config.pot b/xorg-server/xkeyboard-config/po/xkeyboard-config.pot
index a8e3c6901..bf068475b 100644
--- a/xorg-server/xkeyboard-config/po/xkeyboard-config.pot
+++ b/xorg-server/xkeyboard-config/po/xkeyboard-config.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2011-04-03 20:43+0100\n"
+"POT-Creation-Date: 2011-05-17 21:08+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -94,155 +94,155 @@ msgid "Advance Scorpius KI"
 msgstr ""
 
 #: ../rules/base.xml.in.h:18
-msgid "Afg"
-msgstr ""
-
-#: ../rules/base.xml.in.h:19
 msgid "Afghani"
 msgstr ""
 
-#: ../rules/base.xml.in.h:20
+#: ../rules/base.xml.in.h:19
 msgid "Akan"
 msgstr ""
 
-#: ../rules/base.xml.in.h:21
+#: ../rules/base.xml.in.h:20
 msgid "Albanian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:22
+#: ../rules/base.xml.in.h:21
 msgid "Alt and Meta are on Alt keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:23
+#: ../rules/base.xml.in.h:22
 msgid "Alt is mapped to Right Win, Super to Menu"
 msgstr ""
 
-#: ../rules/base.xml.in.h:24
+#: ../rules/base.xml.in.h:23
 msgid "Alt+Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:25
+#: ../rules/base.xml.in.h:24
 msgid "Alt+Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:26
+#: ../rules/base.xml.in.h:25
 msgid "Alt+Shift"
 msgstr ""
 
-#: ../rules/base.xml.in.h:27
+#: ../rules/base.xml.in.h:26
 msgid "Alt+Space"
 msgstr ""
 
-#: ../rules/base.xml.in.h:28
+#: ../rules/base.xml.in.h:27
 msgid "Alt/Win key behavior"
 msgstr ""
 
-#: ../rules/base.xml.in.h:29
+#: ../rules/base.xml.in.h:28
 msgid "Amharic"
 msgstr ""
 
-#: ../rules/base.xml.in.h:30
+#: ../rules/base.xml.in.h:29
 msgid "Any Alt key"
 msgstr ""
 
-#: ../rules/base.xml.in.h:31
+#: ../rules/base.xml.in.h:30
 msgid "Any Win key"
 msgstr ""
 
-#: ../rules/base.xml.in.h:32
+#: ../rules/base.xml.in.h:31
 msgid "Any Win key (while pressed)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:33
+#: ../rules/base.xml.in.h:32
 msgid "Apple"
 msgstr ""
 
-#: ../rules/base.xml.in.h:34
+#: ../rules/base.xml.in.h:33
 msgid "Apple Aluminium Keyboard (ANSI)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:35
+#: ../rules/base.xml.in.h:34
 msgid "Apple Aluminium Keyboard (ISO)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:36
+#: ../rules/base.xml.in.h:35
 msgid "Apple Aluminium Keyboard (JIS)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:37
+#: ../rules/base.xml.in.h:36
 msgid ""
 "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num "
 "Lock)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:38
+#: ../rules/base.xml.in.h:37
 msgid "Apple Laptop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:39
+#: ../rules/base.xml.in.h:38
 msgid "Arabic"
 msgstr ""
 
-#: ../rules/base.xml.in.h:40
+#: ../rules/base.xml.in.h:39
 msgid "Arabic (Buckwalter)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:41
+#: ../rules/base.xml.in.h:40
 msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:42
+#: ../rules/base.xml.in.h:41
 msgid "Arabic (Pakistan)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:43
+#: ../rules/base.xml.in.h:42
 msgid "Arabic (Syria)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:44
+#: ../rules/base.xml.in.h:43
 msgid "Arabic (azerty)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:45
+#: ../rules/base.xml.in.h:44
 msgid "Arabic (azerty/digits)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:46
+#: ../rules/base.xml.in.h:45
 msgid "Arabic (digits)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:47
+#: ../rules/base.xml.in.h:46
 msgid "Arabic (qwerty)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:48
+#: ../rules/base.xml.in.h:47
 msgid "Arabic (qwerty/digits)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:49
+#: ../rules/base.xml.in.h:48 ../rules/base.extras.xml.in.h:2
 msgid "Armenian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:50
+#: ../rules/base.xml.in.h:49
 msgid "Armenian (alternative eastern)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:51
+#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
 msgid "Armenian (alternative phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:52
+#: ../rules/base.xml.in.h:51
 msgid "Armenian (eastern)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:53
+#: ../rules/base.xml.in.h:52
 msgid "Armenian (phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:54
+#: ../rules/base.xml.in.h:53
 msgid "Armenian (western)"
 msgstr ""
 
+#: ../rules/base.xml.in.h:54
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr ""
+
 #: ../rules/base.xml.in.h:55
 msgid "Asus Laptop"
 msgstr ""
@@ -260,11 +260,11 @@ msgid "Avatime"
 msgstr ""
 
 #: ../rules/base.xml.in.h:59
-msgid "Azerbaijan (Cyrillic)"
+msgid "Azerbaijani"
 msgstr ""
 
 #: ../rules/base.xml.in.h:60
-msgid "Azerbaijani"
+msgid "Azerbaijani (Cyrillic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:61
@@ -313,7 +313,7 @@ msgstr ""
 
 #: ../rules/base.xml.in.h:72
 msgid ""
-"Backslash chooses 3rd level, latches when pressed together with another 3rd-"
+"Backslash (chooses 3rd level, latches when pressed together with another 3rd-"
 "level-chooser)"
 msgstr ""
 
@@ -322,3485 +322,3477 @@ msgid "Bambara"
 msgstr ""
 
 #: ../rules/base.xml.in.h:74
-msgid "Belarusian"
+msgid "Bashkirian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:75
-msgid "Belarusian (Latin)"
+msgid "Belarusian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:76
-msgid "Belarusian (legacy)"
+msgid "Belarusian (Latin)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:77
-msgid "Belgian"
+msgid "Belarusian (legacy)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:78
-msgid "Belgian (ISO alternate)"
+msgid "Belgian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:79
-msgid "Belgian (Sun dead keys)"
+msgid "Belgian (ISO alternate)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:80
-msgid "Belgian (Wang model 724 azerty)"
+msgid "Belgian (Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:81
-msgid "Belgian (alternative)"
+msgid "Belgian (Wang model 724 azerty)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:82
-msgid "Belgian (alternative, Sun dead keys)"
+msgid "Belgian (alternative)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:83
-msgid "Belgian (alternative, latin-9 only)"
+msgid "Belgian (alternative, Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:84
-msgid "Belgian (eliminate dead keys)"
+msgid "Belgian (alternative, latin-9 only)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:85
-msgid "BenQ X-Touch"
+msgid "Belgian (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:86
-msgid "BenQ X-Touch 730"
+msgid "BenQ X-Touch"
 msgstr ""
 
 #: ../rules/base.xml.in.h:87
-msgid "BenQ X-Touch 800"
+msgid "BenQ X-Touch 730"
 msgstr ""
 
 #: ../rules/base.xml.in.h:88
-msgid "Bengali"
+msgid "BenQ X-Touch 800"
 msgstr ""
 
 #: ../rules/base.xml.in.h:89
-msgid "Bengali (Probhat)"
+msgid "Bengali"
 msgstr ""
 
 #: ../rules/base.xml.in.h:90
-msgid "Berber (Morocco, Tifinagh alternative phonetic)"
+msgid "Bengali (Probhat)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:91
-msgid "Berber (Morocco, Tifinagh alternative)"
+msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:92
-msgid "Berber (Morocco, Tifinagh extended phonetic)"
+msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:93
-msgid "Berber (Morocco, Tifinagh extended)"
+msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:94
-msgid "Berber (Morocco, Tifinagh phonetic)"
+msgid "Berber (Morocco, Tifinagh extended)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:95
-msgid "Berber (Morocco, Tifinagh)"
+msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:96
-msgid "Bosnian"
+msgid "Berber (Morocco, Tifinagh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:97
-msgid "Bosnian (US keyboard with Bosnian digraphs)"
+msgid "Bosnian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:98
-msgid "Bosnian (US keyboard with Bosnian letters)"
+msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:99
-msgid "Bosnian (use Bosnian digraphs)"
+msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:100
-msgid "Bosnian (use guillemets for quotes)"
+msgid "Bosnian (use Bosnian digraphs)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:101
-msgid "Both Alt keys together"
+msgid "Bosnian (use guillemets for quotes)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:102
-msgid "Both Ctrl keys together"
+msgid "Both Alt keys together"
 msgstr ""
 
 #: ../rules/base.xml.in.h:103
-msgid "Both Shift keys together"
+msgid "Both Ctrl keys together"
 msgstr ""
 
 #: ../rules/base.xml.in.h:104
-msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
+msgid "Both Shift keys together"
 msgstr ""
 
 #: ../rules/base.xml.in.h:105
-msgid "Both Shift-Keys together toggle Caps Lock"
+msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr ""
 
 #: ../rules/base.xml.in.h:106
-msgid "Both Shift-Keys together toggle ShiftLock"
+msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr ""
 
 #: ../rules/base.xml.in.h:107
-msgid "Braille"
+msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr ""
 
 #: ../rules/base.xml.in.h:108
-msgid "Braille (left hand)"
+msgid "Braille"
 msgstr ""
 
 #: ../rules/base.xml.in.h:109
-msgid "Braille (right hand)"
+msgid "Braille (left hand)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:110
-msgid "Brother Internet Keyboard"
+msgid "Braille (right hand)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:111
-msgid "Bulgarian"
+msgid "Brother Internet Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:112
-msgid "Bulgarian (new phonetic)"
+msgid "Bulgarian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:113
-msgid "Bulgarian (traditional phonetic)"
+msgid "Bulgarian (new phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:114
-msgid "Burmese"
+msgid "Bulgarian (traditional phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:115
-msgid "Canadian Multilingual"
+msgid "Burmese"
 msgstr ""
 
 #: ../rules/base.xml.in.h:116
-msgid "Canadian Multilingual (first part)"
+msgid "Canadian Multilingual"
 msgstr ""
 
 #: ../rules/base.xml.in.h:117
-msgid "Canadian Multilingual (second part)"
+msgid "Canadian Multilingual (first part)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:118
-msgid "Caps Lock"
+msgid "Canadian Multilingual (second part)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:119
+msgid "Caps Lock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:120
 msgid ""
 "Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-"
 "level-chooser)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:121
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:122
 msgid ""
 "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr ""
 
-#: ../rules/base.xml.in.h:122
-msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
-msgstr ""
-
 #: ../rules/base.xml.in.h:123
-msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
+msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr ""
 
 #: ../rules/base.xml.in.h:124
-msgid "Caps Lock is disabled"
+msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr ""
 
 #: ../rules/base.xml.in.h:125
-msgid "Caps Lock key behavior"
+msgid "Caps Lock is disabled"
 msgstr ""
 
 #: ../rules/base.xml.in.h:126
-msgid "Caps Lock toggles Shift so all keys are affected"
+msgid "Caps Lock key behavior"
 msgstr ""
 
 #: ../rules/base.xml.in.h:127
-msgid "Caps Lock toggles normal capitalization of alphabetic characters"
+msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr ""
 
 #: ../rules/base.xml.in.h:128
-msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
+msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr ""
 
 #: ../rules/base.xml.in.h:129
-msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
+msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr ""
 
 #: ../rules/base.xml.in.h:130
-msgid "Catalan"
+msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr ""
 
 #: ../rules/base.xml.in.h:131
-msgid "Cherokee"
+msgid "Catalan"
 msgstr ""
 
 #: ../rules/base.xml.in.h:132
-msgid "Cherry B.UNLIMITED"
+msgid "Catalan (Spain, with middle-dot L)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:133
-msgid "Cherry Blue Line CyBo@rd"
+msgid "Cherokee"
 msgstr ""
 
 #: ../rules/base.xml.in.h:134
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgid "Cherry B.UNLIMITED"
 msgstr ""
 
 #: ../rules/base.xml.in.h:135
-msgid "Cherry CyBo@rd USB-Hub"
+msgid "Cherry Blue Line CyBo@rd"
 msgstr ""
 
 #: ../rules/base.xml.in.h:136
-msgid "Cherry CyMotion Expert"
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:137
-msgid "Cherry CyMotion Master Linux"
+msgid "Cherry CyBo@rd USB-Hub"
 msgstr ""
 
 #: ../rules/base.xml.in.h:138
-msgid "Cherry CyMotion Master XPress"
+msgid "Cherry CyMotion Expert"
 msgstr ""
 
 #: ../rules/base.xml.in.h:139
-msgid "Chicony Internet Keyboard"
+msgid "Cherry CyMotion Master Linux"
 msgstr ""
 
 #: ../rules/base.xml.in.h:140
-msgid "Chicony KB-9885"
+msgid "Cherry CyMotion Master XPress"
 msgstr ""
 
 #: ../rules/base.xml.in.h:141
-msgid "Chicony KU-0108"
+msgid "Chicony Internet Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:142
-msgid "Chicony KU-0420"
+msgid "Chicony KB-9885"
 msgstr ""
 
 #: ../rules/base.xml.in.h:143
-msgid "Chinese"
+msgid "Chicony KU-0108"
 msgstr ""
 
 #: ../rules/base.xml.in.h:144
-msgid "Chinese (Tibetan with ASCII numerals)"
+msgid "Chicony KU-0420"
 msgstr ""
 
 #: ../rules/base.xml.in.h:145
-msgid "Chinese (Tibetan)"
+msgid "Chinese"
 msgstr ""
 
 #: ../rules/base.xml.in.h:146
-msgid "Chinese (Uyghur)"
+msgid "Chuvash"
 msgstr ""
 
 #: ../rules/base.xml.in.h:147
-msgid "Classmate PC"
+msgid "Chuvash (Latin)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:148
-msgid "Compaq Easy Access Keyboard"
+msgid "Classmate PC"
 msgstr ""
 
 #: ../rules/base.xml.in.h:149
-msgid "Compaq Internet Keyboard (13 keys)"
+msgid "CloGaelach"
 msgstr ""
 
 #: ../rules/base.xml.in.h:150
-msgid "Compaq Internet Keyboard (18 keys)"
+msgid "Compaq Easy Access Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:151
-msgid "Compaq Internet Keyboard (7 keys)"
+msgid "Compaq Internet Keyboard (13 keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:152
-msgid "Compaq iPaq Keyboard"
+msgid "Compaq Internet Keyboard (18 keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:153
-msgid "Compose key position"
+msgid "Compaq Internet Keyboard (7 keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:154
-msgid "Control + Alt + Backspace"
+msgid "Compaq iPaq Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:155
-msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
+msgid "Compose key position"
 msgstr ""
 
 #: ../rules/base.xml.in.h:156
-msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
+msgid "Control + Alt + Backspace"
 msgstr ""
 
 #: ../rules/base.xml.in.h:157
-msgid "Creative Desktop Wireless 7000"
+msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr ""
 
 #: ../rules/base.xml.in.h:158
-msgid "Croatian"
+msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:159
-msgid "Croatian (US keyboard with Croatian digraphs)"
+msgid "Creative Desktop Wireless 7000"
 msgstr ""
 
 #: ../rules/base.xml.in.h:160
-msgid "Croatian (US keyboard with Croatian letters)"
+msgid "Crimean Tatar (Dobruja Q)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:161
-msgid "Croatian (Use Croatian digraphs)"
+msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:162
-msgid "Croatian (Use guillemets for quotes)"
+msgid "Crimean Tatar (Turkish F)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:163
-msgid "Ctrl key position"
+msgid "Crimean Tatar (Turkish Q)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:164
-msgid "Ctrl+Shift"
+msgid "Croatian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:165
-msgid "Czech"
+msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:166
-msgid "Czech (UCW layout accented letters only)"
+msgid "Croatian (US keyboard with Croatian letters)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:167
-msgid "Czech (US Dvorak with CZ UCW support)"
+msgid "Croatian (use Croatian digraphs)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:168
-msgid "Czech (With &lt;\\|&gt; key)"
+msgid "Croatian (use guillemets for quotes)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:169
-msgid "Czech (qwerty)"
+msgid "Ctrl key position"
 msgstr ""
 
 #: ../rules/base.xml.in.h:170
-msgid "Czech (qwerty, extended Backslash)"
+msgid "Ctrl+Shift"
 msgstr ""
 
 #: ../rules/base.xml.in.h:171
-msgid "DTK2000"
+msgid "Czech"
 msgstr ""
 
 #: ../rules/base.xml.in.h:172
-msgid "Danish"
+msgid "Czech (UCW layout, accented letters only)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:173
-msgid "Danish (Dvorak)"
+msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:174
-msgid "Danish (Mac)"
+msgid "Czech (qwerty)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:175
-msgid "Danish (Mac, eliminate dead keys)"
+msgid "Czech (qwerty, extended Backslash)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:176
-msgid "Danish (eliminate dead keys)"
+msgid "Czech (with &lt;\\|&gt; key)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:177
-msgid "Default numeric keypad keys"
+msgid "DTK2000"
 msgstr ""
 
 #: ../rules/base.xml.in.h:178
-msgid "Dell"
+msgid "Danish"
 msgstr ""
 
 #: ../rules/base.xml.in.h:179
-msgid "Dell 101-key PC"
+msgid "Danish (Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:180
-msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgid "Danish (Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:181
-msgid "Dell Laptop/notebook Precision M series"
+msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:182
-msgid "Dell Latitude series laptop"
+msgid "Danish (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:183
-msgid "Dell Precision M65"
+msgid "Default numeric keypad keys"
 msgstr ""
 
 #: ../rules/base.xml.in.h:184
-msgid "Dell SK-8125"
+msgid "Dell"
 msgstr ""
 
 #: ../rules/base.xml.in.h:185
-msgid "Dell SK-8135"
+msgid "Dell 101-key PC"
 msgstr ""
 
 #: ../rules/base.xml.in.h:186
-msgid "Dell USB Multimedia Keyboard"
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr ""
 
 #: ../rules/base.xml.in.h:187
-msgid "Dexxa Wireless Desktop Keyboard"
+msgid "Dell Laptop/notebook Precision M series"
 msgstr ""
 
 #: ../rules/base.xml.in.h:188
-msgid "Dhivehi"
+msgid "Dell Latitude series laptop"
 msgstr ""
 
 #: ../rules/base.xml.in.h:189
-msgid "Diamond 9801 / 9802 series"
+msgid "Dell Precision M65"
 msgstr ""
 
 #: ../rules/base.xml.in.h:190
-msgid "Dutch"
+msgid "Dell SK-8125"
 msgstr ""
 
 #: ../rules/base.xml.in.h:191
-msgid "Dutch (Mac)"
+msgid "Dell SK-8135"
 msgstr ""
 
 #: ../rules/base.xml.in.h:192
-msgid "Dutch (Sun dead keys)"
+msgid "Dell USB Multimedia Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:193
-msgid "Dutch (standard)"
+msgid "Dexxa Wireless Desktop Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:194
-msgid "Dzongkha"
+msgid "Dhivehi"
 msgstr ""
 
 #: ../rules/base.xml.in.h:195
-msgid "Enable extra typographic characters"
+msgid "Diamond 9801 / 9802 series"
 msgstr ""
 
 #: ../rules/base.xml.in.h:196
-msgid "English (Canada)"
+msgid "Dutch"
 msgstr ""
 
 #: ../rules/base.xml.in.h:197
-msgid "English (Colemak)"
+msgid "Dutch (Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:198
-msgid "English (Dvorak alternative international no dead keys)"
+msgid "Dutch (Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:199
-msgid "English (Dvorak international with dead keys)"
+msgid "Dutch (standard)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:200
-msgid "English (Dvorak)"
+msgid "Dzongkha"
 msgstr ""
 
 #: ../rules/base.xml.in.h:201
-msgid "English (Ghana)"
+msgid "Enable extra typographic characters"
 msgstr ""
 
 #: ../rules/base.xml.in.h:202
-msgid "English (Ghana, GILLBT)"
+msgid "English (Cameroon Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:203
-msgid "English (Ghana, multilingual)"
+msgid "English (Cameroon qwerty)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:204
-msgid "English (India, with RupeeSign)"
+msgid "English (Cameroon)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:205
-msgid "English (Macintosh)"
+msgid "English (Canada)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:206
-msgid "English (Mali, USA Mac)"
+msgid "English (Colemak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:207
-msgid "English (Mali, USA international)"
+msgid "English (Dvorak alternative international no dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:208
-msgid "English (Nigeria)"
+msgid "English (Dvorak international with dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:209
-msgid "English (South Africa)"
+msgid "English (Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:210
-msgid "English (UK)"
+msgid "English (Ghana)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:211
-msgid "English (UK, Colemak)"
+msgid "English (Ghana, GILLBT)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:212
-msgid "English (UK, Dvorak UK punctuation)"
+msgid "English (Ghana, multilingual)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:213
-msgid "English (UK, Dvorak)"
+msgid "English (India, with RupeeSign)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:214
-msgid "English (UK, Mac international)"
+msgid "English (Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:215
-msgid "English (UK, Mac)"
+msgid "English (Mali, US Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:216
-msgid "English (UK, extended, WinKeys)"
+msgid "English (Mali, US international)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:217
-msgid "English (UK, international with dead keys)"
+msgid "English (Nigeria)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:218
-msgid "English (US)"
+msgid "English (South Africa)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:219
-msgid "English (US, alternative international)"
+msgid "English (UK)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:220
-msgid "English (US, international with dead keys)"
+msgid "English (UK, Colemak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:221
-msgid "English (US, with euro on 5)"
+msgid "English (UK, Dvorak with UK punctuation)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:222
-msgid "English (classic Dvorak)"
+msgid "English (UK, Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:223
-msgid "English (international AltGr dead keys)"
+msgid "English (UK, Macintosh international)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:224
-msgid "English (layout toggle on multiply/divide key)"
+msgid "English (UK, Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:225
-msgid "English (left handed Dvorak)"
+msgid "English (UK, extended WinKeys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:226
-msgid "English (programmer Dvorak)"
+msgid "English (UK, international with dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:227
-msgid "English (right handed Dvorak)"
+#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
+msgid "English (US)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:228
-msgid "Ennyah DKB-1008"
+msgid "English (US, alternative international)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:229
-msgid "Enter on keypad"
+msgid "English (US, international with dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:230
-msgid "Esperanto"
+msgid "English (US, with euro on 5)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:231
-msgid "Esperanto (displaced semicolon and quote, obsolete)"
+msgid "English (classic Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:232
-msgid "Estonian"
+msgid "English (international AltGr dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:233
-msgid "Estonian (Dvorak)"
+msgid "English (layout toggle on multiply/divide key)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:234
-msgid "Estonian (US keyboard with Estonian letters)"
+msgid "English (left handed Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:235
-msgid "Estonian (eliminate dead keys)"
+msgid "English (programmer Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:236
-msgid "Euro on 2"
+msgid "English (right handed Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:237
-msgid "Euro on 4"
+msgid "Ennyah DKB-1008"
 msgstr ""
 
 #: ../rules/base.xml.in.h:238
-msgid "Euro on 5"
+msgid "Enter on keypad"
 msgstr ""
 
 #: ../rules/base.xml.in.h:239
-msgid "Euro on E"
+msgid "Esperanto"
 msgstr ""
 
 #: ../rules/base.xml.in.h:240
-msgid "Everex STEPnote"
+msgid "Esperanto (Portugal, Nativo)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:241
-msgid "Ewe"
+msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:242
-msgid "FL90"
+msgid "Estonian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:243
-msgid "Faroese"
+msgid "Estonian (Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:244
-msgid "Faroese (eliminate dead keys)"
+msgid "Estonian (US keyboard with Estonian letters)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:245
-msgid "Filipino"
+msgid "Estonian (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:246
-msgid "Filipino (Capewell-Dvorak Baybayin)"
+msgid "Euro on 2"
 msgstr ""
 
 #: ../rules/base.xml.in.h:247
-msgid "Filipino (Capewell-Dvorak Latin)"
+msgid "Euro on 4"
 msgstr ""
 
 #: ../rules/base.xml.in.h:248
-msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
+msgid "Euro on 5"
 msgstr ""
 
 #: ../rules/base.xml.in.h:249
-msgid "Filipino (Capewell-QWERF 2006 Latin)"
+msgid "Euro on E"
 msgstr ""
 
 #: ../rules/base.xml.in.h:250
-msgid "Filipino (Colemak Baybayin)"
+msgid "Everex STEPnote"
 msgstr ""
 
 #: ../rules/base.xml.in.h:251
-msgid "Filipino (Colemak Latin)"
+msgid "Ewe"
 msgstr ""
 
 #: ../rules/base.xml.in.h:252
-msgid "Filipino (Dvorak Latin)"
+msgid "FL90"
 msgstr ""
 
 #: ../rules/base.xml.in.h:253
-msgid "Filipino (QWERTY Baybayin)"
+msgid "Faroese"
 msgstr ""
 
 #: ../rules/base.xml.in.h:254
-msgid "Finnish"
+msgid "Faroese (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:255
-msgid "Finnish (Mac)"
+msgid "Filipino"
 msgstr ""
 
 #: ../rules/base.xml.in.h:256
-msgid "Finnish (classic)"
+msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:257
-msgid "Finnish (classic, eliminate dead keys)"
+msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:258
-msgid "Finnish (northern Saami)"
+msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:259
+msgid "Filipino (Capewell-QWERF 2006 Latin)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:260
+msgid "Filipino (Colemak Baybayin)"
 msgstr ""
 
-#. This assumes the KP_ abstract symbols are actually useful for some apps
-#. The description needs to be rewritten
 #: ../rules/base.xml.in.h:261
-msgid "Four-level key with abstract separators"
+msgid "Filipino (Colemak Latin)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:262
-msgid "Four-level key with comma"
+msgid "Filipino (Dvorak Baybayin)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:263
-msgid "Four-level key with dot"
+msgid "Filipino (Dvorak Latin)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:264
-msgid "Four-level key with dot, latin-9 restriction"
+msgid "Filipino (QWERTY Baybayin)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:265
-msgid "Four-level key with momayyez"
+msgid "Finnish"
 msgstr ""
 
 #: ../rules/base.xml.in.h:266
-msgid "French"
+msgid "Finnish (Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:267
-msgid "French (Bepo, ergonomic, Dvorak way)"
+msgid "Finnish (classic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:268
-msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:269
-msgid "French (Breton)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:270
-msgid "French (Canada, Dvorak)"
+msgid "Finnish (classic, eliminate dead keys)"
 msgstr ""
 
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
 #: ../rules/base.xml.in.h:271
-msgid "French (Canada, legacy)"
+msgid "Four-level key with abstract separators"
 msgstr ""
 
 #: ../rules/base.xml.in.h:272
-msgid "French (Democratic Republic of the Congo)"
+msgid "Four-level key with comma"
 msgstr ""
 
 #: ../rules/base.xml.in.h:273
-msgid "French (Dvorak)"
+msgid "Four-level key with dot"
 msgstr ""
 
 #: ../rules/base.xml.in.h:274
-msgid "French (Georgian AZERTY Tskapo)"
+msgid "Four-level key with dot, latin-9 restriction"
 msgstr ""
 
 #: ../rules/base.xml.in.h:275
-msgid "French (Guinea)"
+msgid "Four-level key with momayyez"
 msgstr ""
 
 #: ../rules/base.xml.in.h:276
-msgid "French (Mac)"
+msgid "French"
 msgstr ""
 
 #: ../rules/base.xml.in.h:277
-msgid "French (Mali, alternative)"
+msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:278
-msgid "French (Morocco)"
+msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:279
-msgid "French (Occitan)"
+msgid "French (Breton)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:280
-msgid "French (Sun dead keys)"
+msgid "French (Cameroon azerty)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:281
-msgid "French (Switzerland)"
+msgid "French (Cameroon)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:282
-msgid "French (Switzerland, Mac)"
+#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+msgid "French (Canada)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:283
-msgid "French (Switzerland, Sun dead keys)"
+msgid "French (Canada, Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:284
-msgid "French (Switzerland, eliminate dead keys)"
+msgid "French (Canada, legacy)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:285
-msgid "French (alternative)"
+msgid "French (Democratic Republic of the Congo)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:286
-msgid "French (alternative, Sun dead keys)"
+msgid "French (Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:287
-msgid "French (alternative, eliminate dead keys)"
+msgid "French (Guinea)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:288
-msgid "French (alternative, latin-9 only)"
+msgid "French (Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:289
-msgid "French (eliminate dead keys)"
+msgid "French (Mali, alternative)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:290
-msgid "French (legacy alternative)"
+msgid "French (Morocco)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:291
-msgid "French (legacy, alternative, Sun dead keys)"
+msgid "French (Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:292
-msgid "French (legacy, alternative, eliminate dead keys)"
+msgid "French (Switzerland)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:293
-msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgid "French (Switzerland, Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:294
-msgid "Fula"
+msgid "French (Switzerland, Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:295
-msgid "GBr"
+msgid "French (Switzerland, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:296
-msgid "Ga"
+msgid "French (alternative)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:297
-msgid "Generic 101-key PC"
+msgid "French (alternative, Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:298
-msgid "Generic 102-key (Intl) PC"
+msgid "French (alternative, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:299
-msgid "Generic 104-key PC"
+msgid "French (alternative, latin-9 only)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:300
-msgid "Generic 105-key (Intl) PC"
+msgid "French (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:301
-msgid "Genius Comfy KB-12e"
+msgid "French (legacy, alternative)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:302
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgid "French (legacy, alternative, Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:303
-msgid "Genius Comfy KB-21e-Scroll"
+msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:304
-msgid "Genius KB-19e NB"
+msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr ""
 
 #: ../rules/base.xml.in.h:305
-msgid "Genius KKB-2050HS"
+msgid "Fula"
 msgstr ""
 
 #: ../rules/base.xml.in.h:306
-msgid "Georgian"
+msgid "Ga"
 msgstr ""
 
 #: ../rules/base.xml.in.h:307
-msgid "Georgian (MESS)"
+msgid "Generic 101-key PC"
 msgstr ""
 
 #: ../rules/base.xml.in.h:308
-msgid "Georgian (Ossetian)"
+msgid "Generic 102-key (Intl) PC"
 msgstr ""
 
 #: ../rules/base.xml.in.h:309
-msgid "Georgian (ergonomic)"
+msgid "Generic 104-key PC"
 msgstr ""
 
 #: ../rules/base.xml.in.h:310
-msgid "German"
+msgid "Generic 105-key (Intl) PC"
 msgstr ""
 
 #: ../rules/base.xml.in.h:311
-msgid "German (Austria)"
+msgid "Genius Comfy KB-12e"
 msgstr ""
 
 #: ../rules/base.xml.in.h:312
-msgid "German (Austria, Mac)"
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
 msgstr ""
 
 #: ../rules/base.xml.in.h:313
-msgid "German (Austria, Sun dead keys)"
+msgid "Genius Comfy KB-21e-Scroll"
 msgstr ""
 
 #: ../rules/base.xml.in.h:314
-msgid "German (Austria, eliminate dead keys)"
+msgid "Genius KB-19e NB"
 msgstr ""
 
 #: ../rules/base.xml.in.h:315
-msgid "German (Dvorak)"
+msgid "Genius KKB-2050HS"
 msgstr ""
 
 #: ../rules/base.xml.in.h:316
-msgid "German (Mac)"
+msgid "Georgian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:317
-msgid "German (Mac, eliminate dead keys)"
+msgid "Georgian (France, AZERTY Tskapo)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:318
-msgid "German (Neo 2)"
+msgid "Georgian (Italy)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:319
-msgid "German (Romanian keyboard with German letters)"
+msgid "Georgian (MESS)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:320
-msgid "German (Romanian keyboard with German letters, eliminate dead keys)"
+msgid "Georgian (ergonomic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:321
-msgid "German (Sun dead keys)"
+msgid "German"
 msgstr ""
 
 #: ../rules/base.xml.in.h:322
-msgid "German (Switzerland, Mac)"
+msgid "German (Austria)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:323
-msgid "German (Switzerland, Sun dead keys)"
+msgid "German (Austria, Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:324
-msgid "German (Switzerland, eliminate dead keys)"
+msgid "German (Austria, Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:325
-msgid "German (dead acute)"
+msgid "German (Austria, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:326
-msgid "German (dead grave acute)"
+msgid "German (Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:327
-msgid "German (eliminate dead keys)"
+msgid "German (Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:328
-msgid "German (lower Sorbian qwertz)"
+msgid "German (Macintosh, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:329
-msgid "German (lower Sorbian)"
+msgid "German (Neo 2)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:330
-msgid "German (qwerty)"
+msgid "German (Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:331
-msgid "Greek"
+msgid "German (Switzerland)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:332
-msgid "Greek (eliminate dead keys)"
+msgid "German (Switzerland, Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:333
-msgid "Greek (extended)"
+msgid "German (Switzerland, Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:334
-msgid "Greek (polytonic)"
+msgid "German (Switzerland, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:335
-msgid "Greek (simple)"
+msgid "German (Switzerland, legacy)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:336
-msgid "Gujarati"
+msgid "German (dead acute)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:337
-msgid "Gyration"
+msgid "German (dead grave acute)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:338
-msgid "HTC Dream"
+msgid "German (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:339
-msgid "Happy Hacking Keyboard"
+msgid "German (qwerty)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:340
-msgid "Happy Hacking Keyboard for Mac"
+msgid "Greek"
 msgstr ""
 
 #: ../rules/base.xml.in.h:341
-msgid "Hausa"
+msgid "Greek (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:342
-msgid "Hebrew"
+msgid "Greek (extended)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:343
-msgid "Hebrew (Phonetic)"
+msgid "Greek (polytonic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:344
-msgid "Hebrew (Tiro)"
+msgid "Greek (simple)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:345
-msgid "Hebrew (lyx)"
+msgid "Gujarati"
 msgstr ""
 
 #: ../rules/base.xml.in.h:346
-msgid "Hewlett-Packard Internet Keyboard"
+msgid "Gyration"
 msgstr ""
 
 #: ../rules/base.xml.in.h:347
-msgid "Hewlett-Packard Mini 110 Notebook"
+msgid "HTC Dream"
 msgstr ""
 
 #: ../rules/base.xml.in.h:348
-msgid "Hewlett-Packard Omnibook 500 FA"
+msgid "Happy Hacking Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:349
-msgid "Hewlett-Packard Omnibook 5xx"
+msgid "Happy Hacking Keyboard for Mac"
 msgstr ""
 
 #: ../rules/base.xml.in.h:350
-msgid "Hewlett-Packard Omnibook 6000/6100"
+msgid "Hausa"
 msgstr ""
 
 #: ../rules/base.xml.in.h:351
-msgid "Hewlett-Packard Omnibook XE3 GC"
+msgid "Hebrew"
 msgstr ""
 
 #: ../rules/base.xml.in.h:352
-msgid "Hewlett-Packard Omnibook XE3 GF"
+msgid "Hebrew (Biblical, Tiro)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:353
-msgid "Hewlett-Packard Omnibook XT1000"
+msgid "Hebrew (lyx)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:354
-msgid "Hewlett-Packard Pavilion ZT11xx"
+msgid "Hebrew (phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:355
-msgid "Hewlett-Packard Pavilion dv5"
+msgid "Hewlett-Packard Internet Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:356
-msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgid "Hewlett-Packard Mini 110 Notebook"
 msgstr ""
 
 #: ../rules/base.xml.in.h:357
-msgid "Hewlett-Packard nx9020"
+msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr ""
 
 #: ../rules/base.xml.in.h:358
-msgid "Hexadecimal"
+msgid "Hewlett-Packard Omnibook 5xx"
 msgstr ""
 
 #: ../rules/base.xml.in.h:359
-msgid "Hindi (Bolnagri)"
+msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr ""
 
 #: ../rules/base.xml.in.h:360
-msgid "Hindi (Wx)"
+msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr ""
 
 #: ../rules/base.xml.in.h:361
-msgid "Honeywell Euroboard"
+msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr ""
 
 #: ../rules/base.xml.in.h:362
-msgid "Htc Dream phone"
+msgid "Hewlett-Packard Omnibook XT1000"
 msgstr ""
 
 #: ../rules/base.xml.in.h:363
-msgid "Hungarian"
+msgid "Hewlett-Packard Pavilion ZT11xx"
 msgstr ""
 
 #: ../rules/base.xml.in.h:364
-msgid "Hungarian (101/qwerty/comma/dead keys)"
+msgid "Hewlett-Packard Pavilion dv5"
 msgstr ""
 
 #: ../rules/base.xml.in.h:365
-msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:366
-msgid "Hungarian (101/qwerty/dot/dead keys)"
+msgid "Hewlett-Packard nx9020"
 msgstr ""
 
 #: ../rules/base.xml.in.h:367
-msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
+msgid "Hexadecimal"
 msgstr ""
 
 #: ../rules/base.xml.in.h:368
-msgid "Hungarian (101/qwertz/comma/dead keys)"
+msgid "Hindi (Bolnagri)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:369
-msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
+msgid "Hindi (Wx)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:370
-msgid "Hungarian (101/qwertz/dot/dead keys)"
+msgid "Honeywell Euroboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:371
-msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
+msgid "Htc Dream phone"
 msgstr ""
 
 #: ../rules/base.xml.in.h:372
-msgid "Hungarian (102/qwerty/comma/dead keys)"
+msgid "Hungarian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:373
-msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
+msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:374
-msgid "Hungarian (102/qwerty/dot/dead keys)"
+msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:375
-msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
+msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:376
-msgid "Hungarian (102/qwertz/comma/dead keys)"
+msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:377
-msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
+msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:378
-msgid "Hungarian (102/qwertz/dot/dead keys)"
+msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:379
-msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
+msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:380
-msgid "Hungarian (eliminate dead keys)"
+msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:381
-msgid "Hungarian (qwerty)"
+msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:382
-msgid "Hungarian (standard)"
+msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:383
-msgid "Hyper is mapped to Win-keys"
+msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:384
-msgid "IBM Rapid Access"
+msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:385
-msgid "IBM Rapid Access II"
+msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:386
-msgid "IBM Space Saver"
+msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:387
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:388
-msgid "IBM ThinkPad R60/T60/R61/T61"
+msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:389
-msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgid "Hungarian (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:390
-msgid "Icelandic"
+msgid "Hungarian (qwerty)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:391
-msgid "Icelandic (Dvorak)"
+msgid "Hungarian (standard)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:392
-msgid "Icelandic (Mac)"
+msgid "Hyper is mapped to Win-keys"
 msgstr ""
 
 #: ../rules/base.xml.in.h:393
-msgid "Icelandic (Sun dead keys)"
+msgid "IBM Rapid Access"
 msgstr ""
 
 #: ../rules/base.xml.in.h:394
-msgid "Icelandic (eliminate dead keys)"
+msgid "IBM Rapid Access II"
 msgstr ""
 
 #: ../rules/base.xml.in.h:395
-msgid "Igbo"
+msgid "IBM Space Saver"
 msgstr ""
 
 #: ../rules/base.xml.in.h:396
-msgid "Indian"
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr ""
 
 #: ../rules/base.xml.in.h:397
-msgid "Inuktitut"
+msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr ""
 
 #: ../rules/base.xml.in.h:398
-msgid "Iraqi"
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr ""
 
 #: ../rules/base.xml.in.h:399
-msgid "Irish"
+msgid "Icelandic"
 msgstr ""
 
 #: ../rules/base.xml.in.h:400
-msgid "Irish (CloGaelach)"
+msgid "Icelandic (Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:401
-msgid "Irish (Ogham IS434)"
+msgid "Icelandic (Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:402
-msgid "Irish (Ogham)"
+msgid "Icelandic (Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:403
-msgid "Irish (UnicodeExpert)"
+msgid "Icelandic (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:404
-msgid "Italian"
+msgid "Igbo"
 msgstr ""
 
 #: ../rules/base.xml.in.h:405
-msgid "Italian (Georgian)"
+msgid "Indian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:406
-msgid "Italian (Mac)"
+msgid "Inuktitut"
 msgstr ""
 
 #: ../rules/base.xml.in.h:407
-msgid "Italian (US keyboard with Italian letters)"
+msgid "Iraqi"
 msgstr ""
 
 #: ../rules/base.xml.in.h:408
-msgid "Italian (eliminate dead keys)"
+msgid "Irish"
 msgstr ""
 
 #: ../rules/base.xml.in.h:409
-msgid "Japanese"
+msgid "Irish (UnicodeExpert)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:410
-msgid "Japanese (Kana 86)"
+msgid "Italian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:411
-msgid "Japanese (Kana)"
+msgid "Italian (Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:412
-msgid "Japanese (Mac)"
+msgid "Italian (US keyboard with Italian letters)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:413
-msgid "Japanese (OADG 109A)"
+msgid "Italian (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:414
-msgid "Japanese (PC-98xx Series)"
+msgid "Japanese"
 msgstr ""
 
 #: ../rules/base.xml.in.h:415
-msgid "Japanese keyboard options"
+msgid "Japanese (Kana 86)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:416
-msgid "Kana Lock key is locking"
+msgid "Japanese (Kana)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:417
-msgid "Kannada"
+msgid "Japanese (Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:418
-msgid "Kazakh"
+msgid "Japanese (OADG 109A)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:419
-msgid "Kazakh (with Russian)"
+msgid "Japanese (PC-98xx Series)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:420
-msgid "Key sequence to kill the X server"
+msgid "Japanese keyboard options"
 msgstr ""
 
 #: ../rules/base.xml.in.h:421
-msgid "Key to choose 3rd level"
+msgid "Kalmyk"
 msgstr ""
 
 #: ../rules/base.xml.in.h:422
-msgid "Key to choose 5th level"
+msgid "Kana Lock key is locking"
 msgstr ""
 
 #: ../rules/base.xml.in.h:423
-msgid "Key(s) to change layout"
+msgid "Kannada"
 msgstr ""
 
 #: ../rules/base.xml.in.h:424
-msgid "Keytronic FlexPro"
+msgid "Kashubian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:425
-msgid "Khmer (Cambodian)"
+msgid "Kazakh"
 msgstr ""
 
 #: ../rules/base.xml.in.h:426
-msgid "Kikuyu"
+msgid "Kazakh (with Russian)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:427
-msgid "Kinesis"
+msgid "Key sequence to kill the X server"
 msgstr ""
 
 #: ../rules/base.xml.in.h:428
-msgid "Korean"
+msgid "Key to choose 3rd level"
 msgstr ""
 
 #: ../rules/base.xml.in.h:429
-msgid "Korean (101/104 key compatible)"
+msgid "Key to choose 5th level"
 msgstr ""
 
 #: ../rules/base.xml.in.h:430
-msgid "Kurdish (Iran, Arabic-Latin)"
+msgid "Key(s) to change layout"
 msgstr ""
 
 #: ../rules/base.xml.in.h:431
-msgid "Kurdish (Iran, F)"
+msgid "Keytronic FlexPro"
 msgstr ""
 
 #: ../rules/base.xml.in.h:432
-msgid "Kurdish (Iran, Latin Q)"
+msgid "Khmer (Cambodia)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:433
-msgid "Kurdish (Iran, latin alt-Q)"
+msgid "Kikuyu"
 msgstr ""
 
 #: ../rules/base.xml.in.h:434
-msgid "Kurdish (Iraq, Arabic-Latin)"
+msgid "Kinesis"
 msgstr ""
 
 #: ../rules/base.xml.in.h:435
-msgid "Kurdish (Iraq, F)"
+msgid "Komi"
 msgstr ""
 
 #: ../rules/base.xml.in.h:436
-msgid "Kurdish (Iraq, Latin Alt-Q)"
+msgid "Korean"
 msgstr ""
 
 #: ../rules/base.xml.in.h:437
-msgid "Kurdish (Iraq, Latin Q)"
+msgid "Korean (101/104 key compatible)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:438
-msgid "Kurdish (Syria, F)"
+msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:439
-msgid "Kurdish (Syria, Latin Alt-Q)"
+msgid "Kurdish (Iran, F)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:440
-msgid "Kurdish (Syria, Latin Q)"
+msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:441
-msgid "Kurdish (Turkey, F)"
+msgid "Kurdish (Iran, Latin Q)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:442
-msgid "Kurdish (Turkey, Latin Alt-Q)"
+msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:443
-msgid "Kurdish (Turkey, Latin Q)"
+msgid "Kurdish (Iraq, F)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:444
-msgid "Kutenai"
+msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:445
-msgid "Kyrgyz"
+msgid "Kurdish (Iraq, Latin Q)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:446
-msgid "Kyrgyz (phonetic)"
+msgid "Kurdish (Syria, F)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:447
-msgid "Lao"
+msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:448
-msgid "Lao (STEA proposed standard layout)"
+msgid "Kurdish (Syria, Latin Q)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:449
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgid "Kurdish (Turkey, F)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:450
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:451
-msgid "Laptop/notebook eMachines m68xx"
+msgid "Kurdish (Turkey, Latin Q)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:452
-msgid "Latvian"
+msgid "Kyrgyz"
 msgstr ""
 
 #: ../rules/base.xml.in.h:453
-msgid "Latvian (Apostrophe ' variant)"
+msgid "Kyrgyz (phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:454
-msgid "Latvian (F variant)"
+msgid "Lao"
 msgstr ""
 
 #: ../rules/base.xml.in.h:455
-msgid "Latvian (Tilde ~ variant)"
+msgid "Lao (STEA proposed standard layout)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:456
-msgid "Left Alt"
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:457
-msgid "Left Alt (while pressed)"
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:458
-msgid "Left Alt is swapped with Left Win"
+msgid "Laptop/notebook eMachines m68xx"
 msgstr ""
 
-#: ../rules/base.xml.in.h:459
-msgid "Left Ctrl"
+#: ../rules/base.xml.in.h:459 ../rules/base.extras.xml.in.h:12
+msgid "Latvian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:460
-msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
+msgid "Latvian (F variant)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:461
-msgid "Left Ctrl+Left Shift"
+msgid "Latvian (adapted)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:462
-msgid "Left Shift"
+msgid "Latvian (apostrophe variant)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:463
-msgid "Left Win"
+msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:464
-msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgid "Latvian (modern)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:465
-msgid "Left Win (while pressed)"
+msgid "Latvian (tilde variant)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:466
-msgid ""
-"Left Win chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser"
+msgid "Left Alt"
 msgstr ""
 
 #: ../rules/base.xml.in.h:467
-msgid ""
-"Left Win chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser, one press releases the lock"
+msgid "Left Alt (while pressed)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:468
-msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
+msgid "Left Alt is swapped with Left Win"
 msgstr ""
 
 #: ../rules/base.xml.in.h:469
-msgid "Legacy"
+msgid "Left Ctrl"
 msgstr ""
 
 #: ../rules/base.xml.in.h:470
-msgid "Legacy Wang 724"
+msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:471
+msgid "Left Ctrl+Left Shift"
 msgstr ""
 
-#. Actually, with KP_SEPARATOR, as the old keypad(comma)
 #: ../rules/base.xml.in.h:472
-msgid "Legacy key with comma"
+msgid "Left Shift"
 msgstr ""
 
 #: ../rules/base.xml.in.h:473
-msgid "Legacy key with dot"
+msgid "Left Win"
 msgstr ""
 
 #: ../rules/base.xml.in.h:474
-msgid "Lithuanian"
+msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:475
-msgid "Lithuanian (IBM LST 1205-92)"
+msgid "Left Win (while pressed)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:476
-msgid "Lithuanian (LEKP)"
+msgid ""
+"Left Win chooses 5th level, locks when pressed together with another 5th-"
+"level-chooser"
 msgstr ""
 
 #: ../rules/base.xml.in.h:477
-msgid "Lithuanian (LEKPa)"
+msgid ""
+"Left Win chooses 5th level, locks when pressed together with another 5th-"
+"level-chooser, one press releases the lock"
 msgstr ""
 
 #: ../rules/base.xml.in.h:478
-msgid "Lithuanian (US keyboard with Lithuanian letters)"
+msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:479
-msgid "Lithuanian (standard)"
+msgid "Legacy"
 msgstr ""
 
 #: ../rules/base.xml.in.h:480
-msgid "Logitech Access Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:481
-msgid "Logitech Cordless Desktop"
+msgid "Legacy Wang 724"
 msgstr ""
 
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
 #: ../rules/base.xml.in.h:482
-msgid "Logitech Cordless Desktop (alternate option)"
+msgid "Legacy key with comma"
 msgstr ""
 
 #: ../rules/base.xml.in.h:483
-msgid "Logitech Cordless Desktop EX110"
+msgid "Legacy key with dot"
 msgstr ""
 
-#: ../rules/base.xml.in.h:484
-msgid "Logitech Cordless Desktop LX-300"
+#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
+msgid "Lithuanian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:485
-msgid "Logitech Cordless Desktop Navigator"
+msgid "Lithuanian (IBM LST 1205-92)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:486
-msgid "Logitech Cordless Desktop Optical"
+msgid "Lithuanian (LEKP)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:487
-msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgid "Lithuanian (LEKPa)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:488
-msgid "Logitech Cordless Desktop iTouch"
+msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:489
-msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgid "Lithuanian (standard)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:490
-msgid "Logitech G15 extra keys via G15daemon"
+msgid "Logitech Access Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:491
-msgid "Logitech Generic Keyboard"
+msgid "Logitech Cordless Desktop"
 msgstr ""
 
 #: ../rules/base.xml.in.h:492
-msgid "Logitech Internet 350 Keyboard"
+msgid "Logitech Cordless Desktop (alternate option)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:493
-msgid "Logitech Internet Keyboard"
+msgid "Logitech Cordless Desktop EX110"
 msgstr ""
 
 #: ../rules/base.xml.in.h:494
-msgid "Logitech Internet Navigator Keyboard"
+msgid "Logitech Cordless Desktop LX-300"
 msgstr ""
 
 #: ../rules/base.xml.in.h:495
-msgid "Logitech Media Elite Keyboard"
+msgid "Logitech Cordless Desktop Navigator"
 msgstr ""
 
 #: ../rules/base.xml.in.h:496
-msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgid "Logitech Cordless Desktop Optical"
 msgstr ""
 
 #: ../rules/base.xml.in.h:497
-msgid "Logitech Ultra-X Keyboard"
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:498
-msgid "Logitech diNovo Edge Keyboard"
+msgid "Logitech Cordless Desktop iTouch"
 msgstr ""
 
 #: ../rules/base.xml.in.h:499
-msgid "Logitech diNovo Keyboard"
+msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr ""
 
 #: ../rules/base.xml.in.h:500
-msgid "Logitech iTouch"
+msgid "Logitech G15 extra keys via G15daemon"
 msgstr ""
 
 #: ../rules/base.xml.in.h:501
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgid "Logitech Generic Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:502
-msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgid "Logitech Internet 350 Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:503
-msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgid "Logitech Internet Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:504
-msgid "MacBook/MacBook Pro"
+msgid "Logitech Internet Navigator Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:505
-msgid "MacBook/MacBook Pro (Intl)"
+msgid "Logitech Media Elite Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:506
-msgid "Macedonian"
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:507
-msgid "Macedonian (eliminate dead keys)"
+msgid "Logitech Ultra-X Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:508
-msgid "Macintosh"
+msgid "Logitech diNovo Edge Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:509
-msgid "Macintosh Old"
+msgid "Logitech diNovo Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:510
-msgid "Make Caps Lock an additional Backspace"
+msgid "Logitech iTouch"
 msgstr ""
 
 #: ../rules/base.xml.in.h:511
-msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:512
-msgid "Make Caps Lock an additional Ctrl"
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
 msgstr ""
 
 #: ../rules/base.xml.in.h:513
-msgid "Make Caps Lock an additional ESC"
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:514
-msgid "Make Caps Lock an additional Hyper"
+msgid "Lower Sorbian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:515
-msgid "Make Caps Lock an additional Num Lock"
+msgid "Lower Sorbian (qwertz)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:516
-msgid "Make Caps Lock an additional Super"
+msgid "MacBook/MacBook Pro"
 msgstr ""
 
 #: ../rules/base.xml.in.h:517
-msgid "Malayalam"
+msgid "MacBook/MacBook Pro (Intl)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:518
-msgid "Malayalam (Lalitha)"
+msgid "Macedonian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:519
-msgid "Malayalam (enhanced Inscript with Rupee Sign)"
+msgid "Macedonian (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:520
-msgid "Maltese"
+msgid "Macintosh"
 msgstr ""
 
 #: ../rules/base.xml.in.h:521
-msgid "Maltese (with US layout)"
+msgid "Macintosh Old"
 msgstr ""
 
 #: ../rules/base.xml.in.h:522
-msgid "Memorex MX1998"
+msgid "Make Caps Lock an additional Backspace"
 msgstr ""
 
 #: ../rules/base.xml.in.h:523
-msgid "Memorex MX2500 EZ-Access Keyboard"
+msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr ""
 
 #: ../rules/base.xml.in.h:524
-msgid "Memorex MX2750"
+msgid "Make Caps Lock an additional Ctrl"
 msgstr ""
 
 #: ../rules/base.xml.in.h:525
-msgid "Menu"
+msgid "Make Caps Lock an additional ESC"
 msgstr ""
 
 #: ../rules/base.xml.in.h:526
-msgid "Meta is mapped to Left Win"
+msgid "Make Caps Lock an additional Hyper"
 msgstr ""
 
 #: ../rules/base.xml.in.h:527
-msgid "Meta is mapped to Win keys"
+msgid "Make Caps Lock an additional Num Lock"
 msgstr ""
 
 #: ../rules/base.xml.in.h:528
-msgid "Meta on Left Ctrl"
+msgid "Make Caps Lock an additional Super"
 msgstr ""
 
 #: ../rules/base.xml.in.h:529
-msgid "Microsoft Comfort Curve Keyboard 2000"
+msgid "Malayalam"
 msgstr ""
 
 #: ../rules/base.xml.in.h:530
-msgid "Microsoft Internet Keyboard"
+msgid "Malayalam (Lalitha)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:531
-msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:532
-msgid "Microsoft Natural"
+msgid "Maltese"
 msgstr ""
 
 #: ../rules/base.xml.in.h:533
-msgid "Microsoft Natural Keyboard Elite"
+msgid "Maltese (with US layout)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:534
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgid "Maori"
 msgstr ""
 
 #: ../rules/base.xml.in.h:535
-msgid "Microsoft Natural Keyboard Pro OEM"
+msgid "Mari"
 msgstr ""
 
 #: ../rules/base.xml.in.h:536
-msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgid "Memorex MX1998"
 msgstr ""
 
 #: ../rules/base.xml.in.h:537
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
+msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:538
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgid "Memorex MX2750"
 msgstr ""
 
 #: ../rules/base.xml.in.h:539
-msgid "Microsoft Office Keyboard"
+msgid "Menu"
 msgstr ""
 
 #: ../rules/base.xml.in.h:540
-msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgid "Meta is mapped to Left Win"
 msgstr ""
 
 #: ../rules/base.xml.in.h:541
-msgid "Miscellaneous compatibility options"
+msgid "Meta is mapped to Win keys"
 msgstr ""
 
 #: ../rules/base.xml.in.h:542
-msgid "Mongolian"
+msgid "Meta on Left Ctrl"
 msgstr ""
 
 #: ../rules/base.xml.in.h:543
-msgid "Montenegrin"
+msgid "Microsoft Comfort Curve Keyboard 2000"
 msgstr ""
 
 #: ../rules/base.xml.in.h:544
-msgid "Montenegrin (Cyrillic with guillemets)"
+msgid "Microsoft Internet Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:545
-msgid "Montenegrin (Cyrillic)"
+msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr ""
 
 #: ../rules/base.xml.in.h:546
-msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
+msgid "Microsoft Natural"
 msgstr ""
 
 #: ../rules/base.xml.in.h:547
-msgid "Montenegrin (Latin qwerty)"
+msgid "Microsoft Natural Keyboard Elite"
 msgstr ""
 
 #: ../rules/base.xml.in.h:548
-msgid "Montenegrin (Latin unicode qwerty)"
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr ""
 
 #: ../rules/base.xml.in.h:549
-msgid "Montenegrin (Latin unicode)"
+msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr ""
 
 #: ../rules/base.xml.in.h:550
-msgid "Montenegrin (Latin with guillemets)"
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
 msgstr ""
 
 #: ../rules/base.xml.in.h:551
-msgid "Māori"
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 msgstr ""
 
 #: ../rules/base.xml.in.h:552
-msgid "NICOLA-F style Backspace"
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 msgstr ""
 
 #: ../rules/base.xml.in.h:553
-msgid "Nepali"
+msgid "Microsoft Office Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:554
-msgid "Non-breakable space character at fourth level"
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr ""
 
 #: ../rules/base.xml.in.h:555
-msgid ""
-"Non-breakable space character at fourth level, thin non-breakable space "
-"character at sixth level"
+msgid "Miscellaneous compatibility options"
 msgstr ""
 
 #: ../rules/base.xml.in.h:556
-msgid ""
-"Non-breakable space character at fourth level, thin non-breakable space "
-"character at sixth level (via Ctrl+Shift)"
+msgid "Mongolian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:557
-msgid "Non-breakable space character at second level"
+msgid "Montenegrin"
 msgstr ""
 
 #: ../rules/base.xml.in.h:558
-msgid "Non-breakable space character at third level"
+msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:559
-msgid "Non-breakable space character at third level, nothing at fourth level"
+msgid "Montenegrin (Cyrillic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:560
-msgid ""
-"Non-breakable space character at third level, thin non-breakable space "
-"character at fourth level"
+msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:561
-msgid "Northgate OmniKey 101"
+msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:562
-msgid "Norwegian"
+msgid "Montenegrin (Latin Unicode)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:563
-msgid "Norwegian (Dvorak)"
+msgid "Montenegrin (Latin qwerty)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:564
-msgid "Norwegian (Mac)"
+msgid "Montenegrin (Latin with guillemets)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:565
-msgid "Norwegian (Mac, eliminate dead keys)"
+msgid "NICOLA-F style Backspace"
 msgstr ""
 
 #: ../rules/base.xml.in.h:566
-msgid "Norwegian (Northern Saami"
+msgid "Nepali"
 msgstr ""
 
 #: ../rules/base.xml.in.h:567
-msgid "Norwegian (eliminate dead keys)"
+msgid "Non-breakable space character at fourth level"
 msgstr ""
 
 #: ../rules/base.xml.in.h:568
-msgid "Norwegian (northern Saami, eliminate dead keys)"
+msgid ""
+"Non-breakable space character at fourth level, thin non-breakable space "
+"character at sixth level"
 msgstr ""
 
 #: ../rules/base.xml.in.h:569
-msgid "Num Lock"
+msgid ""
+"Non-breakable space character at fourth level, thin non-breakable space "
+"character at sixth level (via Ctrl+Shift)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:570
-msgid "Numeric keypad delete key behaviour"
+msgid "Non-breakable space character at second level"
 msgstr ""
 
 #: ../rules/base.xml.in.h:571
-msgid "Numeric keypad keys work as with Mac"
+msgid "Non-breakable space character at third level"
 msgstr ""
 
 #: ../rules/base.xml.in.h:572
-msgid "Numeric keypad layout selection"
+msgid "Non-breakable space character at third level, nothing at fourth level"
 msgstr ""
 
 #: ../rules/base.xml.in.h:573
-msgid "OLPC"
+msgid ""
+"Non-breakable space character at third level, thin non-breakable space "
+"character at fourth level"
 msgstr ""
 
 #: ../rules/base.xml.in.h:574
-msgid "Oriya"
+msgid "Northern Saami (Finland)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:575
-msgid "Ortek MCK-800 MM/Internet keyboard"
+msgid "Northern Saami (Norway)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:576
-msgid "PC-98xx Series"
+msgid "Northern Saami (Norway, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:577
-msgid "Pashto"
+msgid "Northern Saami (Sweden)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:578
-msgid "Pashto (Afghanistan, OLPC)"
+msgid "Northgate OmniKey 101"
 msgstr ""
 
 #: ../rules/base.xml.in.h:579
-msgid "Pause"
+msgid "Norwegian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:580
-msgid "Persian"
+msgid "Norwegian (Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:581
-msgid "Persian (Afghanistan, Dari OLPC)"
+msgid "Norwegian (Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:582
-msgid "Persian (with Persian Keypad)"
+msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:583
-msgid "Philippines - Dvorak (Baybayin)"
+msgid "Norwegian (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:584
-msgid "Polish"
+msgid "Num Lock"
 msgstr ""
 
 #: ../rules/base.xml.in.h:585
-msgid "Polish (Dvorak)"
+msgid "Numeric keypad delete key behaviour"
 msgstr ""
 
 #: ../rules/base.xml.in.h:586
-msgid "Polish (Dvorak, polish quotes on key 1)"
+msgid "Numeric keypad keys work as with Macintosh"
 msgstr ""
 
 #: ../rules/base.xml.in.h:587
-msgid "Polish (Dvorak, polish quotes on quotemark key)"
+msgid "Numeric keypad layout selection"
 msgstr ""
 
 #: ../rules/base.xml.in.h:588
-msgid "Polish (Kashubian)"
+msgid "OLPC"
 msgstr ""
 
 #: ../rules/base.xml.in.h:589
-msgid "Polish (programmer Dvorak)"
+msgid "Occitan"
 msgstr ""
 
 #: ../rules/base.xml.in.h:590
-msgid "Polish (qwertz)"
+msgid "Ogham"
 msgstr ""
 
 #: ../rules/base.xml.in.h:591
-msgid "Portuguese"
+msgid "Ogham (IS434)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:592
-msgid "Portuguese (Brazil)"
+msgid "Oriya"
 msgstr ""
 
 #: ../rules/base.xml.in.h:593
-msgid "Portuguese (Brazil, Dvorak)"
+msgid "Ortek MCK-800 MM/Internet keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:594
-msgid "Portuguese (Brazil, eliminate dead keys)"
+msgid "Ossetian (Georgia)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:595
-msgid "Portuguese (Brazil, nativo for Esperanto)"
+msgid "Ossetian (WinKeys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:596
-msgid "Portuguese (Brazil, nativo for USA keyboards)"
+msgid "Ossetian (legacy)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:597
-msgid "Portuguese (Brazil, nativo)"
+msgid "PC-98xx Series"
 msgstr ""
 
 #: ../rules/base.xml.in.h:598
-msgid "Portuguese (Mac)"
+msgid "Pannonian Rusyn (homophonic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:599
-msgid "Portuguese (Mac, Sun dead keys)"
+msgid "Pashto"
 msgstr ""
 
 #: ../rules/base.xml.in.h:600
-msgid "Portuguese (Mac, eliminate dead keys)"
+msgid "Pashto (Afghanistan, OLPC)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:601
-msgid "Portuguese (Nativo for Esperanto)"
+msgid "Pause"
 msgstr ""
 
-#: ../rules/base.xml.in.h:602
-msgid "Portuguese (Nativo for USA keyboards)"
+#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:23
+msgid "Persian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:603
-msgid "Portuguese (Nativo)"
+msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:604
-msgid "Portuguese (Sun dead keys)"
+msgid "Persian (with Persian Keypad)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:605
-msgid "Portuguese (eliminate dead keys)"
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
+msgid "Polish"
 msgstr ""
 
 #: ../rules/base.xml.in.h:606
-msgid "Propeller Voyager (KTEZ-1000)"
+msgid "Polish (Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:607
-msgid "PrtSc"
+msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:608
-msgid "Punjabi (Gurmukhi Jhelum)"
+msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:609
-msgid "Punjabi (Gurmukhi)"
+msgid "Polish (programmer Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:610
-msgid "QTronix Scorpius 98N+"
+msgid "Polish (qwertz)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:611
-msgid "Right Alt"
+msgid "Portuguese"
 msgstr ""
 
 #: ../rules/base.xml.in.h:612
-msgid "Right Alt (while pressed)"
+msgid "Portuguese (Brazil)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:613
-msgid ""
-"Right Alt chooses 5th level and activates level5-Lock when pressed together "
-"with another 5th-level-chooser, one press releases the lock"
+msgid "Portuguese (Brazil, Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:614
-msgid ""
-"Right Alt chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser"
+msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:615
-msgid ""
-"Right Alt chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser, one press releases the lock"
+msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:616
-msgid "Right Alt key never chooses 3rd level"
+msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:617
-msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgid "Portuguese (Brazil, nativo)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:618
-msgid "Right Ctrl"
+msgid "Portuguese (Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:619
-msgid "Right Ctrl (while pressed)"
+msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:620
-msgid "Right Ctrl as Right Alt"
+msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:621
-msgid "Right Ctrl is mapped to Menu"
+msgid "Portuguese (Nativo for USA keyboards)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:622
-msgid "Right Ctrl+Right Shift"
+msgid "Portuguese (Nativo)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:623
-msgid "Right Shift"
+msgid "Portuguese (Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:624
-msgid "Right Win"
+msgid "Portuguese (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:625
-msgid "Right Win (while pressed)"
+msgid "Propeller Voyager (KTEZ-1000)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:626
-msgid ""
-"Right Win chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser"
+msgid "PrtSc"
 msgstr ""
 
 #: ../rules/base.xml.in.h:627
-msgid ""
-"Right Win chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser, one press releases the lock"
+msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:628
-msgid "Romanian"
+msgid "Punjabi (Gurmukhi)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:629
-msgid "Romanian (Crimean Tatar Dobruca-1 Q)"
+msgid "QTronix Scorpius 98N+"
 msgstr ""
 
 #: ../rules/base.xml.in.h:630
-msgid "Romanian (Crimean Tatar Dobruca-2 Q)"
+msgid "Right Alt"
 msgstr ""
 
 #: ../rules/base.xml.in.h:631
-msgid "Romanian (Crimean Tatar Turkish Alt-Q)"
+msgid "Right Alt (while pressed)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:632
-msgid "Romanian (Crimean Tatar Turkish F)"
+msgid ""
+"Right Alt chooses 5th level and activates level5-Lock when pressed together "
+"with another 5th-level-chooser, one press releases the lock"
 msgstr ""
 
 #: ../rules/base.xml.in.h:633
-msgid "Romanian (WinKeys)"
+msgid ""
+"Right Alt chooses 5th level, locks when pressed together with another 5th-"
+"level-chooser"
 msgstr ""
 
 #: ../rules/base.xml.in.h:634
-msgid "Romanian (cedilla)"
+msgid ""
+"Right Alt chooses 5th level, locks when pressed together with another 5th-"
+"level-chooser, one press releases the lock"
 msgstr ""
 
 #: ../rules/base.xml.in.h:635
-msgid "Romanian (standard cedilla)"
+msgid "Right Alt key never chooses 3rd level"
 msgstr ""
 
 #: ../rules/base.xml.in.h:636
-msgid "Romanian (standard)"
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr ""
 
 #: ../rules/base.xml.in.h:637
-msgid "Rupee on 4"
+msgid "Right Ctrl"
 msgstr ""
 
 #: ../rules/base.xml.in.h:638
-msgid "Russian"
+msgid "Right Ctrl (while pressed)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:639
-msgid "Russian (Bashkirian)"
+msgid "Right Ctrl as Right Alt"
 msgstr ""
 
 #: ../rules/base.xml.in.h:640
-msgid "Russian (Chuvash Latin)"
+msgid "Right Ctrl is mapped to Menu"
 msgstr ""
 
 #: ../rules/base.xml.in.h:641
-msgid "Russian (Chuvash)"
+msgid "Right Ctrl+Right Shift"
 msgstr ""
 
 #: ../rules/base.xml.in.h:642
-msgid "Russian (DOS)"
+msgid "Right Shift"
 msgstr ""
 
 #: ../rules/base.xml.in.h:643
-msgid "Russian (Georgia)"
+msgid "Right Win"
 msgstr ""
 
 #: ../rules/base.xml.in.h:644
-msgid "Russian (Germany, phonetic)"
+msgid "Right Win (while pressed)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:645
-msgid "Russian (Kalmyk)"
+msgid ""
+"Right Win chooses 5th level, locks when pressed together with another 5th-"
+"level-chooser"
 msgstr ""
 
 #: ../rules/base.xml.in.h:646
-msgid "Russian (Kazakhstan, with Kazakh)"
+msgid ""
+"Right Win chooses 5th level, locks when pressed together with another 5th-"
+"level-chooser, one press releases the lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:647
-msgid "Russian (Komi)"
+#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
+msgid "Romanian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:648
-msgid "Russian (Mari)"
+msgid "Romanian (Germany)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:649
-msgid "Russian (Ossetian, WinKeys)"
+msgid "Romanian (Germany, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:650
-msgid "Russian (Ossetian, legacy)"
+msgid "Romanian (WinKeys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:651
-msgid "Russian (Poland, phonetic Dvorak)"
+msgid "Romanian (cedilla)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:652
-msgid "Russian (Serbian)"
+msgid "Romanian (standard cedilla)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:653
-msgid "Russian (Sweden, phonetic)"
+msgid "Romanian (standard)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:654
-msgid "Russian (Sweden, phonetic, eliminate dead keys)"
+msgid "Rupee on 4"
 msgstr ""
 
-#: ../rules/base.xml.in.h:655
-msgid "Russian (Tatar)"
+#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
+msgid "Russian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:656
-msgid "Russian (US, phonetic)"
+msgid "Russian (DOS)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:657
-msgid "Russian (Udmurt)"
+msgid "Russian (Georgia)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:658
-msgid "Russian (Yakut)"
+msgid "Russian (Germany, phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:659
-msgid "Russian (legacy)"
+msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:660
-msgid "Russian (phonetic WinKeys)"
+msgid "Russian (Poland, phonetic Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:661
-msgid "Russian (phonetic)"
+msgid "Russian (Sweden, phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:662
-msgid "Russian (typewriter)"
+msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:663
-msgid "Russian (typewriter, legacy)"
+msgid "Russian (US, phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:664
-msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgid "Russian (Ukraine, standard RSTU)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:665
-msgid "SK-1300"
+msgid "Russian (legacy)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:666
-msgid "SK-2500"
+msgid "Russian (phonetic WinKeys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:667
-msgid "SK-6200"
+msgid "Russian (phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:668
-msgid "SK-7100"
+msgid "Russian (typewriter)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:669
-msgid "SVEN Ergonomic 2500"
+msgid "Russian (typewriter, legacy)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:670
-msgid "SVEN Slim 303"
+msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:671
-msgid "Saisiyat (Taiwan)"
+msgid "SK-1300"
 msgstr ""
 
 #: ../rules/base.xml.in.h:672
-msgid "Samsung SDM 4500P"
+msgid "SK-2500"
 msgstr ""
 
 #: ../rules/base.xml.in.h:673
-msgid "Samsung SDM 4510P"
+msgid "SK-6200"
 msgstr ""
 
 #: ../rules/base.xml.in.h:674
-msgid "Sanwa Supply SKB-KG3"
+msgid "SK-7100"
 msgstr ""
 
 #: ../rules/base.xml.in.h:675
-msgid "Scroll Lock"
+msgid "SVEN Ergonomic 2500"
 msgstr ""
 
 #: ../rules/base.xml.in.h:676
-msgid "Secwepemctsin"
+msgid "SVEN Slim 303"
 msgstr ""
 
 #: ../rules/base.xml.in.h:677
-msgid "Semi-colon on third level"
+msgid "Saisiyat (Taiwan)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:678
-msgid "Serbian"
+msgid "Samsung SDM 4500P"
 msgstr ""
 
 #: ../rules/base.xml.in.h:679
-msgid "Serbian (Latin Unicode qwerty)"
+msgid "Samsung SDM 4510P"
 msgstr ""
 
 #: ../rules/base.xml.in.h:680
-msgid "Serbian (Latin Unicode)"
+msgid "Sanwa Supply SKB-KG3"
 msgstr ""
 
 #: ../rules/base.xml.in.h:681
-msgid "Serbian (Latin qwerty)"
+msgid "Scroll Lock"
 msgstr ""
 
 #: ../rules/base.xml.in.h:682
-msgid "Serbian (Latin with guillemets)"
+msgid "Semi-colon on third level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:683
-msgid "Serbian (Latin)"
+#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
+msgid "Serbian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:684
-msgid "Serbian (Pannonian Rusyn Homophonic)"
+msgid "Serbian (Latin Unicode qwerty)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:685
-msgid "Serbian (Z and ZHE swapped)"
+msgid "Serbian (Latin Unicode)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:686
-msgid "Serbian (with guillemets)"
+msgid "Serbian (Latin qwerty)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:687
-msgid "Serbo-Croatian (US)"
+msgid "Serbian (Latin with guillemets)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:688
-msgid "Shift cancels Caps Lock"
+msgid "Serbian (Latin)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:689
-msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
+msgid "Serbian (Russia)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:690
-msgid "Shift with numeric keypad keys works as in MS Windows"
+msgid "Serbian (Z and ZHE swapped)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:691
-msgid "Shift+Caps Lock"
+msgid "Serbian (with guillemets)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:692
-msgid "Sindhi"
+msgid "Serbo-Croatian (US)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:693
-msgid "Sinhala"
+msgid "Shift cancels Caps Lock"
 msgstr ""
 
 #: ../rules/base.xml.in.h:694
-msgid "Slovak"
+msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr ""
 
 #: ../rules/base.xml.in.h:695
-msgid "Slovak (extended Backslash)"
+msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr ""
 
 #: ../rules/base.xml.in.h:696
-msgid "Slovak (qwerty)"
+msgid "Shift+Caps Lock"
 msgstr ""
 
 #: ../rules/base.xml.in.h:697
-msgid "Slovak (qwerty, extended Backslash)"
+msgid "Sindhi"
 msgstr ""
 
 #: ../rules/base.xml.in.h:698
-msgid "Slovene"
+msgid "Sinhala"
 msgstr ""
 
 #: ../rules/base.xml.in.h:699
-msgid "Slovene (US keyboard with Slovenian letters)"
+msgid "Slovak"
 msgstr ""
 
 #: ../rules/base.xml.in.h:700
-msgid "Slovene (use guillemets for quotes)"
+msgid "Slovak (extended Backslash)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:701
-msgid "Spanish"
+msgid "Slovak (qwerty)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:702
-msgid "Spanish (Asturian variant with bottom-dot H and bottom-dot L)"
+msgid "Slovak (qwerty, extended Backslash)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:703
-msgid "Spanish (Catalan variant with middle-dot L)"
+msgid "Slovenian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:704
-msgid "Spanish (Dvorak)"
+msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:705
-msgid "Spanish (Latin American)"
+msgid "Slovenian (use guillemets for quotes)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:706
-msgid "Spanish (Latin American, eliminate dead keys)"
+msgid "Spanish"
 msgstr ""
 
 #: ../rules/base.xml.in.h:707
-msgid "Spanish (Latin American, include dead tilde)"
+msgid "Spanish (Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:708
-msgid "Spanish (Latin American, sun dead keys)"
+msgid "Spanish (Latin American)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:709
-msgid "Spanish (Mac)"
+msgid "Spanish (Latin American, Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:710
-msgid "Spanish (Sun dead keys)"
+msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:711
-msgid "Spanish (eliminate dead keys)"
+msgid "Spanish (Latin American, include dead tilde)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:712
-msgid "Spanish (include dead tilde)"
+msgid "Spanish (Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:713
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
+msgid "Spanish (Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:714
-msgid "Sun Type 5/6"
+msgid "Spanish (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:715
-msgid "Super Power Multimedia Keyboard"
+msgid "Spanish (include dead tilde)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:716
-msgid "Swahili (Kenya)"
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr ""
 
 #: ../rules/base.xml.in.h:717
-msgid "Swahili (Tanzania)"
+msgid "Sun Type 5/6"
 msgstr ""
 
 #: ../rules/base.xml.in.h:718
-msgid "Swap Ctrl and Caps Lock"
+msgid "Super Power Multimedia Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:719
-msgid "Swap ESC and Caps Lock"
+msgid "Swahili (Kenya)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:720
-msgid "Swedish"
+msgid "Swahili (Tanzania)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:721
-msgid "Swedish (Dvorak)"
+msgid "Swap Ctrl and Caps Lock"
 msgstr ""
 
 #: ../rules/base.xml.in.h:722
-msgid "Swedish (Mac)"
+msgid "Swap ESC and Caps Lock"
 msgstr ""
 
 #: ../rules/base.xml.in.h:723
-msgid "Swedish (Svdvorak)"
+msgid "Swedish"
 msgstr ""
 
 #: ../rules/base.xml.in.h:724
-msgid "Swedish (eliminate dead keys)"
+msgid "Swedish (Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:725
-msgid "Swedish (northern Saami)"
+msgid "Swedish (Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:726
-msgid "Swiss"
+msgid "Swedish (Svdvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:727
-msgid "Swiss (legacy)"
+msgid "Swedish (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:728
-msgid "Symplon PaceBook (tablet PC)"
+msgid "Swedish Sign Language"
 msgstr ""
 
 #: ../rules/base.xml.in.h:729
-msgid "Syriac"
+msgid "Symplon PaceBook (tablet PC)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:730
-msgid "Syriac (phonetic)"
+msgid "Syriac"
 msgstr ""
 
 #: ../rules/base.xml.in.h:731
-msgid "Taiwanese"
+msgid "Syriac (phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:732
-msgid "Taiwanese (indigenous)"
+msgid "Taiwanese"
 msgstr ""
 
 #: ../rules/base.xml.in.h:733
-msgid "Tajik"
+msgid "Taiwanese (indigenous)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:734
-msgid "Tajik (legacy)"
+msgid "Tajik"
 msgstr ""
 
 #: ../rules/base.xml.in.h:735
-msgid "Tamil"
+msgid "Tajik (legacy)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:736
-msgid "Tamil (Sri Lanka, TAB Typewriter)"
+msgid "Tamil"
 msgstr ""
 
 #: ../rules/base.xml.in.h:737
-msgid "Tamil (Sri Lanka, Unicode)"
+msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:738
-msgid "Tamil (TAB typewriter)"
+msgid "Tamil (Sri Lanka, Unicode)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:739
-msgid "Tamil (TSCII typewriter)"
+msgid "Tamil (TAB typewriter)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:740
-msgid "Tamil (Unicode)"
+msgid "Tamil (TSCII typewriter)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:741
-msgid "Tamil (keyboard with numerals)"
+msgid "Tamil (Unicode)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:742
-msgid "Targa Visionary 811"
+msgid "Tamil (keyboard with numerals)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:743
-msgid "Telugu"
+msgid "Targa Visionary 811"
 msgstr ""
 
 #: ../rules/base.xml.in.h:744
-msgid "Thai"
+msgid "Tatar"
 msgstr ""
 
 #: ../rules/base.xml.in.h:745
-msgid "Thai (Pattachote)"
+msgid "Telugu"
 msgstr ""
 
 #: ../rules/base.xml.in.h:746
-msgid "Thai (TIS-820.2538)"
+msgid "Thai"
 msgstr ""
 
 #: ../rules/base.xml.in.h:747
-msgid "To the corresponding key in a Dvorak keyboard."
+msgid "Thai (Pattachote)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:748
-msgid "To the corresponding key in a Qwerty keyboard."
+msgid "Thai (TIS-820.2538)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:749
-msgid "Toggle PointerKeys with Shift + NumLock."
+msgid "Tibetan"
 msgstr ""
 
 #: ../rules/base.xml.in.h:750
-msgid "Toshiba Satellite S3000"
+msgid "Tibetan (with ASCII numerals)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:751
-msgid "Trust Direct Access Keyboard"
+msgid "To the corresponding key in a Dvorak keyboard."
 msgstr ""
 
 #: ../rules/base.xml.in.h:752
-msgid "Trust Slimline"
+msgid "To the corresponding key in a Qwerty keyboard."
 msgstr ""
 
 #: ../rules/base.xml.in.h:753
-msgid "Trust Wireless Keyboard Classic"
+msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr ""
 
 #: ../rules/base.xml.in.h:754
-msgid "Tswana"
+msgid "Toshiba Satellite S3000"
 msgstr ""
 
 #: ../rules/base.xml.in.h:755
-msgid "Turkish"
+msgid "Trust Direct Access Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:756
-msgid "Turkish (Alt-Q)"
+msgid "Trust Slimline"
 msgstr ""
 
 #: ../rules/base.xml.in.h:757
-msgid "Turkish (Crimean Tatar Turkish Alt-Q)"
+msgid "Trust Wireless Keyboard Classic"
 msgstr ""
 
 #: ../rules/base.xml.in.h:758
-msgid "Turkish (Crimean Tatar Turkish F)"
+msgid "Tswana"
 msgstr ""
 
 #: ../rules/base.xml.in.h:759
-msgid "Turkish (Crimean Tatar Turkish Q)"
+msgid "Turkish"
 msgstr ""
 
 #: ../rules/base.xml.in.h:760
-msgid "Turkish (F)"
+msgid "Turkish (Alt-Q)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:761
-msgid "Turkish (Sun dead keys)"
+msgid "Turkish (F)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:762
-msgid "Turkish (international with dead keys)"
+msgid "Turkish (Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:763
-msgid "Turkmen"
+msgid "Turkish (international with dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:764
-msgid "Turkmen (Alt-Q)"
+msgid "Turkmen"
 msgstr ""
 
 #: ../rules/base.xml.in.h:765
-msgid "TypeMatrix EZ-Reach 2020"
+msgid "Turkmen (Alt-Q)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:766
-msgid "TypeMatrix EZ-Reach 2030 PS2"
+msgid "TypeMatrix EZ-Reach 2020"
 msgstr ""
 
 #: ../rules/base.xml.in.h:767
-msgid "TypeMatrix EZ-Reach 2030 USB"
+msgid "TypeMatrix EZ-Reach 2030 PS2"
 msgstr ""
 
 #: ../rules/base.xml.in.h:768
-msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
+msgid "TypeMatrix EZ-Reach 2030 USB"
 msgstr ""
 
 #: ../rules/base.xml.in.h:769
-msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
+msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:770
-msgid "Ukrainian"
+msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:771
-msgid "Ukrainian (Crimean Tatar Turkish Alt-Q)"
+msgid "Udmurt"
 msgstr ""
 
 #: ../rules/base.xml.in.h:772
-msgid "Ukrainian (Crimean Tatar Turkish F)"
+msgid "Ukrainian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:773
-msgid "Ukrainian (Crimean Tatar Turkish Q)"
+msgid "Ukrainian (WinKeys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:774
-msgid "Ukrainian (WinKeys)"
+msgid "Ukrainian (homophonic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:775
-msgid "Ukrainian (homophonic)"
+msgid "Ukrainian (legacy)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:776
-msgid "Ukrainian (legacy)"
+msgid "Ukrainian (phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:777
-msgid "Ukrainian (phonetic)"
+msgid "Ukrainian (standard RSTU)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:778
-msgid "Ukrainian (standard RSTU on Russian layout)"
+msgid "Ukrainian (typewriter)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:779
-msgid "Ukrainian (standard RSTU)"
+msgid "Unicode additions (arrows and math operators)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:780
-msgid "Ukrainian (typewriter)"
+msgid ""
+"Unicode additions (arrows and math operators). Math operators on default "
+"level"
 msgstr ""
 
 #: ../rules/base.xml.in.h:781
-msgid "Unicode additions (arrows and math operators)"
+msgid "Unitek KB-1925"
 msgstr ""
 
 #: ../rules/base.xml.in.h:782
-msgid ""
-"Unicode additions (arrows and math operators). Math operators on default "
-"level"
+msgid "Urdu (Pakistan)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:783
-msgid "Unitek KB-1925"
+msgid "Urdu (Pakistan, CRULP)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:784
-msgid "Urdu (Pakistan)"
+msgid "Urdu (Pakistan, NLA)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:785
-msgid "Urdu (Pakistan, CRULP)"
+msgid "Urdu (WinKeys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:786
-msgid "Urdu (Pakistan, NLA)"
+msgid "Urdu (alternative phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:787
-msgid "Urdu (WinKeys)"
+msgid "Urdu (phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:788
-msgid "Urdu (alternative phonetic)"
+msgid "Use keyboard LED to show alternative layout"
 msgstr ""
 
 #: ../rules/base.xml.in.h:789
-msgid "Urdu (phonetic)"
+msgid "Using space key to input non-breakable space character"
 msgstr ""
 
 #: ../rules/base.xml.in.h:790
-msgid "Use keyboard LED to show alternative layout"
+msgid "Usual space at any level"
 msgstr ""
 
 #: ../rules/base.xml.in.h:791
-msgid "Using space key to input non-breakable space character"
+msgid "Uyghur"
 msgstr ""
 
 #: ../rules/base.xml.in.h:792
-msgid "Usual space at any level"
+msgid "Uzbek"
 msgstr ""
 
 #: ../rules/base.xml.in.h:793
-msgid "Uzbek"
+msgid "Uzbek (Afghanistan)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:794
-msgid "Uzbek (Afghanistan)"
+msgid "Uzbek (Afghanistan, OLPC)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:795
-msgid "Uzbek (Afghanistan, OLPC)"
+msgid "Uzbek (Latin)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:796
-msgid "Uzbek (Crimean Tatar Turkish Alt-Q)"
+msgid "Vietnamese"
 msgstr ""
 
 #: ../rules/base.xml.in.h:797
-msgid "Uzbek (Crimean Tatar Turkish F)"
+msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:798
-msgid "Uzbek (Crimean Tatar Turkish Q)"
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:799
-msgid "Uzbek (Latin)"
+msgid ""
+"Wang 724 keypad with Unicode additions (arrows and math operators). Math "
+"operators on default level"
 msgstr ""
 
 #: ../rules/base.xml.in.h:800
-msgid "Vietnamese"
+msgid "Winbook Model XP5"
 msgstr ""
 
 #: ../rules/base.xml.in.h:801
-msgid "ViewSonic KU-306 Internet Keyboard"
+msgid "Wolof"
 msgstr ""
 
 #: ../rules/base.xml.in.h:802
-msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgid "Yahoo! Internet Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:803
-msgid ""
-"Wang 724 keypad with unicode additions (arrows and math operators). Math "
-"operators on default level"
+msgid "Yakut"
 msgstr ""
 
 #: ../rules/base.xml.in.h:804
-msgid "Winbook Model XP5"
-msgstr ""
-
-#: ../rules/base.xml.in.h:805
-msgid "Wolof"
-msgstr ""
-
-#: ../rules/base.xml.in.h:806
-msgid "Yahoo! Internet Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:807
 msgid "Yoruba"
 msgstr ""
 
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:805
 msgid "Zero-width non-joiner character at second level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:806
 msgid ""
 "Zero-width non-joiner character at second level, non-breakable space "
 "character at third level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:807
 msgid ""
 "Zero-width non-joiner character at second level, non-breakable space "
 "character at third level, nothing at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:808
 msgid ""
 "Zero-width non-joiner character at second level, non-breakable space "
 "character at third level, thin non-breakable space at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:809
 msgid ""
 "Zero-width non-joiner character at second level, non-breakable space "
 "character at third level, zero-width joiner at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:810
 msgid ""
 "Zero-width non-joiner character at second level, zero-width joiner character "
 "at third level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:811
 msgid ""
 "Zero-width non-joiner character at second level, zero-width joiner character "
 "at third level, non-breakable space character at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:815
+#: ../rules/base.xml.in.h:812
 msgid ""
 "Zero-width non-joiner character at third level, zero-width joiner at fourth "
 "level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:813
 msgid "ak"
 msgstr ""
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:814
 msgid "am"
 msgstr ""
 
-#: ../rules/base.xml.in.h:818
+#: ../rules/base.xml.in.h:815
 msgid "ar"
 msgstr ""
 
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:816
 msgid "avn"
 msgstr ""
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:817
 msgid "az"
 msgstr ""
 
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:818
 msgid "be"
 msgstr ""
 
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:819
 msgid "ber"
 msgstr ""
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:820
 msgid "bg"
 msgstr ""
 
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:821
 msgid "bm"
 msgstr ""
 
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:822
 msgid "bn"
 msgstr ""
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:823
 msgid "brl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:824
 msgid "bs"
 msgstr ""
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:825
 msgid "ca"
 msgstr ""
 
-#: ../rules/base.xml.in.h:829
-msgid "che"
+#: ../rules/base.xml.in.h:826
+msgid "chr"
 msgstr ""
 
-#: ../rules/base.xml.in.h:830
-msgid "chr"
+#: ../rules/base.xml.in.h:827
+msgid "cm"
 msgstr ""
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:828
+msgid "crh"
+msgstr ""
+
+#: ../rules/base.xml.in.h:829
 msgid "cs"
 msgstr ""
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:830
 msgid "da"
 msgstr ""
 
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:831
 msgid "de"
 msgstr ""
 
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:832
 msgid "dv"
 msgstr ""
 
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:833
 msgid "dz"
 msgstr ""
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:834
 msgid "ee"
 msgstr ""
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:835 ../rules/base.extras.xml.in.h:34
 msgid "en"
 msgstr ""
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:836
 msgid "eo"
 msgstr ""
 
-#: ../rules/base.xml.in.h:839
+#: ../rules/base.xml.in.h:837
 msgid "es"
 msgstr ""
 
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:838
 msgid "et"
 msgstr ""
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:839 ../rules/base.extras.xml.in.h:35
 msgid "fa"
 msgstr ""
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:840
 msgid "ff"
 msgstr ""
 
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:841
 msgid "fi"
 msgstr ""
 
-#: ../rules/base.xml.in.h:844
+#: ../rules/base.xml.in.h:842
 msgid "fo"
 msgstr ""
 
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:843 ../rules/base.extras.xml.in.h:36
 msgid "fr"
 msgstr ""
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:844
 msgid "gaa"
 msgstr ""
 
-#: ../rules/base.xml.in.h:847
+#: ../rules/base.xml.in.h:845
 msgid "gr"
 msgstr ""
 
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:846
 msgid "gu"
 msgstr ""
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:847
 msgid "ha"
 msgstr ""
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:848
 msgid "he"
 msgstr ""
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:849
 msgid "hi"
 msgstr ""
 
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:850
 msgid "hr"
 msgstr ""
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:851
 msgid "hu"
 msgstr ""
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:852 ../rules/base.extras.xml.in.h:37
 msgid "hy"
 msgstr ""
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:853
 msgid "ie"
 msgstr ""
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:854
 msgid "ig"
 msgstr ""
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:855
 msgid "ike"
 msgstr ""
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:856
 msgid "in"
 msgstr ""
 
-#: ../rules/base.xml.in.h:859
-msgid "irq"
-msgstr ""
-
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:857
 msgid "is"
 msgstr ""
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:858
 msgid "it"
 msgstr ""
 
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:859
 msgid "ja"
 msgstr ""
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:860
 msgid "ka"
 msgstr ""
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:861
 msgid "ki"
 msgstr ""
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:862
 msgid "kk"
 msgstr ""
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:863
 msgid "km"
 msgstr ""
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:864
 msgid "kn"
 msgstr ""
 
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:865
 msgid "ko"
 msgstr ""
 
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:866
 msgid "ku"
 msgstr ""
 
-#: ../rules/base.xml.in.h:870
-msgid "kut"
-msgstr ""
-
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:867
 msgid "lo"
 msgstr ""
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:868 ../rules/base.extras.xml.in.h:39
 msgid "lt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:869 ../rules/base.extras.xml.in.h:40
 msgid "lv"
 msgstr ""
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:870
 msgid "mi"
 msgstr ""
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:871
 msgid "mk"
 msgstr ""
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:872
 msgid "ml"
 msgstr ""
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:873
 msgid "mn"
 msgstr ""
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:874
 msgid "mt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:875
 msgid "my"
 msgstr ""
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:876
 msgid "ne"
 msgstr ""
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:877
 msgid "nl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:878
 msgid "no"
 msgstr ""
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:879
 msgid "or"
 msgstr ""
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:880
 msgid "pa"
 msgstr ""
 
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:881
 msgid "ph"
 msgstr ""
 
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:882 ../rules/base.extras.xml.in.h:41
 msgid "pl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:883
 msgid "ps"
 msgstr ""
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:884
 msgid "pt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:42
 msgid "ro"
 msgstr ""
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:886 ../rules/base.extras.xml.in.h:43
 msgid "ru"
 msgstr ""
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:887
 msgid "sd"
 msgstr ""
 
-#: ../rules/base.xml.in.h:892
-msgid "shs"
-msgstr ""
-
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:888
 msgid "si"
 msgstr ""
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:889
 msgid "sk"
 msgstr ""
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:890
 msgid "sl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:891
 msgid "sq"
 msgstr ""
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:892 ../rules/base.extras.xml.in.h:45
 msgid "sr"
 msgstr ""
 
-#: ../rules/base.xml.in.h:898
-msgid "srp"
-msgstr ""
-
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:893
 msgid "sv"
 msgstr ""
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:894
 msgid "sw"
 msgstr ""
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:895
 msgid "syc"
 msgstr ""
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:896
 msgid "ta"
 msgstr ""
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:897
 msgid "te"
 msgstr ""
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:898
 msgid "tg"
 msgstr ""
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:899
 msgid "th"
 msgstr ""
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:900
 msgid "tk"
 msgstr ""
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:901
 msgid "tn"
 msgstr ""
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:902
 msgid "tr"
 msgstr ""
 
-#: ../rules/base.xml.in.h:909
-msgid "twn"
-msgstr ""
-
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:903
 msgid "uk"
 msgstr ""
 
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:904
 msgid "ur"
 msgstr ""
 
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:905
 msgid "uz"
 msgstr ""
 
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:906
 msgid "vi"
 msgstr ""
 
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:907
 msgid "wo"
 msgstr ""
 
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:908
 msgid "xsy"
 msgstr ""
 
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:909
 msgid "yo"
 msgstr ""
 
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:910
 msgid "zh"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:1
-msgid "APL"
-msgstr ""
-
-#: ../rules/base.extras.xml.in.h:2
-msgid "Iran"
-msgstr ""
-
-#: ../rules/base.extras.xml.in.h:3
-msgid "Iran - Avestan"
+msgid "APL Keyboard Symbols"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:4
-msgid "Lithuania"
+msgid "Atsina"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:5
-msgid "Lithuania - Dvorak"
+msgid "Avestan"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:6
-msgid "Ltu"
-msgstr ""
-
-#: ../rules/base.extras.xml.in.h:7
-msgid "Romania"
+msgid "Couer D'alene Salish"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:8
-msgid "Romania - Ergonomic Touchtype"
+msgid "English (US, international AltGr Unicode combining)"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:9
-msgid "Rou"
-msgstr ""
-
-#: ../rules/base.extras.xml.in.h:10
-msgid "Rus"
+msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:11
-msgid "Russia"
-msgstr ""
-
-#: ../rules/base.extras.xml.in.h:12
-msgid "Serbia"
+msgid "Kutenai"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:13
-msgid "Serbia - Combining accents instead of dead keys"
+msgid "Latvian (US Colemak)"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:14
-msgid "Srb"
+msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:15
-msgid "USA"
+msgid "Latvian (US Dvorak)"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:16
-msgid "USA - Atsina"
+msgid "Latvian (US Dvorak, Y variant)"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:17
-msgid "USA - Couer D'alene Salish"
+msgid "Latvian (US Dvorak, minus variant)"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:18
-msgid "USA - International (AltGr Unicode combining)"
+msgid "Latvian (programmer US Dvorak)"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:19
-msgid "USA - International (AltGr Unicode combining, alternative)"
+msgid "Latvian (programmer US Dvorak, Y variant)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:20
+msgid "Latvian (programmer US Dvorak, minus variant)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:22
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:25
+msgid "Polish (international with dead keys)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:27
+msgid "Romanian (ergonomic Touchtype)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:29
+msgid "Russian (with UKR and BEL layout)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:30
+msgid "Secwepemctsin"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:32
+msgid "Serbian (combining accents instead of dead keys)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:33
+msgid "apl"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:38
+msgid "kut"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:44
+msgid "shs"
 msgstr ""
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index 8240e27b2..74adfde49 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -6,7 +6,7 @@
     <layout>
       <configItem>
         <name>apl</name>
-        <_shortDescription>APL</_shortDescription>
+        <_shortDescription>apl</_shortDescription>
         <_description>APL Keyboard Symbols</_description>
         <languageList><iso639Id>eng</iso639Id></languageList>
       </configItem>
@@ -39,7 +39,7 @@
     <layout>
       <configItem>
         <name>ir</name>
-        <_shortDescription>Iran</_shortDescription>
+        <_shortDescription>fa</_shortDescription>
         <_description>Persian</_description>
         <languageList><iso639Id>per</iso639Id></languageList>
       </configItem>
@@ -56,15 +56,15 @@
     <layout>
       <configItem>
         <name>lt</name>
-        <_shortDescription>Ltu</_shortDescription>
+        <_shortDescription>lt</_shortDescription>
         <_description>Lithuanian</_description>
         <languageList><iso639Id>lit</iso639Id></languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
-            <name>dvorak</name>
-            <_description>Lithuanian (Dvorak)</_description>
+            <name>us_dvorak</name>
+            <_description>Lithuanian (US Dvorak with Lithuanian letters)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -184,7 +184,7 @@
     <layout>
       <configItem>
         <name>ro</name>
-        <_shortDescription>Rou</_shortDescription>
+        <_shortDescription>ro</_shortDescription>
         <_description>Romanian</_description>
         <languageList><iso639Id>rum</iso639Id></languageList>
       </configItem>
@@ -200,7 +200,7 @@
     <layout>
       <configItem>
         <name>rs</name>
-        <_shortDescription>Srb</_shortDescription>
+        <_shortDescription>sr</_shortDescription>
         <_description>Serbian</_description>
         <languageList><iso639Id>srp</iso639Id></languageList>
       </configItem>
@@ -216,7 +216,7 @@
     <layout>
       <configItem>
         <name>ru</name>
-        <_shortDescription>Rus</_shortDescription>
+        <_shortDescription>ru</_shortDescription>
         <_description>Russian</_description>
       </configItem>
       <variantList>
@@ -227,6 +227,34 @@
             <languageList><iso639Id>chu</iso639Id></languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>ruu</name>
+            <_shortDescription>ru</_shortDescription>
+            <_description>Russian (with UKR and BEL layout)</_description>
+            <languageList><iso639Id>rus</iso639Id>
+                          <iso639Id>ukr</iso639Id>
+                          <iso639Id>bel</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>am</name>
+        <_shortDescription>hy</_shortDescription>
+        <_description>Armenian</_description>
+        <languageList>
+          <iso639Id>hye</iso639Id>
+        </languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>olpc-phonetic</name>
+            <_description>Armenian (alternative phonetic for OLPC)</_description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
   </layoutList>
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 3ec111747..0b180311e 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1384,7 +1384,7 @@
     <layout>
       <configItem>
         <name>af</name>
-        <_shortDescription>Afg</_shortDescription>
+        <_shortDescription>fa</_shortDescription>
         <_description>Afghani</_description>
       </configItem>
       <variantList>
@@ -2581,7 +2581,7 @@
     <layout>
       <configItem>
         <name>iq</name>
-        <_shortDescription>irq</_shortDescription>
+        <_shortDescription>ar</_shortDescription>
         <_description>Iraqi</_description>
         <languageList><iso639Id>ara</iso639Id>
                       <iso639Id>kur</iso639Id></languageList>
@@ -3581,7 +3581,7 @@
     <layout>
       <configItem>
         <name>me</name>
-        <_shortDescription>srp</_shortDescription>
+        <_shortDescription>sr</_shortDescription>
         <_description>Montenegrin</_description>
         <languageList>
           <iso639Id>srp</iso639Id>
@@ -4310,7 +4310,7 @@
     <layout>
       <configItem>
         <name>ch</name>
-        <_shortDescription>che</_shortDescription>
+        <_shortDescription>de</_shortDescription>
         <_description>German (Switzerland)</_description>
         <languageList><iso639Id>ger</iso639Id>
                       <iso639Id>gsw</iso639Id></languageList>
@@ -4613,7 +4613,7 @@
     <layout>
       <configItem>
         <name>tw</name>
-        <_shortDescription>twn</_shortDescription>
+        <_shortDescription>zh</_shortDescription>
         <_description>Taiwanese</_description>
         <languageList>
           <iso639Id>trv</iso639Id>
@@ -4708,7 +4708,7 @@
     <layout>
       <configItem>
         <name>gb</name>
-        <_shortDescription>GBr</_shortDescription>
+        <_shortDescription>en</_shortDescription>
         <_description>English (UK)</_description>
         <languageList>
           <iso639Id>eng</iso639Id>
diff --git a/xorg-server/xkeyboard-config/symbols/am b/xorg-server/xkeyboard-config/symbols/am
index 49543ded5..05be32cb2 100644
--- a/xorg-server/xkeyboard-config/symbols/am
+++ b/xorg-server/xkeyboard-config/symbols/am
@@ -138,6 +138,14 @@ xkb_symbols "phonetic-alt" {
 };
 
 partial alphanumeric_keys
+xkb_symbols "olpc-phonetic" {
+    include "am(phonetic-alt)"
+    name[Group1]= "Armenian (OLPC phonetic)";
+
+    include "group(olpc)"
+};
+
+partial alphanumeric_keys
 xkb_symbols "eastern" {
 
     name[Group1]="Armenian (eastern)";
diff --git a/xorg-server/xkeyboard-config/symbols/lt b/xorg-server/xkeyboard-config/symbols/lt
index 709d08a08..74b4c8048 100644
--- a/xorg-server/xkeyboard-config/symbols/lt
+++ b/xorg-server/xkeyboard-config/symbols/lt
@@ -288,24 +288,27 @@ xkb_symbols "lekpa" {
     key <AB10> {[            h,                   H                ]};
 };
 
+// EXTRAS:
+
 partial alphanumeric_keys modifier_keys
-xkb_symbols "dvorak" {
+xkb_symbols "us_dvorak" {
 
     include "us(dvorak)"
 
-    name[Group1]="Lithuanian (Dvorak)";
+    name[Group1]="Lithuanian (US Dvorak with Lithuanian letters)";
 
-    key <AE01>	{ [   aogonek,      Aogonek,        1,      exclam ] };
-    key <AE02>	{ [    ccaron,       Ccaron,        2,          at ] };
-    key <AE03>	{ [   eogonek,      Eogonek,        3,  numbersign ] };
-    key <AE04>	{ [ eabovedot,    Eabovedot,        4,      dollar ] };
-    key <AE05>	{ [   iogonek,      Iogonek,        5,     percent ] };
-    key <AE06>	{ [    scaron,       Scaron,        6, asciicircum ] };
-    key <AE07>	{ [   uogonek,      Uogonek,        7,   ampersand ] };
-    key <AE08>	{ [   umacron,      Umacron,        8,    asterisk ] };
-    key <AE09>	{ [doublelowquotemark,  parenleft,  9,   parenleft ] };
-    key <AE10>	{ [leftdoublequotemark,parenright,  0,  parenright ] };
-    key <AD12>	{ [    zcaron,       Zcaron,    equal,        plus ] };
+    key <AE01>	{ [        1,      exclam,    aogonek,      Aogonek ] };
+    key <AE02>	{ [        2,          at,     ccaron,       Ccaron ] };
+    key <AE03>	{ [        3,  numbersign,    eogonek,      Eogonek ] };
+    key <AE04>	{ [        4,      dollar,  eabovedot,    Eabovedot ] };
+    key <AE05>	{ [        5,     percent,    iogonek,      Iogonek ] };
+    key <AE06>	{ [        6, asciicircum,     scaron,       Scaron ] };
+    key <AE07>	{ [        7,   ampersand,    uogonek,      Uogonek ] };
+    key <AE08>	{ [        8,    asterisk,    umacron,      Umacron ] };
+    key <AE09>	{ [        9,   parenleft, doublelowquotemark,  parenleft ] };
+    key <AE10>	{ [        0,  parenright, leftdoublequotemark,parenright ] };
+    key <AD12>	{ [    equal,        plus,     zcaron,       Zcaron ] };
 
     include "level3(ralt_switch)"
 };
+
diff --git a/xorg-server/xkeyboard-config/symbols/ru b/xorg-server/xkeyboard-config/symbols/ru
index 70476b4b5..4ed77447a 100644
--- a/xorg-server/xkeyboard-config/symbols/ru
+++ b/xorg-server/xkeyboard-config/symbols/ru
@@ -586,3 +586,68 @@ xkb_symbols "chu"
 	    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU, U2DFB	]	};
 	    key <AB10> {        [          period,    comma, semicolon, exclam      ]       };
 };
+
+
+// RUU (Russian-Ukrainian United keyboard layout).
+// Modified Russian standart keyboard with third level contains ukrainian
+// and belorusian alphabetic letters and commonly used Unicode symbols.
+// Description http://wiki.opennet.ru/RUU [russian]
+// Vasyĺ V. Vercynśkyj <fuckel@ukr.net>
+// Last Changes 2011/05/11
+//
+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
+// │ ' ~ │ ! ≈ │ " ∞ │ № ₴ │ ; € │ % ‰ │ : ≤ │ ? ≥ │ * × │ ( { │ ) } │ _ – │ + ± ┃ ⌫       ┃
+// │ ’  ́ │ 1 ÷ │ 2 ¤ │ 3 § │ 4 $ │ 5 ° │ 6 < │ 7 > │ 8 • │ 9 [ │ 0 ] │ - — │ = ≠ ┃Backspace┃
+// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
+// ┃       ┃ Й   │ Ц   │ У Ў │ К   │ Е Ё │ Н   │ Г Ґ │ Ш   │ Щ   │ З   │ Х   │ Ъ Ї ┃ Enter ┃
+// ┃ Tab ↹ ┃ й   │ ц   │ у ў │ к ® │ е ё │ н   │ г ґ │ ш   │ щ   │ з   │ х   │ ъ ї ┃   ⏎   ┃
+// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃
+// ┃ Caps   ┃ Ф   │ Ы І │ В   │ А   │ П   │ Р   │ О   │ Л   │ Д   │ Ж   │ Э Є │ | ¦ ┃      ┃
+// ┃ Lock ⇬ ┃ ф   │ ы і │ в   │ а   │ п   │ р   │ о   │ л   │ д   │ ж   │ э є │ / \ ┃      ┃
+// ┣━━━━━━━━┻━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┲━━━┷━━━━━┻━━━━━━┫
+// ┃          ┃ Я   │ Ч   │ С   │ М   │ И   │ Т   │ Ь   │ Б „ │ Ю “ │ , … ┃                ┃
+// ┃  Shift ⇧ ┃ я   │ ч   │ с © │ м   │ и   │ т ™ │ ь µ │ б « │ ю » │ . / ┃     Shift ⇧    ┃
+// ┣━━━━━━━┳━━┻━━━━┳┷━━━━━┷┱────┴─────┴─────┴─────┴─────┴─────┴┲━━━━┷━━┳━━┻━━━━┳━━━━━━━┳━━━┛
+// ┃       ┃       ┃       ┃                                   ┃       ┃       ┃       ┃
+// ┃ Ctrl  ┃ Meta  ┃  Alt  ┃                Space              ┃AltGr ⇮┃ Menu  ┃ Ctrl  ┃
+// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
+
+
+
+partial alphanumeric_keys
+xkb_symbols "ruu" {
+    include "ru(common)"
+
+    name[Group1]= "Russian (with UKR and BEL layout)";
+
+    key <TLDE> {    [	U2019,		apostrophe,	U0301,		asciitilde	]	};	// Apostrophe and Stress symbol
+    key <AE01> {    [	1,		exclam,		U00F7,		U2248		]	};	// Division Sign and Almost Equal To
+    key <AE02> {    [	2,		quotedbl,	currency,	infinity	]	};
+    key <AE03> {    [	3,		numerosign,	U00A7,		U20B4		]	};	// Paragraph and Hryvnia sign
+    key <AE04> {    [	4,		semicolon,	dollar,		EuroSign	]	};
+    key <AE05> {    [	5,		percent,	degree,		U2030		]	};	// Per Mille Sign
+    key <AE06> {    [	6,		colon,		less,		U2264		]	};	// Less-Than Or Equal To
+    key <AE07> {    [	7,		question,	greater,	U2265		]	};	// Greater-Than Or Equal To
+    key <AE08> {    [	8,		asterisk,	enfilledcircbullet, U00D7	]	};	// Multiplication Sign
+    key <AE09> {    [	9,		parenleft,	bracketleft,	braceleft	]	};
+    key <AE10> {    [	0,		parenright,	bracketright,	braceright	]	};
+    key <AE11> {    [	minus,		underscore,	emdash,		endash		]	};
+    key <AE12> {    [	equal,		plus,		notequal,	plusminus	]	};
+    key <AD03> {    [	Cyrillic_u,	Cyrillic_U, Byelorussian_shortu, Byelorussian_SHORTU ]	};
+    key <AD04> {    [	Cyrillic_ka,	Cyrillic_KA,	registered			]	};	// Registered tm
+    key <AD05> {    [	Cyrillic_ie,	Cyrillic_IE,	Cyrillic_io,	Cyrillic_IO	]	};
+    key <AD07> {    [Cyrillic_ge, Cyrillic_GE, Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
+    key <AD10> {    [	Cyrillic_ze,	Cyrillic_ZE,	U00B6				]	};	// Pilcrow Sign
+    key <AD12> {    [Cyrillic_hardsign,	Cyrillic_HARDSIGN, Ukrainian_yi, Ukrainian_YI	]	};
+    key <AC02> {    [	Cyrillic_yeru,	Cyrillic_YERU,	Ukrainian_i,  Ukrainian_I	]	};
+    key <AC11> {    [	Cyrillic_e,	Cyrillic_E,	Ukrainian_ie,Ukrainian_IE	]	};
+    key <BKSL> {    [	slash,		bar,		backslash,	U00A6		]	};	// Broken Bar
+    key <AB03> {    [	Cyrillic_es,	Cyrillic_ES,	copyright			]	};
+    key <AB06> {    [	Cyrillic_te,	Cyrillic_TE,	trademark			]	};
+    key <AB07> {    [	Cyrillic_softsign, Cyrillic_SOFTSIGN, U00B5			]	};	// Micro Sign
+    key <AB08> {    [	Cyrillic_be,	Cyrillic_BE,	guillemotleft,	doublelowquotemark ]	};
+    key <AB09> {    [	Cyrillic_yu,	Cyrillic_YU,	guillemotright,	leftdoublequotemark ]	};
+    key <AB10> {    [	period,		comma,		slash,		ellipsis	]	};
+
+    include "level3(ralt_switch)"
+};
author	marha <marha@users.sourceforge.net>	2011-05-18 07:55:12 +0000
committer	marha <marha@users.sourceforge.net>	2011-05-18 07:55:12 +0000
commit	32a666fa1f26defd3b4e508b75f1acf6e2900a40 (patch)
tree	9735440d047c660e4966060a3020e2cae419d77c
parent	ab5c2d2c78273ccdc7c9734bcba482a33fcf9652 (diff)
parent	35484135119fcf55fe1cbb1fcdd0e035f581fcfb (diff)
download	vcxsrv-32a666fa1f26defd3b4e508b75f1acf6e2900a40.tar.gz vcxsrv-32a666fa1f26defd3b4e508b75f1acf6e2900a40.tar.bz2 vcxsrv-32a666fa1f26defd3b4e508b75f1acf6e2900a40.zip