499 files changed, 75310 insertions, 75196 deletions
diff --git a/xorg-server/COPYING b/xorg-server/COPYING
index f59f9f956..cd9e80a48 100644
--- a/xorg-server/COPYING
+++ b/xorg-server/COPYING
@@ -1,1822 +1,1822 @@
-The following is the 'standard copyright' agreed upon by most contributors,
-and is currently the canonical license preferred by the X.Org Foundation.
-This is a slight variant of the common MIT license form published by the
-Open Source Initiative at http://www.opensource.org/licenses/mit-license.php
-
-Copyright holders of new code should use this license statement where
-possible, and insert their name to this list.  Please sort by surname
-for people, and by the full name for other entities (e.g.  Juliusz
-Chroboczek sorts before Intel Corporation sorts before Daniel Stone).
-
-Copyright © 2000-2001 Juliusz Chroboczek
-Copyright © 1998 Egbert Eich
-Copyright © 2006-2007 Intel Corporation
-Copyright © 2006 Nokia Corporation
-Copyright © 2006-2008 Peter Hutterer
-Copyright © 2006 Adam Jackson
-Copyright © 2009-2010 NVIDIA Corporation
-Copyright © 1987, 2003-2006, 2008-2010 Oracle and/or its affiliates.
-Copyright © 1999 Keith Packard
-Copyright © 2007-2009 Red Hat, Inc.
-Copyright © 2005-2008 Daniel Stone
-Copyright © 2006-2009 Simon Thum
-Copyright © 2006 Luc Verhaegen
-
-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 (including the next
-paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
-
-
-
-
-The following licenses are 'legacy': usually MIT/X11 licenses with the name
-of the copyright holder(s) in the license statement, but also some BSD-like
-licenses.
-
-
-Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
-Copyright (C) Colin Harrison 2005-2008
-
-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, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-XFREE86 PROJECT 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 XFree86 Project 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 XFree86 Project.
-
-
-Copyright 1997 by The XFree86 Project, Inc.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of the XFree86 Project, Inc.
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  The Xfree86
-Project, Inc. makes no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-THE XFREE86 PROJECT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1985-1998, 2001  The Open Group
-Copyright 2002 Red Hat Inc., Durham, North Carolina.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-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
-OPEN GROUP 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 Open Group 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 Open Group.
-
-
-Copyright (c) 1987, 1989-1990, 1992-1995  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 © 1999-2000 SuSE, Inc.
-Copyright © 2007 Red Hat, Inc.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of SuSE not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  SuSE makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-
-SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1987-1991, 1993 by Digital Equipment Corporation, Maynard, Massachusetts.
-Copyright 1991 Massachusetts Institute of Technology, Cambridge, Massachusetts.
-Copyright 1991, 1993 Olivetti Research Limited, Cambridge, England.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
-Copyright 1994 Quarterdeck Office Systems.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of Digital and
-Quarterdeck not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-DIGITAL AND QUARTERDECK DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT
-OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
-OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1997 Digital Equipment Corporation.
-All rights reserved.
-
-This software is furnished under license and may be used and copied only in
-accordance with the following terms and conditions.  Subject to these
-conditions, you may download, copy, install, use, modify and distribute
-this software in source and/or binary form. No title or ownership is
-transferred hereby.
-
-1) Any source code used, modified or distributed must reproduce and retain
-   this copyright notice and list of conditions as they appear in the
-   source file.
-
-2) No right is granted to use any trade name, trademark, or logo of Digital
-   Equipment Corporation. Neither the "Digital Equipment Corporation"
-   name nor any trademark or logo of Digital Equipment Corporation may be
-   used to endorse or promote products derived from this software without
-   the prior written permission of Digital Equipment Corporation.
-
-3) This software is provided "AS-IS" and any express or implied warranties,
-   including but not limited to, any implied warranties of merchantability,
-   fitness for a particular purpose, or non-infringement are disclaimed.
-   In no event shall DIGITAL be liable for any damages whatsoever, and in
-   particular, DIGITAL shall not be liable for special, indirect,
-   consequential, or incidental damages or damages for lost profits, loss
-   of revenue or loss of use, whether such damages arise in contract,
-   negligence, tort, under statute, in equity, at law or otherwise, even
-   if advised of the possibility of such damage.
-
-
-Copyright (c) 1991, 1996-1997 Digital Equipment Corporation, Maynard, Massachusetts.
-
-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.
-
-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
-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation
-shall not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from Digital
-Equipment Corporation.
-
-
-SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
-Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
-
-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 including the dates of first publication and
-either this permission notice or a reference to
-http://oss.sgi.com/projects/FreeB/
-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
-SILICON GRAPHICS, INC. 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.
-
-
-Copyright (c) 1994, 1995  Hewlett-Packard Company
-
-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 HEWLETT-PACKARD COMPANY 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 Hewlett-Packard
-Company 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 Hewlett-Packard Company.
-
-
-Copyright 1989 by Hewlett-Packard Company, Palo Alto, California.
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Hewlett-Packard not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-HEWLETT-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
-Copyright (c) 2003 by the XFree86 Project, Inc.
-Copyright 2004-2005 Red Hat Inc., Raleigh, North Carolina.
-All Rights Reserved.
-
-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 on 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 (including the
-next paragraph) 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
-NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-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.
-
-
-Copyright © 2008 Red Hat, Inc.
-Partly based on code Copyright © 2000 SuSE, Inc.
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without
-fee, provided that the above copyright notice appear in all copies
-and that both that copyright notice and this permission notice
-appear in supporting documentation, and that the name of Red Hat
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.  Red
-Hat makes no representations about the suitability of this software
-for any purpose.  It is provided "as is" without express or implied
-warranty.
-
-Red Hat DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
-NO EVENT SHALL Red Hat BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of SuSE not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  SuSE makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-
-SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright © 2006  Red Hat, Inc.
-(C) Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
-
-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, sub license,
-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 (including the next
-paragraph) 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
-RED HAT, INC, OR PRECISION INSIGHT AND/OR THEIR SUPPLIERS 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.
-
-
-Copyright (c) 1995  X Consortium
-Copyright 2004 Red Hat Inc., Durham, North Carolina.
-All Rights Reserved.
-
-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 on 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
-NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT, THE X CONSORTIUM,
-AND/OR THEIR SUPPLIERS 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 1998-2000 Precision Insight, Inc., Cedar Park, Texas.
-Copyright 2000 VA Linux Systems, Inc.
-Copyright (c) 2002, 2008, 2009 Apple Computer, Inc.
-Copyright (c) 2003-2004 Torrey T. Lyons.
-All Rights Reserved.
-
-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, sub license, 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 (including the
-next paragraph) 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 NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
-
-
-(C) Copyright IBM Corporation 2003
-All Rights Reserved.
-
-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
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, 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 (including the next
-paragraph) 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
-VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS 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.
-
-
-(C) Copyright IBM Corporation 2004-2005
-All Rights Reserved.
-
-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, sub license,
-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 (including the next
-paragraph) 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
-IBM,
-AND/OR THEIR SUPPLIERS 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.
-
-
-Copyright (c) 1997  Metro Link Incorporated
-
-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 Metro Link shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from Metro Link.
-
-
-Copyright 1995-1998 by Metro Link, Inc.
-Copyright (c) 1997 Matthieu Herrb
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Metro Link, Inc. not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Metro Link, Inc. makes no
-representations about the suitability of this software for any purpose.
- It is provided "as is" without express or implied warranty.
-
-METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL METRO LINK, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1998 by Metro Link Incorporated
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Metro Link
-Incorporated not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.  Metro Link Incorporated makes no representations
-about the suitability of this software for any purpose.  It is
-provided "as is" without express or implied warranty.
-
-METRO LINK INCORPORATED DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL METRO LINK INCORPORATED BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
-
-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
-CONECTIVA LINUX 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 Conectiva Linux shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from
-Conectiva Linux.
-
-
-Copyright (c) 2001, Andy Ritger  aritger@nvidia.com
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-o Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-o Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer
-  in the documentation and/or other materials provided with the
-  distribution.
-o Neither the name of NVIDIA nor the names of its contributors
-  may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-
-Copyright 1992 Vrije Universiteit, The Netherlands
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, provided
-that the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of the Vrije Universiteit not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  The Vrije Universiteit makes no
-representations about the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-The Vrije Universiteit DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL The Vrije Universiteit BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1998 by Concurrent Computer Corporation
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Concurrent Computer
-Corporation not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.  Concurrent Computer Corporation makes no representations
-about the suitability of this software for any purpose.  It is
-provided "as is" without express or implied warranty.
-
-CONCURRENT COMPUTER CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL CONCURRENT COMPUTER CORPORATION BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-Copyright © 2004 Nokia
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Nokia not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Nokia makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-NOKIA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL NOKIA BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-(c)Copyright 1988,1991 Adobe Systems Incorporated.
-All rights reserved.
-
-Permission to use, copy, modify, distribute, and sublicense this software and its
-documentation for any purpose and without fee is hereby granted, provided that
-the above copyright notices appear in all copies and that both those copyright
-notices and this permission notice appear in supporting documentation and that
-the name of Adobe Systems Incorporated not be used in advertising or publicity
-pertaining to distribution of the software without specific, written prior
-permission.  No trademark license to use the Adobe trademarks is hereby
-granted.  If the Adobe trademark "Display PostScript"(tm) is used to describe
-this software, its functionality or for any other purpose, such use shall be
-limited to a statement that this software works in conjunction with the Display
-PostScript system.  Proper trademark attribution to reflect Adobe's ownership
-of the trademark shall be given whenever any such reference to the Display
-PostScript system is made.
-
-ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR ANY
-PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.  ADOBE
-DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-
-INFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO EVENT SHALL ADOBE BE LIABLE TO YOU
-OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,NEGLIGENCE, STRICT
-LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.  ADOBE WILL NOT PROVIDE ANY TRAINING OR OTHER
-SUPPORT FOR THE SOFTWARE.
-
-Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
-Incorporated which may be registered in certain jurisdictions.
-
-
-Copyright 1989 Network Computing Devices, Inc., Mountain View, California.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, provided
-that the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of N.C.D. not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  N.C.D. makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-
-
-Copyright (c) 1987 by the Regents of the University of California
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies.  The University of California
-makes no representations about the suitability of this
-software for any purpose.  It is provided "as is" without
-express or implied warranty.
-
-
-Copyright 1992, 1993 Data General Corporation;
-Copyright 1992, 1993 OMRON Corporation
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that the
-above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation, and that
-neither the name OMRON or DATA GENERAL be used in advertising or publicity
-pertaining to distribution of the software without specific, written prior
-permission of the party whose name is to be used.  Neither OMRON or
-DATA GENERAL make any representation about the suitability of this software
-for any purpose.  It is provided "as is" without express or implied warranty.
-
-OMRON AND DATA GENERAL EACH DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
-IN NO EVENT SHALL OMRON OR DATA GENERAL BE LIABLE FOR ANY SPECIAL, INDIRECT
-OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-OF THIS SOFTWARE.
-
-
-Copyright © 1998-2004, 2006 Keith Packard
-Copyright © 2000-2002 Keith Packard, member of The XFree86 Project, Inc.
-Copyright (c) 2002 Apple Computer, Inc.
-Copyright (c) 2003 Torrey T. Lyons.
-All Rights Reserved.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Keith Packard not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Keith Packard makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright © 1999 Keith Packard
-Copyright © 2000 Compaq Computer Corporation
-Copyright © 2002 MontaVista Software Inc.
-Copyright © 2005 OpenedHand Ltd.
-Copyright © 2006 Nokia Corporation
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of the authors and/or copyright holders
-not be used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  The authors and/or
-copyright holders make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-THE AUTHORS AND/OR COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE AUTHORS AND/OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1993 by Davor Matic
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation.  Davor Matic makes no representations about
-the suitability of this software for any purpose.  It is provided "as
-is" without express or implied warranty.
-
-
-Copyright (C) 2001-2004 Harold L Hunt II All Rights Reserved.
-Copyright (C) Colin Harrison 2005-2008
-
-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 HAROLD L HUNT II 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 Harold L Hunt II
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-from Harold L Hunt II.
-
-
-Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Thomas Roell not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Thomas Roell makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as is" without express or implied warranty.
-
-THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL THOMAS ROELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
-Copyright 1993 by David Wexelblat <dwex@goblin.org>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of Thomas Roell and David Wexelblat
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  Thomas Roell and
-David Wexelblat makes no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-THOMAS ROELL AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THOMAS ROELL OR DAVID WEXELBLAT BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1990,91,92,93 by Thomas Roell, Germany.
-Copyright 1991,92,93    by SGCS (Snitily Graphics Consulting Services), USA.
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this  permission notice appear
-in supporting documentation, and that the name of Thomas Roell nor
-SGCS be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-Thomas Roell nor SGCS makes no representations about the suitability
-of this software for any purpose. It is provided "as is" without
-express or implied warranty.
-
-THOMAS ROELL AND SGCS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THOMAS ROELL OR SGCS BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1998 by Alan Hourihane, Wigan, England.
-Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Alan Hourihane not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Alan Hourihane makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as is" without express or implied warranty.
-
-ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1995  Kaleb S. KEITHLEY
-
-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 Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-from Kaleb S. KEITHLEY
-
-
-Copyright (c) 1997 Matthieu Herrb
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Matthieu Herrb not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Matthieu Herrb makes no
-representations about the suitability of this software for any purpose.
- It is provided "as is" without express or implied warranty.
-
-MATTHIEU HERRB DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL MATTHIEU HERRB BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 2004, Egbert Eich
-
-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
-EGBERT EICH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Egbert Eich shall not
-be used in advertising or otherwise to promote the sale, use or other deal-
-ings in this Software without prior written authorization from Egbert Eich.
-
-
-Copyright 1993 by David Wexelblat <dwex@goblin.org>
-Copyright 2005 by Kean Johnston <jkj@sco.com>
-Copyright 1993 by David McCullough <davidm@stallion.oz.au>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of David Wexelblat not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  David Wexelblat makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as is" without express or implied warranty.
-
-DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL DAVID WEXELBLAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1992 by Orest Zborowski <obz@Kodak.com>
-Copyright 1993 by David Wexelblat <dwex@goblin.org>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of Orest Zborowski and David Wexelblat
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  Orest Zborowski
-and David Wexelblat make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-OREST ZBOROWSKI AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1992 by Orest Zborowski <obz@Kodak.com>
-Copyright 1993 by David Dawes <dawes@xfree86.org>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of Orest Zborowski and David Dawes
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  Orest Zborowski
-and David Dawes make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-OREST ZBOROWSKI AND DAVID DAWES DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID DAWES BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1995-1999 by Frederic Lepied, France. <fred@sugix.frmug.fr.net>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is  hereby granted without fee, provided that
-the  above copyright   notice appear  in   all  copies and  that both  that
-copyright  notice   and   this  permission   notice  appear  in  supporting
-documentation, and that   the  name of  Frederic   Lepied not  be  used  in
-advertising or publicity pertaining to distribution of the software without
-specific,  written      prior  permission.     Frederic  Lepied   makes  no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-FREDERIC  LEPIED DISCLAIMS ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,
-INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO
-EVENT  SHALL FREDERIC  LEPIED BE   LIABLE   FOR ANY  SPECIAL, INDIRECT   OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA  OR PROFITS, WHETHER  IN  AN ACTION OF  CONTRACT,  NEGLIGENCE OR OTHER
-TORTIOUS  ACTION, ARISING    OUT OF OR   IN  CONNECTION  WITH THE USE    OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1992 by Rich Murphey <Rich@Rice.edu>
-Copyright 1993 by David Wexelblat <dwex@goblin.org>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of Rich Murphey and David Wexelblat
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  Rich Murphey and
-David Wexelblat make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1992 by Rich Murphey <Rich@Rice.edu>
-Copyright 1993 by David Dawes <dawes@xfree86.org>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of Rich Murphey and David Dawes
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  Rich Murphey and
-David Dawes make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-RICH MURPHEY AND DAVID DAWES DISCLAIM ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID DAWES BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright © 2003-2004 Anders Carlsson
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Anders Carlsson not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Anders Carlsson makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-ANDERS CARLSSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ANDERS CARLSSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright (C) 2003 Anders Carlsson
-Copyright © 2003-2004 Eric Anholt
-Copyright © 2004 Keith Packard
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Eric Anholt not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Eric Anholt makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-ERIC ANHOLT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ERIC ANHOLT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
-FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright © 2003-2004 Philip Blundell
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Philip Blundell not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Philip Blundell makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-
-Copyright (c) 1994-2003 by The XFree86 Project, Inc.
-Copyright 1997 by Metro Link, Inc.
-Copyright 2003 by David H. Dawes.
-Copyright 2003 by X-Oz Technologies.
-Copyright (c) 2004, X.Org Foundation
-
-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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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 copyright holder(s)
-and author(s) 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 copyright holder(s) and author(s).
-
-
-Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
-Copyright 1993 by David Wexelblat <dwex@goblin.org>
-Copyright 1999 by David Holland <davidh@iquest.net>
-Copyright © 2000 Compaq Computer Corporation
-Copyright © 2002 Hewlett-Packard Company
-Copyright © 2004, 2005 Red Hat, Inc.
-Copyright © 2004 Nicholas Miell
-Copyright © 2005 Trolltech AS
-Copyright © 2006 Intel Corporation
-Copyright © 2006-2007 Keith Packard
-Copyright © 2008 Red Hat, Inc
-Copyright © 2008 George Sapountzis <gsap7@yahoo.gr>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation, and
-that the name of the copyright holders not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  The copyright holders make no representations
-about the suitability of this software for any purpose.  It is provided "as
-is" without express or implied warranty.
-
-THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
-            2005 Lars Knoll & Zack Rusin, Trolltech
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Keith Packard not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Keith Packard makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-Copyright 1987, 1998  The Open Group
-Copyright © 1998-1999, 2001 The XFree86 Project, Inc.
-Copyright © 2000 VA Linux Systems, Inc.
-Copyright (c) 2000, 2001 Nokia Home Communications
-Copyright © 2007, 2008 Red Hat, Inc.
-All rights reserved.
-
-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, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-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
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-
-
-Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of the above listed
-copyright holder(s) not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.
-
-THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright (c) 2001 Andreas Monitzer.
-Copyright (c) 2001-2004 Greg Parker.
-Copyright (c) 2001-2004 Torrey T. Lyons
-Copyright (c) 2002-2003 Apple Computer, Inc.
-Copyright (c) 2004-2005 Alexander Gottwald
-Copyright (c) 2002-2009 Apple Inc.
-Copyright (c) 2007 Jeremy Huddleston
-All Rights Reserved.
-
-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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright
-holders shall not be used in advertising or otherwise to promote the sale,
-use or other dealings in this Software without prior written authorization.
-
-
-Copyright (C) 1999,2000 by Eric Sunshine <sunshine@sunshineco.com>
-Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-  3. The name of the author may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
-NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-Copyright (C) 2005 Bogdan D. bogdand@users.sourceforge.net
-
-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
-AUTHOR 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 author 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 author.
-
-
-Copyright © 2002 David Dawes
-
-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 AUTHOR(S) 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 author(s) 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 author(s).
-
-
-Copyright (C) 1996-1999 SciTech Software, Inc.
-Copyright (C) David Mosberger-Tang
-Copyright (C) 1999 Egbert Eich
-Copyright (C) 2008 Bart Trojanowski, Symbio Technologies, LLC
-
-Permission to use, copy, modify, distribute, and sell this software and
-its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of the authors not be used
-in advertising or publicity pertaining to distribution of the software
-without specific, written prior permission.  The authors makes no
-representations about the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 2005-2006 Luc Verhaegen.
-
-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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
-
-
-Copyright 1995 by Robin Cutshaw <robin@XFree86.Org>
-Copyright 2000 by Egbert Eich
-Copyright 2002 by David Dawes
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of the above listed copyright holder(s)
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  The above listed
-copyright holder(s) make(s) no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1997-2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation, and
-that the name of Marc Aurele La France not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  Marc Aurele La France makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as-is" without express or implied warranty.
-
-MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO
-EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-OF THIS SOFTWARE.
-
-
-Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany
-Copyright 1992 by David Dawes <dawes@XFree86.org>
-Copyright 1992 by Jim Tsillas <jtsilla@damon.ccs.northeastern.edu>
-Copyright 1992 by Rich Murphey <Rich@Rice.edu>
-Copyright 1992 by Robert Baron <Robert.Baron@ernst.mach.cs.cmu.edu>
-Copyright 1992 by Orest Zborowski <obz@eskimo.com>
-Copyright 1993 by Vrije Universiteit, The Netherlands
-Copyright 1993 by David Wexelblat <dwex@XFree86.org>
-Copyright 1994, 1996 by Holger Veit <Holger.Veit@gmd.de>
-Copyright 1997 by Takis Psarogiannakopoulos <takis@dpmms.cam.ac.uk>
-Copyright 1994-2003 by The XFree86 Project, Inc
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of the above listed copyright holders
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  The above listed
-copyright holders make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-THE ABOVE LISTED COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDERS BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 2001-2005 by J. Kean Johnston <jkj@sco.com>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name J. Kean Johnston not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  J. Kean Johnston makes no
-representations about the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-J. KEAN JOHNSTON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL J. KEAN JOHNSTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
-
-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
-JAKUB JELINEK 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.
-
-
-Copyright 1997,1998 by UCHIYAMA Yasushi
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of UCHIYAMA Yasushi not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  UCHIYAMA Yasushi makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as is" without express or implied warranty.
-
-UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright (C) 2000 Keith Packard
-              2004 Eric Anholt
-              2005 Zack Rusin
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of copyright holders not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Copyright holders make no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-(C) Copyright IBM Corporation 2002-2007
-All Rights Reserved.
-
-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
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, 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 (including the next
-paragraph) 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
-THE COPYRIGHT HOLDERS AND/OR THEIR SUPPLIERS 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.
-
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-this permission notice appear in supporting documentation.  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
-AUTHOR 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.
-
-
-Copyright © 2007 OpenedHand Ltd
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of OpenedHand Ltd not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. OpenedHand Ltd makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-OpenedHand Ltd DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL OpenedHand Ltd BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright (c) 1989, 1990, 1993, 1994
-     The Regents of the University of California.  All rights reserved.
-
-This code is derived from software contributed to Berkeley by
-Chris Torek.
-
-This code is derived from software contributed to Berkeley by
-Michael Rendell of Memorial University of Newfoundland.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 4. Neither the name of the University nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
+The following is the 'standard copyright' agreed upon by most contributors,
+and is currently the canonical license preferred by the X.Org Foundation.
+This is a slight variant of the common MIT license form published by the
+Open Source Initiative at http://www.opensource.org/licenses/mit-license.php
+
+Copyright holders of new code should use this license statement where
+possible, and insert their name to this list.  Please sort by surname
+for people, and by the full name for other entities (e.g.  Juliusz
+Chroboczek sorts before Intel Corporation sorts before Daniel Stone).
+
+Copyright © 2000-2001 Juliusz Chroboczek
+Copyright © 1998 Egbert Eich
+Copyright © 2006-2007 Intel Corporation
+Copyright © 2006 Nokia Corporation
+Copyright © 2006-2008 Peter Hutterer
+Copyright © 2006 Adam Jackson
+Copyright © 2009-2010 NVIDIA Corporation
+Copyright © 1987, 2003-2006, 2008-2010 Oracle and/or its affiliates.
+Copyright © 1999 Keith Packard
+Copyright © 2007-2009 Red Hat, Inc.
+Copyright © 2005-2008 Daniel Stone
+Copyright © 2006-2009 Simon Thum
+Copyright © 2006 Luc Verhaegen
+
+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 (including the next
+paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+
+
+
+
+The following licenses are 'legacy': usually MIT/X11 licenses with the name
+of the copyright holder(s) in the license statement, but also some BSD-like
+licenses.
+
+
+Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
+Copyright (C) Colin Harrison 2005-2008
+
+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, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+XFREE86 PROJECT 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 XFree86 Project 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 XFree86 Project.
+
+
+Copyright 1997 by The XFree86 Project, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of the XFree86 Project, Inc.
+not be used in advertising or publicity pertaining to distribution of
+the software without specific, written prior permission.  The Xfree86
+Project, Inc. makes no representations about the suitability of this
+software for any purpose.  It is provided "as is" without express or
+implied warranty.
+
+THE XFREE86 PROJECT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 1985-1998, 2001  The Open Group
+Copyright 2002 Red Hat Inc., Durham, North Carolina.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+
+
+Copyright (c) 1987, 1989-1990, 1992-1995  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 © 1999-2000 SuSE, Inc.
+Copyright © 2007 Red Hat, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of SuSE not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  SuSE makes no representations about the
+suitability of this software for any purpose.  It is provided "as is"
+without express or implied warranty.
+
+SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
+BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 1987-1991, 1993 by Digital Equipment Corporation, Maynard, Massachusetts.
+Copyright 1991 Massachusetts Institute of Technology, Cambridge, Massachusetts.
+Copyright 1991, 1993 Olivetti Research Limited, Cambridge, England.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
+Copyright 1994 Quarterdeck Office Systems.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the names of Digital and
+Quarterdeck not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.
+
+DIGITAL AND QUARTERDECK DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT
+OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
+OR PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 1997 Digital Equipment Corporation.
+All rights reserved.
+
+This software is furnished under license and may be used and copied only in
+accordance with the following terms and conditions.  Subject to these
+conditions, you may download, copy, install, use, modify and distribute
+this software in source and/or binary form. No title or ownership is
+transferred hereby.
+
+1) Any source code used, modified or distributed must reproduce and retain
+   this copyright notice and list of conditions as they appear in the
+   source file.
+
+2) No right is granted to use any trade name, trademark, or logo of Digital
+   Equipment Corporation. Neither the "Digital Equipment Corporation"
+   name nor any trademark or logo of Digital Equipment Corporation may be
+   used to endorse or promote products derived from this software without
+   the prior written permission of Digital Equipment Corporation.
+
+3) This software is provided "AS-IS" and any express or implied warranties,
+   including but not limited to, any implied warranties of merchantability,
+   fitness for a particular purpose, or non-infringement are disclaimed.
+   In no event shall DIGITAL be liable for any damages whatsoever, and in
+   particular, DIGITAL shall not be liable for special, indirect,
+   consequential, or incidental damages or damages for lost profits, loss
+   of revenue or loss of use, whether such damages arise in contract,
+   negligence, tort, under statute, in equity, at law or otherwise, even
+   if advised of the possibility of such damage.
+
+
+Copyright (c) 1991, 1996-1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+
+SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
+
+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 including the dates of first publication and
+either this permission notice or a reference to
+http://oss.sgi.com/projects/FreeB/
+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
+SILICON GRAPHICS, INC. 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.
+
+
+Copyright (c) 1994, 1995  Hewlett-Packard Company
+
+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 HEWLETT-PACKARD COMPANY 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 Hewlett-Packard
+Company 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 Hewlett-Packard Company.
+
+
+Copyright 1989 by Hewlett-Packard Company, Palo Alto, California.
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Hewlett-Packard not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+HEWLETT-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+
+Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
+Copyright (c) 2003 by the XFree86 Project, Inc.
+Copyright 2004-2005 Red Hat Inc., Raleigh, North Carolina.
+All Rights Reserved.
+
+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 on 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 (including the
+next paragraph) 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
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+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.
+
+
+Copyright © 2008 Red Hat, Inc.
+Partly based on code Copyright © 2000 SuSE, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without
+fee, provided that the above copyright notice appear in all copies
+and that both that copyright notice and this permission notice
+appear in supporting documentation, and that the name of Red Hat
+not be used in advertising or publicity pertaining to distribution
+of the software without specific, written prior permission.  Red
+Hat makes no representations about the suitability of this software
+for any purpose.  It is provided "as is" without express or implied
+warranty.
+
+Red Hat DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+NO EVENT SHALL Red Hat BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of SuSE not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  SuSE makes no representations about the
+suitability of this software for any purpose.  It is provided "as is"
+without express or implied warranty.
+
+SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
+BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright © 2006  Red Hat, Inc.
+(C) Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+All Rights Reserved.
+
+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, sub license,
+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 (including the next
+paragraph) 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
+RED HAT, INC, OR PRECISION INSIGHT AND/OR THEIR SUPPLIERS 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.
+
+
+Copyright (c) 1995  X Consortium
+Copyright 2004 Red Hat Inc., Durham, North Carolina.
+All Rights Reserved.
+
+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 on 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
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT, THE X CONSORTIUM,
+AND/OR THEIR SUPPLIERS 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 1998-2000 Precision Insight, Inc., Cedar Park, Texas.
+Copyright 2000 VA Linux Systems, Inc.
+Copyright (c) 2002, 2008, 2009 Apple Computer, Inc.
+Copyright (c) 2003-2004 Torrey T. Lyons.
+All Rights Reserved.
+
+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, sub license, 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 (including the
+next paragraph) 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 NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
+
+
+(C) Copyright IBM Corporation 2003
+All Rights Reserved.
+
+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
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, 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 (including the next
+paragraph) 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
+VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS 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.
+
+
+(C) Copyright IBM Corporation 2004-2005
+All Rights Reserved.
+
+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, sub license,
+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 (including the next
+paragraph) 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
+IBM,
+AND/OR THEIR SUPPLIERS 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.
+
+
+Copyright (c) 1997  Metro Link Incorporated
+
+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 Metro Link shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from Metro Link.
+
+
+Copyright 1995-1998 by Metro Link, Inc.
+Copyright (c) 1997 Matthieu Herrb
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Metro Link, Inc. not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Metro Link, Inc. makes no
+representations about the suitability of this software for any purpose.
+ It is provided "as is" without express or implied warranty.
+
+METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL METRO LINK, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 1998 by Metro Link Incorporated
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Metro Link
+Incorporated not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.  Metro Link Incorporated makes no representations
+about the suitability of this software for any purpose.  It is
+provided "as is" without express or implied warranty.
+
+METRO LINK INCORPORATED DISCLAIMS ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL METRO LINK INCORPORATED BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+
+Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+
+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
+CONECTIVA LINUX 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 Conectiva Linux shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from
+Conectiva Linux.
+
+
+Copyright (c) 2001, Andy Ritger  aritger@nvidia.com
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+o Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+o Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer
+  in the documentation and/or other materials provided with the
+  distribution.
+o Neither the name of NVIDIA nor the names of its contributors
+  may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+
+Copyright 1992 Vrije Universiteit, The Netherlands
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted, provided
+that the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of the Vrije Universiteit not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  The Vrije Universiteit makes no
+representations about the suitability of this software for any purpose.
+It is provided "as is" without express or implied warranty.
+
+The Vrije Universiteit DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL The Vrije Universiteit BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 1998 by Concurrent Computer Corporation
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Concurrent Computer
+Corporation not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.  Concurrent Computer Corporation makes no representations
+about the suitability of this software for any purpose.  It is
+provided "as is" without express or implied warranty.
+
+CONCURRENT COMPUTER CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL CONCURRENT COMPUTER CORPORATION BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+
+Copyright © 2004 Nokia
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Nokia not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Nokia makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+NOKIA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL NOKIA BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+
+(c)Copyright 1988,1991 Adobe Systems Incorporated.
+All rights reserved.
+
+Permission to use, copy, modify, distribute, and sublicense this software and its
+documentation for any purpose and without fee is hereby granted, provided that
+the above copyright notices appear in all copies and that both those copyright
+notices and this permission notice appear in supporting documentation and that
+the name of Adobe Systems Incorporated not be used in advertising or publicity
+pertaining to distribution of the software without specific, written prior
+permission.  No trademark license to use the Adobe trademarks is hereby
+granted.  If the Adobe trademark "Display PostScript"(tm) is used to describe
+this software, its functionality or for any other purpose, such use shall be
+limited to a statement that this software works in conjunction with the Display
+PostScript system.  Proper trademark attribution to reflect Adobe's ownership
+of the trademark shall be given whenever any such reference to the Display
+PostScript system is made.
+
+ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR ANY
+PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.  ADOBE
+DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-
+INFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO EVENT SHALL ADOBE BE LIABLE TO YOU
+OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,NEGLIGENCE, STRICT
+LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.  ADOBE WILL NOT PROVIDE ANY TRAINING OR OTHER
+SUPPORT FOR THE SOFTWARE.
+
+Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
+Incorporated which may be registered in certain jurisdictions.
+
+
+Copyright 1989 Network Computing Devices, Inc., Mountain View, California.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted, provided
+that the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of N.C.D. not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  N.C.D. makes no representations about the
+suitability of this software for any purpose.  It is provided "as is"
+without express or implied warranty.
+
+
+Copyright (c) 1987 by the Regents of the University of California
+
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright
+notice appear in all copies.  The University of California
+makes no representations about the suitability of this
+software for any purpose.  It is provided "as is" without
+express or implied warranty.
+
+
+Copyright 1992, 1993 Data General Corporation;
+Copyright 1992, 1993 OMRON Corporation
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that the
+above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and that
+neither the name OMRON or DATA GENERAL be used in advertising or publicity
+pertaining to distribution of the software without specific, written prior
+permission of the party whose name is to be used.  Neither OMRON or
+DATA GENERAL make any representation about the suitability of this software
+for any purpose.  It is provided "as is" without express or implied warranty.
+
+OMRON AND DATA GENERAL EACH DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
+IN NO EVENT SHALL OMRON OR DATA GENERAL BE LIABLE FOR ANY SPECIAL, INDIRECT
+OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+
+
+Copyright © 1998-2004, 2006 Keith Packard
+Copyright © 2000-2002 Keith Packard, member of The XFree86 Project, Inc.
+Copyright (c) 2002 Apple Computer, Inc.
+Copyright (c) 2003 Torrey T. Lyons.
+All Rights Reserved.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Keith Packard not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Keith Packard makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright © 1999 Keith Packard
+Copyright © 2000 Compaq Computer Corporation
+Copyright © 2002 MontaVista Software Inc.
+Copyright © 2005 OpenedHand Ltd.
+Copyright © 2006 Nokia Corporation
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of the authors and/or copyright holders
+not be used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  The authors and/or
+copyright holders make no representations about the suitability of this
+software for any purpose.  It is provided "as is" without express or
+implied warranty.
+
+THE AUTHORS AND/OR COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE AUTHORS AND/OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 1993 by Davor Matic
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation.  Davor Matic makes no representations about
+the suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+
+Copyright (C) 2001-2004 Harold L Hunt II All Rights Reserved.
+Copyright (C) Colin Harrison 2005-2008
+
+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 HAROLD L HUNT II 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 Harold L Hunt II
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+from Harold L Hunt II.
+
+
+Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Thomas Roell not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Thomas Roell makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without express or implied warranty.
+
+THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THOMAS ROELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
+Copyright 1993 by David Wexelblat <dwex@goblin.org>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the names of Thomas Roell and David Wexelblat
+not be used in advertising or publicity pertaining to distribution of
+the software without specific, written prior permission.  Thomas Roell and
+David Wexelblat makes no representations about the suitability of this
+software for any purpose.  It is provided "as is" without express or
+implied warranty.
+
+THOMAS ROELL AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL THOMAS ROELL OR DAVID WEXELBLAT BE LIABLE FOR
+ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 1990,91,92,93 by Thomas Roell, Germany.
+Copyright 1991,92,93    by SGCS (Snitily Graphics Consulting Services), USA.
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and
+that both that copyright notice and this  permission notice appear
+in supporting documentation, and that the name of Thomas Roell nor
+SGCS be used in advertising or publicity pertaining to distribution
+of the software without specific, written prior permission.
+Thomas Roell nor SGCS makes no representations about the suitability
+of this software for any purpose. It is provided "as is" without
+express or implied warranty.
+
+THOMAS ROELL AND SGCS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL THOMAS ROELL OR SGCS BE LIABLE FOR ANY
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 1998 by Alan Hourihane, Wigan, England.
+Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Alan Hourihane not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Alan Hourihane makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without express or implied warranty.
+
+ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 1995  Kaleb S. KEITHLEY
+
+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 Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+from Kaleb S. KEITHLEY
+
+
+Copyright (c) 1997 Matthieu Herrb
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Matthieu Herrb not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Matthieu Herrb makes no
+representations about the suitability of this software for any purpose.
+ It is provided "as is" without express or implied warranty.
+
+MATTHIEU HERRB DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL MATTHIEU HERRB BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 2004, Egbert Eich
+
+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
+EGBERT EICH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of Egbert Eich shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from Egbert Eich.
+
+
+Copyright 1993 by David Wexelblat <dwex@goblin.org>
+Copyright 2005 by Kean Johnston <jkj@sco.com>
+Copyright 1993 by David McCullough <davidm@stallion.oz.au>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of David Wexelblat not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  David Wexelblat makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without express or implied warranty.
+
+DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL DAVID WEXELBLAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 1992 by Orest Zborowski <obz@Kodak.com>
+Copyright 1993 by David Wexelblat <dwex@goblin.org>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the names of Orest Zborowski and David Wexelblat
+not be used in advertising or publicity pertaining to distribution of
+the software without specific, written prior permission.  Orest Zborowski
+and David Wexelblat make no representations about the suitability of this
+software for any purpose.  It is provided "as is" without express or
+implied warranty.
+
+OREST ZBOROWSKI AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 1992 by Orest Zborowski <obz@Kodak.com>
+Copyright 1993 by David Dawes <dawes@xfree86.org>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the names of Orest Zborowski and David Dawes
+not be used in advertising or publicity pertaining to distribution of
+the software without specific, written prior permission.  Orest Zborowski
+and David Dawes make no representations about the suitability of this
+software for any purpose.  It is provided "as is" without express or
+implied warranty.
+
+OREST ZBOROWSKI AND DAVID DAWES DISCLAIMS ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID DAWES BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 1995-1999 by Frederic Lepied, France. <fred@sugix.frmug.fr.net>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is  hereby granted without fee, provided that
+the  above copyright   notice appear  in   all  copies and  that both  that
+copyright  notice   and   this  permission   notice  appear  in  supporting
+documentation, and that   the  name of  Frederic   Lepied not  be  used  in
+advertising or publicity pertaining to distribution of the software without
+specific,  written      prior  permission.     Frederic  Lepied   makes  no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+FREDERIC  LEPIED DISCLAIMS ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,
+INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO
+EVENT  SHALL FREDERIC  LEPIED BE   LIABLE   FOR ANY  SPECIAL, INDIRECT   OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA  OR PROFITS, WHETHER  IN  AN ACTION OF  CONTRACT,  NEGLIGENCE OR OTHER
+TORTIOUS  ACTION, ARISING    OUT OF OR   IN  CONNECTION  WITH THE USE    OR
+PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 1992 by Rich Murphey <Rich@Rice.edu>
+Copyright 1993 by David Wexelblat <dwex@goblin.org>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the names of Rich Murphey and David Wexelblat
+not be used in advertising or publicity pertaining to distribution of
+the software without specific, written prior permission.  Rich Murphey and
+David Wexelblat make no representations about the suitability of this
+software for any purpose.  It is provided "as is" without express or
+implied warranty.
+
+RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR
+ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 1992 by Rich Murphey <Rich@Rice.edu>
+Copyright 1993 by David Dawes <dawes@xfree86.org>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the names of Rich Murphey and David Dawes
+not be used in advertising or publicity pertaining to distribution of
+the software without specific, written prior permission.  Rich Murphey and
+David Dawes make no representations about the suitability of this
+software for any purpose.  It is provided "as is" without express or
+implied warranty.
+
+RICH MURPHEY AND DAVID DAWES DISCLAIM ALL WARRANTIES WITH REGARD TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID DAWES BE LIABLE FOR
+ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright © 2003-2004 Anders Carlsson
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Anders Carlsson not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Anders Carlsson makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+ANDERS CARLSSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL ANDERS CARLSSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright (C) 2003 Anders Carlsson
+Copyright © 2003-2004 Eric Anholt
+Copyright © 2004 Keith Packard
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Eric Anholt not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Eric Anholt makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+ERIC ANHOLT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL ERIC ANHOLT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
+WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
+FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright © 2003-2004 Philip Blundell
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Philip Blundell not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Philip Blundell makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+
+
+Copyright (c) 1994-2003 by The XFree86 Project, Inc.
+Copyright 1997 by Metro Link, Inc.
+Copyright 2003 by David H. Dawes.
+Copyright 2003 by X-Oz Technologies.
+Copyright (c) 2004, X.Org Foundation
+
+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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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 copyright holder(s)
+and author(s) 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 copyright holder(s) and author(s).
+
+
+Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
+Copyright 1993 by David Wexelblat <dwex@goblin.org>
+Copyright 1999 by David Holland <davidh@iquest.net>
+Copyright © 2000 Compaq Computer Corporation
+Copyright © 2002 Hewlett-Packard Company
+Copyright © 2004, 2005 Red Hat, Inc.
+Copyright © 2004 Nicholas Miell
+Copyright © 2005 Trolltech AS
+Copyright © 2006 Intel Corporation
+Copyright © 2006-2007 Keith Packard
+Copyright © 2008 Red Hat, Inc
+Copyright © 2008 George Sapountzis <gsap7@yahoo.gr>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+that the name of the copyright holders not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  The copyright holders make no representations
+about the suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+
+Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
+            2005 Lars Knoll & Zack Rusin, Trolltech
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Keith Packard not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Keith Packard makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+
+Copyright 1987, 1998  The Open Group
+Copyright © 1998-1999, 2001 The XFree86 Project, Inc.
+Copyright © 2000 VA Linux Systems, Inc.
+Copyright (c) 2000, 2001 Nokia Home Communications
+Copyright © 2007, 2008 Red Hat, Inc.
+All rights reserved.
+
+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, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
+
+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
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
+
+
+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+Copyright (c) 2001 Andreas Monitzer.
+Copyright (c) 2001-2004 Greg Parker.
+Copyright (c) 2001-2004 Torrey T. Lyons
+Copyright (c) 2002-2003 Apple Computer, Inc.
+Copyright (c) 2004-2005 Alexander Gottwald
+Copyright (c) 2002-2009 Apple Inc.
+Copyright (c) 2007 Jeremy Huddleston
+All Rights Reserved.
+
+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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in this Software without prior written authorization.
+
+
+Copyright (C) 1999,2000 by Eric Sunshine <sunshine@sunshineco.com>
+Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+  3. The name of the author may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Copyright (C) 2005 Bogdan D. bogdand@users.sourceforge.net
+
+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
+AUTHOR 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 author 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 author.
+
+
+Copyright © 2002 David Dawes
+
+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 AUTHOR(S) 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 author(s) 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 author(s).
+
+
+Copyright (C) 1996-1999 SciTech Software, Inc.
+Copyright (C) David Mosberger-Tang
+Copyright (C) 1999 Egbert Eich
+Copyright (C) 2008 Bart Trojanowski, Symbio Technologies, LLC
+
+Permission to use, copy, modify, distribute, and sell this software and
+its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the authors not be used
+in advertising or publicity pertaining to distribution of the software
+without specific, written prior permission.  The authors makes no
+representations about the suitability of this software for any purpose.
+It is provided "as is" without express or implied warranty.
+
+THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 2005-2006 Luc Verhaegen.
+
+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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
+
+
+Copyright 1995 by Robin Cutshaw <robin@XFree86.Org>
+Copyright 2000 by Egbert Eich
+Copyright 2002 by David Dawes
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the names of the above listed copyright holder(s)
+not be used in advertising or publicity pertaining to distribution of
+the software without specific, written prior permission.  The above listed
+copyright holder(s) make(s) no representations about the suitability of this
+software for any purpose.  It is provided "as is" without express or
+implied warranty.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
+IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 1997-2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+that the name of Marc Aurele La France not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  Marc Aurele La France makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as-is" without express or implied warranty.
+
+MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO
+EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+
+
+Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany
+Copyright 1992 by David Dawes <dawes@XFree86.org>
+Copyright 1992 by Jim Tsillas <jtsilla@damon.ccs.northeastern.edu>
+Copyright 1992 by Rich Murphey <Rich@Rice.edu>
+Copyright 1992 by Robert Baron <Robert.Baron@ernst.mach.cs.cmu.edu>
+Copyright 1992 by Orest Zborowski <obz@eskimo.com>
+Copyright 1993 by Vrije Universiteit, The Netherlands
+Copyright 1993 by David Wexelblat <dwex@XFree86.org>
+Copyright 1994, 1996 by Holger Veit <Holger.Veit@gmd.de>
+Copyright 1997 by Takis Psarogiannakopoulos <takis@dpmms.cam.ac.uk>
+Copyright 1994-2003 by The XFree86 Project, Inc
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the names of the above listed copyright holders
+not be used in advertising or publicity pertaining to distribution of
+the software without specific, written prior permission.  The above listed
+copyright holders make no representations about the suitability of this
+software for any purpose.  It is provided "as is" without express or
+implied warranty.
+
+THE ABOVE LISTED COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDERS BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
+IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright 2001-2005 by J. Kean Johnston <jkj@sco.com>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name J. Kean Johnston not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  J. Kean Johnston makes no
+representations about the suitability of this software for any purpose.
+It is provided "as is" without express or implied warranty.
+
+J. KEAN JOHNSTON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL J. KEAN JOHNSTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
+
+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
+JAKUB JELINEK 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.
+
+
+Copyright 1997,1998 by UCHIYAMA Yasushi
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of UCHIYAMA Yasushi not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  UCHIYAMA Yasushi makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without express or implied warranty.
+
+UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright (C) 2000 Keith Packard
+              2004 Eric Anholt
+              2005 Zack Rusin
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of copyright holders not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Copyright holders make no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+
+(C) Copyright IBM Corporation 2002-2007
+All Rights Reserved.
+
+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
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, 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 (including the next
+paragraph) 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
+THE COPYRIGHT HOLDERS AND/OR THEIR SUPPLIERS 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.
+
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+this permission notice appear in supporting documentation.  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
+AUTHOR 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.
+
+
+Copyright © 2007 OpenedHand Ltd
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of OpenedHand Ltd not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. OpenedHand Ltd makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+OpenedHand Ltd DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL OpenedHand Ltd BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright (c) 1989, 1990, 1993, 1994
+     The Regents of the University of California.  All rights reserved.
+
+This code is derived from software contributed to Berkeley by
+Chris Torek.
+
+This code is derived from software contributed to Berkeley by
+Michael Rendell of Memorial University of Newfoundland.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 4. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/xorg-server/README b/xorg-server/README
index b2499a059..58abd8e87 100644
--- a/xorg-server/README
+++ b/xorg-server/README
@@ -1,38 +1,38 @@
-					X Server
-
-The X server accepts requests from client applications to create windows,
-which are (normally rectangular) "virtual screens" that the client program
-can draw into.
-
-Windows are then composed on the actual screen by the X server
-(or by a separate composite manager) as directed by the window manager,
-which usually communicates with the user via graphical controls such as buttons
-and draggable titlebars and borders.
-
-For a comprehensive overview of X Server and X Window System, consult the
-following article:
-http://en.wikipedia.org/wiki/X_server
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
-        http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
-        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-The master development code repository can be found at:
-
-        git://anongit.freedesktop.org/git/xorg/xserver
-
-        http://cgit.freedesktop.org/xorg/xserver
-
-For patch submission instructions, see:
-
-	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
-        http://wiki.x.org/wiki/GitPage
-
+					X Server
+
+The X server accepts requests from client applications to create windows,
+which are (normally rectangular) "virtual screens" that the client program
+can draw into.
+
+Windows are then composed on the actual screen by the X server
+(or by a separate composite manager) as directed by the window manager,
+which usually communicates with the user via graphical controls such as buttons
+and draggable titlebars and borders.
+
+For a comprehensive overview of X Server and X Window System, consult the
+following article:
+http://en.wikipedia.org/wiki/X_server
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+        http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+        git://anongit.freedesktop.org/git/xorg/xserver
+
+        http://cgit.freedesktop.org/xorg/xserver
+
+For patch submission instructions, see:
+
+	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+        http://wiki.x.org/wiki/GitPage
+
diff --git a/xorg-server/Xext/panoramiX.c b/xorg-server/Xext/panoramiX.c
index 98d327f26..de62a35e7 100644
--- a/xorg-server/Xext/panoramiX.c
+++ b/xorg-server/Xext/panoramiX.c
@@ -150,7 +150,7 @@ static GCFuncs XineramaGCFuncs = {
     (pGC)->funcs = &XineramaGCFuncs;
 
 static Bool
-XineramaCloseScreen(int i, ScreenPtr pScreen)
+XineramaCloseScreen(ScreenPtr pScreen)
 {
     PanoramiXScreenPtr pScreenPriv = (PanoramiXScreenPtr)
         dixLookupPrivate(&pScreen->devPrivates, PanoramiXScreenKey);
@@ -163,7 +163,7 @@ XineramaCloseScreen(int i, ScreenPtr pScreen)
 
     free((pointer) pScreenPriv);
 
-    return (*pScreen->CloseScreen) (i, pScreen);
+    return (*pScreen->CloseScreen) (pScreen);
 }
 
 static Bool
diff --git a/xorg-server/Xext/shm.c b/xorg-server/Xext/shm.c
index 7a73640dd..06a919bdc 100644
--- a/xorg-server/Xext/shm.c
+++ b/xorg-server/Xext/shm.c
@@ -204,14 +204,14 @@ CheckForShmSyscall(void)
 #endif
 
 static Bool
-ShmCloseScreen(int i, ScreenPtr pScreen)
+ShmCloseScreen(ScreenPtr pScreen)
 {
     ShmScrPrivateRec *screen_priv = ShmGetScreenPriv(pScreen);
 
     pScreen->CloseScreen = screen_priv->CloseScreen;
     dixSetPrivate(&pScreen->devPrivates, shmScrPrivateKey, NULL);
     free(screen_priv);
-    return (*pScreen->CloseScreen) (i, pScreen);
+    return (*pScreen->CloseScreen) (pScreen);
 }
 
 static ShmScrPrivateRec *
diff --git a/xorg-server/Xext/xf86bigfontsrv.h b/xorg-server/Xext/xf86bigfontsrv.h
index 2c78dc4c9..3c4887dfd 100644
--- a/xorg-server/Xext/xf86bigfontsrv.h
+++ b/xorg-server/Xext/xf86bigfontsrv.h
@@ -1,34 +1,34 @@
-/*
- * Copyright © 2010 Yaakov Selkowitz
- *
- * 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 (including the
- * next paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
- */
-
-#ifndef _XF86BIGFONTSRV_H_
-#define _XF86BIGFONTSRV_H_
-
-#include <X11/fonts/font.h>
-
-extern void XFree86BigfontExtensionInit(void);
-extern void XF86BigfontFreeFontShm(FontPtr);
-extern void XF86BigfontCleanup(void);
-
-#endif
+/*
+ * Copyright © 2010 Yaakov Selkowitz
+ *
+ * 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 (including the
+ * next paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+#ifndef _XF86BIGFONTSRV_H_
+#define _XF86BIGFONTSRV_H_
+
+#include <X11/fonts/font.h>
+
+extern void XFree86BigfontExtensionInit(void);
+extern void XF86BigfontFreeFontShm(FontPtr);
+extern void XF86BigfontCleanup(void);
+
+#endif
diff --git a/xorg-server/Xext/xvdisp.h b/xorg-server/Xext/xvdisp.h
index 298d39560..b3580a8ef 100644
--- a/xorg-server/Xext/xvdisp.h
+++ b/xorg-server/Xext/xvdisp.h
@@ -1,2 +1,2 @@
-extern void XineramifyXv(void);
-extern void XvResetProcVector(void);
+extern void XineramifyXv(void);
+extern void XvResetProcVector(void);
diff --git a/xorg-server/Xext/xvdix.h b/xorg-server/Xext/xvdix.h
index d22672620..59fc1ffc8 100644
--- a/xorg-server/Xext/xvdix.h
+++ b/xorg-server/Xext/xvdix.h
@@ -215,7 +215,7 @@ typedef struct {
     DestroyWindowProcPtr DestroyWindow;
     DestroyPixmapProcPtr DestroyPixmap;
     CloseScreenProcPtr CloseScreen;
-    Bool (*ddCloseScreen) (int, ScreenPtr);
+    Bool (*ddCloseScreen) (ScreenPtr);
     int (*ddQueryAdaptors) (ScreenPtr, XvAdaptorPtr *, int *);
     DevUnion devPriv;
 } XvScreenRec, *XvScreenPtr;
diff --git a/xorg-server/Xext/xvmain.c b/xorg-server/Xext/xvmain.c
index 28f2a56df..0b508611c 100644
--- a/xorg-server/Xext/xvmain.c
+++ b/xorg-server/Xext/xvmain.c
@@ -129,7 +129,7 @@ static void WriteSwappedVideoNotifyEvent(xvEvent *, xvEvent *);
 static void WriteSwappedPortNotifyEvent(xvEvent *, xvEvent *);
 static Bool CreateResourceTypes(void);
 
-static Bool XvCloseScreen(int, ScreenPtr);
+static Bool XvCloseScreen(ScreenPtr);
 static Bool XvDestroyPixmap(PixmapPtr);
 static Bool XvDestroyWindow(WindowPtr);
 static void XvResetProc(ExtensionEntry *);
@@ -290,7 +290,7 @@ XvScreenInit(ScreenPtr pScreen)
 }
 
 static Bool
-XvCloseScreen(int ii, ScreenPtr pScreen)
+XvCloseScreen(ScreenPtr pScreen)
 {
 
     XvScreenPtr pxvs;
@@ -301,13 +301,13 @@ XvCloseScreen(int ii, ScreenPtr pScreen)
     pScreen->DestroyWindow = pxvs->DestroyWindow;
     pScreen->CloseScreen = pxvs->CloseScreen;
 
-    if (pxvs->ddCloseScreen) (*pxvs->ddCloseScreen) (ii, pScreen);
+    if (pxvs->ddCloseScreen) (*pxvs->ddCloseScreen) (pScreen);
 
     free(pxvs);
 
     dixSetPrivate(&pScreen->devPrivates, XvScreenKey, NULL);
 
-    return (*pScreen->CloseScreen) (ii, pScreen);
+    return (*pScreen->CloseScreen) (pScreen);
 }
 
 static void
diff --git a/xorg-server/Xext/xvmc.c b/xorg-server/Xext/xvmc.c
index 8a1d94085..4aaff4d9f 100644
--- a/xorg-server/Xext/xvmc.c
+++ b/xorg-server/Xext/xvmc.c
@@ -709,7 +709,7 @@ XvMCExtensionInit(void)
 }
 
 static Bool
-XvMCCloseScreen(int i, ScreenPtr pScreen)
+XvMCCloseScreen(ScreenPtr pScreen)
 {
     XvMCScreenPtr pScreenPriv = XVMC_GET_PRIVATE(pScreen);
 
@@ -717,7 +717,7 @@ XvMCCloseScreen(int i, ScreenPtr pScreen)
 
     free(pScreenPriv);
 
-    return (*pScreen->CloseScreen) (i, pScreen);
+    return (*pScreen->CloseScreen) (pScreen);
 }
 
 int
diff --git a/xorg-server/Xi/Makefile.am b/xorg-server/Xi/Makefile.am
index 69c7886b9..499e7056d 100644
--- a/xorg-server/Xi/Makefile.am
+++ b/xorg-server/Xi/Makefile.am
@@ -1,108 +1,108 @@
-noinst_LTLIBRARIES = libXi.la
-
-AM_CFLAGS = $(DIX_CFLAGS)
-
-libXi_la_SOURCES =	\
-	allowev.c \
-	allowev.h \
-	chgdctl.c \
-	chgdctl.h \
-	chgfctl.c \
-	chgfctl.h \
-	chgkbd.c \
-	chgkbd.h \
-	chgkmap.c \
-	chgkmap.h \
-	chgprop.c \
-	chgprop.h \
-	chgptr.c \
-	chgptr.h \
-	closedev.c \
-	closedev.h \
-	devbell.c \
-	devbell.h \
-	exevents.c \
-	exglobals.h \
-	extinit.c \
-	getbmap.c \
-	getbmap.h \
-	getdctl.c \
-	getdctl.h \
-	getfctl.c \
-	getfctl.h \
-	getfocus.c \
-	getfocus.h \
-	getkmap.c \
-	getkmap.h \
-	getmmap.c \
-	getmmap.h \
-	getprop.c \
-	getprop.h \
-	getselev.c \
-	getselev.h \
-	getvers.c \
-	getvers.h \
-	grabdev.c \
-	grabdev.h \
-	grabdevb.c \
-	grabdevb.h \
-	grabdevk.c \
-	grabdevk.h \
-	gtmotion.c \
-	gtmotion.h \
-	listdev.c \
-	listdev.h \
-	opendev.c \
-	opendev.h \
-	queryst.c \
-	queryst.h \
-	selectev.c \
-	selectev.h \
-	sendexev.c \
-	sendexev.h \
-	setbmap.c \
-	setbmap.h \
-	setdval.c \
-	setdval.h \
-	setfocus.c \
-	setfocus.h \
-	setmmap.c \
-	setmmap.h \
-	setmode.c \
-	setmode.h \
-	ungrdev.c \
-	ungrdev.h \
-	ungrdevb.c \
-	ungrdevb.h \
-	ungrdevk.c \
-	ungrdevk.h \
-	xiallowev.c \
-	xiallowev.h \
-	xichangecursor.c \
-	xichangecursor.h \
-	xichangehierarchy.c \
-	xichangehierarchy.h \
-	xigetclientpointer.c \
-	xigetclientpointer.h \
-	xigrabdev.c \
-	xigrabdev.h \
-	xipassivegrab.h \
-	xipassivegrab.c \
-	xiproperty.c \
-	xiproperty.h \
-	xiquerydevice.c \
-	xiquerydevice.h \
-	xiquerypointer.c \
-	xiquerypointer.h \
-	xiqueryversion.c \
-	xiqueryversion.h \
-	xiselectev.c \
-	xiselectev.h \
-	xisetclientpointer.c \
-	xisetclientpointer.h \
-	xisetdevfocus.c \
-	xisetdevfocus.h \
-	xiwarppointer.c \
-	xiwarppointer.h
-
-EXTRA_DIST = stubs.c
+noinst_LTLIBRARIES = libXi.la
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+libXi_la_SOURCES =	\
+	allowev.c \
+	allowev.h \
+	chgdctl.c \
+	chgdctl.h \
+	chgfctl.c \
+	chgfctl.h \
+	chgkbd.c \
+	chgkbd.h \
+	chgkmap.c \
+	chgkmap.h \
+	chgprop.c \
+	chgprop.h \
+	chgptr.c \
+	chgptr.h \
+	closedev.c \
+	closedev.h \
+	devbell.c \
+	devbell.h \
+	exevents.c \
+	exglobals.h \
+	extinit.c \
+	getbmap.c \
+	getbmap.h \
+	getdctl.c \
+	getdctl.h \
+	getfctl.c \
+	getfctl.h \
+	getfocus.c \
+	getfocus.h \
+	getkmap.c \
+	getkmap.h \
+	getmmap.c \
+	getmmap.h \
+	getprop.c \
+	getprop.h \
+	getselev.c \
+	getselev.h \
+	getvers.c \
+	getvers.h \
+	grabdev.c \
+	grabdev.h \
+	grabdevb.c \
+	grabdevb.h \
+	grabdevk.c \
+	grabdevk.h \
+	gtmotion.c \
+	gtmotion.h \
+	listdev.c \
+	listdev.h \
+	opendev.c \
+	opendev.h \
+	queryst.c \
+	queryst.h \
+	selectev.c \
+	selectev.h \
+	sendexev.c \
+	sendexev.h \
+	setbmap.c \
+	setbmap.h \
+	setdval.c \
+	setdval.h \
+	setfocus.c \
+	setfocus.h \
+	setmmap.c \
+	setmmap.h \
+	setmode.c \
+	setmode.h \
+	ungrdev.c \
+	ungrdev.h \
+	ungrdevb.c \
+	ungrdevb.h \
+	ungrdevk.c \
+	ungrdevk.h \
+	xiallowev.c \
+	xiallowev.h \
+	xichangecursor.c \
+	xichangecursor.h \
+	xichangehierarchy.c \
+	xichangehierarchy.h \
+	xigetclientpointer.c \
+	xigetclientpointer.h \
+	xigrabdev.c \
+	xigrabdev.h \
+	xipassivegrab.h \
+	xipassivegrab.c \
+	xiproperty.c \
+	xiproperty.h \
+	xiquerydevice.c \
+	xiquerydevice.h \
+	xiquerypointer.c \
+	xiquerypointer.h \
+	xiqueryversion.c \
+	xiqueryversion.h \
+	xiselectev.c \
+	xiselectev.h \
+	xisetclientpointer.c \
+	xisetclientpointer.h \
+	xisetdevfocus.c \
+	xisetdevfocus.h \
+	xiwarppointer.c \
+	xiwarppointer.h
+
+EXTRA_DIST = stubs.c
diff --git a/xorg-server/autogen.sh b/xorg-server/autogen.sh
index 4e8b11ba9..588fef395 100644
--- a/xorg-server/autogen.sh
+++ b/xorg-server/autogen.sh
@@ -1,12 +1,12 @@
-#! /bin/sh
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-autoreconf --force -v --install || exit 1
-cd $ORIGDIR || exit $?
-
-$srcdir/configure --enable-maintainer-mode "$@"
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf --force -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/xorg-server/composite/Makefile.am b/xorg-server/composite/Makefile.am
index c2f5123f2..a7c0804e8 100644
--- a/xorg-server/composite/Makefile.am
+++ b/xorg-server/composite/Makefile.am
@@ -1,15 +1,15 @@
-noinst_LTLIBRARIES = libcomposite.la
-
-AM_CFLAGS = $(DIX_CFLAGS)
-
-if XORG
-sdk_HEADERS = compositeext.h
-endif
-
-libcomposite_la_SOURCES = 	\
-	compalloc.c		\
-	compext.c		\
-	compint.h		\
-	compinit.c		\
-	compoverlay.c		\
-	compwindow.c		
+noinst_LTLIBRARIES = libcomposite.la
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+if XORG
+sdk_HEADERS = compositeext.h
+endif
+
+libcomposite_la_SOURCES = 	\
+	compalloc.c		\
+	compext.c		\
+	compint.h		\
+	compinit.c		\
+	compoverlay.c		\
+	compwindow.c		
diff --git a/xorg-server/composite/compalloc.c b/xorg-server/composite/compalloc.c
index e85ade0f0..f79f5f96c 100644
--- a/xorg-server/composite/compalloc.c
+++ b/xorg-server/composite/compalloc.c
@@ -55,14 +55,13 @@ compScreenUpdate(ScreenPtr pScreen)
 }
 
 static void
-compBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
+compBlockHandler(ScreenPtr pScreen, pointer pTimeout, pointer pReadmask)
 {
-    ScreenPtr pScreen = screenInfo.screens[i];
     CompScreenPtr cs = GetCompScreen(pScreen);
 
     pScreen->BlockHandler = cs->BlockHandler;
     compScreenUpdate(pScreen);
-    (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
+    (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
 
     /* Next damage will restore the block handler */
     cs->BlockHandler = NULL;
diff --git a/xorg-server/composite/compinit.c b/xorg-server/composite/compinit.c
index eaa125681..bc1130e78 100644
--- a/xorg-server/composite/compinit.c
+++ b/xorg-server/composite/compinit.c
@@ -53,7 +53,7 @@ DevPrivateKeyRec CompWindowPrivateKeyRec;
 DevPrivateKeyRec CompSubwindowsPrivateKeyRec;
 
 static Bool
-compCloseScreen(int index, ScreenPtr pScreen)
+compCloseScreen(ScreenPtr pScreen)
 {
     CompScreenPtr cs = GetCompScreen(pScreen);
     Bool ret;
@@ -82,7 +82,7 @@ compCloseScreen(int index, ScreenPtr pScreen)
 
     free(cs);
     dixSetPrivate(&pScreen->devPrivates, CompScreenPrivateKey, NULL);
-    ret = (*pScreen->CloseScreen) (index, pScreen);
+    ret = (*pScreen->CloseScreen) (pScreen);
 
     return ret;
 }
diff --git a/xorg-server/config/10-evdev.conf b/xorg-server/config/10-evdev.conf
index cc83ab232..144110846 100644
--- a/xorg-server/config/10-evdev.conf
+++ b/xorg-server/config/10-evdev.conf
@@ -1,40 +1,40 @@
-#
-# Catch-all evdev loader for udev-based systems
-# We don't simply match on any device since that also adds accelerometers
-# and other devices that we don't really want to use. The list below
-# matches everything but joysticks.
-
-Section "InputClass"
-        Identifier "evdev pointer catchall"
-        MatchIsPointer "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
-EndSection
-
-Section "InputClass"
-        Identifier "evdev keyboard catchall"
-        MatchIsKeyboard "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
-EndSection
-
-Section "InputClass"
-        Identifier "evdev touchpad catchall"
-        MatchIsTouchpad "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
-EndSection
-
-Section "InputClass"
-        Identifier "evdev tablet catchall"
-        MatchIsTablet "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
-EndSection
-
-Section "InputClass"
-        Identifier "evdev touchscreen catchall"
-        MatchIsTouchscreen "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
-EndSection
+#
+# Catch-all evdev loader for udev-based systems
+# We don't simply match on any device since that also adds accelerometers
+# and other devices that we don't really want to use. The list below
+# matches everything but joysticks.
+
+Section "InputClass"
+        Identifier "evdev pointer catchall"
+        MatchIsPointer "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev keyboard catchall"
+        MatchIsKeyboard "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev touchpad catchall"
+        MatchIsTouchpad "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev tablet catchall"
+        MatchIsTablet "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev touchscreen catchall"
+        MatchIsTouchscreen "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection
diff --git a/xorg-server/config/dbus-api b/xorg-server/config/dbus-api
index 018e98657..3c5ea32a6 100644
--- a/xorg-server/config/dbus-api
+++ b/xorg-server/config/dbus-api
@@ -1,40 +1,40 @@
-D-BUS Configuration API v2
-----------------------------
-
-The X server will register the bus name org.x.config.displayN, and the 
-object /org/x/config/N, where N is the display number.
-
-Currently only hotplugging of input devices is supported.
-
-org.x.config.input:
-    org.x.config.input.version:
-        Returns one unsigned int32, which is the API version.
-
-    org.x.config.input.add:
-        Takes an argument of key/value option pairs in arrays, e.g.:
-         [ss][ss][ss][ss]
-        is the signature for four options.  These options will be passed
-        to the input driver as with any others.
-        Option names beginning with _ are not allowed; they are reserved
-        for internal use.
-
-        Returns a number of signed int32s.  Positive integers are the
-        device IDs of new devices; negative numbers are X error codes,
-        as defined in X.h.  BadMatch will be returned if the options
-        given do not match any device.  BadValue is returned for a malformed
-        message.  (Example: 8 is new device ID 8; -8 is BadMatch.)
-
-        Notably, BadAlloc is never returned: the server internally signals
-        to D-BUS that the attempt failed for lack of memory.
-
-    org.x.config.input.remove:
-        Takes one uint32 argument, which is the device ID to remove, i.e.:
-         u
-        is the signature.
-
-        Returns one signed int32 which represents an X status as defined in
-        X.h. See org.x.config.input.add. Error codes are negative numbers.
-
-    org.x.config.input.listDevices:
-        Lists the currently active devices. No argument. 
-        Return value is sequence of [<id> <name>] [<id> <name>] ..., i.e. [us].
+D-BUS Configuration API v2
+----------------------------
+
+The X server will register the bus name org.x.config.displayN, and the 
+object /org/x/config/N, where N is the display number.
+
+Currently only hotplugging of input devices is supported.
+
+org.x.config.input:
+    org.x.config.input.version:
+        Returns one unsigned int32, which is the API version.
+
+    org.x.config.input.add:
+        Takes an argument of key/value option pairs in arrays, e.g.:
+         [ss][ss][ss][ss]
+        is the signature for four options.  These options will be passed
+        to the input driver as with any others.
+        Option names beginning with _ are not allowed; they are reserved
+        for internal use.
+
+        Returns a number of signed int32s.  Positive integers are the
+        device IDs of new devices; negative numbers are X error codes,
+        as defined in X.h.  BadMatch will be returned if the options
+        given do not match any device.  BadValue is returned for a malformed
+        message.  (Example: 8 is new device ID 8; -8 is BadMatch.)
+
+        Notably, BadAlloc is never returned: the server internally signals
+        to D-BUS that the attempt failed for lack of memory.
+
+    org.x.config.input.remove:
+        Takes one uint32 argument, which is the device ID to remove, i.e.:
+         u
+        is the signature.
+
+        Returns one signed int32 which represents an X status as defined in
+        X.h. See org.x.config.input.add. Error codes are negative numbers.
+
+    org.x.config.input.listDevices:
+        Lists the currently active devices. No argument. 
+        Return value is sequence of [<id> <name>] [<id> <name>] ..., i.e. [us].
diff --git a/xorg-server/config/xorg-server.conf b/xorg-server/config/xorg-server.conf
index 47a9a7824..e80f8df08 100644
--- a/xorg-server/config/xorg-server.conf
+++ b/xorg-server/config/xorg-server.conf
@@ -1,13 +1,13 @@
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-	<policy context="default">
-		<allow own="org.x.config.display0"/>
-		<allow send_destination="org.x.config.display0"/>
-		<allow send_interface="org.x.config.display0"/>
-		<allow own="org.x.config.display1"/>
-		<allow send_destination="org.x.config.display1"/>
-		<allow send_interface="org.x.config.display1"/>
-	</policy>
-</busconfig>
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+	<policy context="default">
+		<allow own="org.x.config.display0"/>
+		<allow send_destination="org.x.config.display0"/>
+		<allow send_interface="org.x.config.display0"/>
+		<allow own="org.x.config.display1"/>
+		<allow send_destination="org.x.config.display1"/>
+		<allow send_interface="org.x.config.display1"/>
+	</policy>
+</busconfig>
diff --git a/xorg-server/damageext/Makefile.am b/xorg-server/damageext/Makefile.am
index 35f7620fb..b082fd2cf 100644
--- a/xorg-server/damageext/Makefile.am
+++ b/xorg-server/damageext/Makefile.am
@@ -1,8 +1,8 @@
-noinst_LTLIBRARIES = libdamageext.la
-
-AM_CFLAGS = $(DIX_CFLAGS)
-
-libdamageext_la_SOURCES = 	\
-	damageext.c		\
-	damageext.h		\
-	damageextint.h
+noinst_LTLIBRARIES = libdamageext.la
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+libdamageext_la_SOURCES = 	\
+	damageext.c		\
+	damageext.h		\
+	damageextint.h
diff --git a/xorg-server/dbe/Makefile.am b/xorg-server/dbe/Makefile.am
index 043555b8c..965d2fa26 100644
--- a/xorg-server/dbe/Makefile.am
+++ b/xorg-server/dbe/Makefile.am
@@ -1,13 +1,13 @@
-noinst_LTLIBRARIES = libdbe.la
-
-AM_CFLAGS = $(DIX_CFLAGS)
-
-if XORG
-sdk_HEADERS = dbestruct.h
-endif
-
-libdbe_la_SOURCES = \
-        dbe.c \
-        midbe.c \
-        midbe.h \
-        midbestr.h
+noinst_LTLIBRARIES = libdbe.la
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+if XORG
+sdk_HEADERS = dbestruct.h
+endif
+
+libdbe_la_SOURCES = \
+        dbe.c \
+        midbe.c \
+        midbe.h \
+        midbestr.h
diff --git a/xorg-server/dix/.gitignore b/xorg-server/dix/.gitignore
new file mode 100644
index 000000000..65f2f8c62
--- /dev/null
+++ b/xorg-server/dix/.gitignore
@@ -0,0 +1,3 @@
+#		Add & Override for this directory and it's subdirectories
+Xserver-dtrace.h
+dix.O
diff --git a/xorg-server/dix/BuiltInAtoms b/xorg-server/dix/BuiltInAtoms
index 910c62706..473990e7b 100644
--- a/xorg-server/dix/BuiltInAtoms
+++ b/xorg-server/dix/BuiltInAtoms
@@ -1,329 +1,329 @@
-File: .../x11/server/dix/BuiltInAtoms
-
-This file is of a fixed format and is used to generate both the file
-include/XAtom.h and dix/initatoms.c. Neither of those files should be
-edited directly. Changing the atoms in this file, or even the order in
-which they occur, is equivalent to forcing a new (minor) version number
-on the server. Take care.
-
-The format of the file is that each built in atom starts in column 1
-with no text, other than spaces and tabs, on that line other than a
-mandatory trailing "@" at the end of the line. For each atom (Foo)
-below the defines will be of the form
-	#define XA_Foo <n>
-and the string value of the atom will be "Foo".
-
-The comment lines in this file are not guaranteed to be accurate. To see the
-current truth, look at the Xlib documentation as well as the protocol spec.
-
-Atoms occur in five distinct name spaces within the protocol. Any particular
-atom may or may not have some client interpretation within each of the name
-spaces. For each of the built in atoms, the intended semantics and the space
-within which it is defined is indicated.
-
-Those name spaces are
-	Property names
-	Property types
-	Selections
-	Font properties
-	Type of a ClientMessage event	(none built into server)
-
-For the font properties mentioned here, see the spec for more information.
-
-				-- Selections --
-
-PRIMARY									      @
-	Selection.
-SECONDARY								      @
-	Selection.
-
-			-- Property types and names --
-
-ARC									      @
-	Property type:
-		x, y: INT16
-		width, height: CARD16,
-		angle1, angle2: INT16
-ATOM									      @
-	Property type:
-		atom: ATOM
-BITMAP									      @
-	Property type:
-		bitmap: PIXMAP
-			This is asserted to be of depth 1.
-CARDINAL								      @
-	Property type:
-		card: CARD32 or CARD16 or CARD8
-		the datum size is dependent on the property format
-COLORMAP								      @
-	Property type:
-		colormap: COLORMAP
-CURSOR									      @
-	Property type:
-		cursor: CURSOR
-CUT_BUFFER0								      @
-CUT_BUFFER1								      @
-CUT_BUFFER2								      @
-CUT_BUFFER3								      @
-CUT_BUFFER4								      @
-CUT_BUFFER5								      @
-CUT_BUFFER6								      @
-CUT_BUFFER7								      @
-	Property name:	(type: STRING)
-		Used to implement cut buffer ring, in particular Andrew uses
-		this mechanism.  Anyone else using this sort of IPC mechanism
-		should use these properties.
-
-		Data is normally fetched and stored out of CUT_BUFFER0; the
-		RotateProperties request is used to rotate these buffers.
-DRAWABLE								      @
-	Property type:
-		drawable: DRAWABLE
-FONT									      @
-	Property type:
-		font: FONT
-INTEGER									      @
-	Property type:
-		card: INT32 or INT16 or INT8
-		the datum size is dependent on the property format
-PIXMAP									      @
-	Property type:
-		pixmap: PIXMAP
-POINT									      @
-	Property type:
-		x, y: INT16
-RECTANGLE								      @
-	Property type:
-		x, y: INT16
-		width, height: CARD16
-RESOURCE_MANAGER							      @
-	Property name: (type: STRING)
-		Contents of the user's resource manager data base.
-RGB_COLOR_MAP								      @
-	Property type:
-		colormap:	COLORMAP
-		red-max:	CARD32
-		red-mult:	CARD32
-		green-max:	CARD32
-		green-mult:	CARD32
-		blue-max:	CARD32
-		blue-mult:	CARD32
-		base-pixel:	CARD32
-
-	The fields `red_max', `green_max', and `blue_max' give the maximum
-	red, green, and blue values, respectively.  Each color
-	coefficient ranges from 0 to its max, inclusive.  For example,
-	a common colormap allocation is 3/3/2:  3 planes for red, 3
-	planes for green, and 2 planes for blue.  Such a colormap would
-	have red_max == 7, green_max = 7, and blue_max = 3.  An alternate
-	allocation that uses only 216 colors is red_max = 5, green_max =
-	5, and blue_max = 5.
-
-	The fields `red_mult', `green_mult', and `blue_mult' give the
-	scale factors used to compose a full pixel value.  (See next
-	paragraph.)  For a 3/3/2 allocation red_mult might be 32,
-	green_mult might be 4, and blue_mult might be 1.  For a
-	6-colors-each allocation, red_mult might be 36, green_mult might
-	be 6, and blue_mult might be 1.
-
-	The field `base_pixel' gives the base pixel value used to
-	compose a full pixel value.  Normally base_pixel is obtained
-	from a call to XAllocColorPlanes().  Given integer red, green,
-	and blue coefficients in their appropriate ranges, one can
-	compute a corresponding pixel value with the expression:
-
-		r * red_mult + g * green_mult + b * blue_mult + base_pixel
-	
-	For gray-scale colormaps, only the colormap, red_max, red_mult,
-	and base_pixel fields are defined; the other fields are
-	ignored.  To compute a gray-scale pixel value, use:
-
-		gray * red_mult + base_pixel
-
-	This is provided to allow applications to share color maps.
-
-RGB_BEST_MAP								      @
-RGB_BLUE_MAP								      @
-RGB_DEFAULT_MAP								      @
-RGB_GRAY_MAP								      @
-RGB_GREEN_MAP								      @
-RGB_RED_MAP								      @
-	Property name:	(type: RGB_COLOR_MAP)
-		The needs of most applications can be met with five colormaps.
-		Polite applications may need only a small RGB space, and can
-		use a portion of the default color map. Applications doing
-		high-quality RGB rendering will need an entire colormap,
-		filled with as large an RGB space as possible, e.g. 332. For
-		color separations, an application may need maximum device
-		resolution for each of red, green, and blue, even if this
-		requires three renderings with three colormaps.
-
-		Each of the above five names would be used for sharing color
-		maps.
-STRING									      @
-	Property type:
-		sequence of Bytes
-VISUALID								      @
-	Property type:
-		visual: VISUALID
-WINDOW									      @
-	Property type:
-		window: WINDOW
-WM_COMMAND								      @
-	Property name: (type: STRING)
-		Command line arguments used to invoke this application. The
-		arguments are delimited by null characters (ASCII 0).
-WM_HINTS								      @
-	Property type:
-		flags:		CARD32
-		input:		BOOL32
-		initial-state:	CARD32
-		icon-pixmap:	PIXMAP
-		icon-window:	WINDOW
-		icon_mask:	BITMAP
-		icon-x, icon-y:	INT32
-		    flags contains the following bits
-			0x00000001	input hint
-			0x00000002	state hint
-			0x00000004	icon pixmap hint
-			0x00000008	icon window hint
-			0x00000010	icon position hint
-		     values for initial-state
-			0		unspecified -> application does not
-				care and WM should pick one.
-			1		normal
-			2		zoomed
-			3		iconic
-			4		inactive -> application believes
-				itself to be seldomly used. WM may wish to
-				place it on an inactive menu.
-		This type is potentially extensible. The order is critical;
-		append to the end only.
-	Property name:	(type: WM_HINTS)
-		Additional hints set by the client for use by the window
-		manager.
-WM_CLIENT_MACHINE							      @
-	Property name:	(type: STRING)
-		used to communicate with the window manager.  The host name
-		of the machine the client is running on may be set here.
-WM_ICON_NAME								      @
-	Property name:	(type: STRING)
-		what the application would like the label to be for
-		the iconic form of the window.
-WM_ICON_SIZE								      @
-	Property type:
-		minWidth, min-height:	CARD32
-		maxWidth, max-height:	CARD32
-		widthInc, height-inc:	CARD32
-	Property name:	(type: ICON_SIZE)
-		The window manager may set this property on the root window
-		to specify the icon sizes it allows.
-WM_NAME									      @
-	Property name:	(type: STRING)
-		used to communicate with the window manager. This is
-		what the application would like the label for the window.
-WM_NORMAL_HINTS								      @
-	Property name:	(type: SIZE_HINTS)
-		used to communicate with the window manager. This is size
-		hints for a window in its "normal" state.
-WM_SIZE_HINTS								      @
-	Property type:
-		flags:				CARD32
-		x, y:				INT32
-		width, height:			CARD32
-		min-width, min-height:		CARD32
-		max-width, max-height:		CARD32
-		width-inc, height-inc:		CARD32
-		min-aspect-x, min-aspect-y:	CARD32
-		max-aspect-x, max-aspect-y:	CARD32
-		    flags contains the following bits
-			0x00000001	user specified x and y
-			0x00000002	user specified width and height
-			0x00000004	program specified position
-			0x00000008	program specified size
-			0x00000010	program specified minimum size
-			0x00000020	program specified maximum size
-			0x00000040	program specified resize increment
-			0x00000080	program specified aspect ratio
-		This type is potentially extensible. The order is critical;
-		append to the end only.
-WM_ZOOM_HINTS								      @
-	Property name:	(type: SIZE_HINTS)
-		used to communicate with the window manager. This is size
-		hints for a window in its "zoomed" state.
-
-				-- Font properties --
-
-MIN_SPACE 								      @
-	Font property: CARD32
-NORM_SPACE 								      @
-	Font property: CARD32
-MAX_SPACE 								      @
-	Font property: CARD32
-END_SPACE 								      @
-	Font property: CARD32
-SUPERSCRIPT_X 								      @
-	Font property: INT32
-SUPERSCRIPT_Y 								      @
-	Font property: INT32
-SUBSCRIPT_X 								      @
-	Font property: INT32
-SUBSCRIPT_Y 								      @
-	Font property: INT32
-UNDERLINE_POSITION 							      @
-	Font property: INT32
-UNDERLINE_THICKNESS 							      @
-	Font property: CARD32	
-STRIKEOUT_ASCENT 							      @
-	Font property: INT32
-STRIKEOUT_DESCENT 							      @
-	Font property: INT32
-ITALIC_ANGLE 								      @
-	Font property: INT32
-X_HEIGHT 								      @
-	Font property: INT32
-QUAD_WIDTH 								      @
-	Font property: INT32
-WEIGHT 									      @
-	Font property: CARD32
-POINT_SIZE 								      @
-	Font property: CARD32
-RESOLUTION 								      @
-	Font property: CARD32
-
-The following optional properties on fonts have values that are atoms. The
-atom print name is the useful information.
-
-COPYRIGHT 								      @
-	of the font distribution
-NOTICE									      @
-	trademark/copyright of the character shapes
-FONT_NAME 								      @
-	name of this particular instance of a font
-FAMILY_NAME 								      @
-	name of the 'font family' to which it belongs
-FULL_NAME 								      @
-	full text name of the font
-
-The following aren't in order but putting them at the end avoids encoding
-changes.
-
-CAP_HEIGHT 								      @
-	Font property: CARD32
-
-
-WM_CLASS 								      @
-	Property name: (type: STRING)
-		Used (possibly by some window managers; definitely by 
-		session managers) to look up resources in the resource 
-		data base on behalf of the client who set this property.
-		There are 2 elements:
-			{char *resource_name; char *resource_class;}
-		delimited by a null character (ascii 0)
-
-WM_TRANSIENT_FOR							      @
-	Property name: (type: WINDOW)
-		Used by transient top-level windows, such as dialog 
-		boxes, to point to their logical "parents".  The window 
-		manager can then take down the dialog boxes when the
-		"parent" gets iconified, for instance.
+File: .../x11/server/dix/BuiltInAtoms
+
+This file is of a fixed format and is used to generate both the file
+include/XAtom.h and dix/initatoms.c. Neither of those files should be
+edited directly. Changing the atoms in this file, or even the order in
+which they occur, is equivalent to forcing a new (minor) version number
+on the server. Take care.
+
+The format of the file is that each built in atom starts in column 1
+with no text, other than spaces and tabs, on that line other than a
+mandatory trailing "@" at the end of the line. For each atom (Foo)
+below the defines will be of the form
+	#define XA_Foo <n>
+and the string value of the atom will be "Foo".
+
+The comment lines in this file are not guaranteed to be accurate. To see the
+current truth, look at the Xlib documentation as well as the protocol spec.
+
+Atoms occur in five distinct name spaces within the protocol. Any particular
+atom may or may not have some client interpretation within each of the name
+spaces. For each of the built in atoms, the intended semantics and the space
+within which it is defined is indicated.
+
+Those name spaces are
+	Property names
+	Property types
+	Selections
+	Font properties
+	Type of a ClientMessage event	(none built into server)
+
+For the font properties mentioned here, see the spec for more information.
+
+				-- Selections --
+
+PRIMARY									      @
+	Selection.
+SECONDARY								      @
+	Selection.
+
+			-- Property types and names --
+
+ARC									      @
+	Property type:
+		x, y: INT16
+		width, height: CARD16,
+		angle1, angle2: INT16
+ATOM									      @
+	Property type:
+		atom: ATOM
+BITMAP									      @
+	Property type:
+		bitmap: PIXMAP
+			This is asserted to be of depth 1.
+CARDINAL								      @
+	Property type:
+		card: CARD32 or CARD16 or CARD8
+		the datum size is dependent on the property format
+COLORMAP								      @
+	Property type:
+		colormap: COLORMAP
+CURSOR									      @
+	Property type:
+		cursor: CURSOR
+CUT_BUFFER0								      @
+CUT_BUFFER1								      @
+CUT_BUFFER2								      @
+CUT_BUFFER3								      @
+CUT_BUFFER4								      @
+CUT_BUFFER5								      @
+CUT_BUFFER6								      @
+CUT_BUFFER7								      @
+	Property name:	(type: STRING)
+		Used to implement cut buffer ring, in particular Andrew uses
+		this mechanism.  Anyone else using this sort of IPC mechanism
+		should use these properties.
+
+		Data is normally fetched and stored out of CUT_BUFFER0; the
+		RotateProperties request is used to rotate these buffers.
+DRAWABLE								      @
+	Property type:
+		drawable: DRAWABLE
+FONT									      @
+	Property type:
+		font: FONT
+INTEGER									      @
+	Property type:
+		card: INT32 or INT16 or INT8
+		the datum size is dependent on the property format
+PIXMAP									      @
+	Property type:
+		pixmap: PIXMAP
+POINT									      @
+	Property type:
+		x, y: INT16
+RECTANGLE								      @
+	Property type:
+		x, y: INT16
+		width, height: CARD16
+RESOURCE_MANAGER							      @
+	Property name: (type: STRING)
+		Contents of the user's resource manager data base.
+RGB_COLOR_MAP								      @
+	Property type:
+		colormap:	COLORMAP
+		red-max:	CARD32
+		red-mult:	CARD32
+		green-max:	CARD32
+		green-mult:	CARD32
+		blue-max:	CARD32
+		blue-mult:	CARD32
+		base-pixel:	CARD32
+
+	The fields `red_max', `green_max', and `blue_max' give the maximum
+	red, green, and blue values, respectively.  Each color
+	coefficient ranges from 0 to its max, inclusive.  For example,
+	a common colormap allocation is 3/3/2:  3 planes for red, 3
+	planes for green, and 2 planes for blue.  Such a colormap would
+	have red_max == 7, green_max = 7, and blue_max = 3.  An alternate
+	allocation that uses only 216 colors is red_max = 5, green_max =
+	5, and blue_max = 5.
+
+	The fields `red_mult', `green_mult', and `blue_mult' give the
+	scale factors used to compose a full pixel value.  (See next
+	paragraph.)  For a 3/3/2 allocation red_mult might be 32,
+	green_mult might be 4, and blue_mult might be 1.  For a
+	6-colors-each allocation, red_mult might be 36, green_mult might
+	be 6, and blue_mult might be 1.
+
+	The field `base_pixel' gives the base pixel value used to
+	compose a full pixel value.  Normally base_pixel is obtained
+	from a call to XAllocColorPlanes().  Given integer red, green,
+	and blue coefficients in their appropriate ranges, one can
+	compute a corresponding pixel value with the expression:
+
+		r * red_mult + g * green_mult + b * blue_mult + base_pixel
+	
+	For gray-scale colormaps, only the colormap, red_max, red_mult,
+	and base_pixel fields are defined; the other fields are
+	ignored.  To compute a gray-scale pixel value, use:
+
+		gray * red_mult + base_pixel
+
+	This is provided to allow applications to share color maps.
+
+RGB_BEST_MAP								      @
+RGB_BLUE_MAP								      @
+RGB_DEFAULT_MAP								      @
+RGB_GRAY_MAP								      @
+RGB_GREEN_MAP								      @
+RGB_RED_MAP								      @
+	Property name:	(type: RGB_COLOR_MAP)
+		The needs of most applications can be met with five colormaps.
+		Polite applications may need only a small RGB space, and can
+		use a portion of the default color map. Applications doing
+		high-quality RGB rendering will need an entire colormap,
+		filled with as large an RGB space as possible, e.g. 332. For
+		color separations, an application may need maximum device
+		resolution for each of red, green, and blue, even if this
+		requires three renderings with three colormaps.
+
+		Each of the above five names would be used for sharing color
+		maps.
+STRING									      @
+	Property type:
+		sequence of Bytes
+VISUALID								      @
+	Property type:
+		visual: VISUALID
+WINDOW									      @
+	Property type:
+		window: WINDOW
+WM_COMMAND								      @
+	Property name: (type: STRING)
+		Command line arguments used to invoke this application. The
+		arguments are delimited by null characters (ASCII 0).
+WM_HINTS								      @
+	Property type:
+		flags:		CARD32
+		input:		BOOL32
+		initial-state:	CARD32
+		icon-pixmap:	PIXMAP
+		icon-window:	WINDOW
+		icon_mask:	BITMAP
+		icon-x, icon-y:	INT32
+		    flags contains the following bits
+			0x00000001	input hint
+			0x00000002	state hint
+			0x00000004	icon pixmap hint
+			0x00000008	icon window hint
+			0x00000010	icon position hint
+		     values for initial-state
+			0		unspecified -> application does not
+				care and WM should pick one.
+			1		normal
+			2		zoomed
+			3		iconic
+			4		inactive -> application believes
+				itself to be seldomly used. WM may wish to
+				place it on an inactive menu.
+		This type is potentially extensible. The order is critical;
+		append to the end only.
+	Property name:	(type: WM_HINTS)
+		Additional hints set by the client for use by the window
+		manager.
+WM_CLIENT_MACHINE							      @
+	Property name:	(type: STRING)
+		used to communicate with the window manager.  The host name
+		of the machine the client is running on may be set here.
+WM_ICON_NAME								      @
+	Property name:	(type: STRING)
+		what the application would like the label to be for
+		the iconic form of the window.
+WM_ICON_SIZE								      @
+	Property type:
+		minWidth, min-height:	CARD32
+		maxWidth, max-height:	CARD32
+		widthInc, height-inc:	CARD32
+	Property name:	(type: ICON_SIZE)
+		The window manager may set this property on the root window
+		to specify the icon sizes it allows.
+WM_NAME									      @
+	Property name:	(type: STRING)
+		used to communicate with the window manager. This is
+		what the application would like the label for the window.
+WM_NORMAL_HINTS								      @
+	Property name:	(type: SIZE_HINTS)
+		used to communicate with the window manager. This is size
+		hints for a window in its "normal" state.
+WM_SIZE_HINTS								      @
+	Property type:
+		flags:				CARD32
+		x, y:				INT32
+		width, height:			CARD32
+		min-width, min-height:		CARD32
+		max-width, max-height:		CARD32
+		width-inc, height-inc:		CARD32
+		min-aspect-x, min-aspect-y:	CARD32
+		max-aspect-x, max-aspect-y:	CARD32
+		    flags contains the following bits
+			0x00000001	user specified x and y
+			0x00000002	user specified width and height
+			0x00000004	program specified position
+			0x00000008	program specified size
+			0x00000010	program specified minimum size
+			0x00000020	program specified maximum size
+			0x00000040	program specified resize increment
+			0x00000080	program specified aspect ratio
+		This type is potentially extensible. The order is critical;
+		append to the end only.
+WM_ZOOM_HINTS								      @
+	Property name:	(type: SIZE_HINTS)
+		used to communicate with the window manager. This is size
+		hints for a window in its "zoomed" state.
+
+				-- Font properties --
+
+MIN_SPACE 								      @
+	Font property: CARD32
+NORM_SPACE 								      @
+	Font property: CARD32
+MAX_SPACE 								      @
+	Font property: CARD32
+END_SPACE 								      @
+	Font property: CARD32
+SUPERSCRIPT_X 								      @
+	Font property: INT32
+SUPERSCRIPT_Y 								      @
+	Font property: INT32
+SUBSCRIPT_X 								      @
+	Font property: INT32
+SUBSCRIPT_Y 								      @
+	Font property: INT32
+UNDERLINE_POSITION 							      @
+	Font property: INT32
+UNDERLINE_THICKNESS 							      @
+	Font property: CARD32	
+STRIKEOUT_ASCENT 							      @
+	Font property: INT32
+STRIKEOUT_DESCENT 							      @
+	Font property: INT32
+ITALIC_ANGLE 								      @
+	Font property: INT32
+X_HEIGHT 								      @
+	Font property: INT32
+QUAD_WIDTH 								      @
+	Font property: INT32
+WEIGHT 									      @
+	Font property: CARD32
+POINT_SIZE 								      @
+	Font property: CARD32
+RESOLUTION 								      @
+	Font property: CARD32
+
+The following optional properties on fonts have values that are atoms. The
+atom print name is the useful information.
+
+COPYRIGHT 								      @
+	of the font distribution
+NOTICE									      @
+	trademark/copyright of the character shapes
+FONT_NAME 								      @
+	name of this particular instance of a font
+FAMILY_NAME 								      @
+	name of the 'font family' to which it belongs
+FULL_NAME 								      @
+	full text name of the font
+
+The following aren't in order but putting them at the end avoids encoding
+changes.
+
+CAP_HEIGHT 								      @
+	Font property: CARD32
+
+
+WM_CLASS 								      @
+	Property name: (type: STRING)
+		Used (possibly by some window managers; definitely by 
+		session managers) to look up resources in the resource 
+		data base on behalf of the client who set this property.
+		There are 2 elements:
+			{char *resource_name; char *resource_class;}
+		delimited by a null character (ascii 0)
+
+WM_TRANSIENT_FOR							      @
+	Property name: (type: WINDOW)
+		Used by transient top-level windows, such as dialog 
+		boxes, to point to their logical "parents".  The window 
+		manager can then take down the dialog boxes when the
+		"parent" gets iconified, for instance.
diff --git a/xorg-server/dix/buildatoms b/xorg-server/dix/buildatoms
index dfbbca8a9..efc61b6f9 100644
--- a/xorg-server/dix/buildatoms
+++ b/xorg-server/dix/buildatoms
@@ -1,43 +1,43 @@
-#!/bin/sh
-hfile=../../../include/Xatom.h
-cfile=initatoms.c
-rm -f $hfile $cfile
-umask 222
-awk '
-BEGIN {
-	hfile = "'$hfile'";
-	cfile = "'$cfile'";
-	hformat = "#define XA_%s ((Atom) %d)\n";
-	printf("#ifndef XATOM_H\n") > hfile;
-	printf("#define XATOM_H 1\n\n") > hfile;
-	printf("/* THIS IS A GENERATED FILE\n") > hfile;
-	printf(" *\n") > hfile;
-	printf(" * Do not change!  Changing this file implies a protocol change!\n") > hfile;
-	printf(" */\n\n") > hfile;
-
-	printf("/* THIS IS A GENERATED FILE\n") > cfile;
-	printf(" *\n") > cfile;
-	printf(" * Do not change!  Changing this file implies a protocol change!\n") > cfile;
-	printf(" */\n\n") > cfile;
-	printf("#include \"X.h\"\n") > cfile;
-	printf("#include \"Xatom.h\"\n") > cfile;
-	printf("#include \"misc.h\"\n") > cfile;
-	printf("#include \"dix.h\"\n") > cfile;
-	printf("void MakePredeclaredAtoms()\n") > cfile;
-	printf("{\n") > cfile;
-
-	}
-
-NF == 2 && $2 == "@" {
-	printf(hformat, $1, ++atomno) > hfile ;
-	printf("    if (MakeAtom(\"%s\", %d, 1) != XA_%s) AtomError();\n", $1, length($1), $1) > cfile ;
-	}
-
-END {
-	printf("\n") > hfile;
-	printf(hformat, "LAST_PREDEFINED", atomno) > hfile ;
-	printf("#endif /* XATOM_H */\n") > hfile;
-	printf("}\n") > cfile ;
-	}
-' BuiltInAtoms
-exit 0
+#!/bin/sh
+hfile=../../../include/Xatom.h
+cfile=initatoms.c
+rm -f $hfile $cfile
+umask 222
+awk '
+BEGIN {
+	hfile = "'$hfile'";
+	cfile = "'$cfile'";
+	hformat = "#define XA_%s ((Atom) %d)\n";
+	printf("#ifndef XATOM_H\n") > hfile;
+	printf("#define XATOM_H 1\n\n") > hfile;
+	printf("/* THIS IS A GENERATED FILE\n") > hfile;
+	printf(" *\n") > hfile;
+	printf(" * Do not change!  Changing this file implies a protocol change!\n") > hfile;
+	printf(" */\n\n") > hfile;
+
+	printf("/* THIS IS A GENERATED FILE\n") > cfile;
+	printf(" *\n") > cfile;
+	printf(" * Do not change!  Changing this file implies a protocol change!\n") > cfile;
+	printf(" */\n\n") > cfile;
+	printf("#include \"X.h\"\n") > cfile;
+	printf("#include \"Xatom.h\"\n") > cfile;
+	printf("#include \"misc.h\"\n") > cfile;
+	printf("#include \"dix.h\"\n") > cfile;
+	printf("void MakePredeclaredAtoms()\n") > cfile;
+	printf("{\n") > cfile;
+
+	}
+
+NF == 2 && $2 == "@" {
+	printf(hformat, $1, ++atomno) > hfile ;
+	printf("    if (MakeAtom(\"%s\", %d, 1) != XA_%s) AtomError();\n", $1, length($1), $1) > cfile ;
+	}
+
+END {
+	printf("\n") > hfile;
+	printf(hformat, "LAST_PREDEFINED", atomno) > hfile ;
+	printf("#endif /* XATOM_H */\n") > hfile;
+	printf("}\n") > cfile ;
+	}
+' BuiltInAtoms
+exit 0
diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c
index 60d57a352..1ed1d4863 100644
--- a/xorg-server/dix/dispatch.c
+++ b/xorg-server/dix/dispatch.c
@@ -3772,8 +3772,7 @@ with its screen number, a pointer to its ScreenRec, argc, and argv.
 */
 
 int
-AddScreen(Bool (*pfnInit) (int /*index */ ,
-                           ScreenPtr /*pScreen */ ,
+AddScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ ,
                            int /*argc */ ,
                            char **      /*argv */
           ), int argc, char **argv)
@@ -3841,7 +3840,7 @@ AddScreen(Bool (*pfnInit) (int /*index */ ,
      */
     screenInfo.screens[i] = pScreen;
     screenInfo.numScreens++;
-    if (!(*pfnInit) (i, pScreen, argc, argv)) {
+    if (!(*pfnInit) (pScreen, argc, argv)) {
         dixFreePrivates(pScreen->devPrivates, PRIVATE_SCREEN);
         free(pScreen);
         screenInfo.numScreens--;
diff --git a/xorg-server/dix/dixutils.c b/xorg-server/dix/dixutils.c
index 9eb54893a..b249a810b 100644
--- a/xorg-server/dix/dixutils.c
+++ b/xorg-server/dix/dixutils.c
@@ -384,9 +384,8 @@ BlockHandler(pointer pTimeout, pointer pReadmask)
 
     ++inHandler;
     for (i = 0; i < screenInfo.numScreens; i++)
-        (*screenInfo.screens[i]->BlockHandler) (i,
-                                                screenInfo.screens[i]->
-                                                blockData, pTimeout, pReadmask);
+        (*screenInfo.screens[i]->BlockHandler) (screenInfo.screens[i],
+                                                pTimeout, pReadmask);
     for (i = 0; i < numHandlers; i++)
         if (!handlers[i].deleted)
             (*handlers[i].BlockHandler) (handlers[i].blockData,
@@ -421,9 +420,8 @@ WakeupHandler(int result, pointer pReadmask)
             (*handlers[i].WakeupHandler) (handlers[i].blockData,
                                           result, pReadmask);
     for (i = 0; i < screenInfo.numScreens; i++)
-        (*screenInfo.screens[i]->WakeupHandler) (i,
-                                                 screenInfo.screens[i]->
-                                                 wakeupData, result, pReadmask);
+        (*screenInfo.screens[i]->WakeupHandler) (screenInfo.screens[i],
+                                                 result, pReadmask);
     if (handlerDeleted) {
         for (i = 0; i < numHandlers;)
             if (handlers[i].deleted) {
diff --git a/xorg-server/dix/gc.c b/xorg-server/dix/gc.c
index ec7e24f13..0a7b5165c 100644
--- a/xorg-server/dix/gc.c
+++ b/xorg-server/dix/gc.c
@@ -476,32 +476,21 @@ ChangeGCXIDs(ClientPtr client, GC * pGC, BITS32 mask, CARD32 *pC32)
     return ChangeGC(client, pGC, mask, vals);
 }
 
-/* CreateGC(pDrawable, mask, pval, pStatus)
-   creates a default GC for the given drawable, using mask to fill
-   in any non-default values.
-   Returns a pointer to the new GC on success, NULL otherwise.
-   returns status of non-default fields in pStatus
-BUG:
-   should check for failure to create default tile
-
-*/
-GCPtr
-CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus,
-         XID gcid, ClientPtr client)
+static GCPtr
+NewGCObject(ScreenPtr pScreen, int depth)
 {
     GCPtr pGC;
 
     pGC = dixAllocateObjectWithPrivates(GC, PRIVATE_GC);
     if (!pGC) {
-        *pStatus = BadAlloc;
         return (GCPtr) NULL;
     }
 
-    pGC->pScreen = pDrawable->pScreen;
-    pGC->depth = pDrawable->depth;
+    pGC->pScreen = pScreen;
+    pGC->depth = depth;
     pGC->alu = GXcopy;          /* dst <- src */
     pGC->planemask = ~0;
-    pGC->serialNumber = GC_CHANGE_SERIAL_BIT;
+    pGC->serialNumber = 0;
     pGC->funcs = 0;
     pGC->fgPixel = 0;
     pGC->bgPixel = 1;
@@ -514,17 +503,8 @@ CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus,
     pGC->arcMode = ArcPieSlice;
     pGC->tile.pixel = 0;
     pGC->tile.pixmap = NullPixmap;
-    if (mask & GCForeground) {
-        /*
-         * magic special case -- ChangeGC checks for this condition
-         * and snags the Foreground value to create a pseudo default-tile
-         */
-        pGC->tileIsPixel = FALSE;
-    }
-    else {
-        pGC->tileIsPixel = TRUE;
-    }
 
+    pGC->tileIsPixel = TRUE;
     pGC->patOrg.x = 0;
     pGC->patOrg.y = 0;
     pGC->subWindowMode = ClipByChildren;
@@ -539,12 +519,49 @@ CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus,
 
     /* use the default font and stipple */
     pGC->font = defaultFont;
-    defaultFont->refcnt++;
+    if (pGC->font)              /* necessary, because open of default font could fail */
+        pGC->font->refcnt++;
     pGC->stipple = pGC->pScreen->PixmapPerDepth[0];
-    pGC->stipple->refcnt++;
+    if (pGC->stipple)
+        pGC->stipple->refcnt++;
 
     /* this is not a scratch GC */
     pGC->scratch_inuse = FALSE;
+    return pGC;
+}
+
+/* CreateGC(pDrawable, mask, pval, pStatus)
+   creates a default GC for the given drawable, using mask to fill
+   in any non-default values.
+   Returns a pointer to the new GC on success, NULL otherwise.
+   returns status of non-default fields in pStatus
+BUG:
+   should check for failure to create default tile
+
+*/
+GCPtr
+CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus,
+         XID gcid, ClientPtr client)
+{
+    GCPtr pGC;
+
+    pGC = NewGCObject(pDrawable->pScreen, pDrawable->depth);
+    if (!pGC) {
+        *pStatus = BadAlloc;
+        return (GCPtr) NULL;
+    }
+
+    pGC->serialNumber = GC_CHANGE_SERIAL_BIT;
+    if (mask & GCForeground) {
+        /*
+         * magic special case -- ChangeGC checks for this condition
+         * and snags the Foreground value to create a pseudo default-tile
+         */
+        pGC->tileIsPixel = FALSE;
+    }
+    else {
+        pGC->tileIsPixel = TRUE;
+    }
 
     /* security creation/labeling check */
     *pStatus = XaceHook(XACE_RESOURCE_ACCESS, client, gcid, RT_GC, pGC,
@@ -802,45 +819,10 @@ CreateScratchGC(ScreenPtr pScreen, unsigned depth)
 {
     GCPtr pGC;
 
-    pGC = dixAllocateObjectWithPrivates(GC, PRIVATE_GC);
+    pGC = NewGCObject(pScreen, depth);
     if (!pGC)
         return (GCPtr) NULL;
 
-    pGC->pScreen = pScreen;
-    pGC->depth = depth;
-    pGC->alu = GXcopy;          /* dst <- src */
-    pGC->planemask = ~0;
-    pGC->serialNumber = 0;
-    pGC->fgPixel = 0;
-    pGC->bgPixel = 1;
-    pGC->lineWidth = 0;
-    pGC->lineStyle = LineSolid;
-    pGC->capStyle = CapButt;
-    pGC->joinStyle = JoinMiter;
-    pGC->fillStyle = FillSolid;
-    pGC->fillRule = EvenOddRule;
-    pGC->arcMode = ArcPieSlice;
-    pGC->font = defaultFont;
-    if (pGC->font)              /* necessary, because open of default font could fail */
-        pGC->font->refcnt++;
-    pGC->tileIsPixel = TRUE;
-    pGC->tile.pixel = 0;
-    pGC->tile.pixmap = NullPixmap;
-    pGC->stipple = NullPixmap;
-    pGC->patOrg.x = 0;
-    pGC->patOrg.y = 0;
-    pGC->subWindowMode = ClipByChildren;
-    pGC->graphicsExposures = TRUE;
-    pGC->clipOrg.x = 0;
-    pGC->clipOrg.y = 0;
-    pGC->clientClipType = CT_NONE;
-    pGC->dashOffset = 0;
-    pGC->numInDashList = 2;
-    pGC->dash = DefaultDash;
-
-    /* scratch GCs in the GCperDepth pool start off unused */
-    pGC->scratch_inuse = FALSE;
-
     pGC->stateChanges = GCAllBits;
     if (!(*pScreen->CreateGC) (pGC)) {
         FreeGC(pGC, (XID) 0);
diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c
index b6a9a4e1c..92f5dcb49 100644
--- a/xorg-server/dix/main.c
+++ b/xorg-server/dix/main.c
@@ -253,7 +253,7 @@ main(int argc, char *argv[], char *envp[])
         for (i = 0; i < screenInfo.numScreens; i++) {
             ScreenPtr pScreen = screenInfo.screens[i];
 
-            if (!CreateScratchPixmapsForScreen(i))
+            if (!CreateScratchPixmapsForScreen(pScreen))
                 FatalError("failed to create scratch pixmaps");
             if (pScreen->CreateScreenResources &&
                 !(*pScreen->CreateScreenResources) (pScreen))
@@ -371,10 +371,10 @@ main(int argc, char *argv[], char *envp[])
         CloseDownEvents();
 
         for (i = screenInfo.numScreens - 1; i >= 0; i--) {
-            FreeScratchPixmapsForScreen(i);
+            FreeScratchPixmapsForScreen(screenInfo.screens[i]);
             FreeGCperDepth(i);
             FreeDefaultStipple(i);
-            (*screenInfo.screens[i]->CloseScreen) (i, screenInfo.screens[i]);
+            (*screenInfo.screens[i]->CloseScreen) (screenInfo.screens[i]);
             dixFreePrivates(screenInfo.screens[i]->devPrivates, PRIVATE_SCREEN);
             free(screenInfo.screens[i]);
             screenInfo.numScreens = i;
diff --git a/xorg-server/dix/pixmap.c b/xorg-server/dix/pixmap.c
index 47b220b58..545ff54ac 100644
--- a/xorg-server/dix/pixmap.c
+++ b/xorg-server/dix/pixmap.c
@@ -84,23 +84,23 @@ FreeScratchPixmapHeader(PixmapPtr pPixmap)
 }
 
 Bool
-CreateScratchPixmapsForScreen(int scrnum)
+CreateScratchPixmapsForScreen(ScreenPtr pScreen)
 {
     unsigned int pixmap_size;
 
     pixmap_size = sizeof(PixmapRec) + dixPrivatesSize(PRIVATE_PIXMAP);
-    screenInfo.screens[scrnum]->totalPixmapSize =
+    pScreen->totalPixmapSize =
         BitmapBytePad(pixmap_size * 8);
 
     /* let it be created on first use */
-    screenInfo.screens[scrnum]->pScratchPixmap = NULL;
+    pScreen->pScratchPixmap = NULL;
     return TRUE;
 }
 
 void
-FreeScratchPixmapsForScreen(int scrnum)
+FreeScratchPixmapsForScreen(ScreenPtr pScreen)
 {
-    FreeScratchPixmapHeader(screenInfo.screens[scrnum]->pScratchPixmap);
+    FreeScratchPixmapHeader(pScreen->pScratchPixmap);
 }
 
 /* callable by ddx */
diff --git a/xorg-server/dix/protocol.txt b/xorg-server/dix/protocol.txt
index 8e152edaa..6a87ef4c3 100644
--- a/xorg-server/dix/protocol.txt
+++ b/xorg-server/dix/protocol.txt
@@ -1,1103 +1,1103 @@
-# Registry of protocol names used by X Server
-# This will eventually be replaced by server-side XCB
-#
-# Format is Xnnn <extension-name>:<object-name>
-# R=Request, V=Event, E=Error
-#
-# This is a security-sensitive file, please set permissions as appropriate.
-#
-R001 Adobe-DPS-Extension:Init
-R002 Adobe-DPS-Extension:CreateContext
-R003 Adobe-DPS-Extension:CreateSpace
-R004 Adobe-DPS-Extension:GiveInput
-R005 Adobe-DPS-Extension:GetStatus
-R006 Adobe-DPS-Extension:DestroySpace
-R007 Adobe-DPS-Extension:Reset
-R008 Adobe-DPS-Extension:NotifyContext
-R009 Adobe-DPS-Extension:CreateContextFromID
-R010 Adobe-DPS-Extension:XIDFromContext
-R011 Adobe-DPS-Extension:ContextFromXID
-R012 Adobe-DPS-Extension:SetStatusMask
-R013 Adobe-DPS-Extension:CreateSecureContext
-R014 Adobe-DPS-Extension:NotifyWhenReady
-R000 Apple-DRI:QueryVersion
-R001 Apple-DRI:QueryDirectRenderingCapable
-R002 Apple-DRI:CreateSurface
-R003 Apple-DRI:DestroySurface
-R004 Apple-DRI:AuthConnection
-V000 Apple-DRI:ObsoleteEvent1
-V001 Apple-DRI:ObsoleteEvent2
-V002 Apple-DRI:ObsoleteEvent3
-V003 Apple-DRI:SurfaceNotify
-E000 Apple-DRI:ClientNotLocal
-E001 Apple-DRI:OperationNotSupported
-R000 Apple-WM:QueryVersion
-R001 Apple-WM:FrameGetRect
-R002 Apple-WM:FrameHitTest
-R003 Apple-WM:FrameDraw
-R004 Apple-WM:DisableUpdate
-R005 Apple-WM:ReenableUpdate
-R006 Apple-WM:SelectInput
-R007 Apple-WM:SetWindowMenuCheck
-R008 Apple-WM:SetFrontProcess
-R009 Apple-WM:SetWindowLevel
-R010 Apple-WM:SetCanQuit
-R011 Apple-WM:SetWindowMenu
-V000 Apple-WM:ControllerNotify
-V001 Apple-WM:ActivationNotify
-V002 Apple-WM:PasteboardNotify
-E000 Apple-WM:ClientNotLocal
-E001 Apple-WM:OperationNotSupported
-R000 BIG-REQUESTS:Enable
-R000 Composite:CompositeQueryVersion
-R001 Composite:CompositeRedirectWindow
-R002 Composite:CompositeRedirectSubwindows
-R003 Composite:CompositeUnredirectWindow
-R004 Composite:CompositeUnredirectSubwindows
-R005 Composite:CompositeCreateRegionFromBorderClip
-R006 Composite:CompositeNameWindowPixmap
-R007 Composite:CompositeGetOverlayWindow
-R008 Composite:CompositeReleaseOverlayWindow
-R000 DAMAGE:QueryVersion
-R001 DAMAGE:Create
-R002 DAMAGE:Destroy
-R003 DAMAGE:Subtract
-R004 DAMAGE:Add
-V000 DAMAGE:Notify
-E000 DAMAGE:BadDamage
-R000 DEC-XTRAP:Reset
-R001 DEC-XTRAP:GetAvailable
-R002 DEC-XTRAP:Config
-R003 DEC-XTRAP:StartTrap
-R004 DEC-XTRAP:StopTrap
-R005 DEC-XTRAP:GetCurrent
-R006 DEC-XTRAP:GetStatistics
-R007 DEC-XTRAP:SimulateXEvent
-R008 DEC-XTRAP:GetVersion
-R009 DEC-XTRAP:GetLastInpTime
-V000 DEC-XTRAP:Event
-E002 DEC-XTRAP:BadIO
-E004 DEC-XTRAP:BadStatistics
-E005 DEC-XTRAP:BadDevices
-E007 DEC-XTRAP:BadScreen
-E008 DEC-XTRAP:BadSwapReq
-R000 DMX:DMXQueryVersion
-R001 DMX:DMXGetScreenCount
-R002 DMX:DMXGetScreenInfoDEPRECATED
-R003 DMX:DMXGetWindowAttributes
-R004 DMX:DMXGetInputCount
-R005 DMX:DMXGetInputAttributes
-R006 DMX:DMXForceWindowCreationDEPRECATED
-R007 DMX:DMXReconfigureScreenDEPRECATED
-R008 DMX:DMXSync
-R009 DMX:DMXForceWindowCreation
-R010 DMX:DMXGetScreenAttributes
-R011 DMX:DMXChangeScreensAttributes
-R012 DMX:DMXAddScreen
-R013 DMX:DMXRemoveScreen
-R014 DMX:DMXGetDesktopAttributes
-R015 DMX:DMXChangeDesktopAttributes
-R016 DMX:DMXAddInput
-R017 DMX:DMXRemoveInput
-R000 DOUBLE-BUFFER:GetVersion
-R001 DOUBLE-BUFFER:AllocateBackBufferName
-R002 DOUBLE-BUFFER:DeallocateBackBufferName
-R003 DOUBLE-BUFFER:SwapBuffers
-R004 DOUBLE-BUFFER:BeginIdiom
-R005 DOUBLE-BUFFER:EndIdiom
-R006 DOUBLE-BUFFER:GetVisualInfo
-R007 DOUBLE-BUFFER:GetBackBufferAttributes
-E000 DOUBLE-BUFFER:BadBuffer
-R000 DPMS:GetVersion
-R001 DPMS:Capable
-R002 DPMS:GetTimeouts
-R003 DPMS:SetTimeouts
-R004 DPMS:Enable
-R005 DPMS:Disable
-R006 DPMS:ForceLevel
-R007 DPMS:Info
-R000 DRI2:QueryVersion
-R001 DRI2:Connect
-R002 DRI2:Authenticate
-R003 DRI2:CreateDrawable
-R004 DRI2:DestroyDrawable
-R005 DRI2:GetBuffers
-R006 DRI2:CopyRegion
-R007 DRI2:GetBuffersWithFormat
-R000 Extended-Visual-Information:QueryVersion
-R001 Extended-Visual-Information:GetVisualInfo
-R000 FontCache:QueryVersion
-R001 FontCache:GetCacheSettings
-R002 FontCache:ChangeCacheSettings
-R003 FontCache:GetCacheStatistics
-E000 FontCache:BadProtocol
-E001 FontCache:CannotAllocMemory
-R001 GLX:
-R002 GLX:Large
-R003 GLX:CreateContext
-R004 GLX:DestroyContext
-R005 GLX:MakeCurrent
-R006 GLX:IsDirect
-R007 GLX:QueryVersion
-R008 GLX:WaitGL
-R009 GLX:WaitX
-R010 GLX:CopyContext
-R011 GLX:SwapBuffers
-R012 GLX:UseXFont
-R013 GLX:CreateGLXPixmap
-R014 GLX:GetVisualConfigs
-R015 GLX:DestroyGLXPixmap
-R016 GLX:VendorPrivate
-R017 GLX:VendorPrivateWithReply
-R018 GLX:QueryExtensionsString
-R019 GLX:QueryServerString
-R020 GLX:ClientInfo
-R101 GLX:NewList
-R102 GLX:EndList
-R103 GLX:DeleteLists
-R104 GLX:GenLists
-R105 GLX:FeedbackBuffer
-R106 GLX:SelectBuffer
-R107 GLX:Mode
-R108 GLX:Finish
-R109 GLX:PixelStoref
-R110 GLX:PixelStorei
-R111 GLX:ReadPixels
-R112 GLX:GetBooleanv
-R113 GLX:GetClipPlane
-R114 GLX:GetDoublev
-R115 GLX:GetError
-R116 GLX:GetFloatv
-R117 GLX:GetIntegerv
-R118 GLX:GetLightfv
-R119 GLX:GetLightiv
-R120 GLX:GetMapdv
-R121 GLX:GetMapfv
-R122 GLX:GetMapiv
-R123 GLX:GetMaterialfv
-R124 GLX:GetMaterialiv
-R125 GLX:GetPixelfv
-R126 GLX:GetPixelMapuiv
-R127 GLX:GetPixelMapusv
-R128 GLX:GetPolygonStipple
-R129 GLX:GetString
-R130 GLX:GetTexEnvfv
-R131 GLX:GetTexEnviv
-R132 GLX:GetTexGendv
-R133 GLX:GetTexGenfv
-R134 GLX:GetTexGeniv
-R135 GLX:GetTexImage
-R136 GLX:GetTexParameterfv
-R137 GLX:GetTexParameteriv
-R138 GLX:GetTexLevelParameterfv
-R139 GLX:GetTexLevelParameteriv
-R140 GLX:IsEnabled
-R141 GLX:IsList
-R142 GLX:Flush
-E000 GLX:BadContext
-E001 GLX:BadContextState
-E002 GLX:BadDrawable
-E003 GLX:BadPixmap
-E004 GLX:BadContextTag
-E005 GLX:BadCurrentWindow
-E006 GLX:BadRenderRequest
-E007 GLX:BadLargeRequest
-E008 GLX:UnsupportedPrivateRequest
-R000 LBX:QueryVersion
-R001 LBX:StartProxy
-R002 LBX:StopProxy
-R003 LBX:Switch
-R004 LBX:NewClient
-R005 LBX:CloseClient
-R006 LBX:ModifySequence
-R007 LBX:AllowMotion
-R008 LBX:IncrementPixel
-R009 LBX:Delta
-R010 LBX:GetModifierMapping
-R011 LBX:QueryTag
-R012 LBX:InvalidateTag
-R013 LBX:PolyPoint
-R014 LBX:PolyLine
-R015 LBX:PolySegment
-R016 LBX:PolyRectangle
-R017 LBX:PolyArc
-R018 LBX:FillPoly
-R019 LBX:PolyFillRectangle
-R020 LBX:PolyFillArc
-R021 LBX:GetKeyboardMapping
-R022 LBX:QueryFont
-R023 LBX:ChangeProperty
-R024 LBX:GetProperty
-R025 LBX:TagData
-R026 LBX:CopyArea
-R027 LBX:CopyPlane
-R028 LBX:PolyText8
-R029 LBX:PolyText16
-R030 LBX:ImageText8
-R031 LBX:ImageText16
-R032 LBX:QueryExtension
-R033 LBX:PutImage
-R034 LBX:GetImage
-R035 LBX:BeginLargeRequest
-R036 LBX:LargeRequestData
-R037 LBX:EndLargeRequest
-R038 LBX:InternAtoms
-R039 LBX:GetWinAttrAndGeom
-R040 LBX:GrabCmap
-R041 LBX:ReleaseCmap
-R042 LBX:AllocColor
-R043 LBX:Sync
-E000 LBX:BadLbxClient
-R000 MIT-SCREEN-SAVER:QueryVersion
-R001 MIT-SCREEN-SAVER:QueryInfo
-R002 MIT-SCREEN-SAVER:SelectInput
-R003 MIT-SCREEN-SAVER:SetAttributes
-R004 MIT-SCREEN-SAVER:UnsetAttributes
-R005 MIT-SCREEN-SAVER:Suspend
-V000 MIT-SCREEN-SAVER:Notify
-R000 MIT-SHM:QueryVersion
-R001 MIT-SHM:Attach
-R002 MIT-SHM:Detach
-R003 MIT-SHM:PutImage
-R004 MIT-SHM:GetImage
-R005 MIT-SHM:CreatePixmap
-V000 MIT-SHM:Completion
-E000 MIT-SHM:BadShmSeg
-R000 MIT-SUNDRY-NONSTANDARD:SetBugMode
-R001 MIT-SUNDRY-NONSTANDARD:GetBugMode
-R000 Multi-Buffering:GetBufferVersion
-R001 Multi-Buffering:CreateImageBuffers
-R002 Multi-Buffering:DestroyImageBuffers
-R003 Multi-Buffering:DisplayImageBuffers
-R004 Multi-Buffering:SetMBufferAttributes
-R005 Multi-Buffering:GetMBufferAttributes
-R006 Multi-Buffering:SetBufferAttributes
-R007 Multi-Buffering:GetBufferAttributes
-R008 Multi-Buffering:GetBufferInfo
-R009 Multi-Buffering:CreateStereoWindow
-R010 Multi-Buffering:ClearImageBufferArea
-V000 Multi-Buffering:ClobberNotify
-V001 Multi-Buffering:UpdateNotify
-E000 Multi-Buffering:BadBuffer
-R000 RANDR:QueryVersion
-R001 RANDR:OldGetScreenInfo
-R002 RANDR:SetScreenConfig
-R003 RANDR:OldScreenChangeSelectInput
-R004 RANDR:SelectInput
-R005 RANDR:GetScreenInfo
-R006 RANDR:GetScreenSizeRange
-R007 RANDR:SetScreenSize
-R008 RANDR:GetScreenResources
-R009 RANDR:GetOutputInfo
-R010 RANDR:ListOutputProperties
-R011 RANDR:QueryOutputProperty
-R012 RANDR:ConfigureOutputProperty
-R013 RANDR:ChangeOutputProperty
-R014 RANDR:DeleteOutputProperty
-R015 RANDR:GetOutputProperty
-R016 RANDR:CreateMode
-R017 RANDR:DestroyMode
-R018 RANDR:AddOutputMode
-R019 RANDR:DeleteOutputMode
-R020 RANDR:GetCrtcInfo
-R021 RANDR:SetCrtcConfig
-R022 RANDR:GetCrtcGammaSize
-R023 RANDR:GetCrtcGamma
-R024 RANDR:SetCrtcGamma
-R025 RANDR:GetScreenResourcesCurrent
-R026 RANDR:SetCrtcTransform
-R027 RANDR:GetCrtcTransform
-R028 RANDR:GetPanning
-R029 RANDR:SetPanning
-R030 RANDR:SetOutputPrimary
-R031 RANDR:GetOutputPrimary
-V000 RANDR:ScreenChangeNotify
-V001 RANDR:Notify
-E000 RANDR:BadRROutput
-E001 RANDR:BadRRCrtc
-E002 RANDR:BadRRMode
-R000 RECORD:QueryVersion
-R001 RECORD:CreateContext
-R002 RECORD:RegisterClients
-R003 RECORD:UnregisterClients
-R004 RECORD:GetContext
-R005 RECORD:EnableContext
-R006 RECORD:DisableContext
-R007 RECORD:FreeContext
-E000 RECORD:BadContext
-R000 RENDER:QueryVersion
-R001 RENDER:QueryPictFormats
-R002 RENDER:QueryPictIndexValues
-R003 RENDER:QueryDithers
-R004 RENDER:CreatePicture
-R005 RENDER:ChangePicture
-R006 RENDER:SetPictureClipRectangles
-R007 RENDER:FreePicture
-R008 RENDER:Composite
-R009 RENDER:Scale
-R010 RENDER:Trapezoids
-R011 RENDER:Triangles
-R012 RENDER:TriStrip
-R013 RENDER:TriFan
-R014 RENDER:ColorTrapezoids
-R015 RENDER:ColorTriangles
-R016 RENDER:Transform
-R017 RENDER:CreateGlyphSet
-R018 RENDER:ReferenceGlyphSet
-R019 RENDER:FreeGlyphSet
-R020 RENDER:AddGlyphs
-R021 RENDER:AddGlyphsFromPicture
-R022 RENDER:FreeGlyphs
-R023 RENDER:CompositeGlyphs8
-R024 RENDER:CompositeGlyphs16
-R025 RENDER:CompositeGlyphs32
-R026 RENDER:FillRectangles
-R027 RENDER:CreateCursor
-R028 RENDER:SetPictureTransform
-R029 RENDER:QueryFilters
-R030 RENDER:SetPictureFilter
-R031 RENDER:CreateAnimCursor
-R032 RENDER:AddTraps
-R033 RENDER:CreateSolidFill
-R034 RENDER:CreateLinearGradient
-R035 RENDER:CreateRadialGradient
-R036 RENDER:CreateConicalGradient
-E000 RENDER:BadPictFormat
-E001 RENDER:BadPicture
-E002 RENDER:BadPictOp
-E003 RENDER:BadGlyphSet
-E004 RENDER:BadGlyph
-R000 SECURITY:QueryVersion
-R001 SECURITY:GenerateAuthorization
-R002 SECURITY:RevokeAuthorization
-V000 SECURITY:AuthorizationRevoked
-E000 SECURITY:BadAuthorization
-E001 SECURITY:BadAuthorizationProtocol
-R000 SELinux:SELinuxQueryVersion
-R001 SELinux:SELinuxSetDeviceCreateContext
-R002 SELinux:SELinuxGetDeviceCreateContext
-R003 SELinux:SELinuxSetDeviceContext
-R004 SELinux:SELinuxGetDeviceContext
-R005 SELinux:SELinuxSetWindowCreateContext
-R006 SELinux:SELinuxGetWindowCreateContext
-R007 SELinux:SELinuxGetWindowContext
-R008 SELinux:SELinuxSetPropertyCreateContext
-R009 SELinux:SELinuxGetPropertyCreateContext
-R010 SELinux:SELinuxSetPropertyUseContext
-R011 SELinux:SELinuxGetPropertyUseContext
-R012 SELinux:SELinuxGetPropertyContext
-R013 SELinux:SELinuxGetPropertyDataContext
-R014 SELinux:SELinuxListProperties
-R015 SELinux:SELinuxSetSelectionCreateContext
-R016 SELinux:SELinuxGetSelectionCreateContext
-R017 SELinux:SELinuxSetSelectionUseContext
-R018 SELinux:SELinuxGetSelectionUseContext
-R019 SELinux:SELinuxGetSelectionContext
-R020 SELinux:SELinuxGetSelectionDataContext
-R021 SELinux:SELinuxListSelections
-R022 SELinux:SELinuxGetClientContext
-R000 SHAPE:QueryVersion
-R001 SHAPE:Rectangles
-R002 SHAPE:Mask
-R003 SHAPE:Combine
-R004 SHAPE:Offset
-R005 SHAPE:QueryExtents
-R006 SHAPE:SelectInput
-R007 SHAPE:InputSelected
-R008 SHAPE:GetRectangles
-V000 SHAPE:Notify
-R000 SYNC:Initialize
-R001 SYNC:ListSystemCounters
-R002 SYNC:CreateCounter
-R003 SYNC:SetCounter
-R004 SYNC:ChangeCounter
-R005 SYNC:QueryCounter
-R006 SYNC:DestroyCounter
-R007 SYNC:Await
-R008 SYNC:CreateAlarm
-R009 SYNC:ChangeAlarm
-R010 SYNC:QueryAlarm
-R011 SYNC:DestroyAlarm
-R012 SYNC:SetPriority
-R013 SYNC:GetPriority
-V000 SYNC:CounterNotify
-V001 SYNC:AlarmNotify
-E000 SYNC:BadCounter
-E001 SYNC:BadAlarm
-R000 TOG-CUP:QueryVersion
-R001 TOG-CUP:GetReservedColormapEntries
-R002 TOG-CUP:StoreColors
-R000 Windows-WM:QueryVersion
-R001 Windows-WM:FrameGetRect
-R002 Windows-WM:FrameDraw
-R003 Windows-WM:FrameSetTitle
-R004 Windows-WM:DisableUpdate
-R005 Windows-WM:ReenableUpdate
-R006 Windows-WM:SelectInput
-R007 Windows-WM:SetFrontProcess
-V000 Windows-WM:ControllerNotify
-V001 Windows-WM:ActivationNotify
-E000 Windows-WM:ClientNotLocal
-E001 Windows-WM:OperationNotSupported
-R000 X-Resource:QueryVersion
-R001 X-Resource:QueryClients
-R002 X-Resource:QueryClientResources
-R003 X-Resource:QueryClientPixmapBytes
-R001 X11:CreateWindow
-R002 X11:ChangeWindowAttributes
-R003 X11:GetWindowAttributes
-R004 X11:DestroyWindow
-R005 X11:DestroySubwindows
-R006 X11:ChangeSaveSet
-R007 X11:ReparentWindow
-R008 X11:MapWindow
-R009 X11:MapSubwindows
-R010 X11:UnmapWindow
-R011 X11:UnmapSubwindows
-R012 X11:ConfigureWindow
-R013 X11:CirculateWindow
-R014 X11:GetGeometry
-R015 X11:QueryTree
-R016 X11:InternAtom
-R017 X11:GetAtomName
-R018 X11:ChangeProperty
-R019 X11:DeleteProperty
-R020 X11:GetProperty
-R021 X11:ListProperties
-R022 X11:SetSelectionOwner
-R023 X11:GetSelectionOwner
-R024 X11:ConvertSelection
-R025 X11:SendEvent
-R026 X11:GrabPointer
-R027 X11:UngrabPointer
-R028 X11:GrabButton
-R029 X11:UngrabButton
-R030 X11:ChangeActivePointerGrab
-R031 X11:GrabKeyboard
-R032 X11:UngrabKeyboard
-R033 X11:GrabKey
-R034 X11:UngrabKey
-R035 X11:AllowEvents
-R036 X11:GrabServer
-R037 X11:UngrabServer
-R038 X11:QueryPointer
-R039 X11:GetMotionEvents
-R040 X11:TranslateCoords
-R041 X11:WarpPointer
-R042 X11:SetInputFocus
-R043 X11:GetInputFocus
-R044 X11:QueryKeymap
-R045 X11:OpenFont
-R046 X11:CloseFont
-R047 X11:QueryFont
-R048 X11:QueryTextExtents
-R049 X11:ListFonts
-R050 X11:ListFontsWithInfo
-R051 X11:SetFontPath
-R052 X11:GetFontPath
-R053 X11:CreatePixmap
-R054 X11:FreePixmap
-R055 X11:CreateGC
-R056 X11:ChangeGC
-R057 X11:CopyGC
-R058 X11:SetDashes
-R059 X11:SetClipRectangles
-R060 X11:FreeGC
-R061 X11:ClearArea
-R062 X11:CopyArea
-R063 X11:CopyPlane
-R064 X11:PolyPoint
-R065 X11:PolyLine
-R066 X11:PolySegment
-R067 X11:PolyRectangle
-R068 X11:PolyArc
-R069 X11:FillPoly
-R070 X11:PolyFillRectangle
-R071 X11:PolyFillArc
-R072 X11:PutImage
-R073 X11:GetImage
-R074 X11:PolyText8
-R075 X11:PolyText16
-R076 X11:ImageText8
-R077 X11:ImageText16
-R078 X11:CreateColormap
-R079 X11:FreeColormap
-R080 X11:CopyColormapAndFree
-R081 X11:InstallColormap
-R082 X11:UninstallColormap
-R083 X11:ListInstalledColormaps
-R084 X11:AllocColor
-R085 X11:AllocNamedColor
-R086 X11:AllocColorCells
-R087 X11:AllocColorPlanes
-R088 X11:FreeColors
-R089 X11:StoreColors
-R090 X11:StoreNamedColor
-R091 X11:QueryColors
-R092 X11:LookupColor
-R093 X11:CreateCursor
-R094 X11:CreateGlyphCursor
-R095 X11:FreeCursor
-R096 X11:RecolorCursor
-R097 X11:QueryBestSize
-R098 X11:QueryExtension
-R099 X11:ListExtensions
-R100 X11:ChangeKeyboardMapping
-R101 X11:GetKeyboardMapping
-R102 X11:ChangeKeyboardControl
-R103 X11:GetKeyboardControl
-R104 X11:Bell
-R105 X11:ChangePointerControl
-R106 X11:GetPointerControl
-R107 X11:SetScreenSaver
-R108 X11:GetScreenSaver
-R109 X11:ChangeHosts
-R110 X11:ListHosts
-R111 X11:SetAccessControl
-R112 X11:SetCloseDownMode
-R113 X11:KillClient
-R114 X11:RotateProperties
-R115 X11:ForceScreenSaver
-R116 X11:SetPointerMapping
-R117 X11:GetPointerMapping
-R118 X11:SetModifierMapping
-R119 X11:GetModifierMapping
-R127 X11:NoOperation
-V000 X11:X_Error
-V001 X11:X_Reply
-V002 X11:KeyPress
-V003 X11:KeyRelease
-V004 X11:ButtonPress
-V005 X11:ButtonRelease
-V006 X11:MotionNotify
-V007 X11:EnterNotify
-V008 X11:LeaveNotify
-V009 X11:FocusIn
-V010 X11:FocusOut
-V011 X11:KeymapNotify
-V012 X11:Expose
-V013 X11:GraphicsExpose
-V014 X11:NoExpose
-V015 X11:VisibilityNotify
-V016 X11:CreateNotify
-V017 X11:DestroyNotify
-V018 X11:UnmapNotify
-V019 X11:MapNotify
-V020 X11:MapRequest
-V021 X11:ReparentNotify
-V022 X11:ConfigureNotify
-V023 X11:ConfigureRequest
-V024 X11:GravityNotify
-V025 X11:ResizeRequest
-V026 X11:CirculateNotify
-V027 X11:CirculateRequest
-V028 X11:PropertyNotify
-V029 X11:SelectionClear
-V030 X11:SelectionRequest
-V031 X11:SelectionNotify
-V032 X11:ColormapNotify
-V033 X11:ClientMessage
-V034 X11:MappingNotify
-V035 X11:GenericEvent
-E000 X11:Success
-E001 X11:BadRequest
-E002 X11:BadValue
-E003 X11:BadWindow
-E004 X11:BadPixmap
-E005 X11:BadAtom
-E006 X11:BadCursor
-E007 X11:BadFont
-E008 X11:BadMatch
-E009 X11:BadDrawable
-E010 X11:BadAccess
-E011 X11:BadAlloc
-E012 X11:BadColor
-E013 X11:BadGC
-E014 X11:BadIDChoice
-E015 X11:BadName
-E016 X11:BadLength
-E017 X11:BadImplementation
-R001 X3D-PEX:GetExtensionInfo
-R002 X3D-PEX:GetEnumeratedTypeInfo
-R003 X3D-PEX:GetImpDepConstants
-R004 X3D-PEX:CreateLookupTable
-R005 X3D-PEX:CopyLookupTable
-R006 X3D-PEX:FreeLookupTable
-R007 X3D-PEX:GetTableInfo
-R008 X3D-PEX:GetPredefinedEntries
-R009 X3D-PEX:GetDefinedIndices
-R010 X3D-PEX:GetTableEntry
-R011 X3D-PEX:GetTableEntries
-R012 X3D-PEX:SetTableEntries
-R013 X3D-PEX:DeleteTableEntries
-R014 X3D-PEX:CreatePipelineContext
-R015 X3D-PEX:CopyPipelineContext
-R016 X3D-PEX:FreePipelineContext
-R017 X3D-PEX:GetPipelineContext
-R018 X3D-PEX:ChangePipelineContext
-R019 X3D-PEX:CreateRenderer
-R020 X3D-PEX:FreeRenderer
-R021 X3D-PEX:ChangeRenderer
-R022 X3D-PEX:GetRendererAttributes
-R023 X3D-PEX:GetRendererDynamics
-R024 X3D-PEX:BeginRendering
-R025 X3D-PEX:EndRendering
-R026 X3D-PEX:BeginStructure
-R027 X3D-PEX:EndStructure
-R028 X3D-PEX:OutputCommands
-R029 X3D-PEX:Network
-R030 X3D-PEX:CreateStructure
-R031 X3D-PEX:CopyStructure
-R032 X3D-PEX:DestroyStructures
-R033 X3D-PEX:GetStructureInfo
-R034 X3D-PEX:GetElementInfo
-R035 X3D-PEX:GetStructuresInNetwork
-R036 X3D-PEX:GetAncestors
-R037 X3D-PEX:GetDescendants
-R038 X3D-PEX:FetchElements
-R039 X3D-PEX:SetEditingMode
-R040 X3D-PEX:SetElementPointer
-R041 X3D-PEX:SetElementPointerAtLabel
-R042 X3D-PEX:ElementSearch
-R043 X3D-PEX:StoreElements
-R044 X3D-PEX:DeleteElements
-R045 X3D-PEX:DeleteElementsToLabel
-R046 X3D-PEX:DeleteBetweenLabels
-R047 X3D-PEX:CopyElements
-R048 X3D-PEX:ChangeStructureRefs
-R049 X3D-PEX:CreateNameSet
-R050 X3D-PEX:CopyNameSet
-R051 X3D-PEX:FreeNameSet
-R052 X3D-PEX:GetNameSet
-R053 X3D-PEX:ChangeNameSet
-R054 X3D-PEX:CreateSearchContext
-R055 X3D-PEX:CopySearchContext
-R056 X3D-PEX:FreeSearchContext
-R057 X3D-PEX:GetSearchContext
-R058 X3D-PEX:ChangeSearchContext
-R059 X3D-PEX:SearchNetwork
-R060 X3D-PEX:CreatePhigsWks
-R061 X3D-PEX:FreePhigsWks
-R062 X3D-PEX:GetWksInfo
-R063 X3D-PEX:GetDynamics
-R064 X3D-PEX:GetViewRep
-R065 X3D-PEX:RedrawAllStructures
-R066 X3D-PEX:UpdateWorkstation
-R067 X3D-PEX:RedrawClipRegion
-R068 X3D-PEX:ExecuteDeferredActions
-R069 X3D-PEX:SetViewPriority
-R070 X3D-PEX:SetDisplayUpdateMode
-R071 X3D-PEX:MapDCtoWC
-R072 X3D-PEX:MapWCtoDC
-R073 X3D-PEX:SetViewRep
-R074 X3D-PEX:SetWksWindow
-R075 X3D-PEX:SetWksViewport
-R076 X3D-PEX:SetHlhsrMode
-R077 X3D-PEX:SetWksBufferMode
-R078 X3D-PEX:PostStructure
-R079 X3D-PEX:UnpostStructure
-R080 X3D-PEX:UnpostAllStructures
-R081 X3D-PEX:GetWksPostings
-R082 X3D-PEX:GetPickDevice
-R083 X3D-PEX:ChangePickDevice
-R084 X3D-PEX:CreatePickMeasure
-R085 X3D-PEX:FreePickMeasure
-R086 X3D-PEX:GetPickMeasure
-R087 X3D-PEX:UpdatePickMeasure
-R088 X3D-PEX:OpenFont
-R089 X3D-PEX:CloseFont
-R090 X3D-PEX:QueryFont
-R091 X3D-PEX:ListFonts
-R092 X3D-PEX:ListFontsWithInfo
-R093 X3D-PEX:QueryTextExtents
-R094 X3D-PEX:MatchRenderingTargets
-R095 X3D-PEX:Escape
-R096 X3D-PEX:EscapeWithReply
-R097 X3D-PEX:Elements
-R098 X3D-PEX:AccumulateState
-R099 X3D-PEX:BeginPickOne
-R100 X3D-PEX:EndPickOne
-R101 X3D-PEX:PickOne
-R102 X3D-PEX:BeginPickAll
-R103 X3D-PEX:EndPickAll
-R104 X3D-PEX:PickAll
-E000 X3D-PEX:ColorTypeError
-E001 X3D-PEX:erStateError
-E002 X3D-PEX:FloatingPointFormatError
-E003 X3D-PEX:LabelError
-E004 X3D-PEX:LookupTableError
-E005 X3D-PEX:NameSetError
-E006 X3D-PEX:PathError
-E007 X3D-PEX:FontError
-E008 X3D-PEX:PhigsWksError
-E009 X3D-PEX:PickMeasureError
-E010 X3D-PEX:PipelineContextError
-E011 X3D-PEX:erError
-E012 X3D-PEX:SearchContextError
-E013 X3D-PEX:StructureError
-E014 X3D-PEX:OutputCommandError
-R000 XC-APPGROUP:QueryVersion
-R001 XC-APPGROUP:Create
-R002 XC-APPGROUP:Destroy
-R003 XC-APPGROUP:GetAttr
-R004 XC-APPGROUP:Query
-R005 XC-APPGROUP:CreateAssoc
-R006 XC-APPGROUP:DestroyAssoc
-E000 XC-APPGROUP:BadAppGroup
-R000 XC-MISC:GetVersion
-R001 XC-MISC:GetXIDRange
-R002 XC-MISC:GetXIDList
-R000 XFIXES:QueryVersion
-R001 XFIXES:ChangeSaveSet
-R002 XFIXES:SelectSelectionInput
-R003 XFIXES:SelectCursorInput
-R004 XFIXES:GetCursorImage
-R005 XFIXES:CreateRegion
-R006 XFIXES:CreateRegionFromBitmap
-R007 XFIXES:CreateRegionFromWindow
-R008 XFIXES:CreateRegionFromGC
-R009 XFIXES:CreateRegionFromPicture
-R010 XFIXES:DestroyRegion
-R011 XFIXES:SetRegion
-R012 XFIXES:CopyRegion
-R013 XFIXES:UnionRegion
-R014 XFIXES:IntersectRegion
-R015 XFIXES:SubtractRegion
-R016 XFIXES:InvertRegion
-R017 XFIXES:TranslateRegion
-R018 XFIXES:RegionExtents
-R019 XFIXES:FetchRegion
-R020 XFIXES:SetGCClipRegion
-R021 XFIXES:SetWindowShapeRegion
-R022 XFIXES:SetPictureClipRegion
-R023 XFIXES:SetCursorName
-R024 XFIXES:GetCursorName
-R025 XFIXES:GetCursorImageAndName
-R026 XFIXES:ChangeCursor
-R027 XFIXES:ChangeCursorByName
-R028 XFIXES:ExpandRegion
-R029 XFIXES:HideCursor
-R030 XFIXES:ShowCursor
-V000 XFIXES:SelectionNotify
-V001 XFIXES:CursorNotify
-E000 XFIXES:BadRegion
-R000 XFree86-Bigfont:QueryVersion
-R001 XFree86-Bigfont:QueryFont
-R000 XFree86-DGA:QueryVersion
-R001 XFree86-DGA:GetVideoLL
-R002 XFree86-DGA:DirectVideo
-R003 XFree86-DGA:GetViewPortSize
-R004 XFree86-DGA:SetViewPort
-R005 XFree86-DGA:GetVidPage
-R006 XFree86-DGA:SetVidPage
-R007 XFree86-DGA:InstallColormap
-R008 XFree86-DGA:QueryDirectVideo
-R009 XFree86-DGA:ViewPortChanged
-R010 XFree86-DGA:Obsolete1
-R011 XFree86-DGA:Obsolete2
-R012 XFree86-DGA:QueryModes
-R013 XFree86-DGA:SetMode
-R014 XFree86-DGA:SetViewport
-R015 XFree86-DGA:InstallColormap
-R016 XFree86-DGA:SelectInput
-R017 XFree86-DGA:FillRectangle
-R018 XFree86-DGA:CopyArea
-R019 XFree86-DGA:CopyTransparentArea
-R020 XFree86-DGA:GetViewportStatus
-R021 XFree86-DGA:Sync
-R022 XFree86-DGA:OpenFramebuffer
-R023 XFree86-DGA:CloseFramebuffer
-R024 XFree86-DGA:SetClientVersion
-R025 XFree86-DGA:ChangePixmapMode
-R026 XFree86-DGA:CreateColormap
-E000 XFree86-DGA:ClientNotLocal
-E001 XFree86-DGA:NoDirectVideoMode
-E002 XFree86-DGA:ScreenNotActive
-E003 XFree86-DGA:DirectNotActivated
-E004 XFree86-DGA:OperationNotSupported
-R000 XFree86-DRI:QueryVersion
-R001 XFree86-DRI:QueryDirectRenderingCapable
-R002 XFree86-DRI:OpenConnection
-R003 XFree86-DRI:CloseConnection
-R004 XFree86-DRI:GetClientDriverName
-R005 XFree86-DRI:CreateContext
-R006 XFree86-DRI:DestroyContext
-R007 XFree86-DRI:CreateDrawable
-R008 XFree86-DRI:DestroyDrawable
-R009 XFree86-DRI:GetDrawableInfo
-R010 XFree86-DRI:GetDeviceInfo
-R011 XFree86-DRI:AuthConnection
-R012 XFree86-DRI:OpenFullScreen
-R013 XFree86-DRI:CloseFullScreen
-E000 XFree86-DRI:ClientNotLocal
-E001 XFree86-DRI:OperationNotSupported
-R000 XFree86-Misc:QueryVersion
-R001 XFree86-Misc:GetSaver
-R002 XFree86-Misc:SetSaver
-R003 XFree86-Misc:GetMouseSettings
-R004 XFree86-Misc:GetKbdSettings
-R005 XFree86-Misc:SetMouseSettings
-R006 XFree86-Misc:SetKbdSettings
-R007 XFree86-Misc:SetGrabKeysState
-R008 XFree86-Misc:SetClientVersion
-R009 XFree86-Misc:GetFilePaths
-R010 XFree86-Misc:PassMessage
-E000 XFree86-Misc:BadMouseProtocol
-E001 XFree86-Misc:BadMouseBaudRate
-E002 XFree86-Misc:BadMouseFlags
-E003 XFree86-Misc:BadMouseCombo
-E004 XFree86-Misc:BadKbdType
-E005 XFree86-Misc:ModInDevDisabled
-E006 XFree86-Misc:ModInDevClientNotLocal
-E007 XFree86-Misc:NoModule
-R000 XFree86-VidModeExtension:QueryVersion
-R001 XFree86-VidModeExtension:GetModeLine
-R002 XFree86-VidModeExtension:ModModeLine
-R003 XFree86-VidModeExtension:SwitchMode
-R004 XFree86-VidModeExtension:GetMonitor
-R005 XFree86-VidModeExtension:LockModeSwitch
-R006 XFree86-VidModeExtension:GetAllModeLines
-R007 XFree86-VidModeExtension:AddModeLine
-R008 XFree86-VidModeExtension:DeleteModeLine
-R009 XFree86-VidModeExtension:ValidateModeLine
-R010 XFree86-VidModeExtension:SwitchToMode
-R011 XFree86-VidModeExtension:GetViewPort
-R012 XFree86-VidModeExtension:SetViewPort
-R013 XFree86-VidModeExtension:GetDotClocks
-R014 XFree86-VidModeExtension:SetClientVersion
-R015 XFree86-VidModeExtension:SetGamma
-R016 XFree86-VidModeExtension:GetGamma
-R017 XFree86-VidModeExtension:GetGammaRamp
-R018 XFree86-VidModeExtension:SetGammaRamp
-R019 XFree86-VidModeExtension:GetGammaRampSize
-R020 XFree86-VidModeExtension:GetPermissions
-V000 XFree86-VidModeExtension:Notify
-E000 XFree86-VidModeExtension:BadClock
-E001 XFree86-VidModeExtension:BadHTimings
-E002 XFree86-VidModeExtension:BadVTimings
-E003 XFree86-VidModeExtension:ModeUnsuitable
-E004 XFree86-VidModeExtension:ExtensionDisabled
-E005 XFree86-VidModeExtension:ClientNotLocal
-E006 XFree86-VidModeExtension:ZoomLocked
-R001 XIE:QueryImageExtension
-R002 XIE:QueryTechniques
-R003 XIE:CreateColorList
-R004 XIE:DestroyColorList
-R005 XIE:PurgeColorList
-R006 XIE:QueryColorList
-R007 XIE:CreateLUT
-R008 XIE:DestroyLUT
-R009 XIE:CreatePhotomap
-R010 XIE:DestroyPhotomap
-R011 XIE:QueryPhotomap
-R012 XIE:CreateROI
-R013 XIE:DestroyROI
-R014 XIE:CreatePhotospace
-R015 XIE:DestroyPhotospace
-R016 XIE:ExecuteImmediate
-R017 XIE:CreatePhotoflo
-R018 XIE:DestroyPhotoflo
-R019 XIE:ExecutePhotoflo
-R020 XIE:ModifyPhotoflo
-R021 XIE:RedefinePhotoflo
-R022 XIE:PutClientData
-R023 XIE:GetClientData
-R024 XIE:QueryPhotoflo
-R025 XIE:Await
-R026 XIE:Abort
-E000 XIE:ColorListError
-E001 XIE:LUTError
-E002 XIE:PhotofloError
-E003 XIE:PhotomapError
-E004 XIE:PhotospaceError
-E005 XIE:ROIError
-E006 XIE:FloError
-R000 XINERAMA:QueryVersion
-R001 XINERAMA:GetState
-R002 XINERAMA:GetScreenCount
-R003 XINERAMA:GetScreenSize
-R004 XINERAMA:IsActive
-R005 XINERAMA:QueryScreens
-R001 XInputExtension:GetExtensionVersion
-R002 XInputExtension:ListInputDevices
-R003 XInputExtension:OpenDevice
-R004 XInputExtension:CloseDevice
-R005 XInputExtension:SetDeviceMode
-R006 XInputExtension:SelectExtensionEvent
-R007 XInputExtension:GetSelectedExtensionEvents
-R008 XInputExtension:ChangeDeviceDontPropagateList
-R009 XInputExtension:GetDeviceDontPropagageList
-R010 XInputExtension:GetDeviceMotionEvents
-R011 XInputExtension:ChangeKeyboardDevice
-R012 XInputExtension:ChangePointerDevice
-R013 XInputExtension:GrabDevice
-R014 XInputExtension:UngrabDevice
-R015 XInputExtension:GrabDeviceKey
-R016 XInputExtension:UngrabDeviceKey
-R017 XInputExtension:GrabDeviceButton
-R018 XInputExtension:UngrabDeviceButton
-R019 XInputExtension:AllowDeviceEvents
-R020 XInputExtension:GetDeviceFocus
-R021 XInputExtension:SetDeviceFocus
-R022 XInputExtension:GetFeedbackControl
-R023 XInputExtension:ChangeFeedbackControl
-R024 XInputExtension:GetDeviceKeyMapping
-R025 XInputExtension:ChangeDeviceKeyMapping
-R026 XInputExtension:GetDeviceModifierMapping
-R027 XInputExtension:SetDeviceModifierMapping
-R028 XInputExtension:GetDeviceButtonMapping
-R029 XInputExtension:SetDeviceButtonMapping
-R030 XInputExtension:QueryDeviceState
-R031 XInputExtension:SendExtensionEvent
-R032 XInputExtension:DeviceBell
-R033 XInputExtension:SetDeviceValuators
-R034 XInputExtension:GetDeviceControl
-R035 XInputExtension:ChangeDeviceControl
-R036 XInputExtension:ListDeviceProperties
-R037 XInputExtension:ChangeDeviceProperty
-R038 XInputExtension:DeleteDeviceProperty
-R039 XInputExtension:GetDeviceProperty
-R040 XInputExtension:QueryPointer
-R041 XInputExtension:WarpPointer
-R042 XInputExtension:ChangeCursor
-R043 XInputExtension:ChangeHierarchy
-R044 XInputExtension:SetClientPointer
-R045 XInputExtension:GetClientPointer
-R046 XInputExtension:SelectEvents
-R047 XInputExtension:QueryVersion
-R048 XInputExtension:QueryDevice
-R049 XInputExtension:SetFocus
-R050 XInputExtension:GetFocus
-R051 XInputExtension:GrabDevice
-R052 XInputExtension:UngrabDevice
-R053 XInputExtension:AllowEvents
-R054 XInputExtension:PassiveGrabDevice
-R055 XInputExtension:PassiveUngrabDevice
-R056 XInputExtension:ListProperties
-R057 XInputExtension:ChangeProperty
-R058 XInputExtension:DeleteProperty
-R059 XInputExtension:GetProperty
-R060 XInputExtension:GetSelectedEvents
-V000 XInputExtension:DeviceValuator
-V001 XInputExtension:DeviceKeyPress
-V002 XInputExtension:DeviceKeyRelease
-V003 XInputExtension:DeviceButtonPress
-V004 XInputExtension:DeviceButtonRelease
-V005 XInputExtension:DeviceMotionNotify
-V006 XInputExtension:DeviceFocusIn
-V007 XInputExtension:DeviceFocusOut
-V008 XInputExtension:ProximityIn
-V009 XInputExtension:ProximityOut
-V010 XInputExtension:DeviceStateNotify
-V011 XInputExtension:DeviceMappingNotify
-V012 XInputExtension:ChangeDeviceNotify
-V013 XInputExtension:DeviceKeystateNotify
-V014 XInputExtension:DeviceButtonstateNotify
-V015 XInputExtension:DevicePresenceNotify
-V016 XInputExtension:DevicePropertyNotify
-E000 XInputExtension:BadDevice
-E001 XInputExtension:BadEvent
-E002 XInputExtension:BadMode
-E003 XInputExtension:DeviceBusy
-E004 XInputExtension:BadClass
-R000 XKEYBOARD:UseExtension
-R001 XKEYBOARD:SelectEvents
-R002 XKEYBOARD:Obsolete
-R003 XKEYBOARD:Bell
-R004 XKEYBOARD:GetState
-R005 XKEYBOARD:LatchLockState
-R006 XKEYBOARD:GetControls
-R007 XKEYBOARD:SetControls
-R008 XKEYBOARD:GetMap
-R009 XKEYBOARD:SetMap
-R010 XKEYBOARD:GetCompatMap
-R011 XKEYBOARD:SetCompatMap
-R012 XKEYBOARD:GetIndicatorState
-R013 XKEYBOARD:GetIndicatorMap
-R014 XKEYBOARD:SetIndicatorMap
-R015 XKEYBOARD:GetNamedIndicator
-R016 XKEYBOARD:SetNamedIndicator
-R017 XKEYBOARD:GetNames
-R018 XKEYBOARD:SetNames
-R019 XKEYBOARD:GetGeometry
-R020 XKEYBOARD:SetGeometry
-R021 XKEYBOARD:PerClientFlags
-R022 XKEYBOARD:ListComponents
-R023 XKEYBOARD:GetKbdByName
-R024 XKEYBOARD:GetDeviceInfo
-R025 XKEYBOARD:SetDeviceInfo
-R101 XKEYBOARD:SetDebuggingFlags
-V000 XKEYBOARD:EventCode
-E000 XKEYBOARD:BadKeyboard
-R000 XTEST:GetVersion
-R001 XTEST:CompareCursor
-R002 XTEST:FakeInput
-R003 XTEST:GrabControl
-R000 XVideo:QueryExtension
-R001 XVideo:QueryAdaptors
-R002 XVideo:QueryEncodings
-R003 XVideo:GrabPort
-R004 XVideo:UngrabPort
-R005 XVideo:PutVideo
-R006 XVideo:PutStill
-R007 XVideo:GetVideo
-R008 XVideo:GetStill
-R009 XVideo:StopVideo
-R010 XVideo:SelectVideoNotify
-R011 XVideo:SelectPortNotify
-R012 XVideo:QueryBestSize
-R013 XVideo:SetPortAttribute
-R014 XVideo:GetPortAttribute
-R015 XVideo:QueryPortAttributes
-R016 XVideo:ListImageFormats
-R017 XVideo:QueryImageAttributes
-R018 XVideo:PutImage
-R019 XVideo:ShmPutImage
-V000 XVideo:VideoNotify
-V001 XVideo:PortNotify
-E000 XVideo:BadPort
-E001 XVideo:BadEncoding
-E002 XVideo:BadControl
-R000 XVideo-MotionCompensation:QueryVersion
-R001 XVideo-MotionCompensation:ListSurfaceTypes
-R002 XVideo-MotionCompensation:CreateContext
-R003 XVideo-MotionCompensation:DestroyContext
-R004 XVideo-MotionCompensation:CreateSurface
-R005 XVideo-MotionCompensation:DestroySurface
-R006 XVideo-MotionCompensation:CreateSubpicture
-R007 XVideo-MotionCompensation:DestroySubpicture
-R008 XVideo-MotionCompensation:ListSubpictureTypes
-R009 XVideo-MotionCompensation:GetDRInfo
-E000 XVideo-MotionCompensation:BadContext
-E001 XVideo-MotionCompensation:BadSurface
-E002 XVideo-MotionCompensation:BadSubpicture
-R000 XpExtension:QueryVersion
-R001 XpExtension:GetPrinterList
-R002 XpExtension:CreateContext
-R003 XpExtension:SetContext
-R004 XpExtension:GetContext
-R005 XpExtension:DestroyContext
-R006 XpExtension:GetContextScreen
-R007 XpExtension:StartJob
-R008 XpExtension:EndJob
-R009 XpExtension:StartDoc
-R010 XpExtension:EndDoc
-R011 XpExtension:PutDocumentData
-R012 XpExtension:GetDocumentData
-R013 XpExtension:StartPage
-R014 XpExtension:EndPage
-R015 XpExtension:SelectInput
-R016 XpExtension:InputSelected
-R017 XpExtension:GetAttributes
-R018 XpExtension:SetAttributes
-R019 XpExtension:GetOneAttribute
-R020 XpExtension:RehashPrinterList
-R021 XpExtension:GetPageDimensions
-R022 XpExtension:QueryScreens
-R023 XpExtension:SetImageResolution
-R024 XpExtension:GetImageResolution
-V000 XpExtension:PrintNotify
-V001 XpExtension:AttributeNotify
-E000 XpExtension:BadContext
-E001 XpExtension:BadSequence
-E002 XpExtension:BadResourceID
+# Registry of protocol names used by X Server
+# This will eventually be replaced by server-side XCB
+#
+# Format is Xnnn <extension-name>:<object-name>
+# R=Request, V=Event, E=Error
+#
+# This is a security-sensitive file, please set permissions as appropriate.
+#
+R001 Adobe-DPS-Extension:Init
+R002 Adobe-DPS-Extension:CreateContext
+R003 Adobe-DPS-Extension:CreateSpace
+R004 Adobe-DPS-Extension:GiveInput
+R005 Adobe-DPS-Extension:GetStatus
+R006 Adobe-DPS-Extension:DestroySpace
+R007 Adobe-DPS-Extension:Reset
+R008 Adobe-DPS-Extension:NotifyContext
+R009 Adobe-DPS-Extension:CreateContextFromID
+R010 Adobe-DPS-Extension:XIDFromContext
+R011 Adobe-DPS-Extension:ContextFromXID
+R012 Adobe-DPS-Extension:SetStatusMask
+R013 Adobe-DPS-Extension:CreateSecureContext
+R014 Adobe-DPS-Extension:NotifyWhenReady
+R000 Apple-DRI:QueryVersion
+R001 Apple-DRI:QueryDirectRenderingCapable
+R002 Apple-DRI:CreateSurface
+R003 Apple-DRI:DestroySurface
+R004 Apple-DRI:AuthConnection
+V000 Apple-DRI:ObsoleteEvent1
+V001 Apple-DRI:ObsoleteEvent2
+V002 Apple-DRI:ObsoleteEvent3
+V003 Apple-DRI:SurfaceNotify
+E000 Apple-DRI:ClientNotLocal
+E001 Apple-DRI:OperationNotSupported
+R000 Apple-WM:QueryVersion
+R001 Apple-WM:FrameGetRect
+R002 Apple-WM:FrameHitTest
+R003 Apple-WM:FrameDraw
+R004 Apple-WM:DisableUpdate
+R005 Apple-WM:ReenableUpdate
+R006 Apple-WM:SelectInput
+R007 Apple-WM:SetWindowMenuCheck
+R008 Apple-WM:SetFrontProcess
+R009 Apple-WM:SetWindowLevel
+R010 Apple-WM:SetCanQuit
+R011 Apple-WM:SetWindowMenu
+V000 Apple-WM:ControllerNotify
+V001 Apple-WM:ActivationNotify
+V002 Apple-WM:PasteboardNotify
+E000 Apple-WM:ClientNotLocal
+E001 Apple-WM:OperationNotSupported
+R000 BIG-REQUESTS:Enable
+R000 Composite:CompositeQueryVersion
+R001 Composite:CompositeRedirectWindow
+R002 Composite:CompositeRedirectSubwindows
+R003 Composite:CompositeUnredirectWindow
+R004 Composite:CompositeUnredirectSubwindows
+R005 Composite:CompositeCreateRegionFromBorderClip
+R006 Composite:CompositeNameWindowPixmap
+R007 Composite:CompositeGetOverlayWindow
+R008 Composite:CompositeReleaseOverlayWindow
+R000 DAMAGE:QueryVersion
+R001 DAMAGE:Create
+R002 DAMAGE:Destroy
+R003 DAMAGE:Subtract
+R004 DAMAGE:Add
+V000 DAMAGE:Notify
+E000 DAMAGE:BadDamage
+R000 DEC-XTRAP:Reset
+R001 DEC-XTRAP:GetAvailable
+R002 DEC-XTRAP:Config
+R003 DEC-XTRAP:StartTrap
+R004 DEC-XTRAP:StopTrap
+R005 DEC-XTRAP:GetCurrent
+R006 DEC-XTRAP:GetStatistics
+R007 DEC-XTRAP:SimulateXEvent
+R008 DEC-XTRAP:GetVersion
+R009 DEC-XTRAP:GetLastInpTime
+V000 DEC-XTRAP:Event
+E002 DEC-XTRAP:BadIO
+E004 DEC-XTRAP:BadStatistics
+E005 DEC-XTRAP:BadDevices
+E007 DEC-XTRAP:BadScreen
+E008 DEC-XTRAP:BadSwapReq
+R000 DMX:DMXQueryVersion
+R001 DMX:DMXGetScreenCount
+R002 DMX:DMXGetScreenInfoDEPRECATED
+R003 DMX:DMXGetWindowAttributes
+R004 DMX:DMXGetInputCount
+R005 DMX:DMXGetInputAttributes
+R006 DMX:DMXForceWindowCreationDEPRECATED
+R007 DMX:DMXReconfigureScreenDEPRECATED
+R008 DMX:DMXSync
+R009 DMX:DMXForceWindowCreation
+R010 DMX:DMXGetScreenAttributes
+R011 DMX:DMXChangeScreensAttributes
+R012 DMX:DMXAddScreen
+R013 DMX:DMXRemoveScreen
+R014 DMX:DMXGetDesktopAttributes
+R015 DMX:DMXChangeDesktopAttributes
+R016 DMX:DMXAddInput
+R017 DMX:DMXRemoveInput
+R000 DOUBLE-BUFFER:GetVersion
+R001 DOUBLE-BUFFER:AllocateBackBufferName
+R002 DOUBLE-BUFFER:DeallocateBackBufferName
+R003 DOUBLE-BUFFER:SwapBuffers
+R004 DOUBLE-BUFFER:BeginIdiom
+R005 DOUBLE-BUFFER:EndIdiom
+R006 DOUBLE-BUFFER:GetVisualInfo
+R007 DOUBLE-BUFFER:GetBackBufferAttributes
+E000 DOUBLE-BUFFER:BadBuffer
+R000 DPMS:GetVersion
+R001 DPMS:Capable
+R002 DPMS:GetTimeouts
+R003 DPMS:SetTimeouts
+R004 DPMS:Enable
+R005 DPMS:Disable
+R006 DPMS:ForceLevel
+R007 DPMS:Info
+R000 DRI2:QueryVersion
+R001 DRI2:Connect
+R002 DRI2:Authenticate
+R003 DRI2:CreateDrawable
+R004 DRI2:DestroyDrawable
+R005 DRI2:GetBuffers
+R006 DRI2:CopyRegion
+R007 DRI2:GetBuffersWithFormat
+R000 Extended-Visual-Information:QueryVersion
+R001 Extended-Visual-Information:GetVisualInfo
+R000 FontCache:QueryVersion
+R001 FontCache:GetCacheSettings
+R002 FontCache:ChangeCacheSettings
+R003 FontCache:GetCacheStatistics
+E000 FontCache:BadProtocol
+E001 FontCache:CannotAllocMemory
+R001 GLX:
+R002 GLX:Large
+R003 GLX:CreateContext
+R004 GLX:DestroyContext
+R005 GLX:MakeCurrent
+R006 GLX:IsDirect
+R007 GLX:QueryVersion
+R008 GLX:WaitGL
+R009 GLX:WaitX
+R010 GLX:CopyContext
+R011 GLX:SwapBuffers
+R012 GLX:UseXFont
+R013 GLX:CreateGLXPixmap
+R014 GLX:GetVisualConfigs
+R015 GLX:DestroyGLXPixmap
+R016 GLX:VendorPrivate
+R017 GLX:VendorPrivateWithReply
+R018 GLX:QueryExtensionsString
+R019 GLX:QueryServerString
+R020 GLX:ClientInfo
+R101 GLX:NewList
+R102 GLX:EndList
+R103 GLX:DeleteLists
+R104 GLX:GenLists
+R105 GLX:FeedbackBuffer
+R106 GLX:SelectBuffer
+R107 GLX:Mode
+R108 GLX:Finish
+R109 GLX:PixelStoref
+R110 GLX:PixelStorei
+R111 GLX:ReadPixels
+R112 GLX:GetBooleanv
+R113 GLX:GetClipPlane
+R114 GLX:GetDoublev
+R115 GLX:GetError
+R116 GLX:GetFloatv
+R117 GLX:GetIntegerv
+R118 GLX:GetLightfv
+R119 GLX:GetLightiv
+R120 GLX:GetMapdv
+R121 GLX:GetMapfv
+R122 GLX:GetMapiv
+R123 GLX:GetMaterialfv
+R124 GLX:GetMaterialiv
+R125 GLX:GetPixelfv
+R126 GLX:GetPixelMapuiv
+R127 GLX:GetPixelMapusv
+R128 GLX:GetPolygonStipple
+R129 GLX:GetString
+R130 GLX:GetTexEnvfv
+R131 GLX:GetTexEnviv
+R132 GLX:GetTexGendv
+R133 GLX:GetTexGenfv
+R134 GLX:GetTexGeniv
+R135 GLX:GetTexImage
+R136 GLX:GetTexParameterfv
+R137 GLX:GetTexParameteriv
+R138 GLX:GetTexLevelParameterfv
+R139 GLX:GetTexLevelParameteriv
+R140 GLX:IsEnabled
+R141 GLX:IsList
+R142 GLX:Flush
+E000 GLX:BadContext
+E001 GLX:BadContextState
+E002 GLX:BadDrawable
+E003 GLX:BadPixmap
+E004 GLX:BadContextTag
+E005 GLX:BadCurrentWindow
+E006 GLX:BadRenderRequest
+E007 GLX:BadLargeRequest
+E008 GLX:UnsupportedPrivateRequest
+R000 LBX:QueryVersion
+R001 LBX:StartProxy
+R002 LBX:StopProxy
+R003 LBX:Switch
+R004 LBX:NewClient
+R005 LBX:CloseClient
+R006 LBX:ModifySequence
+R007 LBX:AllowMotion
+R008 LBX:IncrementPixel
+R009 LBX:Delta
+R010 LBX:GetModifierMapping
+R011 LBX:QueryTag
+R012 LBX:InvalidateTag
+R013 LBX:PolyPoint
+R014 LBX:PolyLine
+R015 LBX:PolySegment
+R016 LBX:PolyRectangle
+R017 LBX:PolyArc
+R018 LBX:FillPoly
+R019 LBX:PolyFillRectangle
+R020 LBX:PolyFillArc
+R021 LBX:GetKeyboardMapping
+R022 LBX:QueryFont
+R023 LBX:ChangeProperty
+R024 LBX:GetProperty
+R025 LBX:TagData
+R026 LBX:CopyArea
+R027 LBX:CopyPlane
+R028 LBX:PolyText8
+R029 LBX:PolyText16
+R030 LBX:ImageText8
+R031 LBX:ImageText16
+R032 LBX:QueryExtension
+R033 LBX:PutImage
+R034 LBX:GetImage
+R035 LBX:BeginLargeRequest
+R036 LBX:LargeRequestData
+R037 LBX:EndLargeRequest
+R038 LBX:InternAtoms
+R039 LBX:GetWinAttrAndGeom
+R040 LBX:GrabCmap
+R041 LBX:ReleaseCmap
+R042 LBX:AllocColor
+R043 LBX:Sync
+E000 LBX:BadLbxClient
+R000 MIT-SCREEN-SAVER:QueryVersion
+R001 MIT-SCREEN-SAVER:QueryInfo
+R002 MIT-SCREEN-SAVER:SelectInput
+R003 MIT-SCREEN-SAVER:SetAttributes
+R004 MIT-SCREEN-SAVER:UnsetAttributes
+R005 MIT-SCREEN-SAVER:Suspend
+V000 MIT-SCREEN-SAVER:Notify
+R000 MIT-SHM:QueryVersion
+R001 MIT-SHM:Attach
+R002 MIT-SHM:Detach
+R003 MIT-SHM:PutImage
+R004 MIT-SHM:GetImage
+R005 MIT-SHM:CreatePixmap
+V000 MIT-SHM:Completion
+E000 MIT-SHM:BadShmSeg
+R000 MIT-SUNDRY-NONSTANDARD:SetBugMode
+R001 MIT-SUNDRY-NONSTANDARD:GetBugMode
+R000 Multi-Buffering:GetBufferVersion
+R001 Multi-Buffering:CreateImageBuffers
+R002 Multi-Buffering:DestroyImageBuffers
+R003 Multi-Buffering:DisplayImageBuffers
+R004 Multi-Buffering:SetMBufferAttributes
+R005 Multi-Buffering:GetMBufferAttributes
+R006 Multi-Buffering:SetBufferAttributes
+R007 Multi-Buffering:GetBufferAttributes
+R008 Multi-Buffering:GetBufferInfo
+R009 Multi-Buffering:CreateStereoWindow
+R010 Multi-Buffering:ClearImageBufferArea
+V000 Multi-Buffering:ClobberNotify
+V001 Multi-Buffering:UpdateNotify
+E000 Multi-Buffering:BadBuffer
+R000 RANDR:QueryVersion
+R001 RANDR:OldGetScreenInfo
+R002 RANDR:SetScreenConfig
+R003 RANDR:OldScreenChangeSelectInput
+R004 RANDR:SelectInput
+R005 RANDR:GetScreenInfo
+R006 RANDR:GetScreenSizeRange
+R007 RANDR:SetScreenSize
+R008 RANDR:GetScreenResources
+R009 RANDR:GetOutputInfo
+R010 RANDR:ListOutputProperties
+R011 RANDR:QueryOutputProperty
+R012 RANDR:ConfigureOutputProperty
+R013 RANDR:ChangeOutputProperty
+R014 RANDR:DeleteOutputProperty
+R015 RANDR:GetOutputProperty
+R016 RANDR:CreateMode
+R017 RANDR:DestroyMode
+R018 RANDR:AddOutputMode
+R019 RANDR:DeleteOutputMode
+R020 RANDR:GetCrtcInfo
+R021 RANDR:SetCrtcConfig
+R022 RANDR:GetCrtcGammaSize
+R023 RANDR:GetCrtcGamma
+R024 RANDR:SetCrtcGamma
+R025 RANDR:GetScreenResourcesCurrent
+R026 RANDR:SetCrtcTransform
+R027 RANDR:GetCrtcTransform
+R028 RANDR:GetPanning
+R029 RANDR:SetPanning
+R030 RANDR:SetOutputPrimary
+R031 RANDR:GetOutputPrimary
+V000 RANDR:ScreenChangeNotify
+V001 RANDR:Notify
+E000 RANDR:BadRROutput
+E001 RANDR:BadRRCrtc
+E002 RANDR:BadRRMode
+R000 RECORD:QueryVersion
+R001 RECORD:CreateContext
+R002 RECORD:RegisterClients
+R003 RECORD:UnregisterClients
+R004 RECORD:GetContext
+R005 RECORD:EnableContext
+R006 RECORD:DisableContext
+R007 RECORD:FreeContext
+E000 RECORD:BadContext
+R000 RENDER:QueryVersion
+R001 RENDER:QueryPictFormats
+R002 RENDER:QueryPictIndexValues
+R003 RENDER:QueryDithers
+R004 RENDER:CreatePicture
+R005 RENDER:ChangePicture
+R006 RENDER:SetPictureClipRectangles
+R007 RENDER:FreePicture
+R008 RENDER:Composite
+R009 RENDER:Scale
+R010 RENDER:Trapezoids
+R011 RENDER:Triangles
+R012 RENDER:TriStrip
+R013 RENDER:TriFan
+R014 RENDER:ColorTrapezoids
+R015 RENDER:ColorTriangles
+R016 RENDER:Transform
+R017 RENDER:CreateGlyphSet
+R018 RENDER:ReferenceGlyphSet
+R019 RENDER:FreeGlyphSet
+R020 RENDER:AddGlyphs
+R021 RENDER:AddGlyphsFromPicture
+R022 RENDER:FreeGlyphs
+R023 RENDER:CompositeGlyphs8
+R024 RENDER:CompositeGlyphs16
+R025 RENDER:CompositeGlyphs32
+R026 RENDER:FillRectangles
+R027 RENDER:CreateCursor
+R028 RENDER:SetPictureTransform
+R029 RENDER:QueryFilters
+R030 RENDER:SetPictureFilter
+R031 RENDER:CreateAnimCursor
+R032 RENDER:AddTraps
+R033 RENDER:CreateSolidFill
+R034 RENDER:CreateLinearGradient
+R035 RENDER:CreateRadialGradient
+R036 RENDER:CreateConicalGradient
+E000 RENDER:BadPictFormat
+E001 RENDER:BadPicture
+E002 RENDER:BadPictOp
+E003 RENDER:BadGlyphSet
+E004 RENDER:BadGlyph
+R000 SECURITY:QueryVersion
+R001 SECURITY:GenerateAuthorization
+R002 SECURITY:RevokeAuthorization
+V000 SECURITY:AuthorizationRevoked
+E000 SECURITY:BadAuthorization
+E001 SECURITY:BadAuthorizationProtocol
+R000 SELinux:SELinuxQueryVersion
+R001 SELinux:SELinuxSetDeviceCreateContext
+R002 SELinux:SELinuxGetDeviceCreateContext
+R003 SELinux:SELinuxSetDeviceContext
+R004 SELinux:SELinuxGetDeviceContext
+R005 SELinux:SELinuxSetWindowCreateContext
+R006 SELinux:SELinuxGetWindowCreateContext
+R007 SELinux:SELinuxGetWindowContext
+R008 SELinux:SELinuxSetPropertyCreateContext
+R009 SELinux:SELinuxGetPropertyCreateContext
+R010 SELinux:SELinuxSetPropertyUseContext
+R011 SELinux:SELinuxGetPropertyUseContext
+R012 SELinux:SELinuxGetPropertyContext
+R013 SELinux:SELinuxGetPropertyDataContext
+R014 SELinux:SELinuxListProperties
+R015 SELinux:SELinuxSetSelectionCreateContext
+R016 SELinux:SELinuxGetSelectionCreateContext
+R017 SELinux:SELinuxSetSelectionUseContext
+R018 SELinux:SELinuxGetSelectionUseContext
+R019 SELinux:SELinuxGetSelectionContext
+R020 SELinux:SELinuxGetSelectionDataContext
+R021 SELinux:SELinuxListSelections
+R022 SELinux:SELinuxGetClientContext
+R000 SHAPE:QueryVersion
+R001 SHAPE:Rectangles
+R002 SHAPE:Mask
+R003 SHAPE:Combine
+R004 SHAPE:Offset
+R005 SHAPE:QueryExtents
+R006 SHAPE:SelectInput
+R007 SHAPE:InputSelected
+R008 SHAPE:GetRectangles
+V000 SHAPE:Notify
+R000 SYNC:Initialize
+R001 SYNC:ListSystemCounters
+R002 SYNC:CreateCounter
+R003 SYNC:SetCounter
+R004 SYNC:ChangeCounter
+R005 SYNC:QueryCounter
+R006 SYNC:DestroyCounter
+R007 SYNC:Await
+R008 SYNC:CreateAlarm
+R009 SYNC:ChangeAlarm
+R010 SYNC:QueryAlarm
+R011 SYNC:DestroyAlarm
+R012 SYNC:SetPriority
+R013 SYNC:GetPriority
+V000 SYNC:CounterNotify
+V001 SYNC:AlarmNotify
+E000 SYNC:BadCounter
+E001 SYNC:BadAlarm
+R000 TOG-CUP:QueryVersion
+R001 TOG-CUP:GetReservedColormapEntries
+R002 TOG-CUP:StoreColors
+R000 Windows-WM:QueryVersion
+R001 Windows-WM:FrameGetRect
+R002 Windows-WM:FrameDraw
+R003 Windows-WM:FrameSetTitle
+R004 Windows-WM:DisableUpdate
+R005 Windows-WM:ReenableUpdate
+R006 Windows-WM:SelectInput
+R007 Windows-WM:SetFrontProcess
+V000 Windows-WM:ControllerNotify
+V001 Windows-WM:ActivationNotify
+E000 Windows-WM:ClientNotLocal
+E001 Windows-WM:OperationNotSupported
+R000 X-Resource:QueryVersion
+R001 X-Resource:QueryClients
+R002 X-Resource:QueryClientResources
+R003 X-Resource:QueryClientPixmapBytes
+R001 X11:CreateWindow
+R002 X11:ChangeWindowAttributes
+R003 X11:GetWindowAttributes
+R004 X11:DestroyWindow
+R005 X11:DestroySubwindows
+R006 X11:ChangeSaveSet
+R007 X11:ReparentWindow
+R008 X11:MapWindow
+R009 X11:MapSubwindows
+R010 X11:UnmapWindow
+R011 X11:UnmapSubwindows
+R012 X11:ConfigureWindow
+R013 X11:CirculateWindow
+R014 X11:GetGeometry
+R015 X11:QueryTree
+R016 X11:InternAtom
+R017 X11:GetAtomName
+R018 X11:ChangeProperty
+R019 X11:DeleteProperty
+R020 X11:GetProperty
+R021 X11:ListProperties
+R022 X11:SetSelectionOwner
+R023 X11:GetSelectionOwner
+R024 X11:ConvertSelection
+R025 X11:SendEvent
+R026 X11:GrabPointer
+R027 X11:UngrabPointer
+R028 X11:GrabButton
+R029 X11:UngrabButton
+R030 X11:ChangeActivePointerGrab
+R031 X11:GrabKeyboard
+R032 X11:UngrabKeyboard
+R033 X11:GrabKey
+R034 X11:UngrabKey
+R035 X11:AllowEvents
+R036 X11:GrabServer
+R037 X11:UngrabServer
+R038 X11:QueryPointer
+R039 X11:GetMotionEvents
+R040 X11:TranslateCoords
+R041 X11:WarpPointer
+R042 X11:SetInputFocus
+R043 X11:GetInputFocus
+R044 X11:QueryKeymap
+R045 X11:OpenFont
+R046 X11:CloseFont
+R047 X11:QueryFont
+R048 X11:QueryTextExtents
+R049 X11:ListFonts
+R050 X11:ListFontsWithInfo
+R051 X11:SetFontPath
+R052 X11:GetFontPath
+R053 X11:CreatePixmap
+R054 X11:FreePixmap
+R055 X11:CreateGC
+R056 X11:ChangeGC
+R057 X11:CopyGC
+R058 X11:SetDashes
+R059 X11:SetClipRectangles
+R060 X11:FreeGC
+R061 X11:ClearArea
+R062 X11:CopyArea
+R063 X11:CopyPlane
+R064 X11:PolyPoint
+R065 X11:PolyLine
+R066 X11:PolySegment
+R067 X11:PolyRectangle
+R068 X11:PolyArc
+R069 X11:FillPoly
+R070 X11:PolyFillRectangle
+R071 X11:PolyFillArc
+R072 X11:PutImage
+R073 X11:GetImage
+R074 X11:PolyText8
+R075 X11:PolyText16
+R076 X11:ImageText8
+R077 X11:ImageText16
+R078 X11:CreateColormap
+R079 X11:FreeColormap
+R080 X11:CopyColormapAndFree
+R081 X11:InstallColormap
+R082 X11:UninstallColormap
+R083 X11:ListInstalledColormaps
+R084 X11:AllocColor
+R085 X11:AllocNamedColor
+R086 X11:AllocColorCells
+R087 X11:AllocColorPlanes
+R088 X11:FreeColors
+R089 X11:StoreColors
+R090 X11:StoreNamedColor
+R091 X11:QueryColors
+R092 X11:LookupColor
+R093 X11:CreateCursor
+R094 X11:CreateGlyphCursor
+R095 X11:FreeCursor
+R096 X11:RecolorCursor
+R097 X11:QueryBestSize
+R098 X11:QueryExtension
+R099 X11:ListExtensions
+R100 X11:ChangeKeyboardMapping
+R101 X11:GetKeyboardMapping
+R102 X11:ChangeKeyboardControl
+R103 X11:GetKeyboardControl
+R104 X11:Bell
+R105 X11:ChangePointerControl
+R106 X11:GetPointerControl
+R107 X11:SetScreenSaver
+R108 X11:GetScreenSaver
+R109 X11:ChangeHosts
+R110 X11:ListHosts
+R111 X11:SetAccessControl
+R112 X11:SetCloseDownMode
+R113 X11:KillClient
+R114 X11:RotateProperties
+R115 X11:ForceScreenSaver
+R116 X11:SetPointerMapping
+R117 X11:GetPointerMapping
+R118 X11:SetModifierMapping
+R119 X11:GetModifierMapping
+R127 X11:NoOperation
+V000 X11:X_Error
+V001 X11:X_Reply
+V002 X11:KeyPress
+V003 X11:KeyRelease
+V004 X11:ButtonPress
+V005 X11:ButtonRelease
+V006 X11:MotionNotify
+V007 X11:EnterNotify
+V008 X11:LeaveNotify
+V009 X11:FocusIn
+V010 X11:FocusOut
+V011 X11:KeymapNotify
+V012 X11:Expose
+V013 X11:GraphicsExpose
+V014 X11:NoExpose
+V015 X11:VisibilityNotify
+V016 X11:CreateNotify
+V017 X11:DestroyNotify
+V018 X11:UnmapNotify
+V019 X11:MapNotify
+V020 X11:MapRequest
+V021 X11:ReparentNotify
+V022 X11:ConfigureNotify
+V023 X11:ConfigureRequest
+V024 X11:GravityNotify
+V025 X11:ResizeRequest
+V026 X11:CirculateNotify
+V027 X11:CirculateRequest
+V028 X11:PropertyNotify
+V029 X11:SelectionClear
+V030 X11:SelectionRequest
+V031 X11:SelectionNotify
+V032 X11:ColormapNotify
+V033 X11:ClientMessage
+V034 X11:MappingNotify
+V035 X11:GenericEvent
+E000 X11:Success
+E001 X11:BadRequest
+E002 X11:BadValue
+E003 X11:BadWindow
+E004 X11:BadPixmap
+E005 X11:BadAtom
+E006 X11:BadCursor
+E007 X11:BadFont
+E008 X11:BadMatch
+E009 X11:BadDrawable
+E010 X11:BadAccess
+E011 X11:BadAlloc
+E012 X11:BadColor
+E013 X11:BadGC
+E014 X11:BadIDChoice
+E015 X11:BadName
+E016 X11:BadLength
+E017 X11:BadImplementation
+R001 X3D-PEX:GetExtensionInfo
+R002 X3D-PEX:GetEnumeratedTypeInfo
+R003 X3D-PEX:GetImpDepConstants
+R004 X3D-PEX:CreateLookupTable
+R005 X3D-PEX:CopyLookupTable
+R006 X3D-PEX:FreeLookupTable
+R007 X3D-PEX:GetTableInfo
+R008 X3D-PEX:GetPredefinedEntries
+R009 X3D-PEX:GetDefinedIndices
+R010 X3D-PEX:GetTableEntry
+R011 X3D-PEX:GetTableEntries
+R012 X3D-PEX:SetTableEntries
+R013 X3D-PEX:DeleteTableEntries
+R014 X3D-PEX:CreatePipelineContext
+R015 X3D-PEX:CopyPipelineContext
+R016 X3D-PEX:FreePipelineContext
+R017 X3D-PEX:GetPipelineContext
+R018 X3D-PEX:ChangePipelineContext
+R019 X3D-PEX:CreateRenderer
+R020 X3D-PEX:FreeRenderer
+R021 X3D-PEX:ChangeRenderer
+R022 X3D-PEX:GetRendererAttributes
+R023 X3D-PEX:GetRendererDynamics
+R024 X3D-PEX:BeginRendering
+R025 X3D-PEX:EndRendering
+R026 X3D-PEX:BeginStructure
+R027 X3D-PEX:EndStructure
+R028 X3D-PEX:OutputCommands
+R029 X3D-PEX:Network
+R030 X3D-PEX:CreateStructure
+R031 X3D-PEX:CopyStructure
+R032 X3D-PEX:DestroyStructures
+R033 X3D-PEX:GetStructureInfo
+R034 X3D-PEX:GetElementInfo
+R035 X3D-PEX:GetStructuresInNetwork
+R036 X3D-PEX:GetAncestors
+R037 X3D-PEX:GetDescendants
+R038 X3D-PEX:FetchElements
+R039 X3D-PEX:SetEditingMode
+R040 X3D-PEX:SetElementPointer
+R041 X3D-PEX:SetElementPointerAtLabel
+R042 X3D-PEX:ElementSearch
+R043 X3D-PEX:StoreElements
+R044 X3D-PEX:DeleteElements
+R045 X3D-PEX:DeleteElementsToLabel
+R046 X3D-PEX:DeleteBetweenLabels
+R047 X3D-PEX:CopyElements
+R048 X3D-PEX:ChangeStructureRefs
+R049 X3D-PEX:CreateNameSet
+R050 X3D-PEX:CopyNameSet
+R051 X3D-PEX:FreeNameSet
+R052 X3D-PEX:GetNameSet
+R053 X3D-PEX:ChangeNameSet
+R054 X3D-PEX:CreateSearchContext
+R055 X3D-PEX:CopySearchContext
+R056 X3D-PEX:FreeSearchContext
+R057 X3D-PEX:GetSearchContext
+R058 X3D-PEX:ChangeSearchContext
+R059 X3D-PEX:SearchNetwork
+R060 X3D-PEX:CreatePhigsWks
+R061 X3D-PEX:FreePhigsWks
+R062 X3D-PEX:GetWksInfo
+R063 X3D-PEX:GetDynamics
+R064 X3D-PEX:GetViewRep
+R065 X3D-PEX:RedrawAllStructures
+R066 X3D-PEX:UpdateWorkstation
+R067 X3D-PEX:RedrawClipRegion
+R068 X3D-PEX:ExecuteDeferredActions
+R069 X3D-PEX:SetViewPriority
+R070 X3D-PEX:SetDisplayUpdateMode
+R071 X3D-PEX:MapDCtoWC
+R072 X3D-PEX:MapWCtoDC
+R073 X3D-PEX:SetViewRep
+R074 X3D-PEX:SetWksWindow
+R075 X3D-PEX:SetWksViewport
+R076 X3D-PEX:SetHlhsrMode
+R077 X3D-PEX:SetWksBufferMode
+R078 X3D-PEX:PostStructure
+R079 X3D-PEX:UnpostStructure
+R080 X3D-PEX:UnpostAllStructures
+R081 X3D-PEX:GetWksPostings
+R082 X3D-PEX:GetPickDevice
+R083 X3D-PEX:ChangePickDevice
+R084 X3D-PEX:CreatePickMeasure
+R085 X3D-PEX:FreePickMeasure
+R086 X3D-PEX:GetPickMeasure
+R087 X3D-PEX:UpdatePickMeasure
+R088 X3D-PEX:OpenFont
+R089 X3D-PEX:CloseFont
+R090 X3D-PEX:QueryFont
+R091 X3D-PEX:ListFonts
+R092 X3D-PEX:ListFontsWithInfo
+R093 X3D-PEX:QueryTextExtents
+R094 X3D-PEX:MatchRenderingTargets
+R095 X3D-PEX:Escape
+R096 X3D-PEX:EscapeWithReply
+R097 X3D-PEX:Elements
+R098 X3D-PEX:AccumulateState
+R099 X3D-PEX:BeginPickOne
+R100 X3D-PEX:EndPickOne
+R101 X3D-PEX:PickOne
+R102 X3D-PEX:BeginPickAll
+R103 X3D-PEX:EndPickAll
+R104 X3D-PEX:PickAll
+E000 X3D-PEX:ColorTypeError
+E001 X3D-PEX:erStateError
+E002 X3D-PEX:FloatingPointFormatError
+E003 X3D-PEX:LabelError
+E004 X3D-PEX:LookupTableError
+E005 X3D-PEX:NameSetError
+E006 X3D-PEX:PathError
+E007 X3D-PEX:FontError
+E008 X3D-PEX:PhigsWksError
+E009 X3D-PEX:PickMeasureError
+E010 X3D-PEX:PipelineContextError
+E011 X3D-PEX:erError
+E012 X3D-PEX:SearchContextError
+E013 X3D-PEX:StructureError
+E014 X3D-PEX:OutputCommandError
+R000 XC-APPGROUP:QueryVersion
+R001 XC-APPGROUP:Create
+R002 XC-APPGROUP:Destroy
+R003 XC-APPGROUP:GetAttr
+R004 XC-APPGROUP:Query
+R005 XC-APPGROUP:CreateAssoc
+R006 XC-APPGROUP:DestroyAssoc
+E000 XC-APPGROUP:BadAppGroup
+R000 XC-MISC:GetVersion
+R001 XC-MISC:GetXIDRange
+R002 XC-MISC:GetXIDList
+R000 XFIXES:QueryVersion
+R001 XFIXES:ChangeSaveSet
+R002 XFIXES:SelectSelectionInput
+R003 XFIXES:SelectCursorInput
+R004 XFIXES:GetCursorImage
+R005 XFIXES:CreateRegion
+R006 XFIXES:CreateRegionFromBitmap
+R007 XFIXES:CreateRegionFromWindow
+R008 XFIXES:CreateRegionFromGC
+R009 XFIXES:CreateRegionFromPicture
+R010 XFIXES:DestroyRegion
+R011 XFIXES:SetRegion
+R012 XFIXES:CopyRegion
+R013 XFIXES:UnionRegion
+R014 XFIXES:IntersectRegion
+R015 XFIXES:SubtractRegion
+R016 XFIXES:InvertRegion
+R017 XFIXES:TranslateRegion
+R018 XFIXES:RegionExtents
+R019 XFIXES:FetchRegion
+R020 XFIXES:SetGCClipRegion
+R021 XFIXES:SetWindowShapeRegion
+R022 XFIXES:SetPictureClipRegion
+R023 XFIXES:SetCursorName
+R024 XFIXES:GetCursorName
+R025 XFIXES:GetCursorImageAndName
+R026 XFIXES:ChangeCursor
+R027 XFIXES:ChangeCursorByName
+R028 XFIXES:ExpandRegion
+R029 XFIXES:HideCursor
+R030 XFIXES:ShowCursor
+V000 XFIXES:SelectionNotify
+V001 XFIXES:CursorNotify
+E000 XFIXES:BadRegion
+R000 XFree86-Bigfont:QueryVersion
+R001 XFree86-Bigfont:QueryFont
+R000 XFree86-DGA:QueryVersion
+R001 XFree86-DGA:GetVideoLL
+R002 XFree86-DGA:DirectVideo
+R003 XFree86-DGA:GetViewPortSize
+R004 XFree86-DGA:SetViewPort
+R005 XFree86-DGA:GetVidPage
+R006 XFree86-DGA:SetVidPage
+R007 XFree86-DGA:InstallColormap
+R008 XFree86-DGA:QueryDirectVideo
+R009 XFree86-DGA:ViewPortChanged
+R010 XFree86-DGA:Obsolete1
+R011 XFree86-DGA:Obsolete2
+R012 XFree86-DGA:QueryModes
+R013 XFree86-DGA:SetMode
+R014 XFree86-DGA:SetViewport
+R015 XFree86-DGA:InstallColormap
+R016 XFree86-DGA:SelectInput
+R017 XFree86-DGA:FillRectangle
+R018 XFree86-DGA:CopyArea
+R019 XFree86-DGA:CopyTransparentArea
+R020 XFree86-DGA:GetViewportStatus
+R021 XFree86-DGA:Sync
+R022 XFree86-DGA:OpenFramebuffer
+R023 XFree86-DGA:CloseFramebuffer
+R024 XFree86-DGA:SetClientVersion
+R025 XFree86-DGA:ChangePixmapMode
+R026 XFree86-DGA:CreateColormap
+E000 XFree86-DGA:ClientNotLocal
+E001 XFree86-DGA:NoDirectVideoMode
+E002 XFree86-DGA:ScreenNotActive
+E003 XFree86-DGA:DirectNotActivated
+E004 XFree86-DGA:OperationNotSupported
+R000 XFree86-DRI:QueryVersion
+R001 XFree86-DRI:QueryDirectRenderingCapable
+R002 XFree86-DRI:OpenConnection
+R003 XFree86-DRI:CloseConnection
+R004 XFree86-DRI:GetClientDriverName
+R005 XFree86-DRI:CreateContext
+R006 XFree86-DRI:DestroyContext
+R007 XFree86-DRI:CreateDrawable
+R008 XFree86-DRI:DestroyDrawable
+R009 XFree86-DRI:GetDrawableInfo
+R010 XFree86-DRI:GetDeviceInfo
+R011 XFree86-DRI:AuthConnection
+R012 XFree86-DRI:OpenFullScreen
+R013 XFree86-DRI:CloseFullScreen
+E000 XFree86-DRI:ClientNotLocal
+E001 XFree86-DRI:OperationNotSupported
+R000 XFree86-Misc:QueryVersion
+R001 XFree86-Misc:GetSaver
+R002 XFree86-Misc:SetSaver
+R003 XFree86-Misc:GetMouseSettings
+R004 XFree86-Misc:GetKbdSettings
+R005 XFree86-Misc:SetMouseSettings
+R006 XFree86-Misc:SetKbdSettings
+R007 XFree86-Misc:SetGrabKeysState
+R008 XFree86-Misc:SetClientVersion
+R009 XFree86-Misc:GetFilePaths
+R010 XFree86-Misc:PassMessage
+E000 XFree86-Misc:BadMouseProtocol
+E001 XFree86-Misc:BadMouseBaudRate
+E002 XFree86-Misc:BadMouseFlags
+E003 XFree86-Misc:BadMouseCombo
+E004 XFree86-Misc:BadKbdType
+E005 XFree86-Misc:ModInDevDisabled
+E006 XFree86-Misc:ModInDevClientNotLocal
+E007 XFree86-Misc:NoModule
+R000 XFree86-VidModeExtension:QueryVersion
+R001 XFree86-VidModeExtension:GetModeLine
+R002 XFree86-VidModeExtension:ModModeLine
+R003 XFree86-VidModeExtension:SwitchMode
+R004 XFree86-VidModeExtension:GetMonitor
+R005 XFree86-VidModeExtension:LockModeSwitch
+R006 XFree86-VidModeExtension:GetAllModeLines
+R007 XFree86-VidModeExtension:AddModeLine
+R008 XFree86-VidModeExtension:DeleteModeLine
+R009 XFree86-VidModeExtension:ValidateModeLine
+R010 XFree86-VidModeExtension:SwitchToMode
+R011 XFree86-VidModeExtension:GetViewPort
+R012 XFree86-VidModeExtension:SetViewPort
+R013 XFree86-VidModeExtension:GetDotClocks
+R014 XFree86-VidModeExtension:SetClientVersion
+R015 XFree86-VidModeExtension:SetGamma
+R016 XFree86-VidModeExtension:GetGamma
+R017 XFree86-VidModeExtension:GetGammaRamp
+R018 XFree86-VidModeExtension:SetGammaRamp
+R019 XFree86-VidModeExtension:GetGammaRampSize
+R020 XFree86-VidModeExtension:GetPermissions
+V000 XFree86-VidModeExtension:Notify
+E000 XFree86-VidModeExtension:BadClock
+E001 XFree86-VidModeExtension:BadHTimings
+E002 XFree86-VidModeExtension:BadVTimings
+E003 XFree86-VidModeExtension:ModeUnsuitable
+E004 XFree86-VidModeExtension:ExtensionDisabled
+E005 XFree86-VidModeExtension:ClientNotLocal
+E006 XFree86-VidModeExtension:ZoomLocked
+R001 XIE:QueryImageExtension
+R002 XIE:QueryTechniques
+R003 XIE:CreateColorList
+R004 XIE:DestroyColorList
+R005 XIE:PurgeColorList
+R006 XIE:QueryColorList
+R007 XIE:CreateLUT
+R008 XIE:DestroyLUT
+R009 XIE:CreatePhotomap
+R010 XIE:DestroyPhotomap
+R011 XIE:QueryPhotomap
+R012 XIE:CreateROI
+R013 XIE:DestroyROI
+R014 XIE:CreatePhotospace
+R015 XIE:DestroyPhotospace
+R016 XIE:ExecuteImmediate
+R017 XIE:CreatePhotoflo
+R018 XIE:DestroyPhotoflo
+R019 XIE:ExecutePhotoflo
+R020 XIE:ModifyPhotoflo
+R021 XIE:RedefinePhotoflo
+R022 XIE:PutClientData
+R023 XIE:GetClientData
+R024 XIE:QueryPhotoflo
+R025 XIE:Await
+R026 XIE:Abort
+E000 XIE:ColorListError
+E001 XIE:LUTError
+E002 XIE:PhotofloError
+E003 XIE:PhotomapError
+E004 XIE:PhotospaceError
+E005 XIE:ROIError
+E006 XIE:FloError
+R000 XINERAMA:QueryVersion
+R001 XINERAMA:GetState
+R002 XINERAMA:GetScreenCount
+R003 XINERAMA:GetScreenSize
+R004 XINERAMA:IsActive
+R005 XINERAMA:QueryScreens
+R001 XInputExtension:GetExtensionVersion
+R002 XInputExtension:ListInputDevices
+R003 XInputExtension:OpenDevice
+R004 XInputExtension:CloseDevice
+R005 XInputExtension:SetDeviceMode
+R006 XInputExtension:SelectExtensionEvent
+R007 XInputExtension:GetSelectedExtensionEvents
+R008 XInputExtension:ChangeDeviceDontPropagateList
+R009 XInputExtension:GetDeviceDontPropagageList
+R010 XInputExtension:GetDeviceMotionEvents
+R011 XInputExtension:ChangeKeyboardDevice
+R012 XInputExtension:ChangePointerDevice
+R013 XInputExtension:GrabDevice
+R014 XInputExtension:UngrabDevice
+R015 XInputExtension:GrabDeviceKey
+R016 XInputExtension:UngrabDeviceKey
+R017 XInputExtension:GrabDeviceButton
+R018 XInputExtension:UngrabDeviceButton
+R019 XInputExtension:AllowDeviceEvents
+R020 XInputExtension:GetDeviceFocus
+R021 XInputExtension:SetDeviceFocus
+R022 XInputExtension:GetFeedbackControl
+R023 XInputExtension:ChangeFeedbackControl
+R024 XInputExtension:GetDeviceKeyMapping
+R025 XInputExtension:ChangeDeviceKeyMapping
+R026 XInputExtension:GetDeviceModifierMapping
+R027 XInputExtension:SetDeviceModifierMapping
+R028 XInputExtension:GetDeviceButtonMapping
+R029 XInputExtension:SetDeviceButtonMapping
+R030 XInputExtension:QueryDeviceState
+R031 XInputExtension:SendExtensionEvent
+R032 XInputExtension:DeviceBell
+R033 XInputExtension:SetDeviceValuators
+R034 XInputExtension:GetDeviceControl
+R035 XInputExtension:ChangeDeviceControl
+R036 XInputExtension:ListDeviceProperties
+R037 XInputExtension:ChangeDeviceProperty
+R038 XInputExtension:DeleteDeviceProperty
+R039 XInputExtension:GetDeviceProperty
+R040 XInputExtension:QueryPointer
+R041 XInputExtension:WarpPointer
+R042 XInputExtension:ChangeCursor
+R043 XInputExtension:ChangeHierarchy
+R044 XInputExtension:SetClientPointer
+R045 XInputExtension:GetClientPointer
+R046 XInputExtension:SelectEvents
+R047 XInputExtension:QueryVersion
+R048 XInputExtension:QueryDevice
+R049 XInputExtension:SetFocus
+R050 XInputExtension:GetFocus
+R051 XInputExtension:GrabDevice
+R052 XInputExtension:UngrabDevice
+R053 XInputExtension:AllowEvents
+R054 XInputExtension:PassiveGrabDevice
+R055 XInputExtension:PassiveUngrabDevice
+R056 XInputExtension:ListProperties
+R057 XInputExtension:ChangeProperty
+R058 XInputExtension:DeleteProperty
+R059 XInputExtension:GetProperty
+R060 XInputExtension:GetSelectedEvents
+V000 XInputExtension:DeviceValuator
+V001 XInputExtension:DeviceKeyPress
+V002 XInputExtension:DeviceKeyRelease
+V003 XInputExtension:DeviceButtonPress
+V004 XInputExtension:DeviceButtonRelease
+V005 XInputExtension:DeviceMotionNotify
+V006 XInputExtension:DeviceFocusIn
+V007 XInputExtension:DeviceFocusOut
+V008 XInputExtension:ProximityIn
+V009 XInputExtension:ProximityOut
+V010 XInputExtension:DeviceStateNotify
+V011 XInputExtension:DeviceMappingNotify
+V012 XInputExtension:ChangeDeviceNotify
+V013 XInputExtension:DeviceKeystateNotify
+V014 XInputExtension:DeviceButtonstateNotify
+V015 XInputExtension:DevicePresenceNotify
+V016 XInputExtension:DevicePropertyNotify
+E000 XInputExtension:BadDevice
+E001 XInputExtension:BadEvent
+E002 XInputExtension:BadMode
+E003 XInputExtension:DeviceBusy
+E004 XInputExtension:BadClass
+R000 XKEYBOARD:UseExtension
+R001 XKEYBOARD:SelectEvents
+R002 XKEYBOARD:Obsolete
+R003 XKEYBOARD:Bell
+R004 XKEYBOARD:GetState
+R005 XKEYBOARD:LatchLockState
+R006 XKEYBOARD:GetControls
+R007 XKEYBOARD:SetControls
+R008 XKEYBOARD:GetMap
+R009 XKEYBOARD:SetMap
+R010 XKEYBOARD:GetCompatMap
+R011 XKEYBOARD:SetCompatMap
+R012 XKEYBOARD:GetIndicatorState
+R013 XKEYBOARD:GetIndicatorMap
+R014 XKEYBOARD:SetIndicatorMap
+R015 XKEYBOARD:GetNamedIndicator
+R016 XKEYBOARD:SetNamedIndicator
+R017 XKEYBOARD:GetNames
+R018 XKEYBOARD:SetNames
+R019 XKEYBOARD:GetGeometry
+R020 XKEYBOARD:SetGeometry
+R021 XKEYBOARD:PerClientFlags
+R022 XKEYBOARD:ListComponents
+R023 XKEYBOARD:GetKbdByName
+R024 XKEYBOARD:GetDeviceInfo
+R025 XKEYBOARD:SetDeviceInfo
+R101 XKEYBOARD:SetDebuggingFlags
+V000 XKEYBOARD:EventCode
+E000 XKEYBOARD:BadKeyboard
+R000 XTEST:GetVersion
+R001 XTEST:CompareCursor
+R002 XTEST:FakeInput
+R003 XTEST:GrabControl
+R000 XVideo:QueryExtension
+R001 XVideo:QueryAdaptors
+R002 XVideo:QueryEncodings
+R003 XVideo:GrabPort
+R004 XVideo:UngrabPort
+R005 XVideo:PutVideo
+R006 XVideo:PutStill
+R007 XVideo:GetVideo
+R008 XVideo:GetStill
+R009 XVideo:StopVideo
+R010 XVideo:SelectVideoNotify
+R011 XVideo:SelectPortNotify
+R012 XVideo:QueryBestSize
+R013 XVideo:SetPortAttribute
+R014 XVideo:GetPortAttribute
+R015 XVideo:QueryPortAttributes
+R016 XVideo:ListImageFormats
+R017 XVideo:QueryImageAttributes
+R018 XVideo:PutImage
+R019 XVideo:ShmPutImage
+V000 XVideo:VideoNotify
+V001 XVideo:PortNotify
+E000 XVideo:BadPort
+E001 XVideo:BadEncoding
+E002 XVideo:BadControl
+R000 XVideo-MotionCompensation:QueryVersion
+R001 XVideo-MotionCompensation:ListSurfaceTypes
+R002 XVideo-MotionCompensation:CreateContext
+R003 XVideo-MotionCompensation:DestroyContext
+R004 XVideo-MotionCompensation:CreateSurface
+R005 XVideo-MotionCompensation:DestroySurface
+R006 XVideo-MotionCompensation:CreateSubpicture
+R007 XVideo-MotionCompensation:DestroySubpicture
+R008 XVideo-MotionCompensation:ListSubpictureTypes
+R009 XVideo-MotionCompensation:GetDRInfo
+E000 XVideo-MotionCompensation:BadContext
+E001 XVideo-MotionCompensation:BadSurface
+E002 XVideo-MotionCompensation:BadSubpicture
+R000 XpExtension:QueryVersion
+R001 XpExtension:GetPrinterList
+R002 XpExtension:CreateContext
+R003 XpExtension:SetContext
+R004 XpExtension:GetContext
+R005 XpExtension:DestroyContext
+R006 XpExtension:GetContextScreen
+R007 XpExtension:StartJob
+R008 XpExtension:EndJob
+R009 XpExtension:StartDoc
+R010 XpExtension:EndDoc
+R011 XpExtension:PutDocumentData
+R012 XpExtension:GetDocumentData
+R013 XpExtension:StartPage
+R014 XpExtension:EndPage
+R015 XpExtension:SelectInput
+R016 XpExtension:InputSelected
+R017 XpExtension:GetAttributes
+R018 XpExtension:SetAttributes
+R019 XpExtension:GetOneAttribute
+R020 XpExtension:RehashPrinterList
+R021 XpExtension:GetPageDimensions
+R022 XpExtension:QueryScreens
+R023 XpExtension:SetImageResolution
+R024 XpExtension:GetImageResolution
+V000 XpExtension:PrintNotify
+V001 XpExtension:AttributeNotify
+E000 XpExtension:BadContext
+E001 XpExtension:BadSequence
+E002 XpExtension:BadResourceID
diff --git a/xorg-server/doc/.gitignore b/xorg-server/doc/.gitignore
new file mode 100644
index 000000000..2ee2ac5b4
--- /dev/null
+++ b/xorg-server/doc/.gitignore
@@ -0,0 +1,4 @@
+*.html
+*.pdf
+*.ps
+*.txt
diff --git a/xorg-server/doc/Xserver-spec.xml b/xorg-server/doc/Xserver-spec.xml
index 2b11828fc..31b6fb05d 100644
--- a/xorg-server/doc/Xserver-spec.xml
+++ b/xorg-server/doc/Xserver-spec.xml
@@ -680,7 +680,7 @@ pReadmask is a pointer to the information describing the descriptors
 that will be waited on.
 </para>
 <para>
-In the sample server,  pTimeout is a struct timeval **,  and pReadmask is
+In the sample server,  pTimeout is a pointer,  and pReadmask is
 the address of the select() mask for reading.
 </para>
 <para>
@@ -688,15 +688,14 @@ The DIX BlockHandler() iterates through the Screens,  for each one calling
 its BlockHandler.  A BlockHandler is declared thus:
 <blockquote>
 <programlisting>
-	void xxxBlockHandler(nscreen, pbdata, pptv, pReadmask)
-		int nscreen;
-		pointer pbdata;
-		struct timeval ** pptv;
+	void xxxBlockHandler(pScreen, pTimeout, pReadmask)
+		ScreenPtr pScreen;
+		pointer pTimeout;
 		pointer pReadmask;
 </programlisting>
 </blockquote>
-The arguments are the index of the Screen,  the blockData field
-of the Screen,  and the arguments to the DIX BlockHandler().
+The arguments are a pointer to the Screen, and the arguments to the
+DIX BlockHandler().
 </para>
 <para>
 Immediately after WaitForSomething returns from the
@@ -721,15 +720,14 @@ The DIX WakeupHandler() calls each Screen's
 WakeupHandler.  A WakeupHandler is declared thus:
 <blockquote>
 <programlisting>
-	void xxxWakeupHandler(nscreen, pbdata, err, pReadmask)
-		int nscreen;
-		pointer pbdata;
+	void xxxWakeupHandler(pScreen, result, pReadmask)
+		ScreenPtr pScreen;
 		unsigned long result;
 		pointer pReadmask;
 </programlisting>
 </blockquote>
-The arguments are the index of the Screen,  the blockData field
-of the Screen,  and the arguments to the DIX WakeupHandler().
+The arguments are the Screen, of the Screen, and the arguments to
+the DIX WakeupHandler().
 </para>
 <para>
 In addition to the per-screen BlockHandlers, any module may register
@@ -1942,18 +1940,15 @@ FALSE.</para>
 The scrInitProc should be of the following form:
 <blockquote><programlisting>
 
-	Bool scrInitProc(iScreen, pScreen, argc, argv)
-		int iScreen;
+	Bool scrInitProc(pScreen, argc, argv)
 		ScreenPtr pScreen;
 		int argc;
 		char **argv;
 </programlisting></blockquote>
-iScreen is the index for this screen; 0 for the first one initialized,
-1 for the second, etc.  pScreen is the pointer to the screen's new
-ScreenRec.  argc and argv are as before.  Your screen initialize
-procedure should return TRUE upon success or FALSE if the screen
-cannot be initialized (for instance, if the screen hardware does not
-exist on this machine).</para>
+pScreen is the pointer to the screen's new ScreenRec. argc and argv
+are as before.  Your screen initialize procedure should return TRUE
+upon success or FALSE if the screen cannot be initialized (for
+ instance, if the screen hardware does not exist on this machine).</para>
 <para>
 This procedure must determine what actual device it is supposed to initialize.
 If you have a different procedure for each screen, then it is no problem.
diff --git a/xorg-server/doc/c-extensions b/xorg-server/doc/c-extensions
index eb33e272b..984022333 100644
--- a/xorg-server/doc/c-extensions
+++ b/xorg-server/doc/c-extensions
@@ -1,61 +1,61 @@
-First of all: C89 or better.  If you don't have that, port gcc first.
-
-Use of C language extensions throughout the X server tree
----------------------------------------------------------
-
-Optional extensions:
-The server will still build if your toolchain does not support these
-extensions, although the results may not be optimal.
-
-    * _X_SENTINEL(x): member x of the passed structure must be NULL, e.g.:
-                      void parseOptions(Option *options _X_SENTINEL(0));
-                      parseOptions("foo", "bar", NULL); /* this is OK */
-                      parseOptions("foo", "bar", "baz"); /* this is not */
-                      This definition comes from Xfuncproto.h in the core
-                      protocol headers.
-    * _X_ATTRIBUTE_PRINTF(x, y): This function has printf-like semantics;
-                                 check the format string when built with
-                                 -Wformat (gcc) or similar.
-    * _X_EXPORT: this function should appear in symbol tables.
-    * _X_HIDDEN: this function should not appear in the _dynamic_ symbol
-                 table.
-    * _X_INTERNAL: like _X_HIDDEN, but attempt to ensure that this function
-                   is never called from another module.
-    * _X_INLINE: inline this functon if possible (generally obeyed unless
-                 disabling optimisations).
-    * _X_DEPRECATED: warn on use of this function.
-
-Mandatory extensions:
-The server will not build if your toolchain does not support these extensions.
-
-    * named initialisers: explicitly initialising structure members, e.g.:
-                          struct foo bar = { .baz = quux, .brian = "dog" };
-    * variadic macros: macros with a variable number of arguments, e.g.:
-                       #define DebugF(x, ...) /**/
-    * interleaved code and declarations: { foo = TRUE; int bar; do_stuff(); }
-
-
-Use of OS and library facilities throughout the X server tree
--------------------------------------------------------------
-
-Non-OS-dependent code can assume facilities at least as good as
-the non-OS-facility parts of POSIX-1.2001.  Ideally this would
-be C99, but even gcc+glibc doesn't implement that yet.
-
-Unix-like systems are assumed to be at least as good as UNIX03.
-
-Linux systems must be at least 2.4 or later.  As a practical matter
-though, 2.4 kernels never receive any testing.  Use 2.6 already.
-
-TODO: Solaris.
-
-TODO: *BSD.
-
-Code that needs to be portable to Windows should be careful to,
-well, be portable.  Note that there are two Windows ports, cygwin and
-mingw.  Cygwin is more or less like Linux, but mingw is a bit more
-restrictive.  TODO: document which versions of Windows we actually care
-about.
-
-OSX support is generally limited to the most recent version.  Currently
-that means 10.5.
+First of all: C89 or better.  If you don't have that, port gcc first.
+
+Use of C language extensions throughout the X server tree
+---------------------------------------------------------
+
+Optional extensions:
+The server will still build if your toolchain does not support these
+extensions, although the results may not be optimal.
+
+    * _X_SENTINEL(x): member x of the passed structure must be NULL, e.g.:
+                      void parseOptions(Option *options _X_SENTINEL(0));
+                      parseOptions("foo", "bar", NULL); /* this is OK */
+                      parseOptions("foo", "bar", "baz"); /* this is not */
+                      This definition comes from Xfuncproto.h in the core
+                      protocol headers.
+    * _X_ATTRIBUTE_PRINTF(x, y): This function has printf-like semantics;
+                                 check the format string when built with
+                                 -Wformat (gcc) or similar.
+    * _X_EXPORT: this function should appear in symbol tables.
+    * _X_HIDDEN: this function should not appear in the _dynamic_ symbol
+                 table.
+    * _X_INTERNAL: like _X_HIDDEN, but attempt to ensure that this function
+                   is never called from another module.
+    * _X_INLINE: inline this functon if possible (generally obeyed unless
+                 disabling optimisations).
+    * _X_DEPRECATED: warn on use of this function.
+
+Mandatory extensions:
+The server will not build if your toolchain does not support these extensions.
+
+    * named initialisers: explicitly initialising structure members, e.g.:
+                          struct foo bar = { .baz = quux, .brian = "dog" };
+    * variadic macros: macros with a variable number of arguments, e.g.:
+                       #define DebugF(x, ...) /**/
+    * interleaved code and declarations: { foo = TRUE; int bar; do_stuff(); }
+
+
+Use of OS and library facilities throughout the X server tree
+-------------------------------------------------------------
+
+Non-OS-dependent code can assume facilities at least as good as
+the non-OS-facility parts of POSIX-1.2001.  Ideally this would
+be C99, but even gcc+glibc doesn't implement that yet.
+
+Unix-like systems are assumed to be at least as good as UNIX03.
+
+Linux systems must be at least 2.4 or later.  As a practical matter
+though, 2.4 kernels never receive any testing.  Use 2.6 already.
+
+TODO: Solaris.
+
+TODO: *BSD.
+
+Code that needs to be portable to Windows should be careful to,
+well, be portable.  Note that there are two Windows ports, cygwin and
+mingw.  Cygwin is more or less like Linux, but mingw is a bit more
+restrictive.  TODO: document which versions of Windows we actually care
+about.
+
+OSX support is generally limited to the most recent version.  Currently
+that means 10.5.
diff --git a/xorg-server/doc/dtrace/.gitignore b/xorg-server/doc/dtrace/.gitignore
new file mode 100644
index 000000000..0d40e0d22
--- /dev/null
+++ b/xorg-server/doc/dtrace/.gitignore
@@ -0,0 +1,5 @@
+*.html
+*.pdf
+*.ps
+*.txt
+*.db
diff --git a/xorg-server/doc/smartsched b/xorg-server/doc/smartsched
index 057a759fd..466408431 100644
--- a/xorg-server/doc/smartsched
+++ b/xorg-server/doc/smartsched
@@ -1,204 +1,204 @@
-			Client Scheduling in X
-			    Keith Packard
-			       SuSE
-			     10/28/99
-
-History:
-
-Since the original X server was written at Digital in 1987, the OS and DIX
-layers shared responsibility for scheduling the order to service
-client requests.  The original design was simplistic; under the maximum
-first make it work, then make it work well, this was a good idea.  Now 
-that we have a bit more experience with X applications, it's time to
-rethink the design.
-
-The basic dispatch loop in DIX looks like:
-
-	for (;;)
-	{
-		nready = WaitForSomething (...);
-		while (nready--)
-		{
-			isItTimeToYield = FALSE;
-			while (!isItTimeToYield)
-			{
-				if (!ReadRequestFromClient (...))
-					break;
-				(execute request);
-			}
-		}
-	}
-
-WaitForSomething looks like:
-
-	for (;;)
-		if (ANYSET (ClientsWithInput))
-			return popcount (ClientsWithInput);
-		select (...)
-		compute clientsReadable from select result;
-		return popcount (clientsReadable)
-	}
-
-ReadRequestFromClient looks like:
-
-	if (!fullRequestQueued)
-	{
-		read ();
-		if (!fullRequestQueued)
-		{
-			remove from ClientsWithInput;
-			timesThisConnection = 0;
-			return 0;
-		}
-	}
-	if (twoFullRequestsQueued)
-		add to ClientsWithInput;
-
-	if (++timesThisConnection >= 10)
-	{
-		isItTimeToYield = TRUE;
-		timesThisConnection = 0;
-	}
-	return 1;
-
-Here's what happens in this code:
-
-With a single client executing a stream of requests:
-
-	A client sends a packet of requests to the server.
-
-	WaitForSomething wakes up from select and returns that client
-	to Dispatch
-
-	Dispatch calls ReadRequestFromClient which reads a buffer (4K)
-	full of requests from the client
-
-	The server executes requests from this buffer until it emptys,
-	in two stages -- 10 requests at a time are executed in the
-	inner Dispatch loop, a buffer full of requests are executed
-	because WaitForSomething immediately returns if any clients
-	have complete requests pending in their input queues.
-
-	When the buffer finally emptys, the next call to ReadRequest
-	FromClient will return zero and Dispatch will go back to
-	WaitForSomething; now that the client has no requests pending,
-	WaitForSomething will block in select again.  If the client
-	is active, this select will immediately return that client
-	as ready to read.
-
-With multiple clients sending streams of requests, the sequence
-of operations is similar, except that ReadRequestFromClient will
-set isItTimeToYield after each 10 requests executed causing the
-server to round-robin among the clients with available requests.
-
-It's important to realize here that any complete requests which have been
-read from clients will be executed before the server will use select again
-to discover input from other clients.  A single busy client can easily
-monopolize the X server.
-
-So, the X server doesn't share well with clients which are more interactive
-in nature.
-
-The X server executes at most a buffer full of requests before again heading
-into select; ReadRequestFromClient causes the server to yield when the
-client request buffer doesn't contain a complete request.  When
-that buffer is executed quickly, the server spends a lot of time
-in select discovering that the same client again has input ready.  Thus
-the server also runs busy clients less efficiently than is would be
-possible.
-
-What to do.
-
-There are several things evident from the above discussion:
-
- 1	The server has a poor metric for deciding how much work it
-	should do at one time on behalf of a particular client.
-
- 2	The server doesn't call select often enough to detect less
- 	aggressive clients in the face of busy clients, especially
-	when those clients are executing slow requests.
-
- 3	The server calls select too often when executing fast requests.
-
- 4	Some priority scheme is needed to keep interactive clients
- 	responding to the user.
-
-And, there are some assumptions about how X applications work:
-
- 1	Each X request is executed relatively quickly; a request-granularity
- 	is good enough for interactive response almost all of the time.
-
- 2	X applications receiving mouse/keyboard events are likely to
- 	warrant additional attention from the X server.
-
-Instead of a request-count metric for work, a time-based metric should be
-used.  The server should select a reasonable time slice for each client
-and execute requests for the entire timeslice before yielding to
-another client.
-
-Instead of returning immediately from WaitForSomething if clients have
-complete requests queued, the server should go through select each
-time and gather as many ready clients as possible.  This involves
-polling instead of blocking and adding the ClientsWithInput to
-clientsReadable after the select returns.
-
-Instead of yielding when the request buffer is empty for a particular
-client, leave the yielding to the upper level scheduling and allow
-the server to try and read again from the socket.  If the client
-is busy, another buffer full of requests will already be waiting
-to be delivered thus avoiding the call through select and the
-additional overhead in WaitForSomething.
-
-Finally, the dispatch loop should not simply execute requests from the
-first available client, instead each client should be prioritized with
-busy clients penalized and clients receiving user events praised.
-
-How it's done:
-
-Polling the current time of day from the OS is too expensive to
-be done at each request boundary, so instead an interval timer is
-set allowing the server to track time changes by counting invocations
-of the related signal handler.  Instead of using the wall time for
-this purpose, the process CPU time is used instead.  This serves
-two purposes -- first, it allows the server to consume no CPU cycles
-when idle, second it avoids conflicts with SIGALRM usage in other
-parts of the server code.  It's not without problems though; other
-CPU intensive processes on the same machine can reduce interactive
-response time within the X server.  The dispatch loop can now
-calculate an approximate time value using the number of signals
-received.  The granularity of the timer sets the scheduling jitter,
-at 20ms it's only occasionally noticeable.
-
-The changes to WaitForSomething and ReadRequestFromClient are
-straightforward, adjusting when select is called and avoiding
-setting isItTimeToYield too often.
-
-The dispatch loop changes are more extensive, now instead of
-executing requests from all available clients, a single client
-is chosen after each call to WaitForSomething, requests are
-executed for that client and WaitForSomething is called again.
-
-Each client is assigned a priority, the dispatch loop chooses the
-client with the highest priority to execute.  Priorities are
-updated in three ways:
-
- 1.	Clients which consume their entire slice are penalized
- 	by having their priority reduced by one until they
-	reach some minimum value.
-
- 2.	Clients which have executed no requests for some time
- 	are praised by having their priority raised until they
-	return to normal priority.
-
- 3.	Clients which receive user input are praised by having
- 	their priority rased until they reach some maximal
-	value, above normal priority.
-
-The effect of these changes is to both improve interactive application
-response and benchmark numbers at the same time.
-
-
-
-
-
-$XFree86: $
+			Client Scheduling in X
+			    Keith Packard
+			       SuSE
+			     10/28/99
+
+History:
+
+Since the original X server was written at Digital in 1987, the OS and DIX
+layers shared responsibility for scheduling the order to service
+client requests.  The original design was simplistic; under the maximum
+first make it work, then make it work well, this was a good idea.  Now 
+that we have a bit more experience with X applications, it's time to
+rethink the design.
+
+The basic dispatch loop in DIX looks like:
+
+	for (;;)
+	{
+		nready = WaitForSomething (...);
+		while (nready--)
+		{
+			isItTimeToYield = FALSE;
+			while (!isItTimeToYield)
+			{
+				if (!ReadRequestFromClient (...))
+					break;
+				(execute request);
+			}
+		}
+	}
+
+WaitForSomething looks like:
+
+	for (;;)
+		if (ANYSET (ClientsWithInput))
+			return popcount (ClientsWithInput);
+		select (...)
+		compute clientsReadable from select result;
+		return popcount (clientsReadable)
+	}
+
+ReadRequestFromClient looks like:
+
+	if (!fullRequestQueued)
+	{
+		read ();
+		if (!fullRequestQueued)
+		{
+			remove from ClientsWithInput;
+			timesThisConnection = 0;
+			return 0;
+		}
+	}
+	if (twoFullRequestsQueued)
+		add to ClientsWithInput;
+
+	if (++timesThisConnection >= 10)
+	{
+		isItTimeToYield = TRUE;
+		timesThisConnection = 0;
+	}
+	return 1;
+
+Here's what happens in this code:
+
+With a single client executing a stream of requests:
+
+	A client sends a packet of requests to the server.
+
+	WaitForSomething wakes up from select and returns that client
+	to Dispatch
+
+	Dispatch calls ReadRequestFromClient which reads a buffer (4K)
+	full of requests from the client
+
+	The server executes requests from this buffer until it emptys,
+	in two stages -- 10 requests at a time are executed in the
+	inner Dispatch loop, a buffer full of requests are executed
+	because WaitForSomething immediately returns if any clients
+	have complete requests pending in their input queues.
+
+	When the buffer finally emptys, the next call to ReadRequest
+	FromClient will return zero and Dispatch will go back to
+	WaitForSomething; now that the client has no requests pending,
+	WaitForSomething will block in select again.  If the client
+	is active, this select will immediately return that client
+	as ready to read.
+
+With multiple clients sending streams of requests, the sequence
+of operations is similar, except that ReadRequestFromClient will
+set isItTimeToYield after each 10 requests executed causing the
+server to round-robin among the clients with available requests.
+
+It's important to realize here that any complete requests which have been
+read from clients will be executed before the server will use select again
+to discover input from other clients.  A single busy client can easily
+monopolize the X server.
+
+So, the X server doesn't share well with clients which are more interactive
+in nature.
+
+The X server executes at most a buffer full of requests before again heading
+into select; ReadRequestFromClient causes the server to yield when the
+client request buffer doesn't contain a complete request.  When
+that buffer is executed quickly, the server spends a lot of time
+in select discovering that the same client again has input ready.  Thus
+the server also runs busy clients less efficiently than is would be
+possible.
+
+What to do.
+
+There are several things evident from the above discussion:
+
+ 1	The server has a poor metric for deciding how much work it
+	should do at one time on behalf of a particular client.
+
+ 2	The server doesn't call select often enough to detect less
+ 	aggressive clients in the face of busy clients, especially
+	when those clients are executing slow requests.
+
+ 3	The server calls select too often when executing fast requests.
+
+ 4	Some priority scheme is needed to keep interactive clients
+ 	responding to the user.
+
+And, there are some assumptions about how X applications work:
+
+ 1	Each X request is executed relatively quickly; a request-granularity
+ 	is good enough for interactive response almost all of the time.
+
+ 2	X applications receiving mouse/keyboard events are likely to
+ 	warrant additional attention from the X server.
+
+Instead of a request-count metric for work, a time-based metric should be
+used.  The server should select a reasonable time slice for each client
+and execute requests for the entire timeslice before yielding to
+another client.
+
+Instead of returning immediately from WaitForSomething if clients have
+complete requests queued, the server should go through select each
+time and gather as many ready clients as possible.  This involves
+polling instead of blocking and adding the ClientsWithInput to
+clientsReadable after the select returns.
+
+Instead of yielding when the request buffer is empty for a particular
+client, leave the yielding to the upper level scheduling and allow
+the server to try and read again from the socket.  If the client
+is busy, another buffer full of requests will already be waiting
+to be delivered thus avoiding the call through select and the
+additional overhead in WaitForSomething.
+
+Finally, the dispatch loop should not simply execute requests from the
+first available client, instead each client should be prioritized with
+busy clients penalized and clients receiving user events praised.
+
+How it's done:
+
+Polling the current time of day from the OS is too expensive to
+be done at each request boundary, so instead an interval timer is
+set allowing the server to track time changes by counting invocations
+of the related signal handler.  Instead of using the wall time for
+this purpose, the process CPU time is used instead.  This serves
+two purposes -- first, it allows the server to consume no CPU cycles
+when idle, second it avoids conflicts with SIGALRM usage in other
+parts of the server code.  It's not without problems though; other
+CPU intensive processes on the same machine can reduce interactive
+response time within the X server.  The dispatch loop can now
+calculate an approximate time value using the number of signals
+received.  The granularity of the timer sets the scheduling jitter,
+at 20ms it's only occasionally noticeable.
+
+The changes to WaitForSomething and ReadRequestFromClient are
+straightforward, adjusting when select is called and avoiding
+setting isItTimeToYield too often.
+
+The dispatch loop changes are more extensive, now instead of
+executing requests from all available clients, a single client
+is chosen after each call to WaitForSomething, requests are
+executed for that client and WaitForSomething is called again.
+
+Each client is assigned a priority, the dispatch loop chooses the
+client with the highest priority to execute.  Priorities are
+updated in three ways:
+
+ 1.	Clients which consume their entire slice are penalized
+ 	by having their priority reduced by one until they
+	reach some minimum value.
+
+ 2.	Clients which have executed no requests for some time
+ 	are praised by having their priority raised until they
+	return to normal priority.
+
+ 3.	Clients which receive user input are praised by having
+ 	their priority rased until they reach some maximal
+	value, above normal priority.
+
+The effect of these changes is to both improve interactive application
+response and benchmark numbers at the same time.
+
+
+
+
+
+$XFree86: $
diff --git a/xorg-server/exa/Makefile.am b/xorg-server/exa/Makefile.am
index 8b759cd76..9876bf5f6 100644
--- a/xorg-server/exa/Makefile.am
+++ b/xorg-server/exa/Makefile.am
@@ -1,30 +1,30 @@
-noinst_LTLIBRARIES = libexa.la
-
-# Override these since EXA doesn't need them and the needed files aren't
-# built (in hw/xfree86/os-support/solaris) until after EXA is built
-SOLARIS_ASM_CFLAGS=""
-
-if XORG
-sdk_HEADERS = exa.h
-endif
-
-INCLUDES = \
-	$(XORG_INCS) \
-	-I$(srcdir)/../miext/cw
-
-AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
-
-libexa_la_SOURCES = \
-	exa.c \
-	exa.h \
-	exa_classic.c \
-	exa_migration_classic.c \
-	exa_driver.c \
-	exa_mixed.c \
-	exa_migration_mixed.c \
-	exa_accel.c \
-	exa_glyphs.c \
-	exa_offscreen.c \
-	exa_render.c \
-	exa_priv.h \
-	exa_unaccel.c
+noinst_LTLIBRARIES = libexa.la
+
+# Override these since EXA doesn't need them and the needed files aren't
+# built (in hw/xfree86/os-support/solaris) until after EXA is built
+SOLARIS_ASM_CFLAGS=""
+
+if XORG
+sdk_HEADERS = exa.h
+endif
+
+INCLUDES = \
+	$(XORG_INCS) \
+	-I$(srcdir)/../miext/cw
+
+AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
+
+libexa_la_SOURCES = \
+	exa.c \
+	exa.h \
+	exa_classic.c \
+	exa_migration_classic.c \
+	exa_driver.c \
+	exa_mixed.c \
+	exa_migration_mixed.c \
+	exa_accel.c \
+	exa_glyphs.c \
+	exa_offscreen.c \
+	exa_render.c \
+	exa_priv.h \
+	exa_unaccel.c
diff --git a/xorg-server/exa/exa.c b/xorg-server/exa/exa.c
index e22f2f022..0f90e593c 100644
--- a/xorg-server/exa/exa.c
+++ b/xorg-server/exa/exa.c
@@ -704,11 +704,9 @@ exaCreateScreenResources(ScreenPtr pScreen)
 }
 
 static void
-ExaBlockHandler(int screenNum, pointer blockData, pointer pTimeout,
+ExaBlockHandler(ScreenPtr pScreen, pointer pTimeout,
                 pointer pReadmask)
 {
-    ScreenPtr pScreen = screenInfo.screens[screenNum];
-
     ExaScreenPriv(pScreen);
 
     /* Move any deferred results from a software fallback to the driver pixmap */
@@ -716,7 +714,7 @@ ExaBlockHandler(int screenNum, pointer blockData, pointer pTimeout,
         exaMoveInPixmap_mixed(pExaScr->deferred_mixed_pixmap);
 
     unwrap(pExaScr, pScreen, BlockHandler);
-    (*pScreen->BlockHandler) (screenNum, blockData, pTimeout, pReadmask);
+    (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
     wrap(pExaScr, pScreen, BlockHandler, ExaBlockHandler);
 
     /* The rest only applies to classic EXA */
@@ -736,15 +734,13 @@ ExaBlockHandler(int screenNum, pointer blockData, pointer pTimeout,
 }
 
 static void
-ExaWakeupHandler(int screenNum, pointer wakeupData, unsigned long result,
+ExaWakeupHandler(ScreenPtr pScreen, unsigned long result,
                  pointer pReadmask)
 {
-    ScreenPtr pScreen = screenInfo.screens[screenNum];
-
     ExaScreenPriv(pScreen);
 
     unwrap(pExaScr, pScreen, WakeupHandler);
-    (*pScreen->WakeupHandler) (screenNum, wakeupData, result, pReadmask);
+    (*pScreen->WakeupHandler) (pScreen, result, pReadmask);
     wrap(pExaScr, pScreen, WakeupHandler, ExaWakeupHandler);
 
     if (result == 0 && pExaScr->numOffscreenAvailable > 1) {
@@ -762,7 +758,7 @@ ExaWakeupHandler(int screenNum, pointer wakeupData, unsigned long result,
  * screen private, before calling down to the next CloseSccreen.
  */
 static Bool
-exaCloseScreen(int i, ScreenPtr pScreen)
+exaCloseScreen(ScreenPtr pScreen)
 {
     ExaScreenPriv(pScreen);
     PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
@@ -797,7 +793,7 @@ exaCloseScreen(int i, ScreenPtr pScreen)
 
     free(pExaScr);
 
-    return (*pScreen->CloseScreen) (i, pScreen);
+    return (*pScreen->CloseScreen) (pScreen);
 }
 
 /**
diff --git a/xorg-server/exa/exa.h b/xorg-server/exa/exa.h
index 75340021e..8a6539f65 100644
--- a/xorg-server/exa/exa.h
+++ b/xorg-server/exa/exa.h
@@ -789,7 +789,7 @@ extern _X_EXPORT void
  ExaOffscreenMarkUsed(PixmapPtr pPixmap);
 
 extern _X_EXPORT void
- exaEnableDisableFBAccess(int index, Bool enable);
+ exaEnableDisableFBAccess(ScreenPtr pScreen, Bool enable);
 
 extern _X_EXPORT Bool
  exaDrawableIsOffscreen(DrawablePtr pDrawable);
diff --git a/xorg-server/exa/exa_offscreen.c b/xorg-server/exa/exa_offscreen.c
index 5e1d1398e..1f571cf22 100644
--- a/xorg-server/exa/exa_offscreen.c
+++ b/xorg-server/exa/exa_offscreen.c
@@ -360,10 +360,8 @@ ExaOffscreenSwapIn(ScreenPtr pScreen)
  * swapped out.
  */
 void
-exaEnableDisableFBAccess(int index, Bool enable)
+exaEnableDisableFBAccess(ScreenPtr pScreen, Bool enable)
 {
-    ScreenPtr pScreen = screenInfo.screens[index];
-
     ExaScreenPriv(pScreen);
 
     if (pExaScr->info->flags & EXA_HANDLES_PIXMAPS)
diff --git a/xorg-server/exa/exa_priv.h b/xorg-server/exa/exa_priv.h
index bde78c3a0..f980fea6d 100644
--- a/xorg-server/exa/exa_priv.h
+++ b/xorg-server/exa/exa_priv.h
@@ -147,7 +147,7 @@ typedef struct _ExaMigrationRec {
     RegionPtr pReg;
 } ExaMigrationRec, *ExaMigrationPtr;
 
-typedef void (*EnableDisableFBAccessProcPtr) (int, Bool);
+typedef void (*EnableDisableFBAccessProcPtr) (ScreenPtr, Bool);
 typedef struct {
     ExaDriverPtr info;
     ScreenBlockHandlerProcPtr SavedBlockHandler;
diff --git a/xorg-server/fb/Makefile.am b/xorg-server/fb/Makefile.am
index 1b0302ed1..89f3babb1 100644
--- a/xorg-server/fb/Makefile.am
+++ b/xorg-server/fb/Makefile.am
@@ -1,54 +1,54 @@
-noinst_LTLIBRARIES = libfb.la libwfb.la
-
-AM_CFLAGS = $(DIX_CFLAGS)
-
-if XORG
-sdk_HEADERS = fb.h fbrop.h fboverlay.h wfbrename.h fbpict.h
-endif
-
-libfb_la_CFLAGS = $(AM_CFLAGS)
-libfb_la_LIBADD = $(PIXMAN_LIBS)
-
-libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
-libwfb_la_LIBADD = $(PIXMAN_LIBS)
-
-libfb_la_SOURCES = 	\
-	fb.h		\
-	fb24_32.c	\
-	fb24_32.h	\
-	fballpriv.c	\
-	fbarc.c		\
-	fbbits.c	\
-	fbbits.h	\
-	fbblt.c		\
-	fbbltone.c	\
-	fbcopy.c	\
-	fbfill.c	\
-	fbfillrect.c	\
-	fbfillsp.c	\
-	fbgc.c		\
-	fbgetsp.c	\
-	fbglyph.c	\
-	fbimage.c	\
-	fbline.c	\
-	fboverlay.c	\
-	fboverlay.h	\
-	fbpict.c	\
-	fbpict.h	\
-	fbpixmap.c	\
-	fbpoint.c	\
-	fbpush.c	\
-	fbrop.h		\
-	fbscreen.c	\
-	fbseg.c		\
-	fbsetsp.c	\
-	fbsolid.c	\
-	fbstipple.c	\
-	fbtile.c	\
-	fbtrap.c	\
-	fbutil.c	\
-	fbwindow.c
-
-libwfb_la_SOURCES = $(libfb_la_SOURCES)
-
-EXTRA_DIST = fbcmap_mi.c
+noinst_LTLIBRARIES = libfb.la libwfb.la
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+if XORG
+sdk_HEADERS = fb.h fbrop.h fboverlay.h wfbrename.h fbpict.h
+endif
+
+libfb_la_CFLAGS = $(AM_CFLAGS)
+libfb_la_LIBADD = $(PIXMAN_LIBS)
+
+libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
+libwfb_la_LIBADD = $(PIXMAN_LIBS)
+
+libfb_la_SOURCES = 	\
+	fb.h		\
+	fb24_32.c	\
+	fb24_32.h	\
+	fballpriv.c	\
+	fbarc.c		\
+	fbbits.c	\
+	fbbits.h	\
+	fbblt.c		\
+	fbbltone.c	\
+	fbcopy.c	\
+	fbfill.c	\
+	fbfillrect.c	\
+	fbfillsp.c	\
+	fbgc.c		\
+	fbgetsp.c	\
+	fbglyph.c	\
+	fbimage.c	\
+	fbline.c	\
+	fboverlay.c	\
+	fboverlay.h	\
+	fbpict.c	\
+	fbpict.h	\
+	fbpixmap.c	\
+	fbpoint.c	\
+	fbpush.c	\
+	fbrop.h		\
+	fbscreen.c	\
+	fbseg.c		\
+	fbsetsp.c	\
+	fbsolid.c	\
+	fbstipple.c	\
+	fbtile.c	\
+	fbtrap.c	\
+	fbutil.c	\
+	fbwindow.c
+
+libwfb_la_SOURCES = $(libfb_la_SOURCES)
+
+EXTRA_DIST = fbcmap_mi.c
diff --git a/xorg-server/fb/fb.h b/xorg-server/fb/fb.h
index 4843f0803..613af78e9 100644
--- a/xorg-server/fb/fb.h
+++ b/xorg-server/fb/fb.h
@@ -1396,7 +1396,7 @@ fbPushPixels(GCPtr pGC,
  */
 
 extern _X_EXPORT Bool
- fbCloseScreen(int indx, ScreenPtr pScreen);
+ fbCloseScreen(ScreenPtr pScreen);
 
 extern _X_EXPORT Bool
  fbRealizeFont(ScreenPtr pScreen, FontPtr pFont);
diff --git a/xorg-server/fb/fboverlay.c b/xorg-server/fb/fboverlay.c
index 998be66d9..a882ffa39 100644
--- a/xorg-server/fb/fboverlay.c
+++ b/xorg-server/fb/fboverlay.c
@@ -81,7 +81,7 @@ fbOverlayCreateWindow(WindowPtr pWin)
 }
 
 Bool
-fbOverlayCloseScreen(int iScreen, ScreenPtr pScreen)
+fbOverlayCloseScreen(ScreenPtr pScreen)
 {
     FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pScreen);
     int i;
diff --git a/xorg-server/fb/fboverlay.h b/xorg-server/fb/fboverlay.h
index 76198cda5..9a93457c7 100644
--- a/xorg-server/fb/fboverlay.h
+++ b/xorg-server/fb/fboverlay.h
@@ -63,7 +63,7 @@ extern _X_EXPORT Bool
  fbOverlayCreateWindow(WindowPtr pWin);
 
 extern _X_EXPORT Bool
- fbOverlayCloseScreen(int iScreen, ScreenPtr pScreen);
+ fbOverlayCloseScreen(ScreenPtr pScreen);
 
 extern _X_EXPORT int
  fbOverlayWindowLayer(WindowPtr pWin);
diff --git a/xorg-server/fb/fbscreen.c b/xorg-server/fb/fbscreen.c
index c0903ec5c..0833cd41e 100644
--- a/xorg-server/fb/fbscreen.c
+++ b/xorg-server/fb/fbscreen.c
@@ -27,7 +27,7 @@
 #include "fb.h"
 
 Bool
-fbCloseScreen(int index, ScreenPtr pScreen)
+fbCloseScreen(ScreenPtr pScreen)
 {
     int d;
     DepthPtr depths = pScreen->allowedDepths;
diff --git a/xorg-server/glx/glxdri.c b/xorg-server/glx/glxdri.c
index 9bf20315b..24749dbdd 100644
--- a/xorg-server/glx/glxdri.c
+++ b/xorg-server/glx/glxdri.c
@@ -849,18 +849,17 @@ static const __DRIextension *loader_extensions[] = {
 };
 
 static Bool
-glxDRIEnterVT(int index, int flags)
+glxDRIEnterVT(ScrnInfoPtr scrn)
 {
-    ScrnInfoPtr scrn = xf86Screens[index];
     Bool ret;
     __GLXDRIscreen *screen = (__GLXDRIscreen *)
-        glxGetScreen(screenInfo.screens[index]);
+        glxGetScreen(xf86ScrnToScreen(scrn));
 
     LogMessage(X_INFO, "AIGLX: Resuming AIGLX clients after VT switch\n");
 
     scrn->EnterVT = screen->enterVT;
 
-    ret = scrn->EnterVT(index, flags);
+    ret = scrn->EnterVT(scrn);
 
     screen->enterVT = scrn->EnterVT;
     scrn->EnterVT = glxDRIEnterVT;
@@ -874,18 +873,17 @@ glxDRIEnterVT(int index, int flags)
 }
 
 static void
-glxDRILeaveVT(int index, int flags)
+glxDRILeaveVT(ScrnInfoPtr scrn)
 {
-    ScrnInfoPtr scrn = xf86Screens[index];
     __GLXDRIscreen *screen = (__GLXDRIscreen *)
-        glxGetScreen(screenInfo.screens[index]);
+        glxGetScreen(xf86ScrnToScreen(scrn));
 
     LogMessage(X_INFO, "AIGLX: Suspending AIGLX clients for VT switch\n");
 
     glxSuspendClients();
 
     scrn->LeaveVT = screen->leaveVT;
-    (*screen->leaveVT) (index, flags);
+    (*screen->leaveVT) (scrn);
     screen->leaveVT = scrn->LeaveVT;
     scrn->LeaveVT = glxDRILeaveVT;
 }
diff --git a/xorg-server/glx/glxdri2.c b/xorg-server/glx/glxdri2.c
index cceb12697..6614666ca 100644
--- a/xorg-server/glx/glxdri2.c
+++ b/xorg-server/glx/glxdri2.c
@@ -587,18 +587,17 @@ static const __DRIextension *loader_extensions[] = {
 };
 
 static Bool
-glxDRIEnterVT(int index, int flags)
+glxDRIEnterVT(ScrnInfoPtr scrn)
 {
-    ScrnInfoPtr scrn = xf86Screens[index];
     Bool ret;
     __GLXDRIscreen *screen = (__GLXDRIscreen *)
-        glxGetScreen(screenInfo.screens[index]);
+        glxGetScreen(xf86ScrnToScreen(scrn));
 
     LogMessage(X_INFO, "AIGLX: Resuming AIGLX clients after VT switch\n");
 
     scrn->EnterVT = screen->enterVT;
 
-    ret = scrn->EnterVT(index, flags);
+    ret = scrn->EnterVT(scrn);
 
     screen->enterVT = scrn->EnterVT;
     scrn->EnterVT = glxDRIEnterVT;
@@ -612,18 +611,17 @@ glxDRIEnterVT(int index, int flags)
 }
 
 static void
-glxDRILeaveVT(int index, int flags)
+glxDRILeaveVT(ScrnInfoPtr scrn)
 {
-    ScrnInfoPtr scrn = xf86Screens[index];
     __GLXDRIscreen *screen = (__GLXDRIscreen *)
-        glxGetScreen(screenInfo.screens[index]);
+        glxGetScreen(xf86ScrnToScreen(scrn));
 
     LogMessage(X_INFO, "AIGLX: Suspending AIGLX clients for VT switch\n");
 
     glxSuspendClients();
 
     scrn->LeaveVT = screen->leaveVT;
-    (*screen->leaveVT) (index, flags);
+    (*screen->leaveVT) (scrn);
     screen->leaveVT = scrn->LeaveVT;
     scrn->LeaveVT = glxDRILeaveVT;
 }
diff --git a/xorg-server/glx/glxscreens.c b/xorg-server/glx/glxscreens.c
index 1ece23038..ca0e5254b 100644
--- a/xorg-server/glx/glxscreens.c
+++ b/xorg-server/glx/glxscreens.c
@@ -181,7 +181,7 @@ static char GLXServerExtensions[] =
     "GLX_SGIX_pbuffer " "GLX_MESA_copy_sub_buffer " "GLX_INTEL_swap_event";
 
 static Bool
-glxCloseScreen(int index, ScreenPtr pScreen)
+glxCloseScreen(ScreenPtr pScreen)
 {
     __GLXscreen *pGlxScreen = glxGetScreen(pScreen);
 
@@ -189,7 +189,7 @@ glxCloseScreen(int index, ScreenPtr pScreen)
 
     pGlxScreen->destroy(pGlxScreen);
 
-    return pScreen->CloseScreen(index, pScreen);
+    return pScreen->CloseScreen(pScreen);
 }
 
 __GLXscreen *
diff --git a/xorg-server/glx/glxscreens.h b/xorg-server/glx/glxscreens.h
index d5420ee8d..172268b29 100644
--- a/xorg-server/glx/glxscreens.h
+++ b/xorg-server/glx/glxscreens.h
@@ -153,7 +153,7 @@ struct __GLXscreen {
     unsigned GLXminor;
     /*@} */
 
-    Bool (*CloseScreen) (int index, ScreenPtr pScreen);
+    Bool (*CloseScreen) (ScreenPtr pScreen);
 };
 
 void __glXScreenInit(__GLXscreen * screen, ScreenPtr pScreen);
diff --git a/xorg-server/hw/Makefile.am b/xorg-server/hw/Makefile.am
index 6c2cc6bd4..31e2565db 100644
--- a/xorg-server/hw/Makefile.am
+++ b/xorg-server/hw/Makefile.am
@@ -1,41 +1,41 @@
-if DMX
-DMX_SUBDIRS = dmx
-endif
-
-if XORG
-XORG_SUBDIRS = xfree86
-endif
-
-if XVFB
-XVFB_SUBDIRS = vfb
-endif
-
-if XNEST
-XNEST_SUBDIRS = xnest
-endif
-
-if XWIN
-XWIN_SUBDIRS = xwin
-endif
-
-if KDRIVE
-KDRIVE_SUBDIRS = kdrive
-endif
-
-if XQUARTZ
-XQUARTZ_SUBDIRS = xquartz
-endif
-
-SUBDIRS =			\
-	$(XORG_SUBDIRS)		\
-	$(XWIN_SUBDIRS)		\
-	$(XVFB_SUBDIRS)		\
-	$(XNEST_SUBDIRS)	\
-	$(DMX_SUBDIRS)		\
-	$(KDRIVE_SUBDIRS)	\
-	$(XQUARTZ_SUBDIRS)
-
-DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
-
-relink:
-	$(AM_V_at)for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink || exit 1 ; done
+if DMX
+DMX_SUBDIRS = dmx
+endif
+
+if XORG
+XORG_SUBDIRS = xfree86
+endif
+
+if XVFB
+XVFB_SUBDIRS = vfb
+endif
+
+if XNEST
+XNEST_SUBDIRS = xnest
+endif
+
+if XWIN
+XWIN_SUBDIRS = xwin
+endif
+
+if KDRIVE
+KDRIVE_SUBDIRS = kdrive
+endif
+
+if XQUARTZ
+XQUARTZ_SUBDIRS = xquartz
+endif
+
+SUBDIRS =			\
+	$(XORG_SUBDIRS)		\
+	$(XWIN_SUBDIRS)		\
+	$(XVFB_SUBDIRS)		\
+	$(XNEST_SUBDIRS)	\
+	$(DMX_SUBDIRS)		\
+	$(KDRIVE_SUBDIRS)	\
+	$(XQUARTZ_SUBDIRS)
+
+DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
+
+relink:
+	$(AM_V_at)for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink || exit 1 ; done
diff --git a/xorg-server/hw/dmx/.gitignore b/xorg-server/hw/dmx/.gitignore
new file mode 100644
index 000000000..f71acff10
--- /dev/null
+++ b/xorg-server/hw/dmx/.gitignore
@@ -0,0 +1,2 @@
+#		Add & Override for this directory and it's subdirectories
+Xdmx
diff --git a/xorg-server/hw/dmx/config/.gitignore b/xorg-server/hw/dmx/config/.gitignore
new file mode 100644
index 000000000..bf5e80873
--- /dev/null
+++ b/xorg-server/hw/dmx/config/.gitignore
@@ -0,0 +1,7 @@
+#		Add & Override for this directory and it's subdirectories
+dmxtodmx
+parser.c
+parser.h
+scanner.c
+vdltodmx
+xdmxconfig
diff --git a/xorg-server/hw/dmx/config/TODO b/xorg-server/hw/dmx/config/TODO
index 2998ff4a0..0e9255fd2 100644
--- a/xorg-server/hw/dmx/config/TODO
+++ b/xorg-server/hw/dmx/config/TODO
@@ -1,7 +1,7 @@
-Fri May 31 13:20:17 2002
-
-1) Sanitize values from input boxes.
-
-2) Add canvas colors to cavas widget resources or to command-line options.
-
-3) Add ability to edit option line(s) and wall.
+Fri May 31 13:20:17 2002
+
+1) Sanitize values from input boxes.
+
+2) Add canvas colors to cavas widget resources or to command-line options.
+
+3) Add ability to edit option line(s) and wall.
diff --git a/xorg-server/hw/dmx/config/dmxcompat.h b/xorg-server/hw/dmx/config/dmxcompat.h
index 718892040..b9b083ff6 100644
--- a/xorg-server/hw/dmx/config/dmxcompat.h
+++ b/xorg-server/hw/dmx/config/dmxcompat.h
@@ -1,44 +1,44 @@
-/*
- * Copyright 2002 Red Hat Inc., Durham, North Carolina.
- *
- * All Rights Reserved.
- *
- * 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 on 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 (including the
- * next paragraph) 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
- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
- * 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.
- */
-
-/*
- * Authors:
- *   Rickard E. (Rik) Faith <faith@redhat.com>
- *
- */
-
-/** \file
- * Interface to VDL compatibility support.  \see dmxcompat.c
- *
- * This file is not used by the DMX server.
- */
-
-#ifndef _DMXCOMPAT_H_
-#define _DMXCOMPAT_H_
-
-extern DMXConfigEntryPtr dmxVDLRead(const char *filename);
-#endif
+/*
+ * Copyright 2002 Red Hat Inc., Durham, North Carolina.
+ *
+ * All Rights Reserved.
+ *
+ * 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 on 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 (including the
+ * next paragraph) 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Rickard E. (Rik) Faith <faith@redhat.com>
+ *
+ */
+
+/** \file
+ * Interface to VDL compatibility support.  \see dmxcompat.c
+ *
+ * This file is not used by the DMX server.
+ */
+
+#ifndef _DMXCOMPAT_H_
+#define _DMXCOMPAT_H_
+
+extern DMXConfigEntryPtr dmxVDLRead(const char *filename);
+#endif
diff --git a/xorg-server/hw/dmx/config/parser.y b/xorg-server/hw/dmx/config/parser.y
index ac2441017..9a45e624f 100644
--- a/xorg-server/hw/dmx/config/parser.y
+++ b/xorg-server/hw/dmx/config/parser.y
@@ -1,226 +1,226 @@
-/* $XFree86$ */
-/*
- * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina.
- *
- * All Rights Reserved.
- *
- * 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 on 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 (including the
- * next paragraph) 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
- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
- * 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.
- */
-
-/*
- * Authors:
- *   Rickard E. (Rik) Faith <faith@redhat.com>
- *
- */
-
-%{
-#ifdef HAVE_DMX_CONFIG_H
-#include <dmx-config.h>
-#endif
-
-#include "dmxparse.h"
-#include <string.h>
-#include <stdlib.h>
-#define YYDEBUG 1
-#define YYERROR_VERBOSE
-#define YY_USE_PROTOS
-
-DMXConfigEntryPtr dmxConfigEntry = NULL;
-#define APPEND(type, h, t)                 \
-{                                          \
-    type pt;                               \
-    for (pt = h; pt->next; pt = pt->next); \
-    pt->next = t;                          \
-}
-%}
-
-%union {
-    DMXConfigTokenPtr      token;
-    DMXConfigStringPtr     string;
-    DMXConfigNumberPtr     number;
-    DMXConfigPairPtr       pair;
-    DMXConfigFullDimPtr    fdim;
-    DMXConfigPartDimPtr    pdim;
-    DMXConfigDisplayPtr    display;
-    DMXConfigWallPtr       wall;
-    DMXConfigOptionPtr     option;
-    DMXConfigParamPtr      param;
-    DMXConfigCommentPtr    comment;
-    DMXConfigSubPtr        subentry;
-    DMXConfigVirtualPtr    virtual;
-    DMXConfigEntryPtr      entry;
-}
-
-				/* Terminals */
-%token <token>   '{' '}' ';' '/' T_VIRTUAL T_DISPLAY T_WALL T_OPTION T_PARAM
-%token <string>  T_STRING
-%token <pair>    T_DIMENSION T_OFFSET T_ORIGIN
-%token <comment> T_COMMENT T_LINE_COMMENT
-
-                                /* Non-termials */
-%type  <token>    Display Wall Terminal Open Close
-%type  <string>   NameList Name
-%type  <pair>     Dimension Offset Origin
-%type  <pdim>     PartialDim
-%type  <fdim>     FullDim
-%type  <display>  DisplayEntry
-%type  <option>   OptionEntry
-%type  <param>    ParamEntry ParamList Param
-%type  <subentry> SubList Sub
-%type  <wall>     WallEntry
-%type  <virtual>  Virtual
-%type  <entry>    Program EntryList Entry
-
-%%
-
-Program : EntryList { dmxConfigEntry = $1; }
-        ;
-
-EntryList : Entry
-          | EntryList Entry { APPEND(DMXConfigEntryPtr,$1,$2); $$ = $1; }
-          ;
-
-Entry : Virtual        { $$ = dmxConfigEntryVirtual($1); }
-      | T_LINE_COMMENT { $$ = dmxConfigEntryComment($1); }
-      ;
-
-Virtual : T_VIRTUAL Open SubList Close
-          { $$ = dmxConfigCreateVirtual($1, NULL, NULL, $2, $3, $4); }
-        | T_VIRTUAL Dimension Open SubList Close
-          { $$ = dmxConfigCreateVirtual($1, NULL, $2, $3, $4, $5); }
-        | T_VIRTUAL Name Open SubList Close
-          { $$ = dmxConfigCreateVirtual($1, $2, NULL, $3, $4, $5); }
-        | T_VIRTUAL Name Dimension Open SubList Close
-          { $$ = dmxConfigCreateVirtual($1, $2, $3, $4, $5, $6 ); }
-        ;
-
-SubList : Sub
-        | SubList Sub { APPEND(DMXConfigSubPtr,$1,$2); $$ = $1; }
-        ;
-
-Sub : T_LINE_COMMENT { $$ = dmxConfigSubComment($1); }
-    | DisplayEntry   { $$ = dmxConfigSubDisplay($1); }
-    | WallEntry      { $$ = dmxConfigSubWall($1); }
-    | OptionEntry    { $$ = dmxConfigSubOption($1); }
-    | ParamEntry     { $$ = dmxConfigSubParam($1); }
-    ;
-
-OptionEntry : T_OPTION NameList Terminal
-              { $$ = dmxConfigCreateOption($1, $2, $3); }
-            ;
-
-ParamEntry : T_PARAM NameList Terminal
-             { $$ = dmxConfigCreateParam($1, NULL, $2, NULL, $3); }
-           | T_PARAM Open ParamList Close
-             { $$ = dmxConfigCreateParam($1, $2, NULL, $4, NULL);
-               $$->next = $3;
-             }
-           ;
-
-ParamList : Param
-          | ParamList Param { APPEND(DMXConfigParamPtr,$1,$2); $$ = $1; }
-          ;
-
-Param : NameList Terminal
-        { $$ = dmxConfigCreateParam(NULL, NULL, $1, NULL, $2); }
-      ;
-
-PartialDim : Dimension Offset
-             { $$ = dmxConfigCreatePartDim($1, $2); }
-           | Dimension
-             { $$ = dmxConfigCreatePartDim($1, NULL); }
-           | Offset
-             { $$ = dmxConfigCreatePartDim(NULL, $1); }
-           ;
-
-FullDim : PartialDim '/' PartialDim
-          { $$ = dmxConfigCreateFullDim($1, $3); }
-        | '/' PartialDim
-          { $$ = dmxConfigCreateFullDim(NULL, $2); }
-        | PartialDim
-          { $$ = dmxConfigCreateFullDim($1, NULL); }
-        ;
-
-DisplayEntry : Display Name FullDim Origin Terminal
-               { $$ = dmxConfigCreateDisplay($1, $2, $3, $4, $5); }
-             | Display FullDim Origin Terminal
-               { $$ = dmxConfigCreateDisplay($1, NULL, $2, $3, $4); }
-             | Display Name Origin Terminal
-               { $$ = dmxConfigCreateDisplay($1, $2, NULL, $3, $4); }
-
-             | Display Name FullDim Terminal
-               { $$ = dmxConfigCreateDisplay($1, $2, $3, NULL, $4); }
-             | Display FullDim Terminal
-               { $$ = dmxConfigCreateDisplay($1, NULL, $2, NULL, $3); }
-             | Display Name Terminal
-               { $$ = dmxConfigCreateDisplay($1, $2, NULL, NULL, $3); }
-             | Display Terminal
-               { $$ = dmxConfigCreateDisplay($1, NULL, NULL, NULL, $2); }
-             ;
-
-WallEntry : Wall Dimension Dimension NameList Terminal
-            { $$ = dmxConfigCreateWall($1, $2, $3, $4, $5); }
-          | Wall Dimension NameList Terminal
-            { $$ = dmxConfigCreateWall($1, $2, NULL, $3, $4); }
-          | Wall NameList Terminal
-            { $$ = dmxConfigCreateWall($1, NULL, NULL, $2, $3); }
-          ;
-
-Display : T_DISPLAY
-        | T_DISPLAY T_COMMENT { $$ = $1; $$->comment = $2->comment; }
-        ;
-
-Name : T_STRING
-     | T_STRING T_COMMENT { $$ = $1; $$->comment = $2->comment; }
-     ;
-
-Dimension : T_DIMENSION
-          | T_DIMENSION T_COMMENT { $$ = $1; $$->comment = $2->comment; }
-          ;
-
-Offset : T_OFFSET
-       | T_OFFSET T_COMMENT { $$ = $1; $$->comment = $2->comment; }
-       ;
-
-Origin : T_ORIGIN
-       | T_ORIGIN T_COMMENT { $$ = $1; $$->comment = $2->comment; }
-       ;
-
-Terminal : ';'
-         | ';' T_COMMENT { $$ = $1; $$->comment = $2->comment; }
-         ;
-
-Open : '{'
-     | '{' T_COMMENT { $$ = $1; $$->comment = $2->comment; }
-     ;
-
-Close : '}'
-      | '}' T_COMMENT { $$ = $1; $$->comment = $2->comment; }
-      ;
-
-Wall : T_WALL
-     | T_WALL T_COMMENT { $$ = $1; $$->comment = $2->comment; }
-     ;
-
-NameList : Name
-         | NameList Name { APPEND(DMXConfigStringPtr, $1, $2); $$ = $1; }
-         ;
+/* $XFree86$ */
+/*
+ * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina.
+ *
+ * All Rights Reserved.
+ *
+ * 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 on 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 (including the
+ * next paragraph) 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Rickard E. (Rik) Faith <faith@redhat.com>
+ *
+ */
+
+%{
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "dmxparse.h"
+#include <string.h>
+#include <stdlib.h>
+#define YYDEBUG 1
+#define YYERROR_VERBOSE
+#define YY_USE_PROTOS
+
+DMXConfigEntryPtr dmxConfigEntry = NULL;
+#define APPEND(type, h, t)                 \
+{                                          \
+    type pt;                               \
+    for (pt = h; pt->next; pt = pt->next); \
+    pt->next = t;                          \
+}
+%}
+
+%union {
+    DMXConfigTokenPtr      token;
+    DMXConfigStringPtr     string;
+    DMXConfigNumberPtr     number;
+    DMXConfigPairPtr       pair;
+    DMXConfigFullDimPtr    fdim;
+    DMXConfigPartDimPtr    pdim;
+    DMXConfigDisplayPtr    display;
+    DMXConfigWallPtr       wall;
+    DMXConfigOptionPtr     option;
+    DMXConfigParamPtr      param;
+    DMXConfigCommentPtr    comment;
+    DMXConfigSubPtr        subentry;
+    DMXConfigVirtualPtr    virtual;
+    DMXConfigEntryPtr      entry;
+}
+
+				/* Terminals */
+%token <token>   '{' '}' ';' '/' T_VIRTUAL T_DISPLAY T_WALL T_OPTION T_PARAM
+%token <string>  T_STRING
+%token <pair>    T_DIMENSION T_OFFSET T_ORIGIN
+%token <comment> T_COMMENT T_LINE_COMMENT
+
+                                /* Non-termials */
+%type  <token>    Display Wall Terminal Open Close
+%type  <string>   NameList Name
+%type  <pair>     Dimension Offset Origin
+%type  <pdim>     PartialDim
+%type  <fdim>     FullDim
+%type  <display>  DisplayEntry
+%type  <option>   OptionEntry
+%type  <param>    ParamEntry ParamList Param
+%type  <subentry> SubList Sub
+%type  <wall>     WallEntry
+%type  <virtual>  Virtual
+%type  <entry>    Program EntryList Entry
+
+%%
+
+Program : EntryList { dmxConfigEntry = $1; }
+        ;
+
+EntryList : Entry
+          | EntryList Entry { APPEND(DMXConfigEntryPtr,$1,$2); $$ = $1; }
+          ;
+
+Entry : Virtual        { $$ = dmxConfigEntryVirtual($1); }
+      | T_LINE_COMMENT { $$ = dmxConfigEntryComment($1); }
+      ;
+
+Virtual : T_VIRTUAL Open SubList Close
+          { $$ = dmxConfigCreateVirtual($1, NULL, NULL, $2, $3, $4); }
+        | T_VIRTUAL Dimension Open SubList Close
+          { $$ = dmxConfigCreateVirtual($1, NULL, $2, $3, $4, $5); }
+        | T_VIRTUAL Name Open SubList Close
+          { $$ = dmxConfigCreateVirtual($1, $2, NULL, $3, $4, $5); }
+        | T_VIRTUAL Name Dimension Open SubList Close
+          { $$ = dmxConfigCreateVirtual($1, $2, $3, $4, $5, $6 ); }
+        ;
+
+SubList : Sub
+        | SubList Sub { APPEND(DMXConfigSubPtr,$1,$2); $$ = $1; }
+        ;
+
+Sub : T_LINE_COMMENT { $$ = dmxConfigSubComment($1); }
+    | DisplayEntry   { $$ = dmxConfigSubDisplay($1); }
+    | WallEntry      { $$ = dmxConfigSubWall($1); }
+    | OptionEntry    { $$ = dmxConfigSubOption($1); }
+    | ParamEntry     { $$ = dmxConfigSubParam($1); }
+    ;
+
+OptionEntry : T_OPTION NameList Terminal
+              { $$ = dmxConfigCreateOption($1, $2, $3); }
+            ;
+
+ParamEntry : T_PARAM NameList Terminal
+             { $$ = dmxConfigCreateParam($1, NULL, $2, NULL, $3); }
+           | T_PARAM Open ParamList Close
+             { $$ = dmxConfigCreateParam($1, $2, NULL, $4, NULL);
+               $$->next = $3;
+             }
+           ;
+
+ParamList : Param
+          | ParamList Param { APPEND(DMXConfigParamPtr,$1,$2); $$ = $1; }
+          ;
+
+Param : NameList Terminal
+        { $$ = dmxConfigCreateParam(NULL, NULL, $1, NULL, $2); }
+      ;
+
+PartialDim : Dimension Offset
+             { $$ = dmxConfigCreatePartDim($1, $2); }
+           | Dimension
+             { $$ = dmxConfigCreatePartDim($1, NULL); }
+           | Offset
+             { $$ = dmxConfigCreatePartDim(NULL, $1); }
+           ;
+
+FullDim : PartialDim '/' PartialDim
+          { $$ = dmxConfigCreateFullDim($1, $3); }
+        | '/' PartialDim
+          { $$ = dmxConfigCreateFullDim(NULL, $2); }
+        | PartialDim
+          { $$ = dmxConfigCreateFullDim($1, NULL); }
+        ;
+
+DisplayEntry : Display Name FullDim Origin Terminal
+               { $$ = dmxConfigCreateDisplay($1, $2, $3, $4, $5); }
+             | Display FullDim Origin Terminal
+               { $$ = dmxConfigCreateDisplay($1, NULL, $2, $3, $4); }
+             | Display Name Origin Terminal
+               { $$ = dmxConfigCreateDisplay($1, $2, NULL, $3, $4); }
+
+             | Display Name FullDim Terminal
+               { $$ = dmxConfigCreateDisplay($1, $2, $3, NULL, $4); }
+             | Display FullDim Terminal
+               { $$ = dmxConfigCreateDisplay($1, NULL, $2, NULL, $3); }
+             | Display Name Terminal
+               { $$ = dmxConfigCreateDisplay($1, $2, NULL, NULL, $3); }
+             | Display Terminal
+               { $$ = dmxConfigCreateDisplay($1, NULL, NULL, NULL, $2); }
+             ;
+
+WallEntry : Wall Dimension Dimension NameList Terminal
+            { $$ = dmxConfigCreateWall($1, $2, $3, $4, $5); }
+          | Wall Dimension NameList Terminal
+            { $$ = dmxConfigCreateWall($1, $2, NULL, $3, $4); }
+          | Wall NameList Terminal
+            { $$ = dmxConfigCreateWall($1, NULL, NULL, $2, $3); }
+          ;
+
+Display : T_DISPLAY
+        | T_DISPLAY T_COMMENT { $$ = $1; $$->comment = $2->comment; }
+        ;
+
+Name : T_STRING
+     | T_STRING T_COMMENT { $$ = $1; $$->comment = $2->comment; }
+     ;
+
+Dimension : T_DIMENSION
+          | T_DIMENSION T_COMMENT { $$ = $1; $$->comment = $2->comment; }
+          ;
+
+Offset : T_OFFSET
+       | T_OFFSET T_COMMENT { $$ = $1; $$->comment = $2->comment; }
+       ;
+
+Origin : T_ORIGIN
+       | T_ORIGIN T_COMMENT { $$ = $1; $$->comment = $2->comment; }
+       ;
+
+Terminal : ';'
+         | ';' T_COMMENT { $$ = $1; $$->comment = $2->comment; }
+         ;
+
+Open : '{'
+     | '{' T_COMMENT { $$ = $1; $$->comment = $2->comment; }
+     ;
+
+Close : '}'
+      | '}' T_COMMENT { $$ = $1; $$->comment = $2->comment; }
+      ;
+
+Wall : T_WALL
+     | T_WALL T_COMMENT { $$ = $1; $$->comment = $2->comment; }
+     ;
+
+NameList : Name
+         | NameList Name { APPEND(DMXConfigStringPtr, $1, $2); $$ = $1; }
+         ;
diff --git a/xorg-server/hw/dmx/config/test-a.in b/xorg-server/hw/dmx/config/test-a.in
index 827675374..9aeeab047 100644
--- a/xorg-server/hw/dmx/config/test-a.in
+++ b/xorg-server/hw/dmx/config/test-a.in
@@ -1 +1 @@
-error
+error
diff --git a/xorg-server/hw/dmx/config/test-a.out b/xorg-server/hw/dmx/config/test-a.out
index d35b29fc0..e8b7404e1 100644
--- a/xorg-server/hw/dmx/config/test-a.out
+++ b/xorg-server/hw/dmx/config/test-a.out
@@ -1,2 +1,2 @@
-parse error on line 1 at token "error"
-syntax error, unexpected string expecting "virtual" or comment (e.g., #...)
+parse error on line 1 at token "error"
+syntax error, unexpected string expecting "virtual" or comment (e.g., #...)
diff --git a/xorg-server/hw/dmx/config/test-b.in b/xorg-server/hw/dmx/config/test-b.in
index 308ec1db4..d4f30e004 100644
--- a/xorg-server/hw/dmx/config/test-b.in
+++ b/xorg-server/hw/dmx/config/test-b.in
@@ -1 +1 @@
-# comment
+# comment
diff --git a/xorg-server/hw/dmx/config/test-b.out b/xorg-server/hw/dmx/config/test-b.out
index 308ec1db4..d4f30e004 100644
--- a/xorg-server/hw/dmx/config/test-b.out
+++ b/xorg-server/hw/dmx/config/test-b.out
@@ -1 +1 @@
-# comment
+# comment
diff --git a/xorg-server/hw/dmx/config/test-c.in b/xorg-server/hw/dmx/config/test-c.in
index e07ae5ba6..a3d66513f 100644
--- a/xorg-server/hw/dmx/config/test-c.in
+++ b/xorg-server/hw/dmx/config/test-c.in
@@ -1 +1 @@
-virtual
+virtual
diff --git a/xorg-server/hw/dmx/config/test-c.out b/xorg-server/hw/dmx/config/test-c.out
index 7390397a4..87838938a 100644
--- a/xorg-server/hw/dmx/config/test-c.out
+++ b/xorg-server/hw/dmx/config/test-c.out
@@ -1,2 +1,2 @@
-parse error on line 2 at token " "
-syntax error, unexpected $end, expecting "{" or string or dimension (e.g., 2x2 or 1024x768)
+parse error on line 2 at token " "
+syntax error, unexpected $end, expecting "{" or string or dimension (e.g., 2x2 or 1024x768)
diff --git a/xorg-server/hw/dmx/config/test-d.in b/xorg-server/hw/dmx/config/test-d.in
index 6827503b1..af14b8c09 100644
--- a/xorg-server/hw/dmx/config/test-d.in
+++ b/xorg-server/hw/dmx/config/test-d.in
@@ -1 +1 @@
-display
+display
diff --git a/xorg-server/hw/dmx/config/test-d.out b/xorg-server/hw/dmx/config/test-d.out
index f3219b301..f6e3db0a7 100644
--- a/xorg-server/hw/dmx/config/test-d.out
+++ b/xorg-server/hw/dmx/config/test-d.out
@@ -1,2 +1,2 @@
-parse error on line 1 at token "display"
-syntax error, unexpected "display" expecting "virtual" or comment (e.g., #...)
+parse error on line 1 at token "display"
+syntax error, unexpected "display" expecting "virtual" or comment (e.g., #...)
diff --git a/xorg-server/hw/dmx/config/test-e.in b/xorg-server/hw/dmx/config/test-e.in
index 21dbde95c..4ebcf2406 100644
--- a/xorg-server/hw/dmx/config/test-e.in
+++ b/xorg-server/hw/dmx/config/test-e.in
@@ -1 +1 @@
-display;
+display;
diff --git a/xorg-server/hw/dmx/config/test-e.out b/xorg-server/hw/dmx/config/test-e.out
index f3219b301..f6e3db0a7 100644
--- a/xorg-server/hw/dmx/config/test-e.out
+++ b/xorg-server/hw/dmx/config/test-e.out
@@ -1,2 +1,2 @@
-parse error on line 1 at token "display"
-syntax error, unexpected "display" expecting "virtual" or comment (e.g., #...)
+parse error on line 1 at token "display"
+syntax error, unexpected "display" expecting "virtual" or comment (e.g., #...)
diff --git a/xorg-server/hw/dmx/config/test-f.in b/xorg-server/hw/dmx/config/test-f.in
index 17f6c6327..1fe26c507 100644
--- a/xorg-server/hw/dmx/config/test-f.in
+++ b/xorg-server/hw/dmx/config/test-f.in
@@ -1,2 +1,2 @@
-virtual {
-}
+virtual {
+}
diff --git a/xorg-server/hw/dmx/config/test-g.in b/xorg-server/hw/dmx/config/test-g.in
index 453d8121c..c8741c58e 100644
--- a/xorg-server/hw/dmx/config/test-g.in
+++ b/xorg-server/hw/dmx/config/test-g.in
@@ -1,4 +1,4 @@
-virtual a {
-    display d0:0 1280x1024;
-    display d1:0 1280x1024;
-}
+virtual a {
+    display d0:0 1280x1024;
+    display d1:0 1280x1024;
+}
diff --git a/xorg-server/hw/dmx/config/test-g.out b/xorg-server/hw/dmx/config/test-g.out
index 453d8121c..c8741c58e 100644
--- a/xorg-server/hw/dmx/config/test-g.out
+++ b/xorg-server/hw/dmx/config/test-g.out
@@ -1,4 +1,4 @@
-virtual a {
-    display d0:0 1280x1024;
-    display d1:0 1280x1024;
-}
+virtual a {
+    display d0:0 1280x1024;
+    display d1:0 1280x1024;
+}
diff --git a/xorg-server/hw/dmx/config/test-h.in b/xorg-server/hw/dmx/config/test-h.in
index 1193d309e..93cef324f 100644
--- a/xorg-server/hw/dmx/config/test-h.in
+++ b/xorg-server/hw/dmx/config/test-h.in
@@ -1,7 +1,7 @@
-# comment a
-# comment b
-## comment c
-#	<-- tab
-# Next comment is empty
-#
-# Non empty
+# comment a
+# comment b
+## comment c
+#	<-- tab
+# Next comment is empty
+#
+# Non empty
diff --git a/xorg-server/hw/dmx/config/test-h.out b/xorg-server/hw/dmx/config/test-h.out
index 1193d309e..93cef324f 100644
--- a/xorg-server/hw/dmx/config/test-h.out
+++ b/xorg-server/hw/dmx/config/test-h.out
@@ -1,7 +1,7 @@
-# comment a
-# comment b
-## comment c
-#	<-- tab
-# Next comment is empty
-#
-# Non empty
+# comment a
+# comment b
+## comment c
+#	<-- tab
+# Next comment is empty
+#
+# Non empty
diff --git a/xorg-server/hw/dmx/config/test-i.in b/xorg-server/hw/dmx/config/test-i.in
index b65967e62..bf5d345c3 100644
--- a/xorg-server/hw/dmx/config/test-i.in
+++ b/xorg-server/hw/dmx/config/test-i.in
@@ -1,3 +1,3 @@
-virtual a {
-    param a b; # comment
-}
+virtual a {
+    param a b; # comment
+}
diff --git a/xorg-server/hw/dmx/config/test-i.out b/xorg-server/hw/dmx/config/test-i.out
index b65967e62..bf5d345c3 100644
--- a/xorg-server/hw/dmx/config/test-i.out
+++ b/xorg-server/hw/dmx/config/test-i.out
@@ -1,3 +1,3 @@
-virtual a {
-    param a b; # comment
-}
+virtual a {
+    param a b; # comment
+}
diff --git a/xorg-server/hw/dmx/config/test-j.in b/xorg-server/hw/dmx/config/test-j.in
index cc1cdd0ea..087da79a6 100644
--- a/xorg-server/hw/dmx/config/test-j.in
+++ b/xorg-server/hw/dmx/config/test-j.in
@@ -1,13 +1,13 @@
-virtual a {
-    option aaa # bbb
-           aa cc;
-    param { # comment 1
-        a b;
-        c d;
-        x y z; # comment 2
-    }
-    param e f g h; # comment 3
-    param e f g hlskdjflskdfjsd #comment 4
-     flksdjf sldkfjsldkfjsdlf
-    "lsdkfjsldkfjlsdkjflskdjflsdkjfl" "lkjsdlfjsdlfkjsdlfj";
-}
+virtual a {
+    option aaa # bbb
+           aa cc;
+    param { # comment 1
+        a b;
+        c d;
+        x y z; # comment 2
+    }
+    param e f g h; # comment 3
+    param e f g hlskdjflskdfjsd #comment 4
+     flksdjf sldkfjsldkfjsdlf
+    "lsdkfjsldkfjlsdkjflskdjflsdkjfl" "lkjsdlfjsdlfkjsdlfj";
+}
diff --git a/xorg-server/hw/dmx/config/test-j.out b/xorg-server/hw/dmx/config/test-j.out
index 9acaa009b..d386e40b5 100644
--- a/xorg-server/hw/dmx/config/test-j.out
+++ b/xorg-server/hw/dmx/config/test-j.out
@@ -1,11 +1,11 @@
-virtual a {
-    option "aaa aa cc";
-    param { # comment 1
-            a b;
-            c d;
-            x y z; # comment 2
-    }
-    param e f g h; # comment 3
-    param e f g hlskdjflskdfjsd #comment 4
-        flksdjf sldkfjsldkfjsdlf lsdkfjsldkfjlsdkjflskdjflsdkjfl lkjsdlfjsdlfkjsdlfj;
-}
+virtual a {
+    option "aaa aa cc";
+    param { # comment 1
+            a b;
+            c d;
+            x y z; # comment 2
+    }
+    param e f g h; # comment 3
+    param e f g hlskdjflskdfjsd #comment 4
+        flksdjf sldkfjsldkfjsdlf lsdkfjsldkfjlsdkjflskdjflsdkjfl lkjsdlfjsdlfkjsdlfj;
+}
diff --git a/xorg-server/hw/dmx/config/test-k.in b/xorg-server/hw/dmx/config/test-k.in
index 2218d26d9..937e8ee27 100644
--- a/xorg-server/hw/dmx/config/test-k.in
+++ b/xorg-server/hw/dmx/config/test-k.in
@@ -1,3 +1,3 @@
-virtual a {
-    option +xinerama -syncbatch 0;
-}
+virtual a {
+    option +xinerama -syncbatch 0;
+}
diff --git a/xorg-server/hw/dmx/config/test-k.out b/xorg-server/hw/dmx/config/test-k.out
index ebd743923..cdfd70358 100644
--- a/xorg-server/hw/dmx/config/test-k.out
+++ b/xorg-server/hw/dmx/config/test-k.out
@@ -1,3 +1,3 @@
-virtual a {
-    option "+xinerama -syncbatch 0";
-}
+virtual a {
+    option "+xinerama -syncbatch 0";
+}
diff --git a/xorg-server/hw/dmx/config/test-l.in b/xorg-server/hw/dmx/config/test-l.in
index 7bf05139b..d04c47b9a 100644
--- a/xorg-server/hw/dmx/config/test-l.in
+++ b/xorg-server/hw/dmx/config/test-l.in
@@ -1,12 +1,12 @@
-virtual a {
-    display d0:0 1x2;
-    display d1:0 +3+4;
-    display d2:0 100x200 @1x1;
-    display d3:0 +3+4 @2x2;
-    display d4:0 100x200+3+4 @3x3;
-    display d5:0 / 1x2+3+4;
-    display d6:0 / 1x2;
-    display d7:0 / +3+4;
-    display d8:0 / 1x2+3+4 @4x4;
-    display d9:0 11x22+33+44 / 111x222+333+444 @1000x1100;
-}
+virtual a {
+    display d0:0 1x2;
+    display d1:0 +3+4;
+    display d2:0 100x200 @1x1;
+    display d3:0 +3+4 @2x2;
+    display d4:0 100x200+3+4 @3x3;
+    display d5:0 / 1x2+3+4;
+    display d6:0 / 1x2;
+    display d7:0 / +3+4;
+    display d8:0 / 1x2+3+4 @4x4;
+    display d9:0 11x22+33+44 / 111x222+333+444 @1000x1100;
+}
diff --git a/xorg-server/hw/dmx/config/test-l.out b/xorg-server/hw/dmx/config/test-l.out
index 7bf05139b..d04c47b9a 100644
--- a/xorg-server/hw/dmx/config/test-l.out
+++ b/xorg-server/hw/dmx/config/test-l.out
@@ -1,12 +1,12 @@
-virtual a {
-    display d0:0 1x2;
-    display d1:0 +3+4;
-    display d2:0 100x200 @1x1;
-    display d3:0 +3+4 @2x2;
-    display d4:0 100x200+3+4 @3x3;
-    display d5:0 / 1x2+3+4;
-    display d6:0 / 1x2;
-    display d7:0 / +3+4;
-    display d8:0 / 1x2+3+4 @4x4;
-    display d9:0 11x22+33+44 / 111x222+333+444 @1000x1100;
-}
+virtual a {
+    display d0:0 1x2;
+    display d1:0 +3+4;
+    display d2:0 100x200 @1x1;
+    display d3:0 +3+4 @2x2;
+    display d4:0 100x200+3+4 @3x3;
+    display d5:0 / 1x2+3+4;
+    display d6:0 / 1x2;
+    display d7:0 / +3+4;
+    display d8:0 / 1x2+3+4 @4x4;
+    display d9:0 11x22+33+44 / 111x222+333+444 @1000x1100;
+}
diff --git a/xorg-server/hw/dmx/dmxextension.c b/xorg-server/hw/dmx/dmxextension.c
index faa28a590..d7296ae2d 100644
--- a/xorg-server/hw/dmx/dmxextension.c
+++ b/xorg-server/hw/dmx/dmxextension.c
@@ -1318,7 +1318,7 @@ dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
     }
 
     /* Initialize the BE screen resources */
-    dmxBEScreenInit(idx, screenInfo.screens[idx]);
+    dmxBEScreenInit(screenInfo.screens[idx]);
 
     /* TODO: Handle GLX visual initialization.  GLXProxy needs to be
      * updated to handle dynamic addition/removal of screens. */
diff --git a/xorg-server/hw/dmx/dmxscrinit.c b/xorg-server/hw/dmx/dmxscrinit.c
index 37b3f3b5a..849ef16a1 100644
--- a/xorg-server/hw/dmx/dmxscrinit.c
+++ b/xorg-server/hw/dmx/dmxscrinit.c
@@ -59,7 +59,7 @@
 #include "mipointer.h"
 #include "micmap.h"
 
-extern Bool dmxCloseScreen(int idx, ScreenPtr pScreen);
+extern Bool dmxCloseScreen(ScreenPtr pScreen);
 static Bool dmxSaveScreen(ScreenPtr pScreen, int what);
 
 static unsigned long dmxGeneration;
@@ -77,9 +77,9 @@ DevPrivateKeyRec dmxGlyphSetPrivateKeyRec;
 /** Initialize the parts of screen \a idx that require access to the
  *  back-end server. */
 void
-dmxBEScreenInit(int idx, ScreenPtr pScreen)
+dmxBEScreenInit(ScreenPtr pScreen)
 {
-    DMXScreenInfo *dmxScreen = &dmxScreens[idx];
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
     XSetWindowAttributes attribs;
     XGCValues gcvals;
     unsigned long mask;
@@ -192,11 +192,11 @@ dmxBEScreenInit(int idx, ScreenPtr pScreen)
     }
 }
 
-/** Initialize screen number \a idx. */
+/** Initialize screen number \a pScreen->myNum. */
 Bool
-dmxScreenInit(int idx, ScreenPtr pScreen, int argc, char *argv[])
+dmxScreenInit(ScreenPtr pScreen, int argc, char *argv[])
 {
-    DMXScreenInfo *dmxScreen = &dmxScreens[idx];
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
     int i, j;
 
     if (!dixRegisterPrivateKey(&dmxScreenPrivateKeyRec, PRIVATE_SCREEN, 0))
@@ -286,20 +286,20 @@ dmxScreenInit(int idx, ScreenPtr pScreen, int argc, char *argv[])
     }
     else {
         MAXSCREENSALLOC(dmxCursorGeneration);
-        if (dmxCursorGeneration[idx] != serverGeneration) {
+        if (dmxCursorGeneration[pScreen->myNum] != serverGeneration) {
             if (!(miPointerInitialize(pScreen,
                                       &dmxPointerSpriteFuncs,
                                       &dmxPointerCursorFuncs, FALSE)))
                 return FALSE;
 
-            dmxCursorGeneration[idx] = serverGeneration;
+            dmxCursorGeneration[pScreen->myNum] = serverGeneration;
         }
     }
 
     DMX_WRAP(CloseScreen, dmxCloseScreen, dmxScreen, pScreen);
     DMX_WRAP(SaveScreen, dmxSaveScreen, dmxScreen, pScreen);
 
-    dmxBEScreenInit(idx, pScreen);
+    dmxBEScreenInit(pScreen);
 
     if (!dmxShadowFB) {
         /* Wrap GC functions */
@@ -422,12 +422,12 @@ dmxBECloseScreen(ScreenPtr pScreen)
 
 /** Close screen number \a idx. */
 Bool
-dmxCloseScreen(int idx, ScreenPtr pScreen)
+dmxCloseScreen(ScreenPtr pScreen)
 {
-    DMXScreenInfo *dmxScreen = &dmxScreens[idx];
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
 
     /* Reset the proc vectors */
-    if (idx == 0) {
+    if (pScreen->myNum == 0) {
         dmxResetRender();
         dmxResetFonts();
     }
@@ -498,7 +498,7 @@ dmxCloseScreen(int idx, ScreenPtr pScreen)
     }
 
     DMX_UNWRAP(CloseScreen, dmxScreen, pScreen);
-    return pScreen->CloseScreen(idx, pScreen);
+    return pScreen->CloseScreen(pScreen);
 }
 
 static Bool
diff --git a/xorg-server/hw/dmx/dmxscrinit.h b/xorg-server/hw/dmx/dmxscrinit.h
index 5c0bfacce..9fe9c9844 100644
--- a/xorg-server/hw/dmx/dmxscrinit.h
+++ b/xorg-server/hw/dmx/dmxscrinit.h
@@ -40,9 +40,9 @@
 
 #include "scrnintstr.h"
 
-extern Bool dmxScreenInit(int idx, ScreenPtr pScreen, int argc, char *argv[]);
+extern Bool dmxScreenInit(ScreenPtr pScreen, int argc, char *argv[]);
 
-extern void dmxBEScreenInit(int idx, ScreenPtr pScreen);
+extern void dmxBEScreenInit(ScreenPtr pScreen);
 extern void dmxBECloseScreen(ScreenPtr pScreen);
 
 #endif                          /* DMXSCRINIT_H */
diff --git a/xorg-server/hw/dmx/doc/.gitignore b/xorg-server/hw/dmx/doc/.gitignore
new file mode 100644
index 000000000..9629c1538
--- /dev/null
+++ b/xorg-server/hw/dmx/doc/.gitignore
@@ -0,0 +1,6 @@
+*.html
+*.pdf
+*.ps
+*.txt
+!DMXSpec.txt
+!DMXSpec-v1.txt
diff --git a/xorg-server/hw/dmx/doc/DMXSpec-v1.txt b/xorg-server/hw/dmx/doc/DMXSpec-v1.txt
index cea97b9fe..19a50f2f5 100644
--- a/xorg-server/hw/dmx/doc/DMXSpec-v1.txt
+++ b/xorg-server/hw/dmx/doc/DMXSpec-v1.txt
@@ -1,458 +1,458 @@
-
-
-            Client-to-Server DMX Extension to the X Protocol
-
-           $Date$, $Revision$
-
-               Rickard E. (Rik) Faith (faith@redhat.com)
-                    Kevin E. Martin (kem@redhat.com)
-
-    Copyright 2002,2003 Red Hat Inc., Raleigh, North Carolina.
-
-    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 on 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 (including the
-    next paragraph) 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
-    NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-    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.
-
-
-
-1. Overview
-
-    The client-to-server DMX extension to the X protocol (DMX) provides
-    normal client applications with the ability to determine information
-    about the characteristics of the Xdmx server and the back-end X
-    servers that DMX is using.
-
-    The name for this extension is "DMX".
-
-
-
-2. Syntactic conventions
-
-    This document uses the same syntactic conventions requests and data
-    types as [X11R6.4].
-
-
-
-3. Data types
-
-    No new data types are defined by this extension.  All data types
-    referenced in this document are defined in [X11R6.4].
-
-
-
-4. Requests
-
-    DMXQueryVersion
-        ==>
-        majorVersion: CARD32
-        minorVersion: CARD32
-        patchVersion: CARD32
-
-    The protocol this extension actually supports is indicated by
-    majorVersion and minorVersion (patchVersion indicates the
-    patchlevel and is for informational purposes only).
-
-    Any incompatible changes to the protocol should be indicated by
-    incrementing majorVersion.
-
-    Small, upward-compatible changes should be indicated by incrementing
-    minorVersion.
-
-    Servers that support the protocol defined in this document will
-    return a majorVersion of 1 and a minorVersion of 1.
-
-
-
-    DMXGetScreenCount
-        ==>
-        screenCount: CARD32
-
-    This request returns the number of back-end screens that the Xdmx
-    server controls.  A back-end screen may be managed as a regular X
-    screen in the Xdmx server or may be joined with other back-end
-    screens using Xinerama.  (The information returned by this request
-    does not change while Xdmx is running and may be cached on the
-    client side.)
-    
-
-
-    DMXGetScreenInformation
-        physicalScreen: CARD32
-        ==>
-        displayName: STRING8
-        width: CARD16
-        height: CARD16
-        xoffset: INT16
-        yoffset: INT16
-        logicalScreen: CARD32
-        xorigin: INT16
-        yorigin: INT16
-
-        Errors: Value
-
-    This request returns information about individual back-end screens.
-    The physicalScreen value is between 0 and screenCount-1, inclusive
-    (values outside this range will result in a Value error).  The
-    displayname is the name used to open the display, either from the
-    Xdmx command-line or from the configuration file.  The width,
-    height, xoffset, and yoffset values comprise a geometry
-    specification (see X(7x)) for the location of the DMX window on the
-    back-end screen.  This request will always return non-negative
-    (i.e., normalized) values for xoffset and yoffset.  The
-    logicalScreen value is the value of the screen that that Xdmx server
-    exports to clients.  When Xinerama is in use, this value is
-    typically 0 for all values of physicalScreen.  If Xinerama is in
-    use, the xorigin and yorigin values specify where the physical
-    screen is positioned in the global Xinerama coordinate system.
-    Otherwise, these values are set to 0.  (The information returned by
-    this request does not change while Xdmx is running and may be cached
-    on the client side.)
-
-
-
-    DMXGetWindowInformation
-        window: CARD32
-        ==>
-        screenCount: CARD32
-        screens: LISTofCARD32
-        windows: LISTofCARD32
-        pos: LISTofRECTANGLE
-        vis: LISTofRECTANGLE
-
-        Errors: Window, Alloc
-
-    This request computed the return values incorrectly for version 1.0
-    of this protocol.  Version 1.1 of this protocol conforms to this
-    description.
-
-    Given a window ID on the Xdmx server, this request returns data
-    about how the window is represented on the back-end X servers.  For
-    each back-end X server that displays a portion of the window, the
-    following information is returned:
-        1) the number of the physical screen containing that portion
-           (which can be used with the DMXGetScreenInformation request
-           to obtain more information about the screen),
-        2) the window ID on the back-end X server of the window
-           containing that portion,
-        3) the position and dimensions of the window on the back-end, in
-           screen coordinates, and
-        4) the visible area of the window on the back-end, in
-           window-relative coordinates (all zeros for windows that are
-           not visible)
-    Note that DMX allows multiple back-end windows to overlap in their
-    view of the DMX logical window.  Further, a logical window does not
-    have to be completely covered by back-end windows -- there may be
-    gaps.
-
-    As an example, consider a 500x500 window that spans the top two
-    1024x768 back-end displays (A and B) of a 2048x1536 DMX display
-    composed of 4 1024x768 back-end displays arranged in a cube:
-        A B
-        C D
-
-    In this case, the DMXGetWindowInformation call would return the
-    following information for the 500x500 window:
-
-    display A: 500x500 window at 1024-250,0 (relative to back end)
-               with 250x500 visible at 0,0 (relative to window origin)
-
-    display B: 500x500 window at -250,0 (relative to back end)
-               with 250x500 visible at 250,0 (relative to window origin)
-
-    display C: 500x500 window at 1024-250,-768 with 0x0 visible at 0,0
-
-    display D: 500x500 window at -250,-768 with 0x0 visible at 0,0
-
-    Note that if the specified window has not yet been mapped when
-    DMXGetWindowInformation is called, then a subsequent XMapWindow call
-    might be buffered in xlib while requests directly to the back-end X
-    servers are processed.  This race condition can be solved by calling
-    DMXSync before talking directly to the back-end X servers.
-
-
-    DMXGetInputCount
-        ==>
-        inputCount: CARD32
-
-    This request was first supported in version 1.1 of this protocol.
-
-    This request returns the number of input devices connected to the
-    Xdmx server.  This number is the same as that returned by
-    XListInputDevices, but is available even when the XInput extension
-    is not supported.
-
-
-
-    DMXGetInputInformation
-        deviceId: CARD32
-        ==>
-        inputType: CARD32
-        physicalScreen: CARD32
-        physicalId: CARD32
-        isCore: BOOL
-        sendsCore: BOOL
-        name: STRING8
-
-        Errors: Value
-
-    This request was first supported in version 1.1 of this protocol.
-
-    This request returns information about the specified input device
-    that cannot be obtained from the XListInputDeivices call.  The
-    deviceId is the same as that used by the XListInputDevices call, and
-    must be in the range 0 to inputCount-1, inclusive (values outside
-    this range will result in a Value error).
-
-    The value of inputType will always be value, and will be one of the
-    following values:
-        0 for local (and dummy) devices,
-        1 for console devices, and
-        2 for back-end devices.
-
-    For local devices, all other fields returned, except isCore and
-    sendsCore, are invalid.
-
-    For console devices, the physicalScreen and physicalID will be
-    invalid, and the name will return the name of the X server on which
-    the console window is displayed.
-
-    For back-end devices, the physicalScreen will identify the back-end
-    display and can be used as an argument to DMXGetScreenInformation to
-    obtain more information; the physicalId will be the XInput device id
-    on the back-end X server; and the name will be invalid (since it
-    does not provide any additional information that cannot be obtained
-    with DMXGetScreenInformation).
-
-    If isCore is True, then this device is active as a true core input
-    device and will send core events.  If sendsCore is True, then this
-    device queried an XInput extension device, but sends core events
-    instead of extension events.  Note that this behavior is different
-    from that of XFree86, where XInput extension devices may send both
-    extension events and core events.
-
-
-
-    DMXForceWindowCreation
-        window: CARD32
-        ==>
-
-        Errors: Window
-
-    This request was first supported in version 1.2 of this protocol.
-
-    When using the lazy window creation optimization, windows are not
-    created on the back-end X servers until they are required.  This
-    request forces the immediate creation of the window requested.
-
-
-
-    DMXReconfigureScreen
-        screen: CARD32
-        x: INT16
-        y: INT16
-        ==>
-        status: CARD32
-
-        Errors: Value
-
-    This request was first supported in version 1.3 of this protocol.
-
-    This request reconfigures the screen position to coordinates (x,y)
-    when using the Xinerama extension.  Otherwise, it is a NOP.  Illegal
-    values for screen will result in a BadValue error.  Other non-fatal
-    errors will be returned in status.
-
-
-
-    DMXSync
-        ==>
-
-    This request was first supported in version 1.5 of this protocol.
-
-    This request flushes all pending protocol requests between the Xdmx
-    server and each back-end X server.  It is used by a client that
-    talks directly to back-end X servers
-
-    To ensure proper synchronization semantics, this request has a
-    reply, but the reply does not carry any information.
-
-
-
-5. Events
-
-    No new events are defined by this extension.
-
-
-
-6. Errors
-
-    No new events are defined by this extension.
-
-
-
-7. Encoding
-
-    DMXQueryVersion
-        1           CARD8           opcode (X assigned)
-        1           0               DMX opcode (X_DMXQueryVersion)
-        2           1               request length
-    ==>
-        1           1               Reply
-        1                           unused
-        2           CARD16          sequence number
-        4           0               reply length
-        4           CARD32          majorVersion
-        4           CARD32          minorVersion
-        4           CARD32          patchVersion
-        12                          unused
-
-    DMXGetScreenCount
-        1           CARD8           opcode (X assigned)
-        1           1               DMX opcode (X_DMXGetScreenCount)
-        2           1               request length
-    ==>
-        1           1               Reply
-        1                           unused
-        2           CARD16          sequence number
-        4           0               reply length
-        4           CARD32          screenCount
-        20                          unused
-
-    DMXGetScreenInformation
-        1           CARD8           opcode (X assigned)
-        1           2               DMX opcode (X_DMXGetScreenInformation)
-        2           2               request length
-        4           CARD32          physicalScreen
-    ==>
-        1           1               Reply
-        1                           unused
-        2           CARD16          sequence number
-        4           n/4+p           reply length
-        4           n               displayNameLength
-        2           CARD16          width
-        2           CARD16          height
-        2           INT16           xoffset
-        2           INT16           yoffset
-        4           CARD32          logicalScreen
-        2           INT16           xorigin
-        2           INT16           yorigin
-        4                           unused
-        n                           displayName
-        p                           pad(n)
-
-    DMXGetWindowInformation
-        1           CARD8           opcode (X assigned)
-        1           3               DMX opcode (X_DMXGetWindowInformation)
-        2           2               request length
-        4           CARD32          window
-    ==>
-        1           1               Reply
-        1                           unused
-        2           CARD16          sequence number
-        4           n*6             reply length
-        4           n               screenCount
-        20                          unused
-        n*4         LISTofCARD32    screens
-        n*4         LISTofCARD32    windows
-        n*8         LISTofRECTANGLE pos
-        n*8         LISTofRECTANGLE vis
-
-    DMXGetInputCount
-        1           CARD8           opcode (X assigned)
-        1                           DMX opcode (X_DMXGetInputCount)
-        2           1               request length
-    ==>
-        1           1               Reply
-        1                           unused
-        2           CARD16          sequence number
-        4           0               reply length
-        4           CARD32          inputCount
-        20                          unused
-
-    DMXGetInputInformation
-        1           CARD8           opcode (X assigned)
-        1           4               DMX opcode (X_DMXGetInputInformation)
-        2           2               request length
-        4           CARD32          deviceId
-    ==>
-        1           1               Reply
-        1                           unused
-        2           CARD16          sequence number
-        4           n/4+p           reply length
-        4           CARD32          inputType
-        4           CARD32          physicalScreen
-        4           CARD32          physicalId
-        4           n               nameLength
-        1           BOOL            isCore
-        1           BOOL            sendsCore
-        6                           unused
-        n                           name
-        p                           pad(n)
-
-    DMXForceWindowCreation
-        1           CARD8           opcode (X assigned)
-        1           2               DMX opcode (X_DMXForceWindowCreation)
-        2           2               request length
-        4           CARD32          window
-    ==>
-
-    DMXReconfigureScreen
-        1           CARD8           opcode (X assigned)
-        1           2               DMX opcode (X_DMXReconfigureScreen)
-        2           2               request length
-        4           CARD32          screen
-        2           INT16           x
-        2           INT16           y
-    ==>
-        1           1               Reply
-        1                           unused
-        2           CARD16          sequence number
-        4           0               reply length
-        4           CARD32          status
-        20                          unused
-
-    DMXSync
-        1           CARD8           opcode (X assigned)
-        1           0               DMX opcode (X_DMXSync)
-        2           1               request length
-    ==>
-        1           1               Reply
-        1                           unused
-        2           CARD16          sequence number
-        4           0               reply length
-        24                          unused
-
-
-8. Changes to existing requests/replies/events
-
-    No changes to existing requests, replies, or events are necessitated
-    by this extension.
-
-
-
-9. Acknowledgments
-
-
-
-10. References
-
-    [X11R6.4] Robert W. Sheifler.  X Window System Protocol, X Consortium
-              Standard, X Version 11, Release 6.4.  Available from
-              xc/doc/specs/XProtocol and xc/doc/hardcopy/XProtocol.
+
+
+            Client-to-Server DMX Extension to the X Protocol
+
+           $Date$, $Revision$
+
+               Rickard E. (Rik) Faith (faith@redhat.com)
+                    Kevin E. Martin (kem@redhat.com)
+
+    Copyright 2002,2003 Red Hat Inc., Raleigh, North Carolina.
+
+    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 on 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 (including the
+    next paragraph) 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
+    NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+    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.
+
+
+
+1. Overview
+
+    The client-to-server DMX extension to the X protocol (DMX) provides
+    normal client applications with the ability to determine information
+    about the characteristics of the Xdmx server and the back-end X
+    servers that DMX is using.
+
+    The name for this extension is "DMX".
+
+
+
+2. Syntactic conventions
+
+    This document uses the same syntactic conventions requests and data
+    types as [X11R6.4].
+
+
+
+3. Data types
+
+    No new data types are defined by this extension.  All data types
+    referenced in this document are defined in [X11R6.4].
+
+
+
+4. Requests
+
+    DMXQueryVersion
+        ==>
+        majorVersion: CARD32
+        minorVersion: CARD32
+        patchVersion: CARD32
+
+    The protocol this extension actually supports is indicated by
+    majorVersion and minorVersion (patchVersion indicates the
+    patchlevel and is for informational purposes only).
+
+    Any incompatible changes to the protocol should be indicated by
+    incrementing majorVersion.
+
+    Small, upward-compatible changes should be indicated by incrementing
+    minorVersion.
+
+    Servers that support the protocol defined in this document will
+    return a majorVersion of 1 and a minorVersion of 1.
+
+
+
+    DMXGetScreenCount
+        ==>
+        screenCount: CARD32
+
+    This request returns the number of back-end screens that the Xdmx
+    server controls.  A back-end screen may be managed as a regular X
+    screen in the Xdmx server or may be joined with other back-end
+    screens using Xinerama.  (The information returned by this request
+    does not change while Xdmx is running and may be cached on the
+    client side.)
+    
+
+
+    DMXGetScreenInformation
+        physicalScreen: CARD32
+        ==>
+        displayName: STRING8
+        width: CARD16
+        height: CARD16
+        xoffset: INT16
+        yoffset: INT16
+        logicalScreen: CARD32
+        xorigin: INT16
+        yorigin: INT16
+
+        Errors: Value
+
+    This request returns information about individual back-end screens.
+    The physicalScreen value is between 0 and screenCount-1, inclusive
+    (values outside this range will result in a Value error).  The
+    displayname is the name used to open the display, either from the
+    Xdmx command-line or from the configuration file.  The width,
+    height, xoffset, and yoffset values comprise a geometry
+    specification (see X(7x)) for the location of the DMX window on the
+    back-end screen.  This request will always return non-negative
+    (i.e., normalized) values for xoffset and yoffset.  The
+    logicalScreen value is the value of the screen that that Xdmx server
+    exports to clients.  When Xinerama is in use, this value is
+    typically 0 for all values of physicalScreen.  If Xinerama is in
+    use, the xorigin and yorigin values specify where the physical
+    screen is positioned in the global Xinerama coordinate system.
+    Otherwise, these values are set to 0.  (The information returned by
+    this request does not change while Xdmx is running and may be cached
+    on the client side.)
+
+
+
+    DMXGetWindowInformation
+        window: CARD32
+        ==>
+        screenCount: CARD32
+        screens: LISTofCARD32
+        windows: LISTofCARD32
+        pos: LISTofRECTANGLE
+        vis: LISTofRECTANGLE
+
+        Errors: Window, Alloc
+
+    This request computed the return values incorrectly for version 1.0
+    of this protocol.  Version 1.1 of this protocol conforms to this
+    description.
+
+    Given a window ID on the Xdmx server, this request returns data
+    about how the window is represented on the back-end X servers.  For
+    each back-end X server that displays a portion of the window, the
+    following information is returned:
+        1) the number of the physical screen containing that portion
+           (which can be used with the DMXGetScreenInformation request
+           to obtain more information about the screen),
+        2) the window ID on the back-end X server of the window
+           containing that portion,
+        3) the position and dimensions of the window on the back-end, in
+           screen coordinates, and
+        4) the visible area of the window on the back-end, in
+           window-relative coordinates (all zeros for windows that are
+           not visible)
+    Note that DMX allows multiple back-end windows to overlap in their
+    view of the DMX logical window.  Further, a logical window does not
+    have to be completely covered by back-end windows -- there may be
+    gaps.
+
+    As an example, consider a 500x500 window that spans the top two
+    1024x768 back-end displays (A and B) of a 2048x1536 DMX display
+    composed of 4 1024x768 back-end displays arranged in a cube:
+        A B
+        C D
+
+    In this case, the DMXGetWindowInformation call would return the
+    following information for the 500x500 window:
+
+    display A: 500x500 window at 1024-250,0 (relative to back end)
+               with 250x500 visible at 0,0 (relative to window origin)
+
+    display B: 500x500 window at -250,0 (relative to back end)
+               with 250x500 visible at 250,0 (relative to window origin)
+
+    display C: 500x500 window at 1024-250,-768 with 0x0 visible at 0,0
+
+    display D: 500x500 window at -250,-768 with 0x0 visible at 0,0
+
+    Note that if the specified window has not yet been mapped when
+    DMXGetWindowInformation is called, then a subsequent XMapWindow call
+    might be buffered in xlib while requests directly to the back-end X
+    servers are processed.  This race condition can be solved by calling
+    DMXSync before talking directly to the back-end X servers.
+
+
+    DMXGetInputCount
+        ==>
+        inputCount: CARD32
+
+    This request was first supported in version 1.1 of this protocol.
+
+    This request returns the number of input devices connected to the
+    Xdmx server.  This number is the same as that returned by
+    XListInputDevices, but is available even when the XInput extension
+    is not supported.
+
+
+
+    DMXGetInputInformation
+        deviceId: CARD32
+        ==>
+        inputType: CARD32
+        physicalScreen: CARD32
+        physicalId: CARD32
+        isCore: BOOL
+        sendsCore: BOOL
+        name: STRING8
+
+        Errors: Value
+
+    This request was first supported in version 1.1 of this protocol.
+
+    This request returns information about the specified input device
+    that cannot be obtained from the XListInputDeivices call.  The
+    deviceId is the same as that used by the XListInputDevices call, and
+    must be in the range 0 to inputCount-1, inclusive (values outside
+    this range will result in a Value error).
+
+    The value of inputType will always be value, and will be one of the
+    following values:
+        0 for local (and dummy) devices,
+        1 for console devices, and
+        2 for back-end devices.
+
+    For local devices, all other fields returned, except isCore and
+    sendsCore, are invalid.
+
+    For console devices, the physicalScreen and physicalID will be
+    invalid, and the name will return the name of the X server on which
+    the console window is displayed.
+
+    For back-end devices, the physicalScreen will identify the back-end
+    display and can be used as an argument to DMXGetScreenInformation to
+    obtain more information; the physicalId will be the XInput device id
+    on the back-end X server; and the name will be invalid (since it
+    does not provide any additional information that cannot be obtained
+    with DMXGetScreenInformation).
+
+    If isCore is True, then this device is active as a true core input
+    device and will send core events.  If sendsCore is True, then this
+    device queried an XInput extension device, but sends core events
+    instead of extension events.  Note that this behavior is different
+    from that of XFree86, where XInput extension devices may send both
+    extension events and core events.
+
+
+
+    DMXForceWindowCreation
+        window: CARD32
+        ==>
+
+        Errors: Window
+
+    This request was first supported in version 1.2 of this protocol.
+
+    When using the lazy window creation optimization, windows are not
+    created on the back-end X servers until they are required.  This
+    request forces the immediate creation of the window requested.
+
+
+
+    DMXReconfigureScreen
+        screen: CARD32
+        x: INT16
+        y: INT16
+        ==>
+        status: CARD32
+
+        Errors: Value
+
+    This request was first supported in version 1.3 of this protocol.
+
+    This request reconfigures the screen position to coordinates (x,y)
+    when using the Xinerama extension.  Otherwise, it is a NOP.  Illegal
+    values for screen will result in a BadValue error.  Other non-fatal
+    errors will be returned in status.
+
+
+
+    DMXSync
+        ==>
+
+    This request was first supported in version 1.5 of this protocol.
+
+    This request flushes all pending protocol requests between the Xdmx
+    server and each back-end X server.  It is used by a client that
+    talks directly to back-end X servers
+
+    To ensure proper synchronization semantics, this request has a
+    reply, but the reply does not carry any information.
+
+
+
+5. Events
+
+    No new events are defined by this extension.
+
+
+
+6. Errors
+
+    No new events are defined by this extension.
+
+
+
+7. Encoding
+
+    DMXQueryVersion
+        1           CARD8           opcode (X assigned)
+        1           0               DMX opcode (X_DMXQueryVersion)
+        2           1               request length
+    ==>
+        1           1               Reply
+        1                           unused
+        2           CARD16          sequence number
+        4           0               reply length
+        4           CARD32          majorVersion
+        4           CARD32          minorVersion
+        4           CARD32          patchVersion
+        12                          unused
+
+    DMXGetScreenCount
+        1           CARD8           opcode (X assigned)
+        1           1               DMX opcode (X_DMXGetScreenCount)
+        2           1               request length
+    ==>
+        1           1               Reply
+        1                           unused
+        2           CARD16          sequence number
+        4           0               reply length
+        4           CARD32          screenCount
+        20                          unused
+
+    DMXGetScreenInformation
+        1           CARD8           opcode (X assigned)
+        1           2               DMX opcode (X_DMXGetScreenInformation)
+        2           2               request length
+        4           CARD32          physicalScreen
+    ==>
+        1           1               Reply
+        1                           unused
+        2           CARD16          sequence number
+        4           n/4+p           reply length
+        4           n               displayNameLength
+        2           CARD16          width
+        2           CARD16          height
+        2           INT16           xoffset
+        2           INT16           yoffset
+        4           CARD32          logicalScreen
+        2           INT16           xorigin
+        2           INT16           yorigin
+        4                           unused
+        n                           displayName
+        p                           pad(n)
+
+    DMXGetWindowInformation
+        1           CARD8           opcode (X assigned)
+        1           3               DMX opcode (X_DMXGetWindowInformation)
+        2           2               request length
+        4           CARD32          window
+    ==>
+        1           1               Reply
+        1                           unused
+        2           CARD16          sequence number
+        4           n*6             reply length
+        4           n               screenCount
+        20                          unused
+        n*4         LISTofCARD32    screens
+        n*4         LISTofCARD32    windows
+        n*8         LISTofRECTANGLE pos
+        n*8         LISTofRECTANGLE vis
+
+    DMXGetInputCount
+        1           CARD8           opcode (X assigned)
+        1                           DMX opcode (X_DMXGetInputCount)
+        2           1               request length
+    ==>
+        1           1               Reply
+        1                           unused
+        2           CARD16          sequence number
+        4           0               reply length
+        4           CARD32          inputCount
+        20                          unused
+
+    DMXGetInputInformation
+        1           CARD8           opcode (X assigned)
+        1           4               DMX opcode (X_DMXGetInputInformation)
+        2           2               request length
+        4           CARD32          deviceId
+    ==>
+        1           1               Reply
+        1                           unused
+        2           CARD16          sequence number
+        4           n/4+p           reply length
+        4           CARD32          inputType
+        4           CARD32          physicalScreen
+        4           CARD32          physicalId
+        4           n               nameLength
+        1           BOOL            isCore
+        1           BOOL            sendsCore
+        6                           unused
+        n                           name
+        p                           pad(n)
+
+    DMXForceWindowCreation
+        1           CARD8           opcode (X assigned)
+        1           2               DMX opcode (X_DMXForceWindowCreation)
+        2           2               request length
+        4           CARD32          window
+    ==>
+
+    DMXReconfigureScreen
+        1           CARD8           opcode (X assigned)
+        1           2               DMX opcode (X_DMXReconfigureScreen)
+        2           2               request length
+        4           CARD32          screen
+        2           INT16           x
+        2           INT16           y
+    ==>
+        1           1               Reply
+        1                           unused
+        2           CARD16          sequence number
+        4           0               reply length
+        4           CARD32          status
+        20                          unused
+
+    DMXSync
+        1           CARD8           opcode (X assigned)
+        1           0               DMX opcode (X_DMXSync)
+        2           1               request length
+    ==>
+        1           1               Reply
+        1                           unused
+        2           CARD16          sequence number
+        4           0               reply length
+        24                          unused
+
+
+8. Changes to existing requests/replies/events
+
+    No changes to existing requests, replies, or events are necessitated
+    by this extension.
+
+
+
+9. Acknowledgments
+
+
+
+10. References
+
+    [X11R6.4] Robert W. Sheifler.  X Window System Protocol, X Consortium
+              Standard, X Version 11, Release 6.4.  Available from
+              xc/doc/specs/XProtocol and xc/doc/hardcopy/XProtocol.
diff --git a/xorg-server/hw/dmx/doc/DMXSpec.txt b/xorg-server/hw/dmx/doc/DMXSpec.txt
index 4009f1210..078f83e26 100644
--- a/xorg-server/hw/dmx/doc/DMXSpec.txt
+++ b/xorg-server/hw/dmx/doc/DMXSpec.txt
@@ -1,875 +1,875 @@
-
-
-            Client-to-Server DMX Extension to the X Protocol
-
-           $Date$, $Revision$
-
-               Rickard E. (Rik) Faith (faith@redhat.com)
-                    Kevin E. Martin (kem@redhat.com)
-
-    Copyright 2002-2004 Red Hat Inc., Raleigh, North Carolina.
-
-    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 on 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 (including the
-    next paragraph) 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
-    NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-    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.
-
-
-
-1. Overview
-
-    The client-to-server DMX extension to the X protocol (DMX) provides
-    normal client applications with the ability to determine information
-    about the characteristics of the Xdmx server and the back-end X
-    servers that DMX is using.
-
-    The name for this extension is "DMX".
-
-
-
-2. Syntactic conventions
-
-    This document uses the same syntactic conventions requests and data
-    types as [X11R6.4].
-
-
-
-3. Data types
-
-    No new data types are defined by this extension.  All data types
-    referenced in this document are defined in [X11R6.4].
-
-
-
-4. Requests
-
-    DMXQueryVersion
-        ==>
-        majorVersion: CARD32
-        minorVersion: CARD32
-        patchVersion: CARD32
-
-        Errors: None
-
-    The protocol this extension actually supports is indicated by
-    majorVersion and minorVersion (patchVersion indicates the
-    patchlevel and is for informational purposes only).
-
-    Any incompatible changes to the protocol should be indicated by
-    incrementing majorVersion.
-
-    Small, upward-compatible changes should be indicated by incrementing
-    minorVersion.
-
-    Servers that support the protocol defined in this document will
-    return a majorVersion of 2 and a minorVersion of 2.
-
-    (Version 1.5 was the last version in the 1.x series; version 2.0 was
-    a testing version that was poorly defined.)
-
-
-
-    DMXSync
-        ==>
-        status: CARD32
-
-        Errors: None
-
-    This request was first supported in version 1.5 of this protocol.
-    The status field in the reply was introduced in version 2.0 of this
-    protocol.  Since the status field is ignored, no changes to the
-    underlying protocol were required.
-
-    This request flushes all pending protocol requests between the Xdmx
-    server and each back-end X server.  It is used by clients that
-    talk directly to back-end X servers to ensure that all pending Xdmx
-    requests have reached all back-end servers and have been processed
-    by those servers.
-
-    The value of status is always 0.
-
-
-
-    DMXForceWindowCreation
-        window: CARD32
-        ==>
-        status: CARD32
-
-        Errors: Window
-
-    This request was first supported in version 1.2 of this protocol.
-    This request was changed to have a reply in version 2.0 of this
-    protocol.  The old version of this request was deprecated and will
-    return BadImplementation.
-
-    When using the lazy window creation optimization, windows are not
-    created on the back-end X servers until they are required.  This
-    request forces the immediate creation of the window requested.
-
-    The value of status is always 0.
-
-
-
-
-    DMXGetScreenCount
-        ==>
-        screenCount: CARD32
-
-        Errors: None
-
-    This request returns the number of screens that the Xdmx server
-    controls.  Since a DMX screen usually fills all of the available
-    area on a back-end server, there is usually a one-to-one
-    correspondence between DMX screens and backend servers.  However, it
-    is also possible for a DMX screen to cover only part of the
-    available area on a back-end server, and for more than one DMX
-    screen to occupy different parts of the visible area on the same
-    back-end server.
-
-    A DMX screen may be managed as a regular X screen in the Xdmx server
-    or may be joined with other DMX screens using Xinerama.
-    
-
-
-    DMXGetScreenAttributes
-        physicalScreen: CARD32
-        ==>
-        displayName: STRING8
-        logicalScreen: CARD32
-        screenWindowWidth: CARD16
-        screenWindowHeight: CARD16
-        screenWindowXoffset: INT16
-        screenWindowYoffset: INT16
-        rootWindowWidth: CARD16
-        rootWindowHeight: CARD16
-        rootWindowXoffset: INT16
-        rootWindowYoffset: INT16
-        rootWindowXorigin: INT16
-        rootWindowYorigin: INT16
-
-        Errors: Value
-
-    This request is new in version 2.0 of this protocol.  The old
-    DMXGetScreenInformation request is deprecated and will now return
-    BadImplementation.
-
-    This request returns attributes about a single DMX screen.
-
-    The physicalScreen value is between 0 and screenCount-1, inclusive
-    (values outside this range will result in a Value error).
-
-    The displayname is the name used to open the display, either from
-    the Xdmx command-line or from the configuration file.
-
-    The logicalScreen value is the value of the screen that that Xdmx
-    server exports to clients.  When Xinerama is in use, this value is
-    typically 0 for all values of physicalScreen.  If Xinerama is in
-    use, the rootWindowXOrigin and rootWindowYOrigin values specify
-    where the physical screen is positioned in the global Xinerama
-    coordinate system.  Otherwise, these values are set to 0.
-
-    The screenWindow values comprise a geometry specification (see
-    X(7x)) for the location of the DMX screen on the back-end screen.
-    The coordinant system of the back-end display is used.
-
-    The first four rootWindow values comprise a geometry specification
-    (see X(7x)) for the location of the root window on the screen
-    window.  The coordinant system of the screen window is used.  In
-    most cases, the root window will have the same geometry as the DMX
-    screen window, and will occupy the same area of the back-end
-    display.  (This would not be the case, for example, if automatic
-    projector alignment is used.)
-
-
-
-    DMXChangeScreensAttributes
-        screenCount: CARD32
-        maskCount: CARD32
-        screens: LISTofCARD32
-        valueMasks: LISTofCARD32
-        valueList: LISTofVALUES
-        ==>
-        status: CARD32
-        errorScreen: CARD32
-
-        Errors: Length, Alloc
-
-    This request was first supported in version 2.0 of this protocol.
-    (A singular version of this request with the ability to change some
-    RootWindow attributes was supported in version 1.3 of this protocol,
-    has been deprecated, and will return BadImplementation.)
-
-    This request changes the geometries and positions of the DMX screen
-    and DMX root windows on the back-end X servers.
-   
-    The valueMask and valueList specify which attributes are to be
-    changed.  The possible values are:
-
-        Attribute               Type
-
-        ScreenWindowWidth       CARD16
-        ScreenWindowHeight      CARD16
-        ScreenWindowXoffset     INT16
-        ScreenWindowYoffset     INT16
-        RootWindowWidth         CARD16
-        RootWindowHeight        CARD16
-        RootWindowXoffset       INT16
-        RootWindowYoffset       INT16
-        RootWindowXorigin       INT16
-        RootWindowYorigin       INT16
-
-    The attribute values have the same meaning as do the corresponding
-    values for DMXGetScreenAttributes.
-
-    Non-fatal errors will be returned in status (0 otherwise):
-        DmxBadXinerama: Xinerama is not active
-        DmxBadValue:    The resulting position is not allowed
-                        (e.g., one corner is outside the bounding box)
-    On error, errorScreen will contain the number of the screen that
-    caused the first error.
-
-
-
-    DMXAddScreen
-        displayName: STRING8
-        physicalScreen: CARD32
-        valueMask: CARD32
-        valueList: LISTofVALUES
-        ==>
-        status: CARD32
-        physicalScreen: CARD32
-
-        Errors: Length, Alloc, Value
-
-    This request was first supported in version 2.2 of this protocol.
-
-    This request re-attaches the back-end physicalScreen to the Xdmx
-    server.  Only back-end screens that have been previously detached
-    with DMXRemoveScreen may be added.  The name of the back-end display
-    is given in displayName, and this will replace the name of the
-    back-end screen that was detached.  Both the displayName and
-    physicalScreen must be correct for this request to work.
-
-    The valueMask and valueList specify the attributes to be used.  The
-    possible values are:
-
-        Attribute               Type
-
-        ScreenWindowWidth       CARD16
-        ScreenWindowHeight      CARD16
-        ScreenWindowXoffset     INT16
-        ScreenWindowYoffset     INT16
-        RootWindowWidth         CARD16
-        RootWindowHeight        CARD16
-        RootWindowXoffset       INT16
-        RootWindowYoffset       INT16
-        RootWindowXorigin       INT16
-        RootWindowYorigin       INT16
-
-    The attribute values have the same meaning as do the corresponding
-    values for DMXGetScreenAttributes.
-
-    On success, status will be 0 and physicalScreen will contain the new
-    screen number.  On failure, status will be non-zero.  The status
-    will be 1 if any of the following occured:
-        * the -addremovescreens command-line option was not specified on
-          the Xdmx command line
-        * the value of physicalScreen is out of range
-        * physicalScreen has not been detached (with DMXRemoveScreen)
-        * displayName cannot be opened
-        * the visuals of displayname do not match the visuals that Xdmx
-          is using
-        * the screen data for displayName does not match the data for the
-          previously removed display
-    The status will be DmxBadValue if the attribute values are out of
-    range.
-
-
-
-    DMXRemoveScreen
-        physicalScreen: CARD32
-        ==>
-        status: CARD32
-
-        Errors: None
-
-    This request was first supported in version 2.2 of this protocol.
-
-    This request detaches the physicalScreen screen.
-
-    On success, status will be 0.  On failure, the status will 1 if any
-    of the following occur:
-        * the -addremovescreens command-line option was not specified on
-          the Xdmx command line
-        * the value of physicalScreen is out of range
-        * the back-end screen has already been detached.
-
-
-
-    DMXGetWindowAttributes
-        window: CARD32
-        ==>
-        screenCount: CARD32
-        screens: LISTofCARD32
-        windows: LISTofCARD32
-        pos: LISTofRECTANGLE
-        vis: LISTofRECTANGLE
-
-        Errors: Window, Alloc
-
-    This request computes the return values incorrectly for version 1.0
-    of this protocol.  Version 1.1 of this protocol conforms to this
-    description.  In version 2.0, the name of this request was changed
-    from DMXGetWindowInformation.  However, since the request itself did
-    not change, no changes to the underlying protocol were made.
-
-    Given a window ID on the Xdmx server, this request returns data
-    about how the window is represented on the back-end X servers.  For
-    each back-end X server that displays a portion of the window, the
-    following information is returned:
-        1) the number of the physical screen containing that portion
-           (which can be used with the DMXGetScreenAttributes request
-           to obtain more information about the screen),
-        2) the window ID on the back-end X server of the window
-           containing that portion,
-        3) the position and dimensions of the window on the back-end, in
-           screen coordinates, and
-        4) the visible area of the window on the back-end, in
-           window-relative coordinates (all zeros for windows that are
-           not visible).
-    Note that DMX allows multiple back-end windows to overlap in their
-    view of the DMX logical window.  Further, a logical window does not
-    have to be completely covered by back-end windows -- there may be
-    gaps.
-
-    As an example, consider a 500x500 window that spans the top two
-    1024x768 back-end displays (A and B) of a 2048x1536 DMX display
-    composed of 4 1024x768 back-end displays arranged in a cube:
-        A B
-        C D
-
-    In this case, the DMXGetWindowAttributes call would return the
-    following information for the 500x500 window:
-
-    display A: 500x500 window at 1024-250,0 (relative to back end)
-               with 250x500 visible at 0,0 (relative to window origin)
-
-    display B: 500x500 window at -250,0 (relative to back end)
-               with 250x500 visible at 250,0 (relative to window origin)
-
-    display C: 500x500 window at 1024-250,-768 with 0x0 visible at 0,0
-
-    display D: 500x500 window at -250,-768 with 0x0 visible at 0,0
-
-    Note that if the specified window has not yet been mapped when
-    DMXGetWindowAttributes is called, then a subsequent XMapWindow call
-    might be buffered in xlib while requests directly to the back-end X
-    servers are processed.  This race condition can be solved by calling
-    DMXSync before talking directly to the back-end X servers.
-
-
-
-    DMXGetDesktopAttributes
-        ==>
-        width: INT16
-        height: INT16
-        shiftX: INT16
-        shiftY: INT16
-
-        Errors: None
-
-    This request was first supported in version 2.0 of this protocol.
-
-    This request returns the size of the bounding box of the whole
-    screen in width and height.  The shiftX and shiftY values will
-    always be 0.  The global bounding box is computed whether or not
-    Xinerama is active, and may be larger than the Xinerama screen size
-    because of information in the configuration file.
-
-
-
-    DMXChangeDesktopAttributes
-        valueMask: BITMASK
-        valueList: LISTofVALUE
-        ==>
-        status: CARD32
-
-        Errors: Length, Value
-
-    This request was first supported in version 2.0 of this protocol.
-
-    This request resizes the bounding box of the whole screen when using
-    the Xinerama extension.  Otherwise, it has no effect on the screen
-    layout.  The valueMask and valueList specify which attributes are to
-    be changed.  The possible values are:
-
-        Attriubute      Type
-
-        Width           INT16
-        Height          INT16
-        ShiftX          INT16
-        ShiftY          INT16
-
-    Width and Height specify the new width and height for the bounding
-    box.  ShiftX and ShiftY specify where the Xinerama origin will be
-    placed with respect to the origin of the new bounding box.  This
-    allows the left and upper edges of the bounding box to be changed
-    without changing the visual position of the windows on the desktop.
-    If Width or Height is not specified, the current values will be
-    used.  If ShiftX or ShiftY is not specified, 0 will be used.
-
-    All coordinants are in the global DMX coordinant system.  If
-    Xinerama is not active, this request is not useful.
-
-    Non-fatal errors will be returned in status (0 otherwise):
-        DmxBadXinerama: Xinerama is not active
-        DmxBadValue:    The size of the bounding box is too large
-
-
-
-    DMXGetInputCount
-        ==>
-        inputCount: CARD32
-
-    This request was first supported in version 1.1 of this protocol.
-
-    This request returns the number of input devices connected to the
-    Xdmx server.  This number is the same as that returned by
-    XListInputDevices, but is available even when the XInput extension
-    is not supported.
-
-
-
-    DMXGetInputAttributes
-        deviceId: CARD32
-        ==>
-        inputType: CARD32
-        physicalScreen: CARD32
-        physicalId: CARD32
-        isCore: BOOL
-        sendsCore: BOOL
-        detached: BOOL
-        name: STRING8
-
-        Errors: Value
-
-    This request was first supported in version 1.1 of this protocol.
-    In version 2.0, the name of this request was changed from
-    DMXGetInputInformation.  However, since the request itself did not
-    change, no changes to the underlying protocol were made.  In version
-    2.2, the name of detached was changed from reservation.  There was
-    no change in underlying protocol.
-
-    This request returns information about the specified input device
-    that cannot be obtained from the XListInputDeivices call.  The
-    deviceId is the same as that used by the XListInputDevices call, and
-    must be in the range 0 to inputCount-1, inclusive (values outside
-    this range will result in a Value error).
-
-    The value of inputType will always be valid, and will be one of the
-    following values:
-        0 for local (and dummy) devices,
-        1 for console devices, and
-        2 for back-end devices.
-
-    For local devices, all other fields returned, except isCore and
-    sendsCore, are invalid.
-
-    For console devices, the physicalScreen and physicalID will be
-    invalid, and the name will return the name of the X server on which
-    the console window is displayed.
-
-    For back-end devices, the physicalScreen will identify the back-end
-    display and can be used as an argument to DMXGetScreenAttributes to
-    obtain more information; the physicalId will be the XInput device id
-    on the back-end X server; and the name will be invalid (since it
-    does not provide any additional information that cannot be obtained
-    with DMXGetScreenAttributes).
-
-    If isCore is True, then this device is active as a true core input
-    device and will send core events.  If sendsCore is True, then this
-    device is an XInput extension device, but sends core events instead
-    of extension events.  Note that this behavior is different from that
-    of XFree86 or Xorg, where XInput extension devices may send both
-    extension events and core events.
-
-    If detached is True, then this device has been detached and is no
-    longer producing input events.  The device may be reattached using
-    DMXAddInput.
-
-    
-
-    DMXAddInput
-        displayName: STRING8
-        valueMask: CARD32
-        valueList: LISTofVALUES
-        ==>
-        status: CARD32
-        physicalId: CARD32
-
-        Errors: Value, Access
-
-    This request was first supported in version 2.2 of this protocol.
-
-    The valueMask and valueList specify the attributes to be used.  The
-    possible values are:
-
-        Attribute               Type
-
-        InputType               CARD32
-        InputPhysicalScreen     CARD32
-        InputSendsCore          BOOL
-
-    This request attaches an input device to the Xdmx server.  The value
-    of inputType will be one:
-        1 for console devices, and
-        2 for back-end devices.
-    Other values of InputType will return a BadValue error.  Local
-    devices (inputType=0 in DMXGetInputAttributes) cannot be attached or
-    removed.  For console devices, displayName will store the name of
-    the display to be used.
-
-    For back-end devices, InputPhysicalScreen will specify the screen
-    number.  BadValue will be returned if the screen number is out of
-    range.  BadAccess will be returned if the input has already been
-    attached or if the backend screen is currently detached.
-
-    If InputSendsCore is True, the new device will be added as a true
-    core device.
-
-    If a device was removed with DMXRemoveInput an attempt will be made
-    to reconnect the previous devices (InputSendsCore is ignored in this
-    case).
-
-
-
-    DMXRemoveInput
-        physicalId: CARD32
-        ==>
-        status: CARD32
-
-        Errors: Value, Access
-
-    This request was first supported in version 2.2 of this protocol.
-
-    This request detaches the input device with physicalId, and all
-    associated inputs (e.g., if the physicalId is a backend mouse, and a
-    keyboard is also attached to the backend, then both devices will be
-    detached).  If the physicalId is outside the valid range (0 to one
-    less than the value returned by DMXInputCount), BadValue is
-    returned.  If the physicalId has already been detached, BadAccess is
-    returned.  The status is always 0.
-
-
-
-5. Events
-
-    No new events are defined by this extension.
-
-
-
-6. Errors
-
-    No new events are defined by this extension.
-
-
-
-7. Encoding
-
-    Deprecated DMX opcodes:
-        DMXGetScreenInformation           2
-        DMXForceWindowCreation            6
-        DMXReconfigureScreen              7
-
-    Valid DMX opcodes:
-        DMXQueryVersion                   0
-        DMXSync                           8
-        DMXForceWindowCreation            9
-
-        DMXGetScreenCount                 1
-        DMXGetScreenAttributes           10
-        DMXChangeScreensAttributes       11
-        DMXAddScreen                     12
-        DMXRemoveScreen                  13
-
-        DMXGetWindowAttributes            3
-
-        DMXGetDesktopAttributes          14
-        DMXChangeDesktopAttributes       15
-
-        DMXGetInputCount                  4
-        DMXGetInputAttributes             5
-        DMXAddInput                      16
-        DMXRemoveInput                   17
-
-    DMXQueryVersion
-        1           CARD8           opcode (X assigned)
-        1           0               DMX opcode (X_DMXQueryVersion)
-        2           1               request length
-    ==>
-        1           1               Reply
-        1                           unused
-        2           CARD16          sequence number
-        4           0               reply length
-        4           CARD32          majorVersion
-        4           CARD32          minorVersion
-        4           CARD32          patchVersion
-        12                          unused
-
-    DMXSync
-        1           CARD8           opcode (X assigned)
-        1           8               DMX opcode (X_DMXSync)
-        2           1               request length
-    ==>
-        1           1               Reply
-        1                           unused
-        2           CARD16          sequence number
-        4           0               reply length
-        4           CARD32          status
-        20                          unused
-
-    DMXForceWindowCreation
-        1           CARD8           opcode (X assigned)
-        1           9               DMX opcode (X_DMXForceWindowCreation)
-        2           2               request length
-        4           CARD32          window
-    ==>
-        1           1               Reply
-        1                           unused
-        2           CARD16          sequence number
-        4           0               reply length
-        4           CARD32          status
-        20                          unused
-
-
-    DMXGetScreenCount
-        1           CARD8           opcode (X assigned)
-        1           1               DMX opcode (X_DMXGetScreenCount)
-        2           1               request length
-    ==>
-        1           1               Reply
-        1                           unused
-        2           CARD16          sequence number
-        4           0               reply length
-        4           CARD32          screenCount
-        20                          unused
-
-    DMXGetScreenAttributes
-        1           CARD8           opcode (X assigned)
-        1           10               DMX opcode (X_DMXGetScreenAttributes)
-        2           2               request length
-        4           CARD32          physicalScreen
-    ==>
-        1           1               Reply
-        1                           unused
-        2           CARD16          sequence number
-        4           1+(n+p)/4       reply length
-        4           n               displayNameLength
-        4           CARD32          logicalScreen
-        2           CARD16          screenWindowWidth
-        2           CARD16          screenWindowHeight
-        2           INT16           screenWindowXoffset
-        2           INT16           screenWindowYoffset
-        2           CARD16          rootWindowWidth
-        2           CARD16          rootWindowHeight
-        2           INT16           rootWindowXoffset
-        2           INT16           rootWindowYoffset
-        2           INT16           rootWindowXorigin
-        2           INT16           rootWindowYorigin
-        n                           displayName
-        p                           pad(n)
-
-    DMXChangeScreensAttributes
-        1           CARD8           opcode (X assigned)
-        1           11              DMX opcode (X_DMXChangeScreenAttributes)
-        2           3+s+m+n         request length
-        4           s               screenCount
-        4           m               maskCount
-        4s          LISTofCARD32    screens
-        4m          LISTofCARD32    valueMasks
-        4n          LISTofVALUES    valueList
-    ==>
-        1           1               Reply
-        1                           unused
-        2           CARD16          sequence number
-        4           0               reply length
-        4           CARD32          status
-        4           CARD32          errorScreen
-        16                          unused
-
-
-    DMXAddScreen
-        1           CARD8           opcode (X assigned)
-        1           12              DMX opcode (X_DMXAddScreen)
-        2           3+m+(n+p)/4     request length
-        4           n               displayNameLength
-        4           CARD32          physicalScreen
-        4           CARD32          valueMask
-        4m          LISTofVALUES    valueList
-        n                           displayName
-        p                           pad(n)
-    ==>
-        1           1               Reply
-        1                           unused
-        2           CARD16          sequence number
-        4           0               reply length
-        4           CARD32          status
-        4           CARD32          physicalScreen
-        16                          unused
-
-    DMXRemoveScreen
-        1           CARD8           opcode (X assigned)
-        1           13              DMX opcode (X_DMXRemoveScreen)
-        2           2               request length
-        4           CARD32          physicalScreen
-    ==>
-        1           1               Reply
-        1                           unused
-        2           CARD16          sequence number
-        4           0               reply length
-        4           CARD32          status
-        20                          unused
-
-    DMXGetWindowAttributes
-        1           CARD8           opcode (X assigned)
-        1           3               DMX opcode (X_DMXGetWindowAttributes)
-        2           2               request length
-        4           CARD32          window
-    ==>
-        1           1               Reply
-        1                           unused
-        2           CARD16          sequence number
-        4           n*6             reply length
-        4           n               screenCount
-        20                          unused
-        n*4         LISTofCARD32    screens
-        n*4         LISTofCARD32    windows
-        n*8         LISTofRECTANGLE pos
-        n*8         LISTofRECTANGLE vis
-
-    DMXGetDesktopAttributes
-        1           CARD8           opcode (X assigned)
-        1           14              DMX opcode (X_DMXGetDesktopAttributes)
-        2           1               request length
-    ==>
-        1           1               Reply
-        1                           unused
-        2           CARD16          sequence number
-        4           0               reply length
-        2           INT16           width
-        2           INT16           height
-        2           INT16           shiftX
-        2           INT16           shiftY
-        16                          unused
-
-    DMXChangeDesktopAttributes
-        1           CARD8           opcode (X assigned)
-        1           15              DMX opcode (X_DMXChangeDesktopAttributes)
-        2           2+n             request length
-        4           BITMASK         valueMask
-        4n          LISTofVALUES    valueList
-    ==>
-        1           1               Reply
-        1                           unused
-        2           CARD16          sequence number
-        4           0               reply length
-        4           CARD32          status
-        20                          unused
-
-    DMXGetInputCount
-        1           CARD8           opcode (X assigned)
-        1           4               DMX opcode (X_DMXGetInputCount)
-        2           1               request length
-    ==>
-        1           1               Reply
-        1                           unused
-        2           CARD16          sequence number
-        4           0               reply length
-        4           CARD32          inputCount
-        20                          unused
-
-    DMXGetInputAttributes
-        1           CARD8           opcode (X assigned)
-        1           5               DMX opcode (X_DMXGetInputAttributes)
-        2           2               request length
-        4           CARD32          deviceId
-    ==>
-        1           1               Reply
-        1                           unused
-        2           CARD16          sequence number
-        4           (n+p)/4         reply length
-        4           CARD32          inputType
-        4           CARD32          physicalScreen
-        4           CARD32          physicalId
-        4           n               nameLength
-        1           BOOL            isCore
-        1           BOOL            sendsCore
-        1           BOOL            detached
-        5                           unused
-        n                           name
-        p                           pad(n)
-
-    DMXAddInput
-        1           CARD8           opcode (X assigned)
-        1           16              DMX opcode (X_DMXAddInput)
-        2           3+m+(n+p)/4     request length
-        4           n               displayNameLength
-        4           CARD32          valueMask
-        4m          LISTofVALUES    valueList
-        n                           displayName
-        p                           pad(n)
-    ==>
-        1           1               Reply
-        1                           unused
-        2           CARD16          sequence number
-        4           0               reply length
-        4           CARD32          status
-        4           CARD32          physicalId
-        16                          unused
-
-    DMXRemoveInput
-        1           CARD8           opcode (X assigned)
-        1           17              DMX opcode (X_DMXRemoveInput)
-        2           3               request length
-        4           CARD32          physicalId
-    ==>
-        1           1               Reply
-        1                           unused
-        2           CARD16          sequence number
-        4           0               reply length
-        4           CARD32          status
-        20                          unused
-
-
-8. Changes to existing requests/replies/events
-
-    No changes to existing requests, replies, or events are necessitated
-    by this extension.
-
-
-
-9. Acknowledgments
-
-
-
-10. References
-
-    [X11R6.4] Robert W. Sheifler.  X Window System Protocol, X Consortium
-              Standard, X Version 11, Release 6.4.  Available from
-              xc/doc/specs/XProtocol and xc/doc/hardcopy/XProtocol.
+
+
+            Client-to-Server DMX Extension to the X Protocol
+
+           $Date$, $Revision$
+
+               Rickard E. (Rik) Faith (faith@redhat.com)
+                    Kevin E. Martin (kem@redhat.com)
+
+    Copyright 2002-2004 Red Hat Inc., Raleigh, North Carolina.
+
+    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 on 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 (including the
+    next paragraph) 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
+    NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+    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.
+
+
+
+1. Overview
+
+    The client-to-server DMX extension to the X protocol (DMX) provides
+    normal client applications with the ability to determine information
+    about the characteristics of the Xdmx server and the back-end X
+    servers that DMX is using.
+
+    The name for this extension is "DMX".
+
+
+
+2. Syntactic conventions
+
+    This document uses the same syntactic conventions requests and data
+    types as [X11R6.4].
+
+
+
+3. Data types
+
+    No new data types are defined by this extension.  All data types
+    referenced in this document are defined in [X11R6.4].
+
+
+
+4. Requests
+
+    DMXQueryVersion
+        ==>
+        majorVersion: CARD32
+        minorVersion: CARD32
+        patchVersion: CARD32
+
+        Errors: None
+
+    The protocol this extension actually supports is indicated by
+    majorVersion and minorVersion (patchVersion indicates the
+    patchlevel and is for informational purposes only).
+
+    Any incompatible changes to the protocol should be indicated by
+    incrementing majorVersion.
+
+    Small, upward-compatible changes should be indicated by incrementing
+    minorVersion.
+
+    Servers that support the protocol defined in this document will
+    return a majorVersion of 2 and a minorVersion of 2.
+
+    (Version 1.5 was the last version in the 1.x series; version 2.0 was
+    a testing version that was poorly defined.)
+
+
+
+    DMXSync
+        ==>
+        status: CARD32
+
+        Errors: None
+
+    This request was first supported in version 1.5 of this protocol.
+    The status field in the reply was introduced in version 2.0 of this
+    protocol.  Since the status field is ignored, no changes to the
+    underlying protocol were required.
+
+    This request flushes all pending protocol requests between the Xdmx
+    server and each back-end X server.  It is used by clients that
+    talk directly to back-end X servers to ensure that all pending Xdmx
+    requests have reached all back-end servers and have been processed
+    by those servers.
+
+    The value of status is always 0.
+
+
+
+    DMXForceWindowCreation
+        window: CARD32
+        ==>
+        status: CARD32
+
+        Errors: Window
+
+    This request was first supported in version 1.2 of this protocol.
+    This request was changed to have a reply in version 2.0 of this
+    protocol.  The old version of this request was deprecated and will
+    return BadImplementation.
+
+    When using the lazy window creation optimization, windows are not
+    created on the back-end X servers until they are required.  This
+    request forces the immediate creation of the window requested.
+
+    The value of status is always 0.
+
+
+
+
+    DMXGetScreenCount
+        ==>
+        screenCount: CARD32
+
+        Errors: None
+
+    This request returns the number of screens that the Xdmx server
+    controls.  Since a DMX screen usually fills all of the available
+    area on a back-end server, there is usually a one-to-one
+    correspondence between DMX screens and backend servers.  However, it
+    is also possible for a DMX screen to cover only part of the
+    available area on a back-end server, and for more than one DMX
+    screen to occupy different parts of the visible area on the same
+    back-end server.
+
+    A DMX screen may be managed as a regular X screen in the Xdmx server
+    or may be joined with other DMX screens using Xinerama.
+    
+
+
+    DMXGetScreenAttributes
+        physicalScreen: CARD32
+        ==>
+        displayName: STRING8
+        logicalScreen: CARD32
+        screenWindowWidth: CARD16
+        screenWindowHeight: CARD16
+        screenWindowXoffset: INT16
+        screenWindowYoffset: INT16
+        rootWindowWidth: CARD16
+        rootWindowHeight: CARD16
+        rootWindowXoffset: INT16
+        rootWindowYoffset: INT16
+        rootWindowXorigin: INT16
+        rootWindowYorigin: INT16
+
+        Errors: Value
+
+    This request is new in version 2.0 of this protocol.  The old
+    DMXGetScreenInformation request is deprecated and will now return
+    BadImplementation.
+
+    This request returns attributes about a single DMX screen.
+
+    The physicalScreen value is between 0 and screenCount-1, inclusive
+    (values outside this range will result in a Value error).
+
+    The displayname is the name used to open the display, either from
+    the Xdmx command-line or from the configuration file.
+
+    The logicalScreen value is the value of the screen that that Xdmx
+    server exports to clients.  When Xinerama is in use, this value is
+    typically 0 for all values of physicalScreen.  If Xinerama is in
+    use, the rootWindowXOrigin and rootWindowYOrigin values specify
+    where the physical screen is positioned in the global Xinerama
+    coordinate system.  Otherwise, these values are set to 0.
+
+    The screenWindow values comprise a geometry specification (see
+    X(7x)) for the location of the DMX screen on the back-end screen.
+    The coordinant system of the back-end display is used.
+
+    The first four rootWindow values comprise a geometry specification
+    (see X(7x)) for the location of the root window on the screen
+    window.  The coordinant system of the screen window is used.  In
+    most cases, the root window will have the same geometry as the DMX
+    screen window, and will occupy the same area of the back-end
+    display.  (This would not be the case, for example, if automatic
+    projector alignment is used.)
+
+
+
+    DMXChangeScreensAttributes
+        screenCount: CARD32
+        maskCount: CARD32
+        screens: LISTofCARD32
+        valueMasks: LISTofCARD32
+        valueList: LISTofVALUES
+        ==>
+        status: CARD32
+        errorScreen: CARD32
+
+        Errors: Length, Alloc
+
+    This request was first supported in version 2.0 of this protocol.
+    (A singular version of this request with the ability to change some
+    RootWindow attributes was supported in version 1.3 of this protocol,
+    has been deprecated, and will return BadImplementation.)
+
+    This request changes the geometries and positions of the DMX screen
+    and DMX root windows on the back-end X servers.
+   
+    The valueMask and valueList specify which attributes are to be
+    changed.  The possible values are:
+
+        Attribute               Type
+
+        ScreenWindowWidth       CARD16
+        ScreenWindowHeight      CARD16
+        ScreenWindowXoffset     INT16
+        ScreenWindowYoffset     INT16
+        RootWindowWidth         CARD16
+        RootWindowHeight        CARD16
+        RootWindowXoffset       INT16
+        RootWindowYoffset       INT16
+        RootWindowXorigin       INT16
+        RootWindowYorigin       INT16
+
+    The attribute values have the same meaning as do the corresponding
+    values for DMXGetScreenAttributes.
+
+    Non-fatal errors will be returned in status (0 otherwise):
+        DmxBadXinerama: Xinerama is not active
+        DmxBadValue:    The resulting position is not allowed
+                        (e.g., one corner is outside the bounding box)
+    On error, errorScreen will contain the number of the screen that
+    caused the first error.
+
+
+
+    DMXAddScreen
+        displayName: STRING8
+        physicalScreen: CARD32
+        valueMask: CARD32
+        valueList: LISTofVALUES
+        ==>
+        status: CARD32
+        physicalScreen: CARD32
+
+        Errors: Length, Alloc, Value
+
+    This request was first supported in version 2.2 of this protocol.
+
+    This request re-attaches the back-end physicalScreen to the Xdmx
+    server.  Only back-end screens that have been previously detached
+    with DMXRemoveScreen may be added.  The name of the back-end display
+    is given in displayName, and this will replace the name of the
+    back-end screen that was detached.  Both the displayName and
+    physicalScreen must be correct for this request to work.
+
+    The valueMask and valueList specify the attributes to be used.  The
+    possible values are:
+
+        Attribute               Type
+
+        ScreenWindowWidth       CARD16
+        ScreenWindowHeight      CARD16
+        ScreenWindowXoffset     INT16
+        ScreenWindowYoffset     INT16
+        RootWindowWidth         CARD16
+        RootWindowHeight        CARD16
+        RootWindowXoffset       INT16
+        RootWindowYoffset       INT16
+        RootWindowXorigin       INT16
+        RootWindowYorigin       INT16
+
+    The attribute values have the same meaning as do the corresponding
+    values for DMXGetScreenAttributes.
+
+    On success, status will be 0 and physicalScreen will contain the new
+    screen number.  On failure, status will be non-zero.  The status
+    will be 1 if any of the following occured:
+        * the -addremovescreens command-line option was not specified on
+          the Xdmx command line
+        * the value of physicalScreen is out of range
+        * physicalScreen has not been detached (with DMXRemoveScreen)
+        * displayName cannot be opened
+        * the visuals of displayname do not match the visuals that Xdmx
+          is using
+        * the screen data for displayName does not match the data for the
+          previously removed display
+    The status will be DmxBadValue if the attribute values are out of
+    range.
+
+
+
+    DMXRemoveScreen
+        physicalScreen: CARD32
+        ==>
+        status: CARD32
+
+        Errors: None
+
+    This request was first supported in version 2.2 of this protocol.
+
+    This request detaches the physicalScreen screen.
+
+    On success, status will be 0.  On failure, the status will 1 if any
+    of the following occur:
+        * the -addremovescreens command-line option was not specified on
+          the Xdmx command line
+        * the value of physicalScreen is out of range
+        * the back-end screen has already been detached.
+
+
+
+    DMXGetWindowAttributes
+        window: CARD32
+        ==>
+        screenCount: CARD32
+        screens: LISTofCARD32
+        windows: LISTofCARD32
+        pos: LISTofRECTANGLE
+        vis: LISTofRECTANGLE
+
+        Errors: Window, Alloc
+
+    This request computes the return values incorrectly for version 1.0
+    of this protocol.  Version 1.1 of this protocol conforms to this
+    description.  In version 2.0, the name of this request was changed
+    from DMXGetWindowInformation.  However, since the request itself did
+    not change, no changes to the underlying protocol were made.
+
+    Given a window ID on the Xdmx server, this request returns data
+    about how the window is represented on the back-end X servers.  For
+    each back-end X server that displays a portion of the window, the
+    following information is returned:
+        1) the number of the physical screen containing that portion
+           (which can be used with the DMXGetScreenAttributes request
+           to obtain more information about the screen),
+        2) the window ID on the back-end X server of the window
+           containing that portion,
+        3) the position and dimensions of the window on the back-end, in
+           screen coordinates, and
+        4) the visible area of the window on the back-end, in
+           window-relative coordinates (all zeros for windows that are
+           not visible).
+    Note that DMX allows multiple back-end windows to overlap in their
+    view of the DMX logical window.  Further, a logical window does not
+    have to be completely covered by back-end windows -- there may be
+    gaps.
+
+    As an example, consider a 500x500 window that spans the top two
+    1024x768 back-end displays (A and B) of a 2048x1536 DMX display
+    composed of 4 1024x768 back-end displays arranged in a cube:
+        A B
+        C D
+
+    In this case, the DMXGetWindowAttributes call would return the
+    following information for the 500x500 window:
+
+    display A: 500x500 window at 1024-250,0 (relative to back end)
+               with 250x500 visible at 0,0 (relative to window origin)
+
+    display B: 500x500 window at -250,0 (relative to back end)
+               with 250x500 visible at 250,0 (relative to window origin)
+
+    display C: 500x500 window at 1024-250,-768 with 0x0 visible at 0,0
+
+    display D: 500x500 window at -250,-768 with 0x0 visible at 0,0
+
+    Note that if the specified window has not yet been mapped when
+    DMXGetWindowAttributes is called, then a subsequent XMapWindow call
+    might be buffered in xlib while requests directly to the back-end X
+    servers are processed.  This race condition can be solved by calling
+    DMXSync before talking directly to the back-end X servers.
+
+
+
+    DMXGetDesktopAttributes
+        ==>
+        width: INT16
+        height: INT16
+        shiftX: INT16
+        shiftY: INT16
+
+        Errors: None
+
+    This request was first supported in version 2.0 of this protocol.
+
+    This request returns the size of the bounding box of the whole
+    screen in width and height.  The shiftX and shiftY values will
+    always be 0.  The global bounding box is computed whether or not
+    Xinerama is active, and may be larger than the Xinerama screen size
+    because of information in the configuration file.
+
+
+
+    DMXChangeDesktopAttributes
+        valueMask: BITMASK
+        valueList: LISTofVALUE
+        ==>
+        status: CARD32
+
+        Errors: Length, Value
+
+    This request was first supported in version 2.0 of this protocol.
+
+    This request resizes the bounding box of the whole screen when using
+    the Xinerama extension.  Otherwise, it has no effect on the screen
+    layout.  The valueMask and valueList specify which attributes are to
+    be changed.  The possible values are:
+
+        Attriubute      Type
+
+        Width           INT16
+        Height          INT16
+        ShiftX          INT16
+        ShiftY          INT16
+
+    Width and Height specify the new width and height for the bounding
+    box.  ShiftX and ShiftY specify where the Xinerama origin will be
+    placed with respect to the origin of the new bounding box.  This
+    allows the left and upper edges of the bounding box to be changed
+    without changing the visual position of the windows on the desktop.
+    If Width or Height is not specified, the current values will be
+    used.  If ShiftX or ShiftY is not specified, 0 will be used.
+
+    All coordinants are in the global DMX coordinant system.  If
+    Xinerama is not active, this request is not useful.
+
+    Non-fatal errors will be returned in status (0 otherwise):
+        DmxBadXinerama: Xinerama is not active
+        DmxBadValue:    The size of the bounding box is too large
+
+
+
+    DMXGetInputCount
+        ==>
+        inputCount: CARD32
+
+    This request was first supported in version 1.1 of this protocol.
+
+    This request returns the number of input devices connected to the
+    Xdmx server.  This number is the same as that returned by
+    XListInputDevices, but is available even when the XInput extension
+    is not supported.
+
+
+
+    DMXGetInputAttributes
+        deviceId: CARD32
+        ==>
+        inputType: CARD32
+        physicalScreen: CARD32
+        physicalId: CARD32
+        isCore: BOOL
+        sendsCore: BOOL
+        detached: BOOL
+        name: STRING8
+
+        Errors: Value
+
+    This request was first supported in version 1.1 of this protocol.
+    In version 2.0, the name of this request was changed from
+    DMXGetInputInformation.  However, since the request itself did not
+    change, no changes to the underlying protocol were made.  In version
+    2.2, the name of detached was changed from reservation.  There was
+    no change in underlying protocol.
+
+    This request returns information about the specified input device
+    that cannot be obtained from the XListInputDeivices call.  The
+    deviceId is the same as that used by the XListInputDevices call, and
+    must be in the range 0 to inputCount-1, inclusive (values outside
+    this range will result in a Value error).
+
+    The value of inputType will always be valid, and will be one of the
+    following values:
+        0 for local (and dummy) devices,
+        1 for console devices, and
+        2 for back-end devices.
+
+    For local devices, all other fields returned, except isCore and
+    sendsCore, are invalid.
+
+    For console devices, the physicalScreen and physicalID will be
+    invalid, and the name will return the name of the X server on which
+    the console window is displayed.
+
+    For back-end devices, the physicalScreen will identify the back-end
+    display and can be used as an argument to DMXGetScreenAttributes to
+    obtain more information; the physicalId will be the XInput device id
+    on the back-end X server; and the name will be invalid (since it
+    does not provide any additional information that cannot be obtained
+    with DMXGetScreenAttributes).
+
+    If isCore is True, then this device is active as a true core input
+    device and will send core events.  If sendsCore is True, then this
+    device is an XInput extension device, but sends core events instead
+    of extension events.  Note that this behavior is different from that
+    of XFree86 or Xorg, where XInput extension devices may send both
+    extension events and core events.
+
+    If detached is True, then this device has been detached and is no
+    longer producing input events.  The device may be reattached using
+    DMXAddInput.
+
+    
+
+    DMXAddInput
+        displayName: STRING8
+        valueMask: CARD32
+        valueList: LISTofVALUES
+        ==>
+        status: CARD32
+        physicalId: CARD32
+
+        Errors: Value, Access
+
+    This request was first supported in version 2.2 of this protocol.
+
+    The valueMask and valueList specify the attributes to be used.  The
+    possible values are:
+
+        Attribute               Type
+
+        InputType               CARD32
+        InputPhysicalScreen     CARD32
+        InputSendsCore          BOOL
+
+    This request attaches an input device to the Xdmx server.  The value
+    of inputType will be one:
+        1 for console devices, and
+        2 for back-end devices.
+    Other values of InputType will return a BadValue error.  Local
+    devices (inputType=0 in DMXGetInputAttributes) cannot be attached or
+    removed.  For console devices, displayName will store the name of
+    the display to be used.
+
+    For back-end devices, InputPhysicalScreen will specify the screen
+    number.  BadValue will be returned if the screen number is out of
+    range.  BadAccess will be returned if the input has already been
+    attached or if the backend screen is currently detached.
+
+    If InputSendsCore is True, the new device will be added as a true
+    core device.
+
+    If a device was removed with DMXRemoveInput an attempt will be made
+    to reconnect the previous devices (InputSendsCore is ignored in this
+    case).
+
+
+
+    DMXRemoveInput
+        physicalId: CARD32
+        ==>
+        status: CARD32
+
+        Errors: Value, Access
+
+    This request was first supported in version 2.2 of this protocol.
+
+    This request detaches the input device with physicalId, and all
+    associated inputs (e.g., if the physicalId is a backend mouse, and a
+    keyboard is also attached to the backend, then both devices will be
+    detached).  If the physicalId is outside the valid range (0 to one
+    less than the value returned by DMXInputCount), BadValue is
+    returned.  If the physicalId has already been detached, BadAccess is
+    returned.  The status is always 0.
+
+
+
+5. Events
+
+    No new events are defined by this extension.
+
+
+
+6. Errors
+
+    No new events are defined by this extension.
+
+
+
+7. Encoding
+
+    Deprecated DMX opcodes:
+        DMXGetScreenInformation           2
+        DMXForceWindowCreation            6
+        DMXReconfigureScreen              7
+
+    Valid DMX opcodes:
+        DMXQueryVersion                   0
+        DMXSync                           8
+        DMXForceWindowCreation            9
+
+        DMXGetScreenCount                 1
+        DMXGetScreenAttributes           10
+        DMXChangeScreensAttributes       11
+        DMXAddScreen                     12
+        DMXRemoveScreen                  13
+
+        DMXGetWindowAttributes            3
+
+        DMXGetDesktopAttributes          14
+        DMXChangeDesktopAttributes       15
+
+        DMXGetInputCount                  4
+        DMXGetInputAttributes             5
+        DMXAddInput                      16
+        DMXRemoveInput                   17
+
+    DMXQueryVersion
+        1           CARD8           opcode (X assigned)
+        1           0               DMX opcode (X_DMXQueryVersion)
+        2           1               request length
+    ==>
+        1           1               Reply
+        1                           unused
+        2           CARD16          sequence number
+        4           0               reply length
+        4           CARD32          majorVersion
+        4           CARD32          minorVersion
+        4           CARD32          patchVersion
+        12                          unused
+
+    DMXSync
+        1           CARD8           opcode (X assigned)
+        1           8               DMX opcode (X_DMXSync)
+        2           1               request length
+    ==>
+        1           1               Reply
+        1                           unused
+        2           CARD16          sequence number
+        4           0               reply length
+        4           CARD32          status
+        20                          unused
+
+    DMXForceWindowCreation
+        1           CARD8           opcode (X assigned)
+        1           9               DMX opcode (X_DMXForceWindowCreation)
+        2           2               request length
+        4           CARD32          window
+    ==>
+        1           1               Reply
+        1                           unused
+        2           CARD16          sequence number
+        4           0               reply length
+        4           CARD32          status
+        20                          unused
+
+
+    DMXGetScreenCount
+        1           CARD8           opcode (X assigned)
+        1           1               DMX opcode (X_DMXGetScreenCount)
+        2           1               request length
+    ==>
+        1           1               Reply
+        1                           unused
+        2           CARD16          sequence number
+        4           0               reply length
+        4           CARD32          screenCount
+        20                          unused
+
+    DMXGetScreenAttributes
+        1           CARD8           opcode (X assigned)
+        1           10               DMX opcode (X_DMXGetScreenAttributes)
+        2           2               request length
+        4           CARD32          physicalScreen
+    ==>
+        1           1               Reply
+        1                           unused
+        2           CARD16          sequence number
+        4           1+(n+p)/4       reply length
+        4           n               displayNameLength
+        4           CARD32          logicalScreen
+        2           CARD16          screenWindowWidth
+        2           CARD16          screenWindowHeight
+        2           INT16           screenWindowXoffset
+        2           INT16           screenWindowYoffset
+        2           CARD16          rootWindowWidth
+        2           CARD16          rootWindowHeight
+        2           INT16           rootWindowXoffset
+        2           INT16           rootWindowYoffset
+        2           INT16           rootWindowXorigin
+        2           INT16           rootWindowYorigin
+        n                           displayName
+        p                           pad(n)
+
+    DMXChangeScreensAttributes
+        1           CARD8           opcode (X assigned)
+        1           11              DMX opcode (X_DMXChangeScreenAttributes)
+        2           3+s+m+n         request length
+        4           s               screenCount
+        4           m               maskCount
+        4s          LISTofCARD32    screens
+        4m          LISTofCARD32    valueMasks
+        4n          LISTofVALUES    valueList
+    ==>
+        1           1               Reply
+        1                           unused
+        2           CARD16          sequence number
+        4           0               reply length
+        4           CARD32          status
+        4           CARD32          errorScreen
+        16                          unused
+
+
+    DMXAddScreen
+        1           CARD8           opcode (X assigned)
+        1           12              DMX opcode (X_DMXAddScreen)
+        2           3+m+(n+p)/4     request length
+        4           n               displayNameLength
+        4           CARD32          physicalScreen
+        4           CARD32          valueMask
+        4m          LISTofVALUES    valueList
+        n                           displayName
+        p                           pad(n)
+    ==>
+        1           1               Reply
+        1                           unused
+        2           CARD16          sequence number
+        4           0               reply length
+        4           CARD32          status
+        4           CARD32          physicalScreen
+        16                          unused
+
+    DMXRemoveScreen
+        1           CARD8           opcode (X assigned)
+        1           13              DMX opcode (X_DMXRemoveScreen)
+        2           2               request length
+        4           CARD32          physicalScreen
+    ==>
+        1           1               Reply
+        1                           unused
+        2           CARD16          sequence number
+        4           0               reply length
+        4           CARD32          status
+        20                          unused
+
+    DMXGetWindowAttributes
+        1           CARD8           opcode (X assigned)
+        1           3               DMX opcode (X_DMXGetWindowAttributes)
+        2           2               request length
+        4           CARD32          window
+    ==>
+        1           1               Reply
+        1                           unused
+        2           CARD16          sequence number
+        4           n*6             reply length
+        4           n               screenCount
+        20                          unused
+        n*4         LISTofCARD32    screens
+        n*4         LISTofCARD32    windows
+        n*8         LISTofRECTANGLE pos
+        n*8         LISTofRECTANGLE vis
+
+    DMXGetDesktopAttributes
+        1           CARD8           opcode (X assigned)
+        1           14              DMX opcode (X_DMXGetDesktopAttributes)
+        2           1               request length
+    ==>
+        1           1               Reply
+        1                           unused
+        2           CARD16          sequence number
+        4           0               reply length
+        2           INT16           width
+        2           INT16           height
+        2           INT16           shiftX
+        2           INT16           shiftY
+        16                          unused
+
+    DMXChangeDesktopAttributes
+        1           CARD8           opcode (X assigned)
+        1           15              DMX opcode (X_DMXChangeDesktopAttributes)
+        2           2+n             request length
+        4           BITMASK         valueMask
+        4n          LISTofVALUES    valueList
+    ==>
+        1           1               Reply
+        1                           unused
+        2           CARD16          sequence number
+        4           0               reply length
+        4           CARD32          status
+        20                          unused
+
+    DMXGetInputCount
+        1           CARD8           opcode (X assigned)
+        1           4               DMX opcode (X_DMXGetInputCount)
+        2           1               request length
+    ==>
+        1           1               Reply
+        1                           unused
+        2           CARD16          sequence number
+        4           0               reply length
+        4           CARD32          inputCount
+        20                          unused
+
+    DMXGetInputAttributes
+        1           CARD8           opcode (X assigned)
+        1           5               DMX opcode (X_DMXGetInputAttributes)
+        2           2               request length
+        4           CARD32          deviceId
+    ==>
+        1           1               Reply
+        1                           unused
+        2           CARD16          sequence number
+        4           (n+p)/4         reply length
+        4           CARD32          inputType
+        4           CARD32          physicalScreen
+        4           CARD32          physicalId
+        4           n               nameLength
+        1           BOOL            isCore
+        1           BOOL            sendsCore
+        1           BOOL            detached
+        5                           unused
+        n                           name
+        p                           pad(n)
+
+    DMXAddInput
+        1           CARD8           opcode (X assigned)
+        1           16              DMX opcode (X_DMXAddInput)
+        2           3+m+(n+p)/4     request length
+        4           n               displayNameLength
+        4           CARD32          valueMask
+        4m          LISTofVALUES    valueList
+        n                           displayName
+        p                           pad(n)
+    ==>
+        1           1               Reply
+        1                           unused
+        2           CARD16          sequence number
+        4           0               reply length
+        4           CARD32          status
+        4           CARD32          physicalId
+        16                          unused
+
+    DMXRemoveInput
+        1           CARD8           opcode (X assigned)
+        1           17              DMX opcode (X_DMXRemoveInput)
+        2           3               request length
+        4           CARD32          physicalId
+    ==>
+        1           1               Reply
+        1                           unused
+        2           CARD16          sequence number
+        4           0               reply length
+        4           CARD32          status
+        20                          unused
+
+
+8. Changes to existing requests/replies/events
+
+    No changes to existing requests, replies, or events are necessitated
+    by this extension.
+
+
+
+9. Acknowledgments
+
+
+
+10. References
+
+    [X11R6.4] Robert W. Sheifler.  X Window System Protocol, X Consortium
+              Standard, X Version 11, Release 6.4.  Available from
+              xc/doc/specs/XProtocol and xc/doc/hardcopy/XProtocol.
diff --git a/xorg-server/hw/dmx/doxygen/.gitignore b/xorg-server/hw/dmx/doxygen/.gitignore
new file mode 100644
index 000000000..550262f01
--- /dev/null
+++ b/xorg-server/hw/dmx/doxygen/.gitignore
@@ -0,0 +1,2 @@
+html/
+doxygen.conf
diff --git a/xorg-server/hw/dmx/examples/.gitignore b/xorg-server/hw/dmx/examples/.gitignore
new file mode 100644
index 000000000..854534d9f
--- /dev/null
+++ b/xorg-server/hw/dmx/examples/.gitignore
@@ -0,0 +1,17 @@
+#		Add & Override for this directory and it's subdirectories
+dmxaddinput
+dmxaddscreen
+dmxinfo
+dmxreconfig
+dmxresize
+dmxrminput
+dmxrmscreen
+dmxwininfo
+ev
+evi
+res
+xbell
+xinput
+xled
+xtest
+
diff --git a/xorg-server/hw/dmx/input/Makefile.am b/xorg-server/hw/dmx/input/Makefile.am
index 185aaf84e..ebe9a0843 100644
--- a/xorg-server/hw/dmx/input/Makefile.am
+++ b/xorg-server/hw/dmx/input/Makefile.am
@@ -1,67 +1,67 @@
-noinst_LIBRARIES = libdmxinput.a
-
-if DMX_BUILD_LNX
-RAWSRCS = lnx-keyboard.c \
-          lnx-keyboard.h \
-          lnx-ms.c \
-          lnx-ms.h \
-          lnx-ps2.c \
-          lnx-ps2.h
-endif
-
-if DMX_BUILD_USB
-USBSRCS = usb-keyboard.c \
-          usb-keyboard.h \
-          usb-mouse.c \
-          usb-mouse.h \
-          usb-other.c \
-          usb-other.h \
-          usb-common.c \
-          usb-common.h \
-          usb-private.h
-endif
-
-DRVSRCS = dmxdummy.c \
-          dmxdummy.h \
-          dmxbackend.c \
-          dmxbackend.h \
-          dmxconsole.c \
-          dmxconsole.h \
-          dmxcommon.c \
-          dmxcommon.h
-
-DMXSRCS = dmxinputinit.c \
-          dmxinputinit.h \
-          dmxarg.c \
-          dmxarg.h \
-          dmxsigio.c \
-          dmxsigio.h \
-          dmxevents.c \
-          dmxevents.h \
-	  dmxxinput.c \
-          dmxmotion.c \
-          dmxmotion.h \
-          dmxmap.c \
-          dmxmap.h
-
-
-libdmxinput_a_SOURCES = ChkNotMaskEv.c \
-                        ChkNotMaskEv.h \
-                        atKeynames.h \
-                        $(RAWSRCS) \
-                        $(USBSRCS) \
-                        $(DRVSRCS) \
-                        $(DMXSRCS) \
-                        $(LIBSRCS)
-
-if GLX
-GLX_DEFS = @GL_CFLAGS@
-endif	    
-
-AM_CFLAGS = $(DIX_CFLAGS) \
-            -I$(top_srcdir)/hw/dmx \
-            -DHAVE_DMX_CONFIG_H \
-            $(GLX_DEFS) \
-            @DMXMODULES_CFLAGS@
-
-EXTRA_DIST = dmxdetach.c
+noinst_LIBRARIES = libdmxinput.a
+
+if DMX_BUILD_LNX
+RAWSRCS = lnx-keyboard.c \
+          lnx-keyboard.h \
+          lnx-ms.c \
+          lnx-ms.h \
+          lnx-ps2.c \
+          lnx-ps2.h
+endif
+
+if DMX_BUILD_USB
+USBSRCS = usb-keyboard.c \
+          usb-keyboard.h \
+          usb-mouse.c \
+          usb-mouse.h \
+          usb-other.c \
+          usb-other.h \
+          usb-common.c \
+          usb-common.h \
+          usb-private.h
+endif
+
+DRVSRCS = dmxdummy.c \
+          dmxdummy.h \
+          dmxbackend.c \
+          dmxbackend.h \
+          dmxconsole.c \
+          dmxconsole.h \
+          dmxcommon.c \
+          dmxcommon.h
+
+DMXSRCS = dmxinputinit.c \
+          dmxinputinit.h \
+          dmxarg.c \
+          dmxarg.h \
+          dmxsigio.c \
+          dmxsigio.h \
+          dmxevents.c \
+          dmxevents.h \
+	  dmxxinput.c \
+          dmxmotion.c \
+          dmxmotion.h \
+          dmxmap.c \
+          dmxmap.h
+
+
+libdmxinput_a_SOURCES = ChkNotMaskEv.c \
+                        ChkNotMaskEv.h \
+                        atKeynames.h \
+                        $(RAWSRCS) \
+                        $(USBSRCS) \
+                        $(DRVSRCS) \
+                        $(DMXSRCS) \
+                        $(LIBSRCS)
+
+if GLX
+GLX_DEFS = @GL_CFLAGS@
+endif	    
+
+AM_CFLAGS = $(DIX_CFLAGS) \
+            -I$(top_srcdir)/hw/dmx \
+            -DHAVE_DMX_CONFIG_H \
+            $(GLX_DEFS) \
+            @DMXMODULES_CFLAGS@
+
+EXTRA_DIST = dmxdetach.c
diff --git a/xorg-server/hw/dmx/input/dmxconsole.c b/xorg-server/hw/dmx/input/dmxconsole.c
index f63772b17..600a70553 100644
--- a/xorg-server/hw/dmx/input/dmxconsole.c
+++ b/xorg-server/hw/dmx/input/dmxconsole.c
@@ -640,7 +640,7 @@ dmxCloseConsole(myPrivate * priv)
 }
 
 static Bool
-dmxCloseConsoleScreen(int idx, ScreenPtr pScreen)
+dmxCloseConsoleScreen(ScreenPtr pScreen)
 {
     myPrivate *priv, *last;
 
@@ -650,7 +650,7 @@ dmxCloseConsoleScreen(int idx, ScreenPtr pScreen)
         dmxCloseConsole(last = priv);
 
     DMX_UNWRAP(CloseScreen, last, pScreen);
-    return pScreen->CloseScreen(idx, pScreen);
+    return pScreen->CloseScreen(pScreen);
 }
 
 static Cursor
diff --git a/xorg-server/hw/dmx/input/dmxdummy.h b/xorg-server/hw/dmx/input/dmxdummy.h
index e3a85be95..17318b4d9 100644
--- a/xorg-server/hw/dmx/input/dmxdummy.h
+++ b/xorg-server/hw/dmx/input/dmxdummy.h
@@ -1,43 +1,43 @@
-/*
- * Copyright 2002 Red Hat Inc., Durham, North Carolina.
- *
- * All Rights Reserved.
- *
- * 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 on 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 (including the
- * next paragraph) 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
- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
- * 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.
- */
-
-/*
- * Authors:
- *   Rickard E. (Rik) Faith <faith@redhat.com>
- *
- */
-
-/** \file
- * Interface to dummy input device support.  \see dmxdummy.c */
-
-#ifndef _DMXDUMMY_H_
-#define _DMXDUMMY_H_
-
-extern void dmxDummyMouGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
-extern void dmxDummyKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
-
-#endif
+/*
+ * Copyright 2002 Red Hat Inc., Durham, North Carolina.
+ *
+ * All Rights Reserved.
+ *
+ * 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 on 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 (including the
+ * next paragraph) 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Rickard E. (Rik) Faith <faith@redhat.com>
+ *
+ */
+
+/** \file
+ * Interface to dummy input device support.  \see dmxdummy.c */
+
+#ifndef _DMXDUMMY_H_
+#define _DMXDUMMY_H_
+
+extern void dmxDummyMouGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
+extern void dmxDummyKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
+
+#endif
diff --git a/xorg-server/hw/kdrive/Makefile.am b/xorg-server/hw/kdrive/Makefile.am
index 471ca89dd..3aebd0f43 100644
--- a/xorg-server/hw/kdrive/Makefile.am
+++ b/xorg-server/hw/kdrive/Makefile.am
@@ -1,30 +1,30 @@
-if BUILD_KDRIVEFBDEVLIB
-FBDEV_SUBDIRS = fbdev
-endif
-
-if XFAKESERVER
-XFAKE_SUBDIRS = fake
-endif
-
-if XEPHYR
-XEPHYR_SUBDIRS = ephyr
-endif
-
-if KDRIVELINUX
-LINUX_SUBDIRS = linux
-endif
-
-SERVER_SUBDIRS = 		\
-	$(FBDEV_SUBDIRS)	\
-	$(XEPHYR_SUBDIRS)       \
-	$(XFAKE_SUBDIRS)
-
-SUBDIRS =			\
-	src			\
-	$(LINUX_SUBDIRS)	\
-	$(SERVER_SUBDIRS)
-
-DIST_SUBDIRS = fbdev ephyr src linux fake
-
-relink:
-	$(AM_V_at)for i in $(SERVER_SUBDIRS) ; do $(MAKE) -C $$i relink || exit 1 ; done
+if BUILD_KDRIVEFBDEVLIB
+FBDEV_SUBDIRS = fbdev
+endif
+
+if XFAKESERVER
+XFAKE_SUBDIRS = fake
+endif
+
+if XEPHYR
+XEPHYR_SUBDIRS = ephyr
+endif
+
+if KDRIVELINUX
+LINUX_SUBDIRS = linux
+endif
+
+SERVER_SUBDIRS = 		\
+	$(FBDEV_SUBDIRS)	\
+	$(XEPHYR_SUBDIRS)       \
+	$(XFAKE_SUBDIRS)
+
+SUBDIRS =			\
+	src			\
+	$(LINUX_SUBDIRS)	\
+	$(SERVER_SUBDIRS)
+
+DIST_SUBDIRS = fbdev ephyr src linux fake
+
+relink:
+	$(AM_V_at)for i in $(SERVER_SUBDIRS) ; do $(MAKE) -C $$i relink || exit 1 ; done
diff --git a/xorg-server/hw/kdrive/Xkdrive.man b/xorg-server/hw/kdrive/Xkdrive.man
index b37f9f10a..a2a2736ea 100644
--- a/xorg-server/hw/kdrive/Xkdrive.man
+++ b/xorg-server/hw/kdrive/Xkdrive.man
@@ -1,57 +1,57 @@
-.\" $RCSId: xc/programs/Xserver/hw/kdrive/Xkdrive.man,v 1.3 2001/01/24 00:06:10 dawes Exp $
-.\"
-.TH Xkdrive 1 __vendorversion__
-.SH NAME
-Xkdrive \- tiny X server
-.SH SYNOPSIS
-.B Xvesa
-.RI [ :display ]
-.RI [ option ...]
-
-.B Xfbdev
-.RI [ :display ]
-.RI [ option ...]
-.SH DESCRIPTION
-.B Xkdrive
-is a family of X servers designed to be particularly small.  This
-manual page describes the common functionality of the 
-.B Xkdrive
-servers; for information on a specific X server, please refer to the
-relevant manual page.
-.SH OPTIONS
-In addition to the standard options accepted by all X servers (see
-Xserver(1)), all the 
-.B Xkdrive
-servers accept the following options:
-.TP 8
-.B -card \fIpcmcia\fP
-use pcmcia card as additional screen.
-.TP 8
-.B -dumb
-disable hardware acceleration.
-.TP 8
-.B -origin \fIX\fP,\fIY\fP
-Locates the next screen in the Xinerama virtual screen.
-.TP 8
-.B -screen \fIwidth\fBx\fIheight\fR[\fBx\fIdepth\fR[\fBx\fIfreq\fR]]\fR[\fB@\fIrotation\fR]\fB
-use a screen of the specified \fIwidth\fP, \fIheight\fP, screen \fIdepth\fP, \fIfrequency\fP, and \fIrotation\fP (0, 90, 180 and 270 are legal values).
-.TP 8
-.B -softCursor
-disable the hardware cursor.
-.TP 8
-.B -videoTest
-start the server, pause momentarily, and exit.
-.TP 8
-.B -zaphod
-disable switching screens by moving the pointer across a screen boundary.
-.TP 8
-.B -2button
-enable emulation of a middle mouse button by chording.
-.TP 8
-.B -3button
-disable emulation of a middle mouse button by chording.
-.SH SEE ALSO
-X(__miscmansuffix__), Xserver(1), xdm(1), xinit(1), Xvesa(1), Xfbdev(1).
-.SH AUTHORS
-The Xkdrive common core was written by Keith Packard,
-and is based on the Sample Implementation of X.
+.\" $RCSId: xc/programs/Xserver/hw/kdrive/Xkdrive.man,v 1.3 2001/01/24 00:06:10 dawes Exp $
+.\"
+.TH Xkdrive 1 __vendorversion__
+.SH NAME
+Xkdrive \- tiny X server
+.SH SYNOPSIS
+.B Xvesa
+.RI [ :display ]
+.RI [ option ...]
+
+.B Xfbdev
+.RI [ :display ]
+.RI [ option ...]
+.SH DESCRIPTION
+.B Xkdrive
+is a family of X servers designed to be particularly small.  This
+manual page describes the common functionality of the 
+.B Xkdrive
+servers; for information on a specific X server, please refer to the
+relevant manual page.
+.SH OPTIONS
+In addition to the standard options accepted by all X servers (see
+Xserver(1)), all the 
+.B Xkdrive
+servers accept the following options:
+.TP 8
+.B -card \fIpcmcia\fP
+use pcmcia card as additional screen.
+.TP 8
+.B -dumb
+disable hardware acceleration.
+.TP 8
+.B -origin \fIX\fP,\fIY\fP
+Locates the next screen in the Xinerama virtual screen.
+.TP 8
+.B -screen \fIwidth\fBx\fIheight\fR[\fBx\fIdepth\fR[\fBx\fIfreq\fR]]\fR[\fB@\fIrotation\fR]\fB
+use a screen of the specified \fIwidth\fP, \fIheight\fP, screen \fIdepth\fP, \fIfrequency\fP, and \fIrotation\fP (0, 90, 180 and 270 are legal values).
+.TP 8
+.B -softCursor
+disable the hardware cursor.
+.TP 8
+.B -videoTest
+start the server, pause momentarily, and exit.
+.TP 8
+.B -zaphod
+disable switching screens by moving the pointer across a screen boundary.
+.TP 8
+.B -2button
+enable emulation of a middle mouse button by chording.
+.TP 8
+.B -3button
+disable emulation of a middle mouse button by chording.
+.SH SEE ALSO
+X(__miscmansuffix__), Xserver(1), xdm(1), xinit(1), Xvesa(1), Xfbdev(1).
+.SH AUTHORS
+The Xkdrive common core was written by Keith Packard,
+and is based on the Sample Implementation of X.
diff --git a/xorg-server/hw/kdrive/ephyr/.gitignore b/xorg-server/hw/kdrive/ephyr/.gitignore
new file mode 100644
index 000000000..4962d1ef0
--- /dev/null
+++ b/xorg-server/hw/kdrive/ephyr/.gitignore
@@ -0,0 +1 @@
+Xephyr
diff --git a/xorg-server/hw/kdrive/ephyr/README b/xorg-server/hw/kdrive/ephyr/README
index 6d6a222ef..7b26fcf33 100644
--- a/xorg-server/hw/kdrive/ephyr/README
+++ b/xorg-server/hw/kdrive/ephyr/README
@@ -1,73 +1,73 @@
-Xephyr README
-=============
-
-
-What Is It ?
-============
-
-Xephyr is a a kdrive server that outputs to a window on a pre-existing
-'host' X display. Think Xnest but with support for modern extensions
-like composite, damage and randr. 
-
-Unlike Xnest which is an X proxy, i.e.  limited to the
-capabilities of the host X server, Xephyr is a real X server which
-uses the host X server window as "framebuffer" via fast SHM XImages.
-
-It also has support for 'visually' debugging what the server is
-painting.
-
-
-How To Use 
-==========
-
-You probably want to run like;
-
-Xephyr :1 -ac -screen 800x600 &
-
-Then set DISPLAY=:1 and run whatever X apps you like.
-
-Use 'xrandr' to change to orientation/size. 
-
-There is a '-parent' switch which works just like Xnests ( for use
-with things like matchbox-nest - http://matchbox.handhelds.org ).
-
-There is also a '-host-cursor' switch to set 'cursor acceleration' -
-The host's cursor is reused. This is only really there to aid
-debugging by avoiding server paints for the cursor. Performance
-improvement is negiable. 
-
-Send a SIGUSR1 to the server ( eg kill -USR1 `pidof Xephyr` ) to
-toggle the debugging mode. In this mode red rectangles are painted to
-screen areas getting painted before painting the actual content. The
-delay between this can be altered by setting a XEPHYR_PAUSE env var to
-a value in micro seconds.
-
-
-Caveats
-=======
-
- - Depth is limited to being the same as the host. 
-   *Update* As of 8/11/2004. Xephyr can now do 8bpp & 16bpp 
-            on 24bpp host.
-
- - Rotated displays are currently updated via full blits. This
-   is slower than a normal oprientated display. Debug mode will
-   therefor not be of much use rotated.  
-
- - The '-host-cursor' cursor is static in its appearence. 
-
- - The build gets a warning about 'nanosleep'. I think the various '-D'
-   build flags are causing this. I havn't figured as yet how to work
-   round it. It doesn't appear to break anything however. 
-
- - Keyboard handling is basic but works. 
-
- - Mouse button 5 probably wont work. 
-
-
-
-
-
-Matthew Allum <mallum@o-hand.com> 2004 
-
-
+Xephyr README
+=============
+
+
+What Is It ?
+============
+
+Xephyr is a a kdrive server that outputs to a window on a pre-existing
+'host' X display. Think Xnest but with support for modern extensions
+like composite, damage and randr. 
+
+Unlike Xnest which is an X proxy, i.e.  limited to the
+capabilities of the host X server, Xephyr is a real X server which
+uses the host X server window as "framebuffer" via fast SHM XImages.
+
+It also has support for 'visually' debugging what the server is
+painting.
+
+
+How To Use 
+==========
+
+You probably want to run like;
+
+Xephyr :1 -ac -screen 800x600 &
+
+Then set DISPLAY=:1 and run whatever X apps you like.
+
+Use 'xrandr' to change to orientation/size. 
+
+There is a '-parent' switch which works just like Xnests ( for use
+with things like matchbox-nest - http://matchbox.handhelds.org ).
+
+There is also a '-host-cursor' switch to set 'cursor acceleration' -
+The host's cursor is reused. This is only really there to aid
+debugging by avoiding server paints for the cursor. Performance
+improvement is negiable. 
+
+Send a SIGUSR1 to the server ( eg kill -USR1 `pidof Xephyr` ) to
+toggle the debugging mode. In this mode red rectangles are painted to
+screen areas getting painted before painting the actual content. The
+delay between this can be altered by setting a XEPHYR_PAUSE env var to
+a value in micro seconds.
+
+
+Caveats
+=======
+
+ - Depth is limited to being the same as the host. 
+   *Update* As of 8/11/2004. Xephyr can now do 8bpp & 16bpp 
+            on 24bpp host.
+
+ - Rotated displays are currently updated via full blits. This
+   is slower than a normal oprientated display. Debug mode will
+   therefor not be of much use rotated.  
+
+ - The '-host-cursor' cursor is static in its appearence. 
+
+ - The build gets a warning about 'nanosleep'. I think the various '-D'
+   build flags are causing this. I havn't figured as yet how to work
+   round it. It doesn't appear to break anything however. 
+
+ - Keyboard handling is basic but works. 
+
+ - Mouse button 5 probably wont work. 
+
+
+
+
+
+Matthew Allum <mallum@o-hand.com> 2004 
+
+
diff --git a/xorg-server/hw/kdrive/fake/.gitignore b/xorg-server/hw/kdrive/fake/.gitignore
new file mode 100644
index 000000000..c973ff076
--- /dev/null
+++ b/xorg-server/hw/kdrive/fake/.gitignore
@@ -0,0 +1,2 @@
+#		Add & Override for this directory and it's subdirectories
+Xfake
diff --git a/xorg-server/hw/kdrive/fake/Makefile.am b/xorg-server/hw/kdrive/fake/Makefile.am
index 6d3ed056e..76bbc3619 100644
--- a/xorg-server/hw/kdrive/fake/Makefile.am
+++ b/xorg-server/hw/kdrive/fake/Makefile.am
@@ -1,30 +1,30 @@
-INCLUDES = 					\
-	@KDRIVE_INCS@				\
-	@KDRIVE_CFLAGS@
-
-noinst_LTLIBRARIES = libfake.la
-
-bin_PROGRAMS = Xfake
-
-libfake_la_SOURCES =	\
-	fake.c		\
-	kbd.c		\
-	os.c		\
-	mouse.c		\
-	fake.h
-
-Xfake_SOURCES = \
-	fakeinit.c
-
-Xfake_LDADD = 						\
-	libfake.la					\
-	@KDRIVE_LIBS@
-
-Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
-
-Xfake_DEPENDENCIES =	\
-	libfake.la					\
-	@KDRIVE_LOCAL_LIBS@
-
-relink:
-	$(AM_V_at)rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS)
+INCLUDES = 					\
+	@KDRIVE_INCS@				\
+	@KDRIVE_CFLAGS@
+
+noinst_LTLIBRARIES = libfake.la
+
+bin_PROGRAMS = Xfake
+
+libfake_la_SOURCES =	\
+	fake.c		\
+	kbd.c		\
+	os.c		\
+	mouse.c		\
+	fake.h
+
+Xfake_SOURCES = \
+	fakeinit.c
+
+Xfake_LDADD = 						\
+	libfake.la					\
+	@KDRIVE_LIBS@
+
+Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
+
+Xfake_DEPENDENCIES =	\
+	libfake.la					\
+	@KDRIVE_LOCAL_LIBS@
+
+relink:
+	$(AM_V_at)rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS)
diff --git a/xorg-server/hw/kdrive/fbdev/.gitignore b/xorg-server/hw/kdrive/fbdev/.gitignore
new file mode 100644
index 000000000..8569c9aed
--- /dev/null
+++ b/xorg-server/hw/kdrive/fbdev/.gitignore
@@ -0,0 +1,2 @@
+#		Add & Override for this directory and it's subdirectories
+Xfbdev
diff --git a/xorg-server/hw/kdrive/fbdev/Makefile.am b/xorg-server/hw/kdrive/fbdev/Makefile.am
index ec9df95e0..98d667ebd 100644
--- a/xorg-server/hw/kdrive/fbdev/Makefile.am
+++ b/xorg-server/hw/kdrive/fbdev/Makefile.am
@@ -1,29 +1,29 @@
-INCLUDES = 					\
-	@KDRIVE_INCS@				\
-	@KDRIVE_CFLAGS@
-
-noinst_LTLIBRARIES = libfbdev.la
-
-libfbdev_la_SOURCES =	\
-	fbdev.c		\
-	fbdev.h
-
-if KDRIVEFBDEV
-bin_PROGRAMS = Xfbdev
-
-Xfbdev_SOURCES = \
-	fbinit.c
-
-Xfbdev_LDADD = 						\
-	libfbdev.la					\
-	@KDRIVE_LIBS@
-
-Xfbdev_DEPENDENCIES =	\
-	libfbdev.la					\
-	$(KDRIVE_PURE_LIBS)
-
-Xfbdev_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
-
-relink:
-	$(AM_V_at)rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS)
-endif
+INCLUDES = 					\
+	@KDRIVE_INCS@				\
+	@KDRIVE_CFLAGS@
+
+noinst_LTLIBRARIES = libfbdev.la
+
+libfbdev_la_SOURCES =	\
+	fbdev.c		\
+	fbdev.h
+
+if KDRIVEFBDEV
+bin_PROGRAMS = Xfbdev
+
+Xfbdev_SOURCES = \
+	fbinit.c
+
+Xfbdev_LDADD = 						\
+	libfbdev.la					\
+	@KDRIVE_LIBS@
+
+Xfbdev_DEPENDENCIES =	\
+	libfbdev.la					\
+	$(KDRIVE_PURE_LIBS)
+
+Xfbdev_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
+
+relink:
+	$(AM_V_at)rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS)
+endif
diff --git a/xorg-server/hw/kdrive/fbdev/Xfbdev.man b/xorg-server/hw/kdrive/fbdev/Xfbdev.man
index bfdae168f..6d0c23818 100644
--- a/xorg-server/hw/kdrive/fbdev/Xfbdev.man
+++ b/xorg-server/hw/kdrive/fbdev/Xfbdev.man
@@ -1,28 +1,28 @@
-.\" $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/Xfbdev.man,v 1.4 2001/01/27 18:20:40 dawes Exp $
-.\"
-.TH Xfbdev 1 __vendorversion__
-.SH NAME
-Xfbdev \- Linux framebuffer device tiny X server
-.SH SYNOPSIS
-.B Xfbdev
-.RI [ :display ] 
-.RI [ option ...]
-.SH DESCRIPTION
-.B Xfbdev
-is a generic X server for Linux.
-.B Xfbdev
-doesn't know about any particular hardware, and uses the framebuffer
-provided by the Linux framebuffer device.
-.SH OPTIONS
-.B Xfbdev
-accepts the common options of the Xkdrive family of servers.  Please
-see Xkdrive(1).
-.SH KEYBOARD
-To be written.
-.SH SEE ALSO
-X(__miscmansuffix__), Xserver(1), Xkdrive(1), xdm(1), xinit(1).
-.SH AUTHORS
-The
-.B Xfbdev
-server was written by Keith Packard.
-
+.\" $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/Xfbdev.man,v 1.4 2001/01/27 18:20:40 dawes Exp $
+.\"
+.TH Xfbdev 1 __vendorversion__
+.SH NAME
+Xfbdev \- Linux framebuffer device tiny X server
+.SH SYNOPSIS
+.B Xfbdev
+.RI [ :display ] 
+.RI [ option ...]
+.SH DESCRIPTION
+.B Xfbdev
+is a generic X server for Linux.
+.B Xfbdev
+doesn't know about any particular hardware, and uses the framebuffer
+provided by the Linux framebuffer device.
+.SH OPTIONS
+.B Xfbdev
+accepts the common options of the Xkdrive family of servers.  Please
+see Xkdrive(1).
+.SH KEYBOARD
+To be written.
+.SH SEE ALSO
+X(__miscmansuffix__), Xserver(1), Xkdrive(1), xdm(1), xinit(1).
+.SH AUTHORS
+The
+.B Xfbdev
+server was written by Keith Packard.
+
diff --git a/xorg-server/hw/kdrive/linux/Makefile.am b/xorg-server/hw/kdrive/linux/Makefile.am
index 93e5d2f9f..7946e5df3 100644
--- a/xorg-server/hw/kdrive/linux/Makefile.am
+++ b/xorg-server/hw/kdrive/linux/Makefile.am
@@ -1,27 +1,27 @@
-INCLUDES = 					\
-	@KDRIVE_INCS@				\
-	@KDRIVE_CFLAGS@
-
-AM_CFLAGS = -DHAVE_DIX_CONFIG_H
-
-noinst_LTLIBRARIES = liblinux.la
-
-liblinux_la_SOURCES =
-
-liblinux_la_SOURCES += linux.c
-
-if KDRIVE_KBD
-liblinux_la_SOURCES += keyboard.c
-endif
-
-if KDRIVE_EVDEV
-liblinux_la_SOURCES += evdev.c
-endif
-
-if KDRIVE_MOUSE
-liblinux_la_SOURCES += mouse.c ms.c ps2.c
-endif
-
-if TSLIB
-liblinux_la_SOURCES += tslib.c
-endif
+INCLUDES = 					\
+	@KDRIVE_INCS@				\
+	@KDRIVE_CFLAGS@
+
+AM_CFLAGS = -DHAVE_DIX_CONFIG_H
+
+noinst_LTLIBRARIES = liblinux.la
+
+liblinux_la_SOURCES =
+
+liblinux_la_SOURCES += linux.c
+
+if KDRIVE_KBD
+liblinux_la_SOURCES += keyboard.c
+endif
+
+if KDRIVE_EVDEV
+liblinux_la_SOURCES += evdev.c
+endif
+
+if KDRIVE_MOUSE
+liblinux_la_SOURCES += mouse.c ms.c ps2.c
+endif
+
+if TSLIB
+liblinux_la_SOURCES += tslib.c
+endif
diff --git a/xorg-server/hw/kdrive/src/Makefile.am b/xorg-server/hw/kdrive/src/Makefile.am
index 51375b950..477ad673a 100644
--- a/xorg-server/hw/kdrive/src/Makefile.am
+++ b/xorg-server/hw/kdrive/src/Makefile.am
@@ -1,28 +1,28 @@
-INCLUDES = 					\
-	@KDRIVE_INCS@				\
-	@KDRIVE_CFLAGS@
-
-AM_CFLAGS =	-DHAVE_DIX_CONFIG_H
-
-noinst_LTLIBRARIES = libkdrive.la libkdrivestubs.la
-
-if XV
-KDRIVE_XV_SOURCES =	\
-	kxv.c		\
-	kxv.h
-endif
-
-libkdrive_la_SOURCES =	\
-	fourcc.h	\
-	kcmap.c		\
-	kdrive.c	\
-	kdrive.h	\
-	kinfo.c		\
-	kinput.c	\
-	kmode.c		\
-	kshadow.c	\
-	$(KDRIVE_XV_SOURCES) \
-        $(top_srcdir)/mi/miinitext.c
-
-libkdrivestubs_la_SOURCES = \
-        $(top_srcdir)/fb/fbcmap_mi.c
+INCLUDES = 					\
+	@KDRIVE_INCS@				\
+	@KDRIVE_CFLAGS@
+
+AM_CFLAGS =	-DHAVE_DIX_CONFIG_H
+
+noinst_LTLIBRARIES = libkdrive.la libkdrivestubs.la
+
+if XV
+KDRIVE_XV_SOURCES =	\
+	kxv.c		\
+	kxv.h
+endif
+
+libkdrive_la_SOURCES =	\
+	fourcc.h	\
+	kcmap.c		\
+	kdrive.c	\
+	kdrive.h	\
+	kinfo.c		\
+	kinput.c	\
+	kmode.c		\
+	kshadow.c	\
+	$(KDRIVE_XV_SOURCES) \
+        $(top_srcdir)/mi/miinitext.c
+
+libkdrivestubs_la_SOURCES = \
+        $(top_srcdir)/fb/fbcmap_mi.c
diff --git a/xorg-server/hw/kdrive/src/kdrive.c b/xorg-server/hw/kdrive/src/kdrive.c
index 223a59ad0..ee6895ca0 100644
--- a/xorg-server/hw/kdrive/src/kdrive.c
+++ b/xorg-server/hw/kdrive/src/kdrive.c
@@ -608,7 +608,7 @@ KdCreateScreenResources(ScreenPtr pScreen)
 }
 
 Bool
-KdCloseScreen(int index, ScreenPtr pScreen)
+KdCloseScreen(ScreenPtr pScreen)
 {
     KdScreenPriv(pScreen);
     KdScreenInfo *screen = pScreenPriv->screen;
@@ -618,7 +618,7 @@ KdCloseScreen(int index, ScreenPtr pScreen)
     pScreenPriv->closed = TRUE;
     pScreen->CloseScreen = pScreenPriv->CloseScreen;
     if (pScreen->CloseScreen)
-        ret = (*pScreen->CloseScreen) (index, pScreen);
+        ret = (*pScreen->CloseScreen) (pScreen);
     else
         ret = TRUE;
 
@@ -778,7 +778,7 @@ KdSetSubpixelOrder(ScreenPtr pScreen, Rotation randr)
 static KdScreenInfo *kdCurrentScreen;
 
 Bool
-KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
+KdScreenInit(ScreenPtr pScreen, int argc, char **argv)
 {
     KdScreenInfo *screen = kdCurrentScreen;
     KdCardInfo *card = screen->card;
diff --git a/xorg-server/hw/kdrive/src/kdrive.h b/xorg-server/hw/kdrive/src/kdrive.h
index c20a0846a..a082acef3 100644
--- a/xorg-server/hw/kdrive/src/kdrive.h
+++ b/xorg-server/hw/kdrive/src/kdrive.h
@@ -442,13 +442,13 @@ Bool
  KdCreateScreenResources(ScreenPtr pScreen);
 
 Bool
- KdCloseScreen(int index, ScreenPtr pScreen);
+ KdCloseScreen(ScreenPtr pScreen);
 
 Bool
  KdSaveScreen(ScreenPtr pScreen, int on);
 
 Bool
- KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv);
+ KdScreenInit(ScreenPtr pScreen, int argc, char **argv);
 
 void
 
@@ -537,12 +537,12 @@ void
 
 void
 
-KdBlockHandler(int screen,
+KdBlockHandler(ScreenPtr pScreen,
                pointer blockData, pointer timeout, pointer readmask);
 
 void
 
-KdWakeupHandler(int screen,
+KdWakeupHandler(ScreenPtr pScreen,
                 pointer data, unsigned long result, pointer readmask);
 
 void
diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c
index 0f2a4ae0f..d94af6d0d 100644
--- a/xorg-server/hw/kdrive/src/kinput.c
+++ b/xorg-server/hw/kdrive/src/kinput.c
@@ -1995,7 +1995,7 @@ _KdEnqueuePointerEvent(KdPointerInfo * pi, int type, int x, int y, int z,
 }
 
 void
-KdBlockHandler(int screen, pointer blockData, pointer timeout, pointer readmask)
+KdBlockHandler(ScreenPtr pScreen, pointer blockData, pointer timeout, pointer readmask)
 {
     KdPointerInfo *pi;
     int myTimeout = 0;
@@ -2021,7 +2021,7 @@ KdBlockHandler(int screen, pointer blockData, pointer timeout, pointer readmask)
 }
 
 void
-KdWakeupHandler(int screen,
+KdWakeupHandler(ScreenPtr pScreen,
                 pointer data, unsigned long lresult, pointer readmask)
 {
     int result = (int) lresult;
diff --git a/xorg-server/hw/kdrive/src/kxv.c b/xorg-server/hw/kdrive/src/kxv.c
index 7097aee5c..b02dd88f2 100644
--- a/xorg-server/hw/kdrive/src/kxv.c
+++ b/xorg-server/hw/kdrive/src/kxv.c
@@ -58,7 +58,7 @@ of the copyright holder.
 
 /* XvScreenRec fields */
 
-static Bool KdXVCloseScreen(int, ScreenPtr);
+static Bool KdXVCloseScreen(ScreenPtr);
 static int KdXVQueryAdaptors(ScreenPtr, XvAdaptorPtr *, int *);
 
 /* XvAdaptorRec fields */
@@ -1118,7 +1118,7 @@ KdXVClipNotify(WindowPtr pWin, int dx, int dy)
 /**** Required XvScreenRec fields ****/
 
 static Bool
-KdXVCloseScreen(int i, ScreenPtr pScreen)
+KdXVCloseScreen(ScreenPtr pScreen)
 {
     XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);
     KdXVScreenPtr ScreenPriv = GET_KDXV_SCREEN(pScreen);
diff --git a/xorg-server/hw/vfb/.gitignore b/xorg-server/hw/vfb/.gitignore
new file mode 100644
index 000000000..c04754124
--- /dev/null
+++ b/xorg-server/hw/vfb/.gitignore
@@ -0,0 +1 @@
+Xvfb
diff --git a/xorg-server/hw/vfb/InitOutput.c b/xorg-server/hw/vfb/InitOutput.c
index 16edf4307..955624f3d 100644
--- a/xorg-server/hw/vfb/InitOutput.c
+++ b/xorg-server/hw/vfb/InitOutput.c
@@ -760,9 +760,9 @@ static miPointerScreenFuncRec vfbPointerCursorFuncs = {
 };
 
 static Bool
-vfbCloseScreen(int index, ScreenPtr pScreen)
+vfbCloseScreen(ScreenPtr pScreen)
 {
-    vfbScreenInfoPtr pvfb = &vfbScreens[index];
+    vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum];
     int i;
 
     pScreen->CloseScreen = pvfb->closeScreen;
@@ -781,13 +781,13 @@ vfbCloseScreen(int index, ScreenPtr pScreen)
         (*pScreen->DestroyPixmap) (pScreen->devPrivate);
     pScreen->devPrivate = NULL;
 
-    return pScreen->CloseScreen(index, pScreen);
+    return pScreen->CloseScreen(pScreen);
 }
 
 static Bool
-vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
+vfbScreenInit(ScreenPtr pScreen, int argc, char **argv)
 {
-    vfbScreenInfoPtr pvfb = &vfbScreens[index];
+    vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum];
     int dpix = monitorResolution, dpiy = monitorResolution;
     int ret;
     char *pbits;
diff --git a/xorg-server/hw/xfree86/.gitignore b/xorg-server/hw/xfree86/.gitignore
new file mode 100644
index 000000000..997a94efe
--- /dev/null
+++ b/xorg-server/hw/xfree86/.gitignore
@@ -0,0 +1,4 @@
+Xorg
+xorg.conf.example
+sdksyms.c
+sdksyms.dep
diff --git a/xorg-server/hw/xfree86/common/.gitignore b/xorg-server/hw/xfree86/common/.gitignore
new file mode 100644
index 000000000..3262e2f37
--- /dev/null
+++ b/xorg-server/hw/xfree86/common/.gitignore
@@ -0,0 +1,3 @@
+#		Add & Override for this directory and it's subdirectories
+xf86Build.h
+xf86DefModeSet.c
diff --git a/xorg-server/hw/xfree86/common/extramodes b/xorg-server/hw/xfree86/common/extramodes
index 450502670..fdabb709a 100644
--- a/xorg-server/hw/xfree86/common/extramodes
+++ b/xorg-server/hw/xfree86/common/extramodes
@@ -1,27 +1,27 @@
-//
-// Extra modes to include as default modes in the X server.
-//
-// $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.5 2002/06/05 19:43:05 dawes Exp $
-//
-
-# 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz
-ModeLine "832x624" 57.284 832  864  928 1152  624  625  628  667 -Hsync -Vsync
-
-# 1400x1050 @ 60Hz (VESA GTF) hsync: 65.5kHz
-ModeLine "1400x1050" 122.0 1400 1488 1640 1880   1050 1052 1064 1082 +hsync +vsync
-
-# 1400x1050 @ 75Hz (VESA GTF) hsync: 82.2kHz
-ModeLine "1400x1050" 155.8 1400 1464 1784 1912   1050 1052 1064 1090 +hsync +vsync
-
-# 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz
-Modeline "1920x1440" 341.35  1920 2072 2288 2656  1440 1441 1444 1512 -hsync +vsync
-
-# 2048x1536 @ 60Hz (VESA GTF) hsync: 95.3kHz
-Modeline "2048x1536" 266.95  2048 2200 2424 2800  1536 1537 1540 1589 -hsync +vsync
-
-# 2048x1536 @ 75Hz (VESA GTF) hsync: 120.2kHz
-Modeline "2048x1536" 340.48  2048 2216 2440 2832  1536 1537 1540 1603 -hsync +vsync
-
-# 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz
-Modeline "2048x1536" 388.04  2048 2216 2440 2832  1536 1537 1540 1612 -hsync +vsync
-
+//
+// Extra modes to include as default modes in the X server.
+//
+// $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.5 2002/06/05 19:43:05 dawes Exp $
+//
+
+# 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz
+ModeLine "832x624" 57.284 832  864  928 1152  624  625  628  667 -Hsync -Vsync
+
+# 1400x1050 @ 60Hz (VESA GTF) hsync: 65.5kHz
+ModeLine "1400x1050" 122.0 1400 1488 1640 1880   1050 1052 1064 1082 +hsync +vsync
+
+# 1400x1050 @ 75Hz (VESA GTF) hsync: 82.2kHz
+ModeLine "1400x1050" 155.8 1400 1464 1784 1912   1050 1052 1064 1090 +hsync +vsync
+
+# 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz
+Modeline "1920x1440" 341.35  1920 2072 2288 2656  1440 1441 1444 1512 -hsync +vsync
+
+# 2048x1536 @ 60Hz (VESA GTF) hsync: 95.3kHz
+Modeline "2048x1536" 266.95  2048 2200 2424 2800  1536 1537 1540 1589 -hsync +vsync
+
+# 2048x1536 @ 75Hz (VESA GTF) hsync: 120.2kHz
+Modeline "2048x1536" 340.48  2048 2216 2440 2832  1536 1537 1540 1603 -hsync +vsync
+
+# 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz
+Modeline "2048x1536" 388.04  2048 2216 2440 2832  1536 1537 1540 1612 -hsync +vsync
+
diff --git a/xorg-server/hw/xfree86/common/modeline2c.awk b/xorg-server/hw/xfree86/common/modeline2c.awk
index 038e7e935..a85d36c58 100644
--- a/xorg-server/hw/xfree86/common/modeline2c.awk
+++ b/xorg-server/hw/xfree86/common/modeline2c.awk
@@ -1,93 +1,93 @@
-#!/usr/bin/awk -f
-#
-# Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
-# All rights reserved.
-#
-# Based on Perl script by Dirk Hohndel.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
-# COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# Usage: modeline2c.awk < modefile > xf86DefModeSet.c
-#
-
-BEGIN {
-	flagsdict[""] = "0"
-
-	flagsdict["+hsync +vsync"] = "V_PHSYNC | V_PVSYNC"
-	flagsdict["+hsync -vsync"] = "V_PHSYNC | V_NVSYNC"
-	flagsdict["-hsync +vsync"] = "V_NHSYNC | V_PVSYNC"
-	flagsdict["-hsync -vsync"] = "V_NHSYNC | V_NVSYNC"
-	flagsdict["+hsync +vsync interlace"] = "V_PHSYNC | V_PVSYNC | V_INTERLACE"
-	flagsdict["+hsync -vsync interlace"] = "V_PHSYNC | V_NVSYNC | V_INTERLACE"
-	flagsdict["-hsync +vsync interlace"] = "V_NHSYNC | V_PVSYNC | V_INTERLACE"
-	flagsdict["-hsync -vsync interlace"] = "V_NHSYNC | V_NVSYNC | V_INTERLACE"
-
-	print "/* THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT -- LOOK at"
-	print " * modeline2c.awk */"
-	print ""
-	print "/*"
-	print " * Author: Joerg Sonnenberger <joerg@NetBSD.org>"
-	print " * Based on Perl script from Dirk Hohndel <hohndel@XFree86.Org>"
-	print " */"
-	print ""
-	print "#ifdef HAVE_XORG_CONFIG_H"
-	print "#include <xorg-config.h>"
-	print "#endif"
-	print ""
-	print "#include \"xf86.h\""
-	print "#include \"xf86Config.h\""
-	print "#include \"xf86Priv.h\""
-	print "#include \"xf86_OSlib.h\""
-	print ""
-	print "#include \"globals.h\""
-	print ""
-	print "#define MODEPREFIX NULL, NULL, NULL, MODE_OK, M_T_DEFAULT"
-	print "#define MODESUFFIX 0,0, 0,0,0,0,0,0,0, 0,0,0,0,0,0,FALSE,FALSE,0,NULL,0,0.0,0.0"
-	print ""
-	print "const DisplayModeRec xf86DefaultModes [] = {"
-
-	modeline = "\t{MODEPREFIX,%d, %d,%d,%d,%d,0, %d,%d,%d,%d,0, %s, MODESUFFIX},\n"
-	modeline_data = "^[a-zA-Z]+[ \t]+[^ \t]+[ \t0-9.]+"
-}
-
-/^[mM][oO][dD][eE][lL][iI][nN][eE]/ {
-	flags = $0
-	gsub(modeline_data, "", flags)
-	flags = tolower(flags)
-	printf(modeline, $3 * 1000, $4, $5, $6, $7,
-	       $8, $9, $10, $11, flagsdict[flags])
-	# Half-width double scanned modes
-	printf(modeline, $3 * 500, $4/2, $5/2, $6/2, $7/2,
-	       $8/2, $9/2, $10/2, $11/2, flagsdict[flags] " | V_DBLSCAN")
-}
-
-/^#/ {
-	print "/*" substr($0, 2) " */"
-}
-
-END {
-	print "};"
-	printf "const int xf86NumDefaultModes = sizeof(xf86DefaultModes) / sizeof(DisplayModeRec);"
-}
+#!/usr/bin/awk -f
+#
+# Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
+# All rights reserved.
+#
+# Based on Perl script by Dirk Hohndel.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+# COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# Usage: modeline2c.awk < modefile > xf86DefModeSet.c
+#
+
+BEGIN {
+	flagsdict[""] = "0"
+
+	flagsdict["+hsync +vsync"] = "V_PHSYNC | V_PVSYNC"
+	flagsdict["+hsync -vsync"] = "V_PHSYNC | V_NVSYNC"
+	flagsdict["-hsync +vsync"] = "V_NHSYNC | V_PVSYNC"
+	flagsdict["-hsync -vsync"] = "V_NHSYNC | V_NVSYNC"
+	flagsdict["+hsync +vsync interlace"] = "V_PHSYNC | V_PVSYNC | V_INTERLACE"
+	flagsdict["+hsync -vsync interlace"] = "V_PHSYNC | V_NVSYNC | V_INTERLACE"
+	flagsdict["-hsync +vsync interlace"] = "V_NHSYNC | V_PVSYNC | V_INTERLACE"
+	flagsdict["-hsync -vsync interlace"] = "V_NHSYNC | V_NVSYNC | V_INTERLACE"
+
+	print "/* THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT -- LOOK at"
+	print " * modeline2c.awk */"
+	print ""
+	print "/*"
+	print " * Author: Joerg Sonnenberger <joerg@NetBSD.org>"
+	print " * Based on Perl script from Dirk Hohndel <hohndel@XFree86.Org>"
+	print " */"
+	print ""
+	print "#ifdef HAVE_XORG_CONFIG_H"
+	print "#include <xorg-config.h>"
+	print "#endif"
+	print ""
+	print "#include \"xf86.h\""
+	print "#include \"xf86Config.h\""
+	print "#include \"xf86Priv.h\""
+	print "#include \"xf86_OSlib.h\""
+	print ""
+	print "#include \"globals.h\""
+	print ""
+	print "#define MODEPREFIX NULL, NULL, NULL, MODE_OK, M_T_DEFAULT"
+	print "#define MODESUFFIX 0,0, 0,0,0,0,0,0,0, 0,0,0,0,0,0,FALSE,FALSE,0,NULL,0,0.0,0.0"
+	print ""
+	print "const DisplayModeRec xf86DefaultModes [] = {"
+
+	modeline = "\t{MODEPREFIX,%d, %d,%d,%d,%d,0, %d,%d,%d,%d,0, %s, MODESUFFIX},\n"
+	modeline_data = "^[a-zA-Z]+[ \t]+[^ \t]+[ \t0-9.]+"
+}
+
+/^[mM][oO][dD][eE][lL][iI][nN][eE]/ {
+	flags = $0
+	gsub(modeline_data, "", flags)
+	flags = tolower(flags)
+	printf(modeline, $3 * 1000, $4, $5, $6, $7,
+	       $8, $9, $10, $11, flagsdict[flags])
+	# Half-width double scanned modes
+	printf(modeline, $3 * 500, $4/2, $5/2, $6/2, $7/2,
+	       $8/2, $9/2, $10/2, $11/2, flagsdict[flags] " | V_DBLSCAN")
+}
+
+/^#/ {
+	print "/*" substr($0, 2) " */"
+}
+
+END {
+	print "};"
+	printf "const int xf86NumDefaultModes = sizeof(xf86DefaultModes) / sizeof(DisplayModeRec);"
+}
diff --git a/xorg-server/hw/xfree86/common/vesamodes b/xorg-server/hw/xfree86/common/vesamodes
index 2bc886276..6644ee6ae 100644
--- a/xorg-server/hw/xfree86/common/vesamodes
+++ b/xorg-server/hw/xfree86/common/vesamodes
@@ -1,111 +1,111 @@
-//
-//  Default modes distilled from
-//      "VESA and Industry Standards and Guide for Computer Display Monitor
-//       Timing", version 1.0, revision 0.8, adopted September 17, 1998.
-//  
-//  $XFree86: xc/programs/Xserver/hw/xfree86/etc/vesamodes,v 1.3 1999/11/16 03:28:03 tsi Exp $
-
-
-# 640x350 @ 85Hz (VESA) hsync: 37.9kHz
-ModeLine "640x350"    31.5  640  672  736  832    350  382  385  445 +hsync -vsync
-
-# 640x400 @ 85Hz (VESA) hsync: 37.9kHz
-ModeLine "640x400"    31.5  640  672  736  832    400  401  404  445 -hsync +vsync
-
-# 720x400 @ 85Hz (VESA) hsync: 37.9kHz
-ModeLine "720x400"    35.5  720  756  828  936    400  401  404  446 -hsync +vsync
-
-# 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz
-ModeLine "640x480"    25.175 640  656  752  800    480  490  492  525 -hsync -vsync
-
-# 640x480 @ 72Hz (VESA) hsync: 37.9kHz
-ModeLine "640x480"    31.5  640  664  704  832    480  489  492  520 -hsync -vsync
-
-# 640x480 @ 75Hz (VESA) hsync: 37.5kHz
-ModeLine "640x480"    31.5  640  656  720  840    480  481  484  500 -hsync -vsync
-
-# 640x480 @ 85Hz (VESA) hsync: 43.3kHz
-ModeLine "640x480"    36.0  640  696  752  832    480  481  484  509 -hsync -vsync
-
-# 800x600 @ 56Hz (VESA) hsync: 35.2kHz
-ModeLine "800x600"    36.0  800  824  896 1024    600  601  603  625 +hsync +vsync
-
-# 800x600 @ 60Hz (VESA) hsync: 37.9kHz
-ModeLine "800x600"    40.0  800  840  968 1056    600  601  605  628 +hsync +vsync
-
-# 800x600 @ 72Hz (VESA) hsync: 48.1kHz
-ModeLine "800x600"    50.0  800  856  976 1040    600  637  643  666 +hsync +vsync
-
-# 800x600 @ 75Hz (VESA) hsync: 46.9kHz
-ModeLine "800x600"    49.5  800  816  896 1056    600  601  604  625 +hsync +vsync
-
-# 800x600 @ 85Hz (VESA) hsync: 53.7kHz
-ModeLine "800x600"    56.3  800  832  896 1048    600  601  604  631 +hsync +vsync
-
-# 1024x768i @ 43Hz (industry standard) hsync: 35.5kHz
-ModeLine "1024x768"   44.9 1024 1032 1208 1264    768  768  776  817 +hsync +vsync Interlace
-
-# 1024x768 @ 60Hz (VESA) hsync: 48.4kHz
-ModeLine "1024x768"   65.0 1024 1048 1184 1344    768  771  777  806 -hsync -vsync
-
-# 1024x768 @ 70Hz (VESA) hsync: 56.5kHz
-ModeLine "1024x768"   75.0 1024 1048 1184 1328    768  771  777  806 -hsync -vsync
-
-# 1024x768 @ 75Hz (VESA) hsync: 60.0kHz
-ModeLine "1024x768"   78.75 1024 1040 1136 1312    768  769  772  800 +hsync +vsync
-
-# 1024x768 @ 85Hz (VESA) hsync: 68.7kHz
-ModeLine "1024x768"   94.5 1024 1072 1168 1376    768  769  772  808 +hsync +vsync
-
-# 1152x864 @ 75Hz (VESA) hsync: 67.5kHz
-ModeLine "1152x864"  108.0 1152 1216 1344 1600    864  865  868  900 +hsync +vsync
-
-# 1280x960 @ 60Hz (VESA) hsync: 60.0kHz
-ModeLine "1280x960"  108.0 1280 1376 1488 1800    960  961  964 1000 +hsync +vsync
-
-# 1280x960 @ 85Hz (VESA) hsync: 85.9kHz
-ModeLine "1280x960"  148.5 1280 1344 1504 1728    960  961  964 1011 +hsync +vsync
-
-# 1280x1024 @ 60Hz (VESA) hsync: 64.0kHz
-ModeLine "1280x1024" 108.0 1280 1328 1440 1688   1024 1025 1028 1066 +hsync +vsync
-
-# 1280x1024 @ 75Hz (VESA) hsync: 80.0kHz
-ModeLine "1280x1024" 135.0 1280 1296 1440 1688   1024 1025 1028 1066 +hsync +vsync
-
-# 1280x1024 @ 85Hz (VESA) hsync: 91.1kHz
-ModeLine "1280x1024" 157.5 1280 1344 1504 1728   1024 1025 1028 1072 +hsync +vsync
-
-# 1600x1200 @ 60Hz (VESA) hsync: 75.0kHz
-ModeLine "1600x1200" 162.0 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
-
-# 1600x1200 @ 65Hz (VESA) hsync: 81.3kHz
-ModeLine "1600x1200" 175.5 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
-
-# 1600x1200 @ 70Hz (VESA) hsync: 87.5kHz
-ModeLine "1600x1200" 189.0 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
-
-# 1600x1200 @ 75Hz (VESA) hsync: 93.8kHz
-ModeLine "1600x1200" 202.5 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
-
-# 1600x1200 @ 85Hz (VESA) hsync: 106.3kHz
-ModeLine "1600x1200" 229.5 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
-
-# 1792x1344 @ 60Hz (VESA) hsync: 83.6kHz
-ModeLine "1792x1344" 204.8 1792 1920 2120 2448   1344 1345 1348 1394 -hsync +vsync
-
-# 1792x1344 @ 75Hz (VESA) hsync: 106.3kHz
-ModeLine "1792x1344" 261.0 1792 1888 2104 2456   1344 1345 1348 1417 -hsync +vsync
-
-# 1856x1392 @ 60Hz (VESA) hsync: 86.3kHz
-ModeLine "1856x1392" 218.3 1856 1952 2176 2528   1392 1393 1396 1439 -hsync +vsync
-
-# 1856x1392 @ 75Hz (VESA) hsync: 112.5kHz
-ModeLine "1856x1392" 288.0 1856 1984 2208 2560   1392 1393 1396 1500 -hsync +vsync
-
-# 1920x1440 @ 60Hz (VESA) hsync: 90.0kHz
-ModeLine "1920x1440" 234.0 1920 2048 2256 2600   1440 1441 1444 1500 -hsync +vsync
-
-# 1920x1440 @ 75Hz (VESA) hsync: 112.5kHz
-ModeLine "1920x1440" 297.0 1920 2064 2288 2640   1440 1441 1444 1500 -hsync +vsync
-
-
+//
+//  Default modes distilled from
+//      "VESA and Industry Standards and Guide for Computer Display Monitor
+//       Timing", version 1.0, revision 0.8, adopted September 17, 1998.
+//  
+//  $XFree86: xc/programs/Xserver/hw/xfree86/etc/vesamodes,v 1.3 1999/11/16 03:28:03 tsi Exp $
+
+
+# 640x350 @ 85Hz (VESA) hsync: 37.9kHz
+ModeLine "640x350"    31.5  640  672  736  832    350  382  385  445 +hsync -vsync
+
+# 640x400 @ 85Hz (VESA) hsync: 37.9kHz
+ModeLine "640x400"    31.5  640  672  736  832    400  401  404  445 -hsync +vsync
+
+# 720x400 @ 85Hz (VESA) hsync: 37.9kHz
+ModeLine "720x400"    35.5  720  756  828  936    400  401  404  446 -hsync +vsync
+
+# 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz
+ModeLine "640x480"    25.175 640  656  752  800    480  490  492  525 -hsync -vsync
+
+# 640x480 @ 72Hz (VESA) hsync: 37.9kHz
+ModeLine "640x480"    31.5  640  664  704  832    480  489  492  520 -hsync -vsync
+
+# 640x480 @ 75Hz (VESA) hsync: 37.5kHz
+ModeLine "640x480"    31.5  640  656  720  840    480  481  484  500 -hsync -vsync
+
+# 640x480 @ 85Hz (VESA) hsync: 43.3kHz
+ModeLine "640x480"    36.0  640  696  752  832    480  481  484  509 -hsync -vsync
+
+# 800x600 @ 56Hz (VESA) hsync: 35.2kHz
+ModeLine "800x600"    36.0  800  824  896 1024    600  601  603  625 +hsync +vsync
+
+# 800x600 @ 60Hz (VESA) hsync: 37.9kHz
+ModeLine "800x600"    40.0  800  840  968 1056    600  601  605  628 +hsync +vsync
+
+# 800x600 @ 72Hz (VESA) hsync: 48.1kHz
+ModeLine "800x600"    50.0  800  856  976 1040    600  637  643  666 +hsync +vsync
+
+# 800x600 @ 75Hz (VESA) hsync: 46.9kHz
+ModeLine "800x600"    49.5  800  816  896 1056    600  601  604  625 +hsync +vsync
+
+# 800x600 @ 85Hz (VESA) hsync: 53.7kHz
+ModeLine "800x600"    56.3  800  832  896 1048    600  601  604  631 +hsync +vsync
+
+# 1024x768i @ 43Hz (industry standard) hsync: 35.5kHz
+ModeLine "1024x768"   44.9 1024 1032 1208 1264    768  768  776  817 +hsync +vsync Interlace
+
+# 1024x768 @ 60Hz (VESA) hsync: 48.4kHz
+ModeLine "1024x768"   65.0 1024 1048 1184 1344    768  771  777  806 -hsync -vsync
+
+# 1024x768 @ 70Hz (VESA) hsync: 56.5kHz
+ModeLine "1024x768"   75.0 1024 1048 1184 1328    768  771  777  806 -hsync -vsync
+
+# 1024x768 @ 75Hz (VESA) hsync: 60.0kHz
+ModeLine "1024x768"   78.75 1024 1040 1136 1312    768  769  772  800 +hsync +vsync
+
+# 1024x768 @ 85Hz (VESA) hsync: 68.7kHz
+ModeLine "1024x768"   94.5 1024 1072 1168 1376    768  769  772  808 +hsync +vsync
+
+# 1152x864 @ 75Hz (VESA) hsync: 67.5kHz
+ModeLine "1152x864"  108.0 1152 1216 1344 1600    864  865  868  900 +hsync +vsync
+
+# 1280x960 @ 60Hz (VESA) hsync: 60.0kHz
+ModeLine "1280x960"  108.0 1280 1376 1488 1800    960  961  964 1000 +hsync +vsync
+
+# 1280x960 @ 85Hz (VESA) hsync: 85.9kHz
+ModeLine "1280x960"  148.5 1280 1344 1504 1728    960  961  964 1011 +hsync +vsync
+
+# 1280x1024 @ 60Hz (VESA) hsync: 64.0kHz
+ModeLine "1280x1024" 108.0 1280 1328 1440 1688   1024 1025 1028 1066 +hsync +vsync
+
+# 1280x1024 @ 75Hz (VESA) hsync: 80.0kHz
+ModeLine "1280x1024" 135.0 1280 1296 1440 1688   1024 1025 1028 1066 +hsync +vsync
+
+# 1280x1024 @ 85Hz (VESA) hsync: 91.1kHz
+ModeLine "1280x1024" 157.5 1280 1344 1504 1728   1024 1025 1028 1072 +hsync +vsync
+
+# 1600x1200 @ 60Hz (VESA) hsync: 75.0kHz
+ModeLine "1600x1200" 162.0 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
+
+# 1600x1200 @ 65Hz (VESA) hsync: 81.3kHz
+ModeLine "1600x1200" 175.5 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
+
+# 1600x1200 @ 70Hz (VESA) hsync: 87.5kHz
+ModeLine "1600x1200" 189.0 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
+
+# 1600x1200 @ 75Hz (VESA) hsync: 93.8kHz
+ModeLine "1600x1200" 202.5 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
+
+# 1600x1200 @ 85Hz (VESA) hsync: 106.3kHz
+ModeLine "1600x1200" 229.5 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
+
+# 1792x1344 @ 60Hz (VESA) hsync: 83.6kHz
+ModeLine "1792x1344" 204.8 1792 1920 2120 2448   1344 1345 1348 1394 -hsync +vsync
+
+# 1792x1344 @ 75Hz (VESA) hsync: 106.3kHz
+ModeLine "1792x1344" 261.0 1792 1888 2104 2456   1344 1345 1348 1417 -hsync +vsync
+
+# 1856x1392 @ 60Hz (VESA) hsync: 86.3kHz
+ModeLine "1856x1392" 218.3 1856 1952 2176 2528   1392 1393 1396 1439 -hsync +vsync
+
+# 1856x1392 @ 75Hz (VESA) hsync: 112.5kHz
+ModeLine "1856x1392" 288.0 1856 1984 2208 2560   1392 1393 1396 1500 -hsync +vsync
+
+# 1920x1440 @ 60Hz (VESA) hsync: 90.0kHz
+ModeLine "1920x1440" 234.0 1920 2048 2256 2600   1440 1441 1444 1500 -hsync +vsync
+
+# 1920x1440 @ 75Hz (VESA) hsync: 112.5kHz
+ModeLine "1920x1440" 297.0 1920 2064 2288 2640   1440 1441 1444 1500 -hsync +vsync
+
+
diff --git a/xorg-server/hw/xfree86/common/xf86.h b/xorg-server/hw/xfree86/common/xf86.h
index 0eb000d41..129660d81 100644
--- a/xorg-server/hw/xfree86/common/xf86.h
+++ b/xorg-server/hw/xfree86/common/xf86.h
@@ -244,7 +244,7 @@ extern _X_EXPORT void xf86AddDriver(DriverPtr driver, pointer module,
                                     int flags);
 extern _X_EXPORT void xf86DeleteDriver(int drvIndex);
 extern _X_EXPORT ScrnInfoPtr xf86AllocateScreen(DriverPtr drv, int flags);
-extern _X_EXPORT void xf86DeleteScreen(int scrnIndex, int flags);
+extern _X_EXPORT void xf86DeleteScreen(ScrnInfoPtr pScrn);
 extern _X_EXPORT int xf86AllocateScrnInfoPrivateIndex(void);
 extern _X_EXPORT Bool xf86AddPixFormat(ScrnInfoPtr pScrn, int depth, int bpp,
                                        int pad);
@@ -256,7 +256,7 @@ extern _X_EXPORT Bool xf86SetDefaultVisual(ScrnInfoPtr scrp, int visual);
 extern _X_EXPORT Bool xf86SetGamma(ScrnInfoPtr scrp, Gamma newGamma);
 extern _X_EXPORT void xf86SetDpi(ScrnInfoPtr pScrn, int x, int y);
 extern _X_EXPORT void xf86SetBlackWhitePixels(ScreenPtr pScreen);
-extern _X_EXPORT void xf86EnableDisableFBAccess(int scrnIndex, Bool enable);
+extern _X_EXPORT void xf86EnableDisableFBAccess(ScrnInfoPtr pScrn, Bool enable);
 extern _X_EXPORT void
 xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb,
                 const char *format, va_list args)
@@ -347,7 +347,7 @@ xf86SetBackingStore(ScreenPtr pScreen);
 extern _X_EXPORT void
 xf86SetSilkenMouse(ScreenPtr pScreen);
 extern _X_EXPORT pointer
-xf86FindXvOptions(int scrnIndex, int adapt_index, char *port_name,
+xf86FindXvOptions(ScrnInfoPtr pScrn, int adapt_index, char *port_name,
                   char **adaptor_name, pointer *adaptor_options);
 extern _X_EXPORT void
 xf86GetOS(const char **name, int *major, int *minor, int *teeny);
@@ -357,7 +357,7 @@ xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag,
                    EntityProc enter, EntityProc leave, pointer private);
 
 extern _X_EXPORT Bool
-xf86IsScreenPrimary(int scrnIndex);
+xf86IsScreenPrimary(ScrnInfoPtr pScrn);
 extern _X_EXPORT int
 xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type,
                                int format, unsigned long len, pointer value);
@@ -458,4 +458,6 @@ extern _X_EXPORT ScreenPtr xf86ScrnToScreen(ScrnInfoPtr pScrn);
 
 #define XF86_HAS_SCRN_CONV 1 /* define for drivers to use in api compat */
 
+#define XF86_SCRN_INTERFACE 1 /* define for drivers to use in api compat */
+
 #endif                          /* _XF86_H */
diff --git a/xorg-server/hw/xfree86/common/xf86Build.h.in b/xorg-server/hw/xfree86/common/xf86Build.h.in
index a4f56b0ae..f4af80637 100644
--- a/xorg-server/hw/xfree86/common/xf86Build.h.in
+++ b/xorg-server/hw/xfree86/common/xf86Build.h.in
@@ -1,2 +1,2 @@
-#define BUILD_DATE @BUILD_DATE@
-#define BUILD_TIME @BUILD_TIME@
+#define BUILD_DATE @BUILD_DATE@
+#define BUILD_TIME @BUILD_TIME@
diff --git a/xorg-server/hw/xfree86/common/xf86Bus.c b/xorg-server/hw/xfree86/common/xf86Bus.c
index b8764344b..6c86f5e26 100644
--- a/xorg-server/hw/xfree86/common/xf86Bus.c
+++ b/xorg-server/hw/xfree86/common/xf86Bus.c
@@ -179,7 +179,7 @@ xf86BusConfig(void)
             xf86Msg(X_ERROR,
                     "Screen %d deleted because of no matching config section.\n",
                     i);
-            xf86DeleteScreen(i--, 0);
+            xf86DeleteScreen(xf86Screens[i--]);
         }
     }
 
@@ -377,13 +377,12 @@ xf86RemoveEntityFromScreen(ScrnInfoPtr pScrn, int entityIndex)
 }
 
 /*
- * xf86ClearEntitiesForScreen() - called when a screen is deleted
+ * xf86ClearEntityListForScreen() - called when a screen is deleted
  * to mark it's entities unused. Called by xf86DeleteScreen().
  */
 void
-xf86ClearEntityListForScreen(int scrnIndex)
+xf86ClearEntityListForScreen(ScrnInfoPtr pScrn)
 {
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     int i, entityIndex;
 
     if (pScrn->entityList == NULL || pScrn->numEntities == 0)
diff --git a/xorg-server/hw/xfree86/common/xf86Cursor.c b/xorg-server/hw/xfree86/common/xf86Cursor.c
index 61cae6aa7..c01cfd138 100644
--- a/xorg-server/hw/xfree86/common/xf86Cursor.c
+++ b/xorg-server/hw/xfree86/common/xf86Cursor.c
@@ -66,7 +66,7 @@ static Bool xf86CursorOffScreen(ScreenPtr *pScreen, int *x, int *y);
 static void xf86CrossScreen(ScreenPtr pScreen, Bool entering);
 static void xf86WarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y);
 
-static void xf86PointerMoved(int scrnIndex, int x, int y);
+static void xf86PointerMoved(ScrnInfoPtr pScrn, int x, int y);
 
 static miPointerScreenFuncRec xf86PointerScreenFuncs = {
     xf86CursorOffScreen,
@@ -135,14 +135,13 @@ xf86SetViewport(ScreenPtr pScreen, int x, int y)
 {
     ScrnInfoPtr pScr = xf86ScreenToScrn(pScreen);
 
-    (*pScr->PointerMoved) (pScreen->myNum, x, y);
+    (*pScr->PointerMoved) (pScr, x, y);
 }
 
 static void
-xf86PointerMoved(int scrnIndex, int x, int y)
+xf86PointerMoved(ScrnInfoPtr pScr, int x, int y)
 {
     Bool frameChanged = FALSE;
-    ScrnInfoPtr pScr = xf86Screens[scrnIndex];
 
     /*
      * check wether (x,y) belongs to the visual part of the screen
@@ -173,7 +172,7 @@ xf86PointerMoved(int scrnIndex, int x, int y)
     }
 
     if (frameChanged && pScr->AdjustFrame != NULL)
-        pScr->AdjustFrame(pScr->scrnIndex, pScr->frameX0, pScr->frameY0, 0);
+        pScr->AdjustFrame(pScr, pScr->frameX0, pScr->frameY0);
 }
 
 /*
@@ -230,7 +229,7 @@ xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode)
         miPointerGetPosition(dev, &px, &py);
 
     was_blocked = xf86BlockSIGIO();
-    Switched = (*pScr->SwitchMode) (pScr->scrnIndex, mode, 0);
+    Switched = (*pScr->SwitchMode) (pScr, mode);
     if (Switched) {
         pScr->currentMode = mode;
 
@@ -271,7 +270,7 @@ xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode)
     xf86UnblockSIGIO(was_blocked);
 
     if (pScr->AdjustFrame)
-        (*pScr->AdjustFrame) (pScr->scrnIndex, pScr->frameX0, pScr->frameY0, 0);
+        (*pScr->AdjustFrame) (pScr, pScr->frameX0, pScr->frameY0);
 
     /* The original code centered the frame around the cursor if possible.
      * Since this is hard to achieve with multiple cursors, we do the following:
diff --git a/xorg-server/hw/xfree86/common/xf86DGA.c b/xorg-server/hw/xfree86/common/xf86DGA.c
index e0314d86e..64163721f 100644
--- a/xorg-server/hw/xfree86/common/xf86DGA.c
+++ b/xorg-server/hw/xfree86/common/xf86DGA.c
@@ -56,7 +56,7 @@ static DevPrivateKeyRec DGAScreenKeyRec;
 #define DGAScreenKeyRegistered dixPrivateKeyRegistered(&DGAScreenKeyRec)
 static Bool mieq_installed;
 
-static Bool DGACloseScreen(int i, ScreenPtr pScreen);
+static Bool DGACloseScreen(ScreenPtr pScreen);
 static void DGADestroyColormap(ColormapPtr pmap);
 static void DGAInstallColormap(ColormapPtr pmap);
 static void DGAUninstallColormap(ColormapPtr pmap);
@@ -235,7 +235,7 @@ FreeMarkedVisuals(ScreenPtr pScreen)
 }
 
 static Bool
-DGACloseScreen(int i, ScreenPtr pScreen)
+DGACloseScreen(ScreenPtr pScreen)
 {
     DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
 
@@ -256,7 +256,7 @@ DGACloseScreen(int i, ScreenPtr pScreen)
 
     free(pScreenPriv);
 
-    return ((*pScreen->CloseScreen) (i, pScreen));
+    return ((*pScreen->CloseScreen) (pScreen));
 }
 
 static void
@@ -323,11 +323,10 @@ DGAUninstallColormap(ColormapPtr pmap)
 }
 
 int
-xf86SetDGAMode(int index, int num, DGADevicePtr devRet)
+xf86SetDGAMode(ScrnInfoPtr pScrn, int num, DGADevicePtr devRet)
 {
-    ScreenPtr pScreen = screenInfo.screens[index];
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     DGAScreenPtr pScreenPriv;
-    ScrnInfoPtr pScrn;
     DGADevicePtr device;
     PixmapPtr pPix = NULL;
     DGAModePtr pMode = NULL;
@@ -338,7 +337,6 @@ xf86SetDGAMode(int index, int num, DGADevicePtr devRet)
     pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
     if (!pScreenPriv)
         return BadValue;
-    pScrn = pScreenPriv->pScrn;
 
     if (!num) {
         if (pScreenPriv->current) {
@@ -359,7 +357,7 @@ xf86SetDGAMode(int index, int num, DGADevicePtr devRet)
                 pScreenPriv->savedColormap = NULL;
             }
             pScreenPriv->dgaColormap = NULL;
-            (*pScrn->EnableDisableFBAccess) (index, TRUE);
+            (*pScrn->EnableDisableFBAccess) (pScrn, TRUE);
 
             FreeMarkedVisuals(pScreen);
         }
@@ -385,7 +383,7 @@ xf86SetDGAMode(int index, int num, DGADevicePtr devRet)
         Bool oldVTSema = pScrn->vtSema;
 
         pScrn->vtSema = FALSE;  /* kludge until we rewrite VT switching */
-        (*pScrn->EnableDisableFBAccess) (index, FALSE);
+        (*pScrn->EnableDisableFBAccess) (pScrn, FALSE);
         pScrn->vtSema = oldVTSema;
     }
 
@@ -564,7 +562,7 @@ DGAShutdown(void)
     for (i = 0; i < screenInfo.numScreens; i++) {
         pScrn = xf86Screens[i];
 
-        (void) (*pScrn->SetDGAMode) (pScrn->scrnIndex, 0, NULL);
+        (void) (*pScrn->SetDGAMode) (pScrn, 0, NULL);
     }
 }
 
@@ -579,7 +577,7 @@ DGASetMode(int index, int num, XDGAModePtr mode, PixmapPtr *pPix)
 
     /* We rely on the extension to check that DGA is available */
 
-    ret = (*pScrn->SetDGAMode) (index, num, &device);
+    ret = (*pScrn->SetDGAMode) (pScrn, num, &device);
     if ((ret == Success) && num) {
         DGACopyModeInfo(device.mode, mode);
         *pPix = device.pPix;
diff --git a/xorg-server/hw/xfree86/common/xf86DPMS.c b/xorg-server/hw/xfree86/common/xf86DPMS.c
index 54ad84243..ef4a2c19b 100644
--- a/xorg-server/hw/xfree86/common/xf86DPMS.c
+++ b/xorg-server/hw/xfree86/common/xf86DPMS.c
@@ -49,7 +49,7 @@
 #ifdef DPMSExtension
 static DevPrivateKeyRec DPMSKeyRec;
 static DevPrivateKey DPMSKey;
-static Bool DPMSClose(int i, ScreenPtr pScreen);
+static Bool DPMSClose(ScreenPtr pScreen);
 static int DPMSCount = 0;
 #endif
 
@@ -99,10 +99,10 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
 #ifdef DPMSExtension
 
 static Bool
-DPMSClose(int i, ScreenPtr pScreen)
+DPMSClose(ScreenPtr pScreen)
 {
     DPMSPtr pDPMS;
-
+    ScrnInfoPtr pScrn;
     /* This shouldn't happen */
     if (DPMSKey == NULL)
         return FALSE;
@@ -114,20 +114,20 @@ DPMSClose(int i, ScreenPtr pScreen)
         return FALSE;
 
     pScreen->CloseScreen = pDPMS->CloseScreen;
-
+    pScrn = xf86ScreenToScrn(pScreen);
     /*
      * Turn on DPMS when shutting down. If this function can be used
      * depends on the order the driver wraps things. If this is called
      * after the driver has shut down everything the driver will have
      * to deal with this internally.
      */
-    if (xf86Screens[i]->vtSema && xf86Screens[i]->DPMSSet) {
-        xf86Screens[i]->DPMSSet(xf86Screens[i], DPMSModeOn, 0);
+    if (pScrn->vtSema && pScrn->DPMSSet) {
+        pScrn->DPMSSet(pScrn, DPMSModeOn, 0);
     }
 
     if (--DPMSCount == 0)
         DPMSKey = NULL;
-    return pScreen->CloseScreen(i, pScreen);
+    return pScreen->CloseScreen(pScreen);
 }
 
 /*
diff --git a/xorg-server/hw/xfree86/common/xf86Events.c b/xorg-server/hw/xfree86/common/xf86Events.c
index 5896f220c..4fcad4000 100644
--- a/xorg-server/hw/xfree86/common/xf86Events.c
+++ b/xorg-server/hw/xfree86/common/xf86Events.c
@@ -438,7 +438,7 @@ xf86VTSwitch(void)
         for (i = 0; i < xf86NumScreens; i++) {
             if (!(dispatchException & DE_TERMINATE))
                 if (xf86Screens[i]->EnableDisableFBAccess)
-                    (*xf86Screens[i]->EnableDisableFBAccess) (i, FALSE);
+                    (*xf86Screens[i]->EnableDisableFBAccess) (xf86Screens[i], FALSE);
         }
 
         /*
@@ -459,7 +459,7 @@ xf86VTSwitch(void)
 
         prevSIGIO = xf86BlockSIGIO();
         for (i = 0; i < xf86NumScreens; i++)
-            xf86Screens[i]->LeaveVT(i, 0);
+            xf86Screens[i]->LeaveVT(xf86Screens[i]);
 
         xf86AccessLeave();      /* We need this here, otherwise */
 
@@ -471,13 +471,13 @@ xf86VTSwitch(void)
             DebugF("xf86VTSwitch: Leave failed\n");
             xf86AccessEnter();
             for (i = 0; i < xf86NumScreens; i++) {
-                if (!xf86Screens[i]->EnterVT(i, 0))
+                if (!xf86Screens[i]->EnterVT(xf86Screens[i]))
                     FatalError("EnterVT failed for screen %d\n", i);
             }
             if (!(dispatchException & DE_TERMINATE)) {
                 for (i = 0; i < xf86NumScreens; i++) {
                     if (xf86Screens[i]->EnableDisableFBAccess)
-                        (*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE);
+                        (*xf86Screens[i]->EnableDisableFBAccess) (xf86Screens[i], TRUE);
                 }
             }
             dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
@@ -527,12 +527,12 @@ xf86VTSwitch(void)
         xf86AccessEnter();
         for (i = 0; i < xf86NumScreens; i++) {
             xf86Screens[i]->vtSema = TRUE;
-            if (!xf86Screens[i]->EnterVT(i, 0))
+            if (!xf86Screens[i]->EnterVT(xf86Screens[i]))
                 FatalError("EnterVT failed for screen %d\n", i);
         }
         for (i = 0; i < xf86NumScreens; i++) {
             if (xf86Screens[i]->EnableDisableFBAccess)
-                (*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE);
+                (*xf86Screens[i]->EnableDisableFBAccess) (xf86Screens[i], TRUE);
         }
 
         /* Turn screen saver off when switching back */
diff --git a/xorg-server/hw/xfree86/common/xf86Helper.c b/xorg-server/hw/xfree86/common/xf86Helper.c
index fb56a0b17..5ef1dabfb 100644
--- a/xorg-server/hw/xfree86/common/xf86Helper.c
+++ b/xorg-server/hw/xfree86/common/xf86Helper.c
@@ -198,24 +198,22 @@ xf86AllocateScreen(DriverPtr drv, int flags)
  */
 
 void
-xf86DeleteScreen(int scrnIndex, int flags)
+xf86DeleteScreen(ScrnInfoPtr pScrn)
 {
-    ScrnInfoPtr pScrn;
     int i;
+    int scrnIndex;
 
     /* First check if the screen is valid */
     if (xf86NumScreens == 0 || xf86Screens == NULL)
         return;
 
-    if (scrnIndex > xf86NumScreens - 1)
-        return;
-
-    if (!(pScrn = xf86Screens[scrnIndex]))
+    if (!pScrn)
         return;
 
+    scrnIndex = pScrn->scrnIndex;
     /* If a FreeScreen function is defined, call it here */
     if (pScrn->FreeScreen != NULL)
-        pScrn->FreeScreen(scrnIndex, 0);
+        pScrn->FreeScreen(pScrn);
 
     while (pScrn->modes)
         xf86DeleteMode(&pScrn->modes, pScrn->modes);
@@ -233,7 +231,7 @@ xf86DeleteScreen(int scrnIndex, int flags)
 
     free(pScrn->privates);
 
-    xf86ClearEntityListForScreen(scrnIndex);
+    xf86ClearEntityListForScreen(pScrn);
 
     free(pScrn);
 
@@ -1027,9 +1025,8 @@ xf86SetBlackWhitePixels(ScreenPtr pScreen)
  * private data, and therefore don't need to access pScrnInfo->vtSema.
  */
 void
-xf86EnableDisableFBAccess(int scrnIndex, Bool enable)
+xf86EnableDisableFBAccess(ScrnInfoPtr pScrnInfo, Bool enable)
 {
-    ScrnInfoPtr pScrnInfo = xf86Screens[scrnIndex];
     ScreenPtr pScreen = pScrnInfo->pScreen;
     PixmapPtr pspix;
 
@@ -1651,10 +1648,9 @@ xf86SetSilkenMouse(ScreenPtr pScreen)
 /* Wrote this function for the PM2 Xv driver, preliminary. */
 
 pointer
-xf86FindXvOptions(int scrnIndex, int adaptor_index, char *port_name,
+xf86FindXvOptions(ScrnInfoPtr pScrn, int adaptor_index, char *port_name,
                   char **adaptor_name, pointer *adaptor_options)
 {
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     confXvAdaptorPtr adaptor;
     int i;
 
@@ -1726,9 +1722,8 @@ xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex,
 }
 
 Bool
-xf86IsScreenPrimary(int scrnIndex)
+xf86IsScreenPrimary(ScrnInfoPtr pScrn)
 {
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     int i;
 
     for (i = 0; i < pScrn->numEntities; i++) {
diff --git a/xorg-server/hw/xfree86/common/xf86Init.c b/xorg-server/hw/xfree86/common/xf86Init.c
index ead47ccba..ca6efd44e 100644
--- a/xorg-server/hw/xfree86/common/xf86Init.c
+++ b/xorg-server/hw/xfree86/common/xf86Init.c
@@ -591,7 +591,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
         }
         for (i = 0; i < xf86NumScreens; i++)
             if (!xf86Screens[i]->configured)
-                xf86DeleteScreen(i--, 0);
+                xf86DeleteScreen(xf86Screens[i--]);
 
         /*
          * If no screens left, return now.
@@ -1040,7 +1040,7 @@ AbortDDX(enum ExitCode error)
                  * screen explicitely.
                  */
                 xf86VGAarbiterLock(xf86Screens[i]);
-                (xf86Screens[i]->LeaveVT) (i, 0);
+                (xf86Screens[i]->LeaveVT) (xf86Screens[i]);
                 xf86VGAarbiterUnlock(xf86Screens[i]);
             }
     }
diff --git a/xorg-server/hw/xfree86/common/xf86Mode.c b/xorg-server/hw/xfree86/common/xf86Mode.c
index ab4d595c7..d80dec892 100644
--- a/xorg-server/hw/xfree86/common/xf86Mode.c
+++ b/xorg-server/hw/xfree86/common/xf86Mode.c
@@ -950,7 +950,7 @@ xf86InitialCheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode,
                 mode->SynthClock /= 2;
         }
 
-        status = (*scrp->ValidMode) (scrp->scrnIndex, mode, FALSE,
+        status = (*scrp->ValidMode) (scrp, mode, FALSE,
                                      MODECHECK_INITIAL);
         if (status != MODE_OK)
             return status;
@@ -1840,7 +1840,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
             scrp->virtualX = newVirtX;
             scrp->virtualY = newVirtY;
             scrp->displayWidth = newLinePitch;
-            p->status = (scrp->ValidMode) (scrp->scrnIndex, p, FALSE,
+            p->status = (scrp->ValidMode) (scrp, p, FALSE,
                                            MODECHECK_FINAL);
 
             if (p->status != MODE_OK) {
diff --git a/xorg-server/hw/xfree86/common/xf86Module.h b/xorg-server/hw/xfree86/common/xf86Module.h
index 31f5c6a86..bf56acd05 100644
--- a/xorg-server/hw/xfree86/common/xf86Module.h
+++ b/xorg-server/hw/xfree86/common/xf86Module.h
@@ -82,7 +82,7 @@ typedef enum {
  * mask is 0xFFFF0000.
  */
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
-#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(12, 0)
+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(13, 0)
 #define ABI_XINPUT_VERSION	SET_ABI_VERSION(17, 0)
 #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(6, 0)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)
diff --git a/xorg-server/hw/xfree86/common/xf86PM.c b/xorg-server/hw/xfree86/common/xf86PM.c
index f69fffa0e..1830640d5 100644
--- a/xorg-server/hw/xfree86/common/xf86PM.c
+++ b/xorg-server/hw/xfree86/common/xf86PM.c
@@ -102,7 +102,7 @@ suspend(pmEvent event, Bool undo)
 
     for (i = 0; i < xf86NumScreens; i++) {
         if (xf86Screens[i]->EnableDisableFBAccess)
-            (*xf86Screens[i]->EnableDisableFBAccess) (i, FALSE);
+            (*xf86Screens[i]->EnableDisableFBAccess) (xf86Screens[i], FALSE);
     }
     pInfo = xf86InputDevs;
     while (pInfo) {
@@ -112,9 +112,9 @@ suspend(pmEvent event, Bool undo)
     sigio_blocked_for_suspend = xf86BlockSIGIO();
     for (i = 0; i < xf86NumScreens; i++) {
         if (xf86Screens[i]->PMEvent)
-            xf86Screens[i]->PMEvent(i, event, undo);
+            xf86Screens[i]->PMEvent(xf86Screens[i], event, undo);
         else {
-            xf86Screens[i]->LeaveVT(i, 0);
+            xf86Screens[i]->LeaveVT(xf86Screens[i]);
             xf86Screens[i]->vtSema = FALSE;
         }
     }
@@ -131,16 +131,16 @@ resume(pmEvent event, Bool undo)
     xf86AccessEnter();
     for (i = 0; i < xf86NumScreens; i++) {
         if (xf86Screens[i]->PMEvent)
-            xf86Screens[i]->PMEvent(i, event, undo);
+            xf86Screens[i]->PMEvent(xf86Screens[i], event, undo);
         else {
             xf86Screens[i]->vtSema = TRUE;
-            xf86Screens[i]->EnterVT(i, 0);
+            xf86Screens[i]->EnterVT(xf86Screens[i]);
         }
     }
     xf86UnblockSIGIO(sigio_blocked_for_suspend);
     for (i = 0; i < xf86NumScreens; i++) {
         if (xf86Screens[i]->EnableDisableFBAccess)
-            (*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE);
+            (*xf86Screens[i]->EnableDisableFBAccess) (xf86Screens[i], TRUE);
     }
     dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
     pInfo = xf86InputDevs;
@@ -187,7 +187,7 @@ DoApmEvent(pmEvent event, Bool undo)
         was_blocked = xf86BlockSIGIO();
         for (i = 0; i < xf86NumScreens; i++) {
             if (xf86Screens[i]->PMEvent) {
-                xf86Screens[i]->PMEvent(i, event, undo);
+                xf86Screens[i]->PMEvent(xf86Screens[i], event, undo);
             }
         }
         xf86UnblockSIGIO(was_blocked);
diff --git a/xorg-server/hw/xfree86/common/xf86Priv.h b/xorg-server/hw/xfree86/common/xf86Priv.h
index 6c5efeacc..42a3b30f0 100644
--- a/xorg-server/hw/xfree86/common/xf86Priv.h
+++ b/xorg-server/hw/xfree86/common/xf86Priv.h
@@ -114,7 +114,7 @@ extern _X_EXPORT void xf86BusProbe(void);
 extern _X_EXPORT void xf86AccessEnter(void);
 extern _X_EXPORT void xf86AccessLeave(void);
 extern _X_EXPORT void xf86PostProbe(void);
-extern _X_EXPORT void xf86ClearEntityListForScreen(int scrnIndex);
+extern _X_EXPORT void xf86ClearEntityListForScreen(ScrnInfoPtr pScrn);
 extern _X_EXPORT void xf86AddDevToEntity(int entityIndex, GDevPtr dev);
 extern _X_EXPORT void xf86RemoveDevFromEntity(int entityIndex, GDevPtr dev);
 
diff --git a/xorg-server/hw/xfree86/common/xf86RandR.c b/xorg-server/hw/xfree86/common/xf86RandR.c
index b17f601d1..5606bee4b 100644
--- a/xorg-server/hw/xfree86/common/xf86RandR.c
+++ b/xorg-server/hw/xfree86/common/xf86RandR.c
@@ -159,7 +159,7 @@ xf86RandRSetMode(ScreenPtr pScreen,
     Bool ret = TRUE;
 
     if (pRoot && scrp->vtSema)
-        (*scrp->EnableDisableFBAccess) (pScreen->myNum, FALSE);
+        (*scrp->EnableDisableFBAccess) (scrp, FALSE);
     if (useVirtual) {
         scrp->virtualX = randrp->virtualX;
         scrp->virtualY = randrp->virtualY;
@@ -220,7 +220,7 @@ xf86RandRSetMode(ScreenPtr pScreen,
     xf86SetViewport(pScreen, pScreen->width, pScreen->height);
     xf86SetViewport(pScreen, 0, 0);
     if (pRoot && scrp->vtSema)
-        (*scrp->EnableDisableFBAccess) (pScreen->myNum, TRUE);
+        (*scrp->EnableDisableFBAccess) (scrp, TRUE);
     return ret;
 }
 
@@ -365,7 +365,7 @@ xf86RandRCreateScreenResources(ScreenPtr pScreen)
  * Reset size back to original
  */
 static Bool
-xf86RandRCloseScreen(int index, ScreenPtr pScreen)
+xf86RandRCloseScreen(ScreenPtr pScreen)
 {
     ScrnInfoPtr scrp = xf86ScreenToScrn(pScreen);
     XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
@@ -376,7 +376,7 @@ xf86RandRCloseScreen(int index, ScreenPtr pScreen)
     pScreen->CloseScreen = randrp->CloseScreen;
     free(randrp);
     dixSetPrivate(&pScreen->devPrivates, xf86RandRKey, NULL);
-    return (*pScreen->CloseScreen) (index, pScreen);
+    return (*pScreen->CloseScreen) (pScreen);
 }
 
 Rotation
diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
index b9b46f6cd..225fff06e 100644
--- a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
+++ b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
@@ -221,7 +221,7 @@ xf86VGAarbiterWrapFunctions(void)
 
 /* Screen funcs */
 static Bool
-VGAarbiterCloseScreen(int i, ScreenPtr pScreen)
+VGAarbiterCloseScreen(ScreenPtr pScreen)
 {
     Bool val;
     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
@@ -258,34 +258,30 @@ VGAarbiterCloseScreen(int i, ScreenPtr pScreen)
     UNWRAP_SPRITE;
 
     free((pointer) pScreenPriv);
-    xf86VGAarbiterLock(xf86Screens[i]);
-    val = (*pScreen->CloseScreen) (i, pScreen);
-    xf86VGAarbiterUnlock(xf86Screens[i]);
+    xf86VGAarbiterLock(xf86ScreenToScrn(pScreen));
+    val = (*pScreen->CloseScreen) (pScreen);
+    xf86VGAarbiterUnlock(xf86ScreenToScrn(pScreen));
     return val;
 }
 
 static void
-VGAarbiterBlockHandler(int i,
-                       pointer blockData, pointer pTimeout, pointer pReadmask)
+VGAarbiterBlockHandler(ScreenPtr pScreen,
+                       pointer pTimeout, pointer pReadmask)
 {
-    ScreenPtr pScreen = screenInfo.screens[i];
-
     SCREEN_PROLOG(BlockHandler);
     VGAGet(pScreen);
-    pScreen->BlockHandler(i, blockData, pTimeout, pReadmask);
+    pScreen->BlockHandler(pScreen, pTimeout, pReadmask);
     VGAPut();
     SCREEN_EPILOG(BlockHandler, VGAarbiterBlockHandler);
 }
 
 static void
-VGAarbiterWakeupHandler(int i, pointer blockData, unsigned long result,
+VGAarbiterWakeupHandler(ScreenPtr pScreen, unsigned long result,
                         pointer pReadmask)
 {
-    ScreenPtr pScreen = screenInfo.screens[i];
-
     SCREEN_PROLOG(WakeupHandler);
     VGAGet(pScreen);
-    pScreen->WakeupHandler(i, blockData, result, pReadmask);
+    pScreen->WakeupHandler(pScreen, result, pReadmask);
     VGAPut();
     SCREEN_EPILOG(WakeupHandler, VGAarbiterWakeupHandler);
 }
@@ -466,46 +462,45 @@ VGAarbiterSetCursorPosition(DeviceIntPtr pDev,
 }
 
 static void
-VGAarbiterAdjustFrame(int index, int x, int y, int flags)
+VGAarbiterAdjustFrame(ScrnInfoPtr pScrn, int x, int y)
 {
-    ScreenPtr pScreen = screenInfo.screens[index];
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     VGAarbiterScreenPtr pScreenPriv =
         (VGAarbiterScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
                                                VGAarbiterScreenKey);
 
     VGAGet(pScreen);
-    (*pScreenPriv->AdjustFrame) (index, x, y, flags);
+    (*pScreenPriv->AdjustFrame) (pScrn, x, y);
     VGAPut();
 }
 
 static Bool
-VGAarbiterSwitchMode(int index, DisplayModePtr mode, int flags)
+VGAarbiterSwitchMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
 {
     Bool val;
-    ScreenPtr pScreen = screenInfo.screens[index];
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     VGAarbiterScreenPtr pScreenPriv =
         (VGAarbiterScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
                                                VGAarbiterScreenKey);
 
     VGAGet(pScreen);
-    val = (*pScreenPriv->SwitchMode) (index, mode, flags);
+    val = (*pScreenPriv->SwitchMode) (pScrn, mode);
     VGAPut();
     return val;
 }
 
 static Bool
-VGAarbiterEnterVT(int index, int flags)
+VGAarbiterEnterVT(ScrnInfoPtr pScrn)
 {
     Bool val;
-    ScrnInfoPtr pScrn = xf86Screens[index];
-    ScreenPtr pScreen = screenInfo.screens[index];
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     VGAarbiterScreenPtr pScreenPriv =
         (VGAarbiterScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
                                                VGAarbiterScreenKey);
 
     VGAGet(pScreen);
     pScrn->EnterVT = pScreenPriv->EnterVT;
-    val = (*pScrn->EnterVT) (index, flags);
+    val = (*pScrn->EnterVT) (pScrn);
     pScreenPriv->EnterVT = pScrn->EnterVT;
     pScrn->EnterVT = VGAarbiterEnterVT;
     VGAPut();
@@ -513,32 +508,31 @@ VGAarbiterEnterVT(int index, int flags)
 }
 
 static void
-VGAarbiterLeaveVT(int index, int flags)
+VGAarbiterLeaveVT(ScrnInfoPtr pScrn)
 {
-    ScrnInfoPtr pScrn = xf86Screens[index];
-    ScreenPtr pScreen = screenInfo.screens[index];
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     VGAarbiterScreenPtr pScreenPriv =
         (VGAarbiterScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
                                                VGAarbiterScreenKey);
 
     VGAGet(pScreen);
     pScrn->LeaveVT = pScreenPriv->LeaveVT;
-    (*pScreenPriv->LeaveVT) (index, flags);
+    (*pScreenPriv->LeaveVT) (pScrn);
     pScreenPriv->LeaveVT = pScrn->LeaveVT;
     pScrn->LeaveVT = VGAarbiterLeaveVT;
     VGAPut();
 }
 
 static void
-VGAarbiterFreeScreen(int index, int flags)
+VGAarbiterFreeScreen(ScrnInfoPtr pScrn)
 {
-    ScreenPtr pScreen = screenInfo.screens[index];
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     VGAarbiterScreenPtr pScreenPriv =
         (VGAarbiterScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
                                                VGAarbiterScreenKey);
 
     VGAGet(pScreen);
-    (*pScreenPriv->FreeScreen) (index, flags);
+    (*pScreenPriv->FreeScreen) (pScrn);
     VGAPut();
 }
 
diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h b/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
index ebc8854d3..ba6edfcc3 100644
--- a/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
+++ b/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
@@ -125,11 +125,11 @@ typedef struct _VGAarbiterScreen {
     UnrealizeCursorProcPtr UnrealizeCursor;
     RecolorCursorProcPtr RecolorCursor;
     SetCursorPositionProcPtr SetCursorPosition;
-    void (*AdjustFrame) (int, int, int, int);
-    Bool (*SwitchMode) (int, DisplayModePtr, int);
-    Bool (*EnterVT) (int, int);
-    void (*LeaveVT) (int, int);
-    void (*FreeScreen) (int, int);
+    void (*AdjustFrame) (ScrnInfoPtr, int, int);
+    Bool (*SwitchMode) (ScrnInfoPtr, DisplayModePtr);
+    Bool (*EnterVT) (ScrnInfoPtr);
+    void (*LeaveVT) (ScrnInfoPtr);
+    void (*FreeScreen) (ScrnInfoPtr);
     miPointerSpriteFuncPtr miSprite;
     CompositeProcPtr Composite;
     GlyphsProcPtr Glyphs;
@@ -142,11 +142,11 @@ typedef struct _VGAarbiterGC {
 } VGAarbiterGCRec, *VGAarbiterGCPtr;
 
 /* Screen funcs */
-static void VGAarbiterBlockHandler(int i, pointer blockData, pointer pTimeout,
+static void VGAarbiterBlockHandler(ScreenPtr pScreen, pointer pTimeout,
                                    pointer pReadmask);
-static void VGAarbiterWakeupHandler(int i, pointer blockData,
+static void VGAarbiterWakeupHandler(ScreenPtr pScreen,
                                     unsigned long result, pointer pReadmask);
-static Bool VGAarbiterCloseScreen(int i, ScreenPtr pScreen);
+static Bool VGAarbiterCloseScreen(ScreenPtr pScreen);
 static void VGAarbiterGetImage(DrawablePtr pDrawable, int sx, int sy, int w,
                                int h, unsigned int format,
                                unsigned long planemask, char *pdstLine);
@@ -176,11 +176,11 @@ static Bool VGAarbiterDisplayCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
 static Bool VGAarbiterSetCursorPosition(DeviceIntPtr pDev, ScreenPtr
                                         pScreen, int x, int y,
                                         Bool generateEvent);
-static void VGAarbiterAdjustFrame(int index, int x, int y, int flags);
-static Bool VGAarbiterSwitchMode(int index, DisplayModePtr mode, int flags);
-static Bool VGAarbiterEnterVT(int index, int flags);
-static void VGAarbiterLeaveVT(int index, int flags);
-static void VGAarbiterFreeScreen(int index, int flags);
+static void VGAarbiterAdjustFrame(ScrnInfoPtr pScrn, int x, int y);
+static Bool VGAarbiterSwitchMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
+static Bool VGAarbiterEnterVT(ScrnInfoPtr pScrn);
+static void VGAarbiterLeaveVT(ScrnInfoPtr pScrn);
+static void VGAarbiterFreeScreen(ScrnInfoPtr pScrn);
 
 /* GC funcs */
 static void VGAarbiterValidateGC(GCPtr pGC, unsigned long changes,
diff --git a/xorg-server/hw/xfree86/common/xf86VidMode.c b/xorg-server/hw/xfree86/common/xf86VidMode.c
index 13ffe061c..a7d1c25bf 100644
--- a/xorg-server/hw/xfree86/common/xf86VidMode.c
+++ b/xorg-server/hw/xfree86/common/xf86VidMode.c
@@ -50,7 +50,7 @@
 static DevPrivateKeyRec VidModeKeyRec;
 static DevPrivateKey VidModeKey;
 static int VidModeCount = 0;
-static Bool VidModeClose(int i, ScreenPtr pScreen);
+static Bool VidModeClose(ScreenPtr pScreen);
 
 #define VMPTR(p) ((VidModePtr)dixLookupPrivate(&(p)->devPrivates, VidModeKey))
 
@@ -93,7 +93,7 @@ VidModeExtensionInit(ScreenPtr pScreen)
 #ifdef XF86VIDMODE
 
 static Bool
-VidModeClose(int i, ScreenPtr pScreen)
+VidModeClose(ScreenPtr pScreen)
 {
     VidModePtr pVidMode = VMPTR(pScreen);
 
@@ -108,7 +108,7 @@ VidModeClose(int i, ScreenPtr pScreen)
         dixSetPrivate(&pScreen->devPrivates, VidModeKey, NULL);
         VidModeKey = NULL;
     }
-    return pScreen->CloseScreen(i, pScreen);
+    return pScreen->CloseScreen(pScreen);
 }
 
 Bool
@@ -303,7 +303,7 @@ VidModeSetViewPort(int scrnIndex, int x, int y)
                          pScrn->virtualY - pScrn->currentMode->VDisplay);
     pScrn->frameY1 = pScrn->frameY0 + pScrn->currentMode->VDisplay - 1;
     if (pScrn->AdjustFrame != NULL)
-        (pScrn->AdjustFrame) (scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
+        (pScrn->AdjustFrame) (pScrn, pScrn->frameX0, pScrn->frameY0);
 
     return TRUE;
 }
diff --git a/xorg-server/hw/xfree86/common/xf86cmap.c b/xorg-server/hw/xfree86/common/xf86cmap.c
index 460fafde3..25f84e579 100644
--- a/xorg-server/hw/xfree86/common/xf86cmap.c
+++ b/xorg-server/hw/xfree86/common/xf86cmap.c
@@ -80,9 +80,9 @@ typedef struct {
     DestroyColormapProcPtr DestroyColormap;
     InstallColormapProcPtr InstallColormap;
     StoreColorsProcPtr StoreColors;
-    Bool (*EnterVT) (int, int);
-    Bool (*SwitchMode) (int, DisplayModePtr, int);
-    int (*SetDGAMode) (int, int, DGADevicePtr);
+    Bool (*EnterVT) (ScrnInfoPtr);
+    Bool (*SwitchMode) (ScrnInfoPtr, DisplayModePtr);
+    int (*SetDGAMode) (ScrnInfoPtr, int, DGADevicePtr);
     xf86ChangeGammaProc *ChangeGamma;
     int maxColors;
     int sigRGBbits;
@@ -111,17 +111,17 @@ static DevPrivateKeyRec CMapColormapKeyRec;
 
 static void CMapInstallColormap(ColormapPtr);
 static void CMapStoreColors(ColormapPtr, int, xColorItem *);
-static Bool CMapCloseScreen(int, ScreenPtr);
+static Bool CMapCloseScreen(ScreenPtr);
 static Bool CMapCreateColormap(ColormapPtr);
 static void CMapDestroyColormap(ColormapPtr);
 
-static Bool CMapEnterVT(int, int);
-static Bool CMapSwitchMode(int, DisplayModePtr, int);
+static Bool CMapEnterVT(ScrnInfoPtr);
+static Bool CMapSwitchMode(ScrnInfoPtr, DisplayModePtr);
 
 #ifdef XFreeXDGA
-static int CMapSetDGAMode(int, int, DGADevicePtr);
+static int CMapSetDGAMode(ScrnInfoPtr, int, DGADevicePtr);
 #endif
-static int CMapChangeGamma(int, Gamma);
+static int CMapChangeGamma(ScrnInfoPtr, Gamma);
 
 static void ComputeGamma(CMapScreenPtr);
 static Bool CMapAllocateColormapPrivate(ColormapPtr);
@@ -241,11 +241,11 @@ xf86HandleColormaps(ScreenPtr pScreen,
 /**** Screen functions ****/
 
 static Bool
-CMapCloseScreen(int i, ScreenPtr pScreen)
+CMapCloseScreen(ScreenPtr pScreen)
 {
     CMapUnwrapScreen(pScreen);
 
-    return (*pScreen->CloseScreen) (i, pScreen);
+    return (*pScreen->CloseScreen) (pScreen);
 }
 
 static Bool
@@ -462,16 +462,15 @@ CMapInstallColormap(ColormapPtr pmap)
 /**** ScrnInfoRec functions ****/
 
 static Bool
-CMapEnterVT(int index, int flags)
+CMapEnterVT(ScrnInfoPtr pScrn)
 {
-    ScrnInfoPtr pScrn = xf86Screens[index];
-    ScreenPtr pScreen = screenInfo.screens[index];
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     Bool ret;
     CMapScreenPtr pScreenPriv =
         (CMapScreenPtr) dixLookupPrivate(&pScreen->devPrivates, CMapScreenKey);
 
     pScrn->EnterVT = pScreenPriv->EnterVT;
-    ret = (*pScreenPriv->EnterVT) (index, flags);
+    ret = (*pScreenPriv->EnterVT) (pScrn);
     pScreenPriv->EnterVT = pScrn->EnterVT;
     pScrn->EnterVT = CMapEnterVT;
     if (ret) {
@@ -483,13 +482,13 @@ CMapEnterVT(int index, int flags)
 }
 
 static Bool
-CMapSwitchMode(int index, DisplayModePtr mode, int flags)
+CMapSwitchMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
 {
-    ScreenPtr pScreen = screenInfo.screens[index];
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     CMapScreenPtr pScreenPriv =
         (CMapScreenPtr) dixLookupPrivate(&pScreen->devPrivates, CMapScreenKey);
 
-    if ((*pScreenPriv->SwitchMode) (index, mode, flags)) {
+    if ((*pScreenPriv->SwitchMode) (pScrn, mode)) {
         if (GetInstalledmiColormap(pScreen))
             CMapReinstallMap(GetInstalledmiColormap(pScreen));
         return TRUE;
@@ -499,16 +498,16 @@ CMapSwitchMode(int index, DisplayModePtr mode, int flags)
 
 #ifdef XFreeXDGA
 static int
-CMapSetDGAMode(int index, int num, DGADevicePtr dev)
+CMapSetDGAMode(ScrnInfoPtr pScrn, int num, DGADevicePtr dev)
 {
-    ScreenPtr pScreen = screenInfo.screens[index];
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     CMapScreenPtr pScreenPriv =
         (CMapScreenPtr) dixLookupPrivate(&pScreen->devPrivates, CMapScreenKey);
     int ret;
 
-    ret = (*pScreenPriv->SetDGAMode) (index, num, dev);
+    ret = (*pScreenPriv->SetDGAMode) (pScrn, num, dev);
 
-    pScreenPriv->isDGAmode = DGAActive(index);
+    pScreenPriv->isDGAmode = DGAActive(pScrn->scrnIndex);
 
     if (!pScreenPriv->isDGAmode && GetInstalledmiColormap(pScreen)
         && xf86ScreenToScrn(pScreen)->vtSema)
@@ -908,11 +907,10 @@ ComputeGamma(CMapScreenPtr priv)
 }
 
 int
-CMapChangeGamma(int index, Gamma gamma)
+CMapChangeGamma(ScrnInfoPtr pScrn, Gamma gamma)
 {
     int ret = Success;
-    ScrnInfoPtr pScrn = xf86Screens[index];
-    ScreenPtr pScreen = pScrn->pScreen;
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     CMapColormapPtr pColPriv;
     CMapScreenPtr pScreenPriv;
     CMapLinkPtr pLink;
@@ -979,7 +977,7 @@ CMapChangeGamma(int index, Gamma gamma)
 
     pScrn->ChangeGamma = pScreenPriv->ChangeGamma;
     if (pScrn->ChangeGamma)
-        ret = pScrn->ChangeGamma(index, gamma);
+        ret = pScrn->ChangeGamma(pScrn, gamma);
     pScrn->ChangeGamma = CMapChangeGamma;
 
     return ret;
@@ -1175,7 +1173,7 @@ xf86ChangeGamma(ScreenPtr pScreen, Gamma gamma)
     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 
     if (pScrn->ChangeGamma)
-        return (*pScrn->ChangeGamma) (pScreen->myNum, gamma);
+        return (*pScrn->ChangeGamma) (pScrn, gamma);
 
     return BadImplementation;
 }
diff --git a/xorg-server/hw/xfree86/common/xf86fbman.c b/xorg-server/hw/xfree86/common/xf86fbman.c
index e2db1c354..c2e7bab9f 100644
--- a/xorg-server/hw/xfree86/common/xf86fbman.c
+++ b/xorg-server/hw/xfree86/common/xf86fbman.c
@@ -1149,7 +1149,7 @@ static FBManagerFuncs xf86FBManFuncs = {
 };
 
 static Bool
-xf86FBCloseScreen(int i, ScreenPtr pScreen)
+xf86FBCloseScreen(ScreenPtr pScreen)
 {
     FBLinkPtr pLink, tmp;
     FBLinearLinkPtr pLinearLink, tmp2;
@@ -1180,7 +1180,7 @@ xf86FBCloseScreen(int i, ScreenPtr pScreen)
     free(offman);
     dixSetPrivate(&pScreen->devPrivates, xf86FBScreenKey, NULL);
 
-    return (*pScreen->CloseScreen) (i, pScreen);
+    return (*pScreen->CloseScreen) (pScreen);
 }
 
 Bool
diff --git a/xorg-server/hw/xfree86/common/xf86sbusBus.c b/xorg-server/hw/xfree86/common/xf86sbusBus.c
index 27d24f8e1..b6a6b94b3 100644
--- a/xorg-server/hw/xfree86/common/xf86sbusBus.c
+++ b/xorg-server/hw/xfree86/common/xf86sbusBus.c
@@ -667,7 +667,7 @@ xf86SbusCmapLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
 }
 
 static Bool
-xf86SbusCmapCloseScreen(int i, ScreenPtr pScreen)
+xf86SbusCmapCloseScreen(ScreenPtr pScreen)
 {
     sbusCmapPtr cmap;
     struct fbcmap fbcmap;
@@ -683,7 +683,7 @@ xf86SbusCmapCloseScreen(int i, ScreenPtr pScreen)
     }
     pScreen->CloseScreen = cmap->CloseScreen;
     free(cmap);
-    return (*pScreen->CloseScreen) (i, pScreen);
+    return (*pScreen->CloseScreen) (pScreen);
 }
 
 Bool
diff --git a/xorg-server/hw/xfree86/common/xf86str.h b/xorg-server/hw/xfree86/common/xf86str.h
index 6294845bc..a1404c3aa 100644
--- a/xorg-server/hw/xfree86/common/xf86str.h
+++ b/xorg-server/hw/xfree86/common/xf86str.h
@@ -630,18 +630,18 @@ typedef struct {
 
 typedef Bool xf86ProbeProc(DriverPtr, int);
 typedef Bool xf86PreInitProc(ScrnInfoPtr, int);
-typedef Bool xf86ScreenInitProc(int, ScreenPtr, int, char **);
-typedef Bool xf86SwitchModeProc(int, DisplayModePtr, int);
-typedef void xf86AdjustFrameProc(int, int, int, int);
-typedef Bool xf86EnterVTProc(int, int);
-typedef void xf86LeaveVTProc(int, int);
-typedef void xf86FreeScreenProc(int, int);
-typedef ModeStatus xf86ValidModeProc(int, DisplayModePtr, Bool, int);
-typedef void xf86EnableDisableFBAccessProc(int, Bool);
-typedef int xf86SetDGAModeProc(int, int, DGADevicePtr);
-typedef int xf86ChangeGammaProc(int, Gamma);
-typedef void xf86PointerMovedProc(int, int, int);
-typedef Bool xf86PMEventProc(int, pmEvent, Bool);
+typedef Bool xf86ScreenInitProc(ScreenPtr, int, char **);
+typedef Bool xf86SwitchModeProc(ScrnInfoPtr, DisplayModePtr);
+typedef void xf86AdjustFrameProc(ScrnInfoPtr, int, int);
+typedef Bool xf86EnterVTProc(ScrnInfoPtr);
+typedef void xf86LeaveVTProc(ScrnInfoPtr);
+typedef void xf86FreeScreenProc(ScrnInfoPtr);
+typedef ModeStatus xf86ValidModeProc(ScrnInfoPtr, DisplayModePtr, Bool, int);
+typedef void xf86EnableDisableFBAccessProc(ScrnInfoPtr, Bool);
+typedef int xf86SetDGAModeProc(ScrnInfoPtr, int, DGADevicePtr);
+typedef int xf86ChangeGammaProc(ScrnInfoPtr, Gamma);
+typedef void xf86PointerMovedProc(ScrnInfoPtr, int, int);
+typedef Bool xf86PMEventProc(ScrnInfoPtr, pmEvent, Bool);
 typedef void xf86DPMSSetProc(ScrnInfoPtr, int, int);
 typedef void xf86LoadPaletteProc(ScrnInfoPtr, int, int *, LOCO *, VisualPtr);
 typedef void xf86SetOverscanProc(ScrnInfoPtr, int);
diff --git a/xorg-server/hw/xfree86/common/xf86xv.c b/xorg-server/hw/xfree86/common/xf86xv.c
index b10034852..1a964d270 100644
--- a/xorg-server/hw/xfree86/common/xf86xv.c
+++ b/xorg-server/hw/xfree86/common/xf86xv.c
@@ -56,7 +56,7 @@
 
 /* XvScreenRec fields */
 
-static Bool xf86XVCloseScreen(int, ScreenPtr);
+static Bool xf86XVCloseScreen(ScreenPtr);
 static int xf86XVQueryAdaptors(ScreenPtr, XvAdaptorPtr *, int *);
 
 /* XvAdaptorRec fields */
@@ -100,9 +100,9 @@ static void xf86XVClipNotify(WindowPtr pWin, int dx, int dy);
 
 /* ScrnInfoRec functions */
 
-static Bool xf86XVEnterVT(int, int);
-static void xf86XVLeaveVT(int, int);
-static void xf86XVAdjustFrame(int index, int x, int y, int flags);
+static Bool xf86XVEnterVT(ScrnInfoPtr);
+static void xf86XVLeaveVT(ScrnInfoPtr);
+static void xf86XVAdjustFrame(ScrnInfoPtr, int x, int y);
 static void xf86XVModeSet(ScrnInfoPtr pScrn);
 
 /* misc */
@@ -1066,7 +1066,7 @@ xf86XVReputOrStopPort(XvPortRecPrivatePtr pPriv, WindowPtr pWin, Bool visible)
 static void
 xf86XVReputOrStopAllPorts(ScrnInfoPtr pScrn, Bool onlyChanged)
 {
-    ScreenPtr pScreen = pScrn->pScreen;
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);
     XvAdaptorPtr pa;
     int c, i;
@@ -1255,7 +1255,7 @@ xf86XVClipNotify(WindowPtr pWin, int dx, int dy)
 /**** Required XvScreenRec fields ****/
 
 static Bool
-xf86XVCloseScreen(int i, ScreenPtr pScreen)
+xf86XVCloseScreen(ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);
@@ -1299,15 +1299,14 @@ xf86XVQueryAdaptors(ScreenPtr pScreen,
 /**** ScrnInfoRec fields ****/
 
 static Bool
-xf86XVEnterVT(int index, int flags)
+xf86XVEnterVT(ScrnInfoPtr pScrn)
 {
-    ScrnInfoPtr pScrn = xf86Screens[index];
-    ScreenPtr pScreen = screenInfo.screens[index];
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
     Bool ret;
 
     pScrn->EnterVT = ScreenPriv->EnterVT;
-    ret = (*ScreenPriv->EnterVT) (index, flags);
+    ret = (*ScreenPriv->EnterVT) (pScrn);
     ScreenPriv->EnterVT = pScrn->EnterVT;
     pScrn->EnterVT = xf86XVEnterVT;
 
@@ -1318,10 +1317,9 @@ xf86XVEnterVT(int index, int flags)
 }
 
 static void
-xf86XVLeaveVT(int index, int flags)
+xf86XVLeaveVT(ScrnInfoPtr pScrn)
 {
-    ScrnInfoPtr pScrn = xf86Screens[index];
-    ScreenPtr pScreen = screenInfo.screens[index];
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);
     XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
     XvAdaptorPtr pAdaptor;
@@ -1353,21 +1351,20 @@ xf86XVLeaveVT(int index, int flags)
     }
 
     pScrn->LeaveVT = ScreenPriv->LeaveVT;
-    (*ScreenPriv->LeaveVT) (index, flags);
+    (*ScreenPriv->LeaveVT) (pScrn);
     ScreenPriv->LeaveVT = pScrn->LeaveVT;
     pScrn->LeaveVT = xf86XVLeaveVT;
 }
 
 static void
-xf86XVAdjustFrame(int index, int x, int y, int flags)
+xf86XVAdjustFrame(ScrnInfoPtr pScrn, int x, int y)
 {
-    ScrnInfoPtr pScrn = xf86Screens[index];
-    ScreenPtr pScreen = pScrn->pScreen;
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
 
     if (ScreenPriv->AdjustFrame) {
         pScrn->AdjustFrame = ScreenPriv->AdjustFrame;
-        (*pScrn->AdjustFrame) (index, x, y, flags);
+        (*pScrn->AdjustFrame) (pScrn, x, y);
         pScrn->AdjustFrame = xf86XVAdjustFrame;
     }
 
@@ -1377,7 +1374,7 @@ xf86XVAdjustFrame(int index, int x, int y, int flags)
 static void
 xf86XVModeSet(ScrnInfoPtr pScrn)
 {
-    ScreenPtr pScreen = pScrn->pScreen;
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     XF86XVScreenPtr ScreenPriv;
 
     /* Can be called before pScrn->pScreen is set */
diff --git a/xorg-server/hw/xfree86/common/xf86xvmc.c b/xorg-server/hw/xfree86/common/xf86xvmc.c
index b7da7589a..2e529dd92 100644
--- a/xorg-server/hw/xfree86/common/xf86xvmc.c
+++ b/xorg-server/hw/xfree86/common/xf86xvmc.c
@@ -132,7 +132,7 @@ xf86XvMCDestroySubpicture(XvMCSubpicturePtr pSubpicture)
 }
 
 static Bool
-xf86XvMCCloseScreen(int i, ScreenPtr pScreen)
+xf86XvMCCloseScreen(ScreenPtr pScreen)
 {
     xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pScreen);
 
@@ -141,7 +141,7 @@ xf86XvMCCloseScreen(int i, ScreenPtr pScreen)
     free(pScreenPriv->dixinfo);
     free(pScreenPriv);
 
-    return (*pScreen->CloseScreen) (i, pScreen);
+    return (*pScreen->CloseScreen) (pScreen);
 }
 
 Bool
diff --git a/xorg-server/hw/xfree86/common/xf86xvpriv.h b/xorg-server/hw/xfree86/common/xf86xvpriv.h
index 289ca5843..e95f959a8 100644
--- a/xorg-server/hw/xfree86/common/xf86xvpriv.h
+++ b/xorg-server/hw/xfree86/common/xf86xvpriv.h
@@ -41,9 +41,9 @@ typedef struct {
     ClipNotifyProcPtr ClipNotify;
     WindowExposuresProcPtr WindowExposures;
     PostValidateTreeProcPtr PostValidateTree;
-    void (*AdjustFrame) (int, int, int, int);
-    Bool (*EnterVT) (int, int);
-    void (*LeaveVT) (int, int);
+    void (*AdjustFrame) (ScrnInfoPtr, int, int);
+    Bool (*EnterVT) (ScrnInfoPtr);
+    void (*LeaveVT) (ScrnInfoPtr);
     xf86ModeSetProc *ModeSet;
 } XF86XVScreenRec, *XF86XVScreenPtr;
 
diff --git a/xorg-server/hw/xfree86/ddc/DDC.HOWTO b/xorg-server/hw/xfree86/ddc/DDC.HOWTO
index 1d06ca124..54fbe73ad 100644
--- a/xorg-server/hw/xfree86/ddc/DDC.HOWTO
+++ b/xorg-server/hw/xfree86/ddc/DDC.HOWTO
@@ -1,97 +1,97 @@
-			DDC.HOWTO
-
-  This file describes how to add DDC support to a chipset driver.
-
-1) DDC INITIALIZATION
-
-   When implementing DDC in the driver one has the choice between
-   DDC1 and DDC2. 
-   DDC1 data is continuously transmitted by a DDC1 capable display 
-   device. The data is send serially over a data line; the Vsync 
-   signal serves as clock. Only one EDID 1.x data block can be 
-   transmitted using DDC1. Since transmission of an EDID1 block 
-   using a regular Vsync frequency would take up several seconds 
-   the driver can increase the Vsync frequency to up to 25 kHz as 
-   soon as it detects DDC1 activity on the data line.
-   DDC2 data is transmitted using the I2C protocol. This requires
-   an additional clock line. DDC2 is capable of transmitting EDID1
-   and EDID2 block as well as a VDIF block on display devices that 
-   support these.  
-   Display devices switch into the DDC2 mode as soon as they detect
-   activity on the DDC clock line. Once the are in DDC2 mode they
-   stop transmitting DDC1 signals until the next power cycle.
-
-   Some graphics chipset configurations which are not capable of
-   DDC2 might still be able to read DDC1 data. Where available
-   DDC2 it is preferable. 
-	
-   All relevant prototypes and defines are in xf86DDC.h.
-   DDC2 additionally requires I2C support. The I2C prototypes
-   are in xf86i2c.h.
-
-   DDC1 Support:
-
-     The driver has to provide a read function which waits for the
-     end of the next Vsync signal and reads in and returns the status
-     of the DDC line:
-
-     unsigned int XXX_ddc1Read(ScrnInfoPtr pScrn)
-     
-     Additionally a function is required to increase the Vsync
-     frequency to max. 25 kHz. 
- 
-     void XXX_ddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
- 
-     If the speed argument is DDC_FAST the function should increase
-     the Vsync frequency on DDC_SLOW it should restore the original
-     value. For convenience a generic ddc1SetSpeed() function is provided
-     in the vga module for VGA-like chipsets.     
-	
-     void vgaHWddc1SetSpeed(ScrnInfoPtr pScrn, sf86ddcSpeed speed).
-
-     To read out the DDC1 data the driver should call 
-
-     xf86MonPtr xf86DoEDID_DDC1(int scrnIndex, 
-                              void (*DDC1SetSpeed)(ScrnInfoPtr, xf86ddcSpeed),
-                              unsigned int (*DDC1Read)(ScrnInfoPtr))
- 
-     in PreInit(). DDC1SetSpeed is a pointer to the SetSpeed()
-     function, DDC1Read has to point to the DDC1 read function.
-     The function will return a pointer to the xf86Monitor structure
-     which contains all information retrieved by DDC.
-     NULL will be returned on failure.
-
-   DDC2 Support
- 
-     To read out DDC2 information I2C has to be initialized first.
-     (See documentation for the i2c module). 
-     The function 
-     
-     xf86MonPtr xf86DoEDID_DDC2(int scrnIndex, I2CBusPtr pBus)
-
-     is provided to read out and process DDC2 data. A pointer
-     to the I2CBusRec of the appropriate I2C Bus has to be passed
-     as the second argument.
-     The function will return a pointer to the xf86Monitor structure
-     which contains all information retrieved by DDC.
-     NULL will be returned on failure.
-
-   Printing monitor parameters   
-
-     To print out the information contained in the xf86Monitor
-     structure the function 
-
-     xf86MonPtr xf86PrintEDID(xf86MonPtr monitor)
- 
-     is provided.
-
-    Further processing of the xf86Monitor structure is not yet 
-    implemented. However, it is planned to use the information
-    about video modes, gamma values etc.
-    Therefore it is strongly recommended to read out DDC data
-    before any video mode processing is done.
-
-
-
-
-$XFree86: xc/programs/Xserver/hw/xfree86/ddc/DDC.HOWTO,v 1.2 1998/12/06 13:30:39 dawes Exp $
+			DDC.HOWTO
+
+  This file describes how to add DDC support to a chipset driver.
+
+1) DDC INITIALIZATION
+
+   When implementing DDC in the driver one has the choice between
+   DDC1 and DDC2. 
+   DDC1 data is continuously transmitted by a DDC1 capable display 
+   device. The data is send serially over a data line; the Vsync 
+   signal serves as clock. Only one EDID 1.x data block can be 
+   transmitted using DDC1. Since transmission of an EDID1 block 
+   using a regular Vsync frequency would take up several seconds 
+   the driver can increase the Vsync frequency to up to 25 kHz as 
+   soon as it detects DDC1 activity on the data line.
+   DDC2 data is transmitted using the I2C protocol. This requires
+   an additional clock line. DDC2 is capable of transmitting EDID1
+   and EDID2 block as well as a VDIF block on display devices that 
+   support these.  
+   Display devices switch into the DDC2 mode as soon as they detect
+   activity on the DDC clock line. Once the are in DDC2 mode they
+   stop transmitting DDC1 signals until the next power cycle.
+
+   Some graphics chipset configurations which are not capable of
+   DDC2 might still be able to read DDC1 data. Where available
+   DDC2 it is preferable. 
+	
+   All relevant prototypes and defines are in xf86DDC.h.
+   DDC2 additionally requires I2C support. The I2C prototypes
+   are in xf86i2c.h.
+
+   DDC1 Support:
+
+     The driver has to provide a read function which waits for the
+     end of the next Vsync signal and reads in and returns the status
+     of the DDC line:
+
+     unsigned int XXX_ddc1Read(ScrnInfoPtr pScrn)
+     
+     Additionally a function is required to increase the Vsync
+     frequency to max. 25 kHz. 
+ 
+     void XXX_ddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
+ 
+     If the speed argument is DDC_FAST the function should increase
+     the Vsync frequency on DDC_SLOW it should restore the original
+     value. For convenience a generic ddc1SetSpeed() function is provided
+     in the vga module for VGA-like chipsets.     
+	
+     void vgaHWddc1SetSpeed(ScrnInfoPtr pScrn, sf86ddcSpeed speed).
+
+     To read out the DDC1 data the driver should call 
+
+     xf86MonPtr xf86DoEDID_DDC1(int scrnIndex, 
+                              void (*DDC1SetSpeed)(ScrnInfoPtr, xf86ddcSpeed),
+                              unsigned int (*DDC1Read)(ScrnInfoPtr))
+ 
+     in PreInit(). DDC1SetSpeed is a pointer to the SetSpeed()
+     function, DDC1Read has to point to the DDC1 read function.
+     The function will return a pointer to the xf86Monitor structure
+     which contains all information retrieved by DDC.
+     NULL will be returned on failure.
+
+   DDC2 Support
+ 
+     To read out DDC2 information I2C has to be initialized first.
+     (See documentation for the i2c module). 
+     The function 
+     
+     xf86MonPtr xf86DoEDID_DDC2(int scrnIndex, I2CBusPtr pBus)
+
+     is provided to read out and process DDC2 data. A pointer
+     to the I2CBusRec of the appropriate I2C Bus has to be passed
+     as the second argument.
+     The function will return a pointer to the xf86Monitor structure
+     which contains all information retrieved by DDC.
+     NULL will be returned on failure.
+
+   Printing monitor parameters   
+
+     To print out the information contained in the xf86Monitor
+     structure the function 
+
+     xf86MonPtr xf86PrintEDID(xf86MonPtr monitor)
+ 
+     is provided.
+
+    Further processing of the xf86Monitor structure is not yet 
+    implemented. However, it is planned to use the information
+    about video modes, gamma values etc.
+    Therefore it is strongly recommended to read out DDC data
+    before any video mode processing is done.
+
+
+
+
+$XFree86: xc/programs/Xserver/hw/xfree86/ddc/DDC.HOWTO,v 1.2 1998/12/06 13:30:39 dawes Exp $
diff --git a/xorg-server/hw/xfree86/ddc/Makefile.am b/xorg-server/hw/xfree86/ddc/Makefile.am
index 93ea4a2a5..0db5d833f 100644
--- a/xorg-server/hw/xfree86/ddc/Makefile.am
+++ b/xorg-server/hw/xfree86/ddc/Makefile.am
@@ -1,11 +1,11 @@
-sdk_HEADERS = edid.h xf86DDC.h
-
-noinst_LTLIBRARIES = libddc.la
-
-libddc_la_SOURCES = ddc.c interpret_edid.c print_edid.c ddcProperty.c
-
-INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
-
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
-
-EXTRA_DIST = DDC.HOWTO
+sdk_HEADERS = edid.h xf86DDC.h
+
+noinst_LTLIBRARIES = libddc.la
+
+libddc_la_SOURCES = ddc.c interpret_edid.c print_edid.c ddcProperty.c
+
+INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
+
+AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+
+EXTRA_DIST = DDC.HOWTO
diff --git a/xorg-server/hw/xfree86/ddc/ddc.c b/xorg-server/hw/xfree86/ddc/ddc.c
index a1281d735..28c969646 100644
--- a/xorg-server/hw/xfree86/ddc/ddc.c
+++ b/xorg-server/hw/xfree86/ddc/ddc.c
@@ -258,10 +258,9 @@ EDIDRead_DDC1(ScrnInfoPtr pScrn, DDC1SetSpeedProc DDCSpeed,
  * @return NULL if no monitor attached or failure to interpret the EDID.
  */
 xf86MonPtr
-xf86DoEDID_DDC1(int scrnIndex, DDC1SetSpeedProc DDC1SetSpeed,
+xf86DoEDID_DDC1(ScrnInfoPtr pScrn, DDC1SetSpeedProc DDC1SetSpeed,
                 unsigned int (*DDC1Read) (ScrnInfoPtr))
 {
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     unsigned char *EDID_block = NULL;
     xf86MonPtr tmp = NULL;
 
@@ -285,7 +284,7 @@ xf86DoEDID_DDC1(int scrnIndex, DDC1SetSpeedProc DDC1SetSpeed,
     OsReleaseSignals();
 
     if (EDID_block) {
-        tmp = xf86InterpretEDID(scrnIndex, EDID_block);
+        tmp = xf86InterpretEDID(pScrn->scrnIndex, EDID_block);
     }
 #ifdef DEBUG
     else
@@ -323,7 +322,7 @@ DDC2MakeDevice(I2CBusPtr pBus, int address, char *name)
 }
 
 static I2CDevPtr
-DDC2Init(int scrnIndex, I2CBusPtr pBus)
+DDC2Init(I2CBusPtr pBus)
 {
     I2CDevPtr dev = NULL;
 
@@ -403,9 +402,8 @@ DDC2Read(I2CDevPtr dev, int block, unsigned char *R_Buffer)
  * @return NULL if no monitor attached or failure to interpret the EDID.
  */
 xf86MonPtr
-xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, Bool complete)
+xf86DoEEDID(ScrnInfoPtr pScrn, I2CBusPtr pBus, Bool complete)
 {
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     unsigned char *EDID_block = NULL;
     xf86MonPtr tmp = NULL;
     I2CDevPtr dev = NULL;
@@ -427,7 +425,7 @@ xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, Bool complete)
     if (noddc || noddc2)
         return NULL;
 
-    if (!(dev = DDC2Init(scrnIndex, pBus)))
+    if (!(dev = DDC2Init(pBus)))
         return NULL;
 
     EDID_block = calloc(1, EDID1_LEN);
@@ -444,7 +442,7 @@ xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, Bool complete)
                 DDC2Read(dev, i + 1, EDID_block + (EDID1_LEN * (1 + i)));
         }
 
-        tmp = xf86InterpretEEDID(scrnIndex, EDID_block);
+        tmp = xf86InterpretEEDID(pScrn->scrnIndex, EDID_block);
     }
 
     if (tmp && complete)
@@ -465,9 +463,9 @@ xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, Bool complete)
  * @return NULL if no monitor attached or failure to interpret the EDID.
  */
 xf86MonPtr
-xf86DoEDID_DDC2(int scrnIndex, I2CBusPtr pBus)
+xf86DoEDID_DDC2(ScrnInfoPtr pScrn, I2CBusPtr pBus)
 {
-    return xf86DoEEDID(scrnIndex, pBus, FALSE);
+    return xf86DoEEDID(pScrn, pBus, FALSE);
 }
 
 /* XXX write me */
@@ -489,9 +487,8 @@ DDC2ReadDisplayID(void)
  * @return NULL if no monitor attached or failure to interpret the DisplayID.
  */
 xf86MonPtr
-xf86DoDisplayID(int scrnIndex, I2CBusPtr pBus)
+xf86DoDisplayID(ScrnInfoPtr pScrn, I2CBusPtr pBus)
 {
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     unsigned char *did = NULL;
     xf86MonPtr tmp = NULL;
     I2CDevPtr dev = NULL;
@@ -513,7 +510,7 @@ xf86DoDisplayID(int scrnIndex, I2CBusPtr pBus)
     if (noddc || noddc2)
         return NULL;
 
-    if (!(dev = DDC2Init(scrnIndex, pBus)))
+    if (!(dev = DDC2Init(pBus)))
         return NULL;
 
     if ((did = DDC2ReadDisplayID())) {
@@ -521,7 +518,7 @@ xf86DoDisplayID(int scrnIndex, I2CBusPtr pBus)
         if (!tmp)
             return NULL;
 
-        tmp->scrnIndex = scrnIndex;
+        tmp->scrnIndex = pScrn->scrnIndex;
         tmp->flags |= MONITOR_DISPLAYID;
         tmp->rawData = did;
     }
diff --git a/xorg-server/hw/xfree86/ddc/xf86DDC.h b/xorg-server/hw/xfree86/ddc/xf86DDC.h
index 2071d530d..c63da8bff 100644
--- a/xorg-server/hw/xfree86/ddc/xf86DDC.h
+++ b/xorg-server/hw/xfree86/ddc/xf86DDC.h
@@ -24,15 +24,15 @@ typedef enum {
 
 typedef void (*DDC1SetSpeedProc) (ScrnInfoPtr, xf86ddcSpeed);
 
-extern _X_EXPORT xf86MonPtr xf86DoEDID_DDC1(int scrnIndex,
+extern _X_EXPORT xf86MonPtr xf86DoEDID_DDC1(ScrnInfoPtr pScrn,
                                             DDC1SetSpeedProc DDC1SetSpeed,
                                             unsigned
                                             int (*DDC1Read) (ScrnInfoPtr)
     );
 
-extern _X_EXPORT xf86MonPtr xf86DoEDID_DDC2(int scrnIndex, I2CBusPtr pBus);
+extern _X_EXPORT xf86MonPtr xf86DoEDID_DDC2(ScrnInfoPtr pScrn, I2CBusPtr pBus);
 
-extern _X_EXPORT xf86MonPtr xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, Bool);
+extern _X_EXPORT xf86MonPtr xf86DoEEDID(ScrnInfoPtr pScrn, I2CBusPtr pBus, Bool);
 
 extern _X_EXPORT xf86MonPtr xf86PrintEDID(xf86MonPtr monPtr);
 
@@ -50,7 +50,7 @@ extern _X_EXPORT DisplayModePtr xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC);
 extern _X_EXPORT Bool
  xf86MonitorIsHDMI(xf86MonPtr mon);
 
-extern _X_EXPORT xf86MonPtr xf86DoDisplayID(int scrnIndex, I2CBusPtr pBus);
+extern _X_EXPORT xf86MonPtr xf86DoDisplayID(ScrnInfoPtr pScrn, I2CBusPtr pBus);
 
 extern _X_EXPORT void
  xf86DisplayIDMonitorSet(int scrnIndex, MonPtr mon, xf86MonPtr DDC);
diff --git a/xorg-server/hw/xfree86/doc/.gitignore b/xorg-server/hw/xfree86/doc/.gitignore
new file mode 100644
index 000000000..63eee5960
--- /dev/null
+++ b/xorg-server/hw/xfree86/doc/.gitignore
@@ -0,0 +1,4 @@
+ddxDesign.html
+ddxDesign.pdf
+ddxDesign.ps
+ddxDesign.txt
diff --git a/xorg-server/hw/xfree86/doc/README.DRIcomp b/xorg-server/hw/xfree86/doc/README.DRIcomp
index 617897949..2d3ebf148 100644
--- a/xorg-server/hw/xfree86/doc/README.DRIcomp
+++ b/xorg-server/hw/xfree86/doc/README.DRIcomp
@@ -1,554 +1,554 @@
-                            DRI Compilation Guide
-
-          VA Linux Systems, Inc. Professional Services - Graphics.
-
-                                21 April 2001
-
-1.  Preamble
-
-1.1  Copyright
-
-Copyright 2000-2001 by VA Linux Systems, Inc.  All Rights Reserved.
-
-Permission is granted to make and distribute verbatim copies of this document
-provided the copyright notice and this permission notice are preserved on all
-copies.
-
-1.2  Trademarks
-
-OpenGL is a registered trademark and SGI is a trademark of Silicon Graphics,
-Inc.  Unix is a registered trademark of The Open Group.  The `X' device and X
-Window System are trademarks of The Open Group.  XFree86 is a trademark of
-The XFree86 Project.  Linux is a registered trademark of Linus Torvalds.
-Intel is a registered trademark of Intel Corporation.  3Dlabs, GLINT, and
-Oxygen are either registered trademarks or trademarks of 3Dlabs Inc. Ltd.
-3dfx, Voodoo3, Voodoo4, and Voodoo5 are registered trademarks of 3dfx Inter-
-active, Incorporated.  Matrox is a registered trademark of Matrox Electronic
-Systems Ltd.  ATI Rage and Radeon is a registered trademark of ATI Technolo-
-gies, Inc.  All other trademarks mentioned are the property of their respec-
-tive owners.
-
-2.  Introduction
-
-This document describes how to download, compile and install the DRI.  The
-DRI provides 3D graphics hardware acceleration for the XFree86 project.  This
-information is intended for experienced Linux developers.  Beginners are
-probably better off installing precompiled packages.
-
-Edits, corrections and updates to this document may be mailed to <brian@tung-
-stengraphics.com>.
-
-Last updated on 13 February 2002 by Brian Paul.
-
-3.  Prerequisites
-
-You'll need the following:
-
-   o An installation of XFree86 4.1 or later.  The DRI tree has been pruned
-     down to minimize its size.  But in order to build the DRI tree you need
-     to have recent X header files, etc. already installed.  If you don't
-     have XFree86 4.1 (or later) installed you can probably install it from
-     RPMs (or another package format).  Or, you can download XFree86 as
-     sources and compile/install it yourself.
-
-   o At least 200MB of free disk space.  If you compile for debugging (the -g
-     option) then you'll need about 600MB.
-
-   o GCC compiler and related tools.
-
-   o ssh (secure shell) if you're a DRI developer and don't want to use
-     anonymous CVS download.
-
-   o A 2.4.x Linux Kernel.  See below for details.
-
-   o FreeBSD support is not currently being maintained and may not work.
-
-The DRI 3D drivers generally work on systems with Intel or AMD CPUs.  How-
-ever, limited support for Alpha and PowerPC support is underway.
-
-For 3dfx Voodoo hardware, you'll also need the Glide3 runtime library
-(libglide3-v3.so for Voodoo3 or libglide3-v5.so for Voodoo4/5).  These can be
-downloaded from the DRI website.  You can compile them yourself, but it's
-often a painful process.
-
-For Matrox G200/G400, Intel i810/i830 or ATI Rage128/Radeon hardware, you'll
-also need AGP support in your Linux kernel, either built-in or as a loadable
-module.
-
-4.  Linux Kernel Preparation
-
-Only the Linux 2.4.x kernels are currently supported by the DRI hardware
-drivers.  2.5.x kernels may work, but aren't tested.
-
-Most of the DRI drivers require AGP support and using Intel Pentium III SSE
-optimizations also requires an up-to-date Linux kernel.  Configuring your
-kernel correctly is very important, as features such as SSE optimizations
-will be disabled if your kernel does not support them.  Thus, if you have a
-Pentium III processor, you must configure your kernel for the Pentium III
-processor family.
-
-Building a new Linux kernel can be difficult for beginners but there are
-resources on the Internet to help.  This document assumes experience with
-configuring, building and installing Linux kernels.
-
-Linux kernels can be downloaded from www.kernel.org
-
-Here are the basic steps for kernel setup.
-
-   o Download the needed kernel and put it in /usr/src.  Create a directory
-     for the source and unpack it.  For example:
-
-                    cd /usr/src
-                    rm -f linux
-                    mkdir linux-2.4.x
-                    ln -s linux-2.4.x linux
-                    bzcat linux-2.4.x.tar.bz2 | tar xf -
-
-     It is critical that /usr/src/linux point to your new kernel sources,
-     otherwise the kernel headers will not be used when building the DRI.
-     This will almost certainly cause compilation problems.
-
-   o Read /usr/src/linux/Documentation/Changes.  This file lists the minimum
-     requirements for all software packages required to build the kernel.
-     You must upgrade at least gcc, make, binutils and modutils to at least
-     the versions specified in this file.  The other packages may not be
-     needed.  If you are upgrading from Linux 2.2.x you must upgrade your
-     modutils package for Linux 2.4.x.
-
-   o Configure your kernel.  You might, for example, use make menuconfig and
-     do the following:
-
-        o Go to Code maturity level options
-
-        o Enable Prompt for development and/or incomplete code/drivers
-
-        o hit ESC to return to the top-level menu
-
-        o Go to Processor type and features
-
-        o Select your processor type from Processor Family
-
-        o hit ESC to return to the top-level menu
-
-        o Go to Character devices
-
-        o Disable Direct Rendering Manager (XFree86 DRI support) since we'll
-          use the DRI code from the XFree86/DRI tree and will compile it
-          there.
-
-        o Go to /dev/agpgart (AGP Support) (EXPERIMENTAL) (NEW)
-
-        o Hit SPACE twice to build AGP support into the kernel
-
-        o Enable all chipsets' support for AGP
-
-        o It's recommended that you turn on MTRRs under Processor type and
-          Features, but not required.
-
-   o Configure the rest of the kernel as required for your system (i.e. Eth-
-     ernet, SCSI, etc)
-
-   o Exit, saving your kernel configuration.
-
-   o Edit your /etc/lilo.conf file.  Make sure you have an image entry as
-     follows (or similar):
-
-                      image=/boot/vmlinuz
-                            label=linux.2.4.x
-                            read-only
-                            root=/dev/hda1
-
-     The important part is that you have /boot/vmlinuz without a trailing
-     version number.  If this is the first entry in your /etc/lilo.conf AND
-     you haven't set a default, then this will be your default kernel.
-
-   o Compile the new kernel.
-
-                    cd /usr/src/linux-2.4.x
-                    make dep
-                    make bzImage
-                    make modules
-                    make modules_install
-                    make install
-
-     Note that last make command will automatically run lilo for you.
-
-   o Now reboot to use the new kernel.
-
-5.  CPU Architectures
-
-In general, nothing special has to be done to use the DRI on different CPU
-architectures.  There are, however, a few optimizations that are CPU-depen-
-dent.  Mesa will determine at runtime which CPU-dependent optimizations
-should be used and enable them where appropriate.
-
-5.1  Intel Pentium III Features
-
-The Pentium III SSE instructions are used in optimized vertex transformation
-functions in the Mesa-based DRI drivers.  On Linux, SSE requires a recent
-kernel (such as 2.4.0-test11 or later) both at compile time and runtime.
-
-5.2  AMD 3DNow! Features
-
-AMD's 3DNow! instructions are used in optimized vertex transformation func-
-tions in the Mesa-based DRI drivers.  3DNow! is supported in most versions of
-Linux.
-
-5.3  Alpha Features
-
-On newer Alpha processors a significant performance increase can be seen with
-the addition of the -mcpu= option to GCC.  This option is dependent on the
-architecture of the processor.  For example, -mcpu=ev6 will build specifi-
-cally for the EV6 based AXP's, giving both byte and word alignment access to
-the DRI/Mesa drivers.
-
-To enable this optimization edit your xc/config/host.def file and add the
-line:
-
-#define DefaultGcc2AxpOpt -O2 -mcpu=ev6
-
-Additional speed improvements to 3D rendering can be achieved by installing
-Compaq's Math Libraries (CPML) which can be obtained from http://www.sup-
-port.compaq.com/alpha-tools/software/index.html
-
-Once installed, you can add this line to your host.def to build with the CPML
-libraries:
-
-#define UseCompaqMathLibrary YES
-
-The host.def file is explained below.
-
-6.  Downloading the XFree86/DRI CVS Sources
-
-The DRI project is hosted by SourceForge.  The DRI source code, which is a
-subset of the XFree86 source tree, is kept in a CVS repository there.
-
-The DRI CVS sources may be accessed either anonymously or as a registered
-SourceForge user.  It's recommended that you become a registered SourceForge
-user so that you may submit non-anonymous bug reports and can participate in
-the mailing lists.
-
-6.1  Anonymous CVS download:
-
-  1.  Create a directory to store the CVS files:
-
-                       cd ~
-                       mkdir DRI-CVS
-
-      You could put your CVS directory in a different place but we'll use
-      ~/DRI-CVS/ here.
-
-  2.  Check out the CVS sources:
-
-                       cd ~/DRI-CVS
-                       cvs -d:pserver:anonymous@cvs.dri.sourceforge.net:/cvsroot/dri login
-                         (hit ENTER when prompted for a password)
-                       cvs -z3 -d:pserver:anonymous@cvs.dri.sourceforge.net:/cvsroot/dri co xc
-
-      The -z3 flag causes compression to be used in order to reduce the down-
-      load time.
-
-6.2  Registered CVS download:
-
-  1.  Create a directory to store the CVS files:
-
-                       cd ~
-                       mkdir DRI-CVS
-
-      You could put your CVS directory in a different place but we'll use
-      ~/DRI-CVS/ here.
-
-  2.  Set the CVS_RSH environment variable:
-
-                       setenv CVS_RSH ssh      // if using csh or tcsh
-                       export CVS_RSH=ssh      // if using sh or bash
-
-  3.  Check out the CVS sources:
-
-                       cd ~/DRI-CVS
-                       cvs -z3 -d:ext:YOURID@cvs.dri.sourceforge.net:/cvsroot/dri co xc
-
-      Replace YOURID with your CVS login name.  You'll be prompted to enter
-      your sourceforge password.
-
-      The -z3 flag causes compression to be used in order to reduce the down-
-      load time.
-
-6.3  Updating your CVS sources
-
-In the future you'll want to occasionally update your local copy of the DRI
-source code to get the latest changes.  This can be done with:
-
-                cd ~/DRI-CVS
-                cvs -z3 update -dA xc
-
-The -d flag causes any new subdirectories to be created and -A causes most
-recent trunk sources to be fetched, not branch sources.
-
-7.  Mesa
-
-Most of the DRI 3D drivers are based on Mesa (the free implementation of the
-OpenGL API).  The relevant files from Mesa are already included in the
-XFree86/DRI source tree.  There is no need to download or install the Mesa
-source files separately.
-
-Sometimes a newer version of Mesa will be available than the version included
-in XFree86/DRI.  Upgrading Mesa within XFree86/DRI is not always straightfor-
-ward.  It can be an error-prone undertaking, especially for beginners, and is
-not generally recommended.  The DRI developers will upgrade Mesa when appro-
-priate.
-
-8.  Compiling the XFree86/DRI tree
-
-8.1  Make a build tree
-
-Rather than placing object files and library files right in the source tree,
-they're instead put into a parallel build tree.  The build tree is made with
-the lndir command:
-
-                 cd ~/DRI-CVS
-                 ln -s xc XFree40
-                 mkdir build
-                 cd build
-                 lndir -silent -ignorelinks ../XFree40
-
-The build tree will be populated with symbolic links which point back into
-the CVS source tree.
-
-Advanced users may have several build trees for compiling and testing with
-different options.
-
-8.2  Edit the host.def file
-
-The ~/DRI-CVS/build/xc/config/cf/host.def file is used to configure the
-XFree86 build process.  You can change it to customize your build options or
-make adjustments for your particular system configuration
-
-The default host.def file will look something like this:
-
-                 #define DefaultCCOptions -Wall
-     (i386)      #define DefaultGcc2i386Opt -O2
-     (Alpha)     #define DefaultGcc2AxpOpt -O2 -mcpu=ev6 (or similar)
-                 #define LibraryCDebugFlags -O2
-                 #define BuildServersOnly YES
-                 #define XF86CardDrivers vga tdfx mga ati i810
-                 #define LinuxDistribution LinuxRedHat
-                 #define DefaultCCOptions -ansi GccWarningOptions -pipe
-                 #define BuildXF86DRI YES
-                 /* Optionally turn these on for debugging */
-                 /* #define GlxBuiltInTdfx YES */
-                 /* #define GlxBuiltInMga YES */
-                 /* #define GlxBuiltInR128 YES */
-                 /* #define GlxBuiltInRadeon YES */
-                 /* #define DoLoadableServer NO */
-                 #define SharedLibFont NO
-
-The ProjectRoot variable specifies where the XFree86 files will be installed.
-We recommend installing the DRI files over your existing XFree86 installation
-- it's generally safe to do and less error-prone.  This policy is different
-than what we used to recommend.
-
-If XFree86 4.x is not installed in /usr/X11R6/ you'll have to add the follow-
-ing to the host.def file:
-
-                 #define ProjectRoot pathToYourXFree86installation
-
-Note the XF86CardDrivers line to be sure your card's driver is listed.
-
-If you want to enable 3DNow! optimizations in Mesa and the DRI drivers, you
-should add the following:
-
-                 #define MesaUse3DNow YES
-
-You don't have to be using an AMD processor in order to enable this option.
-The DRI will look for 3DNow! support and runtime and only enable it if appli-
-cable.
-
-If you want to enable SSE optimizations in Mesa and the DRI drivers, you must
-upgrade to a Linux 2.4.x kernel.  Mesa will verify that SSE is supported by
-both your processor and your operating system, but to build Mesa inside the
-DRI you need to have the Linux 2.4.x kernel headers in /usr/src/linux.  If
-you enable SSE optimizations with an earlier version of the Linux kernel in
-/usr/src/linux, Mesa will not compile.  You have been warned.  If you do have
-a 2.4.x kernel, you should add the following:
-
-                 #define MesaUseSSE YES
-
-If you want to build the DRM kernel modules as part of the full build pro-
-cess, add the following:
-
-                 #define BuildXF86DRM YES
-
-Otherwise, you'll need to build them separately as described below.
-
-8.3  Compilation
-
-To compile the complete DRI tree:
-
-                 cd ~/DRI-CVS/build/xc/
-                 make World >& world.log
-
-Or if you want to watch the compilation progress:
-
-                 cd ~/DRI-CVS/build/xc/
-                 make World >& world.log &
-                 tail -f world.log
-
-With the default compilation flags it's normal to get a lot of warnings dur-
-ing compilation.
-
-Building will take some time so you may want to go check your email or visit
-slashdot.
-
-WARNING: do not use the -j option with make.  It's reported that it does not
-work with XFree86/DRI.
-
-8.4  Check for compilation errors
-
-Using your text editor, examine world.log for errors by searching for the
-pattern ***.
-
-After fixing the errors, run make World again.  Later, you might just compile
-parts of the source tree but it's important that the whole tree will build
-first.
-
-If you edited your host.def file to enable automatic building of the DRI ker-
-nel module(s), verify that they were built:
-
-               cd ~/DRI-CVS/build/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel
-               ls
-
-Otherwise, build them now by running
-
-               cd ~/DRI-CVS/build/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel
-               make -f Makefile.linux
-
-For the 3dfx Voodoo, you should see tdfx.o.  For the Matrox G200/G400, you
-should see mga.o.  For the ATI Rage 128, you should see r128.o.  For the ATI
-Radeon, you should see radeon.o.  For the Intel i810, you should see i810.o.
-
-If the DRI kernel module(s) failed to build you should verify that you're
-using the right version of the Linux kernel.  The most recent kernels are not
-always supported.
-
-If your build machine is running a different version of the kernel than your
-target machine (i.e. 2.2.x vs. 2.4.x), make will select the wrong kernel
-source tree. This can be fixed by explicitly setting the value of LINUXDIR.
-If the path to your kernel source is /usr/src/linux-2.4.x,
-
-               cd ~/DRI-CVS/build/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel
-               make -f Makefile.linux LINUXDIR=/usr/src/linux-2.4.x
-
-or alternatively, edit Makefile.linux to set LINUXDIR before the ifndef LIN-
-UXDIR line.
-
-8.5  DRI kernel module installation
-
-The DRI kernel modules will be in ~/DRI-CVS/build/xc/pro-
-grams/Xserver/hw/xfree86/os-support/linux/drm/kernel/.
-
-To load the appropriate DRM module in your running kernel you can either use
-ismod and restart your X server or copy the kernel module to /lib/mod-
-ules/2.4.x/kernel/drivers/char/drm/ then run depmod and restart your X
-server.
-
-Make sure you first unload any older DRI kernel modules that might be already
-loaded.
-
-Note that some DRM modules require that the agpgart module be loaded first.
-
-9.  Normal Installation and Configuration
-
-Most users will want to install the new X server and use it in place of their
-old X server.  This section explains how to do that.
-
-Developers, on the other hand, may just want to test the X server without
-actually installing it as their default server.  If you want to do that, skip
-to the next section.
-
-9.1  Installation
-
-Here are the installation commands:
-
-                su
-                cd ~/DRI-CVS/build/xc
-                make install
-
-9.2  Update the XF86Config File
-
-You may need to edit your XF86Config file to enable the DRI.  The config file
-is usually installed as /etc/X11/XF86Config-4.  See the DRI User Guide for
-details, but basically, you need to load the "glx" and "dri" modules and add
-a "DRI" section.
-
-On the DRI web site, in the resources section, you'll find example XF86Config
-files for a number of graphics cards.  These configuration files also setup
-DRI options so it's highly recommended that you look at these examples.
-
-The XFree86 4.x server can generate a basic configuration file itself.  Sim-
-ply do this:
-
-                  cd /usr/X11R6/bin
-                  ./XFree86 -configure
-
-A file named /root/XF86Config.new will be created.  It should allow you to
-try your X server but you'll almost certainly have to edit it.  For example,
-you should add HorizSync and VertRefresh options to the Monitor section and
-Modes options to the Screen section.  Also, the ModulePath option in the
-Files section should be set to /usr/X11R6/lib/modules.
-
-9.3  Start the New X Server
-
-The new X server should be ready to use now.  Start your X server in your
-usual manner.  Often times the startx command is used:
-
-                  startx
-
-10.  Testing the Server Without Installing It
-
-As mentioned at the start of section 9, developers may want to simply run the
-X server without installing it.  This can save some time and allow you to
-keep a number of X servers available for testing.
-
-10.1  Configuration
-
-As described in the preceding section, you'll need to create a configuration
-file for the new server.  Put the XF86Config file in your ~/DRI-
-CVS/build/xc/programs/Xserver directory.
-
-Be sure the ModulePath option in your XF86Config file is set correctly.
-
-10.2  A Startup Script
-
-A simple shell script can be used to start the X server.  Here's an example.
-
-             #!/bin/sh
-             export DISPLAY=:0
-             ./XFree86 -xf86config XF86Config & \
-             sleep 2
-             fvwm2 &
-             xset b off
-             xmodmap -e "clear mod4"
-             xsetroot -solid "#00306f"
-             xterm -geometry 80x40+0+0
-
-You might name this script start-dri.  Put it in your ~/DRI-CVS/build/xc/pro-
-grams/Xserver directory.
-
-To test the server run the script:
-
-                  cd ~/DRI-CVS/build/xc/programs/Xserver
-                  ./start-dri
-
-For debugging, you may also want to capture the log messages printed by the
-server in a file.  If you're using the C-shell:
-
-                  ./start-dri >& log
-
-11.  Where To Go From Here
-
-At this point your X server should be up and running with hardware-acceler-
-ated direct rendering.  Please read the DRI User Guide for information about
-trouble shooting and how to use the DRI-enabled X server for 3D applications.
-
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml,v 1.19 dawes Exp $
+                            DRI Compilation Guide
+
+          VA Linux Systems, Inc. Professional Services - Graphics.
+
+                                21 April 2001
+
+1.  Preamble
+
+1.1  Copyright
+
+Copyright 2000-2001 by VA Linux Systems, Inc.  All Rights Reserved.
+
+Permission is granted to make and distribute verbatim copies of this document
+provided the copyright notice and this permission notice are preserved on all
+copies.
+
+1.2  Trademarks
+
+OpenGL is a registered trademark and SGI is a trademark of Silicon Graphics,
+Inc.  Unix is a registered trademark of The Open Group.  The `X' device and X
+Window System are trademarks of The Open Group.  XFree86 is a trademark of
+The XFree86 Project.  Linux is a registered trademark of Linus Torvalds.
+Intel is a registered trademark of Intel Corporation.  3Dlabs, GLINT, and
+Oxygen are either registered trademarks or trademarks of 3Dlabs Inc. Ltd.
+3dfx, Voodoo3, Voodoo4, and Voodoo5 are registered trademarks of 3dfx Inter-
+active, Incorporated.  Matrox is a registered trademark of Matrox Electronic
+Systems Ltd.  ATI Rage and Radeon is a registered trademark of ATI Technolo-
+gies, Inc.  All other trademarks mentioned are the property of their respec-
+tive owners.
+
+2.  Introduction
+
+This document describes how to download, compile and install the DRI.  The
+DRI provides 3D graphics hardware acceleration for the XFree86 project.  This
+information is intended for experienced Linux developers.  Beginners are
+probably better off installing precompiled packages.
+
+Edits, corrections and updates to this document may be mailed to <brian@tung-
+stengraphics.com>.
+
+Last updated on 13 February 2002 by Brian Paul.
+
+3.  Prerequisites
+
+You'll need the following:
+
+   o An installation of XFree86 4.1 or later.  The DRI tree has been pruned
+     down to minimize its size.  But in order to build the DRI tree you need
+     to have recent X header files, etc. already installed.  If you don't
+     have XFree86 4.1 (or later) installed you can probably install it from
+     RPMs (or another package format).  Or, you can download XFree86 as
+     sources and compile/install it yourself.
+
+   o At least 200MB of free disk space.  If you compile for debugging (the -g
+     option) then you'll need about 600MB.
+
+   o GCC compiler and related tools.
+
+   o ssh (secure shell) if you're a DRI developer and don't want to use
+     anonymous CVS download.
+
+   o A 2.4.x Linux Kernel.  See below for details.
+
+   o FreeBSD support is not currently being maintained and may not work.
+
+The DRI 3D drivers generally work on systems with Intel or AMD CPUs.  How-
+ever, limited support for Alpha and PowerPC support is underway.
+
+For 3dfx Voodoo hardware, you'll also need the Glide3 runtime library
+(libglide3-v3.so for Voodoo3 or libglide3-v5.so for Voodoo4/5).  These can be
+downloaded from the DRI website.  You can compile them yourself, but it's
+often a painful process.
+
+For Matrox G200/G400, Intel i810/i830 or ATI Rage128/Radeon hardware, you'll
+also need AGP support in your Linux kernel, either built-in or as a loadable
+module.
+
+4.  Linux Kernel Preparation
+
+Only the Linux 2.4.x kernels are currently supported by the DRI hardware
+drivers.  2.5.x kernels may work, but aren't tested.
+
+Most of the DRI drivers require AGP support and using Intel Pentium III SSE
+optimizations also requires an up-to-date Linux kernel.  Configuring your
+kernel correctly is very important, as features such as SSE optimizations
+will be disabled if your kernel does not support them.  Thus, if you have a
+Pentium III processor, you must configure your kernel for the Pentium III
+processor family.
+
+Building a new Linux kernel can be difficult for beginners but there are
+resources on the Internet to help.  This document assumes experience with
+configuring, building and installing Linux kernels.
+
+Linux kernels can be downloaded from www.kernel.org
+
+Here are the basic steps for kernel setup.
+
+   o Download the needed kernel and put it in /usr/src.  Create a directory
+     for the source and unpack it.  For example:
+
+                    cd /usr/src
+                    rm -f linux
+                    mkdir linux-2.4.x
+                    ln -s linux-2.4.x linux
+                    bzcat linux-2.4.x.tar.bz2 | tar xf -
+
+     It is critical that /usr/src/linux point to your new kernel sources,
+     otherwise the kernel headers will not be used when building the DRI.
+     This will almost certainly cause compilation problems.
+
+   o Read /usr/src/linux/Documentation/Changes.  This file lists the minimum
+     requirements for all software packages required to build the kernel.
+     You must upgrade at least gcc, make, binutils and modutils to at least
+     the versions specified in this file.  The other packages may not be
+     needed.  If you are upgrading from Linux 2.2.x you must upgrade your
+     modutils package for Linux 2.4.x.
+
+   o Configure your kernel.  You might, for example, use make menuconfig and
+     do the following:
+
+        o Go to Code maturity level options
+
+        o Enable Prompt for development and/or incomplete code/drivers
+
+        o hit ESC to return to the top-level menu
+
+        o Go to Processor type and features
+
+        o Select your processor type from Processor Family
+
+        o hit ESC to return to the top-level menu
+
+        o Go to Character devices
+
+        o Disable Direct Rendering Manager (XFree86 DRI support) since we'll
+          use the DRI code from the XFree86/DRI tree and will compile it
+          there.
+
+        o Go to /dev/agpgart (AGP Support) (EXPERIMENTAL) (NEW)
+
+        o Hit SPACE twice to build AGP support into the kernel
+
+        o Enable all chipsets' support for AGP
+
+        o It's recommended that you turn on MTRRs under Processor type and
+          Features, but not required.
+
+   o Configure the rest of the kernel as required for your system (i.e. Eth-
+     ernet, SCSI, etc)
+
+   o Exit, saving your kernel configuration.
+
+   o Edit your /etc/lilo.conf file.  Make sure you have an image entry as
+     follows (or similar):
+
+                      image=/boot/vmlinuz
+                            label=linux.2.4.x
+                            read-only
+                            root=/dev/hda1
+
+     The important part is that you have /boot/vmlinuz without a trailing
+     version number.  If this is the first entry in your /etc/lilo.conf AND
+     you haven't set a default, then this will be your default kernel.
+
+   o Compile the new kernel.
+
+                    cd /usr/src/linux-2.4.x
+                    make dep
+                    make bzImage
+                    make modules
+                    make modules_install
+                    make install
+
+     Note that last make command will automatically run lilo for you.
+
+   o Now reboot to use the new kernel.
+
+5.  CPU Architectures
+
+In general, nothing special has to be done to use the DRI on different CPU
+architectures.  There are, however, a few optimizations that are CPU-depen-
+dent.  Mesa will determine at runtime which CPU-dependent optimizations
+should be used and enable them where appropriate.
+
+5.1  Intel Pentium III Features
+
+The Pentium III SSE instructions are used in optimized vertex transformation
+functions in the Mesa-based DRI drivers.  On Linux, SSE requires a recent
+kernel (such as 2.4.0-test11 or later) both at compile time and runtime.
+
+5.2  AMD 3DNow! Features
+
+AMD's 3DNow! instructions are used in optimized vertex transformation func-
+tions in the Mesa-based DRI drivers.  3DNow! is supported in most versions of
+Linux.
+
+5.3  Alpha Features
+
+On newer Alpha processors a significant performance increase can be seen with
+the addition of the -mcpu= option to GCC.  This option is dependent on the
+architecture of the processor.  For example, -mcpu=ev6 will build specifi-
+cally for the EV6 based AXP's, giving both byte and word alignment access to
+the DRI/Mesa drivers.
+
+To enable this optimization edit your xc/config/host.def file and add the
+line:
+
+#define DefaultGcc2AxpOpt -O2 -mcpu=ev6
+
+Additional speed improvements to 3D rendering can be achieved by installing
+Compaq's Math Libraries (CPML) which can be obtained from http://www.sup-
+port.compaq.com/alpha-tools/software/index.html
+
+Once installed, you can add this line to your host.def to build with the CPML
+libraries:
+
+#define UseCompaqMathLibrary YES
+
+The host.def file is explained below.
+
+6.  Downloading the XFree86/DRI CVS Sources
+
+The DRI project is hosted by SourceForge.  The DRI source code, which is a
+subset of the XFree86 source tree, is kept in a CVS repository there.
+
+The DRI CVS sources may be accessed either anonymously or as a registered
+SourceForge user.  It's recommended that you become a registered SourceForge
+user so that you may submit non-anonymous bug reports and can participate in
+the mailing lists.
+
+6.1  Anonymous CVS download:
+
+  1.  Create a directory to store the CVS files:
+
+                       cd ~
+                       mkdir DRI-CVS
+
+      You could put your CVS directory in a different place but we'll use
+      ~/DRI-CVS/ here.
+
+  2.  Check out the CVS sources:
+
+                       cd ~/DRI-CVS
+                       cvs -d:pserver:anonymous@cvs.dri.sourceforge.net:/cvsroot/dri login
+                         (hit ENTER when prompted for a password)
+                       cvs -z3 -d:pserver:anonymous@cvs.dri.sourceforge.net:/cvsroot/dri co xc
+
+      The -z3 flag causes compression to be used in order to reduce the down-
+      load time.
+
+6.2  Registered CVS download:
+
+  1.  Create a directory to store the CVS files:
+
+                       cd ~
+                       mkdir DRI-CVS
+
+      You could put your CVS directory in a different place but we'll use
+      ~/DRI-CVS/ here.
+
+  2.  Set the CVS_RSH environment variable:
+
+                       setenv CVS_RSH ssh      // if using csh or tcsh
+                       export CVS_RSH=ssh      // if using sh or bash
+
+  3.  Check out the CVS sources:
+
+                       cd ~/DRI-CVS
+                       cvs -z3 -d:ext:YOURID@cvs.dri.sourceforge.net:/cvsroot/dri co xc
+
+      Replace YOURID with your CVS login name.  You'll be prompted to enter
+      your sourceforge password.
+
+      The -z3 flag causes compression to be used in order to reduce the down-
+      load time.
+
+6.3  Updating your CVS sources
+
+In the future you'll want to occasionally update your local copy of the DRI
+source code to get the latest changes.  This can be done with:
+
+                cd ~/DRI-CVS
+                cvs -z3 update -dA xc
+
+The -d flag causes any new subdirectories to be created and -A causes most
+recent trunk sources to be fetched, not branch sources.
+
+7.  Mesa
+
+Most of the DRI 3D drivers are based on Mesa (the free implementation of the
+OpenGL API).  The relevant files from Mesa are already included in the
+XFree86/DRI source tree.  There is no need to download or install the Mesa
+source files separately.
+
+Sometimes a newer version of Mesa will be available than the version included
+in XFree86/DRI.  Upgrading Mesa within XFree86/DRI is not always straightfor-
+ward.  It can be an error-prone undertaking, especially for beginners, and is
+not generally recommended.  The DRI developers will upgrade Mesa when appro-
+priate.
+
+8.  Compiling the XFree86/DRI tree
+
+8.1  Make a build tree
+
+Rather than placing object files and library files right in the source tree,
+they're instead put into a parallel build tree.  The build tree is made with
+the lndir command:
+
+                 cd ~/DRI-CVS
+                 ln -s xc XFree40
+                 mkdir build
+                 cd build
+                 lndir -silent -ignorelinks ../XFree40
+
+The build tree will be populated with symbolic links which point back into
+the CVS source tree.
+
+Advanced users may have several build trees for compiling and testing with
+different options.
+
+8.2  Edit the host.def file
+
+The ~/DRI-CVS/build/xc/config/cf/host.def file is used to configure the
+XFree86 build process.  You can change it to customize your build options or
+make adjustments for your particular system configuration
+
+The default host.def file will look something like this:
+
+                 #define DefaultCCOptions -Wall
+     (i386)      #define DefaultGcc2i386Opt -O2
+     (Alpha)     #define DefaultGcc2AxpOpt -O2 -mcpu=ev6 (or similar)
+                 #define LibraryCDebugFlags -O2
+                 #define BuildServersOnly YES
+                 #define XF86CardDrivers vga tdfx mga ati i810
+                 #define LinuxDistribution LinuxRedHat
+                 #define DefaultCCOptions -ansi GccWarningOptions -pipe
+                 #define BuildXF86DRI YES
+                 /* Optionally turn these on for debugging */
+                 /* #define GlxBuiltInTdfx YES */
+                 /* #define GlxBuiltInMga YES */
+                 /* #define GlxBuiltInR128 YES */
+                 /* #define GlxBuiltInRadeon YES */
+                 /* #define DoLoadableServer NO */
+                 #define SharedLibFont NO
+
+The ProjectRoot variable specifies where the XFree86 files will be installed.
+We recommend installing the DRI files over your existing XFree86 installation
+- it's generally safe to do and less error-prone.  This policy is different
+than what we used to recommend.
+
+If XFree86 4.x is not installed in /usr/X11R6/ you'll have to add the follow-
+ing to the host.def file:
+
+                 #define ProjectRoot pathToYourXFree86installation
+
+Note the XF86CardDrivers line to be sure your card's driver is listed.
+
+If you want to enable 3DNow! optimizations in Mesa and the DRI drivers, you
+should add the following:
+
+                 #define MesaUse3DNow YES
+
+You don't have to be using an AMD processor in order to enable this option.
+The DRI will look for 3DNow! support and runtime and only enable it if appli-
+cable.
+
+If you want to enable SSE optimizations in Mesa and the DRI drivers, you must
+upgrade to a Linux 2.4.x kernel.  Mesa will verify that SSE is supported by
+both your processor and your operating system, but to build Mesa inside the
+DRI you need to have the Linux 2.4.x kernel headers in /usr/src/linux.  If
+you enable SSE optimizations with an earlier version of the Linux kernel in
+/usr/src/linux, Mesa will not compile.  You have been warned.  If you do have
+a 2.4.x kernel, you should add the following:
+
+                 #define MesaUseSSE YES
+
+If you want to build the DRM kernel modules as part of the full build pro-
+cess, add the following:
+
+                 #define BuildXF86DRM YES
+
+Otherwise, you'll need to build them separately as described below.
+
+8.3  Compilation
+
+To compile the complete DRI tree:
+
+                 cd ~/DRI-CVS/build/xc/
+                 make World >& world.log
+
+Or if you want to watch the compilation progress:
+
+                 cd ~/DRI-CVS/build/xc/
+                 make World >& world.log &
+                 tail -f world.log
+
+With the default compilation flags it's normal to get a lot of warnings dur-
+ing compilation.
+
+Building will take some time so you may want to go check your email or visit
+slashdot.
+
+WARNING: do not use the -j option with make.  It's reported that it does not
+work with XFree86/DRI.
+
+8.4  Check for compilation errors
+
+Using your text editor, examine world.log for errors by searching for the
+pattern ***.
+
+After fixing the errors, run make World again.  Later, you might just compile
+parts of the source tree but it's important that the whole tree will build
+first.
+
+If you edited your host.def file to enable automatic building of the DRI ker-
+nel module(s), verify that they were built:
+
+               cd ~/DRI-CVS/build/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel
+               ls
+
+Otherwise, build them now by running
+
+               cd ~/DRI-CVS/build/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel
+               make -f Makefile.linux
+
+For the 3dfx Voodoo, you should see tdfx.o.  For the Matrox G200/G400, you
+should see mga.o.  For the ATI Rage 128, you should see r128.o.  For the ATI
+Radeon, you should see radeon.o.  For the Intel i810, you should see i810.o.
+
+If the DRI kernel module(s) failed to build you should verify that you're
+using the right version of the Linux kernel.  The most recent kernels are not
+always supported.
+
+If your build machine is running a different version of the kernel than your
+target machine (i.e. 2.2.x vs. 2.4.x), make will select the wrong kernel
+source tree. This can be fixed by explicitly setting the value of LINUXDIR.
+If the path to your kernel source is /usr/src/linux-2.4.x,
+
+               cd ~/DRI-CVS/build/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel
+               make -f Makefile.linux LINUXDIR=/usr/src/linux-2.4.x
+
+or alternatively, edit Makefile.linux to set LINUXDIR before the ifndef LIN-
+UXDIR line.
+
+8.5  DRI kernel module installation
+
+The DRI kernel modules will be in ~/DRI-CVS/build/xc/pro-
+grams/Xserver/hw/xfree86/os-support/linux/drm/kernel/.
+
+To load the appropriate DRM module in your running kernel you can either use
+ismod and restart your X server or copy the kernel module to /lib/mod-
+ules/2.4.x/kernel/drivers/char/drm/ then run depmod and restart your X
+server.
+
+Make sure you first unload any older DRI kernel modules that might be already
+loaded.
+
+Note that some DRM modules require that the agpgart module be loaded first.
+
+9.  Normal Installation and Configuration
+
+Most users will want to install the new X server and use it in place of their
+old X server.  This section explains how to do that.
+
+Developers, on the other hand, may just want to test the X server without
+actually installing it as their default server.  If you want to do that, skip
+to the next section.
+
+9.1  Installation
+
+Here are the installation commands:
+
+                su
+                cd ~/DRI-CVS/build/xc
+                make install
+
+9.2  Update the XF86Config File
+
+You may need to edit your XF86Config file to enable the DRI.  The config file
+is usually installed as /etc/X11/XF86Config-4.  See the DRI User Guide for
+details, but basically, you need to load the "glx" and "dri" modules and add
+a "DRI" section.
+
+On the DRI web site, in the resources section, you'll find example XF86Config
+files for a number of graphics cards.  These configuration files also setup
+DRI options so it's highly recommended that you look at these examples.
+
+The XFree86 4.x server can generate a basic configuration file itself.  Sim-
+ply do this:
+
+                  cd /usr/X11R6/bin
+                  ./XFree86 -configure
+
+A file named /root/XF86Config.new will be created.  It should allow you to
+try your X server but you'll almost certainly have to edit it.  For example,
+you should add HorizSync and VertRefresh options to the Monitor section and
+Modes options to the Screen section.  Also, the ModulePath option in the
+Files section should be set to /usr/X11R6/lib/modules.
+
+9.3  Start the New X Server
+
+The new X server should be ready to use now.  Start your X server in your
+usual manner.  Often times the startx command is used:
+
+                  startx
+
+10.  Testing the Server Without Installing It
+
+As mentioned at the start of section 9, developers may want to simply run the
+X server without installing it.  This can save some time and allow you to
+keep a number of X servers available for testing.
+
+10.1  Configuration
+
+As described in the preceding section, you'll need to create a configuration
+file for the new server.  Put the XF86Config file in your ~/DRI-
+CVS/build/xc/programs/Xserver directory.
+
+Be sure the ModulePath option in your XF86Config file is set correctly.
+
+10.2  A Startup Script
+
+A simple shell script can be used to start the X server.  Here's an example.
+
+             #!/bin/sh
+             export DISPLAY=:0
+             ./XFree86 -xf86config XF86Config & \
+             sleep 2
+             fvwm2 &
+             xset b off
+             xmodmap -e "clear mod4"
+             xsetroot -solid "#00306f"
+             xterm -geometry 80x40+0+0
+
+You might name this script start-dri.  Put it in your ~/DRI-CVS/build/xc/pro-
+grams/Xserver directory.
+
+To test the server run the script:
+
+                  cd ~/DRI-CVS/build/xc/programs/Xserver
+                  ./start-dri
+
+For debugging, you may also want to capture the log messages printed by the
+server in a file.  If you're using the C-shell:
+
+                  ./start-dri >& log
+
+11.  Where To Go From Here
+
+At this point your X server should be up and running with hardware-acceler-
+ated direct rendering.  Please read the DRI User Guide for information about
+trouble shooting and how to use the DRI-enabled X server for 3D applications.
+
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml,v 1.19 dawes Exp $
diff --git a/xorg-server/hw/xfree86/doc/README.modes b/xorg-server/hw/xfree86/doc/README.modes
index 894e21313..da9d41eb5 100644
--- a/xorg-server/hw/xfree86/doc/README.modes
+++ b/xorg-server/hw/xfree86/doc/README.modes
@@ -1,474 +1,474 @@
-		    Multi-monitor Mode Setting APIs
-	           Keith Packard, <keithp@keithp.com
-		   	   6 March 2007
-
-1. Introduction
-
-This document describes a set of mode setting APIs added in X server version
-1.3 that support multiple monitors per card. These interfaces expose the
-underlying hardware CRTC and output concepts to the xf86 DDX layer so that
-the implementation of initial server setup and mode changes through
-extensions can be shared across drivers. In addition, these new interfaces
-support a new configuration mechanism as well which allows each monitor to
-be customized separately providing a consistent cross-driver configuration
-mechanism that supports the full range of output features.
-
-All of the code implementing this interface can be found in hw/xfree86/modes
-in the X server sources.
-
-2. Overview
-
-This document describes both the driver API and the configuration data
-placed in xorg.conf; these are entirely separate as the driver has no
-interaction with the configuration information at all. Much of the structure
-here is cloned from the RandR extension version 1.2 additions which deal
-with the same kinds of information.
-
-2.1 API overview
-
-The mode setting API is expressed through two new driver-visible objects,
-the 'CRTC' (xf86CrtcRec) and the 'Output' (xf86OutputRec). A CRTC refers to
-hardware within the video system that can scan a subset of the framebuffer
-and generate a video signal. An Output receives that signal and transmits it
-to a monitor, projector or other device.
-
-The xf86CrtcRec and xf86OutputRec contain a small amount of state data
-related to the object along with a pointer to a set of functions provided by
-the driver that manipulate the object in fairly simple ways.
-
-To emulate older behaviour, one of the outputs is picked as the 'compat'
-output; this output changes over time as outputs are detected and used, the
-goal is to always have one 'special' output which is used for operations
-which need a single defined monitor (like XFree86-VidModeExtension mode
-setting, RandR 1.1 mode setting, DDC property setting, etc.).
-
-2.1.1 Output overview 
-
-As outputs are connected to monitors, they hold a list of modes supported by
-the monitor. If the monitor and output support DDC, then the list of modes
-generally comes from the EDID data in the monitor. Otherwise, the server
-uses the standard VESA modes, pruned by monitor timing. If the configuration
-file doesn't contain monitor timing data, the server uses default timing
-information which supports 640x480, 800x600 and 1024x768 all with a 60Hz
-refresh rate.
-
-As hardware often limits possible configuration combinations, each output
-knows the set of CRTCs that it can be connected to as well as the set of
-other outputs which can be simutaneously connected to a CRTC.
-
-2.1.2 CRTC overview
-
-CRTCs serve only to stream frame buffer data to outputs using a mode line.
-Ideally, they would not be presented to the user at all, and in fact the
-configuration file doesn't expose them. The RandR 1.2 protocol does, but the
-hope there is that client-side applications will hide them carefully away.
-
-Each crtc has an associated cursor, along with the current configuration.
-All of the data needed to determine valid configurations is contained within
-the Outputs.
-
-2.2 Configuration overview
-
-As outputs drive monitors, the "Monitor" section has been repurposed to
-define their configuration. This provides for a bit more syntax than
-the large list of driver-specific options that were used in the past for
-similar configuration.
-
-However, the existing "Monitor" section referenced by the active "Screen"
-section no longer has any use at all; some sensible meaning for this
-parameter is needed now that a Screen can have multiple Monitors.
-
-3. Public Functions
-
-3.1 PreInit functions
-
-These functions should be used during the driver PreInit phase, they are
-arranged in the order they should be invoked.
-
-    void
-    xf86CrtcConfigInit (ScrnInfoPtr			scrn
-			const xf86CrtcConfigFuncsRec	*funcs)
-
-This function allocates and initializes structures needed to track CRTC and
-Output state.
-
-    void
-    xf86CrtcSetSizeRange (ScrnInfoPtr scrn,
-			  int minWidth, int minHeight,
-			  int maxWidth, int maxHeight)
-
-This sets the range of screen sizes supported by the driver.
-
-    xf86CrtcPtr
-    xf86CrtcCreate (ScrnInfoPtr             scrn,
-		    const xf86CrtcFuncsRec  *funcs)
-    
-Create one CRTC object. See the discussion below for a description of the
-contents of the xf86CrtcFuncsRec. Note that this is done in PreInit, so it
-should not be re-invoked at each server generation. Create one of these for
-each CRTC present in the hardware.
-    
-    xf86OutputPtr
-    xf86OutputCreate (ScrnInfoPtr              scrn,
-		      const xf86OutputFuncsRec *funcs,
-		      const char	       *name)
-
-Create one Output object. See the discussion below for a description of the
-contents of the xf86OutputFuncsRec. This is also called from PreInit and
-need not be re-invoked at each ScreenInit time. An Output should be created
-for every Output present in the hardware, not just for outputs which have
-detected monitors.
-    
-    Bool
-    xf86OutputRename (xf86OutputPtr output, const char *name)
-
-If necessary, the name of an output can be changed after it is created using
-this function.
-    
-    Bool
-    xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
-
-Using the resources provided, and the configuration specified by the user,
-this function computes an initial configuration for the server. It tries to
-enable as much hardware as possible using some fairly simple heuristics. 
-
-The 'canGrow' parameter indicates that the frame buffer does not have a fixed
-size (fixed size frame buffers are required by XAA). When the frame buffer
-has a fixed size, the configuration selects a 'reasonablely large' frame
-buffer so that common reconfiguration options are possible. For resizable
-frame buffers, the frame buffer is set to the smallest size that encloses
-the desired configuration.
-    
-3.2 ScreenInit functions
-
-These functions should be used during the driver ScreenInit phase.
-
-    Bool
-    xf86DiDGAInit (ScreenPtr screen, unsigned long dga_address)
-
-This function provides driver-independent accelerated DGA support for some
-of the DGA operations; using this, the driver can avoid needing to implement
-any of the rest of DGA.
-
-    Bool
-    xf86SaveScreen(ScreenPtr pScreen, int mode)
-
-Stick this in pScreen->SaveScreen and the core X screen saver will be
-implemented by disabling outputs and crtcs using their dpms functions.
-
-    void
-    xf86DPMSSet(ScrnInfoPtr scrn, int mode, int flags)
-
-Pass this function to xf86DPMSInit and all DPMS mode switching will be
-managed by using the dpms functions provided by the Outputs and CRTCs.
-
-    Bool
-    xf86CrtcScreenInit (ScreenPtr screen)
-
-This function completes the screen initialization process for the crtc and
-output objects. Call it near the end of the ScreenInit function, after the
-frame buffer and acceleration layers have been added.
-
-3.3 EnterVT functions
-
-Functions used during EnterVT, or whenever the current configuration needs
-to be applied to the hardware.
-
-    Bool
-    xf86SetDesiredModes (ScrnInfoPtr scrn)
-
-xf86InitialConfiguration selects the desired configuration at PreInit time;
-when the server finally hits ScreenInit, xf86SetDesiredModes is used by the
-driver to take that configuration and apply it to the hardware. In addition,
-successful mode selection at other times updates the configuration that will
-be used by this function, so LeaveVT/EnterVT pairs can simply invoke this
-and return to the previous configuration.
-
-3.4 SwitchMode functions
-
-Functions called from the pScrn->SwitchMode hook, which is used by the
-XFree86-VidModeExtension and the keypad mode switch commands.
-
-    Bool
-    xf86SetSingleMode (ScrnInfoPtr	scrn, 
-		       DisplayModePtr   desired,
-		       Rotation		rotation)
-
-This function applies the specified mode to all active outputs. Which is to
-say, it picks reasonable modes for all active outputs, attempting to get the
-screen to the specified size while not breaking anything that is currently
-working.
-
-3.7 get_modes functions
-
-Functions called during output->get_modes to help build lists of modes
-
-    xf86MonPtr
-    xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus)
-
-This returns the EDID data structure for the 'output' using the I2C bus
-'pDDCBus'. This has no effect on 'output' itself.
-
-    void
-    xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon)
-
-Once the EDID data has been fetched, this call applies the EDID data to the
-output object, setting the physical size and also various properties, like
-the DDC root window property (when output is the 'compat' output), and the
-RandR 1.2 EDID output properties.
-
-    DisplayModePtr
-    xf86OutputGetEDIDModes (xf86OutputPtr output)
-
-Given an EDID data structure, this function computes a list of suitable
-modes. This function also applies a sequence of 'quirks' during this process
-so that the returned modes may not actually match the mode data present in
-the EDID data.
-
-3.6 Other functions
-
-These remaining functions in the API can be used by the driver as needed.
-
-    Bool
-    xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
-		     int x, int y)
-
-Applies a mode to a CRTC. All of the outputs which are currently using the
-specified CRTC are included in the mode setting process. 'x' and 'y' are the
-offset within the frame buffer that the crtc is placed at. No checking is
-done in this function to ensure that the mode is usable by the active
-outputs.
-    
-    void
-    xf86ProbeOutputModes (ScrnInfoPtr pScrn, int maxX, int maxY)
-
-This discards the mode lists for all outputs, re-detects monitor presence
-and then acquires new mode lists for all monitors which are not disconnected.
-Monitor configuration data is used to modify the mode lists returned by the
-outputs. 'maxX' and 'maxY' limit the maximum size modes that will be
-returned.
-    
-    void
-    xf86SetScrnInfoModes (ScrnInfoPtr pScrn)
-
-This copies the 'compat' output mode list into the pScrn modes list which is
-used by the XFree86-VidModeExtension and the keypad mode switching
-operations. The current 'desired' mode for the CRTC associated with the
-'compat' output is placed first in this list to indicate the current mode.
-Usually, the driver won't need to call this function as
-xf86InitialConfiguration will do so automatically, as well as any RandR
-functions which reprobe for modes. However, if the driver reprobes for modes
-at other times using xf86ProbeOutputModes, this function needs to be called.
-    
-    Bool
-    xf86DiDGAReInit (ScreenPtr pScreen)
-
-This is similar to xf86SetScrnInfoModes, but it applies the 'compat' output
-mode list to the set of modes advertised by the DGA extension; it needs to
-be called whenever xf86ProbeOutputModes is invoked.
-
-    void
-    xf86DisableUnusedFunctions(ScrnInfoPtr pScrn)
-
-After any sequence of calls using xf86CrtcSetMode, this function cleans up
-any leftover Output and CRTC objects by disabling them, saving power. It is
-safe to call this whenever the server is running as it only disables objects
-which are not currently in use.
-    
-4. CRTC operations
-
-4.1 CRTC functions
-
-These functions provide an abstract interface for the CRTC object; most
-manipulation of the CRTC object is done through these functions.
-
-    void
-    crtc->funcs->dpms (xf86CrtcPtr crtc, int mode)
-
-Where 'mode' is one of DPMSModeOff, DPMSModeSuspend, DPMSModeStandby or
-DPMSModeOn. This requests that the crtc go to the specified power state.
-When changing power states, the output dpms functions are invoked before the
-crtc dpms functions.
-
-    void
-    crtc->funcs->save (xf86CrtcPtr crtc)
-	
-    void
-    crtc->funcs->restore (xf86CrtcPtr crtc)
-
-Preserve/restore any register contents related to the CRTC. These are
-strictly a convenience for the driver writer; if the existing driver has
-fully operation save/restore functions, you need not place any additional
-code here. In particular, the server itself never uses this function.
-
-    Bool
-    crtc->funcs->lock (xf86CrtcPtr crtc)
-	
-    void
-    crtc->funcs->unlock (xf86CrtcPtr crtc)
-
-These functions are invoked around mode setting operations; the intent is
-that DRI locking be done here to prevent DRI applications from manipulating
-the hardware while the server is busy changing the output configuration. If
-the lock function returns FALSE, the unlock function will not be invoked.
-
-    Bool
-    crtc->funcs->mode_fixup (xf86CrtcPtr crtc, 
-			     DisplayModePtr mode,
-			     DisplayModePtr adjusted_mode)
-
-This call gives the CRTC a chance to see what mode will be set and to
-comment on the mode by changing 'adjusted_mode' as needed. This function
-shall not modify the state of the crtc hardware at all. If the CRTC cannot
-accept this mode, this function may return FALSE.
-
-    void
-    crtc->funcs->prepare (xf86CrtcPtr crtc)
-
-This call is made just before the mode is set to make the hardware ready for
-the operation. A usual function to perform here is to disable the crtc so
-that mode setting can occur with clocks turned off and outputs deactivated.
-
-    void
-    crtc->funcs->mode_set (xf86CrtcPtr crtc,
-			   DisplayModePtr mode,
-			   DisplayModePtr adjusted_mode)
-
-This function applies the specified mode (possibly adjusted by the CRTC
-and/or Outputs).
-
-    void
-    crtc->funcs->commit (xf86CrtcPtr crtc)
-
-Once the mode has been applied to the CRTC and Outputs, this function is
-invoked to let the hardware turn things back on.
-
-    void
-    crtc->funcs->gamma_set (xf86CrtcPtr crtc, CARD16 *red,
-			    CARD16 *green, CARD16 *blue, int size)
-
-This function adjusts the gamma ramps for the specified crtc.
-
-    void *
-    crtc->funcs->shadow_allocate (xf86CrtcPtr crtc, int width, int height)
-
-This function allocates frame buffer space for a shadow frame buffer. When
-allocated, the crtc must scan from the shadow instead of the main frame
-buffer. This is used for rotation. The address returned is passed to the
-shadow_create function. This function should return NULL on failure.
-
-    PixmapPtr
-    crtc->funcs->shadow_create (xf86CrtcPtr crtc, void *data,
-				int width, int height)
-
-This function creates a pixmap object that will be used as a shadow of the
-main frame buffer for CRTCs which are rotated or reflected. 'data' is the
-value returned by shadow_allocate.
-
-    void
-    crtc->funcs->shadow_destroy (xf86CrtcPtr crtc, PixmapPtr pPixmap,
-				 void *data)
-
-Destroys any associated shadow objects. If pPixmap is NULL, then a pixmap
-was not created, but 'data' may still be non-NULL indicating that the shadow
-had been allocated.
-
-    void
-    crtc->funcs->destroy (xf86CrtcPtr crtc)
-
-When a CRTC is destroyed (which only happens in error cases), this function
-can clean up any driver-specific data.
-
-4.2 CRTC fields
-
-The CRTC object is not opaque; there are several fields of interest to the
-driver writer.
-
-    struct _xf86Crtc {
-	/**
-	 * Associated ScrnInfo
-	 */
-	ScrnInfoPtr     scrn;
-    
-	/**
-	 * Active state of this CRTC
-	 *
-	 * Set when this CRTC is driving one or more outputs
-	 */
-	Bool            enabled;
-    
-	/** Track whether cursor is within CRTC range  */
-	Bool            cursorInRange;
-    
-	/** Track state of cursor associated with this CRTC */
-	Bool            cursorShown;
-    
-	/**
-	 * Active mode
-	 *
-	 * This reflects the mode as set in the CRTC currently
-	 * It will be cleared when the VT is not active or
-	 * during server startup
-	 */
-	DisplayModeRec  mode;
-	Rotation        rotation;
-	PixmapPtr       rotatedPixmap;
-	void            *rotatedData;
-    
-	/**
-	 * Position on screen
-	 *
-	 * Locates this CRTC within the frame buffer
-	 */
-	int             x, y;
-    
-	/**
-	 * Desired mode
-	 *
-	 * This is set to the requested mode, independent of
-	 * whether the VT is active. In particular, it receives
-	 * the startup configured mode and saves the active mode
-	 * on VT switch.
-	 */
-	DisplayModeRec  desiredMode;
-	Rotation        desiredRotation;
-	int             desiredX, desiredY;
-    
-	/** crtc-specific functions */
-	const xf86CrtcFuncsRec *funcs;
-    
-	/**
-	 * Driver private
-	 *
-	 * Holds driver-private information
-	 */
-	void            *driver_private;
-    #ifdef RANDR_12_INTERFACE
-	/**
-	 * RandR crtc
-	 *
-	 * When RandR 1.2 is available, this
-	 * points at the associated crtc object
-	 */
-	RRCrtcPtr       randr_crtc;
-    #else
-	void            *randr_crtc;
-    #endif
-    };
-
-    
-5. Output functions.
-
-6. Configuration
-
-Because the configuration file syntax is fixed,
-this was done by creating new "Driver" section options that hook specific
-outputs to specific "Monitor" sections in the file. The option:
-section of the form:
-
-	Option	"monitor-VGA" "My VGA Monitor"
-
-connects the VGA output of this driver to the "Monitor" section with
-Identifier "My VGA Monitor". All of the usual monitor options can now be
-placed in that "Monitor" section and will be applied to the VGA output
-configuration.
+		    Multi-monitor Mode Setting APIs
+	           Keith Packard, <keithp@keithp.com
+		   	   6 March 2007
+
+1. Introduction
+
+This document describes a set of mode setting APIs added in X server version
+1.3 that support multiple monitors per card. These interfaces expose the
+underlying hardware CRTC and output concepts to the xf86 DDX layer so that
+the implementation of initial server setup and mode changes through
+extensions can be shared across drivers. In addition, these new interfaces
+support a new configuration mechanism as well which allows each monitor to
+be customized separately providing a consistent cross-driver configuration
+mechanism that supports the full range of output features.
+
+All of the code implementing this interface can be found in hw/xfree86/modes
+in the X server sources.
+
+2. Overview
+
+This document describes both the driver API and the configuration data
+placed in xorg.conf; these are entirely separate as the driver has no
+interaction with the configuration information at all. Much of the structure
+here is cloned from the RandR extension version 1.2 additions which deal
+with the same kinds of information.
+
+2.1 API overview
+
+The mode setting API is expressed through two new driver-visible objects,
+the 'CRTC' (xf86CrtcRec) and the 'Output' (xf86OutputRec). A CRTC refers to
+hardware within the video system that can scan a subset of the framebuffer
+and generate a video signal. An Output receives that signal and transmits it
+to a monitor, projector or other device.
+
+The xf86CrtcRec and xf86OutputRec contain a small amount of state data
+related to the object along with a pointer to a set of functions provided by
+the driver that manipulate the object in fairly simple ways.
+
+To emulate older behaviour, one of the outputs is picked as the 'compat'
+output; this output changes over time as outputs are detected and used, the
+goal is to always have one 'special' output which is used for operations
+which need a single defined monitor (like XFree86-VidModeExtension mode
+setting, RandR 1.1 mode setting, DDC property setting, etc.).
+
+2.1.1 Output overview 
+
+As outputs are connected to monitors, they hold a list of modes supported by
+the monitor. If the monitor and output support DDC, then the list of modes
+generally comes from the EDID data in the monitor. Otherwise, the server
+uses the standard VESA modes, pruned by monitor timing. If the configuration
+file doesn't contain monitor timing data, the server uses default timing
+information which supports 640x480, 800x600 and 1024x768 all with a 60Hz
+refresh rate.
+
+As hardware often limits possible configuration combinations, each output
+knows the set of CRTCs that it can be connected to as well as the set of
+other outputs which can be simutaneously connected to a CRTC.
+
+2.1.2 CRTC overview
+
+CRTCs serve only to stream frame buffer data to outputs using a mode line.
+Ideally, they would not be presented to the user at all, and in fact the
+configuration file doesn't expose them. The RandR 1.2 protocol does, but the
+hope there is that client-side applications will hide them carefully away.
+
+Each crtc has an associated cursor, along with the current configuration.
+All of the data needed to determine valid configurations is contained within
+the Outputs.
+
+2.2 Configuration overview
+
+As outputs drive monitors, the "Monitor" section has been repurposed to
+define their configuration. This provides for a bit more syntax than
+the large list of driver-specific options that were used in the past for
+similar configuration.
+
+However, the existing "Monitor" section referenced by the active "Screen"
+section no longer has any use at all; some sensible meaning for this
+parameter is needed now that a Screen can have multiple Monitors.
+
+3. Public Functions
+
+3.1 PreInit functions
+
+These functions should be used during the driver PreInit phase, they are
+arranged in the order they should be invoked.
+
+    void
+    xf86CrtcConfigInit (ScrnInfoPtr			scrn
+			const xf86CrtcConfigFuncsRec	*funcs)
+
+This function allocates and initializes structures needed to track CRTC and
+Output state.
+
+    void
+    xf86CrtcSetSizeRange (ScrnInfoPtr scrn,
+			  int minWidth, int minHeight,
+			  int maxWidth, int maxHeight)
+
+This sets the range of screen sizes supported by the driver.
+
+    xf86CrtcPtr
+    xf86CrtcCreate (ScrnInfoPtr             scrn,
+		    const xf86CrtcFuncsRec  *funcs)
+    
+Create one CRTC object. See the discussion below for a description of the
+contents of the xf86CrtcFuncsRec. Note that this is done in PreInit, so it
+should not be re-invoked at each server generation. Create one of these for
+each CRTC present in the hardware.
+    
+    xf86OutputPtr
+    xf86OutputCreate (ScrnInfoPtr              scrn,
+		      const xf86OutputFuncsRec *funcs,
+		      const char	       *name)
+
+Create one Output object. See the discussion below for a description of the
+contents of the xf86OutputFuncsRec. This is also called from PreInit and
+need not be re-invoked at each ScreenInit time. An Output should be created
+for every Output present in the hardware, not just for outputs which have
+detected monitors.
+    
+    Bool
+    xf86OutputRename (xf86OutputPtr output, const char *name)
+
+If necessary, the name of an output can be changed after it is created using
+this function.
+    
+    Bool
+    xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
+
+Using the resources provided, and the configuration specified by the user,
+this function computes an initial configuration for the server. It tries to
+enable as much hardware as possible using some fairly simple heuristics. 
+
+The 'canGrow' parameter indicates that the frame buffer does not have a fixed
+size (fixed size frame buffers are required by XAA). When the frame buffer
+has a fixed size, the configuration selects a 'reasonablely large' frame
+buffer so that common reconfiguration options are possible. For resizable
+frame buffers, the frame buffer is set to the smallest size that encloses
+the desired configuration.
+    
+3.2 ScreenInit functions
+
+These functions should be used during the driver ScreenInit phase.
+
+    Bool
+    xf86DiDGAInit (ScreenPtr screen, unsigned long dga_address)
+
+This function provides driver-independent accelerated DGA support for some
+of the DGA operations; using this, the driver can avoid needing to implement
+any of the rest of DGA.
+
+    Bool
+    xf86SaveScreen(ScreenPtr pScreen, int mode)
+
+Stick this in pScreen->SaveScreen and the core X screen saver will be
+implemented by disabling outputs and crtcs using their dpms functions.
+
+    void
+    xf86DPMSSet(ScrnInfoPtr scrn, int mode, int flags)
+
+Pass this function to xf86DPMSInit and all DPMS mode switching will be
+managed by using the dpms functions provided by the Outputs and CRTCs.
+
+    Bool
+    xf86CrtcScreenInit (ScreenPtr screen)
+
+This function completes the screen initialization process for the crtc and
+output objects. Call it near the end of the ScreenInit function, after the
+frame buffer and acceleration layers have been added.
+
+3.3 EnterVT functions
+
+Functions used during EnterVT, or whenever the current configuration needs
+to be applied to the hardware.
+
+    Bool
+    xf86SetDesiredModes (ScrnInfoPtr scrn)
+
+xf86InitialConfiguration selects the desired configuration at PreInit time;
+when the server finally hits ScreenInit, xf86SetDesiredModes is used by the
+driver to take that configuration and apply it to the hardware. In addition,
+successful mode selection at other times updates the configuration that will
+be used by this function, so LeaveVT/EnterVT pairs can simply invoke this
+and return to the previous configuration.
+
+3.4 SwitchMode functions
+
+Functions called from the pScrn->SwitchMode hook, which is used by the
+XFree86-VidModeExtension and the keypad mode switch commands.
+
+    Bool
+    xf86SetSingleMode (ScrnInfoPtr	scrn, 
+		       DisplayModePtr   desired,
+		       Rotation		rotation)
+
+This function applies the specified mode to all active outputs. Which is to
+say, it picks reasonable modes for all active outputs, attempting to get the
+screen to the specified size while not breaking anything that is currently
+working.
+
+3.7 get_modes functions
+
+Functions called during output->get_modes to help build lists of modes
+
+    xf86MonPtr
+    xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus)
+
+This returns the EDID data structure for the 'output' using the I2C bus
+'pDDCBus'. This has no effect on 'output' itself.
+
+    void
+    xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon)
+
+Once the EDID data has been fetched, this call applies the EDID data to the
+output object, setting the physical size and also various properties, like
+the DDC root window property (when output is the 'compat' output), and the
+RandR 1.2 EDID output properties.
+
+    DisplayModePtr
+    xf86OutputGetEDIDModes (xf86OutputPtr output)
+
+Given an EDID data structure, this function computes a list of suitable
+modes. This function also applies a sequence of 'quirks' during this process
+so that the returned modes may not actually match the mode data present in
+the EDID data.
+
+3.6 Other functions
+
+These remaining functions in the API can be used by the driver as needed.
+
+    Bool
+    xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
+		     int x, int y)
+
+Applies a mode to a CRTC. All of the outputs which are currently using the
+specified CRTC are included in the mode setting process. 'x' and 'y' are the
+offset within the frame buffer that the crtc is placed at. No checking is
+done in this function to ensure that the mode is usable by the active
+outputs.
+    
+    void
+    xf86ProbeOutputModes (ScrnInfoPtr pScrn, int maxX, int maxY)
+
+This discards the mode lists for all outputs, re-detects monitor presence
+and then acquires new mode lists for all monitors which are not disconnected.
+Monitor configuration data is used to modify the mode lists returned by the
+outputs. 'maxX' and 'maxY' limit the maximum size modes that will be
+returned.
+    
+    void
+    xf86SetScrnInfoModes (ScrnInfoPtr pScrn)
+
+This copies the 'compat' output mode list into the pScrn modes list which is
+used by the XFree86-VidModeExtension and the keypad mode switching
+operations. The current 'desired' mode for the CRTC associated with the
+'compat' output is placed first in this list to indicate the current mode.
+Usually, the driver won't need to call this function as
+xf86InitialConfiguration will do so automatically, as well as any RandR
+functions which reprobe for modes. However, if the driver reprobes for modes
+at other times using xf86ProbeOutputModes, this function needs to be called.
+    
+    Bool
+    xf86DiDGAReInit (ScreenPtr pScreen)
+
+This is similar to xf86SetScrnInfoModes, but it applies the 'compat' output
+mode list to the set of modes advertised by the DGA extension; it needs to
+be called whenever xf86ProbeOutputModes is invoked.
+
+    void
+    xf86DisableUnusedFunctions(ScrnInfoPtr pScrn)
+
+After any sequence of calls using xf86CrtcSetMode, this function cleans up
+any leftover Output and CRTC objects by disabling them, saving power. It is
+safe to call this whenever the server is running as it only disables objects
+which are not currently in use.
+    
+4. CRTC operations
+
+4.1 CRTC functions
+
+These functions provide an abstract interface for the CRTC object; most
+manipulation of the CRTC object is done through these functions.
+
+    void
+    crtc->funcs->dpms (xf86CrtcPtr crtc, int mode)
+
+Where 'mode' is one of DPMSModeOff, DPMSModeSuspend, DPMSModeStandby or
+DPMSModeOn. This requests that the crtc go to the specified power state.
+When changing power states, the output dpms functions are invoked before the
+crtc dpms functions.
+
+    void
+    crtc->funcs->save (xf86CrtcPtr crtc)
+	
+    void
+    crtc->funcs->restore (xf86CrtcPtr crtc)
+
+Preserve/restore any register contents related to the CRTC. These are
+strictly a convenience for the driver writer; if the existing driver has
+fully operation save/restore functions, you need not place any additional
+code here. In particular, the server itself never uses this function.
+
+    Bool
+    crtc->funcs->lock (xf86CrtcPtr crtc)
+	
+    void
+    crtc->funcs->unlock (xf86CrtcPtr crtc)
+
+These functions are invoked around mode setting operations; the intent is
+that DRI locking be done here to prevent DRI applications from manipulating
+the hardware while the server is busy changing the output configuration. If
+the lock function returns FALSE, the unlock function will not be invoked.
+
+    Bool
+    crtc->funcs->mode_fixup (xf86CrtcPtr crtc, 
+			     DisplayModePtr mode,
+			     DisplayModePtr adjusted_mode)
+
+This call gives the CRTC a chance to see what mode will be set and to
+comment on the mode by changing 'adjusted_mode' as needed. This function
+shall not modify the state of the crtc hardware at all. If the CRTC cannot
+accept this mode, this function may return FALSE.
+
+    void
+    crtc->funcs->prepare (xf86CrtcPtr crtc)
+
+This call is made just before the mode is set to make the hardware ready for
+the operation. A usual function to perform here is to disable the crtc so
+that mode setting can occur with clocks turned off and outputs deactivated.
+
+    void
+    crtc->funcs->mode_set (xf86CrtcPtr crtc,
+			   DisplayModePtr mode,
+			   DisplayModePtr adjusted_mode)
+
+This function applies the specified mode (possibly adjusted by the CRTC
+and/or Outputs).
+
+    void
+    crtc->funcs->commit (xf86CrtcPtr crtc)
+
+Once the mode has been applied to the CRTC and Outputs, this function is
+invoked to let the hardware turn things back on.
+
+    void
+    crtc->funcs->gamma_set (xf86CrtcPtr crtc, CARD16 *red,
+			    CARD16 *green, CARD16 *blue, int size)
+
+This function adjusts the gamma ramps for the specified crtc.
+
+    void *
+    crtc->funcs->shadow_allocate (xf86CrtcPtr crtc, int width, int height)
+
+This function allocates frame buffer space for a shadow frame buffer. When
+allocated, the crtc must scan from the shadow instead of the main frame
+buffer. This is used for rotation. The address returned is passed to the
+shadow_create function. This function should return NULL on failure.
+
+    PixmapPtr
+    crtc->funcs->shadow_create (xf86CrtcPtr crtc, void *data,
+				int width, int height)
+
+This function creates a pixmap object that will be used as a shadow of the
+main frame buffer for CRTCs which are rotated or reflected. 'data' is the
+value returned by shadow_allocate.
+
+    void
+    crtc->funcs->shadow_destroy (xf86CrtcPtr crtc, PixmapPtr pPixmap,
+				 void *data)
+
+Destroys any associated shadow objects. If pPixmap is NULL, then a pixmap
+was not created, but 'data' may still be non-NULL indicating that the shadow
+had been allocated.
+
+    void
+    crtc->funcs->destroy (xf86CrtcPtr crtc)
+
+When a CRTC is destroyed (which only happens in error cases), this function
+can clean up any driver-specific data.
+
+4.2 CRTC fields
+
+The CRTC object is not opaque; there are several fields of interest to the
+driver writer.
+
+    struct _xf86Crtc {
+	/**
+	 * Associated ScrnInfo
+	 */
+	ScrnInfoPtr     scrn;
+    
+	/**
+	 * Active state of this CRTC
+	 *
+	 * Set when this CRTC is driving one or more outputs
+	 */
+	Bool            enabled;
+    
+	/** Track whether cursor is within CRTC range  */
+	Bool            cursorInRange;
+    
+	/** Track state of cursor associated with this CRTC */
+	Bool            cursorShown;
+    
+	/**
+	 * Active mode
+	 *
+	 * This reflects the mode as set in the CRTC currently
+	 * It will be cleared when the VT is not active or
+	 * during server startup
+	 */
+	DisplayModeRec  mode;
+	Rotation        rotation;
+	PixmapPtr       rotatedPixmap;
+	void            *rotatedData;
+    
+	/**
+	 * Position on screen
+	 *
+	 * Locates this CRTC within the frame buffer
+	 */
+	int             x, y;
+    
+	/**
+	 * Desired mode
+	 *
+	 * This is set to the requested mode, independent of
+	 * whether the VT is active. In particular, it receives
+	 * the startup configured mode and saves the active mode
+	 * on VT switch.
+	 */
+	DisplayModeRec  desiredMode;
+	Rotation        desiredRotation;
+	int             desiredX, desiredY;
+    
+	/** crtc-specific functions */
+	const xf86CrtcFuncsRec *funcs;
+    
+	/**
+	 * Driver private
+	 *
+	 * Holds driver-private information
+	 */
+	void            *driver_private;
+    #ifdef RANDR_12_INTERFACE
+	/**
+	 * RandR crtc
+	 *
+	 * When RandR 1.2 is available, this
+	 * points at the associated crtc object
+	 */
+	RRCrtcPtr       randr_crtc;
+    #else
+	void            *randr_crtc;
+    #endif
+    };
+
+    
+5. Output functions.
+
+6. Configuration
+
+Because the configuration file syntax is fixed,
+this was done by creating new "Driver" section options that hook specific
+outputs to specific "Monitor" sections in the file. The option:
+section of the form:
+
+	Option	"monitor-VGA" "My VGA Monitor"
+
+connects the VGA output of this driver to the "Monitor" section with
+Identifier "My VGA Monitor". All of the usual monitor options can now be
+placed in that "Monitor" section and will be applied to the VGA output
+configuration.
diff --git a/xorg-server/hw/xfree86/doc/Registry b/xorg-server/hw/xfree86/doc/Registry
index 89a5f10fa..48e24a2f4 100644
--- a/xorg-server/hw/xfree86/doc/Registry
+++ b/xorg-server/hw/xfree86/doc/Registry
@@ -1,409 +1,409 @@
-This is the XFree86 driver/module registry.  To avoid name space clashes and
-to maintain some consistency between drivers the important name spaces are
-maintained here.
-
-1. Module Names.
-
-Each module is required to have a unique name.  Registered names are:
-
-GLcore
-acecad
-afb
-apm
-ark
-ati
-atimisc
-bitmap
-bt8xx
-calcomp
-cfb
-cfb16
-cfb24
-cfb32
-chips
-cirrus
-citron
-cyrix
-dbe
-ddc
-digitaledge
-dmc
-dri
-drm
-dynapro
-elo2300
-elographics
-extmod
-fb
-fbdev
-fbdevhw
-fi12x6
-freetype
-glide
-glint
-glx
-hyperpen
-i128
-i2c
-i740
-i810
-imstt
-int10
-joystick
-keyboard
-layer
-magellan
-magictouch
-mfb
-mga
-microtouch
-mouse
-msp34xx
-mutouch
-neomagic
-newport
-nv
-pcidata
-penmount
-pex5
-r128
-radeon
-rac
-ramdac
-record
-rendition
-s3
-s3virge
-savage
-shadow
-shadowfb
-siliconmotion
-sis
-spaceorb
-speedo
-summa
-sunbw2
-suncg14
-suncg3
-suncg6
-sunffb
-sunleo
-suntcx
-tdfx
-tga
-trident
-tseng
-type1
-v4l
-vbe
-vesa
-vga
-vgahw
-vmware
-void
-wacom
-xaa
-xf1bpp
-xf24_32bpp
-xf4bpp
-xf8_16bpp
-xf8_32bpp
-xf8_32wid
-xie
-xtrap
-xtt
-
-2. External Module Object Symbols.
-
-Each module is required to use a unique prefix or prefixes for all of
-its externally visible symbols. They should be unique without regard to
-case.  Registered prefixes are:
-
-ati
-bt8xx
-cfb
-chips
-fi12x6
-glide
-glint
-mfb
-mga
-msp34xx
-neo
-permedia
-tseng
-vga
-vgahw
-vmware
-xaa
-xf1bpp
-xf4bpp
-
-3. Chipset Names.
-
-Each video driver is required to use a unique set of chipset names.  Case,
-white space and underscore characters are ignored when comparing chipset
-names.  All names listed here are in lower case with all white space and
-underscores removed.  Registered chipset names are:
-
-ati
-ativga
-ct64200
-ct64300
-ct65520
-ct65525
-ct65530
-ct65535
-ct65540
-ct65545
-ct65546
-ct65548
-ct65550
-ct65554
-ct65555
-ct68554
-ct69000
-et4000
-et4000w32
-et4000w32i
-et4000w32p
-et6000
-et6100
-generic
-ibmvga
-ibm8514
-mach32
-mach64
-mach8
-mga2064w
-mga1064sg
-mga2164w
-mga2164wagp
-neo2070
-neo2090
-neo2093
-neo2097
-neo2160
-neo2200
-tipm2
-vgawonder
-voodoo
-
-4. Option Names.
-
-Option names and their usage should be consistent between drivers.
-Case, white space and underscore characters are ignored when comparing
-option names.  The prefix "no" may be added or removed from boolean
-option names.  All names listed here are in their preferred user-visible
-form.  Some registered option names are:
-
-Types are:  B = boolean, O = set/unset (no value), I = integer, S = string,
-            A = optional string, F = floating point number Q = frequency
-
-Scopes are: F = global flags, V = video driver, C = common (per screen),
-            I = input drivers, X = XAA, Xv = Xv extension, M = misc.
-
-Names currently in use:
-
-Name                    Type  Scope      Description
-----------------------------------------------------------------------------
-AllowMouseOpenFail        B     F    ignore mouse dev open failure
-AllowNonLocalModInDev     B     F    allow non-local mod of input devs
-AllowNonLocalXvidtune     B     F    allow non-local VidMode connections
-BlankTime                 I     F    Screen saver timeout (min)
-DisableModInDev           B     F    disallow changing input devs
-DisableVidModeExtension   B     F    disable VidMode extension
-DontVTSwitch              B     F    disable Ctrl-Alt-Fn
-DontZap                   B     F    disable Ctrl-Alt-BS sequence
-DontZoom                  B     F    disable Ctrl-Alt-+/-
-NoTrapSignals             B     F    don't trap signals
-OffTime                   I     F    Time before DPMS off mode active (min)
-PciProbe1                 O     F    use PCI probe algorithm 1
-PciProbe2                 O     F    use PCI probe algorithm 2
-PciForceConfig1           O     F    force PCI config type 1
-PciForceConfig2           O     F    force PCI config type 2
-Pixmap                    I     F    depth 24 pixmap size (24 or 32)
-StandbyTime               I     F    Time before DPMS standby active (min)
-SuspendTime               I     F    Time before DPMS suspend mode active (min)
-
-BackingStore              B     C    Enable backing store
-DDC                       B     C    Enable/disable DDC
-DDC1                      B     C    Enable/disable DDC1
-DDC2                      B     C    Enable/disable DDC2
-DPMS                      O     C    Enable DPMS
-MTRR                      B     C    Enable/disable setting MTRRs
-
-BaudRate                  I     I    Serial port baud rate
-ButtonNumber              I     I    Button number (for touch screen?)
-ButtonThreshold           I     I    ??
-ClearDTR                  O     I    Clear serial port DTR
-ClearRTS                  O     I    Clear serial port RTS
-DataBits                  I     I    Serial port data bits
-DemandLoad                O     I    ??
-Device                    S     I    Device file name
-DeviceName                S     I    Input device name
-FlowControl               S     I    Serial flow control ("xon", "none")
-Floating                  B     I    Device initialised as floating
-HistorySize               I     I    ??
-MaxX                      I     I    Maximum X coordinate
-MaxY                      I     I    Maximum Y coordinate
-MinX                      I     I    Minimum X coordinate
-MinY                      I     I    Minimum Y coordinate
-Parity                    S     I    Serial port parity ("odd", "even", "none")
-ReportDelay               I     I    ??
-ReportingMode             S     I    may be "raw" or "scaled"
-ScreenNumber              I     I    Screen number (for touch screen)
-SendCoreEvents            B     I    Send core events
-StopBits                  I     I    Serial port stop bits
-SwapXY                    B     I    Swap the X and Y axes
-UntouchDelay              I     I    ??
-Vmin                      I     I    Tty VMIN
-Vtime                     I     I    Tty VTIME
-
-
-18BitBus                  B     V    ??
-8Plus16                   B     V    Enable depth 8 + depth 16 with overlay
-8Plus24                   B     V    Enable depth 8 + depth 24 with overlay
-BlockWrite                B     V    Enable/disable block write
-ColorKey                  I     V    Set the color key for overlay modes
-CompositeSync             B     V    Composite sync
-CRTDisplay                B     V    Force display on CRT, not LCD
-CRTScreen                 B     V    Display on CRT, not LCD (Obsolete)
-EarlyRasPrecharge         O     V    Early RAS pre-charge
-FastDRAM                  O     V    Fast DRAM
-FifoAggressive            O     V    Aggressive FIFO setting
-FifoConservative          O     V    Conservative FIFO setting
-FifoModerate              O     V    Moderate FIFO setting
-FireGL3000                B     V    Card is Diamond FireGL3000
-FixPanelSize              B     V    ??
-FPClock8                  Q     V    Flat panel clock for 8bpp fb (MHz)
-FPClock16                 Q     V    Flat panel clock for 16bpp fb (MHz)
-FPClock24                 Q     V    Flat panel clock for 24bpp fb (MHz)
-FPClock32                 Q     V    Flat panel clock for 32bpp fb (MHz)
-FPMVRAM                   O     V    Fast page mode VRAM
-FramebufferWC             B     V    Enable/disable WC for the framebuffer
-GlideDevice               I     V    Selects which Voodoo board to use
-HiBitHigh                 O     V    High clock bit default to set
-HiBitLow                  O     V    High clock bit default to cleared
-HWClocks                  B     V    Enable/disable HW clocks
-HWCursor                  B     V    Enable/disable HW cursor
-LateRasPrecharge          O     V    Late RAS pre-charge
-Legend                    O     V    Card is Legend ET4000
-LCDCenter                 B     V    Enable/disable centering for LCD displays
-Linear                    B     V    Enable/disable linear framebuffer
-MCLK                      Q     V    Specify the current MCLK value (MHz)
-MedDRAM                   B     V    Medium speed DRAM
-MemCfg1                   I     V    ??
-MemCfg2                   I     V    ??
-MGASDRAM                  B     V    Mga card has SDRAM
-MMIO                      B     V    Enable/disable memory mapped I/O
-MMIOCache                 B     V    Enable/Disable MMIO cache
-MuxThreshold              I     V    Multiplexing threshold (kHz)
-NoAccel                   B     V    Disable/enable acceleration
-NoClockChip               B     V    ??
-NoStretch                 B     V    Disable/enable stretching for LCD displays
-OnAtExit                  B     V    Leave video signal on when exiting server
-OverclockMem              B     V    Enable memory overclocking
-Overlay                   A     V    Enable multi-depth/overlay.  An optional
-                                     string "M,N" may be specified, where
-                                     M, N are the depths.
-PanelDisplay              B     V    Force display on LCD
-PciBurst                  B     V    Enable/disable PCI burst mode
-PciRetry                  B     V    Enable/disable PCI retries
-ProbeClocks               B     V    Force probe for non-programmable clocks
-ReferenceClock            Q     V    Clock generator reference frequency
-RGBbits                   I     V    Number of significant bits per rgb
-Rotate                    S     V    Rotate the virtual display (CW or CCW)
-SetLCDClk                 Q     V    Set LCD clock (MHz)
-SetMclk                   Q     V    Set Memory Clock (MHz)
-ShadowFB                  B     V    Enable shadow framebuffer layer
-ShowCache                 B     V    Enable viewing of offscreen memory
-ShowOverscan              O     V    Set the overscan area to a visible colour
-SlowDRAM                  O     V    Slow DRAM
-SlowEDODRAM               O     V    Slow EDO DRAM
-STN                       B     V    STN screen type (??)
-SWCursor                  B     V    Enable/disable SW cursor
-SuspendHack               B     V    ??
-SyncOnGreen               B     V    Enable/disable sync on green
-TurboQueue                B     V    Enable/disable turbo queue
-UseFBDev                  B     V    Use the fbdev driver interface
-UseModeLine               B     V    Use Modeline (??)
-W32Interleave             B     V    ??
-
-Buffers			  I	Xv   Number of buffers
-Device			  S	Xv   Device file name
-Expose                    B     Xv   Disable occlusion clipping (see DESIGN)
-FramesPerSec		  I	Xv   Max. refresh frequency
-
-XAA options.  All are of type "O" and scope "X", and are self-explanatory
-
-XaaNoColor8x8PatternFillRect
-XaaNoColor8x8PatternFillTrap
-XaaNoCPUToScreenColorExpandFill
-XaaNoDashedBresenhamLine
-XaaNoDashedTwoPointLine
-XaaNoScreenToScreenCopy
-XaaNoImageReadRect
-XaaNoImageWriteRect
-XaaNoMono8x8PatternFillRect
-XaaNoMono8x8PatternFillTrap
-XaaNoOffscreenPixmaps
-XaaNoPixmapCache
-XaaNoScanlineCPUToScreenColorExpandFill
-XaaNoScanlineImageWriteRect
-XaaNoScreenToScreenColorExpandFill
-XaaNoSolidBresenhamLine
-XaaNoSolidFillRect
-XaaNoSolidFillTrap
-XaaNoSolidHorVertLine
-XaaNoSolidTwoPointLine
-
-
-Names used in previous versions:
-
-16Clocks
-8Clocks
-ClkDiv2
-EDO VRAM
-ExternDisp
-ExtFramBuf
-FastVRAM
-FavorBitBlt
-InternDisp
-NoBitBlt
-NoFontCache
-NoImageBlt
-NoMemAccess
-NoPciDisconnect
-NoPixmapCache
-NoProgramClocks
-NoSplitXfer
-OverrideBIOS
-OverrideValidateMode
-ProgLcdModeRegs
-ProgLcdModeStretch
-SlowDRAMrefresh
-SlowVRAM
-SwapHiBit
-
-
-5. Ramdac Names.
-
-Ramdac names should be consistent between drivers.  Case, white space
-and underscore characters are ignored when comparing ramdac names.  All
-names listed here are in lower case with all white space and underscores
-removed.
-
-
-6. Clock Chip Names.
-
-Clock chip names should be consistent between drivers.  Case, white
-space and underscore characters are ignored when comparing clock chip
-names.  All names listed here are in lower case with all white space
-and underscores removed.
-
-
-
-
-
-$XFree86: xc/programs/Xserver/hw/xfree86/Registry,v 1.18 2002/04/06 18:31:09 tsi Exp $
+This is the XFree86 driver/module registry.  To avoid name space clashes and
+to maintain some consistency between drivers the important name spaces are
+maintained here.
+
+1. Module Names.
+
+Each module is required to have a unique name.  Registered names are:
+
+GLcore
+acecad
+afb
+apm
+ark
+ati
+atimisc
+bitmap
+bt8xx
+calcomp
+cfb
+cfb16
+cfb24
+cfb32
+chips
+cirrus
+citron
+cyrix
+dbe
+ddc
+digitaledge
+dmc
+dri
+drm
+dynapro
+elo2300
+elographics
+extmod
+fb
+fbdev
+fbdevhw
+fi12x6
+freetype
+glide
+glint
+glx
+hyperpen
+i128
+i2c
+i740
+i810
+imstt
+int10
+joystick
+keyboard
+layer
+magellan
+magictouch
+mfb
+mga
+microtouch
+mouse
+msp34xx
+mutouch
+neomagic
+newport
+nv
+pcidata
+penmount
+pex5
+r128
+radeon
+rac
+ramdac
+record
+rendition
+s3
+s3virge
+savage
+shadow
+shadowfb
+siliconmotion
+sis
+spaceorb
+speedo
+summa
+sunbw2
+suncg14
+suncg3
+suncg6
+sunffb
+sunleo
+suntcx
+tdfx
+tga
+trident
+tseng
+type1
+v4l
+vbe
+vesa
+vga
+vgahw
+vmware
+void
+wacom
+xaa
+xf1bpp
+xf24_32bpp
+xf4bpp
+xf8_16bpp
+xf8_32bpp
+xf8_32wid
+xie
+xtrap
+xtt
+
+2. External Module Object Symbols.
+
+Each module is required to use a unique prefix or prefixes for all of
+its externally visible symbols. They should be unique without regard to
+case.  Registered prefixes are:
+
+ati
+bt8xx
+cfb
+chips
+fi12x6
+glide
+glint
+mfb
+mga
+msp34xx
+neo
+permedia
+tseng
+vga
+vgahw
+vmware
+xaa
+xf1bpp
+xf4bpp
+
+3. Chipset Names.
+
+Each video driver is required to use a unique set of chipset names.  Case,
+white space and underscore characters are ignored when comparing chipset
+names.  All names listed here are in lower case with all white space and
+underscores removed.  Registered chipset names are:
+
+ati
+ativga
+ct64200
+ct64300
+ct65520
+ct65525
+ct65530
+ct65535
+ct65540
+ct65545
+ct65546
+ct65548
+ct65550
+ct65554
+ct65555
+ct68554
+ct69000
+et4000
+et4000w32
+et4000w32i
+et4000w32p
+et6000
+et6100
+generic
+ibmvga
+ibm8514
+mach32
+mach64
+mach8
+mga2064w
+mga1064sg
+mga2164w
+mga2164wagp
+neo2070
+neo2090
+neo2093
+neo2097
+neo2160
+neo2200
+tipm2
+vgawonder
+voodoo
+
+4. Option Names.
+
+Option names and their usage should be consistent between drivers.
+Case, white space and underscore characters are ignored when comparing
+option names.  The prefix "no" may be added or removed from boolean
+option names.  All names listed here are in their preferred user-visible
+form.  Some registered option names are:
+
+Types are:  B = boolean, O = set/unset (no value), I = integer, S = string,
+            A = optional string, F = floating point number Q = frequency
+
+Scopes are: F = global flags, V = video driver, C = common (per screen),
+            I = input drivers, X = XAA, Xv = Xv extension, M = misc.
+
+Names currently in use:
+
+Name                    Type  Scope      Description
+----------------------------------------------------------------------------
+AllowMouseOpenFail        B     F    ignore mouse dev open failure
+AllowNonLocalModInDev     B     F    allow non-local mod of input devs
+AllowNonLocalXvidtune     B     F    allow non-local VidMode connections
+BlankTime                 I     F    Screen saver timeout (min)
+DisableModInDev           B     F    disallow changing input devs
+DisableVidModeExtension   B     F    disable VidMode extension
+DontVTSwitch              B     F    disable Ctrl-Alt-Fn
+DontZap                   B     F    disable Ctrl-Alt-BS sequence
+DontZoom                  B     F    disable Ctrl-Alt-+/-
+NoTrapSignals             B     F    don't trap signals
+OffTime                   I     F    Time before DPMS off mode active (min)
+PciProbe1                 O     F    use PCI probe algorithm 1
+PciProbe2                 O     F    use PCI probe algorithm 2
+PciForceConfig1           O     F    force PCI config type 1
+PciForceConfig2           O     F    force PCI config type 2
+Pixmap                    I     F    depth 24 pixmap size (24 or 32)
+StandbyTime               I     F    Time before DPMS standby active (min)
+SuspendTime               I     F    Time before DPMS suspend mode active (min)
+
+BackingStore              B     C    Enable backing store
+DDC                       B     C    Enable/disable DDC
+DDC1                      B     C    Enable/disable DDC1
+DDC2                      B     C    Enable/disable DDC2
+DPMS                      O     C    Enable DPMS
+MTRR                      B     C    Enable/disable setting MTRRs
+
+BaudRate                  I     I    Serial port baud rate
+ButtonNumber              I     I    Button number (for touch screen?)
+ButtonThreshold           I     I    ??
+ClearDTR                  O     I    Clear serial port DTR
+ClearRTS                  O     I    Clear serial port RTS
+DataBits                  I     I    Serial port data bits
+DemandLoad                O     I    ??
+Device                    S     I    Device file name
+DeviceName                S     I    Input device name
+FlowControl               S     I    Serial flow control ("xon", "none")
+Floating                  B     I    Device initialised as floating
+HistorySize               I     I    ??
+MaxX                      I     I    Maximum X coordinate
+MaxY                      I     I    Maximum Y coordinate
+MinX                      I     I    Minimum X coordinate
+MinY                      I     I    Minimum Y coordinate
+Parity                    S     I    Serial port parity ("odd", "even", "none")
+ReportDelay               I     I    ??
+ReportingMode             S     I    may be "raw" or "scaled"
+ScreenNumber              I     I    Screen number (for touch screen)
+SendCoreEvents            B     I    Send core events
+StopBits                  I     I    Serial port stop bits
+SwapXY                    B     I    Swap the X and Y axes
+UntouchDelay              I     I    ??
+Vmin                      I     I    Tty VMIN
+Vtime                     I     I    Tty VTIME
+
+
+18BitBus                  B     V    ??
+8Plus16                   B     V    Enable depth 8 + depth 16 with overlay
+8Plus24                   B     V    Enable depth 8 + depth 24 with overlay
+BlockWrite                B     V    Enable/disable block write
+ColorKey                  I     V    Set the color key for overlay modes
+CompositeSync             B     V    Composite sync
+CRTDisplay                B     V    Force display on CRT, not LCD
+CRTScreen                 B     V    Display on CRT, not LCD (Obsolete)
+EarlyRasPrecharge         O     V    Early RAS pre-charge
+FastDRAM                  O     V    Fast DRAM
+FifoAggressive            O     V    Aggressive FIFO setting
+FifoConservative          O     V    Conservative FIFO setting
+FifoModerate              O     V    Moderate FIFO setting
+FireGL3000                B     V    Card is Diamond FireGL3000
+FixPanelSize              B     V    ??
+FPClock8                  Q     V    Flat panel clock for 8bpp fb (MHz)
+FPClock16                 Q     V    Flat panel clock for 16bpp fb (MHz)
+FPClock24                 Q     V    Flat panel clock for 24bpp fb (MHz)
+FPClock32                 Q     V    Flat panel clock for 32bpp fb (MHz)
+FPMVRAM                   O     V    Fast page mode VRAM
+FramebufferWC             B     V    Enable/disable WC for the framebuffer
+GlideDevice               I     V    Selects which Voodoo board to use
+HiBitHigh                 O     V    High clock bit default to set
+HiBitLow                  O     V    High clock bit default to cleared
+HWClocks                  B     V    Enable/disable HW clocks
+HWCursor                  B     V    Enable/disable HW cursor
+LateRasPrecharge          O     V    Late RAS pre-charge
+Legend                    O     V    Card is Legend ET4000
+LCDCenter                 B     V    Enable/disable centering for LCD displays
+Linear                    B     V    Enable/disable linear framebuffer
+MCLK                      Q     V    Specify the current MCLK value (MHz)
+MedDRAM                   B     V    Medium speed DRAM
+MemCfg1                   I     V    ??
+MemCfg2                   I     V    ??
+MGASDRAM                  B     V    Mga card has SDRAM
+MMIO                      B     V    Enable/disable memory mapped I/O
+MMIOCache                 B     V    Enable/Disable MMIO cache
+MuxThreshold              I     V    Multiplexing threshold (kHz)
+NoAccel                   B     V    Disable/enable acceleration
+NoClockChip               B     V    ??
+NoStretch                 B     V    Disable/enable stretching for LCD displays
+OnAtExit                  B     V    Leave video signal on when exiting server
+OverclockMem              B     V    Enable memory overclocking
+Overlay                   A     V    Enable multi-depth/overlay.  An optional
+                                     string "M,N" may be specified, where
+                                     M, N are the depths.
+PanelDisplay              B     V    Force display on LCD
+PciBurst                  B     V    Enable/disable PCI burst mode
+PciRetry                  B     V    Enable/disable PCI retries
+ProbeClocks               B     V    Force probe for non-programmable clocks
+ReferenceClock            Q     V    Clock generator reference frequency
+RGBbits                   I     V    Number of significant bits per rgb
+Rotate                    S     V    Rotate the virtual display (CW or CCW)
+SetLCDClk                 Q     V    Set LCD clock (MHz)
+SetMclk                   Q     V    Set Memory Clock (MHz)
+ShadowFB                  B     V    Enable shadow framebuffer layer
+ShowCache                 B     V    Enable viewing of offscreen memory
+ShowOverscan              O     V    Set the overscan area to a visible colour
+SlowDRAM                  O     V    Slow DRAM
+SlowEDODRAM               O     V    Slow EDO DRAM
+STN                       B     V    STN screen type (??)
+SWCursor                  B     V    Enable/disable SW cursor
+SuspendHack               B     V    ??
+SyncOnGreen               B     V    Enable/disable sync on green
+TurboQueue                B     V    Enable/disable turbo queue
+UseFBDev                  B     V    Use the fbdev driver interface
+UseModeLine               B     V    Use Modeline (??)
+W32Interleave             B     V    ??
+
+Buffers			  I	Xv   Number of buffers
+Device			  S	Xv   Device file name
+Expose                    B     Xv   Disable occlusion clipping (see DESIGN)
+FramesPerSec		  I	Xv   Max. refresh frequency
+
+XAA options.  All are of type "O" and scope "X", and are self-explanatory
+
+XaaNoColor8x8PatternFillRect
+XaaNoColor8x8PatternFillTrap
+XaaNoCPUToScreenColorExpandFill
+XaaNoDashedBresenhamLine
+XaaNoDashedTwoPointLine
+XaaNoScreenToScreenCopy
+XaaNoImageReadRect
+XaaNoImageWriteRect
+XaaNoMono8x8PatternFillRect
+XaaNoMono8x8PatternFillTrap
+XaaNoOffscreenPixmaps
+XaaNoPixmapCache
+XaaNoScanlineCPUToScreenColorExpandFill
+XaaNoScanlineImageWriteRect
+XaaNoScreenToScreenColorExpandFill
+XaaNoSolidBresenhamLine
+XaaNoSolidFillRect
+XaaNoSolidFillTrap
+XaaNoSolidHorVertLine
+XaaNoSolidTwoPointLine
+
+
+Names used in previous versions:
+
+16Clocks
+8Clocks
+ClkDiv2
+EDO VRAM
+ExternDisp
+ExtFramBuf
+FastVRAM
+FavorBitBlt
+InternDisp
+NoBitBlt
+NoFontCache
+NoImageBlt
+NoMemAccess
+NoPciDisconnect
+NoPixmapCache
+NoProgramClocks
+NoSplitXfer
+OverrideBIOS
+OverrideValidateMode
+ProgLcdModeRegs
+ProgLcdModeStretch
+SlowDRAMrefresh
+SlowVRAM
+SwapHiBit
+
+
+5. Ramdac Names.
+
+Ramdac names should be consistent between drivers.  Case, white space
+and underscore characters are ignored when comparing ramdac names.  All
+names listed here are in lower case with all white space and underscores
+removed.
+
+
+6. Clock Chip Names.
+
+Clock chip names should be consistent between drivers.  Case, white
+space and underscore characters are ignored when comparing clock chip
+names.  All names listed here are in lower case with all white space
+and underscores removed.
+
+
+
+
+
+$XFree86: xc/programs/Xserver/hw/xfree86/Registry,v 1.18 2002/04/06 18:31:09 tsi Exp $
diff --git a/xorg-server/hw/xfree86/doc/ddxDesign.xml b/xorg-server/hw/xfree86/doc/ddxDesign.xml
index a6b9da2d5..24b0c0324 100644
--- a/xorg-server/hw/xfree86/doc/ddxDesign.xml
+++ b/xorg-server/hw/xfree86/doc/ddxDesign.xml
@@ -1306,7 +1306,7 @@ Here is what <function>InitOutput()</function> does:
 
       <blockquote><para>
 	  <programlisting>
-    Bool ChipScreenInit(int index, ScreenPtr pScreen,
+    Bool ChipScreenInit(ScreenPtr pScreen,
                         int argc, char **argv);
 	  </programlisting>
 	  <blockquote><para>
@@ -1442,7 +1442,7 @@ Here is what <function>InitOutput()</function> does:
 
       <blockquote><para>
 	  <programlisting>
-    Bool ChipSwitchMode(int index, DisplayModePtr mode, int flags);
+    Bool ChipSwitchMode(int index, DisplayModePtr mode);
 	  </programlisting>
 	  <blockquote><para>
       Initialises the new mode for the screen identified by
@@ -1464,7 +1464,7 @@ Here is what <function>InitOutput()</function> does:
 
       <blockquote><para>
 	  <programlisting>
-    void ChipAdjustFrame(int index, int x, int y, int flags);
+    void ChipAdjustFrame(int index, int x, int y);
 	  </programlisting>
 	  <blockquote><para>
       Changes the viewport for the screen identified by
@@ -1572,7 +1572,7 @@ Here is what <function>InitOutput()</function> does:
 
       <blockquote><para>
 	  <programlisting>
-    Bool ChipEnterVT(int index, int flags);
+    Bool ChipEnterVT(ScrnInfoPtr pScrn);
 	  </programlisting>
 	  <blockquote><para>
       This function should initialise the current video mode and
@@ -1589,7 +1589,7 @@ Here is what <function>InitOutput()</function> does:
 
       <blockquote><para>
 	  <programlisting>
-    void ChipLeaveVT(int index, int flags);
+    void ChipLeaveVT(ScrnInfoPtr pScrn);
 	  </programlisting>
 	  <blockquote><para>
       This function should restore the saved video state.  If
@@ -1691,7 +1691,7 @@ but their presence is optional.
 
       <blockquote><para>
 	  <programlisting>
-    ModeStatus ChipValidMode(int index, DisplayModePtr mode,
+    ModeStatus ChipValidMode(ScrnInfoPtr pScrn, DisplayModePtr mode,
                              Bool verbose, int flags);
 	  </programlisting>
 	  <blockquote><para>
@@ -1739,7 +1739,7 @@ MODECHECK_FINAL are intended for checks that may involve more than one mode.
 
       <blockquote><para>
 	  <programlisting>
-    void ChipFreeScreen(int scrnindex, int flags);
+    void ChipFreeScreen(ScrnInfoPtr pScrn);
 	  </programlisting>
 	  <blockquote><para>
       Free any driver-allocated data that may have been allocated up to
@@ -2824,12 +2824,12 @@ Several functions are provided to simplify resource registration:
 
 	  <blockquote><para>
 	      <programlisting>
-    Bool xf86IsScreenPrimary(int scrnIndex);
+    Bool xf86IsScreenPrimary(ScrnInfoPtr pScrn);
 	      </programlisting>
 	      <blockquote><para>
       This function returns <constant>TRUE</constant> if the primary entity
       is registered with the screen referenced by
-      <parameter>scrnIndex</parameter>.
+      <parameter>pScrn</parameter>.
 		</para>
 
 	      </blockquote></para></blockquote>
@@ -9033,7 +9033,7 @@ ZZZModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
 
 	<programlisting>
 static Bool
-ZZZScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ZZZScreenInit(ScreenPtr pScreen, int argc, char **argv)
 {
     /* Get the ScrnInfoRec */
     pScrn = xf86ScreenToScrn(pScreen);
@@ -9051,7 +9051,7 @@ ZZZScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 
     /* Set the viewport if supported */
 
-    ZZZAdjustFrame(scrnIndex, pScrn-&gt;frameX0, pScrn-&gt;frameY0, 0);
+    ZZZAdjustFrame(pScrn, pScrn-&gt;frameX0, pScrn-&gt;frameY0);
 
     /*
      * Setup the screen's visuals, and initialise the framebuffer
@@ -9220,9 +9220,9 @@ ZZZScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 
 	<programlisting>
 static Bool
-ZZZSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+ZZZSwitchMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
 {
-    return ZZZModeInit(xf86Screens[scrnIndex], mode);
+    return ZZZModeInit(pScrn, mode);
 }
 	</programlisting>
       </sect3>
@@ -9237,7 +9237,7 @@ ZZZSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
 
 	<programlisting>
 static void
-ZZZAdjustFrame(int scrnIndex, int x, int y, int flags)
+ZZZAdjustFrame(ScrnInfoPtr pScrn, int x, int y)
 {
     /* Adjust the viewport */
 }
@@ -9258,16 +9258,14 @@ ZZZAdjustFrame(int scrnIndex, int x, int y, int flags)
 
 	<programlisting>
 static Bool
-ZZZEnterVT(int scrnIndex, int flags)
+ZZZEnterVT(ScrnInfoPtr pScrn)
 {
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     return ZZZModeInit(pScrn, pScrn-&gt;currentMode);
 }
 
 static void
-ZZZLeaveVT(int scrnIndex, int flags)
+ZZZLeaveVT(ScrnInfoPtr pScrn)
 {
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     ZZZRestore(pScrn);
 }
 	</programlisting>
@@ -9288,16 +9286,16 @@ ZZZLeaveVT(int scrnIndex, int flags)
 
 	<programlisting>
 static Bool
-ZZZCloseScreen(int scrnIndex, ScreenPtr pScreen)
+ZZZCloseScreen(ScreenPtr pScreen)
 {
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     if (pScrn-&gt;vtSema) {
         ZZZRestore(pScrn);
         ZZZUnmapMem(pScrn);
     }
     pScrn-&gt;vtSema = FALSE;
     pScreen-&gt;CloseScreen = ZZZPTR(pScrn)-&gt;CloseScreen;
-    return (*pScreen-&gt;CloseScreen)(scrnIndex, pScreen);
+    return (*pScreen-&gt;CloseScreen)(pScreen);
 }
 	</programlisting>
       </sect3>
@@ -9342,13 +9340,13 @@ ZZZSaveScreen(ScreenPtr pScreen, int mode)
 
 	<programlisting>
 static void
-ZZZFreeScreen(int scrnIndex, int flags)
+ZZZFreeScreen(ScrnInfoPtr pScrn)
 {
     /*
      * If the vgahw module is used vgaHWFreeHWRec() would be called
      * here.
      */
-    ZZZFreeRec(xf86Screens[scrnIndex]);
+    ZZZFreeRec(pScrn);
 }
 
 	</programlisting>
diff --git a/xorg-server/hw/xfree86/dri/dri.c b/xorg-server/hw/xfree86/dri/dri.c
index 20eb683ad..46a9ae457 100644
--- a/xorg-server/hw/xfree86/dri/dri.c
+++ b/xorg-server/hw/xfree86/dri/dri.c
@@ -1618,7 +1618,7 @@ DRIWakeupHandler(pointer wakeupData, int result, pointer pReadmask)
         DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
         if (pDRIPriv && pDRIPriv->pDriverInfo->wrap.WakeupHandler)
-            (*pDRIPriv->pDriverInfo->wrap.WakeupHandler) (i, wakeupData,
+            (*pDRIPriv->pDriverInfo->wrap.WakeupHandler) (pScreen,
                                                           result, pReadmask);
     }
 }
@@ -1633,16 +1633,15 @@ DRIBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
         DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
         if (pDRIPriv && pDRIPriv->pDriverInfo->wrap.BlockHandler)
-            (*pDRIPriv->pDriverInfo->wrap.BlockHandler) (i, blockData,
+            (*pDRIPriv->pDriverInfo->wrap.BlockHandler) (pScreen,
                                                          pTimeout, pReadmask);
     }
 }
 
 void
-DRIDoWakeupHandler(int screenNum, pointer wakeupData,
+DRIDoWakeupHandler(ScreenPtr pScreen,
                    unsigned long result, pointer pReadmask)
 {
-    ScreenPtr pScreen = screenInfo.screens[screenNum];
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
     DRILock(pScreen, 0);
@@ -1658,10 +1657,9 @@ DRIDoWakeupHandler(int screenNum, pointer wakeupData,
 }
 
 void
-DRIDoBlockHandler(int screenNum, pointer blockData,
+DRIDoBlockHandler(ScreenPtr pScreen,
                   pointer pTimeout, pointer pReadmask)
 {
-    ScreenPtr pScreen = screenInfo.screens[screenNum];
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
     if (pDRIPriv->pDriverInfo->driverSwapMethod == DRI_HIDE_X_CONTEXT) {
@@ -2307,15 +2305,14 @@ _DRIAdjustFrame(ScrnInfoPtr pScrn, DRIScreenPrivPtr pDRIPriv, int x, int y)
 }
 
 void
-DRIAdjustFrame(int scrnIndex, int x, int y, int flags)
+DRIAdjustFrame(ScrnInfoPtr pScrn, int x, int y)
 {
-    ScreenPtr pScreen = screenInfo.screens[scrnIndex];
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     int px, py;
 
     if (!pDRIPriv || !pDRIPriv->pSAREA) {
-        DRIDrvMsg(scrnIndex, X_ERROR, "[DRI] No SAREA (%p %p)\n",
+        DRIDrvMsg(pScrn->scrnIndex, X_ERROR, "[DRI] No SAREA (%p %p)\n",
                   pDRIPriv, pDRIPriv ? pDRIPriv->pSAREA : NULL);
         return;
     }
@@ -2347,7 +2344,7 @@ DRIAdjustFrame(int scrnIndex, int x, int y, int flags)
         /* unwrap */
         pScrn->AdjustFrame = pDRIPriv->wrap.AdjustFrame;
         /* call lower layers */
-        (*pScrn->AdjustFrame) (scrnIndex, x, y, flags);
+        (*pScrn->AdjustFrame) (pScrn, x, y);
         /* rewrap */
         pDRIPriv->wrap.AdjustFrame = pScrn->AdjustFrame;
         pScrn->AdjustFrame = DRIAdjustFrame;
diff --git a/xorg-server/hw/xfree86/dri/dri.h b/xorg-server/hw/xfree86/dri/dri.h
index 53458bb4a..0a4036c35 100644
--- a/xorg-server/hw/xfree86/dri/dri.h
+++ b/xorg-server/hw/xfree86/dri/dri.h
@@ -73,7 +73,7 @@ typedef int DRIWindowRequests;
 #define DRI_ALL_WINDOWS      2
 
 typedef void (*ClipNotifyPtr) (WindowPtr, int, int);
-typedef void (*AdjustFramePtr) (int scrnIndex, int x, int y, int flags);
+typedef void (*AdjustFramePtr) (ScrnInfoPtr pScrn, int x, int y);
 
 /*
  * These functions can be wrapped by the DRI.  Each of these have
@@ -271,13 +271,11 @@ extern _X_EXPORT void DRIWakeupHandler(pointer wakeupData,
 extern _X_EXPORT void DRIBlockHandler(pointer blockData,
                                       OSTimePtr pTimeout, pointer pReadmask);
 
-extern _X_EXPORT void DRIDoWakeupHandler(int screenNum,
-                                         pointer wakeupData,
+extern _X_EXPORT void DRIDoWakeupHandler(ScreenPtr pScreen,
                                          unsigned long result,
                                          pointer pReadmask);
 
-extern _X_EXPORT void DRIDoBlockHandler(int screenNum,
-                                        pointer blockData,
+extern _X_EXPORT void DRIDoBlockHandler(ScreenPtr pScreen,
                                         pointer pTimeout, pointer pReadmask);
 
 extern _X_EXPORT void DRISwapContext(int drmFD, void *oldctx, void *newctx);
@@ -334,7 +332,7 @@ extern _X_EXPORT drm_context_t DRIGetContext(ScreenPtr pScreen);
 extern _X_EXPORT void DRIQueryVersion(int *majorVersion,
                                       int *minorVersion, int *patchVersion);
 
-extern _X_EXPORT void DRIAdjustFrame(int scrnIndex, int x, int y, int flags);
+extern _X_EXPORT void DRIAdjustFrame(ScrnInfoPtr pScrn, int x, int y);
 
 extern _X_EXPORT void DRIMoveBuffersHelper(ScreenPtr pScreen,
                                            int dx,
diff --git a/xorg-server/hw/xfree86/exa/examodule.c b/xorg-server/hw/xfree86/exa/examodule.c
index 50924587d..4e809ea37 100644
--- a/xorg-server/hw/xfree86/exa/examodule.c
+++ b/xorg-server/hw/xfree86/exa/examodule.c
@@ -38,7 +38,7 @@
 
 typedef struct _ExaXorgScreenPrivRec {
     CloseScreenProcPtr SavedCloseScreen;
-    EnableDisableFBAccessProcPtr SavedEnableDisableFBAccess;
+    xf86EnableDisableFBAccessProc *SavedEnableDisableFBAccess;
     OptionInfoPtr options;
 } ExaXorgScreenPrivRec, *ExaXorgScreenPrivPtr;
 
@@ -70,7 +70,7 @@ static const OptionInfoRec EXAOptions[] = {
 };
 
 static Bool
-exaXorgCloseScreen(int i, ScreenPtr pScreen)
+exaXorgCloseScreen(ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     ExaXorgScreenPrivPtr pScreenPriv = (ExaXorgScreenPrivPtr)
@@ -83,24 +83,24 @@ exaXorgCloseScreen(int i, ScreenPtr pScreen)
     free(pScreenPriv->options);
     free(pScreenPriv);
 
-    return pScreen->CloseScreen(i, pScreen);
+    return pScreen->CloseScreen(pScreen);
 }
 
 static void
-exaXorgEnableDisableFBAccess(int index, Bool enable)
+exaXorgEnableDisableFBAccess(ScrnInfoPtr pScrn, Bool enable)
 {
-    ScreenPtr pScreen = screenInfo.screens[index];
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     ExaXorgScreenPrivPtr pScreenPriv = (ExaXorgScreenPrivPtr)
         dixLookupPrivate(&pScreen->devPrivates, exaXorgScreenPrivateKey);
 
     if (!enable)
-        exaEnableDisableFBAccess(index, enable);
+        exaEnableDisableFBAccess(pScreen, enable);
 
     if (pScreenPriv->SavedEnableDisableFBAccess)
-        pScreenPriv->SavedEnableDisableFBAccess(index, enable);
+        pScreenPriv->SavedEnableDisableFBAccess(pScrn, enable);
 
     if (enable)
-        exaEnableDisableFBAccess(index, enable);
+        exaEnableDisableFBAccess(pScreen, enable);
 }
 
 /**
diff --git a/xorg-server/hw/xfree86/fbdevhw/README b/xorg-server/hw/xfree86/fbdevhw/README
index 27cc337d4..65ca06033 100644
--- a/xorg-server/hw/xfree86/fbdevhw/README
+++ b/xorg-server/hw/xfree86/fbdevhw/README
@@ -1,16 +1,16 @@
-
-This is a submodule to access linux framebuffer devices.
-It is supported to work as helper module (like vgahw)
-for the chipset drivers.  There are functions for
-saving/restoring/setting video modes, set palette entries,
-and a few more helper functions.  Some of them can be
-hooked directly into ScrnInfoRec.
-
-In ../drivers/fbdev is a "chipset" driver.  It is a simple,
-non-accelerated and hardware-independent driver which works
-on top of this fbdevhw submodule.
-
-  Gerd
-
---
-Gerd Knorr <kraxel@goldbach.in-berlin.de>
+
+This is a submodule to access linux framebuffer devices.
+It is supported to work as helper module (like vgahw)
+for the chipset drivers.  There are functions for
+saving/restoring/setting video modes, set palette entries,
+and a few more helper functions.  Some of them can be
+hooked directly into ScrnInfoRec.
+
+In ../drivers/fbdev is a "chipset" driver.  It is a simple,
+non-accelerated and hardware-independent driver which works
+on top of this fbdevhw submodule.
+
+  Gerd
+
+--
+Gerd Knorr <kraxel@goldbach.in-berlin.de>
diff --git a/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c b/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c
index 0444d481c..d4b5558a7 100644
--- a/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c
@@ -775,10 +775,8 @@ fbdevHWLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
 /* these can be hooked directly into ScrnInfoRec                        */
 
 ModeStatus
-fbdevHWValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
+fbdevHWValidMode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool verbose, int flags)
 {
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-
     if (!fbdevHWSetMode(pScrn, mode, TRUE))
         return MODE_BAD;
 
@@ -786,10 +784,8 @@ fbdevHWValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
 }
 
 Bool
-fbdevHWSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+fbdevHWSwitchMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
 {
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-
     if (!fbdevHWSetMode(pScrn, mode, FALSE))
         return FALSE;
 
@@ -797,9 +793,8 @@ fbdevHWSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
 }
 
 void
-fbdevHWAdjustFrame(int scrnIndex, int x, int y, int flags)
+fbdevHWAdjustFrame(ScrnInfoPtr pScrn, int x, int y)
 {
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
 
     if (x < 0 || x + fPtr->var.xres > fPtr->var.xres_virtual ||
@@ -809,26 +804,22 @@ fbdevHWAdjustFrame(int scrnIndex, int x, int y, int flags)
     fPtr->var.xoffset = x;
     fPtr->var.yoffset = y;
     if (-1 == ioctl(fPtr->fd, FBIOPAN_DISPLAY, (void *) &fPtr->var))
-        xf86DrvMsgVerb(scrnIndex, X_WARNING, 5,
+        xf86DrvMsgVerb(pScrn->scrnIndex, X_WARNING, 5,
                        "FBIOPAN_DISPLAY: %s\n", strerror(errno));
 }
 
 Bool
-fbdevHWEnterVT(int scrnIndex, int flags)
+fbdevHWEnterVT(ScrnInfoPtr pScrn)
 {
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-
     if (!fbdevHWModeInit(pScrn, pScrn->currentMode))
         return FALSE;
-    fbdevHWAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
+    fbdevHWAdjustFrame(pScrn, pScrn->frameX0, pScrn->frameY0);
     return TRUE;
 }
 
 void
-fbdevHWLeaveVT(int scrnIndex, int flags)
+fbdevHWLeaveVT(ScrnInfoPtr pScrn)
 {
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-
     fbdevHWRestore(pScrn);
 }
 
diff --git a/xorg-server/hw/xfree86/fbdevhw/fbdevhw.h b/xorg-server/hw/xfree86/fbdevhw/fbdevhw.h
index 536987101..4984ccf89 100644
--- a/xorg-server/hw/xfree86/fbdevhw/fbdevhw.h
+++ b/xorg-server/hw/xfree86/fbdevhw/fbdevhw.h
@@ -44,14 +44,12 @@ extern _X_EXPORT void fbdevHWLoadPalette(ScrnInfoPtr pScrn, int numColors,
                                          int *indices, LOCO * colors,
                                          VisualPtr pVisual);
 
-extern _X_EXPORT ModeStatus fbdevHWValidMode(int scrnIndex, DisplayModePtr mode,
+extern _X_EXPORT ModeStatus fbdevHWValidMode(ScrnInfoPtr pScrn, DisplayModePtr mode,
                                              Bool verbose, int flags);
-extern _X_EXPORT Bool fbdevHWSwitchMode(int scrnIndex, DisplayModePtr mode,
-                                        int flags);
-extern _X_EXPORT void fbdevHWAdjustFrame(int scrnIndex, int x, int y,
-                                         int flags);
-extern _X_EXPORT Bool fbdevHWEnterVT(int scrnIndex, int flags);
-extern _X_EXPORT void fbdevHWLeaveVT(int scrnIndex, int flags);
+extern _X_EXPORT Bool fbdevHWSwitchMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
+extern _X_EXPORT void fbdevHWAdjustFrame(ScrnInfoPtr pScrn, int x, int y);
+extern _X_EXPORT Bool fbdevHWEnterVT(ScrnInfoPtr pScrn);
+extern _X_EXPORT void fbdevHWLeaveVT(ScrnInfoPtr pScrn);
 extern _X_EXPORT void fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags);
 
 extern _X_EXPORT Bool fbdevHWSaveScreen(ScreenPtr pScreen, int mode);
diff --git a/xorg-server/hw/xfree86/fbdevhw/fbdevhwstub.c b/xorg-server/hw/xfree86/fbdevhw/fbdevhwstub.c
index 6e0a470b8..b7b4d2e7d 100644
--- a/xorg-server/hw/xfree86/fbdevhw/fbdevhwstub.c
+++ b/xorg-server/hw/xfree86/fbdevhw/fbdevhwstub.c
@@ -131,30 +131,30 @@ fbdevHWLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
 }
 
 ModeStatus
-fbdevHWValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
+fbdevHWValidMode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool verbose, int flags)
 {
     return MODE_ERROR;
 }
 
 Bool
-fbdevHWSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+fbdevHWSwitchMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
 {
     return FALSE;
 }
 
 void
-fbdevHWAdjustFrame(int scrnIndex, int x, int y, int flags)
+fbdevHWAdjustFrame(ScrnInfoPtr pScrn, int x, int y, int flags)
 {
 }
 
 Bool
-fbdevHWEnterVT(int scrnIndex, int flags)
+fbdevHWEnterVT(ScrnInfoPtr pScrn)
 {
     return FALSE;
 }
 
 void
-fbdevHWLeaveVT(int scrnIndex, int flags)
+fbdevHWLeaveVT(ScrnInfoPtr pScrn)
 {
 }
 
diff --git a/xorg-server/hw/xfree86/i2c/i2c_def.h b/xorg-server/hw/xfree86/i2c/i2c_def.h
index 140a071d6..e6a4e039e 100644
--- a/xorg-server/hw/xfree86/i2c/i2c_def.h
+++ b/xorg-server/hw/xfree86/i2c/i2c_def.h
@@ -1,6 +1,6 @@
-#ifndef __I2C_DEF_H__
-#define __I2C_DEF_H__
-
-#include "xf86i2c.h"
-
-#endif
+#ifndef __I2C_DEF_H__
+#define __I2C_DEF_H__
+
+#include "xf86i2c.h"
+
+#endif
diff --git a/xorg-server/hw/xfree86/i2c/xf86i2c.c b/xorg-server/hw/xfree86/i2c/xf86i2c.c
index 1273f4bab..2d261d4ce 100644
--- a/xorg-server/hw/xfree86/i2c/xf86i2c.c
+++ b/xorg-server/hw/xfree86/i2c/xf86i2c.c
@@ -709,6 +709,7 @@ xf86CreateI2CBusRec(void)
 
     if (b != NULL) {
         b->scrnIndex = -1;
+        b->pScrn = NULL;
         b->HoldTime = 5;        /* 100 kHz bus */
         b->BitTimeout = 5;
         b->ByteTimeout = 5;
diff --git a/xorg-server/hw/xfree86/i2c/xf86i2c.h b/xorg-server/hw/xfree86/i2c/xf86i2c.h
index 9a8fb21a3..e296d7d81 100644
--- a/xorg-server/hw/xfree86/i2c/xf86i2c.h
+++ b/xorg-server/hw/xfree86/i2c/xf86i2c.h
@@ -6,6 +6,7 @@
 #define _XF86I2C_H
 
 #include "regionstr.h"
+#include "xf86.h"
 
 typedef unsigned char I2CByte;
 typedef unsigned short I2CSlaveAddr;
@@ -18,6 +19,7 @@ typedef struct _I2CDevRec *I2CDevPtr;
 typedef struct _I2CBusRec {
     char *BusName;
     int scrnIndex;
+    ScrnInfoPtr pScrn;
 
     void (*I2CUDelay) (I2CBusPtr b, int usec);
 
diff --git a/xorg-server/hw/xfree86/int10/INT10.HOWTO b/xorg-server/hw/xfree86/int10/INT10.HOWTO
index e2154c1c3..f2f08ceec 100644
--- a/xorg-server/hw/xfree86/int10/INT10.HOWTO
+++ b/xorg-server/hw/xfree86/int10/INT10.HOWTO
@@ -1,344 +1,344 @@
-
-                 INT10  X86 Real Mode executor
-                 =============================
-
-		         PRELIMINARY
-
-INT10 is  a XFree86  module for soft-booting  and executing  real mode
-int10 BIOS calls. The BIOS call code is largely untested, yet.
-
-1. Usage
-========
-
-To   use   the   int10   module   in  a   driver   the   header   file
-xfree86/os-support/int10/xf86int10.h must be included.
-
- a. Initialization
- -----------------
-
-The int10-executer gets initialized by calling:
-
-   xf86Int10InfoPtr xf86InitInt10(int entityIndex);
-
-The  function  will soft-boot  any  non-primary  device  and return  a
-pointer  to a  xf86Int10InfoRec on  success. If  anything fails  or if
-int10 execution  is disabled by an  option in the  device section NULL
-will  be returned.   The driver  should store  this pointer  for later
-calls to other int10 module functions.
-
- b. Memory allocation
- --------------------
-
-To allocate memory in the real mode execution environment
-    
-   void * xf86Int10AllocPages(xf86Int10InfoPtr pInt,int num, int *off);
-
-can  be called.  It  allocates num  consecutive  pagesize chunks.   It
-returns the address of the allocated area. off is set to its offset in
-the real mode memory space.
-
-  void xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num);
-
-Is used to free num pages beginning at pbase.
-
- c. Doing int10 BIOS calls
- -------------------------
-
-The BIOS call is executed by calling:
-   
-   void xf86ExecX86int10(xf86Int10InfoPtr pInt);
-
-The number  of the interrupt (normally  10) and the  initial values of
-the ax, bx, cx, dx, si, di  and es x86-CPU registers can be set in the
-xf86Int10InfoRec  passed to  the function.   On return  this structure
-contains the  exit values  of the registers  listed above and  the CPU
-flag register.
-
- d. De-initializing
- -----------------
-
-If no further int10 calls are required for a certain chipset
-the driver should call:
-
-  void xf86FreeInt10(xf86Int10InfoPtr pInt);
-
-to free the memory allocated for real mode int10 calls.
-
-
-2. Porting issues
-=================
-
-The int10 real mode executor is  designed to run on top of various x86
-CPU emulators as well as in vm86  mode of a real x86 CPU. If used with
-a CPU  emulator the emulator and  CPU specific interfaces  can be held
-separate thus  requiring minimal efforts  to port the int10  module to
-new  platforms.   Currently  an  interface  to the  x86emu  real  mode
-emulator is  provided.  Since  details of setting  up and  running the
-vm86  mode   is  platform   dependent  both  the   platform  dependent
-environment and the emulation layer  have to be ported. Several helper
-functions are provided for that.
-
-A CPU emulator should meet certain requirements to be usable
-for the INT10 executor:
-
-1. It must trap  calls to intXX instructions and  pass execution to an
-   external  function  which  is   allowed  to  modify  CPU  registers
-   including  the instruction  pointer  (IP) before  returning to  the
-   emulator for  continuing execution.  When the external  function is
-   called the  IP must point to  the instruction past  the intXX call.
-
-2. The  emulator should  use externally  provided functions  to handle
-   PIO.
-
-3.  The emulator  should be able to use  externally provided functions
- to access memory  from the real mode memory  environment.  Note, that
- the  vm86  mode  usually  requires  one hunk  of  consecutive  memory
- starting at address  0 in the process virtual  memory space.  Thus if
- this mode is to be used, the OS environment has to be able to provide
- that, ie. it must be able to remap the processes virtual memory space
- onto itself.  If the  emulator is able  to handle memory  access thru
- externally  provided functions the  real mode  process memory  can be
- located anywhere  in the processes  virtual memory. It does  not even
- have to be consecutive.
-
-4. The executor should terminate on encountering a 'hlt' instruction.
-
-
-Functions to implement:
-
-To simplify development  the code has been split  into a general setup
-part and an emulator specific one. A generic setup code is provided in
-generic.c.  It  should be  usable  with  any  emulator satisfying  the
-conditions mentioned  above. Therefore the following  section on int10
-setup may be skipped when porting int10 to new emulator.
-
-If the  vm86() is to be used  no memory access functions  can be used.
-Therefore the layout of the real mode memory image has to meet certain
-requirements. Therefore  when porting to  other platforms a  new setup
-code may  have to  be designed, too.  The following section  will give
-guidelines how  this may be  done. A sample implementation  using SysV
-IPC to  map the  appropriate real  mode memory image  to address  0 in
-virtual  address  space  just  prior  to execution  may  be  found  in
-xfree86/os-support/linux/int10/linux.c.
-
-On  non-PC like  platforms emulation  of certain  PC features  such as
-initialization of  BIOS int vectors, sys_BIOS constants  or PCI config
-method 1 can be turned on by defining _PC.
-
-I. Setup Code
--------------
-
-This sets  up the real mode  memory image, calls the  emulator to POST
-the chipset if required and  maintains memory allocations in real mode
-address space.
-
-1. xf86Int10InfoPtr xf86InitInt10(int entityIndex);
-
-This  function should  first find  the screen  assigned to  the entity
-carrying entitiyIndex and then call
-
-       Bool int10skip(ScrnInfoPtr pScrn)
-
-to find out if the user  has requested not to initialize int10.  If so
-xf86InitInt10()  should  return  NULL. Otherwise  an  xf86Int10InfoRec
-should be allocated.  This structure contains the following fields:
-
-    a. int entityIndex   - index of the entity whose BIOS is to be 
-                           executed.
-    b. int scrnIndex     - index of the screen assigned the entity.
-    c. pointer cpuRegs   - pointer to a emulator/vm86-mode private 
-                           structure.  May hold cpu register values 
-                           for the emulator.
-    d. CARD16 BIOSseg    - Video BIOS segment address.
-    e. pointer private   - pointer to a os specific data structure.
-    f. struct _int10Mem* - pointer to a structure to hold the memory
-                           access functions for use by an emulator.
-    g. int num           - number of the int to be called.
-    h. int ax..es,flags  - CPU register values to pass to int-call.
-
-The Init  function should initialize  a-f. To initialize  the emulator
-specific execute environment the function
-
-     Bool xf86Int10ExecSetup(xf86Int10InfoPtr pInt)
-
-should be called. If this function returns FALSE any already allocated
-memory should be freed and xf86Int10Init(0 should exit returning NULL.
-
-If the  platform has  a PC  like system BIOS  it may  be copied  to or
-mapped into memory  locations SYS_BIOS to SYS_SIZE-1 of  the real mode
-memory environment of this process. Otherwise the helper function: 
-
-int setup_system_bios(CARD32 base_addr); 
-
-may be  called to set  up a rudimentary  system BIOS sufficient  to be
-used to  boot video BIOSes.   base_addr specifies the  virtual address
-corresponding to SYS_BIOS in the  real mode environment.  If a PC-like
-int vector and BIOS data area is available it should be copied to 0 to
-LOW_PAGE_SIZE of the entities real mode environment.  In this case the
-video interrupt  related entries should  be reset for  all non-primary
-cards by calling:
-
-void reset_int_vect(xf86Int10InfoPtr pInt); To initialize the
-
-correct video BIOS  entry points the BIOS must  be warm-booted.  If no
-PC-like int vector is available one can be set up by calling 
-
-void setup_int_vect(xf86Int10InfoPtr pInt); 
-
-In this  case the  video BIOS  has to be  warm-booted always.   If the
-video BIOS  for this entity has  been installed during boot  it may be
-mapped (or  copied) directly to the  correct address in  the real mode
-memory environment.  Otherwise
-
-int mapPciRom(xf86Int10InfoPtr pInt, unsigned char * address); 
-
-should  be called  to copy  the BIOS  image from  PCI  ROM.  'address'
-specifies the address this image should be copied to. Sufficient space
-to  hold an entire  BIOS image  should be  allocated prior  to calling
-mapPciRom(). This function  will return the size of  the BIOS image in
-bytes  if  it   was  able  to  successfully  copy   the  image  and  0
-otherwise. To create a well defined point to exit the softbooter
-
-void set_return_trap(xf86Int10Ptr pInt); 
-
-may be called.  It sets up a 'hlt' instruction  in the emulator memory
-just above the BIOS variable area. Before entering real mode execution
-this address will be pushed onto  the return stack.  If the BIOS needs
-to be  warm-booted this should be done  before leaving xf86InitInt10()
-by setting num in the xf86Int10InfoRec to 0xe6 and calling
-
-void xf86ExecX86int10(xf86Int10IfoPtr pInt); 
-
-The  implementation of this  function will  be discussed  below.  This
-function  should be  wrapped  by calls  to void  LockLegacyVGA(screen,
-legacyVGAPtr vga); and void UnlockLegacyVGA(screen, legacyVGAPtr vga);
-The struct  vga is  used to hold  the state  of the legacy  VGA access
-registers  if  a legacy  VGA  device  exists.  xf86InitInt10()  should
-return a pointer to the xf86Int10InfoRec allocated.
-
-2. Bool MapCurrentInt10(xf86Int10InfoPtr pInt);
-
-In case  a platform specific  mapping has to  be performed to  map the
-memory allocated for the real  mode memory environment into a specific
-location prior to executing the x86 real mode code a function
-
-        Bool MapCurrentInt10(xf86Int10InfoPtr pInt);
-
-has to  be provided. It will  be called by a  helper function whenever
-the active entity changes. If the  vm86 mode is used it is most likely
-that the 1MB real mode memory space located somewhere in the processes
-virtual memory  will have to be  remapped to address 0  of the virtual
-memory space.
-
-3.   void xf86FreeInt10(xf86Int10InfoPtr pInt);
-
-To free all memory allocated for video BIOS calls of a specific entity
-the function
-
-       void xf86FreeInt10(xf86Int10InfoPtr pInt);
-
-should  be  provided.  If  the  entity  to  be  freed  was  mapped  by
-MapCurrentInt10() this mapping needs to be undone also.
-
-4. 
-   void * xf86Int10AllocPages(xf86Int10InfoPtr pInt,int num, int *off)
-   void xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num)
-
-xf86Int10AllocPages()  should  allocate  'num'  consecutive  page-size
-chunks of memory. In real mode memory space this range needs to occupy
-consecutive addresses,  too. The function  must return the  address of
-this memory.  The offset in real  mode memory needs to  be returned in
-'off'. If  no block of 'num'  pages are available  the function should
-return NULL.
-
-xf86Int10FreePages() will  free the  'num' pages starting  at 'pbase'.
-'num'  is  equal  to  the  number  of  pages  allocated  by  a  single
-xf86Int10AllocatePages()  call. 'pbase'  is the  address of  the range
-previously returned by xf86Int10AllocatePages().
-
-II. Emulator specific functions
--------------------------------
-
-1. Bool xf86Int10ExecSetup(xf86Int10InfoPtr pInt);
-
-This function will  be called from xf86InitInt10(). It  may be used to
-set  up   the  static  emulator   specific  part  of  the   real  mode
-environment. On success it should return TRUE.
-
-2. xf86ExecX86int10(xf86Int10InfoPtr pInt);
-
-This function  gets called  to execute  an int call.  It may  call the
-helper function:
-
-       void setup_int(xf86Int10InfoPrt pInt);
-
-to copy the register values  to the emulator specific locations and to
-set up the non-static real mode execution environment.  On return from
-setup_int()   'Int10Current'   holds   a   pointer  to   the   current
-xf86Int10InfoRec.
-
-It should start execution by calling 
-
-       Bool int_handler(xf86Int10InfoPtr pInt);
-
-and if this function returns TRUE it should call whatever necessary to
-continue execution until a  'hlt' instruction is encountered.  To copy
-the resulting register values back to the xf86Int10InfoRec structure
-
-     void finish_int(xf86Int10InfoPtr pInt);
-
-should be called. 
-
-Helper  functions are  provided to  aid the  implementation of  a vm86
-call:
-
-  Bool vm86_GP_fault(xf86Int10InfoPtr pInt);
-
-This  function  handles  instructions  which  cause  a  vm86  call  to
-trap.  PIO  access  is handled  by  the  in/out  calls as  defined  in
-compiler.h. Optionally the PIO  instructions can be logged by defining
-PRINT_PORT in xf86int10.h. This is meant for debugging purposes.
-
-Unknown  instructions  and   'hlt'  cause  vm86_GP_fault()  to  return
-FALSE. Otherwise TRUE is returned.
-
-Note: This  function is  currently based on  the Linux vm86  call.  It
-might have  to be modified  or even rewritten  for other OS.   So your
-milage may vary.
-
-Functions to dump memory, code, xf86 CPU register values and stack are
-also provided.  Take a  look at  helper.c To view  a memory  range the
-function
-
-    void dprint(unsigned long start, unsigned long size)
-
-is provided. The use should be self explanatory.
-
-Register  and memory  access functions  are provided  in helper_mem.c.
-The PIO register access functions  can trap access to PCI config space
-access register (config method 1) if _PC is not defined.
-
-A header  file 'defines.h' is required to  define OS/emulator specific
-ways  to access  memory and  xf86 CPU  registers: Defines  need  to be
-provided     for    memory     byte/work/long     read/write    access
-(MEM_RB(name,addr),MEM_RW(name,addr),MEM_RL(name,addr),
-MEM_WB(name,addr,val),MEM_WL(name,addr,val),MEM_WL(name,addr,val))   of
-the real mode memory environment. 'name' will contain a pointer to the
-current   xf86Int10InfoRec.  Currently   defines  are   available  for
-vm86-mode under  Linux and x86emu.  They may be activated  by defining
-_X86EMU or _VM86_LINUX respectively.
-
-Note: Emulators usually are not able to pass this pointer when calling
-memory  access functions.  In this  case a  global variable  should be
-defined  which can  hold this  pointer. This  variable can  be  set in
-MapCurrentInt10().  It also  must be  set in  xf86InitInt10()  if this
-function  calls the  memory  access functions  either  directly or  by
-calling  xf86ExecX86int10(pInt).   Defines   to  access  the  emulator
-specific   xf86   CPU    register   locations   are   also   required:
-X86_EAX,...,X86_EFLAGS  for  access  of  the full  32  bit  registers,
-X86_AX...X86_FLAGS   for  access   of   the  16   bit  registers   and
-XF86_AL,XF86_BL,XF86_CL,XF86_DL  to  access  the  lower  byte  of  the
-AX,BX,CX and DX register.
-
-
-$XFree86: xc/programs/Xserver/hw/xfree86/int10/INT10.HOWTO,v 1.2 2000/02/08 13:13:22 eich Exp $
+
+                 INT10  X86 Real Mode executor
+                 =============================
+
+		         PRELIMINARY
+
+INT10 is  a XFree86  module for soft-booting  and executing  real mode
+int10 BIOS calls. The BIOS call code is largely untested, yet.
+
+1. Usage
+========
+
+To   use   the   int10   module   in  a   driver   the   header   file
+xfree86/os-support/int10/xf86int10.h must be included.
+
+ a. Initialization
+ -----------------
+
+The int10-executer gets initialized by calling:
+
+   xf86Int10InfoPtr xf86InitInt10(int entityIndex);
+
+The  function  will soft-boot  any  non-primary  device  and return  a
+pointer  to a  xf86Int10InfoRec on  success. If  anything fails  or if
+int10 execution  is disabled by an  option in the  device section NULL
+will  be returned.   The driver  should store  this pointer  for later
+calls to other int10 module functions.
+
+ b. Memory allocation
+ --------------------
+
+To allocate memory in the real mode execution environment
+    
+   void * xf86Int10AllocPages(xf86Int10InfoPtr pInt,int num, int *off);
+
+can  be called.  It  allocates num  consecutive  pagesize chunks.   It
+returns the address of the allocated area. off is set to its offset in
+the real mode memory space.
+
+  void xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num);
+
+Is used to free num pages beginning at pbase.
+
+ c. Doing int10 BIOS calls
+ -------------------------
+
+The BIOS call is executed by calling:
+   
+   void xf86ExecX86int10(xf86Int10InfoPtr pInt);
+
+The number  of the interrupt (normally  10) and the  initial values of
+the ax, bx, cx, dx, si, di  and es x86-CPU registers can be set in the
+xf86Int10InfoRec  passed to  the function.   On return  this structure
+contains the  exit values  of the registers  listed above and  the CPU
+flag register.
+
+ d. De-initializing
+ -----------------
+
+If no further int10 calls are required for a certain chipset
+the driver should call:
+
+  void xf86FreeInt10(xf86Int10InfoPtr pInt);
+
+to free the memory allocated for real mode int10 calls.
+
+
+2. Porting issues
+=================
+
+The int10 real mode executor is  designed to run on top of various x86
+CPU emulators as well as in vm86  mode of a real x86 CPU. If used with
+a CPU  emulator the emulator and  CPU specific interfaces  can be held
+separate thus  requiring minimal efforts  to port the int10  module to
+new  platforms.   Currently  an  interface  to the  x86emu  real  mode
+emulator is  provided.  Since  details of setting  up and  running the
+vm86  mode   is  platform   dependent  both  the   platform  dependent
+environment and the emulation layer  have to be ported. Several helper
+functions are provided for that.
+
+A CPU emulator should meet certain requirements to be usable
+for the INT10 executor:
+
+1. It must trap  calls to intXX instructions and  pass execution to an
+   external  function  which  is   allowed  to  modify  CPU  registers
+   including  the instruction  pointer  (IP) before  returning to  the
+   emulator for  continuing execution.  When the external  function is
+   called the  IP must point to  the instruction past  the intXX call.
+
+2. The  emulator should  use externally  provided functions  to handle
+   PIO.
+
+3.  The emulator  should be able to use  externally provided functions
+ to access memory  from the real mode memory  environment.  Note, that
+ the  vm86  mode  usually  requires  one hunk  of  consecutive  memory
+ starting at address  0 in the process virtual  memory space.  Thus if
+ this mode is to be used, the OS environment has to be able to provide
+ that, ie. it must be able to remap the processes virtual memory space
+ onto itself.  If the  emulator is able  to handle memory  access thru
+ externally  provided functions the  real mode  process memory  can be
+ located anywhere  in the processes  virtual memory. It does  not even
+ have to be consecutive.
+
+4. The executor should terminate on encountering a 'hlt' instruction.
+
+
+Functions to implement:
+
+To simplify development  the code has been split  into a general setup
+part and an emulator specific one. A generic setup code is provided in
+generic.c.  It  should be  usable  with  any  emulator satisfying  the
+conditions mentioned  above. Therefore the following  section on int10
+setup may be skipped when porting int10 to new emulator.
+
+If the  vm86() is to be used  no memory access functions  can be used.
+Therefore the layout of the real mode memory image has to meet certain
+requirements. Therefore  when porting to  other platforms a  new setup
+code may  have to  be designed, too.  The following section  will give
+guidelines how  this may be  done. A sample implementation  using SysV
+IPC to  map the  appropriate real  mode memory image  to address  0 in
+virtual  address  space  just  prior  to execution  may  be  found  in
+xfree86/os-support/linux/int10/linux.c.
+
+On  non-PC like  platforms emulation  of certain  PC features  such as
+initialization of  BIOS int vectors, sys_BIOS constants  or PCI config
+method 1 can be turned on by defining _PC.
+
+I. Setup Code
+-------------
+
+This sets  up the real mode  memory image, calls the  emulator to POST
+the chipset if required and  maintains memory allocations in real mode
+address space.
+
+1. xf86Int10InfoPtr xf86InitInt10(int entityIndex);
+
+This  function should  first find  the screen  assigned to  the entity
+carrying entitiyIndex and then call
+
+       Bool int10skip(ScrnInfoPtr pScrn)
+
+to find out if the user  has requested not to initialize int10.  If so
+xf86InitInt10()  should  return  NULL. Otherwise  an  xf86Int10InfoRec
+should be allocated.  This structure contains the following fields:
+
+    a. int entityIndex   - index of the entity whose BIOS is to be 
+                           executed.
+    b. int scrnIndex     - index of the screen assigned the entity.
+    c. pointer cpuRegs   - pointer to a emulator/vm86-mode private 
+                           structure.  May hold cpu register values 
+                           for the emulator.
+    d. CARD16 BIOSseg    - Video BIOS segment address.
+    e. pointer private   - pointer to a os specific data structure.
+    f. struct _int10Mem* - pointer to a structure to hold the memory
+                           access functions for use by an emulator.
+    g. int num           - number of the int to be called.
+    h. int ax..es,flags  - CPU register values to pass to int-call.
+
+The Init  function should initialize  a-f. To initialize  the emulator
+specific execute environment the function
+
+     Bool xf86Int10ExecSetup(xf86Int10InfoPtr pInt)
+
+should be called. If this function returns FALSE any already allocated
+memory should be freed and xf86Int10Init(0 should exit returning NULL.
+
+If the  platform has  a PC  like system BIOS  it may  be copied  to or
+mapped into memory  locations SYS_BIOS to SYS_SIZE-1 of  the real mode
+memory environment of this process. Otherwise the helper function: 
+
+int setup_system_bios(CARD32 base_addr); 
+
+may be  called to set  up a rudimentary  system BIOS sufficient  to be
+used to  boot video BIOSes.   base_addr specifies the  virtual address
+corresponding to SYS_BIOS in the  real mode environment.  If a PC-like
+int vector and BIOS data area is available it should be copied to 0 to
+LOW_PAGE_SIZE of the entities real mode environment.  In this case the
+video interrupt  related entries should  be reset for  all non-primary
+cards by calling:
+
+void reset_int_vect(xf86Int10InfoPtr pInt); To initialize the
+
+correct video BIOS  entry points the BIOS must  be warm-booted.  If no
+PC-like int vector is available one can be set up by calling 
+
+void setup_int_vect(xf86Int10InfoPtr pInt); 
+
+In this  case the  video BIOS  has to be  warm-booted always.   If the
+video BIOS  for this entity has  been installed during boot  it may be
+mapped (or  copied) directly to the  correct address in  the real mode
+memory environment.  Otherwise
+
+int mapPciRom(xf86Int10InfoPtr pInt, unsigned char * address); 
+
+should  be called  to copy  the BIOS  image from  PCI  ROM.  'address'
+specifies the address this image should be copied to. Sufficient space
+to  hold an entire  BIOS image  should be  allocated prior  to calling
+mapPciRom(). This function  will return the size of  the BIOS image in
+bytes  if  it   was  able  to  successfully  copy   the  image  and  0
+otherwise. To create a well defined point to exit the softbooter
+
+void set_return_trap(xf86Int10Ptr pInt); 
+
+may be called.  It sets up a 'hlt' instruction  in the emulator memory
+just above the BIOS variable area. Before entering real mode execution
+this address will be pushed onto  the return stack.  If the BIOS needs
+to be  warm-booted this should be done  before leaving xf86InitInt10()
+by setting num in the xf86Int10InfoRec to 0xe6 and calling
+
+void xf86ExecX86int10(xf86Int10IfoPtr pInt); 
+
+The  implementation of this  function will  be discussed  below.  This
+function  should be  wrapped  by calls  to void  LockLegacyVGA(screen,
+legacyVGAPtr vga); and void UnlockLegacyVGA(screen, legacyVGAPtr vga);
+The struct  vga is  used to hold  the state  of the legacy  VGA access
+registers  if  a legacy  VGA  device  exists.  xf86InitInt10()  should
+return a pointer to the xf86Int10InfoRec allocated.
+
+2. Bool MapCurrentInt10(xf86Int10InfoPtr pInt);
+
+In case  a platform specific  mapping has to  be performed to  map the
+memory allocated for the real  mode memory environment into a specific
+location prior to executing the x86 real mode code a function
+
+        Bool MapCurrentInt10(xf86Int10InfoPtr pInt);
+
+has to  be provided. It will  be called by a  helper function whenever
+the active entity changes. If the  vm86 mode is used it is most likely
+that the 1MB real mode memory space located somewhere in the processes
+virtual memory  will have to be  remapped to address 0  of the virtual
+memory space.
+
+3.   void xf86FreeInt10(xf86Int10InfoPtr pInt);
+
+To free all memory allocated for video BIOS calls of a specific entity
+the function
+
+       void xf86FreeInt10(xf86Int10InfoPtr pInt);
+
+should  be  provided.  If  the  entity  to  be  freed  was  mapped  by
+MapCurrentInt10() this mapping needs to be undone also.
+
+4. 
+   void * xf86Int10AllocPages(xf86Int10InfoPtr pInt,int num, int *off)
+   void xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num)
+
+xf86Int10AllocPages()  should  allocate  'num'  consecutive  page-size
+chunks of memory. In real mode memory space this range needs to occupy
+consecutive addresses,  too. The function  must return the  address of
+this memory.  The offset in real  mode memory needs to  be returned in
+'off'. If  no block of 'num'  pages are available  the function should
+return NULL.
+
+xf86Int10FreePages() will  free the  'num' pages starting  at 'pbase'.
+'num'  is  equal  to  the  number  of  pages  allocated  by  a  single
+xf86Int10AllocatePages()  call. 'pbase'  is the  address of  the range
+previously returned by xf86Int10AllocatePages().
+
+II. Emulator specific functions
+-------------------------------
+
+1. Bool xf86Int10ExecSetup(xf86Int10InfoPtr pInt);
+
+This function will  be called from xf86InitInt10(). It  may be used to
+set  up   the  static  emulator   specific  part  of  the   real  mode
+environment. On success it should return TRUE.
+
+2. xf86ExecX86int10(xf86Int10InfoPtr pInt);
+
+This function  gets called  to execute  an int call.  It may  call the
+helper function:
+
+       void setup_int(xf86Int10InfoPrt pInt);
+
+to copy the register values  to the emulator specific locations and to
+set up the non-static real mode execution environment.  On return from
+setup_int()   'Int10Current'   holds   a   pointer  to   the   current
+xf86Int10InfoRec.
+
+It should start execution by calling 
+
+       Bool int_handler(xf86Int10InfoPtr pInt);
+
+and if this function returns TRUE it should call whatever necessary to
+continue execution until a  'hlt' instruction is encountered.  To copy
+the resulting register values back to the xf86Int10InfoRec structure
+
+     void finish_int(xf86Int10InfoPtr pInt);
+
+should be called. 
+
+Helper  functions are  provided to  aid the  implementation of  a vm86
+call:
+
+  Bool vm86_GP_fault(xf86Int10InfoPtr pInt);
+
+This  function  handles  instructions  which  cause  a  vm86  call  to
+trap.  PIO  access  is handled  by  the  in/out  calls as  defined  in
+compiler.h. Optionally the PIO  instructions can be logged by defining
+PRINT_PORT in xf86int10.h. This is meant for debugging purposes.
+
+Unknown  instructions  and   'hlt'  cause  vm86_GP_fault()  to  return
+FALSE. Otherwise TRUE is returned.
+
+Note: This  function is  currently based on  the Linux vm86  call.  It
+might have  to be modified  or even rewritten  for other OS.   So your
+milage may vary.
+
+Functions to dump memory, code, xf86 CPU register values and stack are
+also provided.  Take a  look at  helper.c To view  a memory  range the
+function
+
+    void dprint(unsigned long start, unsigned long size)
+
+is provided. The use should be self explanatory.
+
+Register  and memory  access functions  are provided  in helper_mem.c.
+The PIO register access functions  can trap access to PCI config space
+access register (config method 1) if _PC is not defined.
+
+A header  file 'defines.h' is required to  define OS/emulator specific
+ways  to access  memory and  xf86 CPU  registers: Defines  need  to be
+provided     for    memory     byte/work/long     read/write    access
+(MEM_RB(name,addr),MEM_RW(name,addr),MEM_RL(name,addr),
+MEM_WB(name,addr,val),MEM_WL(name,addr,val),MEM_WL(name,addr,val))   of
+the real mode memory environment. 'name' will contain a pointer to the
+current   xf86Int10InfoRec.  Currently   defines  are   available  for
+vm86-mode under  Linux and x86emu.  They may be activated  by defining
+_X86EMU or _VM86_LINUX respectively.
+
+Note: Emulators usually are not able to pass this pointer when calling
+memory  access functions.  In this  case a  global variable  should be
+defined  which can  hold this  pointer. This  variable can  be  set in
+MapCurrentInt10().  It also  must be  set in  xf86InitInt10()  if this
+function  calls the  memory  access functions  either  directly or  by
+calling  xf86ExecX86int10(pInt).   Defines   to  access  the  emulator
+specific   xf86   CPU    register   locations   are   also   required:
+X86_EAX,...,X86_EFLAGS  for  access  of  the full  32  bit  registers,
+X86_AX...X86_FLAGS   for  access   of   the  16   bit  registers   and
+XF86_AL,XF86_BL,XF86_CL,XF86_DL  to  access  the  lower  byte  of  the
+AX,BX,CX and DX register.
+
+
+$XFree86: xc/programs/Xserver/hw/xfree86/int10/INT10.HOWTO,v 1.2 2000/02/08 13:13:22 eich Exp $
diff --git a/xorg-server/hw/xfree86/int10/generic.c b/xorg-server/hw/xfree86/int10/generic.c
index 8614e0b9b..5343e47e3 100644
--- a/xorg-server/hw/xfree86/int10/generic.c
+++ b/xorg-server/hw/xfree86/int10/generic.c
@@ -70,12 +70,12 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
     void *base = 0;
     void *vbiosMem = 0;
     void *options = NULL;
-    int screen;
     legacyVGARec vga;
+    ScrnInfoPtr pScrn;
 
-    screen = (xf86FindScreenForEntity(entityIndex))->scrnIndex;
+    pScrn = xf86FindScreenForEntity(entityIndex);
 
-    options = xf86HandleInt10Options(xf86Screens[screen], entityIndex);
+    options = xf86HandleInt10Options(pScrn, entityIndex);
 
     if (int10skip(options)) {
         free(options);
@@ -89,7 +89,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
     pInt->mem = &genericMem;
     pInt->private = (pointer) xnfcalloc(1, sizeof(genericInt10Priv));
     INTPriv(pInt)->alloc = (pointer) xnfcalloc(1, ALLOC_ENTRIES(getpagesize()));
-    pInt->scrnIndex = screen;
+    pInt->pScrn = pScrn;
     base = INTPriv(pInt)->base = xnfalloc(SYS_BIOS);
 
     /* FIXME: Shouldn't this be a failure case?  Leaving dev as NULL seems like
@@ -109,7 +109,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
     INTPriv(pInt)->sysMem = sysMem;
 
     if (xf86ReadBIOS(0, 0, base, LOW_PAGE_SIZE) < 0) {
-        xf86DrvMsg(screen, X_ERROR, "Cannot read int vect\n");
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Cannot read int vect\n");
         goto error1;
     }
 
@@ -148,7 +148,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
             vbiosMem = (unsigned char *) base + bios_location;
             err = pci_device_read_rom(rom_device, vbiosMem);
             if (err) {
-                xf86DrvMsg(screen, X_ERROR, "Cannot read V_BIOS (3) %s\n",
+                xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Cannot read V_BIOS (3) %s\n",
                            strerror(err));
                 goto error1;
             }
@@ -249,7 +249,6 @@ MapVRam(xf86Int10InfoPtr pInt)
 static void
 UnmapVRam(xf86Int10InfoPtr pInt)
 {
-    int screen = pInt->scrnIndex;
     int pagesize = getpagesize();
     int size = ((VRAM_SIZE + pagesize - 1) / pagesize) * pagesize;
 
diff --git a/xorg-server/hw/xfree86/int10/helper_exec.c b/xorg-server/hw/xfree86/int10/helper_exec.c
index 1e908778f..1c58cf7ae 100644
--- a/xorg-server/hw/xfree86/int10/helper_exec.c
+++ b/xorg-server/hw/xfree86/int10/helper_exec.c
@@ -125,7 +125,7 @@ run_bios_int(int num, xf86Int10InfoPtr pInt)
     if (MEM_RW(pInt, (num << 2) + 2) == (SYS_BIOS >> 4)) {      /* SYS_BIOS_SEG ? */
 
         if (num == 21 && X86_AH == 0x4e) {
-            xf86DrvMsg(pInt->scrnIndex, X_NOTICE,
+            xf86DrvMsg(pInt->pScrn->scrnIndex, X_NOTICE,
                        "Failing Find-Matching-File on non-PC"
                        " (int 21, func 4e)\n");
             X86_AX = 2;
@@ -133,7 +133,7 @@ run_bios_int(int num, xf86Int10InfoPtr pInt)
             return 1;
         }
         else {
-            xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+            xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_NOT_IMPLEMENTED, 2,
                            "Ignoring int 0x%02x call\n", num);
             if (xf86GetVerbosity() > 3) {
                 dump_registers(pInt);
@@ -169,7 +169,7 @@ dump_code(xf86Int10InfoPtr pInt)
     int i;
     CARD32 lina = SEG_ADR((CARD32), X86_CS, IP);
 
-    xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3, "code at 0x%8.8" PRIx32 ":\n",
+    xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_INFO, 3, "code at 0x%8.8" PRIx32 ":\n",
                    lina);
     for (i = 0; i < 0x10; i++)
         xf86ErrorFVerb(3, " %2.2x", MEM_RB(pInt, lina + i));
@@ -182,19 +182,19 @@ dump_code(xf86Int10InfoPtr pInt)
 void
 dump_registers(xf86Int10InfoPtr pInt)
 {
-    xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3,
+    xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_INFO, 3,
                    "EAX=0x%8.8lx, EBX=0x%8.8lx, ECX=0x%8.8lx, EDX=0x%8.8lx\n",
                    (unsigned long) X86_EAX, (unsigned long) X86_EBX,
                    (unsigned long) X86_ECX, (unsigned long) X86_EDX);
-    xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3,
+    xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_INFO, 3,
                    "ESP=0x%8.8lx, EBP=0x%8.8lx, ESI=0x%8.8lx, EDI=0x%8.8lx\n",
                    (unsigned long) X86_ESP, (unsigned long) X86_EBP,
                    (unsigned long) X86_ESI, (unsigned long) X86_EDI);
-    xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3,
+    xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_INFO, 3,
                    "CS=0x%4.4x, SS=0x%4.4x,"
                    " DS=0x%4.4x, ES=0x%4.4x, FS=0x%4.4x, GS=0x%4.4x\n",
                    X86_CS, X86_SS, X86_DS, X86_ES, X86_FS, X86_GS);
-    xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3,
+    xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_INFO, 3,
                    "EIP=0x%8.8lx, EFLAGS=0x%8.8lx\n",
                    (unsigned long) X86_EIP, (unsigned long) X86_EFLAGS);
 }
@@ -337,7 +337,7 @@ x_inb(CARD16 port)
     }
     else if (port < 0x0100) {   /* Don't interfere with mainboard */
         val = 0;
-        xf86DrvMsgVerb(Int10Current->scrnIndex, X_NOT_IMPLEMENTED, 2,
+        xf86DrvMsgVerb(Int10Current->pScrn->scrnIndex, X_NOT_IMPLEMENTED, 2,
                        "inb 0x%4.4x\n", port);
         if (xf86GetVerbosity() > 3) {
             dump_registers(Int10Current);
@@ -395,7 +395,7 @@ x_outb(CARD16 port, CARD8 val)
 #ifdef __NOT_YET__
     }
     else if (port < 0x0100) {   /* Don't interfere with mainboard */
-        xf86DrvMsgVerb(Int10Current->scrnIndex, X_NOT_IMPLEMENTED, 2,
+        xf86DrvMsgVerb(Int10Current->pScrn->scrnIndex, X_NOT_IMPLEMENTED, 2,
                        "outb 0x%4.4x,0x%2.2x\n", port, val);
         if (xf86GetVerbosity() > 3) {
             dump_registers(Int10Current);
diff --git a/xorg-server/hw/xfree86/int10/helper_mem.c b/xorg-server/hw/xfree86/int10/helper_mem.c
index 96c598a53..160c5aedf 100644
--- a/xorg-server/hw/xfree86/int10/helper_mem.c
+++ b/xorg-server/hw/xfree86/int10/helper_mem.c
@@ -281,7 +281,7 @@ xf86int10GetBiosLocationType(const xf86Int10InfoPtr pInt)
 
 #define CHECK_V_SEGMENT_RANGE(x)   \
     if (((x) << 4) < V_BIOS) { \
-	xf86DrvMsg(pInt->scrnIndex, X_ERROR, \
+	xf86DrvMsg(pInt->pScrn->scrnIndex, X_ERROR, \
 		   "V_BIOS address 0x%lx out of range\n", \
 		   (unsigned long)(x) << 4); \
 	return FALSE; \
@@ -306,17 +306,17 @@ xf86int10GetBiosSegment(xf86Int10InfoPtr pInt, void *base)
 
         CHECK_V_SEGMENT_RANGE(cs);
         vbiosMem = (unsigned char *) base + (cs << 4);
-        if (int10_check_bios(pInt->scrnIndex, cs, vbiosMem)) {
+        if (int10_check_bios(pInt->pScrn->scrnIndex, cs, vbiosMem)) {
             break;
         }
     }
 
     if (segments[i] == ~0) {
-        xf86DrvMsg(pInt->scrnIndex, X_ERROR, "No V_BIOS found\n");
+        xf86DrvMsg(pInt->pScrn->scrnIndex, X_ERROR, "No V_BIOS found\n");
         return FALSE;
     }
 
-    xf86DrvMsg(pInt->scrnIndex, X_INFO, "Primary V_BIOS segment is: 0x%lx\n",
+    xf86DrvMsg(pInt->pScrn->scrnIndex, X_INFO, "Primary V_BIOS segment is: 0x%lx\n",
                (unsigned long) cs);
 
     pInt->BIOSseg = cs;
diff --git a/xorg-server/hw/xfree86/int10/x86emu.c b/xorg-server/hw/xfree86/int10/x86emu.c
index b3320e5b9..087059131 100644
--- a/xorg-server/hw/xfree86/int10/x86emu.c
+++ b/xorg-server/hw/xfree86/int10/x86emu.c
@@ -1,12 +1,12 @@
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "debug.c"
-#include "decode.c"
-#include "fpu.c"
-#include "ops.c"
-#include "ops2.c"
-#include "prim_ops.c"
-#include "sys.c"
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "debug.c"
+#include "decode.c"
+#include "fpu.c"
+#include "ops.c"
+#include "ops2.c"
+#include "prim_ops.c"
+#include "sys.c"
diff --git a/xorg-server/hw/xfree86/int10/xf86int10.c b/xorg-server/hw/xfree86/int10/xf86int10.c
index df347d4dd..5ead44f23 100644
--- a/xorg-server/hw/xfree86/int10/xf86int10.c
+++ b/xorg-server/hw/xfree86/int10/xf86int10.c
@@ -57,7 +57,7 @@ int_handler(xf86Int10InfoPtr pInt)
         ret = run_bios_int(num, pInt);
 
     if (!ret) {
-        xf86DrvMsg(pInt->scrnIndex, X_ERROR, "Halting on int 0x%2.2x!\n", num);
+        xf86DrvMsg(pInt->pScrn->scrnIndex, X_ERROR, "Halting on int 0x%2.2x!\n", num);
         dump_registers(pInt);
         stack_trace(pInt);
     }
@@ -257,7 +257,7 @@ int42_handler(xf86Int10InfoPtr pInt)
         /*         DL = character column                      */
         /* Not Implemented                                    */
     {                           /* Localise */
-        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+        xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_NOT_IMPLEMENTED, 2,
                        "int 0x%2.2x(AH=0x04) -- Get Light Pen Position\n",
                        pInt->num);
         if (xf86GetVerbosity() > 3) {
@@ -314,10 +314,10 @@ int42_handler(xf86Int10InfoPtr pInt)
         /* Leave:  Nothing                                    */
         /* Not Implemented                                    */
     {                           /* Localise */
-        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+        xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_NOT_IMPLEMENTED, 2,
                        "int 0x%2.2x(AH=0x06) -- Initialise or Scroll Window Up\n",
                        pInt->num);
-        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
+        xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_NOT_IMPLEMENTED, 3,
                        " AL=0x%2.2x, BH=0x%2.2x,"
                        " CH=0x%2.2x, CL=0x%2.2x, DH=0x%2.2x, DL=0x%2.2x\n",
                        X86_AL, X86_BH, X86_CH, X86_CL, X86_DH, X86_DL);
@@ -339,10 +339,10 @@ int42_handler(xf86Int10InfoPtr pInt)
         /* Leave:  Nothing                                    */
         /* Not Implemented                                    */
     {                           /* Localise */
-        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+        xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_NOT_IMPLEMENTED, 2,
                        "int 0x%2.2x(AH=0x07) -- Initialise or Scroll Window Down\n",
                        pInt->num);
-        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
+        xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_NOT_IMPLEMENTED, 3,
                        " AL=0x%2.2x, BH=0x%2.2x,"
                        " CH=0x%2.2x, CL=0x%2.2x, DH=0x%2.2x, DL=0x%2.2x\n",
                        X86_AL, X86_BH, X86_CH, X86_CL, X86_DH, X86_DL);
@@ -360,10 +360,10 @@ int42_handler(xf86Int10InfoPtr pInt)
         /*         AL = character                             */
         /* Not Implemented                                    */
     {                           /* Localise */
-        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+        xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_NOT_IMPLEMENTED, 2,
                        "int 0x%2.2x(AH=0x08) -- Read Character and Attribute at"
                        " Cursor\n", pInt->num);
-        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
+        xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_NOT_IMPLEMENTED, 3,
                        "BH=0x%2.2x\n", X86_BH);
         if (xf86GetVerbosity() > 3) {
             dump_registers(pInt);
@@ -382,10 +382,10 @@ int42_handler(xf86Int10InfoPtr pInt)
         /* Leave:  Nothing                                    */
         /* Not Implemented                                    */
     {                           /* Localise */
-        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+        xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_NOT_IMPLEMENTED, 2,
                        "int 0x%2.2x(AH=0x09) -- Write Character and Attribute at"
                        " Cursor\n", pInt->num);
-        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
+        xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_NOT_IMPLEMENTED, 3,
                        "AL=0x%2.2x, BH=0x%2.2x, BL=0x%2.2x, CX=0x%4.4x\n",
                        X86_AL, X86_BH, X86_BL, X86_CX);
         if (xf86GetVerbosity() > 3) {
@@ -404,10 +404,10 @@ int42_handler(xf86Int10InfoPtr pInt)
         /* Leave:  Nothing                                    */
         /* Not Implemented                                    */
     {                           /* Localise */
-        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+        xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_NOT_IMPLEMENTED, 2,
                        "int 0x%2.2x(AH=0x0A) -- Write Character at Cursor\n",
                        pInt->num);
-        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
+        xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_NOT_IMPLEMENTED, 3,
                        "AL=0x%2.2x, BH=0x%2.2x, BL=0x%2.2x, CX=0x%4.4x\n",
                        X86_AL, X86_BH, X86_BL, X86_CX);
         if (xf86GetVerbosity() > 3) {
@@ -450,10 +450,10 @@ int42_handler(xf86Int10InfoPtr pInt)
         /* Leave:  Nothing                                    */
         /* Not Implemented                                    */
     {                           /* Localise */
-        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+        xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_NOT_IMPLEMENTED, 2,
                        "int 0x%2.2x(AH=0x0C) -- Write Graphics Pixel\n",
                        pInt->num);
-        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
+        xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_NOT_IMPLEMENTED, 3,
                        "AL=0x%2.2x, BH=0x%2.2x, CX=0x%4.4x, DX=0x%4.4x\n",
                        X86_AL, X86_BH, X86_CX, X86_DX);
         if (xf86GetVerbosity() > 3) {
@@ -471,10 +471,10 @@ int42_handler(xf86Int10InfoPtr pInt)
         /* Leave:  AL = pixel value                           */
         /* Not Implemented                                    */
     {                           /* Localise */
-        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+        xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_NOT_IMPLEMENTED, 2,
                        "int 0x%2.2x(AH=0x0D) -- Read Graphics Pixel\n",
                        pInt->num);
-        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
+        xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_NOT_IMPLEMENTED, 3,
                        "BH=0x%2.2x, CX=0x%4.4x, DX=0x%4.4x\n", X86_BH, X86_CX,
                        X86_DX);
         if (xf86GetVerbosity() > 3) {
@@ -498,10 +498,10 @@ int42_handler(xf86Int10InfoPtr pInt)
         /*           which might or might not have been       */
         /*           installed yet.                           */
     {                           /* Localise */
-        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+        xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_NOT_IMPLEMENTED, 2,
                        "int 0x%2.2x(AH=0x0E) -- Write Character in Teletype Mode\n",
                        pInt->num);
-        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
+        xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_NOT_IMPLEMENTED, 3,
                        "AL=0x%2.2x, BH=0x%2.2x, BL=0x%2.2x\n",
                        X86_AL, X86_BH, X86_BL);
         if (xf86GetVerbosity() > 3) {
@@ -564,10 +564,10 @@ int42_handler(xf86Int10InfoPtr pInt)
         /*           which might or might not have been       */
         /*           installed yet.                           */
     {                           /* Localise */
-        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+        xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_NOT_IMPLEMENTED, 2,
                        "int 0x%2.2x(AH=0x13) -- Write String in Teletype Mode\n",
                        pInt->num);
-        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 3,
+        xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_NOT_IMPLEMENTED, 3,
                        "AL=0x%2.2x, BL=0x%2.2x, CX=0x%4.4x,"
                        " DH=0x%2.2x, DL=0x%2.2x, ES:BP=0x%4.4x:0x%4.4x\n",
                        X86_AL, X86_BL, X86_CX, X86_DH, X86_DL, X86_ES, X86_BP);
@@ -840,7 +840,7 @@ int1A_handler(xf86Int10InfoPtr pInt)
 #endif
         return 1;
     default:
-        xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+        xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_NOT_IMPLEMENTED, 2,
                        "int 0x1a subfunction\n");
         dump_registers(pInt);
         if (xf86GetVerbosity() > 3)
diff --git a/xorg-server/hw/xfree86/int10/xf86int10.h b/xorg-server/hw/xfree86/int10/xf86int10.h
index 36b659fd7..6d564fc1a 100644
--- a/xorg-server/hw/xfree86/int10/xf86int10.h
+++ b/xorg-server/hw/xfree86/int10/xf86int10.h
@@ -21,10 +21,10 @@
 /* int10 info structure */
 typedef struct {
     int entityIndex;
-    int scrnIndex;
-    pointer cpuRegs;
     CARD16 BIOSseg;
     CARD16 inb40time;
+    ScrnInfoPtr pScrn;
+    pointer cpuRegs;
     char *BIOSScratch;
     int Flags;
     pointer private;
diff --git a/xorg-server/hw/xfree86/int10/xf86x86emu.h b/xorg-server/hw/xfree86/int10/xf86x86emu.h
index 4af2dafb7..320ad6fa8 100644
--- a/xorg-server/hw/xfree86/int10/xf86x86emu.h
+++ b/xorg-server/hw/xfree86/int10/xf86x86emu.h
@@ -1,54 +1,54 @@
-/*
- *                   XFree86 int10 module
- *   execute BIOS int 10h calls in x86 real mode environment
- *                 Copyright 1999 Egbert Eich
- */
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#ifndef XF86X86EMU_H_
-#define XF86X86EMU_H_
-#include <x86emu.h>
-
-#define M _X86EMU_env
-
-#define X86_EAX M.x86.R_EAX
-#define X86_EBX M.x86.R_EBX
-#define X86_ECX M.x86.R_ECX
-#define X86_EDX M.x86.R_EDX
-#define X86_ESI M.x86.R_ESI
-#define X86_EDI M.x86.R_EDI
-#define X86_EBP M.x86.R_EBP
-#define X86_EIP M.x86.R_EIP
-#define X86_ESP M.x86.R_ESP
-#define X86_EFLAGS M.x86.R_EFLG
-
-#define X86_FLAGS M.x86.R_FLG
-#define X86_AX M.x86.R_AX
-#define X86_BX M.x86.R_BX
-#define X86_CX M.x86.R_CX
-#define X86_DX M.x86.R_DX
-#define X86_SI M.x86.R_SI
-#define X86_DI M.x86.R_DI
-#define X86_BP M.x86.R_BP
-#define X86_IP M.x86.R_IP
-#define X86_SP M.x86.R_SP
-#define X86_CS M.x86.R_CS
-#define X86_DS M.x86.R_DS
-#define X86_ES M.x86.R_ES
-#define X86_SS M.x86.R_SS
-#define X86_FS M.x86.R_FS
-#define X86_GS M.x86.R_GS
-
-#define X86_AL M.x86.R_AL
-#define X86_BL M.x86.R_BL
-#define X86_CL M.x86.R_CL
-#define X86_DL M.x86.R_DL
-
-#define X86_AH M.x86.R_AH
-#define X86_BH M.x86.R_BH
-#define X86_CH M.x86.R_CH
-#define X86_DH M.x86.R_DH
-
-#endif
+/*
+ *                   XFree86 int10 module
+ *   execute BIOS int 10h calls in x86 real mode environment
+ *                 Copyright 1999 Egbert Eich
+ */
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#ifndef XF86X86EMU_H_
+#define XF86X86EMU_H_
+#include <x86emu.h>
+
+#define M _X86EMU_env
+
+#define X86_EAX M.x86.R_EAX
+#define X86_EBX M.x86.R_EBX
+#define X86_ECX M.x86.R_ECX
+#define X86_EDX M.x86.R_EDX
+#define X86_ESI M.x86.R_ESI
+#define X86_EDI M.x86.R_EDI
+#define X86_EBP M.x86.R_EBP
+#define X86_EIP M.x86.R_EIP
+#define X86_ESP M.x86.R_ESP
+#define X86_EFLAGS M.x86.R_EFLG
+
+#define X86_FLAGS M.x86.R_FLG
+#define X86_AX M.x86.R_AX
+#define X86_BX M.x86.R_BX
+#define X86_CX M.x86.R_CX
+#define X86_DX M.x86.R_DX
+#define X86_SI M.x86.R_SI
+#define X86_DI M.x86.R_DI
+#define X86_BP M.x86.R_BP
+#define X86_IP M.x86.R_IP
+#define X86_SP M.x86.R_SP
+#define X86_CS M.x86.R_CS
+#define X86_DS M.x86.R_DS
+#define X86_ES M.x86.R_ES
+#define X86_SS M.x86.R_SS
+#define X86_FS M.x86.R_FS
+#define X86_GS M.x86.R_GS
+
+#define X86_AL M.x86.R_AL
+#define X86_BL M.x86.R_BL
+#define X86_CL M.x86.R_CL
+#define X86_DL M.x86.R_DL
+
+#define X86_AH M.x86.R_AH
+#define X86_BH M.x86.R_BH
+#define X86_CH M.x86.R_CH
+#define X86_DH M.x86.R_DH
+
+#endif
diff --git a/xorg-server/hw/xfree86/modes/Makefile.am b/xorg-server/hw/xfree86/modes/Makefile.am
index 9236426bf..e0386d748 100644
--- a/xorg-server/hw/xfree86/modes/Makefile.am
+++ b/xorg-server/hw/xfree86/modes/Makefile.am
@@ -1,35 +1,35 @@
-noinst_LTLIBRARIES = libxf86modes.la
-
-if DGA
-DGA_SRCS = xf86DiDGA.c
-endif
-
-libxf86modes_la_SOURCES = \
-	xf86Crtc.c \
-	xf86Crtc.h \
-	xf86Cursors.c \
-	xf86cvt.c \
-	xf86gtf.c \
-	xf86DisplayIDModes.c \
-	xf86EdidModes.c \
-	xf86Modes.c \
-	xf86Modes.h \
-	xf86RandR12.c \
-	xf86RandR12.h \
-	xf86Rename.h \
-	xf86Rotate.c \
-        $(DGA_SRCS)
-
-INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
-	   -I$(srcdir)/../loader -I$(srcdir)/../rac -I$(srcdir)/../parser \
-	   -I$(srcdir)/../vbe -I$(srcdir)/../int10 \
-	   -I$(srcdir)/../vgahw -I$(srcdir)/../ramdac \
-	   -I$(srcdir)/../dixmods/extmod
-
-sdk_HEADERS = \
-	xf86Crtc.h \
-	xf86Modes.h \
-	xf86RandR12.h \
-	xf86Rename.h
-
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+noinst_LTLIBRARIES = libxf86modes.la
+
+if DGA
+DGA_SRCS = xf86DiDGA.c
+endif
+
+libxf86modes_la_SOURCES = \
+	xf86Crtc.c \
+	xf86Crtc.h \
+	xf86Cursors.c \
+	xf86cvt.c \
+	xf86gtf.c \
+	xf86DisplayIDModes.c \
+	xf86EdidModes.c \
+	xf86Modes.c \
+	xf86Modes.h \
+	xf86RandR12.c \
+	xf86RandR12.h \
+	xf86Rename.h \
+	xf86Rotate.c \
+        $(DGA_SRCS)
+
+INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
+	   -I$(srcdir)/../loader -I$(srcdir)/../rac -I$(srcdir)/../parser \
+	   -I$(srcdir)/../vbe -I$(srcdir)/../int10 \
+	   -I$(srcdir)/../vgahw -I$(srcdir)/../ramdac \
+	   -I$(srcdir)/../dixmods/extmod
+
+sdk_HEADERS = \
+	xf86Crtc.h \
+	xf86Modes.h \
+	xf86RandR12.h \
+	xf86Rename.h
+
+AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c
index ab6ed5e32..2c8878fa7 100644
--- a/xorg-server/hw/xfree86/modes/xf86Crtc.c
+++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c
@@ -716,7 +716,7 @@ xf86CrtcCreateScreenResources(ScreenPtr screen)
  * Clean up config on server reset
  */
 static Bool
-xf86CrtcCloseScreen(int index, ScreenPtr screen)
+xf86CrtcCloseScreen(ScreenPtr screen)
 {
     ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
     xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
@@ -738,7 +738,7 @@ xf86CrtcCloseScreen(int index, ScreenPtr screen)
     }
     xf86RandR12CloseScreen(screen);
 
-    return screen->CloseScreen(index, screen);
+    return screen->CloseScreen(screen);
 }
 
 /*
@@ -3009,7 +3009,7 @@ xf86OutputGetEDID(xf86OutputPtr output, I2CBusPtr pDDCBus)
     ScrnInfoPtr scrn = output->scrn;
     xf86MonPtr mon;
 
-    mon = xf86DoEEDID(scrn->scrnIndex, pDDCBus, TRUE);
+    mon = xf86DoEEDID(scrn, pDDCBus, TRUE);
     if (mon)
         xf86DDCApplyQuirks(scrn->scrnIndex, mon);
 
diff --git a/xorg-server/hw/xfree86/modes/xf86DiDGA.c b/xorg-server/hw/xfree86/modes/xf86DiDGA.c
index fdec6cb4b..bb954ac4b 100644
--- a/xorg-server/hw/xfree86/modes/xf86DiDGA.c
+++ b/xorg-server/hw/xfree86/modes/xf86DiDGA.c
@@ -137,7 +137,7 @@ xf86_dga_get_viewport(ScrnInfoPtr scrn)
 static void
 xf86_dga_set_viewport(ScrnInfoPtr scrn, int x, int y, int flags)
 {
-    scrn->AdjustFrame(scrn->pScreen->myNum, x, y, flags);
+    scrn->AdjustFrame(scrn, x, y);
 }
 
 static Bool
diff --git a/xorg-server/hw/xfree86/modes/xf86RandR12.c b/xorg-server/hw/xfree86/modes/xf86RandR12.c
index e6b205223..59b6f8217 100644
--- a/xorg-server/hw/xfree86/modes/xf86RandR12.c
+++ b/xorg-server/hw/xfree86/modes/xf86RandR12.c
@@ -515,7 +515,7 @@ xf86RandR12SetMode(ScreenPtr pScreen,
     Bool ret = TRUE;
 
     if (pRoot)
-        (*scrp->EnableDisableFBAccess) (pScreen->myNum, FALSE);
+        (*scrp->EnableDisableFBAccess) (scrp, FALSE);
     if (useVirtual) {
         scrp->virtualX = randrp->virtualX;
         scrp->virtualY = randrp->virtualY;
@@ -568,7 +568,7 @@ xf86RandR12SetMode(ScreenPtr pScreen,
     xf86SetViewport(pScreen, pScreen->width, pScreen->height);
     xf86SetViewport(pScreen, 0, 0);
     if (pRoot)
-        (*scrp->EnableDisableFBAccess) (pScreen->myNum, TRUE);
+        (*scrp->EnableDisableFBAccess) (scrp, TRUE);
     return ret;
 }
 
@@ -685,7 +685,7 @@ xf86RandR12ScreenSetSize(ScreenPtr pScreen,
         }
     }
     if (pRoot && pScrn->vtSema)
-        (*pScrn->EnableDisableFBAccess) (pScreen->myNum, FALSE);
+        (*pScrn->EnableDisableFBAccess) (pScrn, FALSE);
 
     /* Let the driver update virtualX and virtualY */
     if (!(*config->funcs->resize) (pScrn, width, height))
@@ -724,7 +724,7 @@ xf86RandR12ScreenSetSize(ScreenPtr pScreen,
     update_desktop_dimensions();
 
     if (pRoot && pScrn->vtSema)
-        (*pScrn->EnableDisableFBAccess) (pScreen->myNum, TRUE);
+        (*pScrn->EnableDisableFBAccess) (pScrn, TRUE);
 #if RANDR_12_INTERFACE
     if (xf86RandR12Key && pScreen->root && ret)
         RRScreenSizeNotify(pScreen);
@@ -1596,10 +1596,9 @@ xf86RandR12TellChanged(ScreenPtr pScreen)
 }
 
 static void
-xf86RandR12PointerMoved(int scrnIndex, int x, int y)
+xf86RandR12PointerMoved(ScrnInfoPtr pScrn, int x, int y)
 {
-    ScreenPtr pScreen = screenInfo.screens[scrnIndex];
-    ScrnInfoPtr pScrn = XF86SCRNINFO(pScreen);
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
     XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
     int c;
@@ -1688,10 +1687,9 @@ gamma_to_ramp(float gamma, CARD16 *ramp, int size)
 }
 
 static int
-xf86RandR12ChangeGamma(int scrnIndex, Gamma gamma)
+xf86RandR12ChangeGamma(ScrnInfoPtr pScrn, Gamma gamma)
 {
     CARD16 *points, *red, *green, *blue;
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     RRCrtcPtr crtc = xf86CompatRRCrtc(pScrn);
     int size;
 
@@ -1723,10 +1721,9 @@ xf86RandR12ChangeGamma(int scrnIndex, Gamma gamma)
 }
 
 static Bool
-xf86RandR12EnterVT(int screen_index, int flags)
+xf86RandR12EnterVT(ScrnInfoPtr pScrn)
 {
-    ScreenPtr pScreen = screenInfo.screens[screen_index];
-    ScrnInfoPtr pScrn = xf86Screens[screen_index];
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
     rrScrPrivPtr rp = rrGetScrPriv(pScreen);
     Bool ret;
@@ -1734,7 +1731,7 @@ xf86RandR12EnterVT(int screen_index, int flags)
 
     if (randrp->orig_EnterVT) {
         pScrn->EnterVT = randrp->orig_EnterVT;
-        ret = pScrn->EnterVT(screen_index, flags);
+        ret = pScrn->EnterVT(pScrn);
         randrp->orig_EnterVT = pScrn->EnterVT;
         pScrn->EnterVT = xf86RandR12EnterVT;
         if (!ret)
diff --git a/xorg-server/hw/xfree86/modes/xf86Rotate.c b/xorg-server/hw/xfree86/modes/xf86Rotate.c
index 26eefc8c0..6a661e195 100644
--- a/xorg-server/hw/xfree86/modes/xf86Rotate.c
+++ b/xorg-server/hw/xfree86/modes/xf86Rotate.c
@@ -250,17 +250,16 @@ xf86RotateRedisplay(ScreenPtr pScreen)
 }
 
 static void
-xf86RotateBlockHandler(int screenNum, pointer blockData,
+xf86RotateBlockHandler(ScreenPtr pScreen,
                        pointer pTimeout, pointer pReadmask)
 {
-    ScreenPtr pScreen = screenInfo.screens[screenNum];
-    ScrnInfoPtr pScrn = xf86Screens[screenNum];
+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
     Bool rotation_active;
 
     rotation_active = xf86RotateRedisplay(pScreen);
     pScreen->BlockHandler = xf86_config->BlockHandler;
-    (*pScreen->BlockHandler) (screenNum, blockData, pTimeout, pReadmask);
+    (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
     /* cannot avoid re-wrapping until all wrapping is audited */
     xf86_config->BlockHandler = pScreen->BlockHandler;
     pScreen->BlockHandler = xf86RotateBlockHandler;
diff --git a/xorg-server/hw/xfree86/os-support/bsd/Makefile.am b/xorg-server/hw/xfree86/os-support/bsd/Makefile.am
index b6ecdf1d1..55eb1151d 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/Makefile.am
+++ b/xorg-server/hw/xfree86/os-support/bsd/Makefile.am
@@ -1,76 +1,76 @@
-noinst_LTLIBRARIES = libbsd.la
-
-# APM support.
-if BSD_KQUEUE_APM
-APM_SOURCES = $(srcdir)/bsd_kqueue_apm.c
-else 
-if BSD_APM
-APM_SOURCES = $(srcdir)/bsd_apm.c
-else
-APM_SOURCES = $(srcdir)/../shared/pm_noop.c
-endif
-endif
-
-if FREEBSD_KLDLOAD
-KMOD_SOURCES = bsd_kmod.c
-else
-KMOD_SOURCES = $(srcdir)/../shared/kmod_noop.c
-endif
-
-if AGP
-AGP_SOURCES = $(srcdir)/../linux/lnx_agp.c
-else
-AGP_SOURCES = $(srcdir)/../shared/agp_noop.c
-endif
-
-if ALPHA_VIDEO
-# Cheat here and piggyback other alpha bits on ALPHA_VIDEO.
-ARCH_SOURCES = \
-	alpha_video.c \
-	bsd_ev56.c \
-	bsd_axp.c \
-	$(srcdir)/../shared/xf86Axp.c
-endif
-
-if ARM_VIDEO
-ARCH_SOURCES = arm_video.c
-endif
-
-if I386_VIDEO
-ARCH_SOURCES = i386_video.c
-endif
-
-if PPC_VIDEO
-ARCH_SOURCES = ppc_video.c
-endif
-
-if SPARC64_VIDEO
-# Cheat here and piggyback other sparc64 bits on SPARC64_VIDEO.
-ARCH_SOURCES = \
-	sparc64_video.c \
-	$(srcdir)/../shared/ioperm_noop.c
-endif
-
-# FIXME: NetBSD Aperture defines (configure.ac)
-AM_CFLAGS = -DUSESTDRES $(XORG_CFLAGS) $(DIX_CFLAGS)
-
-INCLUDES = $(XORG_INCS)
-
-libbsd_la_SOURCES = \
-	$(srcdir)/../shared/posix_tty.c \
-	$(srcdir)/../shared/sigio.c \
-	$(srcdir)/../shared/vidmem.c \
-	bsd_VTsw.c \
-	bsd_init.c \
-	bsd_bell.c \
-	$(ARCH_SOURCES) \
-	$(AGP_SOURCES) \
-	$(APM_SOURCES) \
-	$(AXP_SOURCES) \
-	$(DRI_SOURCES) \
-	$(KMOD_SOURCES) \
-	$(RES_SOURCES)
-
-# FIXME: Add these files to the build as needed
-EXTRA_DIST = \
-	memrange.h
+noinst_LTLIBRARIES = libbsd.la
+
+# APM support.
+if BSD_KQUEUE_APM
+APM_SOURCES = $(srcdir)/bsd_kqueue_apm.c
+else 
+if BSD_APM
+APM_SOURCES = $(srcdir)/bsd_apm.c
+else
+APM_SOURCES = $(srcdir)/../shared/pm_noop.c
+endif
+endif
+
+if FREEBSD_KLDLOAD
+KMOD_SOURCES = bsd_kmod.c
+else
+KMOD_SOURCES = $(srcdir)/../shared/kmod_noop.c
+endif
+
+if AGP
+AGP_SOURCES = $(srcdir)/../linux/lnx_agp.c
+else
+AGP_SOURCES = $(srcdir)/../shared/agp_noop.c
+endif
+
+if ALPHA_VIDEO
+# Cheat here and piggyback other alpha bits on ALPHA_VIDEO.
+ARCH_SOURCES = \
+	alpha_video.c \
+	bsd_ev56.c \
+	bsd_axp.c \
+	$(srcdir)/../shared/xf86Axp.c
+endif
+
+if ARM_VIDEO
+ARCH_SOURCES = arm_video.c
+endif
+
+if I386_VIDEO
+ARCH_SOURCES = i386_video.c
+endif
+
+if PPC_VIDEO
+ARCH_SOURCES = ppc_video.c
+endif
+
+if SPARC64_VIDEO
+# Cheat here and piggyback other sparc64 bits on SPARC64_VIDEO.
+ARCH_SOURCES = \
+	sparc64_video.c \
+	$(srcdir)/../shared/ioperm_noop.c
+endif
+
+# FIXME: NetBSD Aperture defines (configure.ac)
+AM_CFLAGS = -DUSESTDRES $(XORG_CFLAGS) $(DIX_CFLAGS)
+
+INCLUDES = $(XORG_INCS)
+
+libbsd_la_SOURCES = \
+	$(srcdir)/../shared/posix_tty.c \
+	$(srcdir)/../shared/sigio.c \
+	$(srcdir)/../shared/vidmem.c \
+	bsd_VTsw.c \
+	bsd_init.c \
+	bsd_bell.c \
+	$(ARCH_SOURCES) \
+	$(AGP_SOURCES) \
+	$(APM_SOURCES) \
+	$(AXP_SOURCES) \
+	$(DRI_SOURCES) \
+	$(KMOD_SOURCES) \
+	$(RES_SOURCES)
+
+# FIXME: Add these files to the build as needed
+EXTRA_DIST = \
+	memrange.h
diff --git a/xorg-server/hw/xfree86/os-support/hurd/Makefile.am b/xorg-server/hw/xfree86/os-support/hurd/Makefile.am
index 3e8224753..2f0ba2ac8 100644
--- a/xorg-server/hw/xfree86/os-support/hurd/Makefile.am
+++ b/xorg-server/hw/xfree86/os-support/hurd/Makefile.am
@@ -1,15 +1,15 @@
-noinst_LTLIBRARIES = libhurd.la
-
-libhurd_la_SOURCES = hurd_bell.c hurd_init.c hurd_mmap.c \
-		hurd_video.c \
-		$(srcdir)/../shared/VTsw_noop.c \
-		$(srcdir)/../shared/posix_tty.c \
-		$(srcdir)/../shared/vidmem.c \
-		$(srcdir)/../shared/sigiostubs.c \
-		$(srcdir)/../shared/pm_noop.c \
-		$(srcdir)/../shared/kmod_noop.c \
-		$(srcdir)/../shared/agp_noop.c
-
-AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS)
-
-INCLUDES = $(XORG_INCS)
+noinst_LTLIBRARIES = libhurd.la
+
+libhurd_la_SOURCES = hurd_bell.c hurd_init.c hurd_mmap.c \
+		hurd_video.c \
+		$(srcdir)/../shared/VTsw_noop.c \
+		$(srcdir)/../shared/posix_tty.c \
+		$(srcdir)/../shared/vidmem.c \
+		$(srcdir)/../shared/sigiostubs.c \
+		$(srcdir)/../shared/pm_noop.c \
+		$(srcdir)/../shared/kmod_noop.c \
+		$(srcdir)/../shared/agp_noop.c
+
+AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS)
+
+INCLUDES = $(XORG_INCS)
diff --git a/xorg-server/hw/xfree86/os-support/hurd/hurd_bell.c b/xorg-server/hw/xfree86/os-support/hurd/hurd_bell.c
index 33965a44c..8750eaf44 100644
--- a/xorg-server/hw/xfree86/os-support/hurd/hurd_bell.c
+++ b/xorg-server/hw/xfree86/os-support/hurd/hurd_bell.c
@@ -1,37 +1,37 @@
-/*
- * Copyright © 2006 Daniel Stone
- *
- * 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 (including the next
- * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
- *
- * Author: Daniel Stone <daniel@fooishbar.org>
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "xf86.h"
-#include "xf86Priv.h"
-
-void
-xf86OSRingBell(int loudness, int pitch, int duration)
-{
-    return;
-}
+/*
+ * Copyright © 2006 Daniel Stone
+ *
+ * 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 (including the next
+ * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+ *
+ * Author: Daniel Stone <daniel@fooishbar.org>
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86.h"
+#include "xf86Priv.h"
+
+void
+xf86OSRingBell(int loudness, int pitch, int duration)
+{
+    return;
+}
diff --git a/xorg-server/hw/xfree86/os-support/int10Defines.h b/xorg-server/hw/xfree86/os-support/int10Defines.h
index d942fbdad..e79722839 100644
--- a/xorg-server/hw/xfree86/os-support/int10Defines.h
+++ b/xorg-server/hw/xfree86/os-support/int10Defines.h
@@ -1,89 +1,89 @@
-/*
- * Copyright (c) 2000-2001 by The XFree86 Project, Inc.
- *
- * 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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 copyright holder(s)
- * and author(s) 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 copyright holder(s) and author(s).
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#ifndef _INT10DEFINES_H_
-#define _INT10DEFINES_H_ 1
-
-#ifdef _VM86_LINUX
-
-#include <asm/vm86.h>
-
-#define CPU_R(type,name,num) \
-	(((type *)&(((struct vm86_struct *)REG->cpuRegs)->regs.name))[num])
-#define CPU_RD(name,num) CPU_R(CARD32,name,num)
-#define CPU_RW(name,num) CPU_R(CARD16,name,num)
-#define CPU_RB(name,num) CPU_R(CARD8,name,num)
-
-#define X86_EAX CPU_RD(eax,0)
-#define X86_EBX CPU_RD(ebx,0)
-#define X86_ECX CPU_RD(ecx,0)
-#define X86_EDX CPU_RD(edx,0)
-#define X86_ESI CPU_RD(esi,0)
-#define X86_EDI CPU_RD(edi,0)
-#define X86_EBP CPU_RD(ebp,0)
-#define X86_EIP CPU_RD(eip,0)
-#define X86_ESP CPU_RD(esp,0)
-#define X86_EFLAGS CPU_RD(eflags,0)
-
-#define X86_FLAGS CPU_RW(eflags,0)
-#define X86_AX CPU_RW(eax,0)
-#define X86_BX CPU_RW(ebx,0)
-#define X86_CX CPU_RW(ecx,0)
-#define X86_DX CPU_RW(edx,0)
-#define X86_SI CPU_RW(esi,0)
-#define X86_DI CPU_RW(edi,0)
-#define X86_BP CPU_RW(ebp,0)
-#define X86_IP CPU_RW(eip,0)
-#define X86_SP CPU_RW(esp,0)
-#define X86_CS CPU_RW(cs,0)
-#define X86_DS CPU_RW(ds,0)
-#define X86_ES CPU_RW(es,0)
-#define X86_SS CPU_RW(ss,0)
-#define X86_FS CPU_RW(fs,0)
-#define X86_GS CPU_RW(gs,0)
-
-#define X86_AL CPU_RB(eax,0)
-#define X86_BL CPU_RB(ebx,0)
-#define X86_CL CPU_RB(ecx,0)
-#define X86_DL CPU_RB(edx,0)
-
-#define X86_AH CPU_RB(eax,1)
-#define X86_BH CPU_RB(ebx,1)
-#define X86_CH CPU_RB(ecx,1)
-#define X86_DH CPU_RB(edx,1)
-
-#elif defined(_X86EMU)
-
-#include "xf86x86emu.h"
-
-#endif
-
-#endif
+/*
+ * Copyright (c) 2000-2001 by The XFree86 Project, Inc.
+ *
+ * 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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 copyright holder(s)
+ * and author(s) 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 copyright holder(s) and author(s).
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#ifndef _INT10DEFINES_H_
+#define _INT10DEFINES_H_ 1
+
+#ifdef _VM86_LINUX
+
+#include <asm/vm86.h>
+
+#define CPU_R(type,name,num) \
+	(((type *)&(((struct vm86_struct *)REG->cpuRegs)->regs.name))[num])
+#define CPU_RD(name,num) CPU_R(CARD32,name,num)
+#define CPU_RW(name,num) CPU_R(CARD16,name,num)
+#define CPU_RB(name,num) CPU_R(CARD8,name,num)
+
+#define X86_EAX CPU_RD(eax,0)
+#define X86_EBX CPU_RD(ebx,0)
+#define X86_ECX CPU_RD(ecx,0)
+#define X86_EDX CPU_RD(edx,0)
+#define X86_ESI CPU_RD(esi,0)
+#define X86_EDI CPU_RD(edi,0)
+#define X86_EBP CPU_RD(ebp,0)
+#define X86_EIP CPU_RD(eip,0)
+#define X86_ESP CPU_RD(esp,0)
+#define X86_EFLAGS CPU_RD(eflags,0)
+
+#define X86_FLAGS CPU_RW(eflags,0)
+#define X86_AX CPU_RW(eax,0)
+#define X86_BX CPU_RW(ebx,0)
+#define X86_CX CPU_RW(ecx,0)
+#define X86_DX CPU_RW(edx,0)
+#define X86_SI CPU_RW(esi,0)
+#define X86_DI CPU_RW(edi,0)
+#define X86_BP CPU_RW(ebp,0)
+#define X86_IP CPU_RW(eip,0)
+#define X86_SP CPU_RW(esp,0)
+#define X86_CS CPU_RW(cs,0)
+#define X86_DS CPU_RW(ds,0)
+#define X86_ES CPU_RW(es,0)
+#define X86_SS CPU_RW(ss,0)
+#define X86_FS CPU_RW(fs,0)
+#define X86_GS CPU_RW(gs,0)
+
+#define X86_AL CPU_RB(eax,0)
+#define X86_BL CPU_RB(ebx,0)
+#define X86_CL CPU_RB(ecx,0)
+#define X86_DL CPU_RB(edx,0)
+
+#define X86_AH CPU_RB(eax,1)
+#define X86_BH CPU_RB(ebx,1)
+#define X86_CH CPU_RB(ecx,1)
+#define X86_DH CPU_RB(edx,1)
+
+#elif defined(_X86EMU)
+
+#include "xf86x86emu.h"
+
+#endif
+
+#endif
diff --git a/xorg-server/hw/xfree86/os-support/linux/int10/linux.c b/xorg-server/hw/xfree86/os-support/linux/int10/linux.c
index fa58a72b6..8bca37524 100644
--- a/xorg-server/hw/xfree86/os-support/linux/int10/linux.c
+++ b/xorg-server/hw/xfree86/os-support/linux/int10/linux.c
@@ -52,7 +52,6 @@ typedef struct {
     int highMem;
     char *base;
     char *base_high;
-    int screen;
     char *alloc;
 } linuxInt10Priv;
 
@@ -89,15 +88,16 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
     memType cs;
     legacyVGARec vga;
     Bool videoBiosMapped = FALSE;
-
+    ScrnInfoPtr pScrn;
     if (int10Generation != serverGeneration) {
         counter = 0;
         int10Generation = serverGeneration;
     }
 
-    screen = (xf86FindScreenForEntity(entityIndex))->scrnIndex;
+    pScrn = xf86FindScreenForEntity(entityIndex);
+    screen = pScrn->scrnIndex;
 
-    options = xf86HandleInt10Options(xf86Screens[screen], entityIndex);
+    options = xf86HandleInt10Options(pScrn, entityIndex);
 
     if (int10skip(options)) {
         free(options);
@@ -106,7 +106,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
 
 #if defined DoSubModules
     if (loadedSubModule == INT10_NOT_LOADED)
-        loadedSubModule = int10LinuxLoadSubModule(xf86Screens[screen]);
+        loadedSubModule = int10LinuxLoadSubModule(pScrn);
 
     if (loadedSubModule == INT10_LOAD_FAILED)
         return NULL;
@@ -145,7 +145,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
     }
 
     pInt = (xf86Int10InfoPtr) xnfcalloc(1, sizeof(xf86Int10InfoRec));
-    pInt->scrnIndex = screen;
+    pInt->pScrn = pScrn;
     pInt->entityIndex = entityIndex;
     pInt->dev = xf86GetPciInfoForEntity(entityIndex);
 
@@ -154,7 +154,6 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
     pInt->mem = &linuxMem;
     pagesize = getpagesize();
     pInt->private = (pointer) xnfcalloc(1, sizeof(linuxInt10Priv));
-    ((linuxInt10Priv *) pInt->private)->screen = screen;
     ((linuxInt10Priv *) pInt->private)->alloc =
         (pointer) xnfcalloc(1, ALLOC_ENTRIES(pagesize));
 
@@ -333,28 +332,28 @@ MapCurrentInt10(xf86Int10InfoPtr pInt)
     addr =
         shmat(((linuxInt10Priv *) pInt->private)->lowMem, (char *) 1, SHM_RND);
     if (addr == SHMERRORPTR) {
-        xf86DrvMsg(pInt->scrnIndex, X_ERROR, "Cannot shmat() low memory\n");
-        xf86DrvMsg(pInt->scrnIndex, X_ERROR,
+        xf86DrvMsg(pInt->pScrn->scrnIndex, X_ERROR, "Cannot shmat() low memory\n");
+        xf86DrvMsg(pInt->pScrn->scrnIndex, X_ERROR,
                    "shmat(low_mem) error: %s\n", strerror(errno));
         return FALSE;
     }
     if (mprotect((void *) 0, V_RAM, PROT_READ | PROT_WRITE | PROT_EXEC) != 0)
-        xf86DrvMsg(pInt->scrnIndex, X_ERROR,
+        xf86DrvMsg(pInt->pScrn->scrnIndex, X_ERROR,
                    "Cannot set EXEC bit on low memory: %s\n", strerror(errno));
 
     if (((linuxInt10Priv *) pInt->private)->highMem >= 0) {
         addr = shmat(((linuxInt10Priv *) pInt->private)->highMem,
                      (char *) HIGH_MEM, 0);
         if (addr == SHMERRORPTR) {
-            xf86DrvMsg(pInt->scrnIndex, X_ERROR,
+            xf86DrvMsg(pInt->pScrn->scrnIndex, X_ERROR,
                        "Cannot shmat() high memory\n");
-            xf86DrvMsg(pInt->scrnIndex, X_ERROR,
+            xf86DrvMsg(pInt->pScrn->scrnIndex, X_ERROR,
                        "shmget error: %s\n", strerror(errno));
             return FALSE;
         }
         if (mprotect((void *) HIGH_MEM, HIGH_MEM_SIZE,
                      PROT_READ | PROT_WRITE | PROT_EXEC) != 0)
-            xf86DrvMsg(pInt->scrnIndex, X_ERROR,
+            xf86DrvMsg(pInt->pScrn->scrnIndex, X_ERROR,
                        "Cannot set EXEC bit on high memory: %s\n",
                        strerror(errno));
     }
@@ -364,13 +363,13 @@ MapCurrentInt10(xf86Int10InfoPtr pInt)
                      PROT_READ | PROT_WRITE | PROT_EXEC,
                      MAP_SHARED | MAP_FIXED, fd, V_BIOS)
                 == MAP_FAILED) {
-                xf86DrvMsg(pInt->scrnIndex, X_ERROR, "Cannot map V_BIOS\n");
+                xf86DrvMsg(pInt->pScrn->scrnIndex, X_ERROR, "Cannot map V_BIOS\n");
                 close(fd);
                 return FALSE;
             }
         }
         else {
-            xf86DrvMsg(pInt->scrnIndex, X_ERROR, "Cannot open %s\n", DEV_MEM);
+            xf86DrvMsg(pInt->pScrn->scrnIndex, X_ERROR, "Cannot open %s\n", DEV_MEM);
             return FALSE;
         }
         close(fd);
diff --git a/xorg-server/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c b/xorg-server/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
index 8502b21b7..187698399 100644
--- a/xorg-server/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
+++ b/xorg-server/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
@@ -210,19 +210,19 @@ vm86_GP_fault(xf86Int10InfoPtr pInt)
         return FALSE;
 
     case 0x0f:
-        xf86DrvMsg(pInt->scrnIndex, X_ERROR,
+        xf86DrvMsg(pInt->pScrn->scrnIndex, X_ERROR,
                    "CPU 0x0f Trap at CS:EIP=0x%4.4x:0x%8.8lx\n", X86_CS,
                    X86_EIP);
         goto op0ferr;
 
     default:
-        xf86DrvMsg(pInt->scrnIndex, X_ERROR, "unknown reason for exception\n");
+        xf86DrvMsg(pInt->pScrn->scrnIndex, X_ERROR, "unknown reason for exception\n");
 
  op0ferr:
         dump_registers(pInt);
         stack_trace(pInt);
         dump_code(pInt);
-        xf86DrvMsg(pInt->scrnIndex, X_ERROR, "cannot continue\n");
+        xf86DrvMsg(pInt->pScrn->scrnIndex, X_ERROR, "cannot continue\n");
         return FALSE;
     }                           /* end of switch() */
     return TRUE;
@@ -238,7 +238,7 @@ do_vm86(xf86Int10InfoPtr pInt)
     xf86InterceptSignals(NULL);
 
     if (signo >= 0) {
-        xf86DrvMsg(pInt->scrnIndex, X_ERROR,
+        xf86DrvMsg(pInt->pScrn->scrnIndex, X_ERROR,
                    "vm86() syscall generated signal %d.\n", signo);
         dump_registers(pInt);
         dump_code(pInt);
@@ -252,7 +252,7 @@ do_vm86(xf86Int10InfoPtr pInt)
             return 0;
         break;
     case VM86_STI:
-        xf86DrvMsg(pInt->scrnIndex, X_ERROR, "vm86_sti :-((\n");
+        xf86DrvMsg(pInt->pScrn->scrnIndex, X_ERROR, "vm86_sti :-((\n");
         dump_registers(pInt);
         dump_code(pInt);
         stack_trace(pInt);
@@ -260,7 +260,7 @@ do_vm86(xf86Int10InfoPtr pInt)
     case VM86_INTx:
         pInt->num = VM86_ARG(retval);
         if (!int_handler(pInt)) {
-            xf86DrvMsg(pInt->scrnIndex, X_ERROR,
+            xf86DrvMsg(pInt->pScrn->scrnIndex, X_ERROR,
                        "Unknown vm86_int: 0x%X\n\n", VM86_ARG(retval));
             dump_registers(pInt);
             dump_code(pInt);
@@ -275,10 +275,10 @@ do_vm86(xf86Int10InfoPtr pInt)
          * we used to warn here and bail out - but now the sigio stuff
          * always fires signals at us. So we just ignore them for now.
          */
-        xf86DrvMsg(pInt->scrnIndex, X_WARNING, "received signal\n");
+        xf86DrvMsg(pInt->pScrn->scrnIndex, X_WARNING, "received signal\n");
         return 0;
     default:
-        xf86DrvMsg(pInt->scrnIndex, X_ERROR, "unknown type(0x%x)=0x%x\n",
+        xf86DrvMsg(pInt->pScrn->scrnIndex, X_ERROR, "unknown type(0x%x)=0x%x\n",
                    VM86_ARG(retval), VM86_TYPE(retval));
         dump_registers(pInt);
         dump_code(pInt);
diff --git a/xorg-server/hw/xfree86/os-support/misc/Makefile.am b/xorg-server/hw/xfree86/os-support/misc/Makefile.am
index 4bd3fc3e1..db5e7cff0 100644
--- a/xorg-server/hw/xfree86/os-support/misc/Makefile.am
+++ b/xorg-server/hw/xfree86/os-support/misc/Makefile.am
@@ -1,12 +1,12 @@
-
-noinst_LTLIBRARIES = libmisc.la
-
-libmisc_la_SOURCES = SlowBcopy.c
-
-#AM_LDFLAGS = -r
-
-INCLUDES = $(XORG_INCS)
-
-AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
-
-EXTRA_DIST = $(I386_SRCS) $(PORTIO_SRCS)
+
+noinst_LTLIBRARIES = libmisc.la
+
+libmisc_la_SOURCES = SlowBcopy.c
+
+#AM_LDFLAGS = -r
+
+INCLUDES = $(XORG_INCS)
+
+AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
+
+EXTRA_DIST = $(I386_SRCS) $(PORTIO_SRCS)
diff --git a/xorg-server/hw/xfree86/os-support/solaris/Makefile.am b/xorg-server/hw/xfree86/os-support/solaris/Makefile.am
index 5163f4423..9f358a6ea 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/Makefile.am
+++ b/xorg-server/hw/xfree86/os-support/solaris/Makefile.am
@@ -1,37 +1,37 @@
-if SOLARIS_VT
-VTSW_SRC = sun_VTsw.c
-else
-VTSW_SRC = $(srcdir)/../shared/VTsw_noop.c
-endif
-
-if AGP
-AGP_SRC = sun_agp.c
-else
-AGP_SRC = $(srcdir)/../shared/agp_noop.c
-endif
-
-SOLARIS_INOUT_SRC = solaris-@SOLARIS_INOUT_ARCH@.S
-DISTCLEANFILES = solaris-@SOLARIS_INOUT_ARCH@.il
-
-solaris-@SOLARIS_INOUT_ARCH@.il: solaris-@SOLARIS_INOUT_ARCH@.S
-	$(CPP) -P -DINLINE_ASM $(srcdir)/solaris-@SOLARIS_INOUT_ARCH@.S > $@
-
-noinst_LTLIBRARIES = libsolaris.la
-libsolaris_la_SOURCES = sun_init.c \
-	sun_vid.c sun_bell.c $(AGP_SRC) sun_apm.c \
-	$(srcdir)/../shared/kmod_noop.c \
-	$(srcdir)/../shared/posix_tty.c \
-	$(srcdir)/../shared/sigio.c \
-	$(srcdir)/../shared/vidmem.c \
-	$(VTSW_SRC)
-nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC)
-
-sdk_HEADERS =
-nodist_sdk_HEADERS = solaris-@SOLARIS_INOUT_ARCH@.il
-
-AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS)
-
-INCLUDES = $(XORG_INCS) 
-
-EXTRA_DIST = solaris-amd64.S solaris-ia32.S solaris-sparcv8plus.S \
-	apSolaris.shar sun_inout.s
+if SOLARIS_VT
+VTSW_SRC = sun_VTsw.c
+else
+VTSW_SRC = $(srcdir)/../shared/VTsw_noop.c
+endif
+
+if AGP
+AGP_SRC = sun_agp.c
+else
+AGP_SRC = $(srcdir)/../shared/agp_noop.c
+endif
+
+SOLARIS_INOUT_SRC = solaris-@SOLARIS_INOUT_ARCH@.S
+DISTCLEANFILES = solaris-@SOLARIS_INOUT_ARCH@.il
+
+solaris-@SOLARIS_INOUT_ARCH@.il: solaris-@SOLARIS_INOUT_ARCH@.S
+	$(CPP) -P -DINLINE_ASM $(srcdir)/solaris-@SOLARIS_INOUT_ARCH@.S > $@
+
+noinst_LTLIBRARIES = libsolaris.la
+libsolaris_la_SOURCES = sun_init.c \
+	sun_vid.c sun_bell.c $(AGP_SRC) sun_apm.c \
+	$(srcdir)/../shared/kmod_noop.c \
+	$(srcdir)/../shared/posix_tty.c \
+	$(srcdir)/../shared/sigio.c \
+	$(srcdir)/../shared/vidmem.c \
+	$(VTSW_SRC)
+nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC)
+
+sdk_HEADERS =
+nodist_sdk_HEADERS = solaris-@SOLARIS_INOUT_ARCH@.il
+
+AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS)
+
+INCLUDES = $(XORG_INCS) 
+
+EXTRA_DIST = solaris-amd64.S solaris-ia32.S solaris-sparcv8plus.S \
+	apSolaris.shar sun_inout.s
diff --git a/xorg-server/hw/xfree86/os-support/solaris/apSolaris.shar b/xorg-server/hw/xfree86/os-support/solaris/apSolaris.shar
index a3548f7b4..68f44029e 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/apSolaris.shar
+++ b/xorg-server/hw/xfree86/os-support/solaris/apSolaris.shar
@@ -1,806 +1,806 @@
-#!/bin/sh
-#
-# This is a shell archive.  Save it in a file, remove anything before
-# this line, and then unpack it by entering "sh file".  Note, it may
-# create directories; files and directories will be owned by you and
-# have default permissions.
-# Made on Sun Jun 25 20:24:59 CEST 2006 by Martin Bochnig at martux.org
-#
-# This archive contains:
-#
-#	./aperture
-#	
-#	./aperture/Makefile
-#	./aperture/Makefile.amd64
-#	./aperture/Makefile.sparcv9
-#	./aperture/README
-#	./aperture/aperture.c
-#	./aperture/aperture.conf
-#	./aperture/devlink.tab
-#
-echo c - ./aperture
-mkdir -p ./aperture > /dev/null 2>&1
-#
-echo x - ./aperture/Makefile
-sed 's/^X//' >./aperture/Makefile << 'END-of-./aperture/Makefile'
-X#
-X#   File: makefile for aperture Framebuffer Driver
-X# Author: Doug Anson (danson@lgc.com)
-X#   Date: 2/15/94
-X# Modified: David Holland (davidh@use.com)
-X#   Date: 2/23/94
-X#   - Changed name, and debugging structure
-X# Modified: Marc Aurele La France (tsi@xfree86.org)
-X#   Date: 2001.06.08
-X#   - SPARC support, cleanup and turf aptest.
-X#
-X# >>NOTE<< Have a look at Makefile.sparcv9 for  specifics.
-X#
-X# Modified: Martin Bochnig (martin@martux.org)
-X#   Date: 2006.06.24
-X#   - Slightly modified to also build on Solaris 10 and 11.
-X#   - amd64 64 bit kernel support
-X#   - cosmetical changes to also support sun4v, not only sun4u
-X#
-X# >>NOTE<< Have a look at Makefile.amd64 for amd64 specifics.
-X#
-X# GNU gcc compiler
-XCC=gcc
-XCFLGS=-fno-builtin -Wall -O3
-X
-X#
-X# SUNWspro compiler
-X#CC=/opt/SUNWspro/bin/cc
-X#CFLGS=-Xa -xnolib -xO3
-X
-X#
-X# Debug error reporting
-X#DEBUG_FLG=
-X#DEBUG_FLG=-DAPERTURE_DEBUG
-X
-X#
-X# Files and object declarations
-XKERNEL_FLGS=-D_KERNEL -DSUNDDI
-XCFLAGS= $(CFLGS) $(KERNEL_FLGS) $(DEBUG_FLG)
-XCFILES= aperture.c
-XOBJS= aperture.o
-XDRIVER= aperture
-X
-X#
-X# Make rules
-Xall: $(DRIVER)
-X
-X$(DRIVER): $(OBJS)
-X	@if [ -f "Makefile.`isainfo -k`" ]; then \
-X		make -f Makefile.`isainfo -k` $(DRIVER); \
-X	else \
-X		rm -f $(DRIVER); \
-X		ld -r -o $(DRIVER) $(OBJS); \
-X	fi
-X
-Xinstall: $(DRIVER)
-X	@if [ -f "Makefile.`isainfo -k`" ]; then \
-X		make -f Makefile.`isainfo -k` install; \
-X	else \
-X		cp aperture.conf /kernel/drv; \
-X		cp $(DRIVER) /kernel/drv; \
-X	fi
-X
-Xadd_drv:
-X	@if [ -f "Makefile.`isainfo -k`" ]; then \
-X		make -f Makefile.`isainfo -k` add_drv; \
-X	else \
-X		add_drv aperture; \
-X	fi
-X
-Xclean:
-X	rm -f *% *.BAK $(OBJS) $(DRIVER) core
-X
-X.SUFFIXES: .i
-X
-X.c.i:
-X	$(CC) -E $(CFLAGS) $*.c > $@
-X
-X.c.o:
-X	@if [ -f "Makefile.`isainfo -k`" ]; then \
-X		make -f Makefile.`isainfo -k` $@; \
-X	else \
-X		rm -f $@; \
-X		$(CC) -c $(CFLAGS) $*.c -o $@; \
-X	fi
-END-of-./aperture/Makefile
-echo x - ./aperture/Makefile.amd64
-sed 's/^X//' >./aperture/Makefile.amd64 << 'END-of-./aperture/Makefile.amd64'
-X#
-X#   File: Makefile for aperture Framebuffer Driver
-X# Author: Doug Anson (danson@lgc.com)
-X#   Date: 2/15/94
-X# Modified: David Holland (davidh@use.com)
-X#   Date: 2/23/94
-X#   - Changed name, and debugging structure
-X# Modified: Marc Aurele La France (tsi@xfree86.org)
-X#   Date: 2001.06.08
-X#   - SPARC support, cleanup and turf aptest.
-X# Modified: Martin Bochnig (martin@martux.org)
-X#   - amd64 64 bit kernel support, cosmetics and also
-X#     supporting sun4v (and arbitrary sparcv9) platforms
-X#     as well as SunOS 5.10 or higher now
-X#   - Changed name
-X#
-X
-X#
-X# GNU gcc compiler, version 3.2 or later
-X#
-XCC=gcc
-XCFLGS=-fno-builtin -Wall -O3 -m64 -mcmodel=kernel
-X
-X#
-X# SUNWspro compiler (untested, might not properly work for amd64 here)
-X#CC=/opt/SUNWspro/bin/cc
-X#CFLGS=-Xa -xarch=v9 -xnolib -xO3
-X
-X#
-X# Debug error reporting
-X#DEBUG_FLG=
-X#DEBUG_FLG=-DAPERTURE_DEBUG
-X
-X#
-X# Files and object declarations
-XKERNEL_FLGS=-D_KERNEL -DSUNDDI
-XCFLAGS= $(CFLGS) $(KERNEL_FLGS) $(DEBUG_FLG)
-XCFILES= aperture.c
-XOBJS= aperture.o
-XDRIVER= aperture
-X
-X#
-X# Make rules
-Xall: $(DRIVER)
-X
-X$(DRIVER): $(OBJS)
-X	rm -f $(DRIVER)
-X	ld -r -o $(DRIVER) $(OBJS)
-X
-Xinstall: $(DRIVER)
-X	cp aperture.conf /kernel/drv
-X	cp $(DRIVER) /kernel/drv/amd64
-X
-Xadd_drv:
-X	add_drv aperture
-X
-Xclean:
-X	rm -f *% *.BAK $(OBJS) $(DRIVER) core
-X
-X.SUFFIXES: .i
-X
-X.c.i:
-X	$(CC) -E $(CFLAGS) $*.c > $@
-END-of-./aperture/Makefile.amd64
-echo x - ./aperture/Makefile.sparcv9
-sed 's/^X//' >./aperture/Makefile.sparcv9 << 'END-of-./aperture/Makefile.sparcv9'
-X#
-X#   File: makefile for aperture Framebuffer Driver
-X# Author: Doug Anson (danson@lgc.com)
-X#   Date: 2/15/94
-X# Modified: David Holland (davidh@use.com)
-X#   Date: 2/23/94
-X#   - Changed name, and debugging structure
-X# Modified: Marc Aurele La France (tsi@xfree86.org)
-X#   Date: 2001.06.08
-X#   - SPARC support, cleanup and turf aptest.
-X# Modified: Martin Bochnig (martin@martux.org)
-X#   Date: 2006.06.24
-X#   - Changed name for generic sparcv9 support
-X#   - updated to better work with Solaris 10 and 11
-X#
-X
-X#
-X# GNU gcc compiler, version 3.2 or later
-X#
-XCC=gcc
-XCFLGS=-fno-builtin -Wall -O3 -m64
-X
-X#
-X# SUNWspro compiler
-X#CC=/opt/SUNWspro/bin/cc
-X#CFLGS=-Xa -xarch=v9 -xnolib -xO3
-X
-X#
-X# Debug error reporting
-X#DEBUG_FLG=
-X#DEBUG_FLG=-DAPERTURE_DEBUG
-X
-X#
-X# Files and object declarations
-XKERNEL_FLGS=-D_KERNEL -DSUNDDI
-XCFLAGS= $(CFLGS) $(KERNEL_FLGS) $(DEBUG_FLG)
-XCFILES= aperture.c
-XOBJS= aperture.o
-XDRIVER= aperture
-X
-X#
-X# Make rules
-Xall: $(DRIVER)
-X
-X$(DRIVER): $(OBJS)
-X	rm -f $(DRIVER)
-X	ld -r -o $(DRIVER) $(OBJS)
-X
-Xinstall: $(DRIVER)
-X	cp aperture.conf /kernel/drv
-X	cp $(DRIVER) /kernel/drv/sparcv9
-X
-Xadd_drv:
-X	add_drv aperture
-X
-Xclean:
-X	rm -f *% *.BAK $(OBJS) $(DRIVER) core
-X
-X.SUFFIXES: .i
-X
-X.c.i:
-X	$(CC) -E $(CFLAGS) $*.c > $@
-END-of-./aperture/Makefile.sparcv9
-echo x - ./aperture/README
-sed 's/^X//' >./aperture/README << 'END-of-./aperture/README'
-XFramebuffer aperture driver.
-X
-XThis driver was written to provide a device that, unlike /dev/mem, allows
-Xmmap()'ing of ranges beyond installed memory.
-X
-XThe original x86-based version of this driver was the collaborative work of
-XDoug Anson (danson@lgc.com), and David Holland (davidh@use.com).  It has since
-Xbeen rewritten to also work on sparc machines and - later on - also on sparcv9 
-Xand recently amd64 64 bit kernels.
-XIt flawlessly compiles and installs on Solaris 10 and 11 now.
-X
-X
-XInstallation instructions:
-X
-X1) Check the Makefile, for appropriate CC, and CFLAGS definitions.  Compiling
-X   with APERTURE_DEBUG defined means the driver will generate reams of
-X   debugging output.  You'll probably want to leave this off...
-X
-X2) Type 'make' (or 'gmake').  Both the driver and test program should compile 
-X   without any problems. No warning messages should be generated.
-X
-X3) Become 'root'.
-X
-X4) Type 'make install' and 'make add_drv'.  The screen should look something
-X   like this:
-X
-X	# make install
-X	cp aperture aperture.conf /kernel/drv
-X	# make add_drv
-X	add_drv aperture
-X
-X   On a sparcv9 machine this will mention the /kernel/drv/sparcv9 directory
-X   instead of /kernel/drv. Similarily /kernel/drv/amd64 should be used on amd64.
-X
-X   This installs the driver to the system.
-X
-X5) While as root modify the file /etc/devlink.tab, adding these lines:
-X
-X# The following entry is for the framebuffer driver
-Xtype=ddi_pseudo;name=aperture	fbs/\M0
-X
-X   Add that line exactly as shown. You may also simply add the
-X   contents of the devlink.tab file supplied to /etc/devlink.tab.
-X   It contains the lines as well.  (Yes, that is a tab between
-X   aperture and fbs, not spaces - very important)
-X
-X6) Perform a reconfiguration boot of the system.
-X
-X	# touch /reconfigure
-X	# init 6
-X
-XBug reports, questions, suggestions, etc can be sent to xfree86@xfree86.org.
-END-of-./aperture/README
-echo x - ./aperture/aperture.c
-sed 's/^X//' >./aperture/aperture.c << 'END-of-./aperture/aperture.c'
-X/*
-X * Copyright (C) 2001 The XFree86 Project, Inc.  All Rights Reserved.
-X *
-X * Permission is hereby granted, free of charge, to any person obtaining a copy
-X * of this software and associated documentation files (the "Software"), to
-X * deal in the Software without restriction, including without limitation the
-X * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-X * sell copies of the Software, and to permit persons to whom the Software is
-X * furnished to do so, subject to the following conditions:
-X *
-X * The above copyright notice and this permission notice shall be included in
-X * all copies or substantial portions of the Software.
-X *
-X * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-X * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-X * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X * XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-X * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-X * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-X *
-X * Except as contained in this notice, the name of the XFree86 Project shall
-X * not be used in advertising or otherwise to promote the sale, use or other
-X * dealings in this Software without prior written authorization from the
-X * XFree86 Project.
-X */
-X
-X/*
-X * Aperture driver for Solaris.
-X */
-X
-X/*
-X * Modified: Martin Bochnig (martin@martux.org)
-X * Log:      Commented out obsolete kernel interfaces DDI_IDENTIFIED and DDI_NOT_IDENTIFIED
-X *           not supported by SunOS 5.10 or higher anymore, 
-X *           see http://docs.sun.com/app/docs/doc/819-2255/6n4ibnffr?a=view
-X */
-X
-X#include <sys/conf.h>
-X#include <sys/ddi.h>
-X#include <sys/modctl.h>
-X#include <sys/open.h>
-X#include <sys/stat.h>
-X#include <sys/sunddi.h>
-X
-X#define DEV_IDENT  "aperture"
-X#define DEV_BANNER "XFree86 aperture driver"
-X
-X#ifndef D_64BIT
-X#define D_64BIT 0
-X#endif
-X
-X#ifndef NULL
-X#define NULL ((void *)0)
-X#endif
-X
-X/*
-X * open(9E)
-X */
-X/*ARGSUSED*/
-Xstatic int
-Xaperture_open
-X(
-X#ifdef __STDC__
-X	dev_t *devp,
-X	int flag,
-X	int typ,
-X	struct cred *cred
-X#endif
-X)
-X#ifndef __STDC__
-X	dev_t *devp;
-X	int flag;
-X	int typ;
-X	struct cred *cred;
-X#endif
-X{
-X	int error;
-X
-X#ifdef APERTURE_DEBUG
-X
-X	cmn_err(CE_CONT, DEV_IDENT ":  entering open()\n");
-X
-X#endif
-X
-X	if ((typ != OTYP_CHR) || (getminor(*devp)))
-X		error = EINVAL;
-X	else
-X		error = 0;
-X
-X#ifdef APERTURE_DEBUG
-X
-X	cmn_err(CE_CONT, DEV_IDENT ":  leaving open() = %d\n", error);
-X
-X#endif
-X
-X	return error;
-X}
-X
-X/*
-X * mmap(9E)
-X */
-X/*ARGSUSED*/
-Xstatic int
-Xaperture_mmap
-X(
-X#ifdef __STDC__
-X	dev_t dev,
-X	off_t off,
-X	int prot
-X#endif
-X)
-X#ifndef __STDC__
-X	dev_t dev;
-X	off_t off;
-X	int prot;
-X#endif
-X{
-X	pfn_t pf;
-X	int error;
-X
-X#ifdef APERTURE_DEBUG
-X
-X	cmn_err(CE_CONT, DEV_IDENT ":  entering mmap(0x%016lx)\n", off);
-X
-X#endif
-X
-X	pf = btop((unsigned long)off);
-X
-X	/* Deal with mmap(9E) interface limits */
-X	error = (int)pf;
-X	if ((error < 0) || (pf != (pfn_t)error))
-X		error = -1;
-X
-X#ifdef APERTURE_DEBUG
-X
-X	cmn_err(CE_CONT, DEV_IDENT ":  leaving mmap() = 0x%08lx", error);
-X
-X#endif
-X
-X	return error;
-X}
-X
-Xstatic struct cb_ops aperture_cb_ops =
-X{
-X	aperture_open,		/* open */
-X	nulldev,		/* close */
-X	nodev,			/* strategy */
-X	nodev,			/* print */
-X	nodev,			/* dump */
-X	nodev,			/* read */
-X	nodev,			/* write */
-X	nodev,			/* ioctl */
-X	nodev,			/* devmap */
-X	aperture_mmap,		/* mmap */
-X	ddi_segmap,		/* segmap */
-X	nochpoll,		/* poll */
-X	ddi_prop_op,		/* cb_prop_op */
-X	0,			/* streamtab  */
-X	D_NEW | D_MP | D_64BIT	/* Driver compatibility flag */
-X};
-X
-X
-Xstatic dev_info_t *aperture_dip;	/* private copy of devinfo pointer */
-X
-X/*
-X * getinfo(9E)
-X */
-X/*ARGSUSED*/
-Xstatic int
-Xaperture_getinfo
-X(
-X#ifdef __STDC__
-X	dev_info_t *dip,
-X	ddi_info_cmd_t infocmd,
-X	void *arg,
-X	void **result
-X#endif
-X)
-X#ifndef __STDC__
-X	dev_info_t *dip;
-X	ddi_info_cmd_t infocmd;
-X	void *arg;
-X	void **result;
-X#endif
-X{
-X	int error;
-X
-X#ifdef APERTURE_DEBUG
-X
-X	cmn_err(CE_CONT, DEV_IDENT ":  entering getinfo()\n");
-X
-X#endif
-X
-X	switch (infocmd) {
-X	case DDI_INFO_DEVT2DEVINFO:
-X		*result = aperture_dip;
-X		error = DDI_SUCCESS;
-X		break;
-X	case DDI_INFO_DEVT2INSTANCE:
-X		*result = NULL;
-X		error = DDI_SUCCESS;
-X		break;
-X	default:
-X		error = DDI_FAILURE;
-X	}
-X
-X#ifdef APERTURE_DEBUG
-X
-X	cmn_err(CE_CONT, DEV_IDENT ":  leaving getinfo() = %d\n", error);
-X
-X#endif
-X
-X	return error;
-X}
-X
-X/*
-X * identify(9E)
-X */
-X/*ARGSUSED*/
-Xstatic int
-Xaperture_identify
-X(
-X#ifdef __STDC__
-X	dev_info_t *dip
-X#endif
-X)
-X#ifndef __STDC__
-X	dev_info_t *dip;
-X#endif
-X{
-X	int error;
-X
-X#ifdef APERTURE_DEBUG
-X
-X	cmn_err(CE_CONT, DEV_IDENT ":  entering identify()\n");
-X
-X#endif
-X
-X	if (strcmp(ddi_get_name(dip), DEV_IDENT))
-X	  error = 1 /* DDI_NOT_IDENTIFIED obsolete since SunOS 5.10 */ ;
-X	else
-X	  error = 2 /* DDI_IDENTIFIED obsolete since SunOS 5.10 */ ;
-X
-X#ifdef APERTURE_DEBUG
-X
-X	cmn_err(CE_CONT, DEV_IDENT ":  leaving identify() = %d\n", error);
-X
-X#endif
-X
-X	return error;
-X}
-X
-X/*
-X * attach(9E)
-X */
-X/*ARGSUSED*/
-Xstatic int
-Xaperture_attach
-X(
-X#ifdef __STDC__
-X	dev_info_t *dip,
-X	ddi_attach_cmd_t cmd
-X#endif
-X)
-X#ifndef __STDC__
-X	dev_info_t *dip;
-X	ddi_attach_cmd_t cmd;
-X#endif
-X{
-X	int error;
-X
-X#ifdef APERTURE_DEBUG
-X
-X	cmn_err(CE_CONT, DEV_IDENT ":  entering attach()\n");
-X
-X#endif
-X
-X	if (cmd != DDI_ATTACH)
-X	{
-X
-X#ifdef APERTURE_DEBUG
-X
-X		cmn_err(CE_CONT, DEV_IDENT ":  not attach(, DDI_ATTACH)\n");
-X
-X#endif
-X
-X		error = DDI_FAILURE;
-X	}
-X	else
-X	{
-X		error = ddi_create_minor_node(dip, ddi_get_name(dip), S_IFCHR,
-X					      (minor_t)ddi_get_instance(dip),
-X					      NULL, 0 /* NODESPECIFIC_DEV obsolete since SunOS 5.10 */ );
-X
-X		if (error == DDI_SUCCESS)
-X		{
-X			aperture_dip = dip;
-X			ddi_report_dev(dip);
-X		}
-X	}
-X
-X#ifdef APERTURE_DEBUG
-X
-X	cmn_err(CE_CONT, DEV_IDENT ":  leaving attach() = %d\n", error);
-X
-X#endif
-X
-X	return error;
-X}
-X
-X/*
-X * detach(9E)
-X */
-Xstatic int
-Xaperture_detach
-X(
-X#ifdef __STDC__
-X	dev_info_t *dip,
-X	ddi_detach_cmd_t cmd
-X#endif
-X)
-X#ifndef __STDC__
-X	dev_info_t *dip;
-X	ddi_detach_cmd_t cmd;
-X#endif
-X{
-X	int error;
-X
-X#ifdef APERTURE_DEBUG
-X
-X	cmn_err(CE_CONT, DEV_IDENT ":  entering detach()\n");
-X
-X#endif
-X
-X	if (cmd != DDI_DETACH)
-X	{
-X		error = DDI_FAILURE;
-X	}
-X	else
-X	{
-X		ddi_remove_minor_node(dip, NULL);
-X		aperture_dip = NULL;
-X		error = DDI_SUCCESS;
-X	}
-X
-X#if APERTURE_DEBUG
-X
-X	cmn_err(CE_CONT, DEV_IDENT ":  leaving detach() = %d\n", error);
-X
-X#endif
-X
-X	return error;
-X}
-X
-X
-Xstatic struct dev_ops aperture_ops =
-X{
-X	DEVO_REV,		/* revision */
-X	0,			/* refcnt  */
-X	aperture_getinfo,	/* getinfo */
-X	aperture_identify,	/* identify */
-X	nulldev,		/* probe */
-X	aperture_attach,	/* attach */
-X	aperture_detach,	/* detach */
-X	nodev,			/* reset */
-X	&aperture_cb_ops,	/* driver operations */
-X	NULL			/* bus operations */
-X};
-X
-X
-Xstatic struct modldrv modldrv =
-X{
-X	&mod_driverops,		/* mod_ops structure pointer */
-X	DEV_BANNER,		/* driver banner string */
-X	&aperture_ops,		/* dev_ops structure pointer */
-X};
-X
-X
-Xstatic struct modlinkage modlinkage =
-X{
-X	MODREV_1,		/* module API revision */
-X	{
-X		&modldrv,	/* module driver structure pointer */
-X		NULL		/* list termination */
-X	}
-X};
-X
-X
-X/*
-X * _init(9E)
-X */
-Xint
-X_init
-X(
-X#ifdef __STDC__
-X	void
-X#endif
-X)
-X{
-X	int error;
-X
-X#ifdef APERTURE_DEBUG
-X
-X	cmn_err(CE_CONT, DEV_IDENT ":  entering _init()\n");
-X
-X#endif
-X
-X	error = mod_install(&modlinkage);
-X
-X#ifdef APERTURE_DEBUG
-X
-X	cmn_err(CE_CONT, DEV_IDENT ":  leaving _init() = %d\n", error);
-X
-X#endif
-X
-X	return error;
-X}
-X
-X/*
-X * _info(9E)
-X */
-Xint
-X_info
-X(
-X#ifdef __STDC__
-X	struct modinfo *modinfop
-X#endif
-X)
-X#ifndef __STDC__
-X	struct modinfo *modinfop;
-X#endif
-X{
-X	int error;
-X
-X#ifdef APERTURE_DEBUG
-X
-X	cmn_err(CE_CONT, DEV_IDENT ":  entering _info()\n");
-X
-X#endif
-X
-X	error = mod_info(&modlinkage, modinfop);
-X
-X#ifdef APERTURE_DEBUG
-X
-X	cmn_err(CE_CONT, DEV_IDENT ":  leaving _info() = %d\n", error);
-X
-X#endif
-X
-X	return error;
-X}
-X
-X/*
-X * _fini(9E)
-X */
-Xint
-X_fini
-X(
-X#ifdef __STDC__
-X	void
-X#endif
-X)
-X{
-X	int error;
-X
-X#ifdef APERTURE_DEBUG
-X
-X	cmn_err(CE_CONT, DEV_IDENT ":  entering _fini()\n");
-X
-X#endif
-X
-X	error = mod_remove(&modlinkage);
-X
-X#ifdef APERTURE_DEBUG
-X
-X	cmn_err(CE_CONT, DEV_IDENT ":  leaving _fini() = %d\n", error);
-X
-X#endif
-X
-X	return error;
-X}
-END-of-./aperture/aperture.c
-echo x - ./aperture/aperture.conf
-sed 's/^X//' >./aperture/aperture.conf << 'END-of-./aperture/aperture.conf'
-X#
-X# Copyright 1994 Doug Anson, danson@lgc.com & David Holland, davidh@use.com
-X#
-X# File:   aperture.conf
-X# Author: Doug Anson (danson@lgc.com)
-X# 
-X# Modified: David Holland (davidh@use.com)
-X# Log:	    Change comments		02/23/94
-X#	    Change defaults/comments	09/25/94
-X#
-X# Modified: Marc Aurele La France (tsi@xfree86.org)
-X# Log:      SPARC changes		2001.09
-X#
-X# Purpose:  This conf file is used by the aperture driver.
-X#
-Xname="aperture" parent="pseudo";
-END-of-./aperture/aperture.conf
-echo x - ./aperture/devlink.tab
-sed 's/^X//' >./aperture/devlink.tab << 'END-of-./aperture/devlink.tab'
-X# The following entry is for the aperture driver
-Xtype=ddi_pseudo;name=aperture	fbs/\M0
-END-of-./aperture/devlink.tab
-exit
-
+#!/bin/sh
+#
+# This is a shell archive.  Save it in a file, remove anything before
+# this line, and then unpack it by entering "sh file".  Note, it may
+# create directories; files and directories will be owned by you and
+# have default permissions.
+# Made on Sun Jun 25 20:24:59 CEST 2006 by Martin Bochnig at martux.org
+#
+# This archive contains:
+#
+#	./aperture
+#	
+#	./aperture/Makefile
+#	./aperture/Makefile.amd64
+#	./aperture/Makefile.sparcv9
+#	./aperture/README
+#	./aperture/aperture.c
+#	./aperture/aperture.conf
+#	./aperture/devlink.tab
+#
+echo c - ./aperture
+mkdir -p ./aperture > /dev/null 2>&1
+#
+echo x - ./aperture/Makefile
+sed 's/^X//' >./aperture/Makefile << 'END-of-./aperture/Makefile'
+X#
+X#   File: makefile for aperture Framebuffer Driver
+X# Author: Doug Anson (danson@lgc.com)
+X#   Date: 2/15/94
+X# Modified: David Holland (davidh@use.com)
+X#   Date: 2/23/94
+X#   - Changed name, and debugging structure
+X# Modified: Marc Aurele La France (tsi@xfree86.org)
+X#   Date: 2001.06.08
+X#   - SPARC support, cleanup and turf aptest.
+X#
+X# >>NOTE<< Have a look at Makefile.sparcv9 for  specifics.
+X#
+X# Modified: Martin Bochnig (martin@martux.org)
+X#   Date: 2006.06.24
+X#   - Slightly modified to also build on Solaris 10 and 11.
+X#   - amd64 64 bit kernel support
+X#   - cosmetical changes to also support sun4v, not only sun4u
+X#
+X# >>NOTE<< Have a look at Makefile.amd64 for amd64 specifics.
+X#
+X# GNU gcc compiler
+XCC=gcc
+XCFLGS=-fno-builtin -Wall -O3
+X
+X#
+X# SUNWspro compiler
+X#CC=/opt/SUNWspro/bin/cc
+X#CFLGS=-Xa -xnolib -xO3
+X
+X#
+X# Debug error reporting
+X#DEBUG_FLG=
+X#DEBUG_FLG=-DAPERTURE_DEBUG
+X
+X#
+X# Files and object declarations
+XKERNEL_FLGS=-D_KERNEL -DSUNDDI
+XCFLAGS= $(CFLGS) $(KERNEL_FLGS) $(DEBUG_FLG)
+XCFILES= aperture.c
+XOBJS= aperture.o
+XDRIVER= aperture
+X
+X#
+X# Make rules
+Xall: $(DRIVER)
+X
+X$(DRIVER): $(OBJS)
+X	@if [ -f "Makefile.`isainfo -k`" ]; then \
+X		make -f Makefile.`isainfo -k` $(DRIVER); \
+X	else \
+X		rm -f $(DRIVER); \
+X		ld -r -o $(DRIVER) $(OBJS); \
+X	fi
+X
+Xinstall: $(DRIVER)
+X	@if [ -f "Makefile.`isainfo -k`" ]; then \
+X		make -f Makefile.`isainfo -k` install; \
+X	else \
+X		cp aperture.conf /kernel/drv; \
+X		cp $(DRIVER) /kernel/drv; \
+X	fi
+X
+Xadd_drv:
+X	@if [ -f "Makefile.`isainfo -k`" ]; then \
+X		make -f Makefile.`isainfo -k` add_drv; \
+X	else \
+X		add_drv aperture; \
+X	fi
+X
+Xclean:
+X	rm -f *% *.BAK $(OBJS) $(DRIVER) core
+X
+X.SUFFIXES: .i
+X
+X.c.i:
+X	$(CC) -E $(CFLAGS) $*.c > $@
+X
+X.c.o:
+X	@if [ -f "Makefile.`isainfo -k`" ]; then \
+X		make -f Makefile.`isainfo -k` $@; \
+X	else \
+X		rm -f $@; \
+X		$(CC) -c $(CFLAGS) $*.c -o $@; \
+X	fi
+END-of-./aperture/Makefile
+echo x - ./aperture/Makefile.amd64
+sed 's/^X//' >./aperture/Makefile.amd64 << 'END-of-./aperture/Makefile.amd64'
+X#
+X#   File: Makefile for aperture Framebuffer Driver
+X# Author: Doug Anson (danson@lgc.com)
+X#   Date: 2/15/94
+X# Modified: David Holland (davidh@use.com)
+X#   Date: 2/23/94
+X#   - Changed name, and debugging structure
+X# Modified: Marc Aurele La France (tsi@xfree86.org)
+X#   Date: 2001.06.08
+X#   - SPARC support, cleanup and turf aptest.
+X# Modified: Martin Bochnig (martin@martux.org)
+X#   - amd64 64 bit kernel support, cosmetics and also
+X#     supporting sun4v (and arbitrary sparcv9) platforms
+X#     as well as SunOS 5.10 or higher now
+X#   - Changed name
+X#
+X
+X#
+X# GNU gcc compiler, version 3.2 or later
+X#
+XCC=gcc
+XCFLGS=-fno-builtin -Wall -O3 -m64 -mcmodel=kernel
+X
+X#
+X# SUNWspro compiler (untested, might not properly work for amd64 here)
+X#CC=/opt/SUNWspro/bin/cc
+X#CFLGS=-Xa -xarch=v9 -xnolib -xO3
+X
+X#
+X# Debug error reporting
+X#DEBUG_FLG=
+X#DEBUG_FLG=-DAPERTURE_DEBUG
+X
+X#
+X# Files and object declarations
+XKERNEL_FLGS=-D_KERNEL -DSUNDDI
+XCFLAGS= $(CFLGS) $(KERNEL_FLGS) $(DEBUG_FLG)
+XCFILES= aperture.c
+XOBJS= aperture.o
+XDRIVER= aperture
+X
+X#
+X# Make rules
+Xall: $(DRIVER)
+X
+X$(DRIVER): $(OBJS)
+X	rm -f $(DRIVER)
+X	ld -r -o $(DRIVER) $(OBJS)
+X
+Xinstall: $(DRIVER)
+X	cp aperture.conf /kernel/drv
+X	cp $(DRIVER) /kernel/drv/amd64
+X
+Xadd_drv:
+X	add_drv aperture
+X
+Xclean:
+X	rm -f *% *.BAK $(OBJS) $(DRIVER) core
+X
+X.SUFFIXES: .i
+X
+X.c.i:
+X	$(CC) -E $(CFLAGS) $*.c > $@
+END-of-./aperture/Makefile.amd64
+echo x - ./aperture/Makefile.sparcv9
+sed 's/^X//' >./aperture/Makefile.sparcv9 << 'END-of-./aperture/Makefile.sparcv9'
+X#
+X#   File: makefile for aperture Framebuffer Driver
+X# Author: Doug Anson (danson@lgc.com)
+X#   Date: 2/15/94
+X# Modified: David Holland (davidh@use.com)
+X#   Date: 2/23/94
+X#   - Changed name, and debugging structure
+X# Modified: Marc Aurele La France (tsi@xfree86.org)
+X#   Date: 2001.06.08
+X#   - SPARC support, cleanup and turf aptest.
+X# Modified: Martin Bochnig (martin@martux.org)
+X#   Date: 2006.06.24
+X#   - Changed name for generic sparcv9 support
+X#   - updated to better work with Solaris 10 and 11
+X#
+X
+X#
+X# GNU gcc compiler, version 3.2 or later
+X#
+XCC=gcc
+XCFLGS=-fno-builtin -Wall -O3 -m64
+X
+X#
+X# SUNWspro compiler
+X#CC=/opt/SUNWspro/bin/cc
+X#CFLGS=-Xa -xarch=v9 -xnolib -xO3
+X
+X#
+X# Debug error reporting
+X#DEBUG_FLG=
+X#DEBUG_FLG=-DAPERTURE_DEBUG
+X
+X#
+X# Files and object declarations
+XKERNEL_FLGS=-D_KERNEL -DSUNDDI
+XCFLAGS= $(CFLGS) $(KERNEL_FLGS) $(DEBUG_FLG)
+XCFILES= aperture.c
+XOBJS= aperture.o
+XDRIVER= aperture
+X
+X#
+X# Make rules
+Xall: $(DRIVER)
+X
+X$(DRIVER): $(OBJS)
+X	rm -f $(DRIVER)
+X	ld -r -o $(DRIVER) $(OBJS)
+X
+Xinstall: $(DRIVER)
+X	cp aperture.conf /kernel/drv
+X	cp $(DRIVER) /kernel/drv/sparcv9
+X
+Xadd_drv:
+X	add_drv aperture
+X
+Xclean:
+X	rm -f *% *.BAK $(OBJS) $(DRIVER) core
+X
+X.SUFFIXES: .i
+X
+X.c.i:
+X	$(CC) -E $(CFLAGS) $*.c > $@
+END-of-./aperture/Makefile.sparcv9
+echo x - ./aperture/README
+sed 's/^X//' >./aperture/README << 'END-of-./aperture/README'
+XFramebuffer aperture driver.
+X
+XThis driver was written to provide a device that, unlike /dev/mem, allows
+Xmmap()'ing of ranges beyond installed memory.
+X
+XThe original x86-based version of this driver was the collaborative work of
+XDoug Anson (danson@lgc.com), and David Holland (davidh@use.com).  It has since
+Xbeen rewritten to also work on sparc machines and - later on - also on sparcv9 
+Xand recently amd64 64 bit kernels.
+XIt flawlessly compiles and installs on Solaris 10 and 11 now.
+X
+X
+XInstallation instructions:
+X
+X1) Check the Makefile, for appropriate CC, and CFLAGS definitions.  Compiling
+X   with APERTURE_DEBUG defined means the driver will generate reams of
+X   debugging output.  You'll probably want to leave this off...
+X
+X2) Type 'make' (or 'gmake').  Both the driver and test program should compile 
+X   without any problems. No warning messages should be generated.
+X
+X3) Become 'root'.
+X
+X4) Type 'make install' and 'make add_drv'.  The screen should look something
+X   like this:
+X
+X	# make install
+X	cp aperture aperture.conf /kernel/drv
+X	# make add_drv
+X	add_drv aperture
+X
+X   On a sparcv9 machine this will mention the /kernel/drv/sparcv9 directory
+X   instead of /kernel/drv. Similarily /kernel/drv/amd64 should be used on amd64.
+X
+X   This installs the driver to the system.
+X
+X5) While as root modify the file /etc/devlink.tab, adding these lines:
+X
+X# The following entry is for the framebuffer driver
+Xtype=ddi_pseudo;name=aperture	fbs/\M0
+X
+X   Add that line exactly as shown. You may also simply add the
+X   contents of the devlink.tab file supplied to /etc/devlink.tab.
+X   It contains the lines as well.  (Yes, that is a tab between
+X   aperture and fbs, not spaces - very important)
+X
+X6) Perform a reconfiguration boot of the system.
+X
+X	# touch /reconfigure
+X	# init 6
+X
+XBug reports, questions, suggestions, etc can be sent to xfree86@xfree86.org.
+END-of-./aperture/README
+echo x - ./aperture/aperture.c
+sed 's/^X//' >./aperture/aperture.c << 'END-of-./aperture/aperture.c'
+X/*
+X * Copyright (C) 2001 The XFree86 Project, Inc.  All Rights Reserved.
+X *
+X * Permission is hereby granted, free of charge, to any person obtaining a copy
+X * of this software and associated documentation files (the "Software"), to
+X * deal in the Software without restriction, including without limitation the
+X * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+X * sell copies of the Software, and to permit persons to whom the Software is
+X * furnished to do so, subject to the following conditions:
+X *
+X * The above copyright notice and this permission notice shall be included in
+X * all copies or substantial portions of the Software.
+X *
+X * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+X * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+X * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+X * XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+X * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+X * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+X *
+X * Except as contained in this notice, the name of the XFree86 Project shall
+X * not be used in advertising or otherwise to promote the sale, use or other
+X * dealings in this Software without prior written authorization from the
+X * XFree86 Project.
+X */
+X
+X/*
+X * Aperture driver for Solaris.
+X */
+X
+X/*
+X * Modified: Martin Bochnig (martin@martux.org)
+X * Log:      Commented out obsolete kernel interfaces DDI_IDENTIFIED and DDI_NOT_IDENTIFIED
+X *           not supported by SunOS 5.10 or higher anymore, 
+X *           see http://docs.sun.com/app/docs/doc/819-2255/6n4ibnffr?a=view
+X */
+X
+X#include <sys/conf.h>
+X#include <sys/ddi.h>
+X#include <sys/modctl.h>
+X#include <sys/open.h>
+X#include <sys/stat.h>
+X#include <sys/sunddi.h>
+X
+X#define DEV_IDENT  "aperture"
+X#define DEV_BANNER "XFree86 aperture driver"
+X
+X#ifndef D_64BIT
+X#define D_64BIT 0
+X#endif
+X
+X#ifndef NULL
+X#define NULL ((void *)0)
+X#endif
+X
+X/*
+X * open(9E)
+X */
+X/*ARGSUSED*/
+Xstatic int
+Xaperture_open
+X(
+X#ifdef __STDC__
+X	dev_t *devp,
+X	int flag,
+X	int typ,
+X	struct cred *cred
+X#endif
+X)
+X#ifndef __STDC__
+X	dev_t *devp;
+X	int flag;
+X	int typ;
+X	struct cred *cred;
+X#endif
+X{
+X	int error;
+X
+X#ifdef APERTURE_DEBUG
+X
+X	cmn_err(CE_CONT, DEV_IDENT ":  entering open()\n");
+X
+X#endif
+X
+X	if ((typ != OTYP_CHR) || (getminor(*devp)))
+X		error = EINVAL;
+X	else
+X		error = 0;
+X
+X#ifdef APERTURE_DEBUG
+X
+X	cmn_err(CE_CONT, DEV_IDENT ":  leaving open() = %d\n", error);
+X
+X#endif
+X
+X	return error;
+X}
+X
+X/*
+X * mmap(9E)
+X */
+X/*ARGSUSED*/
+Xstatic int
+Xaperture_mmap
+X(
+X#ifdef __STDC__
+X	dev_t dev,
+X	off_t off,
+X	int prot
+X#endif
+X)
+X#ifndef __STDC__
+X	dev_t dev;
+X	off_t off;
+X	int prot;
+X#endif
+X{
+X	pfn_t pf;
+X	int error;
+X
+X#ifdef APERTURE_DEBUG
+X
+X	cmn_err(CE_CONT, DEV_IDENT ":  entering mmap(0x%016lx)\n", off);
+X
+X#endif
+X
+X	pf = btop((unsigned long)off);
+X
+X	/* Deal with mmap(9E) interface limits */
+X	error = (int)pf;
+X	if ((error < 0) || (pf != (pfn_t)error))
+X		error = -1;
+X
+X#ifdef APERTURE_DEBUG
+X
+X	cmn_err(CE_CONT, DEV_IDENT ":  leaving mmap() = 0x%08lx", error);
+X
+X#endif
+X
+X	return error;
+X}
+X
+Xstatic struct cb_ops aperture_cb_ops =
+X{
+X	aperture_open,		/* open */
+X	nulldev,		/* close */
+X	nodev,			/* strategy */
+X	nodev,			/* print */
+X	nodev,			/* dump */
+X	nodev,			/* read */
+X	nodev,			/* write */
+X	nodev,			/* ioctl */
+X	nodev,			/* devmap */
+X	aperture_mmap,		/* mmap */
+X	ddi_segmap,		/* segmap */
+X	nochpoll,		/* poll */
+X	ddi_prop_op,		/* cb_prop_op */
+X	0,			/* streamtab  */
+X	D_NEW | D_MP | D_64BIT	/* Driver compatibility flag */
+X};
+X
+X
+Xstatic dev_info_t *aperture_dip;	/* private copy of devinfo pointer */
+X
+X/*
+X * getinfo(9E)
+X */
+X/*ARGSUSED*/
+Xstatic int
+Xaperture_getinfo
+X(
+X#ifdef __STDC__
+X	dev_info_t *dip,
+X	ddi_info_cmd_t infocmd,
+X	void *arg,
+X	void **result
+X#endif
+X)
+X#ifndef __STDC__
+X	dev_info_t *dip;
+X	ddi_info_cmd_t infocmd;
+X	void *arg;
+X	void **result;
+X#endif
+X{
+X	int error;
+X
+X#ifdef APERTURE_DEBUG
+X
+X	cmn_err(CE_CONT, DEV_IDENT ":  entering getinfo()\n");
+X
+X#endif
+X
+X	switch (infocmd) {
+X	case DDI_INFO_DEVT2DEVINFO:
+X		*result = aperture_dip;
+X		error = DDI_SUCCESS;
+X		break;
+X	case DDI_INFO_DEVT2INSTANCE:
+X		*result = NULL;
+X		error = DDI_SUCCESS;
+X		break;
+X	default:
+X		error = DDI_FAILURE;
+X	}
+X
+X#ifdef APERTURE_DEBUG
+X
+X	cmn_err(CE_CONT, DEV_IDENT ":  leaving getinfo() = %d\n", error);
+X
+X#endif
+X
+X	return error;
+X}
+X
+X/*
+X * identify(9E)
+X */
+X/*ARGSUSED*/
+Xstatic int
+Xaperture_identify
+X(
+X#ifdef __STDC__
+X	dev_info_t *dip
+X#endif
+X)
+X#ifndef __STDC__
+X	dev_info_t *dip;
+X#endif
+X{
+X	int error;
+X
+X#ifdef APERTURE_DEBUG
+X
+X	cmn_err(CE_CONT, DEV_IDENT ":  entering identify()\n");
+X
+X#endif
+X
+X	if (strcmp(ddi_get_name(dip), DEV_IDENT))
+X	  error = 1 /* DDI_NOT_IDENTIFIED obsolete since SunOS 5.10 */ ;
+X	else
+X	  error = 2 /* DDI_IDENTIFIED obsolete since SunOS 5.10 */ ;
+X
+X#ifdef APERTURE_DEBUG
+X
+X	cmn_err(CE_CONT, DEV_IDENT ":  leaving identify() = %d\n", error);
+X
+X#endif
+X
+X	return error;
+X}
+X
+X/*
+X * attach(9E)
+X */
+X/*ARGSUSED*/
+Xstatic int
+Xaperture_attach
+X(
+X#ifdef __STDC__
+X	dev_info_t *dip,
+X	ddi_attach_cmd_t cmd
+X#endif
+X)
+X#ifndef __STDC__
+X	dev_info_t *dip;
+X	ddi_attach_cmd_t cmd;
+X#endif
+X{
+X	int error;
+X
+X#ifdef APERTURE_DEBUG
+X
+X	cmn_err(CE_CONT, DEV_IDENT ":  entering attach()\n");
+X
+X#endif
+X
+X	if (cmd != DDI_ATTACH)
+X	{
+X
+X#ifdef APERTURE_DEBUG
+X
+X		cmn_err(CE_CONT, DEV_IDENT ":  not attach(, DDI_ATTACH)\n");
+X
+X#endif
+X
+X		error = DDI_FAILURE;
+X	}
+X	else
+X	{
+X		error = ddi_create_minor_node(dip, ddi_get_name(dip), S_IFCHR,
+X					      (minor_t)ddi_get_instance(dip),
+X					      NULL, 0 /* NODESPECIFIC_DEV obsolete since SunOS 5.10 */ );
+X
+X		if (error == DDI_SUCCESS)
+X		{
+X			aperture_dip = dip;
+X			ddi_report_dev(dip);
+X		}
+X	}
+X
+X#ifdef APERTURE_DEBUG
+X
+X	cmn_err(CE_CONT, DEV_IDENT ":  leaving attach() = %d\n", error);
+X
+X#endif
+X
+X	return error;
+X}
+X
+X/*
+X * detach(9E)
+X */
+Xstatic int
+Xaperture_detach
+X(
+X#ifdef __STDC__
+X	dev_info_t *dip,
+X	ddi_detach_cmd_t cmd
+X#endif
+X)
+X#ifndef __STDC__
+X	dev_info_t *dip;
+X	ddi_detach_cmd_t cmd;
+X#endif
+X{
+X	int error;
+X
+X#ifdef APERTURE_DEBUG
+X
+X	cmn_err(CE_CONT, DEV_IDENT ":  entering detach()\n");
+X
+X#endif
+X
+X	if (cmd != DDI_DETACH)
+X	{
+X		error = DDI_FAILURE;
+X	}
+X	else
+X	{
+X		ddi_remove_minor_node(dip, NULL);
+X		aperture_dip = NULL;
+X		error = DDI_SUCCESS;
+X	}
+X
+X#if APERTURE_DEBUG
+X
+X	cmn_err(CE_CONT, DEV_IDENT ":  leaving detach() = %d\n", error);
+X
+X#endif
+X
+X	return error;
+X}
+X
+X
+Xstatic struct dev_ops aperture_ops =
+X{
+X	DEVO_REV,		/* revision */
+X	0,			/* refcnt  */
+X	aperture_getinfo,	/* getinfo */
+X	aperture_identify,	/* identify */
+X	nulldev,		/* probe */
+X	aperture_attach,	/* attach */
+X	aperture_detach,	/* detach */
+X	nodev,			/* reset */
+X	&aperture_cb_ops,	/* driver operations */
+X	NULL			/* bus operations */
+X};
+X
+X
+Xstatic struct modldrv modldrv =
+X{
+X	&mod_driverops,		/* mod_ops structure pointer */
+X	DEV_BANNER,		/* driver banner string */
+X	&aperture_ops,		/* dev_ops structure pointer */
+X};
+X
+X
+Xstatic struct modlinkage modlinkage =
+X{
+X	MODREV_1,		/* module API revision */
+X	{
+X		&modldrv,	/* module driver structure pointer */
+X		NULL		/* list termination */
+X	}
+X};
+X
+X
+X/*
+X * _init(9E)
+X */
+Xint
+X_init
+X(
+X#ifdef __STDC__
+X	void
+X#endif
+X)
+X{
+X	int error;
+X
+X#ifdef APERTURE_DEBUG
+X
+X	cmn_err(CE_CONT, DEV_IDENT ":  entering _init()\n");
+X
+X#endif
+X
+X	error = mod_install(&modlinkage);
+X
+X#ifdef APERTURE_DEBUG
+X
+X	cmn_err(CE_CONT, DEV_IDENT ":  leaving _init() = %d\n", error);
+X
+X#endif
+X
+X	return error;
+X}
+X
+X/*
+X * _info(9E)
+X */
+Xint
+X_info
+X(
+X#ifdef __STDC__
+X	struct modinfo *modinfop
+X#endif
+X)
+X#ifndef __STDC__
+X	struct modinfo *modinfop;
+X#endif
+X{
+X	int error;
+X
+X#ifdef APERTURE_DEBUG
+X
+X	cmn_err(CE_CONT, DEV_IDENT ":  entering _info()\n");
+X
+X#endif
+X
+X	error = mod_info(&modlinkage, modinfop);
+X
+X#ifdef APERTURE_DEBUG
+X
+X	cmn_err(CE_CONT, DEV_IDENT ":  leaving _info() = %d\n", error);
+X
+X#endif
+X
+X	return error;
+X}
+X
+X/*
+X * _fini(9E)
+X */
+Xint
+X_fini
+X(
+X#ifdef __STDC__
+X	void
+X#endif
+X)
+X{
+X	int error;
+X
+X#ifdef APERTURE_DEBUG
+X
+X	cmn_err(CE_CONT, DEV_IDENT ":  entering _fini()\n");
+X
+X#endif
+X
+X	error = mod_remove(&modlinkage);
+X
+X#ifdef APERTURE_DEBUG
+X
+X	cmn_err(CE_CONT, DEV_IDENT ":  leaving _fini() = %d\n", error);
+X
+X#endif
+X
+X	return error;
+X}
+END-of-./aperture/aperture.c
+echo x - ./aperture/aperture.conf
+sed 's/^X//' >./aperture/aperture.conf << 'END-of-./aperture/aperture.conf'
+X#
+X# Copyright 1994 Doug Anson, danson@lgc.com & David Holland, davidh@use.com
+X#
+X# File:   aperture.conf
+X# Author: Doug Anson (danson@lgc.com)
+X# 
+X# Modified: David Holland (davidh@use.com)
+X# Log:	    Change comments		02/23/94
+X#	    Change defaults/comments	09/25/94
+X#
+X# Modified: Marc Aurele La France (tsi@xfree86.org)
+X# Log:      SPARC changes		2001.09
+X#
+X# Purpose:  This conf file is used by the aperture driver.
+X#
+Xname="aperture" parent="pseudo";
+END-of-./aperture/aperture.conf
+echo x - ./aperture/devlink.tab
+sed 's/^X//' >./aperture/devlink.tab << 'END-of-./aperture/devlink.tab'
+X# The following entry is for the aperture driver
+Xtype=ddi_pseudo;name=aperture	fbs/\M0
+END-of-./aperture/devlink.tab
+exit
+
diff --git a/xorg-server/hw/xfree86/os-support/solaris/solaris-amd64.S b/xorg-server/hw/xfree86/os-support/solaris/solaris-amd64.S
index a371f9b66..4cc0642dd 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/solaris-amd64.S
+++ b/xorg-server/hw/xfree86/os-support/solaris/solaris-amd64.S
@@ -1,67 +1,67 @@
-/ Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
-/ 
-/ 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 (including the next
-/ paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
-
-#ifdef INLINE_ASM
-#define FUNCTION_START(f,n)	.inline f,n
-#define FUNCTION_END(f)		.end
-#else
-#define _ASM
-#include <sys/asm_linkage.h>
-#define FUNCTION_START(f,n)	ENTRY(f)
-#define FUNCTION_END(f)		ret; SET_SIZE(f)
-#endif
-
-	FUNCTION_START(inb,4)
-	movq	%rdi, %rdx
-	xorq    %rax, %rax
-	inb	(%dx)
-	FUNCTION_END(inb)
-
-	FUNCTION_START(inw,4)
-	movq	%rdi, %rdx
-	xorq    %rax, %rax
-	inw	(%dx)
-	FUNCTION_END(inw)
-
-	FUNCTION_START(inl,4)
-	movq	%rdi, %rdx
-	xorq    %rax, %rax
-	inl	(%dx)
-	FUNCTION_END(inl)
-
-	FUNCTION_START(outb,8)
-	movq	%rdi, %rdx
-	movq    %rsi, %rax
-	outb	(%dx)
-	FUNCTION_END(outb)
-
-	FUNCTION_START(outw,8)
-	movq	%rdi, %rdx
-	movq    %rsi, %rax
-	outw	(%dx)
-	FUNCTION_END(outw)
-
-	FUNCTION_START(outl,8)
-	movq	%rdi, %rdx
-	movq    %rsi, %rax
-	outl	(%dx)
-	FUNCTION_END(outl)
-
+/ Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+/ 
+/ 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 (including the next
+/ paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+
+#ifdef INLINE_ASM
+#define FUNCTION_START(f,n)	.inline f,n
+#define FUNCTION_END(f)		.end
+#else
+#define _ASM
+#include <sys/asm_linkage.h>
+#define FUNCTION_START(f,n)	ENTRY(f)
+#define FUNCTION_END(f)		ret; SET_SIZE(f)
+#endif
+
+	FUNCTION_START(inb,4)
+	movq	%rdi, %rdx
+	xorq    %rax, %rax
+	inb	(%dx)
+	FUNCTION_END(inb)
+
+	FUNCTION_START(inw,4)
+	movq	%rdi, %rdx
+	xorq    %rax, %rax
+	inw	(%dx)
+	FUNCTION_END(inw)
+
+	FUNCTION_START(inl,4)
+	movq	%rdi, %rdx
+	xorq    %rax, %rax
+	inl	(%dx)
+	FUNCTION_END(inl)
+
+	FUNCTION_START(outb,8)
+	movq	%rdi, %rdx
+	movq    %rsi, %rax
+	outb	(%dx)
+	FUNCTION_END(outb)
+
+	FUNCTION_START(outw,8)
+	movq	%rdi, %rdx
+	movq    %rsi, %rax
+	outw	(%dx)
+	FUNCTION_END(outw)
+
+	FUNCTION_START(outl,8)
+	movq	%rdi, %rdx
+	movq    %rsi, %rax
+	outl	(%dx)
+	FUNCTION_END(outl)
+
diff --git a/xorg-server/hw/xfree86/os-support/solaris/solaris-ia32.S b/xorg-server/hw/xfree86/os-support/solaris/solaris-ia32.S
index 0068b06e4..74d787d31 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/solaris-ia32.S
+++ b/xorg-server/hw/xfree86/os-support/solaris/solaris-ia32.S
@@ -1,67 +1,67 @@
-/ Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-/ 
-/ 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 (including the next
-/ paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
-
-#ifdef INLINE_ASM
-#define FUNCTION_START(f,n)	.inline f,n
-#define FUNCTION_END(f)		.end
-#else
-#define _ASM
-#include <sys/asm_linkage.h>
-#define FUNCTION_START(f,n)	ENTRY(f)
-#define FUNCTION_END(f)		ret; SET_SIZE(f)
-#endif
-
-	FUNCTION_START(inb,4)
-	movl	(%esp), %edx
-	xorl    %eax, %eax
-	inb	(%dx)
-	FUNCTION_END(inb)
-
-	FUNCTION_START(inw,4)
-	movl	(%esp), %edx
-	xorl    %eax, %eax
-	inw	(%dx)
-	FUNCTION_END(inw)
-
-	FUNCTION_START(inl,4)
-	movl	(%esp), %edx
-	xorl    %eax, %eax
-	inl	(%dx)
-	FUNCTION_END(inl)
-
-	FUNCTION_START(outb,8)
-	movl	(%esp), %edx
-	movl    4(%esp), %eax
-	outb	(%dx)
-	FUNCTION_END(outb)
-
-	FUNCTION_START(outw,8)
-	movl	(%esp), %edx
-	movl    4(%esp), %eax
-	outw	(%dx)
-	FUNCTION_END(outw)
-
-	FUNCTION_START(outl,8)
-	movl	(%esp), %edx
-	movl    4(%esp), %eax
-	outl	(%dx)
-	FUNCTION_END(outl)
-
+/ Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+/ 
+/ 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 (including the next
+/ paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+
+#ifdef INLINE_ASM
+#define FUNCTION_START(f,n)	.inline f,n
+#define FUNCTION_END(f)		.end
+#else
+#define _ASM
+#include <sys/asm_linkage.h>
+#define FUNCTION_START(f,n)	ENTRY(f)
+#define FUNCTION_END(f)		ret; SET_SIZE(f)
+#endif
+
+	FUNCTION_START(inb,4)
+	movl	(%esp), %edx
+	xorl    %eax, %eax
+	inb	(%dx)
+	FUNCTION_END(inb)
+
+	FUNCTION_START(inw,4)
+	movl	(%esp), %edx
+	xorl    %eax, %eax
+	inw	(%dx)
+	FUNCTION_END(inw)
+
+	FUNCTION_START(inl,4)
+	movl	(%esp), %edx
+	xorl    %eax, %eax
+	inl	(%dx)
+	FUNCTION_END(inl)
+
+	FUNCTION_START(outb,8)
+	movl	(%esp), %edx
+	movl    4(%esp), %eax
+	outb	(%dx)
+	FUNCTION_END(outb)
+
+	FUNCTION_START(outw,8)
+	movl	(%esp), %edx
+	movl    4(%esp), %eax
+	outw	(%dx)
+	FUNCTION_END(outw)
+
+	FUNCTION_START(outl,8)
+	movl	(%esp), %edx
+	movl    4(%esp), %eax
+	outl	(%dx)
+	FUNCTION_END(outl)
+
diff --git a/xorg-server/hw/xfree86/os-support/solaris/solaris-sparcv8plus.S b/xorg-server/hw/xfree86/os-support/solaris/solaris-sparcv8plus.S
index 3bb8d241c..0ecafb352 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/solaris-sparcv8plus.S
+++ b/xorg-server/hw/xfree86/os-support/solaris/solaris-sparcv8plus.S
@@ -1,138 +1,138 @@
-/* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * 
- * 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 (including the next
- * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
- */
-
-#ifdef INLINE_ASM
-#define FUNCTION_START(f,n)	.inline f,n
-#define FUNCTION_END(f)		.end
-#else
-#define _ASM
-#include <sys/asm_linkage.h>
-#define FUNCTION_START(f,n)	ENTRY(f)
-#define FUNCTION_END(f)		retl; nop; SET_SIZE(f)
-#endif
-
-/* Converted from common/compiler.h gcc inline format to Sun cc inline
- * format by Kenjiro Tsuji	
- *	
- *	The value 0x88 means ASI_PRIMARY_LITTLE.
- *	The store or load to/from the address space will be done
- *	as little-endian. In the original xrog code, the value
- *	is defined as the macro ASI_PL.
- *
- *	In the original xorg code, "membar #StoreStore|#StoreLoad"
- *	is directly implemented as an instruction "0x8143e00a".
- *
- */
-
-	FUNCTION_START(outb, 0)
-	stba	%o1, [%o0] 0x88
-	membar	#StoreStore|#StoreLoad
-	FUNCTION_END(outb)
-
-	FUNCTION_START(outw, 0)
-	stha	%o1, [%o0] 0x88
-	membar	#StoreStore|#StoreLoad
-	FUNCTION_END(outw)
-
-	FUNCTION_START(outl, 0)
-	sta	%o1, [%o0] 0x88
-	membar	#StoreStore|#StoreLoad
-	FUNCTION_END(outl)
-
-	FUNCTION_START(inb, 0)
-	lduba	[%o0] 0x88, %o0
-	FUNCTION_END(inb)
-
-	FUNCTION_START(inw, 0)
-	lduha	[%o0] 0x88, %o0
-	FUNCTION_END(inw)
-
-	FUNCTION_START(inl, 0)
-	lda	[%o0] 0x88, %o0
-	FUNCTION_END(inl)
-
-	FUNCTION_START(xf86ReadMmio8, 0)
-	lduba	[%o0 + %o1] 0x88, %o0
-	FUNCTION_END(xf86ReadMmio8)
-
-	FUNCTION_START(xf86ReadMmio16Be, 0)
-	lduh	[%o0 + %o1], %o0
-	FUNCTION_END(xf86ReadMmio16Be)
-
-	FUNCTION_START(xf86ReadMmio16Le, 0)
-	lduha	[%o0 + %o1] 0x88, %o0
-	FUNCTION_END(xf86ReadMmio16Le)
-
-	FUNCTION_START(xf86ReadMmio32Be, 0)
-	ld	[%o0 + %o1], %o0
-	FUNCTION_END(xf86ReadMmio32Be)
-
-	FUNCTION_START(xf86ReadMmio32Le, 0)
-	lda	[%o0 + %o1] 0x88, %o0
-	FUNCTION_END(xf86ReadMmio32Le)
-
-	FUNCTION_START(xf86WriteMmio8, 0)
-	stba	%o2, [%o0 + %o1] 0x88
-	membar	#StoreStore|#StoreLoad
-	FUNCTION_END(xf86WriteMmio8)
-
-	FUNCTION_START(xf86WriteMmio16Be, 0)
-	sth	%o2, [%o0 + %o1]
-	membar	#StoreStore|#StoreLoad
-	FUNCTION_END(xf86WriteMmio16Be)
-
-	FUNCTION_START(xf86WriteMmio16Le, 0)
-	stha	%o2, [%o0 + %o1] 0x88
-	membar	#StoreStore|#StoreLoad
-	FUNCTION_END(xf86WriteMmio16Le)
-
-	FUNCTION_START(xf86WriteMmio32Be, 0)
-	st	%o2, [%o0 + %o1]
-	membar	#StoreStore|#StoreLoad
-	FUNCTION_END(xf86WriteMmio32Be)
-
-	FUNCTION_START(xf86WriteMmio32Le, 0)
-	sta	%o2, [%o0 + %o1] 0x88
-	membar	#StoreStore|#StoreLoad
-	FUNCTION_END(xf86WriteMmio32Le)
-
-	FUNCTION_START(xf86WriteMmio8NB, 0)
-	add	%o0, %o1, %o0
-	stba	%o2, [%o0] 0x88
-	FUNCTION_END(xf86WriteMmio8NB)
-
-	FUNCTION_START(xf86WriteMmio16BeNB, 0)
-	sth	%o2, [%o0 + %o1]
-	FUNCTION_END(xf86WriteMmio16BeNB)
-
-	FUNCTION_START(xf86WriteMmio16LeNB, 0)
-	stha	%o2, [%o0 + %o1] 0x88
-	FUNCTION_END(xf86WriteMmio16LeNB)
-
-	FUNCTION_START(xf86WriteMmio32BeNB, 0)
-	st	%o2, [%o0 + %o1]
-	FUNCTION_END(xf86WriteMmio32BeNB)
-
-	FUNCTION_START(xf86WriteMmio32LeNB, 0)
-	sta	%o2, [%o0 + %o1] 0x88
-	FUNCTION_END(xf86WriteMmio32LeNB)
-
+/* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * 
+ * 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 (including the next
+ * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+#ifdef INLINE_ASM
+#define FUNCTION_START(f,n)	.inline f,n
+#define FUNCTION_END(f)		.end
+#else
+#define _ASM
+#include <sys/asm_linkage.h>
+#define FUNCTION_START(f,n)	ENTRY(f)
+#define FUNCTION_END(f)		retl; nop; SET_SIZE(f)
+#endif
+
+/* Converted from common/compiler.h gcc inline format to Sun cc inline
+ * format by Kenjiro Tsuji	
+ *	
+ *	The value 0x88 means ASI_PRIMARY_LITTLE.
+ *	The store or load to/from the address space will be done
+ *	as little-endian. In the original xrog code, the value
+ *	is defined as the macro ASI_PL.
+ *
+ *	In the original xorg code, "membar #StoreStore|#StoreLoad"
+ *	is directly implemented as an instruction "0x8143e00a".
+ *
+ */
+
+	FUNCTION_START(outb, 0)
+	stba	%o1, [%o0] 0x88
+	membar	#StoreStore|#StoreLoad
+	FUNCTION_END(outb)
+
+	FUNCTION_START(outw, 0)
+	stha	%o1, [%o0] 0x88
+	membar	#StoreStore|#StoreLoad
+	FUNCTION_END(outw)
+
+	FUNCTION_START(outl, 0)
+	sta	%o1, [%o0] 0x88
+	membar	#StoreStore|#StoreLoad
+	FUNCTION_END(outl)
+
+	FUNCTION_START(inb, 0)
+	lduba	[%o0] 0x88, %o0
+	FUNCTION_END(inb)
+
+	FUNCTION_START(inw, 0)
+	lduha	[%o0] 0x88, %o0
+	FUNCTION_END(inw)
+
+	FUNCTION_START(inl, 0)
+	lda	[%o0] 0x88, %o0
+	FUNCTION_END(inl)
+
+	FUNCTION_START(xf86ReadMmio8, 0)
+	lduba	[%o0 + %o1] 0x88, %o0
+	FUNCTION_END(xf86ReadMmio8)
+
+	FUNCTION_START(xf86ReadMmio16Be, 0)
+	lduh	[%o0 + %o1], %o0
+	FUNCTION_END(xf86ReadMmio16Be)
+
+	FUNCTION_START(xf86ReadMmio16Le, 0)
+	lduha	[%o0 + %o1] 0x88, %o0
+	FUNCTION_END(xf86ReadMmio16Le)
+
+	FUNCTION_START(xf86ReadMmio32Be, 0)
+	ld	[%o0 + %o1], %o0
+	FUNCTION_END(xf86ReadMmio32Be)
+
+	FUNCTION_START(xf86ReadMmio32Le, 0)
+	lda	[%o0 + %o1] 0x88, %o0
+	FUNCTION_END(xf86ReadMmio32Le)
+
+	FUNCTION_START(xf86WriteMmio8, 0)
+	stba	%o2, [%o0 + %o1] 0x88
+	membar	#StoreStore|#StoreLoad
+	FUNCTION_END(xf86WriteMmio8)
+
+	FUNCTION_START(xf86WriteMmio16Be, 0)
+	sth	%o2, [%o0 + %o1]
+	membar	#StoreStore|#StoreLoad
+	FUNCTION_END(xf86WriteMmio16Be)
+
+	FUNCTION_START(xf86WriteMmio16Le, 0)
+	stha	%o2, [%o0 + %o1] 0x88
+	membar	#StoreStore|#StoreLoad
+	FUNCTION_END(xf86WriteMmio16Le)
+
+	FUNCTION_START(xf86WriteMmio32Be, 0)
+	st	%o2, [%o0 + %o1]
+	membar	#StoreStore|#StoreLoad
+	FUNCTION_END(xf86WriteMmio32Be)
+
+	FUNCTION_START(xf86WriteMmio32Le, 0)
+	sta	%o2, [%o0 + %o1] 0x88
+	membar	#StoreStore|#StoreLoad
+	FUNCTION_END(xf86WriteMmio32Le)
+
+	FUNCTION_START(xf86WriteMmio8NB, 0)
+	add	%o0, %o1, %o0
+	stba	%o2, [%o0] 0x88
+	FUNCTION_END(xf86WriteMmio8NB)
+
+	FUNCTION_START(xf86WriteMmio16BeNB, 0)
+	sth	%o2, [%o0 + %o1]
+	FUNCTION_END(xf86WriteMmio16BeNB)
+
+	FUNCTION_START(xf86WriteMmio16LeNB, 0)
+	stha	%o2, [%o0 + %o1] 0x88
+	FUNCTION_END(xf86WriteMmio16LeNB)
+
+	FUNCTION_START(xf86WriteMmio32BeNB, 0)
+	st	%o2, [%o0 + %o1]
+	FUNCTION_END(xf86WriteMmio32BeNB)
+
+	FUNCTION_START(xf86WriteMmio32LeNB, 0)
+	sta	%o2, [%o0 + %o1] 0x88
+	FUNCTION_END(xf86WriteMmio32LeNB)
+
diff --git a/xorg-server/hw/xfree86/os-support/solaris/sun_inout.s b/xorg-server/hw/xfree86/os-support/solaris/sun_inout.s
index e8f03d0e8..c13ba8b2f 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/sun_inout.s
+++ b/xorg-server/hw/xfree86/os-support/solaris/sun_inout.s
@@ -1,124 +1,124 @@
-/ $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_inout.s,v 1.1 2001/05/28 02:42:31 tsi Exp $
-/
-/ Copyright 1994-2001 The XFree86 Project, Inc.  All Rights Reserved.
-/
-/ 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
-/ XFREE86 PROJECT 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 XFree86 Project 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
-/ XFree86 Project.
-/
-/
-/ File: sun_inout.s
-/
-/ Purpose: Provide inb(), inw(), inl(), outb(), outw(), outl() functions
-/	   for Solaris x86 using the ProWorks compiler by SunPro
-/
-/ Author:  Installed into XFree86 SuperProbe by Doug Anson (danson@lgc.com)
-/	   Portions donated to XFree86 by Steve Dever (Steve.Dever@Eng.Sun.Com)
-/
-/ Synopsis: (c callable external declarations)
-/	   extern unsigned char inb(int port);
-/	   extern unsigned short inw(int port);
-/	   extern unsigned long inl(int port);
-/	   extern void outb(int port, unsigned char value);
-/	   extern void outw(int port, unsigned short value);
-/	   extern void outl(int port, unsigned long value);
-/
-
-.file "sunos_inout.s"
-.text
-
-.globl	inb
-.globl	inw
-.globl	inl
-.globl	outb
-.globl	outw
-.globl	outl
-
-/
-/ unsigned char inb(int port);
-/
-.align	4
-inb:
-	movl 4(%esp),%edx
-	subl %eax,%eax
-	inb  (%dx)
-	ret
-.type	inb,@function
-.size	inb,.-inb
-
-/
-/ unsigned short inw(int port);
-/
-.align	4
-inw:
-	movl 4(%esp),%edx
-	subl %eax,%eax
-	inw  (%dx)
-	ret
-.type	inw,@function
-.size	inw,.-inw
-
-/
-/ unsigned long inl(int port);
-/
-.align	4
-inl:
-	movl 4(%esp),%edx
-	inl  (%dx)
-	ret
-.type	inl,@function
-.size	inl,.-inl
-
-/
-/     void outb(int port, unsigned char value);
-/
-.align	4
-outb:
-	movl 4(%esp),%edx
-	movl 8(%esp),%eax
-	outb (%dx)
-	ret
-.type	outb,@function
-.size	outb,.-outb
-
-/
-/     void outw(int port, unsigned short value);
-/
-.align	4
-outw:
-	movl 4(%esp),%edx
-	movl 8(%esp),%eax
-	outw (%dx)
-	ret
-.type	outw,@function
-.size	outw,.-outw
-
-/
-/     void outl(int port, unsigned long value);
-/
-.align	4
-outl:
-	movl 4(%esp),%edx
-	movl 8(%esp),%eax
-	outl (%dx)
-	ret
-.type	outl,@function
-.size	outl,.-outl
+/ $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_inout.s,v 1.1 2001/05/28 02:42:31 tsi Exp $
+/
+/ Copyright 1994-2001 The XFree86 Project, Inc.  All Rights Reserved.
+/
+/ 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
+/ XFREE86 PROJECT 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 XFree86 Project 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
+/ XFree86 Project.
+/
+/
+/ File: sun_inout.s
+/
+/ Purpose: Provide inb(), inw(), inl(), outb(), outw(), outl() functions
+/	   for Solaris x86 using the ProWorks compiler by SunPro
+/
+/ Author:  Installed into XFree86 SuperProbe by Doug Anson (danson@lgc.com)
+/	   Portions donated to XFree86 by Steve Dever (Steve.Dever@Eng.Sun.Com)
+/
+/ Synopsis: (c callable external declarations)
+/	   extern unsigned char inb(int port);
+/	   extern unsigned short inw(int port);
+/	   extern unsigned long inl(int port);
+/	   extern void outb(int port, unsigned char value);
+/	   extern void outw(int port, unsigned short value);
+/	   extern void outl(int port, unsigned long value);
+/
+
+.file "sunos_inout.s"
+.text
+
+.globl	inb
+.globl	inw
+.globl	inl
+.globl	outb
+.globl	outw
+.globl	outl
+
+/
+/ unsigned char inb(int port);
+/
+.align	4
+inb:
+	movl 4(%esp),%edx
+	subl %eax,%eax
+	inb  (%dx)
+	ret
+.type	inb,@function
+.size	inb,.-inb
+
+/
+/ unsigned short inw(int port);
+/
+.align	4
+inw:
+	movl 4(%esp),%edx
+	subl %eax,%eax
+	inw  (%dx)
+	ret
+.type	inw,@function
+.size	inw,.-inw
+
+/
+/ unsigned long inl(int port);
+/
+.align	4
+inl:
+	movl 4(%esp),%edx
+	inl  (%dx)
+	ret
+.type	inl,@function
+.size	inl,.-inl
+
+/
+/     void outb(int port, unsigned char value);
+/
+.align	4
+outb:
+	movl 4(%esp),%edx
+	movl 8(%esp),%eax
+	outb (%dx)
+	ret
+.type	outb,@function
+.size	outb,.-outb
+
+/
+/     void outw(int port, unsigned short value);
+/
+.align	4
+outw:
+	movl 4(%esp),%edx
+	movl 8(%esp),%eax
+	outw (%dx)
+	ret
+.type	outw,@function
+.size	outw,.-outw
+
+/
+/     void outl(int port, unsigned long value);
+/
+.align	4
+outl:
+	movl 4(%esp),%edx
+	movl 8(%esp),%eax
+	outl (%dx)
+	ret
+.type	outl,@function
+.size	outl,.-outl
diff --git a/xorg-server/hw/xfree86/ramdac/.gitignore b/xorg-server/hw/xfree86/ramdac/.gitignore
new file mode 100644
index 000000000..9074a4300
--- /dev/null
+++ b/xorg-server/hw/xfree86/ramdac/.gitignore
@@ -0,0 +1,2 @@
+#		Add & Override for this directory and it's subdirectories
+xf86BitOrder.c
diff --git a/xorg-server/hw/xfree86/ramdac/CURSOR.NOTES b/xorg-server/hw/xfree86/ramdac/CURSOR.NOTES
index 726e2edc1..a0ecd02ae 100644
--- a/xorg-server/hw/xfree86/ramdac/CURSOR.NOTES
+++ b/xorg-server/hw/xfree86/ramdac/CURSOR.NOTES
@@ -1,191 +1,191 @@
-			CURSOR.NOTES
-
-  This file describes how to add hardware cursor support to a chipset
-driver.  Though the cursor support itself is in the ramdac module,
-cursor management is separate from the rest of the module.
-
-
-1) CURSOR INITIALIZATION AND SHUTDOWN
-
-   All relevant prototypes and defines are in xf86Cursor.h.
-
-  To initialize the cursor, the driver should allocate an 
-xf86CursorInfoRec via xf86CreateCursorInfoRec(), fill it out as described 
-later in this  document and pass it to xf86InitCursor().  xf86InitCursor() 
-must be called _after_ the software cursor initialization (usually
-miDCInitialize).
-
-   When shutting down, the driver should free the xf86CursorInfoRec
-structure in its CloseScreen function via xf86DestroyCursorInfoRec().
-
-
-2) FILLING OUT THE xf86CursorInfoRec
-
-   The driver informs the ramdac module of it's hardware cursor capablities by
-filling out an xf86CursorInfoRec structure and passing it to xf86InitCursor().
-The xf86CursorInfoRec contains the following function pointers:
-
-
-/**** These functions are required ****/
-
-void ShowCursor(ScrnInfoPtr pScrn)
-
-    ShowCursor should display the current cursor.
-
-void HideCursor(ScrnInfoPtr pScrn)
-
-    HideCursor should hide the current cursor.
-
-void SetCursorPosition(ScrnInfoPtr pScrn, int x, int y)
-
-    Set the cursor position to (x,y).  X and/or y may be negative
-    indicating that the cursor image is partially offscreen on
-    the left and/or top edges of the screen.  It is up to the
-    driver to trap for this and deal with that situation.
-
-void SetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
-
-    Set the cursor foreground and background colors.  In 8bpp, fg and
-    bg are indicies into the current colormap unless the 
-    HARDWARE_CURSOR_TRUECOLOR_AT_8BPP flag is set.  In that case
-    and in all other bpps the fg and bg are in 8-8-8 RGB format.
-    
-void LoadCursorImage(ScrnInfoPtr pScrn, unsigned char *bits)
-
-    LoadCursorImage is how the hardware cursor bits computed by the
-    RealizeCursor function will be passed to the driver when the cursor
-    shape needs to be changed.
-
-
-/**** These functions are optional ****/
-
-    
-unsigned char* RealizeCursor(xf86CursorInfoPtr infoPtr, CursorPtr pCurs) 
-
-    If RealizeCursor is not provided by the driver, one will be provided
-    for you based on the Flags field described below.  The driver must
-    provide this function if the hardware cursor format is not one of
-    the common ones supported by this module.
-  
-
-Bool UseHWCursor(ScreenPtr pScreen, CursorPtr pCurs)
-
-    If the driver is unable to use a hardware cursor for reasons
-    other than the cursor being larger than the maximum specified
-    in the MaxWidth or MaxHeight field below, it can supply the
-    UseHWCursor function.  If UseHWCursor is provided by the driver,
-    it will be called whenever the cursor shape changes or the video
-    mode changes.  This is useful for when the hardware cursor cannot
-    be used in interlaced or doublescan modes.
-
-
-/**** The following fields are required ****/
-
-MaxWidth
-MaxHeight
-
-    These indicate the largest sized cursor that can be a hardware
-    cursor.  It will fall back to a software cursor when a cursor
-    exceeding this size needs to be used.
-
-
-Flags
-
-   /* Color related flags */
-
-   HARDWARE_CURSOR_TRUECOLOR_AT_8BPP
-
-   This indicates that the colors passed to the SetCursorColors
-   function should not be in 8-8-8 RGB format in 8bpp but rather,
-   they should be the pixel values from the current colormap.
-
-
-   /* Cursor data loading flags */
-
-   HARDWARE_CURSOR_SHOW_TRANSPARENT
-
-   The HideCursor entry will normally be called instead of displaying a
-   completely transparent cursor, or when a switch to a software cursor
-   needs to occur.  This flag prevents this behaviour, thus causing the
-   LoadCursorImage entry to be called with transparent cursor data.
-   NOTE:  If you use this flag and provide your own RealizeCursor() entry,
-          ensure this entry returns transparent cursor data when called
-          with a NULL pCurs parameter.
-
-   HARDWARE_CURSOR_UPDATE_UNHIDDEN
-
-   This flag prevents the HideCursor call that would normally occur just before
-   the LoadCursorImage entry is to be called to load a new hardware cursor
-   image.
-
-
-   /* Cursor data packing flags */
-
-   Hardware cursor data consists of two pieces, a source and a mask.
-   The mask is a bitmap indicating which parts of the cursor are 
-   transparent and which parts are drawn.  The source is a bitmap
-   indicating which parts of the non-transparent portion of the the
-   cursor should be painted in the foreground color and which should
-   be painted in the background color.
-
-   HARDWARE_CURSOR_INVERT_MASK
-
-   By default, set bits indicate the opaque part of the mask bitmap
-   and clear bits indicate the transparent part.  If your hardware
-   wants this the opposite way, this flag will invert the mask.
-
-   HARDWARE_CURSOR_SWAP_SOURCE_AND_MASK
-
-   By default, RealizeCursor will store the source first and then
-   the mask.  If the hardware needs this order reversed then this
-   flag should be set.
-
-   HARDWARE_CURSOR_AND_SOURCE_WITH_MASK
-
-   This flag will have the module logical AND the source with the mask to make  
-   sure there are no source bits set if the corresponding mask bits 
-   aren't set.  Some hardware will not care if source bits are set where
-   there are supposed to be transparent areas, but some hardware will
-   interpret this as a third cursor color or similar.  That type of
-   hardware will need this flag set.
-
-   HARDWARE_CURSOR_BIT_ORDER_MSBFIRST
-
-   By default, it is assumed that the least significant bit in each byte
-   corresponds to the leftmost pixel on the screen.  If your hardware
-   has this reversed you should set this flag.
-
-   HARDWARE_CURSOR_NIBBLE_SWAPPED
-
-   If your hardware requires byte swapping of the hardware cursor, enable
-   this option.
-
-
-   /* Source-Mask interleaving flags */
-
-   By default the source and mask data are inlined (source first unless
-   the HARDWARE_CURSOR_SWAP_SOURCE_AND_MASK flag is set).  Some hardware
-   will require the source and mask to be interleaved, that is, X number
-   of source bits should packed and then X number of mask bits repeating
-   until the entire pattern is stored.  The following flags describe the
-   bit interleave.
-
-   HARDWARE_CURSOR_SOURCE_MASK_NOT_INTERLEAVED   
-
-   This one is the default.
- 
-   The following are for interleaved cursors.
-    
-   HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1        
-   HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_8        
-   HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_16       
-   HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_32       
-   HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64   
-
-   And once again, if your hardware requires something different than
-   these packing styles, your driver can supply its own RealizeCursor
-   function.   
-
-
-
-$XFree86: xc/programs/Xserver/hw/xfree86/ramdac/CURSOR.NOTES,v 1.4tsi Exp $
+			CURSOR.NOTES
+
+  This file describes how to add hardware cursor support to a chipset
+driver.  Though the cursor support itself is in the ramdac module,
+cursor management is separate from the rest of the module.
+
+
+1) CURSOR INITIALIZATION AND SHUTDOWN
+
+   All relevant prototypes and defines are in xf86Cursor.h.
+
+  To initialize the cursor, the driver should allocate an 
+xf86CursorInfoRec via xf86CreateCursorInfoRec(), fill it out as described 
+later in this  document and pass it to xf86InitCursor().  xf86InitCursor() 
+must be called _after_ the software cursor initialization (usually
+miDCInitialize).
+
+   When shutting down, the driver should free the xf86CursorInfoRec
+structure in its CloseScreen function via xf86DestroyCursorInfoRec().
+
+
+2) FILLING OUT THE xf86CursorInfoRec
+
+   The driver informs the ramdac module of it's hardware cursor capablities by
+filling out an xf86CursorInfoRec structure and passing it to xf86InitCursor().
+The xf86CursorInfoRec contains the following function pointers:
+
+
+/**** These functions are required ****/
+
+void ShowCursor(ScrnInfoPtr pScrn)
+
+    ShowCursor should display the current cursor.
+
+void HideCursor(ScrnInfoPtr pScrn)
+
+    HideCursor should hide the current cursor.
+
+void SetCursorPosition(ScrnInfoPtr pScrn, int x, int y)
+
+    Set the cursor position to (x,y).  X and/or y may be negative
+    indicating that the cursor image is partially offscreen on
+    the left and/or top edges of the screen.  It is up to the
+    driver to trap for this and deal with that situation.
+
+void SetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
+
+    Set the cursor foreground and background colors.  In 8bpp, fg and
+    bg are indicies into the current colormap unless the 
+    HARDWARE_CURSOR_TRUECOLOR_AT_8BPP flag is set.  In that case
+    and in all other bpps the fg and bg are in 8-8-8 RGB format.
+    
+void LoadCursorImage(ScrnInfoPtr pScrn, unsigned char *bits)
+
+    LoadCursorImage is how the hardware cursor bits computed by the
+    RealizeCursor function will be passed to the driver when the cursor
+    shape needs to be changed.
+
+
+/**** These functions are optional ****/
+
+    
+unsigned char* RealizeCursor(xf86CursorInfoPtr infoPtr, CursorPtr pCurs) 
+
+    If RealizeCursor is not provided by the driver, one will be provided
+    for you based on the Flags field described below.  The driver must
+    provide this function if the hardware cursor format is not one of
+    the common ones supported by this module.
+  
+
+Bool UseHWCursor(ScreenPtr pScreen, CursorPtr pCurs)
+
+    If the driver is unable to use a hardware cursor for reasons
+    other than the cursor being larger than the maximum specified
+    in the MaxWidth or MaxHeight field below, it can supply the
+    UseHWCursor function.  If UseHWCursor is provided by the driver,
+    it will be called whenever the cursor shape changes or the video
+    mode changes.  This is useful for when the hardware cursor cannot
+    be used in interlaced or doublescan modes.
+
+
+/**** The following fields are required ****/
+
+MaxWidth
+MaxHeight
+
+    These indicate the largest sized cursor that can be a hardware
+    cursor.  It will fall back to a software cursor when a cursor
+    exceeding this size needs to be used.
+
+
+Flags
+
+   /* Color related flags */
+
+   HARDWARE_CURSOR_TRUECOLOR_AT_8BPP
+
+   This indicates that the colors passed to the SetCursorColors
+   function should not be in 8-8-8 RGB format in 8bpp but rather,
+   they should be the pixel values from the current colormap.
+
+
+   /* Cursor data loading flags */
+
+   HARDWARE_CURSOR_SHOW_TRANSPARENT
+
+   The HideCursor entry will normally be called instead of displaying a
+   completely transparent cursor, or when a switch to a software cursor
+   needs to occur.  This flag prevents this behaviour, thus causing the
+   LoadCursorImage entry to be called with transparent cursor data.
+   NOTE:  If you use this flag and provide your own RealizeCursor() entry,
+          ensure this entry returns transparent cursor data when called
+          with a NULL pCurs parameter.
+
+   HARDWARE_CURSOR_UPDATE_UNHIDDEN
+
+   This flag prevents the HideCursor call that would normally occur just before
+   the LoadCursorImage entry is to be called to load a new hardware cursor
+   image.
+
+
+   /* Cursor data packing flags */
+
+   Hardware cursor data consists of two pieces, a source and a mask.
+   The mask is a bitmap indicating which parts of the cursor are 
+   transparent and which parts are drawn.  The source is a bitmap
+   indicating which parts of the non-transparent portion of the the
+   cursor should be painted in the foreground color and which should
+   be painted in the background color.
+
+   HARDWARE_CURSOR_INVERT_MASK
+
+   By default, set bits indicate the opaque part of the mask bitmap
+   and clear bits indicate the transparent part.  If your hardware
+   wants this the opposite way, this flag will invert the mask.
+
+   HARDWARE_CURSOR_SWAP_SOURCE_AND_MASK
+
+   By default, RealizeCursor will store the source first and then
+   the mask.  If the hardware needs this order reversed then this
+   flag should be set.
+
+   HARDWARE_CURSOR_AND_SOURCE_WITH_MASK
+
+   This flag will have the module logical AND the source with the mask to make  
+   sure there are no source bits set if the corresponding mask bits 
+   aren't set.  Some hardware will not care if source bits are set where
+   there are supposed to be transparent areas, but some hardware will
+   interpret this as a third cursor color or similar.  That type of
+   hardware will need this flag set.
+
+   HARDWARE_CURSOR_BIT_ORDER_MSBFIRST
+
+   By default, it is assumed that the least significant bit in each byte
+   corresponds to the leftmost pixel on the screen.  If your hardware
+   has this reversed you should set this flag.
+
+   HARDWARE_CURSOR_NIBBLE_SWAPPED
+
+   If your hardware requires byte swapping of the hardware cursor, enable
+   this option.
+
+
+   /* Source-Mask interleaving flags */
+
+   By default the source and mask data are inlined (source first unless
+   the HARDWARE_CURSOR_SWAP_SOURCE_AND_MASK flag is set).  Some hardware
+   will require the source and mask to be interleaved, that is, X number
+   of source bits should packed and then X number of mask bits repeating
+   until the entire pattern is stored.  The following flags describe the
+   bit interleave.
+
+   HARDWARE_CURSOR_SOURCE_MASK_NOT_INTERLEAVED   
+
+   This one is the default.
+ 
+   The following are for interleaved cursors.
+    
+   HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1        
+   HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_8        
+   HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_16       
+   HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_32       
+   HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64   
+
+   And once again, if your hardware requires something different than
+   these packing styles, your driver can supply its own RealizeCursor
+   function.   
+
+
+
+$XFree86: xc/programs/Xserver/hw/xfree86/ramdac/CURSOR.NOTES,v 1.4tsi Exp $
diff --git a/xorg-server/hw/xfree86/ramdac/Makefile.am b/xorg-server/hw/xfree86/ramdac/Makefile.am
index e6f8ed552..3c3780516 100644
--- a/xorg-server/hw/xfree86/ramdac/Makefile.am
+++ b/xorg-server/hw/xfree86/ramdac/Makefile.am
@@ -1,19 +1,19 @@
-noinst_LTLIBRARIES = libramdac.la
-
-libramdac_la_SOURCES = xf86RamDac.c xf86RamDacCmap.c \
-                      xf86Cursor.c xf86HWCurs.c IBM.c BT.c TI.c \
-		      xf86BitOrder.c
-
-sdk_HEADERS = BT.h IBM.h TI.h xf86Cursor.h xf86RamDac.h
-
-DISTCLEANFILES = xf86BitOrder.c
-EXTRA_DIST = BTPriv.h IBMPriv.h TIPriv.h xf86CursorPriv.h xf86RamDacPriv.h \
-	CURSOR.NOTES
-
-AM_CFLAGS = -DXAAReverseBitOrder=xf86ReverseBitOrder -DRAMDAC_MODULE \
-            $(DIX_CFLAGS) $(XORG_CFLAGS)
-INCLUDES = $(XORG_INCS)
-
-xf86BitOrder.c:
-	$(AM_V_GEN)echo "#define XAAReverseBitOrder xf86ReverseBitOrder" > $@
-	$(AM_V_GEN)echo "#include \"$(srcdir)/../xaa/xaaBitOrder.c\"" >> $@
+noinst_LTLIBRARIES = libramdac.la
+
+libramdac_la_SOURCES = xf86RamDac.c xf86RamDacCmap.c \
+                      xf86Cursor.c xf86HWCurs.c IBM.c BT.c TI.c \
+		      xf86BitOrder.c
+
+sdk_HEADERS = BT.h IBM.h TI.h xf86Cursor.h xf86RamDac.h
+
+DISTCLEANFILES = xf86BitOrder.c
+EXTRA_DIST = BTPriv.h IBMPriv.h TIPriv.h xf86CursorPriv.h xf86RamDacPriv.h \
+	CURSOR.NOTES
+
+AM_CFLAGS = -DXAAReverseBitOrder=xf86ReverseBitOrder -DRAMDAC_MODULE \
+            $(DIX_CFLAGS) $(XORG_CFLAGS)
+INCLUDES = $(XORG_INCS)
+
+xf86BitOrder.c:
+	$(AM_V_GEN)echo "#define XAAReverseBitOrder xf86ReverseBitOrder" > $@
+	$(AM_V_GEN)echo "#include \"$(srcdir)/../xaa/xaaBitOrder.c\"" >> $@
diff --git a/xorg-server/hw/xfree86/ramdac/xf86Cursor.c b/xorg-server/hw/xfree86/ramdac/xf86Cursor.c
index 7fd70fc34..15e2ada78 100644
--- a/xorg-server/hw/xfree86/ramdac/xf86Cursor.c
+++ b/xorg-server/hw/xfree86/ramdac/xf86Cursor.c
@@ -43,14 +43,14 @@ static miPointerSpriteFuncRec xf86CursorSpriteFuncs = {
 static void xf86CursorInstallColormap(ColormapPtr);
 static void xf86CursorRecolorCursor(DeviceIntPtr pDev, ScreenPtr, CursorPtr,
                                     Bool);
-static Bool xf86CursorCloseScreen(int, ScreenPtr);
+static Bool xf86CursorCloseScreen(ScreenPtr);
 static void xf86CursorQueryBestSize(int, unsigned short *, unsigned short *,
                                     ScreenPtr);
 
 /* ScrnInfoRec functions */
 
-static void xf86CursorEnableDisableFBAccess(int, Bool);
-static Bool xf86CursorSwitchMode(int, DisplayModePtr, int);
+static void xf86CursorEnableDisableFBAccess(ScrnInfoPtr, Bool);
+static Bool xf86CursorSwitchMode(ScrnInfoPtr, DisplayModePtr);
 
 Bool
 xf86InitCursor(ScreenPtr pScreen, xf86CursorInfoPtr infoPtr)
@@ -118,7 +118,7 @@ xf86InitCursor(ScreenPtr pScreen, xf86CursorInfoPtr infoPtr)
 /***** Screen functions *****/
 
 static Bool
-xf86CursorCloseScreen(int i, ScreenPtr pScreen)
+xf86CursorCloseScreen(ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     miPointerScreenPtr PointPriv =
@@ -149,7 +149,7 @@ xf86CursorCloseScreen(int i, ScreenPtr pScreen)
     free(ScreenPriv->transparentData);
     free(ScreenPriv);
 
-    return (*pScreen->CloseScreen) (i, pScreen);
+    return (*pScreen->CloseScreen) (pScreen);
 }
 
 static void
@@ -203,11 +203,11 @@ xf86CursorRecolorCursor(DeviceIntPtr pDev,
 /***** ScrnInfoRec functions *********/
 
 static void
-xf86CursorEnableDisableFBAccess(int index, Bool enable)
+xf86CursorEnableDisableFBAccess(ScrnInfoPtr pScrn, Bool enable)
 {
     DeviceIntPtr pDev = inputInfo.pointer;
 
-    ScreenPtr pScreen = screenInfo.screens[index];
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     xf86CursorScreenPtr ScreenPriv =
         (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
                                                xf86CursorScreenKey);
@@ -223,7 +223,7 @@ xf86CursorEnableDisableFBAccess(int index, Bool enable)
     }
 
     if (ScreenPriv->EnableDisableFBAccess)
-        (*ScreenPriv->EnableDisableFBAccess) (index, enable);
+        (*ScreenPriv->EnableDisableFBAccess) (pScrn, enable);
 
     if (enable && ScreenPriv->SavedCursor) {
         /*
@@ -237,10 +237,10 @@ xf86CursorEnableDisableFBAccess(int index, Bool enable)
 }
 
 static Bool
-xf86CursorSwitchMode(int index, DisplayModePtr mode, int flags)
+xf86CursorSwitchMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
 {
     Bool ret;
-    ScreenPtr pScreen = screenInfo.screens[index];
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     xf86CursorScreenPtr ScreenPriv =
         (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
                                                xf86CursorScreenKey);
@@ -250,7 +250,7 @@ xf86CursorSwitchMode(int index, DisplayModePtr mode, int flags)
         ScreenPriv->isUp = FALSE;
     }
 
-    ret = (*ScreenPriv->SwitchMode) (index, mode, flags);
+    ret = (*ScreenPriv->SwitchMode) (pScrn, mode);
 
     /*
      * Cannot restore cursor here because the new frame[XY][01] haven't been
diff --git a/xorg-server/hw/xfree86/ramdac/xf86CursorPriv.h b/xorg-server/hw/xfree86/ramdac/xf86CursorPriv.h
index 062b2eb7c..d04f93207 100644
--- a/xorg-server/hw/xfree86/ramdac/xf86CursorPriv.h
+++ b/xorg-server/hw/xfree86/ramdac/xf86CursorPriv.h
@@ -26,7 +26,7 @@ typedef struct {
     miPointerSpriteFuncPtr spriteFuncs;
     Bool PalettedCursor;
     ColormapPtr pInstalledMap;
-    Bool (*SwitchMode) (int, DisplayModePtr, int);
+    Bool (*SwitchMode) (ScrnInfoPtr, DisplayModePtr);
     xf86EnableDisableFBAccessProc *EnableDisableFBAccess;
     CursorPtr SavedCursor;
 
diff --git a/xorg-server/hw/xfree86/shadowfb/shadow.c b/xorg-server/hw/xfree86/shadowfb/shadow.c
index 5aeee6cbf..614501770 100644
--- a/xorg-server/hw/xfree86/shadowfb/shadow.c
+++ b/xorg-server/hw/xfree86/shadowfb/shadow.c
@@ -28,13 +28,13 @@
 
 #include "picturestr.h"
 
-static Bool ShadowCloseScreen(int i, ScreenPtr pScreen);
+static Bool ShadowCloseScreen(ScreenPtr pScreen);
 static void ShadowCopyWindow(WindowPtr pWin,
                              DDXPointRec ptOldOrg, RegionPtr prgn);
 static Bool ShadowCreateGC(GCPtr pGC);
 
-static Bool ShadowEnterVT(int index, int flags);
-static void ShadowLeaveVT(int index, int flags);
+static Bool ShadowEnterVT(ScrnInfoPtr pScrn);
+static void ShadowLeaveVT(ScrnInfoPtr pScrn);
 
 static void ShadowComposite(CARD8 op,
                             PicturePtr pSrc,
@@ -56,8 +56,8 @@ typedef struct {
     CreateGCProcPtr CreateGC;
     ModifyPixmapHeaderProcPtr ModifyPixmapHeader;
     CompositeProcPtr Composite;
-    Bool (*EnterVT) (int, int);
-    void (*LeaveVT) (int, int);
+    Bool (*EnterVT) (ScrnInfoPtr);
+    void (*LeaveVT) (ScrnInfoPtr);
     Bool vtSema;
 } ShadowScreenRec, *ShadowScreenPtr;
 
@@ -192,14 +192,13 @@ ShadowFBInit(ScreenPtr pScreen, RefreshAreaFuncPtr refreshArea)
 /**********************************************************/
 
 static Bool
-ShadowEnterVT(int index, int flags)
+ShadowEnterVT(ScrnInfoPtr pScrn)
 {
-    ScrnInfoPtr pScrn = xf86Screens[index];
     Bool ret;
     ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScrn->pScreen);
 
     pScrn->EnterVT = pPriv->EnterVT;
-    ret = (*pPriv->EnterVT) (index, flags);
+    ret = (*pPriv->EnterVT) (pScrn);
     pPriv->EnterVT = pScrn->EnterVT;
     pScrn->EnterVT = ShadowEnterVT;
     if (ret) {
@@ -211,15 +210,14 @@ ShadowEnterVT(int index, int flags)
 }
 
 static void
-ShadowLeaveVT(int index, int flags)
+ShadowLeaveVT(ScrnInfoPtr pScrn)
 {
-    ScrnInfoPtr pScrn = xf86Screens[index];
-    ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(xf86Screens[index]->pScreen);
+    ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScrn->pScreen);
 
     pPriv->vtSema = FALSE;
 
     pScrn->LeaveVT = pPriv->LeaveVT;
-    (*pPriv->LeaveVT) (index, flags);
+    (*pPriv->LeaveVT) (pScrn);
     pPriv->LeaveVT = pScrn->LeaveVT;
     pScrn->LeaveVT = ShadowLeaveVT;
 }
@@ -227,7 +225,7 @@ ShadowLeaveVT(int index, int flags)
 /**********************************************************/
 
 static Bool
-ShadowCloseScreen(int i, ScreenPtr pScreen)
+ShadowCloseScreen(ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScreen);
@@ -247,7 +245,7 @@ ShadowCloseScreen(int i, ScreenPtr pScreen)
 
     free((pointer) pPriv);
 
-    return (*pScreen->CloseScreen) (i, pScreen);
+    return (*pScreen->CloseScreen) (pScreen);
 }
 
 static void
diff --git a/xorg-server/hw/xfree86/utils/cvt/.gitignore b/xorg-server/hw/xfree86/utils/cvt/.gitignore
new file mode 100644
index 000000000..a217c5563
--- /dev/null
+++ b/xorg-server/hw/xfree86/utils/cvt/.gitignore
@@ -0,0 +1 @@
+cvt
diff --git a/xorg-server/hw/xfree86/utils/gtf/.gitignore b/xorg-server/hw/xfree86/utils/gtf/.gitignore
new file mode 100644
index 000000000..919c993fb
--- /dev/null
+++ b/xorg-server/hw/xfree86/utils/gtf/.gitignore
@@ -0,0 +1 @@
+gtf
diff --git a/xorg-server/hw/xfree86/vbe/vbe.c b/xorg-server/hw/xfree86/vbe/vbe.c
index bbb60e3a1..97a9bcf60 100644
--- a/xorg-server/hw/xfree86/vbe/vbe.c
+++ b/xorg-server/hw/xfree86/vbe/vbe.c
@@ -179,7 +179,7 @@ static Bool
 vbeProbeDDC(vbeInfoPtr pVbe)
 {
     const char *ddc_level;
-    int screen = pVbe->pInt10->scrnIndex;
+    int screen = pVbe->pInt10->pScrn->scrnIndex;
 
     if (pVbe->ddc == DDC_NONE)
         return FALSE;
@@ -262,7 +262,8 @@ vbeReadEDID(vbeInfoPtr pVbe)
     unsigned char *tmp = NULL;
     Bool novbe = FALSE;
     Bool noddc = FALSE;
-    int screen = pVbe->pInt10->scrnIndex;
+    ScrnInfoPtr pScrn = pVbe->pInt10->pScrn;
+    int screen = pScrn->scrnIndex;
     OptionInfoPtr options;
 
     if (!page)
@@ -270,7 +271,7 @@ vbeReadEDID(vbeInfoPtr pVbe)
 
     options = xnfalloc(sizeof(VBEOptions));
     (void) memcpy(options, VBEOptions, sizeof(VBEOptions));
-    xf86ProcessOptions(screen, xf86Screens[screen]->options, options);
+    xf86ProcessOptions(screen, pScrn->options, options);
     xf86GetOptValBool(options, VBEOPT_NOVBE, &novbe);
     xf86GetOptValBool(options, VBEOPT_NODDC, &noddc);
     free(options);
@@ -330,7 +331,7 @@ vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule)
 
     if (!(pModule = pDDCModule)) {
         pModule =
-            xf86LoadSubModule(xf86Screens[pVbe->pInt10->scrnIndex], "ddc");
+            xf86LoadSubModule(pVbe->pInt10->pScrn, "ddc");
         if (!pModule)
             return NULL;
     }
@@ -340,7 +341,7 @@ vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule)
     if (!DDC_data)
         return NULL;
 
-    pMonitor = xf86InterpretEDID(pVbe->pInt10->scrnIndex, DDC_data);
+    pMonitor = xf86InterpretEDID(pVbe->pInt10->pScrn->scrnIndex, DDC_data);
 
     if (!pDDCModule)
         xf86UnloadSubModule(pModule);
@@ -598,7 +599,7 @@ VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction function,
      */
 
     if ((pVbe->version & 0xff00) > 0x100) {
-        int screen = pVbe->pInt10->scrnIndex;
+        int screen = pVbe->pInt10->pScrn->scrnIndex;
 
         if (function == MODE_QUERY || (function == MODE_SAVE && !*memory)) {
             /* Query amount of memory to save state */
@@ -904,7 +905,7 @@ VBEBuildVbeModeList(vbeInfoPtr pVbe, VbeInfoBlock * vbe)
         m->n = id;
         m->next = ModeList;
 
-        xf86DrvMsgVerb(pVbe->pInt10->scrnIndex, X_PROBED, 3,
+        xf86DrvMsgVerb(pVbe->pInt10->pScrn->scrnIndex, X_PROBED, 3,
                        "BIOS reported VESA mode 0x%x: x:%i y:%i bpp:%i\n",
                        m->n, m->width, m->height, m->bpp);
 
@@ -1026,23 +1027,22 @@ VBEDPMSSet(vbeInfoPtr pVbe, int mode)
 }
 
 void
-VBEInterpretPanelID(int scrnIndex, struct vbePanelID *data)
+VBEInterpretPanelID(ScrnInfoPtr pScrn, struct vbePanelID *data)
 {
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     DisplayModePtr mode;
     const float PANEL_HZ = 60.0;
 
     if (!data)
         return;
 
-    xf86DrvMsg(scrnIndex, X_INFO, "PanelID returned panel resolution %dx%d\n",
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "PanelID returned panel resolution %dx%d\n",
                data->hsize, data->vsize);
 
     if (pScrn->monitor->nHsync || pScrn->monitor->nVrefresh)
         return;
 
     if (data->hsize < 320 || data->vsize < 240) {
-        xf86DrvMsg(scrnIndex, X_INFO, "...which I refuse to believe\n");
+        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "...which I refuse to believe\n");
         return;
     }
 
@@ -1069,7 +1069,7 @@ VBEReadPanelID(vbeInfoPtr pVbe)
     int RealOff = pVbe->real_mode_base;
     pointer page = pVbe->memory;
     void *tmp = NULL;
-    int screen = pVbe->pInt10->scrnIndex;
+    int screen = pVbe->pInt10->pScrn->scrnIndex;
 
     pVbe->pInt10->ax = 0x4F11;
     pVbe->pInt10->bx = 0x01;
diff --git a/xorg-server/hw/xfree86/vbe/vbe.h b/xorg-server/hw/xfree86/vbe/vbe.h
index 81be0ff40..3907c53f3 100644
--- a/xorg-server/hw/xfree86/vbe/vbe.h
+++ b/xorg-server/hw/xfree86/vbe/vbe.h
@@ -350,7 +350,7 @@ struct vbePanelID {
     char reserved[14];
 };
 
-extern _X_EXPORT void VBEInterpretPanelID(int scrnIndex,
+extern _X_EXPORT void VBEInterpretPanelID(ScrnInfoPtr pScrn,
                                           struct vbePanelID *data);
 extern _X_EXPORT struct vbePanelID *VBEReadPanelID(vbeInfoPtr pVbe);
 
diff --git a/xorg-server/hw/xfree86/vgahw/Makefile.am b/xorg-server/hw/xfree86/vgahw/Makefile.am
index f48e46a11..0634e47e3 100644
--- a/xorg-server/hw/xfree86/vgahw/Makefile.am
+++ b/xorg-server/hw/xfree86/vgahw/Makefile.am
@@ -1,9 +1,9 @@
-module_LTLIBRARIES = libvgahw.la
-libvgahw_la_LDFLAGS = -avoid-version
-libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c
-INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
-
-sdk_HEADERS = vgaHW.h
-
-EXTRA_DIST = vgaCmap.c
+module_LTLIBRARIES = libvgahw.la
+libvgahw_la_LDFLAGS = -avoid-version
+libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c
+INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c
+AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+
+sdk_HEADERS = vgaHW.h
+
+EXTRA_DIST = vgaCmap.c
diff --git a/xorg-server/hw/xfree86/x86emu/Makefile.am b/xorg-server/hw/xfree86/x86emu/Makefile.am
index df9697767..c4108cffb 100644
--- a/xorg-server/hw/xfree86/x86emu/Makefile.am
+++ b/xorg-server/hw/xfree86/x86emu/Makefile.am
@@ -1,29 +1,29 @@
-if INT10_X86EMU
-noinst_LTLIBRARIES = libx86emu.la
-endif
-
-libx86emu_la_SOURCES = debug.c \
-                      decode.c \
-                      fpu.c \
-                      ops2.c \
-                      ops.c \
-                      prim_ops.c \
-                      sys.c \
-                      x86emu.h
-
-INCLUDES = 
-
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
-
-EXTRA_DIST = validate.c \
-             x86emu/debug.h \
-             x86emu/decode.h \
-             x86emu/fpu.h \
-             x86emu/fpu_regs.h \
-             x86emu/ops.h \
-             x86emu/prim_asm.h \
-             x86emu/prim_ops.h \
-	     x86emu/prim_x86_gcc.h \
-             x86emu/regs.h \
-             x86emu/types.h \
-             x86emu/x86emui.h
+if INT10_X86EMU
+noinst_LTLIBRARIES = libx86emu.la
+endif
+
+libx86emu_la_SOURCES = debug.c \
+                      decode.c \
+                      fpu.c \
+                      ops2.c \
+                      ops.c \
+                      prim_ops.c \
+                      sys.c \
+                      x86emu.h
+
+INCLUDES = 
+
+AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+
+EXTRA_DIST = validate.c \
+             x86emu/debug.h \
+             x86emu/decode.h \
+             x86emu/fpu.h \
+             x86emu/fpu_regs.h \
+             x86emu/ops.h \
+             x86emu/prim_asm.h \
+             x86emu/prim_ops.h \
+	     x86emu/prim_x86_gcc.h \
+             x86emu/regs.h \
+             x86emu/types.h \
+             x86emu/x86emui.h
diff --git a/xorg-server/hw/xfree86/xaa/.gitignore b/xorg-server/hw/xfree86/xaa/.gitignore
new file mode 100644
index 000000000..1ba5b2602
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/.gitignore
@@ -0,0 +1,4 @@
+#		Add & Override for this directory and it's subdirectories
+[lms]-xaa*.c
+[lm]f3-xaa*.c
+[lm][f3]-xaa*.c
diff --git a/xorg-server/hw/xfree86/xaa/XAA.HOWTO b/xorg-server/hw/xfree86/xaa/XAA.HOWTO
index cbd71c138..531ead0a0 100644
--- a/xorg-server/hw/xfree86/xaa/XAA.HOWTO
+++ b/xorg-server/hw/xfree86/xaa/XAA.HOWTO
@@ -1,1427 +1,1427 @@
-
-
-                          XAA.HOWTO
-
-  This file describes how to add basic XAA support to a chipset driver.
-
-0)  What is XAA
-1)  XAA Initialization and Shutdown
-2)  The Primitives
-  2.0  Generic Flags
-  2.1  Screen to Screen Copies
-  2.2  Solid Fills
-  2.3  Solid Lines
-  2.4  Dashed Lines
-  2.5  Color Expand Fills
-    2.5.1 Screen to Screen Color Expansion
-    2.5.2 CPU to Screen Color Expansion
-      2.5.2.1 The Direct Method
-      2.5.2.2 The Indirect Method
-  2.6  8x8 Mono Pattern Fills
-  2.7  8x8 Color Pattern Fills
-  2.8  Image Writes
-    2.8.1 The Direct Method
-    2.8.2 The Indirect Method
-  2.9 Clipping
-3)  The Pixmap Cache
-4)  Offscreen Pixmaps
-
-/********************************************************************/
-
-0) WHAT IS XAA
-	
-   XAA (the XFree86 Acceleration Architecture) is a device dependent
-layer that encapsulates the unaccelerated framebuffer rendering layer,
-intercepting rendering commands sent to it from higher levels of the
-server.  For rendering tasks where hardware acceleration is not 
-possible, XAA allows the requests to proceed to the software rendering
-code.  Otherwise, XAA breaks the sometimes complicated X primitives
-into simpler primitives more suitable for hardware acceleration and
-will use accelerated functions exported by the chipset driver to 
-render these.
-
-   XAA provides a simple, easy to use driver interface that allows
-the driver to communicate its acceleration capabilities and restrictions
-back to XAA.  XAA will use the information provided by the driver
-to determine whether or not acceleration will be possible for a
-particular X primitive.
-
-
-
-1) XAA INITIALIZATION AND SHUTDOWN
-
-   All relevant prototypes and defines are in xaa.h.
-
-   To Initialize the XAA layer, the driver should allocate an XAAInfoRec
-via XAACreateInfoRec(), fill it out as described in this document
-and pass it to XAAInit().  XAAInit() must be called _after_ the 
-framebuffer initialization (usually cfb?ScreenInit or similar) since 
-it is "wrapping" that layer.  XAAInit() should be called _before_ the 
-cursor initialization (usually miDCInitialize) since the cursor
-layer needs to "wrap" all the rendering code including XAA.
-
-   When shutting down, the driver should free the XAAInfoRec
-structure in its CloseScreen function via XAADestroyInfoRec().
-The prototypes for the functions mentioned above are as follows:
-
-   XAAInfoRecPtr XAACreateInfoRec(void);
-   Bool XAAInit(ScreenPtr, XAAInfoRecPtr);
-   void XAADestroyInfoRec(XAAInfoRec);
-
-   The driver informs XAA of it's acceleration capablities by
-filling out an XAAInfoRec structure and passing it to XAAInit().
-The XAAInfoRec structure contains many fields, most of which are
-function pointers and flags.  Each primitive will typically have
-two functions and a set of flags associated with it, but it may
-have more.  These two functions are the "SetupFor" and "Subsequent" 
-functions.  The "SetupFor" function tells the driver that the 
-hardware should be initialized for a particular type of graphics 
-operation.  After the "SetupFor" function, one or more calls to the 
-"Subsequent" function will be made to indicate that an instance
-of the particular primitive should be rendered by the hardware.
-The details of each instance (width, height, etc...) are given
-with each "Subsequent" function.   The set of flags associated
-with each primitive lets the driver tell XAA what its hardware
-limitations are (eg. It doesn't support a planemask, it can only
-do one of the raster-ops, etc...).
-
-  Of the XAAInfoRec fields, one is required.  This is the
-Sync function.  XAA initialization will fail if this function
-is not provided.
-
-void Sync(ScrnInfoPtr pScrn)			/* Required */
-
-   Sync will be called when XAA needs to be certain that all
-   graphics coprocessor operations are finished, such as when
-   the framebuffer must be written to or read from directly
-   and it must be certain that the accelerator will not be
-   overwriting the area of interest.
-
-   One needs to make certain that the Sync function not only
-   waits for the accelerator fifo to empty, but that it waits for
-   the rendering of that last operation to complete.
-
-   It is guaranteed that no direct framebuffer access will
-   occur after a "SetupFor" or "Subsequent" function without
-   the Sync function being called first.
-
-
-
-2)  THE PRIMITIVES
-
-2.0  Generic Flags
-
-  Each primitive type has a set of flags associated with it which
-allow the driver to tell XAA what the hardware limitations are.
-The common ones are as follows:
-
-/* Foreground, Background, rop and planemask restrictions */
-
-   GXCOPY_ONLY
-
-     This indicates that the accelerator only supports GXcopy
-     for the particular primitive.
-
-   ROP_NEEDS_SOURCE
-
-     This indicates that the accelerator doesn't supports a
-     particular primitive with rops that don't involve the source.
-     These rops are GXclear, GXnoop, GXinvert and GXset. If neither
-     this flag nor GXCOPY_ONLY is defined, it is assumed that the
-     accelerator supports all 16 raster operations (rops) for that
-     primitive.
-
-   NO_PLANEMASK
-
-     This indicates that the accelerator does not support a hardware
-     write planemask for the particular primitive.
-
-   RGB_EQUAL
-
-     This indicates that the particular primitive requires the red, 
-     green and blue bytes of the foreground color (and background color,
-     if applicable) to be equal. This is useful for 24bpp when a graphics
-     coprocessor is used in 8bpp mode, which is not uncommon in older
-     hardware since some have no support for or only limited support for 
-     acceleration at 24bpp. This way, many operations will be accelerated 
-     for the common case of "grayscale" colors.  This flag should only
-     be used in 24bpp.
-
-  In addition to the common ones listed above which are possible for
-nearly all primitives, each primitive may have its own flags specific
-to that primitive.  If such flags exist they are documented in the
-descriptions of those primitives below.
- 
-
-
-
-2.1  Screen to Screen Copies
-
-   The SetupFor and Subsequent ScreenToScreenCopy functions provide
-   an interface for copying rectangular areas from video memory to
-   video memory.  To accelerate this primitive the driver should
-   provide both the SetupFor and Subsequent functions and indicate
-   the hardware restrictions via the ScreenToScreenCopyFlags.  The
-   NO_PLANEMASK, GXCOPY_ONLY and ROP_NEEDS_SOURCE flags as described
-   in Section 2.0 are valid as well as the following:
-
-    NO_TRANSPARENCY
-     
-      This indicates that the accelerator does not support skipping
-      of color keyed pixels when copying from the source to the destination.
-
-    TRANSPARENCY_GXCOPY_ONLY
-
-      This indicates that the accelerator supports skipping of color keyed
-      pixels only when the rop is GXcopy.
-
-    ONLY_LEFT_TO_RIGHT_BITBLT
-
-      This indicates that the hardware only accepts blitting when the
-      x direction is positive.
-
-    ONLY_TWO_BITBLT_DIRECTIONS
-
-      This indicates that the hardware can only cope with blitting when
-      the direction of x is the same as the direction in y.
-
-
-void SetupForScreenToScreenCopy( ScrnInfoPtr pScrn,
-			int xdir, int ydir,
-			int rop,
-			unsigned int planemask,
-			int trans_color )
-
-    When this is called, SubsequentScreenToScreenCopy will be called
-    one or more times directly after.  If ydir is 1, then the accelerator
-    should copy starting from the top (minimum y) of the source and
-    proceed downward.  If ydir is -1, then the accelerator should copy
-    starting from the bottom of the source (maximum y) and proceed
-    upward.  If xdir is 1, then the accelerator should copy each
-    y scanline starting from the leftmost pixel of the source.  If
-    xdir is -1, it should start from the rightmost pixel.  
-       If trans_color is not -1 then trans_color indicates that the
-    accelerator should not copy pixels with the color trans_color
-    from the source to the destination, but should skip them. 
-    Trans_color is always -1 if the NO_TRANSPARENCY flag is set.
- 
-
-void SubsequentScreenToScreenCopy(ScrnInfoPtr pScrn,
-			int x1, int y1,
-			int x2, int y2,
-			int width, int height)
-
-    Copy a rectangle "width" x "height" from the source (x1,y1) to the 
-    destination (x2,y2) using the parameters passed by the last
-    SetupForScreenToScreenCopy call. (x1,y1) and (x2,y2) always denote 
-    the upper left hand corners of the source and destination regardless 
-    of which xdir and ydir values are given by SetupForScreenToScreenCopy.  
-
-
-
-2.2 Solid Fills
-
-   The SetupFor and Subsequent SolidFill(Rect/Trap) functions provide
-   an interface for filling rectangular areas of the screen with a
-   foreground color.  To accelerate this primitive the driver should
-   provide both the SetupForSolidFill and SubsequentSolidFillRect 
-   functions and indicate the hardware restrictions via the SolidFillFlags.
-   The driver may optionally provide a SubsequentSolidFillTrap if
-   it is capable of rendering the primitive correctly.  
-   The GXCOPY_ONLY, ROP_NEEDS_SOURCE, NO_PLANEMASK and RGB_EQUAL flags
-   as described in Section 2.0 are valid.
-
-  
-void SetupForSolidFill(ScrnInfoPtr pScrn, 
-                       int color, int rop, unsigned int planemask)
-
-    SetupForSolidFill indicates that any combination of the following 
-    may follow it.
-
-	SubsequentSolidFillRect
-	SubsequentSolidFillTrap
-
-
- 
-void SubsequentSolidFillRect(ScrnInfoPtr pScrn, int x, int y, int w, int h)
-
-     Fill a rectangle of dimensions "w" by "h" with origin at (x,y) 
-     using the color, rop and planemask given by the last 
-     SetupForSolidFill call.
-
-void SubsequentSolidFillTrap(ScrnInfoPtr pScrn, int y, int h, 
-	int left, int dxL, int dyL, int eL,
-	int right, int dxR, int dyR, int eR)
-
-     These parameters describe a trapezoid via a version of
-     Bresenham's parameters. "y" is the top line. "h" is the
-     number of spans to be filled in the positive Y direction.
-     "left" and "right" indicate the starting X values of the
-     left and right edges.  dy/dx describes the edge slope.
-     These are not the deltas between the beginning and ending
-     points on an edge.  They merely describe the slope. "e" is
-     the initial error term.  It's the relationships between dx,
-     dy and e that define the edge.
-	If your engine does not do bresenham trapezoids or does
-     not allow the programmer to specify the error term then
-     you are not expected to be able to accelerate them.
-
-
-2.3  Solid Lines
-
-    XAA provides an interface for drawing thin lines.  In order to
-    draw X lines correctly a high degree of accuracy is required.
-    This usually limits line acceleration to hardware which has a
-    Bresenham line engine, though depending on the algorithm used,
-    other line engines may come close if they accept 16 bit line 
-    deltas.  XAA has both a Bresenham line interface and a two-point
-    line interface for drawing lines of arbitrary orientation.  
-    Additionally there is a SubsequentSolidHorVertLine which will
-    be used for all horizontal and vertical lines.  Horizontal and
-    vertical lines are handled separately since hardware that doesn't
-    have a line engine (or has one that is unusable due to precision
-    problems) can usually draw these lines by some other method such
-    as drawing them as thin rectangles.  Even for hardware that can
-    draw arbitrary lines via the Bresenham or two-point interfaces,
-    the SubsequentSolidHorVertLine is used for horizontal and vertical
-    lines since most hardware is able to render the horizontal lines
-    and sometimes the vertical lines faster by other methods (Hint:
-    try rendering horizontal lines as flattened rectangles).  If you have 
-    not provided a SubsequentSolidHorVertLine but you have provided 
-    Bresenham or two-point lines, a SubsequentSolidHorVertLine function 
-    will be supplied for you.
-
-    The flags field associated with Solid Lines is SolidLineFlags and 
-    the GXCOPY_ONLY, ROP_NEEDS_SOURCE, NO_PLANEMASK and RGB_EQUAL flags as
-    described in Section 2.0 are valid restrictions.  
-
-    Some line engines have line biases hardcoded to comply with
-    Microsoft line biasing rules.  A tell-tale sign of this is the
-    hardware lines not matching the software lines in the zeroth and
-    fourth octants.  The driver can set the flag:
-	
-	MICROSOFT_ZERO_LINE_BIAS
-
-    in the AccelInfoRec.Flags field to adjust the software lines to
-    match the hardware lines.   This is in the generic flags field
-    rather than the SolidLineFlags since this flag applies to all
-    software zero-width lines on the screen and not just the solid ones.
-
-
-void SetupForSolidLine(ScrnInfoPtr pScrn, 
-                       int color, int rop, unsigned int planemask)
-
-    SetupForSolidLine indicates that any combination of the following 
-    may follow it.
-
-	SubsequentSolidBresenhamLine
-	SubsequentSolidTwoPointLine
-        SubsequentSolidHorVertLine 	
-
-
-void SubsequentSolidHorVertLine( ScrnInfoPtr pScrn,
-        			int x, int y, int len, int dir )
-
-    All vertical and horizontal solid thin lines are rendered with
-    this function.  The line starts at coordinate (x,y) and extends
-    "len" pixels inclusive.  In the direction indicated by "dir."
-    The direction is either DEGREES_O or DEGREES_270.  That is, it
-    always extends to the right or down.
-
-
-
-void SubsequentSolidTwoPointLine(ScrnInfoPtr pScrn,
-        	int x1, int y1, int x2, int y2, int flags)
-
-    Draw a line from (x1,y1) to (x2,y2).  If the flags field contains
-    the flag OMIT_LAST, the last pixel should not be drawn.  Otherwise,
-    the pixel at (x2,y2) should be drawn.
-
-    If you use the TwoPoint line interface there is a good possibility
-    that your line engine has hard-coded line biases that do not match
-    the default X zero-width lines.  If so, you may need to set the
-    MICROSOFT_ZERO_LINE_BIAS flag described above.  Note that since
-    any vertex in the 16-bit signed coordinate system is valid, your
-    line engine is expected to handle 16-bit values if you have hardware
-    line clipping enabled.  If your engine cannot handle 16-bit values,
-    you should not use hardware line clipping.
-
-
-void SubsequentSolidBresenhamLine(ScrnInfoPtr pScrn,
-        int x, int y, int major, int minor, int err, int len, int octant)
-
-    "X" and "y" are the starting point of the line.  "Major" and "minor" 
-    are the major and minor step constants.  "Err" is the initial error
-    term.  "Len" is the number of pixels to be drawn (inclusive). "Octant"
-    can be any combination of the following flags OR'd together:
-
-      Y_MAJOR		Y is the major axis (X otherwise)
-      X_DECREASING	The line is drawn from right to left
-      Y_DECREASING	The line is drawn from bottom to top
-	  
-    The major, minor and err terms are the "raw" Bresenham parameters
-    consistent with a line engine that does:
-
-	e = err;
-	while(len--) {
-	   DRAW_POINT(x,y);
-	   e += minor;
-	   if(e >= 0) {
-		e -= major;
-		TAKE_ONE_STEP_ALONG_MINOR_AXIS;
-	   }
-	   TAKE_ONE_STEP_ALONG_MAJOR_AXIS;
-	}
-
-    IBM 8514 style Bresenham line interfaces require their parameters
-    modified in the following way:
-
-	Axial = minor;
-	Diagonal = minor - major;
-	Error = minor + err;
-
-SolidBresenhamLineErrorTermBits
-
-    This field allows the driver to tell XAA how many bits large its
-    Bresenham parameter registers are.  Many engines have registers that
-    only accept 12 or 13 bit Bresenham parameters, and the parameters
-    for clipped lines may overflow these if they are not scaled down.
-    If this field is not set, XAA will assume the engine can accomodate
-    16 bit parameters, otherwise, it will scale the parameters to the
-    size specified.
-
-
-2.4  Dashed Lines
-
-    The same degree of accuracy required by the solid lines is required
-    for drawing dashed lines as well.  The dash pattern itself is a
-    buffer of binary data where ones are expanded into the foreground
-    color and zeros either correspond to the background color or
-    indicate transparency depending on whether or not DoubleDash or
-    OnOffDashes are being drawn.  
-
-    The flags field associated with dashed Lines is DashedLineFlags and 
-    the GXCOPY_ONLY, ROP_NEEDS_SOURCE, NO_PLANEMASK and RGB_EQUAL flags as
-    described in Section 2.0 are valid restrictions.  Additionally, the
-    following flags are valid:
-
-      NO_TRANSPARENCY
-
-	This indicates that the driver cannot support dashed lines
-	with transparent backgrounds (OnOffDashes).
-
-      TRANSPARENCY_ONLY
-
-	This indicates that the driver cannot support dashes with
-	both a foreground and background color (DoubleDashes).
-
-      LINE_PATTERN_POWER_OF_2_ONLY
-
-	This indicates that only patterns with a power of 2 length
-	can be accelerated.
-
-      LINE_PATTERN_LSBFIRST_MSBJUSTIFIED
-      LINE_PATTERN_LSBFIRST_LSBJUSTIFIED
-      LINE_PATTERN_MSBFIRST_MSBJUSTIFIED
-      LINE_PATTERN_MSBFIRST_LSBJUSTIFIED
-
-	These describe how the line pattern should be packed.
-	The pattern buffer is DWORD padded.  LSBFIRST indicates
-	that the pattern runs from the LSB end to the MSB end.
-	MSBFIRST indicates that the pattern runs from the MSB end
-	to the LSB end.  When the pattern does not completely fill
-	the DWORD padded buffer, the pattern will be justified 
-	towards the MSB or LSB end based on the flags above.
-
-
-    The following field indicates the maximum length dash pattern that
-    should be accelerated.
-
-	int DashPatternMaxLength
-
-
-void SetupForDashedLine(ScrnInfoPtr pScrn,
-		int fg, int bg, int rop, unsigned int planemask,
-        	int length, unsigned char *pattern)
-
-    
-    SetupForDashedLine indicates that any combination of the following 
-    may follow it.
-
-	SubsequentDashedBresenhamLine
-	SubsequentDashedTwoPointLine
-
-    If "bg" is -1, then the background (pixels corresponding to clear
-    bits in the pattern) should remain unmodified. "Bg" indicates the
-    background color otherwise.  "Length" indicates the length of
-    the pattern in bits and "pattern" points to the DWORD padded buffer
-    holding the pattern which has been packed according to the flags
-    set above.  
-
-    
-void SubsequentDashedTwoPointLine( ScrnInfoPtr pScrn,
-        int x1, int y1, int x2, int y2, int flags, int phase)
-
-void SubsequentDashedBresenhamLine(ScrnInfoPtr pScrn,
-        int x1, int y1, int major, int minor, int err, int len, int octant,
-        int phase)
-  
-    These are the same as the SubsequentSolidTwoPointLine and
-    SubsequentBresenhamLine functions except for the addition
-    of the "phase" field which indicates the offset into the dash 
-    pattern that the pixel at (x1,y1) corresponds to.
-
-    As with the SubsequentBresenhamLine, there is an
- 
-	int DashedBresenhamLineErrorTermBits 
-   
-    field which indicates the size of the error term registers
-    used with dashed lines.  This is usually the same value as
-    the field for the solid lines (because it's usually the same
-    register).
-       
-      
-
-2.5   Color Expansion Fills
-
-    When filling a color expansion rectangle, the accelerator
-    paints each pixel depending on whether or not a bit in a
-    corresponding bitmap is set or clear. Opaque expansions are 
-    when a set bit corresponds to the foreground color and a clear 
-    bit corresponds to the background color.  A transparent expansion
-    is when a set bit corresponds to the foreground color and a
-    clear bit indicates that the pixel should remain unmodified.
-   
-    The graphics accelerator usually has access to the source 
-    bitmap in one of two ways: 1) the bitmap data is sent serially
-    to the accelerator by the CPU through some memory mapped aperture
-    or 2) the accelerator reads the source bitmap out of offscreen
-    video memory.  Some types of primitives are better suited towards 
-    one method or the other.  Type 2 is useful for reusable patterns
-    such as stipples which can be cached in offscreen memory.  The
-    aperature method can be used for stippling but the CPU must pass
-    the data across the bus each time a stippled fill is to be performed.  
-    For expanding 1bpp client pixmaps or text strings to the screen,
-    the aperature method is usually superior because the intermediate
-    copy in offscreen memory needed by the second method would only be 
-    used once.  Unfortunately, many accelerators can only do one of these
-    methods and not both.  
-
-    XAA provides both ScreenToScreen and CPUToScreen color expansion 
-    interfaces for doing color expansion fills.  The ScreenToScreen
-    functions can only be used with hardware that supports reading
-    of source bitmaps from offscreen video memory, and these are only
-    used for cacheable patterns such as stipples.  There are two
-    variants of the CPUToScreen routines - a direct method intended
-    for hardware that has a transfer aperature, and an indirect method
-    intended for hardware without transfer aperatures or hardware
-    with unusual transfer requirements.  Hardware that can only expand
-    bitmaps from video memory should supply ScreenToScreen routines
-    but also ScanlineCPUToScreen (indirect) routines to optimize transfers 
-    of non-cacheable data.  Hardware that can only accept source bitmaps
-    through an aperature should supply CPUToScreen (or ScanlineCPUToScreen) 
-    routines. Hardware that can do both should provide both ScreenToScreen 
-    and CPUToScreen routines.
-
-    For both ScreenToScreen and CPUToScreen interfaces, the GXCOPY_ONLY,
-    ROP_NEEDS_SOURCE, NO_PLANEMASK and RGB_EQUAL flags described in
-    Section 2.0 are valid as well as the following:
-
-    /* bit order requirements (one of these must be set) */
-   
-    BIT_ORDER_IN_BYTE_LSBFIRST
-
-      This indicates that least significant bit in each byte of the source
-      data corresponds to the leftmost of that block of 8 pixels.  This
-      is the prefered format.
-
-    BIT_ORDER_IN_BYTE_MSBFIRST    
-
-      This indicates that most significant bit in each byte of the source
-      data corresponds to the leftmost of that block of 8 pixels.
-
-    /* transparency restrictions */
-
-    NO_TRANSPARENCY
-
-      This indicates that the accelerator cannot do a transparent expansion.
-
-    TRANSPARENCY_ONLY
-
-      This indicates that the accelerator cannot do an opaque expansion.
-      In cases where where the background needs to be filled, XAA will
-      render the primitive in two passes when using the CPUToScreen
-      interface, but will not do so with the ScreenToScreen interface 
-      since that would require caching of two patterns.  Some 
-      ScreenToScreen hardware may be able to render two passes at the
-      driver level and remove the TRANSPARENCY_ONLY restriction if
-      it can render pixels corresponding to the zero bits.
-
-
-
-2.5.1  Screen To Screen Color Expansion
-
-    The ScreenToScreenColorExpandFill routines provide an interface
-    for doing expansion blits from source patterns stored in offscreen
-    video memory.
-
-    void SetupForScreenToScreenColorExpandFill (ScrnInfoPtr pScrn,
-        			int fg, int bg, 
-				int rop, unsigned int planemask)
-
-
-    Ones in the source bitmap will correspond to the fg color.
-    Zeros in the source bitmap will correspond to the bg color
-    unless bg = -1.  In that case the pixels corresponding to the
-    zeros in the bitmap shall be left unmodified by the accelerator.
-
-    For hardware that doesn't allow an easy implementation of skipleft, the
-    driver can replace CacheMonoStipple function with one that stores multiple
-    rotated copies of the stipple and select between them. In this case the
-    driver should set CacheColorExpandDensity to tell XAA how many copies of
-    the pattern are stored in the width of a cache slot. For instance if the
-    hardware can specify the starting address in bytes, then 8 rotated copies
-    of the stipple are needed and CacheColorExpandDensity should be set to 8.
-
-    void SubsequentScreenToScreenColorExpandFill( ScrnInfoPtr pScrn,
-				int x, int y, int w, int h,
-				int srcx, int srcy, int offset )
-
-   
-    Fill a rectangle "w" x "h" at location (x,y).  The source pitch
-    between scanlines is the framebuffer pitch (pScrn->displayWidth
-    pixels) and srcx and srcy indicate the start of the source pattern 
-    in units of framebuffer pixels. "Offset" indicates the bit offset
-    into the pattern that corresponds to the pixel being painted at
-    "x" on the screen.  Some hardware accepts source coordinates in
-    units of bits which makes implementation of the offset trivial.
-    In that case, the bit address of the source bit corresponding to
-    the pixel painted at (x,y) would be:
-	
-     (srcy * pScrn->displayWidth + srcx) * pScrn->bitsPerPixel + offset
-
-    It should be noted that the offset assumes LSBFIRST hardware.  
-    For MSBFIRST hardware, the driver may need to implement the 
-    offset by bliting only from byte boundaries and hardware clipping.
-
-
-
-2.5.2  CPU To Screen Color Expansion
-
-
-    The CPUToScreenColorExpandFill routines provide an interface for 
-    doing expansion blits from source patterns stored in system memory.
-    There are two varieties of this primitive, a CPUToScreenColorExpandFill
-    and a ScanlineCPUToScreenColorExpandFill.  With the 
-    CPUToScreenColorExpandFill method, the source data is sent serially
-    through a memory mapped aperature.  With the Scanline version, the
-    data is rendered scanline at a time into intermediate buffers with
-    a call to SubsequentColorExpandScanline following each scanline.
-
-    These two methods have separate flags fields, the
-    CPUToScreenColorExpandFillFlags and ScanlineCPUToScreenColorExpandFillFlags
-    respectively.  Flags specific to one method or the other are described 
-    in sections 2.5.2.1 and 2.5.2.2 but for both cases the bit order and
-    transparency restrictions listed at the beginning of section 2.5 are 
-    valid as well as the following:
-    
-    /* clipping  (optional) */
-    
-    LEFT_EDGE_CLIPPING
- 
-      This indicates that the accelerator supports omission of up to
-      31 pixels on the left edge of the rectangle to be filled.  This
-      is beneficial since it allows transfer of the source bitmap to
-      always occur from DWORD boundaries. 
-
-    LEFT_EDGE_CLIPPING_NEGATIVE_X
-
-      This flag indicates that the accelerator can render color expansion
-      rectangles even if the value of x origin is negative (off of
-      the screen on the left edge).
-
-    /* misc */
-
-    TRIPLE_BITS_24BPP
-
-      When enabled (must be in 24bpp mode), color expansion functions
-      are expected to require three times the amount of bits to be
-      transferred so that 24bpp grayscale colors can be used with color
-      expansion in 8bpp coprocessor mode. Each bit is expanded to 3
-      bits when writing the monochrome data.
-
-
- 2.5.1 The Direct Method 
-
-
-    Using the direct method of color expansion XAA will send all
-    bitmap data to the accelerator serially through an memory mapped
-    transfer window defined by the following two fields:
-
-      unsigned char *ColorExpandBase
-
-        This indicates the memory address of the beginning of the aperture.
-
-      int ColorExpandRange
-
-        This indicates the size in bytes of the aperture.
-
-    The driver should specify how the transfered data should be padded.
-    There are options for both the padding of each Y scanline and for the
-    total transfer to the aperature.
-    One of the following two flags must be set:
-
-      CPU_TRANSFER_PAD_DWORD
-
-        This indicates that the total transfer (sum of all scanlines) sent
-        to the aperature must be DWORD padded.  This is the default behavior.
-
-      CPU_TRANSFER_PAD_QWORD 
-
-	This indicates that the total transfer (sum of all scanlines) sent
-	to the aperature must be QWORD padded.  With this set, XAA will send
-        an extra DWORD to the aperature when needed to ensure that only
-        an even number of DWORDs are sent.
-
-    And then there are the flags for padding of each scanline:
-
-      SCANLINE_PAD_DWORD
-
-	This indicates that each Y scanline should be DWORD padded.
-        This is the only option available and is the default.
-
-    Finally, there is the CPU_TRANSFER_BASE_FIXED flag which indicates
-    that the aperture is a single register rather than a range of
-    registers, and XAA should write all of the data to the first DWORD.
-    If the ColorExpandRange is not large enough to accomodate scanlines
-    the width of the screen, this option will be forced. That is, the
-    ColorExpandRange must be:
-
-        ((virtualX + 31)/32) * 4   bytes or more.
-
-        ((virtualX + 62)/32 * 4) if LEFT_EDGE_CLIPPING_NEGATIVE_X is set.
-  
-    If the TRIPLE_BITS_24BPP flag is set, the required area should be 
-    multiplied by three.
-     
-    
-void SetupForCPUToScreenColorExpandFill(ScrnInfoPtr pScrn,
-        		int fg, int bg,
-			int rop,
-			unsigned int planemask)
-
-  
- 
-     Ones in the source bitmap will correspond to the fg color.
-     Zeros in the source bitmap will correspond to the bg color
-     unless bg = -1.  In that case the pixels corresponding to the
-     zeros in the bitmap shall be left unmodified by the accelerator.
-
-
-void SubsequentCPUToScreenColorExpandFill(ScrnInfoPtr pScrn,
-			int x, int y, int w, int h,
-			int skipleft )
-
-     When this function is called, the accelerator should be setup
-     to fill a rectangle of dimension "w" by "h" with origin at (x,y)
-     in the fill style prescribed by the last call to 
-     SetupForCPUToScreenColorExpandFill.  XAA will pass the data to 
-     the aperture immediately after this function is called.  If the 
-     skipleft is non-zero (and LEFT_EDGE_CLIPPING has been enabled), then 
-     the accelerator _should_not_ render skipleft pixels on the leftmost
-     edge of the rectangle.  Some engines have an alignment feature
-     like this built in, some others can do this using a clipping
-     window.
-
-     It can be arranged for XAA to call Sync() after it is through 
-     calling the Subsequent function by setting SYNC_AFTER_COLOR_EXPAND 
-     in the  CPUToScreenColorExpandFillFlags.  This can provide the driver 
-     with an oportunity to reset a clipping window if needed.
-
-    
-2.5.2  The Indirect Method 
-
-     Using the indirect method, XAA will render the bitmap data scanline
-     at a time to one or more buffers.  These buffers may be memory
-     mapped apertures or just intermediate storage.
-
-     int NumScanlineColorExpandBuffers
-
-       This indicates the number of buffers available.
-
-     unsigned char **ScanlineColorExpandBuffers
-
-       This is an array of pointers to the memory locations of each buffer.
-       Each buffer is expected to be large enough to accommodate scanlines
-       the width of the screen.  That is:
-
-        ((virtualX + 31)/32) * 4   bytes or more.
-
-        ((virtualX + 62)/32 * 4) if LEFT_EDGE_CLIPPING_NEGATIVE_X is set.
-  
-     Scanlines are always DWORD padded.
-     If the TRIPLE_BITS_24BPP flag is set, the required area should be 
-     multiplied by three.
-
-
-void SetupForScanlineCPUToScreenColorExpandFill(ScrnInfoPtr pScrn,
-        		int fg, int bg,
-			int rop,
-			unsigned int planemask)
- 
-     Ones in the source bitmap will correspond to the fg color.
-     Zeros in the source bitmap will correspond to the bg color
-     unless bg = -1.  In that case the pixels corresponding to the
-     zeros in the bitmap shall be left unmodified by the accelerator.
-
-     
-void SubsequentScanlineCPUToScreenColorExpandFill(ScrnInfoPtr pScrn,
-			int x, int y, int w, int h,
-			int skipleft )
-
-void SubsequentColorExpandScanline(ScrnInfoPtr pScrn, int bufno)
-
-
-    When SubsequentScanlineCPUToScreenColorExpandFill is called, XAA 
-    will begin transfering the source data scanline at a time, calling  
-    SubsequentColorExpandScanline after each scanline.  If more than
-    one buffer is available, XAA will cycle through the buffers.
-    Subsequent scanlines will use the next buffer and go back to the
-    buffer 0 again when the last buffer is reached.  The index into
-    the ScanlineColorExpandBuffers array is presented as "bufno"
-    with each SubsequentColorExpandScanline call.
-
-    The skipleft field is the same as for the direct method.
-
-    The indirect method can be use to send the source data directly 
-    to a memory mapped aperture represented by a single color expand
-    buffer, scanline at a time, but more commonly it is used to place 
-    the data into offscreen video memory so that the accelerator can 
-    blit it to the visible screen from there.  In the case where the
-    accelerator permits rendering into offscreen video memory while
-    the accelerator is active, several buffers can be used so that
-    XAA can be placing source data into the next buffer while the
-    accelerator is blitting the current buffer.  For cases where
-    the accelerator requires some special manipulation of the source
-    data first, the buffers can be in system memory.  The CPU can
-    manipulate these buffers and then send the data to the accelerator.
-
-
-
-2.6   8x8 Mono Pattern Fills
-
-    XAA provides support for two types of 8x8 hardware patterns -
-    "Mono" patterns and "Color" patterns.  Mono pattern data is
-    64 bits of color expansion data with ones indicating the
-    foreground color and zeros indicating the background color.
-    The source bitmaps for the 8x8 mono patterns can be presented
-    to the graphics accelerator in one of two ways.  They can be
-    passed as two DWORDS to the 8x8 mono pattern functions or
-    they can be cached in offscreen memory and their locations
-    passed to the 8x8 mono pattern functions.  In addition to the
-    GXCOPY_ONLY, ROP_NEEDS_SOURCE, NO_PLANEMASK and RGB_EQUAL flags
-    defined in Section 2.0, the following are defined for the
-    Mono8x8PatternFillFlags:
-
-    HARDWARE_PATTERN_PROGRAMMED_BITS
-
-      This indicates that the 8x8 patterns should be packed into two
-      DWORDS and passed to the 8x8 mono pattern functions.  The default
-      behavior is to cache the patterns in offscreen video memory and
-      pass the locations of these patterns to the functions instead.
-      The pixmap cache must be enabled for the default behavior (8x8 
-      pattern caching) to work.  See Section 3 for how to enable the
-      pixmap cache. The pixmap cache is not necessary for 
-      HARDWARE_PATTERN_PROGRAMMED_BITS.
-
-    HARDWARE_PATTERN_PROGRAMMED_ORIGIN
-
-      If the hardware supports programmable pattern offsets then
-      this option should be set. See the table below for further
-      infomation.
-
-    HARDWARE_PATTERN_SCREEN_ORIGIN
-
-      Some hardware wants the pattern offset specified with respect to the
-      upper left-hand corner of the primitive being drawn.  Other hardware 
-      needs the option HARDWARE_PATTERN_SCREEN_ORIGIN set to indicate that 
-      all pattern offsets should be referenced to the upper left-hand 
-      corner of the screen.  HARDWARE_PATTERN_SCREEN_ORIGIN is preferable 
-      since this is more natural for the X-Window system and offsets will 
-      have to be recalculated for each Subsequent function otherwise.
-
-    BIT_ORDER_IN_BYTE_MSBFIRST
-    BIT_ORDER_IN_BYTE_LSBFIRST
-
-      As with other color expansion routines this indicates whether the
-      most or the least significant bit in each byte from the pattern is 
-      the leftmost on the screen.
-
-    TRANSPARENCY_ONLY
-    NO_TRANSPARENCY
-
-      This means the same thing as for the color expansion rect routines
-      except that for TRANSPARENCY_ONLY XAA will not render the primitive
-      in two passes since this is more easily handled by the driver.
-      It is recommended that TRANSPARENCY_ONLY hardware handle rendering
-      of opaque patterns in two passes (the background can be filled as
-      a rectangle in GXcopy) in the Subsequent function so that the
-      TRANSPARENCY_ONLY restriction can be removed. 
-
-
-
-    Additional information about cached patterns...
-    For the case where HARDWARE_PATTERN_PROGRAMMED_BITS is not set and 
-    the pattern must be cached in offscreen memory, the first pattern
-    starts at the cache slot boundary which is set by the 
-    CachePixelGranularity field used to configure the pixmap cache.
-    One should ensure that the CachePixelGranularity reflects any 
-    alignment restrictions that the accelerator may put on 8x8 pattern 
-    storage locations.  When HARDWARE_PATTERN_PROGRAMMED_ORIGIN is set 
-    there is only one pattern stored.  When this flag is not set,
-    all 64 pre-rotated copies of the pattern are cached in offscreen memory.
-    The MonoPatternPitch field can be used to specify the X position pixel
-    granularity that each of these patterns must align on.  If the
-    MonoPatternPitch is not supplied, the patterns will be densely packed
-    within the cache slot.  The behavior of the default XAA 8x8 pattern
-    caching mechanism to store all 8x8 patterns linearly in video memory.
-    If the accelerator needs the patterns stored in a more unusual fashion,
-    the driver will need to provide its own 8x8 mono pattern caching 
-    routines for XAA to use. 
-
-    The following table describes the meanings of the "patx" and "paty"
-    fields in both the SetupFor and Subsequent functions.
-
-    With HARDWARE_PATTERN_SCREEN_ORIGIN
-    -----------------------------------
-
-    HARDWARE_PATTERN_PROGRAMMED_BITS and HARDWARE_PATTERN_PROGRAMMED_ORIGIN
-
-	SetupFor: patx and paty are the first and second DWORDS of the
-		  8x8 mono pattern.
-
-	Subsequent: patx and paty are the x,y offset into that pattern.
-		    All Subsequent calls will have the same offset in 
-		    the case of HARDWARE_PATTERN_SCREEN_ORIGIN so only
-		    the offset specified by the first Subsequent call 
-		    after a SetupFor call will need to be observed.
-
-    HARDWARE_PATTERN_PROGRAMMED_BITS only
-
-	SetupFor: patx and paty hold the first and second DWORDS of
-		  the 8x8 mono pattern pre-rotated to match the desired
-		  offset.
-
-	Subsequent: These just hold the same patterns and can be ignored.
-
-    HARDWARE_PATTERN_PROGRAMMED_ORIGIN only
-
-	SetupFor: patx and paty hold the x,y coordinates of the offscreen
-		  memory location where the 8x8 pattern is stored.  The
-		  bits are stored linearly in memory at that location.
-
-	Subsequent: patx and paty hold the offset into the pattern.
-		    All Subsequent calls will have the same offset in 
-		    the case of HARDWARE_PATTERN_SCREEN_ORIGIN so only
-		    the offset specified by the first Subsequent call 
-		    after a SetupFor call will need to be observed.
-
-    Neither programmed bits or origin
-
-	SetupFor: patx and paty hold the x,y coordinates of the offscreen 	
-		  memory location where the pre-rotated 8x8 pattern is
-		  stored.
-
-	Subsequent: patx and paty are the same as in the SetupFor function
-		    and can be ignored.
-		  
-
-    Without HARDWARE_PATTERN_SCREEN_ORIGIN
-    -------------------------------------- 
-
-    HARDWARE_PATTERN_PROGRAMMED_BITS and HARDWARE_PATTERN_PROGRAMMED_ORIGIN
-
-	SetupFor: patx and paty are the first and second DWORDS of the
-		  8x8 mono pattern.
-
-	Subsequent: patx and paty are the x,y offset into that pattern.
-
-    HARDWARE_PATTERN_PROGRAMMED_BITS only
-
-	SetupFor: patx and paty holds the first and second DWORDS of
-		  the unrotated 8x8 mono pattern.  This can be ignored. 
-
-	Subsequent: patx and paty hold the rotated 8x8 pattern to be 
-		    rendered.
-
-    HARDWARE_PATTERN_PROGRAMMED_ORIGIN only
-
-	SetupFor: patx and paty hold the x,y coordinates of the offscreen
-		  memory location where the 8x8 pattern is stored.  The
-		  bits are stored linearly in memory at that location.
-
-	Subsequent: patx and paty hold the offset into the pattern.
-
-    Neither programmed bits or origin
-
-	SetupFor: patx and paty hold the x,y coordinates of the offscreen 	
-		  memory location where the unrotated 8x8 pattern is
-		  stored.  This can be ignored.
-
-	Subsequent: patx and paty hold the x,y coordinates of the
-		    rotated 8x8 pattern to be rendered.
-
-
-
-void SetupForMono8x8PatternFill(ScrnInfoPtr pScrn, int patx, int paty,
-        int fg, int bg, int rop, unsigned int planemask)
-
-    SetupForMono8x8PatternFill indicates that any combination of the 
-    following  may follow it.
-
-	SubsequentMono8x8PatternFillRect
-	SubsequentMono8x8PatternFillTrap
-
-    The fg, bg, rop and planemask fields have the same meaning as the
-    ones used for the other color expansion routines.  Patx's and paty's
-    meaning can be determined from the table above.
-
- 
-void SubsequentMono8x8PatternFillRect( ScrnInfoPtr pScrn,
-        	int patx, int paty, int x, int y, int w, int h)
-
-     Fill a rectangle of dimensions "w" by "h" with origin at (x,y) 
-     using the parameters give by the last SetupForMono8x8PatternFill
-     call.  The meanings of patx and paty can be determined by the
-     table above.
-
-void SubsequentMono8x8PatternFillTrap( ScrnInfoPtr pScrn,
-     			   int patx, int paty, int y, int h, 
-     			   int left, int dxL, int dyL, int eL,
-     			   int right, int dxR, int dyR, int eR )
-
-     The meanings of patx and paty can be determined by the table above.
-     The rest of the fields have the same meanings as those in the 
-     SubsequentSolidFillTrap function. 
-
-
-
-2.7   8x8 Color Pattern Fills
-  
-    8x8 color pattern data is 64 pixels of full color data that
-    is stored linearly in offscreen video memory.  8x8 color patterns 
-    are useful as a substitute for 8x8 mono patterns when tiling,
-    doing opaque stipples, or in the case where transperency is
-    supported, regular stipples.  8x8 color pattern fills also have
-    the additional benefit of being able to tile full color 8x8
-    patterns instead of just 2 color ones like the mono patterns.
-    However, full color 8x8 patterns aren't used very often in the
-    X Window system so you might consider passing this primitive
-    by if you already can do mono patterns, especially if they 
-    require alot of cache area.  Color8x8PatternFillFlags is
-    the flags field for this primitive and the GXCOPY_ONLY,
-    ROP_NEEDS_SOURCE and NO_PLANEMASK flags as described in
-    Section 2.0 are valid as well as the following:
-
-
-    HARDWARE_PATTERN_PROGRAMMED_ORIGIN
-
-      If the hardware supports programmable pattern offsets then
-      this option should be set.  
-
-    HARDWARE_PATTERN_SCREEN_ORIGIN
-
-      Some hardware wants the pattern offset specified with respect to the
-      upper left-hand corner of the primitive being drawn.  Other hardware 
-      needs the option HARDWARE_PATTERN_SCREEN_ORIGIN set to indicate that 
-      all pattern offsets should be referenced to the upper left-hand 
-      corner of the screen.  HARDWARE_PATTERN_SCREEN_ORIGIN is preferable 
-      since this is more natural for the X-Window system and offsets will 
-      have to be recalculated for each Subsequent function otherwise.
-
-    NO_TRANSPARENCY
-    TRANSPARENCY_GXCOPY_ONLY
-
-      These mean the same as for the ScreenToScreenCopy functions.
-
-
-    The following table describes the meanings of patx and paty passed
-    to the SetupFor and Subsequent fields:
-
-    HARDWARE_PATTERN_PROGRAMMED_ORIGIN && HARDWARE_PATTERN_SCREEN_ORIGIN
-	
-	SetupFor: patx and paty hold the x,y location of the unrotated 
-		  pattern.
-
-	Subsequent: patx and paty hold the pattern offset.  For the case
-		    of HARDWARE_PATTERN_SCREEN_ORIGIN all Subsequent calls
-		    have the same offset so only the first call will need
-		    to be observed.
-
-    
-    HARDWARE_PATTERN_PROGRAMMED_ORIGIN only
-
-	SetupFor: patx and paty hold the x,y location of the unrotated
-		  pattern.
-
-	Subsequent: patx and paty hold the pattern offset. 
-
-    HARDWARE_PATTERN_SCREEN_ORIGIN
-
-	SetupFor: patx and paty hold the x,y location of the rotated pattern.
-
-	Subsequent: patx and paty hold the same location as the SetupFor
-		    function so these can be ignored.
-
-    neither flag
-
-	SetupFor: patx and paty hold the x,y location of the unrotated
-		  pattern.  This can be ignored.
-
-	Subsequent: patx and paty hold the x,y location of the rotated
-		    pattern.
-
-    Additional information about cached patterns...
-    All 8x8 color patterns are cached in offscreen video memory so
-    the pixmap cache must be enabled to use them. The first pattern
-    starts at the cache slot boundary which is set by the 
-    CachePixelGranularity field used to configure the pixmap cache.
-    One should ensure that the CachePixelGranularity reflects any 
-    alignment restrictions that the accelerator may put on 8x8 pattern 
-    storage locations.  When HARDWARE_PATTERN_PROGRAMMED_ORIGIN is set 
-    there is only one pattern stored.  When this flag is not set,
-    all 64 rotations off the pattern are accessible but it is assumed
-    that the accelerator is capable of accessing data stored on 8
-    pixel boundaries.  If the accelerator has stricter alignment 
-    requirements than this the dirver will need to provide its own 
-    8x8 color pattern caching routines. 
-
-
-void SetupForColor8x8PatternFill(ScrnInfoPtr pScrn, int patx, int paty,
-        	int rop, unsigned int planemask, int trans_color)
-
-    SetupForColor8x8PatternFill indicates that any combination of the 
-    following  may follow it.
-
-	SubsequentColor8x8PatternFillRect
-	SubsequentColor8x8PatternFillTrap	(not implemented yet)
-
-    For the meanings of patx and paty, see the table above.  Trans_color
-    means the same as for the ScreenToScreenCopy functions.
-
-
- 
-void SubsequentColor8x8PatternFillRect( ScrnInfoPtr pScrn,
-        	int patx, int paty, int x, int y, int w, int h)
-
-     Fill a rectangle of dimensions "w" by "h" with origin at (x,y) 
-     using the parameters give by the last SetupForColor8x8PatternFill
-     call.  The meanings of patx and paty can be determined by the
-     table above.
-
-void SubsequentColor8x8PatternFillTrap( ScrnInfoPtr pScrn,
-     			   int patx, int paty, int y, int h, 
-     			   int left, int dxL, int dyL, int eL,
-     			   int right, int dxR, int dyR, int eR )
-
-    For the meanings of patx and paty, see the table above. 
-    The rest of the fields have the same meanings as those in the 
-    SubsequentSolidFillTrap function. 
-
-
-
-2.8  Image Writes
-
-    XAA provides a mechanism for transfering full color pixel data from
-    system memory to video memory through the accelerator.  This is 
-    useful for dealing with alignment issues and performing raster ops
-    on the data when writing it to the framebuffer.  As with color
-    expansion rectangles, there is a direct and indirect method.  The
-    direct method sends all data through a memory mapped aperature.
-    The indirect method sends the data to an intermediated buffer scanline 
-    at a time.
-
-    The direct and indirect methods have separate flags fields, the
-    ImageWriteFlags and ScanlineImageWriteFlags respectively.
-    Flags specific to one method or the other are described in sections 
-    2.8.1 and 2.8.2 but for both cases the GXCOPY_ONLY, ROP_NEEDS_SOURCE
-    and NO_PLANEMASK flags described in Section 2.0 are valid as well as
-    the following:
-
-    NO_GXCOPY
-
-      In order to have accelerated image transfers faster than the 
-      software versions for GXcopy, the engine needs to support clipping,
-      be using the direct method and have a large enough image transfer
-      range so that CPU_TRANSFER_BASE_FIXED doesn't need to be set.
-      If these are not supported, then it is unlikely that transfering
-      the data through the accelerator will be of any advantage for the
-      simple case of GXcopy.  In fact, it may be much slower.  For such
-      cases it's probably best to set the NO_GXCOPY flag so that 
-      Image writes will only be used for the more complicated rops.
-
-    /* transparency restrictions */
-
-    NO_TRANSPARENCY
-     
-      This indicates that the accelerator does not support skipping
-      of color keyed pixels when copying from the source to the destination.
-
-    TRANSPARENCY_GXCOPY_ONLY
-
-      This indicates that the accelerator supports skipping of color keyed
-      pixels only when the rop is GXcopy.
-
-    /* clipping  (optional) */
-    
-    LEFT_EDGE_CLIPPING
- 
-      This indicates that the accelerator supports omission of up to
-      3 pixels on the left edge of the rectangle to be filled.  This
-      is beneficial since it allows transfer from the source pixmap to
-      always occur from DWORD boundaries. 
-
-    LEFT_EDGE_CLIPPING_NEGATIVE_X
-
-      This flag indicates that the accelerator can fill areas with
-      image write data even if the value of x origin is negative (off of
-      the screen on the left edge).
-
-
-2.8.1 The Direct Method
-
-    Using the direct method of ImageWrite XAA will send all
-    bitmap data to the accelerator serially through an memory mapped
-    transfer window defined by the following two fields:
-
-      unsigned char *ImageWriteBase
-
-        This indicates the memory address of the beginning of the aperture.
-
-      int ImageWriteRange
-
-        This indicates the size in bytes of the aperture.
-
-    The driver should specify how the transfered data should be padded.
-    There are options for both the padding of each Y scanline and for the
-    total transfer to the aperature.
-    One of the following two flags must be set:
-
-      CPU_TRANSFER_PAD_DWORD
-
-        This indicates that the total transfer (sum of all scanlines) sent
-        to the aperature must be DWORD padded.  This is the default behavior.
-
-      CPU_TRANSFER_PAD_QWORD 
-
-	This indicates that the total transfer (sum of all scanlines) sent
-	to the aperature must be QWORD padded.  With this set, XAA will send
-        an extra DWORD to the aperature when needed to ensure that only
-        an even number of DWORDs are sent.
-
-    And then there are the flags for padding of each scanline:
-
-      SCANLINE_PAD_DWORD
-
-	This indicates that each Y scanline should be DWORD padded.
-        This is the only option available and is the default.
-
-    Finally, there is the CPU_TRANSFER_BASE_FIXED flag which indicates
-    that the aperture is a single register rather than a range of
-    registers, and XAA should write all of the data to the first DWORD.
-    XAA will automatically select CPU_TRANSFER_BASE_FIXED if the 
-    ImageWriteRange is not large enough to accomodate an entire scanline.   
-
-
-void SetupForImageWrite(ScrnInfoPtr pScrn, int rop, unsigned int planemask,
-        			int trans_color, int bpp, int depth)
-
-     If trans_color is not -1 then trans_color indicates the transparency
-     color key and pixels with color trans_color passed through the 
-     aperature should not be transfered to the screen but should be 
-     skipped.  Bpp and depth indicate the bits per pixel and depth of
-     the source pixmap.  Trans_color is always -1 if the NO_TRANSPARENCY
-     flag is set.
-
-
-void SubsequentImageWriteRect(ScrnInfoPtr pScrn, 
-				int x, int y, int w, int h, int skipleft)
-
-     
-     Data passed through the aperature should be copied to a rectangle
-     of width "w" and height "h" with origin (x,y).  If LEFT_EDGE_CLIPPING
-     has been enabled, skipleft will correspond to the number of pixels
-     on the left edge that should not be drawn.  Skipleft is zero 
-     otherwise.
-
-     It can be arranged for XAA to call Sync() after it is through 
-     calling the Subsequent functions by setting SYNC_AFTER_IMAGE_WRITE 
-     in the  ImageWriteFlags.  This can provide the driver with an
-     oportunity to reset a clipping window if needed.
-
-2.8.2  The Indirect Method
-
-     Using the indirect method, XAA will render the pixel data scanline
-     at a time to one or more buffers.  These buffers may be memory
-     mapped apertures or just intermediate storage.
-
-     int NumScanlineImageWriteBuffers
-
-       This indicates the number of buffers available.
-
-     unsigned char **ScanlineImageWriteBuffers
-
-       This is an array of pointers to the memory locations of each buffer.
-       Each buffer is expected to be large enough to accommodate scanlines
-       the width of the screen.  That is:
-
-         pScrn->VirtualX * pScreen->bitsPerPixel/8   bytes or more.
-
-       If LEFT_EDGE_CLIPPING_NEGATIVE_X is set, add an additional 4
-       bytes to that requirement in 8 and 16bpp, 12 bytes in 24bpp.
-  
-     Scanlines are always DWORD padded.
-
-void SetupForScanlineImageWrite(ScrnInfoPtr pScrn, int rop, 
-				unsigned int planemask, int trans_color, 
-				int bpp, int depth)
-
-     If trans_color is not -1 then trans_color indicates the transparency
-     color key and pixels with color trans_color in the buffer should not 
-     be transfered to the screen but should be skipped.  Bpp and depth 
-     indicate the bits per pixel and depth of the source bitmap.  
-     Trans_color is always -1 if the NO_TRANSPARENCY flag is set.
-
-
-void SubsequentImageWriteRect(ScrnInfoPtr pScrn, 
-				int x, int y, int w, int h, int skipleft)
-
-     
-void SubsequentImageWriteScanline(ScrnInfoPtr pScrn, int bufno)
-
-
-    When SubsequentImageWriteRect is called, XAA will begin
-    transfering the source data scanline at a time, calling  
-    SubsequentImageWriteScanline after each scanline.  If more than
-    one buffer is available, XAA will cycle through the buffers.
-    Subsequent scanlines will use the next buffer and go back to the
-    buffer 0 again when the last buffer is reached.  The index into
-    the ScanlineImageWriteBuffers array is presented as "bufno"
-    with each SubsequentImageWriteScanline call.
-
-    The skipleft field is the same as for the direct method.
-
-    The indirect method can be use to send the source data directly 
-    to a memory mapped aperture represented by a single image write
-    buffer, scanline at a time, but more commonly it is used to place 
-    the data into offscreen video memory so that the accelerator can 
-    blit it to the visible screen from there.  In the case where the
-    accelerator permits rendering into offscreen video memory while
-    the accelerator is active, several buffers can be used so that
-    XAA can be placing source data into the next buffer while the
-    accelerator is blitting the current buffer.  For cases where
-    the accelerator requires some special manipulation of the source
-    data first, the buffers can be in system memory.  The CPU can
-    manipulate these buffers and then send the data to the accelerator.
-
-
-2.9 Clipping
-
-    XAA supports hardware clipping rectangles.  To use clipping
-    in this way it is expected that the graphics accelerator can
-    clip primitives with verticies anywhere in the 16 bit signed 
-    coordinate system. 
-
-void SetClippingRectangle ( ScrnInfoPtr pScrn,
-        		int left, int top, int right, int bottom)
-
-void DisableClipping (ScrnInfoPtr pScrn)
-
-    When SetClippingRectangle is called, all hardware rendering
-    following it should be clipped to the rectangle specified
-    until DisableClipping is called.
-
-    The ClippingFlags field indicates which operations this sort
-    of Set/Disable pairing can be used with.  Any of the following
-    flags may be OR'd together.
-
-	HARDWARE_CLIP_SCREEN_TO_SCREEN_COLOR_EXPAND
-	HARDWARE_CLIP_SCREEN_TO_SCREEN_COPY
-	HARDWARE_CLIP_MONO_8x8_FILL
-	HARDWARE_CLIP_COLOR_8x8_FILL
-	HARDWARE_CLIP_SOLID_FILL
-	HARDWARE_CLIP_DASHED_LINE
-	HARDWARE_CLIP_SOLID_LINE
-
-
-
-3)  XAA PIXMAP CACHE
-
-   /* NOTE:  XAA has no knowledge of framebuffer particulars so until
-	the framebuffer is able to render into offscreen memory, usage
-	of the pixmap cache requires that the driver provide ImageWrite
-	routines or a WritePixmap or WritePixmapToCache replacement so
-	that patterns can even be placed in the cache.
-
-      ADDENDUM: XAA can now load the pixmap cache without requiring
-	that the driver supply an ImageWrite function, but this can
-	only be done on linear framebuffers.  If you have a linear
-	framebuffer, set LINEAR_FRAMEBUFFER in the XAAInfoRec.Flags
-	field and XAA will then be able to upload pixmaps into the
-	cache without the driver providing functions to do so.
-   */
-
-
-   The XAA pixmap cache provides a mechanism for caching of patterns
-   in offscreen video memory so that tiled fills and in some cases
-   stippling can be done by blitting the source patterns from offscreen
-   video memory. The pixmap cache also provides the mechanism for caching 
-   of 8x8 color and mono hardware patterns.  Any unused offscreen video
-   memory gets used for the pixmap cache and that information is 
-   provided by the XFree86 Offscreen Memory Manager. XAA registers a 
-   callback with the manager so that it can be informed of any changes 
-   in the offscreen memory configuration.  The driver writer does not 
-   need to deal with any of this since it is all automatic.  The driver 
-   merely needs to initialize the Offscreen Memory Manager as described 
-   in the DESIGN document and set the PIXMAP_CACHE flag in the 
-   XAAInfoRec.Flags field.  The Offscreen Memory Manager initialization 
-   must occur before XAA is initialized or else pixmap cache 
-   initialization will fail.  
-
-   PixmapCacheFlags is an XAAInfoRec field which allows the driver to
-   control pixmap cache behavior to some extent.  Currently only one
-   flag is defined:
-
-   DO_NOT_BLIT_STIPPLES
-
-     This indicates that the stippling should not be done by blitting
-     from the pixmap cache.  This does not apply to 8x8 pattern fills. 
-
-
-   CachePixelGranularity is an optional field.  If the hardware requires
-   that a 8x8 patterns have some particular pixel alignment it should
-   be reflected in this field.  Ignoring this field or setting it to
-   zero or one means there are no alignment issues.
-
-
-4)  OFFSCREEN PIXMAPS
-
-   XAA has the ability to store pixmap drawables in offscreen video 
-   memory and render into them with full hardware acceleration.  Placement
-   of pixmaps in the cache is done automatically on a first-come basis and 
-   only if there is room.  To enable this feature, set the OFFSCREEN_PIXMAPS
-   flag in the XAAInfoRec.Flags field.  This is only available when a
-   ScreenToScreenCopy function is provided, when the Offscreen memory 
-   manager has been initialized and when the LINEAR_FRAMEBUFFER flag is
-   also set.
-
-   int maxOffPixWidth
-   int maxOffPixHeight
-
-       These two fields allow the driver to limit the maximum dimensions
-     of an offscreen pixmap.  If one of these is not set, it is assumed
-     that there is no limit on that dimension.  Note that if an offscreen
-     pixmap with a particular dimension is allowed, then your driver will be
-     expected to render primitives as large as that pixmap.  
-
-$XFree86: xc/programs/Xserver/hw/xfree86/xaa/XAA.HOWTO,v 1.12 2000/04/12 14:44:42 tsi Exp $
+
+
+                          XAA.HOWTO
+
+  This file describes how to add basic XAA support to a chipset driver.
+
+0)  What is XAA
+1)  XAA Initialization and Shutdown
+2)  The Primitives
+  2.0  Generic Flags
+  2.1  Screen to Screen Copies
+  2.2  Solid Fills
+  2.3  Solid Lines
+  2.4  Dashed Lines
+  2.5  Color Expand Fills
+    2.5.1 Screen to Screen Color Expansion
+    2.5.2 CPU to Screen Color Expansion
+      2.5.2.1 The Direct Method
+      2.5.2.2 The Indirect Method
+  2.6  8x8 Mono Pattern Fills
+  2.7  8x8 Color Pattern Fills
+  2.8  Image Writes
+    2.8.1 The Direct Method
+    2.8.2 The Indirect Method
+  2.9 Clipping
+3)  The Pixmap Cache
+4)  Offscreen Pixmaps
+
+/********************************************************************/
+
+0) WHAT IS XAA
+	
+   XAA (the XFree86 Acceleration Architecture) is a device dependent
+layer that encapsulates the unaccelerated framebuffer rendering layer,
+intercepting rendering commands sent to it from higher levels of the
+server.  For rendering tasks where hardware acceleration is not 
+possible, XAA allows the requests to proceed to the software rendering
+code.  Otherwise, XAA breaks the sometimes complicated X primitives
+into simpler primitives more suitable for hardware acceleration and
+will use accelerated functions exported by the chipset driver to 
+render these.
+
+   XAA provides a simple, easy to use driver interface that allows
+the driver to communicate its acceleration capabilities and restrictions
+back to XAA.  XAA will use the information provided by the driver
+to determine whether or not acceleration will be possible for a
+particular X primitive.
+
+
+
+1) XAA INITIALIZATION AND SHUTDOWN
+
+   All relevant prototypes and defines are in xaa.h.
+
+   To Initialize the XAA layer, the driver should allocate an XAAInfoRec
+via XAACreateInfoRec(), fill it out as described in this document
+and pass it to XAAInit().  XAAInit() must be called _after_ the 
+framebuffer initialization (usually cfb?ScreenInit or similar) since 
+it is "wrapping" that layer.  XAAInit() should be called _before_ the 
+cursor initialization (usually miDCInitialize) since the cursor
+layer needs to "wrap" all the rendering code including XAA.
+
+   When shutting down, the driver should free the XAAInfoRec
+structure in its CloseScreen function via XAADestroyInfoRec().
+The prototypes for the functions mentioned above are as follows:
+
+   XAAInfoRecPtr XAACreateInfoRec(void);
+   Bool XAAInit(ScreenPtr, XAAInfoRecPtr);
+   void XAADestroyInfoRec(XAAInfoRec);
+
+   The driver informs XAA of it's acceleration capablities by
+filling out an XAAInfoRec structure and passing it to XAAInit().
+The XAAInfoRec structure contains many fields, most of which are
+function pointers and flags.  Each primitive will typically have
+two functions and a set of flags associated with it, but it may
+have more.  These two functions are the "SetupFor" and "Subsequent" 
+functions.  The "SetupFor" function tells the driver that the 
+hardware should be initialized for a particular type of graphics 
+operation.  After the "SetupFor" function, one or more calls to the 
+"Subsequent" function will be made to indicate that an instance
+of the particular primitive should be rendered by the hardware.
+The details of each instance (width, height, etc...) are given
+with each "Subsequent" function.   The set of flags associated
+with each primitive lets the driver tell XAA what its hardware
+limitations are (eg. It doesn't support a planemask, it can only
+do one of the raster-ops, etc...).
+
+  Of the XAAInfoRec fields, one is required.  This is the
+Sync function.  XAA initialization will fail if this function
+is not provided.
+
+void Sync(ScrnInfoPtr pScrn)			/* Required */
+
+   Sync will be called when XAA needs to be certain that all
+   graphics coprocessor operations are finished, such as when
+   the framebuffer must be written to or read from directly
+   and it must be certain that the accelerator will not be
+   overwriting the area of interest.
+
+   One needs to make certain that the Sync function not only
+   waits for the accelerator fifo to empty, but that it waits for
+   the rendering of that last operation to complete.
+
+   It is guaranteed that no direct framebuffer access will
+   occur after a "SetupFor" or "Subsequent" function without
+   the Sync function being called first.
+
+
+
+2)  THE PRIMITIVES
+
+2.0  Generic Flags
+
+  Each primitive type has a set of flags associated with it which
+allow the driver to tell XAA what the hardware limitations are.
+The common ones are as follows:
+
+/* Foreground, Background, rop and planemask restrictions */
+
+   GXCOPY_ONLY
+
+     This indicates that the accelerator only supports GXcopy
+     for the particular primitive.
+
+   ROP_NEEDS_SOURCE
+
+     This indicates that the accelerator doesn't supports a
+     particular primitive with rops that don't involve the source.
+     These rops are GXclear, GXnoop, GXinvert and GXset. If neither
+     this flag nor GXCOPY_ONLY is defined, it is assumed that the
+     accelerator supports all 16 raster operations (rops) for that
+     primitive.
+
+   NO_PLANEMASK
+
+     This indicates that the accelerator does not support a hardware
+     write planemask for the particular primitive.
+
+   RGB_EQUAL
+
+     This indicates that the particular primitive requires the red, 
+     green and blue bytes of the foreground color (and background color,
+     if applicable) to be equal. This is useful for 24bpp when a graphics
+     coprocessor is used in 8bpp mode, which is not uncommon in older
+     hardware since some have no support for or only limited support for 
+     acceleration at 24bpp. This way, many operations will be accelerated 
+     for the common case of "grayscale" colors.  This flag should only
+     be used in 24bpp.
+
+  In addition to the common ones listed above which are possible for
+nearly all primitives, each primitive may have its own flags specific
+to that primitive.  If such flags exist they are documented in the
+descriptions of those primitives below.
+ 
+
+
+
+2.1  Screen to Screen Copies
+
+   The SetupFor and Subsequent ScreenToScreenCopy functions provide
+   an interface for copying rectangular areas from video memory to
+   video memory.  To accelerate this primitive the driver should
+   provide both the SetupFor and Subsequent functions and indicate
+   the hardware restrictions via the ScreenToScreenCopyFlags.  The
+   NO_PLANEMASK, GXCOPY_ONLY and ROP_NEEDS_SOURCE flags as described
+   in Section 2.0 are valid as well as the following:
+
+    NO_TRANSPARENCY
+     
+      This indicates that the accelerator does not support skipping
+      of color keyed pixels when copying from the source to the destination.
+
+    TRANSPARENCY_GXCOPY_ONLY
+
+      This indicates that the accelerator supports skipping of color keyed
+      pixels only when the rop is GXcopy.
+
+    ONLY_LEFT_TO_RIGHT_BITBLT
+
+      This indicates that the hardware only accepts blitting when the
+      x direction is positive.
+
+    ONLY_TWO_BITBLT_DIRECTIONS
+
+      This indicates that the hardware can only cope with blitting when
+      the direction of x is the same as the direction in y.
+
+
+void SetupForScreenToScreenCopy( ScrnInfoPtr pScrn,
+			int xdir, int ydir,
+			int rop,
+			unsigned int planemask,
+			int trans_color )
+
+    When this is called, SubsequentScreenToScreenCopy will be called
+    one or more times directly after.  If ydir is 1, then the accelerator
+    should copy starting from the top (minimum y) of the source and
+    proceed downward.  If ydir is -1, then the accelerator should copy
+    starting from the bottom of the source (maximum y) and proceed
+    upward.  If xdir is 1, then the accelerator should copy each
+    y scanline starting from the leftmost pixel of the source.  If
+    xdir is -1, it should start from the rightmost pixel.  
+       If trans_color is not -1 then trans_color indicates that the
+    accelerator should not copy pixels with the color trans_color
+    from the source to the destination, but should skip them. 
+    Trans_color is always -1 if the NO_TRANSPARENCY flag is set.
+ 
+
+void SubsequentScreenToScreenCopy(ScrnInfoPtr pScrn,
+			int x1, int y1,
+			int x2, int y2,
+			int width, int height)
+
+    Copy a rectangle "width" x "height" from the source (x1,y1) to the 
+    destination (x2,y2) using the parameters passed by the last
+    SetupForScreenToScreenCopy call. (x1,y1) and (x2,y2) always denote 
+    the upper left hand corners of the source and destination regardless 
+    of which xdir and ydir values are given by SetupForScreenToScreenCopy.  
+
+
+
+2.2 Solid Fills
+
+   The SetupFor and Subsequent SolidFill(Rect/Trap) functions provide
+   an interface for filling rectangular areas of the screen with a
+   foreground color.  To accelerate this primitive the driver should
+   provide both the SetupForSolidFill and SubsequentSolidFillRect 
+   functions and indicate the hardware restrictions via the SolidFillFlags.
+   The driver may optionally provide a SubsequentSolidFillTrap if
+   it is capable of rendering the primitive correctly.  
+   The GXCOPY_ONLY, ROP_NEEDS_SOURCE, NO_PLANEMASK and RGB_EQUAL flags
+   as described in Section 2.0 are valid.
+
+  
+void SetupForSolidFill(ScrnInfoPtr pScrn, 
+                       int color, int rop, unsigned int planemask)
+
+    SetupForSolidFill indicates that any combination of the following 
+    may follow it.
+
+	SubsequentSolidFillRect
+	SubsequentSolidFillTrap
+
+
+ 
+void SubsequentSolidFillRect(ScrnInfoPtr pScrn, int x, int y, int w, int h)
+
+     Fill a rectangle of dimensions "w" by "h" with origin at (x,y) 
+     using the color, rop and planemask given by the last 
+     SetupForSolidFill call.
+
+void SubsequentSolidFillTrap(ScrnInfoPtr pScrn, int y, int h, 
+	int left, int dxL, int dyL, int eL,
+	int right, int dxR, int dyR, int eR)
+
+     These parameters describe a trapezoid via a version of
+     Bresenham's parameters. "y" is the top line. "h" is the
+     number of spans to be filled in the positive Y direction.
+     "left" and "right" indicate the starting X values of the
+     left and right edges.  dy/dx describes the edge slope.
+     These are not the deltas between the beginning and ending
+     points on an edge.  They merely describe the slope. "e" is
+     the initial error term.  It's the relationships between dx,
+     dy and e that define the edge.
+	If your engine does not do bresenham trapezoids or does
+     not allow the programmer to specify the error term then
+     you are not expected to be able to accelerate them.
+
+
+2.3  Solid Lines
+
+    XAA provides an interface for drawing thin lines.  In order to
+    draw X lines correctly a high degree of accuracy is required.
+    This usually limits line acceleration to hardware which has a
+    Bresenham line engine, though depending on the algorithm used,
+    other line engines may come close if they accept 16 bit line 
+    deltas.  XAA has both a Bresenham line interface and a two-point
+    line interface for drawing lines of arbitrary orientation.  
+    Additionally there is a SubsequentSolidHorVertLine which will
+    be used for all horizontal and vertical lines.  Horizontal and
+    vertical lines are handled separately since hardware that doesn't
+    have a line engine (or has one that is unusable due to precision
+    problems) can usually draw these lines by some other method such
+    as drawing them as thin rectangles.  Even for hardware that can
+    draw arbitrary lines via the Bresenham or two-point interfaces,
+    the SubsequentSolidHorVertLine is used for horizontal and vertical
+    lines since most hardware is able to render the horizontal lines
+    and sometimes the vertical lines faster by other methods (Hint:
+    try rendering horizontal lines as flattened rectangles).  If you have 
+    not provided a SubsequentSolidHorVertLine but you have provided 
+    Bresenham or two-point lines, a SubsequentSolidHorVertLine function 
+    will be supplied for you.
+
+    The flags field associated with Solid Lines is SolidLineFlags and 
+    the GXCOPY_ONLY, ROP_NEEDS_SOURCE, NO_PLANEMASK and RGB_EQUAL flags as
+    described in Section 2.0 are valid restrictions.  
+
+    Some line engines have line biases hardcoded to comply with
+    Microsoft line biasing rules.  A tell-tale sign of this is the
+    hardware lines not matching the software lines in the zeroth and
+    fourth octants.  The driver can set the flag:
+	
+	MICROSOFT_ZERO_LINE_BIAS
+
+    in the AccelInfoRec.Flags field to adjust the software lines to
+    match the hardware lines.   This is in the generic flags field
+    rather than the SolidLineFlags since this flag applies to all
+    software zero-width lines on the screen and not just the solid ones.
+
+
+void SetupForSolidLine(ScrnInfoPtr pScrn, 
+                       int color, int rop, unsigned int planemask)
+
+    SetupForSolidLine indicates that any combination of the following 
+    may follow it.
+
+	SubsequentSolidBresenhamLine
+	SubsequentSolidTwoPointLine
+        SubsequentSolidHorVertLine 	
+
+
+void SubsequentSolidHorVertLine( ScrnInfoPtr pScrn,
+        			int x, int y, int len, int dir )
+
+    All vertical and horizontal solid thin lines are rendered with
+    this function.  The line starts at coordinate (x,y) and extends
+    "len" pixels inclusive.  In the direction indicated by "dir."
+    The direction is either DEGREES_O or DEGREES_270.  That is, it
+    always extends to the right or down.
+
+
+
+void SubsequentSolidTwoPointLine(ScrnInfoPtr pScrn,
+        	int x1, int y1, int x2, int y2, int flags)
+
+    Draw a line from (x1,y1) to (x2,y2).  If the flags field contains
+    the flag OMIT_LAST, the last pixel should not be drawn.  Otherwise,
+    the pixel at (x2,y2) should be drawn.
+
+    If you use the TwoPoint line interface there is a good possibility
+    that your line engine has hard-coded line biases that do not match
+    the default X zero-width lines.  If so, you may need to set the
+    MICROSOFT_ZERO_LINE_BIAS flag described above.  Note that since
+    any vertex in the 16-bit signed coordinate system is valid, your
+    line engine is expected to handle 16-bit values if you have hardware
+    line clipping enabled.  If your engine cannot handle 16-bit values,
+    you should not use hardware line clipping.
+
+
+void SubsequentSolidBresenhamLine(ScrnInfoPtr pScrn,
+        int x, int y, int major, int minor, int err, int len, int octant)
+
+    "X" and "y" are the starting point of the line.  "Major" and "minor" 
+    are the major and minor step constants.  "Err" is the initial error
+    term.  "Len" is the number of pixels to be drawn (inclusive). "Octant"
+    can be any combination of the following flags OR'd together:
+
+      Y_MAJOR		Y is the major axis (X otherwise)
+      X_DECREASING	The line is drawn from right to left
+      Y_DECREASING	The line is drawn from bottom to top
+	  
+    The major, minor and err terms are the "raw" Bresenham parameters
+    consistent with a line engine that does:
+
+	e = err;
+	while(len--) {
+	   DRAW_POINT(x,y);
+	   e += minor;
+	   if(e >= 0) {
+		e -= major;
+		TAKE_ONE_STEP_ALONG_MINOR_AXIS;
+	   }
+	   TAKE_ONE_STEP_ALONG_MAJOR_AXIS;
+	}
+
+    IBM 8514 style Bresenham line interfaces require their parameters
+    modified in the following way:
+
+	Axial = minor;
+	Diagonal = minor - major;
+	Error = minor + err;
+
+SolidBresenhamLineErrorTermBits
+
+    This field allows the driver to tell XAA how many bits large its
+    Bresenham parameter registers are.  Many engines have registers that
+    only accept 12 or 13 bit Bresenham parameters, and the parameters
+    for clipped lines may overflow these if they are not scaled down.
+    If this field is not set, XAA will assume the engine can accomodate
+    16 bit parameters, otherwise, it will scale the parameters to the
+    size specified.
+
+
+2.4  Dashed Lines
+
+    The same degree of accuracy required by the solid lines is required
+    for drawing dashed lines as well.  The dash pattern itself is a
+    buffer of binary data where ones are expanded into the foreground
+    color and zeros either correspond to the background color or
+    indicate transparency depending on whether or not DoubleDash or
+    OnOffDashes are being drawn.  
+
+    The flags field associated with dashed Lines is DashedLineFlags and 
+    the GXCOPY_ONLY, ROP_NEEDS_SOURCE, NO_PLANEMASK and RGB_EQUAL flags as
+    described in Section 2.0 are valid restrictions.  Additionally, the
+    following flags are valid:
+
+      NO_TRANSPARENCY
+
+	This indicates that the driver cannot support dashed lines
+	with transparent backgrounds (OnOffDashes).
+
+      TRANSPARENCY_ONLY
+
+	This indicates that the driver cannot support dashes with
+	both a foreground and background color (DoubleDashes).
+
+      LINE_PATTERN_POWER_OF_2_ONLY
+
+	This indicates that only patterns with a power of 2 length
+	can be accelerated.
+
+      LINE_PATTERN_LSBFIRST_MSBJUSTIFIED
+      LINE_PATTERN_LSBFIRST_LSBJUSTIFIED
+      LINE_PATTERN_MSBFIRST_MSBJUSTIFIED
+      LINE_PATTERN_MSBFIRST_LSBJUSTIFIED
+
+	These describe how the line pattern should be packed.
+	The pattern buffer is DWORD padded.  LSBFIRST indicates
+	that the pattern runs from the LSB end to the MSB end.
+	MSBFIRST indicates that the pattern runs from the MSB end
+	to the LSB end.  When the pattern does not completely fill
+	the DWORD padded buffer, the pattern will be justified 
+	towards the MSB or LSB end based on the flags above.
+
+
+    The following field indicates the maximum length dash pattern that
+    should be accelerated.
+
+	int DashPatternMaxLength
+
+
+void SetupForDashedLine(ScrnInfoPtr pScrn,
+		int fg, int bg, int rop, unsigned int planemask,
+        	int length, unsigned char *pattern)
+
+    
+    SetupForDashedLine indicates that any combination of the following 
+    may follow it.
+
+	SubsequentDashedBresenhamLine
+	SubsequentDashedTwoPointLine
+
+    If "bg" is -1, then the background (pixels corresponding to clear
+    bits in the pattern) should remain unmodified. "Bg" indicates the
+    background color otherwise.  "Length" indicates the length of
+    the pattern in bits and "pattern" points to the DWORD padded buffer
+    holding the pattern which has been packed according to the flags
+    set above.  
+
+    
+void SubsequentDashedTwoPointLine( ScrnInfoPtr pScrn,
+        int x1, int y1, int x2, int y2, int flags, int phase)
+
+void SubsequentDashedBresenhamLine(ScrnInfoPtr pScrn,
+        int x1, int y1, int major, int minor, int err, int len, int octant,
+        int phase)
+  
+    These are the same as the SubsequentSolidTwoPointLine and
+    SubsequentBresenhamLine functions except for the addition
+    of the "phase" field which indicates the offset into the dash 
+    pattern that the pixel at (x1,y1) corresponds to.
+
+    As with the SubsequentBresenhamLine, there is an
+ 
+	int DashedBresenhamLineErrorTermBits 
+   
+    field which indicates the size of the error term registers
+    used with dashed lines.  This is usually the same value as
+    the field for the solid lines (because it's usually the same
+    register).
+       
+      
+
+2.5   Color Expansion Fills
+
+    When filling a color expansion rectangle, the accelerator
+    paints each pixel depending on whether or not a bit in a
+    corresponding bitmap is set or clear. Opaque expansions are 
+    when a set bit corresponds to the foreground color and a clear 
+    bit corresponds to the background color.  A transparent expansion
+    is when a set bit corresponds to the foreground color and a
+    clear bit indicates that the pixel should remain unmodified.
+   
+    The graphics accelerator usually has access to the source 
+    bitmap in one of two ways: 1) the bitmap data is sent serially
+    to the accelerator by the CPU through some memory mapped aperture
+    or 2) the accelerator reads the source bitmap out of offscreen
+    video memory.  Some types of primitives are better suited towards 
+    one method or the other.  Type 2 is useful for reusable patterns
+    such as stipples which can be cached in offscreen memory.  The
+    aperature method can be used for stippling but the CPU must pass
+    the data across the bus each time a stippled fill is to be performed.  
+    For expanding 1bpp client pixmaps or text strings to the screen,
+    the aperature method is usually superior because the intermediate
+    copy in offscreen memory needed by the second method would only be 
+    used once.  Unfortunately, many accelerators can only do one of these
+    methods and not both.  
+
+    XAA provides both ScreenToScreen and CPUToScreen color expansion 
+    interfaces for doing color expansion fills.  The ScreenToScreen
+    functions can only be used with hardware that supports reading
+    of source bitmaps from offscreen video memory, and these are only
+    used for cacheable patterns such as stipples.  There are two
+    variants of the CPUToScreen routines - a direct method intended
+    for hardware that has a transfer aperature, and an indirect method
+    intended for hardware without transfer aperatures or hardware
+    with unusual transfer requirements.  Hardware that can only expand
+    bitmaps from video memory should supply ScreenToScreen routines
+    but also ScanlineCPUToScreen (indirect) routines to optimize transfers 
+    of non-cacheable data.  Hardware that can only accept source bitmaps
+    through an aperature should supply CPUToScreen (or ScanlineCPUToScreen) 
+    routines. Hardware that can do both should provide both ScreenToScreen 
+    and CPUToScreen routines.
+
+    For both ScreenToScreen and CPUToScreen interfaces, the GXCOPY_ONLY,
+    ROP_NEEDS_SOURCE, NO_PLANEMASK and RGB_EQUAL flags described in
+    Section 2.0 are valid as well as the following:
+
+    /* bit order requirements (one of these must be set) */
+   
+    BIT_ORDER_IN_BYTE_LSBFIRST
+
+      This indicates that least significant bit in each byte of the source
+      data corresponds to the leftmost of that block of 8 pixels.  This
+      is the prefered format.
+
+    BIT_ORDER_IN_BYTE_MSBFIRST    
+
+      This indicates that most significant bit in each byte of the source
+      data corresponds to the leftmost of that block of 8 pixels.
+
+    /* transparency restrictions */
+
+    NO_TRANSPARENCY
+
+      This indicates that the accelerator cannot do a transparent expansion.
+
+    TRANSPARENCY_ONLY
+
+      This indicates that the accelerator cannot do an opaque expansion.
+      In cases where where the background needs to be filled, XAA will
+      render the primitive in two passes when using the CPUToScreen
+      interface, but will not do so with the ScreenToScreen interface 
+      since that would require caching of two patterns.  Some 
+      ScreenToScreen hardware may be able to render two passes at the
+      driver level and remove the TRANSPARENCY_ONLY restriction if
+      it can render pixels corresponding to the zero bits.
+
+
+
+2.5.1  Screen To Screen Color Expansion
+
+    The ScreenToScreenColorExpandFill routines provide an interface
+    for doing expansion blits from source patterns stored in offscreen
+    video memory.
+
+    void SetupForScreenToScreenColorExpandFill (ScrnInfoPtr pScrn,
+        			int fg, int bg, 
+				int rop, unsigned int planemask)
+
+
+    Ones in the source bitmap will correspond to the fg color.
+    Zeros in the source bitmap will correspond to the bg color
+    unless bg = -1.  In that case the pixels corresponding to the
+    zeros in the bitmap shall be left unmodified by the accelerator.
+
+    For hardware that doesn't allow an easy implementation of skipleft, the
+    driver can replace CacheMonoStipple function with one that stores multiple
+    rotated copies of the stipple and select between them. In this case the
+    driver should set CacheColorExpandDensity to tell XAA how many copies of
+    the pattern are stored in the width of a cache slot. For instance if the
+    hardware can specify the starting address in bytes, then 8 rotated copies
+    of the stipple are needed and CacheColorExpandDensity should be set to 8.
+
+    void SubsequentScreenToScreenColorExpandFill( ScrnInfoPtr pScrn,
+				int x, int y, int w, int h,
+				int srcx, int srcy, int offset )
+
+   
+    Fill a rectangle "w" x "h" at location (x,y).  The source pitch
+    between scanlines is the framebuffer pitch (pScrn->displayWidth
+    pixels) and srcx and srcy indicate the start of the source pattern 
+    in units of framebuffer pixels. "Offset" indicates the bit offset
+    into the pattern that corresponds to the pixel being painted at
+    "x" on the screen.  Some hardware accepts source coordinates in
+    units of bits which makes implementation of the offset trivial.
+    In that case, the bit address of the source bit corresponding to
+    the pixel painted at (x,y) would be:
+	
+     (srcy * pScrn->displayWidth + srcx) * pScrn->bitsPerPixel + offset
+
+    It should be noted that the offset assumes LSBFIRST hardware.  
+    For MSBFIRST hardware, the driver may need to implement the 
+    offset by bliting only from byte boundaries and hardware clipping.
+
+
+
+2.5.2  CPU To Screen Color Expansion
+
+
+    The CPUToScreenColorExpandFill routines provide an interface for 
+    doing expansion blits from source patterns stored in system memory.
+    There are two varieties of this primitive, a CPUToScreenColorExpandFill
+    and a ScanlineCPUToScreenColorExpandFill.  With the 
+    CPUToScreenColorExpandFill method, the source data is sent serially
+    through a memory mapped aperature.  With the Scanline version, the
+    data is rendered scanline at a time into intermediate buffers with
+    a call to SubsequentColorExpandScanline following each scanline.
+
+    These two methods have separate flags fields, the
+    CPUToScreenColorExpandFillFlags and ScanlineCPUToScreenColorExpandFillFlags
+    respectively.  Flags specific to one method or the other are described 
+    in sections 2.5.2.1 and 2.5.2.2 but for both cases the bit order and
+    transparency restrictions listed at the beginning of section 2.5 are 
+    valid as well as the following:
+    
+    /* clipping  (optional) */
+    
+    LEFT_EDGE_CLIPPING
+ 
+      This indicates that the accelerator supports omission of up to
+      31 pixels on the left edge of the rectangle to be filled.  This
+      is beneficial since it allows transfer of the source bitmap to
+      always occur from DWORD boundaries. 
+
+    LEFT_EDGE_CLIPPING_NEGATIVE_X
+
+      This flag indicates that the accelerator can render color expansion
+      rectangles even if the value of x origin is negative (off of
+      the screen on the left edge).
+
+    /* misc */
+
+    TRIPLE_BITS_24BPP
+
+      When enabled (must be in 24bpp mode), color expansion functions
+      are expected to require three times the amount of bits to be
+      transferred so that 24bpp grayscale colors can be used with color
+      expansion in 8bpp coprocessor mode. Each bit is expanded to 3
+      bits when writing the monochrome data.
+
+
+ 2.5.1 The Direct Method 
+
+
+    Using the direct method of color expansion XAA will send all
+    bitmap data to the accelerator serially through an memory mapped
+    transfer window defined by the following two fields:
+
+      unsigned char *ColorExpandBase
+
+        This indicates the memory address of the beginning of the aperture.
+
+      int ColorExpandRange
+
+        This indicates the size in bytes of the aperture.
+
+    The driver should specify how the transfered data should be padded.
+    There are options for both the padding of each Y scanline and for the
+    total transfer to the aperature.
+    One of the following two flags must be set:
+
+      CPU_TRANSFER_PAD_DWORD
+
+        This indicates that the total transfer (sum of all scanlines) sent
+        to the aperature must be DWORD padded.  This is the default behavior.
+
+      CPU_TRANSFER_PAD_QWORD 
+
+	This indicates that the total transfer (sum of all scanlines) sent
+	to the aperature must be QWORD padded.  With this set, XAA will send
+        an extra DWORD to the aperature when needed to ensure that only
+        an even number of DWORDs are sent.
+
+    And then there are the flags for padding of each scanline:
+
+      SCANLINE_PAD_DWORD
+
+	This indicates that each Y scanline should be DWORD padded.
+        This is the only option available and is the default.
+
+    Finally, there is the CPU_TRANSFER_BASE_FIXED flag which indicates
+    that the aperture is a single register rather than a range of
+    registers, and XAA should write all of the data to the first DWORD.
+    If the ColorExpandRange is not large enough to accomodate scanlines
+    the width of the screen, this option will be forced. That is, the
+    ColorExpandRange must be:
+
+        ((virtualX + 31)/32) * 4   bytes or more.
+
+        ((virtualX + 62)/32 * 4) if LEFT_EDGE_CLIPPING_NEGATIVE_X is set.
+  
+    If the TRIPLE_BITS_24BPP flag is set, the required area should be 
+    multiplied by three.
+     
+    
+void SetupForCPUToScreenColorExpandFill(ScrnInfoPtr pScrn,
+        		int fg, int bg,
+			int rop,
+			unsigned int planemask)
+
+  
+ 
+     Ones in the source bitmap will correspond to the fg color.
+     Zeros in the source bitmap will correspond to the bg color
+     unless bg = -1.  In that case the pixels corresponding to the
+     zeros in the bitmap shall be left unmodified by the accelerator.
+
+
+void SubsequentCPUToScreenColorExpandFill(ScrnInfoPtr pScrn,
+			int x, int y, int w, int h,
+			int skipleft )
+
+     When this function is called, the accelerator should be setup
+     to fill a rectangle of dimension "w" by "h" with origin at (x,y)
+     in the fill style prescribed by the last call to 
+     SetupForCPUToScreenColorExpandFill.  XAA will pass the data to 
+     the aperture immediately after this function is called.  If the 
+     skipleft is non-zero (and LEFT_EDGE_CLIPPING has been enabled), then 
+     the accelerator _should_not_ render skipleft pixels on the leftmost
+     edge of the rectangle.  Some engines have an alignment feature
+     like this built in, some others can do this using a clipping
+     window.
+
+     It can be arranged for XAA to call Sync() after it is through 
+     calling the Subsequent function by setting SYNC_AFTER_COLOR_EXPAND 
+     in the  CPUToScreenColorExpandFillFlags.  This can provide the driver 
+     with an oportunity to reset a clipping window if needed.
+
+    
+2.5.2  The Indirect Method 
+
+     Using the indirect method, XAA will render the bitmap data scanline
+     at a time to one or more buffers.  These buffers may be memory
+     mapped apertures or just intermediate storage.
+
+     int NumScanlineColorExpandBuffers
+
+       This indicates the number of buffers available.
+
+     unsigned char **ScanlineColorExpandBuffers
+
+       This is an array of pointers to the memory locations of each buffer.
+       Each buffer is expected to be large enough to accommodate scanlines
+       the width of the screen.  That is:
+
+        ((virtualX + 31)/32) * 4   bytes or more.
+
+        ((virtualX + 62)/32 * 4) if LEFT_EDGE_CLIPPING_NEGATIVE_X is set.
+  
+     Scanlines are always DWORD padded.
+     If the TRIPLE_BITS_24BPP flag is set, the required area should be 
+     multiplied by three.
+
+
+void SetupForScanlineCPUToScreenColorExpandFill(ScrnInfoPtr pScrn,
+        		int fg, int bg,
+			int rop,
+			unsigned int planemask)
+ 
+     Ones in the source bitmap will correspond to the fg color.
+     Zeros in the source bitmap will correspond to the bg color
+     unless bg = -1.  In that case the pixels corresponding to the
+     zeros in the bitmap shall be left unmodified by the accelerator.
+
+     
+void SubsequentScanlineCPUToScreenColorExpandFill(ScrnInfoPtr pScrn,
+			int x, int y, int w, int h,
+			int skipleft )
+
+void SubsequentColorExpandScanline(ScrnInfoPtr pScrn, int bufno)
+
+
+    When SubsequentScanlineCPUToScreenColorExpandFill is called, XAA 
+    will begin transfering the source data scanline at a time, calling  
+    SubsequentColorExpandScanline after each scanline.  If more than
+    one buffer is available, XAA will cycle through the buffers.
+    Subsequent scanlines will use the next buffer and go back to the
+    buffer 0 again when the last buffer is reached.  The index into
+    the ScanlineColorExpandBuffers array is presented as "bufno"
+    with each SubsequentColorExpandScanline call.
+
+    The skipleft field is the same as for the direct method.
+
+    The indirect method can be use to send the source data directly 
+    to a memory mapped aperture represented by a single color expand
+    buffer, scanline at a time, but more commonly it is used to place 
+    the data into offscreen video memory so that the accelerator can 
+    blit it to the visible screen from there.  In the case where the
+    accelerator permits rendering into offscreen video memory while
+    the accelerator is active, several buffers can be used so that
+    XAA can be placing source data into the next buffer while the
+    accelerator is blitting the current buffer.  For cases where
+    the accelerator requires some special manipulation of the source
+    data first, the buffers can be in system memory.  The CPU can
+    manipulate these buffers and then send the data to the accelerator.
+
+
+
+2.6   8x8 Mono Pattern Fills
+
+    XAA provides support for two types of 8x8 hardware patterns -
+    "Mono" patterns and "Color" patterns.  Mono pattern data is
+    64 bits of color expansion data with ones indicating the
+    foreground color and zeros indicating the background color.
+    The source bitmaps for the 8x8 mono patterns can be presented
+    to the graphics accelerator in one of two ways.  They can be
+    passed as two DWORDS to the 8x8 mono pattern functions or
+    they can be cached in offscreen memory and their locations
+    passed to the 8x8 mono pattern functions.  In addition to the
+    GXCOPY_ONLY, ROP_NEEDS_SOURCE, NO_PLANEMASK and RGB_EQUAL flags
+    defined in Section 2.0, the following are defined for the
+    Mono8x8PatternFillFlags:
+
+    HARDWARE_PATTERN_PROGRAMMED_BITS
+
+      This indicates that the 8x8 patterns should be packed into two
+      DWORDS and passed to the 8x8 mono pattern functions.  The default
+      behavior is to cache the patterns in offscreen video memory and
+      pass the locations of these patterns to the functions instead.
+      The pixmap cache must be enabled for the default behavior (8x8 
+      pattern caching) to work.  See Section 3 for how to enable the
+      pixmap cache. The pixmap cache is not necessary for 
+      HARDWARE_PATTERN_PROGRAMMED_BITS.
+
+    HARDWARE_PATTERN_PROGRAMMED_ORIGIN
+
+      If the hardware supports programmable pattern offsets then
+      this option should be set. See the table below for further
+      infomation.
+
+    HARDWARE_PATTERN_SCREEN_ORIGIN
+
+      Some hardware wants the pattern offset specified with respect to the
+      upper left-hand corner of the primitive being drawn.  Other hardware 
+      needs the option HARDWARE_PATTERN_SCREEN_ORIGIN set to indicate that 
+      all pattern offsets should be referenced to the upper left-hand 
+      corner of the screen.  HARDWARE_PATTERN_SCREEN_ORIGIN is preferable 
+      since this is more natural for the X-Window system and offsets will 
+      have to be recalculated for each Subsequent function otherwise.
+
+    BIT_ORDER_IN_BYTE_MSBFIRST
+    BIT_ORDER_IN_BYTE_LSBFIRST
+
+      As with other color expansion routines this indicates whether the
+      most or the least significant bit in each byte from the pattern is 
+      the leftmost on the screen.
+
+    TRANSPARENCY_ONLY
+    NO_TRANSPARENCY
+
+      This means the same thing as for the color expansion rect routines
+      except that for TRANSPARENCY_ONLY XAA will not render the primitive
+      in two passes since this is more easily handled by the driver.
+      It is recommended that TRANSPARENCY_ONLY hardware handle rendering
+      of opaque patterns in two passes (the background can be filled as
+      a rectangle in GXcopy) in the Subsequent function so that the
+      TRANSPARENCY_ONLY restriction can be removed. 
+
+
+
+    Additional information about cached patterns...
+    For the case where HARDWARE_PATTERN_PROGRAMMED_BITS is not set and 
+    the pattern must be cached in offscreen memory, the first pattern
+    starts at the cache slot boundary which is set by the 
+    CachePixelGranularity field used to configure the pixmap cache.
+    One should ensure that the CachePixelGranularity reflects any 
+    alignment restrictions that the accelerator may put on 8x8 pattern 
+    storage locations.  When HARDWARE_PATTERN_PROGRAMMED_ORIGIN is set 
+    there is only one pattern stored.  When this flag is not set,
+    all 64 pre-rotated copies of the pattern are cached in offscreen memory.
+    The MonoPatternPitch field can be used to specify the X position pixel
+    granularity that each of these patterns must align on.  If the
+    MonoPatternPitch is not supplied, the patterns will be densely packed
+    within the cache slot.  The behavior of the default XAA 8x8 pattern
+    caching mechanism to store all 8x8 patterns linearly in video memory.
+    If the accelerator needs the patterns stored in a more unusual fashion,
+    the driver will need to provide its own 8x8 mono pattern caching 
+    routines for XAA to use. 
+
+    The following table describes the meanings of the "patx" and "paty"
+    fields in both the SetupFor and Subsequent functions.
+
+    With HARDWARE_PATTERN_SCREEN_ORIGIN
+    -----------------------------------
+
+    HARDWARE_PATTERN_PROGRAMMED_BITS and HARDWARE_PATTERN_PROGRAMMED_ORIGIN
+
+	SetupFor: patx and paty are the first and second DWORDS of the
+		  8x8 mono pattern.
+
+	Subsequent: patx and paty are the x,y offset into that pattern.
+		    All Subsequent calls will have the same offset in 
+		    the case of HARDWARE_PATTERN_SCREEN_ORIGIN so only
+		    the offset specified by the first Subsequent call 
+		    after a SetupFor call will need to be observed.
+
+    HARDWARE_PATTERN_PROGRAMMED_BITS only
+
+	SetupFor: patx and paty hold the first and second DWORDS of
+		  the 8x8 mono pattern pre-rotated to match the desired
+		  offset.
+
+	Subsequent: These just hold the same patterns and can be ignored.
+
+    HARDWARE_PATTERN_PROGRAMMED_ORIGIN only
+
+	SetupFor: patx and paty hold the x,y coordinates of the offscreen
+		  memory location where the 8x8 pattern is stored.  The
+		  bits are stored linearly in memory at that location.
+
+	Subsequent: patx and paty hold the offset into the pattern.
+		    All Subsequent calls will have the same offset in 
+		    the case of HARDWARE_PATTERN_SCREEN_ORIGIN so only
+		    the offset specified by the first Subsequent call 
+		    after a SetupFor call will need to be observed.
+
+    Neither programmed bits or origin
+
+	SetupFor: patx and paty hold the x,y coordinates of the offscreen 	
+		  memory location where the pre-rotated 8x8 pattern is
+		  stored.
+
+	Subsequent: patx and paty are the same as in the SetupFor function
+		    and can be ignored.
+		  
+
+    Without HARDWARE_PATTERN_SCREEN_ORIGIN
+    -------------------------------------- 
+
+    HARDWARE_PATTERN_PROGRAMMED_BITS and HARDWARE_PATTERN_PROGRAMMED_ORIGIN
+
+	SetupFor: patx and paty are the first and second DWORDS of the
+		  8x8 mono pattern.
+
+	Subsequent: patx and paty are the x,y offset into that pattern.
+
+    HARDWARE_PATTERN_PROGRAMMED_BITS only
+
+	SetupFor: patx and paty holds the first and second DWORDS of
+		  the unrotated 8x8 mono pattern.  This can be ignored. 
+
+	Subsequent: patx and paty hold the rotated 8x8 pattern to be 
+		    rendered.
+
+    HARDWARE_PATTERN_PROGRAMMED_ORIGIN only
+
+	SetupFor: patx and paty hold the x,y coordinates of the offscreen
+		  memory location where the 8x8 pattern is stored.  The
+		  bits are stored linearly in memory at that location.
+
+	Subsequent: patx and paty hold the offset into the pattern.
+
+    Neither programmed bits or origin
+
+	SetupFor: patx and paty hold the x,y coordinates of the offscreen 	
+		  memory location where the unrotated 8x8 pattern is
+		  stored.  This can be ignored.
+
+	Subsequent: patx and paty hold the x,y coordinates of the
+		    rotated 8x8 pattern to be rendered.
+
+
+
+void SetupForMono8x8PatternFill(ScrnInfoPtr pScrn, int patx, int paty,
+        int fg, int bg, int rop, unsigned int planemask)
+
+    SetupForMono8x8PatternFill indicates that any combination of the 
+    following  may follow it.
+
+	SubsequentMono8x8PatternFillRect
+	SubsequentMono8x8PatternFillTrap
+
+    The fg, bg, rop and planemask fields have the same meaning as the
+    ones used for the other color expansion routines.  Patx's and paty's
+    meaning can be determined from the table above.
+
+ 
+void SubsequentMono8x8PatternFillRect( ScrnInfoPtr pScrn,
+        	int patx, int paty, int x, int y, int w, int h)
+
+     Fill a rectangle of dimensions "w" by "h" with origin at (x,y) 
+     using the parameters give by the last SetupForMono8x8PatternFill
+     call.  The meanings of patx and paty can be determined by the
+     table above.
+
+void SubsequentMono8x8PatternFillTrap( ScrnInfoPtr pScrn,
+     			   int patx, int paty, int y, int h, 
+     			   int left, int dxL, int dyL, int eL,
+     			   int right, int dxR, int dyR, int eR )
+
+     The meanings of patx and paty can be determined by the table above.
+     The rest of the fields have the same meanings as those in the 
+     SubsequentSolidFillTrap function. 
+
+
+
+2.7   8x8 Color Pattern Fills
+  
+    8x8 color pattern data is 64 pixels of full color data that
+    is stored linearly in offscreen video memory.  8x8 color patterns 
+    are useful as a substitute for 8x8 mono patterns when tiling,
+    doing opaque stipples, or in the case where transperency is
+    supported, regular stipples.  8x8 color pattern fills also have
+    the additional benefit of being able to tile full color 8x8
+    patterns instead of just 2 color ones like the mono patterns.
+    However, full color 8x8 patterns aren't used very often in the
+    X Window system so you might consider passing this primitive
+    by if you already can do mono patterns, especially if they 
+    require alot of cache area.  Color8x8PatternFillFlags is
+    the flags field for this primitive and the GXCOPY_ONLY,
+    ROP_NEEDS_SOURCE and NO_PLANEMASK flags as described in
+    Section 2.0 are valid as well as the following:
+
+
+    HARDWARE_PATTERN_PROGRAMMED_ORIGIN
+
+      If the hardware supports programmable pattern offsets then
+      this option should be set.  
+
+    HARDWARE_PATTERN_SCREEN_ORIGIN
+
+      Some hardware wants the pattern offset specified with respect to the
+      upper left-hand corner of the primitive being drawn.  Other hardware 
+      needs the option HARDWARE_PATTERN_SCREEN_ORIGIN set to indicate that 
+      all pattern offsets should be referenced to the upper left-hand 
+      corner of the screen.  HARDWARE_PATTERN_SCREEN_ORIGIN is preferable 
+      since this is more natural for the X-Window system and offsets will 
+      have to be recalculated for each Subsequent function otherwise.
+
+    NO_TRANSPARENCY
+    TRANSPARENCY_GXCOPY_ONLY
+
+      These mean the same as for the ScreenToScreenCopy functions.
+
+
+    The following table describes the meanings of patx and paty passed
+    to the SetupFor and Subsequent fields:
+
+    HARDWARE_PATTERN_PROGRAMMED_ORIGIN && HARDWARE_PATTERN_SCREEN_ORIGIN
+	
+	SetupFor: patx and paty hold the x,y location of the unrotated 
+		  pattern.
+
+	Subsequent: patx and paty hold the pattern offset.  For the case
+		    of HARDWARE_PATTERN_SCREEN_ORIGIN all Subsequent calls
+		    have the same offset so only the first call will need
+		    to be observed.
+
+    
+    HARDWARE_PATTERN_PROGRAMMED_ORIGIN only
+
+	SetupFor: patx and paty hold the x,y location of the unrotated
+		  pattern.
+
+	Subsequent: patx and paty hold the pattern offset. 
+
+    HARDWARE_PATTERN_SCREEN_ORIGIN
+
+	SetupFor: patx and paty hold the x,y location of the rotated pattern.
+
+	Subsequent: patx and paty hold the same location as the SetupFor
+		    function so these can be ignored.
+
+    neither flag
+
+	SetupFor: patx and paty hold the x,y location of the unrotated
+		  pattern.  This can be ignored.
+
+	Subsequent: patx and paty hold the x,y location of the rotated
+		    pattern.
+
+    Additional information about cached patterns...
+    All 8x8 color patterns are cached in offscreen video memory so
+    the pixmap cache must be enabled to use them. The first pattern
+    starts at the cache slot boundary which is set by the 
+    CachePixelGranularity field used to configure the pixmap cache.
+    One should ensure that the CachePixelGranularity reflects any 
+    alignment restrictions that the accelerator may put on 8x8 pattern 
+    storage locations.  When HARDWARE_PATTERN_PROGRAMMED_ORIGIN is set 
+    there is only one pattern stored.  When this flag is not set,
+    all 64 rotations off the pattern are accessible but it is assumed
+    that the accelerator is capable of accessing data stored on 8
+    pixel boundaries.  If the accelerator has stricter alignment 
+    requirements than this the dirver will need to provide its own 
+    8x8 color pattern caching routines. 
+
+
+void SetupForColor8x8PatternFill(ScrnInfoPtr pScrn, int patx, int paty,
+        	int rop, unsigned int planemask, int trans_color)
+
+    SetupForColor8x8PatternFill indicates that any combination of the 
+    following  may follow it.
+
+	SubsequentColor8x8PatternFillRect
+	SubsequentColor8x8PatternFillTrap	(not implemented yet)
+
+    For the meanings of patx and paty, see the table above.  Trans_color
+    means the same as for the ScreenToScreenCopy functions.
+
+
+ 
+void SubsequentColor8x8PatternFillRect( ScrnInfoPtr pScrn,
+        	int patx, int paty, int x, int y, int w, int h)
+
+     Fill a rectangle of dimensions "w" by "h" with origin at (x,y) 
+     using the parameters give by the last SetupForColor8x8PatternFill
+     call.  The meanings of patx and paty can be determined by the
+     table above.
+
+void SubsequentColor8x8PatternFillTrap( ScrnInfoPtr pScrn,
+     			   int patx, int paty, int y, int h, 
+     			   int left, int dxL, int dyL, int eL,
+     			   int right, int dxR, int dyR, int eR )
+
+    For the meanings of patx and paty, see the table above. 
+    The rest of the fields have the same meanings as those in the 
+    SubsequentSolidFillTrap function. 
+
+
+
+2.8  Image Writes
+
+    XAA provides a mechanism for transfering full color pixel data from
+    system memory to video memory through the accelerator.  This is 
+    useful for dealing with alignment issues and performing raster ops
+    on the data when writing it to the framebuffer.  As with color
+    expansion rectangles, there is a direct and indirect method.  The
+    direct method sends all data through a memory mapped aperature.
+    The indirect method sends the data to an intermediated buffer scanline 
+    at a time.
+
+    The direct and indirect methods have separate flags fields, the
+    ImageWriteFlags and ScanlineImageWriteFlags respectively.
+    Flags specific to one method or the other are described in sections 
+    2.8.1 and 2.8.2 but for both cases the GXCOPY_ONLY, ROP_NEEDS_SOURCE
+    and NO_PLANEMASK flags described in Section 2.0 are valid as well as
+    the following:
+
+    NO_GXCOPY
+
+      In order to have accelerated image transfers faster than the 
+      software versions for GXcopy, the engine needs to support clipping,
+      be using the direct method and have a large enough image transfer
+      range so that CPU_TRANSFER_BASE_FIXED doesn't need to be set.
+      If these are not supported, then it is unlikely that transfering
+      the data through the accelerator will be of any advantage for the
+      simple case of GXcopy.  In fact, it may be much slower.  For such
+      cases it's probably best to set the NO_GXCOPY flag so that 
+      Image writes will only be used for the more complicated rops.
+
+    /* transparency restrictions */
+
+    NO_TRANSPARENCY
+     
+      This indicates that the accelerator does not support skipping
+      of color keyed pixels when copying from the source to the destination.
+
+    TRANSPARENCY_GXCOPY_ONLY
+
+      This indicates that the accelerator supports skipping of color keyed
+      pixels only when the rop is GXcopy.
+
+    /* clipping  (optional) */
+    
+    LEFT_EDGE_CLIPPING
+ 
+      This indicates that the accelerator supports omission of up to
+      3 pixels on the left edge of the rectangle to be filled.  This
+      is beneficial since it allows transfer from the source pixmap to
+      always occur from DWORD boundaries. 
+
+    LEFT_EDGE_CLIPPING_NEGATIVE_X
+
+      This flag indicates that the accelerator can fill areas with
+      image write data even if the value of x origin is negative (off of
+      the screen on the left edge).
+
+
+2.8.1 The Direct Method
+
+    Using the direct method of ImageWrite XAA will send all
+    bitmap data to the accelerator serially through an memory mapped
+    transfer window defined by the following two fields:
+
+      unsigned char *ImageWriteBase
+
+        This indicates the memory address of the beginning of the aperture.
+
+      int ImageWriteRange
+
+        This indicates the size in bytes of the aperture.
+
+    The driver should specify how the transfered data should be padded.
+    There are options for both the padding of each Y scanline and for the
+    total transfer to the aperature.
+    One of the following two flags must be set:
+
+      CPU_TRANSFER_PAD_DWORD
+
+        This indicates that the total transfer (sum of all scanlines) sent
+        to the aperature must be DWORD padded.  This is the default behavior.
+
+      CPU_TRANSFER_PAD_QWORD 
+
+	This indicates that the total transfer (sum of all scanlines) sent
+	to the aperature must be QWORD padded.  With this set, XAA will send
+        an extra DWORD to the aperature when needed to ensure that only
+        an even number of DWORDs are sent.
+
+    And then there are the flags for padding of each scanline:
+
+      SCANLINE_PAD_DWORD
+
+	This indicates that each Y scanline should be DWORD padded.
+        This is the only option available and is the default.
+
+    Finally, there is the CPU_TRANSFER_BASE_FIXED flag which indicates
+    that the aperture is a single register rather than a range of
+    registers, and XAA should write all of the data to the first DWORD.
+    XAA will automatically select CPU_TRANSFER_BASE_FIXED if the 
+    ImageWriteRange is not large enough to accomodate an entire scanline.   
+
+
+void SetupForImageWrite(ScrnInfoPtr pScrn, int rop, unsigned int planemask,
+        			int trans_color, int bpp, int depth)
+
+     If trans_color is not -1 then trans_color indicates the transparency
+     color key and pixels with color trans_color passed through the 
+     aperature should not be transfered to the screen but should be 
+     skipped.  Bpp and depth indicate the bits per pixel and depth of
+     the source pixmap.  Trans_color is always -1 if the NO_TRANSPARENCY
+     flag is set.
+
+
+void SubsequentImageWriteRect(ScrnInfoPtr pScrn, 
+				int x, int y, int w, int h, int skipleft)
+
+     
+     Data passed through the aperature should be copied to a rectangle
+     of width "w" and height "h" with origin (x,y).  If LEFT_EDGE_CLIPPING
+     has been enabled, skipleft will correspond to the number of pixels
+     on the left edge that should not be drawn.  Skipleft is zero 
+     otherwise.
+
+     It can be arranged for XAA to call Sync() after it is through 
+     calling the Subsequent functions by setting SYNC_AFTER_IMAGE_WRITE 
+     in the  ImageWriteFlags.  This can provide the driver with an
+     oportunity to reset a clipping window if needed.
+
+2.8.2  The Indirect Method
+
+     Using the indirect method, XAA will render the pixel data scanline
+     at a time to one or more buffers.  These buffers may be memory
+     mapped apertures or just intermediate storage.
+
+     int NumScanlineImageWriteBuffers
+
+       This indicates the number of buffers available.
+
+     unsigned char **ScanlineImageWriteBuffers
+
+       This is an array of pointers to the memory locations of each buffer.
+       Each buffer is expected to be large enough to accommodate scanlines
+       the width of the screen.  That is:
+
+         pScrn->VirtualX * pScreen->bitsPerPixel/8   bytes or more.
+
+       If LEFT_EDGE_CLIPPING_NEGATIVE_X is set, add an additional 4
+       bytes to that requirement in 8 and 16bpp, 12 bytes in 24bpp.
+  
+     Scanlines are always DWORD padded.
+
+void SetupForScanlineImageWrite(ScrnInfoPtr pScrn, int rop, 
+				unsigned int planemask, int trans_color, 
+				int bpp, int depth)
+
+     If trans_color is not -1 then trans_color indicates the transparency
+     color key and pixels with color trans_color in the buffer should not 
+     be transfered to the screen but should be skipped.  Bpp and depth 
+     indicate the bits per pixel and depth of the source bitmap.  
+     Trans_color is always -1 if the NO_TRANSPARENCY flag is set.
+
+
+void SubsequentImageWriteRect(ScrnInfoPtr pScrn, 
+				int x, int y, int w, int h, int skipleft)
+
+     
+void SubsequentImageWriteScanline(ScrnInfoPtr pScrn, int bufno)
+
+
+    When SubsequentImageWriteRect is called, XAA will begin
+    transfering the source data scanline at a time, calling  
+    SubsequentImageWriteScanline after each scanline.  If more than
+    one buffer is available, XAA will cycle through the buffers.
+    Subsequent scanlines will use the next buffer and go back to the
+    buffer 0 again when the last buffer is reached.  The index into
+    the ScanlineImageWriteBuffers array is presented as "bufno"
+    with each SubsequentImageWriteScanline call.
+
+    The skipleft field is the same as for the direct method.
+
+    The indirect method can be use to send the source data directly 
+    to a memory mapped aperture represented by a single image write
+    buffer, scanline at a time, but more commonly it is used to place 
+    the data into offscreen video memory so that the accelerator can 
+    blit it to the visible screen from there.  In the case where the
+    accelerator permits rendering into offscreen video memory while
+    the accelerator is active, several buffers can be used so that
+    XAA can be placing source data into the next buffer while the
+    accelerator is blitting the current buffer.  For cases where
+    the accelerator requires some special manipulation of the source
+    data first, the buffers can be in system memory.  The CPU can
+    manipulate these buffers and then send the data to the accelerator.
+
+
+2.9 Clipping
+
+    XAA supports hardware clipping rectangles.  To use clipping
+    in this way it is expected that the graphics accelerator can
+    clip primitives with verticies anywhere in the 16 bit signed 
+    coordinate system. 
+
+void SetClippingRectangle ( ScrnInfoPtr pScrn,
+        		int left, int top, int right, int bottom)
+
+void DisableClipping (ScrnInfoPtr pScrn)
+
+    When SetClippingRectangle is called, all hardware rendering
+    following it should be clipped to the rectangle specified
+    until DisableClipping is called.
+
+    The ClippingFlags field indicates which operations this sort
+    of Set/Disable pairing can be used with.  Any of the following
+    flags may be OR'd together.
+
+	HARDWARE_CLIP_SCREEN_TO_SCREEN_COLOR_EXPAND
+	HARDWARE_CLIP_SCREEN_TO_SCREEN_COPY
+	HARDWARE_CLIP_MONO_8x8_FILL
+	HARDWARE_CLIP_COLOR_8x8_FILL
+	HARDWARE_CLIP_SOLID_FILL
+	HARDWARE_CLIP_DASHED_LINE
+	HARDWARE_CLIP_SOLID_LINE
+
+
+
+3)  XAA PIXMAP CACHE
+
+   /* NOTE:  XAA has no knowledge of framebuffer particulars so until
+	the framebuffer is able to render into offscreen memory, usage
+	of the pixmap cache requires that the driver provide ImageWrite
+	routines or a WritePixmap or WritePixmapToCache replacement so
+	that patterns can even be placed in the cache.
+
+      ADDENDUM: XAA can now load the pixmap cache without requiring
+	that the driver supply an ImageWrite function, but this can
+	only be done on linear framebuffers.  If you have a linear
+	framebuffer, set LINEAR_FRAMEBUFFER in the XAAInfoRec.Flags
+	field and XAA will then be able to upload pixmaps into the
+	cache without the driver providing functions to do so.
+   */
+
+
+   The XAA pixmap cache provides a mechanism for caching of patterns
+   in offscreen video memory so that tiled fills and in some cases
+   stippling can be done by blitting the source patterns from offscreen
+   video memory. The pixmap cache also provides the mechanism for caching 
+   of 8x8 color and mono hardware patterns.  Any unused offscreen video
+   memory gets used for the pixmap cache and that information is 
+   provided by the XFree86 Offscreen Memory Manager. XAA registers a 
+   callback with the manager so that it can be informed of any changes 
+   in the offscreen memory configuration.  The driver writer does not 
+   need to deal with any of this since it is all automatic.  The driver 
+   merely needs to initialize the Offscreen Memory Manager as described 
+   in the DESIGN document and set the PIXMAP_CACHE flag in the 
+   XAAInfoRec.Flags field.  The Offscreen Memory Manager initialization 
+   must occur before XAA is initialized or else pixmap cache 
+   initialization will fail.  
+
+   PixmapCacheFlags is an XAAInfoRec field which allows the driver to
+   control pixmap cache behavior to some extent.  Currently only one
+   flag is defined:
+
+   DO_NOT_BLIT_STIPPLES
+
+     This indicates that the stippling should not be done by blitting
+     from the pixmap cache.  This does not apply to 8x8 pattern fills. 
+
+
+   CachePixelGranularity is an optional field.  If the hardware requires
+   that a 8x8 patterns have some particular pixel alignment it should
+   be reflected in this field.  Ignoring this field or setting it to
+   zero or one means there are no alignment issues.
+
+
+4)  OFFSCREEN PIXMAPS
+
+   XAA has the ability to store pixmap drawables in offscreen video 
+   memory and render into them with full hardware acceleration.  Placement
+   of pixmaps in the cache is done automatically on a first-come basis and 
+   only if there is room.  To enable this feature, set the OFFSCREEN_PIXMAPS
+   flag in the XAAInfoRec.Flags field.  This is only available when a
+   ScreenToScreenCopy function is provided, when the Offscreen memory 
+   manager has been initialized and when the LINEAR_FRAMEBUFFER flag is
+   also set.
+
+   int maxOffPixWidth
+   int maxOffPixHeight
+
+       These two fields allow the driver to limit the maximum dimensions
+     of an offscreen pixmap.  If one of these is not set, it is assumed
+     that there is no limit on that dimension.  Note that if an offscreen
+     pixmap with a particular dimension is allowed, then your driver will be
+     expected to render primitives as large as that pixmap.  
+
+$XFree86: xc/programs/Xserver/hw/xfree86/xaa/XAA.HOWTO,v 1.12 2000/04/12 14:44:42 tsi Exp $
diff --git a/xorg-server/hw/xfree86/xaa/xaaInit.c b/xorg-server/hw/xfree86/xaa/xaaInit.c
index 48d0605fa..f146f3adf 100644
--- a/xorg-server/hw/xfree86/xaa/xaaInit.c
+++ b/xorg-server/hw/xfree86/xaa/xaaInit.c
@@ -27,7 +27,7 @@
 
 #define MIN_OFFPIX_SIZE		(320*200)
 
-static Bool XAACloseScreen(int i, ScreenPtr pScreen);
+static Bool XAACloseScreen(ScreenPtr pScreen);
 static void XAAGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h,
                         unsigned int format, unsigned long planemask,
                         char *pdstLine);
@@ -36,10 +36,10 @@ static void XAAGetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt,
 static PixmapPtr XAACreatePixmap(ScreenPtr pScreen, int w, int h, int depth,
                                  unsigned usage_hint);
 static Bool XAADestroyPixmap(PixmapPtr pPixmap);
-static Bool XAAEnterVT(int index, int flags);
-static void XAALeaveVT(int index, int flags);
-static int XAASetDGAMode(int index, int num, DGADevicePtr devRet);
-static void XAAEnableDisableFBAccess(int index, Bool enable);
+static Bool XAAEnterVT(ScrnInfoPtr pScrn);
+static void XAALeaveVT(ScrnInfoPtr pScrn);
+static int XAASetDGAMode(ScrnInfoPtr pScrn, int num, DGADevicePtr devRet);
+static void XAAEnableDisableFBAccess(ScrnInfoPtr pScrn, Bool enable);
 static Bool XAAChangeWindowAttributes(WindowPtr pWin, unsigned long mask);
 
 static DevPrivateKeyRec XAAScreenKeyRec;
@@ -214,7 +214,7 @@ XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
 }
 
 static Bool
-XAACloseScreen(int i, ScreenPtr pScreen)
+XAACloseScreen(ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     XAAScreenPtr pScreenPriv =
@@ -238,7 +238,7 @@ XAACloseScreen(int i, ScreenPtr pScreen)
 
     free((pointer) pScreenPriv);
 
-    return (*pScreen->CloseScreen) (i, pScreen);
+    return (*pScreen->CloseScreen) (pScreen);
 }
 
 static void
@@ -509,26 +509,24 @@ XAAChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
 /*  These two aren't really needed for anything */
 
 static Bool
-XAAEnterVT(int index, int flags)
+XAAEnterVT(ScrnInfoPtr pScrn)
 {
-    ScrnInfoPtr pScrn = xf86Screens[index];
     Bool ret;
-    ScreenPtr pScreen = screenInfo.screens[index];
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     XAAScreenPtr pScreenPriv =
         (XAAScreenPtr) dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey);
 
     pScrn->EnterVT = pScreenPriv->EnterVT;
-    ret = ((*pScreenPriv->EnterVT) (index, flags));
+    ret = ((*pScreenPriv->EnterVT) (pScrn));
     pScreenPriv->EnterVT = pScrn->EnterVT;
     pScrn->EnterVT = XAAEnterVT;
     return ret;
 }
 
 static void
-XAALeaveVT(int index, int flags)
+XAALeaveVT(ScrnInfoPtr pScrn)
 {
-    ScrnInfoPtr pScrn = xf86Screens[index];
-    ScreenPtr pScreen = screenInfo.screens[index];
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     XAAScreenPtr pScreenPriv =
         (XAAScreenPtr) dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey);
     XAAInfoRecPtr infoRec = pScreenPriv->AccelInfoRec;
@@ -539,7 +537,7 @@ XAALeaveVT(int index, int flags)
     }
 
     pScrn->LeaveVT = pScreenPriv->LeaveVT;
-    (*pScreenPriv->LeaveVT) (index, flags);
+    (*pScreenPriv->LeaveVT) (pScrn);
     pScreenPriv->LeaveVT = pScrn->LeaveVT;
     pScrn->LeaveVT = XAALeaveVT;
 }
@@ -551,9 +549,9 @@ typedef struct {
 } SavedCacheState, *SavedCacheStatePtr;
 
 static int
-XAASetDGAMode(int index, int num, DGADevicePtr devRet)
+XAASetDGAMode(ScrnInfoPtr pScrn, int num, DGADevicePtr devRet)
 {
-    ScreenPtr pScreen = screenInfo.screens[index];
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
     XAAScreenPtr pScreenPriv =
         (XAAScreenPtr) dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey);
@@ -569,7 +567,7 @@ XAASetDGAMode(int index, int num, DGADevicePtr devRet)
         infoRec->dgaSaves = NULL;
     }
 
-    ret = (*pScreenPriv->SetDGAMode) (index, num, devRet);
+    ret = (*pScreenPriv->SetDGAMode) (pScrn, num, devRet);
     if (ret != Success)
         return ret;
 
@@ -612,9 +610,9 @@ XAASetDGAMode(int index, int num, DGADevicePtr devRet)
 }
 
 static void
-XAAEnableDisableFBAccess(int index, Bool enable)
+XAAEnableDisableFBAccess(ScrnInfoPtr pScrn, Bool enable)
 {
-    ScreenPtr pScreen = screenInfo.screens[index];
+    ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
     XAAScreenPtr pScreenPriv =
         (XAAScreenPtr) dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey);
@@ -627,7 +625,7 @@ XAAEnableDisableFBAccess(int index, Bool enable)
         SwitchedOut = TRUE;
     }
 
-    (*pScreenPriv->EnableDisableFBAccess) (index, enable);
+    (*pScreenPriv->EnableDisableFBAccess) (pScrn, enable);
 
     if (enable) {
         if ((infoRec->Flags & OFFSCREEN_PIXMAPS) && (infoRec->OffscreenPixmaps))
diff --git a/xorg-server/hw/xfree86/xaa/xaalocal.h b/xorg-server/hw/xfree86/xaa/xaalocal.h
index c028ef033..61d9eebe5 100644
--- a/xorg-server/hw/xfree86/xaa/xaalocal.h
+++ b/xorg-server/hw/xfree86/xaa/xaalocal.h
@@ -47,10 +47,10 @@ typedef struct _XAAScreen {
     DestroyPixmapProcPtr DestroyPixmap;
     ChangeWindowAttributesProcPtr ChangeWindowAttributes;
     XAAInfoRecPtr AccelInfoRec;
-    Bool (*EnterVT) (int, int);
-    void (*LeaveVT) (int, int);
-    int (*SetDGAMode) (int, int, DGADevicePtr);
-    void (*EnableDisableFBAccess) (int, Bool);
+    Bool (*EnterVT) (ScrnInfoPtr);
+    void (*LeaveVT) (ScrnInfoPtr);
+    int (*SetDGAMode) (ScrnInfoPtr, int, DGADevicePtr);
+    void (*EnableDisableFBAccess) (ScrnInfoPtr, Bool);
     CompositeProcPtr Composite;
     GlyphsProcPtr Glyphs;
 } XAAScreenRec, *XAAScreenPtr;
diff --git a/xorg-server/hw/xnest/.gitignore b/xorg-server/hw/xnest/.gitignore
new file mode 100644
index 000000000..b76c5a2d0
--- /dev/null
+++ b/xorg-server/hw/xnest/.gitignore
@@ -0,0 +1 @@
+Xnest
diff --git a/xorg-server/hw/xnest/Screen.c b/xorg-server/hw/xnest/Screen.c
index dd76cb801..7b3c1b361 100644
--- a/xorg-server/hw/xnest/Screen.c
+++ b/xorg-server/hw/xnest/Screen.c
@@ -129,7 +129,7 @@ static miPointerSpriteFuncRec xnestPointerSpriteFuncs = {
 };
 
 Bool
-xnestOpenScreen(int index, ScreenPtr pScreen, int argc, char *argv[])
+xnestOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
 {
     VisualPtr visuals;
     DepthPtr depths;
@@ -309,8 +309,6 @@ xnestOpenScreen(int index, ScreenPtr pScreen, int argc, char *argv[])
 
     pScreen->BlockHandler = (ScreenBlockHandlerProcPtr) NoopDDA;
     pScreen->WakeupHandler = (ScreenWakeupHandlerProcPtr) NoopDDA;
-    pScreen->blockData = NULL;
-    pScreen->wakeupData = NULL;
 
     miDCInitialize(pScreen, &xnestPointerCursorFuncs);  /* init SW rendering */
     PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
@@ -409,7 +407,7 @@ xnestOpenScreen(int index, ScreenPtr pScreen, int argc, char *argv[])
 }
 
 Bool
-xnestCloseScreen(int index, ScreenPtr pScreen)
+xnestCloseScreen(ScreenPtr pScreen)
 {
     int i;
 
diff --git a/xorg-server/hw/xnest/Screen.h b/xorg-server/hw/xnest/Screen.h
index 1d255d79b..17c514af7 100644
--- a/xorg-server/hw/xnest/Screen.h
+++ b/xorg-server/hw/xnest/Screen.h
@@ -19,7 +19,7 @@ extern Window xnestDefaultWindows[MAXSCREENS];
 extern Window xnestScreenSaverWindows[MAXSCREENS];
 
 ScreenPtr xnestScreen(Window window);
-Bool xnestOpenScreen(int index, ScreenPtr pScreen, int argc, char *argv[]);
-Bool xnestCloseScreen(int index, ScreenPtr pScreen);
+Bool xnestOpenScreen(ScreenPtr pScreen, int argc, char *argv[]);
+Bool xnestCloseScreen(ScreenPtr pScreen);
 
 #endif                          /* XNESTSCREEN_H */
diff --git a/xorg-server/hw/xnest/icon b/xorg-server/hw/xnest/icon
index 725f1131a..aa00ca497 100644
--- a/xorg-server/hw/xnest/icon
+++ b/xorg-server/hw/xnest/icon
@@ -1,14 +1,14 @@
-#define icon_width 32
-#define icon_height 32
-static unsigned char icon_bits[] = {
-   0xff, 0x00, 0x00, 0xc0, 0xfe, 0x01, 0x00, 0xc0, 0xfc, 0x03, 0x00, 0x60,
-   0xf8, 0x07, 0x00, 0x30, 0xf8, 0x07, 0x00, 0x18, 0xf0, 0x0f, 0x00, 0x0c,
-   0xe0, 0x1f, 0x00, 0x06, 0xc0, 0x3f, 0x00, 0x06, 0xc0, 0x3f, 0x00, 0x03,
-   0x80, 0x7f, 0x80, 0x01, 0x00, 0xff, 0xc0, 0x00, 0x00, 0xfe, 0x61, 0x00,
-   0x00, 0xfe, 0x31, 0x00, 0x00, 0xfc, 0x33, 0x00, 0x00, 0xf8, 0x1b, 0x00,
-   0x00, 0xf0, 0x0d, 0x00, 0x00, 0xf0, 0x0e, 0x00, 0x00, 0x60, 0x1f, 0x00,
-   0x00, 0xb0, 0x3f, 0x00, 0x00, 0x98, 0x7f, 0x00, 0x00, 0x98, 0x7f, 0x00,
-   0x00, 0x0c, 0xff, 0x00, 0x00, 0x06, 0xfe, 0x01, 0x00, 0x03, 0xfc, 0x03,
-   0x80, 0x01, 0xfc, 0x03, 0xc0, 0x00, 0xf8, 0x07, 0xc0, 0x00, 0xf0, 0x0f,
-   0x60, 0x00, 0xe0, 0x1f, 0x30, 0x00, 0xe0, 0x1f, 0x18, 0x00, 0xc0, 0x3f,
-   0x0c, 0x00, 0x80, 0x7f, 0x06, 0x00, 0x00, 0xff};
+#define icon_width 32
+#define icon_height 32
+static unsigned char icon_bits[] = {
+   0xff, 0x00, 0x00, 0xc0, 0xfe, 0x01, 0x00, 0xc0, 0xfc, 0x03, 0x00, 0x60,
+   0xf8, 0x07, 0x00, 0x30, 0xf8, 0x07, 0x00, 0x18, 0xf0, 0x0f, 0x00, 0x0c,
+   0xe0, 0x1f, 0x00, 0x06, 0xc0, 0x3f, 0x00, 0x06, 0xc0, 0x3f, 0x00, 0x03,
+   0x80, 0x7f, 0x80, 0x01, 0x00, 0xff, 0xc0, 0x00, 0x00, 0xfe, 0x61, 0x00,
+   0x00, 0xfe, 0x31, 0x00, 0x00, 0xfc, 0x33, 0x00, 0x00, 0xf8, 0x1b, 0x00,
+   0x00, 0xf0, 0x0d, 0x00, 0x00, 0xf0, 0x0e, 0x00, 0x00, 0x60, 0x1f, 0x00,
+   0x00, 0xb0, 0x3f, 0x00, 0x00, 0x98, 0x7f, 0x00, 0x00, 0x98, 0x7f, 0x00,
+   0x00, 0x0c, 0xff, 0x00, 0x00, 0x06, 0xfe, 0x01, 0x00, 0x03, 0xfc, 0x03,
+   0x80, 0x01, 0xfc, 0x03, 0xc0, 0x00, 0xf8, 0x07, 0xc0, 0x00, 0xf0, 0x0f,
+   0x60, 0x00, 0xe0, 0x1f, 0x30, 0x00, 0xe0, 0x1f, 0x18, 0x00, 0xc0, 0x3f,
+   0x0c, 0x00, 0x80, 0x7f, 0x06, 0x00, 0x00, 0xff};
diff --git a/xorg-server/hw/xnest/screensaver b/xorg-server/hw/xnest/screensaver
index 4940f2650..22fe414b2 100644
--- a/xorg-server/hw/xnest/screensaver
+++ b/xorg-server/hw/xnest/screensaver
@@ -1,686 +1,686 @@
-#define screensaver_width 256
-#define screensaver_height 256
-static unsigned char screensaver_bits[] = {
-   0xa8, 0x00, 0xa0, 0xaa, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00,
-   0x00, 0x00, 0x00, 0xa8, 0xaa, 0x02, 0x00, 0x80, 0x0a, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x00, 0x40, 0x55,
-   0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x50,
-   0x55, 0x05, 0x00, 0x40, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x80, 0xaa, 0x2a, 0x00, 0x00, 0x00,
-   0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0xa8, 0xaa, 0x02, 0x00, 0xa0,
-   0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x15, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
-   0x00, 0x00, 0x00, 0x50, 0x55, 0x05, 0x00, 0x40, 0x01, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0xaa,
-   0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8a, 0x00, 0x00, 0x00, 0x00, 0xa0,
-   0xaa, 0x0a, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x54, 0x55, 0x01, 0x00, 0x00,
-   0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0x15, 0x00, 0x50,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0xaa, 0x2a, 0x80, 0x02, 0x80, 0xaa, 0xaa, 0x82, 0x0a, 0xa8, 0x28, 0x80,
-   0x8a, 0x80, 0x2a, 0x80, 0x80, 0x8a, 0xa2, 0x82, 0x0a, 0xaa, 0x0a, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x2a, 0x02, 0x80, 0x82, 0x41, 0x40, 0x00, 0x50,
-   0x55, 0x41, 0x00, 0x00, 0x04, 0x00, 0x54, 0x40, 0x10, 0x00, 0x40, 0x00,
-   0x51, 0x55, 0x00, 0x15, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x41, 0x00, 0x10, 0x14, 0x00, 0x00, 0x00, 0xa8, 0x8a, 0x02, 0x00, 0x02,
-   0x00, 0x20, 0xa2, 0x00, 0x80, 0x00, 0x08, 0x00, 0xaa, 0x2a, 0x00, 0x2a,
-   0x08, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x80,
-   0x01, 0x00, 0x01, 0x50, 0x45, 0x05, 0x00, 0x01, 0x10, 0x10, 0x40, 0x11,
-   0x40, 0x00, 0x44, 0x00, 0x50, 0x15, 0x01, 0x15, 0x04, 0x00, 0x40, 0x00,
-   0x05, 0x00, 0x00, 0x40, 0x00, 0x01, 0x00, 0x50, 0x20, 0x00, 0x00, 0xa2,
-   0xaa, 0x2a, 0x00, 0x00, 0x02, 0x00, 0xa0, 0x08, 0x00, 0x00, 0x00, 0x00,
-   0xa2, 0xaa, 0x00, 0x0a, 0x00, 0x08, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x20,
-   0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x01, 0x40, 0x44, 0x15, 0x10, 0x01,
-   0x10, 0x10, 0x40, 0x01, 0x40, 0x00, 0x00, 0x00, 0x54, 0x55, 0x41, 0x45,
-   0x04, 0x00, 0x40, 0x00, 0x14, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x54,
-   0x20, 0x80, 0x00, 0x82, 0xaa, 0x0a, 0x00, 0x00, 0x22, 0x00, 0x80, 0x0a,
-   0x00, 0x00, 0x82, 0x00, 0xa0, 0x8a, 0x22, 0x02, 0x00, 0x08, 0x20, 0x00,
-   0xa8, 0x00, 0x00, 0x20, 0x00, 0x80, 0x00, 0x2a, 0x10, 0x40, 0x00, 0x01,
-   0x54, 0x45, 0x10, 0x00, 0x01, 0x00, 0x00, 0x05, 0x00, 0x00, 0x01, 0x00,
-   0x50, 0x45, 0x05, 0x41, 0x00, 0x04, 0x10, 0x00, 0x50, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x15, 0x00, 0x28, 0x00, 0xaa, 0xaa, 0x0a, 0x0a, 0x00,
-   0x20, 0x08, 0x00, 0x20, 0x00, 0x00, 0x80, 0x00, 0xa8, 0xa2, 0x22, 0x2a,
-   0x00, 0x00, 0x0a, 0x00, 0xa8, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x0a,
-   0x50, 0x05, 0x00, 0x01, 0x55, 0x45, 0x00, 0x00, 0x01, 0x00, 0x00, 0x40,
-   0x01, 0x00, 0x00, 0x00, 0x40, 0x55, 0x11, 0x00, 0x00, 0x54, 0x01, 0x00,
-   0x44, 0x01, 0x00, 0x00, 0x05, 0x40, 0x00, 0x05, 0x00, 0x08, 0x00, 0x80,
-   0xaa, 0xaa, 0x08, 0x00, 0x00, 0x08, 0x00, 0x00, 0x0a, 0x00, 0x80, 0x00,
-   0x80, 0xaa, 0x28, 0x20, 0x00, 0x00, 0x02, 0x00, 0x80, 0x02, 0x00, 0x00,
-   0x28, 0x00, 0x80, 0x02, 0x10, 0x10, 0x00, 0x01, 0x54, 0x45, 0x01, 0x00,
-   0x41, 0x00, 0x00, 0x00, 0x10, 0x40, 0x00, 0x00, 0x10, 0x55, 0x14, 0x00,
-   0x00, 0x04, 0x04, 0x00, 0x40, 0x01, 0x00, 0x00, 0x40, 0x40, 0x40, 0x01,
-   0x08, 0x00, 0x80, 0x00, 0xa8, 0xa2, 0x02, 0x80, 0x00, 0x00, 0x00, 0x00,
-   0x20, 0xa0, 0xaa, 0x00, 0x80, 0x28, 0x0a, 0x00, 0x00, 0x02, 0x00, 0x00,
-   0x80, 0x02, 0x00, 0x00, 0x80, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
-   0x10, 0x14, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
-   0x00, 0x40, 0x00, 0x00, 0x08, 0x20, 0x80, 0x00, 0x08, 0x08, 0x80, 0x80,
-   0x80, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x8a, 0x8a, 0x00,
-   0x02, 0x02, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
-   0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x01,
-   0x10, 0x10, 0x00, 0x01, 0x10, 0x45, 0x55, 0x01, 0x00, 0x00, 0x10, 0x00,
-   0x00, 0x00, 0x00, 0x04, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00,
-   0x20, 0xa2, 0xaa, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
-   0x00, 0x80, 0x00, 0x02, 0x04, 0x00, 0x40, 0x00, 0x04, 0x04, 0x40, 0x40,
-   0x00, 0x01, 0x00, 0x04, 0x04, 0x00, 0x00, 0x01, 0x00, 0x51, 0x45, 0x05,
-   0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x45, 0x01,
-   0x2a, 0x80, 0xaa, 0xaa, 0x82, 0xaa, 0x2a, 0xa0, 0x02, 0x02, 0x80, 0xa8,
-   0x00, 0x2a, 0xa0, 0x02, 0x80, 0xa2, 0x00, 0xa0, 0xa0, 0x0a, 0xa0, 0x00,
-   0x00, 0x00, 0x80, 0x88, 0x02, 0x00, 0x08, 0x80, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x50, 0x41, 0x55, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,
-   0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0xa0, 0xaa, 0x0a,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0x00, 0x00, 0x20, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x54, 0x40, 0x55, 0x15, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x54, 0x01, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x2a, 0x80, 0xaa, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8,
-   0x02, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x55, 0x55,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x05, 0x00, 0x04, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xa0, 0x0a, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x05, 0x00, 0x54, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
-   0x15, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0xa8, 0xaa,
-   0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x0a, 0x80, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x40, 0x01, 0x00, 0x50, 0x55, 0x05, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x40, 0x15, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0,
-   0x00, 0x00, 0xa8, 0xaa, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-   0x2a, 0x20, 0x00, 0x00, 0x41, 0x05, 0x55, 0x54, 0x11, 0x04, 0x00, 0x14,
-   0x40, 0x10, 0x44, 0x15, 0x15, 0x00, 0x00, 0x50, 0x01, 0x00, 0x50, 0x55,
-   0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x10, 0x50, 0x40,
-   0x82, 0x08, 0x02, 0x08, 0x20, 0x08, 0x00, 0x22, 0xa0, 0x20, 0x88, 0x00,
-   0x22, 0x00, 0x00, 0xa8, 0x2a, 0x00, 0xa0, 0xaa, 0x0a, 0x00, 0x80, 0x02,
-   0x00, 0x00, 0x00, 0x00, 0xaa, 0x08, 0x88, 0x20, 0x44, 0x10, 0x01, 0x04,
-   0x50, 0x04, 0x00, 0x41, 0x10, 0x11, 0x44, 0x00, 0x41, 0x00, 0x00, 0x54,
-   0x41, 0x00, 0x40, 0x55, 0x15, 0x00, 0x40, 0x04, 0x00, 0x00, 0x00, 0x00,
-   0x54, 0x11, 0x04, 0x11, 0x80, 0x20, 0x02, 0x08, 0xa0, 0x08, 0x00, 0x02,
-   0x88, 0x20, 0x88, 0x00, 0x82, 0x00, 0x00, 0x2a, 0x22, 0x00, 0x80, 0xaa,
-   0x2a, 0x00, 0x20, 0x08, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x08, 0x08, 0x20,
-   0x40, 0x10, 0x01, 0x04, 0x50, 0x04, 0x00, 0x01, 0x04, 0x41, 0x44, 0x00,
-   0x41, 0x00, 0x00, 0x15, 0x05, 0x14, 0x15, 0x50, 0x10, 0x05, 0x40, 0x41,
-   0x41, 0x10, 0x45, 0x05, 0x50, 0x04, 0x04, 0x10, 0x80, 0x20, 0x02, 0x08,
-   0xa0, 0x08, 0x00, 0x02, 0x08, 0x22, 0x82, 0x00, 0x82, 0x00, 0x00, 0x0a,
-   0x2a, 0x22, 0x8a, 0x22, 0x22, 0x08, 0x80, 0x22, 0x22, 0x88, 0x88, 0x02,
-   0x28, 0x02, 0x08, 0x20, 0x40, 0x10, 0x15, 0x54, 0x10, 0x05, 0x00, 0x14,
-   0x04, 0x41, 0x44, 0x05, 0x41, 0x00, 0x00, 0x05, 0x50, 0x01, 0x41, 0x04,
-   0x05, 0x11, 0x00, 0x05, 0x44, 0x44, 0x50, 0x00, 0x10, 0x05, 0x50, 0x10,
-   0x80, 0x0a, 0x02, 0x08, 0x20, 0x0a, 0x00, 0x20, 0xa8, 0x82, 0x82, 0x00,
-   0x2a, 0x00, 0x80, 0x02, 0x22, 0x02, 0x82, 0x20, 0x20, 0x08, 0x20, 0x88,
-   0x82, 0x88, 0x8a, 0x00, 0x88, 0x0a, 0x80, 0x20, 0x40, 0x04, 0x01, 0x04,
-   0x10, 0x05, 0x00, 0x40, 0x04, 0x41, 0x41, 0x00, 0x11, 0x00, 0x40, 0x01,
-   0x41, 0x41, 0x41, 0x14, 0x15, 0x11, 0x40, 0x44, 0x04, 0x44, 0x40, 0x00,
-   0x44, 0x15, 0x00, 0x11, 0x80, 0x08, 0x02, 0x08, 0x20, 0x0a, 0x00, 0x80,
-   0x08, 0x82, 0x82, 0x00, 0x22, 0x00, 0xa0, 0x00, 0x22, 0x22, 0x82, 0x20,
-   0x22, 0x0a, 0x20, 0x28, 0x82, 0x82, 0x88, 0x00, 0x88, 0x2a, 0x00, 0x22,
-   0x44, 0x10, 0x01, 0x04, 0x10, 0x04, 0x00, 0x41, 0x04, 0x01, 0x41, 0x00,
-   0x41, 0x00, 0x50, 0x01, 0x14, 0x14, 0x01, 0x55, 0x10, 0x15, 0x40, 0x45,
-   0x05, 0x01, 0x45, 0x00, 0x04, 0x55, 0x04, 0x11, 0x82, 0x20, 0x02, 0x08,
-   0x20, 0x08, 0x00, 0x22, 0x08, 0x82, 0x80, 0x00, 0x82, 0x00, 0xa8, 0x00,
-   0x00, 0x00, 0x00, 0xa0, 0xaa, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x02, 0xaa, 0x88, 0x20, 0x41, 0x10, 0x55, 0x54, 0x11, 0x04, 0x00, 0x14,
-   0x04, 0x01, 0x41, 0x15, 0x41, 0x00, 0x54, 0x00, 0x00, 0x00, 0x00, 0x40,
-   0x55, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x54, 0x51, 0x40,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x80, 0xaa, 0x2a, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x80, 0x00, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x54, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01, 0x15, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
-   0x00, 0x54, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0xaa, 0x02,
-   0x00, 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0xa8, 0x02, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00,
-   0x50, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x10, 0x00, 0x50, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xa0, 0xaa, 0x0a, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
-   0x00, 0xa0, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0x15,
-   0x00, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x40, 0x15, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xaa, 0x2a, 0x00, 0x00, 0x00, 0x00,
-   0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x02, 0x00, 0x80, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-   0x00, 0x00, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa,
-   0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00,
-   0x05, 0x14, 0x40, 0x01, 0x41, 0x40, 0x01, 0x14, 0x10, 0x01, 0x00, 0x40,
-   0x01, 0x04, 0x14, 0x14, 0x14, 0x10, 0x04, 0x00, 0xa0, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x0a, 0xaa, 0x00, 0x00, 0x00, 0x80, 0x82, 0xa0, 0x20, 0x82,
-   0xa2, 0x20, 0x02, 0x22, 0x28, 0x02, 0x00, 0x08, 0x8a, 0x22, 0x08, 0x08,
-   0x22, 0x28, 0x0a, 0x00, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x54,
-   0x01, 0x00, 0x00, 0x40, 0x41, 0x40, 0x10, 0x04, 0x11, 0x11, 0x04, 0x41,
-   0x10, 0x04, 0x00, 0x04, 0x04, 0x40, 0x10, 0x00, 0x41, 0x10, 0x11, 0x00,
-   0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0xaa, 0x02, 0x00, 0x00, 0xa0,
-   0x82, 0x80, 0x08, 0x08, 0x02, 0x08, 0x88, 0x80, 0x08, 0x08, 0x00, 0x08,
-   0x08, 0x20, 0x20, 0x80, 0x80, 0x20, 0x00, 0x00, 0x10, 0x50, 0x14, 0x14,
-   0x45, 0x05, 0x40, 0x05, 0x41, 0x14, 0x15, 0x50, 0x41, 0x01, 0x04, 0x00,
-   0x01, 0x04, 0x50, 0x00, 0x11, 0x04, 0x00, 0x14, 0x00, 0x40, 0x10, 0x44,
-   0x00, 0x11, 0x00, 0x00, 0xa0, 0x88, 0x22, 0xa2, 0x88, 0x08, 0x00, 0x2a,
-   0x82, 0x22, 0x22, 0xa8, 0x80, 0x0a, 0x08, 0x00, 0x02, 0xa8, 0x8a, 0xaa,
-   0x08, 0x08, 0x00, 0xa8, 0x00, 0x2a, 0x20, 0x80, 0xaa, 0x20, 0x00, 0x00,
-   0x00, 0x05, 0x04, 0x15, 0x55, 0x04, 0x40, 0x04, 0x50, 0x54, 0x01, 0x54,
-   0x00, 0x54, 0x04, 0x00, 0x01, 0x04, 0x40, 0x00, 0x10, 0x04, 0x00, 0x40,
-   0x05, 0x41, 0x40, 0x40, 0x00, 0x10, 0x00, 0x00, 0x80, 0x08, 0x02, 0x82,
-   0x80, 0x08, 0x80, 0x20, 0x02, 0x02, 0x02, 0x2a, 0x00, 0xa0, 0x08, 0x00,
-   0x02, 0x08, 0x80, 0x00, 0x08, 0x08, 0x00, 0x00, 0x8a, 0x20, 0x20, 0x82,
-   0x00, 0x20, 0x00, 0x00, 0x10, 0x45, 0x04, 0x11, 0x51, 0x04, 0x50, 0x44,
-   0x44, 0x44, 0x01, 0x15, 0x00, 0x40, 0x05, 0x00, 0x01, 0x04, 0x40, 0x00,
-   0x10, 0x04, 0x00, 0x00, 0x54, 0x40, 0x40, 0x41, 0x00, 0x10, 0x00, 0x00,
-   0xa0, 0x28, 0x02, 0x0a, 0x8a, 0x08, 0x20, 0x0a, 0x0a, 0x28, 0x02, 0x0a,
-   0x00, 0x80, 0x08, 0x00, 0x02, 0x08, 0x80, 0x00, 0x08, 0x08, 0x00, 0x00,
-   0x88, 0x20, 0x80, 0x80, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x05, 0x40, 0x00, 0x11, 0x00,
-   0x01, 0x10, 0x10, 0x01, 0x11, 0x04, 0x00, 0x04, 0x50, 0x40, 0x41, 0x01,
-   0x01, 0x11, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa,
-   0xaa, 0x00, 0x80, 0x02, 0x80, 0x80, 0x20, 0x02, 0x02, 0x20, 0x08, 0x82,
-   0x08, 0x08, 0x00, 0x08, 0x88, 0x20, 0x80, 0x00, 0x82, 0x20, 0x00, 0x00,
-   0x00, 0x40, 0x01, 0x10, 0x00, 0x00, 0x00, 0x54, 0x55, 0x01, 0x40, 0x01,
-   0x40, 0x14, 0x40, 0x41, 0x05, 0x40, 0x01, 0x14, 0x14, 0x14, 0x00, 0x44,
-   0x01, 0x45, 0x00, 0x00, 0x14, 0x54, 0x00, 0x00, 0x00, 0x80, 0x02, 0x08,
-   0x00, 0x00, 0x00, 0xa8, 0xaa, 0x02, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x04, 0x00, 0x00, 0x00, 0x50,
-   0x55, 0x05, 0x50, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x0a, 0x02, 0x00, 0x00, 0x00, 0xa0, 0xaa, 0x0a, 0xa8, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x01,
-   0x00, 0x00, 0x00, 0x50, 0x55, 0x05, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x00, 0xa0,
-   0xaa, 0x0a, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0x15, 0x15, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00,
-   0x00, 0x00, 0x00, 0x80, 0xaa, 0x2a, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x55, 0x15, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0x8a, 0x02, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x01,
-   0x00, 0x00, 0x00, 0x00, 0x54, 0x45, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x02, 0x00, 0x00, 0x00, 0x00,
-   0xa8, 0xa2, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x01, 0x05, 0x50, 0x00, 0x50, 0x40, 0x45, 0x11, 0x00, 0x50,
-   0x40, 0x41, 0x01, 0x00, 0x14, 0x00, 0x51, 0x40, 0x40, 0x00, 0x05, 0x14,
-   0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x0a,
-   0x88, 0x02, 0xaa, 0xa8, 0x80, 0x00, 0x00, 0xaa, 0xa8, 0xa2, 0x02, 0x00,
-   0xa2, 0xa0, 0x22, 0xa8, 0xa0, 0xa0, 0x8a, 0x2a, 0x02, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x14, 0x04, 0x01, 0x45, 0x51,
-   0x04, 0x40, 0x00, 0x45, 0x41, 0x51, 0x01, 0x00, 0x41, 0x50, 0x54, 0x50,
-   0x50, 0x50, 0x14, 0x14, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x0a, 0x82, 0xa2, 0xa0, 0x02, 0xa0, 0x88, 0x82,
-   0xa0, 0x88, 0x02, 0x80, 0x82, 0x28, 0x28, 0xa0, 0x20, 0x28, 0x08, 0x8a,
-   0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x51, 0x45, 0x54, 0x00,
-   0x14, 0x40, 0x41, 0x50, 0x05, 0x51, 0x10, 0x41, 0x41, 0x41, 0x01, 0x00,
-   0x05, 0x14, 0x10, 0x50, 0x40, 0x10, 0x14, 0x54, 0x04, 0x00, 0x41, 0x55,
-   0x04, 0x45, 0x01, 0x04, 0x20, 0x02, 0x08, 0x00, 0x2a, 0xa0, 0x00, 0xa0,
-   0x8a, 0x20, 0xa8, 0xa2, 0xa0, 0xa0, 0x00, 0x80, 0x0a, 0x28, 0x28, 0xa0,
-   0x20, 0x28, 0x0a, 0x2a, 0x00, 0x00, 0x22, 0x0a, 0x80, 0x88, 0x02, 0x88,
-   0x04, 0x50, 0x01, 0x00, 0x54, 0x40, 0x01, 0x50, 0x15, 0x10, 0x14, 0x51,
-   0x40, 0x41, 0x01, 0x00, 0x15, 0x14, 0x14, 0x40, 0x11, 0x14, 0x05, 0x14,
-   0x00, 0x40, 0x10, 0x00, 0x15, 0x45, 0x04, 0x01, 0x00, 0x00, 0x08, 0x00,
-   0xa8, 0xa0, 0x00, 0x28, 0x8a, 0x08, 0x0a, 0x28, 0xa0, 0xa0, 0x00, 0x00,
-   0x2a, 0x0a, 0x28, 0xa0, 0x08, 0x8a, 0x02, 0x0a, 0x00, 0x80, 0x00, 0x08,
-   0x80, 0x00, 0x00, 0x82, 0x44, 0x11, 0x00, 0x00, 0x50, 0x50, 0x00, 0x10,
-   0x05, 0x40, 0x15, 0x05, 0x50, 0x50, 0x00, 0x00, 0x14, 0x14, 0x14, 0x40,
-   0x11, 0x54, 0x00, 0x05, 0x00, 0x00, 0x11, 0x00, 0x01, 0x40, 0x04, 0x44,
-   0x80, 0x20, 0x0a, 0x00, 0xa0, 0xa0, 0x00, 0x88, 0x82, 0xa8, 0x0a, 0x00,
-   0xa0, 0xa0, 0x00, 0x00, 0x28, 0x0a, 0x0a, 0xa0, 0x08, 0x0a, 0x00, 0x0a,
-   0x00, 0x00, 0x22, 0x0a, 0xa2, 0x00, 0x00, 0x88, 0x01, 0x40, 0x15, 0x00,
-   0x50, 0x51, 0x40, 0x00, 0x01, 0x51, 0x15, 0x00, 0x50, 0x50, 0x00, 0x00,
-   0x54, 0x14, 0x54, 0x40, 0x05, 0x14, 0x00, 0x05, 0x00, 0x40, 0x41, 0x15,
-   0x14, 0x45, 0x04, 0x05, 0x00, 0x00, 0x00, 0x80, 0xa0, 0xa0, 0x20, 0x88,
-   0x80, 0xaa, 0x08, 0x82, 0x28, 0x28, 0x02, 0x20, 0x28, 0x0a, 0x2a, 0xa0,
-   0x02, 0x0a, 0x88, 0xa2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x41, 0x40, 0x11, 0x44, 0x00, 0x55, 0x14, 0x44,
-   0x50, 0x50, 0x01, 0x40, 0x10, 0x54, 0x15, 0x40, 0x01, 0x14, 0x04, 0x45,
-   0x01, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-   0x22, 0xa0, 0x0a, 0x00, 0x00, 0x0a, 0x2a, 0x20, 0x28, 0xa8, 0x00, 0xa0,
-   0x08, 0xa8, 0x08, 0xa0, 0x00, 0xa8, 0x82, 0x82, 0x02, 0x08, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x05, 0x00,
-   0x00, 0x54, 0x55, 0x10, 0x50, 0x50, 0x00, 0x00, 0x05, 0x50, 0x04, 0x40,
-   0x00, 0x50, 0x40, 0x05, 0x05, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x80, 0xaa, 0x2a,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x0a, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x05, 0x00, 0x40, 0x55, 0x15, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x01, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x0a,
-   0x00, 0x80, 0xaa, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0x00, 0x00, 0x55, 0x55,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0xa0, 0x02, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x01,
-   0x00, 0x00, 0x54, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x00, 0x00, 0x00, 0xa8, 0xaa,
-   0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x50, 0x55, 0x05, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x01, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x00,
-   0x00, 0x00, 0xa0, 0xaa, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x82, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x50, 0x55,
-   0x05, 0x00, 0x00, 0x14, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x01, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0xa0, 0xaa, 0x0a, 0x00, 0x00, 0x28,
-   0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x0a, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
-   0x00, 0x00, 0x40, 0x55, 0x15, 0x00, 0x00, 0x50, 0x04, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x40, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x0a, 0x00, 0x00, 0x00, 0x80, 0xaa,
-   0x2a, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x55, 0x50, 0x15,
-   0x55, 0x11, 0x55, 0x00, 0x15, 0x00, 0x54, 0x01, 0x00, 0x54, 0x01, 0x40,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x50, 0x00, 0x20, 0x82, 0x20, 0x08, 0x82, 0x00, 0x22, 0x80,
-   0x08, 0x08, 0x28, 0xa2, 0x28, 0x20, 0x08, 0x20, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xa2,
-   0x00, 0x04, 0x41, 0x10, 0x04, 0x11, 0x00, 0x40, 0x10, 0x14, 0x10, 0x54,
-   0x54, 0x11, 0x10, 0x00, 0x01, 0x00, 0x50, 0x14, 0x15, 0x05, 0x45, 0x01,
-   0x50, 0x50, 0x44, 0x14, 0x05, 0x00, 0x04, 0x40, 0x20, 0x02, 0x22, 0x02,
-   0x22, 0x08, 0x20, 0x20, 0x00, 0x08, 0x20, 0xa8, 0x28, 0x22, 0x08, 0x80,
-   0x02, 0x00, 0x88, 0x22, 0xa2, 0x88, 0x28, 0x02, 0x88, 0x80, 0x22, 0xa2,
-   0x08, 0x00, 0x08, 0x22, 0x00, 0x04, 0x41, 0x00, 0x04, 0x00, 0x01, 0x40,
-   0x00, 0x10, 0x40, 0x04, 0x11, 0x10, 0x04, 0x10, 0x05, 0x00, 0x10, 0x04,
-   0x01, 0x55, 0x45, 0x04, 0x10, 0x50, 0x44, 0x15, 0x01, 0x00, 0x14, 0x10,
-   0x00, 0x2a, 0xa0, 0x02, 0x2a, 0x20, 0x22, 0x80, 0x02, 0x22, 0x20, 0x02,
-   0x0a, 0xa0, 0x02, 0x08, 0x0a, 0x00, 0x20, 0x02, 0x82, 0x80, 0x20, 0x02,
-   0x80, 0x88, 0x28, 0x82, 0x00, 0x00, 0xa8, 0x20, 0x00, 0x44, 0x40, 0x01,
-   0x14, 0x00, 0x04, 0x00, 0x05, 0x10, 0x40, 0x00, 0x11, 0x10, 0x05, 0x04,
-   0x14, 0x00, 0x44, 0x44, 0x01, 0x51, 0x44, 0x04, 0x10, 0x45, 0x14, 0x11,
-   0x01, 0x00, 0x50, 0x11, 0x00, 0x82, 0x20, 0x02, 0x22, 0x20, 0x28, 0x20,
-   0x08, 0x2a, 0x80, 0x02, 0x02, 0x20, 0x08, 0x00, 0x00, 0x00, 0x28, 0x28,
-   0x02, 0x8a, 0x22, 0x02, 0xa0, 0xa8, 0x08, 0x8a, 0x00, 0x00, 0x80, 0x22,
-   0x00, 0x04, 0x41, 0x10, 0x04, 0x01, 0x10, 0x00, 0x10, 0x41, 0x40, 0x01,
-   0x11, 0x10, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x51, 0x20, 0x82, 0x20, 0x00,
-   0x02, 0x20, 0x28, 0x20, 0x88, 0x20, 0x80, 0x00, 0x82, 0x20, 0x28, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x22, 0x10, 0x04, 0x45, 0x10, 0x04, 0x01, 0x10, 0x40,
-   0x04, 0x40, 0x00, 0x00, 0x41, 0x10, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x41,
-   0x8a, 0x0a, 0xaa, 0x8a, 0xaa, 0xa8, 0x20, 0xa0, 0x82, 0xa2, 0x80, 0x80,
-   0xaa, 0xa8, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x80, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0,
-   0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x15, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-   0xaa, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xa8, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0x01, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54,
-   0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xa0, 0xa2, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2a, 0x2a, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01, 0x10, 0x50,
-   0x41, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x15, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0xa0, 0x80, 0x02, 0xa8, 0x28,
-   0x0a, 0xa0, 0x02, 0xa8, 0x00, 0x8a, 0x02, 0x28, 0x00, 0x00, 0x00, 0x0a,
-   0x28, 0x80, 0x2a, 0x80, 0x22, 0x80, 0x0a, 0x00, 0xa8, 0x00, 0x28, 0x2a,
-   0x00, 0x05, 0x00, 0x50, 0x00, 0x00, 0x55, 0x51, 0x14, 0x14, 0x54, 0x54,
-   0x01, 0x54, 0x01, 0x50, 0x50, 0x05, 0x00, 0x05, 0x00, 0x50, 0x55, 0x40,
-   0x51, 0x50, 0x15, 0x00, 0x54, 0x05, 0x14, 0x55, 0x00, 0x0a, 0x00, 0xa0,
-   0x00, 0x80, 0xaa, 0x2a, 0x2a, 0x08, 0x2a, 0xa8, 0x02, 0xaa, 0x02, 0xa0,
-   0xa0, 0x02, 0x00, 0x0a, 0x00, 0xa8, 0xaa, 0x80, 0x2a, 0xa8, 0x2a, 0x80,
-   0xaa, 0x0a, 0xa8, 0xaa, 0x01, 0x05, 0x00, 0x50, 0x05, 0x40, 0x55, 0x55,
-   0x14, 0x00, 0x14, 0x50, 0x05, 0x54, 0x01, 0x40, 0x51, 0x01, 0x00, 0x55,
-   0x00, 0x54, 0x55, 0x41, 0x15, 0x54, 0x55, 0x40, 0x55, 0x15, 0x54, 0x55,
-   0x02, 0x0a, 0x00, 0xa0, 0x0a, 0xa0, 0x02, 0x2a, 0x2a, 0x00, 0x0a, 0x88,
-   0x0a, 0x2a, 0x00, 0x80, 0xaa, 0x00, 0x00, 0xaa, 0x00, 0xaa, 0xa0, 0xa2,
-   0x0a, 0x2a, 0xa8, 0xa0, 0x0a, 0x0a, 0xaa, 0xa0, 0x01, 0x14, 0x01, 0x40,
-   0x55, 0x50, 0x01, 0x14, 0x14, 0x00, 0x05, 0x04, 0x15, 0x15, 0x00, 0x00,
-   0x51, 0x00, 0x00, 0x54, 0x05, 0x14, 0x40, 0x45, 0x05, 0x15, 0x50, 0x41,
-   0x01, 0x14, 0x54, 0x40, 0x02, 0xa8, 0x00, 0x80, 0xaa, 0xa8, 0x00, 0x2a,
-   0x28, 0x88, 0x02, 0x0a, 0x0a, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8,
-   0x0a, 0x0a, 0xa0, 0xa2, 0x82, 0x0a, 0xa0, 0xa0, 0x00, 0x28, 0x2a, 0xa0,
-   0x01, 0x50, 0x00, 0x00, 0x55, 0x50, 0x00, 0x14, 0x54, 0x54, 0x05, 0x15,
-   0x14, 0x15, 0x00, 0x00, 0x11, 0x00, 0x00, 0x50, 0x05, 0x15, 0x00, 0x40,
-   0x01, 0x05, 0x40, 0x51, 0x00, 0x14, 0x14, 0x40, 0x00, 0xa8, 0x00, 0x00,
-   0xa8, 0x28, 0x00, 0x28, 0x28, 0xa8, 0x02, 0x80, 0x0a, 0x0a, 0x00, 0x80,
-   0x08, 0x00, 0x00, 0x80, 0x8a, 0x0a, 0x00, 0xa0, 0x80, 0xaa, 0xaa, 0xa8,
-   0xaa, 0x2a, 0x0a, 0xa0, 0x01, 0x44, 0x01, 0x00, 0x50, 0x55, 0x00, 0x14,
-   0x50, 0x14, 0x01, 0x00, 0x15, 0x05, 0x00, 0x40, 0x15, 0x00, 0x00, 0x00,
-   0x15, 0x05, 0x00, 0x50, 0x41, 0x55, 0x55, 0x51, 0x55, 0x15, 0x15, 0x40,
-   0x00, 0x80, 0x02, 0x00, 0xa0, 0x28, 0x00, 0x0a, 0x28, 0x0a, 0x02, 0x00,
-   0x8a, 0x0a, 0x00, 0xa0, 0x2a, 0x00, 0x00, 0x00, 0x8a, 0x0a, 0x00, 0xa0,
-   0x80, 0xaa, 0xaa, 0xa8, 0xaa, 0x2a, 0x0a, 0xa0, 0x01, 0x40, 0x01, 0x00,
-   0x50, 0x55, 0x00, 0x14, 0x50, 0x05, 0x00, 0x00, 0x14, 0x05, 0x00, 0x50,
-   0x50, 0x00, 0x00, 0x00, 0x15, 0x05, 0x00, 0x50, 0x40, 0x55, 0x55, 0x51,
-   0x55, 0x15, 0x05, 0x50, 0x00, 0x80, 0x02, 0x2a, 0xa8, 0x28, 0x00, 0x0a,
-   0xa8, 0x0a, 0x80, 0xaa, 0x82, 0x02, 0x00, 0x20, 0xa0, 0x00, 0xa0, 0x82,
-   0x8a, 0x0a, 0x00, 0xa0, 0x80, 0x02, 0x00, 0x28, 0x00, 0x00, 0x0a, 0xa0,
-   0x00, 0x00, 0x05, 0x14, 0x50, 0x54, 0x00, 0x15, 0x50, 0x05, 0x40, 0x55,
-   0x01, 0x05, 0x00, 0x10, 0x40, 0x01, 0x40, 0x01, 0x05, 0x15, 0x50, 0x51,
-   0x40, 0x01, 0x00, 0x50, 0x00, 0x00, 0x05, 0x50, 0x00, 0x00, 0x0a, 0x2a,
-   0xa8, 0xa8, 0x80, 0x0a, 0xa0, 0x02, 0x80, 0x0a, 0x80, 0x02, 0x00, 0x08,
-   0x80, 0x02, 0xa0, 0x82, 0x0a, 0x2a, 0xa8, 0xa0, 0x80, 0x02, 0x2a, 0xa8,
-   0x80, 0x8a, 0x0a, 0xa0, 0x00, 0x00, 0x00, 0x54, 0x55, 0x50, 0x55, 0x05,
-   0x50, 0x01, 0x00, 0x00, 0x44, 0x05, 0x00, 0x04, 0x00, 0x05, 0x40, 0x55,
-   0x05, 0x54, 0x55, 0x50, 0x00, 0x55, 0x15, 0x50, 0x55, 0x05, 0x05, 0x50,
-   0x00, 0x00, 0x00, 0xa8, 0x2a, 0xa0, 0xaa, 0x0a, 0xa0, 0x00, 0x08, 0x00,
-   0x8a, 0x02, 0x00, 0x0a, 0x00, 0x00, 0x80, 0xaa, 0x02, 0xaa, 0x2a, 0x28,
-   0x80, 0xaa, 0x0a, 0xa0, 0xaa, 0x82, 0x02, 0x28, 0x00, 0x00, 0x00, 0x50,
-   0x15, 0x40, 0x55, 0x05, 0x40, 0x01, 0x10, 0x00, 0x55, 0x01, 0x00, 0x05,
-   0x00, 0x00, 0x00, 0x55, 0x01, 0x54, 0x15, 0x50, 0x00, 0x55, 0x05, 0x40,
-   0x55, 0x01, 0x05, 0x50, 0x00, 0x00, 0x00, 0xa0, 0x02, 0x80, 0x0a, 0x0a,
-   0xa0, 0x00, 0x00, 0xa0, 0xaa, 0x02, 0x80, 0x0a, 0x00, 0x00, 0x00, 0x2a,
-   0x00, 0xa0, 0x0a, 0x28, 0x00, 0xa8, 0x00, 0x80, 0x2a, 0x80, 0x02, 0x28,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,
-   0x55, 0x00, 0x40, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0xa0, 0x02,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x50, 0x01, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa,
-   0xaa, 0x00, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0x01, 0x50, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xa8, 0xaa, 0x02, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,
-   0x55, 0x05, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xaa, 0x0a, 0x0a, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x40, 0x55, 0x15, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-   0xaa, 0x8a, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0x45, 0x05, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x80, 0x22, 0xa0, 0x22, 0xa8, 0x0a, 0xa8, 0x00,
-   0xa8, 0xa0, 0x28, 0x80, 0xaa, 0x22, 0x28, 0xa0, 0x02, 0x2a, 0x2a, 0xa0,
-   0x02, 0x8a, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x40, 0x15, 0x50, 0x15, 0x54, 0x15, 0x54, 0x01, 0x55, 0x41, 0x55, 0x00,
-   0x55, 0x11, 0x54, 0x50, 0x05, 0x54, 0x54, 0x54, 0x05, 0x54, 0x05, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x08, 0x08, 0x08,
-   0x20, 0x08, 0x02, 0x82, 0x82, 0x82, 0x82, 0x00, 0xaa, 0x08, 0x20, 0x20,
-   0x08, 0x08, 0x08, 0x0a, 0x0a, 0x28, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x50, 0x10, 0x04, 0x10, 0x10, 0x00, 0x01, 0x04,
-   0x01, 0x01, 0x01, 0x01, 0x54, 0x14, 0x11, 0x00, 0x10, 0x10, 0x04, 0x04,
-   0x04, 0x10, 0x00, 0x14, 0x51, 0x10, 0x44, 0x01, 0x50, 0x44, 0x44, 0x14,
-   0xa0, 0x00, 0x02, 0x08, 0x08, 0x80, 0x00, 0x82, 0x00, 0x82, 0x80, 0x00,
-   0xa8, 0x28, 0x00, 0xa0, 0x0a, 0x20, 0x08, 0x02, 0x08, 0x08, 0x00, 0x00,
-   0x20, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x08, 0x40, 0x05, 0x04, 0x00,
-   0x10, 0x00, 0x55, 0x45, 0x55, 0x41, 0x40, 0x00, 0x54, 0x54, 0x00, 0x50,
-   0x05, 0x10, 0x04, 0x55, 0x05, 0x04, 0x00, 0x44, 0x10, 0x14, 0x45, 0x04,
-   0x10, 0x54, 0x54, 0x04, 0x00, 0x0a, 0x02, 0x00, 0x08, 0x80, 0xaa, 0x82,
-   0xaa, 0x82, 0x80, 0x00, 0x2a, 0xaa, 0x00, 0x08, 0x08, 0x20, 0x02, 0xaa,
-   0x0a, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00,
-   0x10, 0x14, 0x04, 0x00, 0x04, 0x00, 0x01, 0x40, 0x00, 0x40, 0x40, 0x00,
-   0x15, 0x45, 0x15, 0x04, 0x04, 0x10, 0x01, 0x01, 0x00, 0x04, 0x00, 0x05,
-   0x15, 0x10, 0x44, 0x04, 0x14, 0x14, 0x41, 0x04, 0x08, 0x08, 0x0a, 0x08,
-   0x08, 0x80, 0x02, 0x82, 0x80, 0x20, 0x20, 0x80, 0x8a, 0x8a, 0x22, 0x02,
-   0x02, 0xa0, 0x00, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x54, 0x05, 0x54, 0x15, 0x55, 0x01, 0x55, 0x01,
-   0x55, 0x51, 0x51, 0x01, 0x45, 0x05, 0x00, 0x54, 0x15, 0x40, 0x00, 0x54,
-   0x45, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0xa8, 0x02, 0xa8, 0x82, 0xaa, 0x00, 0xaa, 0x00, 0x2a, 0xa8, 0xa8, 0x80,
-   0x82, 0x22, 0x20, 0xa8, 0x0a, 0x20, 0x00, 0xa8, 0x80, 0xaa, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01, 0x55, 0x55, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,
-   0x05, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xa0, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x0a, 0x00, 0x00, 0x08,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,
-   0x00, 0x54, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x40, 0x15, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x00, 0xa8, 0xaa, 0x02,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-   0x2a, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x54, 0x00, 0x54, 0x55, 0x01, 0x00, 0x40, 0x01, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x00, 0x00, 0x01,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2a,
-   0x00, 0xa8, 0xaa, 0x02, 0x00, 0x80, 0x02, 0x20, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0xaa, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x00, 0x50, 0x55, 0x05,
-   0x00, 0x00, 0x05, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x54, 0x01, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x80, 0x0a, 0x00, 0xa0, 0xaa, 0x0a, 0x00, 0x00, 0x0a, 0x08,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x02, 0x20, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05,
-   0x00, 0x40, 0x55, 0x15, 0x00, 0x00, 0x14, 0x04, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x54, 0x01, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x80, 0xaa, 0x2a,
-   0x00, 0x00, 0x28, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0xa8, 0x02, 0x08, 0x00, 0x10, 0x50, 0x50, 0x50, 0x40, 0x10, 0x00, 0x00,
-   0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x50, 0x00,
-   0x50, 0x00, 0x05, 0x04, 0x01, 0x05, 0x50, 0x40, 0x54, 0x05, 0x04, 0x05,
-   0x8a, 0x20, 0x20, 0x88, 0xa0, 0x28, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00,
-   0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x20, 0x00, 0x82, 0x82, 0x08, 0x8a,
-   0x82, 0x08, 0x88, 0xa0, 0xa8, 0x0a, 0x22, 0x28, 0x00, 0x41, 0x00, 0x04,
-   0x41, 0x44, 0x00, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x55, 0x55,
-   0x00, 0x00, 0x10, 0x00, 0x01, 0x41, 0x10, 0x44, 0x44, 0x10, 0x04, 0x41,
-   0x50, 0x15, 0x11, 0x10, 0x80, 0x80, 0x00, 0x02, 0x82, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x80, 0x00,
-   0x02, 0x22, 0x20, 0x08, 0x20, 0x20, 0x02, 0x22, 0xa0, 0x2a, 0x22, 0x20,
-   0x00, 0x41, 0x10, 0x01, 0x44, 0x00, 0x00, 0x40, 0x41, 0x51, 0x04, 0x14,
-   0x15, 0x00, 0x11, 0x44, 0x50, 0x54, 0x40, 0x01, 0x05, 0x10, 0x00, 0x04,
-   0x10, 0x40, 0x01, 0x44, 0x10, 0x15, 0x51, 0x00, 0xa8, 0x80, 0x00, 0xaa,
-   0x82, 0x00, 0x00, 0x20, 0x22, 0x8a, 0xa2, 0x22, 0x22, 0x80, 0xa0, 0x88,
-   0x88, 0x88, 0x88, 0x02, 0x2a, 0x20, 0x00, 0x08, 0xa0, 0x2a, 0xaa, 0x22,
-   0x20, 0x8a, 0xa0, 0x02, 0x04, 0x01, 0x01, 0x01, 0x40, 0x00, 0x00, 0x40,
-   0x10, 0x10, 0x41, 0x54, 0x11, 0x00, 0x11, 0x40, 0x54, 0x05, 0x04, 0x05,
-   0x50, 0x11, 0x00, 0x04, 0x10, 0x00, 0x01, 0x40, 0x10, 0x45, 0x00, 0x15,
-   0x82, 0x80, 0x08, 0x02, 0x80, 0x00, 0x00, 0x00, 0x22, 0x88, 0x02, 0x02,
-   0x22, 0x00, 0x82, 0x08, 0x02, 0x08, 0x02, 0x0a, 0x80, 0x22, 0x00, 0x08,
-   0x20, 0x00, 0x02, 0x20, 0x20, 0xa2, 0x00, 0x28, 0x01, 0x01, 0x05, 0x01,
-   0x40, 0x00, 0x00, 0x40, 0x14, 0x51, 0x41, 0x44, 0x11, 0x40, 0x04, 0x11,
-   0x04, 0x05, 0x01, 0x14, 0x00, 0x15, 0x00, 0x04, 0x10, 0x00, 0x01, 0x40,
-   0x10, 0x51, 0x01, 0x50, 0x82, 0x00, 0x02, 0x02, 0x80, 0x00, 0x00, 0x80,
-   0xa2, 0x88, 0x2a, 0x28, 0x22, 0x80, 0x02, 0x28, 0x8a, 0x88, 0x00, 0x28,
-   0x00, 0x22, 0x00, 0x08, 0x20, 0x00, 0x02, 0x20, 0xa0, 0xa8, 0x02, 0x20,
-   0x01, 0x05, 0x05, 0x04, 0x44, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01, 0x00,
-   0x00, 0x00, 0x40, 0x55, 0x15, 0x00, 0x00, 0x00, 0x01, 0x44, 0x00, 0x04,
-   0x40, 0x40, 0x04, 0x44, 0x10, 0x51, 0x15, 0x40, 0x82, 0x00, 0x02, 0x08,
-   0x82, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x80, 0xaa,
-   0x2a, 0x00, 0x00, 0x00, 0x02, 0x82, 0x08, 0x08, 0x80, 0x20, 0x08, 0x22,
-   0xa0, 0xa0, 0x2a, 0x20, 0x14, 0x01, 0x00, 0x50, 0x50, 0x01, 0x00, 0x00,
-   0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00,
-   0x51, 0x00, 0x05, 0x15, 0x00, 0x05, 0x50, 0x50, 0x50, 0x40, 0x15, 0x05,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x10, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x10, 0x40, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x28, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x80, 0x2a, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,
-   0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x02, 0x00, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x01,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0xa8, 0x02, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
-   0x00, 0x00, 0x50, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0xa0, 0x0a,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,
-   0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0a, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x04, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
-   0x00, 0x40, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x50, 0x55, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00,
-   0x00, 0xa0, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xaa,
-   0x15, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0x10, 0x04, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x05, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0x2a, 0x00, 0x00, 0x00,
-   0x00, 0xa0, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x08, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x80, 0xaa, 0x15, 0x00, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00,
-   0x00, 0x10, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55,
-   0xa2, 0x00, 0x80, 0x02, 0x0a, 0xa2, 0x82, 0x02, 0x0a, 0x08, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x02, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x0a, 0xa8, 0xa0, 0x80, 0x82, 0xa0, 0x11, 0x01, 0x00, 0x04,
-   0x11, 0x50, 0x41, 0x04, 0x11, 0x10, 0x00, 0x14, 0x44, 0x40, 0x00, 0x41,
-   0x11, 0x00, 0x14, 0x00, 0x44, 0x05, 0x05, 0x04, 0x45, 0x00, 0x10, 0x44,
-   0x11, 0x11, 0x04, 0x44, 0xa2, 0x02, 0x20, 0x80, 0x20, 0x28, 0x20, 0x08,
-   0x02, 0x20, 0x80, 0x22, 0xa8, 0xa8, 0xa0, 0x82, 0x28, 0x00, 0x28, 0x80,
-   0x22, 0x08, 0x82, 0x0a, 0x22, 0x80, 0x00, 0x82, 0x20, 0x00, 0x88, 0x8a,
-   0x51, 0x05, 0x50, 0x00, 0x10, 0x11, 0x11, 0x10, 0x01, 0x50, 0x40, 0x10,
-   0x54, 0x04, 0x11, 0x04, 0x41, 0x00, 0x50, 0x40, 0x10, 0x04, 0x44, 0x10,
-   0x44, 0x40, 0x01, 0x01, 0x10, 0x10, 0x44, 0x14, 0xa2, 0x00, 0xa0, 0x00,
-   0xa8, 0x02, 0xa0, 0x0a, 0x02, 0xa0, 0xa0, 0x00, 0x0a, 0x82, 0x08, 0x82,
-   0x20, 0x00, 0xa0, 0x20, 0x20, 0x08, 0x22, 0x08, 0x02, 0x80, 0x02, 0x02,
-   0x20, 0xa8, 0x8a, 0x82, 0x51, 0x01, 0x40, 0x01, 0x55, 0x01, 0x10, 0x00,
-   0x01, 0x40, 0x41, 0x00, 0x04, 0x54, 0x50, 0x41, 0x40, 0x00, 0x40, 0x10,
-   0x10, 0x04, 0x41, 0x05, 0x01, 0x00, 0x05, 0x01, 0x10, 0x10, 0x40, 0x50,
-   0xa2, 0x08, 0x80, 0x82, 0xa0, 0x8a, 0x20, 0x00, 0x02, 0x80, 0x22, 0x00,
-   0x02, 0x0a, 0x28, 0x80, 0x20, 0x00, 0x80, 0x20, 0x08, 0x88, 0xa0, 0x00,
-   0x02, 0x00, 0x0a, 0x02, 0x20, 0x08, 0x80, 0xa0, 0x51, 0x01, 0x00, 0x44,
-   0x50, 0x11, 0x10, 0x00, 0x01, 0x00, 0x11, 0x00, 0x01, 0x01, 0x04, 0x40,
-   0x10, 0x00, 0x40, 0x11, 0x10, 0x10, 0x11, 0x00, 0x01, 0x00, 0x10, 0x01,
-   0x10, 0x10, 0x40, 0x50, 0xa2, 0x08, 0x00, 0x88, 0x80, 0x08, 0x20, 0x00,
-   0x02, 0x02, 0x22, 0x00, 0x02, 0x02, 0x08, 0x20, 0x20, 0x00, 0x80, 0x08,
-   0x08, 0x88, 0x20, 0x80, 0x00, 0x00, 0x20, 0x02, 0x20, 0x28, 0x80, 0xa0,
-   0x51, 0x11, 0x10, 0x44, 0x40, 0x50, 0x40, 0x10, 0x01, 0x00, 0x11, 0x00,
-   0x01, 0x01, 0x04, 0x40, 0x10, 0x00, 0x01, 0x11, 0x04, 0x50, 0x10, 0x00,
-   0x01, 0x40, 0x10, 0x04, 0x11, 0x50, 0x00, 0x01, 0xa2, 0x28, 0x20, 0x82,
-   0x0a, 0x20, 0xa0, 0x0a, 0x02, 0x02, 0x22, 0x88, 0x00, 0x82, 0x08, 0x22,
-   0x08, 0x80, 0x80, 0x28, 0x08, 0x28, 0x20, 0x88, 0x00, 0x80, 0x08, 0xaa,
-   0x20, 0xa0, 0x82, 0xaa, 0x41, 0x50, 0x50, 0x01, 0x55, 0x00, 0x00, 0x05,
-   0x05, 0x05, 0x51, 0x04, 0x01, 0x45, 0x14, 0x11, 0x50, 0x00, 0x41, 0x50,
-   0x04, 0x10, 0x50, 0x44, 0x00, 0x40, 0x05, 0x50, 0x50, 0x40, 0x01, 0x14,
-   0xaa, 0xaa, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x00, 0xa8, 0xa0, 0x82,
-   0x00, 0x2a, 0xa8, 0x20, 0x28, 0x80, 0x2a, 0x20, 0x08, 0x08, 0xa0, 0x82,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0x01, 0x00,
-   0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0xa8, 0xaa, 0x02, 0x80, 0x0a, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x54, 0x55, 0x01, 0x40, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0xaa, 0x02, 0xa0,
-   0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x50, 0x55, 0x05, 0x40, 0x01, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0xa0, 0xaa, 0x0a, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0x15, 0x50,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x80, 0xaa, 0x2a, 0x28, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x55, 0x55, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x04, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x40, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0x2a, 0x2a,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x15, 0x15, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xaa, 0x8a, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x45, 0x45,
-   0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x80, 0x88, 0xa2, 0x22, 0x08, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x88, 0x00, 0x00, 0x80, 0xaa, 0x2a, 0x0a, 0x00, 0x0a, 0x08,
-   0x02, 0x22, 0xa0, 0x80, 0x08, 0x00, 0xa0, 0x00, 0x20, 0xa0, 0xa0, 0xa0,
-   0x41, 0x01, 0x51, 0x45, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x01,
-   0x00, 0x00, 0x55, 0x55, 0x14, 0x00, 0x11, 0x14, 0x05, 0x45, 0x10, 0x41,
-   0x11, 0x00, 0x40, 0x01, 0x14, 0x41, 0x40, 0x10, 0x82, 0x28, 0xa2, 0xaa,
-   0x80, 0xa2, 0xa2, 0xa0, 0xa8, 0x00, 0x28, 0x28, 0x08, 0xa2, 0x02, 0xaa,
-   0xa8, 0x80, 0x20, 0x88, 0x88, 0x0a, 0x08, 0x82, 0x20, 0x00, 0x80, 0x0a,
-   0x00, 0x82, 0x00, 0x08, 0x04, 0x51, 0x51, 0x55, 0x45, 0x44, 0x11, 0x11,
-   0x11, 0x01, 0x50, 0x44, 0x04, 0x11, 0x05, 0x55, 0x41, 0x41, 0x40, 0x10,
-   0x40, 0x55, 0x04, 0x44, 0x40, 0x00, 0x00, 0x14, 0x00, 0x01, 0x01, 0x04,
-   0x88, 0xa8, 0xa8, 0x2a, 0x2a, 0x20, 0x08, 0x0a, 0x0a, 0x02, 0xa0, 0x80,
-   0x88, 0x08, 0xa2, 0xaa, 0x02, 0x22, 0x00, 0x08, 0xa0, 0x8a, 0x02, 0x88,
-   0x20, 0x00, 0x00, 0x20, 0x00, 0x82, 0x20, 0x02, 0x05, 0x55, 0x54, 0x55,
-   0x44, 0x40, 0x50, 0x51, 0x11, 0x01, 0x04, 0x51, 0x10, 0x51, 0x41, 0x55,
-   0x05, 0x44, 0x00, 0x10, 0x00, 0x50, 0x54, 0x45, 0x40, 0x00, 0x00, 0x40,
-   0x50, 0x01, 0x01, 0x54, 0x80, 0x2a, 0xaa, 0x0a, 0x28, 0x28, 0x08, 0x08,
-   0x08, 0x02, 0x88, 0x88, 0x80, 0x08, 0xa8, 0xaa, 0x0a, 0x28, 0x00, 0x08,
-   0xa0, 0x02, 0x02, 0x80, 0x20, 0x00, 0x00, 0x80, 0x08, 0x02, 0x02, 0x02,
-   0x00, 0x15, 0x55, 0x15, 0x44, 0x44, 0x10, 0x11, 0x11, 0x01, 0x04, 0x45,
-   0x50, 0x10, 0x51, 0x55, 0x15, 0x44, 0x00, 0x10, 0x00, 0x01, 0x04, 0x40,
-   0x40, 0x00, 0x00, 0x40, 0x04, 0x01, 0x11, 0x04, 0x80, 0x0a, 0xaa, 0x2a,
-   0x82, 0x22, 0xa0, 0xa0, 0x08, 0x02, 0xa8, 0xa8, 0x20, 0xa0, 0xa8, 0xaa,
-   0x0a, 0x28, 0x00, 0x08, 0x80, 0x00, 0x02, 0x80, 0x20, 0x00, 0x00, 0x80,
-   0x02, 0x02, 0x0a, 0x02, 0x00, 0x04, 0x54, 0x55, 0x01, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0x15, 0x44, 0x00, 0x10,
-   0x10, 0x00, 0x04, 0x40, 0x40, 0x00, 0x00, 0x40, 0x04, 0x01, 0x04, 0x04,
-   0x08, 0x02, 0xa8, 0xaa, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x80, 0xaa, 0x28, 0x82, 0x00, 0x08, 0xa8, 0x80, 0x08, 0x88,
-   0x20, 0x00, 0x20, 0x20, 0x02, 0x0a, 0x0a, 0x08, 0x44, 0x00, 0x50, 0x55,
-   0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,
-   0x51, 0x01, 0x11, 0x10, 0x54, 0x41, 0x10, 0x44, 0x40, 0x00, 0x40, 0x10,
-   0x04, 0x01, 0x04, 0x10, 0x00, 0x00, 0xa0, 0xaa, 0x0a, 0x00, 0x00, 0x00,
-   0x00, 0xa0, 0x00, 0x08, 0x00, 0x00, 0x00, 0xaa, 0x08, 0x00, 0x0a, 0x2a,
-   0x2a, 0x0a, 0xa0, 0xa0, 0xa0, 0x00, 0x20, 0x0a, 0x28, 0x02, 0x00, 0xa0,
-   0x50, 0x01, 0x50, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01, 0x00,
-   0x00, 0x00, 0x00, 0x54, 0x55, 0x01, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+#define screensaver_width 256
+#define screensaver_height 256
+static unsigned char screensaver_bits[] = {
+   0xa8, 0x00, 0xa0, 0xaa, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00,
+   0x00, 0x00, 0x00, 0xa8, 0xaa, 0x02, 0x00, 0x80, 0x0a, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x00, 0x40, 0x55,
+   0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x50,
+   0x55, 0x05, 0x00, 0x40, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x80, 0xaa, 0x2a, 0x00, 0x00, 0x00,
+   0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0xa8, 0xaa, 0x02, 0x00, 0xa0,
+   0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x15, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+   0x00, 0x00, 0x00, 0x50, 0x55, 0x05, 0x00, 0x40, 0x01, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0xaa,
+   0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8a, 0x00, 0x00, 0x00, 0x00, 0xa0,
+   0xaa, 0x0a, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x54, 0x55, 0x01, 0x00, 0x00,
+   0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0x15, 0x00, 0x50,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xaa, 0x2a, 0x80, 0x02, 0x80, 0xaa, 0xaa, 0x82, 0x0a, 0xa8, 0x28, 0x80,
+   0x8a, 0x80, 0x2a, 0x80, 0x80, 0x8a, 0xa2, 0x82, 0x0a, 0xaa, 0x0a, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x2a, 0x02, 0x80, 0x82, 0x41, 0x40, 0x00, 0x50,
+   0x55, 0x41, 0x00, 0x00, 0x04, 0x00, 0x54, 0x40, 0x10, 0x00, 0x40, 0x00,
+   0x51, 0x55, 0x00, 0x15, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x41, 0x00, 0x10, 0x14, 0x00, 0x00, 0x00, 0xa8, 0x8a, 0x02, 0x00, 0x02,
+   0x00, 0x20, 0xa2, 0x00, 0x80, 0x00, 0x08, 0x00, 0xaa, 0x2a, 0x00, 0x2a,
+   0x08, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x80,
+   0x01, 0x00, 0x01, 0x50, 0x45, 0x05, 0x00, 0x01, 0x10, 0x10, 0x40, 0x11,
+   0x40, 0x00, 0x44, 0x00, 0x50, 0x15, 0x01, 0x15, 0x04, 0x00, 0x40, 0x00,
+   0x05, 0x00, 0x00, 0x40, 0x00, 0x01, 0x00, 0x50, 0x20, 0x00, 0x00, 0xa2,
+   0xaa, 0x2a, 0x00, 0x00, 0x02, 0x00, 0xa0, 0x08, 0x00, 0x00, 0x00, 0x00,
+   0xa2, 0xaa, 0x00, 0x0a, 0x00, 0x08, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x20,
+   0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x01, 0x40, 0x44, 0x15, 0x10, 0x01,
+   0x10, 0x10, 0x40, 0x01, 0x40, 0x00, 0x00, 0x00, 0x54, 0x55, 0x41, 0x45,
+   0x04, 0x00, 0x40, 0x00, 0x14, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x54,
+   0x20, 0x80, 0x00, 0x82, 0xaa, 0x0a, 0x00, 0x00, 0x22, 0x00, 0x80, 0x0a,
+   0x00, 0x00, 0x82, 0x00, 0xa0, 0x8a, 0x22, 0x02, 0x00, 0x08, 0x20, 0x00,
+   0xa8, 0x00, 0x00, 0x20, 0x00, 0x80, 0x00, 0x2a, 0x10, 0x40, 0x00, 0x01,
+   0x54, 0x45, 0x10, 0x00, 0x01, 0x00, 0x00, 0x05, 0x00, 0x00, 0x01, 0x00,
+   0x50, 0x45, 0x05, 0x41, 0x00, 0x04, 0x10, 0x00, 0x50, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x15, 0x00, 0x28, 0x00, 0xaa, 0xaa, 0x0a, 0x0a, 0x00,
+   0x20, 0x08, 0x00, 0x20, 0x00, 0x00, 0x80, 0x00, 0xa8, 0xa2, 0x22, 0x2a,
+   0x00, 0x00, 0x0a, 0x00, 0xa8, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x0a,
+   0x50, 0x05, 0x00, 0x01, 0x55, 0x45, 0x00, 0x00, 0x01, 0x00, 0x00, 0x40,
+   0x01, 0x00, 0x00, 0x00, 0x40, 0x55, 0x11, 0x00, 0x00, 0x54, 0x01, 0x00,
+   0x44, 0x01, 0x00, 0x00, 0x05, 0x40, 0x00, 0x05, 0x00, 0x08, 0x00, 0x80,
+   0xaa, 0xaa, 0x08, 0x00, 0x00, 0x08, 0x00, 0x00, 0x0a, 0x00, 0x80, 0x00,
+   0x80, 0xaa, 0x28, 0x20, 0x00, 0x00, 0x02, 0x00, 0x80, 0x02, 0x00, 0x00,
+   0x28, 0x00, 0x80, 0x02, 0x10, 0x10, 0x00, 0x01, 0x54, 0x45, 0x01, 0x00,
+   0x41, 0x00, 0x00, 0x00, 0x10, 0x40, 0x00, 0x00, 0x10, 0x55, 0x14, 0x00,
+   0x00, 0x04, 0x04, 0x00, 0x40, 0x01, 0x00, 0x00, 0x40, 0x40, 0x40, 0x01,
+   0x08, 0x00, 0x80, 0x00, 0xa8, 0xa2, 0x02, 0x80, 0x00, 0x00, 0x00, 0x00,
+   0x20, 0xa0, 0xaa, 0x00, 0x80, 0x28, 0x0a, 0x00, 0x00, 0x02, 0x00, 0x00,
+   0x80, 0x02, 0x00, 0x00, 0x80, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+   0x10, 0x14, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
+   0x00, 0x40, 0x00, 0x00, 0x08, 0x20, 0x80, 0x00, 0x08, 0x08, 0x80, 0x80,
+   0x80, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x8a, 0x8a, 0x00,
+   0x02, 0x02, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
+   0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x01,
+   0x10, 0x10, 0x00, 0x01, 0x10, 0x45, 0x55, 0x01, 0x00, 0x00, 0x10, 0x00,
+   0x00, 0x00, 0x00, 0x04, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00,
+   0x20, 0xa2, 0xaa, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
+   0x00, 0x80, 0x00, 0x02, 0x04, 0x00, 0x40, 0x00, 0x04, 0x04, 0x40, 0x40,
+   0x00, 0x01, 0x00, 0x04, 0x04, 0x00, 0x00, 0x01, 0x00, 0x51, 0x45, 0x05,
+   0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x45, 0x01,
+   0x2a, 0x80, 0xaa, 0xaa, 0x82, 0xaa, 0x2a, 0xa0, 0x02, 0x02, 0x80, 0xa8,
+   0x00, 0x2a, 0xa0, 0x02, 0x80, 0xa2, 0x00, 0xa0, 0xa0, 0x0a, 0xa0, 0x00,
+   0x00, 0x00, 0x80, 0x88, 0x02, 0x00, 0x08, 0x80, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x50, 0x41, 0x55, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,
+   0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0xa0, 0xaa, 0x0a,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0x00, 0x00, 0x20, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x54, 0x40, 0x55, 0x15, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x54, 0x01, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x2a, 0x80, 0xaa, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8,
+   0x02, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x55, 0x55,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x05, 0x00, 0x04, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0xa0, 0x0a, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x05, 0x00, 0x54, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
+   0x15, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0xa8, 0xaa,
+   0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x0a, 0x80, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x40, 0x01, 0x00, 0x50, 0x55, 0x05, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x40, 0x15, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0,
+   0x00, 0x00, 0xa8, 0xaa, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+   0x2a, 0x20, 0x00, 0x00, 0x41, 0x05, 0x55, 0x54, 0x11, 0x04, 0x00, 0x14,
+   0x40, 0x10, 0x44, 0x15, 0x15, 0x00, 0x00, 0x50, 0x01, 0x00, 0x50, 0x55,
+   0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x10, 0x50, 0x40,
+   0x82, 0x08, 0x02, 0x08, 0x20, 0x08, 0x00, 0x22, 0xa0, 0x20, 0x88, 0x00,
+   0x22, 0x00, 0x00, 0xa8, 0x2a, 0x00, 0xa0, 0xaa, 0x0a, 0x00, 0x80, 0x02,
+   0x00, 0x00, 0x00, 0x00, 0xaa, 0x08, 0x88, 0x20, 0x44, 0x10, 0x01, 0x04,
+   0x50, 0x04, 0x00, 0x41, 0x10, 0x11, 0x44, 0x00, 0x41, 0x00, 0x00, 0x54,
+   0x41, 0x00, 0x40, 0x55, 0x15, 0x00, 0x40, 0x04, 0x00, 0x00, 0x00, 0x00,
+   0x54, 0x11, 0x04, 0x11, 0x80, 0x20, 0x02, 0x08, 0xa0, 0x08, 0x00, 0x02,
+   0x88, 0x20, 0x88, 0x00, 0x82, 0x00, 0x00, 0x2a, 0x22, 0x00, 0x80, 0xaa,
+   0x2a, 0x00, 0x20, 0x08, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x08, 0x08, 0x20,
+   0x40, 0x10, 0x01, 0x04, 0x50, 0x04, 0x00, 0x01, 0x04, 0x41, 0x44, 0x00,
+   0x41, 0x00, 0x00, 0x15, 0x05, 0x14, 0x15, 0x50, 0x10, 0x05, 0x40, 0x41,
+   0x41, 0x10, 0x45, 0x05, 0x50, 0x04, 0x04, 0x10, 0x80, 0x20, 0x02, 0x08,
+   0xa0, 0x08, 0x00, 0x02, 0x08, 0x22, 0x82, 0x00, 0x82, 0x00, 0x00, 0x0a,
+   0x2a, 0x22, 0x8a, 0x22, 0x22, 0x08, 0x80, 0x22, 0x22, 0x88, 0x88, 0x02,
+   0x28, 0x02, 0x08, 0x20, 0x40, 0x10, 0x15, 0x54, 0x10, 0x05, 0x00, 0x14,
+   0x04, 0x41, 0x44, 0x05, 0x41, 0x00, 0x00, 0x05, 0x50, 0x01, 0x41, 0x04,
+   0x05, 0x11, 0x00, 0x05, 0x44, 0x44, 0x50, 0x00, 0x10, 0x05, 0x50, 0x10,
+   0x80, 0x0a, 0x02, 0x08, 0x20, 0x0a, 0x00, 0x20, 0xa8, 0x82, 0x82, 0x00,
+   0x2a, 0x00, 0x80, 0x02, 0x22, 0x02, 0x82, 0x20, 0x20, 0x08, 0x20, 0x88,
+   0x82, 0x88, 0x8a, 0x00, 0x88, 0x0a, 0x80, 0x20, 0x40, 0x04, 0x01, 0x04,
+   0x10, 0x05, 0x00, 0x40, 0x04, 0x41, 0x41, 0x00, 0x11, 0x00, 0x40, 0x01,
+   0x41, 0x41, 0x41, 0x14, 0x15, 0x11, 0x40, 0x44, 0x04, 0x44, 0x40, 0x00,
+   0x44, 0x15, 0x00, 0x11, 0x80, 0x08, 0x02, 0x08, 0x20, 0x0a, 0x00, 0x80,
+   0x08, 0x82, 0x82, 0x00, 0x22, 0x00, 0xa0, 0x00, 0x22, 0x22, 0x82, 0x20,
+   0x22, 0x0a, 0x20, 0x28, 0x82, 0x82, 0x88, 0x00, 0x88, 0x2a, 0x00, 0x22,
+   0x44, 0x10, 0x01, 0x04, 0x10, 0x04, 0x00, 0x41, 0x04, 0x01, 0x41, 0x00,
+   0x41, 0x00, 0x50, 0x01, 0x14, 0x14, 0x01, 0x55, 0x10, 0x15, 0x40, 0x45,
+   0x05, 0x01, 0x45, 0x00, 0x04, 0x55, 0x04, 0x11, 0x82, 0x20, 0x02, 0x08,
+   0x20, 0x08, 0x00, 0x22, 0x08, 0x82, 0x80, 0x00, 0x82, 0x00, 0xa8, 0x00,
+   0x00, 0x00, 0x00, 0xa0, 0xaa, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x02, 0xaa, 0x88, 0x20, 0x41, 0x10, 0x55, 0x54, 0x11, 0x04, 0x00, 0x14,
+   0x04, 0x01, 0x41, 0x15, 0x41, 0x00, 0x54, 0x00, 0x00, 0x00, 0x00, 0x40,
+   0x55, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x54, 0x51, 0x40,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x80, 0xaa, 0x2a, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x80, 0x00, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x54, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01, 0x15, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
+   0x00, 0x54, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0xaa, 0x02,
+   0x00, 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0xa8, 0x02, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00,
+   0x50, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x10, 0x00, 0x50, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0xa0, 0xaa, 0x0a, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
+   0x00, 0xa0, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0x15,
+   0x00, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x40, 0x15, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xaa, 0x2a, 0x00, 0x00, 0x00, 0x00,
+   0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x02, 0x00, 0x80, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+   0x00, 0x00, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa,
+   0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00,
+   0x05, 0x14, 0x40, 0x01, 0x41, 0x40, 0x01, 0x14, 0x10, 0x01, 0x00, 0x40,
+   0x01, 0x04, 0x14, 0x14, 0x14, 0x10, 0x04, 0x00, 0xa0, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x0a, 0xaa, 0x00, 0x00, 0x00, 0x80, 0x82, 0xa0, 0x20, 0x82,
+   0xa2, 0x20, 0x02, 0x22, 0x28, 0x02, 0x00, 0x08, 0x8a, 0x22, 0x08, 0x08,
+   0x22, 0x28, 0x0a, 0x00, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x44, 0x54,
+   0x01, 0x00, 0x00, 0x40, 0x41, 0x40, 0x10, 0x04, 0x11, 0x11, 0x04, 0x41,
+   0x10, 0x04, 0x00, 0x04, 0x04, 0x40, 0x10, 0x00, 0x41, 0x10, 0x11, 0x00,
+   0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0xaa, 0x02, 0x00, 0x00, 0xa0,
+   0x82, 0x80, 0x08, 0x08, 0x02, 0x08, 0x88, 0x80, 0x08, 0x08, 0x00, 0x08,
+   0x08, 0x20, 0x20, 0x80, 0x80, 0x20, 0x00, 0x00, 0x10, 0x50, 0x14, 0x14,
+   0x45, 0x05, 0x40, 0x05, 0x41, 0x14, 0x15, 0x50, 0x41, 0x01, 0x04, 0x00,
+   0x01, 0x04, 0x50, 0x00, 0x11, 0x04, 0x00, 0x14, 0x00, 0x40, 0x10, 0x44,
+   0x00, 0x11, 0x00, 0x00, 0xa0, 0x88, 0x22, 0xa2, 0x88, 0x08, 0x00, 0x2a,
+   0x82, 0x22, 0x22, 0xa8, 0x80, 0x0a, 0x08, 0x00, 0x02, 0xa8, 0x8a, 0xaa,
+   0x08, 0x08, 0x00, 0xa8, 0x00, 0x2a, 0x20, 0x80, 0xaa, 0x20, 0x00, 0x00,
+   0x00, 0x05, 0x04, 0x15, 0x55, 0x04, 0x40, 0x04, 0x50, 0x54, 0x01, 0x54,
+   0x00, 0x54, 0x04, 0x00, 0x01, 0x04, 0x40, 0x00, 0x10, 0x04, 0x00, 0x40,
+   0x05, 0x41, 0x40, 0x40, 0x00, 0x10, 0x00, 0x00, 0x80, 0x08, 0x02, 0x82,
+   0x80, 0x08, 0x80, 0x20, 0x02, 0x02, 0x02, 0x2a, 0x00, 0xa0, 0x08, 0x00,
+   0x02, 0x08, 0x80, 0x00, 0x08, 0x08, 0x00, 0x00, 0x8a, 0x20, 0x20, 0x82,
+   0x00, 0x20, 0x00, 0x00, 0x10, 0x45, 0x04, 0x11, 0x51, 0x04, 0x50, 0x44,
+   0x44, 0x44, 0x01, 0x15, 0x00, 0x40, 0x05, 0x00, 0x01, 0x04, 0x40, 0x00,
+   0x10, 0x04, 0x00, 0x00, 0x54, 0x40, 0x40, 0x41, 0x00, 0x10, 0x00, 0x00,
+   0xa0, 0x28, 0x02, 0x0a, 0x8a, 0x08, 0x20, 0x0a, 0x0a, 0x28, 0x02, 0x0a,
+   0x00, 0x80, 0x08, 0x00, 0x02, 0x08, 0x80, 0x00, 0x08, 0x08, 0x00, 0x00,
+   0x88, 0x20, 0x80, 0x80, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x05, 0x40, 0x00, 0x11, 0x00,
+   0x01, 0x10, 0x10, 0x01, 0x11, 0x04, 0x00, 0x04, 0x50, 0x40, 0x41, 0x01,
+   0x01, 0x11, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa,
+   0xaa, 0x00, 0x80, 0x02, 0x80, 0x80, 0x20, 0x02, 0x02, 0x20, 0x08, 0x82,
+   0x08, 0x08, 0x00, 0x08, 0x88, 0x20, 0x80, 0x00, 0x82, 0x20, 0x00, 0x00,
+   0x00, 0x40, 0x01, 0x10, 0x00, 0x00, 0x00, 0x54, 0x55, 0x01, 0x40, 0x01,
+   0x40, 0x14, 0x40, 0x41, 0x05, 0x40, 0x01, 0x14, 0x14, 0x14, 0x00, 0x44,
+   0x01, 0x45, 0x00, 0x00, 0x14, 0x54, 0x00, 0x00, 0x00, 0x80, 0x02, 0x08,
+   0x00, 0x00, 0x00, 0xa8, 0xaa, 0x02, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x04, 0x00, 0x00, 0x00, 0x50,
+   0x55, 0x05, 0x50, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x0a, 0x02, 0x00, 0x00, 0x00, 0xa0, 0xaa, 0x0a, 0xa8, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x01,
+   0x00, 0x00, 0x00, 0x50, 0x55, 0x05, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x00, 0xa0,
+   0xaa, 0x0a, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0x15, 0x15, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00,
+   0x00, 0x00, 0x00, 0x80, 0xaa, 0x2a, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x55, 0x15, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0x8a, 0x02, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x01,
+   0x00, 0x00, 0x00, 0x00, 0x54, 0x45, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x02, 0x00, 0x00, 0x00, 0x00,
+   0xa8, 0xa2, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x01, 0x05, 0x50, 0x00, 0x50, 0x40, 0x45, 0x11, 0x00, 0x50,
+   0x40, 0x41, 0x01, 0x00, 0x14, 0x00, 0x51, 0x40, 0x40, 0x00, 0x05, 0x14,
+   0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x0a,
+   0x88, 0x02, 0xaa, 0xa8, 0x80, 0x00, 0x00, 0xaa, 0xa8, 0xa2, 0x02, 0x00,
+   0xa2, 0xa0, 0x22, 0xa8, 0xa0, 0xa0, 0x8a, 0x2a, 0x02, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x14, 0x04, 0x01, 0x45, 0x51,
+   0x04, 0x40, 0x00, 0x45, 0x41, 0x51, 0x01, 0x00, 0x41, 0x50, 0x54, 0x50,
+   0x50, 0x50, 0x14, 0x14, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x0a, 0x82, 0xa2, 0xa0, 0x02, 0xa0, 0x88, 0x82,
+   0xa0, 0x88, 0x02, 0x80, 0x82, 0x28, 0x28, 0xa0, 0x20, 0x28, 0x08, 0x8a,
+   0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x51, 0x45, 0x54, 0x00,
+   0x14, 0x40, 0x41, 0x50, 0x05, 0x51, 0x10, 0x41, 0x41, 0x41, 0x01, 0x00,
+   0x05, 0x14, 0x10, 0x50, 0x40, 0x10, 0x14, 0x54, 0x04, 0x00, 0x41, 0x55,
+   0x04, 0x45, 0x01, 0x04, 0x20, 0x02, 0x08, 0x00, 0x2a, 0xa0, 0x00, 0xa0,
+   0x8a, 0x20, 0xa8, 0xa2, 0xa0, 0xa0, 0x00, 0x80, 0x0a, 0x28, 0x28, 0xa0,
+   0x20, 0x28, 0x0a, 0x2a, 0x00, 0x00, 0x22, 0x0a, 0x80, 0x88, 0x02, 0x88,
+   0x04, 0x50, 0x01, 0x00, 0x54, 0x40, 0x01, 0x50, 0x15, 0x10, 0x14, 0x51,
+   0x40, 0x41, 0x01, 0x00, 0x15, 0x14, 0x14, 0x40, 0x11, 0x14, 0x05, 0x14,
+   0x00, 0x40, 0x10, 0x00, 0x15, 0x45, 0x04, 0x01, 0x00, 0x00, 0x08, 0x00,
+   0xa8, 0xa0, 0x00, 0x28, 0x8a, 0x08, 0x0a, 0x28, 0xa0, 0xa0, 0x00, 0x00,
+   0x2a, 0x0a, 0x28, 0xa0, 0x08, 0x8a, 0x02, 0x0a, 0x00, 0x80, 0x00, 0x08,
+   0x80, 0x00, 0x00, 0x82, 0x44, 0x11, 0x00, 0x00, 0x50, 0x50, 0x00, 0x10,
+   0x05, 0x40, 0x15, 0x05, 0x50, 0x50, 0x00, 0x00, 0x14, 0x14, 0x14, 0x40,
+   0x11, 0x54, 0x00, 0x05, 0x00, 0x00, 0x11, 0x00, 0x01, 0x40, 0x04, 0x44,
+   0x80, 0x20, 0x0a, 0x00, 0xa0, 0xa0, 0x00, 0x88, 0x82, 0xa8, 0x0a, 0x00,
+   0xa0, 0xa0, 0x00, 0x00, 0x28, 0x0a, 0x0a, 0xa0, 0x08, 0x0a, 0x00, 0x0a,
+   0x00, 0x00, 0x22, 0x0a, 0xa2, 0x00, 0x00, 0x88, 0x01, 0x40, 0x15, 0x00,
+   0x50, 0x51, 0x40, 0x00, 0x01, 0x51, 0x15, 0x00, 0x50, 0x50, 0x00, 0x00,
+   0x54, 0x14, 0x54, 0x40, 0x05, 0x14, 0x00, 0x05, 0x00, 0x40, 0x41, 0x15,
+   0x14, 0x45, 0x04, 0x05, 0x00, 0x00, 0x00, 0x80, 0xa0, 0xa0, 0x20, 0x88,
+   0x80, 0xaa, 0x08, 0x82, 0x28, 0x28, 0x02, 0x20, 0x28, 0x0a, 0x2a, 0xa0,
+   0x02, 0x0a, 0x88, 0xa2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x41, 0x40, 0x11, 0x44, 0x00, 0x55, 0x14, 0x44,
+   0x50, 0x50, 0x01, 0x40, 0x10, 0x54, 0x15, 0x40, 0x01, 0x14, 0x04, 0x45,
+   0x01, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+   0x22, 0xa0, 0x0a, 0x00, 0x00, 0x0a, 0x2a, 0x20, 0x28, 0xa8, 0x00, 0xa0,
+   0x08, 0xa8, 0x08, 0xa0, 0x00, 0xa8, 0x82, 0x82, 0x02, 0x08, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x05, 0x00,
+   0x00, 0x54, 0x55, 0x10, 0x50, 0x50, 0x00, 0x00, 0x05, 0x50, 0x04, 0x40,
+   0x00, 0x50, 0x40, 0x05, 0x05, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x80, 0xaa, 0x2a,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x0a, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x05, 0x00, 0x40, 0x55, 0x15, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x01, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x0a,
+   0x00, 0x80, 0xaa, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0x00, 0x00, 0x55, 0x55,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0xa0, 0x02, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x01,
+   0x00, 0x00, 0x54, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x00, 0x00, 0x00, 0xa8, 0xaa,
+   0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x50, 0x55, 0x05, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x01, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x00,
+   0x00, 0x00, 0xa0, 0xaa, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x82, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x50, 0x55,
+   0x05, 0x00, 0x00, 0x14, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x01, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0xa0, 0xaa, 0x0a, 0x00, 0x00, 0x28,
+   0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x0a, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00,
+   0x00, 0x00, 0x40, 0x55, 0x15, 0x00, 0x00, 0x50, 0x04, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x40, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x0a, 0x00, 0x00, 0x00, 0x80, 0xaa,
+   0x2a, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x55, 0x50, 0x15,
+   0x55, 0x11, 0x55, 0x00, 0x15, 0x00, 0x54, 0x01, 0x00, 0x54, 0x01, 0x40,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x50, 0x00, 0x20, 0x82, 0x20, 0x08, 0x82, 0x00, 0x22, 0x80,
+   0x08, 0x08, 0x28, 0xa2, 0x28, 0x20, 0x08, 0x20, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xa2,
+   0x00, 0x04, 0x41, 0x10, 0x04, 0x11, 0x00, 0x40, 0x10, 0x14, 0x10, 0x54,
+   0x54, 0x11, 0x10, 0x00, 0x01, 0x00, 0x50, 0x14, 0x15, 0x05, 0x45, 0x01,
+   0x50, 0x50, 0x44, 0x14, 0x05, 0x00, 0x04, 0x40, 0x20, 0x02, 0x22, 0x02,
+   0x22, 0x08, 0x20, 0x20, 0x00, 0x08, 0x20, 0xa8, 0x28, 0x22, 0x08, 0x80,
+   0x02, 0x00, 0x88, 0x22, 0xa2, 0x88, 0x28, 0x02, 0x88, 0x80, 0x22, 0xa2,
+   0x08, 0x00, 0x08, 0x22, 0x00, 0x04, 0x41, 0x00, 0x04, 0x00, 0x01, 0x40,
+   0x00, 0x10, 0x40, 0x04, 0x11, 0x10, 0x04, 0x10, 0x05, 0x00, 0x10, 0x04,
+   0x01, 0x55, 0x45, 0x04, 0x10, 0x50, 0x44, 0x15, 0x01, 0x00, 0x14, 0x10,
+   0x00, 0x2a, 0xa0, 0x02, 0x2a, 0x20, 0x22, 0x80, 0x02, 0x22, 0x20, 0x02,
+   0x0a, 0xa0, 0x02, 0x08, 0x0a, 0x00, 0x20, 0x02, 0x82, 0x80, 0x20, 0x02,
+   0x80, 0x88, 0x28, 0x82, 0x00, 0x00, 0xa8, 0x20, 0x00, 0x44, 0x40, 0x01,
+   0x14, 0x00, 0x04, 0x00, 0x05, 0x10, 0x40, 0x00, 0x11, 0x10, 0x05, 0x04,
+   0x14, 0x00, 0x44, 0x44, 0x01, 0x51, 0x44, 0x04, 0x10, 0x45, 0x14, 0x11,
+   0x01, 0x00, 0x50, 0x11, 0x00, 0x82, 0x20, 0x02, 0x22, 0x20, 0x28, 0x20,
+   0x08, 0x2a, 0x80, 0x02, 0x02, 0x20, 0x08, 0x00, 0x00, 0x00, 0x28, 0x28,
+   0x02, 0x8a, 0x22, 0x02, 0xa0, 0xa8, 0x08, 0x8a, 0x00, 0x00, 0x80, 0x22,
+   0x00, 0x04, 0x41, 0x10, 0x04, 0x01, 0x10, 0x00, 0x10, 0x41, 0x40, 0x01,
+   0x11, 0x10, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x51, 0x20, 0x82, 0x20, 0x00,
+   0x02, 0x20, 0x28, 0x20, 0x88, 0x20, 0x80, 0x00, 0x82, 0x20, 0x28, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x22, 0x10, 0x04, 0x45, 0x10, 0x04, 0x01, 0x10, 0x40,
+   0x04, 0x40, 0x00, 0x00, 0x41, 0x10, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x41,
+   0x8a, 0x0a, 0xaa, 0x8a, 0xaa, 0xa8, 0x20, 0xa0, 0x82, 0xa2, 0x80, 0x80,
+   0xaa, 0xa8, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x80, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0,
+   0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x15, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+   0xaa, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0xa8, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0x01, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54,
+   0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0xa0, 0xa2, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2a, 0x2a, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01, 0x10, 0x50,
+   0x41, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x15, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0xa0, 0x80, 0x02, 0xa8, 0x28,
+   0x0a, 0xa0, 0x02, 0xa8, 0x00, 0x8a, 0x02, 0x28, 0x00, 0x00, 0x00, 0x0a,
+   0x28, 0x80, 0x2a, 0x80, 0x22, 0x80, 0x0a, 0x00, 0xa8, 0x00, 0x28, 0x2a,
+   0x00, 0x05, 0x00, 0x50, 0x00, 0x00, 0x55, 0x51, 0x14, 0x14, 0x54, 0x54,
+   0x01, 0x54, 0x01, 0x50, 0x50, 0x05, 0x00, 0x05, 0x00, 0x50, 0x55, 0x40,
+   0x51, 0x50, 0x15, 0x00, 0x54, 0x05, 0x14, 0x55, 0x00, 0x0a, 0x00, 0xa0,
+   0x00, 0x80, 0xaa, 0x2a, 0x2a, 0x08, 0x2a, 0xa8, 0x02, 0xaa, 0x02, 0xa0,
+   0xa0, 0x02, 0x00, 0x0a, 0x00, 0xa8, 0xaa, 0x80, 0x2a, 0xa8, 0x2a, 0x80,
+   0xaa, 0x0a, 0xa8, 0xaa, 0x01, 0x05, 0x00, 0x50, 0x05, 0x40, 0x55, 0x55,
+   0x14, 0x00, 0x14, 0x50, 0x05, 0x54, 0x01, 0x40, 0x51, 0x01, 0x00, 0x55,
+   0x00, 0x54, 0x55, 0x41, 0x15, 0x54, 0x55, 0x40, 0x55, 0x15, 0x54, 0x55,
+   0x02, 0x0a, 0x00, 0xa0, 0x0a, 0xa0, 0x02, 0x2a, 0x2a, 0x00, 0x0a, 0x88,
+   0x0a, 0x2a, 0x00, 0x80, 0xaa, 0x00, 0x00, 0xaa, 0x00, 0xaa, 0xa0, 0xa2,
+   0x0a, 0x2a, 0xa8, 0xa0, 0x0a, 0x0a, 0xaa, 0xa0, 0x01, 0x14, 0x01, 0x40,
+   0x55, 0x50, 0x01, 0x14, 0x14, 0x00, 0x05, 0x04, 0x15, 0x15, 0x00, 0x00,
+   0x51, 0x00, 0x00, 0x54, 0x05, 0x14, 0x40, 0x45, 0x05, 0x15, 0x50, 0x41,
+   0x01, 0x14, 0x54, 0x40, 0x02, 0xa8, 0x00, 0x80, 0xaa, 0xa8, 0x00, 0x2a,
+   0x28, 0x88, 0x02, 0x0a, 0x0a, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8,
+   0x0a, 0x0a, 0xa0, 0xa2, 0x82, 0x0a, 0xa0, 0xa0, 0x00, 0x28, 0x2a, 0xa0,
+   0x01, 0x50, 0x00, 0x00, 0x55, 0x50, 0x00, 0x14, 0x54, 0x54, 0x05, 0x15,
+   0x14, 0x15, 0x00, 0x00, 0x11, 0x00, 0x00, 0x50, 0x05, 0x15, 0x00, 0x40,
+   0x01, 0x05, 0x40, 0x51, 0x00, 0x14, 0x14, 0x40, 0x00, 0xa8, 0x00, 0x00,
+   0xa8, 0x28, 0x00, 0x28, 0x28, 0xa8, 0x02, 0x80, 0x0a, 0x0a, 0x00, 0x80,
+   0x08, 0x00, 0x00, 0x80, 0x8a, 0x0a, 0x00, 0xa0, 0x80, 0xaa, 0xaa, 0xa8,
+   0xaa, 0x2a, 0x0a, 0xa0, 0x01, 0x44, 0x01, 0x00, 0x50, 0x55, 0x00, 0x14,
+   0x50, 0x14, 0x01, 0x00, 0x15, 0x05, 0x00, 0x40, 0x15, 0x00, 0x00, 0x00,
+   0x15, 0x05, 0x00, 0x50, 0x41, 0x55, 0x55, 0x51, 0x55, 0x15, 0x15, 0x40,
+   0x00, 0x80, 0x02, 0x00, 0xa0, 0x28, 0x00, 0x0a, 0x28, 0x0a, 0x02, 0x00,
+   0x8a, 0x0a, 0x00, 0xa0, 0x2a, 0x00, 0x00, 0x00, 0x8a, 0x0a, 0x00, 0xa0,
+   0x80, 0xaa, 0xaa, 0xa8, 0xaa, 0x2a, 0x0a, 0xa0, 0x01, 0x40, 0x01, 0x00,
+   0x50, 0x55, 0x00, 0x14, 0x50, 0x05, 0x00, 0x00, 0x14, 0x05, 0x00, 0x50,
+   0x50, 0x00, 0x00, 0x00, 0x15, 0x05, 0x00, 0x50, 0x40, 0x55, 0x55, 0x51,
+   0x55, 0x15, 0x05, 0x50, 0x00, 0x80, 0x02, 0x2a, 0xa8, 0x28, 0x00, 0x0a,
+   0xa8, 0x0a, 0x80, 0xaa, 0x82, 0x02, 0x00, 0x20, 0xa0, 0x00, 0xa0, 0x82,
+   0x8a, 0x0a, 0x00, 0xa0, 0x80, 0x02, 0x00, 0x28, 0x00, 0x00, 0x0a, 0xa0,
+   0x00, 0x00, 0x05, 0x14, 0x50, 0x54, 0x00, 0x15, 0x50, 0x05, 0x40, 0x55,
+   0x01, 0x05, 0x00, 0x10, 0x40, 0x01, 0x40, 0x01, 0x05, 0x15, 0x50, 0x51,
+   0x40, 0x01, 0x00, 0x50, 0x00, 0x00, 0x05, 0x50, 0x00, 0x00, 0x0a, 0x2a,
+   0xa8, 0xa8, 0x80, 0x0a, 0xa0, 0x02, 0x80, 0x0a, 0x80, 0x02, 0x00, 0x08,
+   0x80, 0x02, 0xa0, 0x82, 0x0a, 0x2a, 0xa8, 0xa0, 0x80, 0x02, 0x2a, 0xa8,
+   0x80, 0x8a, 0x0a, 0xa0, 0x00, 0x00, 0x00, 0x54, 0x55, 0x50, 0x55, 0x05,
+   0x50, 0x01, 0x00, 0x00, 0x44, 0x05, 0x00, 0x04, 0x00, 0x05, 0x40, 0x55,
+   0x05, 0x54, 0x55, 0x50, 0x00, 0x55, 0x15, 0x50, 0x55, 0x05, 0x05, 0x50,
+   0x00, 0x00, 0x00, 0xa8, 0x2a, 0xa0, 0xaa, 0x0a, 0xa0, 0x00, 0x08, 0x00,
+   0x8a, 0x02, 0x00, 0x0a, 0x00, 0x00, 0x80, 0xaa, 0x02, 0xaa, 0x2a, 0x28,
+   0x80, 0xaa, 0x0a, 0xa0, 0xaa, 0x82, 0x02, 0x28, 0x00, 0x00, 0x00, 0x50,
+   0x15, 0x40, 0x55, 0x05, 0x40, 0x01, 0x10, 0x00, 0x55, 0x01, 0x00, 0x05,
+   0x00, 0x00, 0x00, 0x55, 0x01, 0x54, 0x15, 0x50, 0x00, 0x55, 0x05, 0x40,
+   0x55, 0x01, 0x05, 0x50, 0x00, 0x00, 0x00, 0xa0, 0x02, 0x80, 0x0a, 0x0a,
+   0xa0, 0x00, 0x00, 0xa0, 0xaa, 0x02, 0x80, 0x0a, 0x00, 0x00, 0x00, 0x2a,
+   0x00, 0xa0, 0x0a, 0x28, 0x00, 0xa8, 0x00, 0x80, 0x2a, 0x80, 0x02, 0x28,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,
+   0x55, 0x00, 0x40, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0xa0, 0x02,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x50, 0x01, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa,
+   0xaa, 0x00, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0x01, 0x50, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0xa8, 0xaa, 0x02, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,
+   0x55, 0x05, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xaa, 0x0a, 0x0a, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x40, 0x55, 0x15, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+   0xaa, 0x8a, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0x45, 0x05, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x80, 0x22, 0xa0, 0x22, 0xa8, 0x0a, 0xa8, 0x00,
+   0xa8, 0xa0, 0x28, 0x80, 0xaa, 0x22, 0x28, 0xa0, 0x02, 0x2a, 0x2a, 0xa0,
+   0x02, 0x8a, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x40, 0x15, 0x50, 0x15, 0x54, 0x15, 0x54, 0x01, 0x55, 0x41, 0x55, 0x00,
+   0x55, 0x11, 0x54, 0x50, 0x05, 0x54, 0x54, 0x54, 0x05, 0x54, 0x05, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x08, 0x08, 0x08,
+   0x20, 0x08, 0x02, 0x82, 0x82, 0x82, 0x82, 0x00, 0xaa, 0x08, 0x20, 0x20,
+   0x08, 0x08, 0x08, 0x0a, 0x0a, 0x28, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x50, 0x10, 0x04, 0x10, 0x10, 0x00, 0x01, 0x04,
+   0x01, 0x01, 0x01, 0x01, 0x54, 0x14, 0x11, 0x00, 0x10, 0x10, 0x04, 0x04,
+   0x04, 0x10, 0x00, 0x14, 0x51, 0x10, 0x44, 0x01, 0x50, 0x44, 0x44, 0x14,
+   0xa0, 0x00, 0x02, 0x08, 0x08, 0x80, 0x00, 0x82, 0x00, 0x82, 0x80, 0x00,
+   0xa8, 0x28, 0x00, 0xa0, 0x0a, 0x20, 0x08, 0x02, 0x08, 0x08, 0x00, 0x00,
+   0x20, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x08, 0x40, 0x05, 0x04, 0x00,
+   0x10, 0x00, 0x55, 0x45, 0x55, 0x41, 0x40, 0x00, 0x54, 0x54, 0x00, 0x50,
+   0x05, 0x10, 0x04, 0x55, 0x05, 0x04, 0x00, 0x44, 0x10, 0x14, 0x45, 0x04,
+   0x10, 0x54, 0x54, 0x04, 0x00, 0x0a, 0x02, 0x00, 0x08, 0x80, 0xaa, 0x82,
+   0xaa, 0x82, 0x80, 0x00, 0x2a, 0xaa, 0x00, 0x08, 0x08, 0x20, 0x02, 0xaa,
+   0x0a, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00,
+   0x10, 0x14, 0x04, 0x00, 0x04, 0x00, 0x01, 0x40, 0x00, 0x40, 0x40, 0x00,
+   0x15, 0x45, 0x15, 0x04, 0x04, 0x10, 0x01, 0x01, 0x00, 0x04, 0x00, 0x05,
+   0x15, 0x10, 0x44, 0x04, 0x14, 0x14, 0x41, 0x04, 0x08, 0x08, 0x0a, 0x08,
+   0x08, 0x80, 0x02, 0x82, 0x80, 0x20, 0x20, 0x80, 0x8a, 0x8a, 0x22, 0x02,
+   0x02, 0xa0, 0x00, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x54, 0x05, 0x54, 0x15, 0x55, 0x01, 0x55, 0x01,
+   0x55, 0x51, 0x51, 0x01, 0x45, 0x05, 0x00, 0x54, 0x15, 0x40, 0x00, 0x54,
+   0x45, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xa8, 0x02, 0xa8, 0x82, 0xaa, 0x00, 0xaa, 0x00, 0x2a, 0xa8, 0xa8, 0x80,
+   0x82, 0x22, 0x20, 0xa8, 0x0a, 0x20, 0x00, 0xa8, 0x80, 0xaa, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01, 0x55, 0x55, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,
+   0x05, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0xa0, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x0a, 0x00, 0x00, 0x08,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,
+   0x00, 0x54, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x40, 0x15, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x00, 0xa8, 0xaa, 0x02,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+   0x2a, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x54, 0x00, 0x54, 0x55, 0x01, 0x00, 0x40, 0x01, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x00, 0x00, 0x01,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2a,
+   0x00, 0xa8, 0xaa, 0x02, 0x00, 0x80, 0x02, 0x20, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0xaa, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x00, 0x50, 0x55, 0x05,
+   0x00, 0x00, 0x05, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x54, 0x01, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x80, 0x0a, 0x00, 0xa0, 0xaa, 0x0a, 0x00, 0x00, 0x0a, 0x08,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x02, 0x20, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05,
+   0x00, 0x40, 0x55, 0x15, 0x00, 0x00, 0x14, 0x04, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x54, 0x01, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x80, 0xaa, 0x2a,
+   0x00, 0x00, 0x28, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xa8, 0x02, 0x08, 0x00, 0x10, 0x50, 0x50, 0x50, 0x40, 0x10, 0x00, 0x00,
+   0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x50, 0x00,
+   0x50, 0x00, 0x05, 0x04, 0x01, 0x05, 0x50, 0x40, 0x54, 0x05, 0x04, 0x05,
+   0x8a, 0x20, 0x20, 0x88, 0xa0, 0x28, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00,
+   0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x20, 0x00, 0x82, 0x82, 0x08, 0x8a,
+   0x82, 0x08, 0x88, 0xa0, 0xa8, 0x0a, 0x22, 0x28, 0x00, 0x41, 0x00, 0x04,
+   0x41, 0x44, 0x00, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x55, 0x55,
+   0x00, 0x00, 0x10, 0x00, 0x01, 0x41, 0x10, 0x44, 0x44, 0x10, 0x04, 0x41,
+   0x50, 0x15, 0x11, 0x10, 0x80, 0x80, 0x00, 0x02, 0x82, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x80, 0x00,
+   0x02, 0x22, 0x20, 0x08, 0x20, 0x20, 0x02, 0x22, 0xa0, 0x2a, 0x22, 0x20,
+   0x00, 0x41, 0x10, 0x01, 0x44, 0x00, 0x00, 0x40, 0x41, 0x51, 0x04, 0x14,
+   0x15, 0x00, 0x11, 0x44, 0x50, 0x54, 0x40, 0x01, 0x05, 0x10, 0x00, 0x04,
+   0x10, 0x40, 0x01, 0x44, 0x10, 0x15, 0x51, 0x00, 0xa8, 0x80, 0x00, 0xaa,
+   0x82, 0x00, 0x00, 0x20, 0x22, 0x8a, 0xa2, 0x22, 0x22, 0x80, 0xa0, 0x88,
+   0x88, 0x88, 0x88, 0x02, 0x2a, 0x20, 0x00, 0x08, 0xa0, 0x2a, 0xaa, 0x22,
+   0x20, 0x8a, 0xa0, 0x02, 0x04, 0x01, 0x01, 0x01, 0x40, 0x00, 0x00, 0x40,
+   0x10, 0x10, 0x41, 0x54, 0x11, 0x00, 0x11, 0x40, 0x54, 0x05, 0x04, 0x05,
+   0x50, 0x11, 0x00, 0x04, 0x10, 0x00, 0x01, 0x40, 0x10, 0x45, 0x00, 0x15,
+   0x82, 0x80, 0x08, 0x02, 0x80, 0x00, 0x00, 0x00, 0x22, 0x88, 0x02, 0x02,
+   0x22, 0x00, 0x82, 0x08, 0x02, 0x08, 0x02, 0x0a, 0x80, 0x22, 0x00, 0x08,
+   0x20, 0x00, 0x02, 0x20, 0x20, 0xa2, 0x00, 0x28, 0x01, 0x01, 0x05, 0x01,
+   0x40, 0x00, 0x00, 0x40, 0x14, 0x51, 0x41, 0x44, 0x11, 0x40, 0x04, 0x11,
+   0x04, 0x05, 0x01, 0x14, 0x00, 0x15, 0x00, 0x04, 0x10, 0x00, 0x01, 0x40,
+   0x10, 0x51, 0x01, 0x50, 0x82, 0x00, 0x02, 0x02, 0x80, 0x00, 0x00, 0x80,
+   0xa2, 0x88, 0x2a, 0x28, 0x22, 0x80, 0x02, 0x28, 0x8a, 0x88, 0x00, 0x28,
+   0x00, 0x22, 0x00, 0x08, 0x20, 0x00, 0x02, 0x20, 0xa0, 0xa8, 0x02, 0x20,
+   0x01, 0x05, 0x05, 0x04, 0x44, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01, 0x00,
+   0x00, 0x00, 0x40, 0x55, 0x15, 0x00, 0x00, 0x00, 0x01, 0x44, 0x00, 0x04,
+   0x40, 0x40, 0x04, 0x44, 0x10, 0x51, 0x15, 0x40, 0x82, 0x00, 0x02, 0x08,
+   0x82, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x80, 0xaa,
+   0x2a, 0x00, 0x00, 0x00, 0x02, 0x82, 0x08, 0x08, 0x80, 0x20, 0x08, 0x22,
+   0xa0, 0xa0, 0x2a, 0x20, 0x14, 0x01, 0x00, 0x50, 0x50, 0x01, 0x00, 0x00,
+   0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00,
+   0x51, 0x00, 0x05, 0x15, 0x00, 0x05, 0x50, 0x50, 0x50, 0x40, 0x15, 0x05,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x10, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x10, 0x40, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x28, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x80, 0x2a, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,
+   0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x02, 0x00, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x01,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0xa8, 0x02, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
+   0x00, 0x00, 0x50, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0xa0, 0x0a,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,
+   0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0a, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x04, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+   0x00, 0x40, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x50, 0x55, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00,
+   0x00, 0xa0, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xaa,
+   0x15, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0x10, 0x04, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x05, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0x2a, 0x00, 0x00, 0x00,
+   0x00, 0xa0, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x08, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x80, 0xaa, 0x15, 0x00, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00,
+   0x00, 0x10, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55,
+   0xa2, 0x00, 0x80, 0x02, 0x0a, 0xa2, 0x82, 0x02, 0x0a, 0x08, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x02, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x0a, 0xa8, 0xa0, 0x80, 0x82, 0xa0, 0x11, 0x01, 0x00, 0x04,
+   0x11, 0x50, 0x41, 0x04, 0x11, 0x10, 0x00, 0x14, 0x44, 0x40, 0x00, 0x41,
+   0x11, 0x00, 0x14, 0x00, 0x44, 0x05, 0x05, 0x04, 0x45, 0x00, 0x10, 0x44,
+   0x11, 0x11, 0x04, 0x44, 0xa2, 0x02, 0x20, 0x80, 0x20, 0x28, 0x20, 0x08,
+   0x02, 0x20, 0x80, 0x22, 0xa8, 0xa8, 0xa0, 0x82, 0x28, 0x00, 0x28, 0x80,
+   0x22, 0x08, 0x82, 0x0a, 0x22, 0x80, 0x00, 0x82, 0x20, 0x00, 0x88, 0x8a,
+   0x51, 0x05, 0x50, 0x00, 0x10, 0x11, 0x11, 0x10, 0x01, 0x50, 0x40, 0x10,
+   0x54, 0x04, 0x11, 0x04, 0x41, 0x00, 0x50, 0x40, 0x10, 0x04, 0x44, 0x10,
+   0x44, 0x40, 0x01, 0x01, 0x10, 0x10, 0x44, 0x14, 0xa2, 0x00, 0xa0, 0x00,
+   0xa8, 0x02, 0xa0, 0x0a, 0x02, 0xa0, 0xa0, 0x00, 0x0a, 0x82, 0x08, 0x82,
+   0x20, 0x00, 0xa0, 0x20, 0x20, 0x08, 0x22, 0x08, 0x02, 0x80, 0x02, 0x02,
+   0x20, 0xa8, 0x8a, 0x82, 0x51, 0x01, 0x40, 0x01, 0x55, 0x01, 0x10, 0x00,
+   0x01, 0x40, 0x41, 0x00, 0x04, 0x54, 0x50, 0x41, 0x40, 0x00, 0x40, 0x10,
+   0x10, 0x04, 0x41, 0x05, 0x01, 0x00, 0x05, 0x01, 0x10, 0x10, 0x40, 0x50,
+   0xa2, 0x08, 0x80, 0x82, 0xa0, 0x8a, 0x20, 0x00, 0x02, 0x80, 0x22, 0x00,
+   0x02, 0x0a, 0x28, 0x80, 0x20, 0x00, 0x80, 0x20, 0x08, 0x88, 0xa0, 0x00,
+   0x02, 0x00, 0x0a, 0x02, 0x20, 0x08, 0x80, 0xa0, 0x51, 0x01, 0x00, 0x44,
+   0x50, 0x11, 0x10, 0x00, 0x01, 0x00, 0x11, 0x00, 0x01, 0x01, 0x04, 0x40,
+   0x10, 0x00, 0x40, 0x11, 0x10, 0x10, 0x11, 0x00, 0x01, 0x00, 0x10, 0x01,
+   0x10, 0x10, 0x40, 0x50, 0xa2, 0x08, 0x00, 0x88, 0x80, 0x08, 0x20, 0x00,
+   0x02, 0x02, 0x22, 0x00, 0x02, 0x02, 0x08, 0x20, 0x20, 0x00, 0x80, 0x08,
+   0x08, 0x88, 0x20, 0x80, 0x00, 0x00, 0x20, 0x02, 0x20, 0x28, 0x80, 0xa0,
+   0x51, 0x11, 0x10, 0x44, 0x40, 0x50, 0x40, 0x10, 0x01, 0x00, 0x11, 0x00,
+   0x01, 0x01, 0x04, 0x40, 0x10, 0x00, 0x01, 0x11, 0x04, 0x50, 0x10, 0x00,
+   0x01, 0x40, 0x10, 0x04, 0x11, 0x50, 0x00, 0x01, 0xa2, 0x28, 0x20, 0x82,
+   0x0a, 0x20, 0xa0, 0x0a, 0x02, 0x02, 0x22, 0x88, 0x00, 0x82, 0x08, 0x22,
+   0x08, 0x80, 0x80, 0x28, 0x08, 0x28, 0x20, 0x88, 0x00, 0x80, 0x08, 0xaa,
+   0x20, 0xa0, 0x82, 0xaa, 0x41, 0x50, 0x50, 0x01, 0x55, 0x00, 0x00, 0x05,
+   0x05, 0x05, 0x51, 0x04, 0x01, 0x45, 0x14, 0x11, 0x50, 0x00, 0x41, 0x50,
+   0x04, 0x10, 0x50, 0x44, 0x00, 0x40, 0x05, 0x50, 0x50, 0x40, 0x01, 0x14,
+   0xaa, 0xaa, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x00, 0xa8, 0xa0, 0x82,
+   0x00, 0x2a, 0xa8, 0x20, 0x28, 0x80, 0x2a, 0x20, 0x08, 0x08, 0xa0, 0x82,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0x01, 0x00,
+   0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0xa8, 0xaa, 0x02, 0x80, 0x0a, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x54, 0x55, 0x01, 0x40, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0xaa, 0x02, 0xa0,
+   0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x50, 0x55, 0x05, 0x40, 0x01, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xa0, 0xaa, 0x0a, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0x15, 0x50,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x80, 0xaa, 0x2a, 0x28, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x55, 0x55, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x04, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x40, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0x2a, 0x2a,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x15, 0x15, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0xaa, 0x8a, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x45, 0x45,
+   0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x80, 0x88, 0xa2, 0x22, 0x08, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x88, 0x00, 0x00, 0x80, 0xaa, 0x2a, 0x0a, 0x00, 0x0a, 0x08,
+   0x02, 0x22, 0xa0, 0x80, 0x08, 0x00, 0xa0, 0x00, 0x20, 0xa0, 0xa0, 0xa0,
+   0x41, 0x01, 0x51, 0x45, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x01,
+   0x00, 0x00, 0x55, 0x55, 0x14, 0x00, 0x11, 0x14, 0x05, 0x45, 0x10, 0x41,
+   0x11, 0x00, 0x40, 0x01, 0x14, 0x41, 0x40, 0x10, 0x82, 0x28, 0xa2, 0xaa,
+   0x80, 0xa2, 0xa2, 0xa0, 0xa8, 0x00, 0x28, 0x28, 0x08, 0xa2, 0x02, 0xaa,
+   0xa8, 0x80, 0x20, 0x88, 0x88, 0x0a, 0x08, 0x82, 0x20, 0x00, 0x80, 0x0a,
+   0x00, 0x82, 0x00, 0x08, 0x04, 0x51, 0x51, 0x55, 0x45, 0x44, 0x11, 0x11,
+   0x11, 0x01, 0x50, 0x44, 0x04, 0x11, 0x05, 0x55, 0x41, 0x41, 0x40, 0x10,
+   0x40, 0x55, 0x04, 0x44, 0x40, 0x00, 0x00, 0x14, 0x00, 0x01, 0x01, 0x04,
+   0x88, 0xa8, 0xa8, 0x2a, 0x2a, 0x20, 0x08, 0x0a, 0x0a, 0x02, 0xa0, 0x80,
+   0x88, 0x08, 0xa2, 0xaa, 0x02, 0x22, 0x00, 0x08, 0xa0, 0x8a, 0x02, 0x88,
+   0x20, 0x00, 0x00, 0x20, 0x00, 0x82, 0x20, 0x02, 0x05, 0x55, 0x54, 0x55,
+   0x44, 0x40, 0x50, 0x51, 0x11, 0x01, 0x04, 0x51, 0x10, 0x51, 0x41, 0x55,
+   0x05, 0x44, 0x00, 0x10, 0x00, 0x50, 0x54, 0x45, 0x40, 0x00, 0x00, 0x40,
+   0x50, 0x01, 0x01, 0x54, 0x80, 0x2a, 0xaa, 0x0a, 0x28, 0x28, 0x08, 0x08,
+   0x08, 0x02, 0x88, 0x88, 0x80, 0x08, 0xa8, 0xaa, 0x0a, 0x28, 0x00, 0x08,
+   0xa0, 0x02, 0x02, 0x80, 0x20, 0x00, 0x00, 0x80, 0x08, 0x02, 0x02, 0x02,
+   0x00, 0x15, 0x55, 0x15, 0x44, 0x44, 0x10, 0x11, 0x11, 0x01, 0x04, 0x45,
+   0x50, 0x10, 0x51, 0x55, 0x15, 0x44, 0x00, 0x10, 0x00, 0x01, 0x04, 0x40,
+   0x40, 0x00, 0x00, 0x40, 0x04, 0x01, 0x11, 0x04, 0x80, 0x0a, 0xaa, 0x2a,
+   0x82, 0x22, 0xa0, 0xa0, 0x08, 0x02, 0xa8, 0xa8, 0x20, 0xa0, 0xa8, 0xaa,
+   0x0a, 0x28, 0x00, 0x08, 0x80, 0x00, 0x02, 0x80, 0x20, 0x00, 0x00, 0x80,
+   0x02, 0x02, 0x0a, 0x02, 0x00, 0x04, 0x54, 0x55, 0x01, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0x15, 0x44, 0x00, 0x10,
+   0x10, 0x00, 0x04, 0x40, 0x40, 0x00, 0x00, 0x40, 0x04, 0x01, 0x04, 0x04,
+   0x08, 0x02, 0xa8, 0xaa, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x80, 0xaa, 0x28, 0x82, 0x00, 0x08, 0xa8, 0x80, 0x08, 0x88,
+   0x20, 0x00, 0x20, 0x20, 0x02, 0x0a, 0x0a, 0x08, 0x44, 0x00, 0x50, 0x55,
+   0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,
+   0x51, 0x01, 0x11, 0x10, 0x54, 0x41, 0x10, 0x44, 0x40, 0x00, 0x40, 0x10,
+   0x04, 0x01, 0x04, 0x10, 0x00, 0x00, 0xa0, 0xaa, 0x0a, 0x00, 0x00, 0x00,
+   0x00, 0xa0, 0x00, 0x08, 0x00, 0x00, 0x00, 0xaa, 0x08, 0x00, 0x0a, 0x2a,
+   0x2a, 0x0a, 0xa0, 0xa0, 0xa0, 0x00, 0x20, 0x0a, 0x28, 0x02, 0x00, 0xa0,
+   0x50, 0x01, 0x50, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01, 0x00,
+   0x00, 0x00, 0x00, 0x54, 0x55, 0x01, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/xorg-server/hw/xquartz/bundle/.gitignore b/xorg-server/hw/xquartz/bundle/.gitignore
new file mode 100644
index 000000000..fbdbd09cd
--- /dev/null
+++ b/xorg-server/hw/xquartz/bundle/.gitignore
@@ -0,0 +1 @@
+Info.plist
diff --git a/xorg-server/hw/xquartz/bundle/X11.sh b/xorg-server/hw/xquartz/bundle/X11.sh
index 3b8b6799c..48c0553d1 100644
--- a/xorg-server/hw/xquartz/bundle/X11.sh
+++ b/xorg-server/hw/xquartz/bundle/X11.sh
@@ -1,15 +1,15 @@
-#!/bin/bash
-
-set "$(dirname "$0")"/X11.bin "${@}"
-
-if [ -x ~/.x11run ]; then
-	exec ~/.x11run "${@}"
-fi
-
-case $(basename "${SHELL}") in
-	bash)          exec -l "${SHELL}" --login -c 'exec "${@}"' - "${@}" ;;
-	ksh|sh|zsh)    exec -l "${SHELL}" -c 'exec "${@}"' - "${@}" ;;
-	csh|tcsh)      exec -l "${SHELL}" -c 'exec $argv:q' "${@}" ;;
-	es|rc)         exec -l "${SHELL}" -l -c 'exec $*' "${@}" ;;
-	*)             exec    "${@}" ;;
-esac
+#!/bin/bash
+
+set "$(dirname "$0")"/X11.bin "${@}"
+
+if [ -x ~/.x11run ]; then
+	exec ~/.x11run "${@}"
+fi
+
+case $(basename "${SHELL}") in
+	bash)          exec -l "${SHELL}" --login -c 'exec "${@}"' - "${@}" ;;
+	ksh|sh|zsh)    exec -l "${SHELL}" -c 'exec "${@}"' - "${@}" ;;
+	csh|tcsh)      exec -l "${SHELL}" -c 'exec $argv:q' "${@}" ;;
+	es|rc)         exec -l "${SHELL}" -l -c 'exec $*' "${@}" ;;
+	*)             exec    "${@}" ;;
+esac
diff --git a/xorg-server/hw/xquartz/bundle/Xquartz.plist b/xorg-server/hw/xquartz/bundle/Xquartz.plist
index e15704516..3ee787807 100644
--- a/xorg-server/hw/xquartz/bundle/Xquartz.plist
+++ b/xorg-server/hw/xquartz/bundle/Xquartz.plist
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-
-<!-- This file contains system-wide defaults for the Apple X11 server -->
-
-<plist version="1.0">
-<dict>
-	<key>apps_menu</key>
-	<array>
-		<array>
-			<string>Terminal</string>
-			<string>xterm</string>
-			<string>n</string>
-		</array>
-		<array>
-			<string>xman</string>
-			<string>xman</string>
-			<string></string>
-		</array>
-		<array>
-			<string>xlogo</string>
-			<string>xlogo</string>
-			<string></string>
-		</array>
-	</array>
-</dict>
-</plist>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+
+<!-- This file contains system-wide defaults for the Apple X11 server -->
+
+<plist version="1.0">
+<dict>
+	<key>apps_menu</key>
+	<array>
+		<array>
+			<string>Terminal</string>
+			<string>xterm</string>
+			<string>n</string>
+		</array>
+		<array>
+			<string>xman</string>
+			<string>xman</string>
+			<string></string>
+		</array>
+		<array>
+			<string>xlogo</string>
+			<string>xlogo</string>
+			<string></string>
+		</array>
+	</array>
+</dict>
+</plist>
diff --git a/xorg-server/hw/xquartz/darwin.c b/xorg-server/hw/xquartz/darwin.c
index 41db72af8..d26f18a12 100644
--- a/xorg-server/hw/xquartz/darwin.c
+++ b/xorg-server/hw/xquartz/darwin.c
@@ -193,7 +193,7 @@ DarwinSaveScreen(ScreenPtr pScreen, int on)
  *  Initialize the screen and communicate information about it back to dix.
  */
 static Bool
-DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
+DarwinScreenInit(ScreenPtr pScreen, int argc, char **argv)
 {
     int dpi;
     static int foundIndex = 0;
@@ -204,7 +204,7 @@ DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
         return FALSE;
 
     // reset index of found screens for each server generation
-    if (index == 0) {
+    if (pScreen->myNum == 0) {
         foundIndex = 0;
 
         // reset the visual list
@@ -275,7 +275,7 @@ DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
     pScreen->SaveScreen = DarwinSaveScreen;
 
     // finish mode dependent screen setup including cursor support
-    if (!QuartzSetupScreen(index, pScreen)) {
+    if (!QuartzSetupScreen(pScreen->myNum, pScreen)) {
         return FALSE;
     }
 
diff --git a/xorg-server/hw/xquartz/mach-startup/.gitignore b/xorg-server/hw/xquartz/mach-startup/.gitignore
new file mode 100644
index 000000000..0bda6e75c
--- /dev/null
+++ b/xorg-server/hw/xquartz/mach-startup/.gitignore
@@ -0,0 +1,8 @@
+#		Add & Override for this directory and it's subdirectories
+mach_startup.h
+mach_startupServer.c
+mach_startupServer.h
+mach_startupUser.c
+X11.bin
+Xquartz
+
diff --git a/xorg-server/hw/xquartz/mach-startup/mach_startup.defs b/xorg-server/hw/xquartz/mach-startup/mach_startup.defs
index e47f49c3c..7b575bf54 100644
--- a/xorg-server/hw/xquartz/mach-startup/mach_startup.defs
+++ b/xorg-server/hw/xquartz/mach-startup/mach_startup.defs
@@ -1,50 +1,50 @@
-/* Copyright (c) 2008 Apple Inc.
- *
- * 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 ABOVE LISTED COPYRIGHT
- * HOLDER(S) 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(s) of the above
- * copyright holders shall not be used in advertising or otherwise to
- * promote the sale, use or other dealings in this Software without
- * prior written authorization.
- */
-
-#include <mach/std_types.defs>
-#include <mach/mach_types.defs>
-import "mach_startup_types.h";
-
-subsystem mach_startup 1000;
-serverprefix do_;
-
-type string_t = c_string[1024];
-type string_array_t = array[] of string_t;
-
-routine start_x11_server(
-    port  : mach_port_t;
-    argv  : string_array_t;
-    envp  : string_array_t);
-
-routine request_fd_handoff_socket (
-        port             : mach_port_t;
-    out socket_filename  : string_t);
-
-routine request_pid (
-        port    : mach_port_t;
-    out pid     : int);
+/* Copyright (c) 2008 Apple Inc.
+ *
+ * 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 ABOVE LISTED COPYRIGHT
+ * HOLDER(S) 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(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
+
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+import "mach_startup_types.h";
+
+subsystem mach_startup 1000;
+serverprefix do_;
+
+type string_t = c_string[1024];
+type string_array_t = array[] of string_t;
+
+routine start_x11_server(
+    port  : mach_port_t;
+    argv  : string_array_t;
+    envp  : string_array_t);
+
+routine request_fd_handoff_socket (
+        port             : mach_port_t;
+    out socket_filename  : string_t);
+
+routine request_pid (
+        port    : mach_port_t;
+    out pid     : int);
diff --git a/xorg-server/hw/xquartz/pbproxy/.gitignore b/xorg-server/hw/xquartz/pbproxy/.gitignore
new file mode 100644
index 000000000..d6e6710f2
--- /dev/null
+++ b/xorg-server/hw/xquartz/pbproxy/.gitignore
@@ -0,0 +1 @@
+xpbproxy
diff --git a/xorg-server/hw/xquartz/xpr/Makefile.am b/xorg-server/hw/xquartz/xpr/Makefile.am
index 763a7cd5c..685052702 100644
--- a/xorg-server/hw/xquartz/xpr/Makefile.am
+++ b/xorg-server/hw/xquartz/xpr/Makefile.am
@@ -1,32 +1,32 @@
-noinst_LTLIBRARIES = libXquartzXpr.la
-
-AM_CFLAGS =  $(DIX_CFLAGS)
-AM_CPPFLAGS = \
-	-I$(srcdir) -I$(srcdir)/.. \
-	-I$(top_srcdir)/miext \
-	-I$(top_srcdir)/miext/rootless
-
-libXquartzXpr_la_SOURCES = \
-	appledri.c \
-	dri.c \
-	driWrap.c \
-	xprAppleWM.c \
-	xprCursor.c \
-	xprEvent.c \
-	xprFrame.c \
-	xprScreen.c \
-	x-hash.c \
-	x-hook.c \
-	x-list.c
-
-EXTRA_DIST = \
-	dri.h \
-	driWrap.h \
-	dristruct.h \
-	appledri.h \
-	appledristr.h \
-	x-hash.h \
-	x-hook.h \
-	x-list.h \
-	xpr.h \
-	xprEvent.h
+noinst_LTLIBRARIES = libXquartzXpr.la
+
+AM_CFLAGS =  $(DIX_CFLAGS)
+AM_CPPFLAGS = \
+	-I$(srcdir) -I$(srcdir)/.. \
+	-I$(top_srcdir)/miext \
+	-I$(top_srcdir)/miext/rootless
+
+libXquartzXpr_la_SOURCES = \
+	appledri.c \
+	dri.c \
+	driWrap.c \
+	xprAppleWM.c \
+	xprCursor.c \
+	xprEvent.c \
+	xprFrame.c \
+	xprScreen.c \
+	x-hash.c \
+	x-hook.c \
+	x-list.c
+
+EXTRA_DIST = \
+	dri.h \
+	driWrap.h \
+	dristruct.h \
+	appledri.h \
+	appledristr.h \
+	x-hash.h \
+	x-hook.h \
+	x-list.h \
+	xpr.h \
+	xprEvent.h
diff --git a/xorg-server/hw/xwin/.gitignore b/xorg-server/hw/xwin/.gitignore
new file mode 100644
index 000000000..bc4986cb4
--- /dev/null
+++ b/xorg-server/hw/xwin/.gitignore
@@ -0,0 +1,3 @@
+winprefslex.c
+winprefsyacc.c
+winprefsyacc.h
diff --git a/xorg-server/hw/xwin/README b/xorg-server/hw/xwin/README
index 219fd1337..9f7090344 100644
--- a/xorg-server/hw/xwin/README
+++ b/xorg-server/hw/xwin/README
@@ -1,141 +1,141 @@
-Cygwin/X Release Notes
-======================
-
-Release X11R6.7
-===============
-
-Cygwin/X has continued its rapid pace of development that it has sustained
-since Spring 2001 and this release shows it, we now have: a stable and fast
-multi-window mode, seamless clipboard integration, a configurable tray menu
-icon, popups on error messages pointing users to the log file and our mailing
-list, the beginnings of indirect 3D acceleration for OpenGL applications,
-improved non-US keyboard and clipboard support, and only a handful of bugs
-that continue to be reported.
-
-Between the XFree86 4.3.0 release and the X.Org X11R6.7 release the Cyg-
-win/XFree86 project broke away from The XFree86 Project, Inc. due to a lack
-of support from the XFree86 project.  As such, the Cygwin/XFree86 project was
-renamed to the Cygwin/X project and the upstream source code tree that Cyg-
-win/X pulls from and pushes to is now the tree managed by the X.Org Founda-
-tion.  The Cygwin/X project has seen a rush of development and interest in
-the project since the split; one metric showing this is that the number of
-CVS committers we have has gone from zero to six.
-
-The most outstanding features of this release are
-
-   o Major multi-window mode improvements. (Takuma Murakami, Earle F. 
-     Philhower III)
-
-   o Initial work of accelerated OpenGL using the windows OpenGL drivers. 
-     (Alexander Gottwald)
-
-   o Massive rework of clipboard integration with windows. (Harold L Hunt II,
-     Kensuke Matsuzaki)
-
-   o Improved Japanese clipboard and keyboard support. (Kensuke Matsuzaki,
-     Takuma Murakami, Alexander Gottwald)
-
-   o Customizable tray menu icon allowing shortcuts to start programs,
-     etc.(Earle F. Philhower III)
-
-   o New icons. (Jehan Bing, Michael Bax, Benjamin Rienfenstahl)
-
-   o Fix some multi-monitor problems.(Takuma Murakami)
-
-   o Fix repeated key strokes. (Ivan Pascal)
-
-   o Automatic keyboard layouts for the most frequently used keyboard lay-
-     outs. (Alexander Gottwald)
-
-   o Built in SHM support with detection of the SHM engine (cygserver).
-     (Ralf Habacker, Harold L Hunt II)
-
-   o Merged in work on the NativeGDI engine. (Alan Hourihane)
-
-OpenGL with Cygwin/X
-====================
-
-Cygwin/X has supported GLX only with software rendering provided by the Mesa
-library. Starting with X11R6.7 we add support for hardware accelerated OpenGL.
-
-This support is still under development and still has some bigger problems. 
-To provide both versions (the stable software rendering and the new hardware
-accelerated) we ship to binaries. XWin.exe contains the software rendering 
-and XWin_GL.exe uses the hardware acceleration provided by the windows drivers.
-
-The known problems with hardware accelerated OpenGL are:
-
-   o Only multiwindow mode is useful. In the other modes the OpenGL output 
-     does not align with the X11 windows.
-
-   o Using two programs which require different visuals will fail. For example
-     glxgears and glxinfo will not work without restarting XWin_GL.exe.
-
-   o OpenGL extensions and functions from OpenGL 1.2 and later should work 
-     but are not completely tested.
-
-   o The standard Windows OpenGL driver will produce no output. Use the one 
-     from your video adapter vendor.  
-
-If you notice problems with some programs please send a message with the 
-logfile /tmp/XWin.log and a short error description to <cygwin-xfree@cygwin.com>
-
-The hardware accelerated OpenGL was tested using: 
-
-   o glxgears
-   o glxinfo
-   o blender
-   o tuxkart
-   o GLUT demos (some did fail)
-   o tuxracer (currently not working)
-
-    
-Release X11R6.8
-===============
-
-Having reached a quite mature state in release X11R6.7 the development 
-has slowed down a little bit. Some of the former active developers have
-retired or cut their work for the Cygwin/X project due to conflicts with 
-job, study and family. 
-
-The X11R6.8 release now includes major improvements from the xserver project.
-This includes the XFixes, Damage, Composite and XEVIE extension which is a 
-major step towards allowing Cygwin/X to have real transparency. 
-
-But at the current state Composite is not working with Cygwin/X. Not all code
-in the Cygwin/X Server has been updated to support the Composite feature and
-using it will even crash the xserver. But as a second problem nearly all
-functions required for compositing are lacking acceleration in Cygwin/X so
-the feature would not be very useful if it would work. So it is disabled by
-default. 
-
-OpenGL with Cygwin/X
-====================
-
-The OpenGL support has lost some of it's limitations from the last release 
-and should be much more stable. But due to missing wide spread testing in 
-the community it is still available in a separate program. XWin still uses 
-the old software OpenGL which is known to be stable.
-
-The known problems with hardware accelerated OpenGL are:
-
-   o Only multiwindow mode is useful. In the other modes the OpenGL output 
-     does not align with the X11 windows.
-
-   o OpenGL extensions and functions from OpenGL 1.2 and later should work 
-     but are not completely tested.
-
-   o The standard Windows OpenGL driver will produce no output. Use the one 
-     from your video adapter vendor.  
-
-If you notice problems with some programs please send a message with the 
-logfile /tmp/XWin.log and a short error description to <cygwin-xfree@cygwin.com>
-
-The hardware accelerated OpenGL was tested using: 
-
-   o glxgears
-   o glxinfo
-   o blender
-   o tuxkart
-   o GLUT demos (some did fail)
-
+Cygwin/X Release Notes
+======================
+
+Release X11R6.7
+===============
+
+Cygwin/X has continued its rapid pace of development that it has sustained
+since Spring 2001 and this release shows it, we now have: a stable and fast
+multi-window mode, seamless clipboard integration, a configurable tray menu
+icon, popups on error messages pointing users to the log file and our mailing
+list, the beginnings of indirect 3D acceleration for OpenGL applications,
+improved non-US keyboard and clipboard support, and only a handful of bugs
+that continue to be reported.
+
+Between the XFree86 4.3.0 release and the X.Org X11R6.7 release the Cyg-
+win/XFree86 project broke away from The XFree86 Project, Inc. due to a lack
+of support from the XFree86 project.  As such, the Cygwin/XFree86 project was
+renamed to the Cygwin/X project and the upstream source code tree that Cyg-
+win/X pulls from and pushes to is now the tree managed by the X.Org Founda-
+tion.  The Cygwin/X project has seen a rush of development and interest in
+the project since the split; one metric showing this is that the number of
+CVS committers we have has gone from zero to six.
+
+The most outstanding features of this release are
+
+   o Major multi-window mode improvements. (Takuma Murakami, Earle F. 
+     Philhower III)
+
+   o Initial work of accelerated OpenGL using the windows OpenGL drivers. 
+     (Alexander Gottwald)
+
+   o Massive rework of clipboard integration with windows. (Harold L Hunt II,
+     Kensuke Matsuzaki)
+
+   o Improved Japanese clipboard and keyboard support. (Kensuke Matsuzaki,
+     Takuma Murakami, Alexander Gottwald)
+
+   o Customizable tray menu icon allowing shortcuts to start programs,
+     etc.(Earle F. Philhower III)
+
+   o New icons. (Jehan Bing, Michael Bax, Benjamin Rienfenstahl)
+
+   o Fix some multi-monitor problems.(Takuma Murakami)
+
+   o Fix repeated key strokes. (Ivan Pascal)
+
+   o Automatic keyboard layouts for the most frequently used keyboard lay-
+     outs. (Alexander Gottwald)
+
+   o Built in SHM support with detection of the SHM engine (cygserver).
+     (Ralf Habacker, Harold L Hunt II)
+
+   o Merged in work on the NativeGDI engine. (Alan Hourihane)
+
+OpenGL with Cygwin/X
+====================
+
+Cygwin/X has supported GLX only with software rendering provided by the Mesa
+library. Starting with X11R6.7 we add support for hardware accelerated OpenGL.
+
+This support is still under development and still has some bigger problems. 
+To provide both versions (the stable software rendering and the new hardware
+accelerated) we ship to binaries. XWin.exe contains the software rendering 
+and XWin_GL.exe uses the hardware acceleration provided by the windows drivers.
+
+The known problems with hardware accelerated OpenGL are:
+
+   o Only multiwindow mode is useful. In the other modes the OpenGL output 
+     does not align with the X11 windows.
+
+   o Using two programs which require different visuals will fail. For example
+     glxgears and glxinfo will not work without restarting XWin_GL.exe.
+
+   o OpenGL extensions and functions from OpenGL 1.2 and later should work 
+     but are not completely tested.
+
+   o The standard Windows OpenGL driver will produce no output. Use the one 
+     from your video adapter vendor.  
+
+If you notice problems with some programs please send a message with the 
+logfile /tmp/XWin.log and a short error description to <cygwin-xfree@cygwin.com>
+
+The hardware accelerated OpenGL was tested using: 
+
+   o glxgears
+   o glxinfo
+   o blender
+   o tuxkart
+   o GLUT demos (some did fail)
+   o tuxracer (currently not working)
+
+    
+Release X11R6.8
+===============
+
+Having reached a quite mature state in release X11R6.7 the development 
+has slowed down a little bit. Some of the former active developers have
+retired or cut their work for the Cygwin/X project due to conflicts with 
+job, study and family. 
+
+The X11R6.8 release now includes major improvements from the xserver project.
+This includes the XFixes, Damage, Composite and XEVIE extension which is a 
+major step towards allowing Cygwin/X to have real transparency. 
+
+But at the current state Composite is not working with Cygwin/X. Not all code
+in the Cygwin/X Server has been updated to support the Composite feature and
+using it will even crash the xserver. But as a second problem nearly all
+functions required for compositing are lacking acceleration in Cygwin/X so
+the feature would not be very useful if it would work. So it is disabled by
+default. 
+
+OpenGL with Cygwin/X
+====================
+
+The OpenGL support has lost some of it's limitations from the last release 
+and should be much more stable. But due to missing wide spread testing in 
+the community it is still available in a separate program. XWin still uses 
+the old software OpenGL which is known to be stable.
+
+The known problems with hardware accelerated OpenGL are:
+
+   o Only multiwindow mode is useful. In the other modes the OpenGL output 
+     does not align with the X11 windows.
+
+   o OpenGL extensions and functions from OpenGL 1.2 and later should work 
+     but are not completely tested.
+
+   o The standard Windows OpenGL driver will produce no output. Use the one 
+     from your video adapter vendor.  
+
+If you notice problems with some programs please send a message with the 
+logfile /tmp/XWin.log and a short error description to <cygwin-xfree@cygwin.com>
+
+The hardware accelerated OpenGL was tested using: 
+
+   o glxgears
+   o glxinfo
+   o blender
+   o tuxkart
+   o GLUT demos (some did fail)
+
diff --git a/xorg-server/hw/xwin/glx/.gitignore b/xorg-server/hw/xwin/glx/.gitignore
new file mode 100644
index 000000000..062fd8573
--- /dev/null
+++ b/xorg-server/hw/xwin/glx/.gitignore
@@ -0,0 +1,3 @@
+# ignore generated files
+generated_gl_wrappers.c
+generated_wgl_wrappers.c
diff --git a/xorg-server/hw/xwin/glx/winpriv.h b/xorg-server/hw/xwin/glx/winpriv.h
index 710525ccc..8cac86caf 100644
--- a/xorg-server/hw/xwin/glx/winpriv.h
+++ b/xorg-server/hw/xwin/glx/winpriv.h
@@ -1,13 +1,13 @@
-/*
- * Export window information for the Windows-OpenGL GLX implementation.
- *
- * Authors: Alexander Gottwald
- */
-
-#include <X11/Xwindows.h>
-#include <windowstr.h>
-
-#define WIN_GL_WINDOW_CLASS "XWinGLTest"
-
-HWND winGetWindowInfo(WindowPtr pWin);
-Bool winCheckScreenAiglxIsSupported(ScreenPtr pScreen);
+/*
+ * Export window information for the Windows-OpenGL GLX implementation.
+ *
+ * Authors: Alexander Gottwald
+ */
+
+#include <X11/Xwindows.h>
+#include <windowstr.h>
+
+#define WIN_GL_WINDOW_CLASS "XWinGLTest"
+
+HWND winGetWindowInfo(WindowPtr pWin);
+Bool winCheckScreenAiglxIsSupported(ScreenPtr pScreen);
diff --git a/xorg-server/hw/xwin/system.XWinrc b/xorg-server/hw/xwin/system.XWinrc
index f0771c610..267809145 100644
--- a/xorg-server/hw/xwin/system.XWinrc
+++ b/xorg-server/hw/xwin/system.XWinrc
@@ -1,128 +1,128 @@
-# XWin Server Resource File - EXAMPLE
-# Earle F. Philhower, III
-
-# Place in ~/.XWinrc or in /etc/X11/system.XWinrc
-
-# Keywords are case insensitive, comments legal pretty much anywhere
-# you can have an end-of-line
-
-# Comments begin with "#" or "//" and go to the end-of-line
-
-# Paths to commands are **cygwin** based (i.e. /usr/local/bin/xcalc)
-
-# Paths to icons are **WINDOWS** based (i.e. c:\windows\icons)
-
-# Menus are defined as...
-# MENU <name> {
-#	<Menu Text>	EXEC	<command>
-#                               ^^ This command will have any "%display%"
-#                                  string replaced with the proper display
-#                                  variable (i.e. 127.0.0.1:<display>.0)
-#                                  (This should only rarely be needed as
-#                                  the DISPLAY environment variable is also
-#                                  set correctly)
-#  or	<Menu Text>	MENU	<name-of-some-prior-defined-menu>
-#  or	<Menu Text>	ALWAYSONTOP
-#                         ^^ Sets the window to display above all others
-#  or   <Menu Text>	RELOAD
-#                         ^^ Causes ~/.XWinrc or the system.XWinrc file
-#                            to be reloaded and icons and menus regenerated
-#  or	SEPARATOR
-#       ...
-# }
-
-# Set the taskmar menu with
-# ROOTMENU <name-of-some-prior-defined-menu>
-
-# If you want a menu to be applied to all popup window's system menu
-# DEFAULTSYSMENU <name-of-some-prior-defined-menu> <atstart|atend>
-
-# To choose a specific menu for a specific WM_CLASS or WM_NAME use ...
-# SYSMENU {
-#	<class-or-name-of-window> <name-of-prior-defined-menu> <atstart|atend>
-#	...
-# }
-
-# When specifying an ICONFILE in the following commands several different
-# formats are allowed:
-# 1. Name of a regular Windows .ico format file
-#    (ex:  "cygwin.ico", "apple.ico")
-# 2. Name and index into a Windows .DLL
-#    (ex: "c:\windows\system32\shell32.dll,4" gives the default folder icon
-#         "c:\windows\system32\shell32.dll,5" gives the floppy drive icon)
-# 3. Index into XWin.EXE internal ICON resource
-#    (ex: ",101" is the 1st icon inside XWin.exe)
-
-# To define where ICO files live (** Windows path**)
-# ICONDIRECTORY	<windows-path i.e. c:\cygwin\usr\icons>
-# NOTE: If you specify a fully qualified path to an ICON below
-#             (i.e. "c:\xxx" or "d:\xxxx")
-#       this ICONDIRECTORY will not be prepended
-
-# To change the taskbar icon use...
-# TRAYICON       <name-of-windows-ico-file-in-icondirectory>
-
-# To define a replacement for the standard X icon for apps w/o specified icons
-# DEFAULTICON	<name-of-windows-ico-file-in-icondirectory>
-
-# To define substitute icons on a per-window basis use...
-# ICONS {
-#	<class-or-name-of-window> <icon-file-name.ico>
-#	...
-# }
-# In the case where multiple matches occur, the first listed in the ICONS
-# section will be chosen.
-
-# To disable exit confirmation dialog add the line containing SilentExit
-
-# DEBUG <string> prints out the string to the XWin.log file
-
-// Below are just some silly menus to demonstrate writing your
-// own configuration file.
-
-// Make some menus...
-menu apps {
-	xterm	exec	"xterm"
-	"Emacs"	exec	"emacs"
-	notepad	exec	notepad
-	xload	exec	"xload -display %display%"  # Comment
-}
-
-menu root {
-// Comments fit here, too...
-	"Reload .XWinrc"	RELOAD
-	"Applications"	menu	apps
-	SEParATOR
-}
-
-menu aot {
-	Separator
-	"Always on Top"	alwaysontop
-}
-
-menu xtermspecial {
-	"Emacs"		exec	"emacs"
-	"Always on Top"	alwaysontop
-	SepArAtor
-}
-
-RootMenu root
-
-DefaultSysMenu aot atend
-
-SysMenu {
-	"xterm"	xtermspecial atstart
-}
-
-# IconDirectory	"c:\winnt\"
-
-# DefaultIcon	"reinstall.ico"
-
-# Icons {
-# 	"xterm"	"uninstall.ico"
-# }
-
-SilentExit
-
-DEBUG "Done parsing the configuration file..."
-
+# XWin Server Resource File - EXAMPLE
+# Earle F. Philhower, III
+
+# Place in ~/.XWinrc or in /etc/X11/system.XWinrc
+
+# Keywords are case insensitive, comments legal pretty much anywhere
+# you can have an end-of-line
+
+# Comments begin with "#" or "//" and go to the end-of-line
+
+# Paths to commands are **cygwin** based (i.e. /usr/local/bin/xcalc)
+
+# Paths to icons are **WINDOWS** based (i.e. c:\windows\icons)
+
+# Menus are defined as...
+# MENU <name> {
+#	<Menu Text>	EXEC	<command>
+#                               ^^ This command will have any "%display%"
+#                                  string replaced with the proper display
+#                                  variable (i.e. 127.0.0.1:<display>.0)
+#                                  (This should only rarely be needed as
+#                                  the DISPLAY environment variable is also
+#                                  set correctly)
+#  or	<Menu Text>	MENU	<name-of-some-prior-defined-menu>
+#  or	<Menu Text>	ALWAYSONTOP
+#                         ^^ Sets the window to display above all others
+#  or   <Menu Text>	RELOAD
+#                         ^^ Causes ~/.XWinrc or the system.XWinrc file
+#                            to be reloaded and icons and menus regenerated
+#  or	SEPARATOR
+#       ...
+# }
+
+# Set the taskmar menu with
+# ROOTMENU <name-of-some-prior-defined-menu>
+
+# If you want a menu to be applied to all popup window's system menu
+# DEFAULTSYSMENU <name-of-some-prior-defined-menu> <atstart|atend>
+
+# To choose a specific menu for a specific WM_CLASS or WM_NAME use ...
+# SYSMENU {
+#	<class-or-name-of-window> <name-of-prior-defined-menu> <atstart|atend>
+#	...
+# }
+
+# When specifying an ICONFILE in the following commands several different
+# formats are allowed:
+# 1. Name of a regular Windows .ico format file
+#    (ex:  "cygwin.ico", "apple.ico")
+# 2. Name and index into a Windows .DLL
+#    (ex: "c:\windows\system32\shell32.dll,4" gives the default folder icon
+#         "c:\windows\system32\shell32.dll,5" gives the floppy drive icon)
+# 3. Index into XWin.EXE internal ICON resource
+#    (ex: ",101" is the 1st icon inside XWin.exe)
+
+# To define where ICO files live (** Windows path**)
+# ICONDIRECTORY	<windows-path i.e. c:\cygwin\usr\icons>
+# NOTE: If you specify a fully qualified path to an ICON below
+#             (i.e. "c:\xxx" or "d:\xxxx")
+#       this ICONDIRECTORY will not be prepended
+
+# To change the taskbar icon use...
+# TRAYICON       <name-of-windows-ico-file-in-icondirectory>
+
+# To define a replacement for the standard X icon for apps w/o specified icons
+# DEFAULTICON	<name-of-windows-ico-file-in-icondirectory>
+
+# To define substitute icons on a per-window basis use...
+# ICONS {
+#	<class-or-name-of-window> <icon-file-name.ico>
+#	...
+# }
+# In the case where multiple matches occur, the first listed in the ICONS
+# section will be chosen.
+
+# To disable exit confirmation dialog add the line containing SilentExit
+
+# DEBUG <string> prints out the string to the XWin.log file
+
+// Below are just some silly menus to demonstrate writing your
+// own configuration file.
+
+// Make some menus...
+menu apps {
+	xterm	exec	"xterm"
+	"Emacs"	exec	"emacs"
+	notepad	exec	notepad
+	xload	exec	"xload -display %display%"  # Comment
+}
+
+menu root {
+// Comments fit here, too...
+	"Reload .XWinrc"	RELOAD
+	"Applications"	menu	apps
+	SEParATOR
+}
+
+menu aot {
+	Separator
+	"Always on Top"	alwaysontop
+}
+
+menu xtermspecial {
+	"Emacs"		exec	"emacs"
+	"Always on Top"	alwaysontop
+	SepArAtor
+}
+
+RootMenu root
+
+DefaultSysMenu aot atend
+
+SysMenu {
+	"xterm"	xtermspecial atstart
+}
+
+# IconDirectory	"c:\winnt\"
+
+# DefaultIcon	"reinstall.ico"
+
+# Icons {
+# 	"xterm"	"uninstall.ico"
+# }
+
+SilentExit
+
+DEBUG "Done parsing the configuration file..."
+
diff --git a/xorg-server/hw/xwin/win.h b/xorg-server/hw/xwin/win.h
index 8c7df4cac..b49859ddc 100644
--- a/xorg-server/hw/xwin/win.h
+++ b/xorg-server/hw/xwin/win.h
@@ -236,7 +236,7 @@ typedef void (*winShadowUpdateProcPtr) (ScreenPtr, shadowBufPtr);
 
 typedef Bool (*winInitScreenProcPtr) (ScreenPtr);
 
-typedef Bool (*winCloseScreenProcPtr) (int, ScreenPtr);
+typedef Bool (*winCloseScreenProcPtr) (ScreenPtr);
 
 typedef Bool (*winInitVisualsProcPtr) (ScreenPtr);
 
@@ -745,8 +745,8 @@ void winSetAuthorization(void);
 
 void
 
-winBlockHandler(int nScreen,
-                pointer pBlockData, pointer pTimeout, pointer pReadMask);
+winBlockHandler(ScreenPtr pScreen,
+                pointer pTimeout, pointer pReadMask);
 
 #ifdef XWIN_NATIVEGDI
 /*
@@ -1039,7 +1039,7 @@ winPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable,
  */
 
 Bool
- winScreenInit(int index, ScreenPtr pScreen, int argc, char **argv);
+ winScreenInit(ScreenPtr pScreen, int argc, char **argv);
 
 Bool
  winFinishScreenInitFB(int index, ScreenPtr pScreen, int argc, char **argv);
@@ -1091,8 +1091,7 @@ Bool
 
 void
 
-winWakeupHandler(int nScreen,
-                 pointer pWakeupData,
+winWakeupHandler(ScreenPtr pScreen,
                  unsigned long ulResult, pointer pReadmask);
 
 /*
diff --git a/xorg-server/hw/xwin/winblock.c b/xorg-server/hw/xwin/winblock.c
index c18d080fa..c1a6e705a 100644
--- a/xorg-server/hw/xwin/winblock.c
+++ b/xorg-server/hw/xwin/winblock.c
@@ -36,11 +36,11 @@
 
 /* See Porting Layer Definition - p. 6 */
 void
-winBlockHandler(int nScreen,
-                pointer pBlockData, pointer pTimeout, pointer pReadMask)
+winBlockHandler(ScreenPtr pScreen,
+                pointer pTimeout, pointer pReadMask)
 {
 #if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
-    winScreenPriv((ScreenPtr) pBlockData);
+    winScreenPriv(pScreen);
 #endif
     MSG msg;
 
diff --git a/xorg-server/hw/xwin/winnativegdi.c b/xorg-server/hw/xwin/winnativegdi.c
index 88cc52976..3cd565313 100644
--- a/xorg-server/hw/xwin/winnativegdi.c
+++ b/xorg-server/hw/xwin/winnativegdi.c
@@ -44,7 +44,7 @@ static void
  winShadowUpdateNativeGDI(ScreenPtr pScreen, shadowBufPtr pBuf);
 
 static Bool
- winCloseScreenNativeGDI(int nIndex, ScreenPtr pScreen);
+ winCloseScreenNativeGDI(ScreenPtr pScreen);
 
 static Bool
  winInitVisualsNativeGDI(ScreenPtr pScreen);
@@ -104,7 +104,7 @@ winInitScreenNativeGDI(ScreenPtr pScreen)
  */
 
 static Bool
-winCloseScreenNativeGDI(int nIndex, ScreenPtr pScreen)
+winCloseScreenNativeGDI(ScreenPtr pScreen)
 {
     winScreenPriv(pScreen);
     winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
diff --git a/xorg-server/hw/xwin/winpfbdd.c b/xorg-server/hw/xwin/winpfbdd.c
index d9b095f3a..e2ed49af8 100644
--- a/xorg-server/hw/xwin/winpfbdd.c
+++ b/xorg-server/hw/xwin/winpfbdd.c
@@ -44,7 +44,7 @@ static Bool
  winAllocateFBPrimaryDD(ScreenPtr pScreen);
 
 static Bool
- winCloseScreenPrimaryDD(int nIndex, ScreenPtr pScreen);
+ winCloseScreenPrimaryDD(ScreenPtr pScreen);
 
 static Bool
  winInitVisualsPrimaryDD(ScreenPtr pScreen);
@@ -264,7 +264,7 @@ winInitScreenPrimaryDD(ScreenPtr pScreen)
  */
 
 static Bool
-winCloseScreenPrimaryDD(int nIndex, ScreenPtr pScreen)
+winCloseScreenPrimaryDD(ScreenPtr pScreen)
 {
     winScreenPriv(pScreen);
     winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
@@ -279,7 +279,7 @@ winCloseScreenPrimaryDD(int nIndex, ScreenPtr pScreen)
     /* Call the wrapped CloseScreen procedure */
     WIN_UNWRAP(CloseScreen);
     if (pScreen->CloseScreen)
-        fReturn = (*pScreen->CloseScreen) (nIndex, pScreen);
+        fReturn = (*pScreen->CloseScreen) (pScreen);
 
     /* Delete the window property */
     RemoveProp(pScreenPriv->hwndScreen, WIN_SCR_PROP);
diff --git a/xorg-server/hw/xwin/winprefsyacc.y b/xorg-server/hw/xwin/winprefsyacc.y
index d28fbeb8f..b9e961622 100644
--- a/xorg-server/hw/xwin/winprefsyacc.y
+++ b/xorg-server/hw/xwin/winprefsyacc.y
@@ -1,460 +1,460 @@
-%{
-/*
- * Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
- * Copyright (C) Colin Harrison 2005-2008
- *
- * 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 XFREE86 PROJECT 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 XFree86 Project
- * 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 XFree86 Project.
- *
- * Authors:     Earle F. Philhower, III
- *              Colin Harrison
- */
-/* $XFree86: $ */
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "winprefs.h"
-#include "winmsg.h"
-
-/* The following give better error messages in bison at the cost of a few KB */
-#define YYERROR_VERBOSE 1
-
-/* YYLTYPE_IS_TRIVIAL and YYENABLE_NLS defined to suppress warnings */
-#define YYLTYPE_IS_TRIVIAL 1
-#define YYENABLE_NLS 0
-
-/* The global pref settings */
-WINPREFS pref;
-
-/* The working menu */  
-static MENUPARSED menu;
-
-/* Functions for parsing the tokens into out structure */
-/* Defined at the end section of this file */
-
-static void SetIconDirectory (char *path);
-static void SetDefaultIcon (char *fname);
-static void SetRootMenu (char *menu);
-static void SetDefaultSysMenu (char *menu, int pos);
-static void SetTrayIcon (char *fname);
-
-static void OpenMenu(char *menuname);
-static void AddMenuLine(char *name, MENUCOMMANDTYPE cmd, char *param);
-static void CloseMenu(void);
-
-static void OpenIcons(void);
-static void AddIconLine(char *matchstr, char *iconfile);
-static void CloseIcons(void);
-
-static void OpenStyles(void);
-static void AddStyleLine(char *matchstr, unsigned long style);
-static void CloseStyles(void);
-
-static void OpenSysMenu(void);
-static void AddSysMenuLine(char *matchstr, char *menuname, int pos);
-static void CloseSysMenu(void);
-
-static int yyerror (char *s);
-
-extern char *yytext;
-extern int yylex(void);
-
-#define YYMALLOC malloc
-#define YYFREE   free
-
-%}
-
-%union {
-  char *sVal;
-  unsigned long uVal;
-  int iVal;
-}
-
-%token NEWLINE
-%token MENU
-%token LB
-%token RB
-%token ICONDIRECTORY
-%token DEFAULTICON
-%token ICONS
-%token STYLES
-%token TOPMOST
-%token MAXIMIZE
-%token MINIMIZE
-%token BOTTOM
-%token NOTITLE
-%token OUTLINE
-%token NOFRAME
-%token DEFAULTSYSMENU
-%token SYSMENU
-%token ROOTMENU
-%token SEPARATOR
-%token ATSTART
-%token ATEND
-%token EXEC
-%token ALWAYSONTOP
-%token DEBUGOUTPUT "DEBUG"
-%token RELOAD
-%token TRAYICON
-%token FORCEEXIT
-%token SILENTEXIT
-
-%token <sVal> STRING
-%type <uVal>  group1
-%type <uVal>  group2
-%type <uVal>  stylecombo
-%type <iVal>  atspot
-
-%%
-
-input:	/* empty */
-	| input line
-	;
-
-line:	NEWLINE
-	| command
-	;
-
-
-newline_or_nada:	
-	| NEWLINE newline_or_nada
-	;
-
-command:	defaulticon
-	| icondirectory
-	| menu
-	| icons
-	| styles
-	| sysmenu
-	| rootmenu
-	| defaultsysmenu
-	| debug
-	| trayicon
-	| forceexit
-	| silentexit
-	;
-
-trayicon:	TRAYICON STRING NEWLINE { SetTrayIcon($2); free($2); }
-	;
-
-rootmenu:	ROOTMENU STRING NEWLINE { SetRootMenu($2); free($2); }
-	;
-
-defaultsysmenu:	DEFAULTSYSMENU STRING atspot NEWLINE { SetDefaultSysMenu($2, $3); free($2); }
-	;
-
-defaulticon:	DEFAULTICON STRING NEWLINE { SetDefaultIcon($2); free($2); }
-	;
-
-icondirectory:	ICONDIRECTORY STRING NEWLINE { SetIconDirectory($2); free($2); }
-	;
-
-menuline:	SEPARATOR NEWLINE newline_or_nada  { AddMenuLine("-", CMD_SEPARATOR, ""); }
-	| STRING ALWAYSONTOP NEWLINE newline_or_nada  { AddMenuLine($1, CMD_ALWAYSONTOP, ""); free($1); }
-	| STRING EXEC STRING NEWLINE newline_or_nada  { AddMenuLine($1, CMD_EXEC, $3); free($1); free($3); }
-	| STRING MENU STRING NEWLINE newline_or_nada  { AddMenuLine($1, CMD_MENU, $3); free($1); free($3); }
-	| STRING RELOAD NEWLINE newline_or_nada  { AddMenuLine($1, CMD_RELOAD, ""); free($1); }
-	;
-
-menulist:	menuline
-	| menuline menulist
-	;
-
-menu:	MENU STRING LB { OpenMenu($2); free($2); } newline_or_nada menulist RB {CloseMenu();}
-	;
-
-iconline:	STRING STRING NEWLINE newline_or_nada { AddIconLine($1, $2); free($1); free($2); }
-	;
-
-iconlist:	iconline
-	| iconline iconlist
-	;
-
-icons:	ICONS LB {OpenIcons();} newline_or_nada iconlist RB {CloseIcons();}
-	;
-
-group1:	TOPMOST { $$=STYLE_TOPMOST; }
-	| MAXIMIZE { $$=STYLE_MAXIMIZE; }
-	| MINIMIZE { $$=STYLE_MINIMIZE; }
-	| BOTTOM { $$=STYLE_BOTTOM; }
-	;
-
-group2:	NOTITLE { $$=STYLE_NOTITLE; }
-	| OUTLINE { $$=STYLE_OUTLINE; }
-	| NOFRAME { $$=STYLE_NOFRAME; }
-	;
-
-stylecombo:	group1 { $$=$1; }
-	| group2 { $$=$1; }
-	| group1 group2 { $$=$1|$2; }
-	| group2 group1 { $$=$1|$2; }
-	;
-
-styleline:	STRING stylecombo NEWLINE newline_or_nada { AddStyleLine($1, $2); free($1); }
-	;
-
-stylelist:	styleline
-	| styleline stylelist
-	;
-
-styles:	STYLES LB {OpenStyles();} newline_or_nada stylelist RB {CloseStyles();}
-	;
-
-atspot:	{ $$=AT_END; }
-	| ATSTART { $$=AT_START; }
-	| ATEND { $$=AT_END; }
-	;
-
-sysmenuline:	STRING STRING atspot NEWLINE newline_or_nada { AddSysMenuLine($1, $2, $3); free($1); free($2); }
-	;
-
-sysmenulist:	sysmenuline
-	| sysmenuline sysmenulist
-	;
-
-sysmenu:	SYSMENU LB NEWLINE {OpenSysMenu();} newline_or_nada sysmenulist RB {CloseSysMenu();}
-	;
-
-forceexit:	FORCEEXIT NEWLINE { pref.fForceExit = TRUE; }
-	;
-
-silentexit:	SILENTEXIT NEWLINE { pref.fSilentExit = TRUE; }
-	;
-
-debug: 	DEBUGOUTPUT STRING NEWLINE { winDebug("LoadPreferences: %s\n", $2); free($2); }
-	;
-
-
-%%
-/*
- * Errors in parsing abort and print log messages
- */
-static int
-yyerror (char *s) 
-{
-  extern int yylineno; /* Handled by flex internally */
-
-  ErrorF("LoadPreferences: %s line %d\n", s, yylineno);
-  return 1;
-}
-
-/* Miscellaneous functions to store TOKENs into the structure */
-static void
-SetIconDirectory (char *path)
-{
-  strncpy (pref.iconDirectory, path, PATH_MAX);
-  pref.iconDirectory[PATH_MAX] = 0;
-}
-
-static void
-SetDefaultIcon (char *fname)
-{
-  strncpy (pref.defaultIconName, fname, NAME_MAX);
-  pref.defaultIconName[NAME_MAX] = 0;
-}
-
-static void
-SetTrayIcon (char *fname)
-{
-  strncpy (pref.trayIconName, fname, NAME_MAX);
-  pref.trayIconName[NAME_MAX] = 0;
-}
-
-static void
-SetRootMenu (char *menu)
-{
-  strncpy (pref.rootMenuName, menu, MENU_MAX);
-  pref.rootMenuName[MENU_MAX] = 0;
-}
-
-static void
-SetDefaultSysMenu (char *menu, int pos)
-{
-  strncpy (pref.defaultSysMenuName, menu, MENU_MAX);
-  pref.defaultSysMenuName[MENU_MAX] = 0;
-  pref.defaultSysMenuPos = pos;
-}
-
-static void
-OpenMenu (char *menuname)
-{
-  if (menu.menuItem) free(menu.menuItem);
-  menu.menuItem = NULL;
-  strncpy(menu.menuName, menuname, MENU_MAX);
-  menu.menuName[MENU_MAX] = 0;
-  menu.menuItems = 0;
-}
-
-static void
-AddMenuLine (char *text, MENUCOMMANDTYPE cmd, char *param)
-{
-  if (menu.menuItem==NULL)
-    menu.menuItem = (MENUITEM*)malloc(sizeof(MENUITEM));
-  else
-    menu.menuItem = (MENUITEM*)
-      realloc(menu.menuItem, sizeof(MENUITEM)*(menu.menuItems+1));
-
-  strncpy (menu.menuItem[menu.menuItems].text, text, MENU_MAX);
-  menu.menuItem[menu.menuItems].text[MENU_MAX] = 0;
-
-  menu.menuItem[menu.menuItems].cmd = cmd;
-
-  strncpy(menu.menuItem[menu.menuItems].param, param, PARAM_MAX);
-  menu.menuItem[menu.menuItems].param[PARAM_MAX] = 0;
-
-  menu.menuItem[menu.menuItems].commandID = 0;
-
-  menu.menuItems++;
-}
-
-static void
-CloseMenu (void)
-{
-  if (menu.menuItem==NULL || menu.menuItems==0)
-    {
-      ErrorF("LoadPreferences: Empty menu detected\n");
-      return;
-    }
-  
-  if (pref.menuItems)
-    pref.menu = (MENUPARSED*)
-      realloc (pref.menu, (pref.menuItems+1)*sizeof(MENUPARSED));
-  else
-    pref.menu = (MENUPARSED*)malloc (sizeof(MENUPARSED));
-  
-  memcpy (pref.menu+pref.menuItems, &menu, sizeof(MENUPARSED));
-  pref.menuItems++;
-
-  memset (&menu, 0, sizeof(MENUPARSED));
-}
-
-static void 
-OpenIcons (void)
-{
-  if (pref.icon != NULL) {
-    winDebug("LoadPreferences: Redefining icon mappings\n");
-    free(pref.icon);
-    pref.icon = NULL;
-  }
-  pref.iconItems = 0;
-}
-
-static void
-AddIconLine (char *matchstr, char *iconfile)
-{
-  if (pref.icon==NULL)
-    pref.icon = (ICONITEM*)malloc(sizeof(ICONITEM));
-  else
-    pref.icon = (ICONITEM*)
-      realloc(pref.icon, sizeof(ICONITEM)*(pref.iconItems+1));
-
-  strncpy(pref.icon[pref.iconItems].match, matchstr, MENU_MAX);
-  pref.icon[pref.iconItems].match[MENU_MAX] = 0;
-
-  strncpy(pref.icon[pref.iconItems].iconFile, iconfile, PATH_MAX+NAME_MAX+1);
-  pref.icon[pref.iconItems].iconFile[PATH_MAX+NAME_MAX+1] = 0;
-
-  pref.icon[pref.iconItems].hicon = 0;
-
-  pref.iconItems++;
-}
-
-static void 
-CloseIcons (void)
-{
-}
-
-static void
-OpenStyles (void)
-{
-  if (pref.style != NULL) {
-    winDebug("LoadPreferences: Redefining window style\n");
-    free(pref.style);
-    pref.style = NULL;
-  }
-  pref.styleItems = 0;
-}
-
-static void
-AddStyleLine (char *matchstr, unsigned long style)
-{
-  if (pref.style==NULL)
-    pref.style = (STYLEITEM*)malloc(sizeof(STYLEITEM));
-  else
-    pref.style = (STYLEITEM*)
-      realloc(pref.style, sizeof(STYLEITEM)*(pref.styleItems+1));
-
-  strncpy(pref.style[pref.styleItems].match, matchstr, MENU_MAX);
-  pref.style[pref.styleItems].match[MENU_MAX] = 0;
-
-  pref.style[pref.styleItems].type = style;
-
-  pref.styleItems++;
-}
-
-static void
-CloseStyles (void)
-{
-}
-
-static void
-OpenSysMenu (void)
-{
-  if (pref.sysMenu != NULL) {
-    winDebug("LoadPreferences: Redefining system menu\n");
-    free(pref.sysMenu);
-    pref.sysMenu = NULL;
-  }
-  pref.sysMenuItems = 0;
-}
-
-static void
-AddSysMenuLine (char *matchstr, char *menuname, int pos)
-{
-  if (pref.sysMenu==NULL)
-    pref.sysMenu = (SYSMENUITEM*)malloc(sizeof(SYSMENUITEM));
-  else
-    pref.sysMenu = (SYSMENUITEM*)
-      realloc(pref.sysMenu, sizeof(SYSMENUITEM)*(pref.sysMenuItems+1));
-
-  strncpy (pref.sysMenu[pref.sysMenuItems].match, matchstr, MENU_MAX);
-  pref.sysMenu[pref.sysMenuItems].match[MENU_MAX] = 0;
-
-  strncpy (pref.sysMenu[pref.sysMenuItems].menuName, menuname, MENU_MAX);
-  pref.sysMenu[pref.sysMenuItems].menuName[MENU_MAX] = 0;
-
-  pref.sysMenu[pref.sysMenuItems].menuPos = pos;
-
-  pref.sysMenuItems++;
-}
-
-static void
-CloseSysMenu (void)
-{
-}
-
+%{
+/*
+ * Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
+ * Copyright (C) Colin Harrison 2005-2008
+ *
+ * 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 XFREE86 PROJECT 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 XFree86 Project
+ * 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 XFree86 Project.
+ *
+ * Authors:     Earle F. Philhower, III
+ *              Colin Harrison
+ */
+/* $XFree86: $ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "winprefs.h"
+#include "winmsg.h"
+
+/* The following give better error messages in bison at the cost of a few KB */
+#define YYERROR_VERBOSE 1
+
+/* YYLTYPE_IS_TRIVIAL and YYENABLE_NLS defined to suppress warnings */
+#define YYLTYPE_IS_TRIVIAL 1
+#define YYENABLE_NLS 0
+
+/* The global pref settings */
+WINPREFS pref;
+
+/* The working menu */  
+static MENUPARSED menu;
+
+/* Functions for parsing the tokens into out structure */
+/* Defined at the end section of this file */
+
+static void SetIconDirectory (char *path);
+static void SetDefaultIcon (char *fname);
+static void SetRootMenu (char *menu);
+static void SetDefaultSysMenu (char *menu, int pos);
+static void SetTrayIcon (char *fname);
+
+static void OpenMenu(char *menuname);
+static void AddMenuLine(char *name, MENUCOMMANDTYPE cmd, char *param);
+static void CloseMenu(void);
+
+static void OpenIcons(void);
+static void AddIconLine(char *matchstr, char *iconfile);
+static void CloseIcons(void);
+
+static void OpenStyles(void);
+static void AddStyleLine(char *matchstr, unsigned long style);
+static void CloseStyles(void);
+
+static void OpenSysMenu(void);
+static void AddSysMenuLine(char *matchstr, char *menuname, int pos);
+static void CloseSysMenu(void);
+
+static int yyerror (char *s);
+
+extern char *yytext;
+extern int yylex(void);
+
+#define YYMALLOC malloc
+#define YYFREE   free
+
+%}
+
+%union {
+  char *sVal;
+  unsigned long uVal;
+  int iVal;
+}
+
+%token NEWLINE
+%token MENU
+%token LB
+%token RB
+%token ICONDIRECTORY
+%token DEFAULTICON
+%token ICONS
+%token STYLES
+%token TOPMOST
+%token MAXIMIZE
+%token MINIMIZE
+%token BOTTOM
+%token NOTITLE
+%token OUTLINE
+%token NOFRAME
+%token DEFAULTSYSMENU
+%token SYSMENU
+%token ROOTMENU
+%token SEPARATOR
+%token ATSTART
+%token ATEND
+%token EXEC
+%token ALWAYSONTOP
+%token DEBUGOUTPUT "DEBUG"
+%token RELOAD
+%token TRAYICON
+%token FORCEEXIT
+%token SILENTEXIT
+
+%token <sVal> STRING
+%type <uVal>  group1
+%type <uVal>  group2
+%type <uVal>  stylecombo
+%type <iVal>  atspot
+
+%%
+
+input:	/* empty */
+	| input line
+	;
+
+line:	NEWLINE
+	| command
+	;
+
+
+newline_or_nada:	
+	| NEWLINE newline_or_nada
+	;
+
+command:	defaulticon
+	| icondirectory
+	| menu
+	| icons
+	| styles
+	| sysmenu
+	| rootmenu
+	| defaultsysmenu
+	| debug
+	| trayicon
+	| forceexit
+	| silentexit
+	;
+
+trayicon:	TRAYICON STRING NEWLINE { SetTrayIcon($2); free($2); }
+	;
+
+rootmenu:	ROOTMENU STRING NEWLINE { SetRootMenu($2); free($2); }
+	;
+
+defaultsysmenu:	DEFAULTSYSMENU STRING atspot NEWLINE { SetDefaultSysMenu($2, $3); free($2); }
+	;
+
+defaulticon:	DEFAULTICON STRING NEWLINE { SetDefaultIcon($2); free($2); }
+	;
+
+icondirectory:	ICONDIRECTORY STRING NEWLINE { SetIconDirectory($2); free($2); }
+	;
+
+menuline:	SEPARATOR NEWLINE newline_or_nada  { AddMenuLine("-", CMD_SEPARATOR, ""); }
+	| STRING ALWAYSONTOP NEWLINE newline_or_nada  { AddMenuLine($1, CMD_ALWAYSONTOP, ""); free($1); }
+	| STRING EXEC STRING NEWLINE newline_or_nada  { AddMenuLine($1, CMD_EXEC, $3); free($1); free($3); }
+	| STRING MENU STRING NEWLINE newline_or_nada  { AddMenuLine($1, CMD_MENU, $3); free($1); free($3); }
+	| STRING RELOAD NEWLINE newline_or_nada  { AddMenuLine($1, CMD_RELOAD, ""); free($1); }
+	;
+
+menulist:	menuline
+	| menuline menulist
+	;
+
+menu:	MENU STRING LB { OpenMenu($2); free($2); } newline_or_nada menulist RB {CloseMenu();}
+	;
+
+iconline:	STRING STRING NEWLINE newline_or_nada { AddIconLine($1, $2); free($1); free($2); }
+	;
+
+iconlist:	iconline
+	| iconline iconlist
+	;
+
+icons:	ICONS LB {OpenIcons();} newline_or_nada iconlist RB {CloseIcons();}
+	;
+
+group1:	TOPMOST { $$=STYLE_TOPMOST; }
+	| MAXIMIZE { $$=STYLE_MAXIMIZE; }
+	| MINIMIZE { $$=STYLE_MINIMIZE; }
+	| BOTTOM { $$=STYLE_BOTTOM; }
+	;
+
+group2:	NOTITLE { $$=STYLE_NOTITLE; }
+	| OUTLINE { $$=STYLE_OUTLINE; }
+	| NOFRAME { $$=STYLE_NOFRAME; }
+	;
+
+stylecombo:	group1 { $$=$1; }
+	| group2 { $$=$1; }
+	| group1 group2 { $$=$1|$2; }
+	| group2 group1 { $$=$1|$2; }
+	;
+
+styleline:	STRING stylecombo NEWLINE newline_or_nada { AddStyleLine($1, $2); free($1); }
+	;
+
+stylelist:	styleline
+	| styleline stylelist
+	;
+
+styles:	STYLES LB {OpenStyles();} newline_or_nada stylelist RB {CloseStyles();}
+	;
+
+atspot:	{ $$=AT_END; }
+	| ATSTART { $$=AT_START; }
+	| ATEND { $$=AT_END; }
+	;
+
+sysmenuline:	STRING STRING atspot NEWLINE newline_or_nada { AddSysMenuLine($1, $2, $3); free($1); free($2); }
+	;
+
+sysmenulist:	sysmenuline
+	| sysmenuline sysmenulist
+	;
+
+sysmenu:	SYSMENU LB NEWLINE {OpenSysMenu();} newline_or_nada sysmenulist RB {CloseSysMenu();}
+	;
+
+forceexit:	FORCEEXIT NEWLINE { pref.fForceExit = TRUE; }
+	;
+
+silentexit:	SILENTEXIT NEWLINE { pref.fSilentExit = TRUE; }
+	;
+
+debug: 	DEBUGOUTPUT STRING NEWLINE { winDebug("LoadPreferences: %s\n", $2); free($2); }
+	;
+
+
+%%
+/*
+ * Errors in parsing abort and print log messages
+ */
+static int
+yyerror (char *s) 
+{
+  extern int yylineno; /* Handled by flex internally */
+
+  ErrorF("LoadPreferences: %s line %d\n", s, yylineno);
+  return 1;
+}
+
+/* Miscellaneous functions to store TOKENs into the structure */
+static void
+SetIconDirectory (char *path)
+{
+  strncpy (pref.iconDirectory, path, PATH_MAX);
+  pref.iconDirectory[PATH_MAX] = 0;
+}
+
+static void
+SetDefaultIcon (char *fname)
+{
+  strncpy (pref.defaultIconName, fname, NAME_MAX);
+  pref.defaultIconName[NAME_MAX] = 0;
+}
+
+static void
+SetTrayIcon (char *fname)
+{
+  strncpy (pref.trayIconName, fname, NAME_MAX);
+  pref.trayIconName[NAME_MAX] = 0;
+}
+
+static void
+SetRootMenu (char *menu)
+{
+  strncpy (pref.rootMenuName, menu, MENU_MAX);
+  pref.rootMenuName[MENU_MAX] = 0;
+}
+
+static void
+SetDefaultSysMenu (char *menu, int pos)
+{
+  strncpy (pref.defaultSysMenuName, menu, MENU_MAX);
+  pref.defaultSysMenuName[MENU_MAX] = 0;
+  pref.defaultSysMenuPos = pos;
+}
+
+static void
+OpenMenu (char *menuname)
+{
+  if (menu.menuItem) free(menu.menuItem);
+  menu.menuItem = NULL;
+  strncpy(menu.menuName, menuname, MENU_MAX);
+  menu.menuName[MENU_MAX] = 0;
+  menu.menuItems = 0;
+}
+
+static void
+AddMenuLine (char *text, MENUCOMMANDTYPE cmd, char *param)
+{
+  if (menu.menuItem==NULL)
+    menu.menuItem = (MENUITEM*)malloc(sizeof(MENUITEM));
+  else
+    menu.menuItem = (MENUITEM*)
+      realloc(menu.menuItem, sizeof(MENUITEM)*(menu.menuItems+1));
+
+  strncpy (menu.menuItem[menu.menuItems].text, text, MENU_MAX);
+  menu.menuItem[menu.menuItems].text[MENU_MAX] = 0;
+
+  menu.menuItem[menu.menuItems].cmd = cmd;
+
+  strncpy(menu.menuItem[menu.menuItems].param, param, PARAM_MAX);
+  menu.menuItem[menu.menuItems].param[PARAM_MAX] = 0;
+
+  menu.menuItem[menu.menuItems].commandID = 0;
+
+  menu.menuItems++;
+}
+
+static void
+CloseMenu (void)
+{
+  if (menu.menuItem==NULL || menu.menuItems==0)
+    {
+      ErrorF("LoadPreferences: Empty menu detected\n");
+      return;
+    }
+  
+  if (pref.menuItems)
+    pref.menu = (MENUPARSED*)
+      realloc (pref.menu, (pref.menuItems+1)*sizeof(MENUPARSED));
+  else
+    pref.menu = (MENUPARSED*)malloc (sizeof(MENUPARSED));
+  
+  memcpy (pref.menu+pref.menuItems, &menu, sizeof(MENUPARSED));
+  pref.menuItems++;
+
+  memset (&menu, 0, sizeof(MENUPARSED));
+}
+
+static void 
+OpenIcons (void)
+{
+  if (pref.icon != NULL) {
+    winDebug("LoadPreferences: Redefining icon mappings\n");
+    free(pref.icon);
+    pref.icon = NULL;
+  }
+  pref.iconItems = 0;
+}
+
+static void
+AddIconLine (char *matchstr, char *iconfile)
+{
+  if (pref.icon==NULL)
+    pref.icon = (ICONITEM*)malloc(sizeof(ICONITEM));
+  else
+    pref.icon = (ICONITEM*)
+      realloc(pref.icon, sizeof(ICONITEM)*(pref.iconItems+1));
+
+  strncpy(pref.icon[pref.iconItems].match, matchstr, MENU_MAX);
+  pref.icon[pref.iconItems].match[MENU_MAX] = 0;
+
+  strncpy(pref.icon[pref.iconItems].iconFile, iconfile, PATH_MAX+NAME_MAX+1);
+  pref.icon[pref.iconItems].iconFile[PATH_MAX+NAME_MAX+1] = 0;
+
+  pref.icon[pref.iconItems].hicon = 0;
+
+  pref.iconItems++;
+}
+
+static void 
+CloseIcons (void)
+{
+}
+
+static void
+OpenStyles (void)
+{
+  if (pref.style != NULL) {
+    winDebug("LoadPreferences: Redefining window style\n");
+    free(pref.style);
+    pref.style = NULL;
+  }
+  pref.styleItems = 0;
+}
+
+static void
+AddStyleLine (char *matchstr, unsigned long style)
+{
+  if (pref.style==NULL)
+    pref.style = (STYLEITEM*)malloc(sizeof(STYLEITEM));
+  else
+    pref.style = (STYLEITEM*)
+      realloc(pref.style, sizeof(STYLEITEM)*(pref.styleItems+1));
+
+  strncpy(pref.style[pref.styleItems].match, matchstr, MENU_MAX);
+  pref.style[pref.styleItems].match[MENU_MAX] = 0;
+
+  pref.style[pref.styleItems].type = style;
+
+  pref.styleItems++;
+}
+
+static void
+CloseStyles (void)
+{
+}
+
+static void
+OpenSysMenu (void)
+{
+  if (pref.sysMenu != NULL) {
+    winDebug("LoadPreferences: Redefining system menu\n");
+    free(pref.sysMenu);
+    pref.sysMenu = NULL;
+  }
+  pref.sysMenuItems = 0;
+}
+
+static void
+AddSysMenuLine (char *matchstr, char *menuname, int pos)
+{
+  if (pref.sysMenu==NULL)
+    pref.sysMenu = (SYSMENUITEM*)malloc(sizeof(SYSMENUITEM));
+  else
+    pref.sysMenu = (SYSMENUITEM*)
+      realloc(pref.sysMenu, sizeof(SYSMENUITEM)*(pref.sysMenuItems+1));
+
+  strncpy (pref.sysMenu[pref.sysMenuItems].match, matchstr, MENU_MAX);
+  pref.sysMenu[pref.sysMenuItems].match[MENU_MAX] = 0;
+
+  strncpy (pref.sysMenu[pref.sysMenuItems].menuName, menuname, MENU_MAX);
+  pref.sysMenu[pref.sysMenuItems].menuName[MENU_MAX] = 0;
+
+  pref.sysMenu[pref.sysMenuItems].menuPos = pos;
+
+  pref.sysMenuItems++;
+}
+
+static void
+CloseSysMenu (void)
+{
+}
+
diff --git a/xorg-server/hw/xwin/winscrinit.c b/xorg-server/hw/xwin/winscrinit.c
index 2b699a84e..d789e563f 100644
--- a/xorg-server/hw/xwin/winscrinit.c
+++ b/xorg-server/hw/xwin/winscrinit.c
@@ -81,9 +81,9 @@ static Bool
  */
 
 Bool
-winScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
+winScreenInit(ScreenPtr pScreen, int argc, char **argv)
 {
-    winScreenInfoPtr pScreenInfo = &g_ScreenInfo[index];
+    winScreenInfoPtr pScreenInfo = &g_ScreenInfo[pScreen->myNum];
     winPrivScreenPtr pScreenPriv;
     HDC hdc;
     DWORD dwInitialBPP;
@@ -200,11 +200,11 @@ winScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
     miClearVisualTypes();
 
     /* Call the engine dependent screen initialization procedure */
-    if (pScreenPriv->pwinFinishScreenInit && !((*pScreenPriv->pwinFinishScreenInit) (index, pScreen, argc, argv))) {
+    if (pScreenPriv->pwinFinishScreenInit && !((*pScreenPriv->pwinFinishScreenInit) (pScreen->myNum, pScreen, argc, argv))) {
         ErrorF("winScreenInit - winFinishScreenInit () failed\n");
 
         /* call the engine dependent screen close procedure to clean up from a failure */
-        pScreenPriv->pwinCloseScreen(index, pScreen);
+        pScreenPriv->pwinCloseScreen(pScreen);
 
         return FALSE;
     }
@@ -224,7 +224,7 @@ winScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
     pScreen->y = pScreenInfo->dwInitialY - GetSystemMetrics(SM_YVIRTUALSCREEN);
 
     winDebug("Screen %d added at virtual desktop coordinate (%d,%d).\n",
-           index, pScreen->x, pScreen->y);
+           pScreen->myNum, pScreen->x, pScreen->y);
     winDebug("winScreenInit - returning\n");
 
     return TRUE;
@@ -352,8 +352,6 @@ winFinishScreenInitFB(int index, ScreenPtr pScreen, int argc, char **argv)
      */
     pScreen->BlockHandler = winBlockHandler;
     pScreen->WakeupHandler = winWakeupHandler;
-    pScreen->blockData = pScreen;
-    pScreen->wakeupData = pScreen;
 
     /* Render extension initialization, calls miPictureInit */
     if (!fbPictureInit(pScreen, NULL, 0)) {
@@ -623,8 +621,6 @@ winFinishScreenInitNativeGDI(int index,
      */
     pScreen->BlockHandler = winBlockHandler;
     pScreen->WakeupHandler = winWakeupHandler;
-    pScreen->blockData = pScreen;
-    pScreen->wakeupData = pScreen;
 
     /* Place our save screen function */
     pScreen->SaveScreen = winSaveScreen;
diff --git a/xorg-server/hw/xwin/winshaddd.c b/xorg-server/hw/xwin/winshaddd.c
index 4b0eba1cb..f6ba49a8a 100644
--- a/xorg-server/hw/xwin/winshaddd.c
+++ b/xorg-server/hw/xwin/winshaddd.c
@@ -49,7 +49,7 @@ static void
  winShadowUpdateDD(ScreenPtr pScreen, shadowBufPtr pBuf);
 
 static Bool
- winCloseScreenShadowDD(int nIndex, ScreenPtr pScreen);
+ winCloseScreenShadowDD(ScreenPtr pScreen);
 
 static Bool
  winInitVisualsShadowDD(ScreenPtr pScreen);
@@ -613,7 +613,7 @@ winInitScreenShadowDD(ScreenPtr pScreen)
  */
 
 static Bool
-winCloseScreenShadowDD(int nIndex, ScreenPtr pScreen)
+winCloseScreenShadowDD(ScreenPtr pScreen)
 {
     winScreenPriv(pScreen);
     winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
@@ -628,7 +628,7 @@ winCloseScreenShadowDD(int nIndex, ScreenPtr pScreen)
     /* Call the wrapped CloseScreen procedure */
     WIN_UNWRAP(CloseScreen);
     if (pScreen->CloseScreen)
-        fReturn = (*pScreen->CloseScreen) (nIndex, pScreen);
+        fReturn = (*pScreen->CloseScreen) (pScreen);
 
     winFreeFBShadowDD(pScreen);
 
diff --git a/xorg-server/hw/xwin/winshadddnl.c b/xorg-server/hw/xwin/winshadddnl.c
index 17fe23e5a..2a28d8717 100644
--- a/xorg-server/hw/xwin/winshadddnl.c
+++ b/xorg-server/hw/xwin/winshadddnl.c
@@ -69,7 +69,7 @@ static void
  winShadowUpdateDDNL(ScreenPtr pScreen, shadowBufPtr pBuf);
 
 static Bool
- winCloseScreenShadowDDNL(int nIndex, ScreenPtr pScreen);
+ winCloseScreenShadowDDNL(ScreenPtr pScreen);
 
 static Bool
  winInitVisualsShadowDDNL(ScreenPtr pScreen);
@@ -766,7 +766,7 @@ winInitScreenShadowDDNL(ScreenPtr pScreen)
  */
 
 static Bool
-winCloseScreenShadowDDNL(int nIndex, ScreenPtr pScreen)
+winCloseScreenShadowDDNL(ScreenPtr pScreen)
 {
     winScreenPriv(pScreen);
     winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
@@ -781,7 +781,7 @@ winCloseScreenShadowDDNL(int nIndex, ScreenPtr pScreen)
     /* Call the wrapped CloseScreen procedure */
     WIN_UNWRAP(CloseScreen);
     if (pScreen->CloseScreen)
-        fReturn = (*pScreen->CloseScreen) (nIndex, pScreen);
+        fReturn = (*pScreen->CloseScreen) (pScreen);
 
     winFreeFBShadowDDNL(pScreen);
 
diff --git a/xorg-server/hw/xwin/winshadgdi.c b/xorg-server/hw/xwin/winshadgdi.c
index c4d1da8d0..2e5714bf0 100644
--- a/xorg-server/hw/xwin/winshadgdi.c
+++ b/xorg-server/hw/xwin/winshadgdi.c
@@ -50,7 +50,7 @@ static void
  winShadowUpdateGDI(ScreenPtr pScreen, shadowBufPtr pBuf);
 
 static Bool
- winCloseScreenShadowGDI(int nIndex, ScreenPtr pScreen);
+ winCloseScreenShadowGDI(ScreenPtr pScreen);
 
 static Bool
  winInitVisualsShadowGDI(ScreenPtr pScreen);
@@ -565,7 +565,7 @@ winInitScreenShadowGDI(ScreenPtr pScreen)
  */
 
 static Bool
-winCloseScreenShadowGDI(int nIndex, ScreenPtr pScreen)
+winCloseScreenShadowGDI(ScreenPtr pScreen)
 {
     winScreenPriv(pScreen);
     winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
@@ -580,7 +580,7 @@ winCloseScreenShadowGDI(int nIndex, ScreenPtr pScreen)
     /* Call the wrapped CloseScreen procedure */
     WIN_UNWRAP(CloseScreen);
     if (pScreen->CloseScreen)
-        fReturn = (*pScreen->CloseScreen) (nIndex, pScreen);
+        fReturn = (*pScreen->CloseScreen) (pScreen);
 
     /* Delete the window property */
     RemoveProp(pScreenPriv->hwndScreen, WIN_SCR_PROP);
diff --git a/xorg-server/hw/xwin/winwakeup.c b/xorg-server/hw/xwin/winwakeup.c
index 1d2bfedbe..77c160533 100644
--- a/xorg-server/hw/xwin/winwakeup.c
+++ b/xorg-server/hw/xwin/winwakeup.c
@@ -38,8 +38,8 @@
 
 /* See Porting Layer Definition - p. 7 */
 void
-winWakeupHandler(int nScreen,
-                 pointer pWakeupData, unsigned long ulResult, pointer pReadmask)
+winWakeupHandler(ScreenPtr pScreen,
+                 unsigned long ulResult, pointer pReadmask)
 {
     MSG msg;
 
diff --git a/xorg-server/include/.gitignore b/xorg-server/include/.gitignore
new file mode 100644
index 000000000..8fffad782
--- /dev/null
+++ b/xorg-server/include/.gitignore
@@ -0,0 +1,5 @@
+#		Add & Override for this directory and it's subdirectories
+*-config.h
+do-not-use-config.h.in
+xorg-server.h
+
diff --git a/xorg-server/include/dix-config-apple-verbatim.h b/xorg-server/include/dix-config-apple-verbatim.h
index f429d200e..720897c80 100644
--- a/xorg-server/include/dix-config-apple-verbatim.h
+++ b/xorg-server/include/dix-config-apple-verbatim.h
@@ -1,8 +1,8 @@
-/* Do not include this file directly.  It is included at the end of <dix-config.h> */
-
-/* Correctly set _XSERVER64 for OSX fat binaries */
-#if defined(__LP64__) && !defined(_XSERVER64)
-#define _XSERVER64 1
-#elif !defined(__LP64__) && defined(_XSERVER64)
-#undef _XSERVER64
-#endif
+/* Do not include this file directly.  It is included at the end of <dix-config.h> */
+
+/* Correctly set _XSERVER64 for OSX fat binaries */
+#if defined(__LP64__) && !defined(_XSERVER64)
+#define _XSERVER64 1
+#elif !defined(__LP64__) && defined(_XSERVER64)
+#undef _XSERVER64
+#endif
diff --git a/xorg-server/include/kdrive-config.h.in b/xorg-server/include/kdrive-config.h.in
index 0e54aa18f..887213d78 100644
--- a/xorg-server/include/kdrive-config.h.in
+++ b/xorg-server/include/kdrive-config.h.in
@@ -1,40 +1,40 @@
-/* kdrive-config.h.in: not at all generated.                      -*- c -*-
- */
-
-#ifndef _KDRIVE_CONFIG_H_
-#define _KDRIVE_CONFIG_H_
-
-#include <dix-config.h>
-#include <xkb-config.h>
-
-/* Building kdrive server. */
-#undef KDRIVESERVER
-
-/* Include framebuffer support in X servers */
-#undef KDRIVEFBDEV
-
-/* Enable touchscreen support */
-#undef TOUCHSCREEN
-
-/* Support tslib touchscreen abstraction library */
-#undef TSLIB
-
-/* Support KDrive kbd driver */
-#undef KDRIVE_KBD
-
-/* Support KDrive mouse driver */
-#undef KDRIVE_MOUSE
-
-/* Support KDrive evdev driver */
-#undef KDRIVE_EVDEV
-
-/* Verbose debugging output hilarity */
-#undef DEBUG
-
-/* Have the backtrace() function. */
-#undef HAVE_BACKTRACE
-
-/* Have execinfo.h for backtrace(). */
-#undef HAVE_EXECINFO_H
-
-#endif /* _KDRIVE_CONFIG_H_ */
+/* kdrive-config.h.in: not at all generated.                      -*- c -*-
+ */
+
+#ifndef _KDRIVE_CONFIG_H_
+#define _KDRIVE_CONFIG_H_
+
+#include <dix-config.h>
+#include <xkb-config.h>
+
+/* Building kdrive server. */
+#undef KDRIVESERVER
+
+/* Include framebuffer support in X servers */
+#undef KDRIVEFBDEV
+
+/* Enable touchscreen support */
+#undef TOUCHSCREEN
+
+/* Support tslib touchscreen abstraction library */
+#undef TSLIB
+
+/* Support KDrive kbd driver */
+#undef KDRIVE_KBD
+
+/* Support KDrive mouse driver */
+#undef KDRIVE_MOUSE
+
+/* Support KDrive evdev driver */
+#undef KDRIVE_EVDEV
+
+/* Verbose debugging output hilarity */
+#undef DEBUG
+
+/* Have the backtrace() function. */
+#undef HAVE_BACKTRACE
+
+/* Have execinfo.h for backtrace(). */
+#undef HAVE_EXECINFO_H
+
+#endif /* _KDRIVE_CONFIG_H_ */
diff --git a/xorg-server/include/pixmap.h b/xorg-server/include/pixmap.h
index 26d737c4d..9bb5bb7b8 100644
--- a/xorg-server/include/pixmap.h
+++ b/xorg-server/include/pixmap.h
@@ -100,9 +100,9 @@ extern _X_EXPORT PixmapPtr GetScratchPixmapHeader(ScreenPtr /*pScreen */ ,
 
 extern _X_EXPORT void FreeScratchPixmapHeader(PixmapPtr /*pPixmap */ );
 
-extern _X_EXPORT Bool CreateScratchPixmapsForScreen(int /*scrnum */ );
+extern _X_EXPORT Bool CreateScratchPixmapsForScreen(ScreenPtr /*pScreen */ );
 
-extern _X_EXPORT void FreeScratchPixmapsForScreen(int /*scrnum */ );
+extern _X_EXPORT void FreeScratchPixmapsForScreen(ScreenPtr /*pScreen */ );
 
 extern _X_EXPORT PixmapPtr AllocatePixmap(ScreenPtr /*pScreen */ ,
                                           int /*pixDataSize */ );
diff --git a/xorg-server/include/screenint.h b/xorg-server/include/screenint.h
index 881747182..6b0cc70ee 100644
--- a/xorg-server/include/screenint.h
+++ b/xorg-server/include/screenint.h
@@ -55,7 +55,6 @@ typedef struct _Depth *DepthPtr;
 typedef struct _Screen *ScreenPtr;
 
 extern _X_EXPORT int AddScreen(Bool (* /*pfnInit */ )(
-                                                         int /*index */ ,
                                                          ScreenPtr /*pScreen */
                                                          ,
                                                          int /*argc */ ,
diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h
index 21d2d0b5d..a646d8854 100644
--- a/xorg-server/include/scrnintstr.h
+++ b/xorg-server/include/scrnintstr.h
@@ -95,8 +95,7 @@ typedef struct _ScreenSaverStuff {
  *  or as a local variable) can easily do so and retain full type checking.
  */
 
-typedef Bool (*CloseScreenProcPtr) (int /*index */ ,
-                                    ScreenPtr /*pScreen */ );
+typedef Bool (*CloseScreenProcPtr) (ScreenPtr /*pScreen */ );
 
 typedef void (*QueryBestSizeProcPtr) (int /*class */ ,
                                       unsigned short * /*pwidth */ ,
@@ -258,13 +257,11 @@ typedef void (*SendGraphicsExposeProcPtr) (ClientPtr /*client */ ,
                                            int /*major */ ,
                                            int /*minor */ );
 
-typedef void (*ScreenBlockHandlerProcPtr) (int /*screenNum */ ,
-                                           pointer /*blockData */ ,
+typedef void (*ScreenBlockHandlerProcPtr) (ScreenPtr /*pScreen*/ ,
                                            pointer /*pTimeout */ ,
                                            pointer /*pReadmask */ );
 
-typedef void (*ScreenWakeupHandlerProcPtr) (int /*screenNum */ ,
-                                            pointer /*wakeupData */ ,
+typedef void (*ScreenWakeupHandlerProcPtr) (ScreenPtr /*pScreen*/ ,
                                             unsigned long /*result */ ,
                                             pointer /*pReadMask */ );
 
@@ -444,9 +441,6 @@ typedef struct _Screen {
     ScreenBlockHandlerProcPtr BlockHandler;
     ScreenWakeupHandlerProcPtr WakeupHandler;
 
-    pointer blockData;
-    pointer wakeupData;
-
     /* anybody can get a piece of this array */
     PrivateRec *devPrivates;
 
diff --git a/xorg-server/include/version-config.h.in b/xorg-server/include/version-config.h.in
index 8180dff8e..4fb614dae 100644
--- a/xorg-server/include/version-config.h.in
+++ b/xorg-server/include/version-config.h.in
@@ -1,16 +1,16 @@
-/* version-config.h.in: not generated */
-
-#ifndef VERSION_CONFIG_H
-#define VERSION_CONFIG_H
-
-/* Vendor man version */
-#undef VENDOR_MAN_VERSION
-
-/* Vendor name */
-#undef VENDOR_NAME
-
-/* Vendor release */
-#undef VENDOR_RELEASE
-
-#endif /* VERSION_CONFIG_H */
-
+/* version-config.h.in: not generated */
+
+#ifndef VERSION_CONFIG_H
+#define VERSION_CONFIG_H
+
+/* Vendor man version */
+#undef VENDOR_MAN_VERSION
+
+/* Vendor name */
+#undef VENDOR_NAME
+
+/* Vendor release */
+#undef VENDOR_RELEASE
+
+#endif /* VERSION_CONFIG_H */
+
diff --git a/xorg-server/include/xsha1.h b/xorg-server/include/xsha1.h
index aab71067a..89e6f5f0b 100644
--- a/xorg-server/include/xsha1.h
+++ b/xorg-server/include/xsha1.h
@@ -1,19 +1,19 @@
-#ifndef XSHA1_H
-#define XSHA1_H
-
-/* Initialize SHA1 computation.  Returns NULL on error. */
-void *x_sha1_init(void);
-
-/*
- * Add some data to be hashed.  ctx is the value returned by x_sha1_init()
- * Returns 0 on error, 1 on success.
- */
-int x_sha1_update(void *ctx, void *data, int size);
-
-/*
- * Place the hash in result, and free ctx.
- * Returns 0 on error, 1 on success. 
- */
-int x_sha1_final(void *ctx, unsigned char result[20]);
-
-#endif
+#ifndef XSHA1_H
+#define XSHA1_H
+
+/* Initialize SHA1 computation.  Returns NULL on error. */
+void *x_sha1_init(void);
+
+/*
+ * Add some data to be hashed.  ctx is the value returned by x_sha1_init()
+ * Returns 0 on error, 1 on success.
+ */
+int x_sha1_update(void *ctx, void *data, int size);
+
+/*
+ * Place the hash in result, and free ctx.
+ * Returns 0 on error, 1 on success. 
+ */
+int x_sha1_final(void *ctx, unsigned char result[20]);
+
+#endif
diff --git a/xorg-server/m4/ac_define_dir.m4 b/xorg-server/m4/ac_define_dir.m4
index db42d3eb0..ef23b78f7 100644
--- a/xorg-server/m4/ac_define_dir.m4
+++ b/xorg-server/m4/ac_define_dir.m4
@@ -1,49 +1,49 @@
-# ===========================================================================
-#             http://autoconf-archive.cryp.to/ac_define_dir.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
-#
-# DESCRIPTION
-#
-#   This macro sets VARNAME to the expansion of the DIR variable, taking
-#   care of fixing up ${prefix} and such.
-#
-#   VARNAME is then offered as both an output variable and a C preprocessor
-#   symbol.
-#
-#   Example:
-#
-#      AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.])
-#
-# LAST MODIFICATION
-#
-#   2008-04-12
-#
-# COPYLEFT
-#
-#   Copyright (c) 2008 Stepan Kasal <kasal@ucw.cz>
-#   Copyright (c) 2008 Andreas Schwab <schwab@suse.de>
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2008 Alexandre Oliva
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.
-
-AC_DEFUN([AC_DEFINE_DIR], [
-  prefix_NONE=
-  exec_prefix_NONE=
-  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
-  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
-dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
-dnl refers to ${prefix}.  Thus we have to use `eval' twice.
-  eval ac_define_dir="\"[$]$2\""
-  eval ac_define_dir="\"$ac_define_dir\""
-  AC_SUBST($1, "$ac_define_dir")
-  AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
-  test "$prefix_NONE" && prefix=NONE
-  test "$exec_prefix_NONE" && exec_prefix=NONE
-])
+# ===========================================================================
+#             http://autoconf-archive.cryp.to/ac_define_dir.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
+#
+# DESCRIPTION
+#
+#   This macro sets VARNAME to the expansion of the DIR variable, taking
+#   care of fixing up ${prefix} and such.
+#
+#   VARNAME is then offered as both an output variable and a C preprocessor
+#   symbol.
+#
+#   Example:
+#
+#      AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.])
+#
+# LAST MODIFICATION
+#
+#   2008-04-12
+#
+# COPYLEFT
+#
+#   Copyright (c) 2008 Stepan Kasal <kasal@ucw.cz>
+#   Copyright (c) 2008 Andreas Schwab <schwab@suse.de>
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2008 Alexandre Oliva
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.
+
+AC_DEFUN([AC_DEFINE_DIR], [
+  prefix_NONE=
+  exec_prefix_NONE=
+  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
+  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
+dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
+dnl refers to ${prefix}.  Thus we have to use `eval' twice.
+  eval ac_define_dir="\"[$]$2\""
+  eval ac_define_dir="\"$ac_define_dir\""
+  AC_SUBST($1, "$ac_define_dir")
+  AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
+  test "$prefix_NONE" && prefix=NONE
+  test "$exec_prefix_NONE" && exec_prefix=NONE
+])
diff --git a/xorg-server/mi/midispcur.c b/xorg-server/mi/midispcur.c
index 24b9a700d..9ee824283 100644
--- a/xorg-server/mi/midispcur.c
+++ b/xorg-server/mi/midispcur.c
@@ -63,7 +63,7 @@ static DevScreenPrivateKeyRec miDCDeviceKeyRec;
 
 #define miDCDeviceKey (&miDCDeviceKeyRec)
 
-static Bool miDCCloseScreen(int index, ScreenPtr pScreen);
+static Bool miDCCloseScreen(ScreenPtr pScreen);
 
 /* per device private data */
 typedef struct {
@@ -128,7 +128,7 @@ miDCInitialize(ScreenPtr pScreen, miPointerScreenFuncPtr screenFuncs)
 }
 
 static Bool
-miDCCloseScreen(int index, ScreenPtr pScreen)
+miDCCloseScreen(ScreenPtr pScreen)
 {
     miDCScreenPtr pScreenPriv;
 
@@ -136,7 +136,7 @@ miDCCloseScreen(int index, ScreenPtr pScreen)
                                                    miDCScreenKey);
     pScreen->CloseScreen = pScreenPriv->CloseScreen;
     free((pointer) pScreenPriv);
-    return (*pScreen->CloseScreen) (index, pScreen);
+    return (*pScreen->CloseScreen) (pScreen);
 }
 
 Bool
diff --git a/xorg-server/mi/mioverlay.c b/xorg-server/mi/mioverlay.c
index a66a71fb5..14cd14ccb 100644
--- a/xorg-server/mi/mioverlay.c
+++ b/xorg-server/mi/mioverlay.c
@@ -70,7 +70,7 @@ static Bool HasUnderlayChildren(WindowPtr);
 static void MarkUnderlayWindow(WindowPtr);
 static Bool CollectUnderlayChildrenRegions(WindowPtr, RegionPtr);
 
-static Bool miOverlayCloseScreen(int, ScreenPtr);
+static Bool miOverlayCloseScreen(ScreenPtr);
 static Bool miOverlayCreateWindow(WindowPtr);
 static Bool miOverlayDestroyWindow(WindowPtr);
 static Bool miOverlayUnrealizeWindow(WindowPtr);
@@ -164,7 +164,7 @@ miInitOverlay(ScreenPtr pScreen,
 }
 
 static Bool
-miOverlayCloseScreen(int i, ScreenPtr pScreen)
+miOverlayCloseScreen(ScreenPtr pScreen)
 {
     miOverlayScreenPtr pScreenPriv = MIOVERLAY_GET_SCREEN_PRIVATE(pScreen);
 
@@ -176,7 +176,7 @@ miOverlayCloseScreen(int i, ScreenPtr pScreen)
 
     free(pScreenPriv);
 
-    return (*pScreen->CloseScreen) (i, pScreen);
+    return (*pScreen->CloseScreen) (pScreen);
 }
 
 static Bool
diff --git a/xorg-server/mi/mipointer.c b/xorg-server/mi/mipointer.c
index de6698a37..a56838ead 100644
--- a/xorg-server/mi/mipointer.c
+++ b/xorg-server/mi/mipointer.c
@@ -91,7 +91,7 @@ static void miPointerCursorLimits(DeviceIntPtr pDev, ScreenPtr pScreen,
                                   BoxPtr pTopLeftBox);
 static Bool miPointerSetCursorPosition(DeviceIntPtr pDev, ScreenPtr pScreen,
                                        int x, int y, Bool generateEvent);
-static Bool miPointerCloseScreen(int index, ScreenPtr pScreen);
+static Bool miPointerCloseScreen(ScreenPtr pScreen);
 static void miPointerMove(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y);
 static Bool miPointerDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen);
 static void miPointerDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen);
@@ -154,7 +154,7 @@ miPointerInitialize(ScreenPtr pScreen,
  * @param pScreen The actual screen pointer
  */
 static Bool
-miPointerCloseScreen(int index, ScreenPtr pScreen)
+miPointerCloseScreen(ScreenPtr pScreen)
 {
     SetupScreen(pScreen);
 
@@ -162,7 +162,7 @@ miPointerCloseScreen(int index, ScreenPtr pScreen)
     free((pointer) pScreenPriv);
     FreeEventList(events, GetMaximumEventsNum());
     events = NULL;
-    return (*pScreen->CloseScreen) (index, pScreen);
+    return (*pScreen->CloseScreen) (pScreen);
 }
 
 /*
diff --git a/xorg-server/mi/miscrinit.c b/xorg-server/mi/miscrinit.c
index 2850c8d79..4698b532f 100644
--- a/xorg-server/mi/miscrinit.c
+++ b/xorg-server/mi/miscrinit.c
@@ -119,7 +119,7 @@ miModifyPixmapHeader(PixmapPtr pPixmap, int width, int height, int depth,
 }
 
 static Bool
-miCloseScreen(int iScreen, ScreenPtr pScreen)
+miCloseScreen(ScreenPtr pScreen)
 {
     return ((*pScreen->DestroyPixmap) ((PixmapPtr) pScreen->devPrivate));
 }
@@ -262,8 +262,6 @@ miScreenInit(ScreenPtr pScreen, pointer pbits,  /* pointer to screen bits */
     pScreen->SendGraphicsExpose = miSendGraphicsExpose;
     pScreen->BlockHandler = (ScreenBlockHandlerProcPtr) NoopDDA;
     pScreen->WakeupHandler = (ScreenWakeupHandlerProcPtr) NoopDDA;
-    pScreen->blockData = (pointer) 0;
-    pScreen->wakeupData = (pointer) 0;
     pScreen->MarkWindow = miMarkWindow;
     pScreen->MarkOverlappedWindows = miMarkOverlappedWindows;
     pScreen->MoveWindow = miMoveWindow;
diff --git a/xorg-server/mi/misprite.c b/xorg-server/mi/misprite.c
index db35d667e..3ef25e75f 100644
--- a/xorg-server/mi/misprite.c
+++ b/xorg-server/mi/misprite.c
@@ -191,7 +191,7 @@ static DevPrivateKeyRec miSpriteDevPrivatesKeyRec;
 
 #define miSpriteDevPrivatesKey (&miSpriteDevPrivatesKeyRec)
 
-static Bool miSpriteCloseScreen(int i, ScreenPtr pScreen);
+static Bool miSpriteCloseScreen(ScreenPtr pScreen);
 static void miSpriteGetImage(DrawablePtr pDrawable, int sx, int sy,
                              int w, int h, unsigned int format,
                              unsigned long planemask, char *pdstLine);
@@ -203,7 +203,7 @@ static void miSpriteSourceValidate(DrawablePtr pDrawable, int x, int y,
                                    unsigned int subWindowMode);
 static void miSpriteCopyWindow(WindowPtr pWindow,
                                DDXPointRec ptOldOrg, RegionPtr prgnSrc);
-static void miSpriteBlockHandler(int i, pointer blockData,
+static void miSpriteBlockHandler(ScreenPtr pScreen,
                                  pointer pTimeout, pointer pReadMask);
 static void miSpriteInstallColormap(ColormapPtr pMap);
 static void miSpriteStoreColors(ColormapPtr pMap, int ndef, xColorItem * pdef);
@@ -367,7 +367,7 @@ miSpriteInitialize(ScreenPtr pScreen, miPointerScreenFuncPtr screenFuncs)
  */
 
 static Bool
-miSpriteCloseScreen(int i, ScreenPtr pScreen)
+miSpriteCloseScreen(ScreenPtr pScreen)
 {
     miSpriteScreenPtr pScreenPriv = GetSpriteScreen(pScreen);
 
@@ -382,7 +382,7 @@ miSpriteCloseScreen(int i, ScreenPtr pScreen)
 
     free(pScreenPriv);
 
-    return (*pScreen->CloseScreen) (i, pScreen);
+    return (*pScreen->CloseScreen) (pScreen);
 }
 
 static void
@@ -520,10 +520,9 @@ miSpriteCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
 }
 
 static void
-miSpriteBlockHandler(int i, pointer blockData, pointer pTimeout,
+miSpriteBlockHandler(ScreenPtr pScreen, pointer pTimeout,
                      pointer pReadmask)
 {
-    ScreenPtr pScreen = screenInfo.screens[i];
     miSpriteScreenPtr pPriv = GetSpriteScreen(pScreen);
     DeviceIntPtr pDev;
     miCursorInfoPtr pCursorInfo;
@@ -554,7 +553,7 @@ miSpriteBlockHandler(int i, pointer blockData, pointer pTimeout,
 
     SCREEN_PROLOGUE(pPriv, pScreen, BlockHandler);
 
-    (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
+    (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
 
     if (WorkToDo)
         SCREEN_EPILOGUE(pPriv, pScreen, BlockHandler);
diff --git a/xorg-server/miext/cw/Makefile.am b/xorg-server/miext/cw/Makefile.am
index e056f4279..cb6cea725 100644
--- a/xorg-server/miext/cw/Makefile.am
+++ b/xorg-server/miext/cw/Makefile.am
@@ -1,11 +1,11 @@
-noinst_LTLIBRARIES = libcw.la
-
-AM_CFLAGS = $(DIX_CFLAGS)
-
-INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
-
-libcw_la_SOURCES = 	\
-	cw.c		\
-	cw_ops.c	\
-	cw_render.c     \
-        cw.h
+noinst_LTLIBRARIES = libcw.la
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
+
+libcw_la_SOURCES = 	\
+	cw.c		\
+	cw_ops.c	\
+	cw_render.c     \
+        cw.h
diff --git a/xorg-server/miext/cw/cw.c b/xorg-server/miext/cw/cw.c
index 87ced2f6a..7543affb0 100644
--- a/xorg-server/miext/cw/cw.c
+++ b/xorg-server/miext/cw/cw.c
@@ -51,7 +51,7 @@ DevPrivateKeyRec cwPictureKeyRec;
 extern GCOps cwGCOps;
 
 static Bool
- cwCloseScreen(int i, ScreenPtr pScreen);
+ cwCloseScreen(ScreenPtr pScreen);
 
 static void
  cwValidateGC(GCPtr pGC, unsigned long stateChanges, DrawablePtr pDrawable);
@@ -502,7 +502,7 @@ miInitializeCompositeWrapper(ScreenPtr pScreen)
 }
 
 static Bool
-cwCloseScreen(int i, ScreenPtr pScreen)
+cwCloseScreen(ScreenPtr pScreen)
 {
     cwScreenPtr pScreenPriv;
     PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
@@ -520,5 +520,5 @@ cwCloseScreen(int i, ScreenPtr pScreen)
 
     free((pointer) pScreenPriv);
 
-    return (*pScreen->CloseScreen) (i, pScreen);
+    return (*pScreen->CloseScreen) (pScreen);
 }
diff --git a/xorg-server/miext/damage/Makefile.am b/xorg-server/miext/damage/Makefile.am
index 9f858a8e5..767a65aee 100644
--- a/xorg-server/miext/damage/Makefile.am
+++ b/xorg-server/miext/damage/Makefile.am
@@ -1,14 +1,14 @@
-noinst_LTLIBRARIES = libdamage.la
-
-AM_CFLAGS = $(DIX_CFLAGS)
-
-INCLUDES = -I$(srcdir)/../cw
-
-if XORG
-sdk_HEADERS = damage.h damagestr.h
-endif
-
-libdamage_la_SOURCES =	\
-	damage.c	\
-	damage.h	\
-	damagestr.h
+noinst_LTLIBRARIES = libdamage.la
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+INCLUDES = -I$(srcdir)/../cw
+
+if XORG
+sdk_HEADERS = damage.h damagestr.h
+endif
+
+libdamage_la_SOURCES =	\
+	damage.c	\
+	damage.h	\
+	damagestr.h
diff --git a/xorg-server/miext/damage/damage.c b/xorg-server/miext/damage/damage.c
index 780162a8d..8000517e8 100644
--- a/xorg-server/miext/damage/damage.c
+++ b/xorg-server/miext/damage/damage.c
@@ -1646,7 +1646,7 @@ damageDestroyWindow(WindowPtr pWindow)
 }
 
 static Bool
-damageCloseScreen(int i, ScreenPtr pScreen)
+damageCloseScreen(ScreenPtr pScreen)
 {
     damageScrPriv(pScreen);
 
@@ -1655,7 +1655,7 @@ damageCloseScreen(int i, ScreenPtr pScreen)
     unwrap(pScrPriv, pScreen, CopyWindow);
     unwrap(pScrPriv, pScreen, CloseScreen);
     free(pScrPriv);
-    return (*pScreen->CloseScreen) (i, pScreen);
+    return (*pScreen->CloseScreen) (pScreen);
 }
 
 /**
diff --git a/xorg-server/miext/rootless/Makefile.am b/xorg-server/miext/rootless/Makefile.am
index 72d299bcc..c97bebebe 100644
--- a/xorg-server/miext/rootless/Makefile.am
+++ b/xorg-server/miext/rootless/Makefile.am
@@ -1,16 +1,16 @@
-AM_CFLAGS = $(DIX_CFLAGS) $(XSERVER_CFLAGS)
-
-noinst_LTLIBRARIES = librootless.la
-librootless_la_SOURCES = \
-	rootlessCommon.c \
-	rootlessGC.c \
-	rootlessScreen.c \
-	rootlessValTree.c \
-	rootlessWindow.c
-
-EXTRA_DIST = \
-	README.txt \
-	rootless.h \
-	rootlessCommon.h \
-	rootlessConfig.h \
-	rootlessWindow.h 
+AM_CFLAGS = $(DIX_CFLAGS) $(XSERVER_CFLAGS)
+
+noinst_LTLIBRARIES = librootless.la
+librootless_la_SOURCES = \
+	rootlessCommon.c \
+	rootlessGC.c \
+	rootlessScreen.c \
+	rootlessValTree.c \
+	rootlessWindow.c
+
+EXTRA_DIST = \
+	README.txt \
+	rootless.h \
+	rootlessCommon.h \
+	rootlessConfig.h \
+	rootlessWindow.h 
diff --git a/xorg-server/miext/rootless/rootlessScreen.c b/xorg-server/miext/rootless/rootlessScreen.c
index ecc72ea92..a1af3e7ac 100644
--- a/xorg-server/miext/rootless/rootlessScreen.c
+++ b/xorg-server/miext/rootless/rootlessScreen.c
@@ -138,7 +138,7 @@ RootlessCreateScreenResources(ScreenPtr pScreen)
 }
 
 static Bool
-RootlessCloseScreen(int i, ScreenPtr pScreen)
+RootlessCloseScreen(ScreenPtr pScreen)
 {
     RootlessScreenRec *s;
 
@@ -154,7 +154,7 @@ RootlessCloseScreen(int i, ScreenPtr pScreen)
     }
 
     free(s);
-    return pScreen->CloseScreen(i, pScreen);
+    return pScreen->CloseScreen(pScreen);
 }
 
 static void
diff --git a/xorg-server/miext/shadow/Makefile.am b/xorg-server/miext/shadow/Makefile.am
index 59cee7f59..30f7bda96 100644
--- a/xorg-server/miext/shadow/Makefile.am
+++ b/xorg-server/miext/shadow/Makefile.am
@@ -1,32 +1,32 @@
-noinst_LTLIBRARIES = libshadow.la
-
-AM_CFLAGS = $(DIX_CFLAGS)
-
-if XORG
-sdk_HEADERS = shadow.h
-endif
-
-libshadow_la_SOURCES =		\
-	shadow.c		\
-	shadow.h		\
-	shalloc.c		\
-	shpacked.c		\
-	shplanar8.c		\
-	shplanar.c		\
-	shrot16pack_180.c	\
-	shrot16pack_270.c	\
-	shrot16pack_270YX.c	\
-	shrot16pack_90.c	\
-	shrot16pack_90YX.c	\
-	shrot16pack.c		\
-	shrot32pack_180.c	\
-	shrot32pack_270.c	\
-	shrot32pack_90.c	\
-	shrot32pack.c		\
-	shrot8pack_180.c	\
-	shrot8pack_270.c	\
-	shrot8pack_90.c		\
-	shrot8pack.c		\
-	shrotate.c		\
-	shrotpack.h		\
-	shrotpackYX.h
+noinst_LTLIBRARIES = libshadow.la
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+if XORG
+sdk_HEADERS = shadow.h
+endif
+
+libshadow_la_SOURCES =		\
+	shadow.c		\
+	shadow.h		\
+	shalloc.c		\
+	shpacked.c		\
+	shplanar8.c		\
+	shplanar.c		\
+	shrot16pack_180.c	\
+	shrot16pack_270.c	\
+	shrot16pack_270YX.c	\
+	shrot16pack_90.c	\
+	shrot16pack_90YX.c	\
+	shrot16pack.c		\
+	shrot32pack_180.c	\
+	shrot32pack_270.c	\
+	shrot32pack_90.c	\
+	shrot32pack.c		\
+	shrot8pack_180.c	\
+	shrot8pack_270.c	\
+	shrot8pack_90.c		\
+	shrot8pack.c		\
+	shrotate.c		\
+	shrotpack.h		\
+	shrotpackYX.h
diff --git a/xorg-server/miext/shadow/shadow.c b/xorg-server/miext/shadow/shadow.c
index d2ba68497..2d869e54b 100644
--- a/xorg-server/miext/shadow/shadow.c
+++ b/xorg-server/miext/shadow/shadow.c
@@ -96,7 +96,7 @@ shadowGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h,
 #define BACKWARDS_COMPATIBILITY
 
 static Bool
-shadowCloseScreen(int i, ScreenPtr pScreen)
+shadowCloseScreen(ScreenPtr pScreen)
 {
     shadowBuf(pScreen);
 
@@ -110,7 +110,7 @@ shadowCloseScreen(int i, ScreenPtr pScreen)
     if (pBuf->pPixmap)
         pScreen->DestroyPixmap(pBuf->pPixmap);
     free(pBuf);
-    return pScreen->CloseScreen(i, pScreen);
+    return pScreen->CloseScreen(pScreen);
 }
 
 #ifdef BACKWARDS_COMPATIBILITY
diff --git a/xorg-server/miext/shadow/shrot16pack.c b/xorg-server/miext/shadow/shrot16pack.c
index 0b7faca6a..f7ebf1efa 100644
--- a/xorg-server/miext/shadow/shrot16pack.c
+++ b/xorg-server/miext/shadow/shrot16pack.c
@@ -1,30 +1,30 @@
-/*
- * Copyright © 2000 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define FUNC	shadowUpdateRotate16
-#define Data	CARD16
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "shrotpack.h"
+/*
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define FUNC	shadowUpdateRotate16
+#define Data	CARD16
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "shrotpack.h"
diff --git a/xorg-server/miext/shadow/shrot16pack_180.c b/xorg-server/miext/shadow/shrot16pack_180.c
index d8f2633e5..877bc174b 100644
--- a/xorg-server/miext/shadow/shrot16pack_180.c
+++ b/xorg-server/miext/shadow/shrot16pack_180.c
@@ -1,31 +1,31 @@
-/*
- * Copyright © 2000 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define FUNC	shadowUpdateRotate16_180
-#define Data	CARD16
-#define ROTATE	180
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "shrotpack.h"
+/*
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define FUNC	shadowUpdateRotate16_180
+#define Data	CARD16
+#define ROTATE	180
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "shrotpack.h"
diff --git a/xorg-server/miext/shadow/shrot16pack_270.c b/xorg-server/miext/shadow/shrot16pack_270.c
index 4aa471325..de1de3850 100644
--- a/xorg-server/miext/shadow/shrot16pack_270.c
+++ b/xorg-server/miext/shadow/shrot16pack_270.c
@@ -1,31 +1,31 @@
-/*
- * Copyright © 2000 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define FUNC	shadowUpdateRotate16_270
-#define Data	CARD16
-#define ROTATE	270
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "shrotpack.h"
+/*
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define FUNC	shadowUpdateRotate16_270
+#define Data	CARD16
+#define ROTATE	270
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "shrotpack.h"
diff --git a/xorg-server/miext/shadow/shrot16pack_270YX.c b/xorg-server/miext/shadow/shrot16pack_270YX.c
index 0df1fd51f..9d6f94c70 100644
--- a/xorg-server/miext/shadow/shrot16pack_270YX.c
+++ b/xorg-server/miext/shadow/shrot16pack_270YX.c
@@ -1,31 +1,31 @@
-/*
- * Copyright  2000 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define FUNC	shadowUpdateRotate16_270YX
-#define Data	CARD16
-#define ROTATE	270
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "shrotpackYX.h"
+/*
+ * Copyright  2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define FUNC	shadowUpdateRotate16_270YX
+#define Data	CARD16
+#define ROTATE	270
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "shrotpackYX.h"
diff --git a/xorg-server/miext/shadow/shrot16pack_90.c b/xorg-server/miext/shadow/shrot16pack_90.c
index 81e49151a..caabb0ea0 100644
--- a/xorg-server/miext/shadow/shrot16pack_90.c
+++ b/xorg-server/miext/shadow/shrot16pack_90.c
@@ -1,31 +1,31 @@
-/*
- * Copyright © 2000 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define FUNC	shadowUpdateRotate16_90
-#define Data	CARD16
-#define ROTATE	90
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "shrotpack.h"
+/*
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define FUNC	shadowUpdateRotate16_90
+#define Data	CARD16
+#define ROTATE	90
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "shrotpack.h"
diff --git a/xorg-server/miext/shadow/shrot16pack_90YX.c b/xorg-server/miext/shadow/shrot16pack_90YX.c
index 5fc3b236a..8a4b3326e 100644
--- a/xorg-server/miext/shadow/shrot16pack_90YX.c
+++ b/xorg-server/miext/shadow/shrot16pack_90YX.c
@@ -1,31 +1,31 @@
-/*
- * Copyright  2000 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define FUNC	shadowUpdateRotate16_90YX
-#define Data	CARD16
-#define ROTATE	90
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "shrotpackYX.h"
+/*
+ * Copyright  2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define FUNC	shadowUpdateRotate16_90YX
+#define Data	CARD16
+#define ROTATE	90
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "shrotpackYX.h"
diff --git a/xorg-server/miext/shadow/shrot32pack.c b/xorg-server/miext/shadow/shrot32pack.c
index 4a9cbc0ff..e1b55f4d5 100644
--- a/xorg-server/miext/shadow/shrot32pack.c
+++ b/xorg-server/miext/shadow/shrot32pack.c
@@ -1,30 +1,30 @@
-/*
- * Copyright © 2000 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define FUNC	shadowUpdateRotate32
-#define Data	CARD32
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "shrotpack.h"
+/*
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define FUNC	shadowUpdateRotate32
+#define Data	CARD32
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "shrotpack.h"
diff --git a/xorg-server/miext/shadow/shrot32pack_180.c b/xorg-server/miext/shadow/shrot32pack_180.c
index 8f5fb5760..50bcae40d 100644
--- a/xorg-server/miext/shadow/shrot32pack_180.c
+++ b/xorg-server/miext/shadow/shrot32pack_180.c
@@ -1,31 +1,31 @@
-/*
- * Copyright © 2000 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define FUNC	shadowUpdateRotate32_180
-#define Data	CARD32
-#define ROTATE	180
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "shrotpack.h"
+/*
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define FUNC	shadowUpdateRotate32_180
+#define Data	CARD32
+#define ROTATE	180
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "shrotpack.h"
diff --git a/xorg-server/miext/shadow/shrot32pack_270.c b/xorg-server/miext/shadow/shrot32pack_270.c
index 7d52fd2bf..28b93f3b8 100644
--- a/xorg-server/miext/shadow/shrot32pack_270.c
+++ b/xorg-server/miext/shadow/shrot32pack_270.c
@@ -1,31 +1,31 @@
-/*
- * Copyright © 2000 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define FUNC	shadowUpdateRotate32_270
-#define Data	CARD32
-#define ROTATE	270
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "shrotpack.h"
+/*
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define FUNC	shadowUpdateRotate32_270
+#define Data	CARD32
+#define ROTATE	270
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "shrotpack.h"
diff --git a/xorg-server/miext/shadow/shrot32pack_90.c b/xorg-server/miext/shadow/shrot32pack_90.c
index 0abeb5cdd..5362f9b1d 100644
--- a/xorg-server/miext/shadow/shrot32pack_90.c
+++ b/xorg-server/miext/shadow/shrot32pack_90.c
@@ -1,31 +1,31 @@
-/*
- * Copyright © 2000 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define FUNC	shadowUpdateRotate32_90
-#define Data	CARD32
-#define ROTATE	90
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "shrotpack.h"
+/*
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define FUNC	shadowUpdateRotate32_90
+#define Data	CARD32
+#define ROTATE	90
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "shrotpack.h"
diff --git a/xorg-server/miext/shadow/shrot8pack.c b/xorg-server/miext/shadow/shrot8pack.c
index 552d838f3..647775d06 100644
--- a/xorg-server/miext/shadow/shrot8pack.c
+++ b/xorg-server/miext/shadow/shrot8pack.c
@@ -1,30 +1,30 @@
-/*
- * Copyright © 2000 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define FUNC	shadowUpdateRotate8
-#define Data	CARD8
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "shrotpack.h"
+/*
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define FUNC	shadowUpdateRotate8
+#define Data	CARD8
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "shrotpack.h"
diff --git a/xorg-server/miext/shadow/shrot8pack_180.c b/xorg-server/miext/shadow/shrot8pack_180.c
index 526d8f15f..b681eac87 100644
--- a/xorg-server/miext/shadow/shrot8pack_180.c
+++ b/xorg-server/miext/shadow/shrot8pack_180.c
@@ -1,31 +1,31 @@
-/*
- * Copyright © 2000 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define FUNC	shadowUpdateRotate8_180
-#define Data	CARD8
-#define ROTATE	180
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "shrotpack.h"
+/*
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define FUNC	shadowUpdateRotate8_180
+#define Data	CARD8
+#define ROTATE	180
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "shrotpack.h"
diff --git a/xorg-server/miext/shadow/shrot8pack_270.c b/xorg-server/miext/shadow/shrot8pack_270.c
index 73f82a712..0dae7a99b 100644
--- a/xorg-server/miext/shadow/shrot8pack_270.c
+++ b/xorg-server/miext/shadow/shrot8pack_270.c
@@ -1,31 +1,31 @@
-/*
- * Copyright © 2000 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define FUNC	shadowUpdateRotate8_270
-#define Data	CARD8
-#define ROTATE	270
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "shrotpack.h"
+/*
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define FUNC	shadowUpdateRotate8_270
+#define Data	CARD8
+#define ROTATE	270
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "shrotpack.h"
diff --git a/xorg-server/miext/shadow/shrot8pack_90.c b/xorg-server/miext/shadow/shrot8pack_90.c
index 73060cad1..fb2c1d011 100644
--- a/xorg-server/miext/shadow/shrot8pack_90.c
+++ b/xorg-server/miext/shadow/shrot8pack_90.c
@@ -1,31 +1,31 @@
-/*
- * Copyright © 2000 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define FUNC	shadowUpdateRotate8_90
-#define Data	CARD8
-#define ROTATE	90
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "shrotpack.h"
+/*
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define FUNC	shadowUpdateRotate8_90
+#define Data	CARD8
+#define ROTATE	90
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "shrotpack.h"
diff --git a/xorg-server/miext/sync/misync.c b/xorg-server/miext/sync/misync.c
index b1e2a36f7..d24921a18 100644
--- a/xorg-server/miext/sync/misync.c
+++ b/xorg-server/miext/sync/misync.c
@@ -163,13 +163,13 @@ miSyncGetScreenFuncs(ScreenPtr pScreen)
 }
 
 static Bool
-SyncCloseScreen(int i, ScreenPtr pScreen)
+SyncCloseScreen(ScreenPtr pScreen)
 {
     SyncScreenPrivPtr pScreenPriv = SYNC_SCREEN_PRIV(pScreen);
 
     pScreen->CloseScreen = pScreenPriv->CloseScreen;
 
-    return (*pScreen->CloseScreen) (i, pScreen);
+    return (*pScreen->CloseScreen) (pScreen);
 }
 
 Bool
diff --git a/xorg-server/os/.gitignore b/xorg-server/os/.gitignore
new file mode 100644
index 000000000..bba633b88
--- /dev/null
+++ b/xorg-server/os/.gitignore
@@ -0,0 +1 @@
+os.O
diff --git a/xorg-server/randr/randr.c b/xorg-server/randr/randr.c
index 9f3df5fbe..a64aae366 100644
--- a/xorg-server/randr/randr.c
+++ b/xorg-server/randr/randr.c
@@ -83,7 +83,7 @@ RRClientCallback(CallbackListPtr *list, pointer closure, pointer data)
 }
 
 static Bool
-RRCloseScreen(int i, ScreenPtr pScreen)
+RRCloseScreen(ScreenPtr pScreen)
 {
     rrScrPriv(pScreen);
     int j;
@@ -98,7 +98,7 @@ RRCloseScreen(int i, ScreenPtr pScreen)
     free(pScrPriv->outputs);
     free(pScrPriv);
     RRNScreens -= 1;            /* ok, one fewer screen with RandR running */
-    return (*pScreen->CloseScreen) (i, pScreen);
+    return (*pScreen->CloseScreen) (pScreen);
 }
 
 static void
diff --git a/xorg-server/randr/randrstr.h b/xorg-server/randr/randrstr.h
index 1c0e9d4db..38fb10751 100644
--- a/xorg-server/randr/randrstr.h
+++ b/xorg-server/randr/randrstr.h
@@ -198,7 +198,7 @@ typedef Bool (*RRSetPanningProcPtr) (ScreenPtr pScrn,
 #endif                          /* RANDR_13_INTERFACE */
 
 typedef Bool (*RRGetInfoProcPtr) (ScreenPtr pScreen, Rotation * rotations);
-typedef Bool (*RRCloseScreenProcPtr) (int i, ScreenPtr pscreen);
+typedef Bool (*RRCloseScreenProcPtr) (ScreenPtr pscreen);
 
 /* These are for 1.0 compatibility */
 
diff --git a/xorg-server/record/Makefile.am b/xorg-server/record/Makefile.am
index 2a64f3189..fe0f5b289 100644
--- a/xorg-server/record/Makefile.am
+++ b/xorg-server/record/Makefile.am
@@ -1,7 +1,7 @@
-noinst_LTLIBRARIES = librecord.la
-
-AM_CFLAGS = $(DIX_CFLAGS)
-
-librecord_la_SOURCES = record.c set.c
-
-EXTRA_DIST = set.h
+noinst_LTLIBRARIES = librecord.la
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+librecord_la_SOURCES = record.c set.c
+
+EXTRA_DIST = set.h
diff --git a/xorg-server/render/animcur.c b/xorg-server/render/animcur.c
index 485c068fe..ebc5b8ef7 100644
--- a/xorg-server/render/animcur.c
+++ b/xorg-server/render/animcur.c
@@ -89,7 +89,7 @@ static DevPrivateKeyRec AnimCurScreenPrivateKeyRec;
 #define Unwrap(as,s,elt)    ((s)->elt = (as)->elt)
 
 static Bool
-AnimCurCloseScreen(int index, ScreenPtr pScreen)
+AnimCurCloseScreen(ScreenPtr pScreen)
 {
     AnimCurScreenPtr as = GetAnimCurScreen(pScreen);
     Bool ret;
@@ -103,7 +103,7 @@ AnimCurCloseScreen(int index, ScreenPtr pScreen)
     Unwrap(as, pScreen, UnrealizeCursor);
     Unwrap(as, pScreen, RecolorCursor);
     SetAnimCurScreen(pScreen, 0);
-    ret = (*pScreen->CloseScreen) (index, pScreen);
+    ret = (*pScreen->CloseScreen) (pScreen);
     free(as);
     return ret;
 }
@@ -135,11 +135,9 @@ AnimCurCursorLimits(DeviceIntPtr pDev,
  */
 
 static void
-AnimCurScreenBlockHandler(int screenNum,
-                          pointer blockData,
+AnimCurScreenBlockHandler(ScreenPtr pScreen,
                           pointer pTimeout, pointer pReadmask)
 {
-    ScreenPtr pScreen = screenInfo.screens[screenNum];
     AnimCurScreenPtr as = GetAnimCurScreen(pScreen);
     DeviceIntPtr dev;
     Bool activeDevice = FALSE;
@@ -183,7 +181,7 @@ AnimCurScreenBlockHandler(int screenNum,
         AdjustWaitForDelay(pTimeout, soonest - now);
 
     Unwrap(as, pScreen, BlockHandler);
-    (*pScreen->BlockHandler) (screenNum, blockData, pTimeout, pReadmask);
+    (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
     if (activeDevice)
         Wrap(as, pScreen, BlockHandler, AnimCurScreenBlockHandler);
     else
diff --git a/xorg-server/render/picture.c b/xorg-server/render/picture.c
index da3e49936..788785354 100644
--- a/xorg-server/render/picture.c
+++ b/xorg-server/render/picture.c
@@ -72,14 +72,14 @@ PictureDestroyWindow(WindowPtr pWindow)
 }
 
 Bool
-PictureCloseScreen(int index, ScreenPtr pScreen)
+PictureCloseScreen(ScreenPtr pScreen)
 {
     PictureScreenPtr ps = GetPictureScreen(pScreen);
     Bool ret;
     int n;
 
     pScreen->CloseScreen = ps->CloseScreen;
-    ret = (*pScreen->CloseScreen) (index, pScreen);
+    ret = (*pScreen->CloseScreen) (pScreen);
     PictureResetFilters(pScreen);
     for (n = 0; n < ps->nformats; n++)
         if (ps->formats[n].type == PictTypeIndexed)
diff --git a/xorg-server/render/picturestr.h b/xorg-server/render/picturestr.h
index cd4ec498c..6da56563d 100644
--- a/xorg-server/render/picturestr.h
+++ b/xorg-server/render/picturestr.h
@@ -381,7 +381,7 @@ extern _X_EXPORT Bool
  PictureDestroyWindow(WindowPtr pWindow);
 
 extern _X_EXPORT Bool
- PictureCloseScreen(int Index, ScreenPtr pScreen);
+ PictureCloseScreen(ScreenPtr pScreen);
 
 extern _X_EXPORT void
  PictureStoreColors(ColormapPtr pColormap, int ndef, xColorItem * pdef);
diff --git a/xorg-server/test/.gitignore b/xorg-server/test/.gitignore
new file mode 100644
index 000000000..5d4fdfa99
--- /dev/null
+++ b/xorg-server/test/.gitignore
@@ -0,0 +1,9 @@
+fixes
+input
+list
+misc
+string
+touch
+xfree86
+xkb
+xtest
diff --git a/xorg-server/test/README b/xorg-server/test/README
index 5759a72fd..a028fe208 100644
--- a/xorg-server/test/README
+++ b/xorg-server/test/README
@@ -1,36 +1,36 @@
-                        X server test suite
-
-This suite contains a set of tests to verify the behaviour of functions used
-internally to the server. This test suite is based on glib's testing
-framework [1].
-
-= How it works =
-Through some automake abuse, we link the test programs with the same static
-libraries as the Xorg binary. The test suites can then call various functions
-and verify their behaviour - without the need to start the server or connect
-clients.
-
-This testing only works for functions that do not rely on a particular state
-of the X server. Unless the test suite replicates the expected state, which
-may be difficult.
-
-= How to run the tests =
-Run "make check" the test directory. This will compile the tests and execute
-them in the order specified in the TESTS variable in test/Makefile.am.
-
-Each set of tests related to a subsystem are available as a binary that can be
-executed directly. For example, run "xkb" to perform some xkb-related tests.
-
-== Adding a new test ==
-When adding a new test, ensure that you add a short description of what the
-test does and what the expected outcome is. If the test reproduces a
-particular bug, using g_test_bug().
-
-== Misc ==
-
-The programs "gtester" and "gtester-report" may be used to generate XML/HTML
-log files of tests succeeded and failed.
-
----------
-
-[1] http://library.gnome.org/devel/glib/stable/glib-Testing.html
+                        X server test suite
+
+This suite contains a set of tests to verify the behaviour of functions used
+internally to the server. This test suite is based on glib's testing
+framework [1].
+
+= How it works =
+Through some automake abuse, we link the test programs with the same static
+libraries as the Xorg binary. The test suites can then call various functions
+and verify their behaviour - without the need to start the server or connect
+clients.
+
+This testing only works for functions that do not rely on a particular state
+of the X server. Unless the test suite replicates the expected state, which
+may be difficult.
+
+= How to run the tests =
+Run "make check" the test directory. This will compile the tests and execute
+them in the order specified in the TESTS variable in test/Makefile.am.
+
+Each set of tests related to a subsystem are available as a binary that can be
+executed directly. For example, run "xkb" to perform some xkb-related tests.
+
+== Adding a new test ==
+When adding a new test, ensure that you add a short description of what the
+test does and what the expected outcome is. If the test reproduces a
+particular bug, using g_test_bug().
+
+== Misc ==
+
+The programs "gtester" and "gtester-report" may be used to generate XML/HTML
+log files of tests succeeded and failed.
+
+---------
+
+[1] http://library.gnome.org/devel/glib/stable/glib-Testing.html
diff --git a/xorg-server/test/xi2/.gitignore b/xorg-server/test/xi2/.gitignore
new file mode 100644
index 000000000..817aa7b6b
--- /dev/null
+++ b/xorg-server/test/xi2/.gitignore
@@ -0,0 +1,11 @@
+protocol-eventconvert
+protocol-xigetclientpointer
+protocol-xigetselectedevents
+protocol-xipassivegrabdevice
+protocol-xiquerydevice
+protocol-xiquerypointer
+protocol-xiqueryversion
+protocol-xiselectevents
+protocol-xisetclientpointer
+protocol-xiwarppointer
+xi2
diff --git a/xorg-server/xfixes/Makefile.am b/xorg-server/xfixes/Makefile.am
index a8425e8ea..7f4d4d285 100644
--- a/xorg-server/xfixes/Makefile.am
+++ b/xorg-server/xfixes/Makefile.am
@@ -1,16 +1,16 @@
-noinst_LTLIBRARIES = libxfixes.la
-
-AM_CFLAGS = $(DIX_CFLAGS)
-
-if XORG
-sdk_HEADERS = xfixes.h
-endif
-
-libxfixes_la_SOURCES = 	\
-	cursor.c	\
-	region.c	\
-	saveset.c	\
-	select.c	\
-	xfixes.c	\
-	xfixes.h	\
-	xfixesint.h
+noinst_LTLIBRARIES = libxfixes.la
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+if XORG
+sdk_HEADERS = xfixes.h
+endif
+
+libxfixes_la_SOURCES = 	\
+	cursor.c	\
+	region.c	\
+	saveset.c	\
+	select.c	\
+	xfixes.c	\
+	xfixes.h	\
+	xfixesint.h
diff --git a/xorg-server/xfixes/cursor.c b/xorg-server/xfixes/cursor.c
index 1f1b0c209..648271ec8 100644
--- a/xorg-server/xfixes/cursor.c
+++ b/xorg-server/xfixes/cursor.c
@@ -192,7 +192,7 @@ CursorDisplayCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
 }
 
 static Bool
-CursorCloseScreen(int index, ScreenPtr pScreen)
+CursorCloseScreen(ScreenPtr pScreen)
 {
     CursorScreenPtr cs = GetCursorScreen(pScreen);
     Bool ret;
@@ -204,7 +204,7 @@ CursorCloseScreen(int index, ScreenPtr pScreen)
     Unwrap(cs, pScreen, DisplayCursor, display_proc);
     Unwrap(cs, pScreen, ConstrainCursorHarder, constrain_proc);
     deleteCursorHideCountsForScreen(pScreen);
-    ret = (*pScreen->CloseScreen) (index, pScreen);
+    ret = (*pScreen->CloseScreen) (pScreen);
     free(cs);
     return ret;
 }
diff --git a/xorg-server/xkb/Makefile.am b/xorg-server/xkb/Makefile.am
index fb3ccbf6f..b05693288 100644
--- a/xorg-server/xkb/Makefile.am
+++ b/xorg-server/xkb/Makefile.am
@@ -1,43 +1,43 @@
-noinst_LTLIBRARIES = libxkb.la libxkbstubs.la
-
-AM_CFLAGS = $(DIX_CFLAGS)
-
-DDX_SRCS = \
-        ddxBeep.c \
-        ddxCtrls.c \
-        ddxLEDs.c \
-        ddxLoad.c \
-        ddxList.c
-
-DIX_SRCS = \
-        xkb.c \
-        xkbUtils.c \
-        xkbEvents.c \
-        xkbAccessX.c \
-        xkbSwap.c \
-        xkbLEDs.c \
-        xkbInit.c \
-        xkbActions.c \
-        xkbPrKeyEv.c
-
-# this should be replaced by a common library or something, ideally -d
-XKBFILE_SRCS = \
-        maprules.c \
-        xkmread.c \
-        xkbtext.c \
-        xkbfmisc.c \
-        xkbout.c
-
-X11_SRCS = \
-        XKBMisc.c \
-        XKBAlloc.c \
-        XKBGAlloc.c \
-        XKBMAlloc.c
-
-libxkb_la_SOURCES = $(DDX_SRCS) $(DIX_SRCS) $(XKBFILE_SRCS) $(X11_SRCS)
-libxkbstubs_la_SOURCES = ddxVT.c ddxPrivate.c ddxKillSrv.c
-
-EXTRA_DIST = xkbDflts.h xkbgeom.h xkb.h
-
-xkbcompileddir = $(XKB_COMPILED_DIR)
-dist_xkbcompiled_DATA = README.compiled
+noinst_LTLIBRARIES = libxkb.la libxkbstubs.la
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+DDX_SRCS = \
+        ddxBeep.c \
+        ddxCtrls.c \
+        ddxLEDs.c \
+        ddxLoad.c \
+        ddxList.c
+
+DIX_SRCS = \
+        xkb.c \
+        xkbUtils.c \
+        xkbEvents.c \
+        xkbAccessX.c \
+        xkbSwap.c \
+        xkbLEDs.c \
+        xkbInit.c \
+        xkbActions.c \
+        xkbPrKeyEv.c
+
+# this should be replaced by a common library or something, ideally -d
+XKBFILE_SRCS = \
+        maprules.c \
+        xkmread.c \
+        xkbtext.c \
+        xkbfmisc.c \
+        xkbout.c
+
+X11_SRCS = \
+        XKBMisc.c \
+        XKBAlloc.c \
+        XKBGAlloc.c \
+        XKBMAlloc.c
+
+libxkb_la_SOURCES = $(DDX_SRCS) $(DIX_SRCS) $(XKBFILE_SRCS) $(X11_SRCS)
+libxkbstubs_la_SOURCES = ddxVT.c ddxPrivate.c ddxKillSrv.c
+
+EXTRA_DIST = xkbDflts.h xkbgeom.h xkb.h
+
+xkbcompileddir = $(XKB_COMPILED_DIR)
+dist_xkbcompiled_DATA = README.compiled
diff --git a/xorg-server/xkb/README.compiled b/xorg-server/xkb/README.compiled
index 71caa2f63..66df26234 100644
--- a/xorg-server/xkb/README.compiled
+++ b/xorg-server/xkb/README.compiled
@@ -1,13 +1,13 @@
-
-The X server uses this directory to store the compiled version of the
-current keymap and/or any scratch keymaps used by clients.  The X server
-or some other tool might destroy or replace the files in this directory,
-so it is not a safe place to store compiled keymaps for long periods of
-time.  The default keymap for any server is usually stored in:
-     X<num>-default.xkm
-where <num> is the display number of the server in question, which makes
-it possible for several servers *on the same host* to share the same 
-directory.
-
-Unless the X server is modified, sharing this directory between servers on
-different hosts could cause problems.
+
+The X server uses this directory to store the compiled version of the
+current keymap and/or any scratch keymaps used by clients.  The X server
+or some other tool might destroy or replace the files in this directory,
+so it is not a safe place to store compiled keymaps for long periods of
+time.  The default keymap for any server is usually stored in:
+     X<num>-default.xkm
+where <num> is the display number of the server in question, which makes
+it possible for several servers *on the same host* to share the same 
+directory.
+
+Unless the X server is modified, sharing this directory between servers on
+different hosts could cause problems.
diff --git a/xorg-server/xkb/XKM_file_format.txt b/xorg-server/xkb/XKM_file_format.txt
index 0ba28ee8c..865973dc1 100644
--- a/xorg-server/xkb/XKM_file_format.txt
+++ b/xorg-server/xkb/XKM_file_format.txt
@@ -1,684 +1,684 @@
-                        XKM File Format Description
-                                Version 15
-
-1. Introduction
-
-The XKM file format is the exchange format for XKB keyboard descriptions
-between the server and xkbcomp. Usually, the server forks off xkbcomp,
-xkbcomp compiles the XKM format from the given parameters.
-The resulting XKM file is put into a directory readable by the server and
-then parsed.
-
-The XKM format is little more than a binary dump of various XKB-specific
-structures and hence tied to the ABI of the server.
-
-                              ❧❧❧❧❧❧❧❧❧❧❧
-
-1.1 About this file format description
-
-This description was produced by analyzing the XKM parsing code. Parts of
-the file description present in the original format specification may be
-missing. This description thus cannot be a reference document for XKM
-implementations.
-
-No description of the meaning of the various fields is given here. Refer to
-the XKB protocol specification for more details.
-                              ❧❧❧❧❧❧❧❧❧❧❧
-
-2. Notations used in this document
-
-Notation for structures:
-
-┌───
-  Name of struct
-	name of field:		type or fixed value of field
-	name of field:		type or fixed value of field
-└───
-
-Data types are identical to those used in the X Protocol specification
-except where noted otherwise. Structs specific to XKM are prefixed with XKM,
-defines specific to the XKB protocol specification are prefixed with Xkb and
-their value is equivalent to that in the protocol specification.
-
-Multiple instances of a given type are denoted in the following form:
-	name of field:		LISTofFIELDTYPE
-
-Length specifiers for such fields are usually prefixed with num_. For
-example, a struct containing a num_foo of 8 and a 'foo' field contains 8
-structures of type 'foo'.
-
-Variable length padding is specified as pad(x), where x is the length of the
-data to be padded out to a multiple of 4 bytes. For example, given an x of
-10, pad(x) would be the remaining 2 bytes to pad the whole struct to 12
-bytes.
-
-A special notation is a variable content struct. In this case, the contents
-of the struct depend on the value of one or more specific fields.
-┌───
-  Name of struct
-	field:			type or fixed value of field
-	field:			type or fixed value of field
-	───
-	field ⇒ value 1
-	⇒
-		specific field:		type
-		specific field:		type
-	───
-        field ⇒ value 2
-	⇒
-		specific field:		type
-		specific field:		type
-└───
-This notation denotes that if field is of value 1, this struct contains the
-specific fields listed underneath value 1.
-
-                              ❧❧❧❧❧❧❧❧❧❧❧
-
-3. XKM Format
-
-The XKM format is a binary format with structs usually being padded to a
-multiple of 4 bytes. No provisions for endianess are provided, the parser is
-left to guess the endianess of the XKM file.
-
-                              ❧❧❧❧❧❧❧❧❧❧❧
-3.1 Common data types
-
-┌───
-  XKMCountedString
-	count:			CARD16
-	string:			count * CHAR
-	pad:			pad(count + 2)
-└───
-
-XKMCountedString is used for user-readable identifiers. Prime example are
-the level names and the section names ("complete", "evdev(inet)", etc.)
-
-┌───
-  XKMGroupBits:		CARD8
-	group1			0x1
-	group2			0x2
-	group3			0x4
-	group4			0x8
-└───
-
-                              ❧❧❧❧❧❧❧❧❧❧❧
-
-3.2 Header and Table of Contents
-
-┌───
-  XKMHeader
-	version:		CARD8
-	identifier1:		'm'
-	identifier2:		'k'
-	idenfifier3:		'x'
-└───
-
-The XKM file format has a 4 byte header identifying the file and the XKM
-version. The header is followed by the table of contents indicating the
-sections present in this file.
-
-┌───
-  XKMFileInfo
-	type:			CARD8
-	min_keycode:		CARD8
-	max_keycode:		CARD8
-	num_sectioninfo:	CARD8
-	present:		CARD16
-	pad:			CARD16
-	sectioninfo:		LISTofXKMSectionInfo
-└───
-
-min_keycode and max_keycode specify the keycode range for this keyboard
-descriptions. The core protocol requires min_keycode always be equal to or
-greater than 8.
-
-┌───
-  XKMSectionInfo
-	type:			CARD16
-		XkmTypesIndex		0
-		XkmCompatMapIndex	1
-		XkmSymbolsIndex		2
-		XkmIndicatorsIndex	3
-		XkmKeyNamesIndex	4
-		XkmGeometryIndex	5
-		XkmVirtualModsIndex	6
-	format:			CARD16
-	size:			CARD16
-	offset:			CARD16
-└───
-
-Describes the section found in a chunk of a file. This struct is found
-_twice_ in the file per section, once as part of the XKMFileInfo, once at
-the beginning of the actual section (see offset).
-The type specifies the type of the section, the section is to be parsed
-according to this type.
-Size and offset specify the size in bytes and the offset into the file in
-bytes, respectively.
-
-3.3 Sections
-
-Each section resides at the offset specified in the XKMFileInfo sectioninfo.
-
-                              ❧❧❧❧❧❧❧❧❧❧❧
-
-3.3.1 XKMTypes
-
-An XKMTypes section describes the key types defined in a layout. Roughly
-speaking, a key type defines how many levels a given key has and which
-modifiers change to a particular level.
-
-┌───
-  XKMTypesSection
-	section_info:		XKMSectionInfo
-	name:			XKMCountedString
-	num_types:		CARD16
-	pad:			CARD16
-	types:			LISTofXKMKeyType
-└───
-
-┌───
-  XKMKeyType
-	real_mods:		CARD8
-	num_levels:		CARD8
-	virt_mods:		CARD16
-	num_map_entries: 	CARD8
-	num_level_names: 	CARD8
-	perserve:	 	CARD8
-	pad:			CARD8
-	map_entries:		LISTofXKMKTMapEntry
-	name:			XKMCountedString
-	mods:			LISTofXKMModsDesc
-	level_names:		LISXTofXKMCountedString
-└───
-
-The num_map_entries specifies the number of structs in both map_entries and mods. mods is only present if preserve is TRUE.
-
-┌───
-  XKMKTMapEntry
-	level:			CARD8
-	real_mods:		CARD8
-	virt_mods:		CARD16
-└───
-
-┌───
-  XKMModsDesc
-	real_mods:		CARD8
-	pad:			CARD8
-	virt_mods:		CARD16
-└───
-
-                              ❧❧❧❧❧❧❧❧❧❧❧
-3.3.2 XKMCompatMap
-
-An XKMCompatMap section describes the actions a keyboard may trigger. This
-ranges from the TerminateServer action to simple modifier bits.
-
-┌───
-  XKMCompatMap
-	section_info:		XKMSectionInfo
-	name:			XKMCountedString
-	num_si:			CARD16
-	group_mask:		XKMGroupBits
-	pad:			CARD8
-	si:			LISTofXKMSymInterpreterDesc
-	groups:			LISTofXKMModsDesc
-└───
-
-One XKMModsDesc is present for each bit set in group_mask.
-
-┌───
-  XKMSymInterpretDesc
-	sym:			CARD32
-	mods:			CARD8
-	match:			CARD8
-	virtual_mod:		CARD8
-	flags:			CARD8
-	action_type:		CARD8
-	action_data:		XKMActionData
-└───
-
-Where the action is 7 bytes of CARD8 whose content is determined by
-action_type.
-
-┌───
-  XKMActionData:
-	pad0:			CARD8
-	pad1:			CARD16
-	pad2:			CARD32
-	───
-        action_type ⇒ XkbSA_SetMods ||
-        action_type ⇒ XkbSA_LatchMods ||
-        action_type ⇒ XkbSA_LockMods
-	⇒
-		flags:			CARD8
-		mask:			CARD8
-		real_mods:		CARD8
-		vmods1:			CARD8
-		vmods2:			CARD8
-		pad:			CARD16
-	───
-        action_type ⇒ XkbSA_SetGroup ||
-        action_type ⇒ XkbSA_LatchGroup ||
-        action_type ⇒ XkbSA_LockGroup
-	⇒
-		flags:			CARD8
-		group_XXX:		CARD8
-		pad0:			CARD8
-		pad1:			CARD32
-	───
-        action_type ⇒ XkbSA_MovePtr
-	⇒
-		flags:			CARD8
-		high_XXX:		CARD8
-		low_XXX:		CARD8
-		high_YYY:		CARD8
-		low_YYY:		CARD8
-		pad:			CARD16
-	───
-        action_type ⇒ XkbSA_PtrBtn ||
-        action_type ⇒ XkbSA_LockPtrBtn
-	⇒
-		flags:			CARD8
-		count:			CARD8
-		button:			CARD8
-		pad:			CARD32
-	───
-        action_type ⇒ XkbSA_DeviceBtn ||
-        action_type ⇒ XkbSA_LockLockPtrBtn
-	⇒
-		flags:			CARD8
-		count:			CARD8
-		button:			CARD8
-		device:			CARD8
-		pad0:			CARD8
-		pad1:			CARD16
-	───
-        action_type ⇒ XkbSA_SetPtrDflt
-	⇒
-		flags:			CARD8
-		affect:			CARD8
-		valueXXX:		CARD8
-		pad0:			CARD32
-	───
-        action_type ⇒ XkbSA_ISOLock
-	⇒
-		flags:			CARD8
-		mask:			CARD8
-		real_mods:		CARD8
-		group_XXX:		CARD8
-		affect:			CARD8
-		vmods1:			CARD8
-		vmods1:			CARD8
-	───
-        action_type ⇒ XkbSA_SwitchScreen
-	⇒
-		flags:			CARD8
-		screenXXX:		CARD8
-		pad0:			CARD8
-		pad1:			CARD32
-	───
-        action_type ⇒ XkbSA_SetControls ||
-        action_type ⇒ XkbSA_LockControls
-	⇒
-		flags:			CARD8
-		ctrls3:			CARD8
-		ctrls2:			CARD8
-		ctrls1:			CARD8
-		ctrls0:			CARD8
-		pad:			CARD16
-	───
-        action_type ⇒ XkbSA_RedirectKey
-	⇒
-		new_key:		CARD8
-		mods_mask:		CARD8
-		mods:			CARD8
-		vmods_mask0:		CARD8
-		vmods_mask1:		CARD8
-		vmods0:			CARD8
-		vmods1:			CARD8
-	───
-        action_type ⇒ XkbSA_DeviceValuator
-	⇒
-		device:		CARD8
-		v1_what:		CARD8
-		v1_idx:			CARD8
-		v1_value:		CARD8
-		v2_what:		CARD8
-		v2_idx:			CARD8
-		v2_value:		CARD8
-		pad:			CARD8
-	───
-        action_type ⇒ XkbSA_XFree86Private ||
-        action_type ⇒ XkbSA_Terminate
-	⇒
-		pad0:			CARD8
-		pad1:			CARD16
-		pad2:			CARD32
-	───
-        action_type ⇒ XkbSA_ActionMessage
-	⇒
-		press_msg:		BOOL
-		release_msg:		BOOL
-		gen_event:		BOOL
-		message:		4 * CHAR
-└───
-
-Note: XkbSA_ActionMessage is currently unsupported and the contents are
-ignored.
-
-                              ❧❧❧❧❧❧❧❧❧❧❧
-3.3.3 XkmSymbols
-
-The symbols in a keymap define the actual keysyms each key may produce.
-
-┌───
-  XKMSymbols
-	section_info:		XKMSectionInfo
-	name:			XKMCountedString
-	min_keycode:		CARD8
-	max_keycode:		CARD8
-	group_names_mask:	XKMGroupBits
-	num_vmod_maps:		CARD8
-	group_names:		LISTofXKMCountedString
-	keysyms:		XKMKeysymMapDesc
-	vmod_maps:		XKMVModMapDesc
-└───
-One group_name is present for each bit set in group_names_mask.
-The number of keysyms present is max_keycode - min_keycode + 1.
-
-┌───
-  XKMKeysymMapDesc
-	width:			CARD8
-	num_groups:		CARD8
-	modifier_map:		CARD8
-	flags:			CARD8
-	names:			LISTofXKMCountedString
-	syms:			LISTofCARD32
-	behavior:		XKMBehaviorDesc
-└───
-
-Presence of names is conditional on the XkmKeyHasTypes flag. The number of
-strings is equal to the number of group bits in group_names_mask in the
-preceeding XKMSymbols section.
-The number of elements in syms is equal to width * num_groups.
-Presence of behavior is conditional on the XkmKeyHasBehavior flag.
-
-┌───
-  XKMKeyBehaviorDesc
-	type:			CARD8
-	data:			CARD8
-	pad:			CARD16
-└───
-
-┌───
-  XKMVModMapDesc
-	key:			CARD8
-	pad:			CARD8
-	vmods:			CARD16
-└───
-
-                              ❧❧❧❧❧❧❧❧❧❧❧
-
-3.3.4 XKMIndicators
-
-┌───
-  XKMIndicators
-	section_info:		XKMSectionInfo
-	name:			XKMCountedString
-	num_indicators:		CARD8
-	pad0:			CARD8
-	pad1:			CARD16
-	indicators:		LISTofXKMIndicatorMapDesc
-└───
-
-┌───
-  XKMIndicatorMapDesc
-	name:			XKMCountedString
-	indicator:		CARD8
-	flags:			CARD8
-	which_mods:		CARD8
-	real_mods:		CARD8
-	vmods:			CARD16
-	which_groups:		CARD8
-	groups:			CARD8
-	ctrls:			CARD32
-└───
-                              ❧❧❧❧❧❧❧❧❧❧❧
-
-3.3.5 XKMKeyNames
-
-┌───
-  XKMKeyNames
-	section_info:		XKMSectionInfo
-	name:			XKMCountedString
-	min_keycode:		CARD8
-	max_keycode:		CARD8
-	num_aliases:		CARD8
-	pad:			CARD8
-	keynames:		LISTofXKMKeyname
-	aliases:		LISTofXKMKeyAlias
-└───
-
-keynames contains max_keycode - min_keycode + 1 entries.
-
-┌───
-  XkmKeyname
-	name:			4 * CHAR8
-└───
-
-┌───
-  XkmKeyAlias
-	real:			XkmKeyname
-	alias:			XkmKeyname
-└───
-
-                              ❧❧❧❧❧❧❧❧❧❧❧
-
-3.3.5 XKMGeometry
-
-┌───
-  XKMGeometry
-	section_info:		XKMSectionInfo
-	name:			XKMCountedString
-	width_mm:		CARD16
-	height_mm:		CARD16
-	base_color_ndx:		CARD8
-	label_color_ndx:	CARD8
-	num_properties:		CARD16
-	num_colors:		CARD16
-	num_shapes:		CARD16
-	num_sections:		CARD16
-	num_doodads:		CARD16
-	num_key_aliases:	CARD16
-	pad:			CARD16
-	label_font:		XKMCountedString
-	properties:		LISTofXKMGeomProperty
-	colors:			LISTofXKMCountedString
-	shapes:			LISTofXKMGeomShape
-	sections:		LISTofXKMGeomSection
-	doodads:		LISTofXKMGeomDoodad
-	key_aliases:		LISTofXKMKeyAlias
-└───
-
-┌───
-  XKMGeomProperty
-	name:			XKMCountedString
-	value:			XKMCountedString
-
-└───
-
-┌───
-  XKMGeomShape
-	name:			XKMCountedString
-	num_outlines:		CARD8
-	primary_idx:		CARD8
-	approx_idx:		CARD8
-	pad:			CARD8
-	outlines:		LISTofXKMOutlineDesc
-└───
-
-┌───
-  XKMOutlineDesc
-	num_points:		CARD8
-	corner_radius:		CARD8
-	pad:			CARD16
-	points:			LISTofXKMPointDesc
-└───
-
-┌───
-  XKMPointDesc
-	x:			INT16
-	y:			INT16
-└───
-
-┌───
-  XKMGeomSection
-	name:			XKMCountedString
-	top:			INT16
-	left:			INT16
-	width:			CARD16
-	height:			CARD16
-	angle:			INT16
-	priority:		CARD8
-	num_rows:		CARD8
-	num_doodads:		CARD8
-	num_overlays:		CARD8
-	pad:			CARD16
-	rows:			LISTofXKMRowDesc
-	doodads:		LISTofXKMGeomDoodad
-	overlays:		LISTofXKMGeomOverlay
-└───
-
-┌───
-  XKMRowDesc
-	top:			INT16
-	left:			INT16
-	num_keys:		CARD8
-	vertical:		BOOL
-	pad:			CARD16
-	keys:			XKMKeyDesc
-└───
-
-┌───
-  XKMKeyDesc
-	name:			XKMKeyname
-	gap:			INT16
-	shape_idx:		CARD8
-	color_idx:		CARD8
-└───
-
-┌───
-  XKMGeomDoodad
-	name:			XKMCountedString
-	type:			CARD8
-	priority:		CARD8
-	top:			INT16
-	left:			INT16
-	pad1:			CARD16
-	pad2:			CARD32
-	pad3:			CARD32
-	───
-        type ⇒ XkbOutlineDoodad ||
-        type ⇒ XkbSolideDoodad
-	⇒
-		type:			CARD8
-		priority:		CARD8
-		top:			INT16
-		left:			INT16
-		angle:			INT16
-		color_idx:		CARD8
-		shape_idx:		CARD8
-		pad0:			CARD16
-		pad1:			CARD32
-	───
-        type ⇒ XkbTextDoodad
-	⇒
-		type:			CARD8
-		priority:		CARD8
-		top:			INT16
-		left:			INT16
-		angle:			INT16
-		width:			CARD16
-		height:			CARD16
-		color_idx:		CARD8
-		pad0:			CARD8
-		pad1:			CARD16
-		text:			XKMCountedString
-		font:			XKMCountedString
-	───
-        type ⇒ XkbIndicatorDoodad
-	⇒
-		type:			CARD8
-		priority:		CARD8
-		top:			INT16
-		left:			INT16
-		shape_idx:		CARD8
-		on_color_idx:		CARD8
-		off_color_idx:		CARD8
-		pad0:			CARD8
-		pad1:			CARD16
-		pad2:			CARD32
-	───
-        type ⇒ XkbLogoDoodad
-	⇒
-		type:			CARD8
-		priority:		CARD8
-		top:			INT16
-		left:			INT16
-		angle:			INT16
-		color_idx:		CARD8
-		shape_idx:		CARD8
-		pad0:			CARD16
-		pad1:			CARD32
-		logo_name:		XKMCountedString
-└───
-
-WARNING: XKMGeomDoodad has variable length depending on the type.
-NOTE: The current server implementation does not use all fields of all
-structures.
-
-┌───
-  XKMOverlayDesc
-	name:			XKMCountedString
-	num_rows:		CARD8
-	pad0:			CARD8
-	pad1:			CARD16
-	rows:			LISTofXKMOverlayRowDesc
-└───
-
-┌───
-  XKMOverlayRowDesc
-	name:			XKMCountedString
-	row_under:		CARD8
-	num_keys:		CARD8
-	pad:			CARD16
-	keys:			LISTofXKMOverlayKeyDesc
-└───
-
-┌───
-  XKMOverlayKeyDesc
-	over:			XKMKeyname
-	under:			XKMKeyname
-└───
-
-                              ❧❧❧❧❧❧❧❧❧❧❧
-
-3.3.6 XKMVirtualMods
-
-┌───
-  XKMOverlayRowDesc
-	section_info:		XKMSectionInfo
-	name:			XKMCountedString
-	bound_mask:		SETofVMODBITS
-	named_mask:		SETofVMODBITS
-	vmods:			LISTofCARD8
-	pad:			pad(vmods)
-	names:			LISTofXKMCountedString
-└───
-
-	VMODBITS:		CARD16
-
-Number of elements in vmods is equal to the number of bits set in
-bound_mask. The padding completes vmods to a multiple of 4 byte units.
-Number of elements in names is equal to the number of bits set in
-named_mask.
+                        XKM File Format Description
+                                Version 15
+
+1. Introduction
+
+The XKM file format is the exchange format for XKB keyboard descriptions
+between the server and xkbcomp. Usually, the server forks off xkbcomp,
+xkbcomp compiles the XKM format from the given parameters.
+The resulting XKM file is put into a directory readable by the server and
+then parsed.
+
+The XKM format is little more than a binary dump of various XKB-specific
+structures and hence tied to the ABI of the server.
+
+                              ❧❧❧❧❧❧❧❧❧❧❧
+
+1.1 About this file format description
+
+This description was produced by analyzing the XKM parsing code. Parts of
+the file description present in the original format specification may be
+missing. This description thus cannot be a reference document for XKM
+implementations.
+
+No description of the meaning of the various fields is given here. Refer to
+the XKB protocol specification for more details.
+                              ❧❧❧❧❧❧❧❧❧❧❧
+
+2. Notations used in this document
+
+Notation for structures:
+
+┌───
+  Name of struct
+	name of field:		type or fixed value of field
+	name of field:		type or fixed value of field
+└───
+
+Data types are identical to those used in the X Protocol specification
+except where noted otherwise. Structs specific to XKM are prefixed with XKM,
+defines specific to the XKB protocol specification are prefixed with Xkb and
+their value is equivalent to that in the protocol specification.
+
+Multiple instances of a given type are denoted in the following form:
+	name of field:		LISTofFIELDTYPE
+
+Length specifiers for such fields are usually prefixed with num_. For
+example, a struct containing a num_foo of 8 and a 'foo' field contains 8
+structures of type 'foo'.
+
+Variable length padding is specified as pad(x), where x is the length of the
+data to be padded out to a multiple of 4 bytes. For example, given an x of
+10, pad(x) would be the remaining 2 bytes to pad the whole struct to 12
+bytes.
+
+A special notation is a variable content struct. In this case, the contents
+of the struct depend on the value of one or more specific fields.
+┌───
+  Name of struct
+	field:			type or fixed value of field
+	field:			type or fixed value of field
+	───
+	field ⇒ value 1
+	⇒
+		specific field:		type
+		specific field:		type
+	───
+        field ⇒ value 2
+	⇒
+		specific field:		type
+		specific field:		type
+└───
+This notation denotes that if field is of value 1, this struct contains the
+specific fields listed underneath value 1.
+
+                              ❧❧❧❧❧❧❧❧❧❧❧
+
+3. XKM Format
+
+The XKM format is a binary format with structs usually being padded to a
+multiple of 4 bytes. No provisions for endianess are provided, the parser is
+left to guess the endianess of the XKM file.
+
+                              ❧❧❧❧❧❧❧❧❧❧❧
+3.1 Common data types
+
+┌───
+  XKMCountedString
+	count:			CARD16
+	string:			count * CHAR
+	pad:			pad(count + 2)
+└───
+
+XKMCountedString is used for user-readable identifiers. Prime example are
+the level names and the section names ("complete", "evdev(inet)", etc.)
+
+┌───
+  XKMGroupBits:		CARD8
+	group1			0x1
+	group2			0x2
+	group3			0x4
+	group4			0x8
+└───
+
+                              ❧❧❧❧❧❧❧❧❧❧❧
+
+3.2 Header and Table of Contents
+
+┌───
+  XKMHeader
+	version:		CARD8
+	identifier1:		'm'
+	identifier2:		'k'
+	idenfifier3:		'x'
+└───
+
+The XKM file format has a 4 byte header identifying the file and the XKM
+version. The header is followed by the table of contents indicating the
+sections present in this file.
+
+┌───
+  XKMFileInfo
+	type:			CARD8
+	min_keycode:		CARD8
+	max_keycode:		CARD8
+	num_sectioninfo:	CARD8
+	present:		CARD16
+	pad:			CARD16
+	sectioninfo:		LISTofXKMSectionInfo
+└───
+
+min_keycode and max_keycode specify the keycode range for this keyboard
+descriptions. The core protocol requires min_keycode always be equal to or
+greater than 8.
+
+┌───
+  XKMSectionInfo
+	type:			CARD16
+		XkmTypesIndex		0
+		XkmCompatMapIndex	1
+		XkmSymbolsIndex		2
+		XkmIndicatorsIndex	3
+		XkmKeyNamesIndex	4
+		XkmGeometryIndex	5
+		XkmVirtualModsIndex	6
+	format:			CARD16
+	size:			CARD16
+	offset:			CARD16
+└───
+
+Describes the section found in a chunk of a file. This struct is found
+_twice_ in the file per section, once as part of the XKMFileInfo, once at
+the beginning of the actual section (see offset).
+The type specifies the type of the section, the section is to be parsed
+according to this type.
+Size and offset specify the size in bytes and the offset into the file in
+bytes, respectively.
+
+3.3 Sections
+
+Each section resides at the offset specified in the XKMFileInfo sectioninfo.
+
+                              ❧❧❧❧❧❧❧❧❧❧❧
+
+3.3.1 XKMTypes
+
+An XKMTypes section describes the key types defined in a layout. Roughly
+speaking, a key type defines how many levels a given key has and which
+modifiers change to a particular level.
+
+┌───
+  XKMTypesSection
+	section_info:		XKMSectionInfo
+	name:			XKMCountedString
+	num_types:		CARD16
+	pad:			CARD16
+	types:			LISTofXKMKeyType
+└───
+
+┌───
+  XKMKeyType
+	real_mods:		CARD8
+	num_levels:		CARD8
+	virt_mods:		CARD16
+	num_map_entries: 	CARD8
+	num_level_names: 	CARD8
+	perserve:	 	CARD8
+	pad:			CARD8
+	map_entries:		LISTofXKMKTMapEntry
+	name:			XKMCountedString
+	mods:			LISTofXKMModsDesc
+	level_names:		LISXTofXKMCountedString
+└───
+
+The num_map_entries specifies the number of structs in both map_entries and mods. mods is only present if preserve is TRUE.
+
+┌───
+  XKMKTMapEntry
+	level:			CARD8
+	real_mods:		CARD8
+	virt_mods:		CARD16
+└───
+
+┌───
+  XKMModsDesc
+	real_mods:		CARD8
+	pad:			CARD8
+	virt_mods:		CARD16
+└───
+
+                              ❧❧❧❧❧❧❧❧❧❧❧
+3.3.2 XKMCompatMap
+
+An XKMCompatMap section describes the actions a keyboard may trigger. This
+ranges from the TerminateServer action to simple modifier bits.
+
+┌───
+  XKMCompatMap
+	section_info:		XKMSectionInfo
+	name:			XKMCountedString
+	num_si:			CARD16
+	group_mask:		XKMGroupBits
+	pad:			CARD8
+	si:			LISTofXKMSymInterpreterDesc
+	groups:			LISTofXKMModsDesc
+└───
+
+One XKMModsDesc is present for each bit set in group_mask.
+
+┌───
+  XKMSymInterpretDesc
+	sym:			CARD32
+	mods:			CARD8
+	match:			CARD8
+	virtual_mod:		CARD8
+	flags:			CARD8
+	action_type:		CARD8
+	action_data:		XKMActionData
+└───
+
+Where the action is 7 bytes of CARD8 whose content is determined by
+action_type.
+
+┌───
+  XKMActionData:
+	pad0:			CARD8
+	pad1:			CARD16
+	pad2:			CARD32
+	───
+        action_type ⇒ XkbSA_SetMods ||
+        action_type ⇒ XkbSA_LatchMods ||
+        action_type ⇒ XkbSA_LockMods
+	⇒
+		flags:			CARD8
+		mask:			CARD8
+		real_mods:		CARD8
+		vmods1:			CARD8
+		vmods2:			CARD8
+		pad:			CARD16
+	───
+        action_type ⇒ XkbSA_SetGroup ||
+        action_type ⇒ XkbSA_LatchGroup ||
+        action_type ⇒ XkbSA_LockGroup
+	⇒
+		flags:			CARD8
+		group_XXX:		CARD8
+		pad0:			CARD8
+		pad1:			CARD32
+	───
+        action_type ⇒ XkbSA_MovePtr
+	⇒
+		flags:			CARD8
+		high_XXX:		CARD8
+		low_XXX:		CARD8
+		high_YYY:		CARD8
+		low_YYY:		CARD8
+		pad:			CARD16
+	───
+        action_type ⇒ XkbSA_PtrBtn ||
+        action_type ⇒ XkbSA_LockPtrBtn
+	⇒
+		flags:			CARD8
+		count:			CARD8
+		button:			CARD8
+		pad:			CARD32
+	───
+        action_type ⇒ XkbSA_DeviceBtn ||
+        action_type ⇒ XkbSA_LockLockPtrBtn
+	⇒
+		flags:			CARD8
+		count:			CARD8
+		button:			CARD8
+		device:			CARD8
+		pad0:			CARD8
+		pad1:			CARD16
+	───
+        action_type ⇒ XkbSA_SetPtrDflt
+	⇒
+		flags:			CARD8
+		affect:			CARD8
+		valueXXX:		CARD8
+		pad0:			CARD32
+	───
+        action_type ⇒ XkbSA_ISOLock
+	⇒
+		flags:			CARD8
+		mask:			CARD8
+		real_mods:		CARD8
+		group_XXX:		CARD8
+		affect:			CARD8
+		vmods1:			CARD8
+		vmods1:			CARD8
+	───
+        action_type ⇒ XkbSA_SwitchScreen
+	⇒
+		flags:			CARD8
+		screenXXX:		CARD8
+		pad0:			CARD8
+		pad1:			CARD32
+	───
+        action_type ⇒ XkbSA_SetControls ||
+        action_type ⇒ XkbSA_LockControls
+	⇒
+		flags:			CARD8
+		ctrls3:			CARD8
+		ctrls2:			CARD8
+		ctrls1:			CARD8
+		ctrls0:			CARD8
+		pad:			CARD16
+	───
+        action_type ⇒ XkbSA_RedirectKey
+	⇒
+		new_key:		CARD8
+		mods_mask:		CARD8
+		mods:			CARD8
+		vmods_mask0:		CARD8
+		vmods_mask1:		CARD8
+		vmods0:			CARD8
+		vmods1:			CARD8
+	───
+        action_type ⇒ XkbSA_DeviceValuator
+	⇒
+		device:		CARD8
+		v1_what:		CARD8
+		v1_idx:			CARD8
+		v1_value:		CARD8
+		v2_what:		CARD8
+		v2_idx:			CARD8
+		v2_value:		CARD8
+		pad:			CARD8
+	───
+        action_type ⇒ XkbSA_XFree86Private ||
+        action_type ⇒ XkbSA_Terminate
+	⇒
+		pad0:			CARD8
+		pad1:			CARD16
+		pad2:			CARD32
+	───
+        action_type ⇒ XkbSA_ActionMessage
+	⇒
+		press_msg:		BOOL
+		release_msg:		BOOL
+		gen_event:		BOOL
+		message:		4 * CHAR
+└───
+
+Note: XkbSA_ActionMessage is currently unsupported and the contents are
+ignored.
+
+                              ❧❧❧❧❧❧❧❧❧❧❧
+3.3.3 XkmSymbols
+
+The symbols in a keymap define the actual keysyms each key may produce.
+
+┌───
+  XKMSymbols
+	section_info:		XKMSectionInfo
+	name:			XKMCountedString
+	min_keycode:		CARD8
+	max_keycode:		CARD8
+	group_names_mask:	XKMGroupBits
+	num_vmod_maps:		CARD8
+	group_names:		LISTofXKMCountedString
+	keysyms:		XKMKeysymMapDesc
+	vmod_maps:		XKMVModMapDesc
+└───
+One group_name is present for each bit set in group_names_mask.
+The number of keysyms present is max_keycode - min_keycode + 1.
+
+┌───
+  XKMKeysymMapDesc
+	width:			CARD8
+	num_groups:		CARD8
+	modifier_map:		CARD8
+	flags:			CARD8
+	names:			LISTofXKMCountedString
+	syms:			LISTofCARD32
+	behavior:		XKMBehaviorDesc
+└───
+
+Presence of names is conditional on the XkmKeyHasTypes flag. The number of
+strings is equal to the number of group bits in group_names_mask in the
+preceeding XKMSymbols section.
+The number of elements in syms is equal to width * num_groups.
+Presence of behavior is conditional on the XkmKeyHasBehavior flag.
+
+┌───
+  XKMKeyBehaviorDesc
+	type:			CARD8
+	data:			CARD8
+	pad:			CARD16
+└───
+
+┌───
+  XKMVModMapDesc
+	key:			CARD8
+	pad:			CARD8
+	vmods:			CARD16
+└───
+
+                              ❧❧❧❧❧❧❧❧❧❧❧
+
+3.3.4 XKMIndicators
+
+┌───
+  XKMIndicators
+	section_info:		XKMSectionInfo
+	name:			XKMCountedString
+	num_indicators:		CARD8
+	pad0:			CARD8
+	pad1:			CARD16
+	indicators:		LISTofXKMIndicatorMapDesc
+└───
+
+┌───
+  XKMIndicatorMapDesc
+	name:			XKMCountedString
+	indicator:		CARD8
+	flags:			CARD8
+	which_mods:		CARD8
+	real_mods:		CARD8
+	vmods:			CARD16
+	which_groups:		CARD8
+	groups:			CARD8
+	ctrls:			CARD32
+└───
+                              ❧❧❧❧❧❧❧❧❧❧❧
+
+3.3.5 XKMKeyNames
+
+┌───
+  XKMKeyNames
+	section_info:		XKMSectionInfo
+	name:			XKMCountedString
+	min_keycode:		CARD8
+	max_keycode:		CARD8
+	num_aliases:		CARD8
+	pad:			CARD8
+	keynames:		LISTofXKMKeyname
+	aliases:		LISTofXKMKeyAlias
+└───
+
+keynames contains max_keycode - min_keycode + 1 entries.
+
+┌───
+  XkmKeyname
+	name:			4 * CHAR8
+└───
+
+┌───
+  XkmKeyAlias
+	real:			XkmKeyname
+	alias:			XkmKeyname
+└───
+
+                              ❧❧❧❧❧❧❧❧❧❧❧
+
+3.3.5 XKMGeometry
+
+┌───
+  XKMGeometry
+	section_info:		XKMSectionInfo
+	name:			XKMCountedString
+	width_mm:		CARD16
+	height_mm:		CARD16
+	base_color_ndx:		CARD8
+	label_color_ndx:	CARD8
+	num_properties:		CARD16
+	num_colors:		CARD16
+	num_shapes:		CARD16
+	num_sections:		CARD16
+	num_doodads:		CARD16
+	num_key_aliases:	CARD16
+	pad:			CARD16
+	label_font:		XKMCountedString
+	properties:		LISTofXKMGeomProperty
+	colors:			LISTofXKMCountedString
+	shapes:			LISTofXKMGeomShape
+	sections:		LISTofXKMGeomSection
+	doodads:		LISTofXKMGeomDoodad
+	key_aliases:		LISTofXKMKeyAlias
+└───
+
+┌───
+  XKMGeomProperty
+	name:			XKMCountedString
+	value:			XKMCountedString
+
+└───
+
+┌───
+  XKMGeomShape
+	name:			XKMCountedString
+	num_outlines:		CARD8
+	primary_idx:		CARD8
+	approx_idx:		CARD8
+	pad:			CARD8
+	outlines:		LISTofXKMOutlineDesc
+└───
+
+┌───
+  XKMOutlineDesc
+	num_points:		CARD8
+	corner_radius:		CARD8
+	pad:			CARD16
+	points:			LISTofXKMPointDesc
+└───
+
+┌───
+  XKMPointDesc
+	x:			INT16
+	y:			INT16
+└───
+
+┌───
+  XKMGeomSection
+	name:			XKMCountedString
+	top:			INT16
+	left:			INT16
+	width:			CARD16
+	height:			CARD16
+	angle:			INT16
+	priority:		CARD8
+	num_rows:		CARD8
+	num_doodads:		CARD8
+	num_overlays:		CARD8
+	pad:			CARD16
+	rows:			LISTofXKMRowDesc
+	doodads:		LISTofXKMGeomDoodad
+	overlays:		LISTofXKMGeomOverlay
+└───
+
+┌───
+  XKMRowDesc
+	top:			INT16
+	left:			INT16
+	num_keys:		CARD8
+	vertical:		BOOL
+	pad:			CARD16
+	keys:			XKMKeyDesc
+└───
+
+┌───
+  XKMKeyDesc
+	name:			XKMKeyname
+	gap:			INT16
+	shape_idx:		CARD8
+	color_idx:		CARD8
+└───
+
+┌───
+  XKMGeomDoodad
+	name:			XKMCountedString
+	type:			CARD8
+	priority:		CARD8
+	top:			INT16
+	left:			INT16
+	pad1:			CARD16
+	pad2:			CARD32
+	pad3:			CARD32
+	───
+        type ⇒ XkbOutlineDoodad ||
+        type ⇒ XkbSolideDoodad
+	⇒
+		type:			CARD8
+		priority:		CARD8
+		top:			INT16
+		left:			INT16
+		angle:			INT16
+		color_idx:		CARD8
+		shape_idx:		CARD8
+		pad0:			CARD16
+		pad1:			CARD32
+	───
+        type ⇒ XkbTextDoodad
+	⇒
+		type:			CARD8
+		priority:		CARD8
+		top:			INT16
+		left:			INT16
+		angle:			INT16
+		width:			CARD16
+		height:			CARD16
+		color_idx:		CARD8
+		pad0:			CARD8
+		pad1:			CARD16
+		text:			XKMCountedString
+		font:			XKMCountedString
+	───
+        type ⇒ XkbIndicatorDoodad
+	⇒
+		type:			CARD8
+		priority:		CARD8
+		top:			INT16
+		left:			INT16
+		shape_idx:		CARD8
+		on_color_idx:		CARD8
+		off_color_idx:		CARD8
+		pad0:			CARD8
+		pad1:			CARD16
+		pad2:			CARD32
+	───
+        type ⇒ XkbLogoDoodad
+	⇒
+		type:			CARD8
+		priority:		CARD8
+		top:			INT16
+		left:			INT16
+		angle:			INT16
+		color_idx:		CARD8
+		shape_idx:		CARD8
+		pad0:			CARD16
+		pad1:			CARD32
+		logo_name:		XKMCountedString
+└───
+
+WARNING: XKMGeomDoodad has variable length depending on the type.
+NOTE: The current server implementation does not use all fields of all
+structures.
+
+┌───
+  XKMOverlayDesc
+	name:			XKMCountedString
+	num_rows:		CARD8
+	pad0:			CARD8
+	pad1:			CARD16
+	rows:			LISTofXKMOverlayRowDesc
+└───
+
+┌───
+  XKMOverlayRowDesc
+	name:			XKMCountedString
+	row_under:		CARD8
+	num_keys:		CARD8
+	pad:			CARD16
+	keys:			LISTofXKMOverlayKeyDesc
+└───
+
+┌───
+  XKMOverlayKeyDesc
+	over:			XKMKeyname
+	under:			XKMKeyname
+└───
+
+                              ❧❧❧❧❧❧❧❧❧❧❧
+
+3.3.6 XKMVirtualMods
+
+┌───
+  XKMOverlayRowDesc
+	section_info:		XKMSectionInfo
+	name:			XKMCountedString
+	bound_mask:		SETofVMODBITS
+	named_mask:		SETofVMODBITS
+	vmods:			LISTofCARD8
+	pad:			pad(vmods)
+	names:			LISTofXKMCountedString
+└───
+
+	VMODBITS:		CARD16
+
+Number of elements in vmods is equal to the number of bits set in
+bound_mask. The padding completes vmods to a multiple of 4 byte units.
+Number of elements in names is equal to the number of bits set in
+named_mask.
diff --git a/xorg-server/xkb/xkb.h b/xorg-server/xkb/xkb.h
index a526356a9..328ac8f00 100644
--- a/xorg-server/xkb/xkb.h
+++ b/xorg-server/xkb/xkb.h
@@ -1,32 +1,32 @@
-#ifndef _XKB_H
-#define _XKB_H
-
-extern int ProcXkbUseExtension(ClientPtr client);
-extern int ProcXkbSelectEvents(ClientPtr client);
-extern int ProcXkbBell(ClientPtr client);
-extern int ProcXkbGetState(ClientPtr client);
-extern int ProcXkbLatchLockState(ClientPtr client);
-extern int ProcXkbGetControls(ClientPtr client);
-extern int ProcXkbSetControls(ClientPtr client);
-extern int ProcXkbGetMap(ClientPtr client);
-extern int ProcXkbSetMap(ClientPtr client);
-extern int ProcXkbGetCompatMap(ClientPtr client);
-extern int ProcXkbSetCompatMap(ClientPtr client);
-extern int ProcXkbGetIndicatorState(ClientPtr client);
-extern int ProcXkbGetIndicatorMap(ClientPtr client);
-extern int ProcXkbSetIndicatorMap(ClientPtr client);
-extern int ProcXkbGetNamedIndicator(ClientPtr client);
-extern int ProcXkbSetNamedIndicator(ClientPtr client);
-extern int ProcXkbGetNames(ClientPtr client);
-extern int ProcXkbSetNames(ClientPtr client);
-extern int ProcXkbGetGeometry(ClientPtr client);
-extern int ProcXkbSetGeometry(ClientPtr client);
-extern int ProcXkbPerClientFlags(ClientPtr client);
-extern int ProcXkbListComponents(ClientPtr client);
-extern int ProcXkbGetKbdByName(ClientPtr client);
-extern int ProcXkbGetDeviceInfo(ClientPtr client);
-extern int ProcXkbSetDeviceInfo(ClientPtr client);
-extern int ProcXkbSetDebuggingFlags(ClientPtr client);
-
-extern void XkbExtensionInit(void);
-#endif
+#ifndef _XKB_H
+#define _XKB_H
+
+extern int ProcXkbUseExtension(ClientPtr client);
+extern int ProcXkbSelectEvents(ClientPtr client);
+extern int ProcXkbBell(ClientPtr client);
+extern int ProcXkbGetState(ClientPtr client);
+extern int ProcXkbLatchLockState(ClientPtr client);
+extern int ProcXkbGetControls(ClientPtr client);
+extern int ProcXkbSetControls(ClientPtr client);
+extern int ProcXkbGetMap(ClientPtr client);
+extern int ProcXkbSetMap(ClientPtr client);
+extern int ProcXkbGetCompatMap(ClientPtr client);
+extern int ProcXkbSetCompatMap(ClientPtr client);
+extern int ProcXkbGetIndicatorState(ClientPtr client);
+extern int ProcXkbGetIndicatorMap(ClientPtr client);
+extern int ProcXkbSetIndicatorMap(ClientPtr client);
+extern int ProcXkbGetNamedIndicator(ClientPtr client);
+extern int ProcXkbSetNamedIndicator(ClientPtr client);
+extern int ProcXkbGetNames(ClientPtr client);
+extern int ProcXkbSetNames(ClientPtr client);
+extern int ProcXkbGetGeometry(ClientPtr client);
+extern int ProcXkbSetGeometry(ClientPtr client);
+extern int ProcXkbPerClientFlags(ClientPtr client);
+extern int ProcXkbListComponents(ClientPtr client);
+extern int ProcXkbGetKbdByName(ClientPtr client);
+extern int ProcXkbGetDeviceInfo(ClientPtr client);
+extern int ProcXkbSetDeviceInfo(ClientPtr client);
+extern int ProcXkbSetDebuggingFlags(ClientPtr client);
+
+extern void XkbExtensionInit(void);
+#endif
diff --git a/xorg-server/xkeyboard-config/.gitignore b/xorg-server/xkeyboard-config/.gitignore
new file mode 100644
index 000000000..5536f8837
--- /dev/null
+++ b/xorg-server/xkeyboard-config/.gitignore
@@ -0,0 +1,102 @@
+ABOUT-NLS
+ChangeLog
+Makefile
+Makefile.in
+aclocal.m4
+autom4te-2.53.cache
+config.cache
+config.log
+config.rpath
+config.status
+config.status.lineno
+configure
+intl
+intltool-extract
+intltool-extract.in
+intltool-merge
+intltool-merge.in
+intltool-update
+intltool-update.in
+m4
+autom4te.cache
+mkinstalldirs
+intltool-modules
+config.h
+config.h.in
+stamp-h1
+xkeyboard-config*.tar.*
+xkeyboard-config.pc
+xkeyboard-config.spec
+xkeyboard-config.prj
+xkeyboard-config.pws
+.tm_project.cache
+INSTALL
+config.guess
+config.sub
+configure.lineno
+install-sh
+missing
+compat/compat.dir
+geometry/geometry.dir
+keycodes/keycodes.dir
+keymap/keymap.dir
+man/xkeyboard-config.7
+man/xkeyboard-config.man
+po/.intltool-merge-cache
+po/Makefile.in.in
+po/Makevars.template
+po/POTFILES
+po/Rules-quot
+po/boldquot.sed
+po/en@boldquot.header
+po/en@quot.header
+po/insert-header.sin
+po/messages
+po/quot.sed
+po/remove-potcdate.sed
+po/remove-potcdate.sin
+po/*.gmo
+po/*.pot
+po/messages.mo
+po/stamp-po
+rules/base.extras.xml
+rules/base.xml
+rules/base.lst
+rules/base
+rules/sun.xml
+semantics/semantics.dir
+symbols/symbols.dir
+tests/*.lst
+tests/*.sd
+types/types.dir
+rules/extras/base.l1v1_s.part
+rules/extras/base.l2_s.part
+rules/extras/base.l2v2_s.part
+rules/extras/base.l3_s.part
+rules/extras/base.l3v3_s.part
+rules/extras/base.l4_s.part
+rules/extras/base.l4v4_s.part
+rules/extras/base.ml1_s.part
+rules/extras/base.ml1v1_s.part
+rules/extras/base.ml_s.part
+rules/extras/base.mlv_s.part
+rules/compat/base.l2_s.part
+rules/compat/base.l3_s.part
+rules/compat/base.l4_s.part
+rules/compat/base.l2v2_s.part
+rules/compat/base.l3v3_s.part
+rules/compat/base.l4v4_s.part
+rules/compat/base.ml1_s.part
+rules/compat/base.ml1v1_s.part
+rules/compat/base.ml_s.part
+rules/compat/base.mlv_s.part
+tests/mxkbledpanel/mxkbledpanel
+tests/mxkbledpanel/mxkbledpanel._man
+tests/reg2ll.lstbase
+po/stamp-it
+rules/evdev
+rules/evdev.extras.xml
+rules/evdev.extras.xml.in
+rules/evdev.lst
+rules/evdev.xml
+rules/evdev.xml.in
diff --git a/xorg-server/xkeyboard-config/AUTHORS b/xorg-server/xkeyboard-config/AUTHORS
index 451e9c08d..ff240c480 100644
--- a/xorg-server/xkeyboard-config/AUTHORS
+++ b/xorg-server/xkeyboard-config/AUTHORS
@@ -1,8 +1,8 @@
-Сергей Удальцов (Sergey Udaltsov) <svu@users.sourceforge.net>
-
-Andriy Rysin <arysin@myrealbox.com>
-Denis Barbier <barbier@linuxfr.org>
-Frank Murphy <murphyf+xfree86@f-m.fm>
-Ivan Pascal <pascal@info.tsu.ru>
-Nicolas Mailhot <nicolas.mailhot@laposte.net>
-Данило Шеган <dsegan@gmx.net>
+Сергей Удальцов (Sergey Udaltsov) <svu@users.sourceforge.net>
+
+Andriy Rysin <arysin@myrealbox.com>
+Denis Barbier <barbier@linuxfr.org>
+Frank Murphy <murphyf+xfree86@f-m.fm>
+Ivan Pascal <pascal@info.tsu.ru>
+Nicolas Mailhot <nicolas.mailhot@laposte.net>
+Данило Шеган <dsegan@gmx.net>
diff --git a/xorg-server/xkeyboard-config/BUGS b/xorg-server/xkeyboard-config/BUGS
index cb48ff636..285e01251 100644
--- a/xorg-server/xkeyboard-config/BUGS
+++ b/xorg-server/xkeyboard-config/BUGS
@@ -1,70 +1,70 @@
--- Freedesktop.ORG
-
-http://freedesktop.org/bugzilla/show_bug.cgi?id=320
-http://bugs.xfree86.org/show_bug.cgi?id=1155
-
-	DONE: Added microsoftprousb
-
-http://freedesktop.org/bugzilla/show_bug.cgi?id=326
-http://bugs.xfree86.org/show_bug.cgi?id=1227
-
-	?: Which of 'inet' files is right?
-	
-http://freedesktop.org/bugzilla/show_bug.cgi?id=365
-
-	DONE: Two keysyms swapped in us(intl)
- 
-http://freedesktop.org/bugzilla/show_bug.cgi?id=371
-
-	?: What exactly is broken? Some patch would be nice
-
-http://freedesktop.org/bugzilla/show_bug.cgi?id=458
-
-	DONE: Changed Farsi to Iranian 
-
-http://freedesktop.org/bugzilla/show_bug.cgi?id=463
-
-	?: Don't know how to fix, really. Let's see.
-
-http://freedesktop.org/bugzilla/show_bug.cgi?id=496
-
-	DONE: Added Gyration Compact Keyboard
-
-http://freedesktop.org/bugzilla/show_bug.cgi?id=574
-
-	DONE: The patch applied
-
-http://freedesktop.org/bugzilla/show_bug.cgi?id=587
-
-	?: Which of altwin options should be included?
-	Some part of meta_win is already there
-
-http://freedesktop.org/bugzilla/show_bug.cgi?id=630
-
-	DONE: Logitech iTouch Cordless Keyboard (model Y-RB6) added
-
-http://freedesktop.org/bugzilla/show_bug.cgi?id=666
-
-	DONE: Long ago added alt_super_win
-
-http://freedesktop.org/bugzilla/show_bug.cgi?id=711
-
-	DONE: Added Super Power Multimedia Keyboard
-
-http://freedesktop.org/bugzilla/show_bug.cgi?id=743
-
-	DONE: Armenian fixed
-
-http://freedesktop.org/bugzilla/show_bug.cgi?id=744
-
-	DONE: Model a4techKB21 added
-
-http://freedesktop.org/bugzilla/show_bug.cgi?id=926
-
-	TODO:
--- GNOME
-
-http://bugzilla.gnome.org/show_bug.cgi?id=144646
-http://bugs.xfree86.org/show_bug.cgi?id=1415
-
-	DONE: Fixed, thanks to Dmitry
+-- Freedesktop.ORG
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=320
+http://bugs.xfree86.org/show_bug.cgi?id=1155
+
+	DONE: Added microsoftprousb
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=326
+http://bugs.xfree86.org/show_bug.cgi?id=1227
+
+	?: Which of 'inet' files is right?
+	
+http://freedesktop.org/bugzilla/show_bug.cgi?id=365
+
+	DONE: Two keysyms swapped in us(intl)
+ 
+http://freedesktop.org/bugzilla/show_bug.cgi?id=371
+
+	?: What exactly is broken? Some patch would be nice
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=458
+
+	DONE: Changed Farsi to Iranian 
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=463
+
+	?: Don't know how to fix, really. Let's see.
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=496
+
+	DONE: Added Gyration Compact Keyboard
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=574
+
+	DONE: The patch applied
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=587
+
+	?: Which of altwin options should be included?
+	Some part of meta_win is already there
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=630
+
+	DONE: Logitech iTouch Cordless Keyboard (model Y-RB6) added
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=666
+
+	DONE: Long ago added alt_super_win
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=711
+
+	DONE: Added Super Power Multimedia Keyboard
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=743
+
+	DONE: Armenian fixed
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=744
+
+	DONE: Model a4techKB21 added
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=926
+
+	TODO:
+-- GNOME
+
+http://bugzilla.gnome.org/show_bug.cgi?id=144646
+http://bugs.xfree86.org/show_bug.cgi?id=1415
+
+	DONE: Fixed, thanks to Dmitry
diff --git a/xorg-server/xkeyboard-config/COPYING b/xorg-server/xkeyboard-config/COPYING
index 4efb62906..49983da29 100644
--- a/xorg-server/xkeyboard-config/COPYING
+++ b/xorg-server/xkeyboard-config/COPYING
@@ -1,190 +1,190 @@
-Copyright 1996 by Joseph Moss
-Copyright (C) 2002-2007 Free Software Foundation, Inc.
-Copyright (C) Dmitry Golubev <lastguru@mail.ru>, 2003-2004
-Copyright (C) 2004, Gregory Mokhin <mokhin@bog.msu.ru>
-Copyright (C) 2006 Erdal Ronahî
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of the copyright holder(s) not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  The copyright holder(s) makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-THE COPYRIGHT HOLDER(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright (c) 1996  Digital Equipment Corporation
-
-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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment 
-Corporation shall not be used in advertising or otherwise to promote
-the sale, use or other dealings in this Software without prior written
-authorization from Digital Equipment Corporation.
-
-
-Copyright 1996, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-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 OPEN GROUP 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 Open Group 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 Open Group.
-
-
-Copyright 2004-2005 Sun Microsystems, Inc.  All rights reserved.
-
-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 (including the next
-paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
-
-
-Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright (c) 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 (C) 2004, 2006 Ævar Arnfjörð Bjarmason <avarab@gmail.com>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-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 OPEN GROUP 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 a copyright holder shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization of
-the copyright holder.
-
-
-Copyright (C) 1999, 2000 by Anton Zinoviev <anton@lml.bas.bg>
-
-This software may be used, modified, copied, distributed, and sold,
-in both source and binary form provided that the above copyright
-and these terms are retained. Under no circumstances is the author
-responsible for the proper functioning of this software, nor does
-the author assume any responsibility for damages incurred with its
-use.
-
-Permission is granted to anyone to use, distribute and modify
-this file in any way, provided that the above copyright notice
-is left intact and the author of the modification summarizes
-the changes in this header.
-
-This file is distributed without any expressed or implied warranty.
+Copyright 1996 by Joseph Moss
+Copyright (C) 2002-2007 Free Software Foundation, Inc.
+Copyright (C) Dmitry Golubev <lastguru@mail.ru>, 2003-2004
+Copyright (C) 2004, Gregory Mokhin <mokhin@bog.msu.ru>
+Copyright (C) 2006 Erdal Ronahî
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of the copyright holder(s) not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  The copyright holder(s) makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+THE COPYRIGHT HOLDER(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright (c) 1996  Digital Equipment Corporation
+
+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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment 
+Corporation shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from Digital Equipment Corporation.
+
+
+Copyright 1996, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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 Open Group 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 Open Group.
+
+
+Copyright 2004-2005 Sun Microsystems, Inc.  All rights reserved.
+
+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 (including the next
+paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+
+
+Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
+
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting
+documentation, and that the name of Silicon Graphics not be 
+used in advertising or publicity pertaining to distribution 
+of the software without specific prior written permission.
+Silicon Graphics makes no representation about the suitability 
+of this software for any purpose. It is provided "as is"
+without any express or implied warranty.
+
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+Copyright (c) 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 (C) 2004, 2006 Ævar Arnfjörð Bjarmason <avarab@gmail.com>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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 a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization of
+the copyright holder.
+
+
+Copyright (C) 1999, 2000 by Anton Zinoviev <anton@lml.bas.bg>
+
+This software may be used, modified, copied, distributed, and sold,
+in both source and binary form provided that the above copyright
+and these terms are retained. Under no circumstances is the author
+responsible for the proper functioning of this software, nor does
+the author assume any responsibility for damages incurred with its
+use.
+
+Permission is granted to anyone to use, distribute and modify
+this file in any way, provided that the above copyright notice
+is left intact and the author of the modification summarizes
+the changes in this header.
+
+This file is distributed without any expressed or implied warranty.
diff --git a/xorg-server/xkeyboard-config/CREDITS b/xorg-server/xkeyboard-config/CREDITS
index 7a05b27ec..b31a3298d 100644
--- a/xorg-server/xkeyboard-config/CREDITS
+++ b/xorg-server/xkeyboard-config/CREDITS
@@ -1,3 +1,3 @@
-Ivan A Derzhanski <iad@math.bas.bg>
-Runa Aruna <runa_aruna@yahoo.com>
-Fr?d?ric BOITEUX <fboiteux@calistel.com>
+Ivan A Derzhanski <iad@math.bas.bg>
+Runa Aruna <runa_aruna@yahoo.com>
+Fr?d?ric BOITEUX <fboiteux@calistel.com>
diff --git a/xorg-server/xkeyboard-config/ChangeLog b/xorg-server/xkeyboard-config/ChangeLog
index 28c811580..51627ab6e 100644
--- a/xorg-server/xkeyboard-config/ChangeLog
+++ b/xorg-server/xkeyboard-config/ChangeLog
@@ -1 +1 @@
-ChangeLog file is not used. Use "git log" instead
+ChangeLog file is not used. Use "git log" instead
diff --git a/xorg-server/xkeyboard-config/ChangeLog.old b/xorg-server/xkeyboard-config/ChangeLog.old
index 40e24271b..2b2b62542 100644
--- a/xorg-server/xkeyboard-config/ChangeLog.old
+++ b/xorg-server/xkeyboard-config/ChangeLog.old
@@ -1,3891 +1,3891 @@
-2009-12-21 Sergey Udaltsov
-
-	* symbols/ru: Added ru(typewriter-legacy),
-	https://bugs.freedesktop.org/show_bug.cgi?id=25726
-	* rules/base.o_s.part, rules/base.xml.in, symbols/group: added
-	grp(lctrl_rctrl_switch),
-	https://bugs.freedesktop.org/show_bug.cgi?id=25727
-
-2009-11-27 Sergey Udaltsov
-
-	* symbols/se: Reintroduced the broken bar in the Swedish symbol
-	layout. http://bugs.freedesktop.org/show_bug.cgi?id=8491
-
-2009-11-25 Sergey Udaltsov
-
-	* rules/base.m_s.part, symbols/inet: a bit of optimization, K6C to map
-	to Eject, always in media section
-
-2009-11-24 Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/lt: removed unneeded lt(balticplus),
-	http://bugs.freedesktop.org/show_bug.cgi?id=25263
-
-2009-11-21 Sergey Udaltsov
-
-	* ../rules/base.xml.in, ../symbols/pl: added pl(dvp),
-	http://bugs.freedesktop.org/show_bug.cgi?id=25200
-
-2009-11-18 Sergey Udaltsov
-
-	* symbols/tm: small fix for tm layout, related to Ctrl+? shortcuts
-	https://bugs.freedesktop.org/show_bug.cgi?id=25074
-
-2009-11-15 Octavio Alvarez
-
-	* rules/base.xml.in: Removed thinkpadintl from base.xml.in.
-
-2009-10-20 Sergey Udaltsov
-
-	* symbols/sun_vndr/us: added backspace mapping,
-	https://bugs.freedesktop.org/show_bug.cgi?id=24554
-
-2009-10-13 Sergey Udaltsov
-
-	* rules/base.lists.part, symbols/macintosh_vndr/Makefile.am,
-	symbols/macintosh_vndr/es: Spanish mac layout just included the
-	general one
-	* rules/base.xml.in, symbols/ch: fixed Swiss default layout, added
-	legacy variant, http://bugs.freedesktop.org/show_bug.cgi?id=24490
-
-2009-10-12 Sergey Udaltsov
-
-	* rules/base.xml.in: USA Russian Phonetic keyboard layout not found in
-	search by Languages - Russian,
-	http://bugs.freedesktop.org/show_bug.cgi?id=24485
-
-2009-09-30 Sergey Udaltsov
-
-	* rules/base.o_s.part, rules/base.xml.in, symbols/group: added
-	grp:rctrl_rshift_toggle option,
-	http://bugs.freedesktop.org/show_bug.cgi?id=24234
-
-2009-09-29 Sergey Udaltsov
-
-	* configure.in, NEWS, po/*.po: preparing 1.7
-
-2009-09-15 Sergey Udaltsov
-
-	* symbols/es: addind dead_tilde,
-	https://bugs.freedesktop.org/show_bug.cgi?id=23876
-	* keycodes/sun, rules/base.m_k.part, rules/base.ml_s.part,
-	symbols/sun_vndr/us: fixed Sun keyboard model for type6,
-	https://bugs.freedesktop.org/show_bug.cgi?id=3952
-
-2009-09-08 Gaetan Nadon
-
-	* **/.cvsignore: remove cvsignore files.
-
-2009-09-02 Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/by: restructured Belarussian variants,
-	https://bugs.freedesktop.org/show_bug.cgi?id=23604
-
-2009-08-28 Sergey Udaltsov
-
-	* symbols/no: updated layout,
-	http://bugs.freedesktop.org/show_bug.cgi?id=23518
-
-2009-08-20 Sergey Udaltsov
-
-	* rules/base.o_s.part, rules/base.xml.in, symbols/capslock: added
-	caps:numlock, http://bugs.freedesktop.org/show_bug.cgi?id=23323
-
-2009-08-18 Peter Hutterer
-
-	* rules/base.o_s.part, rules/base.xml.in, symbols/capslock: added
-	caps:hyper, http://bugs.freedesktop.org/show_bug.cgi?id=23356
-
-2009-08-14 Sergey Udaltsov
-
-	* rules/base.o_s.part, rules/base.xml.in, symbols/capslock: added
-	caps:none option, http://bugs.freedesktop.org/show_bug.cgi?id=23243
-	* rules/base.xml.in, symbols/it: added it(us),
-	http://bugs.freedesktop.org/show_bug.cgi?id=23263
-
-2009-08-04 Sergey Udaltsov
-
-	* geometry/Makefile.am, rules/base.lists.part, rules/base.m_g.part,
-	rules/base.xml.in: added TypeMatrix geometries,
-	http://bugs.freedesktop.org/show_bug.cgi?id=23136
-
-2009-07-19 Sergey Udaltsov
-
-	* symbols/vn: fixed accent typing,
-	http://bugs.freedesktop.org/show_bug.cgi?id=22847
-
-2009-07-18 Sergey Udaltsov
-
-	* symbols/gb: fixed gb(colemak), several mappings added,
-	http://bugs.freedesktop.org/show_bug.cgi?id=22735
-
-2009-07-14 Sergey Udaltsov
-
-	* rules/base.extras.xml.in, rules/extras/variantsMapping.lst,
-	symbols/extras/us: added us(crd) to extras,
-	http://bugs.freedesktop.org/show_bug.cgi?id=22635
-
-2009-07-09 Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/bg: updated bg variants,
-	http://bugs.freedesktop.org/show_bug.cgi?id=22666
-
-2009-06-27 Sergey Udaltsov
-
-	* symbols/extras/us, rules/base.extras.xml.in,
-	rules/extras/variantsMapping.lst, symbols/extras/Makefile.am: Added 3
-	exotic us variants: ats, intl-unicode, alt-intl-unicode
-	http://bugs.freedesktop.org/show_bug.cgi?id=22004
-	http://bugs.freedesktop.org/show_bug.cgi?id=22446
-
-2009-06-22 Sergey Udaltsov
-
-	* .gitignore, configure.in, rules/Makefile.am,
-	rules/base.extras.xml.in, rules/base.l2_s.part, rules/base.l3_s.part,
-	rules/base.l4_s.part, rules/base.lists.part, rules/base.ml_s.part,
-	rules/bin/Makefile.am, rules/compat/ln_s.sh -> rules/bin/ln_s.sh,
-	rules/compat/lnv_s.sh -> rules/bin/lnv_s.sh, rules/compat/ml1_s.sh ->
-	rules/bin/ml1_s.sh, rules/compat/ml1v1_s.sh -> rules/bin/ml1v1_s.sh,
-	rules/compat/ml1v_s.sh -> rules/bin/ml1v_s.sh, rules/compat/ml_s.sh ->
-	rules/bin/ml_s.sh, rules/compat/mlv_s.sh -> rules/bin/mlv_s.sh,
-	rules/compat/Makefile.am, rules/compat/layoutsMapping.lst,
-	rules/compat/variantsMapping.lst, rules/extras/Makefile.am,
-	rules/extras/layoutsMapping.lst, symbols/extras/Makefile.am,
-	symbols/extras/rs: serious restructuring of the rules generation
-	scripts, for compat and extras. Also, adding exotic rs(combiningkeys)
-	variant, http://bugs.freedesktop.org/show_bug.cgi?id=21047
-
-2009-06-20 Sergey Udaltsov
-
-	* symbols/by: missing mappings,
-	https://bugs.freedesktop.org/show_bug.cgi?id=22386
-	* symbols/ca: fixed a couple of mappings in ca(shs)
-	http://bugs.freedesktop.org/show_bug.cgi?id=22388
-
-2009-06-19 Sergey Udaltsov
-
-	* symbols/de: small fix for a numbersign key,
-	http://bugs.freedesktop.org/show_bug.cgi?id=19934
-
-2009-06-15 Sergey Udaltsov
-
-	* symbols/inet: fixing ABNT2-specific mapping for keypad dot key,
-	http://bugs.freedesktop.org/show_bug.cgi?id=22303
-
-2009-06-14 Sergey Udaltsov
-
-	* rules/base.lists.part, rules/base.xml.in, symbols/inet: added
-	creativedw7000 model,
-	http://bugs.freedesktop.org/show_bug.cgi?id=22261
-
-2009-06-12 Sergey Udaltsov
-
-	* symbols/us: added extra symbols to us(altgr-intl),
-	http://bugs.freedesktop.org/show_bug.cgi?id=22249
-
-2009-06-11 Sergey Udaltsov
-
-	* rules/base.o_s.part, rules/base.xml.in, symbols/capslock: added
-	caps:super, http://bugs.freedesktop.org/show_bug.cgi?id=22184
-
-2009-06-09 Sergey Udaltsov
-
-	* symbols/ng: fixing 'e with dot below' in ng(olpc),
-	https://bugs.freedesktop.org/show_bug.cgi?id=20010
-	* rules/base.ml1_s.part: fixing misspeled variant name,
-	https://bugs.freedesktop.org/show_bug.cgi?id=15782
-	* symbols/tr: lost credits added,
-	https://bugs.freedesktop.org/show_bug.cgi?id=22079
-	* rules/base.xml.in, symbols/ru: added ru(bak),
-	https://bugs.freedesktop.org/show_bug.cgi?id=22101
-
-2009-05-31 Sergey Udaltsov
-
-	* symbols/altwin: setting explicit TWO_LEVEL on sections mapping RALT
-	, it is often ONE_LEVEL because of LEVEL3. Fixed
-	http://bugs.freedesktop.org/show_bug.cgi?id=21761
-
-2009-05-24 Sergey Udaltsov
-
-	* symbols/ua: fixed all references, from ua(basic) to ua(legacy),
-	finalizing http://bugs.freedesktop.org/show_bug.cgi?id=21302
-
-2009-05-18 Sergey Udaltsov
-
-	* symbols/de: adding acute to de(nodeadkeys),
-	http://bugs.freedesktop.org/show_bug.cgi?id=21794
-
-2009-05-12 Sergey Udaltsov
-
-	* NEWS, configure.in: bumping the release number
-
-2009-05-12  Reşat SABIQ
-
-	* configure.in (new locale), po/crh.po:
-	Added crh.po as well (as was done originally on January 30), 
-	based on Peter Hutterer's feedback regarding build process;
-	http://bugs.freedesktop.org/show_bug.cgi?id=19730
-
-2009-05-11 Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/pl: polished the description for
-	pl(dvorak_altquotes)
-
-2009-05-11  Reşat SABIQ
-
-	* configure.in (new locale), rules/base.xml.in,
-	symbols/ro, symbols/tr, symbols/ua, symbols/uz:
-	Added Crimean Tatar (Crimean Turkish) layouts;
-	http://bugs.freedesktop.org/show_bug.cgi?id=19730
-
-2009-05-07 Sergey Udaltsov
-
-	* symbols/ru: fixed Kalmyk variant
-
-2009-05-01 Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/ru: added ru(phonetic_winkeys),
-	http://bugs.freedesktop.org/show_bug.cgi?id=21474
-
-2009-04-29 Sergey Udaltsov
-
-	* rules/base.xml.in: fixed wrong locale code,
-	http://bugs.freedesktop.org/show_bug.cgi?id=21451
-
-2009-04-25 Sergey Udaltsov
-
-	* rules/base.o_s.part, rules/base.xml.in, symbols/Makefile.am,
-	symbols/pc, symbols/srvr_ctrl: Make C-A-Bksp an option,
-	http://bugs.freedesktop.org/show_bug.cgi?id=21274
-
-2009-04-23 Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/ua: making ua(unicode) default,
-	http://bugs.freedesktop.org/show_bug.cgi?id=21302
-
-2009-04-22 Sergey Udaltsov
-
-	* rules/compat/ln_s.sh, rules/compat/ml1_s.sh: improved compat rules,
-	hopefully fixing http://bugs.freedesktop.org/show_bug.cgi?id=8452
-
-2009-04-15 Sergey Udaltsov
-
-	* symbols/kr: fixed ordering issue,
-	http://bugs.freedesktop.org/show_bug.cgi?id=21211
-
-2009-04-14 Sergey Udaltsov
-
-	* symbols/kg: small update of the Kyrgyz layout,
-	http://bugs.freedesktop.org/show_bug.cgi?id=17505
-	* rules/base.xml.in, symbols/gb: added gb(extd),
-	http://bugs.freedesktop.org/show_bug.cgi?id=21121
-
-2009-04-03 Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/tm: added Turkmen layout+variant,
-	http://bugs.freedesktop.org/show_bug.cgi?id=21015
-	* symbols/rs: splitting latlevel3 and cyrlevel3,
-	http://bugs.freedesktop.org/show_bug.cgi?id=21044
-	* rules/base.m_s.part, rules/base.xml.in: Cherry B.UMLIMITED dummy
-	model, http://bugs.freedesktop.org/show_bug.cgi?id=21002
-
-2009-03-17 Sergey Udaltsov
-
-	* symbols/de: some useful symbols added on high shift levels,
-	http://bugs.freedesktop.org/show_bug.cgi?id=20551
-
-2009-03-16 Sergey Udaltsov
-
-	* rules/base.lists.part, rules/base.xml.in, symbols/kg: fixed Kyrgyz
-	variants, http://bugs.freedesktop.org/show_bug.cgi?id=17505
-
-2009-03-07 Sergey Udaltsov
-
-	* rules/base.m_s.part, rules/base.xml.in: added trust_slimline model,
-	http://bugs.freedesktop.org/show_bug.cgi?id=20513
-
-2009-03-04 Sergey Udaltsov
-
-	* rules/base.o_s.part, rules/base.xml.in, symbols/altwin, symbols/pc:
-	putting altwin:super_win into default configuration,
-	http://bugs.freedesktop.org/show_bug.cgi?id=19500
-
-2009-03-03 Sergey Udaltsov
-
-	* rules/base.lists.part, rules/base.ml1_s.part, rules/base.ml_s.part:
-	use br(thinkpad) for all thinkpads,
-	http://bugs.freedesktop.org/show_bug.cgi?id=20425
-
-2009-03-02 Sergey Udaltsov
-
-	* po/POTFILES.in: removed evdev.xml.in, which is exact copy of
-	base.xml.in (and not distributed),
-	http://bugs.freedesktop.org/show_bug.cgi?id=20107
-
-2009-02-26 Sergey Udaltsov
-
-	* symbols/fi: added missing (in pc101) mappings, on 4th level,
-	https://bugs.freedesktop.org/show_bug.cgi?id=20300
-	* keycodes/evdev, keycodes/xfree86, keymap/xfree86,
-	rules/base.lists.part, rules/base.m_k.part, rules/base.xml.in,
-	rules/evdev.m_k.part: dropping national-specific models abnt2, jp106,
-	kr106. The corresponding geometries are left in the codebase, for some
-	while
-
-2009-02-25 Sergey Udaltsov
-
-	* symbols/ru: missing minus and underscore are added to ru(phonetic),
-	http://bugs.freedesktop.org/show_bug.cgi?id=20093
-
-2009-02-19 Sergey Udaltsov
-
-	* keycodes/evdev, keycodes/xfree86, rules/base.m_k.part: merged
-	xfree86(jp106) section to basic xfree86 keycodes
-
-2009-02-14  Sergey Udaltsov
-
-	* symbols/sn, rules/base.xml.in, symbols/Makefile.am: added wolof
-	layout, http://bugs.freedesktop.org/show_bug.cgi?id=20004
-
-2009-02-13  Sergey Udaltsov
-
-	* symbols/inet: adding missing mappings to evdev,
-	http://bugs.freedesktop.org/show_bug.cgi?id=18854
-	* rules/base.xml.in: added lost lt(balticplus),
-	http://bugs.freedesktop.org/show_bug.cgi?id=20092
-
-2009-02-05  Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/in: added in(hin-wx),
-	http://bugs.freedesktop.org/show_bug.cgi?id=19753
-
-2009-02-04  Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/ru: added ru(dos),
-	http://bugs.freedesktop.org/show_bug.cgi?id=19880
-
-2009-02-01  Sergey Udaltsov
-
-	* rules/base.xml.in: fixed metainfo for fi(smi),
-	http://bugs.freedesktop.org/show_bug.cgi?id=19841
-	* rules/base.lists.part, rules/evdev.m_s.part: some kbds need tweaking
-	even with evdev, adding $evdevkbds (asked by Peter)
-	* symbols/inet: added battery key (asked by Peter)
-	* README: fixed docs url,
-	http://bugs.freedesktop.org/show_bug.cgi?id=9764
-
-2009-01-28  Sergey Udaltsov
-
-	* rules/base.ml_s.part: fixed sun-related rules,
-	http://bugs.freedesktop.org/show_bug.cgi?id=15782
-	* rules/base.m_s.part, rules/base.xml.in, symbols/inet: added
-	geniuskkb2050hs model,
-	http://bugs.freedesktop.org/show_bug.cgi?id=19694
-	* geometry/dell, rules/base.m_g.part: added latitude geometry,
-	http://bugs.freedesktop.org/show_bug.cgi?id=19750
-	* rules/base.xml.in, symbols/Makefile.am, symbols/brai,
-	symbols/braille: moved Braille symbols to the proper location,
-	http://bugs.freedesktop.org/show_bug.cgi?id=19695
-	* symbols/capslock: keep Escape working in caps:escape,
-	http://bugs.freedesktop.org/show_bug.cgi?id=19795
-	* rules/base.o_s.part, rules/base.xml.in, symbols/level3: added
-	lv3:enter_switch, http://bugs.freedesktop.org/show_bug.cgi?id=19773
-	* rules/base.xml.in, symbols/ca: added ca(eng) for convenience,
-	http://bugs.freedesktop.org/show_bug.cgi?id=19707
-
-2009-01-27  Sergey Udaltsov
-
-	* symbols/typo: fixed text selection,
-	http://bugs.freedesktop.org/show_bug.cgi?id=14022
-	* symbols/be: added missing character,
-	http://bugs.freedesktop.org/show_bug.cgi?id=19751
-	* symbols/fr: fixed . on numpad, period->KP_Decimal,
-	http://bugs.freedesktop.org/show_bug.cgi?id=19756
-	* NEWS, configure.in: preparing 1.5
-
-2009-01-24  Sergey Udaltsov
-
-	* rules/base.xml.in: added SV and US to the country list for latam,
-	http://bugs.freedesktop.org/show_bug.cgi?id=19710
-
-2009-01-22  Sergey Udaltsov
-
-	* symbols/fi: updated default Finnish variant,
-	http://bugs.freedesktop.org/show_bug.cgi?id=18742
-
-2009-01-13  Sergey Udaltsov
-
-	* symbols/typo, rules/base.l1o_s.part, rules/base.l2o_s.part,
-	rules/base.l3o_s.part, rules/base.l4o_s.part, rules/base.lo_s.part,
-	rules/base.xml.in, symbols/Makefile.am: added (inactive so far)
-	misc:typo option, first step to close
-	https://bugs.freedesktop.org/show_bug.cgi?id=14022
-
-2009-01-12  Sergey Udaltsov
-
-	* rules/Makefile.am, rules/merge.sh: fix the build (thanks to Oswald
-	Buddenhagen)
-
-2009-01-11  Sergey Udaltsov
-
-	* rules/base.o_s.part, rules/base.xml.in, symbols/capslock: added
-	option to use capslock as backspace,
-	http://bugs.freedesktop.org/show_bug.cgi?id=19508
-	* rules/base.xml.in, symbols/lt: removed unneeded variant,
-	http://bugs.freedesktop.org/show_bug.cgi?id=14096
-	* rules/base.xml.in, symbols/fr: added Breton variant,
-	http://bugs.freedesktop.org/show_bug.cgi?id=19506
-
-2009-01-10  Sergey Udaltsov
-
-	* rules/base.xml.in: More improvements(?) in descriptions, to make
-	them shorter
-
-2009-01-08  Sergey Udaltsov
-
-	* rules/base.xml.in: slightly reorganized descriptions for the group
-	related to switchers
-
-2009-01-06  Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/es, symbols/latam: added dead tilde
-	variants, http://bugs.freedesktop.org/show_bug.cgi?id=12568
-	* rules/base.xml.in, rules/compat/variantRename.lst, symbols/in,
-	symbols/pk: updated Urdu variants,
-	https://bugs.freedesktop.org/show_bug.cgi?id=8091
-
-2009-01-03  Sergey Udaltsov
-
-	* rules/compat/ln_s.sh, rules/compat/ml1_s.sh: fixed compat layout
-	renaming involving variants on replacement, part of the fix for
-	http://bugs.freedesktop.org/show_bug.cgi?id=8452
-
-2008-12-30  Sergey Udaltsov
-
-	* symbols/fi: updated 2 mappings according to the new standard,
-	http://bugs.freedesktop.org/show_bug.cgi?id=18742
-
-2008-12-29  Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/inet: added compal fl90,
-	http://bugs.freedesktop.org/show_bug.cgi?id=15820
-	* rules/base.m_s.part, rules/base.xml.in: added btc9116u model,
-	http://bugs.freedesktop.org/show_bug.cgi?id=15871
-	* symbols/gb: fixed gb dvorak,
-	http://bugs.freedesktop.org/show_bug.cgi?id=18244
-	* symbols/us: removed explicit CAPS mapping,
-	http://bugs.freedesktop.org/show_bug.cgi?id=18320
-
-2008-12-28  Sergey Udaltsov
-
-	*  rules/base.xml.in, symbols/de: updated neo variant,
-	http://bugs.freedesktop.org/show_bug.cgi?id=19308
-
-2008-12-26  Sergey Udaltsov
-
-	* rules/base.lists.part, rules/base.m_s.part, symbols/inet: using
-	acpi_common wherever possible, dropping (aliasing) unneeded models
-
-2008-12-25  Sergey Udaltsov
-
-	* rules/base.lists.part, rules/base.xml.in, symbols/inet: added
-	chicony0420 model, http://bugs.freedesktop.org/show_bug.cgi?id=15813
-	* symbols/inet: updated cymotionlinux model,
-	http://bugs.freedesktop.org/show_bug.cgi?id=15783
-
-2008-12-24  Sergey Udaltsov
-
-	* symbols/inet: consolidated a lot of mappings into nav_common
-
-2008-12-21  Sergey Udaltsov
-
-	* docs/README.enhancing: fixing the location of XKB proto docs,
-	http://bugs.freedesktop.org/show_bug.cgi?id=9764
-	* rules/base.xml.in, symbols/be: added oss variants,
-	http://bugs.freedesktop.org/show_bug.cgi?id=8854
-	* rules/base.m_s.part, rules/base.xml.in: added microsoftccurve2k
-	model http://bugs.freedesktop.org/show_bug.cgi?id=9772
-	* symbols/inet: changing globally XF86Refresh to XF86Reload,
-	http://bugs.freedesktop.org/show_bug.cgi?id=10751
-	* COPYING: added missing copyright notices,
-	http://bugs.freedesktop.org/show_bug.cgi?id=11095
-	* rules/base.lists.part, rules/base.xml.in, symbols/inet: added model
-	unitek_kb1925, http://bugs.freedesktop.org/show_bug.cgi?id=11579
-
-2008-12-18  Sergey Udaltsov
-
-	* keycodes/macintosh, rules/base.m_k.part, rules/base.o_k.part:
-	dropped the goodmap and badmap keycodes for apple - needed for a very
-	old kernels only. http://bugs.freedesktop.org/show_bug.cgi?id=9095
-	
-2008-12-17  Sergey Udaltsov
-
-	* symbols/capslock, symbols/compose, symbols/ctrl: fix lock modifier
-	for jp, making "CAPS" replace key,
-	http://bugs.freedesktop.org/show_bug.cgi?id=8805
-
-2008-12-15  Sergey Udaltsov
-
-	* symbols/ru: added Kalmyk variant, thanks to Anatoly Mironov and
-	others
-
-2008-12-12  Sergey Udaltsov
-
-	* symbols/fr: fixed bepo variant,
-	http://bugs.freedesktop.org/show_bug.cgi?id=17821
-	* symbols/ara: restoring presentation forms,
-	http://bugs.freedesktop.org/show_bug.cgi?id=18833
-	* rules/base.xml.in, rules/base.m_s.part: added targa_v811 model,
-	https://bugs.freedesktop.org/show_bug.cgi?id=5722
-
-2008-11-30  Sergey Udaltsov
-
-	* symbols/gr: added ralt switch to Greek default layout,
-	http://bugs.freedesktop.org/show_bug.cgi?id=18819
-	* rules/base.o_s.part, rules/base.xml.in, symbols/group: added
-	win_menu_switch option,
-	http://bugs.freedesktop.org/show_bug.cgi?id=18557
-
-2008-11-29  Sergey Udaltsov
-
-	* compat/level5: finally using Level5 characters,
-	https://bugs.freedesktop.org/show_bug.cgi?id=4411
-	* rules/base.xml.in: generalized Fujitsu-Siemens Amilo laptops, also
-	closing http://bugs.freedesktop.org/show_bug.cgi?id=5694
-	* rules/base.o_s.part, rules/base.xml.in, symbols/epo: added a couple
-	of Esperanto options,
-	http://bugs.freedesktop.org/show_bug.cgi?id=18142
-
-2008-11-27  Sergey Udaltsov
-
-	* ChangeLog, rules/base.lists.part, rules/base.xml.in, symbols/inet:
-	added cymotion expert model,
-	http://bugs.freedesktop.org/show_bug.cgi?id=18718
-
-2008-11-26  Sergey Udaltsov
-
-	* keycodes/evdev: fixed ABNT2 keycodes,
-	http://bugs.freedesktop.org/show_bug.cgi?id=18712
-	* keycodes/amiga, keycodes/ataritt, keycodes/fujitsu,
-	keycodes/macintosh, keycodes/sgi_vndr/indigo, keycodes/sgi_vndr/indy,
-	keycodes/sun, keycodes/xfree98: set keycode ranges 8-255, universally,
-	https://bugs.freedesktop.org/show_bug.cgi?id=12538
-
-2008-11-22  Sergey Udaltsov
-
-	* rules/base.o_s.part, rules/base.xml.in, symbols/group: added
-	grp(alt_space_toggle) option,
-	http://bugs.freedesktop.org/show_bug.cgi?id=15772
-	* symbols/ca, symbols/et, symbols/tr: small OLPC fixes,
-	http://bugs.freedesktop.org/show_bug.cgi?id=18645
-
-2008-11-20  Sergey Udaltsov
-
-	* rules/base.lists.part, rules/base.xml.in, symbols/inet: added HP dv5
-	keyboard, thanks to Giuseppe Bilotta
-
-2008-11-18  Sergey Udaltsov
-
-	* symbols/it: fixing it(olpc),
-	http://bugs.freedesktop.org/show_bug.cgi?id=18565
-
-2008-11-08  Sergey Udaltsov
-
-	* symbols/inet: using inet(acpi) wherever possible, fixing apple
-	section (thanks to Otavio Salvador)
-	* symbols/pl: missing mappings, thanks to Otavio and Debian
-
-2008-11-06  Sergey Udaltsov
-
-	* rules/base.o_s.part, rules/base.xml.in, symbols/capslock: added
-	capslock(escape)
-
-2008-10-18  Sergey Udaltsov
-
-	* rules/base.o_s.part, rules/base.xml.in, symbols/keypad,
-	symbols/kpdl: added 2 keypad options (hex and atm), also kpdl:semi,
-	http://bugs.freedesktop.org/show_bug.cgi?id=17110
-	* rules/base.xml.in, symbols/de: added de(qwerty)
-
-2008-10-14  Sergey Udaltsov
-
-	* rules/base.o_s.part, rules/base.xml.in, symbols/keypad: removed
-	keypad:phone_hex option, to be replaced with newer one
-	http://bugs.freedesktop.org/show_bug.cgi?id=17110
-
-2008-10-13  Sergey Udaltsov
-
-	* keycodes/evdev: fixed keycode comment from Peter Hutterer
-	* rules/base.xml.in, symbols/tj: cleaning the mess with tj variants,
-	http://bugs.freedesktop.org/show_bug.cgi?id=17975
-
-2008-10-11  Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/de: added Lower Sorbian variants,
-	http://bugs.freedesktop.org/show_bug.cgi?id=17855
-	* rules/base.xml.in, symbols/tj: added 2 new variants, std and legacy,
-	http://bugs.freedesktop.org/show_bug.cgi?id=17975
-	* rules/base.o_t.part, rules/base.xml.in, types/numpad: added
-	numpad(shift3) option,
-	http://bugs.freedesktop.org/show_bug.cgi?id=17110
-
-2008-10-03  Sergey Udaltsov
-
-	* symbols/ru: fix typewriter layout,
-	http://bugs.freedesktop.org/show_bug.cgi?id=17881
-
-2008-09-30  Sergey Udaltsov
-
-	* rules/base.o_s.part, rules/base.xml.in, symbols/altwin: added
-	Mac-like modifiers positioning,
-	http://bugs.freedesktop.org/show_bug.cgi?id=15655
-	* NEWS, configure.in: preparing 1.4
-
-2008-09-26  Sergey Udaltsov
-
-	* symbols/is: fixed AC11 mapping,
-	http://bugs.freedesktop.org/show_bug.cgi?id=17786
-
-2008-09-24  Sergey Udaltsov
-
-	* rules/base.xml.in: all descriptions are prefixed with underscore,
-	to make them translatable,
-	http://bugs.freedesktop.org/show_bug.cgi?id=17587
-
-2008-09-19  Sergey Udaltsov
-
-	* keycodes/evdev, symbols/inet: fixed evdev for abnt2 and jp106
-	http://bugs.freedesktop.org/show_bug.cgi?id=17656
-
-2008-09-18  Sergey Udaltsov
-
-	* rules/base.o_s.part, rules/base.xml.in: more mismatches fixed,
-	http://bugs.freedesktop.org/show_bug.cgi?id=17622
-
-2008-09-17  Sergey Udaltsov
-
-	* rules/base.o_s.part, rules/base.xml.in: fixed mismatch,
-	http://bugs.freedesktop.org/show_bug.cgi?id=17622
-
-2008-09-15  Sergey Udaltsov
-
-	* rules/base.o_s.part, rules/base.xml.in, symbols/capslock,
-	symbols/cz: added cz(ucw) and couple of options,
-	http://bugs.freedesktop.org/show_bug.cgi?id=17587
-	* rules/base.xml.in, symbols/gr: updated greek variants,
-	http://bugs.freedesktop.org/show_bug.cgi?id=17459
-
-2008-09-12  Sergey Udaltsov
-
-	* geometry/pc: added another pc geometry, with L-shaped Enter,
-	http://bugs.freedesktop.org/show_bug.cgi?id=17513
-
-2008-09-10  Sergey Udaltsov
-
-	* rules/base.lists.part, rules/base.xml.in, symbols/inet: added model
-	sven303, http://bugs.freedesktop.org/show_bug.cgi?id=17518
-
-2008-09-02  Sergey Udaltsov
-
-	* symbols/inet: fixed fscaa1667g,
-	http://bugs.freedesktop.org/show_bug.cgi?id=17389
-	* symbols/fr: fixed invalid keysym,
-	http://bugs.freedesktop.org/show_bug.cgi?id=17388
-	* rules/base.xml.in: some fixes for minor issues
-	* rules/base.xml.in, symbols/gb: added gb(dvorakukp),
-	http://bugs.freedesktop.org/show_bug.cgi?id=17370
-
-2008-08-16  Sergey Udaltsov
-
-	* rules/evdev.m_k.part, rules/evdev.m_s.part, keycodes/evdev,
-	po/POTFILES.in, po/xkeyboard-config.pot, rules/Makefile.am: implement
-	special ruleset for evdev driver
-	* added missing chars to Gurmukhi,
-	http://bugs.freedesktop.org/show_bug.cgi?id=17163
-
-2008-08-06  Sergey Udaltsov
-
-	* compat/Makefile.am, geometry/Makefile.am, keycodes/Makefile.am,
-	keymap/Makefile.am, rules/compat/Makefile.am, semantics/Makefile.am,
-	symbols/Makefile.am, types/Makefile.am, xkbrules.am: improving the
-	build, http://bugs.freedesktop.org/show_bug.cgi?id=17008
-
-2008-08-03  Sergey Udaltsov
-
-	* rules/compat/variantRename.lst: fixing compat rules for Romania,
-	http://bugs.freedesktop.org/show_bug.cgi?id=16872
-	* symbols/mt: fixed Maltese layout,
-	http://bugs.freedesktop.org/show_bug.cgi?id=16966
-	* symbols/fr: fixed fr(dvorak), making it legal
-	http://bugs.freedesktop.org/show_bug.cgi?id=15407
-
-2008-07-28  Sergey Udaltsov
-
-	* rules/base.lists.part, rules/base.xml.in, symbols/inet: added
-	ibm_spacesaver model,
-	http://bugs.freedesktop.org/show_bug.cgi?id=16767
-
-2008-07-22  Sergey Udaltsov
-
-	* rules/base.xml.in: fixed typo,
-	http://bugs.freedesktop.org/show_bug.cgi?id=16806
-
-2008-07-20  Sergey Udaltsov
-
-	* symbols/inet: fixed typo,
-	http://bugs.freedesktop.org/show_bug.cgi?id=16752
-
-2008-07-08  Sergey Udaltsov
-
-	* symbols/us: fixing us(mac),
-	https://bugs.freedesktop.org/show_bug.cgi?id=16641
-
-2008-07-01  Sergey Udaltsov
-
-	* symbols/is, rules/base.xml.in: added is(dvorak),
-	https://bugs.freedesktop.org/show_bug.cgi?id=16557
-
-2008-06-27  Sergey Udaltsov
-
-	* symbols/level5: using normal level5 keysyms
-	* rules/compat/ln_s.sh, rules/compat/lnv_s.sh, rules/compat/ml1_s.sh,
-	rules/compat/ml1v1_s.sh, rules/compat/ml1v_s.sh, rules/compat/ml_s.sh,
-	rules/compat/mlv_s.sh: fixed build process, thanks to Oswald
-	Buddenhagen
-
-2008-06-22  Sergey Udaltsov
-
-	* symbols/tj: sorted and fixed tj layout,
-	http://bugs.freedesktop.org/show_bug.cgi?id=16448
-
-2008-06-12  Sergey Udaltsov
-
-	* rules/base.o_s.part, rules/base.xml.in, symbols/keypad: added
-	keypad:phone_hex, http://bugs.freedesktop.org/show_bug.cgi?id=16298
-
-2008-06-09  Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/us: added us(chr),
-	http://bugs.freedesktop.org/show_bug.cgi?id=16283
-
-2008-06-06  Sergey Udaltsov
-
-	* geometry/pc: removed unneeded space,
-	http://bugs.freedesktop.org/show_bug.cgi?id=16258
-
-2008-06-04  Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/ru: added ru(sah),
-	http://bugs.freedesktop.org/show_bug.cgi?id=15872
-
-2008-06-01  Sergey Udaltsov
-
-	* rules/base.xml.in, rules/base.lists.part, symbols/inet: added
-	microsoft7000, http://bugs.freedesktop.org/show_bug.cgi?id=16087
-	* keycodes/xfree86, rules/base.m_g.part, rules/base.m_k.part,
-	rules/base.m_s.part, rules/base.xml.in: added model thinkpadz60,
-	http://bugs.freedesktop.org/show_bug.cgi?id=15999
-
-2008-05-31  Sergey Udaltsov
-
-	* symbols/gb, symbols/hu: fixed utf8
-
-2008-05-31  Sergey Udaltsov
-
-	* symbols/ru: fixed some includes, from common to winkeys (broken in
-	previous release)
-
-2008-05-30  Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/ca: added ca(kut),
-	http://bugs.freedesktop.org/show_bug.cgi?id=16048
-
-2008-05-27  Sergey Udaltsov
-
-	* symbols/inet: WWW is mapped to I02, because of some changes in
-	kernel or X server (on nx9020),
-	http://bugs.freedesktop.org/show_bug.cgi?id=7310
-	* symbols/us: fixed one-handed dvorak variants (dropped second group),
-	http://bugs.freedesktop.org/show_bug.cgi?id=5659
-	* symbols/fi: returned nbsp to 3rd level of space,
-	http://bugs.freedesktop.org/show_bug.cgi?id=12764
-	* configure.in, NEWS: preparing 1.3
-
-2008-05-12  Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/ro: changed default Romanian variant to
-	the right one, http://bugs.freedesktop.org/show_bug.cgi?id=13277
-
-2008-05-09  Sergey Udaltsov
-
-	* rules/compat/variantRename.lst, symbols/ru: default variant is
-	winkeys (till Daniel fixes xkbcomp)
-	* symbols/ua: small fix, from Andriy
-
-2008-05-01  Sergey Udaltsov
-
-	* po/POTFILES.in, rules/Makefile.am, rules/sgi*, rules/sun*: dropping
-	legacy unsupported rules. Confirmed with Alan Coopersmith (Sun
-	Microsystems)
-
-2008-04-30  Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/us: added us(dvp),
-	http://bugs.freedesktop.org/show_bug.cgi?id=15727
-
-2008-04-29  Sergey Udaltsov
-
-	* symbols/ca: fixed ca(shs),
-	http://bugs.freedesktop.org/show_bug.cgi?id=15756
-
-2008-04-23  Sergey Udaltsov
-
-	* symbols/es: revert broken idea about dead tilde,
-	http://bugs.freedesktop.org/show_bug.cgi?id=9763
-	* symbols/latam: revert broken idea about dead tilde,
-	http://bugs.freedesktop.org/show_bug.cgi?id=12568
-
-2008-04-22  Sergey Udaltsov
-
-	* rules/base.o_s.part, rules/base.xml.in, symbols/fr, symbols/nbsp,
-	types/pc: options for nonbreakspace handling,
-	http://bugs.freedesktop.org/show_bug.cgi?id=9529
-	* symbols/fi: dropping bad nbsp mapping,
-	http://bugs.freedesktop.org/show_bug.cgi?id=12764
-
-2008-04-21  Sergey Udaltsov
-
-	* rules/base.xml.in: fixed some ISO codes
-
-2008-04-19  Sergey Udaltsov
-
-	* symbols/ru, rules/base.xml.in, rules/compat/variantRename.lst:
-	changed ru(winkeys) to default
-	* rules/base.xml.in: put a lot of country/language info in
-
-2008-04-12  Sergey Udaltsov
-
-	* symbols/it: fixed it(geo),
-	https://bugs.freedesktop.org/show_bug.cgi?id=15058
-
-2008-04-07  Sergey Udaltsov
-
-	* symbols/group, rules/base.xml.in, rules/base.o_s.part: added
-	group(shift_caps_switch)
-	http://bugs.freedesktop.org/show_bug.cgi?id=15383
-
-2008-04-01  Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/gb: added gb(colemak),
-	http://bugs.freedesktop.org/show_bug.cgi?id=15303
-
-2008-03-30  Sergey Udaltsov
-
-	* symbols/gn, symbols/ng: fixed unicode sequences,
-	http://bugs.freedesktop.org/show_bug.cgi?id=15273
-	* rules/base.xml.in, symbols/ua: added ua(homophonic),
-	http://bugs.freedesktop.org/show_bug.cgi?id=15240
-
-2008-03-28  Sergey Udaltsov
-
-	* rules/base.o_s.part, rules/base.xml.in, symbols/compose: added
-	compose:102, http://bugs.freedesktop.org/show_bug.cgi?id=15246
-
-2008-03-22  Sergey Udaltsov
-
-	* symbols/fr: fixed fr(oss_nodeadkeys),
-	http://bugs.freedesktop.org/show_bug.cgi?id=15140
-
-2008-03-06  Sergey Udaltsov
-
-	* rules/base.lists.part, symbols/ca, symbols/fr: added ca(olpc),
-	removed fr(olpc), http://bugs.freedesktop.org/show_bug.cgi?id=14749
-
-2008-03-03  Sergey Udaltsov
-
-	* rules/base.lists.part, symbols/fr: added fr(olpc),
-	http://bugs.freedesktop.org/show_bug.cgi?id=14749
-	* symbols/lv: fixed lv accented characters,
-	http://bugs.freedesktop.org/show_bug.cgi?id=14765
-	* rules/base.lists.part, symbols/it: added it(olpc),
-	http://bugs.freedesktop.org/show_bug.cgi?id=14793
-
-2008-03-01  Sergey Udaltsov
-
-	* rules/base.lists.part, rules/base.m_s.part, rules/base.xml.in,
-	symbols/inet: reorganizing keyboard in symbols/inet. Some models are
-	now implemented as "virtual" (by rules only).
-	http://bugs.freedesktop.org/show_bug.cgi?id=14665
-
-2008-02-28  Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/in: added in(jhelum), other indian fixes,
-	http://bugs.freedesktop.org/show_bug.cgi?id=14595
-	* symbols/jp: small fix,
-	http://bugs.freedesktop.org/show_bug.cgi?id=8648
-
-2008-02-16  Sergey Udaltsov
-
-	* symbols/cz, symbols/sk: dropping KPDL mapping,
-	http://bugs.freedesktop.org/show_bug.cgi?id=14479
-
-2008-02-12  Sergey Udaltsov
-
-	* keycodes/sun, symbols/sun_vndr/us, rules/base.ml_s.part,
-	rules/base.xml.in: sun type6 kbd,
-	http://bugs.freedesktop.org/show_bug.cgi?id=13664
-
-2008-02-05  Sergey Udaltsov
-
-	* symbols/af: fixed AE09 in af(olpc-ps),
-	http://bugs.freedesktop.org/show_bug.cgi?id=14379
-
-2008-02-04  Sergey Udaltsov
-
-	* symbols/kh, rules/base.lists.part: added kh(olpc),
-	http://bugs.freedesktop.org/show_bug.cgi?id=14376
-
-2008-02-02  Sergey Udaltsov
-
-	* symbols/lt, rules/base.xml.in: added lt(lekp) etc,
-	http://bugs.freedesktop.org/show_bug.cgi?id=14096
-
-2008-01-31  Sergey Udaltsov
-
-	* symbols/af, rules/base.xml.in, rules/base.lists.part: changing
-	af(olpc-da) to af(olpc-fa),
-	http://bugs.freedesktop.org/show_bug.cgi?id=14319
-	* symbols/in: fixed space in in(olpc),
-	http://bugs.freedesktop.org/show_bug.cgi?id=14224
-
-2008-01-30  Sergey Udaltsov
-
-	* symbols/ca, rules/base.xml.in: adding ca(shs), closing
-	http://bugs.freedesktop.org/show_bug.cgi?id=14308
-	* symbols/mn: added mn(olpc),
-	http://bugs.freedesktop.org/show_bug.cgi?id=14307
-	* symbols/tr: fixed Turkish layouts,
-	http://bugs.freedesktop.org/show_bug.cgi?id=14286
-	* symbols/es, rules/base.xml.in: added es(ast),
-	http://bugs.freedesktop.org/show_bug.cgi?id=14277
-	* symbols/am, rules/base.lists.part: added am(olpc),
-	http://bugs.freedesktop.org/show_bug.cgi?id=14226
-	* symbols/af: fixed some keysyms,
-	http://bugs.freedesktop.org/show_bug.cgi?id=14309
-
-2008-01-29  Sergey Udaltsov
-
-	* NEWS, configure.in: preparing release 1.2
-
-2008-01-24  Sergey Udaltsov
-
-	* symbols/af, symbols/ara, symbols/et, symbols/group, symbols/in,
-	symbols/kz, symbols/np, symbols/pk, symbols/ru, symbols/th,
-	symbols/us: separating group(olpc), closing
-	http://bugs.freedesktop.org/show_bug.cgi?id=14225
-
-2008-01-21  Sergey Udaltsov
-
-	* symbols/gr: Polytonic Greek: Use new keysyms for dead psili and
-	dasia, http://bugs.freedesktop.org/show_bug.cgi?id=13275
-
-2008-01-11  Sergey Udaltsov
-
-	* rules/base.lists.part, symbols/in: added in(olpc), by Bernardo
-	Innocenti
-
-2008-01-07  Sergey Udaltsov
-
-	* geometry/thinkpad, keycodes/xfree86, rules/base.lists.part,
-	rules/base.m_g.part, rules/base.m_k.part, rules/base.xml.in,
-	symbols/inet: added thinkpad60 model (with geometry),
-	https://bugs.freedesktop.org/show_bug.cgi?id=13954
-
-2008-01-05  Sergey Udaltsov
-
-	* symbols/us: add (left,right)singlequotemark to us(-altgr)-intl
-	keymap, https://bugs.freedesktop.org/show_bug.cgi?id=13935
-
-2008-01-04  Sergey Udaltsov
-
-	* symbols/inet, rules/base.lists.part, rules/base.xml.in: adding BTC
-	6301URF, https://bugs.freedesktop.org/show_bug.cgi?id=13913
-	* symbols/macintosh_vndr/fr: added nodeadkeys,
-	https://bugs.freedesktop.org/show_bug.cgi?id=13934
-
-2008-01-03  Sergey Udaltsov
-
-	* symbols/pl, rules/base.xml.in: added pl(ru_phonetic_dvorak),
-	https://bugs.freedesktop.org/show_bug.cgi?id=13900
-
-2008-01-02  Sergey Udaltsov
-
-	* symbols/ro, rules/base.xml.in: small fixes for Romanian visible
-	strings from
-	https://bugs.freedesktop.org/show_bug.cgi?id=13277
-	* rules/base.xml.in, rules/compat/variantRename.lst, symbols/fr,
-	symbols/ge: moving ge(azerty_tscapo) to fr(geo), since that layout is
-	only used in France, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=13644
-	* symbols/ara: remove presentation forms from Arabic layout,
-	https://bugs.freedesktop.org/show_bug.cgi?id=13894
-
-2007-12-31  Sergey Udaltsov
-
-	* symbols/ro, rules/base.xml.in, rules/compat/variantRename.lst:
-	temporarily (partially) reverting
-	https://bugs.freedesktop.org/show_bug.cgi?id=13277
-
-2007-12-27  Sergey Udaltsov
-
-	* rules/base.o_s.part, rules/base.xml.in, symbols/capslock: adding xkb
-	option caps:swapescape,
-	https://bugs.freedesktop.org/show_bug.cgi?id=13824
-
-2007-12-26  Sergey Udaltsov
-
-	* symbols/ee, rules/base.xml.in: adding ee(us), polishing eurosign
-	usage in ee, https://bugs.freedesktop.org/show_bug.cgi?id=13799
-
-2007-12-25  Sergey Udaltsov
-
-	* symbols/eurosign, rules/base.xml.in, rules/base.o_s.part: add
-	eurosign(4)
-
-2007-12-23  Sergey Udaltsov
-
-	* symbols/inet, rules/base.xml.in: add logiultrax model,
-	https://bugs.freedesktop.org/show_bug.cgi?id=13028
-	* symbols/me, rules/base.xml.in: use Latin as default Montenegro
-	variant, https://bugs.freedesktop.org/show_bug.cgi?id=13777
-	* symbols/inet, keycodes/evdev: Kill off the I211 key in evdev
-
-2007-12-17  Sergey Udaltsov
-
-	* keycodes/sun, rules/base.m_k.part, rules/base.ml_s.part,
-	symbols/sun_vndr/cs, symbols/sun_vndr/cz, symbols/sun_vndr/de,
-	symbols/sun_vndr/dk, symbols/sun_vndr/fr, symbols/sun_vndr/gb,
-	symbols/sun_vndr/gr, symbols/sun_vndr/it, symbols/sun_vndr/jp,
-	symbols/sun_vndr/ko, symbols/sun_vndr/nl, symbols/sun_vndr/no,
-	symbols/sun_vndr/pl, symbols/sun_vndr/ru, symbols/sun_vndr/sw,
-	symbols/sun_vndr/tr, symbols/sun_vndr/tuv, symbols/sun_vndr/tw,
-	symbols/sun_vndr/us: added sun type 6 support,
-	https://bugs.freedesktop.org/show_bug.cgi?id=13664
-
-2007-12-10  Sergey Udaltsov
-
-	* symbols/inet: fixed thinkpad,
-	https://bugs.freedesktop.org/show_bug.cgi?id=13461
-
-2007-12-08  Sergey Udaltsov
-
-	* symbols/inet, rules/base.xml.in, rules/base.lists.part: added
-	fscaa1667g model, thanks to Matthew W. S. Bell
-	* symbols/gr: updated greek symbols,
-	https://bugs.freedesktop.org/show_bug.cgi?id=13570
-
-2007-11-30  Sergey Udaltsov
-
-	* symbols/us: small olpc fix
-	* symbols/inet: introducing nav_common and media_nav_common,
-	https://bugs.freedesktop.org/show_bug.cgi?id=13461
-
-2007-11-21  Sergey Udaltsov
-
-	* symbols/np, rules/base.lists.part: added np(olpc)
-	* symbols/et, rules/base.lists.part: added et(olpc)
-	* symbols/in: small fix in in(ben_probhat),
-	https://bugs.freedesktop.org/show_bug.cgi?id=12038
-
-2007-11-20  Sergey Udaltsov
-
-	* symbols/af, symbols/kz, symbols/ng, rules/base.xml.in: OLPC fixes
-	from Bernardo
-	* symbols/pk, rules/base.xml.in: fixing pk(ara) - it is not default
-
-2007-11-18  Sergey Udaltsov
-
-	* symbols/ro, rules/base.xml.in, rules/compat/variantRename.lst:
-	ro(comma), ro(academic) --> ro(cedilla), ro(std_cedilla),
-	https://bugs.freedesktop.org/show_bug.cgi?id=13277
-
-2007-11-17  Sergey Udaltsov
-
-	* symbols/ua, rules/base.xml.in: added ua(unicode)
-
-2007-11-15  Sergey Udaltsov
-
-	* symbols/olpc, keycodes/es: small OLPC fixes
-
-2007-11-14  Sergey Udaltsov
-
-	* symbols/inet, keycodes/evdev: revert #12203
-	https://bugs.freedesktop.org/show_bug.cgi?id=12227
-
-2007-11-01  Sergey Udaltsov
-
-	* symbols/fi, rules/base.xml.in: swapping fi(basic) and fi(kotoistus),
-	https://bugs.freedesktop.org/show_bug.cgi?id=12764
-
-2007-10-28  Sergey Udaltsov
-
-	* symbols/ara, symbols/us, symbols/es, symbols/us, symbols/ng: OLPC
-	fixlets
-
-2007-10-23  Sergey Udaltsov
-
-	* symbols/ru, rules/base.xml.in: added ru(kom),
-	https://bugs.freedesktop.org/show_bug.cgi?id=12893
-
-2007-10-21  Sergey Udaltsov
-
-	* symbols/us, rules/base.xml.in: added us(dvorak-intl),
-	https://bugs.freedesktop.org/show_bug.cgi?id=12867
-	* symbols/macintosh_vndr/dk: dk(macbookpro),
-	https://bugs.freedesktop.org/show_bug.cgi?id=12716
-
-2007-10-19  Sergey Udaltsov
-
-	* symbols/tr, rules/base.xml.in: added tr(intl),
-	https://bugs.freedesktop.org/show_bug.cgi?id=12856
-
-2007-10-18  Sergey Udaltsov
-
-	* geometry/pc, rules/base.xml.in, rules/compat/base.lists.part,
-	symbols/br, symbols/pt: added some br and pt layouts,
-	https://bugs.freedesktop.org/show_bug.cgi?id=12816
-	* rules/base.xml.in symbols/dk: added dk(dvorak),
-	https://bugs.freedesktop.org/show_bug.cgi?id=12837
-
-2007-10-13  Sergey Udaltsov
-
-	* symbols/inet, rules/base.lists.part, rules/base.xml.in: added diNovo
-	Edge, https://bugs.freedesktop.org/show_bug.cgi?id=12789
-
-2007-10-10  Sergey Udaltsov
-
-	* rules/base.xml.in, rules/base.m_g.part: added microsoftelite model,
-	https://bugs.freedesktop.org/show_bug.cgi?id=12753
-	* symbols/fi: fixed fi(kotoistus),
-	https://bugs.freedesktop.org/show_bug.cgi?id=12764
-
-2007-10-09  Sergey Udaltsov
-
-	* geometry/microsoft: added "elite" geometry,
-	https://bugs.freedesktop.org/show_bug.cgi?id=12753
-	* symbols/us: fix for olpc
-
-2007-10-07  Sergey Udaltsov
-
-	* symbols/kz, rules/base.lists.part: added kz(olpc)
-	* symbols/pk: fixed pk(olpc)
-	* rules/base.xml.in: lost vendors,
-	https://bugs.freedesktop.org/show_bug.cgi?id=12719
-	* symbols/inet, rules/base.lists.part, rules/base.xml.in: added
-	chicony0108 model,
-	https://bugs.freedesktop.org/show_bug.cgi?id=6914
-	* symbols/de, types/extra: SS hangling,
-	https://bugs.freedesktop.org/show_bug.cgi?id=7642
-
-2007-10-04  Sergey Udaltsov
-
-	* symbols/us: s/U.S. English/USA/
-	* rules/base.o_s.part, rules/base.xml.in,
-	rules/compat/layoutRename.lst, symbols/Makefile.am, symbols/cs,
-	symbols/me, symbols/rs, symbols/ba, symbols/hr, symbols/si: splitting
-	Serbia and Montenegro 
-	https://bugs.freedesktop.org/show_bug.cgi?id=12390
-
-2007-10-02  Sergey Udaltsov
-
-	* symbols/inet: fixing dell inspiron,
-	https://bugs.freedesktop.org/show_bug.cgi?id=12653
-	* configure.in, rules/Makefile.am, po/ChangeLog: dropping translations
-	from base.xml, let apps/libs use .gmo files instead
-
-2007-09-27  Sergey Udaltsov
-
-	* symbols/shift, symbols/Makefile.am, rules/base.o_s.part: added
-	shift:breaks_caps, https://bugs.freedesktop.org/show_bug.cgi?id=9546
-
-2007-09-26  Sergey Udaltsov
-
-	* symbols/latam: no dead_tilde,
-	https://bugs.freedesktop.org/show_bug.cgi?id=12568
-	* rules/base.xml.in, symbols/in: added mal_lalitha, small fixes,
-	https://bugs.freedesktop.org/show_bug.cgi?id=12426
-	* rules/base.lists.part, rules/base.m_k.part, rules/base.ml_c.part,
-	rules/base.ml_s.part, rules/base.xml.in, rules/merge.sh,
-	symbols/Makefile.am, symbols/ara, symbols/br, symbols/es,
-	symbols/group, symbols/inet, symbols/level3, symbols/ng, symbols/olpc,
-	symbols/pk, symbols/ru, symbols/th, symbols/tr, symbols/us: massive
-	patch from OLPC project
-
-2007-09-25  Sergey Udaltsov
-
-	* NEWS, configure.in: preparing release 1.1
-
-2007-09-24  Sergey Udaltsov
-
-	* symbols/inet: added extra key for nx9020
-	https://bugs.freedesktop.org/show_bug.cgi?id=7310
-
-2007-09-14  Sergey Udaltsov
-
-	* symbols/inet: small fixes in cymotionlinux,
-	https://bugs.freedesktop.org/show_bug.cgi?id=7983
-	* keycodes/evdev: fixed fake keycodes,
-	https://bugs.freedesktop.org/show_bug.cgi?id=12202
-
-2007-09-05  Sergey Udaltsov
-
-	* symbols/inet, geometry/dell, rules/base.m_g.part,
-	rules/base.lists.part: adding dell precision m65,
-	https://bugs.freedesktop.org/show_bug.cgi?id=7992
-	* rules/base.m_g.part: fixed rules for the kinesis keyboard,
-	https://bugs.freedesktop.org/show_bug.cgi?id=7991
-
-2007-09-04  Sergey Udaltsov
-
-	* symbols/it, rules/base.xml.in: added strange one, it(geo),
-	contributed by Vladimir Sichinava
-
-2007-09-02  Sergey Udaltsov
-
-	* keycodes/evdev, symbols/inet: more evdev keycodes,
-	https://bugs.freedesktop.org/show_bug.cgi?id=12227
-	https://bugs.freedesktop.org/show_bug.cgi?id=12228
-
-2007-08-29  Sergey Udaltsov
-
-	* keycodes/evdev: updated evdev keycodes,
-	https://bugs.freedesktop.org/show_bug.cgi?id=12202
-	* keycodes/xfree86, symbols/inet, symbols/pc: display switch &
-	backlight control, https://bugs.freedesktop.org/show_bug.cgi?id=12203
-	* keycodes/macintosh, rules/base.m_k.part, rules/base.xml.in: adding
-	macintosh_hhk model,
-	https://bugs.freedesktop.org/show_bug.cgi?id=12091
-
-2007-08-28  Sergey Udaltsov
-
-	* symbols/group, symbols/jp, symbols/la, symbols/level3, symbols/pc,
-	symbols/digital_vndr/pc, types/pc: renaming types, giving more
-	sensible names
-
-2007-08-27  Sergey Udaltsov
-
-	* keycodes/evdev: missing keycodes for evdev:
-	https://bugs.freedesktop.org/show_bug.cgi?id=12167
-
-2007-08-26  Sergey Udaltsov
-
-	* rules/compat/variantRename.lst: fixing dvorak layouts compat rule,
-	https://bugs.freedesktop.org/show_bug.cgi?id=12115
-
-2007-08-24  Sergey Udaltsov
-
-	* symbols/us: fixes typos in us(classmate-intl)
-
-2007-08-22  Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/Makefile.am, symbols/cn: adding Tibetan
-	layouts, https://bugs.freedesktop.org/show_bug.cgi?id=12088
-
-2007-08-20  Sergey Udaltsov
-
-	* symbols/gr: replacing combining keys with dead keys, temporary hack
-	by James Cloos
-
-2007-08-19  Sergey Udaltsov
-
-	* symbols/et: added missing dead "c" key
-
-2007-08-18  Sergey Udaltsov
-
-	* rules/base.lists.part, rules/base.ml_s.part, rules/base.mlv_s.part,
-	rules/base.xml.in, symbols/inet, symbols/us: added classmate model
-	with specific variants,
-	https://bugs.freedesktop.org/show_bug.cgi?id=11955
-
-2007-08-14  Sergey Udaltsov
-
-	* symbols/inet, rules/base.xml.in: added asus_laptop,
-	https://bugs.freedesktop.org/show_bug.cgi?id=11936
-
-2007-08-12  Sergey Udaltsov
-
-	* symbols/ru: fixed ebreve in ru(ch),
-	http://bugs.freedesktop.org/show_bug.cgi?id=11246
-	* rules/base.xml.in: missing Romanian variants added,
-	https://bugs.freedesktop.org/show_bug.cgi?id=11945
-
-2007-08-10  Sergey Udaltsov
-
-	* symbols/br, rules/base.m_g.part, rules/base.ml1_s.part,
-	rules/base.ml_g.part, rules/base.ml_s.part: Adding br(thinkpad),
-	polishing rules a bit,
-	https://bugs.freedesktop.org/show_bug.cgi?id=11908
-
-2007-08-07  Sergey Udaltsov
-
-	* symbols/ara: Patch to Arabic keyboard layout,
-	http://bugs.freedesktop.org/show_bug.cgi?id=11867
-
-2007-08-03  Sergey Udaltsov
-
-	* symbols/us, rules/base.xml.in: added us(altgr-intl), closing
-	http://bugs.freedesktop.org/show_bug.cgi?id=11753
-
-2007-07-30  Sergey Udaltsov
-
-	* symbols/inet, rules/base.lists.part, rules/base.m_s.part,
-	rules/base.xml.in: introduced media_common, some Dell/Logitech symbols
-	are dead, compatibility rules created, Acer kbds consolidated,
-	http://bugs.freedesktop.org/show_bug.cgi?id=11746
-
-2007-07-25  Sergey Udaltsov
-
-	* symbols/inet, rules/base.lists.part, rules/base.m_s.part,
-	rules/base.xml.in: consolidating benq keyboards,
-	https://bugs.freedesktop.org/show_bug.cgi?id=11713
-
-2007-07-24  Sergey Udaltsov
-
-	* symbols/gn, symbols/Makefile.am, rules/base.xml.in: added Guinea,
-	http://bugs.freedesktop.org/show_bug.cgi?id=11702
-
-2007-07-23  Sergey Udaltsov
-
-	* symbols/cd: update Congolese,
-	https://bugs.freedesktop.org/show_bug.cgi?id=5500
-
-2007-07-22  Sergey Udaltsov
-
-	* symbols/inet, rules/base.lists.part, rules/base.xml.in: adding
-	logiex110 model, https://bugs.freedesktop.org/show_bug.cgi?id=11686
-
-2007-07-20  Sergey Udaltsov
-
-	* symbols/gr: adding pound sign,
-	https://bugs.freedesktop.org/show_bug.cgi?id=11608
-
-2007-07-16  Sergey Udaltsov
-
-	* rules/base.o_s.part, rules/base.xml.in, symbols/be, symbols/keypad:
-	modularized wang kbd,
-	https://bugs.freedesktop.org/show_bug.cgi?id=8852
-
-2007-07-15  Sergey Udaltsov
-
-	* symbols/kpdl, symbols/*, rules/base.xml.in, rules/base.o_s.part:
-	introducing separate KPDL handling,
-	https://bugs.freedesktop.org/show_bug.cgi?id=11611
-
-2007-07-12  Sergey Udaltsov
-
-	* NEWS: preparing release 1.0
-
-2007-07-10  Sergey Udaltsov
-
-	*  geometry/hhk, rules/base.m_g.part, rules/base.xml.in,
-	geometry/Makefile.am: adding hhk geometry,
-	https://bugs.freedesktop.org/show_bug.cgi?id=11519
-
-2007-07-09  Sergey Udaltsov
-
-	*  symbols/de: fixed AE12, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=11514
-
-2007-06-29  Sergey Udaltsov
-
-	*  symbols/lk: another fix from
-	https://bugs.freedesktop.org/show_bug.cgi?id=11284
-	*  symbols/us, rules/base.xml.in: added us(colemak),
-	https://bugs.freedesktop.org/show_bug.cgi?id=11416
-
-2007-06-25  Sergey Udaltsov
-
-	*  symbols/Makefile.am, symbols/braille, rules/base.xml.in: added
-	Braille layout, https://bugs.freedesktop.org/show_bug.cgi?id=11356
-
-2007-06-18  Sergey Udaltsov
-
-	*  symbols/Makefile.am, symbols/et, rules/base.xml.in: added
-	et(basic), part of the OLPC works
-
-2007-06-16  Sergey Udaltsov
-
-	*  symbols/lk: fixed Sinhala, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=11284
-
-2007-06-15  Sergey Udaltsov
-
-	*  symbols/ru, rules/base.xml.in: added ru(cv_latin), closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=11246
-
-2007-06-13  Sergey Udaltsov
-
-	*  symbols/ru, rules/base.xml.in: added ru(cv), closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=11246
-	*  symbols/ge, rules/base.xml.in: added ge(os), again closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8092
-	*  symbols/ru, rules/base.xml.in: added ru(udm), closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=11257
-
-2007-06-07  Sergey Udaltsov
-
-	*  symbols/in, rules/base.xml.in: added Hindi phonetic,
-	https://bugs.freedesktop.org/show_bug.cgi?id=11195
-
-2007-06-06  Sergey Udaltsov
-
-	*  rules/xfree98: fixed nec_vndr, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=11176
-
-2007-05-26  Sergey Udaltsov
-
-	*  rules/base.o_s.part, rules/base.xml.in, symbols/jp: Add
-	"NICOLA-F style Backspace" to "Japanese keyboard options", closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=11064
-
-2007-05-14  Sergey Udaltsov
-
-	*  rules/base.xml.in, rules/xkb.dtd: introducing vendor into
-	configItem
-
-2007-05-13  Sergey Udaltsov
-
-	* symbols/il: replaced backslash with bar, reclosing
-	https://bugs.freedesktop.org/show_bug.cgi?id=6375
-
-2007-05-02  Sergey Udaltsov
-
-	* symbols/gr: using Unicode since it is more appropriate for polytonic
-	Greek, https://bugs.freedesktop.org/show_bug.cgi?id=10824
-
-2007-04-30  Sergey Udaltsov
-
-	* rules/base.xml.in: make descriptions less technical
-
-2007-04-29  Sergey Udaltsov
-
-	* symbols/us: adding explicit BKSL, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=10811
-
-2007-04-27  Sergey Udaltsov
-
-	* geometry/microsoft: replacing non-defined AE00 with TLDE,
-	http://bugzilla.gnome.org/show_bug.cgi?id=429907
-
-2007-04-24  Sergey Udaltsov
-
-	* symbols/ma: fixing alt in Tifinagh, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=10736
-
-2007-04-23  Sergey Udaltsov
-
-	* geometry/pc: fix for abnt2, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=10725
-	* symbols/inet, rules/base.lists.part: adding missing logicdo, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=10671
-
-2007-04-11  Sergey Udaltsov
-
-	* symbols/ge, rules/base.xml.in: added/fixed a lot of Georgian
-	layouts, closing https://bugs.freedesktop.org/show_bug.cgi?id=3332
-
-2007-04-05  Sergey Udaltsov
-
-	* symbols/se, rules/base.xml.in: added se(svdvorak),
-	https://bugs.freedesktop.org/show_bug.cgi?id=10424
-
-2007-04-03  Sergey Udaltsov
-
-	* symbols/cd: fixed Congolese layout one more time,
-	https://bugs.freedesktop.org/show_bug.cgi?id=5500
-
-2007-04-01  Sergey Udaltsov
-
-	* symbols/cd: fixed Congolese layout,
-	https://bugs.freedesktop.org/show_bug.cgi?id=5500
-
-2007-03-29  Sergey Udaltsov
-
-	* configure.in: improved xkb_base calculation, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=10435
-
-2007-03-13  Sergey Udaltsov
-
-	* configure.in: added Korean translation,
-	https://bugs.freedesktop.org/show_bug.cgi?id=10269
-	* rules/base.xml.in: s/descr/_descr/g, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=10270
-
-2007-03-06  Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/us: added us(euro), after a very hot
-	discussion in the maillist
-
-2007-02-26  Sergey Udaltsov
-
-	* symbols/inet: fixed broken symbol, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=10103
-	* compat/misc: fixing copy/paste bug, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=10104
-
-2007-02-25  Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/uz: fixed Uz layout, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=10091
-	* symbols/us: added French oe character to us(intl), closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=10087
-
-2007-02-12  Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/Makefile.am, symbols/ma: added Tifinagh
-	layouts, closing http://bugs.freedesktop.org/show_bug.cgi?id=9950
-
-2007-02-03  Sergey Udaltsov
-
-	* rules/base.ml_g.part, rules/HDR, rules/Makefile.am,
-	rules/base.m_g.part: added (model, layout->geometry) section for
-	thinkpad, https://bugs.freedesktop.org/show_bug.cgi?id=9864
-	* symbols/macintosh_vndr/fr: updated French layout, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=9865
-
-2007-01-27  Sergey Udaltsov
-
-	* symbols/inet, rules/base.lists.part: adding thinkpad media keys,
-	closing https://bugs.freedesktop.org/show_bug.cgi?id=9779
-
-2007-01-26  Sergey Udaltsov
-
-	* symbols/es: s/asciitilde/dead_tilde in spanish, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=9763
-
-2007-01-25  Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/am: adding am(phonetic-alt), closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=9018
-
-2007-01-11  Sergey Udaltsov
-
-	* symbols/nl, rules/base.xml.in: added nl(std), closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=9603
-	* symbols/epo, rules/base.xml.in: added epo(legacy), closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=9556
-
-2007-01-04  Sergey Udaltsov
-
-	* symbols/ir: settling another licensing issue,
-	https://bugs.freedesktop.org/show_bug.cgi?id=9541
-
-2007-01-04  Sergey Udaltsov
-
-	* rules/base.xml.in, rules/base.o_s.part, symbols/ca, symbols/fr,
-	symbols/nbsp: adding more nbsp options, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=9529
-
-2007-01-02  Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/pc: getting rid of stupid "default"
-	altwin options, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=9470
-
-2006-12-19  Sergey Udaltsov
-
-	* rules/base.o_s.part, rules/base.xml.in, rules/sun.xml.in,
-	symbols/level3: adding lv3:ralt_alt, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=9070
-
-2006-12-11  Sergey Udaltsov
-
-	* configure.in: getting rid of bashisms, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=9244
-	* symbols/fi: s/NoSymbol/VoidSymbol/, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=9239
-
-2006-12-07  Sergey Udaltsov
-
-	* Makefile.am, rules/Makefile.am, xkbrules.am: getting rid of
-	gmakisms, closing https://bugs.freedesktop.org/show_bug.cgi?id=9245
-	* Makefile.am: dropping install-compiled target, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=9246
-
-2006-11-20  Sergey Udaltsov
-
-	* symbols/br, keycodes/xfree86: making abnt2 more compatible with
-	other keyboards, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=4910
-	* rules/base.m_k.part: dropping the special (and stupid) abnt2 rule,
-	closing https://bugs.freedesktop.org/show_bug.cgi?id=9097
-
-2006-11-19  Sergey Udaltsov
-
-	* symbols/il, rules/base.xml.in: added il(biblical), closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=9002
-
-2006-11-17  Sergey Udaltsov
-
-	* symbols/us: the backslash/bar definition in the us dvorak variant,
-	closing https://bugs.freedesktop.org/show_bug.cgi?id=9061
-	* symbols/ir: removed problematic copyright notice, with permission of
-	Behnam Esfahbod, https://bugs.freedesktop.org/show_bug.cgi?id=4102
-
-2006-11-14  Sergey Udaltsov
-
-	* symbols/altwin: undo invalid Alt mapping done in
-	https://bugs.freedesktop.org/show_bug.cgi?id=8996
-
-2006-11-12  Sergey Udaltsov
-
-	* rules/base.o_s.part, rules/base.xml.in, symbols/altwin: adding
-	ctrl_win, closing https://bugs.freedesktop.org/show_bug.cgi?id=8996
-
-2006-11-06  Sergey Udaltsov
-
-	* rules/sun.xml.in, rules/Makefile.am, po/POTFILE.in: Added directory
-	for sun rules, closing
-	http://bugzilla.gnome.org/show_bug.cgi?id=137294
-
-2006-11-02  Sergey Udaltsov
-
-	* symbols/fr: some fixes for alternative layouts, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8853
-	* symbols/fr, rules/base.xml.in: new fr(dvorak*) variants, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8728
-
-2006-10-28  Sergey Udaltsov
-
-	* rules/base.lists.part, rules/base.xml.in, symbols/inet: added
-	logitech_g15 model, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8803
-	* symbols/jp: added LCTL definition,
-	https://bugs.freedesktop.org/show_bug.cgi?id=8805
-
-2006-10-26  Sergey Udaltsov
-
-	* rules/base.lists.part, rules/base.xml.in, symbols/inet: added more
-	Dell keyboards, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8761
-
-2006-10-18  Sergey Udaltsov
-
-	* rules/base.lists.part, symbols/macintosh_vndr/Makefile.am,
-	symbols/macintosh_vndr/dk, symbols/macintosh_vndr/es,
-	symbols/macintosh_vndr/it, symbols/macintosh_vndr/latam,
-	symbols/macintosh_vndr/no, symbols/macintosh_vndr/pt,
-	symbols/macintosh_vndr/se: missed part from
-	https://bugs.freedesktop.org/show_bug.cgi?id=1576
-	* rules/base.xml.in, symbols/jp: adding new Japanese layout, changing
-	latin to 106, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8648
-
-2006-10-17  Sergey Udaltsov
-
-	* symbols/macintosh_vndr/dk, symbols/macintosh_vndr/us: adding euro
-	sign to mac us and dk, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8682#add_comment
-
-2006-10-16  Sergey Udaltsov
-
-	* rules/base.m_k.part, rules/base.xml.in, keycodes/Makefile.am,
-	keycodes/powerpcps2: removing obsolete powerpcps2 model. Closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8659
-	* rules/base.o_s.part, rules/base.xml.in, symbols/group: adding
-	grp:lctrl_lshift_toggle, contributed by Alexey Morozov
-	<morozov@gorodok.net>
-	* symbols/macintosh_vndr/us: Fix <BKSP> in symbols/macintosh_vndr/us,
-	closing https://bugs.freedesktop.org/show_bug.cgi?id=8668
-	* symbols/level3: assigning mods to keycodes (reverding earlier wrong
-	fix), closing https://bugs.freedesktop.org/show_bug.cgi?id=8670
-
-2006-10-13  Sergey Udaltsov
-
-	* xkbrules.am: ability to create .dir files when srcdir != objdir,
-	closing https://bugs.freedesktop.org/show_bug.cgi?id=8629
-
-2006-10-12  Sergey Udaltsov
-
-	* symbols/inet, rules/base.lists.part, rules/base.xml.in: added BenQ
-	X-730, thanks to Jean-Marc Spaggiari
-
-2006-10-11  Sergey Udaltsov
-
-	* symbols/af, symbols/ba, symbols/hr, symbols/kr, symbols/nbsp,
-	symbols/ng, symbols/si, symbols/za: addind missing cvs keyword
-	XKeyboardConfig
-	* rules/base.ml_s.part, rules/base.xml.in, symbols/jp: normalizing
-	Japanese rules/variants, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8503
-
-2006-10-10  Sergey Udaltsov
-
-	* symbols/in: fixed Devangari (default) layout, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=4949
-	* configure.in: removing hardcoded prefix, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8448
-	* symbols/it, added EuroSign to italian mac layout, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=1576
-
-2006-10-09  Sergey Udaltsov
-
-	* symbols/inet,rules/base.xml.in: adding benqa800 model, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8574
-
-2006-10-09  Sergey Udaltsov
-
-	* NEWS, configure.in: preparing 0.9
-
-2006-10-09  Sergey Udaltsov
-
-	* tests/*: tests now run alphabetically, a bit of xslt tweaking
-	* symbols/altwin: Alt keys should be mapped on two shift levels,
-	undoing previous fix, as requested in
-	https://bugs.freedesktop.org/show_bug.cgi?id=8571
-	* symbols/level3: mapping Mod5 to keycode rather than to keysym,
-	hopefully fixing https://bugs.freedesktop.org/show_bug.cgi?id=8572
-	* symbols/us,symbols/latin: fixing quotes, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8122
-
-2006-10-07  Sergey Udaltsov
-
-	* types/complete, types/default: putting "numpad" after "extra"
-	hopefully fixes https://bugs.freedesktop.org/show_bug.cgi?id=8402
-
-2006-10-04  Sergey Udaltsov
-
-	* symbols/fi: s/micron/dead_micron, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8494
-
-2006-10-03  Sergey Udaltsov
-
-	* symbols/macintosh_vndr/gb, symbols/gb: adding missing Euro
-	character, closing https://bugs.freedesktop.org/show_bug.cgi?id=5227
-	* symbols/bt, symbols/fr, symbols/np: fixing typos, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8495
-	* symbols/ch, symbols/de, symbols/dk, symbols/es, symbols/no,
-	symbols/pt, symbols/se, symbols/us: optimized mac variants, overwrite
-	old de and ch mac variants, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8491
-
-2006-10-01  Sergey Udaltsov
-
-	* rules/base.xml.in, symbols/Makefile.am, symbols/ng: added Nigerian
-	layouts, closing https://bugs.freedesktop.org/show_bug.cgi?id=8467
-	* symbols/dk, symbols/es, symbols/fi, symbols/fr, symbols/gb,
-	symbols/is, symbols/it, symbols/nl, symbols/no, symbols/pt,
-	symbols/se, symbols/us, rules/base.xml.in: adding mac variants,
-	closing https://bugs.freedesktop.org/show_bug.cgi?id=8465
-
-2006-09-30  Sergey Udaltsov
-	
-	* rules/base.o_s.part, rules/base.xml.in, symbols/Makefile.am,
-	symbols/nbsp: adding nbsp:* options, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8451
-
-2006-09-29  Sergey Udaltsov
-	
-	* rules/base.xml.in: added keypad:* options, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8240
-
-2006-09-28  Sergey Udaltsov
-	
-	* geometry/thinkpad: fix for geometry, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8419
-
-2006-09-24  Sergey Udaltsov
-	
-	* symbols/am, rules/base.xml.in: added am(eastern), am(western),
-	am(eastern-alt), closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8404
-	* rules/base.ml_s.part: macbooks should use the vendor symbols, if
-	possible, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8385
-	* rules/base.o_s.part, rules/base.xml.in, symbols/fr, symbols/keypad:
-	added more French variants, new options, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8240
-
-2006-09-18  Sergey Udaltsov
-	
-	* keycodes/macintosh, rules/HDR, rules/Makefile.am,
-	rules/base.m_k.part, rules/base.o_k.part, rules/base.xml.in: split
-	"good" and "bad" apple keycodes, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8242
-
-	* rules/base.lists.part, rules/base.m_s.part, symbols/inet,
-	symbols/level3: lv3:enter_switch added, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8324
-
-	* symbols/ara: added ara(buckwalter), closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8198
-
-	* symbols/in: fixed layout, Unicode-related bug, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8203
-
-	* geometry/pc, rules/base.ml1_s.part, rules/base.ml_s.part,
-	rules/compat/ml1_s.sh, rules/compat/ml1v1_s.sh,
-	rules/compat/ml1v_s.sh, rules/compat/ml_s.sh, rules/compat/mlv_s.sh,
-	symbols/pc: getting rid of pc101/102/104 legacy. Breaking XkbSymbols
-	again, https://bugs.freedesktop.org/show_bug.cgi?id=8321
-
-2006-09-17  Sergey Udaltsov
-	
-	symbols/keypad, symbols/pc, symbols/us, symbols/macintosh_vndr/*,
-	rules/base.m_t.part, rules/base.ml1_s.part, rules/base.ml_s.part,
-	rules/base.o_t.part, rules/base.xml.in, rules/merge.sh: reorganized
-	Mac stuff, thanks to Denis,
-	https://bugs.freedesktop.org/show_bug.cgi?id=8280
-
-	* symbols/pc: modularized numpad stuff,
-	https://bugs.freedesktop.org/show_bug.cgi?id=8312
-	
-2006-09-10  Sergey Udaltsov
-
-	rules/base.list.part, symbols/inet: added 2 models, thanks to
-	Valery V. Inozemtsev
-
-2006-09-06  Sergey Udaltsov
-
-	* rules/altwin: mapping LALT to Mod4 modifier,
-	https://bugs.freedesktop.org/show_bug.cgi?id=8068
-
-2006-09-05  Sergey Udaltsov
-
-	* rules/base.lists.part: adding missing kbds, reordering a bit
-	https://bugs.freedesktop.org/show_bug.cgi?id=7816
-
-	* geometry/ibm_vnd, configure.in, rules/base.m_g.part: getting rid of
-	ibm_vndr geometry, fixing rules,
-	https://bugs.freedesktop.org/show_bug.cgi?id=7990
-
-	* symbols/gb: s/ralt_switch/ralt_switch_multikey
-	https://bugs.freedesktop.org/show_bug.cgi?id=7674
-
-	* rules/base.mlv_s.part: fixing mac rule for nodeadkeys,
-	https://bugs.freedesktop.org/show_bug.cgi?id=8123
-
-	* rules/base.ml_s.part: s/old_macintosh/macintosh_old/g,
-	https://bugs.freedesktop.org/show_bug.cgi?id=8128
-
-2006-09-04  Sergey Udaltsov
-
-	* rules/base.lists.part, rules/base.m_g.part, rules/base.m_k.part,
-	rules/base.m_s.part, rules/base.ml1_s.part, rules/base.ml_s.part,
-	rules/base.mlv_s.part: fixing lists,
-	https://bugs.freedesktop.org/show_bug.cgi?id=7817
-
-	* symbols/cd, symbols/gr, symbols/il, symbols/jp, symbols/la,
-	symbols/lk, symbols/ru, symbols/ca: fixing types, on per-group basis,
-	https://bugs.freedesktop.org/show_bug.cgi?id=8121
-
-	* symbols/level3: adding level3:ralt_switch_multikey,
-	https://bugs.freedesktop.org/show_bug.cgi?id=7674
-
-2006-09-03  Sergey Udaltsov
-
-	* symbols/vn: getting rid of digits (1 and 2 shift levels),
-	https://bugs.freedesktop.org/show_bug.cgi?id=7807
-
-	* rules/base.xml.in: s/guillemot/guillemet/, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8116
-
-2006-09-02  Sergey Udaltsov
-
-	* symbols/lt, rules/base.xml.in: added lt(ibm)
-	https://bugs.freedesktop.org/show_bug.cgi?id=3841
-
-	* symbols/hr: reverted Croatian
-	https://bugs.freedesktop.org/show_bug.cgi?id=8019
-
-2006-09-01  Sergey Udaltsov
-
-	* symbols/ru, rules/base.xml.in: added Ossetian, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8092
-
-	* symbols/ir, symbols/iq, rules/base.xml.in: added Kurdish Arabic-Latin
-
-2006-08-31  Sergey Udaltsov
-
-	* geometry/macintosh, keycodes/macintosh, keycodes/xfree86,
-	rules/base.lists.part, rules/base.m_g.part, rules/base.m_k.part,
-	rules/base.m_s.part, rules/base.ml_s.part, rules/base.xml.in,
-	symbols/inet: Added Macbook stuff, partially closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=8068
-
-	* symbols/group, rules/base.o_s.part: added group:alt_caps_toggle
-	https://bugs.freedesktop.org/show_bug.cgi?id=8047
-
-2006-08-02  Sergey Udaltsov
-
-	* symbols/inet, keycodes/evdev: updated evdev
-	https://bugs.freedesktop.org/show_bug.cgi?id=7631
-
-2006-07-30  Sergey Udaltsov
-
-	* symbols/pl: added pl(csb)
-	https://bugs.freedesktop.org/show_bug.cgi?id=7693
-
-2006-07-29  Sergey Udaltsov
-
-	* symbols/bt: fixed Bhutan
-	https://bugs.freedesktop.org/show_bug.cgi?id=7556
-
-	* symbols/us: added dvorak-classic, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=7503
-
-	* symbols/inet: added acer_c300, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=6361
-
-2006-07-29  Sergey Udaltsov
-
-	* symbols/lk: updated Sinhala, thanks to Harshula
-
-2006-07-10  Sergey Udaltsov
-
-	* symbols/de: added Mac variants, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=6671
-
-2006-07-04  Sergey Udaltsov
-
-	* symbols/ch: fixed KPDL in ch(de_mac), patch from
-	https://bugs.freedesktop.org/show_bug.cgi?id=6960
-
-2006-07-02  Sergey Udaltsov
-
-	* rules/base.xml.in: fixed mismatch between directory and symbols/inet
-	file.
-	https://bugs.freedesktop.org/show_bug.cgi?id=7398
-	
-	* symbols/ro: fixed Romanian academic
-	https://bugs.freedesktop.org/show_bug.cgi?id=7393
-	
-2006-06-28  Sergey Udaltsov
-
-	* keycodes/evdev: pc105 compatiliby, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=7347
-
-2006-06-25  Sergey Udaltsov
-
-	* rules/base.xml.in, geometry/pc, symbols/inet: added Dell Lattitude,
-	https://bugs.freedesktop.org/show_bug.cgi?id=6894
-
-	* symbols/inet, rules/base.xml.in: added 2 new layouts, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=7325
-
-	* symbols/np: added Nepali, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=6373
-
-2006-06-25  Sergey Udaltsov
-
-	* geometry/pc, rules/base.lists.part, rules/base.m_g.part,
-	rules/base.xml.in, symbols/kr: updated Korean layouts/geometry
-	https://bugs.freedesktop.org/show_bug.cgi?id=7316
-
-2006-06-22  Sergey Udaltsov
-
-	* symbols/inet: fixing double RaiseVolume, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=7095
-
-2006-06-14  Sergey Udaltsov
-
-	* symbols/mt, rules/base.xml.in: fixed the US variant group name
-	* symbols/gh: fixed 'D' key, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=7216
-
-2006-06-13  Sergey Udaltsov
-
-	* symbols/level5, compat/level5: replacing F21-F23 with explicit
-	hexadecimal values of XK_ISO_Level5_*. So for next months people could
-	have Canadian layout fixed and, at the same time, do not have to
-	upgrade xorg. Closing https://bugs.freedesktop.org/show_bug.cgi?id=4411
-
-	* symbols/ch, symbols/inet, symbols/base.xml.in: added mac stuff from
-	https://bugs.freedesktop.org/show_bug.cgi?id=6960
-
-2006-06-13  Sergey Udaltsov
-
-	* symbols/mt: fixed mt(us), closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=1411
-
-2006-06-10  Sergey Udaltsov
-
-	* symbols/level5, compat5/level5: better working Canadian
-	layout, but not complete yet
-
-2006-06-01  Sergey Udaltsov
-
-	* symbols/am: fixed comma in Armenian, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=7080
-
-2006-05-28  Sergey Udaltsov
-
-	* symbols/inet,rules/base.xml.in,rules/base.lists.part: 
-	added Logitech Cordless Desktop LX-300
-	https://bugs.freedesktop.org/show_bug.cgi?id=5609
-
-2006-05-28  Sergey Udaltsov
-
-	* rules/base.ml_c: fixed compat for jp layout, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=4002
-
-2006-05-17  Sergey Udaltsov
-
-	* symbols/inet: fixed power_g5, partially closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=6960
-
-2006-05-13  Sergey Udaltsov
-
-	* symbols/fi: added fi(kotoistus)
-	https://bugs.freedesktop.org/show_bug.cgi?id=6901
-
-2006-05-05  Sergey Udaltsov
-
-	* symbols/de: added de(neo)
-	https://bugs.freedesktop.org/show_bug.cgi?id=6837
-
-2006-05-04  Sergey Udaltsov
-
-	* symbols/inet: fixed cymotionlinux, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=6828
-
-2006-05-04  Sergey Udaltsov
-
-	* rules/base.xml.in,symbols/iq,symbols/in,symbols/sy: added Kurdish, 
-	closed https://bugs.freedesktop.org/show_bug.cgi?id=6159
-	one more time
-
-2006-04-20  Sergey Udaltsov
-
-	* keycodes/evdev: added LSGT, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=6674
-
-2006-04-19  Sergey Udaltsov
-
-	* symbols/macintosh_vndr/(be,de,ch): use keypad(comma)
-
-2006-04-19  Sergey Udaltsov
-
-	* rules/*, keymap/sgi_vndr/*: shift_toggle -> shifts_toggle,
-	fixing https://bugs.freedesktop.org/show_bug.cgi?id=5078
-
-2006-04-08  Sergey Udaltsov
-
-	* keycodes/xfree86,symbols/br: fixed abnt2 keymap and layout
-	https://bugs.freedesktop.org/show_bug.cgi?id=4910
-
-2006-04-08  Sergey Udaltsov
-
-	* geometry/macintosh: fixed mac geometry
-	https://bugs.freedesktop.org/show_bug.cgi?id=4714
-
-2006-04-05  Sergey Udaltsov
-
-	* rules/base.xml.in, changed PC-98xx Series to Japan,
-	https://bugs.freedesktop.org/show_bug.cgi?id=5591
-
-2006-04-04  Sergey Udaltsov
-
-	* symbols/compose,rules/base.xml.in,rules/base.o_s.part: added
-	compose(lwin)
-	https://bugs.freedesktop.org/show_bug.cgi?id=2396
-
-2006-04-04  Sergey Udaltsov
-
-	* symbols/inet,rules/base.xml.in: added Logitech diNovo
-	https://bugs.freedesktop.org/show_bug.cgi?id=1681
-
-2006-04-04  Sergey Udaltsov
-
-	* symbols/inet: fixed Logitech Access Keyboard
-	https://bugs.freedesktop.org/show_bug.cgi?id=1018
-
-2006-04-04  Sergey Udaltsov
-
-	* symbols/pt: added LSGT
-	https://bugs.freedesktop.org/show_bug.cgi?id=970
-
-2006-04-02  Sergey Udaltsov
-
-	* symbols/be, rules/base.xml.in: added 'be(wang)'
-	https://bugs.freedesktop.org/show_bug.cgi?id=6474
-
-2006-03-28  Sergey Udaltsov
-
-	* symbols/cd, symbols/Makefile.am: added 'cd'
-	https://bugs.freedesktop.org/show_bug.cgi?id=5500
-
-2006-03-27  Sergey Udaltsov
-
-	* keycodes/macintosh,keymap/macintosh,rules/base.m_k.part: fixed
-	Macintosh F13-F15, closed 
-	https://bugs.freedesktop.org/show_bug.cgi?id=6399
-
-2006-03-25  Sergey Udaltsov
-
-	* symbols/inet: fixed cymotion,
-	https://bugs.freedesktop.org/show_bug.cgi?id=3541
-
-2006-03-25  Sergey Udaltsov
-
-	* symbols/il,rules/compat/variantRename.lst: generalized 'basic', 
-	removed si1452, closed 
-	https://bugs.freedesktop.org/show_bug.cgi?id=6375
-
-2006-03-23  Sergey Udaltsov
-
-	* symbols/group: another attempt to fix unfamous
-	RAlt problem, reported in ubuntu:
-	https://launchpad.net/distros/ubuntu/+source/xkeyboard-config/+bug/35845
-	Now all types are specified for Group1, to make it consistent
-	
-2006-03-22  Sergey Udaltsov
-
-	* rules/base.xml.in,symbols/tr: added Kurdish, closed
-	https://bugs.freedesktop.org/show_bug.cgi?id=6159
-	
-2006-03-22  Sergey Udaltsov
-
-	* rules/base.xml.in: added missing Logitech models, fixed
-	https://bugs.freedesktop.org/show_bug.cgi?id=6350
-	
-2006-03-21  Sergey Udaltsov
-
-	* symbols/kr: added Korean layout, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=6323
-
-2006-03-21  Sergey Udaltsov
-
-	* types/pc,symbols/level3: another attempt to fix unfamous
-	RAlt problem, reported in ubuntu:
-	https://launchpad.net/distros/ubuntu/+source/xkeyboard-config/+bug/35845
-
-2006-03-17  Sergey Udaltsov
-
-	* symbols/inet, rules/base*: added Acer Ferrari 4K
-	https://bugs.freedesktop.org/show_bug.cgi?id=5259
-
-2006-03-16  Sergey Udaltsov
-
-	* symbols/ee: improved ee(dvorak), closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=4568
-
-2006-03-05  Sergey Udaltsov
-
-	* configure.in, NEWS, Changelog:Preparing release 0.8
-
-2006-02-26  Sergey Udaltsov
-
-	* symbols/es, rules/base.xml.in: added es(cat), closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=6047
-
-2006-02-25  Alan Coopersmith 
-
-	* symbols/sun_vndr/*, compat/japan, compat/mousekeys,
-	geometry/sun:
-	massive update from Sun, see
-	https://bugs.freedesktop.org/show_bug.cgi?id=5725
-	
-2006-02-24  M. Emal Alekozai <memala@gmx.net>
-
-	* symbols/af, symbols/Makefile.am, rules/base.xml:
-	added Afghan, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=6013
-
-2006-02-15  Zephaniah E. Hull  <warp@aehallh.com>
-
-	* keycodes/Makefile.am:
-	* keycodes/evdev:
-	* rules/base.m_k.part:
-	Add the evdev keyboard data files. Closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=5903
-
-2006-02-21 svu
-
-	* symbols/inet: Fixed inet(armada)
-	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=5893
-	
-2006-02-21 svu
-
-	* symbols/hr: Fixed hr(us)
-	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=3807
-	
-2006-02-01 svu
-
-	* rules/compat/layoutRename.lst: Added cz_qwerty compat rule
-	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=177362
-	
-2006-01-31 svu
-
-	* symbols/us: Added single-handed dvoraks
-	https://bugs.freedesktop.org/show_bug.cgi?id=5659
-	
-2006-01-22 svu
-
-	* types/level5: Fixed ScrollLock behaviour
-	https://bugs.freedesktop.org/show_bug.cgi?id=5635
-	
-2006-01-15 svu
-
-	* symbols/bd: Corrected Bangladesh layout, closed
-	https://bugs.freedesktop.org/show_bug.cgi?id=5480
-	
-2006-01-14 svu
-
-	* rules/base.ml_*.part: Japanese layouts are nec_vndr/jp, for
-	consistency
-	
-2006-01-14 svu
-
-	* symbols/macintosh_vnd/is: some cosmetic stuff and some info, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=5597
-	
-2006-01-14 svu
-
-	* rules/base.lists.part: extended non-latin list, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=5590
-
-2006-01-11 svu
-
-	* rules/base*part: improved stuff for non-AT keyboards, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=5507
-
-2006-01-10 svu
-
-	* geometry/pc: fixed geometry, closed
-	https://bugs.freedesktop.org/show_bug.cgi?id=5568
-
-2006-01-08 svu
-
-	* symbols/gh: added Ghana layout, closed
-	https://bugs.freedesktop.org/show_bug.cgi?id=5497
-
-2006-01-06 svu
-
-	* symbols/ad: added Catalan layout, closed
-	https://bugs.freedesktop.org/show_bug.cgi?id=5526
-
-2006-01-01 svu
-
-	* symbols/in: fixed ben_probhat, closed
-	https://bugs.freedesktop.org/show_bug.cgi?id=1012
-
-2005-12-31 svu
-
-	* symbols/ru, rules/base.xml.in: added
-	Tatar, closing https://bugs.freedesktop.org/show_bug.cgi?id=4818
-
-2005-12-31 svu
-
-	* symbols/kh, rules/base.xml.in, symbols/Makefile.am: added
-	Khmer, closing https://bugs.freedesktop.org/show_bug.cgi?id=5389
-
-2005-12-31 svu
-
-	* symbols/epo, rules/base.xml.in, symbols/Makefile.am: added
-	Esperanto, closing https://bugs.freedesktop.org/show_bug.cgi?id=5454
-
-2005-12-30 svu
-
-	* symbols/ctrl: expanding Caps a bit, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=3193
-
-2005-12-20 svu
-
-	* symbols/hu: returned def_dot (instead of def_comma, really
-	eliminated)
-	
-2005-12-10 svu
-
-	* symbols/compat/layoutRename.lst: added en_US
-
-2005-12-01 svu
-
-	* symbols/inet, rules/base.xml.in: added Inspiron 6000 keys, closed
-	https://bugs.freedesktop.org/show_bug.cgi?id=5195
-
-2005-12-01 svu
-
-	* symbols/inet: HUGE redesign of the inet file. Major reorganization
-	of Logitech keyboard. HUGE thanks to Fr?d?ric BOITEUX
-
-2005-11-26 svu
-
-	* symbols/group, symbols/level3, compat/level5, compat/misc:
-	Fixing problem with level3(ralt) and group(alts_toggle).
-	Now "us,ru,se" works ok.
-
-2005-10-20 svu
-
-	* symbols/inet, rules:
-	adding Dell USB Multimedia Keybard, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=4826
-
-2005-10-17 svu
-
-	* symbols, types, compat, rules:
-	adding 5th level and beyond, trying to hack 1-group Canadian layout
-
-2005-10-11 svu
-
-	* symbols/macintosh_vndr/fr: update French Macintosh keyboard, closed
-	https://bugs.freedesktop.org/show_bug.cgi?id=2870
-
-2005-10-10 svu
-
-	* symbols/za, rules/base.xml.in: added South Afrika, closed
-	https://bugs.freedesktop.org/show_bug.cgi?id=2856
-
-2005-10-09 svu
-
-	* symbols/inet: expanded Inspiron definition, closed
-	https://bugs.freedesktop.org/show_bug.cgi?id=4071
-
-2005-10-07 svu
-
-	* symbols/hu: fixed comma issue, closed
-	https://bugs.freedesktop.org/show_bug.cgi?id=4693
-
-2005-10-04 svu
-
-	* symbols/by, rules/base.xml.in: added by(latin), closed
-	https://bugs.freedesktop.org/show_bug.cgi?id=4576
-	
-2005-10-04 svu
-
-	* symbols/gr: added keypad(comma), closed
-	https://bugs.freedesktop.org/show_bug.cgi?id=3538
-
-2005-10-02 svu
-
-	* symbols/se:
-	updating svorak, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=3635
-
-2005-10-02 svu
-
-	* rules/base.lists.part, rules/base.xml.in, 
-	symbols/inet:
-	adding Genius Comfy, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=2275
-
-2005-10-02 svu
-
-	* rules/Makefile.am, rules/HDR, 
-	rules/base.l1o_s.part, rules/base.l2o_s.part,
-	rules/base.l3o_s.part, rules/base.l4o_s.part:
-	adding "layout + option -> symbols" rules,
-	for properly maingating RAlt as AltGr + alts_toggle
-	IMPORTANT: REQUIRES FIXING XORG
-
-2005-10-02 svu
-
-	* rules/base.xml.in, symbols/ee:
-	added Estonian Dvorak, closed
-	https://bugs.freedesktop.org/show_bug.cgi?id=4568
-
-2005-10-02 svu
-
-	* rules/base.xml.in, symbols/inet, rules/base.lists.part:
-	Added eMachines m68xx notebooks keyboards, closed
-	https://bugs.freedesktop.org/show_bug.cgi?id=4000
-
-2005-10-01 svu
-
-	* rules/base.xml.in, symbols/inet, rules/base.lists.part:
-	Added SILVERCREST Multimedia Wireless Keyboard, closed
-	https://bugs.freedesktop.org/show_bug.cgi?id=4217
-
-2005-09-30 svu
-
-	* rules/compat/layoutRename.lst:
-	added us_intl, fixed https://bugs.freedesktop.org/show_bug.cgi?id=4642
-
-2005-09-30 svu
-
-	* po/sl.po:
-	Slovenian translation
-
-2005-09-22 svu
-
-	* rules/base.xml.in, rules/base.o_s.part, symbols/compose:
-	adding CapsLock as Compose, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=4548
-
-2005-09-22 svu
-
-	* rules/Makefile.am, rules/merge.sh
-	fixing merging in env where srcdir != objdir, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=4547
-	
-2005-09-22 svu
-
-	* rules/base.xml.in, symbols/kz:
-	change Cyr to Rus
-	
-2005-09-21 svu
-
-	* rules/base.ml_s.part:
-	IMPORTANT: NO MORE 2-GROUP CANADIAN DEFAULT CONFIGURATION
-
-2005-09-21 svu
-
-	* symbols/kz, symbols/Makefile.am, rules/base.xml.in:
-	added Kazakh, fixing
-	https://bugs.freedesktop.org/show_bug.cgi?id=4497
-
-2005-09-20 svu
-
-	* symbols/macintoch_vndr/ch:
-	Updated de_CH, from
-	https://bugs.freedesktop.org/show_bug.cgi?id=4520
-
-2005-09-20 svu
-
-	* symbols/mk, rules/base.xml.in:
-	removing controversal 'FYROM'
-
-2005-09-14 svu
-
-	* symbols/inet, rules/base.xml.in rules/base.lists.part: 
-	Added Cherry CyBo@rd USB-Hub. Thanks to Paul Egan
-	Fixed https://bugs.freedesktop.org/show_bug.cgi?id=4498
-
-2005-09-14 svu
-
-	* symbols/cs: a bit of cleanup by Denis
-
-2005-09-13 svu
-
-	* configure.in: added Finnish translation
-
-2005-09-04 svu
-
-	* symbols/no:
-	fixed no(dvorak), closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=4397
-
-2005-09-04 svu
-
-	* rules/base.xml.in, symbols/inet:
-	adding Power G5
-
-2005-09-04 svu
-
-	* rules/base.xml.in, symbols/ro:
-	Fixing Romanian, closing
-	https://bugs.freedesktop.org/show_bug.cgi?id=371
-
-2005-09-04 svu
-
-	* rules/base.xml.in, symbols/lk:
-	No TSCII/INSCRIPT in Sri Lanka, 
-	according to <hash@jayasolutions.cjb.net>
-
-2005-08-25 svu
-
-	* rules/base.xml.in:
-	Control -> Ctrl everywhere, for consistency sake
-
-2005-08-25 svu
-
-	* rules/base.xml.in, symbols/cs:
-	Serbia -> Serbia and Montenegro
-
-2005-08-25 svu
-
-	* configure.in, po/sr@Latn.po:
-	adding sr@Latn translation, thanks to Danilo
-
-2005-08-24 svu
-
-	* configure.in:
-	preparing 0.6
-
-2005-08-24 svu
-
-	* rules/base.xml.in, symbols/mk, 
-	rules/compat/layoutRename.lst:
-	Move Macedonian to country-based
-
-2005-08-23 svu
-
-	* rules/base.xml.in, symbols/ba, 
-	symbols/si, symbols/cs, symbols/hr:
-	Major Balkanian revolution by Danilo Segan. GREAT THANKS to him.
-
-2005-08-22 svu
-
-	* rules/base.xml.in, symbols/mv:
-	Moved Dhivehi to Maldives, fixed #3716
-
-2005-08-22 svu
-
-	* rules/compat/layoutRename.lst:
-	fixed http://bugzilla.ubuntu.com/show_bug.cgi?id=13919
-
-2005-08-16 svu
-
-	* rules/base.xml.in, symbols/ir:
-	fixed https://bugs.freedesktop.org/show_bug.cgi?id=4102
-
-2005-08-11 svu
-
-	* symbols/jp, symbols/pc:
-	fixed https://bugs.freedesktop.org/show_bug.cgi?id=847
-
-2005-08-07 svu
-
-	* symbols/bg:
-	fixed https://bugs.freedesktop.org/show_bug.cgi?id=4010
-
-2005-08-06 svu
-
-	* Makefile.am:
-	Allowing multiple compatibility symlinks (xfree86,xorg).
-	Thanks to Daniel Stone for the feedback
-
-2005-08-06 svu
-
-	* Makefile.am:
-	Fixing the xkbcomp symlink creation
-	Thanks to Daniel Stone for the feedback
-
-2005-08-04 svu
-
-	* Makefile.am, configure.in, xkbrules.am:
-	Taking nice ideas from xkbdata. 
-	Thanks to Daniel Stone for his knowledge of autofoo
-
-2005-08-04 svu
-
-	* symbols/in, symbols/lk,
-	rules/base.xml.in, rules/compat/variantRename.lst:
-	a bit reogranizing tamil stuff
-
-2005-08-03 svu
-
-	* symbols/ie, rules/base.xml.in, rules/compat/variantRename.lst:
-	getting rid of laptop variants in 'ie'
-
-2005-08-02 svu
-
-	* symbols/in, rules/base.xml.in, rules/compat/variantRename.lst:
-	moving 'mal_plusnum' to 'mal'
-
-2005-08-01 svu
-
-	* symbols/il, symbols/hr, symbols/tj:
-	fixing two-group layouts
-
-2005-08-01 svu
-
-	* symbols, rules:
-	putting syr to sy, dzo to bt
-
-2005-07-31 svu
-
-	* symbols, rules:
-	putting smi to no, fi, se
-
-2005-07-31 svu
-
-	* symbols, rules:
-	putting Syriac to Syria (setting 'ara' as default)
-
-2005-07-31 svu
-
-	* symbols, rules:
-	putting Devangari, Gurmukhi into 'in'
-
-2005-07-31 svu
-
-	* symbols, rules:
-	changing 'lao' to 'la'
-
-2005-07-31 svu
-
-	* symbols, rules:
-	putting Inuktitut into 'ca'
-
-2005-07-31 svu
-
-	* symbols, rules:
-	putting Ogham into 'ie'. Cleaning it up.
-
-2005-07-29 svu
-
-	* symbols, rules:
-	reorganizing Asian layouts, round #1
-
-2005-07-25 svu
-
-	* symbols/tr:
-	fixed Turkish, according to
-	https://bugs.freedesktop.org/show_bug.cgi?id=2558
-
-2005-07-25 svu
-
-	* symbols/hr:
-	added belowdot, abovedot, in relation to 
-	https://bugs.freedesktop.org/show_bug.cgi?id=475
-
-2005-07-24 svu
-
-	* symbols/div,
-	symbols/Makefile.am,
-	rules/base.xml.in: adding Dhivehi, fixing
-	https://bugs.freedesktop.org/show_bug.cgi?id=3716
-
-2005-07-23 svu
-
-	* symbols/es,
-	rules/base.xml.in:
-	adding Spanish dvorak, pointer from
-	https://bugs.freedesktop.org/show_bug.cgi?id=2344
-
-2005-07-21 svu
-
-	* symbols/sun_vndr/us,
-	rules/sun,
-	keycodes/sun,
-	geometry/sun: adding more keyboards, fixing
-	https://bugs.freedesktop.org/show_bug.cgi?id=2037
-
-2005-07-20 svu
-
-	* symbols/ru, 
-	symbols/us, 
-	symbols/se, 
-	symbols/ua, 
-	rules/base.xml.in: 
-	sorting out Russian layout, fixing (without 3rd and 4th groups)
-	https://bugs.freedesktop.org/show_bug.cgi?id=2582
-
-2005-07-15 svu
-
-	* symbols/inet, rules/base.xml.in: 
-	added Cherry CyMotion Linux, fixed
-	https://bugs.freedesktop.org/show_bug.cgi?id=3789
-
-2005-07-02 svu
-
-	* symbols/nl: fixed Dutch layout
-
-2005-06-17 svu
-
-	* symbols/pl: added AB10 to qwertz
-	https://bugs.freedesktop.org/show_bug.cgi?id=3298
-
-2005-06-17 svu
-
-	* symbols/inet, rules/base.xml.in: added logiultrax,
-	https://bugs.freedesktop.org/show_bug.cgi?id=3523
-
-2005-04-17 svu
-
-	* symbols/tam, rules/base.xml.in: changed default for Tamil,
-	https://bugs.freedesktop.org/show_bug.cgi?id=2971
-
-2005-04-02 svu
-
-	* symbols/de, rules/base.xml.in: added de(dvorak),
-	https://bugs.freedesktop.org/show_bug.cgi?id=2681
-
-2005-03-10 svu
-
-	* po/Makefile.am: adding POTFILES* into the dist
-	* Makefile.am, rules/Makefile.am: adding DISTCLEANFILES
-
-2005-03-09 svu
-
-	* symbols/us: fixing dvorak,
-	https://bugs.freedesktop.org/show_bug.cgi?id=2641
-
-2005-02-05 svu
-
-	* configure.in, NEWS: preparing 0.5
-
-2005-02-03 svu
-
-	* symbols/srp, types/extra: replaced SERBIAN_ALPHABETIC with 
-	FOUR_LEVEL_ALPHABETIC, as Danilo requested. Also, SERBIAN_CAPS 
-	renamed to SEPARATE_CAPS_AND_SHIFT_ALPHABETIC.
-
-2005-01-21 svu
-
-	* rules/base.lists.part,
-	rules/base.xml.in,
-	symbols/inet: addin my own Acer Travelmate 800 keyboard
-	(based on acerhk kernel module).
-
-2005-01-21 svu
-
-	* symbols/gr: a bit more order in group name (needed for 'basic' but 
-	not for 'bare'
-
-2005-01-20 svu
-
-	* symbols/hr: added missing keymapping, 
-	fixed https://bugs.freedesktop.org/show_bug.cgi?id=2325
-
-2005-01-19 svu
-
-	* symbols/us: removed illegal 'hidden' attribute from the default layout
-
-2005-01-18 svu
-
-	* symbols/cz, rules/base.xml.in: fixed the Czech layout,
-	https://bugs.freedesktop.org/show_bug.cgi?id=2319
-
-2005-01-16 svu
-
-	* symbols, rules/base.xml.in: HUGE commit - adjusting the group names
-	according to the descriptions. 
-	Also, some layouts were missing the default variants - added one.
-	Also, some default variants were listed in the variantLists - now they are removed.
-
-2005-01-06 svu
-
-	* symbols/am, rules/base.xml.in: Removing old Armenian layout,
-	fixing http://bugs.freedesktop.org/show_bug.cgi?id=2226
-
-2004-12-22 svu
-
-	* symbols: massive patch for the group names (by Denis Barbier)
-	* rules/base.xml.in: first iteration, match the country names with 
-	the group names
-
-2004-12-21 02:07  svu
-
-	* po/el.po,
-	configure.in: Greek translation
-
-2004-12-20 20:30  svu
-
-	* symbols/inet,
-	rules/base.lists.part,
-	rules/base.xml.in: added A4Tech KBS-8, thanks to olo at force dot sk.
-	fixed https://bugs.freedesktop.org/show_bug.cgi?id=2113
-
-2004-12-10 00:30  svu
-
-	* symbols/inet: removed keyboard names from the group names,
-	fixed https://bugs.freedesktop.org/show_bug.cgi?id=2044
-
-2004-12-08 00:30  svu
-
-	* symbols/mkd, 
-	rules/base.xml.in,
-	rules/compat/layoutRename.lst,
-	rules/compat/Makefile.am: Macedonian is now language-based, 
-	not country-based. Compatibility rule added.
-
-2004-12-04 01:40  svu
-
-	* symbols/mk, rules/base.xml.in: small fix for Makedonian
-
-2004-12-03 00:40  svu
-
-	* configure.in, Makefile.am, compiled: some cleanup in the
-	build process
-
-2004-11-29 19:00  svu
-
-	* symbols/sin: Small patch for Sinhala from Harshula
-
-2004-11-14 22:14  svu
-
-	* symbols/sin: Small patch for Sinhala from Harshula
-
-2004-10-31 01:20  svu
-
-	* symbols/ca, rules/base.xml.in: added fr-dvorak, thanks to
-	Jonathan Bastien-Filiatrault
-
-2004-10-29 01:15  svu
-
-	* symbols/am: fixed phonetic layout, bug
-	http://freedesktop.org/bugzilla/show_bug.cgi?id=1714
-
-2004-10-29 00:55  svu
-
-	* rules/base.xml.in, rules/base.lists.part, symbols/inet: 
-	Added Cherry CyMotion Master XPress, fixed 
-	http://freedesktop.org/bugzilla/show_bug.cgi?id=1715
-
-2004-10-26 21:08  svu
-
-	* symbols/Makefile.am, symbols/kg, rules/base.xml.in: added 
-	Kyrgyz, thanks to Yury Fedorov
-
-2004-10-12 18:45  svu
-
-	* symbols/Makefile.am, symbols/sin, rules/base.xml.in: added 
-	Sinhalese, thanks to Harshula Jayasuriya
-
-2004-10-10 23:59  svu
-
-	* po/: af.po, az.po, bg.po, cs.po, da.po, fr.po, hu.po, nl.po,
-	  ru.po, sk.po, sq.po, sr.po, sv.po, tr.po, uk.po, zh_CN.po: update
-	  from TP
-
-2004-10-09 19:34  svu
-
-	* symbols/: mal, mao, mm, mn, mt, nl, ogam, ori, pc, pl, pt, ru,
-	  sk, smi, srvr_ctrl, syr, tam, tel, th, tr, ua, urd, us: adding
-	  the keyword
-
-2004-10-09 18:40  svu
-
-	* symbols/: jp, kan, lao, latam, latin, level3, lt, lv: adding the
-	  keyword
-
-2004-10-09 18:35  svu
-
-	* symbols/: deva, dzo, ee, es, eurosign, fo, fr, gb, ge, gr, guj,
-	  guru, ie, iku, il, inet, ir, is, it: adding the keyword
-
-2004-10-09 18:29  svu
-
-	* symbols/: al, altwin, am, ara, az, be, ben, bg, by, capslock, ch,
-	  compose, ctrl, cz: adding the keyword
-
-2004-10-09 18:26  svu
-
-	* symbols/: ca, uz, vn: adding the keyword
-
-2004-10-09 18:23  svu
-
-	* symbols/: ca, uz, vn: fixing
-	  https://freedesktop.org/bugzilla/show_bug.cgi?id=1566
-
-2004-10-09 00:31  svu
-
-	* symbols/ch: fixing
-	  https://freedesktop.org/bugzilla/show_bug.cgi?id=1562
-
-2004-10-09 00:20  svu
-
-	* symbols/ca: fixing
-	  https://freedesktop.org/bugzilla/show_bug.cgi?id=1563
-
-2004-10-08 21:55  svu
-
-	* symbols/hu: fixing
-	  https://freedesktop.org/bugzilla/show_bug.cgi?id=1561
-
-2004-09-29 23:25  svu
-
-	* symbols/macintosh_vndr/: Makefile.am, is: Added Icelandic layout
-	  to the Macintosh group
-
-2004-09-28 00:00  svu
-
-	* NEWS, configure.in: preparing 0.4
-
-2004-09-18 01:00  svu
-
-	* BUGS, rules/base.xml.in: David noticed small glitches in
-	  base.xml.in
-
-2004-09-16 01:11  svu
-
-	* rules/Makefile.am, rules/base.o_s.part, rules/base.xml.in,
-	  rules/compat/Makefile.am, rules/compat/base.o_s.part,
-	  symbols/group: shift_toggle -> shifts_toggle
-
-2004-09-15 23:20  svu
-
-	* symbols/group: make the ctrsl_toggle consistend with the others
-
-2004-09-14 20:54  svu
-
-	* symbols/ba: more commas
-
-2004-09-14 20:38  svu
-
-	* symbols/: mk, srp: more commas
-
-2004-09-14 20:14  svu
-
-	* symbols/: br, de, dk, fi, hr, hu, keypad, no, pl, ro, se, si:
-	  keymap(comma) introduced by Frank
-
-2004-09-13 22:39  svu
-
-	* symbols/tj: new local cvs keyword seems to be ok - no more $Id$
-
-2004-09-13 22:38  svu
-
-	* symbols/tj: trying new local cvs keyword
-
-2004-09-13 19:49  svu
-
-	* symbols/ara, symbols/bg, symbols/by, symbols/capslock,
-	  symbols/deva, symbols/fo, symbols/guj, symbols/guru, symbols/iku,
-	  symbols/il, symbols/ir, symbols/kan, symbols/lao, symbols/mk,
-	  symbols/mm, symbols/mt, symbols/ori, symbols/sk, symbols/srp,
-	  symbols/tel, compat/README, compat/ledcaps, compat/lednum,
-	  compat/ledscroll, docs/README.config, geometry/README,
-	  geometry/dell, geometry/everex, geometry/keytronic,
-	  geometry/kinesis, geometry/microsoft, geometry/northgate,
-	  geometry/sgi_vndr/O2, geometry/sgi_vndr/indigo,
-	  geometry/sgi_vndr/indy, keycodes/README, keycodes/aliases,
-	  keymap/README, keymap/sgi_vndr/cz, keymap/sgi_vndr/sk,
-	  rules/README, symbols/macintosh_vndr/ch,
-	  symbols/macintosh_vndr/es, symbols/macintosh_vndr/fi,
-	  symbols/macintosh_vndr/fr, symbols/macintosh_vndr/it,
-	  symbols/macintosh_vndr/nl, symbols/sun_vndr/usb, types/README,
-	  types/basic, types/default, types/numpad: no dummy XFree keyword
-
-2004-09-11 21:41  svu
-
-	* symbols/tj: trying Id
-
-2004-09-09 23:05  svu
-
-	* symbols/: tj: fixing keyword
-
-2004-09-09 23:02  svu
-
-	* symbols/tj: fixing keyword
-
-2004-09-09 22:07  svu
-
-	* symbols/level3: ONE_LEVEL fixing by Frank
-
-2004-09-09 00:01  svu
-
-	* symbols/group: more fair comment
-
-2004-09-08 23:40  svu
-
-	* symbols/level3: they agreed on this
-
-2004-09-08 20:14  svu
-
-	* compat/Makefile.am, rules/base.o_c.part: no more capsled traces
-
-2004-09-07 23:58  svu
-
-	* symbols/level3: restoring for a while, till guys make agreement
-
-2004-09-07 23:16  svu
-
-	* symbols/mn: just for sync:)
-
-2004-09-07 21:51  svu
-
-	* po/ru.po: updated translation
-
-2004-09-07 21:50  svu
-
-	* rules/base.xml.in: small polish of the option descriptions
-
-2004-09-07 20:56  svu
-
-	* symbols/: al, az, be, br, ca, cz, de, dk, dzo, ee, es, fi, fo,
-	  fr, gb, hr, hu, is, it, latam, level3, lt, mt, nl, no, pt, ro,
-	  se, si, sk, smi, srp, tr, us, vn: changing to ralt_switch
-
-2004-09-07 20:39  svu
-
-	* rules/: base.o_s.part, sgi, sun: small fixes, thanks to Frank
-
-2004-09-07 20:33  svu
-
-	* symbols/urd: forgotten to add
-
-2004-09-06 00:59  svu
-
-	* rules/base.xml.in, symbols/Makefile.am: Adding Urdu layout,
-	  thanks to Zaeem Arshad
-
-2004-09-04 22:39  svu
-
-	* compat/Makefile.am, compat/basic, compat/group_led,
-	  compat/ledcaps, compat/lednum, compat/leds, compat/ledscroll,
-	  compat/misc, rules/base.o_c.part, rules/base.o_s.part,
-	  rules/base.xml.in, symbols/Makefile.am, symbols/capslock,
-	  symbols/group, symbols/lock: reorganizing indicators, thanks to
-	  Frank Murphy
-
-2004-08-28 02:04  svu
-
-	* symbols/compose, rules/base.o_s.part, rules/base.xml.in: adding
-	  RCtrl as Compose
-
-2004-08-27 23:57  svu
-
-	* symbols/us: thanks to Frank, he noticed two default variants in
-	  the us layout
-
-2004-08-27 19:20  svu
-
-	* rules/: base.o_s.part, base.xml.in: meta-info about eurosign
-
-2004-08-27 02:23  svu
-
-	* symbols/: Makefile.am, eurosign: added eurosign
-
-2004-07-25 14:55  svu
-
-	* Makefile.am, mkinstalldirs: fixing mkinstalldirs
-
-2004-07-24 00:42  svu
-
-	* rules/Makefile.am: minor fix for the minor bug detected by
-	  distcheck
-
-2004-07-23 22:21  svu
-
-	* TODO: up2date
-
-2004-07-23 22:00  svu
-
-	* NEWS, configure.in: preparing 0.3
-
-2004-07-23 00:11  svu
-
-	* rules/: HDR, Makefile.am, compat/.cvsignore, compat/Makefile.am,
-	  compat/lnv_s.sh, compat/ml1v1_s.sh: HURRAY!!! Rules are working!
-	  Am I cool or what?
-
-2004-07-22 02:03  svu
-
-	* rules/HDR: fixing the header for MLV
-
-2004-07-21 02:21  svu
-
-	* rules/: HDR, Makefile.am, base.mlv_s.part, base.mvl_s.part,
-	  compat/.cvsignore, compat/Makefile.am, compat/ln_s.sh,
-	  compat/ml1_s.sh, compat/ml_s.sh, compat/mlv_s.sh: variants are
-	  there
-
-2004-07-21 01:57  svu
-
-	* rules/: HDR, Makefile.am, compat/.cvsignore, compat/Makefile.am,
-	  compat/lnv_s.sh, compat/ml1_s.sh, compat/ml1v_s.sh: a bit more
-	  about variants
-
-2004-07-21 01:48  svu
-
-	* rules/: .cvsignore, HDR, Makefile.am, compat/.cvsignore,
-	  compat/Makefile.am, compat/lnv_s.sh, compat/variantRename.lst:
-	  adding variants - not complete yet
-
-2004-07-21 01:25  svu
-
-	* rules/compat/: Makefile.am, l2_s.sh, l3_s.sh, l4_s.sh, ln_s.sh:
-	  single script for the layouts 2-4
-
-2004-07-21 00:02  svu
-
-	* rules/merge.sh: bash is great but sh is standard - and think
-	  optimal, dude
-
-2004-07-20 02:57  svu
-
-	* rules/compat/: l2_s.sh, l3_s.sh, l4_s.sh: the extra layouts (2-4)
-	  should be ADDED using '+' character
-
-2004-07-20 02:49  svu
-
-	* rules/: base.ml1_c.part, base.ml1_s.part, base.ml_c.part,
-	  base.ml_s.part, compat/l2_s.sh, compat/l3_s.sh, compat/l4_s.sh,
-	  compat/ml1_s.sh, compat/ml_s.sh: alignment
-
-2004-07-20 02:33  svu
-
-	* rules/compat/: ml1_s.sh, ml_s.sh: little fix
-
-2004-07-20 02:29  svu
-
-	* rules/: HDR, Makefile.am, base.l1_k.part, base.l2_s.part,
-	  base.l3_s.part, base.l4_s.part, base.l_k.part, base.m_g.part,
-	  base.m_k.part, base.m_s.part, base.m_t.part, base.ml1_c.part,
-	  base.ml1_s.part, base.ml_c.part, base.ml_s.part, base.mvl_s.part,
-	  base.o_c.part, base.o_s.part, base.o_t.part, merge.sh: Now, we
-	  compoze the parts using bash script
-
-2004-07-18 03:54  svu
-
-	* configure.in, rules/.cvsignore, rules/compat/.cvsignore,
-	  rules/compat/Makefile.am, rules/compat/base.lists.part,
-	  rules/compat/l2_s.sh, rules/compat/l3_s.sh, rules/compat/l4_s.sh,
-	  rules/compat/layoutRename.lst, rules/compat/ml1_s.sh,
-	  rules/compat/ml_s.sh: starting bundling compatibility parts
-
-2004-07-18 03:44  svu
-
-	* rules/: Makefile.am, base: cleaning a bit before adding the
-	  compat directory
-
-2004-07-18 01:56  svu
-
-	* rules/: Makefile.am, base, base.l1_k.part, base.l2_s.part,
-	  base.l3_s.part, base.l4_s.part, base.l_k.part, base.lists.part,
-	  base.m_g.part, base.m_k.part, base.m_s.part, base.m_t.part,
-	  base.ml1_c.part, base.ml1_s.part, base.ml_c.part, base.ml_s.part,
-	  base.mvl_s.part, base.o_c.part, base.o_s.part, base.o_t.part:
-	  better empty line handling between rule groups
-
-2004-07-18 01:42  svu
-
-	* rules/: Makefile.am, base, base.hdr.part, base.l1_k.part,
-	  base.l2_s.part, base.l3_s.part, base.l4_s.part, base.l_k.part,
-	  base.lists.part, base.m_g.part, base.m_k.part, base.m_s.part,
-	  base.m_t.part, base.ml1_c.part, base.ml1_s.part, base.ml_c.part,
-	  base.ml_s.part, base.mvl_s.part, base.o_c.part, base.o_s.part,
-	  base.o_t.part: Now, the base rules are composed from microfiles
-	  *.part. I see no other way to handle compatibility in a
-	  manageable way. Kill me if I know it.
-
-2004-07-09 05:21  daniel
-
-	* ChangeLog, configure.in: * configure.in: Alter with-xkb-base
-	  default to $(prefix)/lib/X11/xkb, instead of
-	  $(prefix)/X11R6/lib/xkb, which makes --prefix=/usr behave sanely.
-
-2004-07-08 21:40  svu
-
-	* configure.in: getting rid of unnecessary AM_GLIB_GNU_GETTEXT
-
-2004-07-07 22:52  kidcrash
-
-	* ChangeLog: adding required ChangeLog file
-
-2004-07-06 23:44  svu
-
-	* .cvsignore: Anjuta files are not in CVS - and'll never be
-
-2004-07-04 02:00  svu
-
-	* po/ru.po: updating Russian translation
-
-2004-07-04 01:31  svu
-
-	* rules/base.xml.in, symbols/Makefile.am, symbols/cs, symbols/srp:
-	  streamlining ex-yu layouts
-
-2004-07-03 03:32  svu
-
-	* rules/base.xml.in, symbols/Makefile.am, symbols/dvorak,
-	  symbols/fr, symbols/gb, symbols/no, symbols/pl, symbols/se,
-	  symbols/us, po/ru.po: splitting dvorak
-
-2004-07-02 01:59  svu
-
-	* symbols/smi: fixing broken layouts, thanks to my testing scripts
-
-2004-07-02 01:49  svu
-
-	* symbols/: Makefile.am, ara, gr, latam, lv, mal, ogam: fixing
-	  broken layouts, thanks to my testing scripts
-
-2004-07-02 00:16  svu
-
-	* po/Makefile.am: adding update-po
-
-2004-07-01 22:28  svu
-
-	* docs/: iso3166.csv, iso639.csv: more fresh version of the
-	  standards
-
-2004-07-01 03:01  svu
-
-	* po/ru.po: completing Russian translation - though some things are
-	  questionable
-
-2004-07-01 02:59  svu
-
-	* config.rpath, mkinstalldirs: why would I need these files in
-	  CVS???
-
-2004-07-01 02:55  svu
-
-	* ABOUT-NLS: empty but very useful file
-
-2004-07-01 02:48  svu
-
-	* Makefile.am, autogen.sh, configure.in, po/Makefile.am,
-	  rules/base.xml.in: Starting to fix intltool problem, Danilo just
-	  roxx
-
-2004-06-30 23:47  svu
-
-	* rules/base.xml.in, symbols/Makefile.am, symbols/cs, symbols/yu:
-	  Changed yu to cs as Danilo advised - but not sure it is ok.
-	  Investigating...
-
-2004-06-30 23:25  svu
-
-	* rules/base.xml.in, symbols/Makefile.am, symbols/scc, symbols/srp:
-	  Changing scc to srp - as Danilo advised
-
-2004-06-26 01:54  svu
-
-	* BUGS: hopefully fixed Latvian layout
-
-2004-06-26 01:50  svu
-
-	* rules/base.xml.in, symbols/lv: hopefully fixed Latvian layout
-
-2004-06-22 01:11  svu
-
-	* configure.in: trying to set order in the Makefiles list
-
-2004-06-22 00:56  svu
-
-	* Makefile.am, configure.in, autogen.sh: trying to fix intltool -
-	  but without much luck
-
-2004-06-20 20:09  svu
-
-	* rules/base.xml.in: fixing shortDescr for Smi
-
-2004-06-20 19:04  svu
-
-	* docs/: iso15924.csv, iso3166.csv, iso3166.txt, iso639.csv,
-	  iso639.txt: putting order into standards
-
-2004-06-20 15:36  svu
-
-	* symbols/bg: bad patch application
-
-2004-06-20 15:36  svu
-
-	* rules/base.xml.in: typo in Sami id
-
-2004-06-20 15:22  svu
-
-	* symbols/Makefile.am: Frank forgets to chance Makefile.am:)
-
-2004-06-20 14:57  svu
-
-	* xkeyboard-config.spec.in, rules/base, rules/base.xml.in,
-	  docs/Makefile.am, docs/README.symbols, symbols/ar, symbols/ara,
-	  symbols/ba, symbols/bs, symbols/dev, symbols/deva, symbols/dz,
-	  symbols/dzo, symbols/el, symbols/gr, symbols/gur, symbols/guru,
-	  symbols/iku, symbols/iu, symbols/la, symbols/lao, symbols/latam,
-	  symbols/lo, symbols/mal, symbols/mao, symbols/mi, symbols/ml,
-	  symbols/ogam, symbols/ogham, symbols/sapmi, symbols/scc,
-	  symbols/smi, symbols/sr, symbols/tam, symbols/tml: Second phase
-	  of i18n. Frank rocks the world:)
-
-2004-06-19 04:34  svu
-
-	* symbols/mk: Macedonia AKA FYROM
-
-2004-06-19 04:32  svu
-
-	* rules/: Makefile.am, base-it.lst, base.lst, sgi.lst, sun.lst,
-	  xfree98.lst: lst file is not generated automatically - only
-	  base.lst
-
-2004-06-19 04:16  svu
-
-	* rules/: sgi, sun: en_US actually died only now
-
-2004-06-19 04:07  svu
-
-	* symbols/: en_US, sun_vndr/se: en_US actually died only now
-
-2004-06-16 02:07  svu
-
-	* rules/base.xml.in: ISOization, part1
-
-2004-06-16 02:00  svu
-
-	* rules/base.xml.in, symbols/bg, symbols/ch, symbols/el,
-	  symbols/il, symbols/mm: ISOization, part1
-
-2004-06-15 22:04  svu
-
-	* rules/base.xml.in: better wording for Urkainian RSTU description
-
-2004-06-15 19:19  svu
-
-	* rules/base.xml.in, symbols/ru, symbols/ua: Added RSTU
-	  Ukranian/Russian layouts. Thanks to Andrew Porokhnyak
-
-2004-06-13 23:12  svu
-
-	* symbols/inet: actually adding gyration keyboard
-
-2004-06-13 21:30  svu
-
-	* docs/HOWTO.testing: Forgot to add actual document
-
-2004-06-13 21:21  svu
-
-	* BUGS, rules/base, rules/base.lst, rules/base.xml.in, symbols/am,
-	  symbols/inet, symbols/lt, symbols/us: fixing loads of bugs from
-	  fd.o bugzilla
-
-2004-06-13 13:28  svu
-
-	* xkeyboard-config.spec.in, docs/Makefile.am: Added HOWTO.testing
-	  by Frank Murphy
-
-2004-06-12 02:17  svu
-
-	* symbols/mi: getting rid of pc/
-
-2004-06-12 02:14  svu
-
-	* symbols/mi: getting rid of pc/
-
-2004-06-12 02:06  svu
-
-	* NEWS: Redoing 0.2
-
-2004-06-12 02:05  svu
-
-	* symbols/br: fixing bug 515
-
-2004-06-12 02:01  svu
-
-	* rules/base.xml.in, symbols/Makefile.am, symbols/mi: Added Maori,
-	  thanks to John C Barstow
-
-2004-06-12 01:50  svu
-
-	* docs/: iso3166.txt, iso639.txt: just to have standards for
-	  reference
-
-2004-06-10 23:58  svu
-
-	* NEWS: Preparing 0.2
-
-2004-06-10 23:51  svu
-
-	* README, configure.in: Preparing 0.2
-
-2004-06-06 04:22  svu
-
-	* xkeyboard-config.spec.in, docs/HOWTO.transition,
-	  docs/Makefile.am, rules/Makefile.am: adding HOWTO.transition
-
-2004-05-28 23:59  svu
-
-	* Makefile.am, configure.in: Optional creation of xkbcomp symlink
-	  in .../X11/xkb
-
-2004-05-25 22:30  svu
-
-	* NEWS: something to say
-
-2004-05-24 22:15  svu
-
-	* po/xkbdesc.pot: changing the project name
-
-2004-05-24 22:08  svu
-
-	* .cvsignore, Makefile.am, autogen.sh, configure.in,
-	  xkbdesc.spec.in, xkeyboard-config.spec.in: changing the project
-	  name
-
-2004-05-23 21:01  svu
-
-	* rules/base, rules/base.xml.in, symbols/altwin: Daniel Elstner
-	  sent new option for Tux keys
-
-2004-05-18 00:24  svu
-
-	* configure.in: no glib stuff
-
-2004-05-12 13:51  pascal
-
-	* rules/base, symbols/bs: Convert Bosnian keymap to multi-layout
-	  compatible form.
-
-2004-05-09 22:26  svu
-
-	* Makefile.am, README.config, README.enhancing, configure.in,
-	  xkbdesc.spec.in, docs/.cvsignore, docs/Makefile.am,
-	  docs/README.config: reorganization in docs
-
-2004-05-09 21:40  svu
-
-	* TODO, docs/README.enhancing: 2 bits of docs
-
-2004-05-07 19:48  svu
-
-	* po/ru.po: up2date
-
-2004-05-07 19:27  svu
-
-	* rules/base.xml.in, symbols/tr, tests/testLayouts.pl,
-	  tests/testOptions.pl, tests/xkbTestFunc.pm: Some small fixes
-	  made. Options are now testable as well.
-
-2004-05-06 02:00  svu
-
-	* tests/: listCI2.xsl, testLayouts.pl, testOptions.pl,
-	  xkbTestFunc.pm: one more test - but still problems passing it
-
-2004-05-06 01:15  svu
-
-	* configure.in, symbols/mk, tests/testLayouts.pl: Makedonian
-	  problem fixed - and BOTH tests are OK
-
-2004-05-06 01:05  svu
-
-	* symbols/digital_vndr/Makefile.am, symbols/digital_vndr/lk,
-	  symbols/digital_vndr/pc, symbols/digital_vndr/us,
-	  symbols/digital_vndr/vt, symbols/fujitsu_vndr/Makefile.am,
-	  symbols/fujitsu_vndr/jp, keycodes/digital_vndr/Makefile.am,
-	  keycodes/digital_vndr/lk, keycodes/digital_vndr/pc,
-	  keycodes/sgi_vndr/Makefile.am, keycodes/sgi_vndr/indigo,
-	  keycodes/sgi_vndr/indy, keycodes/sgi_vndr/iris, keymap/macintosh,
-	  keymap/sony, keymap/xfree98, keymap/digital_vndr/Makefile.am,
-	  keymap/digital_vndr/us, keymap/sgi_vndr/Makefile.am,
-	  keymap/sgi_vndr/be, keymap/sgi_vndr/bg, keymap/sgi_vndr/ca,
-	  keymap/sgi_vndr/ch, keymap/sgi_vndr/cz, keymap/sgi_vndr/de,
-	  keymap/sgi_vndr/dk, keymap/sgi_vndr/dvorak,
-	  keymap/sgi_vndr/en_US, keymap/sgi_vndr/es, keymap/sgi_vndr/fi,
-	  keymap/sgi_vndr/fr, keymap/sgi_vndr/gb, keymap/sgi_vndr/hu,
-	  keymap/sgi_vndr/it, keymap/sgi_vndr/jp, keymap/sgi_vndr/no,
-	  keymap/sgi_vndr/pl, keymap/sgi_vndr/pt, keymap/sgi_vndr/ru,
-	  keymap/sgi_vndr/se, keymap/sgi_vndr/sk, keymap/sgi_vndr/th,
-	  keymap/sgi_vndr/us, keymap/sun_vndr/Makefile.am,
-	  keymap/sun_vndr/de, keymap/sun_vndr/es, keymap/sun_vndr/fi,
-	  keymap/sun_vndr/fr, keymap/sun_vndr/no, keymap/sun_vndr/pl,
-	  keymap/sun_vndr/ru, keymap/sun_vndr/se, keymap/sun_vndr/uk,
-	  keymap/sun_vndr/us, rules/base, rules/base.xml.in,
-	  symbols/hp_vndr/Makefile.am, symbols/macintosh_vndr/Makefile.am,
-	  symbols/macintosh_vndr/apple, symbols/macintosh_vndr/ch,
-	  symbols/macintosh_vndr/de, symbols/macintosh_vndr/dk,
-	  symbols/macintosh_vndr/fi, symbols/macintosh_vndr/no,
-	  symbols/macintosh_vndr/pt, symbols/macintosh_vndr/se,
-	  symbols/macintosh_vndr/us, symbols/nec_vndr/Makefile.am,
-	  symbols/sgi_vndr/Makefile.am, symbols/sony_vndr/Makefile.am,
-	  symbols/sun_vndr/Makefile.am, symbols/sun_vndr/se,
-	  symbols/sun_vndr/us, symbols/xfree68_vndr/Makefile.am,
-	  tests/testLayouts.pl, tests/testModels.pl, tests/xkbTestFunc.pm,
-	  geometry/digital_vndr/Makefile.am, geometry/digital_vndr/pc,
-	  geometry/ibm_vndr/Makefile.am, geometry/ibm_vndr/thinkpad,
-	  geometry/sgi_vndr/Makefile.am: Yahoo! Models test pased ok!
-
-2004-05-05 23:32  svu
-
-	* configure.in, symbols/Makefile.am,
-	  symbols/digital_vndr/.cvsignore,
-	  symbols/digital_vndr/Makefile.am, symbols/digital_vndr/lk,
-	  symbols/digital_vndr/pc, symbols/digital_vndr/us,
-	  symbols/digital_vndr/vt, symbols/fujitsu_vndr/.cvsignore,
-	  symbols/fujitsu_vndr/Makefile.am, symbols/fujitsu_vndr/jp,
-	  symbols/fujitsu_vndr/us, symbols/hp_vndr/.cvsignore,
-	  symbols/hp_vndr/Makefile.am, symbols/hp_vndr/us,
-	  symbols/macintosh_vndr/.cvsignore,
-	  symbols/macintosh_vndr/Makefile.am, symbols/macintosh_vndr/ch,
-	  symbols/macintosh_vndr/de, symbols/macintosh_vndr/dk,
-	  symbols/macintosh_vndr/es, symbols/macintosh_vndr/fi,
-	  symbols/macintosh_vndr/fr, symbols/macintosh_vndr/gb,
-	  symbols/macintosh_vndr/it, symbols/macintosh_vndr/nl,
-	  symbols/macintosh_vndr/no, symbols/macintosh_vndr/pt,
-	  symbols/macintosh_vndr/se, symbols/macintosh_vndr/us,
-	  symbols/nec_vndr/.cvsignore, symbols/nec_vndr/Makefile.am,
-	  symbols/nec_vndr/jp, geometry/Makefile.am,
-	  geometry/digital_vndr/.cvsignore,
-	  geometry/digital_vndr/Makefile.am, geometry/digital_vndr/lk,
-	  geometry/digital_vndr/pc, geometry/digital_vndr/unix,
-	  geometry/ibm_vndr/.cvsignore, geometry/ibm_vndr/Makefile.am,
-	  geometry/ibm_vndr/thinkpad, geometry/sgi_vndr/.cvsignore,
-	  geometry/sgi_vndr/Makefile.am, geometry/sgi_vndr/O2,
-	  geometry/sgi_vndr/indigo, geometry/sgi_vndr/indy,
-	  keycodes/Makefile.am, symbols/sgi_vndr/.cvsignore,
-	  symbols/sgi_vndr/Makefile.am, symbols/sgi_vndr/jp,
-	  symbols/sony_vndr/.cvsignore, symbols/sony_vndr/Makefile.am,
-	  symbols/sony_vndr/us, symbols/sun_vndr/.cvsignore,
-	  symbols/sun_vndr/Makefile.am, symbols/sun_vndr/se,
-	  symbols/sun_vndr/us, symbols/sun_vndr/usb,
-	  symbols/xfree68_vndr/.cvsignore,
-	  symbols/xfree68_vndr/Makefile.am, symbols/xfree68_vndr/amiga,
-	  symbols/xfree68_vndr/ataritt, keycodes/digital_vndr/.cvsignore,
-	  keycodes/digital_vndr/Makefile.am, keycodes/digital_vndr/lk,
-	  keycodes/digital_vndr/pc, keycodes/sgi_vndr/.cvsignore,
-	  keycodes/sgi_vndr/Makefile.am, keycodes/sgi_vndr/indigo,
-	  keycodes/sgi_vndr/indy, keycodes/sgi_vndr/iris,
-	  keymap/Makefile.am, keymap/digital_vndr/.cvsignore,
-	  keymap/digital_vndr/Makefile.am, keymap/digital_vndr/us,
-	  keymap/sgi_vndr/.cvsignore, keymap/sgi_vndr/Makefile.am,
-	  keymap/sgi_vndr/be, keymap/sgi_vndr/bg, keymap/sgi_vndr/ca,
-	  keymap/sgi_vndr/ch, keymap/sgi_vndr/cz, keymap/sgi_vndr/de,
-	  keymap/sgi_vndr/dk, keymap/sgi_vndr/dvorak,
-	  keymap/sgi_vndr/en_US, keymap/sgi_vndr/es, keymap/sgi_vndr/fi,
-	  keymap/sgi_vndr/fr, keymap/sgi_vndr/gb, keymap/sgi_vndr/hu,
-	  keymap/sgi_vndr/it, keymap/sgi_vndr/jp, keymap/sgi_vndr/no,
-	  keymap/sgi_vndr/pl, keymap/sgi_vndr/pt, keymap/sgi_vndr/ru,
-	  keymap/sgi_vndr/se, keymap/sgi_vndr/sk, keymap/sgi_vndr/th,
-	  keymap/sgi_vndr/us, keymap/sun_vndr/.cvsignore,
-	  keymap/sun_vndr/Makefile.am, keymap/sun_vndr/de,
-	  keymap/sun_vndr/es, keymap/sun_vndr/fi, keymap/sun_vndr/fr,
-	  keymap/sun_vndr/no, keymap/sun_vndr/pl, keymap/sun_vndr/ru,
-	  keymap/sun_vndr/se, keymap/sun_vndr/uk, keymap/sun_vndr/us: Ivan
-	  found dots are not good for us
-
-2004-05-03 02:33  svu
-
-	* tests/: testLayouts.pl, testModels.pl, xkbTestFunc.pm: The perl
-	  code is a bit structured now
-
-2004-05-03 00:48  svu
-
-	* po/ru.po: Russian translation, up2date
-
-2004-05-03 00:48  svu
-
-	* po/xkbdesc.pot: new strings
-
-2004-05-03 00:38  svu
-
-	* rules/: base, base.xml.in: some fixes in rules, more tests pass
-	  ok
-
-2004-05-03 00:05  svu
-
-	* rules/base.xml.in, symbols/ch, symbols/mk, tests/testModels.pl:
-	  at least variants pass ok with tests
-
-2004-05-01 02:17  svu
-
-	* symbols/: Makefile.am, hu: Hungarian layout added, thanks to
-	  Soós
-
-2004-04-30 05:27  pascal
-
-	* rules/base, symbols/Makefile.am, symbols/jp, symbols/mn: Add
-	  Japanese and Mongolian layouts.
-
-2004-04-27 23:17  svu
-
-	* rules/base.xml.in: Canadian layout meta-info fixed
-
-2004-04-27 23:13  svu
-
-	* symbols/ge: fixed syntax typo
-
-2004-04-27 22:19  svu
-
-	* rules/base, rules/base.xml.in, symbols/Makefile.am, symbols/fr,
-	  symbols/fr-latin9: French layouts are now merged. Thanks to
-	  Guylhem for the positive answer
-
-2004-04-26 00:57  svu
-
-	* tests/: listCI2.xsl, testModels.pl: trying to test layouts as
-	  well
-
-2004-04-25 20:26  svu
-
-	* tests/: listCIs.xsl, testModels.pl: starting test scripts
-
-2004-04-25 00:37  svu
-
-	* symbols/us: fixing include
-
-2004-04-25 00:17  svu
-
-	* rules/base.xml.in, symbols/Makefile.am, symbols/us: us_intl is
-	  returned as alt-intl
-
-2004-04-24 20:29  svu
-
-	* symbols/Makefile.am: new layouts by Ivan should be included into
-	  Makefile.am
-
-2004-04-24 13:32  pascal
-
-	* symbols/ca: Remove 'pc' directory name from includes in Canadian
-	  keymap.
-
-2004-04-24 12:35  pascal
-
-	* rules/base, symbols/az, symbols/ca, symbols/group, symbols/vn:
-	  Add Azeri, Canadian and Vietnamese keymaps.
-
-2004-04-24 02:23  svu
-
-	* rules/base.xml.in, symbols/hr: Croatian US stuff appended
-
-2004-04-24 01:55  svu
-
-	* rules/base, rules/base.xml.in, symbols/Makefile.am, symbols/pl,
-	  symbols/pl2: second polish layout is merged
-
-2004-04-24 01:28  svu
-
-	* keymap/macintosh, keymap/sony, keymap/xfree86, keymap/xfree98,
-	  rules/base.lst, rules/base.xml.in, symbols/Makefile.am,
-	  symbols/ch, symbols/cz, symbols/cz_qwerty, symbols/ge,
-	  symbols/ge_la, symbols/ge_ru, symbols/il, symbols/il_phonetic,
-	  symbols/lt, symbols/mt, symbols/mt_us, symbols/ro, symbols/se_FI,
-	  symbols/se_NO, symbols/se_SE, symbols/sk, symbols/sk_qwerty,
-	  symbols/syr, symbols/syr_phonetic, symbols/th, symbols/th_pat,
-	  symbols/th_tis, symbols/us_intl: a lot of layouts cleaned up -
-	  but way way more to go
-
-2004-04-23 00:46  svu
-
-	* Makefile.am, configure.in, compiled/.cvsignore,
-	  compiled/Makefile.am, compiled/README: The 'compiled' directory
-	  is really necessary. Even if it is empty
-
-2004-04-22 00:39  svu
-
-	* po/af.po, po/az.po, po/bg.po, po/cs.po, po/da.po, po/fr.po,
-	  po/hu.po, po/nl.po, po/ru.po, po/sk.po, po/sq.po, po/sr.po,
-	  po/sv.po, po/tr.po, po/uk.po, po/xkbdesc.pot, po/zh_CN.po,
-	  rules/Makefile.am, symbols/Makefile.am, symbols/al, symbols/am,
-	  symbols/ar, symbols/be, symbols/ben, symbols/br, symbols/by,
-	  symbols/ch, symbols/cz, symbols/cz_qwerty, symbols/de,
-	  symbols/dk, symbols/dvorak, symbols/ee, symbols/el,
-	  symbols/en_US, symbols/es, symbols/fi, symbols/fo, symbols/fr,
-	  symbols/fr-latin9, symbols/gb, symbols/ge_la, symbols/hr,
-	  symbols/ie, symbols/il, symbols/is, symbols/it, symbols/la,
-	  symbols/latin, symbols/lt, symbols/lv, symbols/mk, symbols/ml,
-	  symbols/mt, symbols/mt_us, symbols/nl, symbols/no, symbols/ogham,
-	  symbols/pc, symbols/pl, symbols/pl2, symbols/pt, symbols/ro,
-	  symbols/ru, symbols/sapmi, symbols/se, symbols/se_FI,
-	  symbols/se_NO, symbols/se_SE, symbols/si, symbols/sk,
-	  symbols/sk_qwerty, symbols/sr, symbols/syr, symbols/syr_phonetic,
-	  symbols/th, symbols/tml, symbols/tr, symbols/ua, symbols/us,
-	  symbols/us_intl, symbols/uz, symbols/yu: adding Swiss layouts and
-	  removing references to pc/ from files
-
-2004-04-21 00:19  svu
-
-	* symbols/: Makefile.am, bs, srvr_ctrl: Bosninan layout was
-	  forgotten
-
-2004-04-19 23:57  svu
-
-	* symbols/: Makefile.am, altwin, compose, ctrl, group, inet,
-	  keypad, level3, lock: adding all-important option files
-
-2004-04-16 00:58  svu
-
-	* configure.in, xkbdesc.spec.in, rules/Makefile.am: now, the
-	  symlinks allow distributors to use their own names for the rules
-	  - though not really recommended, we have to be
-	  backward-compatible
-
-2004-04-15 00:33  svu
-
-	* COPYING, Makefile.am, xkbdesc.spec.in, po/af.po, po/az.po,
-	  po/bg.po, po/cs.po, po/da.po, po/fr.po, po/hu.po, po/nl.po,
-	  po/ru.po, po/sk.po, po/sq.po, po/sr.po, po/sv.po, po/tr.po,
-	  po/uk.po, po/xkbdesc.pot, po/zh_CN.po: COPYING added - MIT
-	  license (thanks to Keithp). Some minor fixes on infrastructure
-
-2004-04-12 00:13  svu
-
-	* .cvsignore, Makefile.am, autogen.sh, configure.in, rules/base,
-	  symbols/Makefile.am: First buildable version
-
-2004-04-11 23:03  svu
-
-	* configure.in, keycodes/Makefile.am, keymap/.cvsignore,
-	  keymap/Makefile.am, po/af.po, po/az.po, po/bg.po, po/cs.po,
-	  po/da.po, po/fr.po, po/hu.po, po/nl.po, po/ru.po, po/sk.po,
-	  po/sq.po, po/sr.po, po/sv.po, po/tr.po, po/uk.po, po/xkbdesc.pot,
-	  po/zh_CN.po, rules/.cvsignore, rules/Makefile.am,
-	  semantics/.cvsignore, semantics/Makefile.am, symbols/.cvsignore,
-	  types/.cvsignore, types/Makefile.am: more automake foo - but
-	  still far from building the whole thing
-
-2004-04-10 03:22  svu
-
-	* autogen_gnome.sh, keycodes/.cvsignore, keycodes/Makefile.am: more
-	  makefiles.am - but still long way to the first build
-
-2004-04-10 03:08  svu
-
-	* Makefile.am, README, README.config, README.enhancing,
-	  configure.in, xfree86.xml.in, xfree86_xkb_xml.spec.in, xkb.dtd,
-	  xkbdesc.spec.in, compat/.cvsignore, compat/Makefile.am,
-	  compat/README, compat/accessx, compat/basic, compat/complete,
-	  compat/default, compat/group_led, compat/iso9995, compat/japan,
-	  compat/keypad, compat/leds, compat/misc, compat/mousekeys,
-	  compat/norepeat, compat/pc, compat/pc98, compat/xfree86,
-	  compat/xtest, geometry/.cvsignore, geometry/Makefile.am,
-	  geometry/README, geometry/amiga, geometry/ataritt,
-	  geometry/chicony, geometry/dell, geometry/everex,
-	  geometry/fujitsu, geometry/hp, geometry/keytronic,
-	  geometry/kinesis, geometry/macintosh, geometry/microsoft,
-	  geometry/nec, geometry/northgate, geometry/pc, geometry/sony,
-	  geometry/sun, geometry/winbook, keycodes/README,
-	  keycodes/aliases, keycodes/amiga, keycodes/ataritt,
-	  keycodes/fujitsu, keycodes/hp, keycodes/ibm, keycodes/macintosh,
-	  keycodes/powerpcps2, keycodes/sony, keycodes/sun,
-	  keycodes/xfree86, keycodes/xfree98, keymap/README, keymap/amiga,
-	  keymap/ataritt, keymap/macintosh, keymap/sony, keymap/xfree86,
-	  keymap/xfree98, po/POTFILES.in, po/af.po, po/az.po, po/bg.po,
-	  po/cs.po, po/da.po, po/fr.po, po/hu.po, po/nl.po, po/ru.po,
-	  po/sk.po, po/sq.po, po/sr.po, po/sv.po, po/tr.po, po/uk.po,
-	  po/zh_CN.po, rules/README, rules/base, rules/base-it.lst,
-	  rules/base.lst, rules/base.xml.in, rules/sgi, rules/sgi.lst,
-	  rules/sun, rules/sun.lst, rules/xfree98, rules/xfree98.lst,
-	  rules/xkb.dtd, rules/xml2lst.pl, semantics/basic,
-	  semantics/complete, semantics/default, semantics/xtest,
-	  symbols/al, symbols/am, symbols/ar, symbols/be, symbols/ben,
-	  symbols/bg, symbols/br, symbols/by, symbols/cz,
-	  symbols/cz_qwerty, symbols/de, symbols/dev, symbols/dk,
-	  symbols/dvorak, symbols/dz, symbols/ee, symbols/el,
-	  symbols/en_US, symbols/es, symbols/fi, symbols/fo, symbols/fr,
-	  symbols/fr-latin9, symbols/gb, symbols/ge_la, symbols/ge_ru,
-	  symbols/guj, symbols/gur, symbols/hr, symbols/ie, symbols/il,
-	  symbols/il_phonetic, symbols/ir, symbols/is, symbols/it,
-	  symbols/iu, symbols/kan, symbols/la, symbols/latin, symbols/lo,
-	  symbols/lt, symbols/lv, symbols/mk, symbols/ml, symbols/mm,
-	  symbols/mt, symbols/mt_us, symbols/nl, symbols/no, symbols/ogham,
-	  symbols/ori, symbols/pc, symbols/pl, symbols/pl2, symbols/pt,
-	  symbols/ro, symbols/ru, symbols/sapmi, symbols/se, symbols/se_FI,
-	  symbols/se_NO, symbols/se_SE, symbols/si, symbols/sk,
-	  symbols/sk_qwerty, symbols/sr, symbols/syr, symbols/syr_phonetic,
-	  symbols/tel, symbols/th, symbols/th_pat, symbols/th_tis,
-	  symbols/tj, symbols/tml, symbols/tr, symbols/ua, symbols/us,
-	  symbols/us_intl, symbols/uz, symbols/yu, types/README,
-	  types/basic, types/cancel, types/caps, types/complete,
-	  types/default, types/extra, types/iso9995, types/mousekeys,
-	  types/numpad, types/pc: first feed-in of the layouts. The
-	  revolution is coming
-
-2004-04-04 02:40  svu
-
-	* configure.in, po/az.po: Azerbaijani translation, thanks to Metin
-	  Amiroff
-
-2004-04-04 01:14  svu
-
-	* po/ru.po: Russian translation of the Syriac phonetic
-
-2004-04-04 01:12  svu
-
-	* xfree86.xml.in: Syriac phonetic was not there
-
-2004-03-19 21:37  svu
-
-	* configure.in: some more translations
-
-2004-03-19 21:37  svu
-
-	* po/hu.po: Hungarian one
-
-2004-03-19 21:02  svu
-
-	* po/: af.po, bg.po, cs.po, da.po, fr.po, nl.po, ru.po, sk.po,
-	  sq.po, sr.po, sv.po, tr.po, uk.po, zh_CN.po: three new
-	  translations
-
-2004-01-20 10:51  svu
-
-	* po/ru.po: corrected tibetian language translation
-
-2004-01-19 14:41  svu
-
-	* po/ru.po: updated Russian translation
-
-2004-01-19 14:41  svu
-
-	* xfree86.xml.in: new items from Ivan
-
-2004-01-19 14:39  svu
-
-	* xslt/xfree86.xsl: bugfix
-
-2004-01-09 14:44  svu
-
-	* po/ru.po: up2date
-
-2004-01-09 14:43  svu
-
-	* xfree86.xml.in: patch from Ivan - new items
-
-2004-01-07 09:32  svu
-
-	* configure.in, po/fr.po: French translation, thanks to Michel
-	  Robitaille
-
-2004-01-06 16:20  svu
-
-	* xfree86.xml.in, po/ru.po: updates from Ivan
-
-2004-01-03 14:43  svu
-
-	* po/nl.po: new version, thanks to Elros
-
-2003-12-18 22:43  svu
-
-	* .cvsignore, po/.cvsignore: little cleanup on messages
-
-2003-12-18 22:42  svu
-
-	* Makefile.am, configure.in: little things for the latest intltool
-
-2003-12-18 22:39  svu
-
-	* po/sk.po: Slovak translation, thanks to Zdenko Podobný
-
-2003-12-18 22:38  svu
-
-	* po/da.po: Danish translation, thanks to Ole Laursen
-
-2003-12-18 22:34  svu
-
-	* xfree86.xml.in: One more layout, one more variant, updates from
-	  Ivan
-
-2003-12-05 11:37  svu
-
-	* xslt/xfree86.xsl: helper xslt - reduces the resulting file
-
-2003-12-05 10:39  svu
-
-	* configure.in, po/tr.po: Turkish translation added, thanks to
-	  Nilgün Belma Bugüner
-
-2003-11-30 02:11  svu
-
-	* configure.in, po/sr.po: Serbian translation added, thanks to
-	  Danilo Segan
-
-2003-11-29 04:06  svu
-
-	* configure.in, po/zh_CN.po: Chinese simplified translation, thanks
-	  to Funda Wang
-
-2003-11-27 22:57  svu
-
-	* configure.in, po/nl.po: NL translation. Thanks to Elros Cyriatan
-
-2003-11-27 21:19  svu
-
-	* configure.in: added cs translation
-
-2003-11-27 21:15  svu
-
-	* po/cs.po: First non-cyrillic translation. Thanks to Michal
-	  Bukovjan
-
-2003-11-25 23:52  svu
-
-	* Makefile.am, NEWS, autogen_gnome.sh, configure.in,
-	  xfree86.xml.in, po/.cvsignore, po/Makevars, po/POTFILES.in,
-	  po/bg.po, po/ru.po, po/uk.po: Now the project should be buildable
-	  and translatable - but please no translations till the English
-	  version is approved
-
-2003-11-25 16:35  svu
-
-	* .cvsignore, AUTHORS, Makefile.am, autogen.sh, configure.in,
-	  xfree86.xml.in, xfree86_xkb_xml.spec.in, xkb.dtd: first batch of
-	  files - but no translation yet
-
-2003-11-24 23:32  svu
-
-	* README: first file in
-
+2009-12-21 Sergey Udaltsov
+
+	* symbols/ru: Added ru(typewriter-legacy),
+	https://bugs.freedesktop.org/show_bug.cgi?id=25726
+	* rules/base.o_s.part, rules/base.xml.in, symbols/group: added
+	grp(lctrl_rctrl_switch),
+	https://bugs.freedesktop.org/show_bug.cgi?id=25727
+
+2009-11-27 Sergey Udaltsov
+
+	* symbols/se: Reintroduced the broken bar in the Swedish symbol
+	layout. http://bugs.freedesktop.org/show_bug.cgi?id=8491
+
+2009-11-25 Sergey Udaltsov
+
+	* rules/base.m_s.part, symbols/inet: a bit of optimization, K6C to map
+	to Eject, always in media section
+
+2009-11-24 Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/lt: removed unneeded lt(balticplus),
+	http://bugs.freedesktop.org/show_bug.cgi?id=25263
+
+2009-11-21 Sergey Udaltsov
+
+	* ../rules/base.xml.in, ../symbols/pl: added pl(dvp),
+	http://bugs.freedesktop.org/show_bug.cgi?id=25200
+
+2009-11-18 Sergey Udaltsov
+
+	* symbols/tm: small fix for tm layout, related to Ctrl+? shortcuts
+	https://bugs.freedesktop.org/show_bug.cgi?id=25074
+
+2009-11-15 Octavio Alvarez
+
+	* rules/base.xml.in: Removed thinkpadintl from base.xml.in.
+
+2009-10-20 Sergey Udaltsov
+
+	* symbols/sun_vndr/us: added backspace mapping,
+	https://bugs.freedesktop.org/show_bug.cgi?id=24554
+
+2009-10-13 Sergey Udaltsov
+
+	* rules/base.lists.part, symbols/macintosh_vndr/Makefile.am,
+	symbols/macintosh_vndr/es: Spanish mac layout just included the
+	general one
+	* rules/base.xml.in, symbols/ch: fixed Swiss default layout, added
+	legacy variant, http://bugs.freedesktop.org/show_bug.cgi?id=24490
+
+2009-10-12 Sergey Udaltsov
+
+	* rules/base.xml.in: USA Russian Phonetic keyboard layout not found in
+	search by Languages - Russian,
+	http://bugs.freedesktop.org/show_bug.cgi?id=24485
+
+2009-09-30 Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/group: added
+	grp:rctrl_rshift_toggle option,
+	http://bugs.freedesktop.org/show_bug.cgi?id=24234
+
+2009-09-29 Sergey Udaltsov
+
+	* configure.in, NEWS, po/*.po: preparing 1.7
+
+2009-09-15 Sergey Udaltsov
+
+	* symbols/es: addind dead_tilde,
+	https://bugs.freedesktop.org/show_bug.cgi?id=23876
+	* keycodes/sun, rules/base.m_k.part, rules/base.ml_s.part,
+	symbols/sun_vndr/us: fixed Sun keyboard model for type6,
+	https://bugs.freedesktop.org/show_bug.cgi?id=3952
+
+2009-09-08 Gaetan Nadon
+
+	* **/.cvsignore: remove cvsignore files.
+
+2009-09-02 Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/by: restructured Belarussian variants,
+	https://bugs.freedesktop.org/show_bug.cgi?id=23604
+
+2009-08-28 Sergey Udaltsov
+
+	* symbols/no: updated layout,
+	http://bugs.freedesktop.org/show_bug.cgi?id=23518
+
+2009-08-20 Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/capslock: added
+	caps:numlock, http://bugs.freedesktop.org/show_bug.cgi?id=23323
+
+2009-08-18 Peter Hutterer
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/capslock: added
+	caps:hyper, http://bugs.freedesktop.org/show_bug.cgi?id=23356
+
+2009-08-14 Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/capslock: added
+	caps:none option, http://bugs.freedesktop.org/show_bug.cgi?id=23243
+	* rules/base.xml.in, symbols/it: added it(us),
+	http://bugs.freedesktop.org/show_bug.cgi?id=23263
+
+2009-08-04 Sergey Udaltsov
+
+	* geometry/Makefile.am, rules/base.lists.part, rules/base.m_g.part,
+	rules/base.xml.in: added TypeMatrix geometries,
+	http://bugs.freedesktop.org/show_bug.cgi?id=23136
+
+2009-07-19 Sergey Udaltsov
+
+	* symbols/vn: fixed accent typing,
+	http://bugs.freedesktop.org/show_bug.cgi?id=22847
+
+2009-07-18 Sergey Udaltsov
+
+	* symbols/gb: fixed gb(colemak), several mappings added,
+	http://bugs.freedesktop.org/show_bug.cgi?id=22735
+
+2009-07-14 Sergey Udaltsov
+
+	* rules/base.extras.xml.in, rules/extras/variantsMapping.lst,
+	symbols/extras/us: added us(crd) to extras,
+	http://bugs.freedesktop.org/show_bug.cgi?id=22635
+
+2009-07-09 Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/bg: updated bg variants,
+	http://bugs.freedesktop.org/show_bug.cgi?id=22666
+
+2009-06-27 Sergey Udaltsov
+
+	* symbols/extras/us, rules/base.extras.xml.in,
+	rules/extras/variantsMapping.lst, symbols/extras/Makefile.am: Added 3
+	exotic us variants: ats, intl-unicode, alt-intl-unicode
+	http://bugs.freedesktop.org/show_bug.cgi?id=22004
+	http://bugs.freedesktop.org/show_bug.cgi?id=22446
+
+2009-06-22 Sergey Udaltsov
+
+	* .gitignore, configure.in, rules/Makefile.am,
+	rules/base.extras.xml.in, rules/base.l2_s.part, rules/base.l3_s.part,
+	rules/base.l4_s.part, rules/base.lists.part, rules/base.ml_s.part,
+	rules/bin/Makefile.am, rules/compat/ln_s.sh -> rules/bin/ln_s.sh,
+	rules/compat/lnv_s.sh -> rules/bin/lnv_s.sh, rules/compat/ml1_s.sh ->
+	rules/bin/ml1_s.sh, rules/compat/ml1v1_s.sh -> rules/bin/ml1v1_s.sh,
+	rules/compat/ml1v_s.sh -> rules/bin/ml1v_s.sh, rules/compat/ml_s.sh ->
+	rules/bin/ml_s.sh, rules/compat/mlv_s.sh -> rules/bin/mlv_s.sh,
+	rules/compat/Makefile.am, rules/compat/layoutsMapping.lst,
+	rules/compat/variantsMapping.lst, rules/extras/Makefile.am,
+	rules/extras/layoutsMapping.lst, symbols/extras/Makefile.am,
+	symbols/extras/rs: serious restructuring of the rules generation
+	scripts, for compat and extras. Also, adding exotic rs(combiningkeys)
+	variant, http://bugs.freedesktop.org/show_bug.cgi?id=21047
+
+2009-06-20 Sergey Udaltsov
+
+	* symbols/by: missing mappings,
+	https://bugs.freedesktop.org/show_bug.cgi?id=22386
+	* symbols/ca: fixed a couple of mappings in ca(shs)
+	http://bugs.freedesktop.org/show_bug.cgi?id=22388
+
+2009-06-19 Sergey Udaltsov
+
+	* symbols/de: small fix for a numbersign key,
+	http://bugs.freedesktop.org/show_bug.cgi?id=19934
+
+2009-06-15 Sergey Udaltsov
+
+	* symbols/inet: fixing ABNT2-specific mapping for keypad dot key,
+	http://bugs.freedesktop.org/show_bug.cgi?id=22303
+
+2009-06-14 Sergey Udaltsov
+
+	* rules/base.lists.part, rules/base.xml.in, symbols/inet: added
+	creativedw7000 model,
+	http://bugs.freedesktop.org/show_bug.cgi?id=22261
+
+2009-06-12 Sergey Udaltsov
+
+	* symbols/us: added extra symbols to us(altgr-intl),
+	http://bugs.freedesktop.org/show_bug.cgi?id=22249
+
+2009-06-11 Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/capslock: added
+	caps:super, http://bugs.freedesktop.org/show_bug.cgi?id=22184
+
+2009-06-09 Sergey Udaltsov
+
+	* symbols/ng: fixing 'e with dot below' in ng(olpc),
+	https://bugs.freedesktop.org/show_bug.cgi?id=20010
+	* rules/base.ml1_s.part: fixing misspeled variant name,
+	https://bugs.freedesktop.org/show_bug.cgi?id=15782
+	* symbols/tr: lost credits added,
+	https://bugs.freedesktop.org/show_bug.cgi?id=22079
+	* rules/base.xml.in, symbols/ru: added ru(bak),
+	https://bugs.freedesktop.org/show_bug.cgi?id=22101
+
+2009-05-31 Sergey Udaltsov
+
+	* symbols/altwin: setting explicit TWO_LEVEL on sections mapping RALT
+	, it is often ONE_LEVEL because of LEVEL3. Fixed
+	http://bugs.freedesktop.org/show_bug.cgi?id=21761
+
+2009-05-24 Sergey Udaltsov
+
+	* symbols/ua: fixed all references, from ua(basic) to ua(legacy),
+	finalizing http://bugs.freedesktop.org/show_bug.cgi?id=21302
+
+2009-05-18 Sergey Udaltsov
+
+	* symbols/de: adding acute to de(nodeadkeys),
+	http://bugs.freedesktop.org/show_bug.cgi?id=21794
+
+2009-05-12 Sergey Udaltsov
+
+	* NEWS, configure.in: bumping the release number
+
+2009-05-12  Reşat SABIQ
+
+	* configure.in (new locale), po/crh.po:
+	Added crh.po as well (as was done originally on January 30), 
+	based on Peter Hutterer's feedback regarding build process;
+	http://bugs.freedesktop.org/show_bug.cgi?id=19730
+
+2009-05-11 Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/pl: polished the description for
+	pl(dvorak_altquotes)
+
+2009-05-11  Reşat SABIQ
+
+	* configure.in (new locale), rules/base.xml.in,
+	symbols/ro, symbols/tr, symbols/ua, symbols/uz:
+	Added Crimean Tatar (Crimean Turkish) layouts;
+	http://bugs.freedesktop.org/show_bug.cgi?id=19730
+
+2009-05-07 Sergey Udaltsov
+
+	* symbols/ru: fixed Kalmyk variant
+
+2009-05-01 Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/ru: added ru(phonetic_winkeys),
+	http://bugs.freedesktop.org/show_bug.cgi?id=21474
+
+2009-04-29 Sergey Udaltsov
+
+	* rules/base.xml.in: fixed wrong locale code,
+	http://bugs.freedesktop.org/show_bug.cgi?id=21451
+
+2009-04-25 Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/Makefile.am,
+	symbols/pc, symbols/srvr_ctrl: Make C-A-Bksp an option,
+	http://bugs.freedesktop.org/show_bug.cgi?id=21274
+
+2009-04-23 Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/ua: making ua(unicode) default,
+	http://bugs.freedesktop.org/show_bug.cgi?id=21302
+
+2009-04-22 Sergey Udaltsov
+
+	* rules/compat/ln_s.sh, rules/compat/ml1_s.sh: improved compat rules,
+	hopefully fixing http://bugs.freedesktop.org/show_bug.cgi?id=8452
+
+2009-04-15 Sergey Udaltsov
+
+	* symbols/kr: fixed ordering issue,
+	http://bugs.freedesktop.org/show_bug.cgi?id=21211
+
+2009-04-14 Sergey Udaltsov
+
+	* symbols/kg: small update of the Kyrgyz layout,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17505
+	* rules/base.xml.in, symbols/gb: added gb(extd),
+	http://bugs.freedesktop.org/show_bug.cgi?id=21121
+
+2009-04-03 Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/tm: added Turkmen layout+variant,
+	http://bugs.freedesktop.org/show_bug.cgi?id=21015
+	* symbols/rs: splitting latlevel3 and cyrlevel3,
+	http://bugs.freedesktop.org/show_bug.cgi?id=21044
+	* rules/base.m_s.part, rules/base.xml.in: Cherry B.UMLIMITED dummy
+	model, http://bugs.freedesktop.org/show_bug.cgi?id=21002
+
+2009-03-17 Sergey Udaltsov
+
+	* symbols/de: some useful symbols added on high shift levels,
+	http://bugs.freedesktop.org/show_bug.cgi?id=20551
+
+2009-03-16 Sergey Udaltsov
+
+	* rules/base.lists.part, rules/base.xml.in, symbols/kg: fixed Kyrgyz
+	variants, http://bugs.freedesktop.org/show_bug.cgi?id=17505
+
+2009-03-07 Sergey Udaltsov
+
+	* rules/base.m_s.part, rules/base.xml.in: added trust_slimline model,
+	http://bugs.freedesktop.org/show_bug.cgi?id=20513
+
+2009-03-04 Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/altwin, symbols/pc:
+	putting altwin:super_win into default configuration,
+	http://bugs.freedesktop.org/show_bug.cgi?id=19500
+
+2009-03-03 Sergey Udaltsov
+
+	* rules/base.lists.part, rules/base.ml1_s.part, rules/base.ml_s.part:
+	use br(thinkpad) for all thinkpads,
+	http://bugs.freedesktop.org/show_bug.cgi?id=20425
+
+2009-03-02 Sergey Udaltsov
+
+	* po/POTFILES.in: removed evdev.xml.in, which is exact copy of
+	base.xml.in (and not distributed),
+	http://bugs.freedesktop.org/show_bug.cgi?id=20107
+
+2009-02-26 Sergey Udaltsov
+
+	* symbols/fi: added missing (in pc101) mappings, on 4th level,
+	https://bugs.freedesktop.org/show_bug.cgi?id=20300
+	* keycodes/evdev, keycodes/xfree86, keymap/xfree86,
+	rules/base.lists.part, rules/base.m_k.part, rules/base.xml.in,
+	rules/evdev.m_k.part: dropping national-specific models abnt2, jp106,
+	kr106. The corresponding geometries are left in the codebase, for some
+	while
+
+2009-02-25 Sergey Udaltsov
+
+	* symbols/ru: missing minus and underscore are added to ru(phonetic),
+	http://bugs.freedesktop.org/show_bug.cgi?id=20093
+
+2009-02-19 Sergey Udaltsov
+
+	* keycodes/evdev, keycodes/xfree86, rules/base.m_k.part: merged
+	xfree86(jp106) section to basic xfree86 keycodes
+
+2009-02-14  Sergey Udaltsov
+
+	* symbols/sn, rules/base.xml.in, symbols/Makefile.am: added wolof
+	layout, http://bugs.freedesktop.org/show_bug.cgi?id=20004
+
+2009-02-13  Sergey Udaltsov
+
+	* symbols/inet: adding missing mappings to evdev,
+	http://bugs.freedesktop.org/show_bug.cgi?id=18854
+	* rules/base.xml.in: added lost lt(balticplus),
+	http://bugs.freedesktop.org/show_bug.cgi?id=20092
+
+2009-02-05  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/in: added in(hin-wx),
+	http://bugs.freedesktop.org/show_bug.cgi?id=19753
+
+2009-02-04  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/ru: added ru(dos),
+	http://bugs.freedesktop.org/show_bug.cgi?id=19880
+
+2009-02-01  Sergey Udaltsov
+
+	* rules/base.xml.in: fixed metainfo for fi(smi),
+	http://bugs.freedesktop.org/show_bug.cgi?id=19841
+	* rules/base.lists.part, rules/evdev.m_s.part: some kbds need tweaking
+	even with evdev, adding $evdevkbds (asked by Peter)
+	* symbols/inet: added battery key (asked by Peter)
+	* README: fixed docs url,
+	http://bugs.freedesktop.org/show_bug.cgi?id=9764
+
+2009-01-28  Sergey Udaltsov
+
+	* rules/base.ml_s.part: fixed sun-related rules,
+	http://bugs.freedesktop.org/show_bug.cgi?id=15782
+	* rules/base.m_s.part, rules/base.xml.in, symbols/inet: added
+	geniuskkb2050hs model,
+	http://bugs.freedesktop.org/show_bug.cgi?id=19694
+	* geometry/dell, rules/base.m_g.part: added latitude geometry,
+	http://bugs.freedesktop.org/show_bug.cgi?id=19750
+	* rules/base.xml.in, symbols/Makefile.am, symbols/brai,
+	symbols/braille: moved Braille symbols to the proper location,
+	http://bugs.freedesktop.org/show_bug.cgi?id=19695
+	* symbols/capslock: keep Escape working in caps:escape,
+	http://bugs.freedesktop.org/show_bug.cgi?id=19795
+	* rules/base.o_s.part, rules/base.xml.in, symbols/level3: added
+	lv3:enter_switch, http://bugs.freedesktop.org/show_bug.cgi?id=19773
+	* rules/base.xml.in, symbols/ca: added ca(eng) for convenience,
+	http://bugs.freedesktop.org/show_bug.cgi?id=19707
+
+2009-01-27  Sergey Udaltsov
+
+	* symbols/typo: fixed text selection,
+	http://bugs.freedesktop.org/show_bug.cgi?id=14022
+	* symbols/be: added missing character,
+	http://bugs.freedesktop.org/show_bug.cgi?id=19751
+	* symbols/fr: fixed . on numpad, period->KP_Decimal,
+	http://bugs.freedesktop.org/show_bug.cgi?id=19756
+	* NEWS, configure.in: preparing 1.5
+
+2009-01-24  Sergey Udaltsov
+
+	* rules/base.xml.in: added SV and US to the country list for latam,
+	http://bugs.freedesktop.org/show_bug.cgi?id=19710
+
+2009-01-22  Sergey Udaltsov
+
+	* symbols/fi: updated default Finnish variant,
+	http://bugs.freedesktop.org/show_bug.cgi?id=18742
+
+2009-01-13  Sergey Udaltsov
+
+	* symbols/typo, rules/base.l1o_s.part, rules/base.l2o_s.part,
+	rules/base.l3o_s.part, rules/base.l4o_s.part, rules/base.lo_s.part,
+	rules/base.xml.in, symbols/Makefile.am: added (inactive so far)
+	misc:typo option, first step to close
+	https://bugs.freedesktop.org/show_bug.cgi?id=14022
+
+2009-01-12  Sergey Udaltsov
+
+	* rules/Makefile.am, rules/merge.sh: fix the build (thanks to Oswald
+	Buddenhagen)
+
+2009-01-11  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/capslock: added
+	option to use capslock as backspace,
+	http://bugs.freedesktop.org/show_bug.cgi?id=19508
+	* rules/base.xml.in, symbols/lt: removed unneeded variant,
+	http://bugs.freedesktop.org/show_bug.cgi?id=14096
+	* rules/base.xml.in, symbols/fr: added Breton variant,
+	http://bugs.freedesktop.org/show_bug.cgi?id=19506
+
+2009-01-10  Sergey Udaltsov
+
+	* rules/base.xml.in: More improvements(?) in descriptions, to make
+	them shorter
+
+2009-01-08  Sergey Udaltsov
+
+	* rules/base.xml.in: slightly reorganized descriptions for the group
+	related to switchers
+
+2009-01-06  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/es, symbols/latam: added dead tilde
+	variants, http://bugs.freedesktop.org/show_bug.cgi?id=12568
+	* rules/base.xml.in, rules/compat/variantRename.lst, symbols/in,
+	symbols/pk: updated Urdu variants,
+	https://bugs.freedesktop.org/show_bug.cgi?id=8091
+
+2009-01-03  Sergey Udaltsov
+
+	* rules/compat/ln_s.sh, rules/compat/ml1_s.sh: fixed compat layout
+	renaming involving variants on replacement, part of the fix for
+	http://bugs.freedesktop.org/show_bug.cgi?id=8452
+
+2008-12-30  Sergey Udaltsov
+
+	* symbols/fi: updated 2 mappings according to the new standard,
+	http://bugs.freedesktop.org/show_bug.cgi?id=18742
+
+2008-12-29  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/inet: added compal fl90,
+	http://bugs.freedesktop.org/show_bug.cgi?id=15820
+	* rules/base.m_s.part, rules/base.xml.in: added btc9116u model,
+	http://bugs.freedesktop.org/show_bug.cgi?id=15871
+	* symbols/gb: fixed gb dvorak,
+	http://bugs.freedesktop.org/show_bug.cgi?id=18244
+	* symbols/us: removed explicit CAPS mapping,
+	http://bugs.freedesktop.org/show_bug.cgi?id=18320
+
+2008-12-28  Sergey Udaltsov
+
+	*  rules/base.xml.in, symbols/de: updated neo variant,
+	http://bugs.freedesktop.org/show_bug.cgi?id=19308
+
+2008-12-26  Sergey Udaltsov
+
+	* rules/base.lists.part, rules/base.m_s.part, symbols/inet: using
+	acpi_common wherever possible, dropping (aliasing) unneeded models
+
+2008-12-25  Sergey Udaltsov
+
+	* rules/base.lists.part, rules/base.xml.in, symbols/inet: added
+	chicony0420 model, http://bugs.freedesktop.org/show_bug.cgi?id=15813
+	* symbols/inet: updated cymotionlinux model,
+	http://bugs.freedesktop.org/show_bug.cgi?id=15783
+
+2008-12-24  Sergey Udaltsov
+
+	* symbols/inet: consolidated a lot of mappings into nav_common
+
+2008-12-21  Sergey Udaltsov
+
+	* docs/README.enhancing: fixing the location of XKB proto docs,
+	http://bugs.freedesktop.org/show_bug.cgi?id=9764
+	* rules/base.xml.in, symbols/be: added oss variants,
+	http://bugs.freedesktop.org/show_bug.cgi?id=8854
+	* rules/base.m_s.part, rules/base.xml.in: added microsoftccurve2k
+	model http://bugs.freedesktop.org/show_bug.cgi?id=9772
+	* symbols/inet: changing globally XF86Refresh to XF86Reload,
+	http://bugs.freedesktop.org/show_bug.cgi?id=10751
+	* COPYING: added missing copyright notices,
+	http://bugs.freedesktop.org/show_bug.cgi?id=11095
+	* rules/base.lists.part, rules/base.xml.in, symbols/inet: added model
+	unitek_kb1925, http://bugs.freedesktop.org/show_bug.cgi?id=11579
+
+2008-12-18  Sergey Udaltsov
+
+	* keycodes/macintosh, rules/base.m_k.part, rules/base.o_k.part:
+	dropped the goodmap and badmap keycodes for apple - needed for a very
+	old kernels only. http://bugs.freedesktop.org/show_bug.cgi?id=9095
+	
+2008-12-17  Sergey Udaltsov
+
+	* symbols/capslock, symbols/compose, symbols/ctrl: fix lock modifier
+	for jp, making "CAPS" replace key,
+	http://bugs.freedesktop.org/show_bug.cgi?id=8805
+
+2008-12-15  Sergey Udaltsov
+
+	* symbols/ru: added Kalmyk variant, thanks to Anatoly Mironov and
+	others
+
+2008-12-12  Sergey Udaltsov
+
+	* symbols/fr: fixed bepo variant,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17821
+	* symbols/ara: restoring presentation forms,
+	http://bugs.freedesktop.org/show_bug.cgi?id=18833
+	* rules/base.xml.in, rules/base.m_s.part: added targa_v811 model,
+	https://bugs.freedesktop.org/show_bug.cgi?id=5722
+
+2008-11-30  Sergey Udaltsov
+
+	* symbols/gr: added ralt switch to Greek default layout,
+	http://bugs.freedesktop.org/show_bug.cgi?id=18819
+	* rules/base.o_s.part, rules/base.xml.in, symbols/group: added
+	win_menu_switch option,
+	http://bugs.freedesktop.org/show_bug.cgi?id=18557
+
+2008-11-29  Sergey Udaltsov
+
+	* compat/level5: finally using Level5 characters,
+	https://bugs.freedesktop.org/show_bug.cgi?id=4411
+	* rules/base.xml.in: generalized Fujitsu-Siemens Amilo laptops, also
+	closing http://bugs.freedesktop.org/show_bug.cgi?id=5694
+	* rules/base.o_s.part, rules/base.xml.in, symbols/epo: added a couple
+	of Esperanto options,
+	http://bugs.freedesktop.org/show_bug.cgi?id=18142
+
+2008-11-27  Sergey Udaltsov
+
+	* ChangeLog, rules/base.lists.part, rules/base.xml.in, symbols/inet:
+	added cymotion expert model,
+	http://bugs.freedesktop.org/show_bug.cgi?id=18718
+
+2008-11-26  Sergey Udaltsov
+
+	* keycodes/evdev: fixed ABNT2 keycodes,
+	http://bugs.freedesktop.org/show_bug.cgi?id=18712
+	* keycodes/amiga, keycodes/ataritt, keycodes/fujitsu,
+	keycodes/macintosh, keycodes/sgi_vndr/indigo, keycodes/sgi_vndr/indy,
+	keycodes/sun, keycodes/xfree98: set keycode ranges 8-255, universally,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12538
+
+2008-11-22  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/group: added
+	grp(alt_space_toggle) option,
+	http://bugs.freedesktop.org/show_bug.cgi?id=15772
+	* symbols/ca, symbols/et, symbols/tr: small OLPC fixes,
+	http://bugs.freedesktop.org/show_bug.cgi?id=18645
+
+2008-11-20  Sergey Udaltsov
+
+	* rules/base.lists.part, rules/base.xml.in, symbols/inet: added HP dv5
+	keyboard, thanks to Giuseppe Bilotta
+
+2008-11-18  Sergey Udaltsov
+
+	* symbols/it: fixing it(olpc),
+	http://bugs.freedesktop.org/show_bug.cgi?id=18565
+
+2008-11-08  Sergey Udaltsov
+
+	* symbols/inet: using inet(acpi) wherever possible, fixing apple
+	section (thanks to Otavio Salvador)
+	* symbols/pl: missing mappings, thanks to Otavio and Debian
+
+2008-11-06  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/capslock: added
+	capslock(escape)
+
+2008-10-18  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/keypad,
+	symbols/kpdl: added 2 keypad options (hex and atm), also kpdl:semi,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17110
+	* rules/base.xml.in, symbols/de: added de(qwerty)
+
+2008-10-14  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/keypad: removed
+	keypad:phone_hex option, to be replaced with newer one
+	http://bugs.freedesktop.org/show_bug.cgi?id=17110
+
+2008-10-13  Sergey Udaltsov
+
+	* keycodes/evdev: fixed keycode comment from Peter Hutterer
+	* rules/base.xml.in, symbols/tj: cleaning the mess with tj variants,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17975
+
+2008-10-11  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/de: added Lower Sorbian variants,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17855
+	* rules/base.xml.in, symbols/tj: added 2 new variants, std and legacy,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17975
+	* rules/base.o_t.part, rules/base.xml.in, types/numpad: added
+	numpad(shift3) option,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17110
+
+2008-10-03  Sergey Udaltsov
+
+	* symbols/ru: fix typewriter layout,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17881
+
+2008-09-30  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/altwin: added
+	Mac-like modifiers positioning,
+	http://bugs.freedesktop.org/show_bug.cgi?id=15655
+	* NEWS, configure.in: preparing 1.4
+
+2008-09-26  Sergey Udaltsov
+
+	* symbols/is: fixed AC11 mapping,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17786
+
+2008-09-24  Sergey Udaltsov
+
+	* rules/base.xml.in: all descriptions are prefixed with underscore,
+	to make them translatable,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17587
+
+2008-09-19  Sergey Udaltsov
+
+	* keycodes/evdev, symbols/inet: fixed evdev for abnt2 and jp106
+	http://bugs.freedesktop.org/show_bug.cgi?id=17656
+
+2008-09-18  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in: more mismatches fixed,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17622
+
+2008-09-17  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in: fixed mismatch,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17622
+
+2008-09-15  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/capslock,
+	symbols/cz: added cz(ucw) and couple of options,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17587
+	* rules/base.xml.in, symbols/gr: updated greek variants,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17459
+
+2008-09-12  Sergey Udaltsov
+
+	* geometry/pc: added another pc geometry, with L-shaped Enter,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17513
+
+2008-09-10  Sergey Udaltsov
+
+	* rules/base.lists.part, rules/base.xml.in, symbols/inet: added model
+	sven303, http://bugs.freedesktop.org/show_bug.cgi?id=17518
+
+2008-09-02  Sergey Udaltsov
+
+	* symbols/inet: fixed fscaa1667g,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17389
+	* symbols/fr: fixed invalid keysym,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17388
+	* rules/base.xml.in: some fixes for minor issues
+	* rules/base.xml.in, symbols/gb: added gb(dvorakukp),
+	http://bugs.freedesktop.org/show_bug.cgi?id=17370
+
+2008-08-16  Sergey Udaltsov
+
+	* rules/evdev.m_k.part, rules/evdev.m_s.part, keycodes/evdev,
+	po/POTFILES.in, po/xkeyboard-config.pot, rules/Makefile.am: implement
+	special ruleset for evdev driver
+	* added missing chars to Gurmukhi,
+	http://bugs.freedesktop.org/show_bug.cgi?id=17163
+
+2008-08-06  Sergey Udaltsov
+
+	* compat/Makefile.am, geometry/Makefile.am, keycodes/Makefile.am,
+	keymap/Makefile.am, rules/compat/Makefile.am, semantics/Makefile.am,
+	symbols/Makefile.am, types/Makefile.am, xkbrules.am: improving the
+	build, http://bugs.freedesktop.org/show_bug.cgi?id=17008
+
+2008-08-03  Sergey Udaltsov
+
+	* rules/compat/variantRename.lst: fixing compat rules for Romania,
+	http://bugs.freedesktop.org/show_bug.cgi?id=16872
+	* symbols/mt: fixed Maltese layout,
+	http://bugs.freedesktop.org/show_bug.cgi?id=16966
+	* symbols/fr: fixed fr(dvorak), making it legal
+	http://bugs.freedesktop.org/show_bug.cgi?id=15407
+
+2008-07-28  Sergey Udaltsov
+
+	* rules/base.lists.part, rules/base.xml.in, symbols/inet: added
+	ibm_spacesaver model,
+	http://bugs.freedesktop.org/show_bug.cgi?id=16767
+
+2008-07-22  Sergey Udaltsov
+
+	* rules/base.xml.in: fixed typo,
+	http://bugs.freedesktop.org/show_bug.cgi?id=16806
+
+2008-07-20  Sergey Udaltsov
+
+	* symbols/inet: fixed typo,
+	http://bugs.freedesktop.org/show_bug.cgi?id=16752
+
+2008-07-08  Sergey Udaltsov
+
+	* symbols/us: fixing us(mac),
+	https://bugs.freedesktop.org/show_bug.cgi?id=16641
+
+2008-07-01  Sergey Udaltsov
+
+	* symbols/is, rules/base.xml.in: added is(dvorak),
+	https://bugs.freedesktop.org/show_bug.cgi?id=16557
+
+2008-06-27  Sergey Udaltsov
+
+	* symbols/level5: using normal level5 keysyms
+	* rules/compat/ln_s.sh, rules/compat/lnv_s.sh, rules/compat/ml1_s.sh,
+	rules/compat/ml1v1_s.sh, rules/compat/ml1v_s.sh, rules/compat/ml_s.sh,
+	rules/compat/mlv_s.sh: fixed build process, thanks to Oswald
+	Buddenhagen
+
+2008-06-22  Sergey Udaltsov
+
+	* symbols/tj: sorted and fixed tj layout,
+	http://bugs.freedesktop.org/show_bug.cgi?id=16448
+
+2008-06-12  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/keypad: added
+	keypad:phone_hex, http://bugs.freedesktop.org/show_bug.cgi?id=16298
+
+2008-06-09  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/us: added us(chr),
+	http://bugs.freedesktop.org/show_bug.cgi?id=16283
+
+2008-06-06  Sergey Udaltsov
+
+	* geometry/pc: removed unneeded space,
+	http://bugs.freedesktop.org/show_bug.cgi?id=16258
+
+2008-06-04  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/ru: added ru(sah),
+	http://bugs.freedesktop.org/show_bug.cgi?id=15872
+
+2008-06-01  Sergey Udaltsov
+
+	* rules/base.xml.in, rules/base.lists.part, symbols/inet: added
+	microsoft7000, http://bugs.freedesktop.org/show_bug.cgi?id=16087
+	* keycodes/xfree86, rules/base.m_g.part, rules/base.m_k.part,
+	rules/base.m_s.part, rules/base.xml.in: added model thinkpadz60,
+	http://bugs.freedesktop.org/show_bug.cgi?id=15999
+
+2008-05-31  Sergey Udaltsov
+
+	* symbols/gb, symbols/hu: fixed utf8
+
+2008-05-31  Sergey Udaltsov
+
+	* symbols/ru: fixed some includes, from common to winkeys (broken in
+	previous release)
+
+2008-05-30  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/ca: added ca(kut),
+	http://bugs.freedesktop.org/show_bug.cgi?id=16048
+
+2008-05-27  Sergey Udaltsov
+
+	* symbols/inet: WWW is mapped to I02, because of some changes in
+	kernel or X server (on nx9020),
+	http://bugs.freedesktop.org/show_bug.cgi?id=7310
+	* symbols/us: fixed one-handed dvorak variants (dropped second group),
+	http://bugs.freedesktop.org/show_bug.cgi?id=5659
+	* symbols/fi: returned nbsp to 3rd level of space,
+	http://bugs.freedesktop.org/show_bug.cgi?id=12764
+	* configure.in, NEWS: preparing 1.3
+
+2008-05-12  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/ro: changed default Romanian variant to
+	the right one, http://bugs.freedesktop.org/show_bug.cgi?id=13277
+
+2008-05-09  Sergey Udaltsov
+
+	* rules/compat/variantRename.lst, symbols/ru: default variant is
+	winkeys (till Daniel fixes xkbcomp)
+	* symbols/ua: small fix, from Andriy
+
+2008-05-01  Sergey Udaltsov
+
+	* po/POTFILES.in, rules/Makefile.am, rules/sgi*, rules/sun*: dropping
+	legacy unsupported rules. Confirmed with Alan Coopersmith (Sun
+	Microsystems)
+
+2008-04-30  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/us: added us(dvp),
+	http://bugs.freedesktop.org/show_bug.cgi?id=15727
+
+2008-04-29  Sergey Udaltsov
+
+	* symbols/ca: fixed ca(shs),
+	http://bugs.freedesktop.org/show_bug.cgi?id=15756
+
+2008-04-23  Sergey Udaltsov
+
+	* symbols/es: revert broken idea about dead tilde,
+	http://bugs.freedesktop.org/show_bug.cgi?id=9763
+	* symbols/latam: revert broken idea about dead tilde,
+	http://bugs.freedesktop.org/show_bug.cgi?id=12568
+
+2008-04-22  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/fr, symbols/nbsp,
+	types/pc: options for nonbreakspace handling,
+	http://bugs.freedesktop.org/show_bug.cgi?id=9529
+	* symbols/fi: dropping bad nbsp mapping,
+	http://bugs.freedesktop.org/show_bug.cgi?id=12764
+
+2008-04-21  Sergey Udaltsov
+
+	* rules/base.xml.in: fixed some ISO codes
+
+2008-04-19  Sergey Udaltsov
+
+	* symbols/ru, rules/base.xml.in, rules/compat/variantRename.lst:
+	changed ru(winkeys) to default
+	* rules/base.xml.in: put a lot of country/language info in
+
+2008-04-12  Sergey Udaltsov
+
+	* symbols/it: fixed it(geo),
+	https://bugs.freedesktop.org/show_bug.cgi?id=15058
+
+2008-04-07  Sergey Udaltsov
+
+	* symbols/group, rules/base.xml.in, rules/base.o_s.part: added
+	group(shift_caps_switch)
+	http://bugs.freedesktop.org/show_bug.cgi?id=15383
+
+2008-04-01  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/gb: added gb(colemak),
+	http://bugs.freedesktop.org/show_bug.cgi?id=15303
+
+2008-03-30  Sergey Udaltsov
+
+	* symbols/gn, symbols/ng: fixed unicode sequences,
+	http://bugs.freedesktop.org/show_bug.cgi?id=15273
+	* rules/base.xml.in, symbols/ua: added ua(homophonic),
+	http://bugs.freedesktop.org/show_bug.cgi?id=15240
+
+2008-03-28  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/compose: added
+	compose:102, http://bugs.freedesktop.org/show_bug.cgi?id=15246
+
+2008-03-22  Sergey Udaltsov
+
+	* symbols/fr: fixed fr(oss_nodeadkeys),
+	http://bugs.freedesktop.org/show_bug.cgi?id=15140
+
+2008-03-06  Sergey Udaltsov
+
+	* rules/base.lists.part, symbols/ca, symbols/fr: added ca(olpc),
+	removed fr(olpc), http://bugs.freedesktop.org/show_bug.cgi?id=14749
+
+2008-03-03  Sergey Udaltsov
+
+	* rules/base.lists.part, symbols/fr: added fr(olpc),
+	http://bugs.freedesktop.org/show_bug.cgi?id=14749
+	* symbols/lv: fixed lv accented characters,
+	http://bugs.freedesktop.org/show_bug.cgi?id=14765
+	* rules/base.lists.part, symbols/it: added it(olpc),
+	http://bugs.freedesktop.org/show_bug.cgi?id=14793
+
+2008-03-01  Sergey Udaltsov
+
+	* rules/base.lists.part, rules/base.m_s.part, rules/base.xml.in,
+	symbols/inet: reorganizing keyboard in symbols/inet. Some models are
+	now implemented as "virtual" (by rules only).
+	http://bugs.freedesktop.org/show_bug.cgi?id=14665
+
+2008-02-28  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/in: added in(jhelum), other indian fixes,
+	http://bugs.freedesktop.org/show_bug.cgi?id=14595
+	* symbols/jp: small fix,
+	http://bugs.freedesktop.org/show_bug.cgi?id=8648
+
+2008-02-16  Sergey Udaltsov
+
+	* symbols/cz, symbols/sk: dropping KPDL mapping,
+	http://bugs.freedesktop.org/show_bug.cgi?id=14479
+
+2008-02-12  Sergey Udaltsov
+
+	* keycodes/sun, symbols/sun_vndr/us, rules/base.ml_s.part,
+	rules/base.xml.in: sun type6 kbd,
+	http://bugs.freedesktop.org/show_bug.cgi?id=13664
+
+2008-02-05  Sergey Udaltsov
+
+	* symbols/af: fixed AE09 in af(olpc-ps),
+	http://bugs.freedesktop.org/show_bug.cgi?id=14379
+
+2008-02-04  Sergey Udaltsov
+
+	* symbols/kh, rules/base.lists.part: added kh(olpc),
+	http://bugs.freedesktop.org/show_bug.cgi?id=14376
+
+2008-02-02  Sergey Udaltsov
+
+	* symbols/lt, rules/base.xml.in: added lt(lekp) etc,
+	http://bugs.freedesktop.org/show_bug.cgi?id=14096
+
+2008-01-31  Sergey Udaltsov
+
+	* symbols/af, rules/base.xml.in, rules/base.lists.part: changing
+	af(olpc-da) to af(olpc-fa),
+	http://bugs.freedesktop.org/show_bug.cgi?id=14319
+	* symbols/in: fixed space in in(olpc),
+	http://bugs.freedesktop.org/show_bug.cgi?id=14224
+
+2008-01-30  Sergey Udaltsov
+
+	* symbols/ca, rules/base.xml.in: adding ca(shs), closing
+	http://bugs.freedesktop.org/show_bug.cgi?id=14308
+	* symbols/mn: added mn(olpc),
+	http://bugs.freedesktop.org/show_bug.cgi?id=14307
+	* symbols/tr: fixed Turkish layouts,
+	http://bugs.freedesktop.org/show_bug.cgi?id=14286
+	* symbols/es, rules/base.xml.in: added es(ast),
+	http://bugs.freedesktop.org/show_bug.cgi?id=14277
+	* symbols/am, rules/base.lists.part: added am(olpc),
+	http://bugs.freedesktop.org/show_bug.cgi?id=14226
+	* symbols/af: fixed some keysyms,
+	http://bugs.freedesktop.org/show_bug.cgi?id=14309
+
+2008-01-29  Sergey Udaltsov
+
+	* NEWS, configure.in: preparing release 1.2
+
+2008-01-24  Sergey Udaltsov
+
+	* symbols/af, symbols/ara, symbols/et, symbols/group, symbols/in,
+	symbols/kz, symbols/np, symbols/pk, symbols/ru, symbols/th,
+	symbols/us: separating group(olpc), closing
+	http://bugs.freedesktop.org/show_bug.cgi?id=14225
+
+2008-01-21  Sergey Udaltsov
+
+	* symbols/gr: Polytonic Greek: Use new keysyms for dead psili and
+	dasia, http://bugs.freedesktop.org/show_bug.cgi?id=13275
+
+2008-01-11  Sergey Udaltsov
+
+	* rules/base.lists.part, symbols/in: added in(olpc), by Bernardo
+	Innocenti
+
+2008-01-07  Sergey Udaltsov
+
+	* geometry/thinkpad, keycodes/xfree86, rules/base.lists.part,
+	rules/base.m_g.part, rules/base.m_k.part, rules/base.xml.in,
+	symbols/inet: added thinkpad60 model (with geometry),
+	https://bugs.freedesktop.org/show_bug.cgi?id=13954
+
+2008-01-05  Sergey Udaltsov
+
+	* symbols/us: add (left,right)singlequotemark to us(-altgr)-intl
+	keymap, https://bugs.freedesktop.org/show_bug.cgi?id=13935
+
+2008-01-04  Sergey Udaltsov
+
+	* symbols/inet, rules/base.lists.part, rules/base.xml.in: adding BTC
+	6301URF, https://bugs.freedesktop.org/show_bug.cgi?id=13913
+	* symbols/macintosh_vndr/fr: added nodeadkeys,
+	https://bugs.freedesktop.org/show_bug.cgi?id=13934
+
+2008-01-03  Sergey Udaltsov
+
+	* symbols/pl, rules/base.xml.in: added pl(ru_phonetic_dvorak),
+	https://bugs.freedesktop.org/show_bug.cgi?id=13900
+
+2008-01-02  Sergey Udaltsov
+
+	* symbols/ro, rules/base.xml.in: small fixes for Romanian visible
+	strings from
+	https://bugs.freedesktop.org/show_bug.cgi?id=13277
+	* rules/base.xml.in, rules/compat/variantRename.lst, symbols/fr,
+	symbols/ge: moving ge(azerty_tscapo) to fr(geo), since that layout is
+	only used in France, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=13644
+	* symbols/ara: remove presentation forms from Arabic layout,
+	https://bugs.freedesktop.org/show_bug.cgi?id=13894
+
+2007-12-31  Sergey Udaltsov
+
+	* symbols/ro, rules/base.xml.in, rules/compat/variantRename.lst:
+	temporarily (partially) reverting
+	https://bugs.freedesktop.org/show_bug.cgi?id=13277
+
+2007-12-27  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/capslock: adding xkb
+	option caps:swapescape,
+	https://bugs.freedesktop.org/show_bug.cgi?id=13824
+
+2007-12-26  Sergey Udaltsov
+
+	* symbols/ee, rules/base.xml.in: adding ee(us), polishing eurosign
+	usage in ee, https://bugs.freedesktop.org/show_bug.cgi?id=13799
+
+2007-12-25  Sergey Udaltsov
+
+	* symbols/eurosign, rules/base.xml.in, rules/base.o_s.part: add
+	eurosign(4)
+
+2007-12-23  Sergey Udaltsov
+
+	* symbols/inet, rules/base.xml.in: add logiultrax model,
+	https://bugs.freedesktop.org/show_bug.cgi?id=13028
+	* symbols/me, rules/base.xml.in: use Latin as default Montenegro
+	variant, https://bugs.freedesktop.org/show_bug.cgi?id=13777
+	* symbols/inet, keycodes/evdev: Kill off the I211 key in evdev
+
+2007-12-17  Sergey Udaltsov
+
+	* keycodes/sun, rules/base.m_k.part, rules/base.ml_s.part,
+	symbols/sun_vndr/cs, symbols/sun_vndr/cz, symbols/sun_vndr/de,
+	symbols/sun_vndr/dk, symbols/sun_vndr/fr, symbols/sun_vndr/gb,
+	symbols/sun_vndr/gr, symbols/sun_vndr/it, symbols/sun_vndr/jp,
+	symbols/sun_vndr/ko, symbols/sun_vndr/nl, symbols/sun_vndr/no,
+	symbols/sun_vndr/pl, symbols/sun_vndr/ru, symbols/sun_vndr/sw,
+	symbols/sun_vndr/tr, symbols/sun_vndr/tuv, symbols/sun_vndr/tw,
+	symbols/sun_vndr/us: added sun type 6 support,
+	https://bugs.freedesktop.org/show_bug.cgi?id=13664
+
+2007-12-10  Sergey Udaltsov
+
+	* symbols/inet: fixed thinkpad,
+	https://bugs.freedesktop.org/show_bug.cgi?id=13461
+
+2007-12-08  Sergey Udaltsov
+
+	* symbols/inet, rules/base.xml.in, rules/base.lists.part: added
+	fscaa1667g model, thanks to Matthew W. S. Bell
+	* symbols/gr: updated greek symbols,
+	https://bugs.freedesktop.org/show_bug.cgi?id=13570
+
+2007-11-30  Sergey Udaltsov
+
+	* symbols/us: small olpc fix
+	* symbols/inet: introducing nav_common and media_nav_common,
+	https://bugs.freedesktop.org/show_bug.cgi?id=13461
+
+2007-11-21  Sergey Udaltsov
+
+	* symbols/np, rules/base.lists.part: added np(olpc)
+	* symbols/et, rules/base.lists.part: added et(olpc)
+	* symbols/in: small fix in in(ben_probhat),
+	https://bugs.freedesktop.org/show_bug.cgi?id=12038
+
+2007-11-20  Sergey Udaltsov
+
+	* symbols/af, symbols/kz, symbols/ng, rules/base.xml.in: OLPC fixes
+	from Bernardo
+	* symbols/pk, rules/base.xml.in: fixing pk(ara) - it is not default
+
+2007-11-18  Sergey Udaltsov
+
+	* symbols/ro, rules/base.xml.in, rules/compat/variantRename.lst:
+	ro(comma), ro(academic) --> ro(cedilla), ro(std_cedilla),
+	https://bugs.freedesktop.org/show_bug.cgi?id=13277
+
+2007-11-17  Sergey Udaltsov
+
+	* symbols/ua, rules/base.xml.in: added ua(unicode)
+
+2007-11-15  Sergey Udaltsov
+
+	* symbols/olpc, keycodes/es: small OLPC fixes
+
+2007-11-14  Sergey Udaltsov
+
+	* symbols/inet, keycodes/evdev: revert #12203
+	https://bugs.freedesktop.org/show_bug.cgi?id=12227
+
+2007-11-01  Sergey Udaltsov
+
+	* symbols/fi, rules/base.xml.in: swapping fi(basic) and fi(kotoistus),
+	https://bugs.freedesktop.org/show_bug.cgi?id=12764
+
+2007-10-28  Sergey Udaltsov
+
+	* symbols/ara, symbols/us, symbols/es, symbols/us, symbols/ng: OLPC
+	fixlets
+
+2007-10-23  Sergey Udaltsov
+
+	* symbols/ru, rules/base.xml.in: added ru(kom),
+	https://bugs.freedesktop.org/show_bug.cgi?id=12893
+
+2007-10-21  Sergey Udaltsov
+
+	* symbols/us, rules/base.xml.in: added us(dvorak-intl),
+	https://bugs.freedesktop.org/show_bug.cgi?id=12867
+	* symbols/macintosh_vndr/dk: dk(macbookpro),
+	https://bugs.freedesktop.org/show_bug.cgi?id=12716
+
+2007-10-19  Sergey Udaltsov
+
+	* symbols/tr, rules/base.xml.in: added tr(intl),
+	https://bugs.freedesktop.org/show_bug.cgi?id=12856
+
+2007-10-18  Sergey Udaltsov
+
+	* geometry/pc, rules/base.xml.in, rules/compat/base.lists.part,
+	symbols/br, symbols/pt: added some br and pt layouts,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12816
+	* rules/base.xml.in symbols/dk: added dk(dvorak),
+	https://bugs.freedesktop.org/show_bug.cgi?id=12837
+
+2007-10-13  Sergey Udaltsov
+
+	* symbols/inet, rules/base.lists.part, rules/base.xml.in: added diNovo
+	Edge, https://bugs.freedesktop.org/show_bug.cgi?id=12789
+
+2007-10-10  Sergey Udaltsov
+
+	* rules/base.xml.in, rules/base.m_g.part: added microsoftelite model,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12753
+	* symbols/fi: fixed fi(kotoistus),
+	https://bugs.freedesktop.org/show_bug.cgi?id=12764
+
+2007-10-09  Sergey Udaltsov
+
+	* geometry/microsoft: added "elite" geometry,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12753
+	* symbols/us: fix for olpc
+
+2007-10-07  Sergey Udaltsov
+
+	* symbols/kz, rules/base.lists.part: added kz(olpc)
+	* symbols/pk: fixed pk(olpc)
+	* rules/base.xml.in: lost vendors,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12719
+	* symbols/inet, rules/base.lists.part, rules/base.xml.in: added
+	chicony0108 model,
+	https://bugs.freedesktop.org/show_bug.cgi?id=6914
+	* symbols/de, types/extra: SS hangling,
+	https://bugs.freedesktop.org/show_bug.cgi?id=7642
+
+2007-10-04  Sergey Udaltsov
+
+	* symbols/us: s/U.S. English/USA/
+	* rules/base.o_s.part, rules/base.xml.in,
+	rules/compat/layoutRename.lst, symbols/Makefile.am, symbols/cs,
+	symbols/me, symbols/rs, symbols/ba, symbols/hr, symbols/si: splitting
+	Serbia and Montenegro 
+	https://bugs.freedesktop.org/show_bug.cgi?id=12390
+
+2007-10-02  Sergey Udaltsov
+
+	* symbols/inet: fixing dell inspiron,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12653
+	* configure.in, rules/Makefile.am, po/ChangeLog: dropping translations
+	from base.xml, let apps/libs use .gmo files instead
+
+2007-09-27  Sergey Udaltsov
+
+	* symbols/shift, symbols/Makefile.am, rules/base.o_s.part: added
+	shift:breaks_caps, https://bugs.freedesktop.org/show_bug.cgi?id=9546
+
+2007-09-26  Sergey Udaltsov
+
+	* symbols/latam: no dead_tilde,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12568
+	* rules/base.xml.in, symbols/in: added mal_lalitha, small fixes,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12426
+	* rules/base.lists.part, rules/base.m_k.part, rules/base.ml_c.part,
+	rules/base.ml_s.part, rules/base.xml.in, rules/merge.sh,
+	symbols/Makefile.am, symbols/ara, symbols/br, symbols/es,
+	symbols/group, symbols/inet, symbols/level3, symbols/ng, symbols/olpc,
+	symbols/pk, symbols/ru, symbols/th, symbols/tr, symbols/us: massive
+	patch from OLPC project
+
+2007-09-25  Sergey Udaltsov
+
+	* NEWS, configure.in: preparing release 1.1
+
+2007-09-24  Sergey Udaltsov
+
+	* symbols/inet: added extra key for nx9020
+	https://bugs.freedesktop.org/show_bug.cgi?id=7310
+
+2007-09-14  Sergey Udaltsov
+
+	* symbols/inet: small fixes in cymotionlinux,
+	https://bugs.freedesktop.org/show_bug.cgi?id=7983
+	* keycodes/evdev: fixed fake keycodes,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12202
+
+2007-09-05  Sergey Udaltsov
+
+	* symbols/inet, geometry/dell, rules/base.m_g.part,
+	rules/base.lists.part: adding dell precision m65,
+	https://bugs.freedesktop.org/show_bug.cgi?id=7992
+	* rules/base.m_g.part: fixed rules for the kinesis keyboard,
+	https://bugs.freedesktop.org/show_bug.cgi?id=7991
+
+2007-09-04  Sergey Udaltsov
+
+	* symbols/it, rules/base.xml.in: added strange one, it(geo),
+	contributed by Vladimir Sichinava
+
+2007-09-02  Sergey Udaltsov
+
+	* keycodes/evdev, symbols/inet: more evdev keycodes,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12227
+	https://bugs.freedesktop.org/show_bug.cgi?id=12228
+
+2007-08-29  Sergey Udaltsov
+
+	* keycodes/evdev: updated evdev keycodes,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12202
+	* keycodes/xfree86, symbols/inet, symbols/pc: display switch &
+	backlight control, https://bugs.freedesktop.org/show_bug.cgi?id=12203
+	* keycodes/macintosh, rules/base.m_k.part, rules/base.xml.in: adding
+	macintosh_hhk model,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12091
+
+2007-08-28  Sergey Udaltsov
+
+	* symbols/group, symbols/jp, symbols/la, symbols/level3, symbols/pc,
+	symbols/digital_vndr/pc, types/pc: renaming types, giving more
+	sensible names
+
+2007-08-27  Sergey Udaltsov
+
+	* keycodes/evdev: missing keycodes for evdev:
+	https://bugs.freedesktop.org/show_bug.cgi?id=12167
+
+2007-08-26  Sergey Udaltsov
+
+	* rules/compat/variantRename.lst: fixing dvorak layouts compat rule,
+	https://bugs.freedesktop.org/show_bug.cgi?id=12115
+
+2007-08-24  Sergey Udaltsov
+
+	* symbols/us: fixes typos in us(classmate-intl)
+
+2007-08-22  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/Makefile.am, symbols/cn: adding Tibetan
+	layouts, https://bugs.freedesktop.org/show_bug.cgi?id=12088
+
+2007-08-20  Sergey Udaltsov
+
+	* symbols/gr: replacing combining keys with dead keys, temporary hack
+	by James Cloos
+
+2007-08-19  Sergey Udaltsov
+
+	* symbols/et: added missing dead "c" key
+
+2007-08-18  Sergey Udaltsov
+
+	* rules/base.lists.part, rules/base.ml_s.part, rules/base.mlv_s.part,
+	rules/base.xml.in, symbols/inet, symbols/us: added classmate model
+	with specific variants,
+	https://bugs.freedesktop.org/show_bug.cgi?id=11955
+
+2007-08-14  Sergey Udaltsov
+
+	* symbols/inet, rules/base.xml.in: added asus_laptop,
+	https://bugs.freedesktop.org/show_bug.cgi?id=11936
+
+2007-08-12  Sergey Udaltsov
+
+	* symbols/ru: fixed ebreve in ru(ch),
+	http://bugs.freedesktop.org/show_bug.cgi?id=11246
+	* rules/base.xml.in: missing Romanian variants added,
+	https://bugs.freedesktop.org/show_bug.cgi?id=11945
+
+2007-08-10  Sergey Udaltsov
+
+	* symbols/br, rules/base.m_g.part, rules/base.ml1_s.part,
+	rules/base.ml_g.part, rules/base.ml_s.part: Adding br(thinkpad),
+	polishing rules a bit,
+	https://bugs.freedesktop.org/show_bug.cgi?id=11908
+
+2007-08-07  Sergey Udaltsov
+
+	* symbols/ara: Patch to Arabic keyboard layout,
+	http://bugs.freedesktop.org/show_bug.cgi?id=11867
+
+2007-08-03  Sergey Udaltsov
+
+	* symbols/us, rules/base.xml.in: added us(altgr-intl), closing
+	http://bugs.freedesktop.org/show_bug.cgi?id=11753
+
+2007-07-30  Sergey Udaltsov
+
+	* symbols/inet, rules/base.lists.part, rules/base.m_s.part,
+	rules/base.xml.in: introduced media_common, some Dell/Logitech symbols
+	are dead, compatibility rules created, Acer kbds consolidated,
+	http://bugs.freedesktop.org/show_bug.cgi?id=11746
+
+2007-07-25  Sergey Udaltsov
+
+	* symbols/inet, rules/base.lists.part, rules/base.m_s.part,
+	rules/base.xml.in: consolidating benq keyboards,
+	https://bugs.freedesktop.org/show_bug.cgi?id=11713
+
+2007-07-24  Sergey Udaltsov
+
+	* symbols/gn, symbols/Makefile.am, rules/base.xml.in: added Guinea,
+	http://bugs.freedesktop.org/show_bug.cgi?id=11702
+
+2007-07-23  Sergey Udaltsov
+
+	* symbols/cd: update Congolese,
+	https://bugs.freedesktop.org/show_bug.cgi?id=5500
+
+2007-07-22  Sergey Udaltsov
+
+	* symbols/inet, rules/base.lists.part, rules/base.xml.in: adding
+	logiex110 model, https://bugs.freedesktop.org/show_bug.cgi?id=11686
+
+2007-07-20  Sergey Udaltsov
+
+	* symbols/gr: adding pound sign,
+	https://bugs.freedesktop.org/show_bug.cgi?id=11608
+
+2007-07-16  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/be, symbols/keypad:
+	modularized wang kbd,
+	https://bugs.freedesktop.org/show_bug.cgi?id=8852
+
+2007-07-15  Sergey Udaltsov
+
+	* symbols/kpdl, symbols/*, rules/base.xml.in, rules/base.o_s.part:
+	introducing separate KPDL handling,
+	https://bugs.freedesktop.org/show_bug.cgi?id=11611
+
+2007-07-12  Sergey Udaltsov
+
+	* NEWS: preparing release 1.0
+
+2007-07-10  Sergey Udaltsov
+
+	*  geometry/hhk, rules/base.m_g.part, rules/base.xml.in,
+	geometry/Makefile.am: adding hhk geometry,
+	https://bugs.freedesktop.org/show_bug.cgi?id=11519
+
+2007-07-09  Sergey Udaltsov
+
+	*  symbols/de: fixed AE12, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=11514
+
+2007-06-29  Sergey Udaltsov
+
+	*  symbols/lk: another fix from
+	https://bugs.freedesktop.org/show_bug.cgi?id=11284
+	*  symbols/us, rules/base.xml.in: added us(colemak),
+	https://bugs.freedesktop.org/show_bug.cgi?id=11416
+
+2007-06-25  Sergey Udaltsov
+
+	*  symbols/Makefile.am, symbols/braille, rules/base.xml.in: added
+	Braille layout, https://bugs.freedesktop.org/show_bug.cgi?id=11356
+
+2007-06-18  Sergey Udaltsov
+
+	*  symbols/Makefile.am, symbols/et, rules/base.xml.in: added
+	et(basic), part of the OLPC works
+
+2007-06-16  Sergey Udaltsov
+
+	*  symbols/lk: fixed Sinhala, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=11284
+
+2007-06-15  Sergey Udaltsov
+
+	*  symbols/ru, rules/base.xml.in: added ru(cv_latin), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=11246
+
+2007-06-13  Sergey Udaltsov
+
+	*  symbols/ru, rules/base.xml.in: added ru(cv), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=11246
+	*  symbols/ge, rules/base.xml.in: added ge(os), again closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8092
+	*  symbols/ru, rules/base.xml.in: added ru(udm), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=11257
+
+2007-06-07  Sergey Udaltsov
+
+	*  symbols/in, rules/base.xml.in: added Hindi phonetic,
+	https://bugs.freedesktop.org/show_bug.cgi?id=11195
+
+2007-06-06  Sergey Udaltsov
+
+	*  rules/xfree98: fixed nec_vndr, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=11176
+
+2007-05-26  Sergey Udaltsov
+
+	*  rules/base.o_s.part, rules/base.xml.in, symbols/jp: Add
+	"NICOLA-F style Backspace" to "Japanese keyboard options", closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=11064
+
+2007-05-14  Sergey Udaltsov
+
+	*  rules/base.xml.in, rules/xkb.dtd: introducing vendor into
+	configItem
+
+2007-05-13  Sergey Udaltsov
+
+	* symbols/il: replaced backslash with bar, reclosing
+	https://bugs.freedesktop.org/show_bug.cgi?id=6375
+
+2007-05-02  Sergey Udaltsov
+
+	* symbols/gr: using Unicode since it is more appropriate for polytonic
+	Greek, https://bugs.freedesktop.org/show_bug.cgi?id=10824
+
+2007-04-30  Sergey Udaltsov
+
+	* rules/base.xml.in: make descriptions less technical
+
+2007-04-29  Sergey Udaltsov
+
+	* symbols/us: adding explicit BKSL, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=10811
+
+2007-04-27  Sergey Udaltsov
+
+	* geometry/microsoft: replacing non-defined AE00 with TLDE,
+	http://bugzilla.gnome.org/show_bug.cgi?id=429907
+
+2007-04-24  Sergey Udaltsov
+
+	* symbols/ma: fixing alt in Tifinagh, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=10736
+
+2007-04-23  Sergey Udaltsov
+
+	* geometry/pc: fix for abnt2, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=10725
+	* symbols/inet, rules/base.lists.part: adding missing logicdo, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=10671
+
+2007-04-11  Sergey Udaltsov
+
+	* symbols/ge, rules/base.xml.in: added/fixed a lot of Georgian
+	layouts, closing https://bugs.freedesktop.org/show_bug.cgi?id=3332
+
+2007-04-05  Sergey Udaltsov
+
+	* symbols/se, rules/base.xml.in: added se(svdvorak),
+	https://bugs.freedesktop.org/show_bug.cgi?id=10424
+
+2007-04-03  Sergey Udaltsov
+
+	* symbols/cd: fixed Congolese layout one more time,
+	https://bugs.freedesktop.org/show_bug.cgi?id=5500
+
+2007-04-01  Sergey Udaltsov
+
+	* symbols/cd: fixed Congolese layout,
+	https://bugs.freedesktop.org/show_bug.cgi?id=5500
+
+2007-03-29  Sergey Udaltsov
+
+	* configure.in: improved xkb_base calculation, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=10435
+
+2007-03-13  Sergey Udaltsov
+
+	* configure.in: added Korean translation,
+	https://bugs.freedesktop.org/show_bug.cgi?id=10269
+	* rules/base.xml.in: s/descr/_descr/g, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=10270
+
+2007-03-06  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/us: added us(euro), after a very hot
+	discussion in the maillist
+
+2007-02-26  Sergey Udaltsov
+
+	* symbols/inet: fixed broken symbol, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=10103
+	* compat/misc: fixing copy/paste bug, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=10104
+
+2007-02-25  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/uz: fixed Uz layout, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=10091
+	* symbols/us: added French oe character to us(intl), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=10087
+
+2007-02-12  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/Makefile.am, symbols/ma: added Tifinagh
+	layouts, closing http://bugs.freedesktop.org/show_bug.cgi?id=9950
+
+2007-02-03  Sergey Udaltsov
+
+	* rules/base.ml_g.part, rules/HDR, rules/Makefile.am,
+	rules/base.m_g.part: added (model, layout->geometry) section for
+	thinkpad, https://bugs.freedesktop.org/show_bug.cgi?id=9864
+	* symbols/macintosh_vndr/fr: updated French layout, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9865
+
+2007-01-27  Sergey Udaltsov
+
+	* symbols/inet, rules/base.lists.part: adding thinkpad media keys,
+	closing https://bugs.freedesktop.org/show_bug.cgi?id=9779
+
+2007-01-26  Sergey Udaltsov
+
+	* symbols/es: s/asciitilde/dead_tilde in spanish, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9763
+
+2007-01-25  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/am: adding am(phonetic-alt), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9018
+
+2007-01-11  Sergey Udaltsov
+
+	* symbols/nl, rules/base.xml.in: added nl(std), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9603
+	* symbols/epo, rules/base.xml.in: added epo(legacy), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9556
+
+2007-01-04  Sergey Udaltsov
+
+	* symbols/ir: settling another licensing issue,
+	https://bugs.freedesktop.org/show_bug.cgi?id=9541
+
+2007-01-04  Sergey Udaltsov
+
+	* rules/base.xml.in, rules/base.o_s.part, symbols/ca, symbols/fr,
+	symbols/nbsp: adding more nbsp options, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9529
+
+2007-01-02  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/pc: getting rid of stupid "default"
+	altwin options, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9470
+
+2006-12-19  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, rules/sun.xml.in,
+	symbols/level3: adding lv3:ralt_alt, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9070
+
+2006-12-11  Sergey Udaltsov
+
+	* configure.in: getting rid of bashisms, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9244
+	* symbols/fi: s/NoSymbol/VoidSymbol/, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9239
+
+2006-12-07  Sergey Udaltsov
+
+	* Makefile.am, rules/Makefile.am, xkbrules.am: getting rid of
+	gmakisms, closing https://bugs.freedesktop.org/show_bug.cgi?id=9245
+	* Makefile.am: dropping install-compiled target, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9246
+
+2006-11-20  Sergey Udaltsov
+
+	* symbols/br, keycodes/xfree86: making abnt2 more compatible with
+	other keyboards, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=4910
+	* rules/base.m_k.part: dropping the special (and stupid) abnt2 rule,
+	closing https://bugs.freedesktop.org/show_bug.cgi?id=9097
+
+2006-11-19  Sergey Udaltsov
+
+	* symbols/il, rules/base.xml.in: added il(biblical), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=9002
+
+2006-11-17  Sergey Udaltsov
+
+	* symbols/us: the backslash/bar definition in the us dvorak variant,
+	closing https://bugs.freedesktop.org/show_bug.cgi?id=9061
+	* symbols/ir: removed problematic copyright notice, with permission of
+	Behnam Esfahbod, https://bugs.freedesktop.org/show_bug.cgi?id=4102
+
+2006-11-14  Sergey Udaltsov
+
+	* symbols/altwin: undo invalid Alt mapping done in
+	https://bugs.freedesktop.org/show_bug.cgi?id=8996
+
+2006-11-12  Sergey Udaltsov
+
+	* rules/base.o_s.part, rules/base.xml.in, symbols/altwin: adding
+	ctrl_win, closing https://bugs.freedesktop.org/show_bug.cgi?id=8996
+
+2006-11-06  Sergey Udaltsov
+
+	* rules/sun.xml.in, rules/Makefile.am, po/POTFILE.in: Added directory
+	for sun rules, closing
+	http://bugzilla.gnome.org/show_bug.cgi?id=137294
+
+2006-11-02  Sergey Udaltsov
+
+	* symbols/fr: some fixes for alternative layouts, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8853
+	* symbols/fr, rules/base.xml.in: new fr(dvorak*) variants, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8728
+
+2006-10-28  Sergey Udaltsov
+
+	* rules/base.lists.part, rules/base.xml.in, symbols/inet: added
+	logitech_g15 model, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8803
+	* symbols/jp: added LCTL definition,
+	https://bugs.freedesktop.org/show_bug.cgi?id=8805
+
+2006-10-26  Sergey Udaltsov
+
+	* rules/base.lists.part, rules/base.xml.in, symbols/inet: added more
+	Dell keyboards, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8761
+
+2006-10-18  Sergey Udaltsov
+
+	* rules/base.lists.part, symbols/macintosh_vndr/Makefile.am,
+	symbols/macintosh_vndr/dk, symbols/macintosh_vndr/es,
+	symbols/macintosh_vndr/it, symbols/macintosh_vndr/latam,
+	symbols/macintosh_vndr/no, symbols/macintosh_vndr/pt,
+	symbols/macintosh_vndr/se: missed part from
+	https://bugs.freedesktop.org/show_bug.cgi?id=1576
+	* rules/base.xml.in, symbols/jp: adding new Japanese layout, changing
+	latin to 106, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8648
+
+2006-10-17  Sergey Udaltsov
+
+	* symbols/macintosh_vndr/dk, symbols/macintosh_vndr/us: adding euro
+	sign to mac us and dk, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8682#add_comment
+
+2006-10-16  Sergey Udaltsov
+
+	* rules/base.m_k.part, rules/base.xml.in, keycodes/Makefile.am,
+	keycodes/powerpcps2: removing obsolete powerpcps2 model. Closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8659
+	* rules/base.o_s.part, rules/base.xml.in, symbols/group: adding
+	grp:lctrl_lshift_toggle, contributed by Alexey Morozov
+	<morozov@gorodok.net>
+	* symbols/macintosh_vndr/us: Fix <BKSP> in symbols/macintosh_vndr/us,
+	closing https://bugs.freedesktop.org/show_bug.cgi?id=8668
+	* symbols/level3: assigning mods to keycodes (reverding earlier wrong
+	fix), closing https://bugs.freedesktop.org/show_bug.cgi?id=8670
+
+2006-10-13  Sergey Udaltsov
+
+	* xkbrules.am: ability to create .dir files when srcdir != objdir,
+	closing https://bugs.freedesktop.org/show_bug.cgi?id=8629
+
+2006-10-12  Sergey Udaltsov
+
+	* symbols/inet, rules/base.lists.part, rules/base.xml.in: added BenQ
+	X-730, thanks to Jean-Marc Spaggiari
+
+2006-10-11  Sergey Udaltsov
+
+	* symbols/af, symbols/ba, symbols/hr, symbols/kr, symbols/nbsp,
+	symbols/ng, symbols/si, symbols/za: addind missing cvs keyword
+	XKeyboardConfig
+	* rules/base.ml_s.part, rules/base.xml.in, symbols/jp: normalizing
+	Japanese rules/variants, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8503
+
+2006-10-10  Sergey Udaltsov
+
+	* symbols/in: fixed Devangari (default) layout, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=4949
+	* configure.in: removing hardcoded prefix, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8448
+	* symbols/it, added EuroSign to italian mac layout, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=1576
+
+2006-10-09  Sergey Udaltsov
+
+	* symbols/inet,rules/base.xml.in: adding benqa800 model, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8574
+
+2006-10-09  Sergey Udaltsov
+
+	* NEWS, configure.in: preparing 0.9
+
+2006-10-09  Sergey Udaltsov
+
+	* tests/*: tests now run alphabetically, a bit of xslt tweaking
+	* symbols/altwin: Alt keys should be mapped on two shift levels,
+	undoing previous fix, as requested in
+	https://bugs.freedesktop.org/show_bug.cgi?id=8571
+	* symbols/level3: mapping Mod5 to keycode rather than to keysym,
+	hopefully fixing https://bugs.freedesktop.org/show_bug.cgi?id=8572
+	* symbols/us,symbols/latin: fixing quotes, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8122
+
+2006-10-07  Sergey Udaltsov
+
+	* types/complete, types/default: putting "numpad" after "extra"
+	hopefully fixes https://bugs.freedesktop.org/show_bug.cgi?id=8402
+
+2006-10-04  Sergey Udaltsov
+
+	* symbols/fi: s/micron/dead_micron, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8494
+
+2006-10-03  Sergey Udaltsov
+
+	* symbols/macintosh_vndr/gb, symbols/gb: adding missing Euro
+	character, closing https://bugs.freedesktop.org/show_bug.cgi?id=5227
+	* symbols/bt, symbols/fr, symbols/np: fixing typos, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8495
+	* symbols/ch, symbols/de, symbols/dk, symbols/es, symbols/no,
+	symbols/pt, symbols/se, symbols/us: optimized mac variants, overwrite
+	old de and ch mac variants, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8491
+
+2006-10-01  Sergey Udaltsov
+
+	* rules/base.xml.in, symbols/Makefile.am, symbols/ng: added Nigerian
+	layouts, closing https://bugs.freedesktop.org/show_bug.cgi?id=8467
+	* symbols/dk, symbols/es, symbols/fi, symbols/fr, symbols/gb,
+	symbols/is, symbols/it, symbols/nl, symbols/no, symbols/pt,
+	symbols/se, symbols/us, rules/base.xml.in: adding mac variants,
+	closing https://bugs.freedesktop.org/show_bug.cgi?id=8465
+
+2006-09-30  Sergey Udaltsov
+	
+	* rules/base.o_s.part, rules/base.xml.in, symbols/Makefile.am,
+	symbols/nbsp: adding nbsp:* options, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8451
+
+2006-09-29  Sergey Udaltsov
+	
+	* rules/base.xml.in: added keypad:* options, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8240
+
+2006-09-28  Sergey Udaltsov
+	
+	* geometry/thinkpad: fix for geometry, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8419
+
+2006-09-24  Sergey Udaltsov
+	
+	* symbols/am, rules/base.xml.in: added am(eastern), am(western),
+	am(eastern-alt), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8404
+	* rules/base.ml_s.part: macbooks should use the vendor symbols, if
+	possible, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8385
+	* rules/base.o_s.part, rules/base.xml.in, symbols/fr, symbols/keypad:
+	added more French variants, new options, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8240
+
+2006-09-18  Sergey Udaltsov
+	
+	* keycodes/macintosh, rules/HDR, rules/Makefile.am,
+	rules/base.m_k.part, rules/base.o_k.part, rules/base.xml.in: split
+	"good" and "bad" apple keycodes, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8242
+
+	* rules/base.lists.part, rules/base.m_s.part, symbols/inet,
+	symbols/level3: lv3:enter_switch added, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8324
+
+	* symbols/ara: added ara(buckwalter), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8198
+
+	* symbols/in: fixed layout, Unicode-related bug, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8203
+
+	* geometry/pc, rules/base.ml1_s.part, rules/base.ml_s.part,
+	rules/compat/ml1_s.sh, rules/compat/ml1v1_s.sh,
+	rules/compat/ml1v_s.sh, rules/compat/ml_s.sh, rules/compat/mlv_s.sh,
+	symbols/pc: getting rid of pc101/102/104 legacy. Breaking XkbSymbols
+	again, https://bugs.freedesktop.org/show_bug.cgi?id=8321
+
+2006-09-17  Sergey Udaltsov
+	
+	symbols/keypad, symbols/pc, symbols/us, symbols/macintosh_vndr/*,
+	rules/base.m_t.part, rules/base.ml1_s.part, rules/base.ml_s.part,
+	rules/base.o_t.part, rules/base.xml.in, rules/merge.sh: reorganized
+	Mac stuff, thanks to Denis,
+	https://bugs.freedesktop.org/show_bug.cgi?id=8280
+
+	* symbols/pc: modularized numpad stuff,
+	https://bugs.freedesktop.org/show_bug.cgi?id=8312
+	
+2006-09-10  Sergey Udaltsov
+
+	rules/base.list.part, symbols/inet: added 2 models, thanks to
+	Valery V. Inozemtsev
+
+2006-09-06  Sergey Udaltsov
+
+	* rules/altwin: mapping LALT to Mod4 modifier,
+	https://bugs.freedesktop.org/show_bug.cgi?id=8068
+
+2006-09-05  Sergey Udaltsov
+
+	* rules/base.lists.part: adding missing kbds, reordering a bit
+	https://bugs.freedesktop.org/show_bug.cgi?id=7816
+
+	* geometry/ibm_vnd, configure.in, rules/base.m_g.part: getting rid of
+	ibm_vndr geometry, fixing rules,
+	https://bugs.freedesktop.org/show_bug.cgi?id=7990
+
+	* symbols/gb: s/ralt_switch/ralt_switch_multikey
+	https://bugs.freedesktop.org/show_bug.cgi?id=7674
+
+	* rules/base.mlv_s.part: fixing mac rule for nodeadkeys,
+	https://bugs.freedesktop.org/show_bug.cgi?id=8123
+
+	* rules/base.ml_s.part: s/old_macintosh/macintosh_old/g,
+	https://bugs.freedesktop.org/show_bug.cgi?id=8128
+
+2006-09-04  Sergey Udaltsov
+
+	* rules/base.lists.part, rules/base.m_g.part, rules/base.m_k.part,
+	rules/base.m_s.part, rules/base.ml1_s.part, rules/base.ml_s.part,
+	rules/base.mlv_s.part: fixing lists,
+	https://bugs.freedesktop.org/show_bug.cgi?id=7817
+
+	* symbols/cd, symbols/gr, symbols/il, symbols/jp, symbols/la,
+	symbols/lk, symbols/ru, symbols/ca: fixing types, on per-group basis,
+	https://bugs.freedesktop.org/show_bug.cgi?id=8121
+
+	* symbols/level3: adding level3:ralt_switch_multikey,
+	https://bugs.freedesktop.org/show_bug.cgi?id=7674
+
+2006-09-03  Sergey Udaltsov
+
+	* symbols/vn: getting rid of digits (1 and 2 shift levels),
+	https://bugs.freedesktop.org/show_bug.cgi?id=7807
+
+	* rules/base.xml.in: s/guillemot/guillemet/, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8116
+
+2006-09-02  Sergey Udaltsov
+
+	* symbols/lt, rules/base.xml.in: added lt(ibm)
+	https://bugs.freedesktop.org/show_bug.cgi?id=3841
+
+	* symbols/hr: reverted Croatian
+	https://bugs.freedesktop.org/show_bug.cgi?id=8019
+
+2006-09-01  Sergey Udaltsov
+
+	* symbols/ru, rules/base.xml.in: added Ossetian, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8092
+
+	* symbols/ir, symbols/iq, rules/base.xml.in: added Kurdish Arabic-Latin
+
+2006-08-31  Sergey Udaltsov
+
+	* geometry/macintosh, keycodes/macintosh, keycodes/xfree86,
+	rules/base.lists.part, rules/base.m_g.part, rules/base.m_k.part,
+	rules/base.m_s.part, rules/base.ml_s.part, rules/base.xml.in,
+	symbols/inet: Added Macbook stuff, partially closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=8068
+
+	* symbols/group, rules/base.o_s.part: added group:alt_caps_toggle
+	https://bugs.freedesktop.org/show_bug.cgi?id=8047
+
+2006-08-02  Sergey Udaltsov
+
+	* symbols/inet, keycodes/evdev: updated evdev
+	https://bugs.freedesktop.org/show_bug.cgi?id=7631
+
+2006-07-30  Sergey Udaltsov
+
+	* symbols/pl: added pl(csb)
+	https://bugs.freedesktop.org/show_bug.cgi?id=7693
+
+2006-07-29  Sergey Udaltsov
+
+	* symbols/bt: fixed Bhutan
+	https://bugs.freedesktop.org/show_bug.cgi?id=7556
+
+	* symbols/us: added dvorak-classic, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=7503
+
+	* symbols/inet: added acer_c300, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=6361
+
+2006-07-29  Sergey Udaltsov
+
+	* symbols/lk: updated Sinhala, thanks to Harshula
+
+2006-07-10  Sergey Udaltsov
+
+	* symbols/de: added Mac variants, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=6671
+
+2006-07-04  Sergey Udaltsov
+
+	* symbols/ch: fixed KPDL in ch(de_mac), patch from
+	https://bugs.freedesktop.org/show_bug.cgi?id=6960
+
+2006-07-02  Sergey Udaltsov
+
+	* rules/base.xml.in: fixed mismatch between directory and symbols/inet
+	file.
+	https://bugs.freedesktop.org/show_bug.cgi?id=7398
+	
+	* symbols/ro: fixed Romanian academic
+	https://bugs.freedesktop.org/show_bug.cgi?id=7393
+	
+2006-06-28  Sergey Udaltsov
+
+	* keycodes/evdev: pc105 compatiliby, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=7347
+
+2006-06-25  Sergey Udaltsov
+
+	* rules/base.xml.in, geometry/pc, symbols/inet: added Dell Lattitude,
+	https://bugs.freedesktop.org/show_bug.cgi?id=6894
+
+	* symbols/inet, rules/base.xml.in: added 2 new layouts, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=7325
+
+	* symbols/np: added Nepali, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=6373
+
+2006-06-25  Sergey Udaltsov
+
+	* geometry/pc, rules/base.lists.part, rules/base.m_g.part,
+	rules/base.xml.in, symbols/kr: updated Korean layouts/geometry
+	https://bugs.freedesktop.org/show_bug.cgi?id=7316
+
+2006-06-22  Sergey Udaltsov
+
+	* symbols/inet: fixing double RaiseVolume, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=7095
+
+2006-06-14  Sergey Udaltsov
+
+	* symbols/mt, rules/base.xml.in: fixed the US variant group name
+	* symbols/gh: fixed 'D' key, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=7216
+
+2006-06-13  Sergey Udaltsov
+
+	* symbols/level5, compat/level5: replacing F21-F23 with explicit
+	hexadecimal values of XK_ISO_Level5_*. So for next months people could
+	have Canadian layout fixed and, at the same time, do not have to
+	upgrade xorg. Closing https://bugs.freedesktop.org/show_bug.cgi?id=4411
+
+	* symbols/ch, symbols/inet, symbols/base.xml.in: added mac stuff from
+	https://bugs.freedesktop.org/show_bug.cgi?id=6960
+
+2006-06-13  Sergey Udaltsov
+
+	* symbols/mt: fixed mt(us), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=1411
+
+2006-06-10  Sergey Udaltsov
+
+	* symbols/level5, compat5/level5: better working Canadian
+	layout, but not complete yet
+
+2006-06-01  Sergey Udaltsov
+
+	* symbols/am: fixed comma in Armenian, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=7080
+
+2006-05-28  Sergey Udaltsov
+
+	* symbols/inet,rules/base.xml.in,rules/base.lists.part: 
+	added Logitech Cordless Desktop LX-300
+	https://bugs.freedesktop.org/show_bug.cgi?id=5609
+
+2006-05-28  Sergey Udaltsov
+
+	* rules/base.ml_c: fixed compat for jp layout, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=4002
+
+2006-05-17  Sergey Udaltsov
+
+	* symbols/inet: fixed power_g5, partially closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=6960
+
+2006-05-13  Sergey Udaltsov
+
+	* symbols/fi: added fi(kotoistus)
+	https://bugs.freedesktop.org/show_bug.cgi?id=6901
+
+2006-05-05  Sergey Udaltsov
+
+	* symbols/de: added de(neo)
+	https://bugs.freedesktop.org/show_bug.cgi?id=6837
+
+2006-05-04  Sergey Udaltsov
+
+	* symbols/inet: fixed cymotionlinux, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=6828
+
+2006-05-04  Sergey Udaltsov
+
+	* rules/base.xml.in,symbols/iq,symbols/in,symbols/sy: added Kurdish, 
+	closed https://bugs.freedesktop.org/show_bug.cgi?id=6159
+	one more time
+
+2006-04-20  Sergey Udaltsov
+
+	* keycodes/evdev: added LSGT, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=6674
+
+2006-04-19  Sergey Udaltsov
+
+	* symbols/macintosh_vndr/(be,de,ch): use keypad(comma)
+
+2006-04-19  Sergey Udaltsov
+
+	* rules/*, keymap/sgi_vndr/*: shift_toggle -> shifts_toggle,
+	fixing https://bugs.freedesktop.org/show_bug.cgi?id=5078
+
+2006-04-08  Sergey Udaltsov
+
+	* keycodes/xfree86,symbols/br: fixed abnt2 keymap and layout
+	https://bugs.freedesktop.org/show_bug.cgi?id=4910
+
+2006-04-08  Sergey Udaltsov
+
+	* geometry/macintosh: fixed mac geometry
+	https://bugs.freedesktop.org/show_bug.cgi?id=4714
+
+2006-04-05  Sergey Udaltsov
+
+	* rules/base.xml.in, changed PC-98xx Series to Japan,
+	https://bugs.freedesktop.org/show_bug.cgi?id=5591
+
+2006-04-04  Sergey Udaltsov
+
+	* symbols/compose,rules/base.xml.in,rules/base.o_s.part: added
+	compose(lwin)
+	https://bugs.freedesktop.org/show_bug.cgi?id=2396
+
+2006-04-04  Sergey Udaltsov
+
+	* symbols/inet,rules/base.xml.in: added Logitech diNovo
+	https://bugs.freedesktop.org/show_bug.cgi?id=1681
+
+2006-04-04  Sergey Udaltsov
+
+	* symbols/inet: fixed Logitech Access Keyboard
+	https://bugs.freedesktop.org/show_bug.cgi?id=1018
+
+2006-04-04  Sergey Udaltsov
+
+	* symbols/pt: added LSGT
+	https://bugs.freedesktop.org/show_bug.cgi?id=970
+
+2006-04-02  Sergey Udaltsov
+
+	* symbols/be, rules/base.xml.in: added 'be(wang)'
+	https://bugs.freedesktop.org/show_bug.cgi?id=6474
+
+2006-03-28  Sergey Udaltsov
+
+	* symbols/cd, symbols/Makefile.am: added 'cd'
+	https://bugs.freedesktop.org/show_bug.cgi?id=5500
+
+2006-03-27  Sergey Udaltsov
+
+	* keycodes/macintosh,keymap/macintosh,rules/base.m_k.part: fixed
+	Macintosh F13-F15, closed 
+	https://bugs.freedesktop.org/show_bug.cgi?id=6399
+
+2006-03-25  Sergey Udaltsov
+
+	* symbols/inet: fixed cymotion,
+	https://bugs.freedesktop.org/show_bug.cgi?id=3541
+
+2006-03-25  Sergey Udaltsov
+
+	* symbols/il,rules/compat/variantRename.lst: generalized 'basic', 
+	removed si1452, closed 
+	https://bugs.freedesktop.org/show_bug.cgi?id=6375
+
+2006-03-23  Sergey Udaltsov
+
+	* symbols/group: another attempt to fix unfamous
+	RAlt problem, reported in ubuntu:
+	https://launchpad.net/distros/ubuntu/+source/xkeyboard-config/+bug/35845
+	Now all types are specified for Group1, to make it consistent
+	
+2006-03-22  Sergey Udaltsov
+
+	* rules/base.xml.in,symbols/tr: added Kurdish, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=6159
+	
+2006-03-22  Sergey Udaltsov
+
+	* rules/base.xml.in: added missing Logitech models, fixed
+	https://bugs.freedesktop.org/show_bug.cgi?id=6350
+	
+2006-03-21  Sergey Udaltsov
+
+	* symbols/kr: added Korean layout, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=6323
+
+2006-03-21  Sergey Udaltsov
+
+	* types/pc,symbols/level3: another attempt to fix unfamous
+	RAlt problem, reported in ubuntu:
+	https://launchpad.net/distros/ubuntu/+source/xkeyboard-config/+bug/35845
+
+2006-03-17  Sergey Udaltsov
+
+	* symbols/inet, rules/base*: added Acer Ferrari 4K
+	https://bugs.freedesktop.org/show_bug.cgi?id=5259
+
+2006-03-16  Sergey Udaltsov
+
+	* symbols/ee: improved ee(dvorak), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=4568
+
+2006-03-05  Sergey Udaltsov
+
+	* configure.in, NEWS, Changelog:Preparing release 0.8
+
+2006-02-26  Sergey Udaltsov
+
+	* symbols/es, rules/base.xml.in: added es(cat), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=6047
+
+2006-02-25  Alan Coopersmith 
+
+	* symbols/sun_vndr/*, compat/japan, compat/mousekeys,
+	geometry/sun:
+	massive update from Sun, see
+	https://bugs.freedesktop.org/show_bug.cgi?id=5725
+	
+2006-02-24  M. Emal Alekozai <memala@gmx.net>
+
+	* symbols/af, symbols/Makefile.am, rules/base.xml:
+	added Afghan, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=6013
+
+2006-02-15  Zephaniah E. Hull  <warp@aehallh.com>
+
+	* keycodes/Makefile.am:
+	* keycodes/evdev:
+	* rules/base.m_k.part:
+	Add the evdev keyboard data files. Closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=5903
+
+2006-02-21 svu
+
+	* symbols/inet: Fixed inet(armada)
+	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=5893
+	
+2006-02-21 svu
+
+	* symbols/hr: Fixed hr(us)
+	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=3807
+	
+2006-02-01 svu
+
+	* rules/compat/layoutRename.lst: Added cz_qwerty compat rule
+	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=177362
+	
+2006-01-31 svu
+
+	* symbols/us: Added single-handed dvoraks
+	https://bugs.freedesktop.org/show_bug.cgi?id=5659
+	
+2006-01-22 svu
+
+	* types/level5: Fixed ScrollLock behaviour
+	https://bugs.freedesktop.org/show_bug.cgi?id=5635
+	
+2006-01-15 svu
+
+	* symbols/bd: Corrected Bangladesh layout, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=5480
+	
+2006-01-14 svu
+
+	* rules/base.ml_*.part: Japanese layouts are nec_vndr/jp, for
+	consistency
+	
+2006-01-14 svu
+
+	* symbols/macintosh_vnd/is: some cosmetic stuff and some info, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=5597
+	
+2006-01-14 svu
+
+	* rules/base.lists.part: extended non-latin list, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=5590
+
+2006-01-11 svu
+
+	* rules/base*part: improved stuff for non-AT keyboards, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=5507
+
+2006-01-10 svu
+
+	* geometry/pc: fixed geometry, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=5568
+
+2006-01-08 svu
+
+	* symbols/gh: added Ghana layout, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=5497
+
+2006-01-06 svu
+
+	* symbols/ad: added Catalan layout, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=5526
+
+2006-01-01 svu
+
+	* symbols/in: fixed ben_probhat, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=1012
+
+2005-12-31 svu
+
+	* symbols/ru, rules/base.xml.in: added
+	Tatar, closing https://bugs.freedesktop.org/show_bug.cgi?id=4818
+
+2005-12-31 svu
+
+	* symbols/kh, rules/base.xml.in, symbols/Makefile.am: added
+	Khmer, closing https://bugs.freedesktop.org/show_bug.cgi?id=5389
+
+2005-12-31 svu
+
+	* symbols/epo, rules/base.xml.in, symbols/Makefile.am: added
+	Esperanto, closing https://bugs.freedesktop.org/show_bug.cgi?id=5454
+
+2005-12-30 svu
+
+	* symbols/ctrl: expanding Caps a bit, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=3193
+
+2005-12-20 svu
+
+	* symbols/hu: returned def_dot (instead of def_comma, really
+	eliminated)
+	
+2005-12-10 svu
+
+	* symbols/compat/layoutRename.lst: added en_US
+
+2005-12-01 svu
+
+	* symbols/inet, rules/base.xml.in: added Inspiron 6000 keys, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=5195
+
+2005-12-01 svu
+
+	* symbols/inet: HUGE redesign of the inet file. Major reorganization
+	of Logitech keyboard. HUGE thanks to Fr?d?ric BOITEUX
+
+2005-11-26 svu
+
+	* symbols/group, symbols/level3, compat/level5, compat/misc:
+	Fixing problem with level3(ralt) and group(alts_toggle).
+	Now "us,ru,se" works ok.
+
+2005-10-20 svu
+
+	* symbols/inet, rules:
+	adding Dell USB Multimedia Keybard, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=4826
+
+2005-10-17 svu
+
+	* symbols, types, compat, rules:
+	adding 5th level and beyond, trying to hack 1-group Canadian layout
+
+2005-10-11 svu
+
+	* symbols/macintosh_vndr/fr: update French Macintosh keyboard, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=2870
+
+2005-10-10 svu
+
+	* symbols/za, rules/base.xml.in: added South Afrika, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=2856
+
+2005-10-09 svu
+
+	* symbols/inet: expanded Inspiron definition, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=4071
+
+2005-10-07 svu
+
+	* symbols/hu: fixed comma issue, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=4693
+
+2005-10-04 svu
+
+	* symbols/by, rules/base.xml.in: added by(latin), closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=4576
+	
+2005-10-04 svu
+
+	* symbols/gr: added keypad(comma), closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=3538
+
+2005-10-02 svu
+
+	* symbols/se:
+	updating svorak, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=3635
+
+2005-10-02 svu
+
+	* rules/base.lists.part, rules/base.xml.in, 
+	symbols/inet:
+	adding Genius Comfy, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=2275
+
+2005-10-02 svu
+
+	* rules/Makefile.am, rules/HDR, 
+	rules/base.l1o_s.part, rules/base.l2o_s.part,
+	rules/base.l3o_s.part, rules/base.l4o_s.part:
+	adding "layout + option -> symbols" rules,
+	for properly maingating RAlt as AltGr + alts_toggle
+	IMPORTANT: REQUIRES FIXING XORG
+
+2005-10-02 svu
+
+	* rules/base.xml.in, symbols/ee:
+	added Estonian Dvorak, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=4568
+
+2005-10-02 svu
+
+	* rules/base.xml.in, symbols/inet, rules/base.lists.part:
+	Added eMachines m68xx notebooks keyboards, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=4000
+
+2005-10-01 svu
+
+	* rules/base.xml.in, symbols/inet, rules/base.lists.part:
+	Added SILVERCREST Multimedia Wireless Keyboard, closed
+	https://bugs.freedesktop.org/show_bug.cgi?id=4217
+
+2005-09-30 svu
+
+	* rules/compat/layoutRename.lst:
+	added us_intl, fixed https://bugs.freedesktop.org/show_bug.cgi?id=4642
+
+2005-09-30 svu
+
+	* po/sl.po:
+	Slovenian translation
+
+2005-09-22 svu
+
+	* rules/base.xml.in, rules/base.o_s.part, symbols/compose:
+	adding CapsLock as Compose, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=4548
+
+2005-09-22 svu
+
+	* rules/Makefile.am, rules/merge.sh
+	fixing merging in env where srcdir != objdir, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=4547
+	
+2005-09-22 svu
+
+	* rules/base.xml.in, symbols/kz:
+	change Cyr to Rus
+	
+2005-09-21 svu
+
+	* rules/base.ml_s.part:
+	IMPORTANT: NO MORE 2-GROUP CANADIAN DEFAULT CONFIGURATION
+
+2005-09-21 svu
+
+	* symbols/kz, symbols/Makefile.am, rules/base.xml.in:
+	added Kazakh, fixing
+	https://bugs.freedesktop.org/show_bug.cgi?id=4497
+
+2005-09-20 svu
+
+	* symbols/macintoch_vndr/ch:
+	Updated de_CH, from
+	https://bugs.freedesktop.org/show_bug.cgi?id=4520
+
+2005-09-20 svu
+
+	* symbols/mk, rules/base.xml.in:
+	removing controversal 'FYROM'
+
+2005-09-14 svu
+
+	* symbols/inet, rules/base.xml.in rules/base.lists.part: 
+	Added Cherry CyBo@rd USB-Hub. Thanks to Paul Egan
+	Fixed https://bugs.freedesktop.org/show_bug.cgi?id=4498
+
+2005-09-14 svu
+
+	* symbols/cs: a bit of cleanup by Denis
+
+2005-09-13 svu
+
+	* configure.in: added Finnish translation
+
+2005-09-04 svu
+
+	* symbols/no:
+	fixed no(dvorak), closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=4397
+
+2005-09-04 svu
+
+	* rules/base.xml.in, symbols/inet:
+	adding Power G5
+
+2005-09-04 svu
+
+	* rules/base.xml.in, symbols/ro:
+	Fixing Romanian, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=371
+
+2005-09-04 svu
+
+	* rules/base.xml.in, symbols/lk:
+	No TSCII/INSCRIPT in Sri Lanka, 
+	according to <hash@jayasolutions.cjb.net>
+
+2005-08-25 svu
+
+	* rules/base.xml.in:
+	Control -> Ctrl everywhere, for consistency sake
+
+2005-08-25 svu
+
+	* rules/base.xml.in, symbols/cs:
+	Serbia -> Serbia and Montenegro
+
+2005-08-25 svu
+
+	* configure.in, po/sr@Latn.po:
+	adding sr@Latn translation, thanks to Danilo
+
+2005-08-24 svu
+
+	* configure.in:
+	preparing 0.6
+
+2005-08-24 svu
+
+	* rules/base.xml.in, symbols/mk, 
+	rules/compat/layoutRename.lst:
+	Move Macedonian to country-based
+
+2005-08-23 svu
+
+	* rules/base.xml.in, symbols/ba, 
+	symbols/si, symbols/cs, symbols/hr:
+	Major Balkanian revolution by Danilo Segan. GREAT THANKS to him.
+
+2005-08-22 svu
+
+	* rules/base.xml.in, symbols/mv:
+	Moved Dhivehi to Maldives, fixed #3716
+
+2005-08-22 svu
+
+	* rules/compat/layoutRename.lst:
+	fixed http://bugzilla.ubuntu.com/show_bug.cgi?id=13919
+
+2005-08-16 svu
+
+	* rules/base.xml.in, symbols/ir:
+	fixed https://bugs.freedesktop.org/show_bug.cgi?id=4102
+
+2005-08-11 svu
+
+	* symbols/jp, symbols/pc:
+	fixed https://bugs.freedesktop.org/show_bug.cgi?id=847
+
+2005-08-07 svu
+
+	* symbols/bg:
+	fixed https://bugs.freedesktop.org/show_bug.cgi?id=4010
+
+2005-08-06 svu
+
+	* Makefile.am:
+	Allowing multiple compatibility symlinks (xfree86,xorg).
+	Thanks to Daniel Stone for the feedback
+
+2005-08-06 svu
+
+	* Makefile.am:
+	Fixing the xkbcomp symlink creation
+	Thanks to Daniel Stone for the feedback
+
+2005-08-04 svu
+
+	* Makefile.am, configure.in, xkbrules.am:
+	Taking nice ideas from xkbdata. 
+	Thanks to Daniel Stone for his knowledge of autofoo
+
+2005-08-04 svu
+
+	* symbols/in, symbols/lk,
+	rules/base.xml.in, rules/compat/variantRename.lst:
+	a bit reogranizing tamil stuff
+
+2005-08-03 svu
+
+	* symbols/ie, rules/base.xml.in, rules/compat/variantRename.lst:
+	getting rid of laptop variants in 'ie'
+
+2005-08-02 svu
+
+	* symbols/in, rules/base.xml.in, rules/compat/variantRename.lst:
+	moving 'mal_plusnum' to 'mal'
+
+2005-08-01 svu
+
+	* symbols/il, symbols/hr, symbols/tj:
+	fixing two-group layouts
+
+2005-08-01 svu
+
+	* symbols, rules:
+	putting syr to sy, dzo to bt
+
+2005-07-31 svu
+
+	* symbols, rules:
+	putting smi to no, fi, se
+
+2005-07-31 svu
+
+	* symbols, rules:
+	putting Syriac to Syria (setting 'ara' as default)
+
+2005-07-31 svu
+
+	* symbols, rules:
+	putting Devangari, Gurmukhi into 'in'
+
+2005-07-31 svu
+
+	* symbols, rules:
+	changing 'lao' to 'la'
+
+2005-07-31 svu
+
+	* symbols, rules:
+	putting Inuktitut into 'ca'
+
+2005-07-31 svu
+
+	* symbols, rules:
+	putting Ogham into 'ie'. Cleaning it up.
+
+2005-07-29 svu
+
+	* symbols, rules:
+	reorganizing Asian layouts, round #1
+
+2005-07-25 svu
+
+	* symbols/tr:
+	fixed Turkish, according to
+	https://bugs.freedesktop.org/show_bug.cgi?id=2558
+
+2005-07-25 svu
+
+	* symbols/hr:
+	added belowdot, abovedot, in relation to 
+	https://bugs.freedesktop.org/show_bug.cgi?id=475
+
+2005-07-24 svu
+
+	* symbols/div,
+	symbols/Makefile.am,
+	rules/base.xml.in: adding Dhivehi, fixing
+	https://bugs.freedesktop.org/show_bug.cgi?id=3716
+
+2005-07-23 svu
+
+	* symbols/es,
+	rules/base.xml.in:
+	adding Spanish dvorak, pointer from
+	https://bugs.freedesktop.org/show_bug.cgi?id=2344
+
+2005-07-21 svu
+
+	* symbols/sun_vndr/us,
+	rules/sun,
+	keycodes/sun,
+	geometry/sun: adding more keyboards, fixing
+	https://bugs.freedesktop.org/show_bug.cgi?id=2037
+
+2005-07-20 svu
+
+	* symbols/ru, 
+	symbols/us, 
+	symbols/se, 
+	symbols/ua, 
+	rules/base.xml.in: 
+	sorting out Russian layout, fixing (without 3rd and 4th groups)
+	https://bugs.freedesktop.org/show_bug.cgi?id=2582
+
+2005-07-15 svu
+
+	* symbols/inet, rules/base.xml.in: 
+	added Cherry CyMotion Linux, fixed
+	https://bugs.freedesktop.org/show_bug.cgi?id=3789
+
+2005-07-02 svu
+
+	* symbols/nl: fixed Dutch layout
+
+2005-06-17 svu
+
+	* symbols/pl: added AB10 to qwertz
+	https://bugs.freedesktop.org/show_bug.cgi?id=3298
+
+2005-06-17 svu
+
+	* symbols/inet, rules/base.xml.in: added logiultrax,
+	https://bugs.freedesktop.org/show_bug.cgi?id=3523
+
+2005-04-17 svu
+
+	* symbols/tam, rules/base.xml.in: changed default for Tamil,
+	https://bugs.freedesktop.org/show_bug.cgi?id=2971
+
+2005-04-02 svu
+
+	* symbols/de, rules/base.xml.in: added de(dvorak),
+	https://bugs.freedesktop.org/show_bug.cgi?id=2681
+
+2005-03-10 svu
+
+	* po/Makefile.am: adding POTFILES* into the dist
+	* Makefile.am, rules/Makefile.am: adding DISTCLEANFILES
+
+2005-03-09 svu
+
+	* symbols/us: fixing dvorak,
+	https://bugs.freedesktop.org/show_bug.cgi?id=2641
+
+2005-02-05 svu
+
+	* configure.in, NEWS: preparing 0.5
+
+2005-02-03 svu
+
+	* symbols/srp, types/extra: replaced SERBIAN_ALPHABETIC with 
+	FOUR_LEVEL_ALPHABETIC, as Danilo requested. Also, SERBIAN_CAPS 
+	renamed to SEPARATE_CAPS_AND_SHIFT_ALPHABETIC.
+
+2005-01-21 svu
+
+	* rules/base.lists.part,
+	rules/base.xml.in,
+	symbols/inet: addin my own Acer Travelmate 800 keyboard
+	(based on acerhk kernel module).
+
+2005-01-21 svu
+
+	* symbols/gr: a bit more order in group name (needed for 'basic' but 
+	not for 'bare'
+
+2005-01-20 svu
+
+	* symbols/hr: added missing keymapping, 
+	fixed https://bugs.freedesktop.org/show_bug.cgi?id=2325
+
+2005-01-19 svu
+
+	* symbols/us: removed illegal 'hidden' attribute from the default layout
+
+2005-01-18 svu
+
+	* symbols/cz, rules/base.xml.in: fixed the Czech layout,
+	https://bugs.freedesktop.org/show_bug.cgi?id=2319
+
+2005-01-16 svu
+
+	* symbols, rules/base.xml.in: HUGE commit - adjusting the group names
+	according to the descriptions. 
+	Also, some layouts were missing the default variants - added one.
+	Also, some default variants were listed in the variantLists - now they are removed.
+
+2005-01-06 svu
+
+	* symbols/am, rules/base.xml.in: Removing old Armenian layout,
+	fixing http://bugs.freedesktop.org/show_bug.cgi?id=2226
+
+2004-12-22 svu
+
+	* symbols: massive patch for the group names (by Denis Barbier)
+	* rules/base.xml.in: first iteration, match the country names with 
+	the group names
+
+2004-12-21 02:07  svu
+
+	* po/el.po,
+	configure.in: Greek translation
+
+2004-12-20 20:30  svu
+
+	* symbols/inet,
+	rules/base.lists.part,
+	rules/base.xml.in: added A4Tech KBS-8, thanks to olo at force dot sk.
+	fixed https://bugs.freedesktop.org/show_bug.cgi?id=2113
+
+2004-12-10 00:30  svu
+
+	* symbols/inet: removed keyboard names from the group names,
+	fixed https://bugs.freedesktop.org/show_bug.cgi?id=2044
+
+2004-12-08 00:30  svu
+
+	* symbols/mkd, 
+	rules/base.xml.in,
+	rules/compat/layoutRename.lst,
+	rules/compat/Makefile.am: Macedonian is now language-based, 
+	not country-based. Compatibility rule added.
+
+2004-12-04 01:40  svu
+
+	* symbols/mk, rules/base.xml.in: small fix for Makedonian
+
+2004-12-03 00:40  svu
+
+	* configure.in, Makefile.am, compiled: some cleanup in the
+	build process
+
+2004-11-29 19:00  svu
+
+	* symbols/sin: Small patch for Sinhala from Harshula
+
+2004-11-14 22:14  svu
+
+	* symbols/sin: Small patch for Sinhala from Harshula
+
+2004-10-31 01:20  svu
+
+	* symbols/ca, rules/base.xml.in: added fr-dvorak, thanks to
+	Jonathan Bastien-Filiatrault
+
+2004-10-29 01:15  svu
+
+	* symbols/am: fixed phonetic layout, bug
+	http://freedesktop.org/bugzilla/show_bug.cgi?id=1714
+
+2004-10-29 00:55  svu
+
+	* rules/base.xml.in, rules/base.lists.part, symbols/inet: 
+	Added Cherry CyMotion Master XPress, fixed 
+	http://freedesktop.org/bugzilla/show_bug.cgi?id=1715
+
+2004-10-26 21:08  svu
+
+	* symbols/Makefile.am, symbols/kg, rules/base.xml.in: added 
+	Kyrgyz, thanks to Yury Fedorov
+
+2004-10-12 18:45  svu
+
+	* symbols/Makefile.am, symbols/sin, rules/base.xml.in: added 
+	Sinhalese, thanks to Harshula Jayasuriya
+
+2004-10-10 23:59  svu
+
+	* po/: af.po, az.po, bg.po, cs.po, da.po, fr.po, hu.po, nl.po,
+	  ru.po, sk.po, sq.po, sr.po, sv.po, tr.po, uk.po, zh_CN.po: update
+	  from TP
+
+2004-10-09 19:34  svu
+
+	* symbols/: mal, mao, mm, mn, mt, nl, ogam, ori, pc, pl, pt, ru,
+	  sk, smi, srvr_ctrl, syr, tam, tel, th, tr, ua, urd, us: adding
+	  the keyword
+
+2004-10-09 18:40  svu
+
+	* symbols/: jp, kan, lao, latam, latin, level3, lt, lv: adding the
+	  keyword
+
+2004-10-09 18:35  svu
+
+	* symbols/: deva, dzo, ee, es, eurosign, fo, fr, gb, ge, gr, guj,
+	  guru, ie, iku, il, inet, ir, is, it: adding the keyword
+
+2004-10-09 18:29  svu
+
+	* symbols/: al, altwin, am, ara, az, be, ben, bg, by, capslock, ch,
+	  compose, ctrl, cz: adding the keyword
+
+2004-10-09 18:26  svu
+
+	* symbols/: ca, uz, vn: adding the keyword
+
+2004-10-09 18:23  svu
+
+	* symbols/: ca, uz, vn: fixing
+	  https://freedesktop.org/bugzilla/show_bug.cgi?id=1566
+
+2004-10-09 00:31  svu
+
+	* symbols/ch: fixing
+	  https://freedesktop.org/bugzilla/show_bug.cgi?id=1562
+
+2004-10-09 00:20  svu
+
+	* symbols/ca: fixing
+	  https://freedesktop.org/bugzilla/show_bug.cgi?id=1563
+
+2004-10-08 21:55  svu
+
+	* symbols/hu: fixing
+	  https://freedesktop.org/bugzilla/show_bug.cgi?id=1561
+
+2004-09-29 23:25  svu
+
+	* symbols/macintosh_vndr/: Makefile.am, is: Added Icelandic layout
+	  to the Macintosh group
+
+2004-09-28 00:00  svu
+
+	* NEWS, configure.in: preparing 0.4
+
+2004-09-18 01:00  svu
+
+	* BUGS, rules/base.xml.in: David noticed small glitches in
+	  base.xml.in
+
+2004-09-16 01:11  svu
+
+	* rules/Makefile.am, rules/base.o_s.part, rules/base.xml.in,
+	  rules/compat/Makefile.am, rules/compat/base.o_s.part,
+	  symbols/group: shift_toggle -> shifts_toggle
+
+2004-09-15 23:20  svu
+
+	* symbols/group: make the ctrsl_toggle consistend with the others
+
+2004-09-14 20:54  svu
+
+	* symbols/ba: more commas
+
+2004-09-14 20:38  svu
+
+	* symbols/: mk, srp: more commas
+
+2004-09-14 20:14  svu
+
+	* symbols/: br, de, dk, fi, hr, hu, keypad, no, pl, ro, se, si:
+	  keymap(comma) introduced by Frank
+
+2004-09-13 22:39  svu
+
+	* symbols/tj: new local cvs keyword seems to be ok - no more $Id$
+
+2004-09-13 22:38  svu
+
+	* symbols/tj: trying new local cvs keyword
+
+2004-09-13 19:49  svu
+
+	* symbols/ara, symbols/bg, symbols/by, symbols/capslock,
+	  symbols/deva, symbols/fo, symbols/guj, symbols/guru, symbols/iku,
+	  symbols/il, symbols/ir, symbols/kan, symbols/lao, symbols/mk,
+	  symbols/mm, symbols/mt, symbols/ori, symbols/sk, symbols/srp,
+	  symbols/tel, compat/README, compat/ledcaps, compat/lednum,
+	  compat/ledscroll, docs/README.config, geometry/README,
+	  geometry/dell, geometry/everex, geometry/keytronic,
+	  geometry/kinesis, geometry/microsoft, geometry/northgate,
+	  geometry/sgi_vndr/O2, geometry/sgi_vndr/indigo,
+	  geometry/sgi_vndr/indy, keycodes/README, keycodes/aliases,
+	  keymap/README, keymap/sgi_vndr/cz, keymap/sgi_vndr/sk,
+	  rules/README, symbols/macintosh_vndr/ch,
+	  symbols/macintosh_vndr/es, symbols/macintosh_vndr/fi,
+	  symbols/macintosh_vndr/fr, symbols/macintosh_vndr/it,
+	  symbols/macintosh_vndr/nl, symbols/sun_vndr/usb, types/README,
+	  types/basic, types/default, types/numpad: no dummy XFree keyword
+
+2004-09-11 21:41  svu
+
+	* symbols/tj: trying Id
+
+2004-09-09 23:05  svu
+
+	* symbols/: tj: fixing keyword
+
+2004-09-09 23:02  svu
+
+	* symbols/tj: fixing keyword
+
+2004-09-09 22:07  svu
+
+	* symbols/level3: ONE_LEVEL fixing by Frank
+
+2004-09-09 00:01  svu
+
+	* symbols/group: more fair comment
+
+2004-09-08 23:40  svu
+
+	* symbols/level3: they agreed on this
+
+2004-09-08 20:14  svu
+
+	* compat/Makefile.am, rules/base.o_c.part: no more capsled traces
+
+2004-09-07 23:58  svu
+
+	* symbols/level3: restoring for a while, till guys make agreement
+
+2004-09-07 23:16  svu
+
+	* symbols/mn: just for sync:)
+
+2004-09-07 21:51  svu
+
+	* po/ru.po: updated translation
+
+2004-09-07 21:50  svu
+
+	* rules/base.xml.in: small polish of the option descriptions
+
+2004-09-07 20:56  svu
+
+	* symbols/: al, az, be, br, ca, cz, de, dk, dzo, ee, es, fi, fo,
+	  fr, gb, hr, hu, is, it, latam, level3, lt, mt, nl, no, pt, ro,
+	  se, si, sk, smi, srp, tr, us, vn: changing to ralt_switch
+
+2004-09-07 20:39  svu
+
+	* rules/: base.o_s.part, sgi, sun: small fixes, thanks to Frank
+
+2004-09-07 20:33  svu
+
+	* symbols/urd: forgotten to add
+
+2004-09-06 00:59  svu
+
+	* rules/base.xml.in, symbols/Makefile.am: Adding Urdu layout,
+	  thanks to Zaeem Arshad
+
+2004-09-04 22:39  svu
+
+	* compat/Makefile.am, compat/basic, compat/group_led,
+	  compat/ledcaps, compat/lednum, compat/leds, compat/ledscroll,
+	  compat/misc, rules/base.o_c.part, rules/base.o_s.part,
+	  rules/base.xml.in, symbols/Makefile.am, symbols/capslock,
+	  symbols/group, symbols/lock: reorganizing indicators, thanks to
+	  Frank Murphy
+
+2004-08-28 02:04  svu
+
+	* symbols/compose, rules/base.o_s.part, rules/base.xml.in: adding
+	  RCtrl as Compose
+
+2004-08-27 23:57  svu
+
+	* symbols/us: thanks to Frank, he noticed two default variants in
+	  the us layout
+
+2004-08-27 19:20  svu
+
+	* rules/: base.o_s.part, base.xml.in: meta-info about eurosign
+
+2004-08-27 02:23  svu
+
+	* symbols/: Makefile.am, eurosign: added eurosign
+
+2004-07-25 14:55  svu
+
+	* Makefile.am, mkinstalldirs: fixing mkinstalldirs
+
+2004-07-24 00:42  svu
+
+	* rules/Makefile.am: minor fix for the minor bug detected by
+	  distcheck
+
+2004-07-23 22:21  svu
+
+	* TODO: up2date
+
+2004-07-23 22:00  svu
+
+	* NEWS, configure.in: preparing 0.3
+
+2004-07-23 00:11  svu
+
+	* rules/: HDR, Makefile.am, compat/.cvsignore, compat/Makefile.am,
+	  compat/lnv_s.sh, compat/ml1v1_s.sh: HURRAY!!! Rules are working!
+	  Am I cool or what?
+
+2004-07-22 02:03  svu
+
+	* rules/HDR: fixing the header for MLV
+
+2004-07-21 02:21  svu
+
+	* rules/: HDR, Makefile.am, base.mlv_s.part, base.mvl_s.part,
+	  compat/.cvsignore, compat/Makefile.am, compat/ln_s.sh,
+	  compat/ml1_s.sh, compat/ml_s.sh, compat/mlv_s.sh: variants are
+	  there
+
+2004-07-21 01:57  svu
+
+	* rules/: HDR, Makefile.am, compat/.cvsignore, compat/Makefile.am,
+	  compat/lnv_s.sh, compat/ml1_s.sh, compat/ml1v_s.sh: a bit more
+	  about variants
+
+2004-07-21 01:48  svu
+
+	* rules/: .cvsignore, HDR, Makefile.am, compat/.cvsignore,
+	  compat/Makefile.am, compat/lnv_s.sh, compat/variantRename.lst:
+	  adding variants - not complete yet
+
+2004-07-21 01:25  svu
+
+	* rules/compat/: Makefile.am, l2_s.sh, l3_s.sh, l4_s.sh, ln_s.sh:
+	  single script for the layouts 2-4
+
+2004-07-21 00:02  svu
+
+	* rules/merge.sh: bash is great but sh is standard - and think
+	  optimal, dude
+
+2004-07-20 02:57  svu
+
+	* rules/compat/: l2_s.sh, l3_s.sh, l4_s.sh: the extra layouts (2-4)
+	  should be ADDED using '+' character
+
+2004-07-20 02:49  svu
+
+	* rules/: base.ml1_c.part, base.ml1_s.part, base.ml_c.part,
+	  base.ml_s.part, compat/l2_s.sh, compat/l3_s.sh, compat/l4_s.sh,
+	  compat/ml1_s.sh, compat/ml_s.sh: alignment
+
+2004-07-20 02:33  svu
+
+	* rules/compat/: ml1_s.sh, ml_s.sh: little fix
+
+2004-07-20 02:29  svu
+
+	* rules/: HDR, Makefile.am, base.l1_k.part, base.l2_s.part,
+	  base.l3_s.part, base.l4_s.part, base.l_k.part, base.m_g.part,
+	  base.m_k.part, base.m_s.part, base.m_t.part, base.ml1_c.part,
+	  base.ml1_s.part, base.ml_c.part, base.ml_s.part, base.mvl_s.part,
+	  base.o_c.part, base.o_s.part, base.o_t.part, merge.sh: Now, we
+	  compoze the parts using bash script
+
+2004-07-18 03:54  svu
+
+	* configure.in, rules/.cvsignore, rules/compat/.cvsignore,
+	  rules/compat/Makefile.am, rules/compat/base.lists.part,
+	  rules/compat/l2_s.sh, rules/compat/l3_s.sh, rules/compat/l4_s.sh,
+	  rules/compat/layoutRename.lst, rules/compat/ml1_s.sh,
+	  rules/compat/ml_s.sh: starting bundling compatibility parts
+
+2004-07-18 03:44  svu
+
+	* rules/: Makefile.am, base: cleaning a bit before adding the
+	  compat directory
+
+2004-07-18 01:56  svu
+
+	* rules/: Makefile.am, base, base.l1_k.part, base.l2_s.part,
+	  base.l3_s.part, base.l4_s.part, base.l_k.part, base.lists.part,
+	  base.m_g.part, base.m_k.part, base.m_s.part, base.m_t.part,
+	  base.ml1_c.part, base.ml1_s.part, base.ml_c.part, base.ml_s.part,
+	  base.mvl_s.part, base.o_c.part, base.o_s.part, base.o_t.part:
+	  better empty line handling between rule groups
+
+2004-07-18 01:42  svu
+
+	* rules/: Makefile.am, base, base.hdr.part, base.l1_k.part,
+	  base.l2_s.part, base.l3_s.part, base.l4_s.part, base.l_k.part,
+	  base.lists.part, base.m_g.part, base.m_k.part, base.m_s.part,
+	  base.m_t.part, base.ml1_c.part, base.ml1_s.part, base.ml_c.part,
+	  base.ml_s.part, base.mvl_s.part, base.o_c.part, base.o_s.part,
+	  base.o_t.part: Now, the base rules are composed from microfiles
+	  *.part. I see no other way to handle compatibility in a
+	  manageable way. Kill me if I know it.
+
+2004-07-09 05:21  daniel
+
+	* ChangeLog, configure.in: * configure.in: Alter with-xkb-base
+	  default to $(prefix)/lib/X11/xkb, instead of
+	  $(prefix)/X11R6/lib/xkb, which makes --prefix=/usr behave sanely.
+
+2004-07-08 21:40  svu
+
+	* configure.in: getting rid of unnecessary AM_GLIB_GNU_GETTEXT
+
+2004-07-07 22:52  kidcrash
+
+	* ChangeLog: adding required ChangeLog file
+
+2004-07-06 23:44  svu
+
+	* .cvsignore: Anjuta files are not in CVS - and'll never be
+
+2004-07-04 02:00  svu
+
+	* po/ru.po: updating Russian translation
+
+2004-07-04 01:31  svu
+
+	* rules/base.xml.in, symbols/Makefile.am, symbols/cs, symbols/srp:
+	  streamlining ex-yu layouts
+
+2004-07-03 03:32  svu
+
+	* rules/base.xml.in, symbols/Makefile.am, symbols/dvorak,
+	  symbols/fr, symbols/gb, symbols/no, symbols/pl, symbols/se,
+	  symbols/us, po/ru.po: splitting dvorak
+
+2004-07-02 01:59  svu
+
+	* symbols/smi: fixing broken layouts, thanks to my testing scripts
+
+2004-07-02 01:49  svu
+
+	* symbols/: Makefile.am, ara, gr, latam, lv, mal, ogam: fixing
+	  broken layouts, thanks to my testing scripts
+
+2004-07-02 00:16  svu
+
+	* po/Makefile.am: adding update-po
+
+2004-07-01 22:28  svu
+
+	* docs/: iso3166.csv, iso639.csv: more fresh version of the
+	  standards
+
+2004-07-01 03:01  svu
+
+	* po/ru.po: completing Russian translation - though some things are
+	  questionable
+
+2004-07-01 02:59  svu
+
+	* config.rpath, mkinstalldirs: why would I need these files in
+	  CVS???
+
+2004-07-01 02:55  svu
+
+	* ABOUT-NLS: empty but very useful file
+
+2004-07-01 02:48  svu
+
+	* Makefile.am, autogen.sh, configure.in, po/Makefile.am,
+	  rules/base.xml.in: Starting to fix intltool problem, Danilo just
+	  roxx
+
+2004-06-30 23:47  svu
+
+	* rules/base.xml.in, symbols/Makefile.am, symbols/cs, symbols/yu:
+	  Changed yu to cs as Danilo advised - but not sure it is ok.
+	  Investigating...
+
+2004-06-30 23:25  svu
+
+	* rules/base.xml.in, symbols/Makefile.am, symbols/scc, symbols/srp:
+	  Changing scc to srp - as Danilo advised
+
+2004-06-26 01:54  svu
+
+	* BUGS: hopefully fixed Latvian layout
+
+2004-06-26 01:50  svu
+
+	* rules/base.xml.in, symbols/lv: hopefully fixed Latvian layout
+
+2004-06-22 01:11  svu
+
+	* configure.in: trying to set order in the Makefiles list
+
+2004-06-22 00:56  svu
+
+	* Makefile.am, configure.in, autogen.sh: trying to fix intltool -
+	  but without much luck
+
+2004-06-20 20:09  svu
+
+	* rules/base.xml.in: fixing shortDescr for Smi
+
+2004-06-20 19:04  svu
+
+	* docs/: iso15924.csv, iso3166.csv, iso3166.txt, iso639.csv,
+	  iso639.txt: putting order into standards
+
+2004-06-20 15:36  svu
+
+	* symbols/bg: bad patch application
+
+2004-06-20 15:36  svu
+
+	* rules/base.xml.in: typo in Sami id
+
+2004-06-20 15:22  svu
+
+	* symbols/Makefile.am: Frank forgets to chance Makefile.am:)
+
+2004-06-20 14:57  svu
+
+	* xkeyboard-config.spec.in, rules/base, rules/base.xml.in,
+	  docs/Makefile.am, docs/README.symbols, symbols/ar, symbols/ara,
+	  symbols/ba, symbols/bs, symbols/dev, symbols/deva, symbols/dz,
+	  symbols/dzo, symbols/el, symbols/gr, symbols/gur, symbols/guru,
+	  symbols/iku, symbols/iu, symbols/la, symbols/lao, symbols/latam,
+	  symbols/lo, symbols/mal, symbols/mao, symbols/mi, symbols/ml,
+	  symbols/ogam, symbols/ogham, symbols/sapmi, symbols/scc,
+	  symbols/smi, symbols/sr, symbols/tam, symbols/tml: Second phase
+	  of i18n. Frank rocks the world:)
+
+2004-06-19 04:34  svu
+
+	* symbols/mk: Macedonia AKA FYROM
+
+2004-06-19 04:32  svu
+
+	* rules/: Makefile.am, base-it.lst, base.lst, sgi.lst, sun.lst,
+	  xfree98.lst: lst file is not generated automatically - only
+	  base.lst
+
+2004-06-19 04:16  svu
+
+	* rules/: sgi, sun: en_US actually died only now
+
+2004-06-19 04:07  svu
+
+	* symbols/: en_US, sun_vndr/se: en_US actually died only now
+
+2004-06-16 02:07  svu
+
+	* rules/base.xml.in: ISOization, part1
+
+2004-06-16 02:00  svu
+
+	* rules/base.xml.in, symbols/bg, symbols/ch, symbols/el,
+	  symbols/il, symbols/mm: ISOization, part1
+
+2004-06-15 22:04  svu
+
+	* rules/base.xml.in: better wording for Urkainian RSTU description
+
+2004-06-15 19:19  svu
+
+	* rules/base.xml.in, symbols/ru, symbols/ua: Added RSTU
+	  Ukranian/Russian layouts. Thanks to Andrew Porokhnyak
+
+2004-06-13 23:12  svu
+
+	* symbols/inet: actually adding gyration keyboard
+
+2004-06-13 21:30  svu
+
+	* docs/HOWTO.testing: Forgot to add actual document
+
+2004-06-13 21:21  svu
+
+	* BUGS, rules/base, rules/base.lst, rules/base.xml.in, symbols/am,
+	  symbols/inet, symbols/lt, symbols/us: fixing loads of bugs from
+	  fd.o bugzilla
+
+2004-06-13 13:28  svu
+
+	* xkeyboard-config.spec.in, docs/Makefile.am: Added HOWTO.testing
+	  by Frank Murphy
+
+2004-06-12 02:17  svu
+
+	* symbols/mi: getting rid of pc/
+
+2004-06-12 02:14  svu
+
+	* symbols/mi: getting rid of pc/
+
+2004-06-12 02:06  svu
+
+	* NEWS: Redoing 0.2
+
+2004-06-12 02:05  svu
+
+	* symbols/br: fixing bug 515
+
+2004-06-12 02:01  svu
+
+	* rules/base.xml.in, symbols/Makefile.am, symbols/mi: Added Maori,
+	  thanks to John C Barstow
+
+2004-06-12 01:50  svu
+
+	* docs/: iso3166.txt, iso639.txt: just to have standards for
+	  reference
+
+2004-06-10 23:58  svu
+
+	* NEWS: Preparing 0.2
+
+2004-06-10 23:51  svu
+
+	* README, configure.in: Preparing 0.2
+
+2004-06-06 04:22  svu
+
+	* xkeyboard-config.spec.in, docs/HOWTO.transition,
+	  docs/Makefile.am, rules/Makefile.am: adding HOWTO.transition
+
+2004-05-28 23:59  svu
+
+	* Makefile.am, configure.in: Optional creation of xkbcomp symlink
+	  in .../X11/xkb
+
+2004-05-25 22:30  svu
+
+	* NEWS: something to say
+
+2004-05-24 22:15  svu
+
+	* po/xkbdesc.pot: changing the project name
+
+2004-05-24 22:08  svu
+
+	* .cvsignore, Makefile.am, autogen.sh, configure.in,
+	  xkbdesc.spec.in, xkeyboard-config.spec.in: changing the project
+	  name
+
+2004-05-23 21:01  svu
+
+	* rules/base, rules/base.xml.in, symbols/altwin: Daniel Elstner
+	  sent new option for Tux keys
+
+2004-05-18 00:24  svu
+
+	* configure.in: no glib stuff
+
+2004-05-12 13:51  pascal
+
+	* rules/base, symbols/bs: Convert Bosnian keymap to multi-layout
+	  compatible form.
+
+2004-05-09 22:26  svu
+
+	* Makefile.am, README.config, README.enhancing, configure.in,
+	  xkbdesc.spec.in, docs/.cvsignore, docs/Makefile.am,
+	  docs/README.config: reorganization in docs
+
+2004-05-09 21:40  svu
+
+	* TODO, docs/README.enhancing: 2 bits of docs
+
+2004-05-07 19:48  svu
+
+	* po/ru.po: up2date
+
+2004-05-07 19:27  svu
+
+	* rules/base.xml.in, symbols/tr, tests/testLayouts.pl,
+	  tests/testOptions.pl, tests/xkbTestFunc.pm: Some small fixes
+	  made. Options are now testable as well.
+
+2004-05-06 02:00  svu
+
+	* tests/: listCI2.xsl, testLayouts.pl, testOptions.pl,
+	  xkbTestFunc.pm: one more test - but still problems passing it
+
+2004-05-06 01:15  svu
+
+	* configure.in, symbols/mk, tests/testLayouts.pl: Makedonian
+	  problem fixed - and BOTH tests are OK
+
+2004-05-06 01:05  svu
+
+	* symbols/digital_vndr/Makefile.am, symbols/digital_vndr/lk,
+	  symbols/digital_vndr/pc, symbols/digital_vndr/us,
+	  symbols/digital_vndr/vt, symbols/fujitsu_vndr/Makefile.am,
+	  symbols/fujitsu_vndr/jp, keycodes/digital_vndr/Makefile.am,
+	  keycodes/digital_vndr/lk, keycodes/digital_vndr/pc,
+	  keycodes/sgi_vndr/Makefile.am, keycodes/sgi_vndr/indigo,
+	  keycodes/sgi_vndr/indy, keycodes/sgi_vndr/iris, keymap/macintosh,
+	  keymap/sony, keymap/xfree98, keymap/digital_vndr/Makefile.am,
+	  keymap/digital_vndr/us, keymap/sgi_vndr/Makefile.am,
+	  keymap/sgi_vndr/be, keymap/sgi_vndr/bg, keymap/sgi_vndr/ca,
+	  keymap/sgi_vndr/ch, keymap/sgi_vndr/cz, keymap/sgi_vndr/de,
+	  keymap/sgi_vndr/dk, keymap/sgi_vndr/dvorak,
+	  keymap/sgi_vndr/en_US, keymap/sgi_vndr/es, keymap/sgi_vndr/fi,
+	  keymap/sgi_vndr/fr, keymap/sgi_vndr/gb, keymap/sgi_vndr/hu,
+	  keymap/sgi_vndr/it, keymap/sgi_vndr/jp, keymap/sgi_vndr/no,
+	  keymap/sgi_vndr/pl, keymap/sgi_vndr/pt, keymap/sgi_vndr/ru,
+	  keymap/sgi_vndr/se, keymap/sgi_vndr/sk, keymap/sgi_vndr/th,
+	  keymap/sgi_vndr/us, keymap/sun_vndr/Makefile.am,
+	  keymap/sun_vndr/de, keymap/sun_vndr/es, keymap/sun_vndr/fi,
+	  keymap/sun_vndr/fr, keymap/sun_vndr/no, keymap/sun_vndr/pl,
+	  keymap/sun_vndr/ru, keymap/sun_vndr/se, keymap/sun_vndr/uk,
+	  keymap/sun_vndr/us, rules/base, rules/base.xml.in,
+	  symbols/hp_vndr/Makefile.am, symbols/macintosh_vndr/Makefile.am,
+	  symbols/macintosh_vndr/apple, symbols/macintosh_vndr/ch,
+	  symbols/macintosh_vndr/de, symbols/macintosh_vndr/dk,
+	  symbols/macintosh_vndr/fi, symbols/macintosh_vndr/no,
+	  symbols/macintosh_vndr/pt, symbols/macintosh_vndr/se,
+	  symbols/macintosh_vndr/us, symbols/nec_vndr/Makefile.am,
+	  symbols/sgi_vndr/Makefile.am, symbols/sony_vndr/Makefile.am,
+	  symbols/sun_vndr/Makefile.am, symbols/sun_vndr/se,
+	  symbols/sun_vndr/us, symbols/xfree68_vndr/Makefile.am,
+	  tests/testLayouts.pl, tests/testModels.pl, tests/xkbTestFunc.pm,
+	  geometry/digital_vndr/Makefile.am, geometry/digital_vndr/pc,
+	  geometry/ibm_vndr/Makefile.am, geometry/ibm_vndr/thinkpad,
+	  geometry/sgi_vndr/Makefile.am: Yahoo! Models test pased ok!
+
+2004-05-05 23:32  svu
+
+	* configure.in, symbols/Makefile.am,
+	  symbols/digital_vndr/.cvsignore,
+	  symbols/digital_vndr/Makefile.am, symbols/digital_vndr/lk,
+	  symbols/digital_vndr/pc, symbols/digital_vndr/us,
+	  symbols/digital_vndr/vt, symbols/fujitsu_vndr/.cvsignore,
+	  symbols/fujitsu_vndr/Makefile.am, symbols/fujitsu_vndr/jp,
+	  symbols/fujitsu_vndr/us, symbols/hp_vndr/.cvsignore,
+	  symbols/hp_vndr/Makefile.am, symbols/hp_vndr/us,
+	  symbols/macintosh_vndr/.cvsignore,
+	  symbols/macintosh_vndr/Makefile.am, symbols/macintosh_vndr/ch,
+	  symbols/macintosh_vndr/de, symbols/macintosh_vndr/dk,
+	  symbols/macintosh_vndr/es, symbols/macintosh_vndr/fi,
+	  symbols/macintosh_vndr/fr, symbols/macintosh_vndr/gb,
+	  symbols/macintosh_vndr/it, symbols/macintosh_vndr/nl,
+	  symbols/macintosh_vndr/no, symbols/macintosh_vndr/pt,
+	  symbols/macintosh_vndr/se, symbols/macintosh_vndr/us,
+	  symbols/nec_vndr/.cvsignore, symbols/nec_vndr/Makefile.am,
+	  symbols/nec_vndr/jp, geometry/Makefile.am,
+	  geometry/digital_vndr/.cvsignore,
+	  geometry/digital_vndr/Makefile.am, geometry/digital_vndr/lk,
+	  geometry/digital_vndr/pc, geometry/digital_vndr/unix,
+	  geometry/ibm_vndr/.cvsignore, geometry/ibm_vndr/Makefile.am,
+	  geometry/ibm_vndr/thinkpad, geometry/sgi_vndr/.cvsignore,
+	  geometry/sgi_vndr/Makefile.am, geometry/sgi_vndr/O2,
+	  geometry/sgi_vndr/indigo, geometry/sgi_vndr/indy,
+	  keycodes/Makefile.am, symbols/sgi_vndr/.cvsignore,
+	  symbols/sgi_vndr/Makefile.am, symbols/sgi_vndr/jp,
+	  symbols/sony_vndr/.cvsignore, symbols/sony_vndr/Makefile.am,
+	  symbols/sony_vndr/us, symbols/sun_vndr/.cvsignore,
+	  symbols/sun_vndr/Makefile.am, symbols/sun_vndr/se,
+	  symbols/sun_vndr/us, symbols/sun_vndr/usb,
+	  symbols/xfree68_vndr/.cvsignore,
+	  symbols/xfree68_vndr/Makefile.am, symbols/xfree68_vndr/amiga,
+	  symbols/xfree68_vndr/ataritt, keycodes/digital_vndr/.cvsignore,
+	  keycodes/digital_vndr/Makefile.am, keycodes/digital_vndr/lk,
+	  keycodes/digital_vndr/pc, keycodes/sgi_vndr/.cvsignore,
+	  keycodes/sgi_vndr/Makefile.am, keycodes/sgi_vndr/indigo,
+	  keycodes/sgi_vndr/indy, keycodes/sgi_vndr/iris,
+	  keymap/Makefile.am, keymap/digital_vndr/.cvsignore,
+	  keymap/digital_vndr/Makefile.am, keymap/digital_vndr/us,
+	  keymap/sgi_vndr/.cvsignore, keymap/sgi_vndr/Makefile.am,
+	  keymap/sgi_vndr/be, keymap/sgi_vndr/bg, keymap/sgi_vndr/ca,
+	  keymap/sgi_vndr/ch, keymap/sgi_vndr/cz, keymap/sgi_vndr/de,
+	  keymap/sgi_vndr/dk, keymap/sgi_vndr/dvorak,
+	  keymap/sgi_vndr/en_US, keymap/sgi_vndr/es, keymap/sgi_vndr/fi,
+	  keymap/sgi_vndr/fr, keymap/sgi_vndr/gb, keymap/sgi_vndr/hu,
+	  keymap/sgi_vndr/it, keymap/sgi_vndr/jp, keymap/sgi_vndr/no,
+	  keymap/sgi_vndr/pl, keymap/sgi_vndr/pt, keymap/sgi_vndr/ru,
+	  keymap/sgi_vndr/se, keymap/sgi_vndr/sk, keymap/sgi_vndr/th,
+	  keymap/sgi_vndr/us, keymap/sun_vndr/.cvsignore,
+	  keymap/sun_vndr/Makefile.am, keymap/sun_vndr/de,
+	  keymap/sun_vndr/es, keymap/sun_vndr/fi, keymap/sun_vndr/fr,
+	  keymap/sun_vndr/no, keymap/sun_vndr/pl, keymap/sun_vndr/ru,
+	  keymap/sun_vndr/se, keymap/sun_vndr/uk, keymap/sun_vndr/us: Ivan
+	  found dots are not good for us
+
+2004-05-03 02:33  svu
+
+	* tests/: testLayouts.pl, testModels.pl, xkbTestFunc.pm: The perl
+	  code is a bit structured now
+
+2004-05-03 00:48  svu
+
+	* po/ru.po: Russian translation, up2date
+
+2004-05-03 00:48  svu
+
+	* po/xkbdesc.pot: new strings
+
+2004-05-03 00:38  svu
+
+	* rules/: base, base.xml.in: some fixes in rules, more tests pass
+	  ok
+
+2004-05-03 00:05  svu
+
+	* rules/base.xml.in, symbols/ch, symbols/mk, tests/testModels.pl:
+	  at least variants pass ok with tests
+
+2004-05-01 02:17  svu
+
+	* symbols/: Makefile.am, hu: Hungarian layout added, thanks to
+	  Soós
+
+2004-04-30 05:27  pascal
+
+	* rules/base, symbols/Makefile.am, symbols/jp, symbols/mn: Add
+	  Japanese and Mongolian layouts.
+
+2004-04-27 23:17  svu
+
+	* rules/base.xml.in: Canadian layout meta-info fixed
+
+2004-04-27 23:13  svu
+
+	* symbols/ge: fixed syntax typo
+
+2004-04-27 22:19  svu
+
+	* rules/base, rules/base.xml.in, symbols/Makefile.am, symbols/fr,
+	  symbols/fr-latin9: French layouts are now merged. Thanks to
+	  Guylhem for the positive answer
+
+2004-04-26 00:57  svu
+
+	* tests/: listCI2.xsl, testModels.pl: trying to test layouts as
+	  well
+
+2004-04-25 20:26  svu
+
+	* tests/: listCIs.xsl, testModels.pl: starting test scripts
+
+2004-04-25 00:37  svu
+
+	* symbols/us: fixing include
+
+2004-04-25 00:17  svu
+
+	* rules/base.xml.in, symbols/Makefile.am, symbols/us: us_intl is
+	  returned as alt-intl
+
+2004-04-24 20:29  svu
+
+	* symbols/Makefile.am: new layouts by Ivan should be included into
+	  Makefile.am
+
+2004-04-24 13:32  pascal
+
+	* symbols/ca: Remove 'pc' directory name from includes in Canadian
+	  keymap.
+
+2004-04-24 12:35  pascal
+
+	* rules/base, symbols/az, symbols/ca, symbols/group, symbols/vn:
+	  Add Azeri, Canadian and Vietnamese keymaps.
+
+2004-04-24 02:23  svu
+
+	* rules/base.xml.in, symbols/hr: Croatian US stuff appended
+
+2004-04-24 01:55  svu
+
+	* rules/base, rules/base.xml.in, symbols/Makefile.am, symbols/pl,
+	  symbols/pl2: second polish layout is merged
+
+2004-04-24 01:28  svu
+
+	* keymap/macintosh, keymap/sony, keymap/xfree86, keymap/xfree98,
+	  rules/base.lst, rules/base.xml.in, symbols/Makefile.am,
+	  symbols/ch, symbols/cz, symbols/cz_qwerty, symbols/ge,
+	  symbols/ge_la, symbols/ge_ru, symbols/il, symbols/il_phonetic,
+	  symbols/lt, symbols/mt, symbols/mt_us, symbols/ro, symbols/se_FI,
+	  symbols/se_NO, symbols/se_SE, symbols/sk, symbols/sk_qwerty,
+	  symbols/syr, symbols/syr_phonetic, symbols/th, symbols/th_pat,
+	  symbols/th_tis, symbols/us_intl: a lot of layouts cleaned up -
+	  but way way more to go
+
+2004-04-23 00:46  svu
+
+	* Makefile.am, configure.in, compiled/.cvsignore,
+	  compiled/Makefile.am, compiled/README: The 'compiled' directory
+	  is really necessary. Even if it is empty
+
+2004-04-22 00:39  svu
+
+	* po/af.po, po/az.po, po/bg.po, po/cs.po, po/da.po, po/fr.po,
+	  po/hu.po, po/nl.po, po/ru.po, po/sk.po, po/sq.po, po/sr.po,
+	  po/sv.po, po/tr.po, po/uk.po, po/xkbdesc.pot, po/zh_CN.po,
+	  rules/Makefile.am, symbols/Makefile.am, symbols/al, symbols/am,
+	  symbols/ar, symbols/be, symbols/ben, symbols/br, symbols/by,
+	  symbols/ch, symbols/cz, symbols/cz_qwerty, symbols/de,
+	  symbols/dk, symbols/dvorak, symbols/ee, symbols/el,
+	  symbols/en_US, symbols/es, symbols/fi, symbols/fo, symbols/fr,
+	  symbols/fr-latin9, symbols/gb, symbols/ge_la, symbols/hr,
+	  symbols/ie, symbols/il, symbols/is, symbols/it, symbols/la,
+	  symbols/latin, symbols/lt, symbols/lv, symbols/mk, symbols/ml,
+	  symbols/mt, symbols/mt_us, symbols/nl, symbols/no, symbols/ogham,
+	  symbols/pc, symbols/pl, symbols/pl2, symbols/pt, symbols/ro,
+	  symbols/ru, symbols/sapmi, symbols/se, symbols/se_FI,
+	  symbols/se_NO, symbols/se_SE, symbols/si, symbols/sk,
+	  symbols/sk_qwerty, symbols/sr, symbols/syr, symbols/syr_phonetic,
+	  symbols/th, symbols/tml, symbols/tr, symbols/ua, symbols/us,
+	  symbols/us_intl, symbols/uz, symbols/yu: adding Swiss layouts and
+	  removing references to pc/ from files
+
+2004-04-21 00:19  svu
+
+	* symbols/: Makefile.am, bs, srvr_ctrl: Bosninan layout was
+	  forgotten
+
+2004-04-19 23:57  svu
+
+	* symbols/: Makefile.am, altwin, compose, ctrl, group, inet,
+	  keypad, level3, lock: adding all-important option files
+
+2004-04-16 00:58  svu
+
+	* configure.in, xkbdesc.spec.in, rules/Makefile.am: now, the
+	  symlinks allow distributors to use their own names for the rules
+	  - though not really recommended, we have to be
+	  backward-compatible
+
+2004-04-15 00:33  svu
+
+	* COPYING, Makefile.am, xkbdesc.spec.in, po/af.po, po/az.po,
+	  po/bg.po, po/cs.po, po/da.po, po/fr.po, po/hu.po, po/nl.po,
+	  po/ru.po, po/sk.po, po/sq.po, po/sr.po, po/sv.po, po/tr.po,
+	  po/uk.po, po/xkbdesc.pot, po/zh_CN.po: COPYING added - MIT
+	  license (thanks to Keithp). Some minor fixes on infrastructure
+
+2004-04-12 00:13  svu
+
+	* .cvsignore, Makefile.am, autogen.sh, configure.in, rules/base,
+	  symbols/Makefile.am: First buildable version
+
+2004-04-11 23:03  svu
+
+	* configure.in, keycodes/Makefile.am, keymap/.cvsignore,
+	  keymap/Makefile.am, po/af.po, po/az.po, po/bg.po, po/cs.po,
+	  po/da.po, po/fr.po, po/hu.po, po/nl.po, po/ru.po, po/sk.po,
+	  po/sq.po, po/sr.po, po/sv.po, po/tr.po, po/uk.po, po/xkbdesc.pot,
+	  po/zh_CN.po, rules/.cvsignore, rules/Makefile.am,
+	  semantics/.cvsignore, semantics/Makefile.am, symbols/.cvsignore,
+	  types/.cvsignore, types/Makefile.am: more automake foo - but
+	  still far from building the whole thing
+
+2004-04-10 03:22  svu
+
+	* autogen_gnome.sh, keycodes/.cvsignore, keycodes/Makefile.am: more
+	  makefiles.am - but still long way to the first build
+
+2004-04-10 03:08  svu
+
+	* Makefile.am, README, README.config, README.enhancing,
+	  configure.in, xfree86.xml.in, xfree86_xkb_xml.spec.in, xkb.dtd,
+	  xkbdesc.spec.in, compat/.cvsignore, compat/Makefile.am,
+	  compat/README, compat/accessx, compat/basic, compat/complete,
+	  compat/default, compat/group_led, compat/iso9995, compat/japan,
+	  compat/keypad, compat/leds, compat/misc, compat/mousekeys,
+	  compat/norepeat, compat/pc, compat/pc98, compat/xfree86,
+	  compat/xtest, geometry/.cvsignore, geometry/Makefile.am,
+	  geometry/README, geometry/amiga, geometry/ataritt,
+	  geometry/chicony, geometry/dell, geometry/everex,
+	  geometry/fujitsu, geometry/hp, geometry/keytronic,
+	  geometry/kinesis, geometry/macintosh, geometry/microsoft,
+	  geometry/nec, geometry/northgate, geometry/pc, geometry/sony,
+	  geometry/sun, geometry/winbook, keycodes/README,
+	  keycodes/aliases, keycodes/amiga, keycodes/ataritt,
+	  keycodes/fujitsu, keycodes/hp, keycodes/ibm, keycodes/macintosh,
+	  keycodes/powerpcps2, keycodes/sony, keycodes/sun,
+	  keycodes/xfree86, keycodes/xfree98, keymap/README, keymap/amiga,
+	  keymap/ataritt, keymap/macintosh, keymap/sony, keymap/xfree86,
+	  keymap/xfree98, po/POTFILES.in, po/af.po, po/az.po, po/bg.po,
+	  po/cs.po, po/da.po, po/fr.po, po/hu.po, po/nl.po, po/ru.po,
+	  po/sk.po, po/sq.po, po/sr.po, po/sv.po, po/tr.po, po/uk.po,
+	  po/zh_CN.po, rules/README, rules/base, rules/base-it.lst,
+	  rules/base.lst, rules/base.xml.in, rules/sgi, rules/sgi.lst,
+	  rules/sun, rules/sun.lst, rules/xfree98, rules/xfree98.lst,
+	  rules/xkb.dtd, rules/xml2lst.pl, semantics/basic,
+	  semantics/complete, semantics/default, semantics/xtest,
+	  symbols/al, symbols/am, symbols/ar, symbols/be, symbols/ben,
+	  symbols/bg, symbols/br, symbols/by, symbols/cz,
+	  symbols/cz_qwerty, symbols/de, symbols/dev, symbols/dk,
+	  symbols/dvorak, symbols/dz, symbols/ee, symbols/el,
+	  symbols/en_US, symbols/es, symbols/fi, symbols/fo, symbols/fr,
+	  symbols/fr-latin9, symbols/gb, symbols/ge_la, symbols/ge_ru,
+	  symbols/guj, symbols/gur, symbols/hr, symbols/ie, symbols/il,
+	  symbols/il_phonetic, symbols/ir, symbols/is, symbols/it,
+	  symbols/iu, symbols/kan, symbols/la, symbols/latin, symbols/lo,
+	  symbols/lt, symbols/lv, symbols/mk, symbols/ml, symbols/mm,
+	  symbols/mt, symbols/mt_us, symbols/nl, symbols/no, symbols/ogham,
+	  symbols/ori, symbols/pc, symbols/pl, symbols/pl2, symbols/pt,
+	  symbols/ro, symbols/ru, symbols/sapmi, symbols/se, symbols/se_FI,
+	  symbols/se_NO, symbols/se_SE, symbols/si, symbols/sk,
+	  symbols/sk_qwerty, symbols/sr, symbols/syr, symbols/syr_phonetic,
+	  symbols/tel, symbols/th, symbols/th_pat, symbols/th_tis,
+	  symbols/tj, symbols/tml, symbols/tr, symbols/ua, symbols/us,
+	  symbols/us_intl, symbols/uz, symbols/yu, types/README,
+	  types/basic, types/cancel, types/caps, types/complete,
+	  types/default, types/extra, types/iso9995, types/mousekeys,
+	  types/numpad, types/pc: first feed-in of the layouts. The
+	  revolution is coming
+
+2004-04-04 02:40  svu
+
+	* configure.in, po/az.po: Azerbaijani translation, thanks to Metin
+	  Amiroff
+
+2004-04-04 01:14  svu
+
+	* po/ru.po: Russian translation of the Syriac phonetic
+
+2004-04-04 01:12  svu
+
+	* xfree86.xml.in: Syriac phonetic was not there
+
+2004-03-19 21:37  svu
+
+	* configure.in: some more translations
+
+2004-03-19 21:37  svu
+
+	* po/hu.po: Hungarian one
+
+2004-03-19 21:02  svu
+
+	* po/: af.po, bg.po, cs.po, da.po, fr.po, nl.po, ru.po, sk.po,
+	  sq.po, sr.po, sv.po, tr.po, uk.po, zh_CN.po: three new
+	  translations
+
+2004-01-20 10:51  svu
+
+	* po/ru.po: corrected tibetian language translation
+
+2004-01-19 14:41  svu
+
+	* po/ru.po: updated Russian translation
+
+2004-01-19 14:41  svu
+
+	* xfree86.xml.in: new items from Ivan
+
+2004-01-19 14:39  svu
+
+	* xslt/xfree86.xsl: bugfix
+
+2004-01-09 14:44  svu
+
+	* po/ru.po: up2date
+
+2004-01-09 14:43  svu
+
+	* xfree86.xml.in: patch from Ivan - new items
+
+2004-01-07 09:32  svu
+
+	* configure.in, po/fr.po: French translation, thanks to Michel
+	  Robitaille
+
+2004-01-06 16:20  svu
+
+	* xfree86.xml.in, po/ru.po: updates from Ivan
+
+2004-01-03 14:43  svu
+
+	* po/nl.po: new version, thanks to Elros
+
+2003-12-18 22:43  svu
+
+	* .cvsignore, po/.cvsignore: little cleanup on messages
+
+2003-12-18 22:42  svu
+
+	* Makefile.am, configure.in: little things for the latest intltool
+
+2003-12-18 22:39  svu
+
+	* po/sk.po: Slovak translation, thanks to Zdenko Podobný
+
+2003-12-18 22:38  svu
+
+	* po/da.po: Danish translation, thanks to Ole Laursen
+
+2003-12-18 22:34  svu
+
+	* xfree86.xml.in: One more layout, one more variant, updates from
+	  Ivan
+
+2003-12-05 11:37  svu
+
+	* xslt/xfree86.xsl: helper xslt - reduces the resulting file
+
+2003-12-05 10:39  svu
+
+	* configure.in, po/tr.po: Turkish translation added, thanks to
+	  Nilgün Belma Bugüner
+
+2003-11-30 02:11  svu
+
+	* configure.in, po/sr.po: Serbian translation added, thanks to
+	  Danilo Segan
+
+2003-11-29 04:06  svu
+
+	* configure.in, po/zh_CN.po: Chinese simplified translation, thanks
+	  to Funda Wang
+
+2003-11-27 22:57  svu
+
+	* configure.in, po/nl.po: NL translation. Thanks to Elros Cyriatan
+
+2003-11-27 21:19  svu
+
+	* configure.in: added cs translation
+
+2003-11-27 21:15  svu
+
+	* po/cs.po: First non-cyrillic translation. Thanks to Michal
+	  Bukovjan
+
+2003-11-25 23:52  svu
+
+	* Makefile.am, NEWS, autogen_gnome.sh, configure.in,
+	  xfree86.xml.in, po/.cvsignore, po/Makevars, po/POTFILES.in,
+	  po/bg.po, po/ru.po, po/uk.po: Now the project should be buildable
+	  and translatable - but please no translations till the English
+	  version is approved
+
+2003-11-25 16:35  svu
+
+	* .cvsignore, AUTHORS, Makefile.am, autogen.sh, configure.in,
+	  xfree86.xml.in, xfree86_xkb_xml.spec.in, xkb.dtd: first batch of
+	  files - but no translation yet
+
+2003-11-24 23:32  svu
+
+	* README: first file in
+
diff --git a/xorg-server/xkeyboard-config/README b/xorg-server/xkeyboard-config/README
index d91eda6e6..faaec09aa 100644
--- a/xorg-server/xkeyboard-config/README
+++ b/xorg-server/xkeyboard-config/README
@@ -1,28 +1,28 @@
-X Keyboard Extension
---------------------
-
-The X Keyboard Extension essentially replaces the core protocol definition of
-keyboard. The extension makes possible to clearly and explicitly specify most
-aspects of keyboard behaviour on per-key basis and to more closely track the
-logical and physical state of the keyboard. It also includes a number of
-keyboard controls designed to make keyboards more accessible to people with
-physical impairments.
-
-There are five types of components in the server database corresponing to five
-xkb symbolic names: symbols, geometry, keycodes, compat and types which
-determine the keyboard behaviour. These five components can combined together
-into a resulting keyboard mapping using the 'rules' component.
-
-The complete specification can be found on
-http://xfree86.org/current/XKBproto.pdf
-
-For XKB configuration information see 'docs/README.config' file.
-
-For information how to further enhance XKB configuration see 'docs/README.enhancing'
-file.
-
-For information how to replace existing XKB configuration database with 
-XKeyboardConfig see 'docs/HOWTO.transition' file.
-
-Contribution guidelines are described at
-http://www.freedesktop.org/wiki/Software/XKeyboardConfig/Rules
+X Keyboard Extension
+--------------------
+
+The X Keyboard Extension essentially replaces the core protocol definition of
+keyboard. The extension makes possible to clearly and explicitly specify most
+aspects of keyboard behaviour on per-key basis and to more closely track the
+logical and physical state of the keyboard. It also includes a number of
+keyboard controls designed to make keyboards more accessible to people with
+physical impairments.
+
+There are five types of components in the server database corresponing to five
+xkb symbolic names: symbols, geometry, keycodes, compat and types which
+determine the keyboard behaviour. These five components can combined together
+into a resulting keyboard mapping using the 'rules' component.
+
+The complete specification can be found on
+http://xfree86.org/current/XKBproto.pdf
+
+For XKB configuration information see 'docs/README.config' file.
+
+For information how to further enhance XKB configuration see 'docs/README.enhancing'
+file.
+
+For information how to replace existing XKB configuration database with 
+XKeyboardConfig see 'docs/HOWTO.transition' file.
+
+Contribution guidelines are described at
+http://www.freedesktop.org/wiki/Software/XKeyboardConfig/Rules
diff --git a/xorg-server/xkeyboard-config/TODO b/xorg-server/xkeyboard-config/TODO
index 8a10faa02..f0ffaa754 100644
--- a/xorg-server/xkeyboard-config/TODO
+++ b/xorg-server/xkeyboard-config/TODO
@@ -1,6 +1,6 @@
-+ Ensure all national layouts are 'normalized' (no multiple layouts for same country/language - only variants)
-+ Write tests checking that every model/layout(variant)/option in base.xml is working
-+ Add the vendor info to the keyboard geometry description
-- Check consistence (correctness, usability) of the descriptions in the registry. Note: ask help from GNOME Usability Team.
-- Write tests which would ensure that base.xml covers everything
-- Write compatibility rules for old models/layouts/variants (potentially eternal job)
++ Ensure all national layouts are 'normalized' (no multiple layouts for same country/language - only variants)
++ Write tests checking that every model/layout(variant)/option in base.xml is working
++ Add the vendor info to the keyboard geometry description
+- Check consistence (correctness, usability) of the descriptions in the registry. Note: ask help from GNOME Usability Team.
+- Write tests which would ensure that base.xml covers everything
+- Write compatibility rules for old models/layouts/variants (potentially eternal job)
diff --git a/xorg-server/xkeyboard-config/compat/README b/xorg-server/xkeyboard-config/compat/README
index 00d591e7b..ea8750fac 100644
--- a/xorg-server/xkeyboard-config/compat/README
+++ b/xorg-server/xkeyboard-config/compat/README
@@ -1,33 +1,33 @@
-The core protocol interpretation of keyboard modifiers does not include direct
-support for multiple keyboard groups, so XKB reports the effective keyboard
-group to XKB-aware clients using some of reserved bits in the state field of
-some core protocol events. This modified state field would not be interpreted
-correctly by XKB-unaware clients, so XKB provides a group compatibility mapping
-which remaps the keyboard group into a core modifier mask that has similar
-effects, when possible.
-
-XKB maintains three compatibility state components that are used to make
-XKB-unaware clients(*) work as well as possible:
-- The compatibility state which corresponds to the effective modifier and
-  effective group state.
-- The compatibility lookup state which is the core-protocol equivalent of the
-  lookup state.
-- The compatibility grab state which is the nearest core-protocol equivalent
-  of the grab state.
-
-Compatibility state are essentially the corresponding XKB states, but with
-keyboard group possibly encoded as one or more modifiers. 
-
-Modifiers that correspond to each keyboard group are described in this
-group compatibility map.
-
-
-----
-(*) The implementation of XKB invisibly extends the X library to use the
-keyboard extension if it is present. That means, clients that use library or
-toolkit routines to interpret keyboard events automatically use all of XKB
-features; clients that directly interpret the state field of core protocol
-events or the keymap direcly may be affected by some of the XKB differences.
-Thus most clients can take all advantages without modification but it also
-means that XKB state can be reported to clients that have not explicitly
-requested the keyboard extension.
+The core protocol interpretation of keyboard modifiers does not include direct
+support for multiple keyboard groups, so XKB reports the effective keyboard
+group to XKB-aware clients using some of reserved bits in the state field of
+some core protocol events. This modified state field would not be interpreted
+correctly by XKB-unaware clients, so XKB provides a group compatibility mapping
+which remaps the keyboard group into a core modifier mask that has similar
+effects, when possible.
+
+XKB maintains three compatibility state components that are used to make
+XKB-unaware clients(*) work as well as possible:
+- The compatibility state which corresponds to the effective modifier and
+  effective group state.
+- The compatibility lookup state which is the core-protocol equivalent of the
+  lookup state.
+- The compatibility grab state which is the nearest core-protocol equivalent
+  of the grab state.
+
+Compatibility state are essentially the corresponding XKB states, but with
+keyboard group possibly encoded as one or more modifiers. 
+
+Modifiers that correspond to each keyboard group are described in this
+group compatibility map.
+
+
+----
+(*) The implementation of XKB invisibly extends the X library to use the
+keyboard extension if it is present. That means, clients that use library or
+toolkit routines to interpret keyboard events automatically use all of XKB
+features; clients that directly interpret the state field of core protocol
+events or the keymap direcly may be affected by some of the XKB differences.
+Thus most clients can take all advantages without modification but it also
+means that XKB state can be reported to clients that have not explicitly
+requested the keyboard extension.
diff --git a/xorg-server/xkeyboard-config/compat/accessx b/xorg-server/xkeyboard-config/compat/accessx
index 26cafab7a..0ed34ced1 100644
--- a/xorg-server/xkeyboard-config/compat/accessx
+++ b/xorg-server/xkeyboard-config/compat/accessx
@@ -1,52 +1,52 @@
-default partial xkb_compatibility "basic" {
-    interpret AccessX_Enable { 
-	action= LockControls(controls=AccessXKeys); 
-    };
-};
-
-partial xkb_compatibility "full" {
-
-    interpret AccessX_Enable {
-	action= LockControls(controls=AccessXKeys); 
-    };
-
-    interpret AccessX_Feedback_Enable { 
-	action= LockControls(controls=AccessXFeedback); 
-    };
-
-    interpret RepeatKeys_Enable {
-	action= LockControls(controls=RepeatKeys);
-    };
-
-    interpret SlowKeys_Enable {
-	action= LockControls(controls=SlowKeys);
-    };
-
-    interpret BounceKeys_Enable {
-	action= LockControls(controls=BounceKeys);
-    };
-
-    interpret StickyKeys_Enable {
-	action= LockControls(controls=StickyKeys);
-    };
-
-    interpret MouseKeys_Enable {
-	action= LockControls(controls=MouseKeys);
-    };
-
-    interpret MouseKeys_Accel_Enable {
-	action= LockControls(controls=MouseKeysAccel);
-    };
-
-    interpret Overlay1_Enable {
-	action= LockControls(controls=Overlay1);
-    };
-
-    interpret Overlay2_Enable {
-	action= LockControls(controls=Overlay2);
-    };
-
-    interpret AudibleBell_Enable {
-	action= LockControls(controls=AudibleBell);
-    };
-};
+default partial xkb_compatibility "basic" {
+    interpret AccessX_Enable { 
+	action= LockControls(controls=AccessXKeys); 
+    };
+};
+
+partial xkb_compatibility "full" {
+
+    interpret AccessX_Enable {
+	action= LockControls(controls=AccessXKeys); 
+    };
+
+    interpret AccessX_Feedback_Enable { 
+	action= LockControls(controls=AccessXFeedback); 
+    };
+
+    interpret RepeatKeys_Enable {
+	action= LockControls(controls=RepeatKeys);
+    };
+
+    interpret SlowKeys_Enable {
+	action= LockControls(controls=SlowKeys);
+    };
+
+    interpret BounceKeys_Enable {
+	action= LockControls(controls=BounceKeys);
+    };
+
+    interpret StickyKeys_Enable {
+	action= LockControls(controls=StickyKeys);
+    };
+
+    interpret MouseKeys_Enable {
+	action= LockControls(controls=MouseKeys);
+    };
+
+    interpret MouseKeys_Accel_Enable {
+	action= LockControls(controls=MouseKeysAccel);
+    };
+
+    interpret Overlay1_Enable {
+	action= LockControls(controls=Overlay1);
+    };
+
+    interpret Overlay2_Enable {
+	action= LockControls(controls=Overlay2);
+    };
+
+    interpret AudibleBell_Enable {
+	action= LockControls(controls=AudibleBell);
+    };
+};
diff --git a/xorg-server/xkeyboard-config/compat/basic b/xorg-server/xkeyboard-config/compat/basic
index ba7e52a6f..393c32445 100644
--- a/xorg-server/xkeyboard-config/compat/basic
+++ b/xorg-server/xkeyboard-config/compat/basic
@@ -1,48 +1,48 @@
-// Minimal set of symbol interpretations to provide 
-// reasonable default behavior (Num lock, shift and 
-// caps lock and mode switch) and set up the 
-// automatic updating of common keyboard LEDs.
-
-default xkb_compatibility "basic"  {
-    virtual_modifiers NumLock,AltGr;
-
-    interpret.repeat= False;
-    setMods.clearLocks= True;
-    latchMods.clearLocks= True;
-    latchMods.latchToLock= True;
-
-    interpret Shift_Lock+AnyOf(Shift+Lock) {
-	action= LockMods(modifiers=Shift);
-    };
-
-    interpret Any+Lock {
-	action= LockMods(modifiers=Lock);
-    };
-
-    interpret Num_Lock+Any {
-	virtualModifier= NumLock;
-	action= LockMods(modifiers=NumLock);
-    };
-
-    interpret Mode_switch {
-	useModMapMods= level1;
-	virtualModifier= AltGr;
-	action= SetGroup(group=+1);
-    };
-
-    interpret Any + Any {
-	action= SetMods(modifiers=modMapMods);
-    };
-
-    group 2 = AltGr;
-    group 3 = AltGr;
-    group 4 = AltGr;
-
-    include "ledcaps"
-    include "lednum"
-    indicator "Shift Lock" {
-	!allowExplicit;
-	whichModState= Locked;
-	modifiers= Shift;
-    };
-};
+// Minimal set of symbol interpretations to provide 
+// reasonable default behavior (Num lock, shift and 
+// caps lock and mode switch) and set up the 
+// automatic updating of common keyboard LEDs.
+
+default xkb_compatibility "basic"  {
+    virtual_modifiers NumLock,AltGr;
+
+    interpret.repeat= False;
+    setMods.clearLocks= True;
+    latchMods.clearLocks= True;
+    latchMods.latchToLock= True;
+
+    interpret Shift_Lock+AnyOf(Shift+Lock) {
+	action= LockMods(modifiers=Shift);
+    };
+
+    interpret Any+Lock {
+	action= LockMods(modifiers=Lock);
+    };
+
+    interpret Num_Lock+Any {
+	virtualModifier= NumLock;
+	action= LockMods(modifiers=NumLock);
+    };
+
+    interpret Mode_switch {
+	useModMapMods= level1;
+	virtualModifier= AltGr;
+	action= SetGroup(group=+1);
+    };
+
+    interpret Any + Any {
+	action= SetMods(modifiers=modMapMods);
+    };
+
+    group 2 = AltGr;
+    group 3 = AltGr;
+    group 4 = AltGr;
+
+    include "ledcaps"
+    include "lednum"
+    indicator "Shift Lock" {
+	!allowExplicit;
+	whichModState= Locked;
+	modifiers= Shift;
+    };
+};
diff --git a/xorg-server/xkeyboard-config/compat/caps b/xorg-server/xkeyboard-config/compat/caps
index d787ab63d..03c47151e 100644
--- a/xorg-server/xkeyboard-config/compat/caps
+++ b/xorg-server/xkeyboard-config/compat/caps
@@ -1,12 +1,12 @@
-partial xkb_compatibility "caps_lock"  {
-    // Keysym Caps_Lock locks Lock modifier.
-    // With this, the keysym Caps_Lock can be used without binding the whole
-    // key to a real modifier.
-	// This is essential when you don't want to use caps lock on the first
-	// level.
-	// This should not have any compatibility issues when used together with
-	// other layouts which don't utilize this capability.
-    interpret Caps_Lock {
-        action = LockMods(modifiers = Lock);
-    };
-};
+partial xkb_compatibility "caps_lock"  {
+    // Keysym Caps_Lock locks Lock modifier.
+    // With this, the keysym Caps_Lock can be used without binding the whole
+    // key to a real modifier.
+	// This is essential when you don't want to use caps lock on the first
+	// level.
+	// This should not have any compatibility issues when used together with
+	// other layouts which don't utilize this capability.
+    interpret Caps_Lock {
+        action = LockMods(modifiers = Lock);
+    };
+};
diff --git a/xorg-server/xkeyboard-config/compat/complete b/xorg-server/xkeyboard-config/compat/complete
index 0bf171db3..d33c4dbce 100644
--- a/xorg-server/xkeyboard-config/compat/complete
+++ b/xorg-server/xkeyboard-config/compat/complete
@@ -1,10 +1,10 @@
-default xkb_compatibility "complete"  {
-    include "basic"
-    augment "iso9995"
-    augment "mousekeys"
-    augment "accessx(full)"
-    augment "misc"
-    augment "xfree86"
-    augment "level5"
-    augment "caps(caps_lock)"
-};
+default xkb_compatibility "complete"  {
+    include "basic"
+    augment "iso9995"
+    augment "mousekeys"
+    augment "accessx(full)"
+    augment "misc"
+    augment "xfree86"
+    augment "level5"
+    augment "caps(caps_lock)"
+};
diff --git a/xorg-server/xkeyboard-config/compat/japan b/xorg-server/xkeyboard-config/compat/japan
index e9a6728d4..ab4f85e4c 100644
--- a/xorg-server/xkeyboard-config/compat/japan
+++ b/xorg-server/xkeyboard-config/compat/japan
@@ -1,45 +1,45 @@
-// Japanese keyboards need Eisu and Kana shift and 
-// lock keys, which are typically bound to the
-// second shift level for some other modifier key.
-// These interpretations disable the default
-// interpretation (which would have these keys set
-// the same modifier as the level one symbol).
-
-default partial xkb_compatibility "japan"  {
-
-    interpret.repeat= False;
-
-    interpret Eisu_Shift+Lock {
-	action= NoAction();
-    };
-
-    interpret Eisu_toggle+Lock {
-	action= NoAction();
-    };
-
-    interpret Kana_Shift+Lock {
-	action= NoAction();
-    };
-
-    interpret Kana_Lock+Lock {
-	action= NoAction();
-    };
-};
-
-// Some Japanese keyboards have an explict Kana Lock key & matching LED
-
-partial xkb_compatibility "kana_lock"  {
-
-    virtual_modifiers Kana_Lock;
-
-    interpret Kana_Lock+AnyOfOrNone(all) {
-        virtualModifier= Kana_Lock;
-        useModMapMods=level1;
-        action= LockGroup(group=+1);
-    };
-
-    indicator "Kana" {
-        !allowExplicit;
-	groups= All-Group1;
-    };
-};
+// Japanese keyboards need Eisu and Kana shift and 
+// lock keys, which are typically bound to the
+// second shift level for some other modifier key.
+// These interpretations disable the default
+// interpretation (which would have these keys set
+// the same modifier as the level one symbol).
+
+default partial xkb_compatibility "japan"  {
+
+    interpret.repeat= False;
+
+    interpret Eisu_Shift+Lock {
+	action= NoAction();
+    };
+
+    interpret Eisu_toggle+Lock {
+	action= NoAction();
+    };
+
+    interpret Kana_Shift+Lock {
+	action= NoAction();
+    };
+
+    interpret Kana_Lock+Lock {
+	action= NoAction();
+    };
+};
+
+// Some Japanese keyboards have an explict Kana Lock key & matching LED
+
+partial xkb_compatibility "kana_lock"  {
+
+    virtual_modifiers Kana_Lock;
+
+    interpret Kana_Lock+AnyOfOrNone(all) {
+        virtualModifier= Kana_Lock;
+        useModMapMods=level1;
+        action= LockGroup(group=+1);
+    };
+
+    indicator "Kana" {
+        !allowExplicit;
+	groups= All-Group1;
+    };
+};
diff --git a/xorg-server/xkeyboard-config/compat/ledcaps b/xorg-server/xkeyboard-config/compat/ledcaps
index fc3084eec..8e3ad4796 100644
--- a/xorg-server/xkeyboard-config/compat/ledcaps
+++ b/xorg-server/xkeyboard-config/compat/ledcaps
@@ -1,23 +1,23 @@
-// Use Caps Lock LED to show either Caps Lock, Group, or Shift Lock state
-
-default partial xkb_compatibility "caps_lock"   {
-   indicator "Caps Lock" {
-       !allowExplicit;
-       whichModState= Locked;
-       modifiers= Lock;
-   };
-};
-
-partial xkb_compatibility "group_lock"   {
-   indicator "Caps Lock" {
-       modifiers= None;
-       groups=All-group1;
-   };
-};
-
-partial xkb_compatibility "shift_lock"   {
-   indicator "Caps Lock" {
-       whichModState= Locked;
-       modifiers= Shift;
-   };
-};
+// Use Caps Lock LED to show either Caps Lock, Group, or Shift Lock state
+
+default partial xkb_compatibility "caps_lock"   {
+   indicator "Caps Lock" {
+       !allowExplicit;
+       whichModState= Locked;
+       modifiers= Lock;
+   };
+};
+
+partial xkb_compatibility "group_lock"   {
+   indicator "Caps Lock" {
+       modifiers= None;
+       groups=All-group1;
+   };
+};
+
+partial xkb_compatibility "shift_lock"   {
+   indicator "Caps Lock" {
+       whichModState= Locked;
+       modifiers= Shift;
+   };
+};
diff --git a/xorg-server/xkeyboard-config/compat/lednum b/xorg-server/xkeyboard-config/compat/lednum
index 24a60a595..57fb2646e 100644
--- a/xorg-server/xkeyboard-config/compat/lednum
+++ b/xorg-server/xkeyboard-config/compat/lednum
@@ -1,23 +1,23 @@
-// Use Num Lock LED to show either Num Lock, Group, or Shift Lock state
-
-default partial xkb_compatibility "num_lock"   {
-    indicator "Num Lock" {
-       !allowExplicit;
-       whichModState= Locked;
-       modifiers= NumLock;
-   };
-};
-
-partial xkb_compatibility "group_lock"   {
-   indicator "Num Lock" {
-       modifiers= None;
-       groups=All-group1;
-   };
-};
-
-partial xkb_compatibility "shift_lock"   {
-   indicator "Num Lock" {
-       whichModState= Locked;
-       modifiers= Shift;
-   };
-};
+// Use Num Lock LED to show either Num Lock, Group, or Shift Lock state
+
+default partial xkb_compatibility "num_lock"   {
+    indicator "Num Lock" {
+       !allowExplicit;
+       whichModState= Locked;
+       modifiers= NumLock;
+   };
+};
+
+partial xkb_compatibility "group_lock"   {
+   indicator "Num Lock" {
+       modifiers= None;
+       groups=All-group1;
+   };
+};
+
+partial xkb_compatibility "shift_lock"   {
+   indicator "Num Lock" {
+       whichModState= Locked;
+       modifiers= Shift;
+   };
+};
diff --git a/xorg-server/xkeyboard-config/compat/ledscroll b/xorg-server/xkeyboard-config/compat/ledscroll
index ca5a82c4c..d51fcfc6f 100644
--- a/xorg-server/xkeyboard-config/compat/ledscroll
+++ b/xorg-server/xkeyboard-config/compat/ledscroll
@@ -1,23 +1,23 @@
-// Use Scroll Lock LED to show either Scroll Lock, Group, or Shift Lock state
-
-default partial xkb_compatibility "scroll_lock"   {
-   indicator "Scroll Lock" {
-       allowExplicit;
-       whichModState= Locked;
-       modifiers= ScrollLock;
-   };
-};
-
-partial xkb_compatibility "group_lock"   {
-   indicator "Scroll Lock" {
-       modifiers= None;
-       groups=All-group1;
-   };
-};
-
-partial xkb_compatibility "shift_lock"   {
-   indicator "Scroll Lock" {
-       whichModState= Locked;
-       modifiers= Shift;
-   };
-};
+// Use Scroll Lock LED to show either Scroll Lock, Group, or Shift Lock state
+
+default partial xkb_compatibility "scroll_lock"   {
+   indicator "Scroll Lock" {
+       allowExplicit;
+       whichModState= Locked;
+       modifiers= ScrollLock;
+   };
+};
+
+partial xkb_compatibility "group_lock"   {
+   indicator "Scroll Lock" {
+       modifiers= None;
+       groups=All-group1;
+   };
+};
+
+partial xkb_compatibility "shift_lock"   {
+   indicator "Scroll Lock" {
+       whichModState= Locked;
+       modifiers= Shift;
+   };
+};
diff --git a/xorg-server/xkeyboard-config/compat/level5 b/xorg-server/xkeyboard-config/compat/level5
index 69296e9f0..8d28051c1 100644
--- a/xorg-server/xkeyboard-config/compat/level5
+++ b/xorg-server/xkeyboard-config/compat/level5
@@ -1,51 +1,51 @@
-// Fairly complete set of symbol interpretations 
-// to provide reasonable default behavior
-
-default partial xkb_compatibility "default"  {
-    virtual_modifiers LevelFive;
-
-    interpret.repeat= False;
-    setMods.clearLocks= True;
-    latchMods.clearLocks= True;
-    latchMods.latchToLock= True;
-
-    interpret ISO_Level5_Shift+Any {
-	useModMapMods= level1;
-	virtualModifier= LevelFive;
-	action= SetMods(modifiers=LevelFive);
-    };
-
-    interpret ISO_Level5_Shift {
-	action= SetMods(modifiers=LevelFive);
-    };
-
-    interpret ISO_Level5_Latch+Any {
-	virtualModifier= LevelFive;
-	action= LatchMods(modifiers=LevelFive);
-    };
-
-    interpret ISO_Level5_Latch {
-	action= LatchMods(modifiers=LevelFive);
-    };
-
-    interpret ISO_Level5_Lock+Any {
-	virtualModifier= LevelFive;
-	action= LockMods(modifiers=LevelFive);
-    };
-
-    interpret ISO_Level5_Lock {
-	action= LockMods(modifiers=LevelFive);
-    };
-};
-partial xkb_compatibility "level5_lock"  {
-	// This defines a Level5-Lock using the NumLock real modifier in order to
-	// create arbitrary level-behaviour, which would not be possible with the
-	// virtual modifier.
-	// See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK
-	// See also: symbols/level5(lock)
-    virtual_modifiers NumLock;
-    
-    interpret ISO_Level5_Lock {
-        action = LockMods(modifiers = NumLock);
-    };
-};
+// Fairly complete set of symbol interpretations 
+// to provide reasonable default behavior
+
+default partial xkb_compatibility "default"  {
+    virtual_modifiers LevelFive;
+
+    interpret.repeat= False;
+    setMods.clearLocks= True;
+    latchMods.clearLocks= True;
+    latchMods.latchToLock= True;
+
+    interpret ISO_Level5_Shift+Any {
+	useModMapMods= level1;
+	virtualModifier= LevelFive;
+	action= SetMods(modifiers=LevelFive);
+    };
+
+    interpret ISO_Level5_Shift {
+	action= SetMods(modifiers=LevelFive);
+    };
+
+    interpret ISO_Level5_Latch+Any {
+	virtualModifier= LevelFive;
+	action= LatchMods(modifiers=LevelFive);
+    };
+
+    interpret ISO_Level5_Latch {
+	action= LatchMods(modifiers=LevelFive);
+    };
+
+    interpret ISO_Level5_Lock+Any {
+	virtualModifier= LevelFive;
+	action= LockMods(modifiers=LevelFive);
+    };
+
+    interpret ISO_Level5_Lock {
+	action= LockMods(modifiers=LevelFive);
+    };
+};
+partial xkb_compatibility "level5_lock"  {
+	// This defines a Level5-Lock using the NumLock real modifier in order to
+	// create arbitrary level-behaviour, which would not be possible with the
+	// virtual modifier.
+	// See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK
+	// See also: symbols/level5(lock)
+    virtual_modifiers NumLock;
+    
+    interpret ISO_Level5_Lock {
+        action = LockMods(modifiers = NumLock);
+    };
+};
diff --git a/xorg-server/xkeyboard-config/compat/misc b/xorg-server/xkeyboard-config/compat/misc
index 6a8b20217..cfe9a39b4 100644
--- a/xorg-server/xkeyboard-config/compat/misc
+++ b/xorg-server/xkeyboard-config/compat/misc
@@ -1,122 +1,122 @@
-default partial xkb_compatibility "misc"  {
-
-    virtual_modifiers	Alt,Meta,Super,Hyper,ScrollLock;
-
-    // Interpretations for some other useful keys
-
-    interpret Terminate_Server {
-        action = Terminate();
-    };
-
-    setMods.clearLocks= True;
-
-    // Sets the "Alt" virtual modifier
-
-    interpret Alt_L+Any     {
-        //useModMapMods= level1;
-	virtualModifier= Alt;
-	action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret Alt_L	{
-	action = SetMods(modifiers=Alt);
-    };
-
-    interpret Alt_R+Any     {
-        //useModMapMods= level1;
-	virtualModifier= Alt;
-	action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret Alt_R	{
-	action = SetMods(modifiers=Alt);
-    };
-
-    // Sets the "Meta" virtual modifier
-
-    interpret Meta_L+Any     {
-//        useModMapMods= level1;
-	virtualModifier= Meta;
-	action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret Meta_L	{
-	action = SetMods(modifiers=Meta);
-    };
-
-    interpret Meta_R+Any     {
-        //useModMapMods= level1;
-	virtualModifier= Meta;
-	action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret Meta_R	{
-	action = SetMods(modifiers=Meta);
-    };
-
-    // Sets the "Super" virtual modifier
-
-    interpret Super_L+Any     {
-//        useModMapMods= level1;
-	virtualModifier= Super;
-	action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret Super_L	{
-	action = SetMods(modifiers=Super);
-    };
-
-    interpret Super_R+Any     {
-        //useModMapMods= level1;
-	virtualModifier= Super;
-	action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret Super_R	{
-	action = SetMods(modifiers=Super);
-    };
-
-    // Sets the "Hyper" virtual modifier
-
-    interpret Hyper_L+Any     {
-//        useModMapMods= level1;
-	virtualModifier= Hyper;
-	action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret Hyper_L	{
-	action = SetMods(modifiers=Hyper);
-    };
-
-    interpret Hyper_R+Any     {
-        //useModMapMods= level1;
-	virtualModifier= Hyper;
-	action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret Hyper_R	{
-	action = SetMods(modifiers=Hyper);
-    };
-
-    // Sets the "ScrollLock" virtual modifier and
-    // makes it actually lock when pressed.  Sets
-    // up a map for the scroll lock indicator.
-    interpret Scroll_Lock+Any	{
-	virtualModifier= ScrollLock;
-	action = LockMods(modifiers=modMapMods);
-    };
-
-    include "ledscroll"
-	
-    include "misc(assign_shift_left_action)"
-};
-
-partial xkb_compatibility "assign_shift_left_action"  {
-    // Because of the irrevertable modifier mapping in symbols/pc <LFSH> is 
-    // getting bound to the Lock modifier when using 
-    // symbols/shift(both_capslock), creating unwanted behaviour. 
-    // This is a quirk, to circumvent the problem.
-    interpret Shift_L {
-        action = SetMods(modifiers = Shift);
-    };
-};
+default partial xkb_compatibility "misc"  {
+
+    virtual_modifiers	Alt,Meta,Super,Hyper,ScrollLock;
+
+    // Interpretations for some other useful keys
+
+    interpret Terminate_Server {
+        action = Terminate();
+    };
+
+    setMods.clearLocks= True;
+
+    // Sets the "Alt" virtual modifier
+
+    interpret Alt_L+Any     {
+        //useModMapMods= level1;
+	virtualModifier= Alt;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Alt_L	{
+	action = SetMods(modifiers=Alt);
+    };
+
+    interpret Alt_R+Any     {
+        //useModMapMods= level1;
+	virtualModifier= Alt;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Alt_R	{
+	action = SetMods(modifiers=Alt);
+    };
+
+    // Sets the "Meta" virtual modifier
+
+    interpret Meta_L+Any     {
+//        useModMapMods= level1;
+	virtualModifier= Meta;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Meta_L	{
+	action = SetMods(modifiers=Meta);
+    };
+
+    interpret Meta_R+Any     {
+        //useModMapMods= level1;
+	virtualModifier= Meta;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Meta_R	{
+	action = SetMods(modifiers=Meta);
+    };
+
+    // Sets the "Super" virtual modifier
+
+    interpret Super_L+Any     {
+//        useModMapMods= level1;
+	virtualModifier= Super;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Super_L	{
+	action = SetMods(modifiers=Super);
+    };
+
+    interpret Super_R+Any     {
+        //useModMapMods= level1;
+	virtualModifier= Super;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Super_R	{
+	action = SetMods(modifiers=Super);
+    };
+
+    // Sets the "Hyper" virtual modifier
+
+    interpret Hyper_L+Any     {
+//        useModMapMods= level1;
+	virtualModifier= Hyper;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Hyper_L	{
+	action = SetMods(modifiers=Hyper);
+    };
+
+    interpret Hyper_R+Any     {
+        //useModMapMods= level1;
+	virtualModifier= Hyper;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Hyper_R	{
+	action = SetMods(modifiers=Hyper);
+    };
+
+    // Sets the "ScrollLock" virtual modifier and
+    // makes it actually lock when pressed.  Sets
+    // up a map for the scroll lock indicator.
+    interpret Scroll_Lock+Any	{
+	virtualModifier= ScrollLock;
+	action = LockMods(modifiers=modMapMods);
+    };
+
+    include "ledscroll"
+	
+    include "misc(assign_shift_left_action)"
+};
+
+partial xkb_compatibility "assign_shift_left_action"  {
+    // Because of the irrevertable modifier mapping in symbols/pc <LFSH> is 
+    // getting bound to the Lock modifier when using 
+    // symbols/shift(both_capslock), creating unwanted behaviour. 
+    // This is a quirk, to circumvent the problem.
+    interpret Shift_L {
+        action = SetMods(modifiers = Shift);
+    };
+};
diff --git a/xorg-server/xkeyboard-config/compat/mousekeys b/xorg-server/xkeyboard-config/compat/mousekeys
index bdd3d7c5d..f60c756c4 100644
--- a/xorg-server/xkeyboard-config/compat/mousekeys
+++ b/xorg-server/xkeyboard-config/compat/mousekeys
@@ -1,202 +1,202 @@
-// Interpretations for arrow keys and a bunch of other 
-// common keysyms which make it possible to bind "mouse" 
-// keys using xmodmap and activate or deactivate them 
-// from the keyboard.
-
-default partial xkb_compatibility "mousekeys" {
-
-    // Keypad actions.
-    //
-    interpret.repeat= True;
-
-    interpret KP_1 { 
-	action = MovePtr(x=-1,y= +1); 
-    };
-    interpret KP_End { 
-	action = MovePtr(x=-1,y= +1); 
-    };
-
-    interpret KP_2 { 
-	action = MovePtr(x=+0,y= +1); 
-    };
-    interpret KP_Down { 
-	action = MovePtr(x=+0,y= +1); 
-    };
-
-    interpret KP_3 { 
-	action = MovePtr(x=+1,y=+1); 
-    };
-    interpret KP_Next { 
- 	action = MovePtr(x=+1,y=+1); 
-    };
-
-    interpret KP_4 { 
-	action = MovePtr(x=-1,y=+0); 
-    };
-    interpret KP_Left { 
-	action = MovePtr(x=-1,y=+0); 
-    };
-
-    interpret KP_6 { 
-	action = MovePtr(x=+1,y=+0); 
-    };
-    interpret KP_Right { 
- 	action = MovePtr(x=+1,y=+0); 
-    };
-
-    interpret KP_7 { 
-	action = MovePtr(x=-1,y=-1); 
-    };
-    interpret KP_Home { 
-	action = MovePtr(x=-1,y=-1); 
-    };
-
-    interpret KP_8 { 
-	action = MovePtr(x=+0,y=-1); 
-    };
-    interpret KP_Up { 
-	action = MovePtr(x=+0,y=-1); 
-    };
-
-    interpret KP_9 { 
-	action = MovePtr(x=+1,y=-1); 
-    };
-    interpret KP_Prior { 
-	action = MovePtr(x=+1,y=-1); 
-    };
-
-    interpret KP_5 { 
-	action = PointerButton(button=default); 
-    };
-    interpret KP_Begin { 
-	action = PointerButton(button=default); 
-    };
-
-    interpret KP_F2 { 
-	action = SetPtrDflt(affect=defaultButton,button=1); 
-    };
-    interpret KP_Divide { 
-	action = SetPtrDflt(affect=defaultButton,button=1); 
-    };
-
-    interpret KP_F3 { 
-	action = SetPtrDflt(affect=defaultButton,button=2); 
-    };
-    interpret KP_Multiply { 
-	action = SetPtrDflt(affect=defaultButton,button=2); 
-    };
-
-    interpret KP_F4 { 
-	action = SetPtrDflt(affect=defaultButton,button=3); 
-    };
-    interpret KP_Subtract { 
-	action = SetPtrDflt(affect=defaultButton,button=3); 
-    };
-
-    interpret KP_Separator { 
-	action = PointerButton(button=default,count=2); 
-    };
-    interpret KP_Add { 
-	action = PointerButton(button=default,count=2);
-    };
-
-    interpret KP_0 { 
-	action = LockPointerButton(button=default,affect=lock); 
-    };
-    interpret KP_Insert { 
-	action = LockPointerButton(button=default,affect=lock); 
-    };
-
-    interpret KP_Decimal { 
-	action = LockPointerButton(button=default,affect=unlock); 
-    };
-    interpret KP_Delete { 
-	action = LockPointerButton(button=default,affect=unlock); 
-    };
-
-    // Additional mappings for Solaris keypad compatibility
-    interpret F25 { // aka KP_Divide
-	action = SetPtrDflt(affect=defaultButton,button=1); 
-    };
-    interpret F26 { // aka KP_Multiply
-	action = SetPtrDflt(affect=defaultButton,button=2); 
-    };
-    interpret F27 { // aka KP_Home
-	action = MovePtr(x=-1,y=-1); 
-    };
-    interpret F29 { // aka KP_Prior
-	action = MovePtr(x=+1,y=-1); 
-    };
-    interpret F31 { // aka KP_Begin
-	action = PointerButton(button=default); 
-    };
-    interpret F33 { // aka KP_End
-	action = MovePtr(x=-1,y= +1); 
-    };
-    interpret F35 { // aka KP_Next
- 	action = MovePtr(x=+1,y=+1); 
-    };
-
-    interpret.repeat= False;
-
-
-    // New Keysym Actions.
-    //
-    interpret Pointer_Button_Dflt {
-	action= PointerButton(button=default);
-    };
-    interpret Pointer_Button1 {
-	action= PointerButton(button=1);
-    };
-    interpret Pointer_Button2 {
-	action= PointerButton(button=2);
-    };
-    interpret Pointer_Button3 {
-	action= PointerButton(button=3);
-    };
-    interpret Pointer_DblClick_Dflt {
-	action= PointerButton(button=default,count=2);
-    };
-    interpret Pointer_DblClick1 {
-	action= PointerButton(button=1,count=2);
-    };
-    interpret Pointer_DblClick2 {
-	action= PointerButton(button=2,count=2);
-    };
-    interpret Pointer_DblClick3 {
-	action= PointerButton(button=3,count=2);
-    };
-    interpret Pointer_Drag_Dflt	{
-	action= LockPointerButton(button=default);
-    };
-    interpret Pointer_Drag1 {
-	action= LockPointerButton(button=1);
-    };
-    interpret Pointer_Drag2 {
-	action= LockPointerButton(button=2);
-    };
-    interpret Pointer_Drag3 {
-	action= LockPointerButton(button=3);
-    };
-
-    interpret Pointer_EnableKeys {
-	action= LockControls(controls=MouseKeys);
-    };
-    interpret Pointer_Accelerate {
-	action= LockControls(controls=MouseKeysAccel);
-    };
-    interpret Pointer_DfltBtnNext {
-	action= SetPtrDflt(affect=defaultButton,button= +1);
-    };
-    interpret Pointer_DfltBtnPrev {
-	action= SetPtrDflt(affect=defaultButton,button= -1);
-    };
-
-
-    // Allow an indicator for MouseKeys.
-    indicator "Mouse Keys" {
-//	!allowExplicit;
-	indicatorDrivesKeyboard;
-	controls= MouseKeys;
-    };
-};
+// Interpretations for arrow keys and a bunch of other 
+// common keysyms which make it possible to bind "mouse" 
+// keys using xmodmap and activate or deactivate them 
+// from the keyboard.
+
+default partial xkb_compatibility "mousekeys" {
+
+    // Keypad actions.
+    //
+    interpret.repeat= True;
+
+    interpret KP_1 { 
+	action = MovePtr(x=-1,y= +1); 
+    };
+    interpret KP_End { 
+	action = MovePtr(x=-1,y= +1); 
+    };
+
+    interpret KP_2 { 
+	action = MovePtr(x=+0,y= +1); 
+    };
+    interpret KP_Down { 
+	action = MovePtr(x=+0,y= +1); 
+    };
+
+    interpret KP_3 { 
+	action = MovePtr(x=+1,y=+1); 
+    };
+    interpret KP_Next { 
+ 	action = MovePtr(x=+1,y=+1); 
+    };
+
+    interpret KP_4 { 
+	action = MovePtr(x=-1,y=+0); 
+    };
+    interpret KP_Left { 
+	action = MovePtr(x=-1,y=+0); 
+    };
+
+    interpret KP_6 { 
+	action = MovePtr(x=+1,y=+0); 
+    };
+    interpret KP_Right { 
+ 	action = MovePtr(x=+1,y=+0); 
+    };
+
+    interpret KP_7 { 
+	action = MovePtr(x=-1,y=-1); 
+    };
+    interpret KP_Home { 
+	action = MovePtr(x=-1,y=-1); 
+    };
+
+    interpret KP_8 { 
+	action = MovePtr(x=+0,y=-1); 
+    };
+    interpret KP_Up { 
+	action = MovePtr(x=+0,y=-1); 
+    };
+
+    interpret KP_9 { 
+	action = MovePtr(x=+1,y=-1); 
+    };
+    interpret KP_Prior { 
+	action = MovePtr(x=+1,y=-1); 
+    };
+
+    interpret KP_5 { 
+	action = PointerButton(button=default); 
+    };
+    interpret KP_Begin { 
+	action = PointerButton(button=default); 
+    };
+
+    interpret KP_F2 { 
+	action = SetPtrDflt(affect=defaultButton,button=1); 
+    };
+    interpret KP_Divide { 
+	action = SetPtrDflt(affect=defaultButton,button=1); 
+    };
+
+    interpret KP_F3 { 
+	action = SetPtrDflt(affect=defaultButton,button=2); 
+    };
+    interpret KP_Multiply { 
+	action = SetPtrDflt(affect=defaultButton,button=2); 
+    };
+
+    interpret KP_F4 { 
+	action = SetPtrDflt(affect=defaultButton,button=3); 
+    };
+    interpret KP_Subtract { 
+	action = SetPtrDflt(affect=defaultButton,button=3); 
+    };
+
+    interpret KP_Separator { 
+	action = PointerButton(button=default,count=2); 
+    };
+    interpret KP_Add { 
+	action = PointerButton(button=default,count=2);
+    };
+
+    interpret KP_0 { 
+	action = LockPointerButton(button=default,affect=lock); 
+    };
+    interpret KP_Insert { 
+	action = LockPointerButton(button=default,affect=lock); 
+    };
+
+    interpret KP_Decimal { 
+	action = LockPointerButton(button=default,affect=unlock); 
+    };
+    interpret KP_Delete { 
+	action = LockPointerButton(button=default,affect=unlock); 
+    };
+
+    // Additional mappings for Solaris keypad compatibility
+    interpret F25 { // aka KP_Divide
+	action = SetPtrDflt(affect=defaultButton,button=1); 
+    };
+    interpret F26 { // aka KP_Multiply
+	action = SetPtrDflt(affect=defaultButton,button=2); 
+    };
+    interpret F27 { // aka KP_Home
+	action = MovePtr(x=-1,y=-1); 
+    };
+    interpret F29 { // aka KP_Prior
+	action = MovePtr(x=+1,y=-1); 
+    };
+    interpret F31 { // aka KP_Begin
+	action = PointerButton(button=default); 
+    };
+    interpret F33 { // aka KP_End
+	action = MovePtr(x=-1,y= +1); 
+    };
+    interpret F35 { // aka KP_Next
+ 	action = MovePtr(x=+1,y=+1); 
+    };
+
+    interpret.repeat= False;
+
+
+    // New Keysym Actions.
+    //
+    interpret Pointer_Button_Dflt {
+	action= PointerButton(button=default);
+    };
+    interpret Pointer_Button1 {
+	action= PointerButton(button=1);
+    };
+    interpret Pointer_Button2 {
+	action= PointerButton(button=2);
+    };
+    interpret Pointer_Button3 {
+	action= PointerButton(button=3);
+    };
+    interpret Pointer_DblClick_Dflt {
+	action= PointerButton(button=default,count=2);
+    };
+    interpret Pointer_DblClick1 {
+	action= PointerButton(button=1,count=2);
+    };
+    interpret Pointer_DblClick2 {
+	action= PointerButton(button=2,count=2);
+    };
+    interpret Pointer_DblClick3 {
+	action= PointerButton(button=3,count=2);
+    };
+    interpret Pointer_Drag_Dflt	{
+	action= LockPointerButton(button=default);
+    };
+    interpret Pointer_Drag1 {
+	action= LockPointerButton(button=1);
+    };
+    interpret Pointer_Drag2 {
+	action= LockPointerButton(button=2);
+    };
+    interpret Pointer_Drag3 {
+	action= LockPointerButton(button=3);
+    };
+
+    interpret Pointer_EnableKeys {
+	action= LockControls(controls=MouseKeys);
+    };
+    interpret Pointer_Accelerate {
+	action= LockControls(controls=MouseKeysAccel);
+    };
+    interpret Pointer_DfltBtnNext {
+	action= SetPtrDflt(affect=defaultButton,button= +1);
+    };
+    interpret Pointer_DfltBtnPrev {
+	action= SetPtrDflt(affect=defaultButton,button= -1);
+    };
+
+
+    // Allow an indicator for MouseKeys.
+    indicator "Mouse Keys" {
+//	!allowExplicit;
+	indicatorDrivesKeyboard;
+	controls= MouseKeys;
+    };
+};
diff --git a/xorg-server/xkeyboard-config/compat/olpc b/xorg-server/xkeyboard-config/compat/olpc
index b8fe667d2..a7a2cc425 100644
--- a/xorg-server/xkeyboard-config/compat/olpc
+++ b/xorg-server/xkeyboard-config/compat/olpc
@@ -1,51 +1,51 @@
-//
-// Created by Bernardo Innocenti <bernie@codewiz.org>
-//
-// Map the OLPC game keys to virtual modifiers
-//
-
-default xkb_compatibility "olpc"  {
-    include "complete"
-
-    virtual_modifiers  Square,Cross,Triangle,Circle;
-
-    interpret KP_Home+Any     {
-        //useModMapMods= level1;
-       virtualModifier= Square;
-       action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret KP_Home  {
-       action = SetMods(modifiers=Square);
-    };
-
-    interpret KP_Next+Any     {
-        //useModMapMods= level1;
-       virtualModifier= Cross;
-       action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret KP_Next  {
-       action = SetMods(modifiers=Cross);
-    };
-
-    interpret KP_End+Any     {
-        //useModMapMods= level1;
-       virtualModifier= Circle;
-       action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret KP_End   {
-       action = SetMods(modifiers=Circle);
-    };
-
-    interpret KP_Prior+Any     {
-        //useModMapMods= level1;
-       virtualModifier= Triangle;
-       action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret KP_Prior {
-       action = SetMods(modifiers=Triangle);
-    };
-};
+//
+// Created by Bernardo Innocenti <bernie@codewiz.org>
+//
+// Map the OLPC game keys to virtual modifiers
+//
+
+default xkb_compatibility "olpc"  {
+    include "complete"
+
+    virtual_modifiers  Square,Cross,Triangle,Circle;
+
+    interpret KP_Home+Any     {
+        //useModMapMods= level1;
+       virtualModifier= Square;
+       action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret KP_Home  {
+       action = SetMods(modifiers=Square);
+    };
+
+    interpret KP_Next+Any     {
+        //useModMapMods= level1;
+       virtualModifier= Cross;
+       action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret KP_Next  {
+       action = SetMods(modifiers=Cross);
+    };
+
+    interpret KP_End+Any     {
+        //useModMapMods= level1;
+       virtualModifier= Circle;
+       action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret KP_End   {
+       action = SetMods(modifiers=Circle);
+    };
+
+    interpret KP_Prior+Any     {
+        //useModMapMods= level1;
+       virtualModifier= Triangle;
+       action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret KP_Prior {
+       action = SetMods(modifiers=Triangle);
+    };
+};
diff --git a/xorg-server/xkeyboard-config/compat/pc b/xorg-server/xkeyboard-config/compat/pc
index 14ba9c3cc..e970795c7 100644
--- a/xorg-server/xkeyboard-config/compat/pc
+++ b/xorg-server/xkeyboard-config/compat/pc
@@ -1,17 +1,17 @@
-default partial xkb_compatibility "pc"  {
-
-    // Sets the "Alt" virtual modifier
-
-    virtual_modifiers	Alt;
-
-    setMods.clearLocks= True;
-    interpret Alt_L+Any     { 
-	virtualModifier= Alt;
-	action = SetMods(modifiers=modMapMods);
-    };
-
-    interpret Alt_R+Any	{
-	virtualModifier= Alt;
-	action = SetMods(modifiers=modMapMods);
-    };
-};
+default partial xkb_compatibility "pc"  {
+
+    // Sets the "Alt" virtual modifier
+
+    virtual_modifiers	Alt;
+
+    setMods.clearLocks= True;
+    interpret Alt_L+Any     { 
+	virtualModifier= Alt;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Alt_R+Any	{
+	virtualModifier= Alt;
+	action = SetMods(modifiers=modMapMods);
+    };
+};
diff --git a/xorg-server/xkeyboard-config/compat/pc98 b/xorg-server/xkeyboard-config/compat/pc98
index 93a620036..f7e40014a 100644
--- a/xorg-server/xkeyboard-config/compat/pc98
+++ b/xorg-server/xkeyboard-config/compat/pc98
@@ -1,55 +1,55 @@
-// Minimal set of symbol interpretations to provide 
-// reasonable default behavior (Num lock, shift and 
-// caps lock and mode switch) and set up the 
-// automatic updating of common keyboard LEDs.
-
-default xkb_compatibility "basic"  {
-    virtual_modifiers NumLock,AltGr;
-
-    interpret.repeat= False;
-    setMods.clearLocks= True;
-    latchMods.clearLocks= True;
-    latchMods.latchToLock= True;
-
-    interpret Shift_Lock+AnyOf(Shift+Lock) {
-	action= LockMods(modifiers=Shift);
-    };
-
-//    interpret Any+Lock {
-//	action= LockMods(modifiers=Lock);
-//   }; 
-
-    interpret Num_Lock+Any {
-	virtualModifier= NumLock;
-	action= LockMods(modifiers=NumLock);
-    };
-
-    interpret Mode_switch {
-	useModMapMods= level1;
-	virtualModifier= AltGr;
-	action= SetGroup(group=2,clearLocks);
-    };
-
-    interpret Any + Any {
-	action= SetMods(modifiers=modMapMods);
-    };
-
-    group 2 = AltGr;
-    group 3 = AltGr;
-    group 4 = AltGr;
-
-    indicator.allowExplicit= False;
-    indicator "Caps Lock" { 
-	whichModState= Locked;
-	modifiers= Lock;
-    };
-    indicator "Num Lock" {
-	whichModState= Locked;
-	modifiers= NumLock;
-    };
-    indicator "Shift Lock" {
-	whichModState= Locked;
-	modifiers= Shift;
-    };
-    indicator.allowExplicit= True;
-};
+// Minimal set of symbol interpretations to provide 
+// reasonable default behavior (Num lock, shift and 
+// caps lock and mode switch) and set up the 
+// automatic updating of common keyboard LEDs.
+
+default xkb_compatibility "basic"  {
+    virtual_modifiers NumLock,AltGr;
+
+    interpret.repeat= False;
+    setMods.clearLocks= True;
+    latchMods.clearLocks= True;
+    latchMods.latchToLock= True;
+
+    interpret Shift_Lock+AnyOf(Shift+Lock) {
+	action= LockMods(modifiers=Shift);
+    };
+
+//    interpret Any+Lock {
+//	action= LockMods(modifiers=Lock);
+//   }; 
+
+    interpret Num_Lock+Any {
+	virtualModifier= NumLock;
+	action= LockMods(modifiers=NumLock);
+    };
+
+    interpret Mode_switch {
+	useModMapMods= level1;
+	virtualModifier= AltGr;
+	action= SetGroup(group=2,clearLocks);
+    };
+
+    interpret Any + Any {
+	action= SetMods(modifiers=modMapMods);
+    };
+
+    group 2 = AltGr;
+    group 3 = AltGr;
+    group 4 = AltGr;
+
+    indicator.allowExplicit= False;
+    indicator "Caps Lock" { 
+	whichModState= Locked;
+	modifiers= Lock;
+    };
+    indicator "Num Lock" {
+	whichModState= Locked;
+	modifiers= NumLock;
+    };
+    indicator "Shift Lock" {
+	whichModState= Locked;
+	modifiers= Shift;
+    };
+    indicator.allowExplicit= True;
+};
diff --git a/xorg-server/xkeyboard-config/compat/xtest b/xorg-server/xkeyboard-config/compat/xtest
index 6700bedd6..5ee88ccf8 100644
--- a/xorg-server/xkeyboard-config/compat/xtest
+++ b/xorg-server/xkeyboard-config/compat/xtest
@@ -1,57 +1,57 @@
-default xkb_compatibility "xtest"  {
-
-    // Minimal set of symbol interpretations to provide
-    // reasonable behavior for testing.   The X Test 
-    // Suite assumes that it can set any modifier by 
-    // simulating a KeyPress and clear it by simulating 
-    // a KeyRelease.  Because of the way that XKB 
-    // implements locking/latching modifiers, this 
-    // approach fails in some cases (typically the 
-    // lock or num lock modifiers).  These symbol
-    // interpretations make all modifier keys just
-    // set the corresponding modifier so that xtest
-    // will see the behavior it expects.
-
-    virtual_modifiers NumLock,AltGr;
-
-    interpret.repeat= False;
-    setMods.clearLocks= True;
-    latchMods.clearLocks= True;
-    latchMods.latchToLock= False;
-
-    interpret Shift_Lock+AnyOf(Shift+Lock) {
-	action= SetMods(modifiers=Shift);
-    };
-
-    interpret Num_Lock+Any {
-	virtualModifier= NumLock;
-	action= SetMods(modifiers=NumLock);
-    };
-
-    interpret Mode_switch {
-	useModMapMods= level1;
-	virtualModifier= AltGr;
-	action= SetGroup(group=2);
-    };
-
-    interpret Any + Any {
-	action= SetMods(modifiers=modMapMods);
-    };
-
-    group 2 = AltGr;
-    group 3 = AltGr;
-    group 4 = AltGr;
-
-    indicator.allowExplicit= False;
-    indicator "Caps Lock" { 
-	modifiers= Lock;
-    };
-    indicator "Num Lock" {
-	modifiers= NumLock;
-    };
-    indicator "Shift Lock" {
-	whichModState= Locked;
-	modifiers= Shift;
-    };
-    indicator.allowExplicit= True;
-};
+default xkb_compatibility "xtest"  {
+
+    // Minimal set of symbol interpretations to provide
+    // reasonable behavior for testing.   The X Test 
+    // Suite assumes that it can set any modifier by 
+    // simulating a KeyPress and clear it by simulating 
+    // a KeyRelease.  Because of the way that XKB 
+    // implements locking/latching modifiers, this 
+    // approach fails in some cases (typically the 
+    // lock or num lock modifiers).  These symbol
+    // interpretations make all modifier keys just
+    // set the corresponding modifier so that xtest
+    // will see the behavior it expects.
+
+    virtual_modifiers NumLock,AltGr;
+
+    interpret.repeat= False;
+    setMods.clearLocks= True;
+    latchMods.clearLocks= True;
+    latchMods.latchToLock= False;
+
+    interpret Shift_Lock+AnyOf(Shift+Lock) {
+	action= SetMods(modifiers=Shift);
+    };
+
+    interpret Num_Lock+Any {
+	virtualModifier= NumLock;
+	action= SetMods(modifiers=NumLock);
+    };
+
+    interpret Mode_switch {
+	useModMapMods= level1;
+	virtualModifier= AltGr;
+	action= SetGroup(group=2);
+    };
+
+    interpret Any + Any {
+	action= SetMods(modifiers=modMapMods);
+    };
+
+    group 2 = AltGr;
+    group 3 = AltGr;
+    group 4 = AltGr;
+
+    indicator.allowExplicit= False;
+    indicator "Caps Lock" { 
+	modifiers= Lock;
+    };
+    indicator "Num Lock" {
+	modifiers= NumLock;
+    };
+    indicator "Shift Lock" {
+	whichModState= Locked;
+	modifiers= Shift;
+    };
+    indicator.allowExplicit= True;
+};
diff --git a/xorg-server/xkeyboard-config/docs/HOWTO.testing b/xorg-server/xkeyboard-config/docs/HOWTO.testing
index 01aa0500c..5ab9dd477 100644
--- a/xorg-server/xkeyboard-config/docs/HOWTO.testing
+++ b/xorg-server/xkeyboard-config/docs/HOWTO.testing
@@ -1,22 +1,22 @@
-A mini-HOWTO test the XKB config without modifying the system configuration.
-(Only tested with XFree86 4.3+.) 
-
-First see what your configuration is. Note the model and layout.
-   $ setxkbmap -print
-
-Then unpack the sources locally ...
-   $ gzip -dc xkeyboard-config*.tar.gz | tar -tf -
-... and change to the delivered directory
-   $ cd xkeyboard-config-<version>
-
-Then try to load the current keyboard using the local rules
-   $ setxkbmap -v 10 -I$PWD -rules base
-
-Now try to set different keyboards using the -model and -layout.
-   $ setxkbmap -v 10 -I$PWD -rules base -model pc102 -layout intl
-Look in the file rules/base for other example models and layouts
-
-If there was a problem, you can reset the keyboard like so:
-   $ setxkbmap -rules xfree86 -model <noted model> -layout <noted layout>
-
-If that doesn't work, you may have to log out and log back in.
+A mini-HOWTO test the XKB config without modifying the system configuration.
+(Only tested with XFree86 4.3+.) 
+
+First see what your configuration is. Note the model and layout.
+   $ setxkbmap -print
+
+Then unpack the sources locally ...
+   $ gzip -dc xkeyboard-config*.tar.gz | tar -tf -
+... and change to the delivered directory
+   $ cd xkeyboard-config-<version>
+
+Then try to load the current keyboard using the local rules
+   $ setxkbmap -v 10 -I$PWD -rules base
+
+Now try to set different keyboards using the -model and -layout.
+   $ setxkbmap -v 10 -I$PWD -rules base -model pc102 -layout intl
+Look in the file rules/base for other example models and layouts
+
+If there was a problem, you can reset the keyboard like so:
+   $ setxkbmap -rules xfree86 -model <noted model> -layout <noted layout>
+
+If that doesn't work, you may have to log out and log back in.
diff --git a/xorg-server/xkeyboard-config/docs/HOWTO.transition b/xorg-server/xkeyboard-config/docs/HOWTO.transition
index 24add85f5..1b7cce216 100644
--- a/xorg-server/xkeyboard-config/docs/HOWTO.transition
+++ b/xorg-server/xkeyboard-config/docs/HOWTO.transition
@@ -1,19 +1,19 @@
-PURPOSE
-
-This document describes the procedure for replacing the standard XKB configuration repository shipped with an X Window System implementation. The procedure should work for XFree86 4.3 and higher and X11R7 implementation from X.Org. Any other X server supporting so called "multiple layouts" can be powered with XKeyboardConfig in a similar way (at the moment NO known commercial X Window System implementations support "multiple layouts"). X servers which do not support "multiple layouts" can be used with XKeyboardConfig as well - but users should be aware that only one group will be accessible with each possible XKB configuration.
-
-PROCEDURE
-
-1. Find your current XKB configuration data directory. In most cases it is /usr/X11R6/lib/X11/xkb. This directory usually contain subdirectores: compat, compiled, geometry, keycodes, keymap, rules, semantics, symbols etc.
-
-2. Backup your current XKB configuration data directory (for example, rename it to xkb.orig) - so you would be able to restore your original configuration in case of troubles.
-
-3. Untar XKeyboardConfiguration tarball (tar -xzvf xkeyboard-config-0.2.tar.gz). Change to the root project directory. Run the configure script with appropriate options. There are several useful options:
-  
-  --with-xkb-rules-symlink=NAME - this option creates symlinks for the rules and registry files. The default file names are base and base.xml correspondingly. Using this option allows to create symlinks for configuration files compatibility (for example, --with-xkb-rules-symlink=xfree86 creates symlinks xfree86 and xfree86.xml - so users would be able to use rules set "xfree86").
-  
-  --enable-xkbcomp-symlink - creates symlink from original xkbcomp utility (usually found in /usr/X111R6/bin) to XKB configuration directory (usually it is required by XKB server). By default, this option is enabled - but user can disable it.
-  
-4. Run "make" and (as root) "make install". At that point, new /usr/X11R6/lib/X11/xkb should be created.
-
-5. Adjust the configuration files (XF86Config, xorg.conf etc.). If you don't use the symlinks, you should use the rules set "base" (as the "XkbRules" value). If you added --with-xkb-rules-symlink option, you can use either "base" or the name of the rules symlink you created (for example, "xfree86").
+PURPOSE
+
+This document describes the procedure for replacing the standard XKB configuration repository shipped with an X Window System implementation. The procedure should work for XFree86 4.3 and higher and X11R7 implementation from X.Org. Any other X server supporting so called "multiple layouts" can be powered with XKeyboardConfig in a similar way (at the moment NO known commercial X Window System implementations support "multiple layouts"). X servers which do not support "multiple layouts" can be used with XKeyboardConfig as well - but users should be aware that only one group will be accessible with each possible XKB configuration.
+
+PROCEDURE
+
+1. Find your current XKB configuration data directory. In most cases it is /usr/X11R6/lib/X11/xkb. This directory usually contain subdirectores: compat, compiled, geometry, keycodes, keymap, rules, semantics, symbols etc.
+
+2. Backup your current XKB configuration data directory (for example, rename it to xkb.orig) - so you would be able to restore your original configuration in case of troubles.
+
+3. Untar XKeyboardConfiguration tarball (tar -xzvf xkeyboard-config-0.2.tar.gz). Change to the root project directory. Run the configure script with appropriate options. There are several useful options:
+  
+  --with-xkb-rules-symlink=NAME - this option creates symlinks for the rules and registry files. The default file names are base and base.xml correspondingly. Using this option allows to create symlinks for configuration files compatibility (for example, --with-xkb-rules-symlink=xfree86 creates symlinks xfree86 and xfree86.xml - so users would be able to use rules set "xfree86").
+  
+  --enable-xkbcomp-symlink - creates symlink from original xkbcomp utility (usually found in /usr/X111R6/bin) to XKB configuration directory (usually it is required by XKB server). By default, this option is enabled - but user can disable it.
+  
+4. Run "make" and (as root) "make install". At that point, new /usr/X11R6/lib/X11/xkb should be created.
+
+5. Adjust the configuration files (XF86Config, xorg.conf etc.). If you don't use the symlinks, you should use the rules set "base" (as the "XkbRules" value). If you added --with-xkb-rules-symlink option, you can use either "base" or the name of the rules symlink you created (for example, "xfree86").
diff --git a/xorg-server/xkeyboard-config/docs/Makefile.am b/xorg-server/xkeyboard-config/docs/Makefile.am
index 5ae0e80a1..835e673e0 100644
--- a/xorg-server/xkeyboard-config/docs/Makefile.am
+++ b/xorg-server/xkeyboard-config/docs/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST= README.config README.enhancing README.symbols HOWTO.transition HOWTO.testing
+EXTRA_DIST= README.config README.enhancing README.symbols HOWTO.transition HOWTO.testing
diff --git a/xorg-server/xkeyboard-config/docs/README.config b/xorg-server/xkeyboard-config/docs/README.config
index 4a068867d..215449a01 100644
--- a/xorg-server/xkeyboard-config/docs/README.config
+++ b/xorg-server/xkeyboard-config/docs/README.config
@@ -1,195 +1,195 @@
-                         The XKB Configuration Guide
-
-                         Kamil Toman, Ivan U. Pascal
-
-                              25 November 2002
-
-                                  Abstract
-
-     This document describes how to configure XFree86 XKB from a user's
-     point a few. It converts basic configuration syntax and gives also
-     a few examples.
-
-1.  Overview
-
-The XKB configuration is decomposed into a number of components. Selecting
-proper parts and combining them back you can achieve most of configurations
-you might need. Unless you have a completely atypical keyboard you really
-don't need to touch any of xkb configuration files.
-
-2.  Selecting XKB Configuration
-
-The easiest and the most natural way how to specify a keyboard mapping is to
-use rules component. As its name suggests it describes a number of general
-rules how to combine all bits and pieces into a valid and useful keyboard
-mapping. All you need to do is to select a suitable rules file and then to
-feed it with a few parameters that will adjust the keyboard behaviour to ful-
-fill your needs.
-
-The parameters are:
-
-   o XkbRules - files of rules to be used for keyboard mapping composition
-
-   o XkbModel - name of model of your keyboard type
-
-   o XkbLayout - layout(s) you intend to use
-
-   o XkbVariant - variant(s) of layout you intend to use
-
-   o XkbOptions - extra xkb configuration options
-
-The proper rules file depends on your vendor. In reality, the commonest file
-of rules is xfree86. For each rules file there is a description file named
-<vendor-rules>.lst, for instance xfree86.lst which is located in xkb configu-
-ration subdirectory rules (for example /etc/X11/xkb/rules).
-
-2.1  Basic Configuration
-
-Let's say you want to configure a PC style America keyboard with 104 keys as
-described in xfree86.lst. It can be done by simply writing several lines from
-below to you XFree86 configuration file (often found as /etc/X11/XF86Config-4
-or /etc/X11/XF86Config):
-
-     Section "InputDevice"
-         Identifier "Keyboard1"
-         Driver "Keyboard"
-
-         Option "XkbModel" "pc104"
-         Option "XkbLayout" "us"
-         Option "XKbOptions" ""
-     EndSection
-
-The values of parameters XkbModel and XkbLayout are really not surprising.
-The parameters XkbOptions has been explicitly set to empty set of parameters.
-The parameter XkbVariant has been left out.  That means the default variant
-named basic is loaded.
-
-Of course, this can be also done at runtime using utility setxkbmap.  Shell
-command loading the same keyboard mapping would look like:
-
-     setxkbmap -rules xfree86 -model pc104 -layout us -option ""
-
-The configuration and the shell command would be very analogical for most
-other layouts (internationalized mappings).
-
-2.2  Advanced Configuration
-
-Since XFree86 4.3.x you can use multi-layouts xkb configuration.  What does
-it mean? Basically it allows to load up to four different keyboard layouts at
-a time. Each such layout would reside in its own group. The groups (unlike
-complete keyboard remapping) can be switched very fast from one to another by
-a combination of keys.
-
-Let's say you want to configure your new Logitech cordless desktop keyboard,
-you intend to use three different layouts at the same time - us, czech and
-german (in this order), and that you are used to Alt-Shift combination for
-switching among them.
-
-Then the configuration snippet could look like this:
-
-     Section "InputDevice"
-         Identifier "Keyboard1"
-         Driver "Keyboard"
-
-         Option "XkbModel" "logicordless"
-         Option "XkbLayout" "us,cz,de"
-         Option "XKbOptions" "grp:alt_shift_toggle"
-     EndSection
-
-Of course, this can be also done at runtime using utility setxkbmap.  Shell
-command loading the same keyboard mapping would look like:
-
-     setxkbmap -rules xfree86 -model logicordless -layout "us,cz,de" \
-              -option "grp:alt_shift_toggle"
-
-2.3  Even More Advanced Configuration
-
-Okay, let's say you are more demanding. You do like the example above but you
-want it to change a bit. Let's imagine you want the czech keyboard mapping to
-use another variant but basic.  The configuration snippet then changes into:
-
-     Section "InputDevice"
-         Identifier "Keyboard1"
-         Driver "Keyboard"
-
-         Option "XkbModel" "logicordless"
-         Option "XkbLayout" "us,cz,de"
-         Option "XkbVariant" ",bksl,"
-         Option "XKbOptions" "grp:alt_shift_toggle"
-     EndSection
-
-That's seems tricky but it is not. The logic for settings of variants is the
-same as for layouts, that means the first and the third variant settings are
-left out (set to basic), the second is set to bksl (a special variant with an
-enhanced definition of the backslash key).
-
-Analogically, the loading runtime will change to:
-
-     setxkmap -rules xfree86 -model logicordless -layout "us,cz,de" \
-              -variant ",bksl," -option "grp:alt_shift_toggle"
-
-2.4  Basic Global Options
-
-See rules/*.lst files.
-
-3.  Direct XKB Configuration
-
-Generally, you can directly prescribe what configuration of each of basic xkb
-components should be used to form the resulting keyboard mapping.  This
-method is rather "brute force". You precisely need to know the structure and
-the meaning of all of used configuration components.
-
-This method also exposes all xkb configuration details directly into XFree86
-configuration file which is a not very fortunate fact.  In rare occasions it
-may be needed, though. So how does it work?
-
-3.1  Basic Components
-
-There are five basic components used to form a keyboard mapping:
-
-   o key codes - a translation of the scan codes produced by the keyboard
-     into a suitable symbolic form
-
-   o types - a specification of what various combinations of modifiers pro-
-     duce
-
-   o key symbols - a translation of symbolic key codes into actual symbols
-
-   o geometry - a description of physical keyboard geometry
-
-   o compatibility maps - a specification of what action should each key pro-
-     duce in order to preserve compatibility with XKB-unware clients
-
-3.2  Example Configuration
-
-Look at the following example:
-
-     Section "InputDevice"
-         Identifier "Keyboard0"
-         Driver "Keyboard"
-
-         Option "XkbKeycodes" "xfree86"
-         Option "XkbTypes"    "default"
-         Option "XkbSymbols"  "en_US(pc104)+de+swapcaps"
-         Option "XkbGeometry" "pc(pc104)"
-         Option "XkbCompat"   "basic+pc+iso9995"
-     EndSection
-
-This configuration sets the standard XFree86 default interpretation of key-
-board keycodes, sets the default modificator types. The symbol table is com-
-posed of extended US keyboard layout in its variant for pc keyboards with 104
-keys plus all keys for german layout are redefined respectively. Also the
-logical meaning of Caps-lock and Control keys is swapped.  The standard key-
-board geometry (physical look) is set to pc style keyboard with 104 keys. The
-compatibility map is set to allow basic shifting, to allow Alt keys to be
-interpreted and also to allow iso9995 group shifting.
-
-4.  Keymap XKB Configuration
-
-It is the formerly used way to configure xkb. The user included a special
-keymap file which specified the direct xkb configuration. This method has
-been obsoleted by previously described rules files which are far more flexi-
-ble and allow simpler and more intuitive syntax. It is preserved merely for
-compatibility reasons. Avoid using it if it is possible.
-
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Config.sgml,v 1.4 dawes Exp $
+                         The XKB Configuration Guide
+
+                         Kamil Toman, Ivan U. Pascal
+
+                              25 November 2002
+
+                                  Abstract
+
+     This document describes how to configure XFree86 XKB from a user's
+     point a few. It converts basic configuration syntax and gives also
+     a few examples.
+
+1.  Overview
+
+The XKB configuration is decomposed into a number of components. Selecting
+proper parts and combining them back you can achieve most of configurations
+you might need. Unless you have a completely atypical keyboard you really
+don't need to touch any of xkb configuration files.
+
+2.  Selecting XKB Configuration
+
+The easiest and the most natural way how to specify a keyboard mapping is to
+use rules component. As its name suggests it describes a number of general
+rules how to combine all bits and pieces into a valid and useful keyboard
+mapping. All you need to do is to select a suitable rules file and then to
+feed it with a few parameters that will adjust the keyboard behaviour to ful-
+fill your needs.
+
+The parameters are:
+
+   o XkbRules - files of rules to be used for keyboard mapping composition
+
+   o XkbModel - name of model of your keyboard type
+
+   o XkbLayout - layout(s) you intend to use
+
+   o XkbVariant - variant(s) of layout you intend to use
+
+   o XkbOptions - extra xkb configuration options
+
+The proper rules file depends on your vendor. In reality, the commonest file
+of rules is xfree86. For each rules file there is a description file named
+<vendor-rules>.lst, for instance xfree86.lst which is located in xkb configu-
+ration subdirectory rules (for example /etc/X11/xkb/rules).
+
+2.1  Basic Configuration
+
+Let's say you want to configure a PC style America keyboard with 104 keys as
+described in xfree86.lst. It can be done by simply writing several lines from
+below to you XFree86 configuration file (often found as /etc/X11/XF86Config-4
+or /etc/X11/XF86Config):
+
+     Section "InputDevice"
+         Identifier "Keyboard1"
+         Driver "Keyboard"
+
+         Option "XkbModel" "pc104"
+         Option "XkbLayout" "us"
+         Option "XKbOptions" ""
+     EndSection
+
+The values of parameters XkbModel and XkbLayout are really not surprising.
+The parameters XkbOptions has been explicitly set to empty set of parameters.
+The parameter XkbVariant has been left out.  That means the default variant
+named basic is loaded.
+
+Of course, this can be also done at runtime using utility setxkbmap.  Shell
+command loading the same keyboard mapping would look like:
+
+     setxkbmap -rules xfree86 -model pc104 -layout us -option ""
+
+The configuration and the shell command would be very analogical for most
+other layouts (internationalized mappings).
+
+2.2  Advanced Configuration
+
+Since XFree86 4.3.x you can use multi-layouts xkb configuration.  What does
+it mean? Basically it allows to load up to four different keyboard layouts at
+a time. Each such layout would reside in its own group. The groups (unlike
+complete keyboard remapping) can be switched very fast from one to another by
+a combination of keys.
+
+Let's say you want to configure your new Logitech cordless desktop keyboard,
+you intend to use three different layouts at the same time - us, czech and
+german (in this order), and that you are used to Alt-Shift combination for
+switching among them.
+
+Then the configuration snippet could look like this:
+
+     Section "InputDevice"
+         Identifier "Keyboard1"
+         Driver "Keyboard"
+
+         Option "XkbModel" "logicordless"
+         Option "XkbLayout" "us,cz,de"
+         Option "XKbOptions" "grp:alt_shift_toggle"
+     EndSection
+
+Of course, this can be also done at runtime using utility setxkbmap.  Shell
+command loading the same keyboard mapping would look like:
+
+     setxkbmap -rules xfree86 -model logicordless -layout "us,cz,de" \
+              -option "grp:alt_shift_toggle"
+
+2.3  Even More Advanced Configuration
+
+Okay, let's say you are more demanding. You do like the example above but you
+want it to change a bit. Let's imagine you want the czech keyboard mapping to
+use another variant but basic.  The configuration snippet then changes into:
+
+     Section "InputDevice"
+         Identifier "Keyboard1"
+         Driver "Keyboard"
+
+         Option "XkbModel" "logicordless"
+         Option "XkbLayout" "us,cz,de"
+         Option "XkbVariant" ",bksl,"
+         Option "XKbOptions" "grp:alt_shift_toggle"
+     EndSection
+
+That's seems tricky but it is not. The logic for settings of variants is the
+same as for layouts, that means the first and the third variant settings are
+left out (set to basic), the second is set to bksl (a special variant with an
+enhanced definition of the backslash key).
+
+Analogically, the loading runtime will change to:
+
+     setxkmap -rules xfree86 -model logicordless -layout "us,cz,de" \
+              -variant ",bksl," -option "grp:alt_shift_toggle"
+
+2.4  Basic Global Options
+
+See rules/*.lst files.
+
+3.  Direct XKB Configuration
+
+Generally, you can directly prescribe what configuration of each of basic xkb
+components should be used to form the resulting keyboard mapping.  This
+method is rather "brute force". You precisely need to know the structure and
+the meaning of all of used configuration components.
+
+This method also exposes all xkb configuration details directly into XFree86
+configuration file which is a not very fortunate fact.  In rare occasions it
+may be needed, though. So how does it work?
+
+3.1  Basic Components
+
+There are five basic components used to form a keyboard mapping:
+
+   o key codes - a translation of the scan codes produced by the keyboard
+     into a suitable symbolic form
+
+   o types - a specification of what various combinations of modifiers pro-
+     duce
+
+   o key symbols - a translation of symbolic key codes into actual symbols
+
+   o geometry - a description of physical keyboard geometry
+
+   o compatibility maps - a specification of what action should each key pro-
+     duce in order to preserve compatibility with XKB-unware clients
+
+3.2  Example Configuration
+
+Look at the following example:
+
+     Section "InputDevice"
+         Identifier "Keyboard0"
+         Driver "Keyboard"
+
+         Option "XkbKeycodes" "xfree86"
+         Option "XkbTypes"    "default"
+         Option "XkbSymbols"  "en_US(pc104)+de+swapcaps"
+         Option "XkbGeometry" "pc(pc104)"
+         Option "XkbCompat"   "basic+pc+iso9995"
+     EndSection
+
+This configuration sets the standard XFree86 default interpretation of key-
+board keycodes, sets the default modificator types. The symbol table is com-
+posed of extended US keyboard layout in its variant for pc keyboards with 104
+keys plus all keys for german layout are redefined respectively. Also the
+logical meaning of Caps-lock and Control keys is swapped.  The standard key-
+board geometry (physical look) is set to pc style keyboard with 104 keys. The
+compatibility map is set to allow basic shifting, to allow Alt keys to be
+interpreted and also to allow iso9995 group shifting.
+
+4.  Keymap XKB Configuration
+
+It is the formerly used way to configure xkb. The user included a special
+keymap file which specified the direct xkb configuration. This method has
+been obsoleted by previously described rules files which are far more flexi-
+ble and allow simpler and more intuitive syntax. It is preserved merely for
+compatibility reasons. Avoid using it if it is possible.
+
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Config.sgml,v 1.4 dawes Exp $
diff --git a/xorg-server/xkeyboard-config/docs/README.enhancing b/xorg-server/xkeyboard-config/docs/README.enhancing
index 88d6a4edf..dd972e76b 100644
--- a/xorg-server/xkeyboard-config/docs/README.enhancing
+++ b/xorg-server/xkeyboard-config/docs/README.enhancing
@@ -1,520 +1,520 @@
-                  How to further enhance XKB configuration
-
-                         Kamil Toman, Ivan U. Pascal
-
-                              25 November 2002
-
-                                  Abstract
-
-     This guide is aimed to relieve one's labour to create a new (inter-
-     nationalized) keyboard layout. Unlike other documents this guide
-     accents the keymap developer's point of view.
-
-1.  Overview
-
-The developer of a new layout should read the xkb protocol specification (The
-X Keyboard Extension: Protocol Specification 
-<URL:http://xfree86.org/current/XKBproto.pdf>) at least to clarify for
-himself some xkb-specific terms used in this document and elsewhere in xkb
-configuration. Also it shows wise to understand how the X server and a client
-digest their keyboard inputs (with and without xkb).
-
-A useful source is also Ivan  Pascal's text about xkb configuration
-<URL:http://www.tsu.ru/~pascal/en/xkb> often referenced throughout this docu-
-ment.
-
-Note that this document covers only enhancements which are to be made to
-XFree86 version 4.3.x and above.
-
-2.  The Basics
-
-At the startup (or at later at user's command) X server starts its xkb key-
-board module extension and reads data from a compiled configuration file.
-
-This compiled configuration file is prepared by the program xkbcomp which
-behaves altogether as an ordinary compiler (see man xkbcomp).  Its input are
-human readable xkb configuration files which are verified and then composed
-into a useful xkb configuration. Users don't need to mess with xkbcomp them-
-selves, for them it is invisible. Usually, it is started upon X server
-startup.
-
-As you probably already know, the xkb configuration consists of five main
-modules:
-
-      Keycodes
-            Tables that defines translation from keyboard scan codes into
-            reasonable symbolic names, maximum, minimum legal keycodes, sym-
-            bolic aliases and description of physically present LED-indica-
-            tors. The primary sence of this component is to allow definitions
-            of maps of symbols (see below) to be independent of physical key-
-            board scancodes. There are two main naming conventions for sym-
-            bolic names (always four bytes long):
-
-               o  names which express some traditional meaning like <SPCE>
-                 (stands for space bar) or
-
-               o  names which express some relative positioning on a key-
-                 board, for example <AE01> (an exclamation mark on US key-
-                 boards), on the right there are keys <AE02>, <AE03> etc.
-
-      Types
-            Types describe how the produced key is changed by active modi-
-            fiers (like Shift, Control, Alt, ...). There are several prede-
-            fined types which cover most of used combinations.
-
-      Compat
-            Compatibility component defines internal behaviour of modifiers.
-            Using compat component you can assign various actions (elabo-
-            rately described in xkb specification) to key events. This is
-            also the place where LED-indicators behaviour is defined.
-
-      Symbols
-            For i18n purposes, this is the most important table. It defines
-            what values (=symbols) are assigned to what keycodes (represented
-            by their symbolic name, see above). There may be defined more
-            than one value for each key and then it depends on a key type and
-            on modifiers state (respective compat component) which value will
-            be the resulting one.
-
-      Geometry
-            Geometry files aren't used by xkb itself but they may be used by
-            some external programs to depict a keyboard image.
-
-All these components have the files located in xkb configuration tree in sub-
-directories with the same names (usually in /usr/lib/X11/xkb).
-
-3.  Enhancing XKB Configuration
-
-Most of xkb enhancements concerns a need to define new output symbols for the
-some input key events. In other words, a need to define a new symbol map (for
-a new language, standard or just to feel more comfortable when typing text).
-
-What do you need to do? Generally, you have to define following things:
-
-   o  the map of symbols itself
-
-   o  the rules to allow users to select the new mapping
-
-   o  the description of the new layout
-
-First of all, it is good to go through existing layouts and to examine them
-if there is something you could easily adjust to fit your needs.  Even if
-there is nothing similar you may get some ideas about basic concepts and used
-tricks.
-
-3.1  Levels And Groups
-
-Since XFree86 4.3.0 you can use multi-layout concept of xkb configuration.
-Though it is still in boundaries of xkb protocol and general ideas, the
-keymap designer must obey new rules when creating new maps. In exchange we
-get a more powerful and cleaner configuration system.
-
-Remember that it is the application which must decide which symbol matches
-which keycode according to effective modifier state. The X server itself
-sends only an input event message to. Of course, usually the general inter-
-pretation is processed by Xlib, Xaw, Motif, Qt, Gtk and similar libraries.
-The X server only supplies its mapping table (usually upon an application
-startup).
-
-You can think of the X server's symbol table as of a irregular table where
-each keycode has its row and where each combination of modifiers determines
-exactly one column. The resulting cell then gives the proper symbolic value.
-Not all keycodes need to bind different values for different combination of
-modifiers.  <ENTER> key, for instance, usually doesn't depend on any modi-
-fiers so it its row has only one column defined.
-
-Note that in XKB there is no prior assumption that certain modifiers are
-bound to certain columns. By editing proper files (see keytypes (section 4.2,
-page 1)) this mapping can be changed as well.
-
-Unlike the original X protocol the XKB approach is far more flexible. It is
-comfortable to add one additional XKB term - group. You can think of a group
-as of a vector of columns per each keycode (naturally the dimension of this
-vector may differ for different keycodes). What is it good for? The group is
-not very useful unless you intend to use more than one logically different
-set of symbols (like more than one alphabet) defined in a single mapping ta-
-ble. But then, the group has a natural meaning - each symbol set has its own
-group and changing it means selecting a different one.  XKB approach allows
-up to four different groups. The columns inside each group are called (shift)
-levels. The X server knows the current group and reports it together with
-modifier set and with a keycode in key events.
-
-To sum it up:
-
-   o  for each keycode XKB keyboard map contains up to four one-dimensional
-     tables - groups (logically different symbol sets)
-
-   o  for each group of a keycode XKB keyboard map contains some columns -
-     shift levels (values reached by combinations of Shift, Ctrl, Alt, ...
-     modifiers)
-
-   o  different keycodes can have different number of groups
-
-   o  different groups of one keycode can have different number of shift lev-
-     els
-
-   o  the current group number is tracked by X server
-
-It is clear that if you sanely define levels, groups and sanely bind modi-
-fiers and associated actions you can have simultaneously loaded up to four
-different symbol sets where each of them would reside in its own group.
-
-The multi-layout concept provides a facility to manipulate xkb groups and
-symbol definitions in a way that allows almost arbitrary composition of pre-
-defined symbol tables. To keep it fully functional you have to:
-
-   o  define all symbols only in the first group
-
-   o  (re)define any modifiers with extra care to avoid strange (anisometric)
-     behaviour
-
-4.  Defining New Layouts
-
-See Some Words  About XKB internals <URL:http://www.tsu.ru/~pas-
-cal/en/xkb/internals.html> for explanation of used xkb terms and problems
-addressed by XKB extension.
-
-See Common  notes about XKB configuration files language
-<URL:http://www.tsu.ru/~pascal/en/xkb/gram-common.html> for more precise
-explanation of syntax of xkb configuration files.
-
-4.1  Predefined XKB Symbol Sets
-
-If you are about to define some European symbol map extension, you might want
-to use on of four predefined latin alphabet layouts.
-
-Okay, let's assume you want extend an existing keymap and you want to over-
-ride a few keys. Let's take a simple U.K. keyboard as an example (defined in
-pc/gb):
-
-     partial default alphanumeric_keys
-     xkb_symbols "basic" {
-       include "pc/latin"
-
-       name[Group1]="Great Britain";
-
-       key <AE02>  { [         2,   quotedbl,  twosuperior,    oneeighth ] };
-       key <AE03>  { [         3,   sterling, threesuperior,    sterling ] };
-       key <AC11>  { [apostrophe,         at, dead_circumflex, dead_caron] };
-       key <TLDE>  { [     grave,    notsign,          bar,          bar ] };
-       key <BKSL>  { [numbersign, asciitilde,   dead_grave,   dead_breve ] };
-       key <RALT>  { type[Group1]="TWO_LEVEL",
-                     [ ISO_Level3_Shift, Multi_key ]   };
-
-       modifier_map Mod5   { <RALT> };
-     };
-
-It defines a new layout in basic variant as an extension of common latin
-alphabet layout. The layout (symbol set) name is set to "Great Britain".
-Then there are redefinitions of a few keycodes and a modifiers binding. As
-you can see the number of shift levels is the same for <AE02>, <AE03>,
-<AC11>, <TLDE> and <BKSL> keys but it differs from number of shift levels of
-<RALT>.
-
-Note that the <RALT> key itself is a binding key for Mod5 and that it serves
-like a shift modifier for LevelThree, together with Shift as a multi-key. It
-is a good habit to respect this rule in a new similar layout.
-
-Okay, you could now define more variants of your new layout besides basic
-simply by including (augmenting/overriding/...) the basic definition and
-altering what may be needed.
-
-4.2  Key Types
-
-The differences in the number of columns (shift levels) are caused by a dif-
-ferent types of keys (see the types definition in section basics).  Most key-
-codes have implicitly set the keytype in the included "pc/latin" file to
-"FOUR_LEVEL_ALPHABETIC". The only exception is <RALT> keycode which is
-explicitly set "TWO_LEVEL" keytype.
-
-All those names refer to pre-defined shift level schemes. Usually you can
-choose a suitable shift level scheme from default types scheme list in proper
-xkb component's subdirectory.
-
-The most used schemes are:
-
-      ONE_LEVEL
-            The key does not depend on any modifiers. The symbol from first
-            level is always chosen.
-
-      TWO_LEVEL
-            The key uses a modifier Shift and may have two possible values.
-            The second level may be chosen by Shift modifier. If Lock modi-
-            fier (usually Caps-lock) applies the symbol is further processed
-            using system-specific capitalization rules. If both Shift+Lock
-            modifier apply the symbol from the second level is taken and cap-
-            italization rules are applied (and usually have no effect).
-
-      ALPHABETIC
-            The key uses modifiers Shift and Lock. It may have two possible
-            values. The second level may be chosen by Shift modifier. When
-            Lock modifier applies, the symbol from the first level is taken
-            and further processed using system-specific capitalization rules.
-            If both Shift+Lock modifier apply the symbol from the first level
-            is taken and no capitalization rules applied. This is often
-            called shift-cancels-caps behaviour.
-
-      THREE_LEVEL
-            Is the same as TWO_LEVEL but it considers an extra modifier -
-            LevelThree which can be used to gain the symbol value from the
-            third level. If both Shift+LevelThree modifiers apply the value
-            from the third level is also taken. As in TWO_LEVEL, the Lock
-            modifier doesn't influence the resulting level. Only Shift and
-            LevelThree are taken into that consideration. If the Lock modi-
-            fier is active capitalization rules are applied on the resulting
-            symbol.
-
-      FOUR_LEVEL
-            Is the same as THREE_LEVEL but unlike LEVEL_THREE if both
-            Shift+LevelThree modifiers apply the symbol is taken from the
-            fourth level.
-
-      FOUR_LEVEL_ALPHABETIC
-            Is similar to FOUR_LEVEL but also defines shift-cancels-caps
-            behaviour as in ALPHABETIC. If Lock+LevelThree apply the symbol
-            from the third level is taken and the capitalization rules are
-            applied.  If Lock+Shift+LevelThree apply the symbol from the
-            third level is taken and no capitalization rules are applied.
-
-      KEYPAD
-            As the name suggest this scheme is primarily used for numeric
-            keypads.  The scheme considers two modifiers - Shift and NumLock.
-            If none of modifiers applies the symbol from the first level is
-            taken. If either Shift or NumLock modifiers apply the symbol from
-            the second level is taken.  If both Shift+NumLock modifiers apply
-            the symbol from the first level is taken. Again, shift-cancels-
-            caps variant.
-
-      FOUR_LEVEL_KEYPAD
-            Is similar to KEYPAD scheme but considers also LevelThree modi-
-            fier.  If LevelThree modifier applies the symbol from the third
-            level is taken.  If Shift+LevelThree or NumLock+LevelThree apply
-            the symbol from the fourth level is taken. If all Shift+Num-
-            Lock+LevelThree modifiers apply the symbol from the third level
-            is taken. This also, shift-cancels-caps variant.
-
-      FOUR_LEVEL_MIXED_KEYPAD
-	    A four-level keypad scheme where the first two levels are similar
-            to the KEYPAD scheme (NumLock+Shift)
-            LevelThree acts as an override providing access to two Shift-ed
-            levels. When LevelThree is active we totally ignore NumLock state
-            Intended for the digit area of the keypad
-
-      FOUR_LEVEL_X
-            A four-level scheme where the base level accepts no modifier,
-            LevelThree provides two more Shift-ed levels like in the previous
-            scheme, and Ctrl+Alt controls the fourth level
-            Intended for the operator part of a keypad, though since NumLock
-            plays no part, it is not keypad-specific
-
-Besides that, there are several schemes for special purposes:
-
-      PC_CONTROL_LEVEL2
-            It is similar to TWO_LEVEL scheme but it considers the Control
-            modifier rather than Shift. That means, the symbol from the sec-
-            ond level is chosen by Control rather than by Shift.
-
-      PC_ALT_LEVEL2
-            It is similar to TWO_LEVEL scheme but it considers the Alt modi-
-            fier rather than Shift. That means, the symbol from the second
-            level is chosen by Alt rather than by Shift.
-
-      CTRL+ALT
-            The key uses modifiers Alt and Control. It may have two possible
-            values. If only one modifier (Alt or Control) applies the symbol
-            from the first level is chosen. Only if both Alt+Control modi-
-            fiers apply the symbol from the second level is chosen.
-
-      SHIFT+ALT
-            The key uses modifiers Shift and Alt. It may have two possible
-            values.  If only one modifier (Alt or Shift) applies the symbol
-            from the first level is chosen. Only if both Alt+Shift modifiers
-            apply the symbol from the second level is chosen.
-
-If needed, special caps schemes may be used. They redefine the standard
-behaviour of all *ALPHABETIC types. The layouts (maps of symbols) with keys
-defined in respective types then automatically change their behaviour accord-
-ingly. Possible redefinitions are:
-
-   o internal
-
-   o internal_nocancel
-
-   o shift
-
-   o shift_nocancel
-
-None of these schemes should be used directly. They are defined merely for
-'caps:' xkb options (used to globally change the layouts behaviour).
-
-Don't alter any of existing key types. If you need a different behaviour cre-
-ate a new one.
-
-4.2.1  More On Definitions Of Types
-
-When the XKB software deals with a separate type description it gets a com-
-plete list of modifiers that should be taken into account from the 'modi-
-fiers=<list of modifiers>' list and expects that a set of 'map[<combination
-of modifiers>]=<list of modifiers>' instructions that contain the mapping for
-each combination of modifiers mentioned in that list. Modifiers that are not
-explicitly listed are NOT taken into account when the resulting shift level
-is computed.  If some combination is omitted the program (subroutine) should
-choose the first level for this combination (a quite reasonable behavior).
-
-Lets consider an example with two modifiers ModOne and ModTwo:
-
-     type "..." {
-         modifiers = ModOne+ModTwo;
-         map[None] = Level1;
-         map[ModOne] = Level2;
-     };
-
-In this case the map statements for ModTwo only and ModOne+ModTwo are omit-
-ted.  It means that if the ModTwo is active the subroutine can't found
-explicit mapping for such combination an will use the default level i.e.
-Level1.
-
-But in the case the type described as:
-
-     type "..." {
-         modifiers = ModOne;
-         map[None] = Level1;
-         map[ModOne] = Level2;
-     };
-
-the ModTwo will not be taken into account and the resulting level depends on
-the ModOne state only. That means, ModTwo alone produces the Level1 but the
-combination ModOne+ModTwo produces the Level2 as well as ModOne alone.
-
-What does it mean if the second modifier is the Lock? It means that in the
-first case (the Lock itself is included in the list of modifiers but combina-
-tions with this modifier aren't mentioned in the map statements) the internal
-capitalization rules will be applied to the symbol from the first level. But
-in the second case the capitalization will be applied to the symbol chosen
-accordingly to he first modifier - and this can be the symbol from the first
-as well as from the second level.
-
-Usually, all modifiers introduced in 'modifiers=<list of modifiers>' list are
-used for shift level calculation and then discarded. Sometimes this is not
-desirable. If you want to use a modifier for shift level calculation but you
-don't want to discard it, you may list in 'preserve[<combination of modi-
-fiers>]=<list of modifiers>'. That means, for a given combination all listed
-modifiers will be preserved. If the Lock modifier is preserved then the
-resulting symbol is passed to internal capitalization routine regardless
-whether it has been used for a shift level calculation or not.
-
-Any key type description can use both real and virtual modifiers. Since real
-modifiers always have standard names it is not necessary to explicitly
-declare them. Virtual modifiers can have arbitrary names and can be declared
-(prior using them) directly in key type definition:
-
-     virtual_modifiers <comma-separated list of modifiers>  ;
-
-as seen in for example basic, pc or mousekeys key type definitions.
-
-4.3  Rules
-
-Once you are finished with your symbol map you need to add it to rules file.
-The rules file describes how all the five basic keycodes, types, compat, sym-
-bols and geometry components should be composed to give a sensible resulting
-xkb configuration.
-
-The main advantage of rules over formerly used keymaps is a possibility to
-simply parameterize (once) fixed patterns of configurations and thus to ele-
-gantly allow substitutions of various local configurations into predefined
-templates.
-
-A pattern in a rules file (often located in /usr/lib/X11/xkb/rules) can be
-parameterized with four other arguments: Model, Layout, Variant and Options.
-For most cases parameters model and layout should be sufficient for choosing
-a functional keyboard mapping.
-
-The rules file itself is composed of pattern lines and lines with rules. The
-pattern line starts with an exclamation mark ('!') and describes how will the
-xkb interpret the following lines (rules). A sample rules file looks like
-this:
-
-     ! model                   =   keycodes
-       macintosh_old                     =   macintosh
-       ...
-       *                       =   xfree86
-
-     ! model                        =   symbols
-       hp                      =   +inet(%m)
-       microsoftpro                 =   +inet(%m)
-       geniuscomfy                  =   +inet(%m)
-
-     ! model       layout[1]          = symbols
-       macintosh    us           = macintosh/us%(v[1])
-       *             *               =       pc/pc(%m)+pc/%l[1]%(v[1])
-
-     ! model     layout[2]            = symbols
-       macintosh     us              =  +macintosh/us[2]%(v[2]):2
-       *       *               =   +pc/%l[2]%(v[2]):2
-
-     ! option            =    types
-       caps:internal               =    +caps(internal)
-       caps:internal_nocancel =    +caps(internal_nocancel)
-
-Each rule defines what certain combination of values on the left side of
-equal sign ('=') results in. For example a (keyboard) model macintosh_old
-instructs xkb to take definitions of keycodes from file keycodes/macintosh
-while the rest of models (represented by a wild card '*') instructs it to
-take them from file keycodes/xfree86. The wild card represents all possible
-values on the left side which were not found in any of the previous rules.
-The more specialized (more complete) rules have higher precedence than gen-
-eral ones, i.e. the more general rules supply reasonable default values.
-
-As you can see some lines contain substitution parameters - the parameters
-preceded by the percent sign ('%'). The first alphabetical character after
-the percent sign expands to the value which has been found on the left side.
-For example +%l%(v) expands into +cz(bksl) if the respective values on the
-left side were cz layout in its bksl variant. More, if the layout resp. vari-
-ant  parameter is followed by a pair of brackets ('[', ']') it means that xkb
-should place the layout resp. variant into specified xkb group. If the brack-
-ets are omitted the first group is the default value.
-
-So the second block of rules enhances symbol definitions for some particular
-keyboard models with extra keys (for internet, multimedia, ...) . Other mod-
-els are left intact. Similarly, the last block overrides some key type defi-
-nitions, so the common global behaviour ''shift cancels caps'' or ''shift
-doesn't cancel caps'' can be selected. The rest of rules produces special
-symbols for each variant us layout of macintosh keyboard and standard pc sym-
-bols in appropriate variants as a default.
-
-4.4  Descriptive Files of Rules
-
-Now you just need to add a detailed description to <rules>.xml description
-file so the other users (and external programs which often parse this file)
-know what is your work about.
-
-4.4.1  Old Descriptive Files
-
-The formerly used descriptive files were named <rules>.lst Its structure is
-very simple and quite self descriptive but such simplicity had also some cav-
-ities, for example there was no way how to describe local variants of layouts
-and there were problems with the localization of descriptions. To preserve
-compatibility with some older programs, new XML descriptive files can be con-
-verted to old format '.lst'.
-
-For each parameter of rules file should be described its meaning. For the
-rules file described above the .lst file could look like:
-
-     ! model
-       pc104        Generic 104-key PC
-       microsoft    Microsoft Natural
-       pc98         PC-98xx Series
-       macintosh     Original Macintosh
-       ...
-
-     ! layout
-       us      U.S. English
-       cz      Czech
-       de      German
-       ...
-
-     ! option
-       caps:internal           uses internal capitalization. Shift cancels Caps
-       caps:internal_nocancel uses internal capitalization. Shift doesn't cancel Caps
-
-And that should be it. Enjoy creating your own xkb mapping.
+                  How to further enhance XKB configuration
+
+                         Kamil Toman, Ivan U. Pascal
+
+                              25 November 2002
+
+                                  Abstract
+
+     This guide is aimed to relieve one's labour to create a new (inter-
+     nationalized) keyboard layout. Unlike other documents this guide
+     accents the keymap developer's point of view.
+
+1.  Overview
+
+The developer of a new layout should read the xkb protocol specification (The
+X Keyboard Extension: Protocol Specification 
+<URL:http://xfree86.org/current/XKBproto.pdf>) at least to clarify for
+himself some xkb-specific terms used in this document and elsewhere in xkb
+configuration. Also it shows wise to understand how the X server and a client
+digest their keyboard inputs (with and without xkb).
+
+A useful source is also Ivan  Pascal's text about xkb configuration
+<URL:http://www.tsu.ru/~pascal/en/xkb> often referenced throughout this docu-
+ment.
+
+Note that this document covers only enhancements which are to be made to
+XFree86 version 4.3.x and above.
+
+2.  The Basics
+
+At the startup (or at later at user's command) X server starts its xkb key-
+board module extension and reads data from a compiled configuration file.
+
+This compiled configuration file is prepared by the program xkbcomp which
+behaves altogether as an ordinary compiler (see man xkbcomp).  Its input are
+human readable xkb configuration files which are verified and then composed
+into a useful xkb configuration. Users don't need to mess with xkbcomp them-
+selves, for them it is invisible. Usually, it is started upon X server
+startup.
+
+As you probably already know, the xkb configuration consists of five main
+modules:
+
+      Keycodes
+            Tables that defines translation from keyboard scan codes into
+            reasonable symbolic names, maximum, minimum legal keycodes, sym-
+            bolic aliases and description of physically present LED-indica-
+            tors. The primary sence of this component is to allow definitions
+            of maps of symbols (see below) to be independent of physical key-
+            board scancodes. There are two main naming conventions for sym-
+            bolic names (always four bytes long):
+
+               o  names which express some traditional meaning like <SPCE>
+                 (stands for space bar) or
+
+               o  names which express some relative positioning on a key-
+                 board, for example <AE01> (an exclamation mark on US key-
+                 boards), on the right there are keys <AE02>, <AE03> etc.
+
+      Types
+            Types describe how the produced key is changed by active modi-
+            fiers (like Shift, Control, Alt, ...). There are several prede-
+            fined types which cover most of used combinations.
+
+      Compat
+            Compatibility component defines internal behaviour of modifiers.
+            Using compat component you can assign various actions (elabo-
+            rately described in xkb specification) to key events. This is
+            also the place where LED-indicators behaviour is defined.
+
+      Symbols
+            For i18n purposes, this is the most important table. It defines
+            what values (=symbols) are assigned to what keycodes (represented
+            by their symbolic name, see above). There may be defined more
+            than one value for each key and then it depends on a key type and
+            on modifiers state (respective compat component) which value will
+            be the resulting one.
+
+      Geometry
+            Geometry files aren't used by xkb itself but they may be used by
+            some external programs to depict a keyboard image.
+
+All these components have the files located in xkb configuration tree in sub-
+directories with the same names (usually in /usr/lib/X11/xkb).
+
+3.  Enhancing XKB Configuration
+
+Most of xkb enhancements concerns a need to define new output symbols for the
+some input key events. In other words, a need to define a new symbol map (for
+a new language, standard or just to feel more comfortable when typing text).
+
+What do you need to do? Generally, you have to define following things:
+
+   o  the map of symbols itself
+
+   o  the rules to allow users to select the new mapping
+
+   o  the description of the new layout
+
+First of all, it is good to go through existing layouts and to examine them
+if there is something you could easily adjust to fit your needs.  Even if
+there is nothing similar you may get some ideas about basic concepts and used
+tricks.
+
+3.1  Levels And Groups
+
+Since XFree86 4.3.0 you can use multi-layout concept of xkb configuration.
+Though it is still in boundaries of xkb protocol and general ideas, the
+keymap designer must obey new rules when creating new maps. In exchange we
+get a more powerful and cleaner configuration system.
+
+Remember that it is the application which must decide which symbol matches
+which keycode according to effective modifier state. The X server itself
+sends only an input event message to. Of course, usually the general inter-
+pretation is processed by Xlib, Xaw, Motif, Qt, Gtk and similar libraries.
+The X server only supplies its mapping table (usually upon an application
+startup).
+
+You can think of the X server's symbol table as of a irregular table where
+each keycode has its row and where each combination of modifiers determines
+exactly one column. The resulting cell then gives the proper symbolic value.
+Not all keycodes need to bind different values for different combination of
+modifiers.  <ENTER> key, for instance, usually doesn't depend on any modi-
+fiers so it its row has only one column defined.
+
+Note that in XKB there is no prior assumption that certain modifiers are
+bound to certain columns. By editing proper files (see keytypes (section 4.2,
+page 1)) this mapping can be changed as well.
+
+Unlike the original X protocol the XKB approach is far more flexible. It is
+comfortable to add one additional XKB term - group. You can think of a group
+as of a vector of columns per each keycode (naturally the dimension of this
+vector may differ for different keycodes). What is it good for? The group is
+not very useful unless you intend to use more than one logically different
+set of symbols (like more than one alphabet) defined in a single mapping ta-
+ble. But then, the group has a natural meaning - each symbol set has its own
+group and changing it means selecting a different one.  XKB approach allows
+up to four different groups. The columns inside each group are called (shift)
+levels. The X server knows the current group and reports it together with
+modifier set and with a keycode in key events.
+
+To sum it up:
+
+   o  for each keycode XKB keyboard map contains up to four one-dimensional
+     tables - groups (logically different symbol sets)
+
+   o  for each group of a keycode XKB keyboard map contains some columns -
+     shift levels (values reached by combinations of Shift, Ctrl, Alt, ...
+     modifiers)
+
+   o  different keycodes can have different number of groups
+
+   o  different groups of one keycode can have different number of shift lev-
+     els
+
+   o  the current group number is tracked by X server
+
+It is clear that if you sanely define levels, groups and sanely bind modi-
+fiers and associated actions you can have simultaneously loaded up to four
+different symbol sets where each of them would reside in its own group.
+
+The multi-layout concept provides a facility to manipulate xkb groups and
+symbol definitions in a way that allows almost arbitrary composition of pre-
+defined symbol tables. To keep it fully functional you have to:
+
+   o  define all symbols only in the first group
+
+   o  (re)define any modifiers with extra care to avoid strange (anisometric)
+     behaviour
+
+4.  Defining New Layouts
+
+See Some Words  About XKB internals <URL:http://www.tsu.ru/~pas-
+cal/en/xkb/internals.html> for explanation of used xkb terms and problems
+addressed by XKB extension.
+
+See Common  notes about XKB configuration files language
+<URL:http://www.tsu.ru/~pascal/en/xkb/gram-common.html> for more precise
+explanation of syntax of xkb configuration files.
+
+4.1  Predefined XKB Symbol Sets
+
+If you are about to define some European symbol map extension, you might want
+to use on of four predefined latin alphabet layouts.
+
+Okay, let's assume you want extend an existing keymap and you want to over-
+ride a few keys. Let's take a simple U.K. keyboard as an example (defined in
+pc/gb):
+
+     partial default alphanumeric_keys
+     xkb_symbols "basic" {
+       include "pc/latin"
+
+       name[Group1]="Great Britain";
+
+       key <AE02>  { [         2,   quotedbl,  twosuperior,    oneeighth ] };
+       key <AE03>  { [         3,   sterling, threesuperior,    sterling ] };
+       key <AC11>  { [apostrophe,         at, dead_circumflex, dead_caron] };
+       key <TLDE>  { [     grave,    notsign,          bar,          bar ] };
+       key <BKSL>  { [numbersign, asciitilde,   dead_grave,   dead_breve ] };
+       key <RALT>  { type[Group1]="TWO_LEVEL",
+                     [ ISO_Level3_Shift, Multi_key ]   };
+
+       modifier_map Mod5   { <RALT> };
+     };
+
+It defines a new layout in basic variant as an extension of common latin
+alphabet layout. The layout (symbol set) name is set to "Great Britain".
+Then there are redefinitions of a few keycodes and a modifiers binding. As
+you can see the number of shift levels is the same for <AE02>, <AE03>,
+<AC11>, <TLDE> and <BKSL> keys but it differs from number of shift levels of
+<RALT>.
+
+Note that the <RALT> key itself is a binding key for Mod5 and that it serves
+like a shift modifier for LevelThree, together with Shift as a multi-key. It
+is a good habit to respect this rule in a new similar layout.
+
+Okay, you could now define more variants of your new layout besides basic
+simply by including (augmenting/overriding/...) the basic definition and
+altering what may be needed.
+
+4.2  Key Types
+
+The differences in the number of columns (shift levels) are caused by a dif-
+ferent types of keys (see the types definition in section basics).  Most key-
+codes have implicitly set the keytype in the included "pc/latin" file to
+"FOUR_LEVEL_ALPHABETIC". The only exception is <RALT> keycode which is
+explicitly set "TWO_LEVEL" keytype.
+
+All those names refer to pre-defined shift level schemes. Usually you can
+choose a suitable shift level scheme from default types scheme list in proper
+xkb component's subdirectory.
+
+The most used schemes are:
+
+      ONE_LEVEL
+            The key does not depend on any modifiers. The symbol from first
+            level is always chosen.
+
+      TWO_LEVEL
+            The key uses a modifier Shift and may have two possible values.
+            The second level may be chosen by Shift modifier. If Lock modi-
+            fier (usually Caps-lock) applies the symbol is further processed
+            using system-specific capitalization rules. If both Shift+Lock
+            modifier apply the symbol from the second level is taken and cap-
+            italization rules are applied (and usually have no effect).
+
+      ALPHABETIC
+            The key uses modifiers Shift and Lock. It may have two possible
+            values. The second level may be chosen by Shift modifier. When
+            Lock modifier applies, the symbol from the first level is taken
+            and further processed using system-specific capitalization rules.
+            If both Shift+Lock modifier apply the symbol from the first level
+            is taken and no capitalization rules applied. This is often
+            called shift-cancels-caps behaviour.
+
+      THREE_LEVEL
+            Is the same as TWO_LEVEL but it considers an extra modifier -
+            LevelThree which can be used to gain the symbol value from the
+            third level. If both Shift+LevelThree modifiers apply the value
+            from the third level is also taken. As in TWO_LEVEL, the Lock
+            modifier doesn't influence the resulting level. Only Shift and
+            LevelThree are taken into that consideration. If the Lock modi-
+            fier is active capitalization rules are applied on the resulting
+            symbol.
+
+      FOUR_LEVEL
+            Is the same as THREE_LEVEL but unlike LEVEL_THREE if both
+            Shift+LevelThree modifiers apply the symbol is taken from the
+            fourth level.
+
+      FOUR_LEVEL_ALPHABETIC
+            Is similar to FOUR_LEVEL but also defines shift-cancels-caps
+            behaviour as in ALPHABETIC. If Lock+LevelThree apply the symbol
+            from the third level is taken and the capitalization rules are
+            applied.  If Lock+Shift+LevelThree apply the symbol from the
+            third level is taken and no capitalization rules are applied.
+
+      KEYPAD
+            As the name suggest this scheme is primarily used for numeric
+            keypads.  The scheme considers two modifiers - Shift and NumLock.
+            If none of modifiers applies the symbol from the first level is
+            taken. If either Shift or NumLock modifiers apply the symbol from
+            the second level is taken.  If both Shift+NumLock modifiers apply
+            the symbol from the first level is taken. Again, shift-cancels-
+            caps variant.
+
+      FOUR_LEVEL_KEYPAD
+            Is similar to KEYPAD scheme but considers also LevelThree modi-
+            fier.  If LevelThree modifier applies the symbol from the third
+            level is taken.  If Shift+LevelThree or NumLock+LevelThree apply
+            the symbol from the fourth level is taken. If all Shift+Num-
+            Lock+LevelThree modifiers apply the symbol from the third level
+            is taken. This also, shift-cancels-caps variant.
+
+      FOUR_LEVEL_MIXED_KEYPAD
+	    A four-level keypad scheme where the first two levels are similar
+            to the KEYPAD scheme (NumLock+Shift)
+            LevelThree acts as an override providing access to two Shift-ed
+            levels. When LevelThree is active we totally ignore NumLock state
+            Intended for the digit area of the keypad
+
+      FOUR_LEVEL_X
+            A four-level scheme where the base level accepts no modifier,
+            LevelThree provides two more Shift-ed levels like in the previous
+            scheme, and Ctrl+Alt controls the fourth level
+            Intended for the operator part of a keypad, though since NumLock
+            plays no part, it is not keypad-specific
+
+Besides that, there are several schemes for special purposes:
+
+      PC_CONTROL_LEVEL2
+            It is similar to TWO_LEVEL scheme but it considers the Control
+            modifier rather than Shift. That means, the symbol from the sec-
+            ond level is chosen by Control rather than by Shift.
+
+      PC_ALT_LEVEL2
+            It is similar to TWO_LEVEL scheme but it considers the Alt modi-
+            fier rather than Shift. That means, the symbol from the second
+            level is chosen by Alt rather than by Shift.
+
+      CTRL+ALT
+            The key uses modifiers Alt and Control. It may have two possible
+            values. If only one modifier (Alt or Control) applies the symbol
+            from the first level is chosen. Only if both Alt+Control modi-
+            fiers apply the symbol from the second level is chosen.
+
+      SHIFT+ALT
+            The key uses modifiers Shift and Alt. It may have two possible
+            values.  If only one modifier (Alt or Shift) applies the symbol
+            from the first level is chosen. Only if both Alt+Shift modifiers
+            apply the symbol from the second level is chosen.
+
+If needed, special caps schemes may be used. They redefine the standard
+behaviour of all *ALPHABETIC types. The layouts (maps of symbols) with keys
+defined in respective types then automatically change their behaviour accord-
+ingly. Possible redefinitions are:
+
+   o internal
+
+   o internal_nocancel
+
+   o shift
+
+   o shift_nocancel
+
+None of these schemes should be used directly. They are defined merely for
+'caps:' xkb options (used to globally change the layouts behaviour).
+
+Don't alter any of existing key types. If you need a different behaviour cre-
+ate a new one.
+
+4.2.1  More On Definitions Of Types
+
+When the XKB software deals with a separate type description it gets a com-
+plete list of modifiers that should be taken into account from the 'modi-
+fiers=<list of modifiers>' list and expects that a set of 'map[<combination
+of modifiers>]=<list of modifiers>' instructions that contain the mapping for
+each combination of modifiers mentioned in that list. Modifiers that are not
+explicitly listed are NOT taken into account when the resulting shift level
+is computed.  If some combination is omitted the program (subroutine) should
+choose the first level for this combination (a quite reasonable behavior).
+
+Lets consider an example with two modifiers ModOne and ModTwo:
+
+     type "..." {
+         modifiers = ModOne+ModTwo;
+         map[None] = Level1;
+         map[ModOne] = Level2;
+     };
+
+In this case the map statements for ModTwo only and ModOne+ModTwo are omit-
+ted.  It means that if the ModTwo is active the subroutine can't found
+explicit mapping for such combination an will use the default level i.e.
+Level1.
+
+But in the case the type described as:
+
+     type "..." {
+         modifiers = ModOne;
+         map[None] = Level1;
+         map[ModOne] = Level2;
+     };
+
+the ModTwo will not be taken into account and the resulting level depends on
+the ModOne state only. That means, ModTwo alone produces the Level1 but the
+combination ModOne+ModTwo produces the Level2 as well as ModOne alone.
+
+What does it mean if the second modifier is the Lock? It means that in the
+first case (the Lock itself is included in the list of modifiers but combina-
+tions with this modifier aren't mentioned in the map statements) the internal
+capitalization rules will be applied to the symbol from the first level. But
+in the second case the capitalization will be applied to the symbol chosen
+accordingly to he first modifier - and this can be the symbol from the first
+as well as from the second level.
+
+Usually, all modifiers introduced in 'modifiers=<list of modifiers>' list are
+used for shift level calculation and then discarded. Sometimes this is not
+desirable. If you want to use a modifier for shift level calculation but you
+don't want to discard it, you may list in 'preserve[<combination of modi-
+fiers>]=<list of modifiers>'. That means, for a given combination all listed
+modifiers will be preserved. If the Lock modifier is preserved then the
+resulting symbol is passed to internal capitalization routine regardless
+whether it has been used for a shift level calculation or not.
+
+Any key type description can use both real and virtual modifiers. Since real
+modifiers always have standard names it is not necessary to explicitly
+declare them. Virtual modifiers can have arbitrary names and can be declared
+(prior using them) directly in key type definition:
+
+     virtual_modifiers <comma-separated list of modifiers>  ;
+
+as seen in for example basic, pc or mousekeys key type definitions.
+
+4.3  Rules
+
+Once you are finished with your symbol map you need to add it to rules file.
+The rules file describes how all the five basic keycodes, types, compat, sym-
+bols and geometry components should be composed to give a sensible resulting
+xkb configuration.
+
+The main advantage of rules over formerly used keymaps is a possibility to
+simply parameterize (once) fixed patterns of configurations and thus to ele-
+gantly allow substitutions of various local configurations into predefined
+templates.
+
+A pattern in a rules file (often located in /usr/lib/X11/xkb/rules) can be
+parameterized with four other arguments: Model, Layout, Variant and Options.
+For most cases parameters model and layout should be sufficient for choosing
+a functional keyboard mapping.
+
+The rules file itself is composed of pattern lines and lines with rules. The
+pattern line starts with an exclamation mark ('!') and describes how will the
+xkb interpret the following lines (rules). A sample rules file looks like
+this:
+
+     ! model                   =   keycodes
+       macintosh_old                     =   macintosh
+       ...
+       *                       =   xfree86
+
+     ! model                        =   symbols
+       hp                      =   +inet(%m)
+       microsoftpro                 =   +inet(%m)
+       geniuscomfy                  =   +inet(%m)
+
+     ! model       layout[1]          = symbols
+       macintosh    us           = macintosh/us%(v[1])
+       *             *               =       pc/pc(%m)+pc/%l[1]%(v[1])
+
+     ! model     layout[2]            = symbols
+       macintosh     us              =  +macintosh/us[2]%(v[2]):2
+       *       *               =   +pc/%l[2]%(v[2]):2
+
+     ! option            =    types
+       caps:internal               =    +caps(internal)
+       caps:internal_nocancel =    +caps(internal_nocancel)
+
+Each rule defines what certain combination of values on the left side of
+equal sign ('=') results in. For example a (keyboard) model macintosh_old
+instructs xkb to take definitions of keycodes from file keycodes/macintosh
+while the rest of models (represented by a wild card '*') instructs it to
+take them from file keycodes/xfree86. The wild card represents all possible
+values on the left side which were not found in any of the previous rules.
+The more specialized (more complete) rules have higher precedence than gen-
+eral ones, i.e. the more general rules supply reasonable default values.
+
+As you can see some lines contain substitution parameters - the parameters
+preceded by the percent sign ('%'). The first alphabetical character after
+the percent sign expands to the value which has been found on the left side.
+For example +%l%(v) expands into +cz(bksl) if the respective values on the
+left side were cz layout in its bksl variant. More, if the layout resp. vari-
+ant  parameter is followed by a pair of brackets ('[', ']') it means that xkb
+should place the layout resp. variant into specified xkb group. If the brack-
+ets are omitted the first group is the default value.
+
+So the second block of rules enhances symbol definitions for some particular
+keyboard models with extra keys (for internet, multimedia, ...) . Other mod-
+els are left intact. Similarly, the last block overrides some key type defi-
+nitions, so the common global behaviour ''shift cancels caps'' or ''shift
+doesn't cancel caps'' can be selected. The rest of rules produces special
+symbols for each variant us layout of macintosh keyboard and standard pc sym-
+bols in appropriate variants as a default.
+
+4.4  Descriptive Files of Rules
+
+Now you just need to add a detailed description to <rules>.xml description
+file so the other users (and external programs which often parse this file)
+know what is your work about.
+
+4.4.1  Old Descriptive Files
+
+The formerly used descriptive files were named <rules>.lst Its structure is
+very simple and quite self descriptive but such simplicity had also some cav-
+ities, for example there was no way how to describe local variants of layouts
+and there were problems with the localization of descriptions. To preserve
+compatibility with some older programs, new XML descriptive files can be con-
+verted to old format '.lst'.
+
+For each parameter of rules file should be described its meaning. For the
+rules file described above the .lst file could look like:
+
+     ! model
+       pc104        Generic 104-key PC
+       microsoft    Microsoft Natural
+       pc98         PC-98xx Series
+       macintosh     Original Macintosh
+       ...
+
+     ! layout
+       us      U.S. English
+       cz      Czech
+       de      German
+       ...
+
+     ! option
+       caps:internal           uses internal capitalization. Shift cancels Caps
+       caps:internal_nocancel uses internal capitalization. Shift doesn't cancel Caps
+
+And that should be it. Enjoy creating your own xkb mapping.
diff --git a/xorg-server/xkeyboard-config/docs/README.symbols b/xorg-server/xkeyboard-config/docs/README.symbols
index 749618e77..2382f0a15 100644
--- a/xorg-server/xkeyboard-config/docs/README.symbols
+++ b/xorg-server/xkeyboard-config/docs/README.symbols
@@ -1,51 +1,51 @@
-
-The files in the symbols directory describe possible layouts for a given 
-keyboard.
-
-The default layout in each file should describe the most common layout
-for its kind, usually the symbols printed on the keys. Layout variants
-can describe common differences that are not necessarily printed on the keys.
-(e.g. a phonetic version of Cyrillic).
-
-The names of the files are referenced throughout the XKB rules, and may be
-exposed in the X server configuration and in user configuration tools.
-The filenames use the following convention:
-
-Country layouts:
-
-  Keyboard layouts for a country must use the 2-letter code from the
-  ISO-3166 standard.
-
-Language layouts:
-
-  Keyboard layouts for a language must use the 3-letter code from the
-  ISO-639 standard.
-
-Script layouts:
-
-  Keyboard layouts for a script must use the 4-letter code from the
-  ISO-15924 standard.
-
-Other:
-
-  Keyboard layouts that do not fit in the above model and directories
-  must use a filename between 5 and 8 characters.
-
-The ISO codes can be found at the following addressed:
-
-Country layouts:  http://www.iso.org/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/iso_3166-1_decoding_table.html
-Language layouts: http://www.loc.gov/standards/iso639-2/langcodes.html
-Script layouts:   http://www.unicode.org/iso15924/iso15924-codes.html
-
-The description in the directory file base.xml.in should match the group names 
-in the symbols file. 
-
-If the layout is country-based, this has to be the full 
-name of the country. It is highly not recommended to use the forms 
-"Republic of XXX" or "XXX Republic" - the form "XXX" should be used instead.
-The only exception is "United Kingdom".
-
-If the layout is language-based, this has to be the name of the language.
-
-Within single symbols file, all the variants should have the same group name 
-(implemented using the "include" directive wherever possible).
+
+The files in the symbols directory describe possible layouts for a given 
+keyboard.
+
+The default layout in each file should describe the most common layout
+for its kind, usually the symbols printed on the keys. Layout variants
+can describe common differences that are not necessarily printed on the keys.
+(e.g. a phonetic version of Cyrillic).
+
+The names of the files are referenced throughout the XKB rules, and may be
+exposed in the X server configuration and in user configuration tools.
+The filenames use the following convention:
+
+Country layouts:
+
+  Keyboard layouts for a country must use the 2-letter code from the
+  ISO-3166 standard.
+
+Language layouts:
+
+  Keyboard layouts for a language must use the 3-letter code from the
+  ISO-639 standard.
+
+Script layouts:
+
+  Keyboard layouts for a script must use the 4-letter code from the
+  ISO-15924 standard.
+
+Other:
+
+  Keyboard layouts that do not fit in the above model and directories
+  must use a filename between 5 and 8 characters.
+
+The ISO codes can be found at the following addressed:
+
+Country layouts:  http://www.iso.org/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/iso_3166-1_decoding_table.html
+Language layouts: http://www.loc.gov/standards/iso639-2/langcodes.html
+Script layouts:   http://www.unicode.org/iso15924/iso15924-codes.html
+
+The description in the directory file base.xml.in should match the group names 
+in the symbols file. 
+
+If the layout is country-based, this has to be the full 
+name of the country. It is highly not recommended to use the forms 
+"Republic of XXX" or "XXX Republic" - the form "XXX" should be used instead.
+The only exception is "United Kingdom".
+
+If the layout is language-based, this has to be the name of the language.
+
+Within single symbols file, all the variants should have the same group name 
+(implemented using the "include" directive wherever possible).
diff --git a/xorg-server/xkeyboard-config/docs/iso15924.csv b/xorg-server/xkeyboard-config/docs/iso15924.csv
index 0c751839b..60ee4ed9f 100644
--- a/xorg-server/xkeyboard-config/docs/iso15924.csv
+++ b/xorg-server/xkeyboard-config/docs/iso15924.csv
@@ -1,105 +1,105 @@
-Code,N°,"English Name","Nom français","Property Value Alias",Date
-Arab,160,Arabic,arabe,Arabic,38108
-Armn,230,Armenian,arménien,Armenian,38108
-Bali,360,Balinese,balinais,,38136
-Batk,365,Batak,batak,,38108
-Beng,325,Bengali,bengalî,Bengali,38108
-Blis,550,Blissymbols,"symboles Bliss",,38108
-Bopo,285,Bopomofo,bopomofo,Bopomofo,38108
-Brah,300,Brahmi,brâhmî,,38108
-Brai,570,Braille,braille,Braille,38108
-Bugi,367,Buginese,bouguis,,38108
-Buhd,372,Buhid,bouhide,Buhid,38108
-Cans,440,"Unified Canadian Aboriginal Syllabics","syllabaire autochtone canadien unifié",Canadian_Aboriginal,38136
-Cham,358,Cham,"cham (čam, tcham)",,38108
-Cher,445,Cherokee,tchérokî,Cherokee,38108
-Cirt,291,Cirth,cirth,,38108
-Copt,204,Coptic,copte,,38136
-Cprt,403,Cypriot,"syllabaire chypriote",Cypriot,38108
-Cyrl,220,Cyrillic,cyrillique,Cyrillic,38108
-Cyrs,221,"Cyrillic (Old Church Slavonic variant)","cyrillique (variante slavonne)",,38108
-Deva,315,"Devanagari (Nagari)",dévanâgarî,Devanagari,38108
-Dsrt,250,"Deseret (Mormon)","déseret (mormon)",Deseret,38108
-Egyd,70,"Egyptian demotic","démotique égyptien",,38108
-Egyh,60,"Egyptian hieratic","hiératique égyptien",,38108
-Egyp,50,"Egyptian hieroglyphs","hiéroglyphes égyptiens",,38108
-Ethi,430,"Ethiopic (Ge‘ez)","éthiopique (éthiopien, ge‘ez, guèze)",Ethiopic,38136
-Geor,240,"Georgian (Mkhedruli)","géorgien (mkhédrouli)",Georgian,38136
-Glag,225,Glagolitic,glagolitique,,38108
-Goth,206,Gothic,gotique,Gothic,38108
-Grek,200,Greek,grec,Greek,38108
-Gujr,320,Gujarati,"goudjarâtî (gujrâtî)",Gujarati,38108
-Guru,310,Gurmukhi,gourmoukhî,Gurmukhi,38108
-Hang,286,"Hangul (Hangŭl, Hangeul)","hangûl (hangŭl, hangeul)",Hangul,38136
-Hani,500,"Han (Hanzi, Kanji, Hanja)","idéogrammes han",Han,38108
-Hano,371,"Hanunoo (Hanunóo)",hanounóo,Hanunoo,38136
-Hans,501,"Han (Simplified variant)","idéogrammes han (variante simplifiée)",,38136
-Hant,502,"Han (Traditional variant)","idéogrammes han (variante traditionnelle)",,38136
-Hebr,125,Hebrew,hébreu,Hebrew,38108
-Hira,410,Hiragana,hiragana,Hiragana,38108
-Hmng,450,"Pahawh Hmong","pahawh hmong",,38108
-Hrkt,412,"(alias for Hiragana + Katakana)","(alias pour hiragana + katakana)",Katakana_Or_Hiragana,38108
-Hung,176,"Old Hungarian","ancien hongrois",,38108
-Inds,610,"Indus (Harappan)",indus,,38108
-Ital,210,"Old Italic (Etruscan, Oscan, etc.)","ancien italique (étrusque, osque, etc.)",Old_Italic,38136
-Java,361,Javanese,javanais,,38136
-Kali,357,"Kayah Li","kayah li",,38108
-Kana,411,Katakana,katakana,Katakana,38108
-Khar,305,Kharoshthi,kharochthî,,38136
-Khmr,355,Khmer,khmer,Khmer,38136
-Knda,345,Kannada,"kannara (canara)",Kannada,38136
-Laoo,356,Lao,laotien,Lao,38108
-Latf,217,"Latin (Fraktur variant)","latin (variante brisée)",,38108
-Latg,216,"Latin (Gaelic variant)","latin (variante gaélique)",,38108
-Latn,215,Latin,latin,Latin,38108
-Lepc,335,"Lepcha (Róng)","lepcha (róng)",,38108
-Limb,336,Limbu,limbou,Limbu,38136
-Lina,400,"Linear A","linéaire A",,38108
-Linb,401,"Linear B","linéaire B",Linear_B,38136
-Mand,140,Mandaean,mandéen,,38136
-Maya,90,"Mayan hieroglyphs","hiéroglyphes mayas",,38108
-Mero,100,Meroitic,méroïtique,,38108
-Mlym,347,Malayalam,malayâlam,Malayalam,38108
-Mong,145,Mongolian,mongol,Mongolian,38108
-Mymr,350,"Myanmar (Burmese)",birman,Myanmar,38108
-Ogam,212,Ogham,ogam,Ogham,38108
-Orkh,175,Orkhon,orkhon,,38108
-Orya,327,Oriya,oriyâ,Oriya,38108
-Osma,260,Osmanya,osmanais,Osmanya,38108
-Perm,227,"Old Permic","ancien permien",,38108
-Phag,331,Phags-pa,"’phags pa",,38136
-Phnx,115,Phoenician,phénicien,,38108
-Plrd,282,"Pollard Phonetic","phonétique de Pollard",,38108
-Qaaa,900,"Reserved for private use (start)","réservé à l’usage privé (début)",,38136
-Qabx,949,"Reserved for private use (end)","réservé à l’usage privé (fin)",,38136
-Roro,620,Rongorongo,rongorongo,,38108
-Runr,211,Runic,runique,Runic,38108
-Sara,292,Sarati,sarati,,38136
-Shaw,281,"Shavian (Shaw)","shavien (Shaw)",Shavian,38108
-Sinh,348,Sinhala,singhalais,Sinhala,38108
-Sylo,316,"Syloti Nagri","sylotî nâgrî",,38136
-Syrc,135,Syriac,syriaque,Syriac,38108
-Syre,138,"Syriac (Estrangelo variant)","syriaque (variante estranghélo)",,38108
-Syrj,137,"Syriac (Western variant)","syriaque (variante occidentale)",,38108
-Syrn,136,"Syriac (Eastern variant)","syriaque (variante orientale)",,38108
-Tagb,373,Tagbanwa,tagbanoua,Tagbanwa,38108
-Tale,353,"Tai Le","taï le",Tai_Le,38136
-Talu,354,"Tai Lue","taï lue",,38136
-Taml,346,Tamil,tamoul,Tamil,38108
-Telu,340,Telugu,télougou,Telugu,38108
-Teng,290,Tengwar,tengwar,,38108
-Tfng,120,"Tifinagh (Berber)","tifinagh (berbère)",,38108
-Tglg,370,Tagalog,tagal,Tagalog,38108
-Thaa,170,Thaana,thâna,Thaana,38108
-Thai,352,Thai,thaï,Thai,38108
-Tibt,330,Tibetan,tibétain,Tibetan,38108
-Ugar,40,Ugaritic,ougaritique,Ugaritic,38108
-Vaii,470,Vai,vaï,,38108
-Visp,280,"Visible Speech","parole visible",,38108
-Xpeo,30,"Old Persian","cunéiforme persépolitain",,38108
-Xsux,20,"Cuneiform, Sumero-Akkadian","cunéiforme suméro-akkadien",,38108
-Yiii,460,Yi,yi,Yi,38108
-Zxxx,997,"Code for unwritten languages","codet pour les langues non écrites",,38108
-Zyyy,998,"Code for undetermined script","codet pour écriture indéterminée",Common,38136
-Zzzz,999,"Code for uncoded script","codet pour écriture non codée",,38108
-Code,N°,"English Name","Nom français","Property Value Alias",Date
+Code,N°,"English Name","Nom français","Property Value Alias",Date
+Arab,160,Arabic,arabe,Arabic,38108
+Armn,230,Armenian,arménien,Armenian,38108
+Bali,360,Balinese,balinais,,38136
+Batk,365,Batak,batak,,38108
+Beng,325,Bengali,bengalî,Bengali,38108
+Blis,550,Blissymbols,"symboles Bliss",,38108
+Bopo,285,Bopomofo,bopomofo,Bopomofo,38108
+Brah,300,Brahmi,brâhmî,,38108
+Brai,570,Braille,braille,Braille,38108
+Bugi,367,Buginese,bouguis,,38108
+Buhd,372,Buhid,bouhide,Buhid,38108
+Cans,440,"Unified Canadian Aboriginal Syllabics","syllabaire autochtone canadien unifié",Canadian_Aboriginal,38136
+Cham,358,Cham,"cham (čam, tcham)",,38108
+Cher,445,Cherokee,tchérokî,Cherokee,38108
+Cirt,291,Cirth,cirth,,38108
+Copt,204,Coptic,copte,,38136
+Cprt,403,Cypriot,"syllabaire chypriote",Cypriot,38108
+Cyrl,220,Cyrillic,cyrillique,Cyrillic,38108
+Cyrs,221,"Cyrillic (Old Church Slavonic variant)","cyrillique (variante slavonne)",,38108
+Deva,315,"Devanagari (Nagari)",dévanâgarî,Devanagari,38108
+Dsrt,250,"Deseret (Mormon)","déseret (mormon)",Deseret,38108
+Egyd,70,"Egyptian demotic","démotique égyptien",,38108
+Egyh,60,"Egyptian hieratic","hiératique égyptien",,38108
+Egyp,50,"Egyptian hieroglyphs","hiéroglyphes égyptiens",,38108
+Ethi,430,"Ethiopic (Ge‘ez)","éthiopique (éthiopien, ge‘ez, guèze)",Ethiopic,38136
+Geor,240,"Georgian (Mkhedruli)","géorgien (mkhédrouli)",Georgian,38136
+Glag,225,Glagolitic,glagolitique,,38108
+Goth,206,Gothic,gotique,Gothic,38108
+Grek,200,Greek,grec,Greek,38108
+Gujr,320,Gujarati,"goudjarâtî (gujrâtî)",Gujarati,38108
+Guru,310,Gurmukhi,gourmoukhî,Gurmukhi,38108
+Hang,286,"Hangul (Hangŭl, Hangeul)","hangûl (hangŭl, hangeul)",Hangul,38136
+Hani,500,"Han (Hanzi, Kanji, Hanja)","idéogrammes han",Han,38108
+Hano,371,"Hanunoo (Hanunóo)",hanounóo,Hanunoo,38136
+Hans,501,"Han (Simplified variant)","idéogrammes han (variante simplifiée)",,38136
+Hant,502,"Han (Traditional variant)","idéogrammes han (variante traditionnelle)",,38136
+Hebr,125,Hebrew,hébreu,Hebrew,38108
+Hira,410,Hiragana,hiragana,Hiragana,38108
+Hmng,450,"Pahawh Hmong","pahawh hmong",,38108
+Hrkt,412,"(alias for Hiragana + Katakana)","(alias pour hiragana + katakana)",Katakana_Or_Hiragana,38108
+Hung,176,"Old Hungarian","ancien hongrois",,38108
+Inds,610,"Indus (Harappan)",indus,,38108
+Ital,210,"Old Italic (Etruscan, Oscan, etc.)","ancien italique (étrusque, osque, etc.)",Old_Italic,38136
+Java,361,Javanese,javanais,,38136
+Kali,357,"Kayah Li","kayah li",,38108
+Kana,411,Katakana,katakana,Katakana,38108
+Khar,305,Kharoshthi,kharochthî,,38136
+Khmr,355,Khmer,khmer,Khmer,38136
+Knda,345,Kannada,"kannara (canara)",Kannada,38136
+Laoo,356,Lao,laotien,Lao,38108
+Latf,217,"Latin (Fraktur variant)","latin (variante brisée)",,38108
+Latg,216,"Latin (Gaelic variant)","latin (variante gaélique)",,38108
+Latn,215,Latin,latin,Latin,38108
+Lepc,335,"Lepcha (Róng)","lepcha (róng)",,38108
+Limb,336,Limbu,limbou,Limbu,38136
+Lina,400,"Linear A","linéaire A",,38108
+Linb,401,"Linear B","linéaire B",Linear_B,38136
+Mand,140,Mandaean,mandéen,,38136
+Maya,90,"Mayan hieroglyphs","hiéroglyphes mayas",,38108
+Mero,100,Meroitic,méroïtique,,38108
+Mlym,347,Malayalam,malayâlam,Malayalam,38108
+Mong,145,Mongolian,mongol,Mongolian,38108
+Mymr,350,"Myanmar (Burmese)",birman,Myanmar,38108
+Ogam,212,Ogham,ogam,Ogham,38108
+Orkh,175,Orkhon,orkhon,,38108
+Orya,327,Oriya,oriyâ,Oriya,38108
+Osma,260,Osmanya,osmanais,Osmanya,38108
+Perm,227,"Old Permic","ancien permien",,38108
+Phag,331,Phags-pa,"’phags pa",,38136
+Phnx,115,Phoenician,phénicien,,38108
+Plrd,282,"Pollard Phonetic","phonétique de Pollard",,38108
+Qaaa,900,"Reserved for private use (start)","réservé à l’usage privé (début)",,38136
+Qabx,949,"Reserved for private use (end)","réservé à l’usage privé (fin)",,38136
+Roro,620,Rongorongo,rongorongo,,38108
+Runr,211,Runic,runique,Runic,38108
+Sara,292,Sarati,sarati,,38136
+Shaw,281,"Shavian (Shaw)","shavien (Shaw)",Shavian,38108
+Sinh,348,Sinhala,singhalais,Sinhala,38108
+Sylo,316,"Syloti Nagri","sylotî nâgrî",,38136
+Syrc,135,Syriac,syriaque,Syriac,38108
+Syre,138,"Syriac (Estrangelo variant)","syriaque (variante estranghélo)",,38108
+Syrj,137,"Syriac (Western variant)","syriaque (variante occidentale)",,38108
+Syrn,136,"Syriac (Eastern variant)","syriaque (variante orientale)",,38108
+Tagb,373,Tagbanwa,tagbanoua,Tagbanwa,38108
+Tale,353,"Tai Le","taï le",Tai_Le,38136
+Talu,354,"Tai Lue","taï lue",,38136
+Taml,346,Tamil,tamoul,Tamil,38108
+Telu,340,Telugu,télougou,Telugu,38108
+Teng,290,Tengwar,tengwar,,38108
+Tfng,120,"Tifinagh (Berber)","tifinagh (berbère)",,38108
+Tglg,370,Tagalog,tagal,Tagalog,38108
+Thaa,170,Thaana,thâna,Thaana,38108
+Thai,352,Thai,thaï,Thai,38108
+Tibt,330,Tibetan,tibétain,Tibetan,38108
+Ugar,40,Ugaritic,ougaritique,Ugaritic,38108
+Vaii,470,Vai,vaï,,38108
+Visp,280,"Visible Speech","parole visible",,38108
+Xpeo,30,"Old Persian","cunéiforme persépolitain",,38108
+Xsux,20,"Cuneiform, Sumero-Akkadian","cunéiforme suméro-akkadien",,38108
+Yiii,460,Yi,yi,Yi,38108
+Zxxx,997,"Code for unwritten languages","codet pour les langues non écrites",,38108
+Zyyy,998,"Code for undetermined script","codet pour écriture indéterminée",Common,38136
+Zzzz,999,"Code for uncoded script","codet pour écriture non codée",,38108
+Code,N°,"English Name","Nom français","Property Value Alias",Date
diff --git a/xorg-server/xkeyboard-config/docs/iso3166-3.csv b/xorg-server/xkeyboard-config/docs/iso3166-3.csv
index 0e5a44e17..e0ecb96ca 100644
--- a/xorg-server/xkeyboard-config/docs/iso3166-3.csv
+++ b/xorg-server/xkeyboard-config/docs/iso3166-3.csv
@@ -1,246 +1,246 @@
-ABW 	Aruba
-AFG 	Afghanistan
-AGO 	Angola
-AIA 	Anguilla
-ALA 	Åland Islands
-ALB 	Albania
-AND 	Andorra
-ANT 	Netherlands Antilles
-ARE 	United Arab Emirates
-ARG 	Argentina
-ARM 	Armenia
-ASM 	American Samoa
-ATA 	Antarctica
-ATF 	French Southern Territories
-ATG 	Antigua and Barbuda
-AUS 	Australia
-AUT 	Austria
-AZE 	Azerbaijan
-BDI 	Burundi
-BEL 	Belgium
-BEN 	Benin
-BFA 	Burkina Faso
-BGD 	Bangladesh
-BGR 	Bulgaria
-BHR 	Bahrain
-BHS 	Bahamas
-BIH 	Bosnia and Herzegovina
-BLM 	Saint Barthélemy
-BLR 	Belarus
-BLZ 	Belize
-BMU 	Bermuda
-BOL 	Bolivia, Plurinational State of
-BRA 	Brazil
-BRB 	Barbados
-BRN 	Brunei Darussalam
-BTN 	Bhutan
-BVT 	Bouvet Island
-BWA 	Botswana
-CAF 	Central African Republic
-CAN 	Canada
-CCK 	Cocos (Keeling) Islands
-CHE 	Switzerland
-CHL 	Chile
-CHN 	China
-CIV 	Côte d'Ivoire
-CMR 	Cameroon
-COD 	Congo, the Democratic Republic of the
-COG 	Congo
-COK 	Cook Islands
-COL 	Colombia
-COM 	Comoros
-CPV 	Cape Verde
-CRI 	Costa Rica
-CUB 	Cuba
-CXR 	Christmas Island
-CYM 	Cayman Islands
-CYP 	Cyprus
-CZE 	Czech Republic
-DEU 	Germany
-DJI 	Djibouti
-DMA 	Dominica
-DNK 	Denmark
-DOM 	Dominican Republic
-DZA 	Algeria
-ECU 	Ecuador
-EGY 	Egypt
-ERI 	Eritrea
-ESH 	Western Sahara
-ESP 	Spain
-EST 	Estonia
-ETH 	Ethiopia
-FIN 	Finland
-FJI 	Fiji
-FLK 	Falkland Islands (Malvinas)
-FRA 	France
-FRO 	Faroe Islands
-FSM 	Micronesia, Federated States of
-GAB 	Gabon
-GBR 	United Kingdom
-GEO 	Georgia
-GGY 	Guernsey
-GHA 	Ghana
-GIB 	Gibraltar
-GIN 	Guinea
-GLP 	Guadeloupe
-GMB 	Gambia
-GNB 	Guinea-Bissau
-GNQ 	Equatorial Guinea
-GRC 	Greece
-GRD 	Grenada
-GRL 	Greenland
-GTM 	Guatemala
-GUF 	French Guiana
-GUM 	Guam
-GUY 	Guyana
-HKG 	Hong Kong
-HMD 	Heard Island and McDonald Islands
-HND 	Honduras
-HRV 	Croatia
-HTI 	Haiti
-HUN 	Hungary
-IDN 	Indonesia
-IMN 	Isle of Man
-IND 	India
-IOT 	British Indian Ocean Territory
-IRL 	Ireland
-IRN 	Iran, Islamic Republic of
-IRQ 	Iraq
-ISL 	Iceland
-ISR 	Israel
-ITA 	Italy
-JAM 	Jamaica
-JEY 	Jersey
-JOR 	Jordan
-JPN 	Japan
-KAZ 	Kazakhstan
-KEN 	Kenya
-KGZ 	Kyrgyzstan
-KHM 	Cambodia
-KIR 	Kiribati
-KNA 	Saint Kitts and Nevis
-KOR 	Korea, Republic of
-KWT 	Kuwait
-LAO 	Lao People's Democratic Republic
-LBN 	Lebanon
-LBR 	Liberia
-LBY 	Libyan Arab Jamahiriya
-LCA 	Saint Lucia
-LIE 	Liechtenstein
-LKA 	Sri Lanka
-LSO 	Lesotho
-LTU 	Lithuania
-LUX 	Luxembourg
-LVA 	Latvia
-MAC 	Macao
-MAF 	Saint Martin (French part)
-MAR 	Morocco
-MCO 	Monaco
-MDA 	Moldova, Republic of
-MDG 	Madagascar
-MDV 	Maldives
-MEX 	Mexico
-MHL 	Marshall Islands
-MKD 	Macedonia, the former Yugoslav Republic of
-MLI 	Mali
-MLT 	Malta
-MMR 	Myanmar
-MNE 	Montenegro
-MNG 	Mongolia
-MNP 	Northern Mariana Islands
-MOZ 	Mozambique
-MRT 	Mauritania
-MSR 	Montserrat
-MTQ 	Martinique
-MUS 	Mauritius
-MWI 	Malawi
-MYS 	Malaysia
-MYT 	Mayotte
-NAM 	Namibia
-NCL 	New Caledonia
-NER 	Niger
-NFK 	Norfolk Island
-NGA 	Nigeria
-NIC 	Nicaragua
-NIU 	Niue
-NLD 	Netherlands
-NOR 	Norway
-NPL 	Nepal
-NRU 	Nauru
-NZL 	New Zealand
-OMN 	Oman
-PAK 	Pakistan
-PAN 	Panama
-PCN 	Pitcairn
-PER 	Peru
-PHL 	Philippines
-PLW 	Palau
-PNG 	Papua New Guinea
-POL 	Poland
-PRI 	Puerto Rico
-PRK 	Korea, Democratic People's Republic of
-PRT 	Portugal
-PRY 	Paraguay
-PSE 	Palestinian Territory, Occupied
-PYF 	French Polynesia
-QAT 	Qatar
-REU 	Réunion
-ROU 	Romania
-RUS 	Russian Federation
-RWA 	Rwanda
-SAU 	Saudi Arabia
-SDN 	Sudan
-SEN 	Senegal
-SGP 	Singapore
-SGS 	South Georgia and the South Sandwich Islands
-SHN 	Saint Helena, Ascension and Tristan da Cunha
-SJM 	Svalbard and Jan Mayen
-SLB 	Solomon Islands
-SLE 	Sierra Leone
-SLV 	El Salvador
-SMR 	San Marino
-SOM 	Somalia
-SPM 	Saint Pierre and Miquelon
-SRB 	Serbia
-STP 	Sao Tome and Principe
-SUR 	Suriname
-SVK 	Slovakia
-SVN 	Slovenia
-SWE 	Sweden
-SWZ 	Swaziland
-SYC 	Seychelles
-SYR 	Syrian Arab Republic
-TCA 	Turks and Caicos Islands
-TCD 	Chad
-TGO 	Togo
-THA 	Thailand
-TJK 	Tajikistan
-TKL 	Tokelau
-TKM 	Turkmenistan
-TLS 	Timor-Leste
-TON 	Tonga
-TTO 	Trinidad and Tobago
-TUN 	Tunisia
-TUR 	Turkey
-TUV 	Tuvalu
-TWN 	Taiwan, Province of China
-TZA 	Tanzania, United Republic of
-UGA 	Uganda
-UKR 	Ukraine
-UMI 	United States Minor Outlying Islands
-URY 	Uruguay
-USA 	United States
-UZB 	Uzbekistan
-VAT 	Holy See (Vatican City State)
-VCT 	Saint Vincent and the Grenadines
-VEN 	Venezuela, Bolivarian Republic of
-VGB 	Virgin Islands, British
-VIR 	Virgin Islands, U.S.
-VNM 	Viet Nam
-VUT 	Vanuatu
-WLF 	Wallis and Futuna
-WSM 	Samoa
-YEM 	Yemen
-ZAF 	South Africa
-ZMB 	Zambia
-ZWE 	Zimbabwe
+ABW 	Aruba
+AFG 	Afghanistan
+AGO 	Angola
+AIA 	Anguilla
+ALA 	Åland Islands
+ALB 	Albania
+AND 	Andorra
+ANT 	Netherlands Antilles
+ARE 	United Arab Emirates
+ARG 	Argentina
+ARM 	Armenia
+ASM 	American Samoa
+ATA 	Antarctica
+ATF 	French Southern Territories
+ATG 	Antigua and Barbuda
+AUS 	Australia
+AUT 	Austria
+AZE 	Azerbaijan
+BDI 	Burundi
+BEL 	Belgium
+BEN 	Benin
+BFA 	Burkina Faso
+BGD 	Bangladesh
+BGR 	Bulgaria
+BHR 	Bahrain
+BHS 	Bahamas
+BIH 	Bosnia and Herzegovina
+BLM 	Saint Barthélemy
+BLR 	Belarus
+BLZ 	Belize
+BMU 	Bermuda
+BOL 	Bolivia, Plurinational State of
+BRA 	Brazil
+BRB 	Barbados
+BRN 	Brunei Darussalam
+BTN 	Bhutan
+BVT 	Bouvet Island
+BWA 	Botswana
+CAF 	Central African Republic
+CAN 	Canada
+CCK 	Cocos (Keeling) Islands
+CHE 	Switzerland
+CHL 	Chile
+CHN 	China
+CIV 	Côte d'Ivoire
+CMR 	Cameroon
+COD 	Congo, the Democratic Republic of the
+COG 	Congo
+COK 	Cook Islands
+COL 	Colombia
+COM 	Comoros
+CPV 	Cape Verde
+CRI 	Costa Rica
+CUB 	Cuba
+CXR 	Christmas Island
+CYM 	Cayman Islands
+CYP 	Cyprus
+CZE 	Czech Republic
+DEU 	Germany
+DJI 	Djibouti
+DMA 	Dominica
+DNK 	Denmark
+DOM 	Dominican Republic
+DZA 	Algeria
+ECU 	Ecuador
+EGY 	Egypt
+ERI 	Eritrea
+ESH 	Western Sahara
+ESP 	Spain
+EST 	Estonia
+ETH 	Ethiopia
+FIN 	Finland
+FJI 	Fiji
+FLK 	Falkland Islands (Malvinas)
+FRA 	France
+FRO 	Faroe Islands
+FSM 	Micronesia, Federated States of
+GAB 	Gabon
+GBR 	United Kingdom
+GEO 	Georgia
+GGY 	Guernsey
+GHA 	Ghana
+GIB 	Gibraltar
+GIN 	Guinea
+GLP 	Guadeloupe
+GMB 	Gambia
+GNB 	Guinea-Bissau
+GNQ 	Equatorial Guinea
+GRC 	Greece
+GRD 	Grenada
+GRL 	Greenland
+GTM 	Guatemala
+GUF 	French Guiana
+GUM 	Guam
+GUY 	Guyana
+HKG 	Hong Kong
+HMD 	Heard Island and McDonald Islands
+HND 	Honduras
+HRV 	Croatia
+HTI 	Haiti
+HUN 	Hungary
+IDN 	Indonesia
+IMN 	Isle of Man
+IND 	India
+IOT 	British Indian Ocean Territory
+IRL 	Ireland
+IRN 	Iran, Islamic Republic of
+IRQ 	Iraq
+ISL 	Iceland
+ISR 	Israel
+ITA 	Italy
+JAM 	Jamaica
+JEY 	Jersey
+JOR 	Jordan
+JPN 	Japan
+KAZ 	Kazakhstan
+KEN 	Kenya
+KGZ 	Kyrgyzstan
+KHM 	Cambodia
+KIR 	Kiribati
+KNA 	Saint Kitts and Nevis
+KOR 	Korea, Republic of
+KWT 	Kuwait
+LAO 	Lao People's Democratic Republic
+LBN 	Lebanon
+LBR 	Liberia
+LBY 	Libyan Arab Jamahiriya
+LCA 	Saint Lucia
+LIE 	Liechtenstein
+LKA 	Sri Lanka
+LSO 	Lesotho
+LTU 	Lithuania
+LUX 	Luxembourg
+LVA 	Latvia
+MAC 	Macao
+MAF 	Saint Martin (French part)
+MAR 	Morocco
+MCO 	Monaco
+MDA 	Moldova, Republic of
+MDG 	Madagascar
+MDV 	Maldives
+MEX 	Mexico
+MHL 	Marshall Islands
+MKD 	Macedonia, the former Yugoslav Republic of
+MLI 	Mali
+MLT 	Malta
+MMR 	Myanmar
+MNE 	Montenegro
+MNG 	Mongolia
+MNP 	Northern Mariana Islands
+MOZ 	Mozambique
+MRT 	Mauritania
+MSR 	Montserrat
+MTQ 	Martinique
+MUS 	Mauritius
+MWI 	Malawi
+MYS 	Malaysia
+MYT 	Mayotte
+NAM 	Namibia
+NCL 	New Caledonia
+NER 	Niger
+NFK 	Norfolk Island
+NGA 	Nigeria
+NIC 	Nicaragua
+NIU 	Niue
+NLD 	Netherlands
+NOR 	Norway
+NPL 	Nepal
+NRU 	Nauru
+NZL 	New Zealand
+OMN 	Oman
+PAK 	Pakistan
+PAN 	Panama
+PCN 	Pitcairn
+PER 	Peru
+PHL 	Philippines
+PLW 	Palau
+PNG 	Papua New Guinea
+POL 	Poland
+PRI 	Puerto Rico
+PRK 	Korea, Democratic People's Republic of
+PRT 	Portugal
+PRY 	Paraguay
+PSE 	Palestinian Territory, Occupied
+PYF 	French Polynesia
+QAT 	Qatar
+REU 	Réunion
+ROU 	Romania
+RUS 	Russian Federation
+RWA 	Rwanda
+SAU 	Saudi Arabia
+SDN 	Sudan
+SEN 	Senegal
+SGP 	Singapore
+SGS 	South Georgia and the South Sandwich Islands
+SHN 	Saint Helena, Ascension and Tristan da Cunha
+SJM 	Svalbard and Jan Mayen
+SLB 	Solomon Islands
+SLE 	Sierra Leone
+SLV 	El Salvador
+SMR 	San Marino
+SOM 	Somalia
+SPM 	Saint Pierre and Miquelon
+SRB 	Serbia
+STP 	Sao Tome and Principe
+SUR 	Suriname
+SVK 	Slovakia
+SVN 	Slovenia
+SWE 	Sweden
+SWZ 	Swaziland
+SYC 	Seychelles
+SYR 	Syrian Arab Republic
+TCA 	Turks and Caicos Islands
+TCD 	Chad
+TGO 	Togo
+THA 	Thailand
+TJK 	Tajikistan
+TKL 	Tokelau
+TKM 	Turkmenistan
+TLS 	Timor-Leste
+TON 	Tonga
+TTO 	Trinidad and Tobago
+TUN 	Tunisia
+TUR 	Turkey
+TUV 	Tuvalu
+TWN 	Taiwan, Province of China
+TZA 	Tanzania, United Republic of
+UGA 	Uganda
+UKR 	Ukraine
+UMI 	United States Minor Outlying Islands
+URY 	Uruguay
+USA 	United States
+UZB 	Uzbekistan
+VAT 	Holy See (Vatican City State)
+VCT 	Saint Vincent and the Grenadines
+VEN 	Venezuela, Bolivarian Republic of
+VGB 	Virgin Islands, British
+VIR 	Virgin Islands, U.S.
+VNM 	Viet Nam
+VUT 	Vanuatu
+WLF 	Wallis and Futuna
+WSM 	Samoa
+YEM 	Yemen
+ZAF 	South Africa
+ZMB 	Zambia
+ZWE 	Zimbabwe
diff --git a/xorg-server/xkeyboard-config/docs/iso3166.csv b/xorg-server/xkeyboard-config/docs/iso3166.csv
index f08b3da03..cf971e300 100644
--- a/xorg-server/xkeyboard-config/docs/iso3166.csv
+++ b/xorg-server/xkeyboard-config/docs/iso3166.csv
@@ -1,240 +1,240 @@
-AF,AFGHANISTAN
-AX,"ÅLAND ISLANDS"
-AL,ALBANIA
-DZ,ALGERIA
-AS,"AMERICAN SAMOA"
-AD,ANDORRA
-AO,ANGOLA
-AI,ANGUILLA
-AQ,ANTARCTICA
-AG,"ANTIGUA AND BARBUDA"
-AR,ARGENTINA
-AM,ARMENIA
-AW,ARUBA
-AU,AUSTRALIA
-AT,AUSTRIA
-AZ,AZERBAIJAN
-BS,BAHAMAS
-BH,BAHRAIN
-BD,BANGLADESH
-BB,BARBADOS
-BY,BELARUS
-BE,BELGIUM
-BZ,BELIZE
-BJ,BENIN
-BM,BERMUDA
-BT,BHUTAN
-BO,BOLIVIA
-BA,"BOSNIA AND HERZEGOVINA"
-BW,BOTSWANA
-BV,"BOUVET ISLAND"
-BR,BRAZIL
-IO,"BRITISH INDIAN OCEAN TERRITORY"
-BN,"BRUNEI DARUSSALAM"
-BG,BULGARIA
-BF,"BURKINA FASO"
-BI,BURUNDI
-KH,CAMBODIA
-CM,CAMEROON
-CA,CANADA
-CV,"CAPE VERDE"
-KY,"CAYMAN ISLANDS"
-CF,"CENTRAL AFRICAN REPUBLIC"
-TD,CHAD
-CL,CHILE
-CN,CHINA
-CX,"CHRISTMAS ISLAND"
-CC,"COCOS (KEELING) ISLANDS"
-CO,COLOMBIA
-KM,COMOROS
-CG,CONGO
-CD,"CONGO, THE DEMOCRATIC REPUBLIC OF THE"
-CK,"COOK ISLANDS"
-CR,"COSTA RICA"
-CI,"COTE D'IVOIRE"
-HR,CROATIA
-CU,CUBA
-CY,CYPRUS
-CZ,"CZECH REPUBLIC"
-DK,DENMARK
-DJ,DJIBOUTI
-DM,DOMINICA
-DO,"DOMINICAN REPUBLIC"
-EC,ECUADOR
-EG,EGYPT
-SV,"EL SALVADOR"
-GQ,"EQUATORIAL GUINEA"
-ER,ERITREA
-EE,ESTONIA
-ET,ETHIOPIA
-FK,"FALKLAND ISLANDS (MALVINAS)"
-FO,"FAROE ISLANDS"
-FJ,FIJI
-FI,FINLAND
-FR,FRANCE
-GF,"FRENCH GUIANA"
-PF,"FRENCH POLYNESIA"
-TF,"FRENCH SOUTHERN TERRITORIES"
-GA,GABON
-GM,GAMBIA
-GE,GEORGIA
-DE,GERMANY
-GH,GHANA
-GI,GIBRALTAR
-GR,GREECE
-GL,GREENLAND
-GD,GRENADA
-GP,GUADELOUPE
-GU,GUAM
-GT,GUATEMALA
-GN,GUINEA
-GW,GUINEA-BISSAU
-GY,GUYANA
-HT,HAITI
-HM,"HEARD ISLAND AND MCDONALD ISLANDS"
-VA,"HOLY SEE (VATICAN CITY STATE)"
-HN,HONDURAS
-HK,"HONG KONG"
-HU,HUNGARY
-IS,ICELAND
-IN,INDIA
-ID,INDONESIA
-IR,"IRAN, ISLAMIC REPUBLIC OF"
-IQ,IRAQ
-IE,IRELAND
-IL,ISRAEL
-IT,ITALY
-JM,JAMAICA
-JP,JAPAN
-JO,JORDAN
-KZ,KAZAKHSTAN
-KE,KENYA
-KI,KIRIBATI
-KP,"KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF"
-KR,"KOREA, REPUBLIC OF"
-KW,KUWAIT
-KG,KYRGYZSTAN
-LA,"LAO PEOPLE'S DEMOCRATIC REPUBLIC"
-LV,LATVIA
-LB,LEBANON
-LS,LESOTHO
-LR,LIBERIA
-LY,"LIBYAN ARAB JAMAHIRIYA"
-LI,LIECHTENSTEIN
-LT,LITHUANIA
-LU,LUXEMBOURG
-MO,MACAO
-MK,"MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF"
-MG,MADAGASCAR
-MW,MALAWI
-MY,MALAYSIA
-MV,MALDIVES
-ML,MALI
-MT,MALTA
-MH,"MARSHALL ISLANDS"
-MQ,MARTINIQUE
-MR,MAURITANIA
-MU,MAURITIUS
-YT,MAYOTTE
-MX,MEXICO
-FM,"MICRONESIA, FEDERATED STATES OF"
-MD,"MOLDOVA, REPUBLIC OF"
-MC,MONACO
-MN,MONGOLIA
-MS,MONTSERRAT
-MA,MOROCCO
-MZ,MOZAMBIQUE
-MM,MYANMAR
-NA,NAMIBIA
-NR,NAURU
-NP,NEPAL
-NL,NETHERLANDS
-AN,"NETHERLANDS ANTILLES"
-NC,"NEW CALEDONIA"
-NZ,"NEW ZEALAND"
-NI,NICARAGUA
-NE,NIGER
-NG,NIGERIA
-NU,NIUE
-NF,"NORFOLK ISLAND"
-MP,"NORTHERN MARIANA ISLANDS"
-NO,NORWAY
-OM,OMAN
-PK,PAKISTAN
-PW,PALAU
-PS,"PALESTINIAN TERRITORY, OCCUPIED"
-PA,PANAMA
-PG,"PAPUA NEW GUINEA"
-PY,PARAGUAY
-PE,PERU
-PH,PHILIPPINES
-PN,PITCAIRN
-PL,POLAND
-PT,PORTUGAL
-PR,"PUERTO RICO"
-QA,QATAR
-RE,REUNION
-RO,ROMANIA
-RU,"RUSSIAN FEDERATION"
-RW,RWANDA
-SH,"SAINT HELENA"
-KN,"SAINT KITTS AND NEVIS"
-LC,"SAINT LUCIA"
-PM,"SAINT PIERRE AND MIQUELON"
-VC,"SAINT VINCENT AND THE GRENADINES"
-WS,SAMOA
-SM,"SAN MARINO"
-ST,"SAO TOME AND PRINCIPE"
-SA,"SAUDI ARABIA"
-SN,SENEGAL
-CS,"SERBIA AND MONTENEGRO"
-SC,SEYCHELLES
-SL,"SIERRA LEONE"
-SG,SINGAPORE
-SK,SLOVAKIA
-SI,SLOVENIA
-SB,"SOLOMON ISLANDS"
-SO,SOMALIA
-ZA,"SOUTH AFRICA"
-GS,"SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS"
-ES,SPAIN
-LK,"SRI LANKA"
-SD,SUDAN
-SR,SURINAME
-SJ,"SVALBARD AND JAN MAYEN"
-SZ,SWAZILAND
-SE,SWEDEN
-CH,SWITZERLAND
-SY,"SYRIAN ARAB REPUBLIC"
-TW,"TAIWAN, PROVINCE OF CHINA"
-TJ,TAJIKISTAN
-TZ,"TANZANIA, UNITED REPUBLIC OF"
-TH,THAILAND
-TL,TIMOR-LESTE
-TG,TOGO
-TK,TOKELAU
-TO,TONGA
-TT,"TRINIDAD AND TOBAGO"
-TN,TUNISIA
-TR,TURKEY
-TM,TURKMENISTAN
-TC,"TURKS AND CAICOS ISLANDS"
-TV,TUVALU
-UG,UGANDA
-UA,UKRAINE
-AE,"UNITED ARAB EMIRATES"
-GB,"UNITED KINGDOM"
-US,"UNITED STATES"
-UM,"UNITED STATES MINOR OUTLYING ISLANDS"
-UY,URUGUAY
-UZ,UZBEKISTAN
-VU,VANUATU
-VE,VENEZUELA
-VN,"VIET NAM"
-VG,"VIRGIN ISLANDS, BRITISH"
-VI,"VIRGIN ISLANDS, U.S."
-WF,"WALLIS AND FUTUNA"
-EH,"WESTERN SAHARA"
-YE,YEMEN
-ZM,ZAMBIA
-ZW,ZIMBABWE
+AF,AFGHANISTAN
+AX,"ÅLAND ISLANDS"
+AL,ALBANIA
+DZ,ALGERIA
+AS,"AMERICAN SAMOA"
+AD,ANDORRA
+AO,ANGOLA
+AI,ANGUILLA
+AQ,ANTARCTICA
+AG,"ANTIGUA AND BARBUDA"
+AR,ARGENTINA
+AM,ARMENIA
+AW,ARUBA
+AU,AUSTRALIA
+AT,AUSTRIA
+AZ,AZERBAIJAN
+BS,BAHAMAS
+BH,BAHRAIN
+BD,BANGLADESH
+BB,BARBADOS
+BY,BELARUS
+BE,BELGIUM
+BZ,BELIZE
+BJ,BENIN
+BM,BERMUDA
+BT,BHUTAN
+BO,BOLIVIA
+BA,"BOSNIA AND HERZEGOVINA"
+BW,BOTSWANA
+BV,"BOUVET ISLAND"
+BR,BRAZIL
+IO,"BRITISH INDIAN OCEAN TERRITORY"
+BN,"BRUNEI DARUSSALAM"
+BG,BULGARIA
+BF,"BURKINA FASO"
+BI,BURUNDI
+KH,CAMBODIA
+CM,CAMEROON
+CA,CANADA
+CV,"CAPE VERDE"
+KY,"CAYMAN ISLANDS"
+CF,"CENTRAL AFRICAN REPUBLIC"
+TD,CHAD
+CL,CHILE
+CN,CHINA
+CX,"CHRISTMAS ISLAND"
+CC,"COCOS (KEELING) ISLANDS"
+CO,COLOMBIA
+KM,COMOROS
+CG,CONGO
+CD,"CONGO, THE DEMOCRATIC REPUBLIC OF THE"
+CK,"COOK ISLANDS"
+CR,"COSTA RICA"
+CI,"COTE D'IVOIRE"
+HR,CROATIA
+CU,CUBA
+CY,CYPRUS
+CZ,"CZECH REPUBLIC"
+DK,DENMARK
+DJ,DJIBOUTI
+DM,DOMINICA
+DO,"DOMINICAN REPUBLIC"
+EC,ECUADOR
+EG,EGYPT
+SV,"EL SALVADOR"
+GQ,"EQUATORIAL GUINEA"
+ER,ERITREA
+EE,ESTONIA
+ET,ETHIOPIA
+FK,"FALKLAND ISLANDS (MALVINAS)"
+FO,"FAROE ISLANDS"
+FJ,FIJI
+FI,FINLAND
+FR,FRANCE
+GF,"FRENCH GUIANA"
+PF,"FRENCH POLYNESIA"
+TF,"FRENCH SOUTHERN TERRITORIES"
+GA,GABON
+GM,GAMBIA
+GE,GEORGIA
+DE,GERMANY
+GH,GHANA
+GI,GIBRALTAR
+GR,GREECE
+GL,GREENLAND
+GD,GRENADA
+GP,GUADELOUPE
+GU,GUAM
+GT,GUATEMALA
+GN,GUINEA
+GW,GUINEA-BISSAU
+GY,GUYANA
+HT,HAITI
+HM,"HEARD ISLAND AND MCDONALD ISLANDS"
+VA,"HOLY SEE (VATICAN CITY STATE)"
+HN,HONDURAS
+HK,"HONG KONG"
+HU,HUNGARY
+IS,ICELAND
+IN,INDIA
+ID,INDONESIA
+IR,"IRAN, ISLAMIC REPUBLIC OF"
+IQ,IRAQ
+IE,IRELAND
+IL,ISRAEL
+IT,ITALY
+JM,JAMAICA
+JP,JAPAN
+JO,JORDAN
+KZ,KAZAKHSTAN
+KE,KENYA
+KI,KIRIBATI
+KP,"KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF"
+KR,"KOREA, REPUBLIC OF"
+KW,KUWAIT
+KG,KYRGYZSTAN
+LA,"LAO PEOPLE'S DEMOCRATIC REPUBLIC"
+LV,LATVIA
+LB,LEBANON
+LS,LESOTHO
+LR,LIBERIA
+LY,"LIBYAN ARAB JAMAHIRIYA"
+LI,LIECHTENSTEIN
+LT,LITHUANIA
+LU,LUXEMBOURG
+MO,MACAO
+MK,"MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF"
+MG,MADAGASCAR
+MW,MALAWI
+MY,MALAYSIA
+MV,MALDIVES
+ML,MALI
+MT,MALTA
+MH,"MARSHALL ISLANDS"
+MQ,MARTINIQUE
+MR,MAURITANIA
+MU,MAURITIUS
+YT,MAYOTTE
+MX,MEXICO
+FM,"MICRONESIA, FEDERATED STATES OF"
+MD,"MOLDOVA, REPUBLIC OF"
+MC,MONACO
+MN,MONGOLIA
+MS,MONTSERRAT
+MA,MOROCCO
+MZ,MOZAMBIQUE
+MM,MYANMAR
+NA,NAMIBIA
+NR,NAURU
+NP,NEPAL
+NL,NETHERLANDS
+AN,"NETHERLANDS ANTILLES"
+NC,"NEW CALEDONIA"
+NZ,"NEW ZEALAND"
+NI,NICARAGUA
+NE,NIGER
+NG,NIGERIA
+NU,NIUE
+NF,"NORFOLK ISLAND"
+MP,"NORTHERN MARIANA ISLANDS"
+NO,NORWAY
+OM,OMAN
+PK,PAKISTAN
+PW,PALAU
+PS,"PALESTINIAN TERRITORY, OCCUPIED"
+PA,PANAMA
+PG,"PAPUA NEW GUINEA"
+PY,PARAGUAY
+PE,PERU
+PH,PHILIPPINES
+PN,PITCAIRN
+PL,POLAND
+PT,PORTUGAL
+PR,"PUERTO RICO"
+QA,QATAR
+RE,REUNION
+RO,ROMANIA
+RU,"RUSSIAN FEDERATION"
+RW,RWANDA
+SH,"SAINT HELENA"
+KN,"SAINT KITTS AND NEVIS"
+LC,"SAINT LUCIA"
+PM,"SAINT PIERRE AND MIQUELON"
+VC,"SAINT VINCENT AND THE GRENADINES"
+WS,SAMOA
+SM,"SAN MARINO"
+ST,"SAO TOME AND PRINCIPE"
+SA,"SAUDI ARABIA"
+SN,SENEGAL
+CS,"SERBIA AND MONTENEGRO"
+SC,SEYCHELLES
+SL,"SIERRA LEONE"
+SG,SINGAPORE
+SK,SLOVAKIA
+SI,SLOVENIA
+SB,"SOLOMON ISLANDS"
+SO,SOMALIA
+ZA,"SOUTH AFRICA"
+GS,"SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS"
+ES,SPAIN
+LK,"SRI LANKA"
+SD,SUDAN
+SR,SURINAME
+SJ,"SVALBARD AND JAN MAYEN"
+SZ,SWAZILAND
+SE,SWEDEN
+CH,SWITZERLAND
+SY,"SYRIAN ARAB REPUBLIC"
+TW,"TAIWAN, PROVINCE OF CHINA"
+TJ,TAJIKISTAN
+TZ,"TANZANIA, UNITED REPUBLIC OF"
+TH,THAILAND
+TL,TIMOR-LESTE
+TG,TOGO
+TK,TOKELAU
+TO,TONGA
+TT,"TRINIDAD AND TOBAGO"
+TN,TUNISIA
+TR,TURKEY
+TM,TURKMENISTAN
+TC,"TURKS AND CAICOS ISLANDS"
+TV,TUVALU
+UG,UGANDA
+UA,UKRAINE
+AE,"UNITED ARAB EMIRATES"
+GB,"UNITED KINGDOM"
+US,"UNITED STATES"
+UM,"UNITED STATES MINOR OUTLYING ISLANDS"
+UY,URUGUAY
+UZ,UZBEKISTAN
+VU,VANUATU
+VE,VENEZUELA
+VN,"VIET NAM"
+VG,"VIRGIN ISLANDS, BRITISH"
+VI,"VIRGIN ISLANDS, U.S."
+WF,"WALLIS AND FUTUNA"
+EH,"WESTERN SAHARA"
+YE,YEMEN
+ZM,ZAMBIA
+ZW,ZIMBABWE
diff --git a/xorg-server/xkeyboard-config/docs/iso639.csv b/xorg-server/xkeyboard-config/docs/iso639.csv
index d582d8cc5..374f2104b 100644
--- a/xorg-server/xkeyboard-config/docs/iso639.csv
+++ b/xorg-server/xkeyboard-config/docs/iso639.csv
@@ -1,501 +1,501 @@
-Abkhazian,abkhaze,abk,ab
-Achinese,aceh,ace,
-Acoli,acoli,ach,
-Adangme,adangme,ada,
-"Adygei; Adyghe",adyghé,ady,
-"Adyghe; Adygei",adygh,ady,
-Afar,afar,aar,aa
-Afrihili,afrihili,afh,
-Afrikaans,afrikaans,afr,af
-"Afro-Asiatic (Other)","afro-asiatiques, autres langues",afa,
-Akan,akan,aka,ak
-Akkadian,akkadien,akk,
-Albanian,albanais,alb/sqi,sq
-Aleut,aléoute,ale,
-"Algonquian languages","algonquines, langues",alg,
-"Altaic (Other)","altaïques, autres langues",tut,
-Amharic,amharique,amh,am
-"Apache languages",apache,apa,
-Arabic,arabe,ara,ar
-Aragonese,aragonais,arg,an
-Aramaic,araméen,arc,
-Arapaho,arapaho,arp,
-Araucanian,araucan,arn,
-Arawak,arawak,arw,
-Armenian,arménien,arm/hye,hy
-"Artificial (Other)","artificielles, autres langues",art,
-Assamese,assamais,asm,as
-"Asturian; Bable","asturien; bable",ast,
-"Athapascan languages","athapascanes, langues",ath,
-"Australian languages","australiennes, langues",aus,
-"Austronesian (Other)","malayo-polynésiennes, autres langues",map,
-Avaric,avar,ava,av
-Avestan,avestique,ave,ae
-Awadhi,awadhi,awa,
-Aymara,aymara,aym,ay
-Azerbaijani,azéri,aze,az
-"Bable; Asturian","bable; asturien",ast,
-Balinese,balinais,ban,
-"Baltic (Other)","baltiques, autres langues",bat,
-Baluchi,baloutchi,bal,
-Bambara,bambara,bam,bm
-"Bamileke languages","bamilékés, langues",bai,
-Banda,banda,bad,
-"Bantu (Other)","bantoues, autres langues",bnt,
-Basa,basa,bas,
-Bashkir,bachkir,bak,ba
-Basque,basque,baq/eus,eu
-"Batak (Indonesia)","batak (Indonésie)",btk,
-Beja,bedja,bej,
-Belarusian,biélorusse,bel,be
-Bemba,bemba,bem,
-Bengali,bengali,ben,bn
-"Berber (Other)","berbères, autres langues",ber,
-Bhojpuri,bhojpuri,bho,
-Bihari,bihari,bih,bh
-Bikol,bikol,bik,
-"Bilin; Blin","bilen; blin",byn,
-Bini,bini,bin,
-Bislama,bichlamar,bis,bi
-"Blin; Bilin","blin; bilen",byn,
-"Bokmål, Norwegian; Norwegian Bokmål","bokmål, norvégien; bokmål norvégien",nob,nb
-Bosnian,bosniaque,bos,bs
-Braj,braj,bra,
-Breton,breton,bre,br
-Buginese,bugi,bug,
-Bulgarian,bulgare,bul,bg
-Buriat,bouriate,bua,
-Burmese,birman,bur/mya,my
-Caddo,caddo,cad,
-Carib,caribe,car,
-"Castilian; Spanish","castillan; espagnol",spa,es
-"Catalan; Valencian","catalan; valencien",cat,ca
-"Caucasian (Other)","caucasiennes, autres langues",cau,
-Cebuano,cebuano,ceb,
-"Celtic (Other)","celtiques, autres langues",cel,
-"Central American Indian (Other)","indiennes d'Amérique centrale, autres langues",cai,
-Chagatai,djaghataï,chg,
-"Chamic languages","chames, langues",cmc,
-Chamorro,chamorro,cha,ch
-Chechen,tchétchène,che,ce
-Cherokee,cherokee,chr,
-"Chewa; Chichewa; Nyanja","chewa, chichewa, nyanja",nya,ny
-Cheyenne,cheyenne,chy,
-Chibcha,chibcha,chb,
-"Chichewa; Chewa; Nyanja","chichewa; chewa; nyanja",nya,ny
-Chinese,chinois,chi/zho,zh
-"Chinook jargon","chinook, jargon",chn,
-Chipewyan,chipewyan,chp,
-Choctaw,choctaw,cho,
-"Chuang; Zhuang","chuang; zhuang",zha,za
-"Church Slavic; Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic","slavon d'église; vieux slave; slavon liturgique; vieux bulgare",chu,cu
-"Church Slavonic; Church Slavic; Old Slavonic; Old Bulgarian; Old Church Slavonic","slavon liturgique; slavon d'église; vieux slave; vieux bulgare",chu,cu
-Chuukese,chuuk,chk,
-Chuvash,tchouvache,chv,cv
-"Classical Nepal Bhasa; Classical Newari; Old Newari","newari classique",nwc,
-"Classical Newari; Old Newari; Classical Nepal Bhasa","newari classique",nwc,
-Coptic,copte,cop,
-Cornish,cornique,cor,kw
-Corsican,corse,cos,co
-Cree,cree,cre,cr
-Creek,muskogee,mus,
-"Creoles and pidgins (Other)","créoles et pidgins divers",crp,
-"Creoles and pidgins, English-based (Other)","créoles et pidgins anglais, autres",cpe,
-"Creoles and pidgins, French-based (Other)","créoles et pidgins français, autres",cpf,
-"Creoles and pidgins, Portuguese-based (Other)","créoles et pidgins portugais, autres",cpp,
-"Crimean Tatar; Crimean Turkish","tatar de Crimé",crh,
-"Crimean Turkish; Crimean Tatar","tatar de Crimé",crh,
-Croatian,croate,scr/hrv,hr
-"Cushitic (Other)","couchitiques, autres langues",cus,
-Czech,tchèque,cze/ces,cs
-Dakota,dakota,dak,
-Danish,danois,dan,da
-Dargwa,dargwa,dar,
-Dayak,dayak,day,
-Delaware,delaware,del,
-Dinka,dinka,din,
-Divehi,maldivien,div,dv
-Dogri,dogri,doi,
-Dogrib,dogrib,dgr,
-"Dravidian (Other)","dravidiennes, autres langues",dra,
-Duala,douala,dua,
-"Dutch; Flemish","néerlandais; flamand",dut/nld,nl
-"Dutch, Middle (ca. 1050-1350)","néerlandais moyen (ca. 1050-1350)",dum,
-Dyula,dioula,dyu,
-Dzongkha,dzongkha,dzo,dz
-Efik,efik,efi,
-"Egyptian (Ancient)",égyptien,egy,
-Ekajuk,ekajuk,eka,
-Elamite,élamite,elx,
-English,anglais,eng,en
-"English, Middle (1100-1500)","anglais moyen (1100-1500)",enm,
-"English, Old (ca.450-1100)","anglo-saxon (ca.450-1100)",ang,
-Erzya,erza,myv,
-Esperanto,espéranto,epo,eo
-Estonian,estonien,est,et
-Ewe,éwé,ewe,ee
-Ewondo,éwondo,ewo,
-Fang,fang,fan,
-Fanti,fanti,fat,
-Faroese,féroïen,fao,fo
-Fijian,fidjien,fij,fj
-Finnish,finnois,fin,fi
-"Finno-Ugrian (Other)","finno-ougriennes, autres langues",fiu,
-"Flemish; Dutch","flamand; néerlandais",dut/nld,nl
-Fon,fon,fon,
-French,français,fre/fra,fr
-"French, Middle (ca.1400-1600)","français moyen (1400-1600)",frm,
-"French, Old (842-ca.1400)","français ancien (842-ca.1400)",fro,
-Frisian,frison,fry,fy
-Friulian,frioulan,fur,
-Fulah,peul,ful,ff
-"Gaelic; Scottish Gaelic","gaélique; gaélique écossais",gla,gd
-Gallegan,galicien,glg,gl
-Ganda,ganda,lug,lg
-Gayo,gayo,gay,
-Gbaya,gbaya,gba,
-Geez,guèze,gez,
-Georgian,géorgien,geo/kat,ka
-German,allemand,ger/deu,de
-"German, Low; Saxon, Low; Low German; Low Saxon","allemand, bas; saxon, bas; bas allemand; bas saxon",nds,
-"German, Middle High (ca.1050-1500)","allemand, moyen haut (ca. 1050-1500)",gmh,
-"German, Old High (ca.750-1050)","allemand, vieux haut (ca. 750-1050)",goh,
-"Germanic (Other)","germaniques, autres langues",gem,
-"Gikuyu; Kikuyu",kikuyu,kik,ki
-Gilbertese,kiribati,gil,
-Gondi,gond,gon,
-Gorontalo,gorontalo,gor,
-Gothic,gothique,got,
-Grebo,grebo,grb,
-"Greek, Ancient (to 1453)","grec ancien (jusqu'à 1453)",grc,
-"Greek, Modern (1453-)","grec moderne (après 1453)",gre/ell,el
-"Greenlandic; Kalaallisut",groenlandais,kal,kl
-Guarani,guarani,grn,gn
-Gujarati,goudjrati,guj,gu
-Gwich´in,gwich´in,gwi,
-Haida,haida,hai,
-"Haitian; Haitian Creole","haïtien; créole haïtien",hat,ht
-"Haitian Creole; Haitian","créole haïtien; haïtien",hat,ht
-Hausa,haoussa,hau,ha
-Hawaiian,hawaïen,haw,
-Hebrew,hébreu,heb,he
-Herero,herero,her,hz
-Hiligaynon,hiligaynon,hil,
-Himachali,himachali,him,
-Hindi,hindi,hin,hi
-"Hiri Motu","hiri motu",hmo,ho
-Hittite,hittite,hit,
-Hmong,hmong,hmn,
-Hungarian,hongrois,hun,hu
-Hupa,hupa,hup,
-Icelandic,islandais,ice/isl,is
-Ido,ido,ido,io
-Igbo,igbo,ibo,ig
-Ijo,ijo,ijo,
-Iloko,ilocano,ilo,
-"Inari Sami","sami d'Inari",smn,
-"Indic (Other)","indo-aryennes, autres langues",inc,
-"Indo-European (Other)","indo-européennes, autres langues",ine,
-Indonesian,indonésien,ind,id
-Ingush,ingouche,inh,
-"Interlingua (International Auxiliary Language Association)","interlingua (langue auxiliaire internationale)",ina,ia
-Interlingue,interlingue,ile,ie
-Inuktitut,inuktitut,iku,iu
-Inupiaq,inupiaq,ipk,ik
-"Iranian (Other)","iraniennes, autres langues",ira,
-Irish,irlandais,gle,ga
-"Irish, Middle (900-1200)","irlandais moyen (900-1200)",mga,
-"Irish, Old (to 900)","irlandais ancien (jusqu'à 900)",sga,
-"Iroquoian languages","iroquoises, langues (famille)",iro,
-Italian,italien,ita,it
-Japanese,japonais,jpn,ja
-Javanese,javanais,jav,jv
-Judeo-Arabic,judéo-arabe,jrb,
-Judeo-Persian,judéo-persan,jpr,
-Kabyle,kabyle,kab,
-Kachin,kachin,kac,
-"Kalaallisut; Greenlandic",groenlandais,kal,kl
-Kalmyk,kalmouk,xal,
-Kamba,kamba,kam,
-Kannada,kannada,kan,kn
-Kanuri,kanouri,kau,kr
-Karachay-Balkar,"karatchaï balkar",krc,
-Kara-Kalpak,karakalpak,kaa,
-Karen,karen,kar,
-Kashmiri,kashmiri,kas,ks
-Kashubian,kachoube,csb,
-Kawi,kawi,kaw,
-Kazakh,kazakh,kaz,kk
-Khasi,khasi,kha,
-Khmer,khmer,khm,km
-"Khoisan (Other)","khoisan, autres langues",khi,
-Khotanese,khotanais,kho,
-"Kikuyu; Gikuyu",kikuyu,kik,ki
-Kimbundu,kimbundu,kmb,
-Kinyarwanda,rwanda,kin,rw
-Kirghiz,kirghize,kir,ky
-"Klingon; tlhlngan-Hol",klingon,tlh,
-Komi,komi,kom,kv
-Kongo,kongo,kon,kg
-Konkani,konkani,kok,
-Korean,coréen,kor,ko
-Kosraean,kosrae,kos,
-Kpelle,kpellé,kpe,
-Kru,krou,kro,
-"Kuanyama; Kwanyama","kuanyama; kwanyama",kua,kj
-Kumyk,koumyk,kum,
-Kurdish,kurde,kur,ku
-Kurukh,kurukh,kru,
-Kutenai,kutenai,kut,
-"Kwanyama, Kuanyama","kwanyama; kuanyama",kua,kj
-Ladino,judéo-espagnol,lad,
-Lahnda,lahnda,lah,
-Lamba,lamba,lam,
-Lao,lao,lao,lo
-Latin,latin,lat,la
-Latvian,letton,lav,lv
-"Letzeburgesch; Luxembourgish",luxembourgeois,ltz,lb
-Lezghian,lezghien,lez,
-"Limburgan; Limburger; Limburgish",limbourgeois,lim,li
-"Limburger; Limburgan; Limburgish;",limbourgeois,lim,li
-"Limburgish; Limburger; Limburgan",limbourgeois,lim,li
-Lingala,lingala,lin,ln
-Lithuanian,lituanien,lit,lt
-Lojban,lojban,jbo,
-"Low German; Low Saxon; German, Low; Saxon, Low","bas allemand; bas saxon; allemand, bas; saxon, bas",nds,
-"Low Saxon; Low German; Saxon, Low; German, Low","bas saxon; bas allemand; saxon, bas; allemand, bas",nds,
-"Lower Sorbian",bas-sorabe,dsb,
-Lozi,lozi,loz,
-Luba-Katanga,luba-katanga,lub,lu
-Luba-Lulua,luba-lulua,lua,
-Luiseno,luiseno,lui,
-"Lule Sami","sami de Lule",smj,
-Lunda,lunda,lun,
-"Luo (Kenya and Tanzania)","luo (Kenya et Tanzanie)",luo,
-Lushai,lushai,lus,
-"Luxembourgish; Letzeburgesch",luxembourgeois,ltz,lb
-Macedonian,macédonien,mac/mkd,mk
-Madurese,madourais,mad,
-Magahi,magahi,mag,
-Maithili,maithili,mai,
-Makasar,makassar,mak,
-Malagasy,malgache,mlg,mg
-Malay,malais,may/msa,ms
-Malayalam,malayalam,mal,ml
-Maltese,maltais,mlt,mt
-Manchu,mandchou,mnc,
-Mandar,mandar,mdr,
-Mandingo,mandingue,man,
-Manipuri,manipuri,mni,
-"Manobo languages","manobo, langues",mno,
-Manx,"manx; mannois",glv,gv
-Maori,maori,mao/mri,mi
-Marathi,marathe,mar,mr
-Mari,mari,chm,
-Marshallese,marshall,mah,mh
-Marwari,marvari,mwr,
-Masai,massaï,mas,
-"Mayan languages","maya, langues",myn,
-Mende,mendé,men,
-Micmac,micmac,mic,
-Minangkabau,minangkabau,min,
-"Miscellaneous languages","diverses, langues",mis,
-Mohawk,mohawk,moh,
-Moksha,moksa,mdf,
-Moldavian,moldave,mol,mo
-"Mon-Khmer (Other)","môn-khmer, autres langues",mkh,
-Mongo,mongo,lol,
-Mongolian,mongol,mon,mn
-Mossi,moré,mos,
-"Multiple languages",multilingue,mul,
-"Munda languages","mounda, langues",mun,
-Nahuatl,nahuatl,nah,
-Nauru,nauruan,nau,na
-"Navaho, Navajo",navaho,nav,nv
-"Navajo; Navaho",navaho,nav,nv
-"Ndebele, North","ndébélé du Nord",nde,nd
-"Ndebele, South","ndébélé du Sud",nbl,nr
-Ndonga,ndonga,ndo,ng
-Neapolitan,napolitain,nap,
-"Nepal Bhasa ; Newari","nepal bhasa ; newari",new,
-Nepali,népalais,nep,ne
-"Newari; Nepal Bhasa","newari; nepal bhasa",new,
-Nias,nias,nia,
-"Niger-Kordofanian (Other)","nigéro-congolaises, autres langues",nic,
-"Nilo-Saharan (Other)","nilo-sahariennes, autres langues",ssa,
-Niuean,niué,niu,
-Nogai,"nogaï; nogay",nog,
-"Norse, Old","norrois, vieux",non,
-"North American Indian (Other)","indiennes d'Amérique du Nord, autres langues",nai,
-"Northern Sami","sami du Nord",sme,se
-"North Ndebele","ndébélé du Nord",nde,nd
-Norwegian,norvégien,nor,no
-"Norwegian Bokmål; Bokmål, Norwegian","norvégien bokmål; bokmål, norvégien",nob,nb
-"Norwegian Nynorsk; Nynorsk, Norwegian","norvégien nynorsk; nynorsk, norvégien",nno,nn
-"Nubian languages","nubiennes, langues",nub,
-Nyamwezi,nyamwezi,nym,
-"Nyanja; Chichewa; Chewa","nyanja; chichewa; chewa",nya,ny
-Nyankole,nyankolé,nyn,
-"Nynorsk, Norwegian; Norwegian Nynorsk","nynorsk, norvégien; norvégien nynorsk",nno,nn
-Nyoro,nyoro,nyo,
-Nzima,nzema,nzi,
-"Occitan (post 1500); Provençal","occitan (après 1500); provençal",oci,oc
-Ojibwa,ojibwa,oji,oj
-"Old Bulgarian; Old Slavonic; Church Slavonic; Church Slavic; Old Church Slavonic","vieux bulgare; vieux slave; slavon liturgique; slavon d'église",chu,cu
-"Old Church Slavonic; Old Slavonic; Church Slavonic; Old Bulgarian; Church Slavic","vieux slave; slavon liturgique; vieux bulgare; slavon d'église",chu,cu
-"Old Newari; Classical Newari; Classical Nepal Bhasa","newari classique",nwc,
-"Old Slavonic; Church Slavonic; Old Bulgarian; Church Slavic; Old Church Slavonic","vieux slave; slavon liturgique; vieux bulgare; slavon d'église",chu,cu
-Oriya,oriya,ori,or
-Oromo,galla,orm,om
-Osage,osage,osa,
-"Ossetian; Ossetic",ossète,oss,os
-"Ossetic; Ossetian",ossète,oss,os
-"Otomian languages","otomangue, langues",oto,
-Pahlavi,pahlavi,pal,
-Palauan,palau,pau,
-Pali,pali,pli,pi
-Pampanga,pampangan,pam,
-Pangasinan,pangasinan,pag,
-"Panjabi; Punjabi",pendjabi,pan,pa
-Papiamento,papiamento,pap,
-"Papuan (Other)","papoues, autres langues",paa,
-Persian,persan,per/fas,fa
-"Persian, Old (ca.600-400 B.C.)","perse, vieux (ca. 600-400 av. J.-C.)",peo,
-"Philippine (Other)","philippines, autres langues",phi,
-Phoenician,phénicien,phn,
-Pohnpeian,pohnpei,pon,
-Polish,polonais,pol,pl
-Portuguese,portugais,por,pt
-"Prakrit languages",prâkrit,pra,
-"Provençal; Occitan (post 1500)","provençal; occitan (après 1500)",oci,oc
-"Provençal, Old (to 1500)","provençal ancien (jusqu'à 1500)",pro,
-"Punjabi; Panjabi",pendjabi,pan,pa
-Pushto,pachto,pus,ps
-Rajasthani,rajasthani,raj,
-Rapanui,rapanui,rap,
-Rarotongan,rarotonga,rar,
-"Reserved for local use","réservée à l'usage local",qaa-qtz,
-"Romance (Other)","romanes, autres langues",roa,
-Romanian,roumain,rum/ron,ro
-Romany,tsigane,rom,
-Rundi,rundi,run,rn
-Russian,russe,rus,ru
-"Salishan languages","salish, langues",sal,
-"Samaritan Aramaic",samaritain,sam,
-"Sami languages (Other)","sami, autres langues",smi,
-Samoan,samoan,smo,sm
-Sandawe,sandawe,sad,
-Sango,sango,sag,sg
-Sanskrit,sanskrit,san,sa
-Santali,santal,sat,
-Sardinian,sarde,srd,sc
-Sasak,sasak,sas,
-"Saxon, Low; German, Low; Low Saxon; Low German","saxon, bas; allemand, bas; bas saxon; bas allemand",nds,
-Scots,écossais,sco,
-"Scottish Gaelic; Gaelic","gaélique écossais; gaélique",gla,gd
-Selkup,selkoupe,sel,
-"Semitic (Other)","sémitiques, autres langues",sem,
-Serbian,serbe,scc/srp,sr
-Serer,sérère,srr,
-Shan,chan,shn,
-Shona,shona,sna,sn
-"Sichuan Yi","yi de Sichuan",iii,ii
-Sidamo,sidamo,sid,
-"Sign languages","langues des signes",sgn,
-Siksika,blackfoot,bla,
-Sindhi,sindhi,snd,sd
-Sinhalese,singhalais,sin,si
-"Sino-Tibetan (Other)","sino-tibétaines, autres langues",sit,
-"Siouan languages","sioux, langues",sio,
-"Skolt Sami","sami skolt",sms,
-"Slave (Athapascan)","esclave (athapascan)",den,
-"Slavic (Other)","slaves, autres langues",sla,
-Slovak,slovaque,slo/slk,sk
-Slovenian,slovène,slv,sl
-Sogdian,sogdien,sog,
-Somali,somali,som,so
-Songhai,songhai,son,
-Soninke,soninké,snk,
-"Sorbian languages","sorabes, langues",wen,
-"Sotho, Northern","sotho du Nord",nso,
-"Sotho, Southern","sotho du Sud",sot,st
-"South American Indian (Other)","indiennes d'Amérique du Sud, autres langues",sai,
-"Southern Sami","sami du Sud",sma,
-"South Ndebele","ndébélé du Sud",nbl,nr
-"Spanish; Castilian","espagnol; castillan",spa,es
-Sukuma,sukuma,suk,
-Sumerian,sumérien,sux,
-Sundanese,soundanais,sun,su
-Susu,soussou,sus,
-Swahili,swahili,swa,sw
-Swati,swati,ssw,ss
-Swedish,suédois,swe,sv
-Syriac,syriaque,syr,
-Tagalog,tagalog,tgl,tl
-Tahitian,tahitien,tah,ty
-"Tai (Other)","thaïes, autres langues",tai,
-Tajik,tadjik,tgk,tg
-Tamashek,tamacheq,tmh,
-Tamil,tamoul,tam,ta
-Tatar,tatar,tat,tt
-Telugu,télougou,tel,te
-Tereno,tereno,ter,
-Tetum,tetum,tet,
-Thai,thaï,tha,th
-Tibetan,tibétain,tib/bod,bo
-Tigre,tigré,tig,
-Tigrinya,tigrigna,tir,ti
-Timne,temne,tem,
-Tiv,tiv,tiv,
-"tlhlngan-Hol; Klingon",klingon,tlh,
-Tlingit,tlingit,tli,
-"Tok Pisin","tok pisin",tpi,
-Tokelau,tokelau,tkl,
-"Tonga (Nyasa)","tonga (Nyasa)",tog,
-"Tonga (Tonga Islands)","tongan (Îles Tonga)",ton,to
-Tsimshian,tsimshian,tsi,
-Tsonga,tsonga,tso,ts
-Tswana,tswana,tsn,tn
-Tumbuka,tumbuka,tum,
-"Tupi languages","tupi, langues",tup,
-Turkish,turc,tur,tr
-"Turkish, Ottoman (1500-1928)","turc ottoman (1500-1928)",ota,
-Turkmen,turkmène,tuk,tk
-Tuvalu,tuvalu,tvl,
-Tuvinian,touva,tyv,
-Twi,twi,twi,tw
-Udmurt,oudmourte,udm,
-Ugaritic,ougaritique,uga,
-Uighur,ouïgour,uig,ug
-Ukrainian,ukrainien,ukr,uk
-Umbundu,umbundu,umb,
-Undetermined,indéterminée,und,
-"Upper Sorbian",haut-sorabe,hsb,
-Urdu,ourdou,urd,ur
-Uzbek,ouszbek,uzb,uz
-Vai,vaï,vai,
-"Valencian; Catalan","valencien; catalan",cat,ca
-Venda,venda,ven,ve
-Vietnamese,vietnamien,vie,vi
-Volapük,volapük,vol,vo
-Votic,vote,vot,
-"Wakashan languages","wakashennes, langues",wak,
-Walamo,walamo,wal,
-Walloon,wallon,wln,wa
-Waray,waray,war,
-Washo,washo,was,
-Welsh,gallois,wel/cym,cy
-Wolof,wolof,wol,wo
-Xhosa,xhosa,xho,xh
-Yakut,iakoute,sah,
-Yao,yao,yao,
-Yapese,yapois,yap,
-Yiddish,yiddish,yid,yi
-Yoruba,yoruba,yor,yo
-"Yupik languages","yupik, langues",ypk,
-Zande,zandé,znd,
-Zapotec,zapotèque,zap,
-Zenaga,zenaga,zen,
-"Zhuang; Chuang","zhuang; chuang",zha,za
-Zulu,zoulou,zul,zu
-Zuni,zuni,zun,
+Abkhazian,abkhaze,abk,ab
+Achinese,aceh,ace,
+Acoli,acoli,ach,
+Adangme,adangme,ada,
+"Adygei; Adyghe",adyghé,ady,
+"Adyghe; Adygei",adygh,ady,
+Afar,afar,aar,aa
+Afrihili,afrihili,afh,
+Afrikaans,afrikaans,afr,af
+"Afro-Asiatic (Other)","afro-asiatiques, autres langues",afa,
+Akan,akan,aka,ak
+Akkadian,akkadien,akk,
+Albanian,albanais,alb/sqi,sq
+Aleut,aléoute,ale,
+"Algonquian languages","algonquines, langues",alg,
+"Altaic (Other)","altaïques, autres langues",tut,
+Amharic,amharique,amh,am
+"Apache languages",apache,apa,
+Arabic,arabe,ara,ar
+Aragonese,aragonais,arg,an
+Aramaic,araméen,arc,
+Arapaho,arapaho,arp,
+Araucanian,araucan,arn,
+Arawak,arawak,arw,
+Armenian,arménien,arm/hye,hy
+"Artificial (Other)","artificielles, autres langues",art,
+Assamese,assamais,asm,as
+"Asturian; Bable","asturien; bable",ast,
+"Athapascan languages","athapascanes, langues",ath,
+"Australian languages","australiennes, langues",aus,
+"Austronesian (Other)","malayo-polynésiennes, autres langues",map,
+Avaric,avar,ava,av
+Avestan,avestique,ave,ae
+Awadhi,awadhi,awa,
+Aymara,aymara,aym,ay
+Azerbaijani,azéri,aze,az
+"Bable; Asturian","bable; asturien",ast,
+Balinese,balinais,ban,
+"Baltic (Other)","baltiques, autres langues",bat,
+Baluchi,baloutchi,bal,
+Bambara,bambara,bam,bm
+"Bamileke languages","bamilékés, langues",bai,
+Banda,banda,bad,
+"Bantu (Other)","bantoues, autres langues",bnt,
+Basa,basa,bas,
+Bashkir,bachkir,bak,ba
+Basque,basque,baq/eus,eu
+"Batak (Indonesia)","batak (Indonésie)",btk,
+Beja,bedja,bej,
+Belarusian,biélorusse,bel,be
+Bemba,bemba,bem,
+Bengali,bengali,ben,bn
+"Berber (Other)","berbères, autres langues",ber,
+Bhojpuri,bhojpuri,bho,
+Bihari,bihari,bih,bh
+Bikol,bikol,bik,
+"Bilin; Blin","bilen; blin",byn,
+Bini,bini,bin,
+Bislama,bichlamar,bis,bi
+"Blin; Bilin","blin; bilen",byn,
+"Bokmål, Norwegian; Norwegian Bokmål","bokmål, norvégien; bokmål norvégien",nob,nb
+Bosnian,bosniaque,bos,bs
+Braj,braj,bra,
+Breton,breton,bre,br
+Buginese,bugi,bug,
+Bulgarian,bulgare,bul,bg
+Buriat,bouriate,bua,
+Burmese,birman,bur/mya,my
+Caddo,caddo,cad,
+Carib,caribe,car,
+"Castilian; Spanish","castillan; espagnol",spa,es
+"Catalan; Valencian","catalan; valencien",cat,ca
+"Caucasian (Other)","caucasiennes, autres langues",cau,
+Cebuano,cebuano,ceb,
+"Celtic (Other)","celtiques, autres langues",cel,
+"Central American Indian (Other)","indiennes d'Amérique centrale, autres langues",cai,
+Chagatai,djaghataï,chg,
+"Chamic languages","chames, langues",cmc,
+Chamorro,chamorro,cha,ch
+Chechen,tchétchène,che,ce
+Cherokee,cherokee,chr,
+"Chewa; Chichewa; Nyanja","chewa, chichewa, nyanja",nya,ny
+Cheyenne,cheyenne,chy,
+Chibcha,chibcha,chb,
+"Chichewa; Chewa; Nyanja","chichewa; chewa; nyanja",nya,ny
+Chinese,chinois,chi/zho,zh
+"Chinook jargon","chinook, jargon",chn,
+Chipewyan,chipewyan,chp,
+Choctaw,choctaw,cho,
+"Chuang; Zhuang","chuang; zhuang",zha,za
+"Church Slavic; Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic","slavon d'église; vieux slave; slavon liturgique; vieux bulgare",chu,cu
+"Church Slavonic; Church Slavic; Old Slavonic; Old Bulgarian; Old Church Slavonic","slavon liturgique; slavon d'église; vieux slave; vieux bulgare",chu,cu
+Chuukese,chuuk,chk,
+Chuvash,tchouvache,chv,cv
+"Classical Nepal Bhasa; Classical Newari; Old Newari","newari classique",nwc,
+"Classical Newari; Old Newari; Classical Nepal Bhasa","newari classique",nwc,
+Coptic,copte,cop,
+Cornish,cornique,cor,kw
+Corsican,corse,cos,co
+Cree,cree,cre,cr
+Creek,muskogee,mus,
+"Creoles and pidgins (Other)","créoles et pidgins divers",crp,
+"Creoles and pidgins, English-based (Other)","créoles et pidgins anglais, autres",cpe,
+"Creoles and pidgins, French-based (Other)","créoles et pidgins français, autres",cpf,
+"Creoles and pidgins, Portuguese-based (Other)","créoles et pidgins portugais, autres",cpp,
+"Crimean Tatar; Crimean Turkish","tatar de Crimé",crh,
+"Crimean Turkish; Crimean Tatar","tatar de Crimé",crh,
+Croatian,croate,scr/hrv,hr
+"Cushitic (Other)","couchitiques, autres langues",cus,
+Czech,tchèque,cze/ces,cs
+Dakota,dakota,dak,
+Danish,danois,dan,da
+Dargwa,dargwa,dar,
+Dayak,dayak,day,
+Delaware,delaware,del,
+Dinka,dinka,din,
+Divehi,maldivien,div,dv
+Dogri,dogri,doi,
+Dogrib,dogrib,dgr,
+"Dravidian (Other)","dravidiennes, autres langues",dra,
+Duala,douala,dua,
+"Dutch; Flemish","néerlandais; flamand",dut/nld,nl
+"Dutch, Middle (ca. 1050-1350)","néerlandais moyen (ca. 1050-1350)",dum,
+Dyula,dioula,dyu,
+Dzongkha,dzongkha,dzo,dz
+Efik,efik,efi,
+"Egyptian (Ancient)",égyptien,egy,
+Ekajuk,ekajuk,eka,
+Elamite,élamite,elx,
+English,anglais,eng,en
+"English, Middle (1100-1500)","anglais moyen (1100-1500)",enm,
+"English, Old (ca.450-1100)","anglo-saxon (ca.450-1100)",ang,
+Erzya,erza,myv,
+Esperanto,espéranto,epo,eo
+Estonian,estonien,est,et
+Ewe,éwé,ewe,ee
+Ewondo,éwondo,ewo,
+Fang,fang,fan,
+Fanti,fanti,fat,
+Faroese,féroïen,fao,fo
+Fijian,fidjien,fij,fj
+Finnish,finnois,fin,fi
+"Finno-Ugrian (Other)","finno-ougriennes, autres langues",fiu,
+"Flemish; Dutch","flamand; néerlandais",dut/nld,nl
+Fon,fon,fon,
+French,français,fre/fra,fr
+"French, Middle (ca.1400-1600)","français moyen (1400-1600)",frm,
+"French, Old (842-ca.1400)","français ancien (842-ca.1400)",fro,
+Frisian,frison,fry,fy
+Friulian,frioulan,fur,
+Fulah,peul,ful,ff
+"Gaelic; Scottish Gaelic","gaélique; gaélique écossais",gla,gd
+Gallegan,galicien,glg,gl
+Ganda,ganda,lug,lg
+Gayo,gayo,gay,
+Gbaya,gbaya,gba,
+Geez,guèze,gez,
+Georgian,géorgien,geo/kat,ka
+German,allemand,ger/deu,de
+"German, Low; Saxon, Low; Low German; Low Saxon","allemand, bas; saxon, bas; bas allemand; bas saxon",nds,
+"German, Middle High (ca.1050-1500)","allemand, moyen haut (ca. 1050-1500)",gmh,
+"German, Old High (ca.750-1050)","allemand, vieux haut (ca. 750-1050)",goh,
+"Germanic (Other)","germaniques, autres langues",gem,
+"Gikuyu; Kikuyu",kikuyu,kik,ki
+Gilbertese,kiribati,gil,
+Gondi,gond,gon,
+Gorontalo,gorontalo,gor,
+Gothic,gothique,got,
+Grebo,grebo,grb,
+"Greek, Ancient (to 1453)","grec ancien (jusqu'à 1453)",grc,
+"Greek, Modern (1453-)","grec moderne (après 1453)",gre/ell,el
+"Greenlandic; Kalaallisut",groenlandais,kal,kl
+Guarani,guarani,grn,gn
+Gujarati,goudjrati,guj,gu
+Gwich´in,gwich´in,gwi,
+Haida,haida,hai,
+"Haitian; Haitian Creole","haïtien; créole haïtien",hat,ht
+"Haitian Creole; Haitian","créole haïtien; haïtien",hat,ht
+Hausa,haoussa,hau,ha
+Hawaiian,hawaïen,haw,
+Hebrew,hébreu,heb,he
+Herero,herero,her,hz
+Hiligaynon,hiligaynon,hil,
+Himachali,himachali,him,
+Hindi,hindi,hin,hi
+"Hiri Motu","hiri motu",hmo,ho
+Hittite,hittite,hit,
+Hmong,hmong,hmn,
+Hungarian,hongrois,hun,hu
+Hupa,hupa,hup,
+Icelandic,islandais,ice/isl,is
+Ido,ido,ido,io
+Igbo,igbo,ibo,ig
+Ijo,ijo,ijo,
+Iloko,ilocano,ilo,
+"Inari Sami","sami d'Inari",smn,
+"Indic (Other)","indo-aryennes, autres langues",inc,
+"Indo-European (Other)","indo-européennes, autres langues",ine,
+Indonesian,indonésien,ind,id
+Ingush,ingouche,inh,
+"Interlingua (International Auxiliary Language Association)","interlingua (langue auxiliaire internationale)",ina,ia
+Interlingue,interlingue,ile,ie
+Inuktitut,inuktitut,iku,iu
+Inupiaq,inupiaq,ipk,ik
+"Iranian (Other)","iraniennes, autres langues",ira,
+Irish,irlandais,gle,ga
+"Irish, Middle (900-1200)","irlandais moyen (900-1200)",mga,
+"Irish, Old (to 900)","irlandais ancien (jusqu'à 900)",sga,
+"Iroquoian languages","iroquoises, langues (famille)",iro,
+Italian,italien,ita,it
+Japanese,japonais,jpn,ja
+Javanese,javanais,jav,jv
+Judeo-Arabic,judéo-arabe,jrb,
+Judeo-Persian,judéo-persan,jpr,
+Kabyle,kabyle,kab,
+Kachin,kachin,kac,
+"Kalaallisut; Greenlandic",groenlandais,kal,kl
+Kalmyk,kalmouk,xal,
+Kamba,kamba,kam,
+Kannada,kannada,kan,kn
+Kanuri,kanouri,kau,kr
+Karachay-Balkar,"karatchaï balkar",krc,
+Kara-Kalpak,karakalpak,kaa,
+Karen,karen,kar,
+Kashmiri,kashmiri,kas,ks
+Kashubian,kachoube,csb,
+Kawi,kawi,kaw,
+Kazakh,kazakh,kaz,kk
+Khasi,khasi,kha,
+Khmer,khmer,khm,km
+"Khoisan (Other)","khoisan, autres langues",khi,
+Khotanese,khotanais,kho,
+"Kikuyu; Gikuyu",kikuyu,kik,ki
+Kimbundu,kimbundu,kmb,
+Kinyarwanda,rwanda,kin,rw
+Kirghiz,kirghize,kir,ky
+"Klingon; tlhlngan-Hol",klingon,tlh,
+Komi,komi,kom,kv
+Kongo,kongo,kon,kg
+Konkani,konkani,kok,
+Korean,coréen,kor,ko
+Kosraean,kosrae,kos,
+Kpelle,kpellé,kpe,
+Kru,krou,kro,
+"Kuanyama; Kwanyama","kuanyama; kwanyama",kua,kj
+Kumyk,koumyk,kum,
+Kurdish,kurde,kur,ku
+Kurukh,kurukh,kru,
+Kutenai,kutenai,kut,
+"Kwanyama, Kuanyama","kwanyama; kuanyama",kua,kj
+Ladino,judéo-espagnol,lad,
+Lahnda,lahnda,lah,
+Lamba,lamba,lam,
+Lao,lao,lao,lo
+Latin,latin,lat,la
+Latvian,letton,lav,lv
+"Letzeburgesch; Luxembourgish",luxembourgeois,ltz,lb
+Lezghian,lezghien,lez,
+"Limburgan; Limburger; Limburgish",limbourgeois,lim,li
+"Limburger; Limburgan; Limburgish;",limbourgeois,lim,li
+"Limburgish; Limburger; Limburgan",limbourgeois,lim,li
+Lingala,lingala,lin,ln
+Lithuanian,lituanien,lit,lt
+Lojban,lojban,jbo,
+"Low German; Low Saxon; German, Low; Saxon, Low","bas allemand; bas saxon; allemand, bas; saxon, bas",nds,
+"Low Saxon; Low German; Saxon, Low; German, Low","bas saxon; bas allemand; saxon, bas; allemand, bas",nds,
+"Lower Sorbian",bas-sorabe,dsb,
+Lozi,lozi,loz,
+Luba-Katanga,luba-katanga,lub,lu
+Luba-Lulua,luba-lulua,lua,
+Luiseno,luiseno,lui,
+"Lule Sami","sami de Lule",smj,
+Lunda,lunda,lun,
+"Luo (Kenya and Tanzania)","luo (Kenya et Tanzanie)",luo,
+Lushai,lushai,lus,
+"Luxembourgish; Letzeburgesch",luxembourgeois,ltz,lb
+Macedonian,macédonien,mac/mkd,mk
+Madurese,madourais,mad,
+Magahi,magahi,mag,
+Maithili,maithili,mai,
+Makasar,makassar,mak,
+Malagasy,malgache,mlg,mg
+Malay,malais,may/msa,ms
+Malayalam,malayalam,mal,ml
+Maltese,maltais,mlt,mt
+Manchu,mandchou,mnc,
+Mandar,mandar,mdr,
+Mandingo,mandingue,man,
+Manipuri,manipuri,mni,
+"Manobo languages","manobo, langues",mno,
+Manx,"manx; mannois",glv,gv
+Maori,maori,mao/mri,mi
+Marathi,marathe,mar,mr
+Mari,mari,chm,
+Marshallese,marshall,mah,mh
+Marwari,marvari,mwr,
+Masai,massaï,mas,
+"Mayan languages","maya, langues",myn,
+Mende,mendé,men,
+Micmac,micmac,mic,
+Minangkabau,minangkabau,min,
+"Miscellaneous languages","diverses, langues",mis,
+Mohawk,mohawk,moh,
+Moksha,moksa,mdf,
+Moldavian,moldave,mol,mo
+"Mon-Khmer (Other)","môn-khmer, autres langues",mkh,
+Mongo,mongo,lol,
+Mongolian,mongol,mon,mn
+Mossi,moré,mos,
+"Multiple languages",multilingue,mul,
+"Munda languages","mounda, langues",mun,
+Nahuatl,nahuatl,nah,
+Nauru,nauruan,nau,na
+"Navaho, Navajo",navaho,nav,nv
+"Navajo; Navaho",navaho,nav,nv
+"Ndebele, North","ndébélé du Nord",nde,nd
+"Ndebele, South","ndébélé du Sud",nbl,nr
+Ndonga,ndonga,ndo,ng
+Neapolitan,napolitain,nap,
+"Nepal Bhasa ; Newari","nepal bhasa ; newari",new,
+Nepali,népalais,nep,ne
+"Newari; Nepal Bhasa","newari; nepal bhasa",new,
+Nias,nias,nia,
+"Niger-Kordofanian (Other)","nigéro-congolaises, autres langues",nic,
+"Nilo-Saharan (Other)","nilo-sahariennes, autres langues",ssa,
+Niuean,niué,niu,
+Nogai,"nogaï; nogay",nog,
+"Norse, Old","norrois, vieux",non,
+"North American Indian (Other)","indiennes d'Amérique du Nord, autres langues",nai,
+"Northern Sami","sami du Nord",sme,se
+"North Ndebele","ndébélé du Nord",nde,nd
+Norwegian,norvégien,nor,no
+"Norwegian Bokmål; Bokmål, Norwegian","norvégien bokmål; bokmål, norvégien",nob,nb
+"Norwegian Nynorsk; Nynorsk, Norwegian","norvégien nynorsk; nynorsk, norvégien",nno,nn
+"Nubian languages","nubiennes, langues",nub,
+Nyamwezi,nyamwezi,nym,
+"Nyanja; Chichewa; Chewa","nyanja; chichewa; chewa",nya,ny
+Nyankole,nyankolé,nyn,
+"Nynorsk, Norwegian; Norwegian Nynorsk","nynorsk, norvégien; norvégien nynorsk",nno,nn
+Nyoro,nyoro,nyo,
+Nzima,nzema,nzi,
+"Occitan (post 1500); Provençal","occitan (après 1500); provençal",oci,oc
+Ojibwa,ojibwa,oji,oj
+"Old Bulgarian; Old Slavonic; Church Slavonic; Church Slavic; Old Church Slavonic","vieux bulgare; vieux slave; slavon liturgique; slavon d'église",chu,cu
+"Old Church Slavonic; Old Slavonic; Church Slavonic; Old Bulgarian; Church Slavic","vieux slave; slavon liturgique; vieux bulgare; slavon d'église",chu,cu
+"Old Newari; Classical Newari; Classical Nepal Bhasa","newari classique",nwc,
+"Old Slavonic; Church Slavonic; Old Bulgarian; Church Slavic; Old Church Slavonic","vieux slave; slavon liturgique; vieux bulgare; slavon d'église",chu,cu
+Oriya,oriya,ori,or
+Oromo,galla,orm,om
+Osage,osage,osa,
+"Ossetian; Ossetic",ossète,oss,os
+"Ossetic; Ossetian",ossète,oss,os
+"Otomian languages","otomangue, langues",oto,
+Pahlavi,pahlavi,pal,
+Palauan,palau,pau,
+Pali,pali,pli,pi
+Pampanga,pampangan,pam,
+Pangasinan,pangasinan,pag,
+"Panjabi; Punjabi",pendjabi,pan,pa
+Papiamento,papiamento,pap,
+"Papuan (Other)","papoues, autres langues",paa,
+Persian,persan,per/fas,fa
+"Persian, Old (ca.600-400 B.C.)","perse, vieux (ca. 600-400 av. J.-C.)",peo,
+"Philippine (Other)","philippines, autres langues",phi,
+Phoenician,phénicien,phn,
+Pohnpeian,pohnpei,pon,
+Polish,polonais,pol,pl
+Portuguese,portugais,por,pt
+"Prakrit languages",prâkrit,pra,
+"Provençal; Occitan (post 1500)","provençal; occitan (après 1500)",oci,oc
+"Provençal, Old (to 1500)","provençal ancien (jusqu'à 1500)",pro,
+"Punjabi; Panjabi",pendjabi,pan,pa
+Pushto,pachto,pus,ps
+Rajasthani,rajasthani,raj,
+Rapanui,rapanui,rap,
+Rarotongan,rarotonga,rar,
+"Reserved for local use","réservée à l'usage local",qaa-qtz,
+"Romance (Other)","romanes, autres langues",roa,
+Romanian,roumain,rum/ron,ro
+Romany,tsigane,rom,
+Rundi,rundi,run,rn
+Russian,russe,rus,ru
+"Salishan languages","salish, langues",sal,
+"Samaritan Aramaic",samaritain,sam,
+"Sami languages (Other)","sami, autres langues",smi,
+Samoan,samoan,smo,sm
+Sandawe,sandawe,sad,
+Sango,sango,sag,sg
+Sanskrit,sanskrit,san,sa
+Santali,santal,sat,
+Sardinian,sarde,srd,sc
+Sasak,sasak,sas,
+"Saxon, Low; German, Low; Low Saxon; Low German","saxon, bas; allemand, bas; bas saxon; bas allemand",nds,
+Scots,écossais,sco,
+"Scottish Gaelic; Gaelic","gaélique écossais; gaélique",gla,gd
+Selkup,selkoupe,sel,
+"Semitic (Other)","sémitiques, autres langues",sem,
+Serbian,serbe,scc/srp,sr
+Serer,sérère,srr,
+Shan,chan,shn,
+Shona,shona,sna,sn
+"Sichuan Yi","yi de Sichuan",iii,ii
+Sidamo,sidamo,sid,
+"Sign languages","langues des signes",sgn,
+Siksika,blackfoot,bla,
+Sindhi,sindhi,snd,sd
+Sinhalese,singhalais,sin,si
+"Sino-Tibetan (Other)","sino-tibétaines, autres langues",sit,
+"Siouan languages","sioux, langues",sio,
+"Skolt Sami","sami skolt",sms,
+"Slave (Athapascan)","esclave (athapascan)",den,
+"Slavic (Other)","slaves, autres langues",sla,
+Slovak,slovaque,slo/slk,sk
+Slovenian,slovène,slv,sl
+Sogdian,sogdien,sog,
+Somali,somali,som,so
+Songhai,songhai,son,
+Soninke,soninké,snk,
+"Sorbian languages","sorabes, langues",wen,
+"Sotho, Northern","sotho du Nord",nso,
+"Sotho, Southern","sotho du Sud",sot,st
+"South American Indian (Other)","indiennes d'Amérique du Sud, autres langues",sai,
+"Southern Sami","sami du Sud",sma,
+"South Ndebele","ndébélé du Sud",nbl,nr
+"Spanish; Castilian","espagnol; castillan",spa,es
+Sukuma,sukuma,suk,
+Sumerian,sumérien,sux,
+Sundanese,soundanais,sun,su
+Susu,soussou,sus,
+Swahili,swahili,swa,sw
+Swati,swati,ssw,ss
+Swedish,suédois,swe,sv
+Syriac,syriaque,syr,
+Tagalog,tagalog,tgl,tl
+Tahitian,tahitien,tah,ty
+"Tai (Other)","thaïes, autres langues",tai,
+Tajik,tadjik,tgk,tg
+Tamashek,tamacheq,tmh,
+Tamil,tamoul,tam,ta
+Tatar,tatar,tat,tt
+Telugu,télougou,tel,te
+Tereno,tereno,ter,
+Tetum,tetum,tet,
+Thai,thaï,tha,th
+Tibetan,tibétain,tib/bod,bo
+Tigre,tigré,tig,
+Tigrinya,tigrigna,tir,ti
+Timne,temne,tem,
+Tiv,tiv,tiv,
+"tlhlngan-Hol; Klingon",klingon,tlh,
+Tlingit,tlingit,tli,
+"Tok Pisin","tok pisin",tpi,
+Tokelau,tokelau,tkl,
+"Tonga (Nyasa)","tonga (Nyasa)",tog,
+"Tonga (Tonga Islands)","tongan (Îles Tonga)",ton,to
+Tsimshian,tsimshian,tsi,
+Tsonga,tsonga,tso,ts
+Tswana,tswana,tsn,tn
+Tumbuka,tumbuka,tum,
+"Tupi languages","tupi, langues",tup,
+Turkish,turc,tur,tr
+"Turkish, Ottoman (1500-1928)","turc ottoman (1500-1928)",ota,
+Turkmen,turkmène,tuk,tk
+Tuvalu,tuvalu,tvl,
+Tuvinian,touva,tyv,
+Twi,twi,twi,tw
+Udmurt,oudmourte,udm,
+Ugaritic,ougaritique,uga,
+Uighur,ouïgour,uig,ug
+Ukrainian,ukrainien,ukr,uk
+Umbundu,umbundu,umb,
+Undetermined,indéterminée,und,
+"Upper Sorbian",haut-sorabe,hsb,
+Urdu,ourdou,urd,ur
+Uzbek,ouszbek,uzb,uz
+Vai,vaï,vai,
+"Valencian; Catalan","valencien; catalan",cat,ca
+Venda,venda,ven,ve
+Vietnamese,vietnamien,vie,vi
+Volapük,volapük,vol,vo
+Votic,vote,vot,
+"Wakashan languages","wakashennes, langues",wak,
+Walamo,walamo,wal,
+Walloon,wallon,wln,wa
+Waray,waray,war,
+Washo,washo,was,
+Welsh,gallois,wel/cym,cy
+Wolof,wolof,wol,wo
+Xhosa,xhosa,xho,xh
+Yakut,iakoute,sah,
+Yao,yao,yao,
+Yapese,yapois,yap,
+Yiddish,yiddish,yid,yi
+Yoruba,yoruba,yor,yo
+"Yupik languages","yupik, langues",ypk,
+Zande,zandé,znd,
+Zapotec,zapotèque,zap,
+Zenaga,zenaga,zen,
+"Zhuang; Chuang","zhuang; chuang",zha,za
+Zulu,zoulou,zul,zu
+Zuni,zuni,zun,
diff --git a/xorg-server/xkeyboard-config/geometry/README b/xorg-server/xkeyboard-config/geometry/README
index 5f4dcc72c..7a238e55a 100644
--- a/xorg-server/xkeyboard-config/geometry/README
+++ b/xorg-server/xkeyboard-config/geometry/README
@@ -1,6 +1,6 @@
-The geometry component of a keyboard mapping specifies primarily the geometry of
-the keyboard. It contains the geometry symbolic name and the keyboard geometry
-description. The geometry component might also contain aliases for some keys or
-symbolic names for some indicators and might affect the set of indicators that
-are physically present. Key aliases defined in the geometry component of a
-keyboard mapping override those defined in the keycodes component.
+The geometry component of a keyboard mapping specifies primarily the geometry of
+the keyboard. It contains the geometry symbolic name and the keyboard geometry
+description. The geometry component might also contain aliases for some keys or
+symbolic names for some indicators and might affect the set of indicators that
+are physically present. Key aliases defined in the geometry component of a
+keyboard mapping override those defined in the keycodes component.
diff --git a/xorg-server/xkeyboard-config/geometry/amiga b/xorg-server/xkeyboard-config/geometry/amiga
index 79793eabf..9c5f65e57 100644
--- a/xorg-server/xkeyboard-config/geometry/amiga
+++ b/xorg-server/xkeyboard-config/geometry/amiga
@@ -1,264 +1,264 @@
-default xkb_geometry "usa1" {
-
-    description= "Amiga (usa1)";
-    width= 490;
-    height= 175;
-
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
-    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };
-    shape "FCTS" { { [ 23,18] }, { [2,1], [ 21,17] } };
-    shape "TLDE" { { [ 28,18] }, { [2,1], [ 21,17] } };
-    shape "TABK" { { [ 37,18] }, { [2,1], [ 35,17] } };
-    shape "CTRL" { { [ 23,18] }, { [2,1], [ 21,17] } };
-    shape "CAPS" { { [ 18,18] }, { [2,1], [ 16,17] } };
-    shape "RTRN" {
-	approx = { [ 16, 0], [42,37] },
-	{ [16, 0], [42, 0], [42,37],
-	  [ 0,37], [ 0,19], [16,19] },
-	{ [18, 1], [40, 1], [40,36],
-	  [ 2,36], [ 2,20], [18,20] } };
-    shape "LFSH" { { [ 52,18] }, { [2,1], [ 50,17] } };
-    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,17] } };
-    shape "MODK" { { [ 23,18] }, { [2,1], [ 21,17] } };
-    shape "SPCE" { { [172,18] }, { [2,1], [170,17] } };
-    shape "DELE" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
-    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
-
-    section.left= 22;
-    row.left= 1;
-    key.shape= "FCTS";
-    key.gap=  1;
-    section "Function" {
-	top= 28;
-	row {
-	    top= 1;
-	    keys { { <ESC>, shape="NORM" },
-		   { <FK01>, 9 }, <FK02>, <FK03>, <FK04>, <FK05>,
-		   { <FK06>, 9 }, <FK07>, <FK08>, <FK09>, <FK10>
-	    };
-	};
-    }; // End of "Function" section
-
-    key.shape= "NORM";
-    section "Alpha" {
-	top= 56;
-	row {
-	    top= 1;
-	    keys { { <TLDE>, shape="TLDE" },
-		   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>,
-		   <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
-		   <BKSL>, { <BKSP>, "BKSP" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <RTRN>, "RTRN", -15 }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <LCTL>, "CTRL" }, { <CAPS>, "CAPS" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
-		   <AC11>
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "LFSH" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		    { <RTSH>, "RTSH" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "MODK";
-	    keys { { <LALT>, 10 }, <LAMI>,
-		   { <SPCE>, "SPCE" },
-		   <RAMI>, <RALT>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 56;
-	left= 326;
-	row {
-	    top= 1;
-	    key.shape = "DELE";
-	    keys { <DELE>, <HELP> };
-	};
-	row {
-	    top= 39;
-	    left = 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 58;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 56;
-	left= 392;
-	row {
-	    top= 1;
-	    keys { <KPLP>, <KPRP>, <KPDV>, <KPMU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDC> };
-	};
-    }; // End of "Keypad" section
-
-};
-
-xkb_geometry "de" {
-
-    description= "Amiga (de)";
-    width= 490;
-    height= 175;
-
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
-    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };
-    shape "FCTS" { { [ 23,18] }, { [2,1], [ 21,17] } };
-    shape "TLDE" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "TABK" { { [ 37,18] }, { [2,1], [ 35,17] } };
-    shape "CTRL" { { [ 23,18] }, { [2,1], [ 21,17] } };
-    shape "CAPS" { { [ 18,18] }, { [2,1], [ 16,17] } };
-    shape "RTRN" {
-	{ [ 0, 0], [28,0], [28,37], [5,37], [5,18], [ 0,18] },
-	{ [ 2, 1], [26,1], [26,36], [7,36], [7,17], [ 2,17] } };
-    shape "LFSH" { { [ 32,18] }, { [2,1], [ 29,17] } };
-    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,17] } };
-    shape "MODK" { { [ 23,18] }, { [2,1], [ 21,17] } };
-    shape "SPCE" { { [172,18] }, { [2,1], [170,17] } };
-    shape "DELE" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
-    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
-
-    section.left= 22;
-    row.left= 1;
-    key.shape= "FCTS";
-    key.gap=  1;
-    section "Function" {
-	top= 28;
-	row {
-	    top= 1;
-	    keys { { <ESC>, shape="NORM" },
-		   { <FK01>, 9 }, <FK02>, <FK03>, <FK04>, <FK05>,
-		   { <FK06>, 9 }, <FK07>, <FK08>, <FK09>, <FK10>
-	    };
-	};
-    }; // End of "Function" section
-
-    key.shape= "NORM";
-    section "Alpha" {
-	top= 56;
-	row {
-	    top= 1;
-	    keys { { <TLDE>, shape="TLDE" },
-		   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>,
-		   <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
-		   <BKSL>, { <BKSP>, "BKSP" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <RTRN>, "RTRN" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <LCTL>, "CTRL" }, { <CAPS>, "CAPS" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
-		   <AC11>, <AC12>
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "LFSH" },
-		    <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>,
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		    { <RTSH>, "RTSH" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "MODK";
-	    keys { { <LALT>, 14 }, <LAMI>,
-		   { <SPCE>, "SPCE" },
-		   <RAMI>, <RALT>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 56;
-	left= 326;
-	row {
-	    top= 1;
-	    key.shape = "DELE";
-	    keys { <DELE>, <HELP> };
-	};
-	row {
-	    top= 39;
-	    left = 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 58;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 56;
-	left= 392;
-	row {
-	    top= 1;
-	    keys { <KPLP>, <KPRP>, <KPDV>, <KPMU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDC> };
-	};
-    }; // End of "Keypad" section
-
-};
+default xkb_geometry "usa1" {
+
+    description= "Amiga (usa1)";
+    width= 490;
+    height= 175;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "FCTS" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "TLDE" { { [ 28,18] }, { [2,1], [ 21,17] } };
+    shape "TABK" { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "CTRL" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "CAPS" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "RTRN" {
+	approx = { [ 16, 0], [42,37] },
+	{ [16, 0], [42, 0], [42,37],
+	  [ 0,37], [ 0,19], [16,19] },
+	{ [18, 1], [40, 1], [40,36],
+	  [ 2,36], [ 2,20], [18,20] } };
+    shape "LFSH" { { [ 52,18] }, { [2,1], [ 50,17] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,17] } };
+    shape "MODK" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "SPCE" { { [172,18] }, { [2,1], [170,17] } };
+    shape "DELE" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
+
+    section.left= 22;
+    row.left= 1;
+    key.shape= "FCTS";
+    key.gap=  1;
+    section "Function" {
+	top= 28;
+	row {
+	    top= 1;
+	    keys { { <ESC>, shape="NORM" },
+		   { <FK01>, 9 }, <FK02>, <FK03>, <FK04>, <FK05>,
+		   { <FK06>, 9 }, <FK07>, <FK08>, <FK09>, <FK10>
+	    };
+	};
+    }; // End of "Function" section
+
+    key.shape= "NORM";
+    section "Alpha" {
+	top= 56;
+	row {
+	    top= 1;
+	    keys { { <TLDE>, shape="TLDE" },
+		   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>,
+		   <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
+		   <BKSL>, { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN", -15 }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <LCTL>, "CTRL" }, { <CAPS>, "CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
+		   <AC11>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    keys { { <LALT>, 10 }, <LAMI>,
+		   { <SPCE>, "SPCE" },
+		   <RAMI>, <RALT>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 56;
+	left= 326;
+	row {
+	    top= 1;
+	    key.shape = "DELE";
+	    keys { <DELE>, <HELP> };
+	};
+	row {
+	    top= 39;
+	    left = 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 58;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 56;
+	left= 392;
+	row {
+	    top= 1;
+	    keys { <KPLP>, <KPRP>, <KPDV>, <KPMU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDC> };
+	};
+    }; // End of "Keypad" section
+
+};
+
+xkb_geometry "de" {
+
+    description= "Amiga (de)";
+    width= 490;
+    height= 175;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "FCTS" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "TLDE" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "TABK" { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "CTRL" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "CAPS" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "RTRN" {
+	{ [ 0, 0], [28,0], [28,37], [5,37], [5,18], [ 0,18] },
+	{ [ 2, 1], [26,1], [26,36], [7,36], [7,17], [ 2,17] } };
+    shape "LFSH" { { [ 32,18] }, { [2,1], [ 29,17] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,17] } };
+    shape "MODK" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "SPCE" { { [172,18] }, { [2,1], [170,17] } };
+    shape "DELE" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
+
+    section.left= 22;
+    row.left= 1;
+    key.shape= "FCTS";
+    key.gap=  1;
+    section "Function" {
+	top= 28;
+	row {
+	    top= 1;
+	    keys { { <ESC>, shape="NORM" },
+		   { <FK01>, 9 }, <FK02>, <FK03>, <FK04>, <FK05>,
+		   { <FK06>, 9 }, <FK07>, <FK08>, <FK09>, <FK10>
+	    };
+	};
+    }; // End of "Function" section
+
+    key.shape= "NORM";
+    section "Alpha" {
+	top= 56;
+	row {
+	    top= 1;
+	    keys { { <TLDE>, shape="TLDE" },
+		   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>,
+		   <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
+		   <BKSL>, { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <LCTL>, "CTRL" }, { <CAPS>, "CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
+		   <AC11>, <AC12>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH" },
+		    <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>,
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    keys { { <LALT>, 14 }, <LAMI>,
+		   { <SPCE>, "SPCE" },
+		   <RAMI>, <RALT>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 56;
+	left= 326;
+	row {
+	    top= 1;
+	    key.shape = "DELE";
+	    keys { <DELE>, <HELP> };
+	};
+	row {
+	    top= 39;
+	    left = 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 58;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 56;
+	left= 392;
+	row {
+	    top= 1;
+	    keys { <KPLP>, <KPRP>, <KPDV>, <KPMU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDC> };
+	};
+    }; // End of "Keypad" section
+
+};
diff --git a/xorg-server/xkeyboard-config/geometry/ataritt b/xorg-server/xkeyboard-config/geometry/ataritt
index 5b035131a..06a681de4 100644
--- a/xorg-server/xkeyboard-config/geometry/ataritt
+++ b/xorg-server/xkeyboard-config/geometry/ataritt
@@ -1,251 +1,251 @@
-default xkb_geometry "us" {
-
-    description= "Atari TT (us)";
-    width= 480;
-    height= 173;
-
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
-    shape "BKSP" { { [ 37,18] }, { [2,1], [ 35,17] } };
-    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "RTRN" { approx = { [0,19], [32,37] },
-		   { [ 14, 0], [32, 0], [32,37], [0,37], [0,19], [14,19] },
-		   { [ 16, 1], [30, 1], [30,36], [2,36], [2,20], [16,20] } };
-    shape "CTRL" { { [ 32,18] }, { [2,1], [ 30,17] } };
-    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,17] } };
-    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "SPCE" { { [172,18] }, { [2,1], [170,17] } };
-    shape "FCTS" { { [ 28,10] }, { [2,1], [ 26,9] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
-    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
-
-    section.left= 21;
-    row.left= 1;
-    key.shape = "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 36;
-	key.shape= "FCTS";
-	row {
-	    top= 1;
-	    keys { <FK01>, <FK02>, <FK03>, <FK04>,
-		   <FK05>, <FK06>, <FK07>, <FK08>,
-		   <FK09>, <FK10>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 63;
-	row {
-	    top= 1;
-	    keys { <ESC>, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>, <TLDE>,
-		   { <BKSP>, "BKSP" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <RTRN>, "RTRN", -13 }, <DELE>
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <LCTL>, "CTRL" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, { <BKSL>, 34 }
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "LFSH" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		    { <RTSH>, "RTSH" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "MODK";
-	    keys { { <ALT>, 24 },
-		   { <SPCE>, "SPCE" },
-		   <CAPS>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 63;
-	left= 319;
-	row {
-	    top= 1;
-	    key.shape = "BKSP";
-	    keys { <HELP>, <UNDO> };
-	};
-	row {
-	    top= 20;
-	    keys { <INS>, <UP>, <HOME> };
-	};
-	row {
-	    top= 39;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 63;
-	left= 381;
-	row {
-	    top= 1;
-	    keys { <KPLP>, <KPRP>, <KPDV>, <KPMU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDC> };
-	};
-    }; // End of "Keypad" section
-
-};
-
-xkb_geometry "de" {
-
-    description= "Atari TT (de)";
-    width= 480;
-    height= 173;
-
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
-    shape "BKSP" { { [ 27,18] }, { [2,1], [ 25,17] } };
-    shape "TABK" { { [ 27,18] }, { [2,1], [ 25,17] } };
-    shape "RTRN" { approx = { [0,19], [32,37] },
-		   { [ 14, 0], [32, 0], [32,37], [0,37], [0,19], [14,19] },
-		   { [ 16, 1], [30, 1], [30,36], [2,36], [2,20], [16,20] } };
-    shape "CTRL" { { [ 32,18] }, { [2,1], [ 30,17] } };
-    shape "LFSH" { { [ 23,18] }, { [2,1], [ 21,17] } };
-    shape "RTSH" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "SPCE" { { [170,18] }, { [2,1], [168,17] } };
-    shape "FCTS" { { [ 28,11] }, { [2,1], [ 26,10] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
-    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
-
-    section.left= 21;
-    row.left= 1;
-    key.shape = "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 36;
-	key.shape= "FCTS";
-	row {
-	    top= 1;
-	    keys { <FK01>, <FK02>, <FK03>, <FK04>,
-		   <FK05>, <FK06>, <FK07>, <FK08>,
-		   <FK09>, <FK10>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 63;
-	row {
-	    top= 1;
-	    keys { <ESC>, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>, <TLDE>,
-		   { <BKSP>, "BKSP" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <RTRN>, "RTRN", -13 }, <DELE>
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <LCTL>, "CTRL" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, { <BKSL>, 34 }
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "LFSH" }, <LSGT>, 
-		    <AB01>, <AB02>, <AB03>, <AB04>,
-		    <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
-		    { <RTSH>, "RTSH" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "MODK";
-	    keys { { <ALT>, 24 }, { <SPCE>, "SPCE" }, <CAPS>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 63;
-	left= 319;
-	row {
-	    top= 1;
-	    key.shape = "BKSP";
-	    keys { <HELP>, <UNDO> };
-	};
-	row {
-	    top= 20;
-	    keys { <INS>, <UP>, <HOME> };
-	};
-	row {
-	    top= 39;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 63;
-	left= 381;
-	row {
-	    top= 1;
-	    keys { <KPLP>, <KPRP>, <KPDV>, <KPMU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDC> };
-	};
-    }; // End of "Keypad" section
-
-};
+default xkb_geometry "us" {
+
+    description= "Atari TT (us)";
+    width= 480;
+    height= 173;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "RTRN" { approx = { [0,19], [32,37] },
+		   { [ 14, 0], [32, 0], [32,37], [0,37], [0,19], [14,19] },
+		   { [ 16, 1], [30, 1], [30,36], [2,36], [2,20], [16,20] } };
+    shape "CTRL" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,17] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "SPCE" { { [172,18] }, { [2,1], [170,17] } };
+    shape "FCTS" { { [ 28,10] }, { [2,1], [ 26,9] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
+
+    section.left= 21;
+    row.left= 1;
+    key.shape = "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 36;
+	key.shape= "FCTS";
+	row {
+	    top= 1;
+	    keys { <FK01>, <FK02>, <FK03>, <FK04>,
+		   <FK05>, <FK06>, <FK07>, <FK08>,
+		   <FK09>, <FK10>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 63;
+	row {
+	    top= 1;
+	    keys { <ESC>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, <TLDE>,
+		   { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN", -13 }, <DELE>
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <LCTL>, "CTRL" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <BKSL>, 34 }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    keys { { <ALT>, 24 },
+		   { <SPCE>, "SPCE" },
+		   <CAPS>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 63;
+	left= 319;
+	row {
+	    top= 1;
+	    key.shape = "BKSP";
+	    keys { <HELP>, <UNDO> };
+	};
+	row {
+	    top= 20;
+	    keys { <INS>, <UP>, <HOME> };
+	};
+	row {
+	    top= 39;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 63;
+	left= 381;
+	row {
+	    top= 1;
+	    keys { <KPLP>, <KPRP>, <KPDV>, <KPMU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDC> };
+	};
+    }; // End of "Keypad" section
+
+};
+
+xkb_geometry "de" {
+
+    description= "Atari TT (de)";
+    width= 480;
+    height= 173;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 27,18] }, { [2,1], [ 25,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [ 25,17] } };
+    shape "RTRN" { approx = { [0,19], [32,37] },
+		   { [ 14, 0], [32, 0], [32,37], [0,37], [0,19], [14,19] },
+		   { [ 16, 1], [30, 1], [30,36], [2,36], [2,20], [16,20] } };
+    shape "CTRL" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "LFSH" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "RTSH" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "SPCE" { { [170,18] }, { [2,1], [168,17] } };
+    shape "FCTS" { { [ 28,11] }, { [2,1], [ 26,10] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
+
+    section.left= 21;
+    row.left= 1;
+    key.shape = "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 36;
+	key.shape= "FCTS";
+	row {
+	    top= 1;
+	    keys { <FK01>, <FK02>, <FK03>, <FK04>,
+		   <FK05>, <FK06>, <FK07>, <FK08>,
+		   <FK09>, <FK10>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 63;
+	row {
+	    top= 1;
+	    keys { <ESC>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, <TLDE>,
+		   { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN", -13 }, <DELE>
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <LCTL>, "CTRL" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <BKSL>, 34 }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH" }, <LSGT>, 
+		    <AB01>, <AB02>, <AB03>, <AB04>,
+		    <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		    { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    keys { { <ALT>, 24 }, { <SPCE>, "SPCE" }, <CAPS>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 63;
+	left= 319;
+	row {
+	    top= 1;
+	    key.shape = "BKSP";
+	    keys { <HELP>, <UNDO> };
+	};
+	row {
+	    top= 20;
+	    keys { <INS>, <UP>, <HOME> };
+	};
+	row {
+	    top= 39;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 63;
+	left= 381;
+	row {
+	    top= 1;
+	    keys { <KPLP>, <KPRP>, <KPDV>, <KPMU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDC> };
+	};
+    }; // End of "Keypad" section
+
+};
diff --git a/xorg-server/xkeyboard-config/geometry/chicony b/xorg-server/xkeyboard-config/geometry/chicony
index d43fb1b4a..75bce8d1a 100644
--- a/xorg-server/xkeyboard-config/geometry/chicony
+++ b/xorg-server/xkeyboard-config/geometry/chicony
@@ -1,189 +1,189 @@
-// -*- indent-tabs-mode: nil -*-
-
-// Created by Alexander Pohoyda <alexander.pohoyda@gmx.net>
-// Geometry specification for Chicony KB-9820 keyboard.
-
-// 86 keys
-default xkb_geometry "us" {
-    description = "Chicony KB-9820 infra-red keyboard";
-    width = 350;
-    height = 180;
-    //baseColor = "grey60";
-    labelColor = "white";
-
-    shape "EDGE" { cornerRadius = 25,
-                   { [0, 8], [142.5, 0], [202.5, 0], [347, 8],
-                     [347, 60], [327, 100], [322, 160],
-                     [202.5, 165], [142.5, 165],
-                     [25, 160], [20, 100], [0, 60] } };
-    shape "KEYS" { cornerRadius = 2, { [271, 109] } };
-    shape "MOUS" { cornerRadius = 12, { [24, 24] } };
-    shape "MOUS2" { cornerRadius = 9, { [18, 18] } };
-    shape "BTNS"  { cornerRadius = 5, { [10, 10] } };
-
-    solid "Edges" {
-        top = 0;
-        left = 0;
-        shape = "EDGE";
-	color = "grey60";
-    };
-
-    solid "KeyPanel" {
-	shape = "KEYS";
-	left = 38;
-	top = 22;
-	color = "black";
-    };
-
-    solid "Mouse" {
-        shape = "MOUS";
-        left = 315;
-        top = 30;
-        color = "grey30";
-    };
-
-    outline "Mouse2" {
-        shape = "MOUS2";
-        left = 318;
-        top = 33;
-        color = "black";
-    };
-    
-    solid "Button1" {
-        shape = "BTNS";
-        left = 10;
-        top = 32;
-        color = "grey30";
-    };
-
-    solid "Button2" {
-        shape = "BTNS";
-        left = 20;
-        top = 42;
-        color = "grey30";
-    };
-
-    outline "Buttons" {
-        shape = "MOUS";
-        left = 8;
-        top = 30;
-        color = "black";
-    };
-
-    shape.cornerRadius = 1;
-    shape "ESC"    { { [17, 12] }, { [1.5, 0], [15.5, 10] } };
-    shape "SMALL"  { { [15, 12] }, { [1.5, 0], [13.5, 10] } };
-    shape "THIN"   { { [14, 18] }, { [2, 0], [12, 15] } };
-    shape "NARR"   { { [16, 18] }, { [2, 0], [14, 15] } };
-    shape "NORM"   { { [17, 18] }, { [2, 0], [15, 15] } };
-    shape "WIDER"  { { [18, 18] }, { [2, 0], [16, 15] } };
-    shape "CAPS"   { { [22, 18] }, { [2, 0], [20, 15] } };
-    shape "RTSH"   { { [23, 18] }, { [2, 0], [21, 15] } };
-    shape "WIDEST" { { [30, 18] }, { [2, 0], [28, 15] } };
-    shape "SPCE"   { { [68, 18] }, { [2, 0], [66, 15] } };
-
-    section "Function" {
-	key.shape = "SMALL";
-	key.gap = 0.79;
-	key.color = "grey60";
-	left = 38;
-	top = 22;
-	row {
-	    top = 1;
-	    keys {  { <ESC>, shape="ESC", 1 },
-	    	    { <FK01>, 1.5 }, <FK02>, <FK03>, <FK04>,
-		    <FK05>, <FK06>, <FK07>, <FK08>,
-		    <FK09>, <FK10>, <FK11>, <FK12>,
-		    <NMLK>, <PRSC>, <SCLK>, <PAUS>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Control" {
-	key.shape = "NORM";
-	key.gap = 1;
-	key.color = "grey60";
-        left = 38;
-	top = 111;
-	row {
-	    top = 1;
-	    keys { <EASY>, <LCTL>, <LWIN>, <LALT>,
-	           { <SPCE>, shape="SPCE" },
-                   <RALT>,
-                   { <RWIN>, shape="THIN" },
-                   { <MENU>, shape="THIN" },
-                   { <INS>, shape="THIN" },
-                   { <DELE>, shape="THIN" } };
-	};
-    }; // End of "Control" section
-
-    section "Editing" {
-        key.shape = "NORM";
-	key.gap = 1;
-	key.color = "grey60";
-	left = 291;
-	top = 34;
-        row.vertical = True;
-	row {
-	    top = 1;
-	    keys { <HOME>, <PGUP>, <PGDN>, <END> };
-	};
-    }; // End of "Editing" section
-
-    section "Navigation" {
-	key.gap = 1;
-	key.shape = "NARR";
-	key.color = "grey60";
-	left = 257;
-	top = 92;
-	row {
-	    left = 16;
-	    top = 1;
-	    keys { <UP> };
-	};
-	row {
-	    top = 20;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Navigation" section
-
-    section "Alpha" {
-	key.gap = 1;
-	key.shape = "NORM";
-	key.color = "grey60";
-        left = 38;
-	top = 35;
-	row {
-	    top = 1;
-	    keys { { <TLDE>, shape="NARR" },
-                   <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>, { <BKSP>, shape="WIDER" }
-	    };
-	};
-	row {
-	    top = 20;
-	    keys { <TAB>,
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, <AD13>
-	    };
-	};
-	row {
-	    top = 39;
-	    keys { { <CAPS>, shape="CAPS" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, { <RTRN>, shape="WIDEST" }
-	    };
-	};
-	row {
-	    top = 58;
-	    keys { { <LFSH>, shape="WIDEST" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
-		    { <RTSH>, shape="RTSH" }
-	    };
-	};
-    }; // End of "Alpha" section
-};
+// -*- indent-tabs-mode: nil -*-
+
+// Created by Alexander Pohoyda <alexander.pohoyda@gmx.net>
+// Geometry specification for Chicony KB-9820 keyboard.
+
+// 86 keys
+default xkb_geometry "us" {
+    description = "Chicony KB-9820 infra-red keyboard";
+    width = 350;
+    height = 180;
+    //baseColor = "grey60";
+    labelColor = "white";
+
+    shape "EDGE" { cornerRadius = 25,
+                   { [0, 8], [142.5, 0], [202.5, 0], [347, 8],
+                     [347, 60], [327, 100], [322, 160],
+                     [202.5, 165], [142.5, 165],
+                     [25, 160], [20, 100], [0, 60] } };
+    shape "KEYS" { cornerRadius = 2, { [271, 109] } };
+    shape "MOUS" { cornerRadius = 12, { [24, 24] } };
+    shape "MOUS2" { cornerRadius = 9, { [18, 18] } };
+    shape "BTNS"  { cornerRadius = 5, { [10, 10] } };
+
+    solid "Edges" {
+        top = 0;
+        left = 0;
+        shape = "EDGE";
+	color = "grey60";
+    };
+
+    solid "KeyPanel" {
+	shape = "KEYS";
+	left = 38;
+	top = 22;
+	color = "black";
+    };
+
+    solid "Mouse" {
+        shape = "MOUS";
+        left = 315;
+        top = 30;
+        color = "grey30";
+    };
+
+    outline "Mouse2" {
+        shape = "MOUS2";
+        left = 318;
+        top = 33;
+        color = "black";
+    };
+    
+    solid "Button1" {
+        shape = "BTNS";
+        left = 10;
+        top = 32;
+        color = "grey30";
+    };
+
+    solid "Button2" {
+        shape = "BTNS";
+        left = 20;
+        top = 42;
+        color = "grey30";
+    };
+
+    outline "Buttons" {
+        shape = "MOUS";
+        left = 8;
+        top = 30;
+        color = "black";
+    };
+
+    shape.cornerRadius = 1;
+    shape "ESC"    { { [17, 12] }, { [1.5, 0], [15.5, 10] } };
+    shape "SMALL"  { { [15, 12] }, { [1.5, 0], [13.5, 10] } };
+    shape "THIN"   { { [14, 18] }, { [2, 0], [12, 15] } };
+    shape "NARR"   { { [16, 18] }, { [2, 0], [14, 15] } };
+    shape "NORM"   { { [17, 18] }, { [2, 0], [15, 15] } };
+    shape "WIDER"  { { [18, 18] }, { [2, 0], [16, 15] } };
+    shape "CAPS"   { { [22, 18] }, { [2, 0], [20, 15] } };
+    shape "RTSH"   { { [23, 18] }, { [2, 0], [21, 15] } };
+    shape "WIDEST" { { [30, 18] }, { [2, 0], [28, 15] } };
+    shape "SPCE"   { { [68, 18] }, { [2, 0], [66, 15] } };
+
+    section "Function" {
+	key.shape = "SMALL";
+	key.gap = 0.79;
+	key.color = "grey60";
+	left = 38;
+	top = 22;
+	row {
+	    top = 1;
+	    keys {  { <ESC>, shape="ESC", 1 },
+	    	    { <FK01>, 1.5 }, <FK02>, <FK03>, <FK04>,
+		    <FK05>, <FK06>, <FK07>, <FK08>,
+		    <FK09>, <FK10>, <FK11>, <FK12>,
+		    <NMLK>, <PRSC>, <SCLK>, <PAUS>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Control" {
+	key.shape = "NORM";
+	key.gap = 1;
+	key.color = "grey60";
+        left = 38;
+	top = 111;
+	row {
+	    top = 1;
+	    keys { <EASY>, <LCTL>, <LWIN>, <LALT>,
+	           { <SPCE>, shape="SPCE" },
+                   <RALT>,
+                   { <RWIN>, shape="THIN" },
+                   { <MENU>, shape="THIN" },
+                   { <INS>, shape="THIN" },
+                   { <DELE>, shape="THIN" } };
+	};
+    }; // End of "Control" section
+
+    section "Editing" {
+        key.shape = "NORM";
+	key.gap = 1;
+	key.color = "grey60";
+	left = 291;
+	top = 34;
+        row.vertical = True;
+	row {
+	    top = 1;
+	    keys { <HOME>, <PGUP>, <PGDN>, <END> };
+	};
+    }; // End of "Editing" section
+
+    section "Navigation" {
+	key.gap = 1;
+	key.shape = "NARR";
+	key.color = "grey60";
+	left = 257;
+	top = 92;
+	row {
+	    left = 16;
+	    top = 1;
+	    keys { <UP> };
+	};
+	row {
+	    top = 20;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Navigation" section
+
+    section "Alpha" {
+	key.gap = 1;
+	key.shape = "NORM";
+	key.color = "grey60";
+        left = 38;
+	top = 35;
+	row {
+	    top = 1;
+	    keys { { <TLDE>, shape="NARR" },
+                   <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, { <BKSP>, shape="WIDER" }
+	    };
+	};
+	row {
+	    top = 20;
+	    keys { <TAB>,
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, <AD13>
+	    };
+	};
+	row {
+	    top = 39;
+	    keys { { <CAPS>, shape="CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, shape="WIDEST" }
+	    };
+	};
+	row {
+	    top = 58;
+	    keys { { <LFSH>, shape="WIDEST" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		    { <RTSH>, shape="RTSH" }
+	    };
+	};
+    }; // End of "Alpha" section
+};
diff --git a/xorg-server/xkeyboard-config/geometry/dell b/xorg-server/xkeyboard-config/geometry/dell
index 4fd6479f7..cb635ef60 100644
--- a/xorg-server/xkeyboard-config/geometry/dell
+++ b/xorg-server/xkeyboard-config/geometry/dell
@@ -1,644 +1,644 @@
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//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 OPEN GROUP 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 Open Group 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 Open Group.
-//
-default xkb_geometry "dell101" {
-
-    description= "Dell 101";
-    width= 470;
-    height= 210;
-
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
-    shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
-    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
-    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
-    shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,16] } };
-    shape "CAPS" { { [ 33,18] }, { [ 28,18] }, { [2,1], [ 26,16] } };
-    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,16] } };
-    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,16] } };
-    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
-    shape "SPCE" { { [133,18] }, { [2,1], [131,16] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
-
-    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
-    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  52;
-	left= 377;
-	color= "grey10";
-    };
-
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 67;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { left= 382; };
-    indicator "Caps Lock"    { left= 407; };
-    indicator "Scroll Lock"  { left= 433; };
-    text.top= 55;
-    text.color= "black";
-    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
-    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
-    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
-
-    section.left= 19;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 52;
-	row {
-	    top= 1;
-	    keys {  { <ESC>, color="grey20" },
-		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
-		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
-		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
-		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 91;
-	row {
-	    top= 1;
-	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>,
-		   { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK", color="grey20" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <CAPS>, "CAPS", color="grey20" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, { <RTRN>, "RTRN", color="grey20" }
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "LFSH", color="grey20" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		    { <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "MODK";
-	    key.color= "grey20";
-	    keys { <LCTL>, { <LALT>, 21 },
-		   { <SPCE>, "SPCE", color="white" },
-		   <RALT>, { <RCTL>, 21 }
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 91;
-	left= 312;
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-        row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 91;
-	left= 376;
-	row {
-	    top= 1;
-	    key.color= "grey20";
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-
-}; // End of "default" geometry
-
-
-xkb_geometry "dell65" {
-};
-
-xkb_geometry "dell65x" {
-
-    description= "Dell 101";
-    width= 470;
-    height= 210;
-    color="grey10";
-
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
-    shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
-    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
-    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
-    shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,16] } };
-    shape "CAPS" { { [ 33,18] }, { [ 28,18] }, { [2,1], [ 26,16] } };
-    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,16] } };
-    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,16] } };
-    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
-    shape "SPCE" { { [133,18] }, { [2,1], [131,16] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
-
-    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
-    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  52;
-	left= 377;
-	color= "grey10";
-    };
-
-    shape "BACKGROUND"  { cornerRadius=5, { [  470,  210 ] } };
-    solid "Background" {
-	shape= "BACKGROUND";
-	top=  0;
-	left= 0;
-	color= "grey10";
-    };
-
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 67;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { left= 382; };
-    indicator "Caps Lock"    { left= 407; };
-    indicator "Scroll Lock"  { left= 433; };
-    text.top= 55;
-    text.color= "black";
-    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
-    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
-    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
-
-    section.left= 19;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 52;
-	row {
-	    top= 1;
-	    keys {  { <ESC>, color="grey20" },
-		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
-		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
-		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
-		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 91;
-	row {
-	    top= 1;
-	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>,
-		   { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK", color="grey20" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <CAPS>, "CAPS", color="grey20" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, { <RTRN>, "RTRN", color="grey20" }
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "LFSH", color="grey20" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		    { <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "MODK";
-	    key.color= "grey20";
-	    keys { <LCTL>, { <LALT>, 21 },
-		   { <SPCE>, "SPCE", color="white" },
-		   <RALT>, { <RCTL>, 21 }
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 91;
-	left= 312;
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-        row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 91;
-	left= 376;
-	row {
-	    top= 1;
-	    key.color= "grey20";
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-
-};
-
-
-//
-// Dell Precision M65
-//
-
-xkb_geometry "dellm65" {
-
-    description= "Dell Precision M65";
-    width= 308;
-    height= 152;
-    baseColor = "grey20";
-    labelColor = "white";
-
-    shape "BACKGROUND"  { cornerRadius = 3, { [  308,  152 ] } };
-    shape "BACKGROUND2" { cornerRadius = 2, { [  7, 22 ], 
-                                              [ 171, 22 ],
-                                              [ 171, 10 ],
-                                              [ 301, 10 ],
-                                              [ 301, 148 ],
-                                              [ 244, 148 ],
-                                              [ 244, 132 ],
-                                              [   7, 132] } }; 
-    solid "Background" {
-	shape = "BACKGROUND";
-	top = 0;
-	left = 0;
-	color = "grey20";
-    };
-    solid "Background2" {
-	shape = "BACKGROUND2";
-	top = 0;
-	left = 0;
-	color = "black";
-    };
-
-    shape "LEDS" { cornerRadius = 4, { [ 26, 8 ] } };
-    shape "LED" { cornerRadius = 0, { [ 4, 4 ] } };
-    solid "LedPanel" {
-	shape = "LEDS";
-	top = 8;
-	left = 69;
-	color = "grey20";
-    };
-
-    indicator.onColor= "green";
-    indicator.offColor= "gray20";
-    indicator.top= 10;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { left= 72; };
-    indicator "Caps Lock"    { left= 80; };
-    indicator "Scroll Lock"  { left= 88; };
-
-    shape "MEDIA" { cornerRadius = 5, { [ 2, 2], [ 12, 12 ] } };
-    shape "POWER" { cornerRadius = 7, { [ 14, 14 ] } };
-
-    section "Media" {
-        top = 5;
-        left = 102;
-        width = 60;
-        height = 14;
-        key.color="grey30";
-        key.shape = "MEDIA";
-        row {
-           top = 0;
-           keys {
-             <I2E>, <I30>, <I20>, { <I04>, shape = "POWER", gap = 3 }
-           };
-        };
-    };
-
-
-    shape "FKEY" { cornerRadius = 1, { [ 18, 12 ] }, { [ 1, 1 ], [ 17, 10 ] } };
-
-    section "Function" {
-       top = 12;
-       left = 8;
-       width = 290;
-       height = 24;
-       key.color = "grey80";
-       key.shape = "FKEY";
-       key.gap = 0;
-       row {
-	    top = 0;
-            keys {      { <MENU>, 165 }, <PRSC>, <NMLK>, <PAUS>, 
-                        { <INS>, 1 },  <HOME>, <PGUP> };
-       };
-       row {
-	    top = 12;
-            keys { <ESC>, { <FK01>, 1 }, <FK02>, <FK03>, <FK04>, 
-                          { <FK05>, 1 }, <FK06>, <FK07>, <FK08>,
-                          { <FK09>, 1 }, <FK10>, <FK11>, <FK12>,
-                          { <DELE>,  1 }, <END>, <PGDN> };
-       };
-   };
-
-   shape "AKEY" { cornerRadius = 1, { [ 19, 19 ] }, { [ 2, 1 ], [ 17, 15 ] } };
-   shape "BKSP" { cornerRadius = 1, { [ 44, 19 ] }, { [ 2, 1 ], [ 42, 15 ] } };
-   shape "TABK" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
-   shape "BKSL" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
-   shape "CAPS" { cornerRadius = 1, { [ 34, 19 ] }, { [ 2, 1 ], [ 32, 15 ] } };
-   shape "RTRN" { cornerRadius = 1, { [ 47, 19 ] }, { [ 2, 1 ], [ 45, 15 ] } };
-   shape "LFSH" { cornerRadius = 1, { [ 44, 19 ] }, { [ 2, 1 ], [ 42, 15 ] } };
-   shape "RTSH" { cornerRadius = 1, { [ 56, 19 ] }, { [ 2, 1 ], [ 54, 15 ] } };
-   shape "LCTL" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
-   shape "LALT" { cornerRadius = 1, { [ 25, 19 ] }, { [ 2, 1 ], [ 23, 15 ] } };
-   shape "RCTL" { cornerRadius = 1, { [ 25, 19 ] }, { [ 2, 1 ], [ 23, 15 ] } };
-   shape "SPCE" { cornerRadius = 1, { [ 96, 19 ] }, { [ 2, 1 ], [ 94, 15 ] } };
-   
-
-   section "Alpha" {
-       top = 36;
-       left = 8;
-       width = 290;
-       height = 21;
-       key.color = "grey80";
-       key.shape = "AKEY";
-       key.gap = 0;
-       row {
-	    top = 1;
-            keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>, { <BKSP>, 1, "BKSP" } };
-	};
-       row {
-	    top = 20;
-            keys { { <TAB>, "TABK" },
-		   { <AD01>, 1 }, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <BKSL>, 1, "BKSL" } };
-	};
-       row {
-	    top = 39;
-            keys { { <CAPS>, "CAPS" },
-		   { <AC01>, 1 }, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, { <RTRN>, 1, "RTRN" } };
-	};
-       row {
-	    top = 58;
-            keys { { <LFSH>, "LFSH" },
-		   { <AB01>, 1 }, <AB02>, <AB03>, <AB04>, <AB05>, 
-		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		   { <RTSH>, 1, "RTSH" } };
-	};
-       row {
-           top = 77;
-           keys { { <LCTL>, "LCTL" }, { <LWIN>, 20 }, { <LALT>, "LALT" }, 
-                  { <SPCE>, "SPCE" }, <RALT>, { <RCTL>, "RCTL" } };
-	};
-   };
-
-   shape "SKEY" { cornerRadius = 1, { [ 18, 17 ] }, { [ 2, 1 ], [ 16, 13 ] } };
-   section "Arrows" {
-        top = 113;
-        left = 243;
-        width = 54;
-        height = 36;
-        
-       key.color = "grey80";
-        key.shape = "SKEY";
-        row {
-           top = 0;
-           left = 20;
-
-           keys { <UP> };
-        };
-  
-        row {
-            top = 17;
-            left = 2;
-
-            keys { <LEFT>, <DOWN>, <RGHT> };
-        };
-   };
-
-  shape "STIK" { cornerRadius = 4, { [ 7, 7 ] } };
-
-  solid "STIK" {
-      priority = 255;
-      color = "blue";
-      shape = "STIK";
-      top = 90; 
-      left = 135;
-  };
-};
- 
-xkb_geometry "latitude" {
-	description="Dell Latitude";
-	width=304.2; height=219.1;
-
-	baseColor="grey"; labelColor="white";
-
-	alias <AC00> =<CAPS>;
-	alias <AA00> =<LCTL>;
-
-	shape "EXTERNAL" {corner=3,
-		{[0,0], [302,0], [302,154], [174,154], [174,198], [166,216], [107,216], [100,198], [100,154], [0,154]}};
-	solid "external" {shape="EXTERNAL"; top=1.1; left=1.1; color="grey10"; priority=10;};
-
-	shape "INTERNAL" {corner=3,
-		{[0,13], [162.2,13], [162.2,0], [286,0], [286,138], [230,138], [230,124], [163,124], [163,138], [96,138], [96,124], [0,124]}};
-	solid "internal" {shape="INTERNAL"; top=7; left=8.5; color="black"; priority=20;};
-
-	shape "TOUCHPAD" {corner=2, {[68,40]}};
-	solid "touchpad" {shape="TOUCHPAD"; top=153; left=104; color="grey20"; priority=20;};
-
-	shape "TOUCHPADBUTTONS" {corner=1,
-		{[0,0], [33.5,0], [33.5,16], [6,16]},
-		{[34.5,0], [68,0], [61, 16], [34.5,16]}};
-	solid "touchleft" {shape="TOUCHPADBUTTONS"; top=198; left=104; color="grey20"; priority=20;};
-
-	shape "NIPPLE" {corner=3, {[7.5,7.5]}};
-	solid "nipple" {shape="NIPPLE"; top=87; left=134; color="blue"; priority=200;};
-	shape "NIPPLEBUTTONS" {corner=2, {[32.5,13]}, {[33.5,0],[66,13]}};
-	solid "nipplebuttons" {shape="NIPPLEBUTTONS"; top=131; left=105; color="grey20"; priority=20;};
-
-	shape "FILLINGS" {corner=1.5, {[19,15]}, {[38,0],[55,15]}};
-	solid "fillings" {shape="FILLINGS"; top=112; left=238; color="grey"; priority=200;};
-
-	shape "FUNC" {corner=1.5, {[16.3,12]}, {[2,0.5], [14,10]}};
-	shape "ESC" {corner=1.5, {[18,12]}, {[2,0.5], [16,10]}};
-	shape "BKSP" {corner=1.5, {[36.5,18]}, {[3,0.5], [33.5,14]}};
-
-	section "Function" {key.color="grey"; priority=100; top=9; left=10; width=290; height=28;
-	row {top=0; left=161.1; keys {{<MENU>,"FUNC",1.1}, {<PRSC>,"FUNC",1.1}, {<NMLK>,"FUNC",1.1},
-		{<PAUS>,"FUNC",1.1}, {<INS>,"FUNC",2.5}, {<HOME>,"FUNC",1.1}, {<PGUP>,"FUNC",1.1}};};
-	row {top=12.5; left=0; keys {{<ESC>,"ESC",0},
-		{<FK01>,"FUNC",2.7}, {<FK02>,"FUNC",1.1}, {<FK03>,"FUNC",1.1}, {<FK04>,"FUNC",1.1},
-		{<FK05>,"FUNC",2.5}, {<FK06>,"FUNC",1.1}, {<FK07>,"FUNC",1.1}, {<FK08>,"FUNC",1.1},
-		{<FK09>,"FUNC",2.5}, {<FK10>,"FUNC",1.1}, {<FK11>,"FUNC",1.1}, {<FK12>,"FUNC",1.1},
-		{<DELE>,"FUNC",2.5}, {<END>, "FUNC",1.1}, {<PGDN>,"FUNC",1.1}};};
-	}; // End of "Function" section
-
-	shape "NORM" {corner=1.5, {[18,18]}, {[3,0.5], [14.8,14]}};
-	shape "TABK" {corner=1.5, {[28,18]}, {[3,0.5], [25,14]}};
-	shape "CAPS" {corner=1.5, {[32,18]}, {[3,0.5], [22,14]}};
-	shape "LFSH" {corner=1.5, {[23,18]}, {[3,0.5], [20,14]}};
-	shape "RTSH" {corner=1.5, {[50,18]}, {[3,1], [47,14]}};
-	shape "RTRN" {corner=1.5, {[0,0],[26.5,0],[26.5,37],[4,37],[4,18],[0,18]},
-		{[3,0.5], [23.5,0.5], [23.5,33], [7,33], [7,14], [3,14]}};
-	shape "SPCE" {corner=1.5,{[95,18]}, {[3,0.5],[92,14]}};
-	shape "LCTL" {corner=1.5, {[27,18]}, {[3,0.5],[24,14]}};
-	shape "LALT" {corner=1.5, {[22,18]}, {[3,0.5],[19,14]}};
-	shape "WIN" {corner=1.5, {[18,18]}, {[3,0.5],[15,14]}};
-
-	section "Alpha" {key.color="grey"; priority=100; top=36; left=10; width=290; height=18;
-	row {top=0; left=0; keys {{<TLDE>, "NORM", 0}, {<AE01>, "NORM", 1}, {<AE02>, "NORM", 1}, {<AE03>, "NORM", 1},
-		{<AE04>, "NORM", 1}, {<AE05>, "NORM", 1}, {<AE06>, "NORM", 1}, {<AE07>, "NORM", 1}, {<AE08>, "NORM", 1},
-		{<AE09>, "NORM", 1}, {<AE10>, "NORM", 1}, {<AE11>, "NORM", 1}, {<AE12>, "NORM", 1}, {<BKSP>, "BKSP", 1}};};
-	row {top=19; left=0; keys {{<TAB>, "TABK", 0}, {<AD01>, "NORM", 1}, {<AD02>, "NORM", 1}, {<AD03>, "NORM", 1},
-		{<AD04>, "NORM", 1}, {<AD05>, "NORM", 1}, {<AD06>, "NORM", 1}, {<AD07>, "NORM", 1}, {<AD08>, "NORM", 1},
-		{<AD09>, "NORM", 1}, {<AD10>, "NORM", 1}, {<AD11>, "NORM", 1}, {<AD12>, "NORM", 1}, {<RTRN>, "RTRN", 1}};};
-	row {top=38; left=0; keys {{<CAPS>, "CAPS", 0}, {<AC01>, "NORM", 1}, {<AC02>, "NORM", 1}, {<AC03>, "NORM", 1},
-		{<AC04>, "NORM", 1}, {<AC05>, "NORM", 1}, {<AC06>, "NORM", 1}, {<AC07>, "NORM", 1}, {<AC08>, "NORM", 1}, 
-		{<AC09>, "NORM", 1}, {<AC10>, "NORM", 1}, {<AC11>, "NORM", 1}, {<AC12>, "NORM", 1}};};
-	// TODO There's a weird <> key here, check it out:
-	row {top=57; left=0; keys {{<LFSH>, "LFSH", 0}, {<AB01>, "NORM", 1}, {<AB02>, "NORM", 1}, {<AB03>, "NORM", 1},
-		{<AB04>, "NORM", 1}, {<AB05>, "NORM", 1}, {<AB06>, "NORM", 1}, {<AB07>, "NORM", 1}, {<AB08>, "NORM", 1},
-		{<AB09>, "NORM", 1}, {<AB10>, "NORM", 1}, {<AB11>, "NORM", 1}, {<RTSH>, "RTSH", 1}};};
-	row {top=76; left=0; keys {{<LCTL>, "LCTL", 0}, {<FN>, "WIN", 1},{<LWIN>, "WIN", 1}, {<LALT>, "LALT", 1},
-		{<SPCE>, "SPCE", 1}, {<RALT>, "WIN", 1},{<RCTL>, "LALT", 1}};};
-	}; // End of "Alpha" section
-
-	shape "ARROW" {corner=1.5, {[17,15]}, {[2,0.5],[15,13]}};
-	section "Arrows" {key.color="grey"; priority=110; top=112; left=240; width=43; height=31;
-		row {top=0; left=18; keys {{<UP>, "ARROW", 0}};};	
-		row {top=16; left=0; keys {{<LEFT>, "ARROW", 0}, {<DOWN>, "ARROW", 1}, {<RGHT>, "ARROW", 1}};};
-		}; // End of "Arrows" section
-
-	shape "LEDS" {corner=3, {[25,7]}};
-	solid "leds" {shape="LEDS"; top=5.7; left=69; color="grey"; priority=10;};
-	shape "LED" {corner=0, {[0,1.5], [3,4.5]}, {[0.5,1.5], [1,0] , [2,0], [2.5,1.5]}};
-	indicator.onColor="green";
-	indicator.offColor="grey";
-	indicator.top=7;
-	indicator.shape="LED"; 
-	indicator.priority=200;
-	indicator "Num Lock" {left=72;};
-	indicator "Caps Lock" {left=80;};
-	indicator "Scroll Lock" {left=88;};
-
-	text "LATITUDE" {left=10; top=7; text="L A T I T U D E | D620";};
-
-	shape "ROUND" {corner=5, {[10,10]}};
-	shape "POWER" {corner=7, {[15,15]}};
-	section "Topbuttons" {key.color="grey"; priority=110; top=2; left=100;
-		row {top=2; left=0; keys {{<VLUP>, "ROUND", 0}, {<VLDN>, "ROUND", 3}, {<MUTE>, "ROUND", 3}};};	
-		row {top=0; left=45; keys {{<POWR>, "POWER", 0}};};
-		}; // End of "TopButtons" section
-};
+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//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 OPEN GROUP 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 Open Group 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 Open Group.
+//
+default xkb_geometry "dell101" {
+
+    description= "Dell 101";
+    width= 470;
+    height= 210;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
+    shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "CAPS" { { [ 33,18] }, { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,16] } };
+    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
+    shape "SPCE" { { [133,18] }, { [2,1], [131,16] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
+
+    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  52;
+	left= 377;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 67;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 382; };
+    indicator "Caps Lock"    { left= 407; };
+    indicator "Scroll Lock"  { left= 433; };
+    text.top= 55;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 52;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 91;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LCTL>, { <LALT>, 21 },
+		   { <SPCE>, "SPCE", color="white" },
+		   <RALT>, { <RCTL>, 21 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 91;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 91;
+	left= 376;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "default" geometry
+
+
+xkb_geometry "dell65" {
+};
+
+xkb_geometry "dell65x" {
+
+    description= "Dell 101";
+    width= 470;
+    height= 210;
+    color="grey10";
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
+    shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "CAPS" { { [ 33,18] }, { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,16] } };
+    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
+    shape "SPCE" { { [133,18] }, { [2,1], [131,16] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
+
+    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  52;
+	left= 377;
+	color= "grey10";
+    };
+
+    shape "BACKGROUND"  { cornerRadius=5, { [  470,  210 ] } };
+    solid "Background" {
+	shape= "BACKGROUND";
+	top=  0;
+	left= 0;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 67;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 382; };
+    indicator "Caps Lock"    { left= 407; };
+    indicator "Scroll Lock"  { left= 433; };
+    text.top= 55;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 52;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 91;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LCTL>, { <LALT>, 21 },
+		   { <SPCE>, "SPCE", color="white" },
+		   <RALT>, { <RCTL>, 21 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 91;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 91;
+	left= 376;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+};
+
+
+//
+// Dell Precision M65
+//
+
+xkb_geometry "dellm65" {
+
+    description= "Dell Precision M65";
+    width= 308;
+    height= 152;
+    baseColor = "grey20";
+    labelColor = "white";
+
+    shape "BACKGROUND"  { cornerRadius = 3, { [  308,  152 ] } };
+    shape "BACKGROUND2" { cornerRadius = 2, { [  7, 22 ], 
+                                              [ 171, 22 ],
+                                              [ 171, 10 ],
+                                              [ 301, 10 ],
+                                              [ 301, 148 ],
+                                              [ 244, 148 ],
+                                              [ 244, 132 ],
+                                              [   7, 132] } }; 
+    solid "Background" {
+	shape = "BACKGROUND";
+	top = 0;
+	left = 0;
+	color = "grey20";
+    };
+    solid "Background2" {
+	shape = "BACKGROUND2";
+	top = 0;
+	left = 0;
+	color = "black";
+    };
+
+    shape "LEDS" { cornerRadius = 4, { [ 26, 8 ] } };
+    shape "LED" { cornerRadius = 0, { [ 4, 4 ] } };
+    solid "LedPanel" {
+	shape = "LEDS";
+	top = 8;
+	left = 69;
+	color = "grey20";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "gray20";
+    indicator.top= 10;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 72; };
+    indicator "Caps Lock"    { left= 80; };
+    indicator "Scroll Lock"  { left= 88; };
+
+    shape "MEDIA" { cornerRadius = 5, { [ 2, 2], [ 12, 12 ] } };
+    shape "POWER" { cornerRadius = 7, { [ 14, 14 ] } };
+
+    section "Media" {
+        top = 5;
+        left = 102;
+        width = 60;
+        height = 14;
+        key.color="grey30";
+        key.shape = "MEDIA";
+        row {
+           top = 0;
+           keys {
+             <I2E>, <I30>, <I20>, { <I04>, shape = "POWER", gap = 3 }
+           };
+        };
+    };
+
+
+    shape "FKEY" { cornerRadius = 1, { [ 18, 12 ] }, { [ 1, 1 ], [ 17, 10 ] } };
+
+    section "Function" {
+       top = 12;
+       left = 8;
+       width = 290;
+       height = 24;
+       key.color = "grey80";
+       key.shape = "FKEY";
+       key.gap = 0;
+       row {
+	    top = 0;
+            keys {      { <MENU>, 165 }, <PRSC>, <NMLK>, <PAUS>, 
+                        { <INS>, 1 },  <HOME>, <PGUP> };
+       };
+       row {
+	    top = 12;
+            keys { <ESC>, { <FK01>, 1 }, <FK02>, <FK03>, <FK04>, 
+                          { <FK05>, 1 }, <FK06>, <FK07>, <FK08>,
+                          { <FK09>, 1 }, <FK10>, <FK11>, <FK12>,
+                          { <DELE>,  1 }, <END>, <PGDN> };
+       };
+   };
+
+   shape "AKEY" { cornerRadius = 1, { [ 19, 19 ] }, { [ 2, 1 ], [ 17, 15 ] } };
+   shape "BKSP" { cornerRadius = 1, { [ 44, 19 ] }, { [ 2, 1 ], [ 42, 15 ] } };
+   shape "TABK" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+   shape "BKSL" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+   shape "CAPS" { cornerRadius = 1, { [ 34, 19 ] }, { [ 2, 1 ], [ 32, 15 ] } };
+   shape "RTRN" { cornerRadius = 1, { [ 47, 19 ] }, { [ 2, 1 ], [ 45, 15 ] } };
+   shape "LFSH" { cornerRadius = 1, { [ 44, 19 ] }, { [ 2, 1 ], [ 42, 15 ] } };
+   shape "RTSH" { cornerRadius = 1, { [ 56, 19 ] }, { [ 2, 1 ], [ 54, 15 ] } };
+   shape "LCTL" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+   shape "LALT" { cornerRadius = 1, { [ 25, 19 ] }, { [ 2, 1 ], [ 23, 15 ] } };
+   shape "RCTL" { cornerRadius = 1, { [ 25, 19 ] }, { [ 2, 1 ], [ 23, 15 ] } };
+   shape "SPCE" { cornerRadius = 1, { [ 96, 19 ] }, { [ 2, 1 ], [ 94, 15 ] } };
+   
+
+   section "Alpha" {
+       top = 36;
+       left = 8;
+       width = 290;
+       height = 21;
+       key.color = "grey80";
+       key.shape = "AKEY";
+       key.gap = 0;
+       row {
+	    top = 1;
+            keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, { <BKSP>, 1, "BKSP" } };
+	};
+       row {
+	    top = 20;
+            keys { { <TAB>, "TABK" },
+		   { <AD01>, 1 }, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, 1, "BKSL" } };
+	};
+       row {
+	    top = 39;
+            keys { { <CAPS>, "CAPS" },
+		   { <AC01>, 1 }, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, 1, "RTRN" } };
+	};
+       row {
+	    top = 58;
+            keys { { <LFSH>, "LFSH" },
+		   { <AB01>, 1 }, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		   { <RTSH>, 1, "RTSH" } };
+	};
+       row {
+           top = 77;
+           keys { { <LCTL>, "LCTL" }, { <LWIN>, 20 }, { <LALT>, "LALT" }, 
+                  { <SPCE>, "SPCE" }, <RALT>, { <RCTL>, "RCTL" } };
+	};
+   };
+
+   shape "SKEY" { cornerRadius = 1, { [ 18, 17 ] }, { [ 2, 1 ], [ 16, 13 ] } };
+   section "Arrows" {
+        top = 113;
+        left = 243;
+        width = 54;
+        height = 36;
+        
+       key.color = "grey80";
+        key.shape = "SKEY";
+        row {
+           top = 0;
+           left = 20;
+
+           keys { <UP> };
+        };
+  
+        row {
+            top = 17;
+            left = 2;
+
+            keys { <LEFT>, <DOWN>, <RGHT> };
+        };
+   };
+
+  shape "STIK" { cornerRadius = 4, { [ 7, 7 ] } };
+
+  solid "STIK" {
+      priority = 255;
+      color = "blue";
+      shape = "STIK";
+      top = 90; 
+      left = 135;
+  };
+};
+ 
+xkb_geometry "latitude" {
+	description="Dell Latitude";
+	width=304.2; height=219.1;
+
+	baseColor="grey"; labelColor="white";
+
+	alias <AC00> =<CAPS>;
+	alias <AA00> =<LCTL>;
+
+	shape "EXTERNAL" {corner=3,
+		{[0,0], [302,0], [302,154], [174,154], [174,198], [166,216], [107,216], [100,198], [100,154], [0,154]}};
+	solid "external" {shape="EXTERNAL"; top=1.1; left=1.1; color="grey10"; priority=10;};
+
+	shape "INTERNAL" {corner=3,
+		{[0,13], [162.2,13], [162.2,0], [286,0], [286,138], [230,138], [230,124], [163,124], [163,138], [96,138], [96,124], [0,124]}};
+	solid "internal" {shape="INTERNAL"; top=7; left=8.5; color="black"; priority=20;};
+
+	shape "TOUCHPAD" {corner=2, {[68,40]}};
+	solid "touchpad" {shape="TOUCHPAD"; top=153; left=104; color="grey20"; priority=20;};
+
+	shape "TOUCHPADBUTTONS" {corner=1,
+		{[0,0], [33.5,0], [33.5,16], [6,16]},
+		{[34.5,0], [68,0], [61, 16], [34.5,16]}};
+	solid "touchleft" {shape="TOUCHPADBUTTONS"; top=198; left=104; color="grey20"; priority=20;};
+
+	shape "NIPPLE" {corner=3, {[7.5,7.5]}};
+	solid "nipple" {shape="NIPPLE"; top=87; left=134; color="blue"; priority=200;};
+	shape "NIPPLEBUTTONS" {corner=2, {[32.5,13]}, {[33.5,0],[66,13]}};
+	solid "nipplebuttons" {shape="NIPPLEBUTTONS"; top=131; left=105; color="grey20"; priority=20;};
+
+	shape "FILLINGS" {corner=1.5, {[19,15]}, {[38,0],[55,15]}};
+	solid "fillings" {shape="FILLINGS"; top=112; left=238; color="grey"; priority=200;};
+
+	shape "FUNC" {corner=1.5, {[16.3,12]}, {[2,0.5], [14,10]}};
+	shape "ESC" {corner=1.5, {[18,12]}, {[2,0.5], [16,10]}};
+	shape "BKSP" {corner=1.5, {[36.5,18]}, {[3,0.5], [33.5,14]}};
+
+	section "Function" {key.color="grey"; priority=100; top=9; left=10; width=290; height=28;
+	row {top=0; left=161.1; keys {{<MENU>,"FUNC",1.1}, {<PRSC>,"FUNC",1.1}, {<NMLK>,"FUNC",1.1},
+		{<PAUS>,"FUNC",1.1}, {<INS>,"FUNC",2.5}, {<HOME>,"FUNC",1.1}, {<PGUP>,"FUNC",1.1}};};
+	row {top=12.5; left=0; keys {{<ESC>,"ESC",0},
+		{<FK01>,"FUNC",2.7}, {<FK02>,"FUNC",1.1}, {<FK03>,"FUNC",1.1}, {<FK04>,"FUNC",1.1},
+		{<FK05>,"FUNC",2.5}, {<FK06>,"FUNC",1.1}, {<FK07>,"FUNC",1.1}, {<FK08>,"FUNC",1.1},
+		{<FK09>,"FUNC",2.5}, {<FK10>,"FUNC",1.1}, {<FK11>,"FUNC",1.1}, {<FK12>,"FUNC",1.1},
+		{<DELE>,"FUNC",2.5}, {<END>, "FUNC",1.1}, {<PGDN>,"FUNC",1.1}};};
+	}; // End of "Function" section
+
+	shape "NORM" {corner=1.5, {[18,18]}, {[3,0.5], [14.8,14]}};
+	shape "TABK" {corner=1.5, {[28,18]}, {[3,0.5], [25,14]}};
+	shape "CAPS" {corner=1.5, {[32,18]}, {[3,0.5], [22,14]}};
+	shape "LFSH" {corner=1.5, {[23,18]}, {[3,0.5], [20,14]}};
+	shape "RTSH" {corner=1.5, {[50,18]}, {[3,1], [47,14]}};
+	shape "RTRN" {corner=1.5, {[0,0],[26.5,0],[26.5,37],[4,37],[4,18],[0,18]},
+		{[3,0.5], [23.5,0.5], [23.5,33], [7,33], [7,14], [3,14]}};
+	shape "SPCE" {corner=1.5,{[95,18]}, {[3,0.5],[92,14]}};
+	shape "LCTL" {corner=1.5, {[27,18]}, {[3,0.5],[24,14]}};
+	shape "LALT" {corner=1.5, {[22,18]}, {[3,0.5],[19,14]}};
+	shape "WIN" {corner=1.5, {[18,18]}, {[3,0.5],[15,14]}};
+
+	section "Alpha" {key.color="grey"; priority=100; top=36; left=10; width=290; height=18;
+	row {top=0; left=0; keys {{<TLDE>, "NORM", 0}, {<AE01>, "NORM", 1}, {<AE02>, "NORM", 1}, {<AE03>, "NORM", 1},
+		{<AE04>, "NORM", 1}, {<AE05>, "NORM", 1}, {<AE06>, "NORM", 1}, {<AE07>, "NORM", 1}, {<AE08>, "NORM", 1},
+		{<AE09>, "NORM", 1}, {<AE10>, "NORM", 1}, {<AE11>, "NORM", 1}, {<AE12>, "NORM", 1}, {<BKSP>, "BKSP", 1}};};
+	row {top=19; left=0; keys {{<TAB>, "TABK", 0}, {<AD01>, "NORM", 1}, {<AD02>, "NORM", 1}, {<AD03>, "NORM", 1},
+		{<AD04>, "NORM", 1}, {<AD05>, "NORM", 1}, {<AD06>, "NORM", 1}, {<AD07>, "NORM", 1}, {<AD08>, "NORM", 1},
+		{<AD09>, "NORM", 1}, {<AD10>, "NORM", 1}, {<AD11>, "NORM", 1}, {<AD12>, "NORM", 1}, {<RTRN>, "RTRN", 1}};};
+	row {top=38; left=0; keys {{<CAPS>, "CAPS", 0}, {<AC01>, "NORM", 1}, {<AC02>, "NORM", 1}, {<AC03>, "NORM", 1},
+		{<AC04>, "NORM", 1}, {<AC05>, "NORM", 1}, {<AC06>, "NORM", 1}, {<AC07>, "NORM", 1}, {<AC08>, "NORM", 1}, 
+		{<AC09>, "NORM", 1}, {<AC10>, "NORM", 1}, {<AC11>, "NORM", 1}, {<AC12>, "NORM", 1}};};
+	// TODO There's a weird <> key here, check it out:
+	row {top=57; left=0; keys {{<LFSH>, "LFSH", 0}, {<AB01>, "NORM", 1}, {<AB02>, "NORM", 1}, {<AB03>, "NORM", 1},
+		{<AB04>, "NORM", 1}, {<AB05>, "NORM", 1}, {<AB06>, "NORM", 1}, {<AB07>, "NORM", 1}, {<AB08>, "NORM", 1},
+		{<AB09>, "NORM", 1}, {<AB10>, "NORM", 1}, {<AB11>, "NORM", 1}, {<RTSH>, "RTSH", 1}};};
+	row {top=76; left=0; keys {{<LCTL>, "LCTL", 0}, {<FN>, "WIN", 1},{<LWIN>, "WIN", 1}, {<LALT>, "LALT", 1},
+		{<SPCE>, "SPCE", 1}, {<RALT>, "WIN", 1},{<RCTL>, "LALT", 1}};};
+	}; // End of "Alpha" section
+
+	shape "ARROW" {corner=1.5, {[17,15]}, {[2,0.5],[15,13]}};
+	section "Arrows" {key.color="grey"; priority=110; top=112; left=240; width=43; height=31;
+		row {top=0; left=18; keys {{<UP>, "ARROW", 0}};};	
+		row {top=16; left=0; keys {{<LEFT>, "ARROW", 0}, {<DOWN>, "ARROW", 1}, {<RGHT>, "ARROW", 1}};};
+		}; // End of "Arrows" section
+
+	shape "LEDS" {corner=3, {[25,7]}};
+	solid "leds" {shape="LEDS"; top=5.7; left=69; color="grey"; priority=10;};
+	shape "LED" {corner=0, {[0,1.5], [3,4.5]}, {[0.5,1.5], [1,0] , [2,0], [2.5,1.5]}};
+	indicator.onColor="green";
+	indicator.offColor="grey";
+	indicator.top=7;
+	indicator.shape="LED"; 
+	indicator.priority=200;
+	indicator "Num Lock" {left=72;};
+	indicator "Caps Lock" {left=80;};
+	indicator "Scroll Lock" {left=88;};
+
+	text "LATITUDE" {left=10; top=7; text="L A T I T U D E | D620";};
+
+	shape "ROUND" {corner=5, {[10,10]}};
+	shape "POWER" {corner=7, {[15,15]}};
+	section "Topbuttons" {key.color="grey"; priority=110; top=2; left=100;
+		row {top=2; left=0; keys {{<VLUP>, "ROUND", 0}, {<VLDN>, "ROUND", 3}, {<MUTE>, "ROUND", 3}};};	
+		row {top=0; left=45; keys {{<POWR>, "POWER", 0}};};
+		}; // End of "TopButtons" section
+};
diff --git a/xorg-server/xkeyboard-config/geometry/digital_vndr/Makefile.am b/xorg-server/xkeyboard-config/geometry/digital_vndr/Makefile.am
index 821c0ccf4..94464f8cb 100644
--- a/xorg-server/xkeyboard-config/geometry/digital_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/geometry/digital_vndr/Makefile.am
@@ -1,4 +1,4 @@
-geomdir = $(xkb_base)/geometry/digital_vndr
-
-dist_geom_DATA = \
-lk  pc  unix
+geomdir = $(xkb_base)/geometry/digital_vndr
+
+dist_geom_DATA = \
+lk  pc  unix
diff --git a/xorg-server/xkeyboard-config/geometry/digital_vndr/lk b/xorg-server/xkeyboard-config/geometry/digital_vndr/lk
index fb6b2c72c..cf7c57372 100644
--- a/xorg-server/xkeyboard-config/geometry/digital_vndr/lk
+++ b/xorg-server/xkeyboard-config/geometry/digital_vndr/lk
@@ -1,728 +1,728 @@
-//
-//Copyright (c) 1996  Digital Equipment Corporation
-//
-//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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment 
-//Corporation shall not be used in advertising or otherwise to promote
-//the sale, use or other dealings in this Software without prior written
-//authorization from Digital Equipment Corporation.
-//
-// HISTORY
-// Log: lk,v 
-// Revision 1.2  1996/06/18  09:12:47  erik
-// use flags correctly, assorted cleanups and consortium fixes
-//
-// Revision 1.1.6.2  1995/08/18  21:15:16  William_Walker
-// 	Upgrade XKB to Protocol Rev. 0.64
-// 	[1995/08/18  20:41:46  William_Walker]
-//
-// Revision 1.1.2.5  1995/08/11  19:35:47  William_Walker
-// 	Sync up with Erik's pool.
-// 	[1995/08/11  18:35:58  William_Walker]
-// 
-// Revision 1.1.2.4  1995/06/27  12:17:28  William_Walker
-// 	Rename <TLDE> to ISO9995 compliant <AE00>.
-// 	[1995/06/26  20:23:07  William_Walker]
-// 
-// Revision 1.1.2.3  1995/06/09  20:54:36  William_Walker
-// 	Add VT105 layout support and ISO group support
-// 	[1995/06/09  20:40:38  William_Walker]
-// 
-// Revision 1.1.2.2  1995/06/05  19:21:16  William_Walker
-// 	New file.  I love keymaps.
-// 	[1995/06/05  18:05:43  William_Walker]
-// 
-// EndLog
-// 
-// @(#)RCSfile: lk,v  Revision: 1.2  (DEC) Date: 1996/01/24 12:16:00
-// 
-xkb_geometry "lk201" {
-    width	       = 530;
-    height	       = 170;
-    shape.cornerRadius = 1;
-
-    shape "NORM" { { [18,19] }, { [3,2], [15,16] } };
-    shape "RTRN" {
-	approx = { [0,0],[23,19] },
-        { [0,0], [23,0], [23,39], [5,39], [5,19], [0,19] },
-        { [3,2], [20,2], [20,36], [8,36], [8,16], [3,16] }
-    };
-    shape "LONG"  { { [37,19] }, { [3,2], [34,16] } };
-    shape "TALL" { { [18,39] }, { [3,2], [15,36] } };
-    shape "MED" { { [28,19] }, { [3,2], [25,16] } };
-    shape "CAPS" { { [28,19] }, { [3,2], [18,16] } };
-    shape "SPCE" { { [171,19] },{ [3,2], [168,16]} };
-    shape "LEDS" { [ 30,15] };
-    shape "LED"  { [  5, 2] };
-
-    section.left= 27;
-    row.left	= 1;
-    key.shape	= "NORM";
-    key.gap	=  1;
-
-    section "Function" { top = 20;
-        row { top = 1;
-	    keys {  <FK01>, <FK02>, <FK03>, <FK04>, <FK05>,
-		    { <FK06>, 19 }, <FK07>, <FK08>, <FK09>, <FK10>,
-		    { <FK11>, 19 }, <FK12>, <FK13>, <FK14>,
-		    { <FK17>, 98 }, <FK18>, <FK19>, <FK20>
-	    };
-        };
-    };
-
-    section "Editing" { top = 20; left = 350;
-        row { top = 1;
-	    keys { <HELP>, { <DO>, "LONG" } };
-        };
-        row { top = 41;
-	    keys { <FIND>, <INS>, <DELE> };
-        };
-        row { top = 61;
-	    keys { <SELE>, <PGUP>, <PGDN> };
-        };
-        row { top = 81; left = 20;
-	    keys { <UP> };
-        };
-        row { top = 101;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-        };
-    };
-
-    section "Keypad" { top = 60; left = 426;
-        row { top = 1;
-	    keys { <KPF1>, <KPF2>, <KPF3>, <KPF4> };
-        };
-        row { top = 21;
-	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
-        };
-        row { top = 41;
-	    keys { <KP4>, <KP5>, <KP6>, <KPCO> };
-        };
-        row { top = 61;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "TALL" } };
-        };
-        row { top = 81;
-	    keys { { <KP0>, "LONG" }, <KPDL> };
-        };
-    };
-
-    section "Alpha" { top = 60;
-        row { top = 1; left = 15;
-	    keys {  <AE00>, 
-		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
-		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
-		    { <BKSP>, "MED" }
-	    };
-        };
-        row { top = 21; left = 15;
-	    keys {  { <TAB>, "MED" },
-		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
-		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
-		    { <RTRN>, "RTRN" }
-	    };
-
-        };
-        row { top = 41;
-	    keys {  <LCTL>,
-		    { <CAPS>, "CAPS" },
-		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
-		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL>
-	    };
-        };
-        row { top = 61;
-	    keys {  { <LFSH>, "LONG" },
-		    <AB00>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
-		    { <RTSH>, "LONG" }
-	    };
-        };
-        row { top = 81;	left = 26;
-	    keys {  { <LCMP>, "LONG" },
-	    	    { <SPCE>, "SPCE" }
-	    };
-        };
-    };
-
-    section.left = 341;
-    section.top  = 3;
-
-    section "Indicators" {
-        indicator.onColor = "#00ff00";
-        indicator.offColor= "#001000";
-        indicator.top = 10;
-        indicator.shape= "LED";
-        indicator "Scroll Lock" { left = 9;  };
-        indicator "Caps Lock"   { left = 27; };
-        indicator "Compose"     { left = 45; };
-        indicator "Wait"        { left = 63; };
-        text.top = 4;
-        text.color = "black";
-        text "HoldScreenLabel" {left = 5; text="Hold\n"; };
-        text "CapsLockLabel" {left = 23; text="Lock\n"; };
-        text "ComposeLabel" {left = 37; text="Compose\n"; };
-        text "WaitLabel" {left = 60; text="Wait\n"; };
-    };
-};
-
-xkb_geometry "lk401" {
-
-    width		= 480;
-    height		= 180;
-    shape.cornerRadius	= 1;
-
-    shape "NORM" { { [18,19] }, { [3,2], [15,16] } };
-    shape "RTRN" {
-	approx = { [0,0],[23,19] },
-        { [0,0], [23,0], [23,39], [5,39], [5,19], [0,19] },
-        { [3,2], [20,2], [20,36], [8,36], [8,16], [3,16] }
-    };
-    shape "LONG"  { { [37,19] }, { [3,2], [34,16] } };
-    shape "TALL" { { [18,39] }, { [3,2], [15,36] } };
-    shape "MED" { { [28,19] }, { [3,2], [25,16] } };
-    shape "CAPS" { { [28,19] }, { [3,2], [18,16] } };
-    shape "SPCE" { { [131,19] },{ [3,2], [128,16]} };
-    shape "LEDS" { [ 36,15] };
-    shape "LED"  { [  5, 2] };
-
-    section.left= 17;
-    row.left	= 1;
-    key.shape	= "NORM";
-    key.gap	=  1;
-
-    text "Logo" {left = 20; top = 10; text="digital\n"; };
-
-    section "Function" { top = 20;
-    	row { top = 1;
-	    keys {  <FK01>, <FK02>, <FK03>, <FK04>, <FK05>,
-	    	    { <FK06>, 15 }, <FK07>, <FK08>, <FK09>, <FK10>,
-		    { <FK11>, 15 }, <FK12>, <FK13>, <FK14>,
-		    { <FK17>, 75 }, <FK18>, <FK19>, <FK20>
-	    };
-        };
-    };
-
-    section "Editing" { top = 20; left = 320;
-        row { top = 1;
-	    keys { <HELP>, { <DO>, "LONG" } };
-        };
-        row { top = 41;
-	    keys { <FIND>, <INS>, <DELE> };
-        };
-        row { top = 61;
-	    keys { <SELE>, <PGUP>, <PGDN> };
-        };
-        row { top = 81; left= 20;
-	    keys { <UP> };
-        };
-        row { top = 101;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-        };
-    };
-
-    section "Keypad" { top = 60; left = 385;
-        row { top = 1;
-	    keys { <KPF1>, <KPF2>, <KPF3>, <KPF4> };
-        };
-        row {
-	    top = 21;
-	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
-        };
-        row { top = 41;
-	    keys { <KP4>, <KP5>, <KP6>, <KPCO> };
-        };
-        row { top = 61;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "TALL" } };
-        };
-        row { top = 81;
-	    keys { { <KP0>, "LONG" }, <KPDL> };
-        };
-    };
-
-    section "Alpha" { top = 60;
-        row { top = 1; left = 15;
-	    keys {  <AE00>, 
-		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
-		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
-		    { <BKSP>, "MED" }
-	    };
-        };
-        row { top = 21; left = 15;
-	    keys {	{ <TAB>, "MED" },
-	    	    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
-		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
-		    { <RTRN>, "RTRN" }
-	    };
-
-        };
-        row { top = 41;
-	    keys {  <LCTL>,
-	    	    { <CAPS>, "CAPS" },
-		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
-		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL>
-	    };
-        };
-        row { top = 61;
-	    keys { 	{ <LFSH>, "LONG" },
-		    <AB00>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
-		    { <RTSH>, "LONG" }
-	    };
-        };
-        row { top = 81; left = 29;
-	    keys { 	{ <LCMP>, "MED" },
-		    { <LALT>, "MED" },
-		    { <SPCE>, "SPCE" },
-		    { <RALT>, "MED" },
-		    { <RCMP>, "MED" }
-	    };
-        };
-    };
-
-    section.left = 69;
-    section.top  = 3;
-    section "Indicators" {
-        solid "led_panel" { top = 0; left = 0;
-	    cornerRadius = 1;
-	    shape = "LEDS";
-	    color = "grey";
-        };
-        indicator.onColor = "#00ff00";
-        indicator.offColor= "#001000";
-        indicator.shape   = "LED";
-        indicator.top 	  = 1;
-        indicator "Scroll Lock" { left = 3;  };
-        indicator "Caps Lock"   { left = 22; };
-    };
-    section "IndicatorLabels" {
-	text.top = 4;
-	text.color = "black";
-	text "ScrollLockLabel" {left = 3;  text="Scroll\nLock"; };
-	text "CapsLockLabel"   {left = 22; text="Caps\nLock"; };
-    };
-};
-
-xkb_geometry "lk450" {
-
-    width		= 480;
-    height		= 180;
-    shape.cornerRadius	= 1;
-
-    shape "NORM" { { [18,19] }, { [3,2], [15,16] } };
-    shape "RTRN" {
-	approx = { [0,0],[23,19] },
-        { [0,0], [23,0], [23,39], [5,39], [5,19], [0,19] },
-        { [3,2], [20,2], [20,36], [8,36], [8,16], [3,16] }
-    };
-    shape "LONG"  { { [37,19] }, { [3,2], [34,16] } };
-    shape "TALL" { { [18,39] }, { [3,2], [15,36] } };
-    shape "MED" { { [28,19] }, { [3,2], [25,16] } };
-    shape "CAPS" { { [28,19] }, { [3,2], [18,16] } };
-    shape "SPCE" { { [131,19] },{ [3,2], [128,16]} };
-    shape "LEDS" { [ 36,15] };
-    shape "LED"  { [  5, 2] };
-
-    section.left= 17;
-    row.left	= 1;
-    key.shape	= "NORM";
-    key.gap	=  1;
-
-    text "Logo" {left = 20; top = 10; text="digital\n"; };
-
-    section "Function" { top = 20;
-    	row { top = 1;
-	    keys {  <FK01>, <FK02>, <FK03>, <FK04>, <FK05>,
-	    	    { <FK06>, 15 }, <FK07>, <FK08>, <FK09>, <FK10>,
-		    { <FK11>, 15 }, <FK12>, <FK13>, <FK14>,
-		    { <FK17>, 75 }, <FK18>, <FK19>, <FK20>
-	    };
-        };
-    };
-
-    section "Editing" { top = 20; left = 320;
-        row { top = 1;
-	    keys { <HELP>, { <DO>, "LONG" } };
-        };
-        row { top = 41;
-	    keys { <FIND>, <INS>, <DELE> };
-        };
-        row { top = 61;
-	    keys { <SELE>, <PGUP>, <PGDN> };
-        };
-        row { top = 81; left= 20;
-	    keys { <UP> };
-        };
-        row { top = 101;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-        };
-    };
-
-    section "Keypad" { top = 60; left = 385;
-        row { top = 1;
-	    keys { <KPF1>, <KPF2>, <KPF3>, <KPF4> };
-        };
-        row {
-	    top = 21;
-	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
-        };
-        row { top = 41;
-	    keys { <KP4>, <KP5>, <KP6>, <KPCO> };
-        };
-        row { top = 61;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "TALL" } };
-        };
-        row { top = 81;
-	    keys { { <KP0>, "LONG" }, <KPDL> };
-        };
-    };
-
-    section "Alpha" { top = 60;
-        row { top = 1; left = 15;
-	    keys {  <AE00>, 
-		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
-		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
-		    { <BKSP>, "MED" }
-	    };
-        };
-        row { top = 21; left = 15;
-	    keys {	{ <TAB>, "MED" },
-	    	    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
-		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
-		    { <RTRN>, "RTRN" }
-	    };
-
-        };
-        row { top = 41;
-	    keys {  <LCTL>,
-	    	    { <CAPS>, "CAPS" },
-		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
-		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL>
-	    };
-        };
-        row { top = 61;
-	    keys { 	{ <LFSH>, "LONG" },
-		    <AB00>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
-		    { <RTSH>, "LONG" }
-	    };
-        };
-        row { top = 81; left = 29;
-	    keys { 	{ <LCMP>, "MED" },
-		    { <LALT>, "MED" },
-		    { <SPCE>, "SPCE" },
-		    { <RALT>, "MED" },
-		    { <RCMP>, "MED" }
-	    };
-        };
-    };
-
-    section.left = 69;
-    section.top  = 3;
-    section "Indicators" {
-        solid "led_panel" { top = 0; left = 0;
-	    cornerRadius = 1;
-	    shape = "LEDS";
-	    color = "grey";
-        };
-        indicator.onColor = "#00ff00";
-        indicator.offColor= "#001000";
-        indicator.shape   = "LED";
-        indicator.top 	  = 1;
-        indicator "Scroll Lock" { left = 3;  };
-        indicator "Caps Lock"   { left = 22; };
-    };
-    section "IndicatorLabels" {
-	text.top = 4;
-	text.color = "black";
-	text "ScrollLockLabel" {left = 3;  text="Scroll\nLock"; };
-	text "CapsLockLabel"   {left = 22; text="Caps\nLock"; };
-    };
-};
-
-xkb_geometry "lk401bj"
-{
-    width		= 480;
-    height		= 180;
-    shape.cornerRadius  = 1;
-
-    shape "NORM" { { [18,19] }, { [3,2], [15,16] } };
-    shape "RTRN" {
-    	approx = { [0,0],[23,19] },
-        { [0,0], [23,0], [23,39], [5,39], [5,19], [0,19] },
-        { [3,2], [20,2], [20,36], [8,36], [8,16], [3,16] }
-    };
-    shape "LONG"  { { [37,19] }, { [3,2], [34,16] } };
-    shape "TALL" { { [18,39] }, { [3,2], [15,36] } };
-    shape "MED" { { [28,19] }, { [3,2], [25,16] } };
-    shape "CAPS" { { [28,19] }, { [3,2], [18,16] } };
-    shape "SPCE" { { [131,19] },{ [3,2], [128,16]} };
-    shape "LEDS" { [ 30,15] };
-    shape "LED"  { [  5, 2] };
-
-    section.left= 17;
-    row.left	= 1;
-    key.shape	= "NORM";
-    key.gap	=  1;
-
-    text "Logo" {left = 20; top = 10; text="digital\n"; };
-
-    section "Function" { top = 20;
-        row { top = 1;
-    	    keys {  <FK01>, <FK02>, <FK03>, <FK04>, <FK05>,
-		    { <FK06>, 15 }, <FK07>, <FK08>, <FK09>, <FK10>,
-		    { <FK11>, 15 }, <FK12>, <FK13>, <FK14>,
-		    { <FK17>, 75 }, <FK18>, <FK19>, <FK20>
-	    };
-        };
-    };
-
-    section "Editing" { top = 20; left = 320;
-        row { top = 1;
-	    keys { <HELP>, { <DO>, "LONG" } };
-        };
-        row { top = 41;
-	    keys { <FIND>, <INS>, <DELE> };
-        };
-        row { top = 61;
-	    keys { <SELE>, <PGUP>, <PGDN> };
-        };
-        row { top = 81;	left = 20;
-	    keys { <UP> };
-        };
-        row { top = 101;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-        };
-    };
-
-    section "Keypad" { top = 60; left = 385;
-        row { top = 1;
-	    keys { <PF1>, <PF2>, <PF3>, <PF4> };
-        };
-        row { top = 21;
-	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
-        };
-        row { top = 41;
-	    keys { <KP4>, <KP5>, <KP6>, <KPCO> };
-        };
-        row { top = 61;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "TALL" } };
-        };
-        row { top = 81;
-	    keys { { <KP0>, "LONG" }, <KPDL> };
-        };
-    };
-
-    section "Alpha" { top = 60;
-        row { top = 1; left = 15;
-	    keys {  <AE00>, 
-		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
-		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
-		    { <BKSP>, "MED" }
-	    };
-        };
-        row { top = 21;	left = 15;
-	    keys {  { <TAB>, "MED" },
-		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
-		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
-		    { <RTRN>, "RTRN" }
-	    };
-        };
-        row { top = 41;
-	    keys {  <LCTL>,
-		    { <CAPS>, "CAPS" },
-		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
-		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL>
-	    };
-        };
-        row { top = 61;
-	    keys {  { <LFSH>, "LONG" },
-		    <AB00>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
-		    { <RTSH>, "LONG" }
-	    };
-        };
-        row { top = 81;	left = 29;
-	    keys {  { <LCMP>, "MED" },
-		    { <LALT>, "MED" },
-		    { <SPCE>, "SPCE" },
-		    { <RALT>, "MED" },
-		    { <RCMP>, "MED" }
-	    };
-        };
-    };
-
-    section.left = 69;
-    section.top  = 3;
-
-    section "Indicators" {
-        solid "led_panel" { top = 0; left = 0;
-	    cornerRadius = 1;
-	    shape = "LEDS";
-	    color = "grey";
-        };
-        indicator.onColor = "#00ff00";
-        indicator.offColor= "#001000";
-        indicator.top = 1;
-        indicator.shape= "LED";
-        indicator "Scroll Lock" { left = 3; };
-        indicator "Caps Lock" { left = 22; };
-        text.top = 4;
-        text.color = "black";
-        text "ScrollLockLabel" {left = 3; text="Scroll\nLock"; };
-        text "CapsLockLabel" {left = 19; text="Caps\nLock"; };
-    };
-};
-
-xkb_geometry "lk401jj" {
-
-    width		= 460;
-    height		= 180;
-    shape.cornerRadius  = 1;
-
-    shape "NORM" { { [18,19] }, { [3,2], [15,16] } };
-    shape "RTRN" {
-	approx = { [0,0],[28,23] },
-        { [0,0], [28,0], [28,39], [5,39], [5,19], [0,19] },
-        { [3,2], [25,2], [25,36], [8,36], [8,16], [3,16] }
-    };
-    shape "LONG"  { { [37,19] }, { [3,2], [34,16] } };
-    shape "LONG1" { { [32,19] }, { [3,2], [29,16] } };
-    shape "TALL" { { [18,39] }, { [3,2], [15,36] } };
-    shape "MED" { { [28,19] }, { [3,2], [25,16] } };
-    shape "MED1" { { [23,19] }, { [3,2], [20,16] } };
-    shape "CTRL" { { [43,19] }, { [3,2], [38,16] } };
-    shape "SPCE" { { [55,19] },{ [3,2], [53,16]} };
-    shape "LEDS" { [ 56,15] };
-    shape "LED"  { [  5, 2] };
-
-    section.left	= 5;
-    row.left	= 1;
-    key.shape	= "NORM";
-    key.gap		=  1;
-
-    text "Logo" {left = 7; top = 10; text="digital\n"; };
-
-    section "Function" { top = 40;
-        row { top = 1;
-	    keys {  <FK01>, <FK02>, <FK03>, <FK04>, <FK05>,
-		    { <FK06>, 18 }, <FK07>, <FK08>, <FK09>, <FK10>,
-		    { <FK11>, 18 }, <FK12>, <FK13>, <FK14>,
-		    { <FK17>, 73 }, <FK18>, <FK19>, <FK20>
-	    };
-        };
-    };
-
-    section "Editing" { top = 40; left = 313;
-        row { top = 1;
-	    keys { <HELP>, { <DO>, "LONG" } };
-        };
-        row { top = 31;
-	    keys { <FIND>, <INS>, <DELE> };
-        };
-        row { top = 51;
-	    keys { <SELE>, <PGUP>, <PGDN> };
-        };
-        row { top = 71;	left= 20;
-	    keys { <UP> };
-        };
-        row { top = 91;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-        };
-    };
-
-    section "Keypad" { top = 70; left = 377;
-        row { top = 1;
-	    keys { <PF1>, <PF2>, <PF3>, <PF4> };
-        };
-        row { top = 21;
-	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
-        };
-        row { top = 41;
-	    keys { <KP4>, <KP5>, <KP6>, <KPCO> };
-        };
-        row { top = 61;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "TALL" } };
-        };
-        row { top = 81;
-	    keys { { <KP0>, "LONG" }, <KPDL> };
-        };
-    };
-
-    section "Alpha" { top = 70;
-        row { top = 1; left = 7;
-	    keys {  { <AE00>, "MED1" }, 
-		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
-		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
-		    <AB00>, { <BKSP>, "MED1" }
-	    };
-        };
-        row { top = 21; left = 7;
-	    keys {  { <TAB>, "LONG1" },
-		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
-		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
-		    { <RTRN>, "RTRN" }
-	    };
-        };
-        row { top = 41;
-	    keys {  { <LCTL>, "CTRL" },
-		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
-		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL>
-	    };
-        };
-        row { top = 61;
-	    keys {  <CAPS>, { <LFSH>, "LONG1" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
-		    <AB11>, { <RTSH>, "MED" }
-	    };
-        };
-        row { top = 81;	left = 7;
-	    keys {  { <LCMP>, "LONG" },
-		    { <LALT>, "LONG" },
-		    { <MUHE>, "LONG" },
-		    { <SPCE>, "SPCE" },
-		    { <KANJ>, "LONG" },
-		    { <HIRA>, "LONG" },
-		    <RALT>, <RCMP>
-	    };
-        };
-    };
-
-    section.left = 315;
-    section.top  = 20;
-
-    section "Indicators" {
-        solid "led_panel" { top = 0; left = 0;
-	    cornerRadius = 1;
-	    shape = "LEDS";
-	    color = "grey";
-        };
-        indicator.onColor = "#00ff00";
-        indicator.offColor= "#001000";
-        indicator.top = 11;
-        indicator.shape= "LED";
-        indicator "Scroll Lock" { left = 6;  };
-        indicator "Caps Lock"   { left = 26; };
-        text.top = 4;
-        text.color = "black";
-        text "ScrollLockLabel" {left = 3; text="Scroll\nLock"; };
-        text "CapsLockLabel" {left = 22; text="Caps\nLock"; };
-    };
-};
+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log: lk,v 
+// Revision 1.2  1996/06/18  09:12:47  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.6.2  1995/08/18  21:15:16  William_Walker
+// 	Upgrade XKB to Protocol Rev. 0.64
+// 	[1995/08/18  20:41:46  William_Walker]
+//
+// Revision 1.1.2.5  1995/08/11  19:35:47  William_Walker
+// 	Sync up with Erik's pool.
+// 	[1995/08/11  18:35:58  William_Walker]
+// 
+// Revision 1.1.2.4  1995/06/27  12:17:28  William_Walker
+// 	Rename <TLDE> to ISO9995 compliant <AE00>.
+// 	[1995/06/26  20:23:07  William_Walker]
+// 
+// Revision 1.1.2.3  1995/06/09  20:54:36  William_Walker
+// 	Add VT105 layout support and ISO group support
+// 	[1995/06/09  20:40:38  William_Walker]
+// 
+// Revision 1.1.2.2  1995/06/05  19:21:16  William_Walker
+// 	New file.  I love keymaps.
+// 	[1995/06/05  18:05:43  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: lk,v  Revision: 1.2  (DEC) Date: 1996/01/24 12:16:00
+// 
+xkb_geometry "lk201" {
+    width	       = 530;
+    height	       = 170;
+    shape.cornerRadius = 1;
+
+    shape "NORM" { { [18,19] }, { [3,2], [15,16] } };
+    shape "RTRN" {
+	approx = { [0,0],[23,19] },
+        { [0,0], [23,0], [23,39], [5,39], [5,19], [0,19] },
+        { [3,2], [20,2], [20,36], [8,36], [8,16], [3,16] }
+    };
+    shape "LONG"  { { [37,19] }, { [3,2], [34,16] } };
+    shape "TALL" { { [18,39] }, { [3,2], [15,36] } };
+    shape "MED" { { [28,19] }, { [3,2], [25,16] } };
+    shape "CAPS" { { [28,19] }, { [3,2], [18,16] } };
+    shape "SPCE" { { [171,19] },{ [3,2], [168,16]} };
+    shape "LEDS" { [ 30,15] };
+    shape "LED"  { [  5, 2] };
+
+    section.left= 27;
+    row.left	= 1;
+    key.shape	= "NORM";
+    key.gap	=  1;
+
+    section "Function" { top = 20;
+        row { top = 1;
+	    keys {  <FK01>, <FK02>, <FK03>, <FK04>, <FK05>,
+		    { <FK06>, 19 }, <FK07>, <FK08>, <FK09>, <FK10>,
+		    { <FK11>, 19 }, <FK12>, <FK13>, <FK14>,
+		    { <FK17>, 98 }, <FK18>, <FK19>, <FK20>
+	    };
+        };
+    };
+
+    section "Editing" { top = 20; left = 350;
+        row { top = 1;
+	    keys { <HELP>, { <DO>, "LONG" } };
+        };
+        row { top = 41;
+	    keys { <FIND>, <INS>, <DELE> };
+        };
+        row { top = 61;
+	    keys { <SELE>, <PGUP>, <PGDN> };
+        };
+        row { top = 81; left = 20;
+	    keys { <UP> };
+        };
+        row { top = 101;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+        };
+    };
+
+    section "Keypad" { top = 60; left = 426;
+        row { top = 1;
+	    keys { <KPF1>, <KPF2>, <KPF3>, <KPF4> };
+        };
+        row { top = 21;
+	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+        };
+        row { top = 41;
+	    keys { <KP4>, <KP5>, <KP6>, <KPCO> };
+        };
+        row { top = 61;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "TALL" } };
+        };
+        row { top = 81;
+	    keys { { <KP0>, "LONG" }, <KPDL> };
+        };
+    };
+
+    section "Alpha" { top = 60;
+        row { top = 1; left = 15;
+	    keys {  <AE00>, 
+		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
+		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
+		    { <BKSP>, "MED" }
+	    };
+        };
+        row { top = 21; left = 15;
+	    keys {  { <TAB>, "MED" },
+		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
+		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
+		    { <RTRN>, "RTRN" }
+	    };
+
+        };
+        row { top = 41;
+	    keys {  <LCTL>,
+		    { <CAPS>, "CAPS" },
+		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
+		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL>
+	    };
+        };
+        row { top = 61;
+	    keys {  { <LFSH>, "LONG" },
+		    <AB00>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		    { <RTSH>, "LONG" }
+	    };
+        };
+        row { top = 81;	left = 26;
+	    keys {  { <LCMP>, "LONG" },
+	    	    { <SPCE>, "SPCE" }
+	    };
+        };
+    };
+
+    section.left = 341;
+    section.top  = 3;
+
+    section "Indicators" {
+        indicator.onColor = "#00ff00";
+        indicator.offColor= "#001000";
+        indicator.top = 10;
+        indicator.shape= "LED";
+        indicator "Scroll Lock" { left = 9;  };
+        indicator "Caps Lock"   { left = 27; };
+        indicator "Compose"     { left = 45; };
+        indicator "Wait"        { left = 63; };
+        text.top = 4;
+        text.color = "black";
+        text "HoldScreenLabel" {left = 5; text="Hold\n"; };
+        text "CapsLockLabel" {left = 23; text="Lock\n"; };
+        text "ComposeLabel" {left = 37; text="Compose\n"; };
+        text "WaitLabel" {left = 60; text="Wait\n"; };
+    };
+};
+
+xkb_geometry "lk401" {
+
+    width		= 480;
+    height		= 180;
+    shape.cornerRadius	= 1;
+
+    shape "NORM" { { [18,19] }, { [3,2], [15,16] } };
+    shape "RTRN" {
+	approx = { [0,0],[23,19] },
+        { [0,0], [23,0], [23,39], [5,39], [5,19], [0,19] },
+        { [3,2], [20,2], [20,36], [8,36], [8,16], [3,16] }
+    };
+    shape "LONG"  { { [37,19] }, { [3,2], [34,16] } };
+    shape "TALL" { { [18,39] }, { [3,2], [15,36] } };
+    shape "MED" { { [28,19] }, { [3,2], [25,16] } };
+    shape "CAPS" { { [28,19] }, { [3,2], [18,16] } };
+    shape "SPCE" { { [131,19] },{ [3,2], [128,16]} };
+    shape "LEDS" { [ 36,15] };
+    shape "LED"  { [  5, 2] };
+
+    section.left= 17;
+    row.left	= 1;
+    key.shape	= "NORM";
+    key.gap	=  1;
+
+    text "Logo" {left = 20; top = 10; text="digital\n"; };
+
+    section "Function" { top = 20;
+    	row { top = 1;
+	    keys {  <FK01>, <FK02>, <FK03>, <FK04>, <FK05>,
+	    	    { <FK06>, 15 }, <FK07>, <FK08>, <FK09>, <FK10>,
+		    { <FK11>, 15 }, <FK12>, <FK13>, <FK14>,
+		    { <FK17>, 75 }, <FK18>, <FK19>, <FK20>
+	    };
+        };
+    };
+
+    section "Editing" { top = 20; left = 320;
+        row { top = 1;
+	    keys { <HELP>, { <DO>, "LONG" } };
+        };
+        row { top = 41;
+	    keys { <FIND>, <INS>, <DELE> };
+        };
+        row { top = 61;
+	    keys { <SELE>, <PGUP>, <PGDN> };
+        };
+        row { top = 81; left= 20;
+	    keys { <UP> };
+        };
+        row { top = 101;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+        };
+    };
+
+    section "Keypad" { top = 60; left = 385;
+        row { top = 1;
+	    keys { <KPF1>, <KPF2>, <KPF3>, <KPF4> };
+        };
+        row {
+	    top = 21;
+	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+        };
+        row { top = 41;
+	    keys { <KP4>, <KP5>, <KP6>, <KPCO> };
+        };
+        row { top = 61;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "TALL" } };
+        };
+        row { top = 81;
+	    keys { { <KP0>, "LONG" }, <KPDL> };
+        };
+    };
+
+    section "Alpha" { top = 60;
+        row { top = 1; left = 15;
+	    keys {  <AE00>, 
+		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
+		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
+		    { <BKSP>, "MED" }
+	    };
+        };
+        row { top = 21; left = 15;
+	    keys {	{ <TAB>, "MED" },
+	    	    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
+		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
+		    { <RTRN>, "RTRN" }
+	    };
+
+        };
+        row { top = 41;
+	    keys {  <LCTL>,
+	    	    { <CAPS>, "CAPS" },
+		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
+		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL>
+	    };
+        };
+        row { top = 61;
+	    keys { 	{ <LFSH>, "LONG" },
+		    <AB00>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		    { <RTSH>, "LONG" }
+	    };
+        };
+        row { top = 81; left = 29;
+	    keys { 	{ <LCMP>, "MED" },
+		    { <LALT>, "MED" },
+		    { <SPCE>, "SPCE" },
+		    { <RALT>, "MED" },
+		    { <RCMP>, "MED" }
+	    };
+        };
+    };
+
+    section.left = 69;
+    section.top  = 3;
+    section "Indicators" {
+        solid "led_panel" { top = 0; left = 0;
+	    cornerRadius = 1;
+	    shape = "LEDS";
+	    color = "grey";
+        };
+        indicator.onColor = "#00ff00";
+        indicator.offColor= "#001000";
+        indicator.shape   = "LED";
+        indicator.top 	  = 1;
+        indicator "Scroll Lock" { left = 3;  };
+        indicator "Caps Lock"   { left = 22; };
+    };
+    section "IndicatorLabels" {
+	text.top = 4;
+	text.color = "black";
+	text "ScrollLockLabel" {left = 3;  text="Scroll\nLock"; };
+	text "CapsLockLabel"   {left = 22; text="Caps\nLock"; };
+    };
+};
+
+xkb_geometry "lk450" {
+
+    width		= 480;
+    height		= 180;
+    shape.cornerRadius	= 1;
+
+    shape "NORM" { { [18,19] }, { [3,2], [15,16] } };
+    shape "RTRN" {
+	approx = { [0,0],[23,19] },
+        { [0,0], [23,0], [23,39], [5,39], [5,19], [0,19] },
+        { [3,2], [20,2], [20,36], [8,36], [8,16], [3,16] }
+    };
+    shape "LONG"  { { [37,19] }, { [3,2], [34,16] } };
+    shape "TALL" { { [18,39] }, { [3,2], [15,36] } };
+    shape "MED" { { [28,19] }, { [3,2], [25,16] } };
+    shape "CAPS" { { [28,19] }, { [3,2], [18,16] } };
+    shape "SPCE" { { [131,19] },{ [3,2], [128,16]} };
+    shape "LEDS" { [ 36,15] };
+    shape "LED"  { [  5, 2] };
+
+    section.left= 17;
+    row.left	= 1;
+    key.shape	= "NORM";
+    key.gap	=  1;
+
+    text "Logo" {left = 20; top = 10; text="digital\n"; };
+
+    section "Function" { top = 20;
+    	row { top = 1;
+	    keys {  <FK01>, <FK02>, <FK03>, <FK04>, <FK05>,
+	    	    { <FK06>, 15 }, <FK07>, <FK08>, <FK09>, <FK10>,
+		    { <FK11>, 15 }, <FK12>, <FK13>, <FK14>,
+		    { <FK17>, 75 }, <FK18>, <FK19>, <FK20>
+	    };
+        };
+    };
+
+    section "Editing" { top = 20; left = 320;
+        row { top = 1;
+	    keys { <HELP>, { <DO>, "LONG" } };
+        };
+        row { top = 41;
+	    keys { <FIND>, <INS>, <DELE> };
+        };
+        row { top = 61;
+	    keys { <SELE>, <PGUP>, <PGDN> };
+        };
+        row { top = 81; left= 20;
+	    keys { <UP> };
+        };
+        row { top = 101;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+        };
+    };
+
+    section "Keypad" { top = 60; left = 385;
+        row { top = 1;
+	    keys { <KPF1>, <KPF2>, <KPF3>, <KPF4> };
+        };
+        row {
+	    top = 21;
+	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+        };
+        row { top = 41;
+	    keys { <KP4>, <KP5>, <KP6>, <KPCO> };
+        };
+        row { top = 61;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "TALL" } };
+        };
+        row { top = 81;
+	    keys { { <KP0>, "LONG" }, <KPDL> };
+        };
+    };
+
+    section "Alpha" { top = 60;
+        row { top = 1; left = 15;
+	    keys {  <AE00>, 
+		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
+		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
+		    { <BKSP>, "MED" }
+	    };
+        };
+        row { top = 21; left = 15;
+	    keys {	{ <TAB>, "MED" },
+	    	    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
+		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
+		    { <RTRN>, "RTRN" }
+	    };
+
+        };
+        row { top = 41;
+	    keys {  <LCTL>,
+	    	    { <CAPS>, "CAPS" },
+		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
+		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL>
+	    };
+        };
+        row { top = 61;
+	    keys { 	{ <LFSH>, "LONG" },
+		    <AB00>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		    { <RTSH>, "LONG" }
+	    };
+        };
+        row { top = 81; left = 29;
+	    keys { 	{ <LCMP>, "MED" },
+		    { <LALT>, "MED" },
+		    { <SPCE>, "SPCE" },
+		    { <RALT>, "MED" },
+		    { <RCMP>, "MED" }
+	    };
+        };
+    };
+
+    section.left = 69;
+    section.top  = 3;
+    section "Indicators" {
+        solid "led_panel" { top = 0; left = 0;
+	    cornerRadius = 1;
+	    shape = "LEDS";
+	    color = "grey";
+        };
+        indicator.onColor = "#00ff00";
+        indicator.offColor= "#001000";
+        indicator.shape   = "LED";
+        indicator.top 	  = 1;
+        indicator "Scroll Lock" { left = 3;  };
+        indicator "Caps Lock"   { left = 22; };
+    };
+    section "IndicatorLabels" {
+	text.top = 4;
+	text.color = "black";
+	text "ScrollLockLabel" {left = 3;  text="Scroll\nLock"; };
+	text "CapsLockLabel"   {left = 22; text="Caps\nLock"; };
+    };
+};
+
+xkb_geometry "lk401bj"
+{
+    width		= 480;
+    height		= 180;
+    shape.cornerRadius  = 1;
+
+    shape "NORM" { { [18,19] }, { [3,2], [15,16] } };
+    shape "RTRN" {
+    	approx = { [0,0],[23,19] },
+        { [0,0], [23,0], [23,39], [5,39], [5,19], [0,19] },
+        { [3,2], [20,2], [20,36], [8,36], [8,16], [3,16] }
+    };
+    shape "LONG"  { { [37,19] }, { [3,2], [34,16] } };
+    shape "TALL" { { [18,39] }, { [3,2], [15,36] } };
+    shape "MED" { { [28,19] }, { [3,2], [25,16] } };
+    shape "CAPS" { { [28,19] }, { [3,2], [18,16] } };
+    shape "SPCE" { { [131,19] },{ [3,2], [128,16]} };
+    shape "LEDS" { [ 30,15] };
+    shape "LED"  { [  5, 2] };
+
+    section.left= 17;
+    row.left	= 1;
+    key.shape	= "NORM";
+    key.gap	=  1;
+
+    text "Logo" {left = 20; top = 10; text="digital\n"; };
+
+    section "Function" { top = 20;
+        row { top = 1;
+    	    keys {  <FK01>, <FK02>, <FK03>, <FK04>, <FK05>,
+		    { <FK06>, 15 }, <FK07>, <FK08>, <FK09>, <FK10>,
+		    { <FK11>, 15 }, <FK12>, <FK13>, <FK14>,
+		    { <FK17>, 75 }, <FK18>, <FK19>, <FK20>
+	    };
+        };
+    };
+
+    section "Editing" { top = 20; left = 320;
+        row { top = 1;
+	    keys { <HELP>, { <DO>, "LONG" } };
+        };
+        row { top = 41;
+	    keys { <FIND>, <INS>, <DELE> };
+        };
+        row { top = 61;
+	    keys { <SELE>, <PGUP>, <PGDN> };
+        };
+        row { top = 81;	left = 20;
+	    keys { <UP> };
+        };
+        row { top = 101;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+        };
+    };
+
+    section "Keypad" { top = 60; left = 385;
+        row { top = 1;
+	    keys { <PF1>, <PF2>, <PF3>, <PF4> };
+        };
+        row { top = 21;
+	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+        };
+        row { top = 41;
+	    keys { <KP4>, <KP5>, <KP6>, <KPCO> };
+        };
+        row { top = 61;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "TALL" } };
+        };
+        row { top = 81;
+	    keys { { <KP0>, "LONG" }, <KPDL> };
+        };
+    };
+
+    section "Alpha" { top = 60;
+        row { top = 1; left = 15;
+	    keys {  <AE00>, 
+		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
+		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
+		    { <BKSP>, "MED" }
+	    };
+        };
+        row { top = 21;	left = 15;
+	    keys {  { <TAB>, "MED" },
+		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
+		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
+		    { <RTRN>, "RTRN" }
+	    };
+        };
+        row { top = 41;
+	    keys {  <LCTL>,
+		    { <CAPS>, "CAPS" },
+		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
+		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL>
+	    };
+        };
+        row { top = 61;
+	    keys {  { <LFSH>, "LONG" },
+		    <AB00>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		    { <RTSH>, "LONG" }
+	    };
+        };
+        row { top = 81;	left = 29;
+	    keys {  { <LCMP>, "MED" },
+		    { <LALT>, "MED" },
+		    { <SPCE>, "SPCE" },
+		    { <RALT>, "MED" },
+		    { <RCMP>, "MED" }
+	    };
+        };
+    };
+
+    section.left = 69;
+    section.top  = 3;
+
+    section "Indicators" {
+        solid "led_panel" { top = 0; left = 0;
+	    cornerRadius = 1;
+	    shape = "LEDS";
+	    color = "grey";
+        };
+        indicator.onColor = "#00ff00";
+        indicator.offColor= "#001000";
+        indicator.top = 1;
+        indicator.shape= "LED";
+        indicator "Scroll Lock" { left = 3; };
+        indicator "Caps Lock" { left = 22; };
+        text.top = 4;
+        text.color = "black";
+        text "ScrollLockLabel" {left = 3; text="Scroll\nLock"; };
+        text "CapsLockLabel" {left = 19; text="Caps\nLock"; };
+    };
+};
+
+xkb_geometry "lk401jj" {
+
+    width		= 460;
+    height		= 180;
+    shape.cornerRadius  = 1;
+
+    shape "NORM" { { [18,19] }, { [3,2], [15,16] } };
+    shape "RTRN" {
+	approx = { [0,0],[28,23] },
+        { [0,0], [28,0], [28,39], [5,39], [5,19], [0,19] },
+        { [3,2], [25,2], [25,36], [8,36], [8,16], [3,16] }
+    };
+    shape "LONG"  { { [37,19] }, { [3,2], [34,16] } };
+    shape "LONG1" { { [32,19] }, { [3,2], [29,16] } };
+    shape "TALL" { { [18,39] }, { [3,2], [15,36] } };
+    shape "MED" { { [28,19] }, { [3,2], [25,16] } };
+    shape "MED1" { { [23,19] }, { [3,2], [20,16] } };
+    shape "CTRL" { { [43,19] }, { [3,2], [38,16] } };
+    shape "SPCE" { { [55,19] },{ [3,2], [53,16]} };
+    shape "LEDS" { [ 56,15] };
+    shape "LED"  { [  5, 2] };
+
+    section.left	= 5;
+    row.left	= 1;
+    key.shape	= "NORM";
+    key.gap		=  1;
+
+    text "Logo" {left = 7; top = 10; text="digital\n"; };
+
+    section "Function" { top = 40;
+        row { top = 1;
+	    keys {  <FK01>, <FK02>, <FK03>, <FK04>, <FK05>,
+		    { <FK06>, 18 }, <FK07>, <FK08>, <FK09>, <FK10>,
+		    { <FK11>, 18 }, <FK12>, <FK13>, <FK14>,
+		    { <FK17>, 73 }, <FK18>, <FK19>, <FK20>
+	    };
+        };
+    };
+
+    section "Editing" { top = 40; left = 313;
+        row { top = 1;
+	    keys { <HELP>, { <DO>, "LONG" } };
+        };
+        row { top = 31;
+	    keys { <FIND>, <INS>, <DELE> };
+        };
+        row { top = 51;
+	    keys { <SELE>, <PGUP>, <PGDN> };
+        };
+        row { top = 71;	left= 20;
+	    keys { <UP> };
+        };
+        row { top = 91;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+        };
+    };
+
+    section "Keypad" { top = 70; left = 377;
+        row { top = 1;
+	    keys { <PF1>, <PF2>, <PF3>, <PF4> };
+        };
+        row { top = 21;
+	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+        };
+        row { top = 41;
+	    keys { <KP4>, <KP5>, <KP6>, <KPCO> };
+        };
+        row { top = 61;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "TALL" } };
+        };
+        row { top = 81;
+	    keys { { <KP0>, "LONG" }, <KPDL> };
+        };
+    };
+
+    section "Alpha" { top = 70;
+        row { top = 1; left = 7;
+	    keys {  { <AE00>, "MED1" }, 
+		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
+		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
+		    <AB00>, { <BKSP>, "MED1" }
+	    };
+        };
+        row { top = 21; left = 7;
+	    keys {  { <TAB>, "LONG1" },
+		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
+		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
+		    { <RTRN>, "RTRN" }
+	    };
+        };
+        row { top = 41;
+	    keys {  { <LCTL>, "CTRL" },
+		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
+		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL>
+	    };
+        };
+        row { top = 61;
+	    keys {  <CAPS>, { <LFSH>, "LONG1" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		    <AB11>, { <RTSH>, "MED" }
+	    };
+        };
+        row { top = 81;	left = 7;
+	    keys {  { <LCMP>, "LONG" },
+		    { <LALT>, "LONG" },
+		    { <MUHE>, "LONG" },
+		    { <SPCE>, "SPCE" },
+		    { <KANJ>, "LONG" },
+		    { <HIRA>, "LONG" },
+		    <RALT>, <RCMP>
+	    };
+        };
+    };
+
+    section.left = 315;
+    section.top  = 20;
+
+    section "Indicators" {
+        solid "led_panel" { top = 0; left = 0;
+	    cornerRadius = 1;
+	    shape = "LEDS";
+	    color = "grey";
+        };
+        indicator.onColor = "#00ff00";
+        indicator.offColor= "#001000";
+        indicator.top = 11;
+        indicator.shape= "LED";
+        indicator "Scroll Lock" { left = 6;  };
+        indicator "Caps Lock"   { left = 26; };
+        text.top = 4;
+        text.color = "black";
+        text "ScrollLockLabel" {left = 3; text="Scroll\nLock"; };
+        text "CapsLockLabel" {left = 22; text="Caps\nLock"; };
+    };
+};
diff --git a/xorg-server/xkeyboard-config/geometry/digital_vndr/pc b/xorg-server/xkeyboard-config/geometry/digital_vndr/pc
index 45589fca0..aaceeba85 100644
--- a/xorg-server/xkeyboard-config/geometry/digital_vndr/pc
+++ b/xorg-server/xkeyboard-config/geometry/digital_vndr/pc
@@ -1,349 +1,349 @@
-//
-//Copyright (c) 1996  Digital Equipment Corporation
-//
-//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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment 
-//Corporation shall not be used in advertising or otherwise to promote
-//the sale, use or other dealings in this Software without prior written
-//authorization from Digital Equipment Corporation.
-//
-// HISTORY
-// Log: pc,v 
-// Revision 1.2  1996/06/18  09:12:50  erik
-// use flags correctly, assorted cleanups and consortium fixes
-//
-// Revision 1.1.6.2  1995/08/18  21:15:18  William_Walker
-// 	Upgrade XKB to Protocol Rev. 0.64
-// 	[1995/08/18  20:41:49  William_Walker]
-//
-// Revision 1.1.2.4  1995/08/11  19:35:48  William_Walker
-// 	Sync up with Erik's pool.
-// 	[1995/08/11  18:36:03  William_Walker]
-// 
-// Revision 1.1.2.3  1995/06/27  12:17:29  William_Walker
-// 	Rename <TLDE> to ISO9995 compliant <AE00>.
-// 	[1995/06/26  20:23:10  William_Walker]
-// 
-// Revision 1.1.2.2  1995/06/05  19:21:19  William_Walker
-// 	New file.  I love keymaps.
-// 	[1995/06/05  18:05:51  William_Walker]
-// 
-// EndLog
-// 
-// @(#)RCSfile: pc,v  Revision: 1.2  (DEC) Date: 1996/02/02 14:40:25
-// 
-partial xkb_geometry "common" {
-    width		= 480;
-    height		= 200;
-
-    shape.cornerRadius = 1;
-    shape "NORM" { primary = { [18,19] }, { [3,2], [15,16] } };
-    shape "KP0"  { primary = { [37,19] }, { [3,2], [34,16] } };
-    shape "KPAD" { primary = { [18,39] }, { [3,2], [15,36] } };
-    shape "LEDS" { [78,22] };
-    shape "LED"  { [5,2] };
-
-    text.color         = "black";
-    section.left       = 17;
-    row.left	       = 1;
-    key.shape	       = "NORM";
-    key.gap	       =  1;
-
-    section "Function" { top = 40;
-        row { top = 1;
-	    keys {  <ESC>,
-	    	    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
-	    	    { <FK05>, 10 }, <FK06>, <FK07>, <FK08>,
-		    { <FK09>, 10 }, <FK10>, <FK11>, <FK12>
-	    };
-        };
-    };
-
-    section "Editing" { top = 40; left = 308;
-        row { top = 1;
-    	    keys { <PRSC>, <SCLK>, <PAUS> };
-        };
-        row { top = 41;
-	    keys { <INS>, <HOME>, <PGUP> };
-        };
-        row { top = 61;
-	    keys { <DELE>, <END>, <PGDN> };
-        };
-        row { top = 101; left = 20;
-	    keys { <UP> };
-        };
-        row { top = 121;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-        };
-    };
-
-    section "Keypad" { top = 80; left = 374;
-        row { top = 1;
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-        };
-        row { top = 21;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD" } };
-        };
-        row { top = 41;
-	    keys { <KP4>, <KP5>, <KP6> };
-        };
-        row { top = 61;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD" } };
-        };
-        row { top = 81;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-        };
-    };
-};
-
-partial xkb_geometry "leds_on_keys" {
-    section.top  = 40;
-    section.left = 17;
-    section "LedPanel" {
-        indicator.onColor  = "#00ff00";
-        indicator.offColor = "#001000";
-        indicator.shape    = "LED";
-        indicator "Scroll Lock" { left = 317; top = 5;  };
-        indicator "Num Lock"    { left = 364; top = 45; };
-        indicator "Caps Lock"   { left = 10;   top = 85; };
-    };
-
-    section.left = 375;
-    section.top  = 40;
-    section "LogoPanel" {
-        solid "logo_panel" { top = 0; left = 0;
-            shape = "LEDS";
-	    color = "grey";
-        };
-        text "Logo" {left = 28; top = 10; text="digital\n"; };
-    };
-};
-
-partial xkb_geometry "leds_alone" {
-    section.left = 375;
-    section.top  = 40;
-    section "Indicators" {
-        solid "led_panel" { top = 0; left = 0;
-	    shape = "LEDS";
-	    color = "grey";
-        };
-        indicator.top = 16;
-        indicator.onColor  = "#00ff00";
-        indicator.offColor = "#001000";
-        indicator.shape    = "LED";
-        indicator "Num Lock" 	{ left = 3;  };
-        indicator "Caps Lock"	{ left = 26; };
-        indicator "Scroll Lock" { left = 50; };
-        text "Logo" {left = 2; top = 3; text="digital\n"; };
-    };
-    section "IndicatorLabels" {
-	text.top = 11;
-    	text "NumLockLabel"    {left = 10; text="Num\nLock";    };
-    	text "CapsLockLabel"   {left = 33; text="Caps\nLock";   };
-    	text "ScrollLockLabel" {left = 58; text="Scroll\nLock"; };
-    };
-};
-
-xkb_geometry "pc101" {
-    include "digital_vndr/pc(common)"
-
-    shape.cornerRadius = 1;
-    shape "BKSP" { primary = { [36,19] }, { [3,2], [33,16] } };
-    shape "TABK" { primary = { [27,19] }, { [3,2], [24,16] } };
-    shape "RTRN" { primary = { [41,19] }, { [3,2], [38,16] } };
-    shape "CAPS" { primary = { [32,19] }, { [3,2], [29,16] } };
-    shape "LFSH" { primary = { [41,19] }, { [3,2], [38,16] } };
-    shape "RTSH" { primary = { [51,19] }, { [3,2], [49,16] } };
-    shape "MODK" { primary = { [27,19] }, { [3,2], [24,16] } };
-    shape "BKSL" { primary = { [27,19] }, { [3,2], [24,16] } };
-    shape "SPCE" { primary = { [132,19] },{ [3,2], [129,16]} };
-
-    section.left       = 17;
-    row.left	       = 1;
-    key.shape	       = "NORM";
-    key.gap	       =  1;
-
-    section "Alpha" { top = 80;
-        row { top = 1;
-	    keys {  <AE00>, 
-		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
-		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
-		    { <BKSP>, "BKSP" }
-	    };
-        };
-        row { top = 21;
-	    keys {  { <TAB>, "TABK" },
-		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
-		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
-		    { <BKSL>, "BKSL" }
-	    };
-
-        };
-        row { top = 41;
-	    keys {  { <CAPS>, "CAPS" },
-		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
-		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>,
-		    { <RTRN>, "RTRN" }
-	    };
-        };
-        row { top = 61;
-	    keys {  { <LFSH>, "LFSH" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, 
-                    <AB07>, <AB08>, <AB09>, <AB10>,
-		    { <RTSH>, "RTSH" }
-	    };
-        };
-        row { top = 81;
-	    key.shape = "MODK";
-	    keys {  <LCTL>,
-		    { <LALT>, 20 },
-		    { <SPCE>, "SPCE" },
-		    <RALT>,
-		    { <RCTL>, 21 }
-	    };
-        };
-    };
-};
-
-xkb_geometry "pc102" {
-    include "digital_vndr/pc(common)"
-
-    shape.cornerRadius = 1;
-    shape "BKSP" { primary = { [36,19] }, { [3,2], [33,16] } };
-    shape "TABK" { primary = { [27,19] }, { [3,2], [24,16] } };
-    shape "RTRN" { 
-        approx = { [0,0],[28,19] },
-        { [0,0], [27,0], [27,39], [5,39], [5,19], [0,19] },
-        { [3,2], [24,2], [24,36], [8,36], [8,16], [3,16] }
-    };
-    shape "CAPS" { primary = { [32,19] }, { [3,2], [29,16] } };
-    shape "LFSH" { primary = { [22,19] }, { [3,2], [19,16] } };
-    shape "RTSH" { primary = { [51,19] }, { [3,2], [49,16] } };
-    shape "MODK" { primary = { [27,19] }, { [3,2], [24,16] } };
-    shape "BKSL" { primary = { [27,19] }, { [3,2], [24,16] } };
-    shape "SPCE" { primary = { [132,19] },{ [3,2], [129,16]} };
-
-    section.left       = 17;
-    row.left	       = 1;
-    key.shape	       = "NORM";
-    key.gap	       =  1;
-
-    section "Alpha" { top = 80;
-        row { top = 1;
-	    keys {  <AE00>, 
-		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
-		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
-		    { <BKSP>, "BKSP" }
-	    };
-        };
-        row { top = 21;
-	    keys {  { <TAB>, "TABK" },
-		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
-		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
-		    { <RTRN>, "RTRN" }
-	    };
-
-        };
-        row { top = 41;
-	    keys {  { <CAPS>, "CAPS" },
-		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
-		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <AC12>
-	    };
-        };
-        row { top = 61;
-	    keys {  { <LFSH>, "LFSH" },
-		    <BKSL>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-	            <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
-		    { <RTSH>, "RTSH" }
-	    };
-        };
-        row { top = 81;
-	    key.shape = "MODK";
-	    keys {  <LCTL>,
-		    { <LALT>, 20 },
-		    { <SPCE>, "SPCE" },
-		    <RALT>,
-		    { <RCTL>, 21 }
-	    };
-        };
-    };
-};
-
-xkb_geometry "pcxaj" {
-    include "digital_vndr/pc(common)"
-
-    shape.cornerRadius = 1;
-    shape "BKSP" { primary = { [36,19] }, { [3,2], [33,16] } };
-    shape "TABK" { primary = { [27,19] }, { [3,2], [24,16] } };
-    shape "RTRN" { primary = { [22,19] }, { [3,2], [19,16] } };
-    shape "CAPS" { primary = { [32,19] }, { [3,2], [29,16] } };
-    shape "LFSH" { primary = { [41,19] }, { [3,2], [38,16] } };
-    shape "RTSH" { primary = { [32,19] }, { [3,2], [29,16] } };
-    shape "MODK" { primary = { [27,19] }, { [3,2], [24,16] } };
-    shape "BKSL" { primary = { [27,19] }, { [3,2], [24,16] } };
-    shape "SPCE" { primary = { [114,19]}, { [3,2], [111,16]} };
-
-    section.left       = 17;
-    row.left	       = 1;
-    key.shape	       = "NORM";
-    key.gap	       =  1;
-
-    section "Alpha" { top = 80;
-        row { top = 1;
-	    keys {  <AE00>, 
-		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
-		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
-		    { <BKSP>, "BKSP" }
-	    };
-        };
-        row { top = 21;
-	    keys {  { <TAB>, "TABK" },
-		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
-		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
-		    { <BKSL>, "BKSL" }
-	    };
-        };
-        row { top = 41;
-	    keys {  { <CAPS>, "CAPS" },
-		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
-		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <AC12>,
-		    { <RTRN>, "RTRN" }
-	    };
-        };
-        row { top = 61;
-	    keys {  { <LFSH>, "LFSH" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, 
-		    <AB07>, <AB08>, <AB09>, <AB10>, <AB11>,
-		    { <RTSH>, "RTSH" }
-	    };
-        };
-        row { top = 81;
-	    key.shape = "MODK";
-	    keys {  <LCTL>, <LALT>, 
-		    { <MUHE>, "NORM" }, 
-		    { <SPCE>, "SPCE" },
-		    { <KANJ>, "NORM" },
-		    { <HIRA>, "NORM" },
-		    <RALT>, <RCTL>
-	    };
-        };
-    };
-};
+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log: pc,v 
+// Revision 1.2  1996/06/18  09:12:50  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.6.2  1995/08/18  21:15:18  William_Walker
+// 	Upgrade XKB to Protocol Rev. 0.64
+// 	[1995/08/18  20:41:49  William_Walker]
+//
+// Revision 1.1.2.4  1995/08/11  19:35:48  William_Walker
+// 	Sync up with Erik's pool.
+// 	[1995/08/11  18:36:03  William_Walker]
+// 
+// Revision 1.1.2.3  1995/06/27  12:17:29  William_Walker
+// 	Rename <TLDE> to ISO9995 compliant <AE00>.
+// 	[1995/06/26  20:23:10  William_Walker]
+// 
+// Revision 1.1.2.2  1995/06/05  19:21:19  William_Walker
+// 	New file.  I love keymaps.
+// 	[1995/06/05  18:05:51  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: pc,v  Revision: 1.2  (DEC) Date: 1996/02/02 14:40:25
+// 
+partial xkb_geometry "common" {
+    width		= 480;
+    height		= 200;
+
+    shape.cornerRadius = 1;
+    shape "NORM" { primary = { [18,19] }, { [3,2], [15,16] } };
+    shape "KP0"  { primary = { [37,19] }, { [3,2], [34,16] } };
+    shape "KPAD" { primary = { [18,39] }, { [3,2], [15,36] } };
+    shape "LEDS" { [78,22] };
+    shape "LED"  { [5,2] };
+
+    text.color         = "black";
+    section.left       = 17;
+    row.left	       = 1;
+    key.shape	       = "NORM";
+    key.gap	       =  1;
+
+    section "Function" { top = 40;
+        row { top = 1;
+	    keys {  <ESC>,
+	    	    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
+	    	    { <FK05>, 10 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 10 }, <FK10>, <FK11>, <FK12>
+	    };
+        };
+    };
+
+    section "Editing" { top = 40; left = 308;
+        row { top = 1;
+    	    keys { <PRSC>, <SCLK>, <PAUS> };
+        };
+        row { top = 41;
+	    keys { <INS>, <HOME>, <PGUP> };
+        };
+        row { top = 61;
+	    keys { <DELE>, <END>, <PGDN> };
+        };
+        row { top = 101; left = 20;
+	    keys { <UP> };
+        };
+        row { top = 121;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+        };
+    };
+
+    section "Keypad" { top = 80; left = 374;
+        row { top = 1;
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+        };
+        row { top = 21;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD" } };
+        };
+        row { top = 41;
+	    keys { <KP4>, <KP5>, <KP6> };
+        };
+        row { top = 61;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD" } };
+        };
+        row { top = 81;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+        };
+    };
+};
+
+partial xkb_geometry "leds_on_keys" {
+    section.top  = 40;
+    section.left = 17;
+    section "LedPanel" {
+        indicator.onColor  = "#00ff00";
+        indicator.offColor = "#001000";
+        indicator.shape    = "LED";
+        indicator "Scroll Lock" { left = 317; top = 5;  };
+        indicator "Num Lock"    { left = 364; top = 45; };
+        indicator "Caps Lock"   { left = 10;   top = 85; };
+    };
+
+    section.left = 375;
+    section.top  = 40;
+    section "LogoPanel" {
+        solid "logo_panel" { top = 0; left = 0;
+            shape = "LEDS";
+	    color = "grey";
+        };
+        text "Logo" {left = 28; top = 10; text="digital\n"; };
+    };
+};
+
+partial xkb_geometry "leds_alone" {
+    section.left = 375;
+    section.top  = 40;
+    section "Indicators" {
+        solid "led_panel" { top = 0; left = 0;
+	    shape = "LEDS";
+	    color = "grey";
+        };
+        indicator.top = 16;
+        indicator.onColor  = "#00ff00";
+        indicator.offColor = "#001000";
+        indicator.shape    = "LED";
+        indicator "Num Lock" 	{ left = 3;  };
+        indicator "Caps Lock"	{ left = 26; };
+        indicator "Scroll Lock" { left = 50; };
+        text "Logo" {left = 2; top = 3; text="digital\n"; };
+    };
+    section "IndicatorLabels" {
+	text.top = 11;
+    	text "NumLockLabel"    {left = 10; text="Num\nLock";    };
+    	text "CapsLockLabel"   {left = 33; text="Caps\nLock";   };
+    	text "ScrollLockLabel" {left = 58; text="Scroll\nLock"; };
+    };
+};
+
+xkb_geometry "pc101" {
+    include "digital_vndr/pc(common)"
+
+    shape.cornerRadius = 1;
+    shape "BKSP" { primary = { [36,19] }, { [3,2], [33,16] } };
+    shape "TABK" { primary = { [27,19] }, { [3,2], [24,16] } };
+    shape "RTRN" { primary = { [41,19] }, { [3,2], [38,16] } };
+    shape "CAPS" { primary = { [32,19] }, { [3,2], [29,16] } };
+    shape "LFSH" { primary = { [41,19] }, { [3,2], [38,16] } };
+    shape "RTSH" { primary = { [51,19] }, { [3,2], [49,16] } };
+    shape "MODK" { primary = { [27,19] }, { [3,2], [24,16] } };
+    shape "BKSL" { primary = { [27,19] }, { [3,2], [24,16] } };
+    shape "SPCE" { primary = { [132,19] },{ [3,2], [129,16]} };
+
+    section.left       = 17;
+    row.left	       = 1;
+    key.shape	       = "NORM";
+    key.gap	       =  1;
+
+    section "Alpha" { top = 80;
+        row { top = 1;
+	    keys {  <AE00>, 
+		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
+		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
+		    { <BKSP>, "BKSP" }
+	    };
+        };
+        row { top = 21;
+	    keys {  { <TAB>, "TABK" },
+		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
+		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
+		    { <BKSL>, "BKSL" }
+	    };
+
+        };
+        row { top = 41;
+	    keys {  { <CAPS>, "CAPS" },
+		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
+		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>,
+		    { <RTRN>, "RTRN" }
+	    };
+        };
+        row { top = 61;
+	    keys {  { <LFSH>, "LFSH" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, 
+                    <AB07>, <AB08>, <AB09>, <AB10>,
+		    { <RTSH>, "RTSH" }
+	    };
+        };
+        row { top = 81;
+	    key.shape = "MODK";
+	    keys {  <LCTL>,
+		    { <LALT>, 20 },
+		    { <SPCE>, "SPCE" },
+		    <RALT>,
+		    { <RCTL>, 21 }
+	    };
+        };
+    };
+};
+
+xkb_geometry "pc102" {
+    include "digital_vndr/pc(common)"
+
+    shape.cornerRadius = 1;
+    shape "BKSP" { primary = { [36,19] }, { [3,2], [33,16] } };
+    shape "TABK" { primary = { [27,19] }, { [3,2], [24,16] } };
+    shape "RTRN" { 
+        approx = { [0,0],[28,19] },
+        { [0,0], [27,0], [27,39], [5,39], [5,19], [0,19] },
+        { [3,2], [24,2], [24,36], [8,36], [8,16], [3,16] }
+    };
+    shape "CAPS" { primary = { [32,19] }, { [3,2], [29,16] } };
+    shape "LFSH" { primary = { [22,19] }, { [3,2], [19,16] } };
+    shape "RTSH" { primary = { [51,19] }, { [3,2], [49,16] } };
+    shape "MODK" { primary = { [27,19] }, { [3,2], [24,16] } };
+    shape "BKSL" { primary = { [27,19] }, { [3,2], [24,16] } };
+    shape "SPCE" { primary = { [132,19] },{ [3,2], [129,16]} };
+
+    section.left       = 17;
+    row.left	       = 1;
+    key.shape	       = "NORM";
+    key.gap	       =  1;
+
+    section "Alpha" { top = 80;
+        row { top = 1;
+	    keys {  <AE00>, 
+		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
+		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
+		    { <BKSP>, "BKSP" }
+	    };
+        };
+        row { top = 21;
+	    keys {  { <TAB>, "TABK" },
+		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
+		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
+		    { <RTRN>, "RTRN" }
+	    };
+
+        };
+        row { top = 41;
+	    keys {  { <CAPS>, "CAPS" },
+		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
+		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <AC12>
+	    };
+        };
+        row { top = 61;
+	    keys {  { <LFSH>, "LFSH" },
+		    <BKSL>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+	            <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		    { <RTSH>, "RTSH" }
+	    };
+        };
+        row { top = 81;
+	    key.shape = "MODK";
+	    keys {  <LCTL>,
+		    { <LALT>, 20 },
+		    { <SPCE>, "SPCE" },
+		    <RALT>,
+		    { <RCTL>, 21 }
+	    };
+        };
+    };
+};
+
+xkb_geometry "pcxaj" {
+    include "digital_vndr/pc(common)"
+
+    shape.cornerRadius = 1;
+    shape "BKSP" { primary = { [36,19] }, { [3,2], [33,16] } };
+    shape "TABK" { primary = { [27,19] }, { [3,2], [24,16] } };
+    shape "RTRN" { primary = { [22,19] }, { [3,2], [19,16] } };
+    shape "CAPS" { primary = { [32,19] }, { [3,2], [29,16] } };
+    shape "LFSH" { primary = { [41,19] }, { [3,2], [38,16] } };
+    shape "RTSH" { primary = { [32,19] }, { [3,2], [29,16] } };
+    shape "MODK" { primary = { [27,19] }, { [3,2], [24,16] } };
+    shape "BKSL" { primary = { [27,19] }, { [3,2], [24,16] } };
+    shape "SPCE" { primary = { [114,19]}, { [3,2], [111,16]} };
+
+    section.left       = 17;
+    row.left	       = 1;
+    key.shape	       = "NORM";
+    key.gap	       =  1;
+
+    section "Alpha" { top = 80;
+        row { top = 1;
+	    keys {  <AE00>, 
+		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
+		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
+		    { <BKSP>, "BKSP" }
+	    };
+        };
+        row { top = 21;
+	    keys {  { <TAB>, "TABK" },
+		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
+		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
+		    { <BKSL>, "BKSL" }
+	    };
+        };
+        row { top = 41;
+	    keys {  { <CAPS>, "CAPS" },
+		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
+		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <AC12>,
+		    { <RTRN>, "RTRN" }
+	    };
+        };
+        row { top = 61;
+	    keys {  { <LFSH>, "LFSH" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, 
+		    <AB07>, <AB08>, <AB09>, <AB10>, <AB11>,
+		    { <RTSH>, "RTSH" }
+	    };
+        };
+        row { top = 81;
+	    key.shape = "MODK";
+	    keys {  <LCTL>, <LALT>, 
+		    { <MUHE>, "NORM" }, 
+		    { <SPCE>, "SPCE" },
+		    { <KANJ>, "NORM" },
+		    { <HIRA>, "NORM" },
+		    <RALT>, <RCTL>
+	    };
+        };
+    };
+};
diff --git a/xorg-server/xkeyboard-config/geometry/digital_vndr/unix b/xorg-server/xkeyboard-config/geometry/digital_vndr/unix
index 6c13d4326..f3f180ce2 100644
--- a/xorg-server/xkeyboard-config/geometry/digital_vndr/unix
+++ b/xorg-server/xkeyboard-config/geometry/digital_vndr/unix
@@ -1,227 +1,227 @@
-//
-//Copyright (c) 1996  Digital Equipment Corporation
-//
-//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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment 
-//Corporation shall not be used in advertising or otherwise to promote
-//the sale, use or other dealings in this Software without prior written
-//authorization from Digital Equipment Corporation.
-//
-// HISTORY
-// Log: unix,v 
-// Revision 1.2  1996/06/18  09:12:53  erik
-// use flags correctly, assorted cleanups and consortium fixes
-//
-// Revision 1.1.2.3  1995/06/27  12:17:30  William_Walker
-// 	Rename <TLDE> to ISO9995 compliant <AE00>.
-// 	[1995/06/26  20:23:12  William_Walker]
-//
-// Revision 1.1.2.2  1995/06/05  19:21:23  William_Walker
-// 	New file.  I love keymaps.
-// 	[1995/06/05  18:05:56  William_Walker]
-// 
-// EndLog
-// 
-// @(#)RCSfile: unix,v  Revision: 1.2  (DEC) Date: 1996/01/24 12:16:
-// 
-xkb_geometry "unix" {
-
-    width		= 340;
-    height		= 160;
-    shape.cornerRadius 	= 1;
-
-    shape "NORM" { primary = { [18,19] }, { [3,2], [15,16] } };
-    shape "AE00" { primary = { [28,19] }, { [3,2], [25,16] } };
-    shape "BKSP" { primary = { [46,19] }, { [3,2], [43,16] } };
-    shape "TABK" { primary = { [37,19] }, { [3,2], [34,16] } };
-    shape "CTRL" { primary = { [46,19] }, { [3,2], [43,16] } };
-    shape "RTRN" { primary = { [46,19] }, { [3,2], [43,16] } };
-    shape "SHFT" { primary = { [56,19] }, { [3,2], [53,16] } };
-    shape "MODK" { primary = { [37,19] }, { [3,2], [34,16] } };
-    shape "SPCE" { primary = { [132,19] },{ [3,2], [129,16]} };
-
-    section.left= 17;
-    row.left	= 1;
-    key.shape	= "NORM";
-    key.gap	=  1;
-
-    text.color      = "black";
-    text "Logo" {left = 20; top = 10; text="digital\n"; };
-
-    section "Function" { top = 30;
-        row { top = 1;
-	    keys {  <FK01>, <FK02>, <FK03>, <FK04>, <FK05>, 
-		    { <FK06>, 20 }, <FK07>, <FK08>, <FK09>, <FK10>,
-		    { <LEFT>, 20 }, <DOWN>, <UP>, <RGHT>
-	    };
-        };
-    };
-
-    section "Alpha" { top = 50;
-        row { top = 1;
-	    keys {  { <AE00>, "AE00" }, 
-		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
-		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
-		    { <BKSP>, "BKSP" }
-	    };
-        };
-        row { top = 21;
-	    keys {  { <TAB>, "TABK" },
-		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
-		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
-		    <BKSL>, <AB00>
-	    };
-
-        };
-        row { top = 41; left = -4;
-	    keys {  { <LCTL>, "CTRL" },
-		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
-		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, 
-		    { <RTRN>, "RTRN" }
-	    };
-        };
-        row { top = 61; left = -4;
-	    keys {  { <LFSH>, "SHFT" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, 
-		    <AB07>, <AB08>, <AB09>, <AB10>,
-		    { <RTSH>, "SHFT" }
-	    };
-        };
-        solid "ExtendKey" { top = 81; left= 1;
-            shape= "NORM";
-            color= "grey20";
-        };
-        text.top = 89;
-        text.color = "black";
-        text "ExtendLabel" {left = 6; text="Ext\nend"; };
-        row { top = 81; left = 19;
-	    key.shape = "MODK";
-	    keys {  { <LCMP>, "NORM" }, <LALT>,
-		    { <SPCE>, "SPCE" },
-		    <RALT>, <RCMP> 
-	    };
-        };
-    };
-};
-
-xkb_geometry "lk421jj" {
-
-    width		= 315;
-    height		= 170;
-    shape.cornerRadius  = 1;
-
-    shape "NORM" { { [18,19] }, { [3,2], [15,16] } };
-    shape "RTRN" {
-	approx = { [0,0],[28,23] },
-        { [0,0], [28,0], [28,39], [5,39], [5,19], [0,19] },
-        { [3,2], [25,2], [25,36], [8,36], [8,16], [3,16] }
-    };
-    shape "LONG"  { { [37,19] }, { [3,2], [34,16] } };
-    shape "LONG1" { { [32,19] }, { [3,2], [29,16] } };
-    shape "TALL" { { [18,39] }, { [3,2], [15,36] } };
-    shape "MED" { { [23,19] }, { [3,2], [20,16] } };
-    shape "CTRL" { { [43,19] }, { [3,2], [38,16] } };
-    shape "SPCE" { { [55,19] },{ [3,2], [53,16]} };
-    shape "LEDS" { [ 56,15] };
-    shape "LED"  { [  5, 2] };
-
-    section.left	= 5;
-    row.left	= 1;
-    key.shape	= "NORM";
-    key.gap		=  1;
-
-    text "Logo" {left = 7; top = 10; text="digital\n"; };
-
-    section "Function" { top = 45;
-        row { top = 1; left = 7;
-	    keys {  <FK01>, <FK02>, <FK03>, <FK04>, <FK05>,
-		    { <FK06>, 18 }, <FK07>, <FK08>, <FK09>, <FK10>
-	    };
-        };
-    };
-
-    section "Editing" { top = 45; left= 230;
-        row { top = 1;
-	    keys { <LEFT>, <DOWN>, <UP>, <RGHT> };
-        };
-    };
-
-    section "Alpha" { top = 65;
-        row { top = 1; left = 7;
-	    keys {  { <AE00>, "MED" }, 
-		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
-		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
-		    <AB00>, { <BKSP>, "MED" }
-	    };
-        };
-        row { top = 21;	left = 7;
-	    keys {  { <TAB>, "LONG1" },
-		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
-		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
-		    { <RTRN>, "RTRN" }
-	    };
-        };
-        row { top = 41;
-	    keys {  { <LCTL>, "CTRL" },
-		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
-		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL>
-	    };
-        };
-        row { top = 61;
-	    keys {  <CAPS>, { <LFSH>, "LONG1" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
-		    <AB11>, { <RTSH>, "LONG1" }
-	    };
-        };
-        row { top = 81;	left = 7;
-	    keys {  <AA00>, <LCMP>,
-		    { <LALT>, "LONG" },
-		    { <MUHE>, "LONG" },
-		    { <SPCE>, "SPCE" },
-		    { <KANJ>, "LONG" },
-		    { <HIRA>, "LONG" },
-		    <RALT>, <RCMP>
-	    };
-        };
-    };
-
-    section.left = 233;
-    section.top  = 20;
-
-    section "Indicators" {
-        solid "led_panel" { top = 0; left = 0;
-	    cornerRadius = 1;
-	    shape = "LEDS";
-	    color = "grey";
-        };
-        indicator.onColor = "#00ff00";
-        indicator.offColor= "#001000";
-        indicator.top = 11;
-        indicator.shape= "LED";
-        indicator "Scroll Lock" { left = 6;  };
-        indicator "Caps Lock"   { left = 26; };
-        text.top = 3;
-        text.color = "black";
-        text "ScrollLockLabel" {left = 3; text="Scroll\nLock"; };
-        text "CapsLockLabel" {left = 22; text="Caps\nLock"; };
-    };
-};
+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log: unix,v 
+// Revision 1.2  1996/06/18  09:12:53  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.2.3  1995/06/27  12:17:30  William_Walker
+// 	Rename <TLDE> to ISO9995 compliant <AE00>.
+// 	[1995/06/26  20:23:12  William_Walker]
+//
+// Revision 1.1.2.2  1995/06/05  19:21:23  William_Walker
+// 	New file.  I love keymaps.
+// 	[1995/06/05  18:05:56  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: unix,v  Revision: 1.2  (DEC) Date: 1996/01/24 12:16:
+// 
+xkb_geometry "unix" {
+
+    width		= 340;
+    height		= 160;
+    shape.cornerRadius 	= 1;
+
+    shape "NORM" { primary = { [18,19] }, { [3,2], [15,16] } };
+    shape "AE00" { primary = { [28,19] }, { [3,2], [25,16] } };
+    shape "BKSP" { primary = { [46,19] }, { [3,2], [43,16] } };
+    shape "TABK" { primary = { [37,19] }, { [3,2], [34,16] } };
+    shape "CTRL" { primary = { [46,19] }, { [3,2], [43,16] } };
+    shape "RTRN" { primary = { [46,19] }, { [3,2], [43,16] } };
+    shape "SHFT" { primary = { [56,19] }, { [3,2], [53,16] } };
+    shape "MODK" { primary = { [37,19] }, { [3,2], [34,16] } };
+    shape "SPCE" { primary = { [132,19] },{ [3,2], [129,16]} };
+
+    section.left= 17;
+    row.left	= 1;
+    key.shape	= "NORM";
+    key.gap	=  1;
+
+    text.color      = "black";
+    text "Logo" {left = 20; top = 10; text="digital\n"; };
+
+    section "Function" { top = 30;
+        row { top = 1;
+	    keys {  <FK01>, <FK02>, <FK03>, <FK04>, <FK05>, 
+		    { <FK06>, 20 }, <FK07>, <FK08>, <FK09>, <FK10>,
+		    { <LEFT>, 20 }, <DOWN>, <UP>, <RGHT>
+	    };
+        };
+    };
+
+    section "Alpha" { top = 50;
+        row { top = 1;
+	    keys {  { <AE00>, "AE00" }, 
+		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
+		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
+		    { <BKSP>, "BKSP" }
+	    };
+        };
+        row { top = 21;
+	    keys {  { <TAB>, "TABK" },
+		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
+		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
+		    <BKSL>, <AB00>
+	    };
+
+        };
+        row { top = 41; left = -4;
+	    keys {  { <LCTL>, "CTRL" },
+		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
+		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, 
+		    { <RTRN>, "RTRN" }
+	    };
+        };
+        row { top = 61; left = -4;
+	    keys {  { <LFSH>, "SHFT" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, 
+		    <AB07>, <AB08>, <AB09>, <AB10>,
+		    { <RTSH>, "SHFT" }
+	    };
+        };
+        solid "ExtendKey" { top = 81; left= 1;
+            shape= "NORM";
+            color= "grey20";
+        };
+        text.top = 89;
+        text.color = "black";
+        text "ExtendLabel" {left = 6; text="Ext\nend"; };
+        row { top = 81; left = 19;
+	    key.shape = "MODK";
+	    keys {  { <LCMP>, "NORM" }, <LALT>,
+		    { <SPCE>, "SPCE" },
+		    <RALT>, <RCMP> 
+	    };
+        };
+    };
+};
+
+xkb_geometry "lk421jj" {
+
+    width		= 315;
+    height		= 170;
+    shape.cornerRadius  = 1;
+
+    shape "NORM" { { [18,19] }, { [3,2], [15,16] } };
+    shape "RTRN" {
+	approx = { [0,0],[28,23] },
+        { [0,0], [28,0], [28,39], [5,39], [5,19], [0,19] },
+        { [3,2], [25,2], [25,36], [8,36], [8,16], [3,16] }
+    };
+    shape "LONG"  { { [37,19] }, { [3,2], [34,16] } };
+    shape "LONG1" { { [32,19] }, { [3,2], [29,16] } };
+    shape "TALL" { { [18,39] }, { [3,2], [15,36] } };
+    shape "MED" { { [23,19] }, { [3,2], [20,16] } };
+    shape "CTRL" { { [43,19] }, { [3,2], [38,16] } };
+    shape "SPCE" { { [55,19] },{ [3,2], [53,16]} };
+    shape "LEDS" { [ 56,15] };
+    shape "LED"  { [  5, 2] };
+
+    section.left	= 5;
+    row.left	= 1;
+    key.shape	= "NORM";
+    key.gap		=  1;
+
+    text "Logo" {left = 7; top = 10; text="digital\n"; };
+
+    section "Function" { top = 45;
+        row { top = 1; left = 7;
+	    keys {  <FK01>, <FK02>, <FK03>, <FK04>, <FK05>,
+		    { <FK06>, 18 }, <FK07>, <FK08>, <FK09>, <FK10>
+	    };
+        };
+    };
+
+    section "Editing" { top = 45; left= 230;
+        row { top = 1;
+	    keys { <LEFT>, <DOWN>, <UP>, <RGHT> };
+        };
+    };
+
+    section "Alpha" { top = 65;
+        row { top = 1; left = 7;
+	    keys {  { <AE00>, "MED" }, 
+		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
+		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
+		    <AB00>, { <BKSP>, "MED" }
+	    };
+        };
+        row { top = 21;	left = 7;
+	    keys {  { <TAB>, "LONG1" },
+		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
+		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
+		    { <RTRN>, "RTRN" }
+	    };
+        };
+        row { top = 41;
+	    keys {  { <LCTL>, "CTRL" },
+		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
+		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL>
+	    };
+        };
+        row { top = 61;
+	    keys {  <CAPS>, { <LFSH>, "LONG1" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		    <AB11>, { <RTSH>, "LONG1" }
+	    };
+        };
+        row { top = 81;	left = 7;
+	    keys {  <AA00>, <LCMP>,
+		    { <LALT>, "LONG" },
+		    { <MUHE>, "LONG" },
+		    { <SPCE>, "SPCE" },
+		    { <KANJ>, "LONG" },
+		    { <HIRA>, "LONG" },
+		    <RALT>, <RCMP>
+	    };
+        };
+    };
+
+    section.left = 233;
+    section.top  = 20;
+
+    section "Indicators" {
+        solid "led_panel" { top = 0; left = 0;
+	    cornerRadius = 1;
+	    shape = "LEDS";
+	    color = "grey";
+        };
+        indicator.onColor = "#00ff00";
+        indicator.offColor= "#001000";
+        indicator.top = 11;
+        indicator.shape= "LED";
+        indicator "Scroll Lock" { left = 6;  };
+        indicator "Caps Lock"   { left = 26; };
+        text.top = 3;
+        text.color = "black";
+        text "ScrollLockLabel" {left = 3; text="Scroll\nLock"; };
+        text "CapsLockLabel" {left = 22; text="Caps\nLock"; };
+    };
+};
diff --git a/xorg-server/xkeyboard-config/geometry/everex b/xorg-server/xkeyboard-config/geometry/everex
index 8cc094760..c175b1718 100644
--- a/xorg-server/xkeyboard-config/geometry/everex
+++ b/xorg-server/xkeyboard-config/geometry/everex
@@ -1,170 +1,170 @@
-default xkb_geometry "STEPnote" {
-
-    description= "Everex STEPnote";
-    width= 281;
-    height= 150;
-
-    shape.cornerRadius= 1;
-
-    shape "NORM" { 
-	{ [17,17] },
-	{ [ 2, 1], [ 15, 15 ] }
-    };
-    shape "NARR" {
-	{ [  15, 17 ] },
-	{ [   2,  1 ], [ 13, 15 ] }
-    };
-    shape "FKEY" {
-	{ [ 15.1, 15.5 ] },
-	{ [  1,  1 ], [ 14.1, 14.5 ] }
-    };
-    shape "ESC" {
-	{ [  16.4, 15.5 ] },
-	{ [   1, 1  ], [ 14.1, 14.5 ] }
-    };
-    shape "WIDE" {	// backspace, tab and Fn
-	{ [  25, 17 ] },
-	{ [   2,  1 ], [ 23, 15 ] }
-    };
-    shape "RTRN" {
-	{ [  27.5, 17 ] },
-	{ [  2,  1 ], [ 25.5, 15 ] }
-    };
-    shape "CAPS" {
-	{ [  30, 17 ] },
-	{ [   2,  1 ], [ 28, 15 ] }
-    };
-    shape "LFSH" {
-	{ [  38.5, 17 ] },
-	{ [  2,  1 ], [ 36.5, 15 ] }
-    };
-    shape "RTSH" {
-	{ [  21, 17 ] },
-	{ [   2,  1 ], [ 19, 15 ] }
-    };
-    shape "SPCE" {
-	{ [  88.8, 17 ] },
-	{ [  2,  1 ], [ 86.8, 15 ] }
-    };
-    shape "WELL" { 
-	{ [ 269, 105 ] }
-    };
-    shape "LED" {
-	cornerRadius= 1.5,
-	{ [ 3, 10 ] }
-    };
-
-    section.left= 6;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  0.5;
-
-    key.color= "grey20";
-    labelColor= "white";
-    baseColor= "grey20";
-
-    indicator.top= 20;
-    indicator.shape= "LED";
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-
-    indicator "Power" 		{ left= 40; };
-    indicator "Battery" 	{ left=101; };
-    indicator "Suspend" 	{ left=112; };
-    indicator "HardDrive" 	{ left=123; };
-    indicator "Floppy" 		{ left=134; };
-    indicator "KeyPad" 		{ left=145; };
-    indicator "Num Lock" 	{ left=156; };
-    indicator "Caps Lock" 	{ left=167; };
-    indicator "Scroll Lock"	{ left=178; };
-
-    solid "KeyWell" {
-	top= 35;
-	left= 6;
-	shape= "WELL";
-	color= "grey10";
-    };
-    section "Whole" {
-	top= 35;
-	row {
-	    top= 0.5;
-	    key.color= "grey30";
-	    key.shape= "FKEY";
-	    keys { 
-		{ <ESC>, "ESC" },
-		<FK01>, <FK02>, <FK03>, <FK04>, <FK05>, <FK06>,
-		<FK07>, <FK08>, <FK09>, <FK10>, <FK11>, <FK12>,
-		<NMLK>, <PRSC>, <SCLK>, <PAUS>
-	    };
-	};
-	row {
-	    top= 16.5;
-	    keys { 
-		{ <TLDE>, "NARR" },
-		<AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>,
-		<AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
-		{ <BKSP>, shape="WIDE", color="grey30" }, 
-		{ <HOME>, shape="NARR", color="grey30" }
-	    };
-	};
-	row {
-	    top= 34;
-	    keys { 
-	    	{  <TAB>, shape="WIDE", color="grey30" },
-		<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>,
-		<AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>,
-		{ <BKSL>, "NARR" }, 
-		{ <PGUP>, shape="NARR", color="grey30" }
-	    };
-	};
-	row {
-	    top= 51.5;
-	    keys { 
-		{ <CAPS>, shape="CAPS", color="grey30" },
-		<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		<AC11>, 
-		{ <RTRN>, shape="RTRN", color="grey30" }, 
-		{ <PGDN>, shape="NARR", color="grey30" }
-	    };
-	};
-	row {
-	    top= 69;
-	    keys { 
-		{ <LFSH>, shape="LFSH", color="grey30" },
-		<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		{ <RTSH>, shape="RTSH", color="grey30" }, 
-		{   <UP>, shape="NARR", color="grey30" },
-		{  <END>, shape="NARR", color="grey30" }
-	    };
-	};
-	row {
-	    top= 86.5;
-	    key.color= "grey30";
-	    keys { 
-		{ <FUNC>, "WIDE" }, 
-		<LCTL>, <LALT>,
-		{ <SPCE>, shape="SPCE", 18, color="grey20" },
-		<RALT>,  <INS>, <DELE>,
-		{ <LEFT>, "NARR" }, { <DOWN>, "NARR" },
-		{ <RGHT>, "NARR" }
-	    };
-	};
-	solid "FakeKey" {
-	    top= 86.5;
-	    left= 62.1;
-	    shape= "NORM";
-	    color= "grey20";
-	};
-	overlay "KPAD" {
-	    <AE07>=<KP7>,  <AE08>=<KP8>, <AE09>=<KP9>,  <AE10>=<KPMU>,
-	    <AD07>=<KP4>,  <AD08>=<KP5>, <AD09>=<KP6>,  <AD10>=<KPSU>,
-	    <AC07>=<KP1>,  <AC08>=<KP2>, <AC09>=<KP3>,  <AC10>=<KPAD>,
-	    <AB07>=<KP0>,                <AB09>=<KPDL>, <AB10>=<KPSL>
-	};
-    }; // End of "Whole" section
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-};
+default xkb_geometry "STEPnote" {
+
+    description= "Everex STEPnote";
+    width= 281;
+    height= 150;
+
+    shape.cornerRadius= 1;
+
+    shape "NORM" { 
+	{ [17,17] },
+	{ [ 2, 1], [ 15, 15 ] }
+    };
+    shape "NARR" {
+	{ [  15, 17 ] },
+	{ [   2,  1 ], [ 13, 15 ] }
+    };
+    shape "FKEY" {
+	{ [ 15.1, 15.5 ] },
+	{ [  1,  1 ], [ 14.1, 14.5 ] }
+    };
+    shape "ESC" {
+	{ [  16.4, 15.5 ] },
+	{ [   1, 1  ], [ 14.1, 14.5 ] }
+    };
+    shape "WIDE" {	// backspace, tab and Fn
+	{ [  25, 17 ] },
+	{ [   2,  1 ], [ 23, 15 ] }
+    };
+    shape "RTRN" {
+	{ [  27.5, 17 ] },
+	{ [  2,  1 ], [ 25.5, 15 ] }
+    };
+    shape "CAPS" {
+	{ [  30, 17 ] },
+	{ [   2,  1 ], [ 28, 15 ] }
+    };
+    shape "LFSH" {
+	{ [  38.5, 17 ] },
+	{ [  2,  1 ], [ 36.5, 15 ] }
+    };
+    shape "RTSH" {
+	{ [  21, 17 ] },
+	{ [   2,  1 ], [ 19, 15 ] }
+    };
+    shape "SPCE" {
+	{ [  88.8, 17 ] },
+	{ [  2,  1 ], [ 86.8, 15 ] }
+    };
+    shape "WELL" { 
+	{ [ 269, 105 ] }
+    };
+    shape "LED" {
+	cornerRadius= 1.5,
+	{ [ 3, 10 ] }
+    };
+
+    section.left= 6;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  0.5;
+
+    key.color= "grey20";
+    labelColor= "white";
+    baseColor= "grey20";
+
+    indicator.top= 20;
+    indicator.shape= "LED";
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+
+    indicator "Power" 		{ left= 40; };
+    indicator "Battery" 	{ left=101; };
+    indicator "Suspend" 	{ left=112; };
+    indicator "HardDrive" 	{ left=123; };
+    indicator "Floppy" 		{ left=134; };
+    indicator "KeyPad" 		{ left=145; };
+    indicator "Num Lock" 	{ left=156; };
+    indicator "Caps Lock" 	{ left=167; };
+    indicator "Scroll Lock"	{ left=178; };
+
+    solid "KeyWell" {
+	top= 35;
+	left= 6;
+	shape= "WELL";
+	color= "grey10";
+    };
+    section "Whole" {
+	top= 35;
+	row {
+	    top= 0.5;
+	    key.color= "grey30";
+	    key.shape= "FKEY";
+	    keys { 
+		{ <ESC>, "ESC" },
+		<FK01>, <FK02>, <FK03>, <FK04>, <FK05>, <FK06>,
+		<FK07>, <FK08>, <FK09>, <FK10>, <FK11>, <FK12>,
+		<NMLK>, <PRSC>, <SCLK>, <PAUS>
+	    };
+	};
+	row {
+	    top= 16.5;
+	    keys { 
+		{ <TLDE>, "NARR" },
+		<AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>,
+		<AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
+		{ <BKSP>, shape="WIDE", color="grey30" }, 
+		{ <HOME>, shape="NARR", color="grey30" }
+	    };
+	};
+	row {
+	    top= 34;
+	    keys { 
+	    	{  <TAB>, shape="WIDE", color="grey30" },
+		<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>,
+		<AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>,
+		{ <BKSL>, "NARR" }, 
+		{ <PGUP>, shape="NARR", color="grey30" }
+	    };
+	};
+	row {
+	    top= 51.5;
+	    keys { 
+		{ <CAPS>, shape="CAPS", color="grey30" },
+		<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		<AC11>, 
+		{ <RTRN>, shape="RTRN", color="grey30" }, 
+		{ <PGDN>, shape="NARR", color="grey30" }
+	    };
+	};
+	row {
+	    top= 69;
+	    keys { 
+		{ <LFSH>, shape="LFSH", color="grey30" },
+		<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		{ <RTSH>, shape="RTSH", color="grey30" }, 
+		{   <UP>, shape="NARR", color="grey30" },
+		{  <END>, shape="NARR", color="grey30" }
+	    };
+	};
+	row {
+	    top= 86.5;
+	    key.color= "grey30";
+	    keys { 
+		{ <FUNC>, "WIDE" }, 
+		<LCTL>, <LALT>,
+		{ <SPCE>, shape="SPCE", 18, color="grey20" },
+		<RALT>,  <INS>, <DELE>,
+		{ <LEFT>, "NARR" }, { <DOWN>, "NARR" },
+		{ <RGHT>, "NARR" }
+	    };
+	};
+	solid "FakeKey" {
+	    top= 86.5;
+	    left= 62.1;
+	    shape= "NORM";
+	    color= "grey20";
+	};
+	overlay "KPAD" {
+	    <AE07>=<KP7>,  <AE08>=<KP8>, <AE09>=<KP9>,  <AE10>=<KPMU>,
+	    <AD07>=<KP4>,  <AD08>=<KP5>, <AD09>=<KP6>,  <AD10>=<KPSU>,
+	    <AC07>=<KP1>,  <AC08>=<KP2>, <AC09>=<KP3>,  <AC10>=<KPAD>,
+	    <AB07>=<KP0>,                <AB09>=<KPDL>, <AB10>=<KPSL>
+	};
+    }; // End of "Whole" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+};
diff --git a/xorg-server/xkeyboard-config/geometry/fujitsu b/xorg-server/xkeyboard-config/geometry/fujitsu
index 1cc5dddca..5f5ff58bf 100644
--- a/xorg-server/xkeyboard-config/geometry/fujitsu
+++ b/xorg-server/xkeyboard-config/geometry/fujitsu
@@ -1,314 +1,314 @@
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//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 OPEN GROUP 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 Open Group 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 Open Group.
-//
-default xkb_geometry "138" {
-
-    // This is an approximate layout for a (US/ASCII) Fujitsu keyboard.  
-
-    description= "Fujitsu English keyboard";
-
-    width= 480;
-    height= 215;
-
-    shape "EDGE" { cornerRadius= 2, { [ 480, 215 ] } };
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
-    shape "TABK" { { [ 27,18] }, { [2,1], [ 25,17] } };
-    shape "RTRN" { 
-	    approx = { [ 0, 0], [28,37] },
-	    { [ 0, 0], [28, 0], [28,37],
-	      [ 5,37], [ 5,19], [ 0,19] },
-	    { [ 1, 1], [26, 1], [26,36],
-	      [ 7,36], [ 7,18], [ 1,18] }
-    };
-    shape "LFSH" { { [ 41,18] }, { [2,1], [ 39,17] } };
-    shape "RTSH" { { [ 33,18] }, { [2,1], [ 31,17] } };
-    shape "LCTL" { { [ 32,18] }, { [2,1], [ 30,17] } };
-    shape "SPCE" { { [151,18] }, { [2,1], [149,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
-    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
-    shape "EXEC" { { [ 57,18] }, { [2,1], [ 55,17] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 15;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-
-    section "Alpha" {
-	top= 28;
-	row {
-	    top= 1;
-	    keys { 
-		  <BREA>, { <PRSC>, 6 }, 
-		{ <FK13>, 30 }, <FK14>, <FK15>, <FK16>,
-		{ <FK17>, 6 }, <FK18>, <FK19>, <FK20>,
-		{ <FK21>, 6 }, <FK22>, <FK23>, <FK24>,
-		{ <FK29>, 68 }, <FK30>, <FK31>, <FK32>
-	    };
-	};
-	row {
-	    top= 20;
-	    keys {
-		  <KNJI>, { <PAUS>, 6 },
-		{ <FK01>, 30 }, <FK02>, <FK03>, <FK04>,
-		{ <FK05>, 6 }, <FK06>, <FK07>, <FK08>,
-		{ <FK09>, 6 }, <FK10>, <FK11>, <FK12>,
-		{ <UNK0>, 6 }, <UNK1>, <UNK2>,
-		{ <FK25>, 6 }, <FK26>, <FK27>, <FK28>
-	    };
-	};
-	row {
-	    top= 39;
-	    left= 316;
-	    keys {
-		  <PGUP>, <HOME>, <PGDN>
-	    };
-	};
-	row {
-	    top= 54;
-	    keys { 
-		  <UNDO>, { <ESC>, 6 }, 
-		  <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, 
-		  <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, 
-		  <AE11>, <AE12>, <TLDE>, <BKSP>,
-		{ <KPMU>, 68 }, <KPDV>, <KPAD>, <KPSU>
-
-	    };
-	};
-	row {
-	    top= 58;
-	    left= 316;
-	    keys {
-		  <UNK3>, <DEL>, <INS>
-	    };
-	};
-	row {
-	    top= 73;
-	    keys { <COPY>, 
-		 { <TAB>, 6, "TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <RTRN>, "RTRN" },
-		 { <KP7>, 68 }, <KP8>, <KP9>, <KPEQ>
-	    };
-	};
-	row {
-	    top= 92;
-	    keys { <PAST>, 
-		 { <LCTL>, 6, "LCTL" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, <BKSL>,
-		 { <UP>, 49 },
-		 { <KP4>, 25 }, <KP5>, <KP6>, <KPDC>
-	    };
-	};
-	row {
-	    top= 102;
-	    left= 316;
-	    keys { <LEFT>, { <RGHT>, 19 }
-	    };
-	};
-	row {
-	    top= 111;
-	    keys { <CUT>, 
-		 { <LFSH>, 6 , "LFSH" }, 
-		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		   <AB11>, { <RTSH>, "RTSH" },
-		 { <DOWN>, 25 },
-		 { <KP1>, 25 }, <KP2>, <KP3>, { <KPEN>, "KPEN" }
-	    };
-	};
-	row {
-	    top= 130;
-	    keys { <HELP>, { <CAPS>, 6 },
-		   <LALT>, <LMTA>, 
-		 { <SPCE>, "SPCE" },
-		   <RMTA>, <RALT>, <COMP>, <LNFD>, 
-		 { <KP0>, 68, "KP0" }, <KP00>
-	    };
-	};
-	row {
-	    top= 149;
-	    left= 316;
-	    keys { 
-		 { <EXEC>, "EXEC" }
-	    };
-	};
-    }; // End of "Alpha" section
-};
-
-xkb_geometry "140" {
-
-    // This is an approximate layout for a Fujitsu Japanese keyboard.  
-
-    description= "Fujitsu Japanese keyboard";
-
-    width= 480;
-    height= 215;
-
-    shape "EDGE" { cornerRadius= 2, { [ 480, 215 ] } };
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
-    shape "TABK" { { [ 27,18] }, { [2,1], [ 25,17] } };
-    shape "RTRN" { 
-	    approx = { [ 0, 0], [28,37] },
-	    { [ 0, 0], [28, 0], [28,37],
-	      [ 5,37], [ 5,19], [ 0,19] },
-	    { [ 1, 1], [26, 1], [26,36],
-	      [ 7,36], [ 7,18], [ 1,18] }
-    };
-    shape "LFSH" { { [ 41,18] }, { [2,1], [ 39,17] } };
-    shape "RTSH" { { [ 33,18] }, { [2,1], [ 31,17] } };
-    shape "LCTL" { { [ 32,18] }, { [2,1], [ 30,17] } };
-    shape "SPCE" { { [113,18] }, { [2,1], [111,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
-    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
-    shape "HNKN" { { [ 23,18] }, { [2,1], [ 21,17] } };
-    shape "EXEC" { { [ 57,18] }, { [2,1], [ 55,17] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 15;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-
-    section "Alpha" {
-	top= 28;
-	row {
-	    top= 1;
-	    keys { 
-		  <BREA>, { <PRSC>, 6 }, 
-		{ <FK13>, 30 }, <FK14>, <FK15>, <FK16>,
-		{ <FK17>, 6 }, <FK18>, <FK19>, <FK20>,
-		{ <FK21>, 6 }, <FK22>, <FK23>, <FK24>,
-		{ <FK29>, 68 }, <FK30>, <FK31>, <FK32>
-	    };
-	};
-	row {
-	    top= 20;
-	    keys {
-		  <KNJI>, { <PAUS>, 6 },
-		{ <FK01>, 30 }, <FK02>, <FK03>, <FK04>,
-		{ <FK05>, 6 }, <FK06>, <FK07>, <FK08>,
-		{ <FK09>, 6 }, <FK10>, <FK11>, <FK12>,
-		{ <UNK0>, 6 }, <UNK1>, <UNK2>,
-		{ <FK25>, 6 }, <FK26>, <FK27>, <FK28>
-	    };
-	};
-	row {
-	    top= 39;
-	    left= 316;
-	    keys {
-		  <PGUP>, <HOME>, <PGDN>
-	    };
-	};
-	row {
-	    top= 54;
-	    keys { 
-		  <UNDO>, { <ESC>, 6 }, 
-		  <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, 
-		  <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, 
-		  <AE11>, <AE12>, <BKSL>, <BKSP>,
-		{ <KPMU>, 68 }, <KPDV>, <KPAD>, <KPSU>
-
-	    };
-	};
-	row {
-	    top= 58;
-	    left= 316;
-	    keys {
-		  <UNK3>, <DEL>, <INS>
-	    };
-	};
-	row {
-	    top= 73;
-	    keys { <COPY>, 
-		 { <TAB>, 6, "TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <RTRN>, "RTRN" },
-		 { <KP7>, 68 }, <KP8>, <KP9>, <KPEQ>
-	    };
-	};
-	row {
-	    top= 92;
-	    keys { <PAST>, 
-		 { <LCTL>, 6, "LCTL" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, <TLDE>,
-		 { <UP>, 49 },
-		 { <KP4>, 25 }, <KP5>, <KP6>, <KPDC>
-	    };
-	};
-	row {
-	    top= 102;
-	    left= 316;
-	    keys { <LEFT>, { <RGHT>, 19 }
-	    };
-	};
-	row {
-	    top= 111;
-	    keys { <CUT>, 
-		 { <LFSH>, 6 , "LFSH" }, 
-		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		   <AB11>, { <RTSH>, "RTSH" }, 
-		 { <DOWN>, 25 },
-		 { <KP1>, 25 }, <KP2>, <KP3>, { <KPEN>, "KPEN" }
-	    };
-	};
-	row {
-	    top= 130;
-	    keys { <HELP>, { <CAPS>, 6 },
-		   <LALT>, <LMTA>, <UNK4>,
-		 { <SPCE>, "SPCE" },
-		   <UNK5>, <RMTA>, <COMP>, <LNFD>, <UNK6>,
-		 { <KP0>, 68, "KP0" }, <KP00>
-	    };
-	};
-	row {
-	    top= 149;
-	    left= 134;
-	    keys { 
-		 { <UNK7>, "HNKN" }, { <UNK8>, "HNKN" }, 
-		 { <EXEC>, 132, "EXEC" }
-	    };
-	};
-    }; // End of "Alpha" section
-};
+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//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 OPEN GROUP 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 Open Group 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 Open Group.
+//
+default xkb_geometry "138" {
+
+    // This is an approximate layout for a (US/ASCII) Fujitsu keyboard.  
+
+    description= "Fujitsu English keyboard";
+
+    width= 480;
+    height= 215;
+
+    shape "EDGE" { cornerRadius= 2, { [ 480, 215 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [ 25,17] } };
+    shape "RTRN" { 
+	    approx = { [ 0, 0], [28,37] },
+	    { [ 0, 0], [28, 0], [28,37],
+	      [ 5,37], [ 5,19], [ 0,19] },
+	    { [ 1, 1], [26, 1], [26,36],
+	      [ 7,36], [ 7,18], [ 1,18] }
+    };
+    shape "LFSH" { { [ 41,18] }, { [2,1], [ 39,17] } };
+    shape "RTSH" { { [ 33,18] }, { [2,1], [ 31,17] } };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "SPCE" { { [151,18] }, { [2,1], [149,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
+    shape "EXEC" { { [ 57,18] }, { [2,1], [ 55,17] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 15;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+
+    section "Alpha" {
+	top= 28;
+	row {
+	    top= 1;
+	    keys { 
+		  <BREA>, { <PRSC>, 6 }, 
+		{ <FK13>, 30 }, <FK14>, <FK15>, <FK16>,
+		{ <FK17>, 6 }, <FK18>, <FK19>, <FK20>,
+		{ <FK21>, 6 }, <FK22>, <FK23>, <FK24>,
+		{ <FK29>, 68 }, <FK30>, <FK31>, <FK32>
+	    };
+	};
+	row {
+	    top= 20;
+	    keys {
+		  <KNJI>, { <PAUS>, 6 },
+		{ <FK01>, 30 }, <FK02>, <FK03>, <FK04>,
+		{ <FK05>, 6 }, <FK06>, <FK07>, <FK08>,
+		{ <FK09>, 6 }, <FK10>, <FK11>, <FK12>,
+		{ <UNK0>, 6 }, <UNK1>, <UNK2>,
+		{ <FK25>, 6 }, <FK26>, <FK27>, <FK28>
+	    };
+	};
+	row {
+	    top= 39;
+	    left= 316;
+	    keys {
+		  <PGUP>, <HOME>, <PGDN>
+	    };
+	};
+	row {
+	    top= 54;
+	    keys { 
+		  <UNDO>, { <ESC>, 6 }, 
+		  <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, 
+		  <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, 
+		  <AE11>, <AE12>, <TLDE>, <BKSP>,
+		{ <KPMU>, 68 }, <KPDV>, <KPAD>, <KPSU>
+
+	    };
+	};
+	row {
+	    top= 58;
+	    left= 316;
+	    keys {
+		  <UNK3>, <DEL>, <INS>
+	    };
+	};
+	row {
+	    top= 73;
+	    keys { <COPY>, 
+		 { <TAB>, 6, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN" },
+		 { <KP7>, 68 }, <KP8>, <KP9>, <KPEQ>
+	    };
+	};
+	row {
+	    top= 92;
+	    keys { <PAST>, 
+		 { <LCTL>, 6, "LCTL" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <BKSL>,
+		 { <UP>, 49 },
+		 { <KP4>, 25 }, <KP5>, <KP6>, <KPDC>
+	    };
+	};
+	row {
+	    top= 102;
+	    left= 316;
+	    keys { <LEFT>, { <RGHT>, 19 }
+	    };
+	};
+	row {
+	    top= 111;
+	    keys { <CUT>, 
+		 { <LFSH>, 6 , "LFSH" }, 
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		   <AB11>, { <RTSH>, "RTSH" },
+		 { <DOWN>, 25 },
+		 { <KP1>, 25 }, <KP2>, <KP3>, { <KPEN>, "KPEN" }
+	    };
+	};
+	row {
+	    top= 130;
+	    keys { <HELP>, { <CAPS>, 6 },
+		   <LALT>, <LMTA>, 
+		 { <SPCE>, "SPCE" },
+		   <RMTA>, <RALT>, <COMP>, <LNFD>, 
+		 { <KP0>, 68, "KP0" }, <KP00>
+	    };
+	};
+	row {
+	    top= 149;
+	    left= 316;
+	    keys { 
+		 { <EXEC>, "EXEC" }
+	    };
+	};
+    }; // End of "Alpha" section
+};
+
+xkb_geometry "140" {
+
+    // This is an approximate layout for a Fujitsu Japanese keyboard.  
+
+    description= "Fujitsu Japanese keyboard";
+
+    width= 480;
+    height= 215;
+
+    shape "EDGE" { cornerRadius= 2, { [ 480, 215 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [ 25,17] } };
+    shape "RTRN" { 
+	    approx = { [ 0, 0], [28,37] },
+	    { [ 0, 0], [28, 0], [28,37],
+	      [ 5,37], [ 5,19], [ 0,19] },
+	    { [ 1, 1], [26, 1], [26,36],
+	      [ 7,36], [ 7,18], [ 1,18] }
+    };
+    shape "LFSH" { { [ 41,18] }, { [2,1], [ 39,17] } };
+    shape "RTSH" { { [ 33,18] }, { [2,1], [ 31,17] } };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "SPCE" { { [113,18] }, { [2,1], [111,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
+    shape "HNKN" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "EXEC" { { [ 57,18] }, { [2,1], [ 55,17] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 15;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+
+    section "Alpha" {
+	top= 28;
+	row {
+	    top= 1;
+	    keys { 
+		  <BREA>, { <PRSC>, 6 }, 
+		{ <FK13>, 30 }, <FK14>, <FK15>, <FK16>,
+		{ <FK17>, 6 }, <FK18>, <FK19>, <FK20>,
+		{ <FK21>, 6 }, <FK22>, <FK23>, <FK24>,
+		{ <FK29>, 68 }, <FK30>, <FK31>, <FK32>
+	    };
+	};
+	row {
+	    top= 20;
+	    keys {
+		  <KNJI>, { <PAUS>, 6 },
+		{ <FK01>, 30 }, <FK02>, <FK03>, <FK04>,
+		{ <FK05>, 6 }, <FK06>, <FK07>, <FK08>,
+		{ <FK09>, 6 }, <FK10>, <FK11>, <FK12>,
+		{ <UNK0>, 6 }, <UNK1>, <UNK2>,
+		{ <FK25>, 6 }, <FK26>, <FK27>, <FK28>
+	    };
+	};
+	row {
+	    top= 39;
+	    left= 316;
+	    keys {
+		  <PGUP>, <HOME>, <PGDN>
+	    };
+	};
+	row {
+	    top= 54;
+	    keys { 
+		  <UNDO>, { <ESC>, 6 }, 
+		  <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, 
+		  <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, 
+		  <AE11>, <AE12>, <BKSL>, <BKSP>,
+		{ <KPMU>, 68 }, <KPDV>, <KPAD>, <KPSU>
+
+	    };
+	};
+	row {
+	    top= 58;
+	    left= 316;
+	    keys {
+		  <UNK3>, <DEL>, <INS>
+	    };
+	};
+	row {
+	    top= 73;
+	    keys { <COPY>, 
+		 { <TAB>, 6, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN" },
+		 { <KP7>, 68 }, <KP8>, <KP9>, <KPEQ>
+	    };
+	};
+	row {
+	    top= 92;
+	    keys { <PAST>, 
+		 { <LCTL>, 6, "LCTL" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <TLDE>,
+		 { <UP>, 49 },
+		 { <KP4>, 25 }, <KP5>, <KP6>, <KPDC>
+	    };
+	};
+	row {
+	    top= 102;
+	    left= 316;
+	    keys { <LEFT>, { <RGHT>, 19 }
+	    };
+	};
+	row {
+	    top= 111;
+	    keys { <CUT>, 
+		 { <LFSH>, 6 , "LFSH" }, 
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		   <AB11>, { <RTSH>, "RTSH" }, 
+		 { <DOWN>, 25 },
+		 { <KP1>, 25 }, <KP2>, <KP3>, { <KPEN>, "KPEN" }
+	    };
+	};
+	row {
+	    top= 130;
+	    keys { <HELP>, { <CAPS>, 6 },
+		   <LALT>, <LMTA>, <UNK4>,
+		 { <SPCE>, "SPCE" },
+		   <UNK5>, <RMTA>, <COMP>, <LNFD>, <UNK6>,
+		 { <KP0>, 68, "KP0" }, <KP00>
+	    };
+	};
+	row {
+	    top= 149;
+	    left= 134;
+	    keys { 
+		 { <UNK7>, "HNKN" }, { <UNK8>, "HNKN" }, 
+		 { <EXEC>, 132, "EXEC" }
+	    };
+	};
+    }; // End of "Alpha" section
+};
diff --git a/xorg-server/xkeyboard-config/geometry/hhk b/xorg-server/xkeyboard-config/geometry/hhk
index 0f1cc0503..de6fe6f53 100644
--- a/xorg-server/xkeyboard-config/geometry/hhk
+++ b/xorg-server/xkeyboard-config/geometry/hhk
@@ -1,266 +1,266 @@
-//
-//	XKB geometry for the Happy Hacking Keyboard (Lite).
-//	Different variants correspond to different switch
-//	settings on the HHK.
-//
-//  Copyright (c) Doug Palmer <doug@charvolant.org>, 2002
-//
-//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
-//AUTHORS OR COPYRIGHT HOLDERS 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.
-
-// SW = 100 Default layout with windows keys
-default xkb_geometry "win1" {
-	include "hhk(basic)"
-
-	key.gap = 1;
-	section "Space" {
-		top = 86;
-		left = 30;
-		row {
-			top = 1;
-			keys {
-				<LALT>,
-				{ <LWIN>, "DIAM" },
-				{ <SPCE>, "SPCE" },
-				{ <RWIN>, "DIAM" },
-				<RALT>
-			};
-		};
-	};
-};
-
-// SW = 101 Layout with windows and alt keys swapped
-xkb_geometry "win2" {
-	include "hhk(basic)"
-
-	key.gap = 1;
-	section "Space" {
-		top = 86;
-		left = 30;
-		row {
-			top = 1;
-			keys {
-				<LWIN>,
-				{ <LALT>, "DIAM" },
-				{ <SPCE>, "SPCE" },
-				{ <RALT>, "DIAM" },
-				<RWIN>
-			};
-		};
-	};
-};
-
-// SW = 110 Default layout with windows keys, and left diamond = Fn key
-xkb_geometry "win3" {
-	include "hhk(basic)"
-
-	key.gap = 1;
-	section "Space" {
-		top = 86;
-		left = 30;
-		row {
-			top = 1;
-			keys {
-				<LALT>,
-				{ <FN>, "DIAM" },
-				{ <SPCE>, "SPCE" },
-				{ <RWIN>, "DIAM" },
-				<RALT>
-			};
-		};
-	};
-};
-
-// SW = 101 Layout with windows and alt keys swapped and left-Alt = Fn key
-xkb_geometry "win4" {
-	include "hhk(basic)"
-
-	key.gap = 1;
-	section "Space" {
-		top = 86;
-		left = 30;
-		row {
-			top = 1;
-			keys {
-				<FN>,
-				{ <LALT>, "DIAM" },
-				{ <SPCE>, "SPCE" },
-				{ <RALT>, "DIAM" },
-				<RWIN>
-			};
-		};
-	};
-};
-
-// SW = 000 Layout with Muhenkan and Henkan keys
-xkb_geometry "jp1" {
-	include "hhk(basic)"
-
-	key.gap = 1;
-	section "Space" {
-		top = 86;
-		left = 30;
-		row {
-			top = 1;
-			keys {
-				<LALT>,
-				{ <NFER>, "DIAM" },
-				{ <SPCE>, "SPCE" },
-				{ <XFER>, "DIAM" },
-				<RALT>
-			};
-		};
-	};
-};
-
-// SW = 001 Layout with Muhenkan and Henkan keys swapped with Alt keys
-xkb_geometry "jp2" {
-	include "hhk(basic)"
-
-	key.gap = 1;
-	section "Space" {
-		top = 86;
-		left = 30;
-		row {
-			top = 1;
-			keys {
-				<NFER>,
-				{ <LALT>, "DIAM" },
-				{ <SPCE>, "SPCE" },
-				{ <RALT>, "DIAM" },
-				<XFER>
-			};
-		};
-	};
-};
-
-// SW = 010 Layout with Henkan key and left-diamond as Fn
-xkb_geometry "jp3" {
-	include "hhk(basic)"
-
-	key.gap = 1;
-	section "Space" {
-		top = 86;
-		left = 30;
-		row {
-			top = 1;
-			keys {
-				<LALT>,
-				{ <FN>, "DIAM" },
-				{ <SPCE>, "SPCE" },
-				{ <XFER>, "DIAM" },
-				<RALT>
-			};
-		};
-	};
-};
-
-// SW = 001 Layout with Henkan key swapped with Alt keys and left-Alt as Fn
-xkb_geometry "jp4" {
-	include "hhk(basic)"
-
-	key.gap = 1;
-	section "Space" {
-		top = 86;
-		left = 30;
-		row {
-			top = 1;
-			keys {
-				<FN>,
-				{ <LALT>, "DIAM" },
-				{ <SPCE>, "SPCE" },
-				{ <RALT>, "DIAM" },
-				<XFER>
-			};
-		};
-	};
-};
-
-// Basic layout for non-swictchable keys
-partial hidden xkb_geometry "basic" {
-
-	description = "Happy Hacking Keyboard";
-	width = 290;
-	height = 106;
-	
-	shape.cornerRadius = 1;
-	shape "NORM" { { [18, 18] }, { [2, 1], [14, 14] } };
-	shape "BKSP" { { [28, 18] }, { [2, 1], [24, 14] } };
-	shape "TABK" { { [28, 18] }, { [2, 1], [24, 14] } };
-	shape "CTRL" { { [32, 18] }, { [2, 1], [28, 14] } };
-	shape "RTRN" { { [42, 18] }, { [2, 1], [38, 14] } };
-	shape "LFSH" { { [42, 18] }, { [2, 1], [38, 14] } };
-	shape "RTSH" { { [32, 18] }, { [2, 1], [28, 14] } };
-	shape "DIAM" { { [28, 18] }, { [2, 1], [24, 14] } };
-	shape "SPCE" { { [114, 18] }, { [2, 1], [110, 14] } };
-
-	text.color = "black";
-	text "PFULabel" { left = 16; top = 2; fontsize = 20; text = "PFU"; };
-	text "HHKLabel" { left = 254; top = 90; text = "Happy Hacking\nKeyboard"; };
-
-	section.left = 1;
-	row.left = 1;
-	key.shape = "NORM";
-	key.gap = 1;
-
-	section "Alphanumeric" {
-		top = 10;
-		row {
-			top = 1;
-			keys {
-				 <ESC>, 
-				<AE01>, <AE02>, <AE03>, <AE04>, <AE05>, 
-				<AE06>, <AE07>, <AE08>, <AE09>, <AE10>, 
-				<AE11>, <AE12>, 
-				<BKSL>, <TLDE>
-			};
-		};
-		row {
-			top = 20;
-			keys {
-				{ <TAB>, "TABK" },
-				<AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
-				<AD06>, <AD07>, <AD08>, <AD09>, <AD10>,
-				<AD11>, <AD12>,
-				{ <BKSP>, "BKSP" }
-			};
-		};
-		row {
-			top = 39;
-			keys {
-				{ <LCTL>, "CTRL" },
-				<AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
-				<AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
-				<AC11>, 
-				{ <RTRN>, "RTRN" }
-			};
-		};
-		row {
-			top = 58;
-			keys {
-				{ <LFSH>, "LFSH" },
-				<AB01>, <AB02>, <AB03>, <AB04>, <AB05>,
-				<AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
-				{ <RTSH>, "RTSH" },
-				{ <FN>, color = "grey20" }
-			};
-		};
-	};
-
-	alias <AC00> = <LCTL>;
-};
+//
+//	XKB geometry for the Happy Hacking Keyboard (Lite).
+//	Different variants correspond to different switch
+//	settings on the HHK.
+//
+//  Copyright (c) Doug Palmer <doug@charvolant.org>, 2002
+//
+//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
+//AUTHORS OR COPYRIGHT HOLDERS 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.
+
+// SW = 100 Default layout with windows keys
+default xkb_geometry "win1" {
+	include "hhk(basic)"
+
+	key.gap = 1;
+	section "Space" {
+		top = 86;
+		left = 30;
+		row {
+			top = 1;
+			keys {
+				<LALT>,
+				{ <LWIN>, "DIAM" },
+				{ <SPCE>, "SPCE" },
+				{ <RWIN>, "DIAM" },
+				<RALT>
+			};
+		};
+	};
+};
+
+// SW = 101 Layout with windows and alt keys swapped
+xkb_geometry "win2" {
+	include "hhk(basic)"
+
+	key.gap = 1;
+	section "Space" {
+		top = 86;
+		left = 30;
+		row {
+			top = 1;
+			keys {
+				<LWIN>,
+				{ <LALT>, "DIAM" },
+				{ <SPCE>, "SPCE" },
+				{ <RALT>, "DIAM" },
+				<RWIN>
+			};
+		};
+	};
+};
+
+// SW = 110 Default layout with windows keys, and left diamond = Fn key
+xkb_geometry "win3" {
+	include "hhk(basic)"
+
+	key.gap = 1;
+	section "Space" {
+		top = 86;
+		left = 30;
+		row {
+			top = 1;
+			keys {
+				<LALT>,
+				{ <FN>, "DIAM" },
+				{ <SPCE>, "SPCE" },
+				{ <RWIN>, "DIAM" },
+				<RALT>
+			};
+		};
+	};
+};
+
+// SW = 101 Layout with windows and alt keys swapped and left-Alt = Fn key
+xkb_geometry "win4" {
+	include "hhk(basic)"
+
+	key.gap = 1;
+	section "Space" {
+		top = 86;
+		left = 30;
+		row {
+			top = 1;
+			keys {
+				<FN>,
+				{ <LALT>, "DIAM" },
+				{ <SPCE>, "SPCE" },
+				{ <RALT>, "DIAM" },
+				<RWIN>
+			};
+		};
+	};
+};
+
+// SW = 000 Layout with Muhenkan and Henkan keys
+xkb_geometry "jp1" {
+	include "hhk(basic)"
+
+	key.gap = 1;
+	section "Space" {
+		top = 86;
+		left = 30;
+		row {
+			top = 1;
+			keys {
+				<LALT>,
+				{ <NFER>, "DIAM" },
+				{ <SPCE>, "SPCE" },
+				{ <XFER>, "DIAM" },
+				<RALT>
+			};
+		};
+	};
+};
+
+// SW = 001 Layout with Muhenkan and Henkan keys swapped with Alt keys
+xkb_geometry "jp2" {
+	include "hhk(basic)"
+
+	key.gap = 1;
+	section "Space" {
+		top = 86;
+		left = 30;
+		row {
+			top = 1;
+			keys {
+				<NFER>,
+				{ <LALT>, "DIAM" },
+				{ <SPCE>, "SPCE" },
+				{ <RALT>, "DIAM" },
+				<XFER>
+			};
+		};
+	};
+};
+
+// SW = 010 Layout with Henkan key and left-diamond as Fn
+xkb_geometry "jp3" {
+	include "hhk(basic)"
+
+	key.gap = 1;
+	section "Space" {
+		top = 86;
+		left = 30;
+		row {
+			top = 1;
+			keys {
+				<LALT>,
+				{ <FN>, "DIAM" },
+				{ <SPCE>, "SPCE" },
+				{ <XFER>, "DIAM" },
+				<RALT>
+			};
+		};
+	};
+};
+
+// SW = 001 Layout with Henkan key swapped with Alt keys and left-Alt as Fn
+xkb_geometry "jp4" {
+	include "hhk(basic)"
+
+	key.gap = 1;
+	section "Space" {
+		top = 86;
+		left = 30;
+		row {
+			top = 1;
+			keys {
+				<FN>,
+				{ <LALT>, "DIAM" },
+				{ <SPCE>, "SPCE" },
+				{ <RALT>, "DIAM" },
+				<XFER>
+			};
+		};
+	};
+};
+
+// Basic layout for non-swictchable keys
+partial hidden xkb_geometry "basic" {
+
+	description = "Happy Hacking Keyboard";
+	width = 290;
+	height = 106;
+	
+	shape.cornerRadius = 1;
+	shape "NORM" { { [18, 18] }, { [2, 1], [14, 14] } };
+	shape "BKSP" { { [28, 18] }, { [2, 1], [24, 14] } };
+	shape "TABK" { { [28, 18] }, { [2, 1], [24, 14] } };
+	shape "CTRL" { { [32, 18] }, { [2, 1], [28, 14] } };
+	shape "RTRN" { { [42, 18] }, { [2, 1], [38, 14] } };
+	shape "LFSH" { { [42, 18] }, { [2, 1], [38, 14] } };
+	shape "RTSH" { { [32, 18] }, { [2, 1], [28, 14] } };
+	shape "DIAM" { { [28, 18] }, { [2, 1], [24, 14] } };
+	shape "SPCE" { { [114, 18] }, { [2, 1], [110, 14] } };
+
+	text.color = "black";
+	text "PFULabel" { left = 16; top = 2; fontsize = 20; text = "PFU"; };
+	text "HHKLabel" { left = 254; top = 90; text = "Happy Hacking\nKeyboard"; };
+
+	section.left = 1;
+	row.left = 1;
+	key.shape = "NORM";
+	key.gap = 1;
+
+	section "Alphanumeric" {
+		top = 10;
+		row {
+			top = 1;
+			keys {
+				 <ESC>, 
+				<AE01>, <AE02>, <AE03>, <AE04>, <AE05>, 
+				<AE06>, <AE07>, <AE08>, <AE09>, <AE10>, 
+				<AE11>, <AE12>, 
+				<BKSL>, <TLDE>
+			};
+		};
+		row {
+			top = 20;
+			keys {
+				{ <TAB>, "TABK" },
+				<AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
+				<AD06>, <AD07>, <AD08>, <AD09>, <AD10>,
+				<AD11>, <AD12>,
+				{ <BKSP>, "BKSP" }
+			};
+		};
+		row {
+			top = 39;
+			keys {
+				{ <LCTL>, "CTRL" },
+				<AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+				<AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
+				<AC11>, 
+				{ <RTRN>, "RTRN" }
+			};
+		};
+		row {
+			top = 58;
+			keys {
+				{ <LFSH>, "LFSH" },
+				<AB01>, <AB02>, <AB03>, <AB04>, <AB05>,
+				<AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+				{ <RTSH>, "RTSH" },
+				{ <FN>, color = "grey20" }
+			};
+		};
+	};
+
+	alias <AC00> = <LCTL>;
+};
diff --git a/xorg-server/xkeyboard-config/geometry/hp b/xorg-server/xkeyboard-config/geometry/hp
index a9846f295..8cb07b480 100644
--- a/xorg-server/xkeyboard-config/geometry/hp
+++ b/xorg-server/xkeyboard-config/geometry/hp
@@ -1,697 +1,697 @@
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//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 OPEN GROUP 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 Open Group 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 Open Group.
-//
-
-default xkb_geometry "pc101" {
-
-    description= "HP PC101";
-    width= 470;
-    height= 210;
-
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
-    shape "BKSP" { { [ 37,18] }, { [2,1], [ 35,17] } };
-    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,17] } };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [ 30,17] } };
-    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,17] } };
-    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "SPCE" { { [132,18] }, { [2,1], [130,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,36] } };
-
-    section.left= 19;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 52;
-	row {
-	    top= 1;
-	    keys {  { <ESC>, color="grey20" },
-		    { <FK01>, 18 }, <FK02>, <FK03>, <FK04>,
-		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
-		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
-		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 91;
-	row {
-	    top= 1;
-	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>,
-		   { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK", color="grey20" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <CAPS>, "CAPS", color="grey20" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, { <RTRN>, "RTRN", color="grey20" }
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "LFSH", color="grey20" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		    { <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "MODK";
-	    key.color= "grey20";
-	    keys { <LCTL>, { <LALT>, 20 },
-		   { <SPCE>, "SPCE", color="white" },
-		   <RALT>, { <RCTL>, 20 }
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 91;
-	left= 310;
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-        row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 91;
-	left= 375;
-	row {
-	    top= 1;
-	    key.color= "grey20";
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-
-}; // End of "default" geometry
-
-xkb_geometry "hil" {
-
-    description= "HP hil";
-    width= 455;
-    height= 170;
-
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
-    shape "BKSP" { { [ 32,18] }, { [2,1], [ 30,17] } };
-    shape "TABK" { { [ 32,18] }, { [2,1], [ 30,17] } };
-    shape "BKSL" { { [ 24,18] }, { [2,1], [ 22,17] } };
-    shape "RTRN" { { [ 38,18] }, { [2,1], [ 36,17] } };
-    shape "LFSH" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "RTSH" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "SPCE" { { [151,18] }, { [2,1], [150,17] } };
-    shape "KP0"  { { [ 38,18] }, { [2,1], [ 36,17] } };
-    shape "KPTB" { { [ 18,38] }, { [2,1], [ 16,37] } };
-    shape "TLDE" { { [ 24,18] }, { [2,1], [ 22,17] } };
-    shape "FKT1" { { [ 17,14] }, { [2,1], [ 15,13] } };
-    shape "FKT2" { { [ 23,14] }, { [2,1], [ 21,13] } };
-
-    section.left= 19;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 14;
-	row {
-	    top= 1;
-	    keys {  { <BRK>, "FKT1" }, { <STOP>, "FKT1" } ,
-		    { <FK01>, "FKT2", 10 }, { <FK02>, "FKT2" },
-		    { <FK03>, "FKT2" }, { <FK04>, "FKT2" }, 
-		    { <MENU>, "FKT1" }, { <SYST>, "FKT1" },
-		    { <FK05>, "FKT2" }, { <FK06>, "FKT2" }, 
-		    { <FK07>, "FKT2" }, { <FK08>, "FKT2" }, 
-		    { <CLRL>, "FKT1", 10 }, { <CLR>, "FKT1" },
-		    { <FK09>, "FKT1", 19 }, { <FK10>, "FKT1" },
-		    { <FK11>, "FKT1" }, { <FK12>, "FKT1" }
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 52;
-	row {
-	    top= 1;
-	    keys { { <TLDE>, "TLDE" }, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>,
-		   { <BKSP>, "BKSP" }, <INSL>, <DELL>
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <BKSL>, "BKSL" },
-		   <INSC>, <DELC>
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { <CAPS>, <LCTL>,
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, { <RTRN>, "RTRN" },
-		   <HOME>, <PGUP>
-	    };
-	};
-	row {
-	    top= 58;
-	    keys {  <ESC>, { <LFSH>, "LFSH" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		    { <RTSH>, "RTSH" }, <SELE>,
-		    <UP>, <PGDN>
-	    };
-	};
-	row {
-	    top= 77;
-	    keys { <PRSC>, { <LALT>, 30 },
-		   { <SPCE>, "SPCE" },
-		   <RALT>, { <LEFT>, 30 }, <DOWN>, <RGHT>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Keypad" {
-	top= 52;
-	left= 360;
-	row {
-	    top= 1;
-	    keys { <KPMU>, <KPDV>, <KPAD>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, <KPEN> };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6>, <KPSP> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPTB>, "KPTB" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-
-}; // End of "default" geometry
-
-
-// Created by Alexander Pohoyda <alexander.pohoyda@gmx.net>
-// Geometry specification for HP Omnibook keyboards.
-// Compatible Models: 6100, 6000.
-
-xkb_geometry "omnibook" {
-    width = 282;
-    height = 128;
-    baseColor = "grey80";
-    labelColor = "white";
-
-    shape "FN0"  { cornerRadius = 1, { [15.5, 12] }, { [1, 0], [14.5, 11] } };
-    shape "NORM" { cornerRadius = 1, { [18, 16] }, { [2, 0], [16, 14] } };
-    shape "BKSP" { cornerRadius = 1, { [31, 16] }, { [2, 0], [29, 14] } };
-    shape "TABK" { cornerRadius = 1, { [27, 16] }, { [2, 0], [25, 14] } };
-    shape "CAPS" { cornerRadius = 1, { [32, 16] }, { [2, 0], [30, 14] } };
-    shape "RTSH" { cornerRadius = 1, { [45, 16] }, { [2, 0], [43, 14] } };
-    shape "MODK" { cornerRadius = 1, { [28, 16] }, { [2, 0], [26, 14] } };
-    shape "SPCE" { cornerRadius = 1, { [90, 16] }, { [2, 0], [88, 14] } };
-    shape "ARRS" { cornerRadius = 1, { [17, 12] }, { [2, 0], [15, 11] } };
-    
-    shape "LED"  { cornerRadius = 1, { [2, 4] } };
-
-    shape "KEYS" { cornerRadius = 1,
-                   { [0, 13],
-                     [197, 13], [197, 0],
-                     [280, 0], [280, 125],
-                     [224, 125], [224, 112],
-                     [0, 112] }
-    };
-
-    solid "KeyPanel" {
-	shape = "KEYS";
-	left = 1;
-	top = 1;
-	color = "black";
-    };
-
-    shape "NULL1" { cornerRadius = 1, { [54, 16] } };
-
-    solid "NullPanel1" {
-	shape = "NULL1";
-	left = 226;
-	top = 96;
-	color = "grey80";
-    };
-
-    shape "NULL2" { cornerRadius = 1, { [19, 14] } };
-
-    solid "NullPanel2" {
-	shape = "NULL2";
-	left = 243;
-	top = 97;
-	color = "black";
-    };
-
-    indicator.onColor = "green";
-    indicator.offColor = "grey10";
-    indicator.top = 4;
-    indicator.shape = "LED";
-    indicator "Caps Lock"    { left = 45; };
-    indicator "Num Lock"     { left = 60; };
-    indicator "Scroll Lock"  { left = 75; };
-    indicator "HDDActivity" { onColor = "red"; left = 90; };
-
-    key.color = "grey60";
-
-    section "Function" {
-        key.gap = 0.99;
-        left = 1;
-        top = 1;
-	key.shape = "FN0";
-	row {
-	    left = 197;
-	    top = 1;
-	    keys {  <PRSC>, <PAUS>, <INS>, <HOME>, <PGUP> };
-	};
-	row {
-	    top = 14;
-	    keys {  <ESC>,
-                    <FK01>, <FK02>, <FK03>, <FK04>,
-		    <FK05>, <FK06>, <FK07>, <FK08>,
-		    <FK09>, <FK10>, <FK11>, <FK12>,
-                    <SCLK>, <DELE>, <END>, <PGDN>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Control" {
-        left = 1;
-	top = 34;
-        key.gap = 1;
-	row {
-	    top = 62;
-	    key.shape = "NORM";
-	    keys { <LCTL>, <FN>, <LWIN>, <LALT>,
-		   { <SPCE>, "SPCE" }, <RALT>, <MENU>, <RCTL>
-	    };
-	};
-    }; // End of "Control" section
-
-    section "Navigation" {
-	key.shape = "ARRS";
-	left = 225;
-	top = 97;
-        key.gap = 1.4;
-	row {
-	    left= 18;
-	    top = 1;
-	    keys { <UP> };
-	};
-	row {
-	    top = 16;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Navigation" section
-
-    shape "STIK" { cornerRadius = 4, { [7, 7] } };
-
-    solid "STIK" {
-	priority = 255;
-	color = "red";
-	shape = "STIK";
-	top = 73;
-	left = 126;
-    };
-};
-
-// 86 keys
-xkb_geometry "omnibook_intl" {
-    include "hp(omnibook)"
-    description = "HP Omnibook 6000/6100, Intl";
-
-    shape "RTRN" { cornerRadius = 1,
-                   { [22, 0], [22, 33], [5, 33], [5, 16], [0, 16], [0, 0] },
-                   { [20, 0], [20, 31], [7, 31], [7, 14], [2, 14], [2, 0] } };
-    shape "LFSH" { cornerRadius = 1, { [23, 16] }, { [2, 0], [21, 14] } };
-
-    section "Alpha" {
-	key.gap = 1;
-	key.color = "grey60";
-	key.shape = "NORM";
-        left = 1;
-	top = 27;
-	row {
-	    top = 1;
-	    keys { <AE00>, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
-	    };
-	};
-	row {
-	    top = 18;
-	    keys { { <TAB>, "TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <RTRN>, "RTRN" }
-	    };
-	};
-	row {
-	    top = 35;
-	    keys { { <CAPS>, "CAPS" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, <AC12>
-	    };
-	};
-	row {
-	    top = 52;
-	    keys { { <LFSH>, "LFSH" }, <LSGT>,
-		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
-		   { <RTSH>, "RTSH" }
-	    };
-	};
-    }; // End of "Alpha" section
-};
-
-xkb_geometry "mini110" {
-
-	description= "HP Mini 110";
-	width= 262;
-	height= 106;
-
-	shape.cornerRadius = 0;
-	shape "FN0"  { { [ 14, 10 ] } , { [ 14, 10 ] } };
-	shape "NORM" { { [ 16.7, 16 ] }   , { [ 16.7, 16 ] } };
-	shape "TLDE" { { [ 12, 16 ] } , { [ 12, 16 ] } };
-	shape "ONE"  { { [ 14, 16 ] }   , { [ 14, 16 ] } };
-	shape "BKSP" { { [ 31.3, 16 ] }   , { [ 31.3, 16 ] } };
-	shape "BKSL" { { [ 23.9, 16 ] } , { [ 23.9, 16 ] } };
-	shape "CAPS" { { [ 22, 16 ] }   , { [ 22, 16 ] } };
-	shape "RTRN" { { [ 36.3, 16 ] } , { [ 36.3, 16 ] } };
-	shape "LFSH" { { [ 31, 16 ] }   , { [ 31, 16 ] } };
-	shape "RTSH" { { [ 45, 16 ] } , { [ 45, 16 ] } };
-	shape "CTLS" { { [ 16.5, 19 ] }   , { [ 16.5, 19 ] } };
-	shape "SPCE" { { [ 78.4, 19 ] } , { [ 78.4, 19 ] } };
-	shape "ARRW" { { [ 16.7, 9 ] }  , { [ 16.7, 9 ] } };
-
-	key.gap=1;
-
-	section "Function" {
-		top=4;
-		left=3;
-		key.shape="FN0";
-		row {
-			keys {
-				<ESC>, <FK01>, <FK02>, <FK03>, <FK04>, <FK05>,
-				<FK06>, <FK07>, <FK08>, <FK09>, <FK10>, <FK11>,
-				<FK12>, <PAUS>, <SCLK>, <INS>, <DELE>
-			};
-		};
-	};
-
-	section "Alphanum" {
-		top=15;
-		left=3;
-		key.shape="NORM";
-        row {
-            top= 0;
-            keys { { <TLDE>, "TLDE" } , { <AE01>, "ONE" }, <AE02>, <AE03>, <AE04>,
-                   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-                   <AE10>, <AE11>, <AE12>,
-                   { <BKSP>, "BKSP" }
-            };
-        };
-        row {
-            top= 17;
-            keys { <TAB>, <AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
-                   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>,
-                   <AD11>, <AD12>, { <BKSL>, "BKSL" }
-            };
-        };
-        row {
-            top= 34;
-            keys { { <CAPS>, "CAPS" } ,
-                   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
-                   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
-                   <AC11>, { <RTRN>, "RTRN" }
-            };
-        };
-        row {
-            top= 51;
-            keys { { <LFSH>, "LFSH" },
-                    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>,
-                    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
-                    { <RTSH>, "RTSH" }
-            };
-        };
-
-	};
-
-	section "Control" {
-		top=83;
-		left=3;
-		key.shape="CTLS";
-		row {
-			keys {
-				<LCTL>, <FN>, <LWIN>, <LALT>, { <SPCE>, "SPCE" }, <RALT>, <MENU>, <RCTL>
-			};
-		};
-	};
-
-	section "Arrows" {
-		top=83;
-		left=204.9;
-		key.shape="ARRW";
-		row {
-			left= 17.7;
-			keys {
-				<UP>
-			};
-		};
-		row {
-			top = 10;
-			keys {
-				<LEFT>, <DOWN>, <RGHT>
-			};
-		};
-	};
-
-};
-
-xkb_geometry "dv5" {
-
-	height=118.4;
-	width=310.6;
-
-    description = "HP Pavilion dv5";
-
-	shape.cornerRadius = 1;
-
-	shape "ESC"  { { [20.0, 12.5] }, { [2.2, 1], [17.8, 10.5] } };
-	shape "FN0"  { { [15.9, 12.5] }, { [2.2, 1], [13.7, 10.5] } };
-	shape "DELE" { { [19.4, 12.5] }, { [2.2, 1], [17.2, 10.5] } };
-
-	shape "NORM" { { [17.9, 18.3] }, { [2.2, 1], [15.7, 16.3] } };
-
-	shape "BKSP" { { [36.1, 18.3] }, { [2.4, 1], [33.7, 16.3] } };
-
-	shape "TABK" { { [26.8, 18.3] }, { [2.4, 1], [24.4, 16.3] } };
-	shape "BKSL" { { [27.1, 18.3] }, { [2.4, 1], [24.7, 16.3] } };
-
-	shape "CAPS" { { [31.6, 18.3] }, { [2.4, 1], [29.2, 16.3] } };
-	shape "RTRN" { { [41.2, 18.3] }, { [2.4, 1], [39.3, 16.3] } };
-
-	shape "LFSH" { { [41.5, 18.3] }, { [2.4, 1], [38.8, 16.3] } };
-	shape "RTSH" { { [31.5, 18.3] }, { [2.4, 1], [29.1, 16.3] } };
-
-	shape "LCTL" { { [22.4, 18.3] }, { [2.2, 1], [20.2, 16.3] } };
-	shape "RCTL" { { [22.6, 18.3] }, { [2.2, 1], [20.4, 16.3] } };
-	shape "CTLS" { { [17.9, 18.3] }, { [2.2, 1], [15.7, 16.3] } };
-	shape "SPCE" { { [94.3, 18.3] }, { [2.5, 1], [91.8, 16.3] } };
-
-	shape "ARRW" { { [17.9, 18.3] }, { [2.2, 1], [15.7, 16.3] } };
-
-	shape "EDIT" { { [16.6, 18.3] }, { [2.2, 1], [14.4, 16.3] } };
-
-	key.gap = 1.2;
-
-	section "Function" {
-		top=4.2;
-		left=3;
-		row {
-			key.shape = "FN0";
-			keys {
-				{<ESC>, "ESC"},
-				{2.9, <FK01>}, <FK02>, <FK03>, <FK04>,
-				{2.9, <FK05>}, <FK06>, <FK07>, <FK08>,
-				{2.9, <FK09>}, <FK10>, <FK11>, <FK12>,
-				{2.9, <NMLK>}, <PAUS>, <INS>, {<DELE>, "DELE"}
-			};
-		};
-	};
-
-    section "Alpha" {
-		top = 17.9;
-		key.shape = "NORM";
-	    left = 3;
-
-		row {
-		    top = 0;
-		    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
-			   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-			   <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
-		    };
-		};
-		row {
-		    top = 19.5;
-		    keys { { <TAB>, "TABK" },
-			   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-			   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-			   <AD11>, <AD12>, { <BKSL>, "BKSL" }
-		    };
-		};
-		row {
-		    top = 39;
-		    keys { { <CAPS>, "CAPS" },
-			   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-			   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-			   <AC11>, { <RTRN>, "RTRN" }
-		    };
-		};
-		row {
-		    top = 58.5;
-		    keys { { <LFSH>, "LFSH" },
-			   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-			   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
-			   { <RTSH>, "RTSH" }
-		    };
-		};
-    }; // End of "Alpha" section
-
-    section "Controls" {
-		top = 95.9;
-		key.shape = "CTLS";
-	    left = 3;
-
-		row {
-		    top = 0;
-		    keys { {<LCTL>, "LCTL"}, <FN>, <LWIN>, <LALT>, {<SPCE>, "SPCE"},
-			   <RALT>, <MENU>, {<RCTL>, "RCTL"}
-		    };
-		};
-    };
-
-	section "Edition" {
-		top = 16.5;
-	    left = 289.9;
-		key.shape = "EDIT";
-		key.gap = 1.4;
-		row {
-		    top = 0;
-			vertical = true;
-		    keys {
-				<HOME>, <PGUP>, <PGDN>, <END>
-		    };
-		};
-	};
-
-	section "Arrows" {
-		top = 76.4;
-		key.shape = "ARRW";
-		left = 249.3;
-		row {
-			top = 0;
-			left = 19.1;
-			keys {
-				<UP>
-			};
-		};
-		row {
-			top = 19.5;
-			left = 0;
-			keys {
-				<LEFT>, <DOWN>, <RGHT>
-			};
-		};
-	};
-};
+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//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 OPEN GROUP 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 Open Group 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 Open Group.
+//
+
+default xkb_geometry "pc101" {
+
+    description= "HP PC101";
+    width= 470;
+    height= 210;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,17] } };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,17] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "SPCE" { { [132,18] }, { [2,1], [130,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,36] } };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 52;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 18 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 91;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LCTL>, { <LALT>, 20 },
+		   { <SPCE>, "SPCE", color="white" },
+		   <RALT>, { <RCTL>, 20 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 91;
+	left= 310;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 91;
+	left= 375;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "default" geometry
+
+xkb_geometry "hil" {
+
+    description= "HP hil";
+    width= 455;
+    height= 170;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "TABK" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "BKSL" { { [ 24,18] }, { [2,1], [ 22,17] } };
+    shape "RTRN" { { [ 38,18] }, { [2,1], [ 36,17] } };
+    shape "LFSH" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "RTSH" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "SPCE" { { [151,18] }, { [2,1], [150,17] } };
+    shape "KP0"  { { [ 38,18] }, { [2,1], [ 36,17] } };
+    shape "KPTB" { { [ 18,38] }, { [2,1], [ 16,37] } };
+    shape "TLDE" { { [ 24,18] }, { [2,1], [ 22,17] } };
+    shape "FKT1" { { [ 17,14] }, { [2,1], [ 15,13] } };
+    shape "FKT2" { { [ 23,14] }, { [2,1], [ 21,13] } };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 14;
+	row {
+	    top= 1;
+	    keys {  { <BRK>, "FKT1" }, { <STOP>, "FKT1" } ,
+		    { <FK01>, "FKT2", 10 }, { <FK02>, "FKT2" },
+		    { <FK03>, "FKT2" }, { <FK04>, "FKT2" }, 
+		    { <MENU>, "FKT1" }, { <SYST>, "FKT1" },
+		    { <FK05>, "FKT2" }, { <FK06>, "FKT2" }, 
+		    { <FK07>, "FKT2" }, { <FK08>, "FKT2" }, 
+		    { <CLRL>, "FKT1", 10 }, { <CLR>, "FKT1" },
+		    { <FK09>, "FKT1", 19 }, { <FK10>, "FKT1" },
+		    { <FK11>, "FKT1" }, { <FK12>, "FKT1" }
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 52;
+	row {
+	    top= 1;
+	    keys { { <TLDE>, "TLDE" }, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP" }, <INSL>, <DELL>
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" },
+		   <INSC>, <DELC>
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <CAPS>, <LCTL>,
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, "RTRN" },
+		   <HOME>, <PGUP>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys {  <ESC>, { <LFSH>, "LFSH" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH" }, <SELE>,
+		    <UP>, <PGDN>
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <PRSC>, { <LALT>, 30 },
+		   { <SPCE>, "SPCE" },
+		   <RALT>, { <LEFT>, 30 }, <DOWN>, <RGHT>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Keypad" {
+	top= 52;
+	left= 360;
+	row {
+	    top= 1;
+	    keys { <KPMU>, <KPDV>, <KPAD>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, <KPEN> };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, <KPSP> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPTB>, "KPTB" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+}; // End of "default" geometry
+
+
+// Created by Alexander Pohoyda <alexander.pohoyda@gmx.net>
+// Geometry specification for HP Omnibook keyboards.
+// Compatible Models: 6100, 6000.
+
+xkb_geometry "omnibook" {
+    width = 282;
+    height = 128;
+    baseColor = "grey80";
+    labelColor = "white";
+
+    shape "FN0"  { cornerRadius = 1, { [15.5, 12] }, { [1, 0], [14.5, 11] } };
+    shape "NORM" { cornerRadius = 1, { [18, 16] }, { [2, 0], [16, 14] } };
+    shape "BKSP" { cornerRadius = 1, { [31, 16] }, { [2, 0], [29, 14] } };
+    shape "TABK" { cornerRadius = 1, { [27, 16] }, { [2, 0], [25, 14] } };
+    shape "CAPS" { cornerRadius = 1, { [32, 16] }, { [2, 0], [30, 14] } };
+    shape "RTSH" { cornerRadius = 1, { [45, 16] }, { [2, 0], [43, 14] } };
+    shape "MODK" { cornerRadius = 1, { [28, 16] }, { [2, 0], [26, 14] } };
+    shape "SPCE" { cornerRadius = 1, { [90, 16] }, { [2, 0], [88, 14] } };
+    shape "ARRS" { cornerRadius = 1, { [17, 12] }, { [2, 0], [15, 11] } };
+    
+    shape "LED"  { cornerRadius = 1, { [2, 4] } };
+
+    shape "KEYS" { cornerRadius = 1,
+                   { [0, 13],
+                     [197, 13], [197, 0],
+                     [280, 0], [280, 125],
+                     [224, 125], [224, 112],
+                     [0, 112] }
+    };
+
+    solid "KeyPanel" {
+	shape = "KEYS";
+	left = 1;
+	top = 1;
+	color = "black";
+    };
+
+    shape "NULL1" { cornerRadius = 1, { [54, 16] } };
+
+    solid "NullPanel1" {
+	shape = "NULL1";
+	left = 226;
+	top = 96;
+	color = "grey80";
+    };
+
+    shape "NULL2" { cornerRadius = 1, { [19, 14] } };
+
+    solid "NullPanel2" {
+	shape = "NULL2";
+	left = 243;
+	top = 97;
+	color = "black";
+    };
+
+    indicator.onColor = "green";
+    indicator.offColor = "grey10";
+    indicator.top = 4;
+    indicator.shape = "LED";
+    indicator "Caps Lock"    { left = 45; };
+    indicator "Num Lock"     { left = 60; };
+    indicator "Scroll Lock"  { left = 75; };
+    indicator "HDDActivity" { onColor = "red"; left = 90; };
+
+    key.color = "grey60";
+
+    section "Function" {
+        key.gap = 0.99;
+        left = 1;
+        top = 1;
+	key.shape = "FN0";
+	row {
+	    left = 197;
+	    top = 1;
+	    keys {  <PRSC>, <PAUS>, <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top = 14;
+	    keys {  <ESC>,
+                    <FK01>, <FK02>, <FK03>, <FK04>,
+		    <FK05>, <FK06>, <FK07>, <FK08>,
+		    <FK09>, <FK10>, <FK11>, <FK12>,
+                    <SCLK>, <DELE>, <END>, <PGDN>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Control" {
+        left = 1;
+	top = 34;
+        key.gap = 1;
+	row {
+	    top = 62;
+	    key.shape = "NORM";
+	    keys { <LCTL>, <FN>, <LWIN>, <LALT>,
+		   { <SPCE>, "SPCE" }, <RALT>, <MENU>, <RCTL>
+	    };
+	};
+    }; // End of "Control" section
+
+    section "Navigation" {
+	key.shape = "ARRS";
+	left = 225;
+	top = 97;
+        key.gap = 1.4;
+	row {
+	    left= 18;
+	    top = 1;
+	    keys { <UP> };
+	};
+	row {
+	    top = 16;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Navigation" section
+
+    shape "STIK" { cornerRadius = 4, { [7, 7] } };
+
+    solid "STIK" {
+	priority = 255;
+	color = "red";
+	shape = "STIK";
+	top = 73;
+	left = 126;
+    };
+};
+
+// 86 keys
+xkb_geometry "omnibook_intl" {
+    include "hp(omnibook)"
+    description = "HP Omnibook 6000/6100, Intl";
+
+    shape "RTRN" { cornerRadius = 1,
+                   { [22, 0], [22, 33], [5, 33], [5, 16], [0, 16], [0, 0] },
+                   { [20, 0], [20, 31], [7, 31], [7, 14], [2, 14], [2, 0] } };
+    shape "LFSH" { cornerRadius = 1, { [23, 16] }, { [2, 0], [21, 14] } };
+
+    section "Alpha" {
+	key.gap = 1;
+	key.color = "grey60";
+	key.shape = "NORM";
+        left = 1;
+	top = 27;
+	row {
+	    top = 1;
+	    keys { <AE00>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top = 18;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top = 35;
+	    keys { { <CAPS>, "CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <AC12>
+	    };
+	};
+	row {
+	    top = 52;
+	    keys { { <LFSH>, "LFSH" }, <LSGT>,
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		   { <RTSH>, "RTSH" }
+	    };
+	};
+    }; // End of "Alpha" section
+};
+
+xkb_geometry "mini110" {
+
+	description= "HP Mini 110";
+	width= 262;
+	height= 106;
+
+	shape.cornerRadius = 0;
+	shape "FN0"  { { [ 14, 10 ] } , { [ 14, 10 ] } };
+	shape "NORM" { { [ 16.7, 16 ] }   , { [ 16.7, 16 ] } };
+	shape "TLDE" { { [ 12, 16 ] } , { [ 12, 16 ] } };
+	shape "ONE"  { { [ 14, 16 ] }   , { [ 14, 16 ] } };
+	shape "BKSP" { { [ 31.3, 16 ] }   , { [ 31.3, 16 ] } };
+	shape "BKSL" { { [ 23.9, 16 ] } , { [ 23.9, 16 ] } };
+	shape "CAPS" { { [ 22, 16 ] }   , { [ 22, 16 ] } };
+	shape "RTRN" { { [ 36.3, 16 ] } , { [ 36.3, 16 ] } };
+	shape "LFSH" { { [ 31, 16 ] }   , { [ 31, 16 ] } };
+	shape "RTSH" { { [ 45, 16 ] } , { [ 45, 16 ] } };
+	shape "CTLS" { { [ 16.5, 19 ] }   , { [ 16.5, 19 ] } };
+	shape "SPCE" { { [ 78.4, 19 ] } , { [ 78.4, 19 ] } };
+	shape "ARRW" { { [ 16.7, 9 ] }  , { [ 16.7, 9 ] } };
+
+	key.gap=1;
+
+	section "Function" {
+		top=4;
+		left=3;
+		key.shape="FN0";
+		row {
+			keys {
+				<ESC>, <FK01>, <FK02>, <FK03>, <FK04>, <FK05>,
+				<FK06>, <FK07>, <FK08>, <FK09>, <FK10>, <FK11>,
+				<FK12>, <PAUS>, <SCLK>, <INS>, <DELE>
+			};
+		};
+	};
+
+	section "Alphanum" {
+		top=15;
+		left=3;
+		key.shape="NORM";
+        row {
+            top= 0;
+            keys { { <TLDE>, "TLDE" } , { <AE01>, "ONE" }, <AE02>, <AE03>, <AE04>,
+                   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+                   <AE10>, <AE11>, <AE12>,
+                   { <BKSP>, "BKSP" }
+            };
+        };
+        row {
+            top= 17;
+            keys { <TAB>, <AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
+                   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>,
+                   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+            };
+        };
+        row {
+            top= 34;
+            keys { { <CAPS>, "CAPS" } ,
+                   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+                   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
+                   <AC11>, { <RTRN>, "RTRN" }
+            };
+        };
+        row {
+            top= 51;
+            keys { { <LFSH>, "LFSH" },
+                    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>,
+                    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+                    { <RTSH>, "RTSH" }
+            };
+        };
+
+	};
+
+	section "Control" {
+		top=83;
+		left=3;
+		key.shape="CTLS";
+		row {
+			keys {
+				<LCTL>, <FN>, <LWIN>, <LALT>, { <SPCE>, "SPCE" }, <RALT>, <MENU>, <RCTL>
+			};
+		};
+	};
+
+	section "Arrows" {
+		top=83;
+		left=204.9;
+		key.shape="ARRW";
+		row {
+			left= 17.7;
+			keys {
+				<UP>
+			};
+		};
+		row {
+			top = 10;
+			keys {
+				<LEFT>, <DOWN>, <RGHT>
+			};
+		};
+	};
+
+};
+
+xkb_geometry "dv5" {
+
+	height=118.4;
+	width=310.6;
+
+    description = "HP Pavilion dv5";
+
+	shape.cornerRadius = 1;
+
+	shape "ESC"  { { [20.0, 12.5] }, { [2.2, 1], [17.8, 10.5] } };
+	shape "FN0"  { { [15.9, 12.5] }, { [2.2, 1], [13.7, 10.5] } };
+	shape "DELE" { { [19.4, 12.5] }, { [2.2, 1], [17.2, 10.5] } };
+
+	shape "NORM" { { [17.9, 18.3] }, { [2.2, 1], [15.7, 16.3] } };
+
+	shape "BKSP" { { [36.1, 18.3] }, { [2.4, 1], [33.7, 16.3] } };
+
+	shape "TABK" { { [26.8, 18.3] }, { [2.4, 1], [24.4, 16.3] } };
+	shape "BKSL" { { [27.1, 18.3] }, { [2.4, 1], [24.7, 16.3] } };
+
+	shape "CAPS" { { [31.6, 18.3] }, { [2.4, 1], [29.2, 16.3] } };
+	shape "RTRN" { { [41.2, 18.3] }, { [2.4, 1], [39.3, 16.3] } };
+
+	shape "LFSH" { { [41.5, 18.3] }, { [2.4, 1], [38.8, 16.3] } };
+	shape "RTSH" { { [31.5, 18.3] }, { [2.4, 1], [29.1, 16.3] } };
+
+	shape "LCTL" { { [22.4, 18.3] }, { [2.2, 1], [20.2, 16.3] } };
+	shape "RCTL" { { [22.6, 18.3] }, { [2.2, 1], [20.4, 16.3] } };
+	shape "CTLS" { { [17.9, 18.3] }, { [2.2, 1], [15.7, 16.3] } };
+	shape "SPCE" { { [94.3, 18.3] }, { [2.5, 1], [91.8, 16.3] } };
+
+	shape "ARRW" { { [17.9, 18.3] }, { [2.2, 1], [15.7, 16.3] } };
+
+	shape "EDIT" { { [16.6, 18.3] }, { [2.2, 1], [14.4, 16.3] } };
+
+	key.gap = 1.2;
+
+	section "Function" {
+		top=4.2;
+		left=3;
+		row {
+			key.shape = "FN0";
+			keys {
+				{<ESC>, "ESC"},
+				{2.9, <FK01>}, <FK02>, <FK03>, <FK04>,
+				{2.9, <FK05>}, <FK06>, <FK07>, <FK08>,
+				{2.9, <FK09>}, <FK10>, <FK11>, <FK12>,
+				{2.9, <NMLK>}, <PAUS>, <INS>, {<DELE>, "DELE"}
+			};
+		};
+	};
+
+    section "Alpha" {
+		top = 17.9;
+		key.shape = "NORM";
+	    left = 3;
+
+		row {
+		    top = 0;
+		    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+			   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+			   <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
+		    };
+		};
+		row {
+		    top = 19.5;
+		    keys { { <TAB>, "TABK" },
+			   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+			   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+			   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+		    };
+		};
+		row {
+		    top = 39;
+		    keys { { <CAPS>, "CAPS" },
+			   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+			   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+			   <AC11>, { <RTRN>, "RTRN" }
+		    };
+		};
+		row {
+		    top = 58.5;
+		    keys { { <LFSH>, "LFSH" },
+			   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+			   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+			   { <RTSH>, "RTSH" }
+		    };
+		};
+    }; // End of "Alpha" section
+
+    section "Controls" {
+		top = 95.9;
+		key.shape = "CTLS";
+	    left = 3;
+
+		row {
+		    top = 0;
+		    keys { {<LCTL>, "LCTL"}, <FN>, <LWIN>, <LALT>, {<SPCE>, "SPCE"},
+			   <RALT>, <MENU>, {<RCTL>, "RCTL"}
+		    };
+		};
+    };
+
+	section "Edition" {
+		top = 16.5;
+	    left = 289.9;
+		key.shape = "EDIT";
+		key.gap = 1.4;
+		row {
+		    top = 0;
+			vertical = true;
+		    keys {
+				<HOME>, <PGUP>, <PGDN>, <END>
+		    };
+		};
+	};
+
+	section "Arrows" {
+		top = 76.4;
+		key.shape = "ARRW";
+		left = 249.3;
+		row {
+			top = 0;
+			left = 19.1;
+			keys {
+				<UP>
+			};
+		};
+		row {
+			top = 19.5;
+			left = 0;
+			keys {
+				<LEFT>, <DOWN>, <RGHT>
+			};
+		};
+	};
+};
diff --git a/xorg-server/xkeyboard-config/geometry/keytronic b/xorg-server/xkeyboard-config/geometry/keytronic
index 6ee1b718b..fb17dd8b9 100644
--- a/xorg-server/xkeyboard-config/geometry/keytronic
+++ b/xorg-server/xkeyboard-config/geometry/keytronic
@@ -1,252 +1,252 @@
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//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 OPEN GROUP 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 Open Group 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 Open Group.
-//
-default xkb_geometry "FlexPro" {
-
-    // This is an approximate layout for a Key Tronic FlexPro
-    // keyboard.  I just took a similar layout (101 key PC keyboard)
-    // and adjusted the sizes of a few keys by eye.  I didn't actually
-    // *measure* a real keyboard.
-
-    description= "Key Tronic FlexPro keyboard";
-
-    width= 515;
-    height= 200;
-
-    shape "EDGE" { cornerRadius= 2, { [ 515, 200 ] } };
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
-    shape "BKSP" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "TABK" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "BKSL" { { [ 23,18] }, { [2,1], [21,17] } };
-    shape "RTRN" {
-        approx = { [16, 0], [38,37] },
-        { [16, 0], [38, 0], [38,37], 
-	  [ 0,37], [ 0,19], [16,19] },
-        { [18, 1], [36, 1], [36,36], 
-	  [ 2,36], [ 2,20], [18,20] } };
-    shape "CAPS" { { [36,18] }, { [2,1], [34,17] } };
-    shape "SHFT" { { [46,18] }, { [2,1], [44,17] } };
-    shape "LCTL" { { [32,18] }, { [2,1], [30,17] } };
-    shape "RCTL" { { [38,18] }, { [2,1], [36,17] } };
-    shape "LALT" { { [28,18] }, { [2,1], [26,17] } };
-    shape "RALT" { { [33,18] }, { [2,1], [31,17] } };
-    shape "LSPC" { { [66,22] }, { [0,0], [66,22] } };
-    shape "RSPC" { { [76,22] }, { [0,0], [76,22] } };
-    shape "KP0"  { { [37,18] }, { [2,1], [35,17] } };
-    shape "KPEN" { { [18,37] }, { [2,1], [16,36] } };
-    shape "LOGO" { cornerRadius= 3, { [80,35] } };
-
-    outline "Edges" {
-   	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 9;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-
-    section "Function" {
-	top= 56;
-	row {
-	    top = 1;
-	    key.color= "grey20";
-	    keys { <FK01>, <FK02> };
-	};
-	row {
-	    top = 20;
-	    key.color= "grey20";
-	    keys { <FK03>, <FK04> };
-	};
-	row {
-	    top = 39;
-	    keys { <FK05>, <FK06> };
-	};
-	row {
-	    top = 58;
-	    key.color= "grey20";
-	    keys { <FK07>, <FK08> };
-	};
-	row {
-	    top = 77;
-	    key.color= "grey20";
-	    keys { <FK09>, <FK10> };
-	};
-	row {
-	    top = 96;
-	    keys { <FK11>, <FK12> };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 56;
-	left= 53;
-	row {
-	    top= 1;
-	    keys { 
-		{ <ESC>, color="grey20" }, { <BKSL>, "BKSL", color="grey20" }, 
-		<AE01>, <AE02>, <AE03>, <AE04>,
-		<AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		<AE10>, <AE11>, <AE12>,
-		{ <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { 
-		{ <TLDE>, color="grey20" },  { <TAB>, "TABK", color="grey20" },
-		<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		<AD11>, <AD12>,
-		{ <RTRN>, "RTRN", -14, color="grey20" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { 
-		{ <LCTL>, color="grey20" }, { <CAPS>, "CAPS", color="grey20" },
-		<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { 
-		{ <LFSH>, color="grey20" }, 
-		{ <LFSH>, "SHFT", color="grey20" }, 
-		<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		{ <RTSH>, "SHFT", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.color= "grey20";
-	    keys { 
-		<LALT>, 
-		{ <LCTL>, shape="LCTL" }, 
-		{ <LALT>, shape="LALT" },
-		{ <SPCE>, shape="LSPC", 4, color="white" },
-		{ <SPCE>, shape="RSPC",color="white" },
-		{ <RALT>, shape="RALT", 4 }, 
-		{ <RCTL>, shape="RCTL" }
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 12;
-	left= 365;
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    keys { <PRSC>, <SCLK>, <PAUS> };
-	};
-	row {
-	    top= 45;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-	row {
-	    top= 64;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 102;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 121;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-    	};
-    }; // End of "Editing" section
-
-    shape "LEDS" { cornerRadius= 3, { [ 76, 20 ] } };
-    shape "LED"  { cornerRadius= 0, { [  7,  4 ] } };
-    solid "LedPanel" {
-    	shape= "LEDS";
-	top=  11;
-	left= 430;
-	color= "grey10";
-    };
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 13;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { left= 440; };
-    indicator "Caps Lock"    { left= 467; };
-    indicator "Scroll Lock"  { left= 489; };
-    text.top= 22;
-    text.color= "black";
-    text "NumLockLabel"		{ left= 438; text="Num\nLock"; };
-    text "CapsLockLabel"	{ left= 465; text="Caps\nLock"; };
-    text "ScrollLockLabel"	{ left= 487; text="Scroll\nLock"; };
-
-    logo "FlexProLogoImage" 	{ 
-	top= 12;
-	left= 45;
-	name= "KeyTronic"; 
-	shape= "LOGO"; 
-    };
-    text "KeyTronicLogoText"	{
-	top= 15;
-	left= 50;
-	width= 55;
-	text= "FlexPro";
-	font= "times";
-	slant= "o";
-	weight= "bold";
-	fontWidth= "narrow";
-	fontSize= 36;
-    };
-
-    section "Keypad" {
-	top= 56;
-	left= 430;
-	row {
-	    top= 1;
-	    key.color= "grey20";
-	    keys { <NMLK>, <KPDV>, <KPMU>, <LEFT> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPSU>, color= "grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6>, { <KPAD>, color= "grey20" } };
-    	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN", color= "grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-};
+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//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 OPEN GROUP 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 Open Group 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 Open Group.
+//
+default xkb_geometry "FlexPro" {
+
+    // This is an approximate layout for a Key Tronic FlexPro
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes of a few keys by eye.  I didn't actually
+    // *measure* a real keyboard.
+
+    description= "Key Tronic FlexPro keyboard";
+
+    width= 515;
+    height= 200;
+
+    shape "EDGE" { cornerRadius= 2, { [ 515, 200 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "TABK" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "BKSL" { { [ 23,18] }, { [2,1], [21,17] } };
+    shape "RTRN" {
+        approx = { [16, 0], [38,37] },
+        { [16, 0], [38, 0], [38,37], 
+	  [ 0,37], [ 0,19], [16,19] },
+        { [18, 1], [36, 1], [36,36], 
+	  [ 2,36], [ 2,20], [18,20] } };
+    shape "CAPS" { { [36,18] }, { [2,1], [34,17] } };
+    shape "SHFT" { { [46,18] }, { [2,1], [44,17] } };
+    shape "LCTL" { { [32,18] }, { [2,1], [30,17] } };
+    shape "RCTL" { { [38,18] }, { [2,1], [36,17] } };
+    shape "LALT" { { [28,18] }, { [2,1], [26,17] } };
+    shape "RALT" { { [33,18] }, { [2,1], [31,17] } };
+    shape "LSPC" { { [66,22] }, { [0,0], [66,22] } };
+    shape "RSPC" { { [76,22] }, { [0,0], [76,22] } };
+    shape "KP0"  { { [37,18] }, { [2,1], [35,17] } };
+    shape "KPEN" { { [18,37] }, { [2,1], [16,36] } };
+    shape "LOGO" { cornerRadius= 3, { [80,35] } };
+
+    outline "Edges" {
+   	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 9;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+
+    section "Function" {
+	top= 56;
+	row {
+	    top = 1;
+	    key.color= "grey20";
+	    keys { <FK01>, <FK02> };
+	};
+	row {
+	    top = 20;
+	    key.color= "grey20";
+	    keys { <FK03>, <FK04> };
+	};
+	row {
+	    top = 39;
+	    keys { <FK05>, <FK06> };
+	};
+	row {
+	    top = 58;
+	    key.color= "grey20";
+	    keys { <FK07>, <FK08> };
+	};
+	row {
+	    top = 77;
+	    key.color= "grey20";
+	    keys { <FK09>, <FK10> };
+	};
+	row {
+	    top = 96;
+	    keys { <FK11>, <FK12> };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 56;
+	left= 53;
+	row {
+	    top= 1;
+	    keys { 
+		{ <ESC>, color="grey20" }, { <BKSL>, "BKSL", color="grey20" }, 
+		<AE01>, <AE02>, <AE03>, <AE04>,
+		<AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		<AE10>, <AE11>, <AE12>,
+		{ <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { 
+		{ <TLDE>, color="grey20" },  { <TAB>, "TABK", color="grey20" },
+		<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		<AD11>, <AD12>,
+		{ <RTRN>, "RTRN", -14, color="grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { 
+		{ <LCTL>, color="grey20" }, { <CAPS>, "CAPS", color="grey20" },
+		<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { 
+		{ <LFSH>, color="grey20" }, 
+		{ <LFSH>, "SHFT", color="grey20" }, 
+		<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		{ <RTSH>, "SHFT", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.color= "grey20";
+	    keys { 
+		<LALT>, 
+		{ <LCTL>, shape="LCTL" }, 
+		{ <LALT>, shape="LALT" },
+		{ <SPCE>, shape="LSPC", 4, color="white" },
+		{ <SPCE>, shape="RSPC",color="white" },
+		{ <RALT>, shape="RALT", 4 }, 
+		{ <RCTL>, shape="RCTL" }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 12;
+	left= 365;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <PRSC>, <SCLK>, <PAUS> };
+	};
+	row {
+	    top= 45;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 64;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 102;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 121;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+    	};
+    }; // End of "Editing" section
+
+    shape "LEDS" { cornerRadius= 3, { [ 76, 20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  7,  4 ] } };
+    solid "LedPanel" {
+    	shape= "LEDS";
+	top=  11;
+	left= 430;
+	color= "grey10";
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 13;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 440; };
+    indicator "Caps Lock"    { left= 467; };
+    indicator "Scroll Lock"  { left= 489; };
+    text.top= 22;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 438; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 465; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 487; text="Scroll\nLock"; };
+
+    logo "FlexProLogoImage" 	{ 
+	top= 12;
+	left= 45;
+	name= "KeyTronic"; 
+	shape= "LOGO"; 
+    };
+    text "KeyTronicLogoText"	{
+	top= 15;
+	left= 50;
+	width= 55;
+	text= "FlexPro";
+	font= "times";
+	slant= "o";
+	weight= "bold";
+	fontWidth= "narrow";
+	fontSize= 36;
+    };
+
+    section "Keypad" {
+	top= 56;
+	left= 430;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <LEFT> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPSU>, color= "grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, { <KPAD>, color= "grey20" } };
+    	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN", color= "grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+};
diff --git a/xorg-server/xkeyboard-config/geometry/kinesis b/xorg-server/xkeyboard-config/geometry/kinesis
index 868f5c542..f71cec8c5 100644
--- a/xorg-server/xkeyboard-config/geometry/kinesis
+++ b/xorg-server/xkeyboard-config/geometry/kinesis
@@ -1,189 +1,189 @@
-default xkb_geometry "model100" {
-
-    // This is an approximate layout for a Kinesis Ergonomic keyboard
-    // Generated completely by eye.  I didn't actually *measure* a real 
-    // keyboard.
-
-    description= "Kinesis Ergonomic Keyboard";
-    width= 421;
-    height= 185;
-
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
-    shape "WIDE" { { [ 21,18] }, { [2,1], [19,17] } };
-    shape "TALL" { { [ 18,37] }, { [2,1], [16,36] } };
-    shape "FKEY" { cornerRadius=0, { [ 10,13] } };
-    shape "LED"  { cornerRadius= 1.5, { [ 3,  3] } };
-    shape "LOGO" { { [ 40, 10 ] } };
-    shape "EDGE" { cornerRadius=5, { [ 421, 185 ] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section "LeftFunction" {
-	left= 15;
-	top=  11;
-	key.shape= "FKEY";
-	key.gap= 3;
-	row {
-	    left= 1;
-	    top= 1;
-	    keys { 
-	    	<ESC>,  <FK01>, <FK02>, <FK03>, <FK04>,
-		<FK05>, <FK06>, <FK07>, <FK08>
-	    };
-	};
-    }; // End of "LeftFunction" section
-
-    section "RightFunction" {
-	left= 290;
-	top=  11;
-	key.shape= "FKEY";
-	key.gap= 3;
-	row {
-	    left= 1;
-	    top= 0.2;
-	    keys {
-		<FK09>, <FK10>, <FK11>, <FK12>, <PRSC>, 
-		<SCLK>, <PAUS>, <FK16>, <FK17>
-	    };
-	};
-    }; // End of "RightFunction" section
-
-    row.vertical= True;
-    row.top= 1;
-    key.gap= 0.5;
-
-    logo "KinesisLogoImage" 	{ 
-	top= 25;
-	left= 240;
-	name= "Kinesis"; 
-	shape= "LOGO"; 
-    };
-
-    indicator.shape= "LED";
-    indicator.top= 30;
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator "Caps Lock" { left= 23; };
-
-    section "LeftAlpha" {
-	top=  34;
-	left= 15;
-	row {
-	    left= 2;
-	    key.shape= "WIDE";
-	    keys { <AE12>, <TAB>, <CAPS>, <LFSH> };
-	};
-	row {
-	    top= 4;
-	    left= 24;
-	    keys { <AE01>, <AD01>, { <AC01>, color="grey20" }, <AB01>, <TLDE> };
-	};
-	row {
-	    left= 43;
-	    keys { <AE02>, <AD02>, { <AC02>, color="grey20" }, <AB02>, <INS> };
-	};
-	row {
-	    left= 62;
-	    keys { <AE03>, <AD03>, { <AC03>, color="grey20" }, <AB03>, <LEFT> };
-	};
-	row {
-	    left= 81;
-	    keys { <AE04>, <AD04>, { <AC04>, color="grey20" }, <AB04>, <RGHT> };
-	};
-	row {
-	    left= 100;
-	    keys { <AE05>, <AD05>, <AC05>, <AB05> };
-	};
-    }; // End of "LeftAlpha" section
-
-    indicator "NumLock"  { left= 318; };
-    indicator "Overlay"  { left= 387; };
-    section "RightAlpha" {
-	top= 34;
-	left= 290;
-	row {
-	    left= 2;
-	    keys { <AE06>, <AD06>, <AC06>, <AB06> };
-	};
-	row {
-	    left= 21;
-	    keys { <AE07>, <AD07>, { <AC07>, color="grey20" }, <AB07>, <UP> };
-	};
-    	row {
-	    left= 40;
-	    keys { <AE08>, <AD08>, { <AC08>, color="grey20" }, <AB08>, <DOWN> };
-	};
-	row {
-	    left= 59;
-	    keys { <AE09>, <AD09>, { <AC09>, color="grey20" }, <AB09>, <AD11> };
-	};
-	row {
-	    top= 4;
-	    left= 78;
-	    keys { <AE10>, <AD10>, { <AC10>, color="grey20" }, <AB10>, <AD12> };
-	};
-	row {
-	    left= 97;
-	    key.shape= "WIDE";
-	    keys { <AE11>, <BKSL>, <AC11>, <RTSH> };
-	};
-	overlay "KPAD" {
-	    <AE07>=<NMLK>, <AE08>=<KPEQ>, <AE09>=<KPSL>, <AE10>=<KPMU>,
-	    <AD07>=<KP7>,  <AD08>=<KP8>,  <AD09>=<KP9>,  <AD10>=<KPSU>,
-	    <AC07>=<KP4>,  <AC08>=<KP5>, <AC09>=<KP6>,  <AC10>=<KPAD>,
-	    <AB07>=<KP1>,  <AB08>=<KP2>, <AB09>=<KP3>,  <AB10>=<KPEN>,
-	    <AE10>=<KPDL>, <AE11>=<KPEN>
-	};
-    }; // End of "RightAlpha" section
-
-    section "LeftEdit" {
-	top= 109;
-	left= 123;
-	angle= 20;
-	row.top= -18;
-	row {
-	    top=  1;
-	    left= 1;
-	    keys { { <BKSP>, "TALL" } };
-	};
-	row {
-	    left= 20;
-	    keys { <LCTL>, { <DELE>, "TALL" } };
-	};
-	row {
-	    left= 39;
-	    keys { <LALT>, <HOME>, <END> };
-	};
-    }; // End of "RightEdit" section
-
-    section "RightEdit" {
-	top= 109;
-	left= 302;
-	angle= -20;
-	row.top= -18;
-	row {
-	    left= -57;
-	    keys { <RALT>, <PGUP>, <PGDN> };
-	};
-	row {
-	    left= -38;
-	    keys { <RCTL>, { <RTRN>, "TALL" } };
-	};
-	row {
-	    top=  1;
-	    left= -19;
-	    keys { { <SPCE>, "TALL" } };
-	};
-	overlay "KPAD" {
-	    <SPCE>= <KP0>
-	};
-    }; // End of "Keypad" section
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-};
+default xkb_geometry "model100" {
+
+    // This is an approximate layout for a Kinesis Ergonomic keyboard
+    // Generated completely by eye.  I didn't actually *measure* a real 
+    // keyboard.
+
+    description= "Kinesis Ergonomic Keyboard";
+    width= 421;
+    height= 185;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "WIDE" { { [ 21,18] }, { [2,1], [19,17] } };
+    shape "TALL" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "FKEY" { cornerRadius=0, { [ 10,13] } };
+    shape "LED"  { cornerRadius= 1.5, { [ 3,  3] } };
+    shape "LOGO" { { [ 40, 10 ] } };
+    shape "EDGE" { cornerRadius=5, { [ 421, 185 ] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section "LeftFunction" {
+	left= 15;
+	top=  11;
+	key.shape= "FKEY";
+	key.gap= 3;
+	row {
+	    left= 1;
+	    top= 1;
+	    keys { 
+	    	<ESC>,  <FK01>, <FK02>, <FK03>, <FK04>,
+		<FK05>, <FK06>, <FK07>, <FK08>
+	    };
+	};
+    }; // End of "LeftFunction" section
+
+    section "RightFunction" {
+	left= 290;
+	top=  11;
+	key.shape= "FKEY";
+	key.gap= 3;
+	row {
+	    left= 1;
+	    top= 0.2;
+	    keys {
+		<FK09>, <FK10>, <FK11>, <FK12>, <PRSC>, 
+		<SCLK>, <PAUS>, <FK16>, <FK17>
+	    };
+	};
+    }; // End of "RightFunction" section
+
+    row.vertical= True;
+    row.top= 1;
+    key.gap= 0.5;
+
+    logo "KinesisLogoImage" 	{ 
+	top= 25;
+	left= 240;
+	name= "Kinesis"; 
+	shape= "LOGO"; 
+    };
+
+    indicator.shape= "LED";
+    indicator.top= 30;
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator "Caps Lock" { left= 23; };
+
+    section "LeftAlpha" {
+	top=  34;
+	left= 15;
+	row {
+	    left= 2;
+	    key.shape= "WIDE";
+	    keys { <AE12>, <TAB>, <CAPS>, <LFSH> };
+	};
+	row {
+	    top= 4;
+	    left= 24;
+	    keys { <AE01>, <AD01>, { <AC01>, color="grey20" }, <AB01>, <TLDE> };
+	};
+	row {
+	    left= 43;
+	    keys { <AE02>, <AD02>, { <AC02>, color="grey20" }, <AB02>, <INS> };
+	};
+	row {
+	    left= 62;
+	    keys { <AE03>, <AD03>, { <AC03>, color="grey20" }, <AB03>, <LEFT> };
+	};
+	row {
+	    left= 81;
+	    keys { <AE04>, <AD04>, { <AC04>, color="grey20" }, <AB04>, <RGHT> };
+	};
+	row {
+	    left= 100;
+	    keys { <AE05>, <AD05>, <AC05>, <AB05> };
+	};
+    }; // End of "LeftAlpha" section
+
+    indicator "NumLock"  { left= 318; };
+    indicator "Overlay"  { left= 387; };
+    section "RightAlpha" {
+	top= 34;
+	left= 290;
+	row {
+	    left= 2;
+	    keys { <AE06>, <AD06>, <AC06>, <AB06> };
+	};
+	row {
+	    left= 21;
+	    keys { <AE07>, <AD07>, { <AC07>, color="grey20" }, <AB07>, <UP> };
+	};
+    	row {
+	    left= 40;
+	    keys { <AE08>, <AD08>, { <AC08>, color="grey20" }, <AB08>, <DOWN> };
+	};
+	row {
+	    left= 59;
+	    keys { <AE09>, <AD09>, { <AC09>, color="grey20" }, <AB09>, <AD11> };
+	};
+	row {
+	    top= 4;
+	    left= 78;
+	    keys { <AE10>, <AD10>, { <AC10>, color="grey20" }, <AB10>, <AD12> };
+	};
+	row {
+	    left= 97;
+	    key.shape= "WIDE";
+	    keys { <AE11>, <BKSL>, <AC11>, <RTSH> };
+	};
+	overlay "KPAD" {
+	    <AE07>=<NMLK>, <AE08>=<KPEQ>, <AE09>=<KPSL>, <AE10>=<KPMU>,
+	    <AD07>=<KP7>,  <AD08>=<KP8>,  <AD09>=<KP9>,  <AD10>=<KPSU>,
+	    <AC07>=<KP4>,  <AC08>=<KP5>, <AC09>=<KP6>,  <AC10>=<KPAD>,
+	    <AB07>=<KP1>,  <AB08>=<KP2>, <AB09>=<KP3>,  <AB10>=<KPEN>,
+	    <AE10>=<KPDL>, <AE11>=<KPEN>
+	};
+    }; // End of "RightAlpha" section
+
+    section "LeftEdit" {
+	top= 109;
+	left= 123;
+	angle= 20;
+	row.top= -18;
+	row {
+	    top=  1;
+	    left= 1;
+	    keys { { <BKSP>, "TALL" } };
+	};
+	row {
+	    left= 20;
+	    keys { <LCTL>, { <DELE>, "TALL" } };
+	};
+	row {
+	    left= 39;
+	    keys { <LALT>, <HOME>, <END> };
+	};
+    }; // End of "RightEdit" section
+
+    section "RightEdit" {
+	top= 109;
+	left= 302;
+	angle= -20;
+	row.top= -18;
+	row {
+	    left= -57;
+	    keys { <RALT>, <PGUP>, <PGDN> };
+	};
+	row {
+	    left= -38;
+	    keys { <RCTL>, { <RTRN>, "TALL" } };
+	};
+	row {
+	    top=  1;
+	    left= -19;
+	    keys { { <SPCE>, "TALL" } };
+	};
+	overlay "KPAD" {
+	    <SPCE>= <KP0>
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+};
diff --git a/xorg-server/xkeyboard-config/geometry/macintosh b/xorg-server/xkeyboard-config/geometry/macintosh
index 32389445b..1e0e125d7 100644
--- a/xorg-server/xkeyboard-config/geometry/macintosh
+++ b/xorg-server/xkeyboard-config/geometry/macintosh
@@ -1,1446 +1,1446 @@
-//
-// Some modifications (<eqdar@castalie.org>) :
-// - Added a <LSGT> key
-// - Fixed the shape of the <RTRN> key
-// - Moved <BKSL> to the 'AC' row
-// - Added a special Macintosh sysctl key
-// - Minor changes (Function keys shape, LED position...)
-
-// Minor changes
-// - Mail address above is no longer valid
-// - Changed {L,R}MTA to {L,R}WIN, which are defined
-// 2005/10 -- Simon Vallet <svallet@gmail.com>
-
-default xkb_geometry "macintosh" {
-
-    description= "Apple Extended Keyboard II";
-    width = 475;
-    height = 194;
-
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
-    shape "TLDE" { { [ 23,18] }, { [2,1], [ 21,17] } };
-    shape "BKSP" { { [ 33,18] }, { [2,1], [ 31,17] } };
-    shape "TAB"  { { [ 33,18] }, { [2,1], [ 31,17] } };
-    shape "RTRN" { 
-        { [0,0],[23,0],[23,37],[4,37],[4,18],[0,18] }, 
-        { [2,1],[21,1],[21,36],[6,36],[6,17],[2,17] } };
-    shape "CAPS" { { [ 37,18] }, { [2,1], [ 35,17] } };
-    shape "LCTL" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "LALT" { { [ 22,18] }, { [2,1], [ 20,17] } };
-    shape "LMTA" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "LFSH" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "RCTL" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "RALT" { { [ 22,18] }, { [2,1], [ 20,17] } };
-    shape "RMTA" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "RTSH" { { [ 47,18] }, { [2,1], [ 45,17] } };
-    shape "SPCE" { { [123,18] }, { [2,1], [121,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
-    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
-    // Macintosh keyboards have a special sysctl key at the top right
-    shape "AAPL" { 
-        { [ 0,0], [ 18,0], [ 18,18], [ 0,18] },
-        { [ 1,1], [ 17,1], [ 17,17], [ 1,17] },
-        { [ 8,5], [ 8,12], [  2,9] } };
-
-    shape "LEDS" { cornerRadius = 0, { [ 55,19] } };
-    shape "LED"  { cornerRadius = 0, { [  8, 2] } };
-
-    solid "LedPanel" {
-	shape= "LEDS";
-        top = 48;
-        left = 378;
-    };
-
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top = 50;
-    indicator.shape= "LED";
-    indicator "NumLock"    { left = 381; };
-    indicator "CapsLock"   { left = 398; };
-    indicator "ScrollLock" { left = 415; };
-    text.top= 55;
-    text.color= "black";
-    text "NumLockLabel"    { left = 381; text = "Num\nLock";    };
-    text "CapsLockLabel"   { left = 398; text = "Caps\nLock";   };
-    text "ScrollLockLabel" { left = 415; text = "Scroll\nLock"; };
-
-    section.left= 19;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-
-    section "Function" {
-        top = 48;
-	row {
-	    top= 1;
-            keys { <ESC>, 
-                   { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
-                   { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
-                   { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
-                   { <PRSC>, 10 }, <SCLK>, <PAUS>,
-                   // This is the sysctl key on macintosh keyboards
-                   // keycode is 222 with a 4.21 kernel, which is <I5E>
-                   { <I5E>, "AAPL", 67 }
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-        top = 87;
-	row {
-	    top= 1;
-            keys { { <TLDE>, "TLDE" }, <AE01>, <AE02>, <AE03>,
-                   <AE04>, <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TAB" },  <AD01>, <AD02>, <AD03>,
-                   <AD04>, <AD05>, <AD06>, <AD07>, <AD08>, <AD09>,
-                   <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <CAPS>, "CAPS" }, <AC01>, <AC02>, <AC03>,
-                   <AC04>, <AC05>, <AC06>, <AC07>, <AC08>, <AC09>,
-                   <AC10>, <AC11>, <BKSL>
-	    };
-	};
-	row {
-	    top= 58;
-            keys { { <LFSH>, "LFSH" }, <LSGT>, <AB01>, <AB02>,
-                   <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>,
-                   <AB09>, <AB10>, { <RTSH>, "RTSH" }
-	    };
-	};
-	row {
-	    top= 77;
-	    keys { { <LCTL>, "LCTL" }, { <LALT>, "LALT" },
-                   { <LWIN>, "LMTA" },
-                   { <SPCE>, "SPCE" }, 
-                   { <RWIN>, "RMTA" },
-	           { <RALT>, "RALT" }, { <RCTL>, "RCTL" }
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-        top = 87;
-        left = 314;
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-        row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    // Begin of "Keypad" section
-    section "Keypad" {
-        top = 87;
-        left = 380;
-	row {
-	    top= 1;
-            keys { <NMLK>, <KPEQ>, <KPDV>, <KPMU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" },  <KPDL> };
-	};
-    }; // End of "Keypad" section
-
-}; // End of "default" geometry
-
-
-// This section describes the geometry of the "Apple Pro" keyboard
-// included with NewWorld desktop machines
-//
-// It adds four new keysyms, labeled SDDN, SDUP, SDNO, EJCT.
-//
-// 2005/10 -- Simon Vallet <svallet@gmail.com>
-
-xkb_geometry "applepro" {
-
-    description= "Apple Pro Keyboard";
-    width = 455;
-    height = 150;
-
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18, 18] }, { [2, 1], [ 16, 15] } };
-    shape "FUNC" { { [ 18, 21] }, { [2, 1], [ 16, 16] } };
-    shape "BKSP" { { [ 38, 18] }, { [2, 1], [ 36, 15] } };
-    shape "TAB"  { { [ 29, 18] }, { [2, 1], [ 26, 15] } };
-    shape "LFSH" { { [ 28, 18] }, { [2, 1], [ 26, 15] } };
-    shape "RTSH" { { [ 47, 18] }, { [2, 1], [ 45, 15] } };
-
-    shape "RTRN" {
-        { [0,0],[27,0],[27,37],[4,37],[4,18],[0,18] }, 
-        { [2,1],[25,1],[25,34],[6,34],[6,15],[2,15] } };
-
-    shape "CAPS" { { [ 32, 18] }, { [2, 1], [ 26, 15] } };
-    shape "LCTL" { { [ 28, 20] }, { [2, 1], [ 26, 17] } };
-    shape "RCTL" { { [ 28, 20] }, { [2, 1], [ 26, 17] } };
-    shape "LALT" { { [ 23, 20] }, { [2, 1], [ 21, 17] } };
-    shape "RALT" { { [ 23, 20] }, { [2, 1], [ 21, 17] } };
-    shape "LMTA" { { [ 28, 20] }, { [2, 1], [ 26, 17] } };
-    shape "RMTA" { { [ 28, 20] }, { [2, 1], [ 26, 17] } };
-    shape "SPCE" { { [121, 20] }, { [3, 1], [118, 17] } };
-    shape "BOTM" { { [ 18, 20] }, { [2, 1], [ 16, 17] } }; 
-
-    shape "KP0"  { { [ 37, 20] }, { [2, 1], [ 35, 17] } };
-    shape "KPEN" { { [ 18, 39] }, { [2, 1], [ 16, 36] } };
-
-    section.left = 7;
-    row.left = 1;
-    key.gap =  1;
-    key.shape = "NORM";
-
-    section "Function" {
-       key.shape = "FUNC";
-        top = 26;
-       row {
-           top= 1;
-            keys { <ESC>, 
-                   { <FK01>, 14 }, <FK02>, <FK03>, <FK04>,
-                   { <FK05>, 14 }, <FK06>, <FK07>, <FK08>,
-                   { <FK09>, 14 }, <FK10>, <FK11>, <FK12>,
-                   { <PRSC>, 11 }, <SCLK>, <PAUS>,
-                  { <SDDN>, 11 }, <SDUP>, <SDNO>, <EJCT>
-            };
-       };
-    }; // End of "Function" section
-
-
-    section "Alpha" {
-        top = 48;
-       row {
-           top= 1;
-            keys { <TLDE>, <AE01>, <AE02>, <AE03>,
-                   <AE04>, <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-                  <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
-           };
-       };
-       row {
-           top= 20;
-           keys { { <TAB>, "TAB" },  <AD01>, <AD02>, <AD03>,
-                   <AD04>, <AD05>, <AD06>, <AD07>, <AD08>, <AD09>,
-                   <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN" }
-           };
-       };
-       row {
-           top= 39;
-           keys { { <CAPS>, "CAPS" }, <AC01>, <AC02>, <AC03>,
-                   <AC04>, <AC05>, <AC06>, <AC07>, <AC08>, <AC09>,
-                   <AC10>, <AC11>, <BKSL>
-           };
-       };
-       row {
-           top= 58;
-           keys { { <LFSH>, "LFSH" }, <LSGT>, <AB01>, <AB02>,
-                   <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>,
-                   <AB09>, <AB10>, { <RTSH>, "RTSH" }
-           };
-       };
-       row {
-           top= 77;
-           keys { { <LCTL>, "LCTL" }, { <LALT>, "LALT" },
-                       { <LWIN>, "LMTA" },
-                       { <SPCE>, "SPCE" }, 
-                       { <RWIN>, "RMTA" },
-                       { <RALT>, "RALT" }, { <RCTL>, "RCTL" }
-           };
-       };
-    }; // End of "Alpha" section
-
-    section "Editing" {
-        top = 48;
-        left = 303;
-       row {
-           top= 1;
-           keys { <INS>, <HOME>, <PGUP> };
-       };
-        row {
-           top= 20;
-           keys { <DELE>, <END>, <PGDN> };
-       };
-       row {
-           top= 58;
-           left= 20;
-           keys { <UP> };
-       };
-       row {
-           top= 77;
-           key.shape = "BOTM";
-           keys { <LEFT>, <DOWN>, <RGHT> };
-       };
-    }; // End of "Editing" section
-
-    // Begin of "Keypad" section
-    section "Keypad" {
-        top = 48;
-        left = 370;
-       row {
-           top= 1;
-            keys { <NMLK>, <KPEQ>, <KPDV>, <KPMU> };
-       };
-       row {
-           top= 20;
-           keys { <KP7>, <KP8>, <KP9>, <KPSU> };
-       };
-       row {
-           top= 39;
-           keys { <KP4>, <KP5>, <KP6>, <KPAD> };
-       };
-       row {
-           top= 58;
-           keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN" } };
-       };
-       row {
-           top= 77;
-           keys { { <KP0>, "KP0" },  { <KPDL>, "BOTM" } };
-       };
-    }; // End of "Keypad" section
-
-}; // End of "applepro" geometry
-
-xkb_geometry "macbook78" {
-
-    description= "Apple Laptop 78-key (US)";
-    width= 273;
-    height= 110;
-
-    shape.cornerRadius= 0;
-    shape "ESC"  { { [ 21,9] }, cornerRadius=1, { [0,1], [ 19,8] } };
-    shape "FUNC" { { [ 18,9] }, cornerRadius=1, { [2,1], [ 16,8] } };
-    shape "EJCT" { { [ 20,9] }, cornerRadius=1, { [2,1], [ 20,8] } };
-    shape "DEGR" { { [ 16,18] }, cornerRadius=1, { [0,2], [ 14,16] } };
-    shape "NORM" { { [ 18,18] }, cornerRadius=1, { [2,2], [ 16,16] } };
-    shape "BKSP" { { [ 25,18] }, cornerRadius=1, { [2,2], [ 25,16] } };
-    shape "TABK" { { [ 24,18] }, cornerRadius=1, { [0,2], [ 22,16] } };
-    shape "BKSL" { { [ 17,18] }, cornerRadius=1, { [2,2], [17,16] } };
-    shape "RTRN" { { [ 31,18] }, cornerRadius=1, { [2,2], [31,16] } };
-    shape "CAPS" { { [ 29,18] }, cornerRadius=1, { [0,2], [ 27,16] } };
-    shape "LFSH" { { [ 40,18] }, cornerRadius=1, { [0,2], [ 38,16] } };
-    shape "RTSH" { { [ 39,18] }, cornerRadius=1, { [2,2], [ 39,16] } };
-    shape "APPL" { { [ 23,18] }, cornerRadius=1, { [2,2], [ 21,16] } };
-    shape "SPCE" { { [ 94,18] }, cornerRadius=1, { [2,2], [ 92,16] } };
-    shape "ARRO" { { [ 17,9] }, cornerRadius=1, { [2,1], [ 15,8] } };
-
-    shape "LED"  { cornerRadius= 1, { [  2,  2 ] } };
-
-    indicator.onColor= "green";
-    indicator.offColor= "gray";
-    indicator.shape= "LED";
-    indicator "Num Lock"   { top=4; left= 119; };
-    indicator "Caps Lock"  { top=53; left= 4; };
-
-    section.left=0;
-    row.left= 1;
-    key.shape= "FUNC";
-    key.gap= 1;
-    section "Function" {
-	top= 0;
-	row {
-	    top= 1;
-	    keys {  {<ESC>, "ESC" },
-		    <FK01>, <FK02>, <FK03>, <FK04>,
-		    <FK05>, <FK06>, <FK07>, <FK08>,
-		    <FK09>, <FK10>, <FK11>, <FK12>,
-                    {<K6C>, "EJCT" }
-	    };
-	};
-    }; // End of "Function" section
-
-    key.shape= "NORM";
-    section "Alpha" {
-	top= 10;
-	row {
-	    top= 1;
-	    keys { {<TLDE>, "DEGR"},
-                   <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>,
-                   <AE09>, <AE10>, <AE11>, <AE12>,
-		   { <BKSP>, "BKSP" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK"},
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, 
-                   { <BKSL>, "BKSL" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <CAPS>, "CAPS" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, 
-                   { <RTRN>, "RTRN" }
-	    };
-        };
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "LFSH"},
-		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		   { <RTSH>, "RTSH" }
-	    };
-	};
-	row {
-	    top= 77;
-	    keys { {<FN>, "DEGR"}, 
-                   <LCTL>, <LALT>, 
-                   {<LMTA>, "APPL"},
-                   {<SPCE>, "SPCE" }, 
-                   {<RMTA>, "APPL"},
-                   <KPEN>
-	    };
-	};
-
-    }; // End of "Alpha" section
-
-    key.shape= "ARRO";
-    section "Editing" {
-        top = 86;
-        left = 217;
-	row {
-	    top= 1;
-	    left= 19;
-	    keys { <UP> };
-	};
-	row {
-	    top= 10;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-
-};
-
-xkb_geometry "macbook79" {
-
-    description= "Apple Laptop 79-key (Intl)";
-    width= 273;
-    height= 110;
-
-    shape.cornerRadius= 0;
-    shape "ESC"  { { [ 21,9] }, cornerRadius=1, { [0,1], [ 19,8] } };
-    shape "FUNC" { { [ 18,9] }, cornerRadius=1, { [2,1], [ 16,8] } };
-    shape "EJCT" { { [ 20,9] }, cornerRadius=1, { [2,1], [ 20,8] } };
-    shape "DEGR" { { [ 16,18] }, cornerRadius=1, { [0,2], [ 14,16] } };
-    shape "NORM" { { [ 18,18] }, cornerRadius=1, { [2,2], [ 16,16] } };
-    shape "BKSP" { { [ 25,18] }, cornerRadius=1, { [2,2], [ 25,16] } };
-    shape "TABK" { { [ 24,18] }, cornerRadius=1, { [0,2], [ 22,16] } };
-    shape "RTRN" { { [ 0,0], [17,0], [17,37], [5,37], [5, 18], [0,18], [0,0] },
-                   cornerRadius=1, 
-	           { [ 2,2], [15,2], [15,35], [7,35], [7, 16], [2,16] } 
-                 };
-    shape "CAPS" { { [ 29,18] }, cornerRadius=1, { [0,2], [ 27,16] } };
-    shape "LFSH" { { [ 21,18] }, cornerRadius=1, { [0,2], [ 19,16] } };
-    shape "RTSH" { { [ 39,18] }, cornerRadius=1, { [2,2], [ 39,16] } };
-    shape "APPL" { { [ 23,18] }, cornerRadius=1, { [2,2], [ 21,16] } };
-    shape "SPCE" { { [ 94,18] }, cornerRadius=1, { [2,2], [ 92,16] } };
-    shape "ARRO" { { [ 17,9] }, cornerRadius=1, { [2,1], [ 15,8] } };
-
-    shape "LED"  { cornerRadius= 1, { [  2,  2 ] } };
-
-    indicator.onColor= "green";
-    indicator.offColor= "gray";
-    indicator.shape= "LED";
-    indicator "Num Lock"   { top=4; left= 119; };
-    indicator "Caps Lock"  { top=53; left= 4; };
-
-    section.left=0;
-    row.left= 1;
-    key.shape= "FUNC";
-    key.gap= 1;
-    section "Function" {
-	top= 0;
-	row {
-	    top= 1;
-	    keys {  {<ESC>, "ESC" },
-		    <FK01>, <FK02>, <FK03>, <FK04>,
-		    <FK05>, <FK06>, <FK07>, <FK08>,
-		    <FK09>, <FK10>, <FK11>, <FK12>,
-                    {<K6C>, "EJCT" }
-	    };
-	};
-    }; // End of "Function" section
-
-    key.shape= "NORM";
-    section "Alpha" {
-	top= 10;
-	row {
-	    top= 1;
-	    keys { {<TLDE>, "DEGR"},
-                   <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>,
-                   <AE09>, <AE10>, <AE11>, <AE12>,
-		   { <BKSP>, "BKSP" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK"},
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <RTRN>, "RTRN" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <CAPS>, "CAPS" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, <BKSL>
-	    };
-        };
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "LFSH"},
-		   <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
-		   { <RTSH>, "RTSH" }
-	    };
-	};
-	row {
-	    top= 77;
-	    keys { {<FN>, "DEGR"}, 
-                   <LCTL>, <LALT>, 
-                   {<LWIN>, "APPL"},
-                   {<SPCE>, "SPCE" }, 
-                   {<RALT>, "APPL"},
-                   <KPEN>
-	    };
-	};
-
-    }; // End of "Alpha" section
-
-    key.shape= "ARRO";
-    section "Editing" {
-        top = 86;
-        left = 217;
-	row {
-	    top= 1;
-	    left= 19;
-	    keys { <UP> };
-	};
-	row {
-	    top= 10;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-
-}; // End of "default" geometry
-
-
-// Aluminium Keyboard, ANSI model (United States, 109 keys)
-xkb_geometry "applealu_ansi" {
-
-    width=       430;
-    height=      113.5;
-
-    baseColor=   "white";
-    labelColor=  "black";
-    xfont=       "-*-helvetica-medium-r-normal--*-80-*-*-*-*-iso8859-1";
-    description= "Aluminium Keyboard (ANSI)";
-
-    shape "NORM" {
-        corner= 1,
-        { [  15.5,  15 ] }
-    };
-    shape "FUNC" {
-        corner= 1,
-        { [  16.1,   9 ] }
-    };
-    shape "FUNS" {
-        corner= 1,
-        { [  15.5,  9 ] }
-    };
-    shape "BKSP" {
-        corner= 1,
-        { [  24.5,  15 ] }
-    };
-    shape "TAB" {
-        corner= 1,
-        { [  24.5,  15 ] }
-    };
-    shape "RTRN" {
-        corner= 1,
-        { [  29.5,  15 ] }
-    };
-    shape "CAPS" {
-        corner= 1,
-        { [  29.5,  15 ] }
-    };
-    shape "LCTL" {
-        corner= 1,
-        { [  25,  18	 ] }
-    };
-    shape "LALT" {
-        corner= 1,
-        { [  20,  18 ] }
-    };
-    shape "LMTA" {
-        corner= 1,
-        { [  25,  18 ] }
-    };
-    shape "LFSH" {
-        corner= 1,
-        { [  39,  15 ] }
-    };
-    shape "RCTL" {
-        corner= 1,
-        { [  25,  18 ] }
-    };
-    shape "RALT" {
-        corner= 1,
-        { [  20,  18 ] }
-    };
-    shape "RMTA" {
-        corner= 1,
-        { [  25,  18 ] }
-    };
-    shape "RTSH" {
-        corner= 1,
-        { [  39,  15 ] }
-    };
-    shape "SPCE" {
-        corner= 1,
-        { [ 110.5,  18 ] }
-    };
-    shape "KP0" {
-        corner= 1,
-        { [  34.5,  18 ] }
-    };
-    shape "KPEN" {
-        corner= 1,
-        { [  15.5,  36.5 ] }
-    };
-    shape "KPDT" {
-        corner= 1,
-        { [  15.5,  18 ] }
-    };
-    shape "LED" { 
-        corner= 0.5,
-        { [   1.5,   1.5 ] }
-    };
-
-    section "Function" {
-        key.color= "white";
-        priority=  7;
-        top=       4.5;
-        left=      4.7;
-        width=     420.5;
-        height=    10;
-        row {
-            top=  0;
-            left= 0;
-            keys {
-                {  <ESC>, "FUNC",   0 },   { <FK01>, "FUNC",   3.6 },
-                { <FK02>, "FUNC",   3.5 }, { <FK03>, "FUNC",   3.6 },
-                { <FK04>, "FUNC",   3.5 }, { <FK05>, "FUNC",   3.6 },
-                { <FK06>, "FUNC",   3.5 }, { <FK07>, "FUNC",   3.6 },
-                { <FK08>, "FUNC",   3.5 }, { <FK09>, "FUNC",   3.6 },
-                { <FK10>, "FUNC",   3.5 }, { <FK11>, "FUNC",   3.6 },
-                { <FK12>, "FUNC",   3.5 }, { <I169>, "FUNC",   3.5 },
-                { <FK13>, "FUNS",  11.5 }, { <FK14>, "FUNS",   3.5 },
-                { <FK15>, "FUNS",   3.5 }, { <FK16>, "FUNS",  11.5 },
-                { <FK17>, "FUNS",   3.5 }, { <FK18>, "FUNS",   3.5 },
-                { <FK19>, "FUNS",   3.5 }
-            };
-        };
-    }; // End of "Function" section
-
-    section "Alpha" {
-        key.color= "white";
-        priority=  8;
-        top=       17;
-        left=      5;
-        width=     271.5;
-        height=    92;
-        row {
-            top=  0;
-            left= 0;
-            keys {
-                { <TLDE>, "NORM",   0 },   { <AE01>, "NORM",   3.5 },
-                { <AE02>, "NORM",   3.5 }, { <AE03>, "NORM",   3.5 },
-                { <AE04>, "NORM",   3.5 }, { <AE05>, "NORM",   3.5 },
-                { <AE06>, "NORM",   3.5 }, { <AE07>, "NORM",   3.5 },
-                { <AE08>, "NORM",   3.5 }, { <AE09>, "NORM",   3.5 },
-                { <AE10>, "NORM",   3.5 }, { <AE11>, "NORM",   3.5 },
-                { <AE12>, "NORM",   3.5 }, { <BKSP>, "BKSP",   3.5 }
-            };
-        };
-        row {
-            top=  18.5;
-            left= 0;
-            keys {
-                {  <TAB>, "TAB",   0 },    { <AD01>, "NORM",   3.5 },
-                { <AD02>, "NORM",   3.5 }, { <AD03>, "NORM",   3.5 },
-                { <AD04>, "NORM",   3.5 }, { <AD05>, "NORM",   3.5 },
-                { <AD06>, "NORM",   3.5 }, { <AD07>, "NORM",   3.5 },
-                { <AD08>, "NORM",   3.5 }, { <AD09>, "NORM",   3.5 },
-                { <AD10>, "NORM",   3.5 }, { <AD11>, "NORM",   3.5 },
-                { <AD12>, "NORM",   3.5 }, { <BKSL>, "NORM",   3.5 }
-
-            };
-        };
-        row {
-            top=  37;
-            left= 0;
-            keys {
-                { <CAPS>, "CAPS",   0 },   { <AC01>, "NORM",   3.5 },
-                { <AC02>, "NORM",   3.5 }, { <AC03>, "NORM",   3.5 },
-                { <AC04>, "NORM",   3.5 }, { <AC05>, "NORM",   3.5 },
-                { <AC06>, "NORM",   3.5 }, { <AC07>, "NORM",   3.5 },
-                { <AC08>, "NORM",   3.5 }, { <AC09>, "NORM",   3.5 },
-                { <AC10>, "NORM",   3.5 }, { <AC11>, "NORM",   3.5 },
-		{ <RTRN>, "RTRN",   3.5 }
-            };
-        };
-        row {
-            top=  55.5;
-            left= 0;
-            keys {
-                { <LFSH>, "LFSH",   0 }, 
-                { <AB01>, "NORM",   3.5 }, { <AB02>, "NORM",   3.5 },
-                { <AB03>, "NORM",   3.5 }, { <AB04>, "NORM",   3.5 },
-                { <AB05>, "NORM",   3.5 }, { <AB06>, "NORM",   3.5 },
-                { <AB07>, "NORM",   3.5 }, { <AB08>, "NORM",   3.5 },
-                { <AB09>, "NORM",   3.5 }, { <AB10>, "NORM",   3.5 },
-                { <RTSH>, "RTSH",   3.5 }
-            };
-        };
-        row {
-            top=  74;
-            left= 0;
-            keys {
-                { <LCTL>, "LCTL",   0 },   { <LALT>, "LALT",   3.5 },
-                { <LMTA>, "LMTA",   3.5 }, { <SPCE>, "SPCE",   3.5 },
-                { <RMTA>, "RMTA",   3.5 }, { <RALT>, "RALT",   3.5 },
-                { <RCTL>, "RCTL",   3.5 }
-            };
-        };
-    }; // End of "Alpha" section
-
-    section "Editing" {
-        key.color= "white";
-        priority=  9;
-        top=       17;
-        left=      287.7;
-        width=     53.5;
-        height=    92;
-        row {
-            top=  0;
-            left= 0;
-            keys {
-                {  <INS>, "NORM",   0 },  { <HOME>, "NORM",   3.5 },
-                { <PGUP>, "NORM",   3.5 }
-            };
-        };
-        row {
-            top=  18.5;
-            left= 0;
-            keys {
-                { <DELE>, "NORM",   0 },  {  <END>, "NORM",   3.5 },
-                { <PGDN>, "NORM",   3.5 }
-            };
-        };
-        row {
-            top=  58.5;
-            left= 19;
-            keys {
-                {   <UP>, "NORM",   0 }
-            };
-        };
-        row {
-            top=  77;
-            left= 0;
-            keys {
-                { <LEFT>, "NORM",   0 },  { <DOWN>, "NORM",   3.5 },
-                { <RGHT>, "NORM",   3.5 }
-            };
-        };
-    }; // End of "Editing" section
-
-    section "Keypad" {
-        key.color= "white";
-        priority=  10;
-        top=       17;
-        left=      352.7;
-        width=     72.5;
-        height=    92;
-        row {
-            top=  0;
-            left= 0;
-            keys {
-                { <NMLK>, "NORM",   0 },   { <KPEQ>, "NORM",   3.5 },
-                { <KPDV>, "NORM",   3.5 }, { <KPMU>, "NORM",   3.5 }
-            };
-        };
-        row {
-            top=  18.5;
-            left= 0;
-            keys {
-                {  <KP7>, "NORM",   0 },   {  <KP8>, "NORM",   3.5 },
-                {  <KP9>, "NORM",   3.5 }, { <KPSU>, "NORM",   3.5 }
-            };
-        };
-        row {
-            top=  37;
-            left= 0;
-            keys {
-                {  <KP4>, "NORM",   0 },   {  <KP5>, "NORM",   3.5 },
-                {  <KP6>, "NORM",   3.5 }, { <KPAD>, "NORM",   3.5 }
-            };
-        };
-        row {
-            top=  55.5;
-            left= 0;
-            keys {
-                {  <KP1>, "NORM",   0 },   {  <KP2>, "NORM",   3.5 },
-                {  <KP3>, "NORM",   3.5 }, { <KPEN>, "KPEN",   3.5 }
-            };
-        };
-        row {
-            top=  74;
-            left= 0;
-            keys {
-                {  <KP0>, "KP0",   0 }, { <KPDL>, "KPDT",   3.5 }
-            };
-        };
-    }; // End of "Keypad" section
-
-    indicator "Caps Lock" {
-        top=      56;
-        left=     6.7;
-        priority= 2;
-        onColor= "green";
-        offColor= "gray";
-        shape= "LED";
-    };
-
-};
-
-// Aluminium Keyboard, ISO model (International, 110 keys)
-xkb_geometry "applealu_iso" {
-
-    width=       430;
-    height=      113.5;
-
-    baseColor=   "white";
-    labelColor=  "black";
-    xfont=       "-*-helvetica-medium-r-normal--*-80-*-*-*-*-iso8859-1";
-    description= "Aluminium Keyboard (ISO)";
-
-    shape "NORM" {
-        corner= 1,
-        { [  15.5,  15 ] }
-    };
-    shape "FUNC" {
-        corner= 1,
-        { [  16.1,   9 ] }
-    };
-    shape "FUNS" {
-        corner= 1,
-        { [  15.5,  9 ] }
-    };
-    shape "BKSP" {
-        corner= 1,
-        { [  24.5,  15 ] }
-    };
-    shape "TAB" {
-        corner= 1,
-        { [  24.5,  15 ] }
-    };
-    shape "RTRN" {
-        corner= 1,
-        { [   0,   0 ], [  15.5  ,   0 ], [  15.5  ,  33.5 ], [   5,  33.5 ],
-          [   5,  15 ], [   0,  15 ] }
-    };
-    shape "CAPS" {
-        corner= 1,
-        { [  29.5,  15 ] }
-    };
-    shape "LCTL" {
-        corner= 1,
-        { [  25,  18	 ] }
-    };
-    shape "LALT" {
-        corner= 1,
-        { [  20,  18 ] }
-    };
-    shape "LMTA" {
-        corner= 1,
-        { [  25,  18 ] }
-    };
-    shape "LFSH" {
-        corner= 1,
-        { [  20,  15 ] }
-    };
-    shape "RCTL" {
-        corner= 1,
-        { [  25,  18 ] }
-    };
-    shape "RALT" {
-        corner= 1,
-        { [  20,  18 ] }
-    };
-    shape "RMTA" {
-        corner= 1,
-        { [  25,  18 ] }
-    };
-    shape "RTSH" {
-        corner= 1,
-        { [  39,  15 ] }
-    };
-    shape "SPCE" {
-        corner= 1,
-        { [ 110.5,  18 ] }
-    };
-    shape "KP0" {
-        corner= 1,
-        { [  34.5,  18 ] }
-    };
-    shape "KPEN" {
-        corner= 1,
-        { [  15.5,  36.5 ] }
-    };
-    shape "KPDT" {
-        corner= 1,
-        { [  15.5,  18 ] }
-    };
-    shape "LED" { 
-        corner= 0.5,
-        { [   1.5,   1.5 ] }
-    };
-
-    section "Function" {
-        key.color= "white";
-        priority=  7;
-        top=       4.5;
-        left=      4.7;
-        width=     420.5;
-        height=    10;
-        row {
-            top=  0;
-            left= 0;
-            keys {
-                {  <ESC>, "FUNC",   0 },   { <FK01>, "FUNC",   3.6 },
-                { <FK02>, "FUNC",   3.5 }, { <FK03>, "FUNC",   3.6 },
-                { <FK04>, "FUNC",   3.5 }, { <FK05>, "FUNC",   3.6 },
-                { <FK06>, "FUNC",   3.5 }, { <FK07>, "FUNC",   3.6 },
-                { <FK08>, "FUNC",   3.5 }, { <FK09>, "FUNC",   3.6 },
-                { <FK10>, "FUNC",   3.5 }, { <FK11>, "FUNC",   3.6 },
-                { <FK12>, "FUNC",   3.5 }, { <I169>, "FUNC",   3.5 },
-                { <FK13>, "FUNS",  11.5 }, { <FK14>, "FUNS",   3.5 },
-                { <FK15>, "FUNS",   3.5 }, { <FK16>, "FUNS",  11.5 },
-                { <FK17>, "FUNS",   3.5 }, { <FK18>, "FUNS",   3.5 },
-                { <FK19>, "FUNS",   3.5 }
-            };
-        };
-    }; // End of "Function" section
-
-    section "Alpha" {
-        key.color= "white";
-        priority=  8;
-        top=       17;
-        left=      5;
-        width=     271.5;
-        height=    92;
-        row {
-            top=  0;
-            left= 0;
-            keys {
-                { <TLDE>, "NORM",   0 },   { <AE01>, "NORM",   3.5 },
-                { <AE02>, "NORM",   3.5 }, { <AE03>, "NORM",   3.5 },
-                { <AE04>, "NORM",   3.5 }, { <AE05>, "NORM",   3.5 },
-                { <AE06>, "NORM",   3.5 }, { <AE07>, "NORM",   3.5 },
-                { <AE08>, "NORM",   3.5 }, { <AE09>, "NORM",   3.5 },
-                { <AE10>, "NORM",   3.5 }, { <AE11>, "NORM",   3.5 },
-                { <AE12>, "NORM",   3.5 }, { <BKSP>, "BKSP",   3.5 }
-            };
-        };
-        row {
-            top=  18.5;
-            left= 0;
-            keys {
-                {  <TAB>, "TAB",   0 },   { <AD01>, "NORM",   3.5 },
-                { <AD02>, "NORM",   3.5 }, { <AD03>, "NORM",   3.5 },
-                { <AD04>, "NORM",   3.5 }, { <AD05>, "NORM",   3.5 },
-                { <AD06>, "NORM",   3.5 }, { <AD07>, "NORM",   3.5 },
-                { <AD08>, "NORM",   3.5 }, { <AD09>, "NORM",   3.5 },
-                { <AD10>, "NORM",   3.5 }, { <AD11>, "NORM",   3.5 },
-                { <AD12>, "NORM",   3.5 }, { <RTRN>, "RTRN",   3.5 }
-            };
-        };
-        row {
-            top=  37;
-            left= 0;
-            keys {
-                { <CAPS>, "CAPS",   0 },   { <AC01>, "NORM",   3.5 },
-                { <AC02>, "NORM",   3.5 }, { <AC03>, "NORM",   3.5 },
-                { <AC04>, "NORM",   3.5 }, { <AC05>, "NORM",   3.5 },
-                { <AC06>, "NORM",   3.5 }, { <AC07>, "NORM",   3.5 },
-                { <AC08>, "NORM",   3.5 }, { <AC09>, "NORM",   3.5 },
-                { <AC10>, "NORM",   3.5 }, { <AC11>, "NORM",   3.5 },
-                { <BKSL>, "NORM",   3.5 }
-            };
-        };
-        row {
-            top=  55.5;
-            left= 0;
-            keys {
-                { <LFSH>, "LFSH",   0 },   { <LSGT>, "NORM",   3.5 },
-                { <AB01>, "NORM",   3.5 }, { <AB02>, "NORM",   3.5 },
-                { <AB03>, "NORM",   3.5 }, { <AB04>, "NORM",   3.5 },
-                { <AB05>, "NORM",   3.5 }, { <AB06>, "NORM",   3.5 },
-                { <AB07>, "NORM",   3.5 }, { <AB08>, "NORM",   3.5 },
-                { <AB09>, "NORM",   3.5 }, { <AB10>, "NORM",   3.5 },
-                { <RTSH>, "RTSH",   3.5 }
-            };
-        };
-        row {
-            top=  74;
-            left= 0;
-            keys {
-                { <LCTL>, "LCTL",   0 },   { <LALT>, "LALT",   3.5 },
-                { <LMTA>, "LMTA",   3.5 }, { <SPCE>, "SPCE",   3.5 },
-                { <RMTA>, "RMTA",   3.5 }, { <RALT>, "RALT",   3.5 },
-                { <RCTL>, "RCTL",   3.5 }
-            };
-        };
-    }; // End of "Alpha" section
-
-    section "Editing" {
-        key.color= "white";
-        priority=  9;
-        top=       17;
-        left=      287.7;
-        width=     53.5;
-        height=    92;
-        row {
-            top=  0;
-            left= 0;
-            keys {
-                {  <INS>, "NORM",   0 },  { <HOME>, "NORM",   3.5 },
-                { <PGUP>, "NORM",   3.5 }
-            };
-        };
-        row {
-            top=  18.5;
-            left= 0;
-            keys {
-                { <DELE>, "NORM",   0 },  {  <END>, "NORM",   3.5 },
-                { <PGDN>, "NORM",   3.5 }
-            };
-        };
-        row {
-            top=  58.5;
-            left= 19;
-            keys {
-                {   <UP>, "NORM",   0 }
-            };
-        };
-        row {
-            top=  77;
-            left= 0;
-            keys {
-                { <LEFT>, "NORM",   0 },  { <DOWN>, "NORM",   3.5 },
-                { <RGHT>, "NORM",   3.5 }
-            };
-        };
-    }; // End of "Editing" section
-
-    section "Keypad" {
-        key.color= "white";
-        priority=  10;
-        top=       17;
-        left=      352.7;
-        width=     72.5;
-        height=    92;
-        row {
-            top=  0;
-            left= 0;
-            keys {
-                { <NMLK>, "NORM",   0 },   { <KPEQ>, "NORM",   3.5 },
-                { <KPDV>, "NORM",   3.5 }, { <KPMU>, "NORM",   3.5 }
-            };
-        };
-        row {
-            top=  18.5;
-            left= 0;
-            keys {
-                {  <KP7>, "NORM",   0 },   {  <KP8>, "NORM",   3.5 },
-                {  <KP9>, "NORM",   3.5 }, { <KPSU>, "NORM",   3.5 }
-            };
-        };
-        row {
-            top=  37;
-            left= 0;
-            keys {
-                {  <KP4>, "NORM",   0 },   {  <KP5>, "NORM",   3.5 },
-                {  <KP6>, "NORM",   3.5 }, { <KPAD>, "NORM",   3.5 }
-            };
-        };
-        row {
-            top=  55.5;
-            left= 0;
-            keys {
-                {  <KP1>, "NORM",   0 },   {  <KP2>, "NORM",   3.5 },
-                {  <KP3>, "NORM",   3.5 }, { <KPEN>, "KPEN",   3.5 }
-            };
-        };
-        row {
-            top=  74;
-            left= 0;
-            keys {
-                {  <KP0>, "KP0",   0 }, { <KPDL>, "KPDT",   3.5 }
-            };
-        };
-    }; // End of "Keypad" section
-
-    indicator "Caps Lock" {
-        top=      56;
-        left=     6.7;
-        priority= 2;
-        onColor= "green";
-        offColor= "gray";
-        shape= "LED";
-    };
-
-};
-
-// Aluminium Keyboard, JIS model (Japanese, 112 keys)
-xkb_geometry "applealu_jis" {
-
-    width=       430;
-    height=      113.5;
-
-    baseColor=   "white";
-    labelColor=  "black";
-    xfont=       "-*-helvetica-medium-r-normal--*-80-*-*-*-*-iso8859-1";
-    description= "Aluminium Keyboard (JIS)";
-
-    shape "NORM" {
-        corner= 1,
-        { [  15.5,  15 ] }
-    };
-    shape "FUNC" {
-        corner= 1,
-        { [  16.1,   9 ] }
-    };
-    shape "FUNS" {
-        corner= 1,
-        { [  15.5,  9 ] }
-    };
-    shape "KEY1" {
-        corner= 1,
-        { [  24.5,  15 ] }
-    };
-    shape "BKSP" {
-        corner= 1,
-        { [  15.5,  15 ] }
-    };
-    shape "TAB" {
-        corner= 1,
-        { [  15.5,  15 ] }
-    };
-    shape "RTRN" {
-        corner= 1,
-        { [   0,   0 ], [  24.5  ,   0 ], [  24.5  ,  33.5 ], [   4.5,  33.5 ],
-          [   4.5,  15 ], [   0,  15 ] }
-    };
-    shape "CAPS" {
-        corner= 1,
-        { [  35,  18 ] }
-    };
-    shape "LCTL" {
-        corner= 1,
-        { [  20,  15 ] }
-    };
-    shape "LALT" {
-        corner= 1,
-        { [  27,  18 ] }
-    };
-    shape "LMTA" {
-        corner= 1,
-        { [  27,  18 ] }
-    };
-    shape "LFSH" {
-        corner= 1,
-        { [  29.5,  15 ] }
-    };
-    shape "EISU" {
-        corner= 1,
-        { [  20,  18 ] }
-    };
-    shape "RCTL" {
-        corner= 1,
-        { [  27,  18 ] }
-    };
-    shape "RALT" {
-        corner= 1,
-        { [  27,  18 ] }
-    };
-    shape "RMTA" {
-        corner= 1,
-        { [  27,  18 ] }
-    };
-    shape "RTSH" {
-        corner= 1,
-        { [  29.5,  15 ] }
-    };
-    shape "KANA" {
-        corner= 1,
-        { [  20,  18 ] }
-    };
-    shape "SPCE" {
-        corner= 1,
-        { [ 64,  18 ] }
-    };
-    shape "KPDT" {
-        corner= 1,
-        { [  15.5,  18 ] }
-    };
-    shape "KPEN" {
-        corner= 1,
-        { [  15.5,  36.5 ] }
-    };
-    shape "LED" { 
-        corner= 0.5,
-        { [   1.5,   1.5 ] }
-    };
-
-    section "Function" {
-        key.color= "white";
-        priority=  7;
-        top=       4.5;
-        left=      4.7;
-        width=     420.5;
-        height=    10;
-        row {
-            top=  0;
-            left= 0;
-            keys {
-                {  <ESC>, "FUNC",   0 }, { <FK01>, "FUNC",   3.6 },
-                { <FK02>, "FUNC",   3.5 }, { <FK03>, "FUNC",   3.6 },
-                { <FK04>, "FUNC",   3.5 }, { <FK05>, "FUNC",   3.6 },
-                { <FK06>, "FUNC",   3.5 }, { <FK07>, "FUNC",   3.6 },
-                { <FK08>, "FUNC",   3.5 }, { <FK09>, "FUNC",   3.6 },
-                { <FK10>, "FUNC",   3.5 }, { <FK11>, "FUNC",   3.6 },
-                { <FK12>, "FUNC",   3.5 }, { <I169>, "FUNC",   3.5 },
-                { <FK13>, "FUNS",  11.5 }, { <FK14>, "FUNS",   3.5 },
-                { <FK15>, "FUNS",   3.5 }, { <FK16>, "FUNS",  11.5 },
-                { <FK17>, "FUNS",   3.5 }, { <FK18>, "FUNS",   3.5 },
-                { <FK19>, "FUNS",   3.5 }
-            };
-        };
-    }; // End of "Function" section
-
-    section "Alpha" {
-        key.color= "white";
-        priority=  8;
-        top=       17;
-        left=      5;
-        width=     271.5;
-        height=    92;
-        row {
-            top=  0;
-            left= 0;
-            keys {
-                { <AE01>, "KEY1",   0 },
-                { <AE02>, "NORM",   3.5 }, { <AE03>, "NORM",   3.5 },
-                { <AE04>, "NORM",   3.5 }, { <AE05>, "NORM",   3.5 },
-                { <AE06>, "NORM",   3.5 }, { <AE07>, "NORM",   3.5 },
-                { <AE08>, "NORM",   3.5 }, { <AE09>, "NORM",   3.5 },
-                { <AE10>, "NORM",   3.5 }, { <AE11>, "NORM",   3.5 },
-                { <AE12>, "NORM",   3.5 }, { <AE13>, "NORM",   3.5 },
-                { <BKSP>, "BKSP",   3.5 }
-            };
-        };
-        row {
-            top=  18.5;
-            left= 0;
-            keys {
-                {  <TAB>,  "TAB",   0 },   { <AD01>, "NORM",   3.5 },
-                { <AD02>, "NORM",   3.5 }, { <AD03>, "NORM",   3.5 },
-                { <AD04>, "NORM",   3.5 }, { <AD05>, "NORM",   3.5 },
-                { <AD06>, "NORM",   3.5 }, { <AD07>, "NORM",   3.5 },
-                { <AD08>, "NORM",   3.5 }, { <AD09>, "NORM",   3.5 },
-                { <AD10>, "NORM",   3.5 }, { <AD11>, "NORM",   3.5 },
-                { <AD12>, "NORM",   3.5 }, { <RTRN>, "RTRN",   3.5 }
-            };
-        };
-        row {
-            top=  37;
-            left= 0;
-            keys {
-                { <LCTL>, "LCTL",   0 },   { <AC01>, "NORM",   3.5 },
-                { <AC02>, "NORM",   3.5 }, { <AC03>, "NORM",   3.5 },
-                { <AC04>, "NORM",   3.5 }, { <AC05>, "NORM",   3.5 },
-                { <AC06>, "NORM",   3.5 }, { <AC07>, "NORM",   3.5 },
-                { <AC08>, "NORM",   3.5 }, { <AC09>, "NORM",   3.5 },
-                { <AC10>, "NORM",   3.5 }, { <AC11>, "NORM",   3.5 },
-                { <AC12>, "NORM",   3.5 }
-            };
-        };
-        row {
-            top=  55.5;
-            left= 0;
-            keys {
-                { <LFSH>, "LFSH",   0 }, 
-                { <AB01>, "NORM",   3.5 }, { <AB02>, "NORM",   3.5 },
-                { <AB03>, "NORM",   3.5 }, { <AB04>, "NORM",   3.5 },
-                { <AB05>, "NORM",   3.5 }, { <AB06>, "NORM",   3.5 },
-                { <AB07>, "NORM",   3.5 }, { <AB08>, "NORM",   3.5 },
-                { <AB09>, "NORM",   3.5 }, { <AB10>, "NORM",   3.5 },
-                { <AB11>, "NORM",   3.5 }, { <RTSH>, "RTSH",   3.5 }
-            };
-        };
-        row {
-            top=  74;
-            left= 0;
-            keys {
-                { <LALT>, "LALT",   0 },   { <LMTA>, "LMTA",   3.5 },
-                { <EISU>, "EISU",   3.5 }, { <SPCE>, "SPCE",   3.5 },
-                { <KANA>, "KANA",   3.5 }, { <RMTA>, "RMTA",   3.5 },
-                { <RALT>, "RALT",   3.5 }, { <CAPS>, "CAPS",   3.5 }
-            };
-        };
-    }; // End of "Alpha" section
-
-    section "Editing" {
-        key.color= "white";
-        priority=  9;
-        top=       17;
-        left=      287.7;
-        width=     53.5;
-        height=    92;
-        row {
-            top=  0;
-            left= 0;
-            keys {
-                {  <INS>, "NORM",   0 },  { <HOME>, "NORM",   3.5 },
-                { <PGUP>, "NORM",   3.5 }
-            };
-        };
-        row {
-            top=  18.5;
-            left= 0;
-            keys {
-                { <DELE>, "NORM",   0 }, {  <END>, "NORM",   3.5 },
-                { <PGDN>, "NORM",   3.5 }
-            };
-        };
-        row {
-            top=  58.5;
-            left= 19;
-            keys {
-                {   <UP>, "NORM",   0 }
-            };
-        };
-        row {
-            top=  77;
-            left= 0;
-            keys {
-                { <LEFT>, "NORM",   0 },  { <DOWN>, "NORM",   3.5 },
-                { <RGHT>, "NORM",   3.5 }
-            };
-        };
-    }; // End of "Editing" section
-
-    section "Keypad" {
-        key.color= "white";
-        priority=  10;
-        top=       17;
-        left=      352.7;
-        width=     72.5;
-        height=    92;
-        row {
-            top=  0;
-            left= 0;
-            keys {
-                { <NMLK>, "NORM",   0 },   { <KPEQ>, "NORM",   3.5 },
-                { <KPDV>, "NORM",   3.5 }, { <KPMU>, "NORM",   3.5 }
-            };
-        };
-        row {
-            top=  18.5;
-            left= 0;
-            keys {
-                {  <KP7>, "NORM",   0 },   {  <KP8>, "NORM",   3.5 },
-                {  <KP9>, "NORM",   3.5 }, { <KPSU>, "NORM",   3.5 }
-            };
-        };
-        row {
-            top=  37;
-            left= 0;
-            keys {
-                {  <KP4>, "NORM",   0 },   {  <KP5>, "NORM",   3.5 },
-                {  <KP6>, "NORM",   3.5 }, { <KPAD>, "NORM",   3.5 }
-            };
-        };
-        row {
-            top=  55.5;
-            left= 0;
-            keys {
-                {  <KP1>, "NORM",   0 },   {  <KP2>, "NORM",   3.5 },
-                {  <KP3>, "NORM",   3.5 }, { <KPEN>, "KPEN",   3.5 }
-            };
-        };
-        row {
-            top=  74;
-            left= 0;
-            keys {
-                {  <KP0>, "KPDT",   0 },  { <JPCM>, "KPDT",   3.5 },
-                { <KPDL>, "KPDT",   3.5 }
-            };
-        };
-    }; // End of "Keypad" section
-
-    indicator "Caps Lock" {
-        top=      93;
-        left=     273.2;
-        priority= 2;
-        onColor= "green";
-        offColor= "gray";
-        shape= "LED";
-    };
-
-};
+//
+// Some modifications (<eqdar@castalie.org>) :
+// - Added a <LSGT> key
+// - Fixed the shape of the <RTRN> key
+// - Moved <BKSL> to the 'AC' row
+// - Added a special Macintosh sysctl key
+// - Minor changes (Function keys shape, LED position...)
+
+// Minor changes
+// - Mail address above is no longer valid
+// - Changed {L,R}MTA to {L,R}WIN, which are defined
+// 2005/10 -- Simon Vallet <svallet@gmail.com>
+
+default xkb_geometry "macintosh" {
+
+    description= "Apple Extended Keyboard II";
+    width = 475;
+    height = 194;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "TLDE" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "BKSP" { { [ 33,18] }, { [2,1], [ 31,17] } };
+    shape "TAB"  { { [ 33,18] }, { [2,1], [ 31,17] } };
+    shape "RTRN" { 
+        { [0,0],[23,0],[23,37],[4,37],[4,18],[0,18] }, 
+        { [2,1],[21,1],[21,36],[6,36],[6,17],[2,17] } };
+    shape "CAPS" { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "LCTL" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "LALT" { { [ 22,18] }, { [2,1], [ 20,17] } };
+    shape "LMTA" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "LFSH" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "RCTL" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "RALT" { { [ 22,18] }, { [2,1], [ 20,17] } };
+    shape "RMTA" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "RTSH" { { [ 47,18] }, { [2,1], [ 45,17] } };
+    shape "SPCE" { { [123,18] }, { [2,1], [121,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
+    // Macintosh keyboards have a special sysctl key at the top right
+    shape "AAPL" { 
+        { [ 0,0], [ 18,0], [ 18,18], [ 0,18] },
+        { [ 1,1], [ 17,1], [ 17,17], [ 1,17] },
+        { [ 8,5], [ 8,12], [  2,9] } };
+
+    shape "LEDS" { cornerRadius = 0, { [ 55,19] } };
+    shape "LED"  { cornerRadius = 0, { [  8, 2] } };
+
+    solid "LedPanel" {
+	shape= "LEDS";
+        top = 48;
+        left = 378;
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top = 50;
+    indicator.shape= "LED";
+    indicator "NumLock"    { left = 381; };
+    indicator "CapsLock"   { left = 398; };
+    indicator "ScrollLock" { left = 415; };
+    text.top= 55;
+    text.color= "black";
+    text "NumLockLabel"    { left = 381; text = "Num\nLock";    };
+    text "CapsLockLabel"   { left = 398; text = "Caps\nLock";   };
+    text "ScrollLockLabel" { left = 415; text = "Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+
+    section "Function" {
+        top = 48;
+	row {
+	    top= 1;
+            keys { <ESC>, 
+                   { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
+                   { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+                   { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+                   { <PRSC>, 10 }, <SCLK>, <PAUS>,
+                   // This is the sysctl key on macintosh keyboards
+                   // keycode is 222 with a 4.21 kernel, which is <I5E>
+                   { <I5E>, "AAPL", 67 }
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+        top = 87;
+	row {
+	    top= 1;
+            keys { { <TLDE>, "TLDE" }, <AE01>, <AE02>, <AE03>,
+                   <AE04>, <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TAB" },  <AD01>, <AD02>, <AD03>,
+                   <AD04>, <AD05>, <AD06>, <AD07>, <AD08>, <AD09>,
+                   <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS" }, <AC01>, <AC02>, <AC03>,
+                   <AC04>, <AC05>, <AC06>, <AC07>, <AC08>, <AC09>,
+                   <AC10>, <AC11>, <BKSL>
+	    };
+	};
+	row {
+	    top= 58;
+            keys { { <LFSH>, "LFSH" }, <LSGT>, <AB01>, <AB02>,
+                   <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>,
+                   <AB09>, <AB10>, { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { { <LCTL>, "LCTL" }, { <LALT>, "LALT" },
+                   { <LWIN>, "LMTA" },
+                   { <SPCE>, "SPCE" }, 
+                   { <RWIN>, "RMTA" },
+	           { <RALT>, "RALT" }, { <RCTL>, "RCTL" }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+        top = 87;
+        left = 314;
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    // Begin of "Keypad" section
+    section "Keypad" {
+        top = 87;
+        left = 380;
+	row {
+	    top= 1;
+            keys { <NMLK>, <KPEQ>, <KPDV>, <KPMU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" },  <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+}; // End of "default" geometry
+
+
+// This section describes the geometry of the "Apple Pro" keyboard
+// included with NewWorld desktop machines
+//
+// It adds four new keysyms, labeled SDDN, SDUP, SDNO, EJCT.
+//
+// 2005/10 -- Simon Vallet <svallet@gmail.com>
+
+xkb_geometry "applepro" {
+
+    description= "Apple Pro Keyboard";
+    width = 455;
+    height = 150;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18, 18] }, { [2, 1], [ 16, 15] } };
+    shape "FUNC" { { [ 18, 21] }, { [2, 1], [ 16, 16] } };
+    shape "BKSP" { { [ 38, 18] }, { [2, 1], [ 36, 15] } };
+    shape "TAB"  { { [ 29, 18] }, { [2, 1], [ 26, 15] } };
+    shape "LFSH" { { [ 28, 18] }, { [2, 1], [ 26, 15] } };
+    shape "RTSH" { { [ 47, 18] }, { [2, 1], [ 45, 15] } };
+
+    shape "RTRN" {
+        { [0,0],[27,0],[27,37],[4,37],[4,18],[0,18] }, 
+        { [2,1],[25,1],[25,34],[6,34],[6,15],[2,15] } };
+
+    shape "CAPS" { { [ 32, 18] }, { [2, 1], [ 26, 15] } };
+    shape "LCTL" { { [ 28, 20] }, { [2, 1], [ 26, 17] } };
+    shape "RCTL" { { [ 28, 20] }, { [2, 1], [ 26, 17] } };
+    shape "LALT" { { [ 23, 20] }, { [2, 1], [ 21, 17] } };
+    shape "RALT" { { [ 23, 20] }, { [2, 1], [ 21, 17] } };
+    shape "LMTA" { { [ 28, 20] }, { [2, 1], [ 26, 17] } };
+    shape "RMTA" { { [ 28, 20] }, { [2, 1], [ 26, 17] } };
+    shape "SPCE" { { [121, 20] }, { [3, 1], [118, 17] } };
+    shape "BOTM" { { [ 18, 20] }, { [2, 1], [ 16, 17] } }; 
+
+    shape "KP0"  { { [ 37, 20] }, { [2, 1], [ 35, 17] } };
+    shape "KPEN" { { [ 18, 39] }, { [2, 1], [ 16, 36] } };
+
+    section.left = 7;
+    row.left = 1;
+    key.gap =  1;
+    key.shape = "NORM";
+
+    section "Function" {
+       key.shape = "FUNC";
+        top = 26;
+       row {
+           top= 1;
+            keys { <ESC>, 
+                   { <FK01>, 14 }, <FK02>, <FK03>, <FK04>,
+                   { <FK05>, 14 }, <FK06>, <FK07>, <FK08>,
+                   { <FK09>, 14 }, <FK10>, <FK11>, <FK12>,
+                   { <PRSC>, 11 }, <SCLK>, <PAUS>,
+                  { <SDDN>, 11 }, <SDUP>, <SDNO>, <EJCT>
+            };
+       };
+    }; // End of "Function" section
+
+
+    section "Alpha" {
+        top = 48;
+       row {
+           top= 1;
+            keys { <TLDE>, <AE01>, <AE02>, <AE03>,
+                   <AE04>, <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+                  <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
+           };
+       };
+       row {
+           top= 20;
+           keys { { <TAB>, "TAB" },  <AD01>, <AD02>, <AD03>,
+                   <AD04>, <AD05>, <AD06>, <AD07>, <AD08>, <AD09>,
+                   <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN" }
+           };
+       };
+       row {
+           top= 39;
+           keys { { <CAPS>, "CAPS" }, <AC01>, <AC02>, <AC03>,
+                   <AC04>, <AC05>, <AC06>, <AC07>, <AC08>, <AC09>,
+                   <AC10>, <AC11>, <BKSL>
+           };
+       };
+       row {
+           top= 58;
+           keys { { <LFSH>, "LFSH" }, <LSGT>, <AB01>, <AB02>,
+                   <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>,
+                   <AB09>, <AB10>, { <RTSH>, "RTSH" }
+           };
+       };
+       row {
+           top= 77;
+           keys { { <LCTL>, "LCTL" }, { <LALT>, "LALT" },
+                       { <LWIN>, "LMTA" },
+                       { <SPCE>, "SPCE" }, 
+                       { <RWIN>, "RMTA" },
+                       { <RALT>, "RALT" }, { <RCTL>, "RCTL" }
+           };
+       };
+    }; // End of "Alpha" section
+
+    section "Editing" {
+        top = 48;
+        left = 303;
+       row {
+           top= 1;
+           keys { <INS>, <HOME>, <PGUP> };
+       };
+        row {
+           top= 20;
+           keys { <DELE>, <END>, <PGDN> };
+       };
+       row {
+           top= 58;
+           left= 20;
+           keys { <UP> };
+       };
+       row {
+           top= 77;
+           key.shape = "BOTM";
+           keys { <LEFT>, <DOWN>, <RGHT> };
+       };
+    }; // End of "Editing" section
+
+    // Begin of "Keypad" section
+    section "Keypad" {
+        top = 48;
+        left = 370;
+       row {
+           top= 1;
+            keys { <NMLK>, <KPEQ>, <KPDV>, <KPMU> };
+       };
+       row {
+           top= 20;
+           keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+       };
+       row {
+           top= 39;
+           keys { <KP4>, <KP5>, <KP6>, <KPAD> };
+       };
+       row {
+           top= 58;
+           keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN" } };
+       };
+       row {
+           top= 77;
+           keys { { <KP0>, "KP0" },  { <KPDL>, "BOTM" } };
+       };
+    }; // End of "Keypad" section
+
+}; // End of "applepro" geometry
+
+xkb_geometry "macbook78" {
+
+    description= "Apple Laptop 78-key (US)";
+    width= 273;
+    height= 110;
+
+    shape.cornerRadius= 0;
+    shape "ESC"  { { [ 21,9] }, cornerRadius=1, { [0,1], [ 19,8] } };
+    shape "FUNC" { { [ 18,9] }, cornerRadius=1, { [2,1], [ 16,8] } };
+    shape "EJCT" { { [ 20,9] }, cornerRadius=1, { [2,1], [ 20,8] } };
+    shape "DEGR" { { [ 16,18] }, cornerRadius=1, { [0,2], [ 14,16] } };
+    shape "NORM" { { [ 18,18] }, cornerRadius=1, { [2,2], [ 16,16] } };
+    shape "BKSP" { { [ 25,18] }, cornerRadius=1, { [2,2], [ 25,16] } };
+    shape "TABK" { { [ 24,18] }, cornerRadius=1, { [0,2], [ 22,16] } };
+    shape "BKSL" { { [ 17,18] }, cornerRadius=1, { [2,2], [17,16] } };
+    shape "RTRN" { { [ 31,18] }, cornerRadius=1, { [2,2], [31,16] } };
+    shape "CAPS" { { [ 29,18] }, cornerRadius=1, { [0,2], [ 27,16] } };
+    shape "LFSH" { { [ 40,18] }, cornerRadius=1, { [0,2], [ 38,16] } };
+    shape "RTSH" { { [ 39,18] }, cornerRadius=1, { [2,2], [ 39,16] } };
+    shape "APPL" { { [ 23,18] }, cornerRadius=1, { [2,2], [ 21,16] } };
+    shape "SPCE" { { [ 94,18] }, cornerRadius=1, { [2,2], [ 92,16] } };
+    shape "ARRO" { { [ 17,9] }, cornerRadius=1, { [2,1], [ 15,8] } };
+
+    shape "LED"  { cornerRadius= 1, { [  2,  2 ] } };
+
+    indicator.onColor= "green";
+    indicator.offColor= "gray";
+    indicator.shape= "LED";
+    indicator "Num Lock"   { top=4; left= 119; };
+    indicator "Caps Lock"  { top=53; left= 4; };
+
+    section.left=0;
+    row.left= 1;
+    key.shape= "FUNC";
+    key.gap= 1;
+    section "Function" {
+	top= 0;
+	row {
+	    top= 1;
+	    keys {  {<ESC>, "ESC" },
+		    <FK01>, <FK02>, <FK03>, <FK04>,
+		    <FK05>, <FK06>, <FK07>, <FK08>,
+		    <FK09>, <FK10>, <FK11>, <FK12>,
+                    {<K6C>, "EJCT" }
+	    };
+	};
+    }; // End of "Function" section
+
+    key.shape= "NORM";
+    section "Alpha" {
+	top= 10;
+	row {
+	    top= 1;
+	    keys { {<TLDE>, "DEGR"},
+                   <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>,
+                   <AE09>, <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK"},
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, 
+                   { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, 
+                   { <RTRN>, "RTRN" }
+	    };
+        };
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH"},
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		   { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { {<FN>, "DEGR"}, 
+                   <LCTL>, <LALT>, 
+                   {<LMTA>, "APPL"},
+                   {<SPCE>, "SPCE" }, 
+                   {<RMTA>, "APPL"},
+                   <KPEN>
+	    };
+	};
+
+    }; // End of "Alpha" section
+
+    key.shape= "ARRO";
+    section "Editing" {
+        top = 86;
+        left = 217;
+	row {
+	    top= 1;
+	    left= 19;
+	    keys { <UP> };
+	};
+	row {
+	    top= 10;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+};
+
+xkb_geometry "macbook79" {
+
+    description= "Apple Laptop 79-key (Intl)";
+    width= 273;
+    height= 110;
+
+    shape.cornerRadius= 0;
+    shape "ESC"  { { [ 21,9] }, cornerRadius=1, { [0,1], [ 19,8] } };
+    shape "FUNC" { { [ 18,9] }, cornerRadius=1, { [2,1], [ 16,8] } };
+    shape "EJCT" { { [ 20,9] }, cornerRadius=1, { [2,1], [ 20,8] } };
+    shape "DEGR" { { [ 16,18] }, cornerRadius=1, { [0,2], [ 14,16] } };
+    shape "NORM" { { [ 18,18] }, cornerRadius=1, { [2,2], [ 16,16] } };
+    shape "BKSP" { { [ 25,18] }, cornerRadius=1, { [2,2], [ 25,16] } };
+    shape "TABK" { { [ 24,18] }, cornerRadius=1, { [0,2], [ 22,16] } };
+    shape "RTRN" { { [ 0,0], [17,0], [17,37], [5,37], [5, 18], [0,18], [0,0] },
+                   cornerRadius=1, 
+	           { [ 2,2], [15,2], [15,35], [7,35], [7, 16], [2,16] } 
+                 };
+    shape "CAPS" { { [ 29,18] }, cornerRadius=1, { [0,2], [ 27,16] } };
+    shape "LFSH" { { [ 21,18] }, cornerRadius=1, { [0,2], [ 19,16] } };
+    shape "RTSH" { { [ 39,18] }, cornerRadius=1, { [2,2], [ 39,16] } };
+    shape "APPL" { { [ 23,18] }, cornerRadius=1, { [2,2], [ 21,16] } };
+    shape "SPCE" { { [ 94,18] }, cornerRadius=1, { [2,2], [ 92,16] } };
+    shape "ARRO" { { [ 17,9] }, cornerRadius=1, { [2,1], [ 15,8] } };
+
+    shape "LED"  { cornerRadius= 1, { [  2,  2 ] } };
+
+    indicator.onColor= "green";
+    indicator.offColor= "gray";
+    indicator.shape= "LED";
+    indicator "Num Lock"   { top=4; left= 119; };
+    indicator "Caps Lock"  { top=53; left= 4; };
+
+    section.left=0;
+    row.left= 1;
+    key.shape= "FUNC";
+    key.gap= 1;
+    section "Function" {
+	top= 0;
+	row {
+	    top= 1;
+	    keys {  {<ESC>, "ESC" },
+		    <FK01>, <FK02>, <FK03>, <FK04>,
+		    <FK05>, <FK06>, <FK07>, <FK08>,
+		    <FK09>, <FK10>, <FK11>, <FK12>,
+                    {<K6C>, "EJCT" }
+	    };
+	};
+    }; // End of "Function" section
+
+    key.shape= "NORM";
+    section "Alpha" {
+	top= 10;
+	row {
+	    top= 1;
+	    keys { {<TLDE>, "DEGR"},
+                   <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>,
+                   <AE09>, <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK"},
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <BKSL>
+	    };
+        };
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH"},
+		   <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		   { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { {<FN>, "DEGR"}, 
+                   <LCTL>, <LALT>, 
+                   {<LWIN>, "APPL"},
+                   {<SPCE>, "SPCE" }, 
+                   {<RALT>, "APPL"},
+                   <KPEN>
+	    };
+	};
+
+    }; // End of "Alpha" section
+
+    key.shape= "ARRO";
+    section "Editing" {
+        top = 86;
+        left = 217;
+	row {
+	    top= 1;
+	    left= 19;
+	    keys { <UP> };
+	};
+	row {
+	    top= 10;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "default" geometry
+
+
+// Aluminium Keyboard, ANSI model (United States, 109 keys)
+xkb_geometry "applealu_ansi" {
+
+    width=       430;
+    height=      113.5;
+
+    baseColor=   "white";
+    labelColor=  "black";
+    xfont=       "-*-helvetica-medium-r-normal--*-80-*-*-*-*-iso8859-1";
+    description= "Aluminium Keyboard (ANSI)";
+
+    shape "NORM" {
+        corner= 1,
+        { [  15.5,  15 ] }
+    };
+    shape "FUNC" {
+        corner= 1,
+        { [  16.1,   9 ] }
+    };
+    shape "FUNS" {
+        corner= 1,
+        { [  15.5,  9 ] }
+    };
+    shape "BKSP" {
+        corner= 1,
+        { [  24.5,  15 ] }
+    };
+    shape "TAB" {
+        corner= 1,
+        { [  24.5,  15 ] }
+    };
+    shape "RTRN" {
+        corner= 1,
+        { [  29.5,  15 ] }
+    };
+    shape "CAPS" {
+        corner= 1,
+        { [  29.5,  15 ] }
+    };
+    shape "LCTL" {
+        corner= 1,
+        { [  25,  18	 ] }
+    };
+    shape "LALT" {
+        corner= 1,
+        { [  20,  18 ] }
+    };
+    shape "LMTA" {
+        corner= 1,
+        { [  25,  18 ] }
+    };
+    shape "LFSH" {
+        corner= 1,
+        { [  39,  15 ] }
+    };
+    shape "RCTL" {
+        corner= 1,
+        { [  25,  18 ] }
+    };
+    shape "RALT" {
+        corner= 1,
+        { [  20,  18 ] }
+    };
+    shape "RMTA" {
+        corner= 1,
+        { [  25,  18 ] }
+    };
+    shape "RTSH" {
+        corner= 1,
+        { [  39,  15 ] }
+    };
+    shape "SPCE" {
+        corner= 1,
+        { [ 110.5,  18 ] }
+    };
+    shape "KP0" {
+        corner= 1,
+        { [  34.5,  18 ] }
+    };
+    shape "KPEN" {
+        corner= 1,
+        { [  15.5,  36.5 ] }
+    };
+    shape "KPDT" {
+        corner= 1,
+        { [  15.5,  18 ] }
+    };
+    shape "LED" { 
+        corner= 0.5,
+        { [   1.5,   1.5 ] }
+    };
+
+    section "Function" {
+        key.color= "white";
+        priority=  7;
+        top=       4.5;
+        left=      4.7;
+        width=     420.5;
+        height=    10;
+        row {
+            top=  0;
+            left= 0;
+            keys {
+                {  <ESC>, "FUNC",   0 },   { <FK01>, "FUNC",   3.6 },
+                { <FK02>, "FUNC",   3.5 }, { <FK03>, "FUNC",   3.6 },
+                { <FK04>, "FUNC",   3.5 }, { <FK05>, "FUNC",   3.6 },
+                { <FK06>, "FUNC",   3.5 }, { <FK07>, "FUNC",   3.6 },
+                { <FK08>, "FUNC",   3.5 }, { <FK09>, "FUNC",   3.6 },
+                { <FK10>, "FUNC",   3.5 }, { <FK11>, "FUNC",   3.6 },
+                { <FK12>, "FUNC",   3.5 }, { <I169>, "FUNC",   3.5 },
+                { <FK13>, "FUNS",  11.5 }, { <FK14>, "FUNS",   3.5 },
+                { <FK15>, "FUNS",   3.5 }, { <FK16>, "FUNS",  11.5 },
+                { <FK17>, "FUNS",   3.5 }, { <FK18>, "FUNS",   3.5 },
+                { <FK19>, "FUNS",   3.5 }
+            };
+        };
+    }; // End of "Function" section
+
+    section "Alpha" {
+        key.color= "white";
+        priority=  8;
+        top=       17;
+        left=      5;
+        width=     271.5;
+        height=    92;
+        row {
+            top=  0;
+            left= 0;
+            keys {
+                { <TLDE>, "NORM",   0 },   { <AE01>, "NORM",   3.5 },
+                { <AE02>, "NORM",   3.5 }, { <AE03>, "NORM",   3.5 },
+                { <AE04>, "NORM",   3.5 }, { <AE05>, "NORM",   3.5 },
+                { <AE06>, "NORM",   3.5 }, { <AE07>, "NORM",   3.5 },
+                { <AE08>, "NORM",   3.5 }, { <AE09>, "NORM",   3.5 },
+                { <AE10>, "NORM",   3.5 }, { <AE11>, "NORM",   3.5 },
+                { <AE12>, "NORM",   3.5 }, { <BKSP>, "BKSP",   3.5 }
+            };
+        };
+        row {
+            top=  18.5;
+            left= 0;
+            keys {
+                {  <TAB>, "TAB",   0 },    { <AD01>, "NORM",   3.5 },
+                { <AD02>, "NORM",   3.5 }, { <AD03>, "NORM",   3.5 },
+                { <AD04>, "NORM",   3.5 }, { <AD05>, "NORM",   3.5 },
+                { <AD06>, "NORM",   3.5 }, { <AD07>, "NORM",   3.5 },
+                { <AD08>, "NORM",   3.5 }, { <AD09>, "NORM",   3.5 },
+                { <AD10>, "NORM",   3.5 }, { <AD11>, "NORM",   3.5 },
+                { <AD12>, "NORM",   3.5 }, { <BKSL>, "NORM",   3.5 }
+
+            };
+        };
+        row {
+            top=  37;
+            left= 0;
+            keys {
+                { <CAPS>, "CAPS",   0 },   { <AC01>, "NORM",   3.5 },
+                { <AC02>, "NORM",   3.5 }, { <AC03>, "NORM",   3.5 },
+                { <AC04>, "NORM",   3.5 }, { <AC05>, "NORM",   3.5 },
+                { <AC06>, "NORM",   3.5 }, { <AC07>, "NORM",   3.5 },
+                { <AC08>, "NORM",   3.5 }, { <AC09>, "NORM",   3.5 },
+                { <AC10>, "NORM",   3.5 }, { <AC11>, "NORM",   3.5 },
+		{ <RTRN>, "RTRN",   3.5 }
+            };
+        };
+        row {
+            top=  55.5;
+            left= 0;
+            keys {
+                { <LFSH>, "LFSH",   0 }, 
+                { <AB01>, "NORM",   3.5 }, { <AB02>, "NORM",   3.5 },
+                { <AB03>, "NORM",   3.5 }, { <AB04>, "NORM",   3.5 },
+                { <AB05>, "NORM",   3.5 }, { <AB06>, "NORM",   3.5 },
+                { <AB07>, "NORM",   3.5 }, { <AB08>, "NORM",   3.5 },
+                { <AB09>, "NORM",   3.5 }, { <AB10>, "NORM",   3.5 },
+                { <RTSH>, "RTSH",   3.5 }
+            };
+        };
+        row {
+            top=  74;
+            left= 0;
+            keys {
+                { <LCTL>, "LCTL",   0 },   { <LALT>, "LALT",   3.5 },
+                { <LMTA>, "LMTA",   3.5 }, { <SPCE>, "SPCE",   3.5 },
+                { <RMTA>, "RMTA",   3.5 }, { <RALT>, "RALT",   3.5 },
+                { <RCTL>, "RCTL",   3.5 }
+            };
+        };
+    }; // End of "Alpha" section
+
+    section "Editing" {
+        key.color= "white";
+        priority=  9;
+        top=       17;
+        left=      287.7;
+        width=     53.5;
+        height=    92;
+        row {
+            top=  0;
+            left= 0;
+            keys {
+                {  <INS>, "NORM",   0 },  { <HOME>, "NORM",   3.5 },
+                { <PGUP>, "NORM",   3.5 }
+            };
+        };
+        row {
+            top=  18.5;
+            left= 0;
+            keys {
+                { <DELE>, "NORM",   0 },  {  <END>, "NORM",   3.5 },
+                { <PGDN>, "NORM",   3.5 }
+            };
+        };
+        row {
+            top=  58.5;
+            left= 19;
+            keys {
+                {   <UP>, "NORM",   0 }
+            };
+        };
+        row {
+            top=  77;
+            left= 0;
+            keys {
+                { <LEFT>, "NORM",   0 },  { <DOWN>, "NORM",   3.5 },
+                { <RGHT>, "NORM",   3.5 }
+            };
+        };
+    }; // End of "Editing" section
+
+    section "Keypad" {
+        key.color= "white";
+        priority=  10;
+        top=       17;
+        left=      352.7;
+        width=     72.5;
+        height=    92;
+        row {
+            top=  0;
+            left= 0;
+            keys {
+                { <NMLK>, "NORM",   0 },   { <KPEQ>, "NORM",   3.5 },
+                { <KPDV>, "NORM",   3.5 }, { <KPMU>, "NORM",   3.5 }
+            };
+        };
+        row {
+            top=  18.5;
+            left= 0;
+            keys {
+                {  <KP7>, "NORM",   0 },   {  <KP8>, "NORM",   3.5 },
+                {  <KP9>, "NORM",   3.5 }, { <KPSU>, "NORM",   3.5 }
+            };
+        };
+        row {
+            top=  37;
+            left= 0;
+            keys {
+                {  <KP4>, "NORM",   0 },   {  <KP5>, "NORM",   3.5 },
+                {  <KP6>, "NORM",   3.5 }, { <KPAD>, "NORM",   3.5 }
+            };
+        };
+        row {
+            top=  55.5;
+            left= 0;
+            keys {
+                {  <KP1>, "NORM",   0 },   {  <KP2>, "NORM",   3.5 },
+                {  <KP3>, "NORM",   3.5 }, { <KPEN>, "KPEN",   3.5 }
+            };
+        };
+        row {
+            top=  74;
+            left= 0;
+            keys {
+                {  <KP0>, "KP0",   0 }, { <KPDL>, "KPDT",   3.5 }
+            };
+        };
+    }; // End of "Keypad" section
+
+    indicator "Caps Lock" {
+        top=      56;
+        left=     6.7;
+        priority= 2;
+        onColor= "green";
+        offColor= "gray";
+        shape= "LED";
+    };
+
+};
+
+// Aluminium Keyboard, ISO model (International, 110 keys)
+xkb_geometry "applealu_iso" {
+
+    width=       430;
+    height=      113.5;
+
+    baseColor=   "white";
+    labelColor=  "black";
+    xfont=       "-*-helvetica-medium-r-normal--*-80-*-*-*-*-iso8859-1";
+    description= "Aluminium Keyboard (ISO)";
+
+    shape "NORM" {
+        corner= 1,
+        { [  15.5,  15 ] }
+    };
+    shape "FUNC" {
+        corner= 1,
+        { [  16.1,   9 ] }
+    };
+    shape "FUNS" {
+        corner= 1,
+        { [  15.5,  9 ] }
+    };
+    shape "BKSP" {
+        corner= 1,
+        { [  24.5,  15 ] }
+    };
+    shape "TAB" {
+        corner= 1,
+        { [  24.5,  15 ] }
+    };
+    shape "RTRN" {
+        corner= 1,
+        { [   0,   0 ], [  15.5  ,   0 ], [  15.5  ,  33.5 ], [   5,  33.5 ],
+          [   5,  15 ], [   0,  15 ] }
+    };
+    shape "CAPS" {
+        corner= 1,
+        { [  29.5,  15 ] }
+    };
+    shape "LCTL" {
+        corner= 1,
+        { [  25,  18	 ] }
+    };
+    shape "LALT" {
+        corner= 1,
+        { [  20,  18 ] }
+    };
+    shape "LMTA" {
+        corner= 1,
+        { [  25,  18 ] }
+    };
+    shape "LFSH" {
+        corner= 1,
+        { [  20,  15 ] }
+    };
+    shape "RCTL" {
+        corner= 1,
+        { [  25,  18 ] }
+    };
+    shape "RALT" {
+        corner= 1,
+        { [  20,  18 ] }
+    };
+    shape "RMTA" {
+        corner= 1,
+        { [  25,  18 ] }
+    };
+    shape "RTSH" {
+        corner= 1,
+        { [  39,  15 ] }
+    };
+    shape "SPCE" {
+        corner= 1,
+        { [ 110.5,  18 ] }
+    };
+    shape "KP0" {
+        corner= 1,
+        { [  34.5,  18 ] }
+    };
+    shape "KPEN" {
+        corner= 1,
+        { [  15.5,  36.5 ] }
+    };
+    shape "KPDT" {
+        corner= 1,
+        { [  15.5,  18 ] }
+    };
+    shape "LED" { 
+        corner= 0.5,
+        { [   1.5,   1.5 ] }
+    };
+
+    section "Function" {
+        key.color= "white";
+        priority=  7;
+        top=       4.5;
+        left=      4.7;
+        width=     420.5;
+        height=    10;
+        row {
+            top=  0;
+            left= 0;
+            keys {
+                {  <ESC>, "FUNC",   0 },   { <FK01>, "FUNC",   3.6 },
+                { <FK02>, "FUNC",   3.5 }, { <FK03>, "FUNC",   3.6 },
+                { <FK04>, "FUNC",   3.5 }, { <FK05>, "FUNC",   3.6 },
+                { <FK06>, "FUNC",   3.5 }, { <FK07>, "FUNC",   3.6 },
+                { <FK08>, "FUNC",   3.5 }, { <FK09>, "FUNC",   3.6 },
+                { <FK10>, "FUNC",   3.5 }, { <FK11>, "FUNC",   3.6 },
+                { <FK12>, "FUNC",   3.5 }, { <I169>, "FUNC",   3.5 },
+                { <FK13>, "FUNS",  11.5 }, { <FK14>, "FUNS",   3.5 },
+                { <FK15>, "FUNS",   3.5 }, { <FK16>, "FUNS",  11.5 },
+                { <FK17>, "FUNS",   3.5 }, { <FK18>, "FUNS",   3.5 },
+                { <FK19>, "FUNS",   3.5 }
+            };
+        };
+    }; // End of "Function" section
+
+    section "Alpha" {
+        key.color= "white";
+        priority=  8;
+        top=       17;
+        left=      5;
+        width=     271.5;
+        height=    92;
+        row {
+            top=  0;
+            left= 0;
+            keys {
+                { <TLDE>, "NORM",   0 },   { <AE01>, "NORM",   3.5 },
+                { <AE02>, "NORM",   3.5 }, { <AE03>, "NORM",   3.5 },
+                { <AE04>, "NORM",   3.5 }, { <AE05>, "NORM",   3.5 },
+                { <AE06>, "NORM",   3.5 }, { <AE07>, "NORM",   3.5 },
+                { <AE08>, "NORM",   3.5 }, { <AE09>, "NORM",   3.5 },
+                { <AE10>, "NORM",   3.5 }, { <AE11>, "NORM",   3.5 },
+                { <AE12>, "NORM",   3.5 }, { <BKSP>, "BKSP",   3.5 }
+            };
+        };
+        row {
+            top=  18.5;
+            left= 0;
+            keys {
+                {  <TAB>, "TAB",   0 },   { <AD01>, "NORM",   3.5 },
+                { <AD02>, "NORM",   3.5 }, { <AD03>, "NORM",   3.5 },
+                { <AD04>, "NORM",   3.5 }, { <AD05>, "NORM",   3.5 },
+                { <AD06>, "NORM",   3.5 }, { <AD07>, "NORM",   3.5 },
+                { <AD08>, "NORM",   3.5 }, { <AD09>, "NORM",   3.5 },
+                { <AD10>, "NORM",   3.5 }, { <AD11>, "NORM",   3.5 },
+                { <AD12>, "NORM",   3.5 }, { <RTRN>, "RTRN",   3.5 }
+            };
+        };
+        row {
+            top=  37;
+            left= 0;
+            keys {
+                { <CAPS>, "CAPS",   0 },   { <AC01>, "NORM",   3.5 },
+                { <AC02>, "NORM",   3.5 }, { <AC03>, "NORM",   3.5 },
+                { <AC04>, "NORM",   3.5 }, { <AC05>, "NORM",   3.5 },
+                { <AC06>, "NORM",   3.5 }, { <AC07>, "NORM",   3.5 },
+                { <AC08>, "NORM",   3.5 }, { <AC09>, "NORM",   3.5 },
+                { <AC10>, "NORM",   3.5 }, { <AC11>, "NORM",   3.5 },
+                { <BKSL>, "NORM",   3.5 }
+            };
+        };
+        row {
+            top=  55.5;
+            left= 0;
+            keys {
+                { <LFSH>, "LFSH",   0 },   { <LSGT>, "NORM",   3.5 },
+                { <AB01>, "NORM",   3.5 }, { <AB02>, "NORM",   3.5 },
+                { <AB03>, "NORM",   3.5 }, { <AB04>, "NORM",   3.5 },
+                { <AB05>, "NORM",   3.5 }, { <AB06>, "NORM",   3.5 },
+                { <AB07>, "NORM",   3.5 }, { <AB08>, "NORM",   3.5 },
+                { <AB09>, "NORM",   3.5 }, { <AB10>, "NORM",   3.5 },
+                { <RTSH>, "RTSH",   3.5 }
+            };
+        };
+        row {
+            top=  74;
+            left= 0;
+            keys {
+                { <LCTL>, "LCTL",   0 },   { <LALT>, "LALT",   3.5 },
+                { <LMTA>, "LMTA",   3.5 }, { <SPCE>, "SPCE",   3.5 },
+                { <RMTA>, "RMTA",   3.5 }, { <RALT>, "RALT",   3.5 },
+                { <RCTL>, "RCTL",   3.5 }
+            };
+        };
+    }; // End of "Alpha" section
+
+    section "Editing" {
+        key.color= "white";
+        priority=  9;
+        top=       17;
+        left=      287.7;
+        width=     53.5;
+        height=    92;
+        row {
+            top=  0;
+            left= 0;
+            keys {
+                {  <INS>, "NORM",   0 },  { <HOME>, "NORM",   3.5 },
+                { <PGUP>, "NORM",   3.5 }
+            };
+        };
+        row {
+            top=  18.5;
+            left= 0;
+            keys {
+                { <DELE>, "NORM",   0 },  {  <END>, "NORM",   3.5 },
+                { <PGDN>, "NORM",   3.5 }
+            };
+        };
+        row {
+            top=  58.5;
+            left= 19;
+            keys {
+                {   <UP>, "NORM",   0 }
+            };
+        };
+        row {
+            top=  77;
+            left= 0;
+            keys {
+                { <LEFT>, "NORM",   0 },  { <DOWN>, "NORM",   3.5 },
+                { <RGHT>, "NORM",   3.5 }
+            };
+        };
+    }; // End of "Editing" section
+
+    section "Keypad" {
+        key.color= "white";
+        priority=  10;
+        top=       17;
+        left=      352.7;
+        width=     72.5;
+        height=    92;
+        row {
+            top=  0;
+            left= 0;
+            keys {
+                { <NMLK>, "NORM",   0 },   { <KPEQ>, "NORM",   3.5 },
+                { <KPDV>, "NORM",   3.5 }, { <KPMU>, "NORM",   3.5 }
+            };
+        };
+        row {
+            top=  18.5;
+            left= 0;
+            keys {
+                {  <KP7>, "NORM",   0 },   {  <KP8>, "NORM",   3.5 },
+                {  <KP9>, "NORM",   3.5 }, { <KPSU>, "NORM",   3.5 }
+            };
+        };
+        row {
+            top=  37;
+            left= 0;
+            keys {
+                {  <KP4>, "NORM",   0 },   {  <KP5>, "NORM",   3.5 },
+                {  <KP6>, "NORM",   3.5 }, { <KPAD>, "NORM",   3.5 }
+            };
+        };
+        row {
+            top=  55.5;
+            left= 0;
+            keys {
+                {  <KP1>, "NORM",   0 },   {  <KP2>, "NORM",   3.5 },
+                {  <KP3>, "NORM",   3.5 }, { <KPEN>, "KPEN",   3.5 }
+            };
+        };
+        row {
+            top=  74;
+            left= 0;
+            keys {
+                {  <KP0>, "KP0",   0 }, { <KPDL>, "KPDT",   3.5 }
+            };
+        };
+    }; // End of "Keypad" section
+
+    indicator "Caps Lock" {
+        top=      56;
+        left=     6.7;
+        priority= 2;
+        onColor= "green";
+        offColor= "gray";
+        shape= "LED";
+    };
+
+};
+
+// Aluminium Keyboard, JIS model (Japanese, 112 keys)
+xkb_geometry "applealu_jis" {
+
+    width=       430;
+    height=      113.5;
+
+    baseColor=   "white";
+    labelColor=  "black";
+    xfont=       "-*-helvetica-medium-r-normal--*-80-*-*-*-*-iso8859-1";
+    description= "Aluminium Keyboard (JIS)";
+
+    shape "NORM" {
+        corner= 1,
+        { [  15.5,  15 ] }
+    };
+    shape "FUNC" {
+        corner= 1,
+        { [  16.1,   9 ] }
+    };
+    shape "FUNS" {
+        corner= 1,
+        { [  15.5,  9 ] }
+    };
+    shape "KEY1" {
+        corner= 1,
+        { [  24.5,  15 ] }
+    };
+    shape "BKSP" {
+        corner= 1,
+        { [  15.5,  15 ] }
+    };
+    shape "TAB" {
+        corner= 1,
+        { [  15.5,  15 ] }
+    };
+    shape "RTRN" {
+        corner= 1,
+        { [   0,   0 ], [  24.5  ,   0 ], [  24.5  ,  33.5 ], [   4.5,  33.5 ],
+          [   4.5,  15 ], [   0,  15 ] }
+    };
+    shape "CAPS" {
+        corner= 1,
+        { [  35,  18 ] }
+    };
+    shape "LCTL" {
+        corner= 1,
+        { [  20,  15 ] }
+    };
+    shape "LALT" {
+        corner= 1,
+        { [  27,  18 ] }
+    };
+    shape "LMTA" {
+        corner= 1,
+        { [  27,  18 ] }
+    };
+    shape "LFSH" {
+        corner= 1,
+        { [  29.5,  15 ] }
+    };
+    shape "EISU" {
+        corner= 1,
+        { [  20,  18 ] }
+    };
+    shape "RCTL" {
+        corner= 1,
+        { [  27,  18 ] }
+    };
+    shape "RALT" {
+        corner= 1,
+        { [  27,  18 ] }
+    };
+    shape "RMTA" {
+        corner= 1,
+        { [  27,  18 ] }
+    };
+    shape "RTSH" {
+        corner= 1,
+        { [  29.5,  15 ] }
+    };
+    shape "KANA" {
+        corner= 1,
+        { [  20,  18 ] }
+    };
+    shape "SPCE" {
+        corner= 1,
+        { [ 64,  18 ] }
+    };
+    shape "KPDT" {
+        corner= 1,
+        { [  15.5,  18 ] }
+    };
+    shape "KPEN" {
+        corner= 1,
+        { [  15.5,  36.5 ] }
+    };
+    shape "LED" { 
+        corner= 0.5,
+        { [   1.5,   1.5 ] }
+    };
+
+    section "Function" {
+        key.color= "white";
+        priority=  7;
+        top=       4.5;
+        left=      4.7;
+        width=     420.5;
+        height=    10;
+        row {
+            top=  0;
+            left= 0;
+            keys {
+                {  <ESC>, "FUNC",   0 }, { <FK01>, "FUNC",   3.6 },
+                { <FK02>, "FUNC",   3.5 }, { <FK03>, "FUNC",   3.6 },
+                { <FK04>, "FUNC",   3.5 }, { <FK05>, "FUNC",   3.6 },
+                { <FK06>, "FUNC",   3.5 }, { <FK07>, "FUNC",   3.6 },
+                { <FK08>, "FUNC",   3.5 }, { <FK09>, "FUNC",   3.6 },
+                { <FK10>, "FUNC",   3.5 }, { <FK11>, "FUNC",   3.6 },
+                { <FK12>, "FUNC",   3.5 }, { <I169>, "FUNC",   3.5 },
+                { <FK13>, "FUNS",  11.5 }, { <FK14>, "FUNS",   3.5 },
+                { <FK15>, "FUNS",   3.5 }, { <FK16>, "FUNS",  11.5 },
+                { <FK17>, "FUNS",   3.5 }, { <FK18>, "FUNS",   3.5 },
+                { <FK19>, "FUNS",   3.5 }
+            };
+        };
+    }; // End of "Function" section
+
+    section "Alpha" {
+        key.color= "white";
+        priority=  8;
+        top=       17;
+        left=      5;
+        width=     271.5;
+        height=    92;
+        row {
+            top=  0;
+            left= 0;
+            keys {
+                { <AE01>, "KEY1",   0 },
+                { <AE02>, "NORM",   3.5 }, { <AE03>, "NORM",   3.5 },
+                { <AE04>, "NORM",   3.5 }, { <AE05>, "NORM",   3.5 },
+                { <AE06>, "NORM",   3.5 }, { <AE07>, "NORM",   3.5 },
+                { <AE08>, "NORM",   3.5 }, { <AE09>, "NORM",   3.5 },
+                { <AE10>, "NORM",   3.5 }, { <AE11>, "NORM",   3.5 },
+                { <AE12>, "NORM",   3.5 }, { <AE13>, "NORM",   3.5 },
+                { <BKSP>, "BKSP",   3.5 }
+            };
+        };
+        row {
+            top=  18.5;
+            left= 0;
+            keys {
+                {  <TAB>,  "TAB",   0 },   { <AD01>, "NORM",   3.5 },
+                { <AD02>, "NORM",   3.5 }, { <AD03>, "NORM",   3.5 },
+                { <AD04>, "NORM",   3.5 }, { <AD05>, "NORM",   3.5 },
+                { <AD06>, "NORM",   3.5 }, { <AD07>, "NORM",   3.5 },
+                { <AD08>, "NORM",   3.5 }, { <AD09>, "NORM",   3.5 },
+                { <AD10>, "NORM",   3.5 }, { <AD11>, "NORM",   3.5 },
+                { <AD12>, "NORM",   3.5 }, { <RTRN>, "RTRN",   3.5 }
+            };
+        };
+        row {
+            top=  37;
+            left= 0;
+            keys {
+                { <LCTL>, "LCTL",   0 },   { <AC01>, "NORM",   3.5 },
+                { <AC02>, "NORM",   3.5 }, { <AC03>, "NORM",   3.5 },
+                { <AC04>, "NORM",   3.5 }, { <AC05>, "NORM",   3.5 },
+                { <AC06>, "NORM",   3.5 }, { <AC07>, "NORM",   3.5 },
+                { <AC08>, "NORM",   3.5 }, { <AC09>, "NORM",   3.5 },
+                { <AC10>, "NORM",   3.5 }, { <AC11>, "NORM",   3.5 },
+                { <AC12>, "NORM",   3.5 }
+            };
+        };
+        row {
+            top=  55.5;
+            left= 0;
+            keys {
+                { <LFSH>, "LFSH",   0 }, 
+                { <AB01>, "NORM",   3.5 }, { <AB02>, "NORM",   3.5 },
+                { <AB03>, "NORM",   3.5 }, { <AB04>, "NORM",   3.5 },
+                { <AB05>, "NORM",   3.5 }, { <AB06>, "NORM",   3.5 },
+                { <AB07>, "NORM",   3.5 }, { <AB08>, "NORM",   3.5 },
+                { <AB09>, "NORM",   3.5 }, { <AB10>, "NORM",   3.5 },
+                { <AB11>, "NORM",   3.5 }, { <RTSH>, "RTSH",   3.5 }
+            };
+        };
+        row {
+            top=  74;
+            left= 0;
+            keys {
+                { <LALT>, "LALT",   0 },   { <LMTA>, "LMTA",   3.5 },
+                { <EISU>, "EISU",   3.5 }, { <SPCE>, "SPCE",   3.5 },
+                { <KANA>, "KANA",   3.5 }, { <RMTA>, "RMTA",   3.5 },
+                { <RALT>, "RALT",   3.5 }, { <CAPS>, "CAPS",   3.5 }
+            };
+        };
+    }; // End of "Alpha" section
+
+    section "Editing" {
+        key.color= "white";
+        priority=  9;
+        top=       17;
+        left=      287.7;
+        width=     53.5;
+        height=    92;
+        row {
+            top=  0;
+            left= 0;
+            keys {
+                {  <INS>, "NORM",   0 },  { <HOME>, "NORM",   3.5 },
+                { <PGUP>, "NORM",   3.5 }
+            };
+        };
+        row {
+            top=  18.5;
+            left= 0;
+            keys {
+                { <DELE>, "NORM",   0 }, {  <END>, "NORM",   3.5 },
+                { <PGDN>, "NORM",   3.5 }
+            };
+        };
+        row {
+            top=  58.5;
+            left= 19;
+            keys {
+                {   <UP>, "NORM",   0 }
+            };
+        };
+        row {
+            top=  77;
+            left= 0;
+            keys {
+                { <LEFT>, "NORM",   0 },  { <DOWN>, "NORM",   3.5 },
+                { <RGHT>, "NORM",   3.5 }
+            };
+        };
+    }; // End of "Editing" section
+
+    section "Keypad" {
+        key.color= "white";
+        priority=  10;
+        top=       17;
+        left=      352.7;
+        width=     72.5;
+        height=    92;
+        row {
+            top=  0;
+            left= 0;
+            keys {
+                { <NMLK>, "NORM",   0 },   { <KPEQ>, "NORM",   3.5 },
+                { <KPDV>, "NORM",   3.5 }, { <KPMU>, "NORM",   3.5 }
+            };
+        };
+        row {
+            top=  18.5;
+            left= 0;
+            keys {
+                {  <KP7>, "NORM",   0 },   {  <KP8>, "NORM",   3.5 },
+                {  <KP9>, "NORM",   3.5 }, { <KPSU>, "NORM",   3.5 }
+            };
+        };
+        row {
+            top=  37;
+            left= 0;
+            keys {
+                {  <KP4>, "NORM",   0 },   {  <KP5>, "NORM",   3.5 },
+                {  <KP6>, "NORM",   3.5 }, { <KPAD>, "NORM",   3.5 }
+            };
+        };
+        row {
+            top=  55.5;
+            left= 0;
+            keys {
+                {  <KP1>, "NORM",   0 },   {  <KP2>, "NORM",   3.5 },
+                {  <KP3>, "NORM",   3.5 }, { <KPEN>, "KPEN",   3.5 }
+            };
+        };
+        row {
+            top=  74;
+            left= 0;
+            keys {
+                {  <KP0>, "KPDT",   0 },  { <JPCM>, "KPDT",   3.5 },
+                { <KPDL>, "KPDT",   3.5 }
+            };
+        };
+    }; // End of "Keypad" section
+
+    indicator "Caps Lock" {
+        top=      93;
+        left=     273.2;
+        priority= 2;
+        onColor= "green";
+        offColor= "gray";
+        shape= "LED";
+    };
+
+};
diff --git a/xorg-server/xkeyboard-config/geometry/microsoft b/xorg-server/xkeyboard-config/geometry/microsoft
index 932db6c11..e7f8d7515 100644
--- a/xorg-server/xkeyboard-config/geometry/microsoft
+++ b/xorg-server/xkeyboard-config/geometry/microsoft
@@ -1,532 +1,532 @@
-default xkb_geometry "natural" {
-
-    // Approximate layout for a Microsoft Natural Keyboard
-    description= "Microsoft Natural Keyboard";
-    width= 550;
-    height= 190;
-
-    shape.cornerRadius= 1;
-    shape "LDEF" { { [ 18,18] }, { [2,1], [15,15] } };
-    shape "TABK" { { [ 26,18] }, { [2,1], [23,15] } }; 
-    shape "CAPS" { { [ 30,18] }, { [2,1], [23,15] } }; 
-    shape "LFSH" { { [ 41,18] }, { [2,1], [38,15] } };
-    shape "KEY6" { { [ 22,18] }, { [2,1], [15,15] } };
-    shape "KEYT" { { [ 33,18] }, { [2,1], [15,15] } };
-    shape "KEYG" { { [ 29,18] }, { [2,1], [15,15] } };
-    shape "LCTL" { 
-	approx= { [ 32, 22 ] },
-	{ [  0, 0], [ 32, 0 ], [ 32, 23 ], [ 0, 22 ] },
-	{ [  2, 1], [ 29, 1 ], [ 29, 17 ], [ 2, 15 ] } 
-    };
-    shape "LWIN" { 
-	approx= { [ 32, 23 ] },
-	{ [  0, 0], [ 32, 0 ], [ 32, 24 ], [ 0, 23 ] },
-	{ [  2, 1], [ 29, 1 ], [ 29, 18 ], [ 2, 17 ] } 
-    };
-    shape "LALT" { 
-	approx= { [ 32, 24 ] },
-	{ [  0, 0], [ 32, 0 ], [ 32, 25 ], [ 0, 24 ] },
-	{ [  2, 1], [ 29, 1 ], [ 29, 20 ], [ 2, 19 ] } 
-    };
-    shape "RDEF" { { [ 18,18] }, { [3,1], [15,15] } };
-    shape "KEY7" {	{ [ 28, 18 ] }, { [ 14, 1], [26, 15] } };
-    shape "KEYH" {	{ [ 24, 18 ] }, { [ 10, 1], [22, 15] } };
-    shape "KEYN" {	{ [ 32, 18 ] }, { [ 18, 1], [30, 15] } };
-    shape "BKSP" {	{ [ 41, 18 ] }, { [  3, 1], [39, 15] } };
-    shape "BKSL" {	{ [ 24, 18 ] }, { [  3, 1], [22, 15] } };
-    shape "RTRN" {	{ [ 37, 18 ] }, { [  3, 1], [35, 15] } };
-    shape "RTSH" {	{ [ 43, 18 ] }, { [  3, 1], [41, 15] } };
-    shape "RALT" { 
-	approx= { [ 27, 24 ] },
-	{ [  0, 0], [ 27, 0 ], [ 27, 24 ], [ 0, 25 ] },
-	{ [  3, 1], [ 25, 1 ], [ 25, 19 ], [ 3, 20 ] } 
-    };
-    shape "RWIN" { 
-	approx= { [ 27, 23 ] },
-	{ [  0, 0], [ 27, 0 ], [ 27, 23 ], [ 0, 24 ] },
-	{ [  3, 1], [ 25, 1 ], [ 25, 18 ], [ 3, 19 ] } 
-    };
-    shape "MENU" { 
-	approx= { [ 27, 21 ] },
-	{ [  0, 0], [ 27, 0 ], [ 27, 21 ], [ 0, 23 ] },
-	{ [  3, 1], [ 25, 1 ], [ 25, 16 ], [ 3, 17 ] } 
-    };
-    shape "RCTL" { 
-	approx= { [ 27, 19 ] },
-	{ [  0, 0], [ 27, 0 ], [ 27, 19 ], [ 0, 21 ] },
-	{ [  3, 1], [ 25, 1 ], [ 25, 14 ], [ 3, 15 ] } 
-    };
-    shape "KPAD" { { [ 18, 37 ] },	{ [ 3, 1 ], [ 16, 34 ] } };
-    shape "KP0"  { { [ 37, 18 ] },	{ [ 3, 1 ], [ 35, 15 ] } };
-    shape "SPCE" {
-	{ [  4, 3], [42,10], [44, 0], [88, 0], [90,10], [130, 3], 
-	  [134,26], [99,30], [67,33], [33,30], [  0,26] },
-	{ [  6, 4.5], [43,11], [45, 1], [87, 1], [89,11], [128, 4.5], 
-	  [131,23], [99,28], [67,32], [33,28], [  3,23] }
-    };
-
-    shape "EDGE" {
-	cornerRadius= 2,
-	{ [  25,   0 ],  [ 177,  17 ],  [ 329,   0 ], [ 542,   0 ],
-	  [ 542, 150 ],  [ 354, 150 ],  [ 177, 185 ], [   0, 150 ] }
-    };
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    row.left= 1;
-    key.shape= "LDEF";
-    key.gap=  1;
-    section "LeftFunction" {
-	top= 10;
-	left= 40;
-	angle= 10;
-	row {
-	    top= 1;
-	    keys {  <ESC>, { <FK01>, 12 }, <FK02>, <FK03>, <FK04>, <FK05> };
-	};
-    }; // End of "LeftFunction" section
-
-    section "LeftAlpha" {
-	top= 47;
-	left= 30;
-	angle= 10;
-	row {
-	    top= 1;
-	    keys {	<AE00>, <AE01>, <AE02>, <AE03>, <AE04>,
-			<AE05>, { <AE06>, "KEY6" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys {	{ <TAB>, "TABK" },
-			<AD01>, <AD02>, <AD03>, <AD04>, { <AD05>, "KEYT" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { 	{ <CAPS>, "CAPS" },
-			<AC01>, <AC02>, <AC03>, <AC04>, { <AC05>, "KEYG" }
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { 	{ <LFSH>, "LFSH" }, 
-			<AB01>, <AB02>, <AB03>, <AB04>, <AB05>
-	    };
-	};
-	row {
-	    top= 77;
-	    keys {  { <LCTL>, "LCTL" }, { <LWIN>, "LWIN" }, { <LALT>, "LALT" } };
-	};
-    }; // End of "LeftAlpha" section
-
-    key.shape= "RDEF";
-    section "RightFunction" {
-	top= 32;
-	left= 195;
-	angle= -10;
-	row {
-	    top= 1;
-	    left= 1;
-	    keys {  <FK06>, <FK07>, <FK08>, <FK09>, <FK10>, <FK11>, <FK12> };
-	};
-    }; // End of "RightFunction" section
-
-    section "RightAlpha" {
-	top= 71;
-	left= 190;
-	angle= -10;
-	row.left= 1;
-	row {
-	    top= 1;
-	    keys {	{ <AE07>, "KEY7" },
-			<AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
-			{ <BKSP>, "BKSP" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { 
-		<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>,
-		{ <BKSL>, "BKSL" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys {	{ <AC06>, "KEYH" },
-			<AC07>, <AC08>, <AC09>, <AC10>, <AC11>,
-			{ <RTRN>, "RTRN" }
-	    };
-	};
-	row {
-	    top= 58;
-	    keys {	{ <AB06>, "KEYN" },
-			<AB07>, <AB08>, <AB09>, <AB10>,
-			{ <RTSH>, "RTSH" }
-	    };
-	};
-	row {
-	    top= 77;
-	    left= 40;
-	    keys { 	{ <RALT>, "RALT" }, { <RWIN>, "RWIN" }, 
-			{ <MENU>, "MENU" }, { <RCTL>, "RCTL" }
-	    };
-	};
-    }; // End of "RightAlpha" section
-
-    section "SpaceBar" {
-	top= 139;
-	left= 111;
-	key.shape= "SPCE";
-	row { keys { <SPCE> }; };
-    };
-
-    section "Editing" {
-	top= 15;
-	left= 385;
-	row {
-	    top= 1;
-	    keys { <PRSC>, <SCLK>, <PAUS> };
-	};
-	row {
-	    top= 33;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-	row {
-	    top= 53;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 91;
-	    left= 20;
-	    keys { <UP> };
-    	};
-	row {
-	    top= 109;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    shape "LED"  { 
-	cornerRadius= 0,
-	{ [  3,  1 ] }
-    };
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.left= 177;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { top= 90; };
-    indicator "Caps Lock"    { top= 107; };
-    indicator "Scroll Lock"  { top= 127; };
-    
-    section "Keypad" {
-	top= 47;
-	left= 456;
-	row {
-	    top= 1;
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-};
-
-// Approximate layout for a Microsoft Natural(R) Keyboard Elite
-// 
-// Modified by Pavel Kurashov <pavell@mail.ru> Mon Oct  8 22:08:20 NOVST 2007
-//
-// * Function, editing and navigation keys are reduced height
-// * Navigation keys are repositioned in two column
-// * Leds are enlarged for better look
-// * "BKSP"  alligned with "BKSL" and "RTRN"
-// * Ouline Edges slightly modified
-//
-xkb_geometry "elite" {
-
-    // Approximate layout for a Microsoft Natural(R) Keyboard Elite
-    description= "Microsoft Natural(r) Keyboard Elite";
-    width= 495;
-    height= 190;
-
-    shape.cornerRadius= 1;
-    shape "LDEF" { { [ 18,18] }, { [2,1], [15,15] } };
-    shape "FKEY" { { [ 18,13] }, { [2,1], [15,10] } };
-    shape "TABK" { { [ 26,18] }, { [2,1], [23,15] } }; 
-    shape "CAPS" { { [ 30,18] }, { [2,1], [23,15] } }; 
-    shape "LFSH" { { [ 41,18] }, { [2,1], [38,15] } };
-    shape "KEY6" { { [ 22,18] }, { [2,1], [15,15] } };
-    shape "KEYT" { { [ 33,18] }, { [2,1], [15,15] } };
-    shape "KEYG" { { [ 29,18] }, { [2,1], [15,15] } };
-    shape "LCTL" { 
-	approx= { [ 32, 22 ] },
-	{ [  0, 0], [ 32, 0 ], [ 32, 23 ], [ 0, 22 ] },
-	{ [  2, 1], [ 29, 1 ], [ 29, 17 ], [ 2, 15 ] } 
-    };
-    shape "LWIN" { 
-	approx= { [ 32, 23 ] },
-	{ [  0, 0], [ 32, 0 ], [ 32, 24 ], [ 0, 23 ] },
-	{ [  2, 1], [ 29, 1 ], [ 29, 18 ], [ 2, 17 ] } 
-    };
-    shape "LALT" { 
-	approx= { [ 32, 24 ] },
-	{ [  0, 0], [ 32, 0 ], [ 32, 25 ], [ 0, 24 ] },
-	{ [  2, 1], [ 29, 1 ], [ 29, 20 ], [ 2, 19 ] } 
-    };
-    shape "RDEF" { 	{ [ 18,18  ] }, { [  2, 1], [15, 15] } };
-    shape "KEY7" {	{ [ 28, 18 ] }, { [ 14, 1], [26, 15] } };
-    shape "KEYH" {	{ [ 24, 18 ] }, { [ 10, 1], [22, 15] } };
-    shape "KEYN" {	{ [ 32, 18 ] }, { [ 18, 1], [30, 15] } };
-    shape "BKSP" {	{ [ 32, 18 ] }, { [  2, 1], [30, 15] } };
-    shape "BKSL" {	{ [ 24, 18 ] }, { [  2, 1], [22, 15] } };
-    shape "RTRN" {	{ [ 37, 18 ] }, { [  2, 1], [35, 15] } };
-    shape "RTSH" {	{ [ 43, 18 ] }, { [  2, 1], [41, 15] } };
-    shape "RALT" { 
-	approx= { [ 27, 24 ] },
-	{ [  0, 0], [ 27, 0 ], [ 27, 24 ], [ 0, 25 ] },
-	{ [  3, 1], [ 25, 1 ], [ 25, 19 ], [ 3, 20 ] } 
-    };
-    shape "RWIN" { 
-	approx= { [ 27, 23 ] },
-	{ [  0, 0], [ 27, 0 ], [ 27, 23 ], [ 0, 24 ] },
-	{ [  3, 1], [ 25, 1 ], [ 25, 18 ], [ 3, 19 ] } 
-    };
-    shape "MENU" { 
-	approx= { [ 27, 21 ] },
-	{ [  0, 0], [ 27, 0 ], [ 27, 21 ], [ 0, 23 ] },
-	{ [  3, 1], [ 25, 1 ], [ 25, 16 ], [ 3, 17 ] } 
-    };
-    shape "RCTL" { 
-	approx= { [ 27, 19 ] },
-	{ [  0, 0], [ 27, 0 ], [ 27, 19 ], [ 0, 21 ] },
-	{ [  3, 1], [ 25, 1 ], [ 25, 14 ], [ 3, 15 ] } 
-    };
-    shape "KPAD" { { [ 18, 37 ] },	{ [ 3, 1 ], [ 16, 34 ] } };
-    shape "KP0"  { { [ 37, 18 ] },	{ [ 3, 1 ], [ 35, 15 ] } };
-    shape "SPCE" {
-	{ [  4, 3], [42,10], [44, 0], [88, 0], [90,10], [130, 3], 
-	  [134,26], [99,30], [67,33], [33,30], [  0,26] },
-	{ [  6, 4.5], [43,11], [45, 1], [87, 1], [89,11], [128, 4.5], 
-	  [131,23], [99,28], [67,32], [33,28], [  3,23] }
-    };
-
-    shape "EDGE" {
-	cornerRadius= 3,
-	{ [  32,   15 ],  [140, 33],[ 220,  33 ],  [ 329,   15 ], [ 493,   15 ],
-	  [ 493, 150 ],  [ 354, 150 ],  [200, 180], [ 153, 180 ], [   7, 150 ] }
-    };
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    row.left= 1;
-    key.shape= "FKEY";
-    key.gap=  1;
-    section "LeftFunction" {
-	top= 26;
-	left= 40;
-	angle= 10;
-	row {
-	    top= 1;
-	    keys {  <ESC>, { <FK01>, 12 }, <FK02>, <FK03>, <FK04>, <FK05> };
-	};
-    }; // End of "LeftFunction" section
-
-    key.shape= "LDEF";
-    section "LeftAlpha" {
-	top= 47;
-	left= 30;
-	angle= 10;
-	row {
-	    top= 1;
-	    keys {	<TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
-			<AE05>, { <AE06>, "KEY6" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys {	{ <TAB>, "TABK" },
-			<AD01>, <AD02>, <AD03>, <AD04>, { <AD05>, "KEYT" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { 	{ <CAPS>, "CAPS" },
-			<AC01>, <AC02>, <AC03>, <AC04>, { <AC05>, "KEYG" }
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { 	{ <LFSH>, "LFSH" }, 
-			<AB01>, <AB02>, <AB03>, <AB04>, <AB05>
-	    };
-	};
-	row {
-	    top= 77;
-	    keys {  { <LCTL>, "LCTL" }, { <LWIN>, "LWIN" }, { <LALT>, "LALT" } };
-	};
-    }; // End of "LeftAlpha" section
-
-    key.shape= "FKEY";
-    section "RightFunction" {
-	top= 48;
-	left= 195;
-	angle= -10;
-	row {
-	    top= 1;
-	    left= 1;
-	    keys {  <FK06>, <FK07>, <FK08>, <FK09>, <FK10>, <FK11>, <FK12> };
-	};
-    }; // End of "RightFunction" section
-
-    key.shape= "RDEF";
-    section "RightAlpha" {
-	top= 71;
-	left= 190;
-	angle= -10;
-	row.left= 1;
-	row {
-	    top= 1;
-	    keys {	{ <AE07>, "KEY7" },
-			<AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
-			{ <BKSP>, "BKSP" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { 
-		<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>,
-		{ <BKSL>, "BKSL" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys {	{ <AC06>, "KEYH" },
-			<AC07>, <AC08>, <AC09>, <AC10>, <AC11>,
-			{ <RTRN>, "RTRN" }
-	    };
-	};
-	row {
-	    top= 58;
-	    keys {	{ <AB06>, "KEYN" },
-			<AB07>, <AB08>, <AB09>, <AB10>,
-			{ <RTSH>, "RTSH" }
-	    };
-	};
-	row {
-	    top= 77;
-	    left= 40;
-	    keys { 	{ <RALT>, "RALT" }, { <RWIN>, "RWIN" }, 
-			{ <MENU>, "MENU" }, { <RCTL>, "RCTL" }
-	    };
-	};
-    }; // End of "RightAlpha" section
-
-    section "SpaceBar" {
-	top= 139;
-	left= 111;
-	key.shape= "SPCE";
-	row { keys { <SPCE> }; };
-    };
-
-    section "Editing" {
-	key.shape="FKEY";
-	top= 23;
-	left= 348;
-	row {
-	    top= 0;
-	    keys { <PRSC>, <SCLK>, <PAUS> };
-	};
-	row {
-	    top= 22;
-	    left=20;	
-	    keys { <HOME>, <PGUP> };
-	};
-	row {
-	    top= 36;
-	    left=20;	
-	    keys {  <END>, <PGDN> };
-	};
-	row {
-	    top= 50;
-	    left=20;	
-	    keys { <DELE>, <INS> };
-	};
-	row {
-	    top= 75;
-	    left= 29;
-	    keys { <UP> };
-    	};
-	row {
-	    top= 89;
-	    left=20;	
-	    keys { <LEFT>, <RGHT> };
-	};
-	row {
-	    top= 103;
-	    left=29;	
-	    keys { <DOWN> };
-	};
-    }; // End of "Editing" section
-
-    shape "LED"  { 
-	cornerRadius= 1,
-	{ [  7,  2 ] }
-    };
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.left= 177;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { top= 90; };
-    indicator "Caps Lock"    { top= 107; };
-    indicator "Scroll Lock"  { top= 127; };
-    
-    section "Keypad" {
-	top= 44;
-	left= 412;
-	row {
-	    top= 1;
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-};
+default xkb_geometry "natural" {
+
+    // Approximate layout for a Microsoft Natural Keyboard
+    description= "Microsoft Natural Keyboard";
+    width= 550;
+    height= 190;
+
+    shape.cornerRadius= 1;
+    shape "LDEF" { { [ 18,18] }, { [2,1], [15,15] } };
+    shape "TABK" { { [ 26,18] }, { [2,1], [23,15] } }; 
+    shape "CAPS" { { [ 30,18] }, { [2,1], [23,15] } }; 
+    shape "LFSH" { { [ 41,18] }, { [2,1], [38,15] } };
+    shape "KEY6" { { [ 22,18] }, { [2,1], [15,15] } };
+    shape "KEYT" { { [ 33,18] }, { [2,1], [15,15] } };
+    shape "KEYG" { { [ 29,18] }, { [2,1], [15,15] } };
+    shape "LCTL" { 
+	approx= { [ 32, 22 ] },
+	{ [  0, 0], [ 32, 0 ], [ 32, 23 ], [ 0, 22 ] },
+	{ [  2, 1], [ 29, 1 ], [ 29, 17 ], [ 2, 15 ] } 
+    };
+    shape "LWIN" { 
+	approx= { [ 32, 23 ] },
+	{ [  0, 0], [ 32, 0 ], [ 32, 24 ], [ 0, 23 ] },
+	{ [  2, 1], [ 29, 1 ], [ 29, 18 ], [ 2, 17 ] } 
+    };
+    shape "LALT" { 
+	approx= { [ 32, 24 ] },
+	{ [  0, 0], [ 32, 0 ], [ 32, 25 ], [ 0, 24 ] },
+	{ [  2, 1], [ 29, 1 ], [ 29, 20 ], [ 2, 19 ] } 
+    };
+    shape "RDEF" { { [ 18,18] }, { [3,1], [15,15] } };
+    shape "KEY7" {	{ [ 28, 18 ] }, { [ 14, 1], [26, 15] } };
+    shape "KEYH" {	{ [ 24, 18 ] }, { [ 10, 1], [22, 15] } };
+    shape "KEYN" {	{ [ 32, 18 ] }, { [ 18, 1], [30, 15] } };
+    shape "BKSP" {	{ [ 41, 18 ] }, { [  3, 1], [39, 15] } };
+    shape "BKSL" {	{ [ 24, 18 ] }, { [  3, 1], [22, 15] } };
+    shape "RTRN" {	{ [ 37, 18 ] }, { [  3, 1], [35, 15] } };
+    shape "RTSH" {	{ [ 43, 18 ] }, { [  3, 1], [41, 15] } };
+    shape "RALT" { 
+	approx= { [ 27, 24 ] },
+	{ [  0, 0], [ 27, 0 ], [ 27, 24 ], [ 0, 25 ] },
+	{ [  3, 1], [ 25, 1 ], [ 25, 19 ], [ 3, 20 ] } 
+    };
+    shape "RWIN" { 
+	approx= { [ 27, 23 ] },
+	{ [  0, 0], [ 27, 0 ], [ 27, 23 ], [ 0, 24 ] },
+	{ [  3, 1], [ 25, 1 ], [ 25, 18 ], [ 3, 19 ] } 
+    };
+    shape "MENU" { 
+	approx= { [ 27, 21 ] },
+	{ [  0, 0], [ 27, 0 ], [ 27, 21 ], [ 0, 23 ] },
+	{ [  3, 1], [ 25, 1 ], [ 25, 16 ], [ 3, 17 ] } 
+    };
+    shape "RCTL" { 
+	approx= { [ 27, 19 ] },
+	{ [  0, 0], [ 27, 0 ], [ 27, 19 ], [ 0, 21 ] },
+	{ [  3, 1], [ 25, 1 ], [ 25, 14 ], [ 3, 15 ] } 
+    };
+    shape "KPAD" { { [ 18, 37 ] },	{ [ 3, 1 ], [ 16, 34 ] } };
+    shape "KP0"  { { [ 37, 18 ] },	{ [ 3, 1 ], [ 35, 15 ] } };
+    shape "SPCE" {
+	{ [  4, 3], [42,10], [44, 0], [88, 0], [90,10], [130, 3], 
+	  [134,26], [99,30], [67,33], [33,30], [  0,26] },
+	{ [  6, 4.5], [43,11], [45, 1], [87, 1], [89,11], [128, 4.5], 
+	  [131,23], [99,28], [67,32], [33,28], [  3,23] }
+    };
+
+    shape "EDGE" {
+	cornerRadius= 2,
+	{ [  25,   0 ],  [ 177,  17 ],  [ 329,   0 ], [ 542,   0 ],
+	  [ 542, 150 ],  [ 354, 150 ],  [ 177, 185 ], [   0, 150 ] }
+    };
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    row.left= 1;
+    key.shape= "LDEF";
+    key.gap=  1;
+    section "LeftFunction" {
+	top= 10;
+	left= 40;
+	angle= 10;
+	row {
+	    top= 1;
+	    keys {  <ESC>, { <FK01>, 12 }, <FK02>, <FK03>, <FK04>, <FK05> };
+	};
+    }; // End of "LeftFunction" section
+
+    section "LeftAlpha" {
+	top= 47;
+	left= 30;
+	angle= 10;
+	row {
+	    top= 1;
+	    keys {	<AE00>, <AE01>, <AE02>, <AE03>, <AE04>,
+			<AE05>, { <AE06>, "KEY6" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys {	{ <TAB>, "TABK" },
+			<AD01>, <AD02>, <AD03>, <AD04>, { <AD05>, "KEYT" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { 	{ <CAPS>, "CAPS" },
+			<AC01>, <AC02>, <AC03>, <AC04>, { <AC05>, "KEYG" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { 	{ <LFSH>, "LFSH" }, 
+			<AB01>, <AB02>, <AB03>, <AB04>, <AB05>
+	    };
+	};
+	row {
+	    top= 77;
+	    keys {  { <LCTL>, "LCTL" }, { <LWIN>, "LWIN" }, { <LALT>, "LALT" } };
+	};
+    }; // End of "LeftAlpha" section
+
+    key.shape= "RDEF";
+    section "RightFunction" {
+	top= 32;
+	left= 195;
+	angle= -10;
+	row {
+	    top= 1;
+	    left= 1;
+	    keys {  <FK06>, <FK07>, <FK08>, <FK09>, <FK10>, <FK11>, <FK12> };
+	};
+    }; // End of "RightFunction" section
+
+    section "RightAlpha" {
+	top= 71;
+	left= 190;
+	angle= -10;
+	row.left= 1;
+	row {
+	    top= 1;
+	    keys {	{ <AE07>, "KEY7" },
+			<AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
+			{ <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { 
+		<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>,
+		{ <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys {	{ <AC06>, "KEYH" },
+			<AC07>, <AC08>, <AC09>, <AC10>, <AC11>,
+			{ <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys {	{ <AB06>, "KEYN" },
+			<AB07>, <AB08>, <AB09>, <AB10>,
+			{ <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    left= 40;
+	    keys { 	{ <RALT>, "RALT" }, { <RWIN>, "RWIN" }, 
+			{ <MENU>, "MENU" }, { <RCTL>, "RCTL" }
+	    };
+	};
+    }; // End of "RightAlpha" section
+
+    section "SpaceBar" {
+	top= 139;
+	left= 111;
+	key.shape= "SPCE";
+	row { keys { <SPCE> }; };
+    };
+
+    section "Editing" {
+	top= 15;
+	left= 385;
+	row {
+	    top= 1;
+	    keys { <PRSC>, <SCLK>, <PAUS> };
+	};
+	row {
+	    top= 33;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 53;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 91;
+	    left= 20;
+	    keys { <UP> };
+    	};
+	row {
+	    top= 109;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    shape "LED"  { 
+	cornerRadius= 0,
+	{ [  3,  1 ] }
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.left= 177;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { top= 90; };
+    indicator "Caps Lock"    { top= 107; };
+    indicator "Scroll Lock"  { top= 127; };
+    
+    section "Keypad" {
+	top= 47;
+	left= 456;
+	row {
+	    top= 1;
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+};
+
+// Approximate layout for a Microsoft Natural(R) Keyboard Elite
+// 
+// Modified by Pavel Kurashov <pavell@mail.ru> Mon Oct  8 22:08:20 NOVST 2007
+//
+// * Function, editing and navigation keys are reduced height
+// * Navigation keys are repositioned in two column
+// * Leds are enlarged for better look
+// * "BKSP"  alligned with "BKSL" and "RTRN"
+// * Ouline Edges slightly modified
+//
+xkb_geometry "elite" {
+
+    // Approximate layout for a Microsoft Natural(R) Keyboard Elite
+    description= "Microsoft Natural(r) Keyboard Elite";
+    width= 495;
+    height= 190;
+
+    shape.cornerRadius= 1;
+    shape "LDEF" { { [ 18,18] }, { [2,1], [15,15] } };
+    shape "FKEY" { { [ 18,13] }, { [2,1], [15,10] } };
+    shape "TABK" { { [ 26,18] }, { [2,1], [23,15] } }; 
+    shape "CAPS" { { [ 30,18] }, { [2,1], [23,15] } }; 
+    shape "LFSH" { { [ 41,18] }, { [2,1], [38,15] } };
+    shape "KEY6" { { [ 22,18] }, { [2,1], [15,15] } };
+    shape "KEYT" { { [ 33,18] }, { [2,1], [15,15] } };
+    shape "KEYG" { { [ 29,18] }, { [2,1], [15,15] } };
+    shape "LCTL" { 
+	approx= { [ 32, 22 ] },
+	{ [  0, 0], [ 32, 0 ], [ 32, 23 ], [ 0, 22 ] },
+	{ [  2, 1], [ 29, 1 ], [ 29, 17 ], [ 2, 15 ] } 
+    };
+    shape "LWIN" { 
+	approx= { [ 32, 23 ] },
+	{ [  0, 0], [ 32, 0 ], [ 32, 24 ], [ 0, 23 ] },
+	{ [  2, 1], [ 29, 1 ], [ 29, 18 ], [ 2, 17 ] } 
+    };
+    shape "LALT" { 
+	approx= { [ 32, 24 ] },
+	{ [  0, 0], [ 32, 0 ], [ 32, 25 ], [ 0, 24 ] },
+	{ [  2, 1], [ 29, 1 ], [ 29, 20 ], [ 2, 19 ] } 
+    };
+    shape "RDEF" { 	{ [ 18,18  ] }, { [  2, 1], [15, 15] } };
+    shape "KEY7" {	{ [ 28, 18 ] }, { [ 14, 1], [26, 15] } };
+    shape "KEYH" {	{ [ 24, 18 ] }, { [ 10, 1], [22, 15] } };
+    shape "KEYN" {	{ [ 32, 18 ] }, { [ 18, 1], [30, 15] } };
+    shape "BKSP" {	{ [ 32, 18 ] }, { [  2, 1], [30, 15] } };
+    shape "BKSL" {	{ [ 24, 18 ] }, { [  2, 1], [22, 15] } };
+    shape "RTRN" {	{ [ 37, 18 ] }, { [  2, 1], [35, 15] } };
+    shape "RTSH" {	{ [ 43, 18 ] }, { [  2, 1], [41, 15] } };
+    shape "RALT" { 
+	approx= { [ 27, 24 ] },
+	{ [  0, 0], [ 27, 0 ], [ 27, 24 ], [ 0, 25 ] },
+	{ [  3, 1], [ 25, 1 ], [ 25, 19 ], [ 3, 20 ] } 
+    };
+    shape "RWIN" { 
+	approx= { [ 27, 23 ] },
+	{ [  0, 0], [ 27, 0 ], [ 27, 23 ], [ 0, 24 ] },
+	{ [  3, 1], [ 25, 1 ], [ 25, 18 ], [ 3, 19 ] } 
+    };
+    shape "MENU" { 
+	approx= { [ 27, 21 ] },
+	{ [  0, 0], [ 27, 0 ], [ 27, 21 ], [ 0, 23 ] },
+	{ [  3, 1], [ 25, 1 ], [ 25, 16 ], [ 3, 17 ] } 
+    };
+    shape "RCTL" { 
+	approx= { [ 27, 19 ] },
+	{ [  0, 0], [ 27, 0 ], [ 27, 19 ], [ 0, 21 ] },
+	{ [  3, 1], [ 25, 1 ], [ 25, 14 ], [ 3, 15 ] } 
+    };
+    shape "KPAD" { { [ 18, 37 ] },	{ [ 3, 1 ], [ 16, 34 ] } };
+    shape "KP0"  { { [ 37, 18 ] },	{ [ 3, 1 ], [ 35, 15 ] } };
+    shape "SPCE" {
+	{ [  4, 3], [42,10], [44, 0], [88, 0], [90,10], [130, 3], 
+	  [134,26], [99,30], [67,33], [33,30], [  0,26] },
+	{ [  6, 4.5], [43,11], [45, 1], [87, 1], [89,11], [128, 4.5], 
+	  [131,23], [99,28], [67,32], [33,28], [  3,23] }
+    };
+
+    shape "EDGE" {
+	cornerRadius= 3,
+	{ [  32,   15 ],  [140, 33],[ 220,  33 ],  [ 329,   15 ], [ 493,   15 ],
+	  [ 493, 150 ],  [ 354, 150 ],  [200, 180], [ 153, 180 ], [   7, 150 ] }
+    };
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    row.left= 1;
+    key.shape= "FKEY";
+    key.gap=  1;
+    section "LeftFunction" {
+	top= 26;
+	left= 40;
+	angle= 10;
+	row {
+	    top= 1;
+	    keys {  <ESC>, { <FK01>, 12 }, <FK02>, <FK03>, <FK04>, <FK05> };
+	};
+    }; // End of "LeftFunction" section
+
+    key.shape= "LDEF";
+    section "LeftAlpha" {
+	top= 47;
+	left= 30;
+	angle= 10;
+	row {
+	    top= 1;
+	    keys {	<TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+			<AE05>, { <AE06>, "KEY6" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys {	{ <TAB>, "TABK" },
+			<AD01>, <AD02>, <AD03>, <AD04>, { <AD05>, "KEYT" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { 	{ <CAPS>, "CAPS" },
+			<AC01>, <AC02>, <AC03>, <AC04>, { <AC05>, "KEYG" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { 	{ <LFSH>, "LFSH" }, 
+			<AB01>, <AB02>, <AB03>, <AB04>, <AB05>
+	    };
+	};
+	row {
+	    top= 77;
+	    keys {  { <LCTL>, "LCTL" }, { <LWIN>, "LWIN" }, { <LALT>, "LALT" } };
+	};
+    }; // End of "LeftAlpha" section
+
+    key.shape= "FKEY";
+    section "RightFunction" {
+	top= 48;
+	left= 195;
+	angle= -10;
+	row {
+	    top= 1;
+	    left= 1;
+	    keys {  <FK06>, <FK07>, <FK08>, <FK09>, <FK10>, <FK11>, <FK12> };
+	};
+    }; // End of "RightFunction" section
+
+    key.shape= "RDEF";
+    section "RightAlpha" {
+	top= 71;
+	left= 190;
+	angle= -10;
+	row.left= 1;
+	row {
+	    top= 1;
+	    keys {	{ <AE07>, "KEY7" },
+			<AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
+			{ <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { 
+		<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>,
+		{ <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys {	{ <AC06>, "KEYH" },
+			<AC07>, <AC08>, <AC09>, <AC10>, <AC11>,
+			{ <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys {	{ <AB06>, "KEYN" },
+			<AB07>, <AB08>, <AB09>, <AB10>,
+			{ <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    left= 40;
+	    keys { 	{ <RALT>, "RALT" }, { <RWIN>, "RWIN" }, 
+			{ <MENU>, "MENU" }, { <RCTL>, "RCTL" }
+	    };
+	};
+    }; // End of "RightAlpha" section
+
+    section "SpaceBar" {
+	top= 139;
+	left= 111;
+	key.shape= "SPCE";
+	row { keys { <SPCE> }; };
+    };
+
+    section "Editing" {
+	key.shape="FKEY";
+	top= 23;
+	left= 348;
+	row {
+	    top= 0;
+	    keys { <PRSC>, <SCLK>, <PAUS> };
+	};
+	row {
+	    top= 22;
+	    left=20;	
+	    keys { <HOME>, <PGUP> };
+	};
+	row {
+	    top= 36;
+	    left=20;	
+	    keys {  <END>, <PGDN> };
+	};
+	row {
+	    top= 50;
+	    left=20;	
+	    keys { <DELE>, <INS> };
+	};
+	row {
+	    top= 75;
+	    left= 29;
+	    keys { <UP> };
+    	};
+	row {
+	    top= 89;
+	    left=20;	
+	    keys { <LEFT>, <RGHT> };
+	};
+	row {
+	    top= 103;
+	    left=29;	
+	    keys { <DOWN> };
+	};
+    }; // End of "Editing" section
+
+    shape "LED"  { 
+	cornerRadius= 1,
+	{ [  7,  2 ] }
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.left= 177;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { top= 90; };
+    indicator "Caps Lock"    { top= 107; };
+    indicator "Scroll Lock"  { top= 127; };
+    
+    section "Keypad" {
+	top= 44;
+	left= 412;
+	row {
+	    top= 1;
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+};
diff --git a/xorg-server/xkeyboard-config/geometry/nec b/xorg-server/xkeyboard-config/geometry/nec
index e6c00d3ff..f4af6660d 100644
--- a/xorg-server/xkeyboard-config/geometry/nec
+++ b/xorg-server/xkeyboard-config/geometry/nec
@@ -1,157 +1,157 @@
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//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 OPEN GROUP 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 Open Group 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 Open Group.
-//
-
-default xkb_geometry "pc98" {
-
-    description= "Generic PC98";
-    width= 405;
-    height= 172;
-
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 17,18] }, { [2,1], [ 15,17] } };
-    shape "RTRN" { { [ 20,37] }, { [2,1], [ 18,35] } };
-    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,17] } };
-    shape "RTSH" { { [ 31,18] }, { [2,1], [ 29,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "SPCE" { { [115,18] }, { [2,1], [113,17] } };
-    shape "FUNC" { { [ 21,18] }, { [2,1], [ 19,17] } };
-    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,36] } };
-    shape "TABK" { { [ 30,18] }, { [2,1], [ 28,17] } };
-    shape "ARRW" { { [ 35,18] }, { [2,1], [ 33,17] } };
-
-    section.left= 8;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 29;
-	row {
-	    top= 1;
-	    key.shape="FUNC";
-	    keys {  { <BRK>, "NORM" }, { <PRSC>, "NORM", 5 },
-		    { <FK01>, 6 }, <FK02>, <FK03>, <FK04>, <FK05>, 
-		    { <FK06>, 6 }, <FK07>, <FK08>, <FK09>, <FK10>, 
-		    { <FK11>, 6 }, <FK12>, <FK13>, <FK14>, <FK15>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 54;
-	row {
-	    top= 1;
-	    keys { { <ESC>, shape="BKSP"}, 
-		   <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>, <BKSL>,
-		   { <BKSP>, "BKSP" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <RTRN>, "RTRN", 6 }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { <LCTL>, <CAPS>,
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, <AC12>
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "LFSH" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <AB11>,
-		    { <RTSH>, "RTSH" }
-	    };
-	};
-	row {
-	    top= 77;
-	    keys { { <ALGR>, 35 } , <LALT>, { <NFER>, "FUNC" },
-		   { <SPCE>, "SPCE" }, { <XFER>, "FUNC" }
-		   
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 54;
-	left= 281;
-	row {
-	    top= 1;
-	    keys { <INS>, <DELE> };
-	};
-        row {
-	    top= 20;
-	    keys { <PGDN>, <PGUP> };
-	};
-	row {
-	    top= 39;
-	    keys { { <UP>, "ARRW" } };
-	};
-	row {
-	    top= 58;
-	    keys { <LEFT>, <RGHT> };
-	};
-	row {
-	    top= 77;
-	    keys { { <DOWN>, "ARRW" } };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 54;
-	left= 320;
-	row {
-	    top= 1;
-	    keys { <HOME>, <HELP>, <KPSU>, <KPDV> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, <KPMU> };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, <KPEQ> };
-	};
-	row {
-	    top= 77;
-	    keys { <KP0>, <KPSP>, <KPDC>, <KPEN> };
-	};
-    }; // End of "Keypad" section
-
-}; // End of "pc98" geometry
+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//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 OPEN GROUP 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 Open Group 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 Open Group.
+//
+
+default xkb_geometry "pc98" {
+
+    description= "Generic PC98";
+    width= 405;
+    height= 172;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 17,18] }, { [2,1], [ 15,17] } };
+    shape "RTRN" { { [ 20,37] }, { [2,1], [ 18,35] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,17] } };
+    shape "RTSH" { { [ 31,18] }, { [2,1], [ 29,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "SPCE" { { [115,18] }, { [2,1], [113,17] } };
+    shape "FUNC" { { [ 21,18] }, { [2,1], [ 19,17] } };
+    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,36] } };
+    shape "TABK" { { [ 30,18] }, { [2,1], [ 28,17] } };
+    shape "ARRW" { { [ 35,18] }, { [2,1], [ 33,17] } };
+
+    section.left= 8;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 29;
+	row {
+	    top= 1;
+	    key.shape="FUNC";
+	    keys {  { <BRK>, "NORM" }, { <PRSC>, "NORM", 5 },
+		    { <FK01>, 6 }, <FK02>, <FK03>, <FK04>, <FK05>, 
+		    { <FK06>, 6 }, <FK07>, <FK08>, <FK09>, <FK10>, 
+		    { <FK11>, 6 }, <FK12>, <FK13>, <FK14>, <FK15>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 54;
+	row {
+	    top= 1;
+	    keys { { <ESC>, shape="BKSP"}, 
+		   <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, <BKSL>,
+		   { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN", 6 }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <LCTL>, <CAPS>,
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <AC12>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <AB11>,
+		    { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { { <ALGR>, 35 } , <LALT>, { <NFER>, "FUNC" },
+		   { <SPCE>, "SPCE" }, { <XFER>, "FUNC" }
+		   
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 54;
+	left= 281;
+	row {
+	    top= 1;
+	    keys { <INS>, <DELE> };
+	};
+        row {
+	    top= 20;
+	    keys { <PGDN>, <PGUP> };
+	};
+	row {
+	    top= 39;
+	    keys { { <UP>, "ARRW" } };
+	};
+	row {
+	    top= 58;
+	    keys { <LEFT>, <RGHT> };
+	};
+	row {
+	    top= 77;
+	    keys { { <DOWN>, "ARRW" } };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 54;
+	left= 320;
+	row {
+	    top= 1;
+	    keys { <HOME>, <HELP>, <KPSU>, <KPDV> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, <KPMU> };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, <KPEQ> };
+	};
+	row {
+	    top= 77;
+	    keys { <KP0>, <KPSP>, <KPDC>, <KPEN> };
+	};
+    }; // End of "Keypad" section
+
+}; // End of "pc98" geometry
diff --git a/xorg-server/xkeyboard-config/geometry/nokia b/xorg-server/xkeyboard-config/geometry/nokia
index 5132840ca..789f6523b 100644
--- a/xorg-server/xkeyboard-config/geometry/nokia
+++ b/xorg-server/xkeyboard-config/geometry/nokia
@@ -1,53 +1,53 @@
-// Zoomed 3x because of text size
-
-default xkb_geometry "nokiarx51" {
-
-    description= "Nokia RX-51";
-    width= 273; // 13x6mm + 2x1.5mm border + 2x5mm border
-    height= 54; // 3x5mm + 2x1.5mm border
-
-    shape.cornerRadius= 1.5;
-    shape "NORM"  { { [18,15] } };
-    shape "SPCE"  { { [36,15] } };
-    shape "FRAME" { cornerRadius= 2.5, { [243,54] } };
-
-    solid "FRAME" {
-	shape= "FRAME";
-	color= "white";
-	top= 0;
-	left= 15;
-    };
-
-    section.left= 15;
-    row.left= 4.5;
-    key.shape= "NORM";
-    key.gap= 0;
-    section "Keys" {
-	top= 0;
-	row {
-	    top= 4.5;
-	    keys { { <LCTL>, "NORM", color="grey20" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AB08>,
-		   { <BKSP>, "NORM", color="grey20" }
-	    };
-	};
-	row {
-	    top= 19.5;
-	    keys { { <RALT>, "NORM", color="grey20" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AB09>, <UP>,
-		   { <RTRN>, "NORM", color="grey20" }
-	    };
-	};
-	row {
-	    top= 34.5;
-	    keys { { <LFSH>, "NORM", color="grey20" },
-		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>,
-		   { <SPCE>, "SPCE", color="white" },
-		   <LEFT>, <DOWN>, <RGHT>
-	    };
-	};
-    }; // End of "Keys" section
-
-}; // End of "rx51" geometry
+// Zoomed 3x because of text size
+
+default xkb_geometry "nokiarx51" {
+
+    description= "Nokia RX-51";
+    width= 273; // 13x6mm + 2x1.5mm border + 2x5mm border
+    height= 54; // 3x5mm + 2x1.5mm border
+
+    shape.cornerRadius= 1.5;
+    shape "NORM"  { { [18,15] } };
+    shape "SPCE"  { { [36,15] } };
+    shape "FRAME" { cornerRadius= 2.5, { [243,54] } };
+
+    solid "FRAME" {
+	shape= "FRAME";
+	color= "white";
+	top= 0;
+	left= 15;
+    };
+
+    section.left= 15;
+    row.left= 4.5;
+    key.shape= "NORM";
+    key.gap= 0;
+    section "Keys" {
+	top= 0;
+	row {
+	    top= 4.5;
+	    keys { { <LCTL>, "NORM", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AB08>,
+		   { <BKSP>, "NORM", color="grey20" }
+	    };
+	};
+	row {
+	    top= 19.5;
+	    keys { { <RALT>, "NORM", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AB09>, <UP>,
+		   { <RTRN>, "NORM", color="grey20" }
+	    };
+	};
+	row {
+	    top= 34.5;
+	    keys { { <LFSH>, "NORM", color="grey20" },
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>,
+		   { <SPCE>, "SPCE", color="white" },
+		   <LEFT>, <DOWN>, <RGHT>
+	    };
+	};
+    }; // End of "Keys" section
+
+}; // End of "rx51" geometry
diff --git a/xorg-server/xkeyboard-config/geometry/northgate b/xorg-server/xkeyboard-config/geometry/northgate
index cec2e35a3..364bf5499 100644
--- a/xorg-server/xkeyboard-config/geometry/northgate
+++ b/xorg-server/xkeyboard-config/geometry/northgate
@@ -1,168 +1,168 @@
-default xkb_geometry "omnikey101" {
-
-    description= "North Gate Omnikey 101";
-    width= 470;
-    height= 175;
-
-    shape.cornerRadius= 1;
-    shape "NORM" { { [18,18] }, { [2,1], [16,17] } };
-    shape "BKSP" { { [34,18] }, { [2,1], [32,17] } };
-    shape "TABK" { { [27,18] }, { [2,1], [25,17] } };
-    shape "RTRN" {
-	approx = { [15, 0], [40,37] },
-	{ [15, 0], [40, 0], [40,37],
-	  [ 0,37], [ 0,19], [15,19] },
-	{ [17, 1], [38, 1], [38,36],
-	  [ 2,36], [ 2,20], [17,20] }
-    };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "LFSH" { { [ 41,18] }, { [2,1], [39,17] } };
-    shape "RTSH" { { [ 30,18] }, { [2,1], [28,17] } };
-    shape "MODK" { { [ 26,18] }, { [2,1], [24,17] } };
-    shape "SPCE" { { [129,18] }, { [2,1], [127,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-
-    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
-    shape "LED"  { cornerRadius= 0, { [  1,  3 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  32;
-	left= 375;
-	color= "grey10";
-    };
-
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 46.5;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { left= 384; };
-    indicator "Caps Lock"    { left= 409; };
-    indicator "Scroll Lock"  { left= 434; };
-    text.top= 34;
-    text.color= "black";
-    text "NumLockLabel"	{ left= 380.5; text="Num\nLock"; };
-    text "CapsLockLabel"	{ left= 405; text="Caps\nLock"; };
-    text "ScrollLockLabel"	{ left= 430; text="Scroll\nLock"; };
-
-    section.left= 19;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 32;
-	row {
-	    top= 1;
-	    keys {  { <ESC>, color="grey20" },
-		    { <FK01>, 18}, <FK02>, <FK03>, <FK04>,
-		    { <FK05>, 9 }, <FK06>, <FK07>, <FK08>,
-		    { <FK09>, 9 }, <FK10>, <FK11>, <FK12>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 65;
-	row {
-	    top= 1;
-	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>,
-		   { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK", color="grey20" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>,
-		   { <RTRN>, "RTRN", -14, color="grey20" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <CAPS>, "CAPS", color="grey20" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "LFSH", color="grey20" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		    { <RTSH>, "RTSH", color="grey20" }, <BKSL>
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "MODK";
-	    key.color= "grey20";
-	    keys { <LALT>,
-		   { <LCTL>, 23 },
-		   { <SPCE>, "SPCE", color="white" },
-		   <RCTL>,
-		    { <RALT>, 23 }
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 32;
-	left= 308;
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    keys { <PRSC>, <SCLK>, <PAUS> };
-	};
-	row {
-	    top= 33;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-        row {
-	    top= 53;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 91;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 110;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 65;
-	left= 374;
-	row {
-	    top= 1;
-	    key.color= "grey20";
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-
-}; // End of "default" geometry
+default xkb_geometry "omnikey101" {
+
+    description= "North Gate Omnikey 101";
+    width= 470;
+    height= 175;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [34,18] }, { [2,1], [32,17] } };
+    shape "TABK" { { [27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" {
+	approx = { [15, 0], [40,37] },
+	{ [15, 0], [40, 0], [40,37],
+	  [ 0,37], [ 0,19], [15,19] },
+	{ [17, 1], [38, 1], [38,36],
+	  [ 2,36], [ 2,20], [17,20] }
+    };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LFSH" { { [ 41,18] }, { [2,1], [39,17] } };
+    shape "RTSH" { { [ 30,18] }, { [2,1], [28,17] } };
+    shape "MODK" { { [ 26,18] }, { [2,1], [24,17] } };
+    shape "SPCE" { { [129,18] }, { [2,1], [127,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+
+    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  1,  3 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  32;
+	left= 375;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 46.5;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 384; };
+    indicator "Caps Lock"    { left= 409; };
+    indicator "Scroll Lock"  { left= 434; };
+    text.top= 34;
+    text.color= "black";
+    text "NumLockLabel"	{ left= 380.5; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 405; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 430; text="Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 32;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 18}, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 9 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 9 }, <FK10>, <FK11>, <FK12>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 65;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>,
+		   { <RTRN>, "RTRN", -14, color="grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH", color="grey20" }, <BKSL>
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LALT>,
+		   { <LCTL>, 23 },
+		   { <SPCE>, "SPCE", color="white" },
+		   <RCTL>,
+		    { <RALT>, 23 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 32;
+	left= 308;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <PRSC>, <SCLK>, <PAUS> };
+	};
+	row {
+	    top= 33;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 53;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 91;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 110;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 65;
+	left= 374;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "default" geometry
diff --git a/xorg-server/xkeyboard-config/geometry/pc b/xorg-server/xkeyboard-config/geometry/pc
index 91e8dd7e1..86f546228 100644
--- a/xorg-server/xkeyboard-config/geometry/pc
+++ b/xorg-server/xkeyboard-config/geometry/pc
@@ -1,1568 +1,1568 @@
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//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 OPEN GROUP 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 Open Group 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 Open Group.
-//
-
-default xkb_geometry "pc101" {
-
-    description= "Generic 101";
-    width= 470;
-    height= 180;
-
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
-    shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
-    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
-    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
-    shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,16] } };
-    shape "CAPS" { { [ 33,18] }, { [2,1], [ 31,16] } };
-    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,16] } };
-    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,16] } };
-    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
-    shape "SPCE" { { [133,18] }, { [2,1], [131,16] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
-
-    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
-    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  22;
-	left= 377;
-	color= "grey10";
-    };
-
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 37;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { left= 382; };
-    indicator "Caps Lock"    { left= 407; };
-    indicator "Scroll Lock"  { left= 433; };
-    text.top= 25;
-    text.color= "black";
-    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
-    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
-    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
-
-    section.left= 19;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 22;
-	row {
-	    top= 1;
-	    keys {  { <ESC>, color="grey20" },
-		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
-		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
-		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
-		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 61;
-	row {
-	    top= 1;
-	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>,
-		   { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK", color="grey20" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <CAPS>, "CAPS", color="grey20" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, { <RTRN>, "RTRN", color="grey20" }
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "LFSH", color="grey20" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		    { <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "MODK";
-	    key.color= "grey20";
-	    keys { <LCTL>, { <LALT>, 21 },
-		   { <SPCE>, "SPCE", color="white" },
-		   <RALT>, { <RCTL>, 21 }
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 61;
-	left= 312;
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-        row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 61;
-	left= 376;
-	row {
-	    top= 1;
-	    key.color= "grey20";
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-
-}; // End of "default" geometry
-
-xkb_geometry "pc102" {
-
-    description= "Generic 102";
-    width= 470;
-    height= 180;
-
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
-    shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
-    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
-    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
-    shape "RTRN" {
-        { [0,0], [28,0], [28,37], [5,37], [5,18], [0,18] },
-        { [2,1], [26,1], [26,35], [7,35], [7,16], [2,16] } };
-    shape "CAPS" { { [ 33,18] }, { [2,1], [ 31,16] } };
-    shape "LFSH" { { [ 25,18] }, { [2,1], [ 23,16] } };
-    shape "RTSH" { { [ 50,18] }, { [2,1], [ 48,16] } };
-    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
-    shape "SPCE" { { [134,18] }, { [2,1], [132,16] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
-
-    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
-    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  22;
-	left= 377;
-	color= "grey10";
-    };
-
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 37;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { left= 382; };
-    indicator "Caps Lock"    { left= 407; };
-    indicator "Scroll Lock"  { left= 433; };
-    text.top= 25;
-    text.color= "black";
-    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
-    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
-    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
-
-    section.left= 19;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 22;
-	row {
-	    top= 1;
-	    keys {  { <ESC>, "TABK", color="grey20" },
-		    { <FK01>, 10 }, <FK02>, <FK03>, <FK04>,
-		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
-		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
-		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 61;
-	row {
-	    top= 1;
-	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>, 
-		   { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK", color="grey20" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <RTRN>, "RTRN", color="grey20" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <CAPS>, "CAPS", color="grey20" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, <BKSL>
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "LFSH", color="grey20" },
-		    <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		    { <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "MODK";
-	    key.color= "grey20";
-	    keys { <LCTL>, { <LALT>, 20 },
-		   { <SPCE>, "SPCE", color="white" },
-		   <RALT>, { <RCTL>, 21 }
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 61;
-	left= 312;
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-        row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 61;
-	left= 376;
-	row {
-	    top= 1;
-	    key.color= "grey20";
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-
-}; // End of "pc102" geometry
-
-xkb_geometry "pc104" {
-
-    description= "Generic 104";
-    width= 470;
-    height= 180;
-
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
-    shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
-    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
-    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
-    shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,16] } };
-    shape "CAPS" { { [ 33,18] }, { [2,1], [ 31,16] } };
-    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,16] } };
-    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,16] } };
-    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
-    shape "SMOD" { { [ 23,18] }, { [2,1], [ 21,16] } };
-    shape "SPCE" { { [113,18] }, { [2,1], [111,16] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
-
-    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
-    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  22;
-	left= 377;
-	color= "grey10";
-    };
-
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 37;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { left= 382; };
-    indicator "Caps Lock"    { left= 407; };
-    indicator "Scroll Lock"  { left= 433; };
-    text.top= 25;
-    text.color= "black";
-    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
-    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
-    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
-
-    section.left= 19;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 22;
-	row {
-	    top= 1;
-	    keys {  { <ESC>, color="grey20" },
-		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
-		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
-		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
-		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 61;
-	row {
-	    top= 1;
-	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>,
-		   { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK", color="grey20" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <CAPS>, "CAPS", color="grey20" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, { <RTRN>, "RTRN", color="grey20" }
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "LFSH", color="grey20" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		    { <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "SMOD";
-	    key.color= "grey20";
-	    keys { { <LCTL>, "MODK" }, <LWIN>, <LALT>,
-		   { <SPCE>, "SPCE", color="white" },
-		   <RALT>, <RWIN>, <MENU>, <RCTL>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 61;
-	left= 312;
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-        row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 61;
-	left= 376;
-	row {
-	    top= 1;
-	    key.color= "grey20";
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-
-}; // End of "pc104" geometry
-
-xkb_geometry "pc105" {
-
-    description= "Generic 105";
-    width= 470;
-    height= 180;
-
-    shape.cornerRadius= 1;
-
-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
-    shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
-    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
-    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
-    shape "RTRN" {
-        { [0,0], [28,0], [28,37], [5,37], [5,18], [0,18] } ,
-        { [2,1], [26,1], [26,35], [7,35], [7,16], [2,16] } ,
-        approx = { [5,0], [28,37] } };
-    shape "CAPS" { { [ 33,18] }, { [2,1], [ 31,16] } };
-    shape "LFSH" { { [ 25,18] }, { [2,1], [ 23,16] } };
-    shape "RTSH" { { [ 50,18] }, { [2,1], [ 48,16] } };
-    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
-    shape "SMOD" { { [ 23,18] }, { [2,1], [ 21,16] } };
-    shape "SPCE" { { [113,18] }, { [2,1], [111,16] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
-
-    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
-    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  22;
-	left= 377;
-	color= "grey10";
-    };
-
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 37;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { left= 382; };
-    indicator "Caps Lock"    { left= 407; };
-    indicator "Scroll Lock"  { left= 433; };
-    text.top= 25;
-    text.color= "black";
-    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
-    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
-    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
-
-    section.left= 19;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 22;
-	row {
-	    top= 1;
-	    keys {  { <ESC>, color="grey20" },
-		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
-		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
-		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
-		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 61;
-	row {
-	    top= 1;
-	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>,
-		   { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK", color="grey20" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <RTRN>, "RTRN", color="grey20" } 
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <CAPS>, "CAPS", color="grey20" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, <BKSL> 
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "LFSH", color="grey20" },
-		    <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		    { <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "SMOD";
-	    key.color= "grey20";
-	    keys { { <LCTL>, "MODK" }, <LWIN>, <LALT>,
-		   { <SPCE>, "SPCE", color="white" },
-		   <RALT>, <RWIN>, <MENU>, <RCTL>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 61;
-	left= 312;
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-        row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 61;
-	left= 376;
-	row {
-	    top= 1;
-	    key.color= "grey20";
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-
-}; // End of "pc105" geometry
-
-
-// Added for japanese 106 keyboard
-//                     by tsuka@kawalab.dnj.ynu.ac.jp .
-xkb_geometry "jp106" {
-
-    description= "Japanese 106";
-    width= 470;
-    height= 180;
-
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
-    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };
-    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "BKSL" { { [ 27,18] }, { [2,1], [ 25,17] } };
-    shape "RTRN" {
-        { [0,0],[ 27,0],[27,37],[4,37],[4,18],[0,18] } ,
-        { [2,1],[ 25,1],[25,36],[5,36],[5,17],[2,17] } };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [ 30,17] } };
-    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,17] } };
-    shape "RTSH" { { [ 32,18] }, { [2,1], [ 30,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "SPCE" { { [ 46,18] }, { [2,1], [ 44,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,36] } };
-
-    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
-    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  25;
-	left= 375;
-	color= "grey10";
-    };
-
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 40;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { left= 379; };
-    indicator "Caps Lock"    { left= 404; };
-    indicator "Scroll Lock"  { left= 429; };
-    text.top= 28;
-    text.color= "black";
-    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
-    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
-    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
-
-    section.left= 19;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 25;
-	row {
-	    top= 1;
-	    keys {  { <ESC>, color="grey20" },
-		    { <FK01>, 18 }, <FK02>, <FK03>, <FK04>,
-		    { <FK05>, 11 ,color="grey20"}, {<FK06>,color="grey20"}, 
-		    { <FK07>, color="grey20"}, {<FK08>,color="grey20"},
-		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
-		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 61;
-	row {
-	    top= 1;
-	    keys { {<HZTG>,color="grey20"}, <AE01>, <AE02>, 
-                    <AE03>, <AE04>, <AE05>, <AE06>, <AE07>, 
-	            <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
-		    <AE13>, { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK", color="grey20" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <RTRN>, 1 ,"RTRN",color="grey20" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <CAPS>, "CAPS", color="grey20" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, <AC12>
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "LFSH", color="grey20" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		    <AB11>, { <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "MODK";
-	    key.color= "grey20";
-	    keys { <LCTL>, { <LALT>, 20 },<NFER>,
-		   { <SPCE>, "SPCE", color="white" },
-		   <XFER>,<HKTG>,<RALT>, { <RCTL>, 17 }
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 61;
-	left= 310;
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-        row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 61;
-	left= 375;
-	row {
-	    top= 1;
-	    key.color= "grey20";
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-
-}; // End of "jp106" geometry
-
-// Added for brazilian ABNT2 by Ricardo Y. Igarashi(iga@that.com.br)
-xkb_geometry "abnt2" {
-    include "pc(pc105)"
-
-    description= "Brazilian ABNT2";
-
-    shape "RTRN" {
-        { [0,0],[ 28,0],[28,37],[4,37],[4,18],[0,18] } ,
-        { [2,1],[ 26,1],[26,36],[5,36],[5,18],[2,18] } };
-    shape "RTSH" { { [ 31,18] }, { [2,1], [ 29,16] } };
-
-    section.left= 19;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Alpha" {
-	top= 61;
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK", color="grey20" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <RTRN>, "RTRN", color="grey20" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <CAPS>, "CAPS", color="grey20" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, <BKSL>
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "LFSH", color="grey20" },
-		    <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <AB11>,
-		    { <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Keypad" {
-	top= 61;
-	left= 376;
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, color="grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6>, { <KPPT>, color="grey20" } };
-	};
-    }; // End of "Keypad" section
-
-}; // End of "abnt2" geometry
-
-
-// Created by Alexander Pohoyda <alexander.pohoyda@gmx.net>
-
-xkb_geometry "pc86" {
-    description = "Noname keyboard with 86 keys, DE";
-    width = 287;
-    height = 143;
-    baseColor = "grey20";
-
-    shape "EDGE" { cornerRadius = 2, { [287, 143] } };
-    shape "LED"  { cornerRadius = 2, { [3, 3] } };
-    shape "LEDS" { cornerRadius = 0, { [75, 5] } };
-    shape "KEYS" { cornerRadius = 0, { [271, 109] } };
-
-    outline "Edges" {
-        top = 0;
-        left = 0;
-        shape = "EDGE";
-        color = "black";
-    };
-
-    solid "KeyPanel" {
-	shape = "KEYS";
-	left = 8;
-	top = 22;
-	color = "grey70";
-    };
-
-    solid "LedPanel" {
-	shape = "LEDS";
-	left = 212;
-	top = 10;
-	color = "black";
-    };
-
-    indicator.onColor = "green";
-    indicator.offColor = "green30";
-    indicator.top = 11;
-    indicator.shape = "LED";
-    indicator "Num Lock"     { left = 212 + 7; };
-    indicator "Caps Lock"    { left = 212 + 23; };
-    indicator "Scroll Lock"  { left = 212 + 39; };
-    text.fontSize = 6;
-    text.top = 10;
-    text.color = "white";
-    text "NumLockLabel"     { left = 212 + 7 + 5; text = "Num\nLock"; };
-    text "CapsLockLabel"    { left = 212 + 23 + 5; text = "Caps\nLock"; };
-    text "ScrollLockLabel"  { left = 212 + 39 + 5; text = "Scroll\nLock"; };
-
-    shape.cornerRadius = 1;
-    shape "SMALL"  { { [15, 12] }, { [1.5, 0], [13.5, 10] } };
-    shape "NARR"   { { [13, 18] }, { [1.5, 0], [11.5, 14] } };
-    shape "NORM"   { { [18, 18] }, { [3, 0], [15, 14] } };
-    shape "NORM_1" { { [22, 18] }, { [4, 0], [22, 18] },
-                                   { [7, 0], [19, 14] } };
-    shape "WIDER"  { { [23, 18] }, { [3, 0], [20, 14] } };
-    shape "WIDEST" { { [27, 18] }, { [3, 0], [24, 14] } };
-    shape "SPCE"   { { [75, 18] }, { [3, 0], [72, 14] } };
-
-    section "Function" {
-	key.shape = "SMALL";
-	key.gap = 0.99;
-	key.color = "grey30";
-	left = 8;
-	top = 22;
-	row {
-	    top = 1;
-	    keys {  <ESC>,
-	    	    <FK01>, <FK02>, <FK03>, <FK04>,
-		    <FK05>, <FK06>, <FK07>, <FK08>,
-		    <FK09>, <FK10>, <FK11>, <FK12>,
-		    <NMLK>, <PRSC>, <SCLK>, <PAUS>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Control" {
-	key.shape = "NORM";
-	key.gap = 1;
-	key.color = "grey30";
-        left = 8;
-	top = 111;
-	row {
-	    top = 1;
-	    keys { <LCTL>, <FN>, <LALT>,
-	           { <SPCE>, shape="SPCE", 39 }, <RALT>,
-		   <INS>, <DELE>
-	    };
-	};
-    }; // End of "Control" section
-
-    section "Editing" {
-        key.shape = "NARR";
-	key.gap = 1;
-	key.color = "grey30";
-	left = 265;
-	top = 34;
-        row.vertical = True;
-	row {
-	    top = 1;
-	    keys { <HOME>, <PGUP>, <PGDN>, <END> };
-	};
-    }; // End of "Editing" section
-
-    section "Navigation" {
-	key.gap = 1;
-	key.shape = "NARR";
-	key.color = "grey30";
-	left = 236;
-	top = 92;
-	row {
-	    left = 14;
-	    top = 1;
-	    keys { <UP> };
-	};
-	row {
-	    top = 20;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Navigation" section
-
-    section "Alpha" {
-	key.gap = 1;
-	key.shape = "NORM";
-	key.color = "grey10";
-        left = 8;
-	top = 35;
-	row {
-	    top = 1;
-	    keys { { <AE01>, shape="NORM_1" }, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>,
-                   { <BKSP>, shape="WIDER", color="grey30" }
-	    };
-	};
-	row {
-	    top = 20;
-	    keys { { <TAB>, shape="NARR", color="grey30" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <AD13>, shape="NARR" }
-	    };
-	};
-	row {
-	    top = 39;
-	    keys { { <CAPS>, color="grey30" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, { <RTRN>, shape="WIDEST", color="grey30" }
-	    };
-	};
-	row {
-	    top = 58;
-	    keys { { <LFSH>, shape="WIDEST", color="grey30" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
-		    { <RTSH>, shape="WIDER", color="grey30" }
-	    };
-	};
-	row {
-            left = 57;
-	    top = 77;
-	    keys { <AE00>, <LSGT> };
-	};
-    }; // End of "Alpha" section
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-}; // End of "pc86" geometry
-
-xkb_geometry "kr106" {
-
-    description= "Korean 106";
-    width= 470;
-    height= 180;
-
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
-    shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
-    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
-    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
-    shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,16] } };
-    shape "CAPS" { { [ 33,18] }, { [2,1], [ 31,16] } };
-    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,16] } };
-    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,16] } };
-    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
-    shape "SMOD" { { [ 23,18] }, { [2,1], [ 21,16] } };
-    shape "SPCE" { { [ 75,18] }, { [2,1], [ 73,16] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
-
-    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
-    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  22;
-	left= 377;
-	color= "grey10";
-    };
-
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 37;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { left= 382; };
-    indicator "Caps Lock"    { left= 407; };
-    indicator "Scroll Lock"  { left= 433; };
-    text.top= 25;
-    text.color= "black";
-    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
-    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
-    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
-
-    section.left= 19;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 22;
-	row {
-	    top= 1;
-	    keys {  { <ESC>, color="grey20" },
-		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
-		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
-		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
-		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 61;
-	row {
-	    top= 1;
-	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>,
-		   { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK", color="grey20" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <CAPS>, "CAPS", color="grey20" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, { <RTRN>, "RTRN", color="grey20" }
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "LFSH", color="grey20" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		    { <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "SMOD";
-	    key.color= "grey20";
-	    keys { { <LCTL>, "MODK" }, <LWIN>, <LALT>,
-		   { <K71>, "NORM", color="white" },
-		   { <SPCE>, "SPCE", color="white" },
-		   { <K72>, "NORM", color="white" },
-		   <RALT>, <RWIN>, <MENU>, <RCTL>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 61;
-	left= 312;
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-        row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 61;
-	left= 376;
-	row {
-	    top= 1;
-	    key.color= "grey20";
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-
-}; // End of "kr106" geometry
-
-// Based on the pc(pc105) layout. The keypad, sysreq/ScrLk/Break, and multimedia
-// keys are not shown because they are shared with other keys via the <FN> key.
-// This should not be a problem if the normal symbols are used, as the keys will
-// show through normally, they just won't show from xkbprint. For the record,
-// <FN>+<PGUP> = AudioRaise,
-// <FN>+<PGDN> = AudioLower,
-// <FN>+<END> = AudioMute,
-// <FN>+<PRSC> = Sysreq,
-// <FN>+<NMLK> = ScrollLock,
-// <FN>+<BREAK> = <PAUS>,
-// <FN>+7 = KP_7,
-// <FN>+8 = KP_8,
-// <FN>+9 = KP_9,
-// <FN>+0 = KP_MUL,
-// <FN>+U = KP_4,
-// <FN>+I = KP_5,
-// <FN>+O = KP_6,
-// <FN>+P = KP_SUB,
-// <FN>+J = KP_1,
-// <FN>+K = KP_2,
-// <FN>+L = KP_3,
-// <FN>+; = KP_ADD,
-// <FN>+M = KP_INS,
-// <FN>+. = KP_DEL,
-// <FN>+/ = KP_DIV.
-// The other FN combinations aren't passed to X, but are handled by BIOS.
-// <FN> and all keys with <FN> level mappings are marked in grey20.
-//
-// David Cameron Staples <staples@cs.mu.oz.au> 2006-05-12
-
-xkb_geometry "latitude" {
-
-    description= "Dell Latitude";
-    width= 330;
-    height= 210;
-
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18  ,18] }, { [2,1  ], [ 16,16] } };
-    shape "FUNC" { { [ 16.2,12] }, { [2,0.5], [ 14,10] } };
-    shape "ESC"  { { [ 18  ,12] }, { [2,0.5], [ 16,10] } };
-    shape "BKSP" { { [ 38  ,18] }, { [2,1  ], [ 36,16] } };
-    shape "TABK" { { [ 28  ,18] }, { [2,1  ], [ 26,16] } };
-    shape "BKSL" { { [ 28  ,18] }, { [2,1  ], [ 26,16] } };
-    shape "RTRN" { { [ 42  ,18] }, { [2,1  ], [ 40,16] } };
-    shape "CAPS" { { [ 33  ,18] }, { [2,1  ], [ 26,16] } };
-    shape "LFSH" { { [ 42  ,18] }, { [2,1  ], [ 40,16] } };
-    shape "RTSH" { { [ 52  ,18] }, { [2,1  ], [ 50,16] } };
-    shape "SPCE" { { [ 95  ,18] }, { [2,1  ], [ 93,16] } };
-    shape "LCTL" { { [ 28  ,14] }, { [2,1  ], [ 26,12] } };
-    shape "LALT" { { [ 22  ,14] }, { [2,1  ], [ 20,12] } };
-    shape "WIN"  { { [ 18  ,14] }, { [2,1  ], [ 16,12] } };
-
-    shape "LED"  { cornerRadius= 0.5, { [  1,  3 ] } };
-
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 37;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { left= 138; };
-    indicator "Caps Lock"    { left= 150; };
-    indicator "Scroll Lock"  { left= 162; };
-    text.top= 33;
-    text.color= "black";
-    text "NumLockLabel"		{ left= 140; text="Num\nLock"; };
-    text "CapsLockLabel"	{ left= 152; text="Caps\nLock"; };
-    text "ScrollLockLabel"	{ left= 164; text="Scroll\nLock"; };
-
-    text "LATITUDE"		{ left= 19; text="L A T I T U D E"; };
-
-    section.left= 19;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 32;
-	key.shape= "FUNC";
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    left= 163.8;
-	    keys {  { <MENU>, color="white" }, <PRSC>, <NMLK>, <PAUS>,
-	            { <INS>, 3, color="white" },
-		    { <HOME>, color="white"}, <PGUP>
-            };
-	};
-	row {
-	    top= 14;
-	    keys {  { <ESC>, "ESC" },
-		    { <FK01>, 3 },
-		    { <FK02>, color="white" }, <FK03>,
-		    { <FK04>, color="white" },
-		    { <FK05>, 3 },
-		    { <FK06>, color="white" }, <FK07>, <FK08>,
-		    { <FK09>, 3, color="white" }, <FK10>,
-		    { <FK11>, color="white" }, 
-		    { <FK12>, color="white" },
-		    { <DELE>, 3, color="white" }, <END>, <PGDN> 
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 60;
-	row {
-	    top= 1;
-	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, 
-		   { <AE07>, color="grey20" },
-		   { <AE08>, color="grey20" },
-		   { <AE09>, color="grey20" },
-		   { <AE10>, color="grey20" }, <AE11>, <AE12>,
-		   { <BKSP>, "BKSP" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, 
-		   { <AD07>, color="grey20" },
-		   { <AD08>, color="grey20" },
-		   { <AD09>, color="grey20" },
-		   { <AD10>, color="grey20" },
-		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <CAPS>, "CAPS" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, 
-		   { <AC07>, color="grey20" },
-		   { <AC08>, color="grey20" },
-		   { <AC09>, color="grey20" },
-		   { <AC10>, color="grey20" },
-		   <AC11>, { <RTRN>, "RTRN" }
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "LFSH" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, 
-		    { <AB07>, color="grey20" }, <AB08>,
-		    { <AB09>, color="grey20" },
-		    { <AB10>, color="grey20" },
-		    { <RTSH>, "RTSH" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "WIN";
-	    keys { { <LCTL>, "LCTL" },
-	           { <FN>, color="grey20" },
-		   <LWIN>,
-		   { <LALT>, "LALT" },
-		   { <SPCE>, "SPCE" },
-		   <RALT>,
-		   { <RCTL>, "LALT" }
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 136;
-	left= 250;
-	key.shape= "FUNC";
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    left= 18.2;
-	    keys { <UP> };
-	};
-	row {
-	    top= 14;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-
-}; // End of "latitude" geometry
-
-xkb_geometry "pc104alt" {
-
-    description= "Generic 104 with L-shaped Enter and small Backspace with Backslash left to it";
-    width= 470;
-    height= 210;
-
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
-    shape "BKSP" { { [ 19,18] }, { [2,1], [ 17,16] } };
-    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
-//    shape "RTRN" { { [ 0,19 ], [ 0,37 ], [ 42,37 ], [ 42,0 ], [ 14,0 ], [ 14,19 ] },
-//                   { [ 2,20 ], [ 2,35 ], [ 40,35 ], [ 40,1 ], [ 16,1 ], [ 16,20 ] },
-//                   approx = { [ 17,21 ], [ 39,34 ] }
-//                 };
-    shape "RTRN" { { [ -14,19 ], [ -14,37 ], [ 28,37 ], [ 28,0 ], [ 0,0 ], [ 0,19 ] },
-                   { [ -12,20 ], [ -12,35 ], [ 26,35 ], [ 26,1 ], [ 2,1 ], [ 2,20 ] },
-                   approx = { [ 3,21 ], [ 25,34 ] }
-                 };
-    shape "CAPS" { { [ 33,18] }, { [2,1], [ 31,16] } };
-    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,16] } };
-    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,16] } };
-    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
-    shape "SMOD" { { [ 23,18] }, { [2,1], [ 21,16] } };
-    shape "SPCE" { { [113,18] }, { [2,1], [111,16] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
-
-    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
-    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  52;
-	left= 377;
-	color= "grey10";
-    };
-
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 67;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { left= 382; };
-    indicator "Caps Lock"    { left= 407; };
-    indicator "Scroll Lock"  { left= 433; };
-    text.top= 55;
-    text.color= "black";
-    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
-    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
-    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
-
-    section.left= 19;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 52;
-	row {
-	    top= 1;
-	    keys {  { <ESC>, color="grey20" },
-		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
-		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
-		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
-		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 91;
-	row {
-	    top= 1;
-	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>, <BKSL>,
-		   { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK", color="grey20" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-//		   <AD11>, <AD12>, { <RTRN>, -13, "RTRN", color="grey20" }
-		   <AD11>, <AD12>, { <RTRN>, "RTRN", color="grey20" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <CAPS>, "CAPS", color="grey20" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "LFSH", color="grey20" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		    { <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "SMOD";
-	    key.color= "grey20";
-	    keys { { <LCTL>, "MODK" }, <LWIN>, <LALT>,
-		   { <SPCE>, "SPCE", color="white" },
-		   <RALT>, <RWIN>, <MENU>, <RCTL>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 91;
-	left= 312;
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-        row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 91;
-	left= 376;
-	row {
-	    top= 1;
-	    key.color= "grey20";
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-
-}; // End of "pc104" geometry
+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//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 OPEN GROUP 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 Open Group 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 Open Group.
+//
+
+default xkb_geometry "pc101" {
+
+    description= "Generic 101";
+    width= 470;
+    height= 180;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
+    shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "CAPS" { { [ 33,18] }, { [2,1], [ 31,16] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,16] } };
+    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
+    shape "SPCE" { { [133,18] }, { [2,1], [131,16] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
+
+    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  22;
+	left= 377;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 37;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 382; };
+    indicator "Caps Lock"    { left= 407; };
+    indicator "Scroll Lock"  { left= 433; };
+    text.top= 25;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 22;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LCTL>, { <LALT>, 21 },
+		   { <SPCE>, "SPCE", color="white" },
+		   <RALT>, { <RCTL>, 21 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 376;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "default" geometry
+
+xkb_geometry "pc102" {
+
+    description= "Generic 102";
+    width= 470;
+    height= 180;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
+    shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "RTRN" {
+        { [0,0], [28,0], [28,37], [5,37], [5,18], [0,18] },
+        { [2,1], [26,1], [26,35], [7,35], [7,16], [2,16] } };
+    shape "CAPS" { { [ 33,18] }, { [2,1], [ 31,16] } };
+    shape "LFSH" { { [ 25,18] }, { [2,1], [ 23,16] } };
+    shape "RTSH" { { [ 50,18] }, { [2,1], [ 48,16] } };
+    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
+    shape "SPCE" { { [134,18] }, { [2,1], [132,16] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
+
+    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  22;
+	left= 377;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 37;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 382; };
+    indicator "Caps Lock"    { left= 407; };
+    indicator "Scroll Lock"  { left= 433; };
+    text.top= 25;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 22;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, "TABK", color="grey20" },
+		    { <FK01>, 10 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, 
+		   { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <BKSL>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LCTL>, { <LALT>, 20 },
+		   { <SPCE>, "SPCE", color="white" },
+		   <RALT>, { <RCTL>, 21 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 376;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "pc102" geometry
+
+xkb_geometry "pc104" {
+
+    description= "Generic 104";
+    width= 470;
+    height= 180;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
+    shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "CAPS" { { [ 33,18] }, { [2,1], [ 31,16] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,16] } };
+    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
+    shape "SMOD" { { [ 23,18] }, { [2,1], [ 21,16] } };
+    shape "SPCE" { { [113,18] }, { [2,1], [111,16] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
+
+    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  22;
+	left= 377;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 37;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 382; };
+    indicator "Caps Lock"    { left= 407; };
+    indicator "Scroll Lock"  { left= 433; };
+    text.top= 25;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 22;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "SMOD";
+	    key.color= "grey20";
+	    keys { { <LCTL>, "MODK" }, <LWIN>, <LALT>,
+		   { <SPCE>, "SPCE", color="white" },
+		   <RALT>, <RWIN>, <MENU>, <RCTL>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 376;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "pc104" geometry
+
+xkb_geometry "pc105" {
+
+    description= "Generic 105";
+    width= 470;
+    height= 180;
+
+    shape.cornerRadius= 1;
+
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
+    shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "RTRN" {
+        { [0,0], [28,0], [28,37], [5,37], [5,18], [0,18] } ,
+        { [2,1], [26,1], [26,35], [7,35], [7,16], [2,16] } ,
+        approx = { [5,0], [28,37] } };
+    shape "CAPS" { { [ 33,18] }, { [2,1], [ 31,16] } };
+    shape "LFSH" { { [ 25,18] }, { [2,1], [ 23,16] } };
+    shape "RTSH" { { [ 50,18] }, { [2,1], [ 48,16] } };
+    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
+    shape "SMOD" { { [ 23,18] }, { [2,1], [ 21,16] } };
+    shape "SPCE" { { [113,18] }, { [2,1], [111,16] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
+
+    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  22;
+	left= 377;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 37;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 382; };
+    indicator "Caps Lock"    { left= 407; };
+    indicator "Scroll Lock"  { left= 433; };
+    text.top= 25;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 22;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN", color="grey20" } 
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <BKSL> 
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "SMOD";
+	    key.color= "grey20";
+	    keys { { <LCTL>, "MODK" }, <LWIN>, <LALT>,
+		   { <SPCE>, "SPCE", color="white" },
+		   <RALT>, <RWIN>, <MENU>, <RCTL>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 376;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "pc105" geometry
+
+
+// Added for japanese 106 keyboard
+//                     by tsuka@kawalab.dnj.ynu.ac.jp .
+xkb_geometry "jp106" {
+
+    description= "Japanese 106";
+    width= 470;
+    height= 180;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "BKSL" { { [ 27,18] }, { [2,1], [ 25,17] } };
+    shape "RTRN" {
+        { [0,0],[ 27,0],[27,37],[4,37],[4,18],[0,18] } ,
+        { [2,1],[ 25,1],[25,36],[5,36],[5,17],[2,17] } };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,17] } };
+    shape "RTSH" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "SPCE" { { [ 46,18] }, { [2,1], [ 44,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,36] } };
+
+    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  25;
+	left= 375;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 40;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 379; };
+    indicator "Caps Lock"    { left= 404; };
+    indicator "Scroll Lock"  { left= 429; };
+    text.top= 28;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 25;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 18 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 ,color="grey20"}, {<FK06>,color="grey20"}, 
+		    { <FK07>, color="grey20"}, {<FK08>,color="grey20"},
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { {<HZTG>,color="grey20"}, <AE01>, <AE02>, 
+                    <AE03>, <AE04>, <AE05>, <AE06>, <AE07>, 
+	            <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
+		    <AE13>, { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, 1 ,"RTRN",color="grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <AC12>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    <AB11>, { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LCTL>, { <LALT>, 20 },<NFER>,
+		   { <SPCE>, "SPCE", color="white" },
+		   <XFER>,<HKTG>,<RALT>, { <RCTL>, 17 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 310;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 375;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "jp106" geometry
+
+// Added for brazilian ABNT2 by Ricardo Y. Igarashi(iga@that.com.br)
+xkb_geometry "abnt2" {
+    include "pc(pc105)"
+
+    description= "Brazilian ABNT2";
+
+    shape "RTRN" {
+        { [0,0],[ 28,0],[28,37],[4,37],[4,18],[0,18] } ,
+        { [2,1],[ 26,1],[26,36],[5,36],[5,18],[2,18] } };
+    shape "RTSH" { { [ 31,18] }, { [2,1], [ 29,16] } };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <BKSL>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <AB11>,
+		    { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Keypad" {
+	top= 61;
+	left= 376;
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, { <KPPT>, color="grey20" } };
+	};
+    }; // End of "Keypad" section
+
+}; // End of "abnt2" geometry
+
+
+// Created by Alexander Pohoyda <alexander.pohoyda@gmx.net>
+
+xkb_geometry "pc86" {
+    description = "Noname keyboard with 86 keys, DE";
+    width = 287;
+    height = 143;
+    baseColor = "grey20";
+
+    shape "EDGE" { cornerRadius = 2, { [287, 143] } };
+    shape "LED"  { cornerRadius = 2, { [3, 3] } };
+    shape "LEDS" { cornerRadius = 0, { [75, 5] } };
+    shape "KEYS" { cornerRadius = 0, { [271, 109] } };
+
+    outline "Edges" {
+        top = 0;
+        left = 0;
+        shape = "EDGE";
+        color = "black";
+    };
+
+    solid "KeyPanel" {
+	shape = "KEYS";
+	left = 8;
+	top = 22;
+	color = "grey70";
+    };
+
+    solid "LedPanel" {
+	shape = "LEDS";
+	left = 212;
+	top = 10;
+	color = "black";
+    };
+
+    indicator.onColor = "green";
+    indicator.offColor = "green30";
+    indicator.top = 11;
+    indicator.shape = "LED";
+    indicator "Num Lock"     { left = 212 + 7; };
+    indicator "Caps Lock"    { left = 212 + 23; };
+    indicator "Scroll Lock"  { left = 212 + 39; };
+    text.fontSize = 6;
+    text.top = 10;
+    text.color = "white";
+    text "NumLockLabel"     { left = 212 + 7 + 5; text = "Num\nLock"; };
+    text "CapsLockLabel"    { left = 212 + 23 + 5; text = "Caps\nLock"; };
+    text "ScrollLockLabel"  { left = 212 + 39 + 5; text = "Scroll\nLock"; };
+
+    shape.cornerRadius = 1;
+    shape "SMALL"  { { [15, 12] }, { [1.5, 0], [13.5, 10] } };
+    shape "NARR"   { { [13, 18] }, { [1.5, 0], [11.5, 14] } };
+    shape "NORM"   { { [18, 18] }, { [3, 0], [15, 14] } };
+    shape "NORM_1" { { [22, 18] }, { [4, 0], [22, 18] },
+                                   { [7, 0], [19, 14] } };
+    shape "WIDER"  { { [23, 18] }, { [3, 0], [20, 14] } };
+    shape "WIDEST" { { [27, 18] }, { [3, 0], [24, 14] } };
+    shape "SPCE"   { { [75, 18] }, { [3, 0], [72, 14] } };
+
+    section "Function" {
+	key.shape = "SMALL";
+	key.gap = 0.99;
+	key.color = "grey30";
+	left = 8;
+	top = 22;
+	row {
+	    top = 1;
+	    keys {  <ESC>,
+	    	    <FK01>, <FK02>, <FK03>, <FK04>,
+		    <FK05>, <FK06>, <FK07>, <FK08>,
+		    <FK09>, <FK10>, <FK11>, <FK12>,
+		    <NMLK>, <PRSC>, <SCLK>, <PAUS>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Control" {
+	key.shape = "NORM";
+	key.gap = 1;
+	key.color = "grey30";
+        left = 8;
+	top = 111;
+	row {
+	    top = 1;
+	    keys { <LCTL>, <FN>, <LALT>,
+	           { <SPCE>, shape="SPCE", 39 }, <RALT>,
+		   <INS>, <DELE>
+	    };
+	};
+    }; // End of "Control" section
+
+    section "Editing" {
+        key.shape = "NARR";
+	key.gap = 1;
+	key.color = "grey30";
+	left = 265;
+	top = 34;
+        row.vertical = True;
+	row {
+	    top = 1;
+	    keys { <HOME>, <PGUP>, <PGDN>, <END> };
+	};
+    }; // End of "Editing" section
+
+    section "Navigation" {
+	key.gap = 1;
+	key.shape = "NARR";
+	key.color = "grey30";
+	left = 236;
+	top = 92;
+	row {
+	    left = 14;
+	    top = 1;
+	    keys { <UP> };
+	};
+	row {
+	    top = 20;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Navigation" section
+
+    section "Alpha" {
+	key.gap = 1;
+	key.shape = "NORM";
+	key.color = "grey10";
+        left = 8;
+	top = 35;
+	row {
+	    top = 1;
+	    keys { { <AE01>, shape="NORM_1" }, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+                   { <BKSP>, shape="WIDER", color="grey30" }
+	    };
+	};
+	row {
+	    top = 20;
+	    keys { { <TAB>, shape="NARR", color="grey30" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <AD13>, shape="NARR" }
+	    };
+	};
+	row {
+	    top = 39;
+	    keys { { <CAPS>, color="grey30" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, shape="WIDEST", color="grey30" }
+	    };
+	};
+	row {
+	    top = 58;
+	    keys { { <LFSH>, shape="WIDEST", color="grey30" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		    { <RTSH>, shape="WIDER", color="grey30" }
+	    };
+	};
+	row {
+            left = 57;
+	    top = 77;
+	    keys { <AE00>, <LSGT> };
+	};
+    }; // End of "Alpha" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+}; // End of "pc86" geometry
+
+xkb_geometry "kr106" {
+
+    description= "Korean 106";
+    width= 470;
+    height= 180;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
+    shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "CAPS" { { [ 33,18] }, { [2,1], [ 31,16] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,16] } };
+    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
+    shape "SMOD" { { [ 23,18] }, { [2,1], [ 21,16] } };
+    shape "SPCE" { { [ 75,18] }, { [2,1], [ 73,16] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
+
+    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  22;
+	left= 377;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 37;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 382; };
+    indicator "Caps Lock"    { left= 407; };
+    indicator "Scroll Lock"  { left= 433; };
+    text.top= 25;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 22;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "SMOD";
+	    key.color= "grey20";
+	    keys { { <LCTL>, "MODK" }, <LWIN>, <LALT>,
+		   { <K71>, "NORM", color="white" },
+		   { <SPCE>, "SPCE", color="white" },
+		   { <K72>, "NORM", color="white" },
+		   <RALT>, <RWIN>, <MENU>, <RCTL>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 376;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "kr106" geometry
+
+// Based on the pc(pc105) layout. The keypad, sysreq/ScrLk/Break, and multimedia
+// keys are not shown because they are shared with other keys via the <FN> key.
+// This should not be a problem if the normal symbols are used, as the keys will
+// show through normally, they just won't show from xkbprint. For the record,
+// <FN>+<PGUP> = AudioRaise,
+// <FN>+<PGDN> = AudioLower,
+// <FN>+<END> = AudioMute,
+// <FN>+<PRSC> = Sysreq,
+// <FN>+<NMLK> = ScrollLock,
+// <FN>+<BREAK> = <PAUS>,
+// <FN>+7 = KP_7,
+// <FN>+8 = KP_8,
+// <FN>+9 = KP_9,
+// <FN>+0 = KP_MUL,
+// <FN>+U = KP_4,
+// <FN>+I = KP_5,
+// <FN>+O = KP_6,
+// <FN>+P = KP_SUB,
+// <FN>+J = KP_1,
+// <FN>+K = KP_2,
+// <FN>+L = KP_3,
+// <FN>+; = KP_ADD,
+// <FN>+M = KP_INS,
+// <FN>+. = KP_DEL,
+// <FN>+/ = KP_DIV.
+// The other FN combinations aren't passed to X, but are handled by BIOS.
+// <FN> and all keys with <FN> level mappings are marked in grey20.
+//
+// David Cameron Staples <staples@cs.mu.oz.au> 2006-05-12
+
+xkb_geometry "latitude" {
+
+    description= "Dell Latitude";
+    width= 330;
+    height= 210;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18  ,18] }, { [2,1  ], [ 16,16] } };
+    shape "FUNC" { { [ 16.2,12] }, { [2,0.5], [ 14,10] } };
+    shape "ESC"  { { [ 18  ,12] }, { [2,0.5], [ 16,10] } };
+    shape "BKSP" { { [ 38  ,18] }, { [2,1  ], [ 36,16] } };
+    shape "TABK" { { [ 28  ,18] }, { [2,1  ], [ 26,16] } };
+    shape "BKSL" { { [ 28  ,18] }, { [2,1  ], [ 26,16] } };
+    shape "RTRN" { { [ 42  ,18] }, { [2,1  ], [ 40,16] } };
+    shape "CAPS" { { [ 33  ,18] }, { [2,1  ], [ 26,16] } };
+    shape "LFSH" { { [ 42  ,18] }, { [2,1  ], [ 40,16] } };
+    shape "RTSH" { { [ 52  ,18] }, { [2,1  ], [ 50,16] } };
+    shape "SPCE" { { [ 95  ,18] }, { [2,1  ], [ 93,16] } };
+    shape "LCTL" { { [ 28  ,14] }, { [2,1  ], [ 26,12] } };
+    shape "LALT" { { [ 22  ,14] }, { [2,1  ], [ 20,12] } };
+    shape "WIN"  { { [ 18  ,14] }, { [2,1  ], [ 16,12] } };
+
+    shape "LED"  { cornerRadius= 0.5, { [  1,  3 ] } };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 37;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 138; };
+    indicator "Caps Lock"    { left= 150; };
+    indicator "Scroll Lock"  { left= 162; };
+    text.top= 33;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 140; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 152; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 164; text="Scroll\nLock"; };
+
+    text "LATITUDE"		{ left= 19; text="L A T I T U D E"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 32;
+	key.shape= "FUNC";
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    left= 163.8;
+	    keys {  { <MENU>, color="white" }, <PRSC>, <NMLK>, <PAUS>,
+	            { <INS>, 3, color="white" },
+		    { <HOME>, color="white"}, <PGUP>
+            };
+	};
+	row {
+	    top= 14;
+	    keys {  { <ESC>, "ESC" },
+		    { <FK01>, 3 },
+		    { <FK02>, color="white" }, <FK03>,
+		    { <FK04>, color="white" },
+		    { <FK05>, 3 },
+		    { <FK06>, color="white" }, <FK07>, <FK08>,
+		    { <FK09>, 3, color="white" }, <FK10>,
+		    { <FK11>, color="white" }, 
+		    { <FK12>, color="white" },
+		    { <DELE>, 3, color="white" }, <END>, <PGDN> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 60;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, 
+		   { <AE07>, color="grey20" },
+		   { <AE08>, color="grey20" },
+		   { <AE09>, color="grey20" },
+		   { <AE10>, color="grey20" }, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, 
+		   { <AD07>, color="grey20" },
+		   { <AD08>, color="grey20" },
+		   { <AD09>, color="grey20" },
+		   { <AD10>, color="grey20" },
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, 
+		   { <AC07>, color="grey20" },
+		   { <AC08>, color="grey20" },
+		   { <AC09>, color="grey20" },
+		   { <AC10>, color="grey20" },
+		   <AC11>, { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, 
+		    { <AB07>, color="grey20" }, <AB08>,
+		    { <AB09>, color="grey20" },
+		    { <AB10>, color="grey20" },
+		    { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "WIN";
+	    keys { { <LCTL>, "LCTL" },
+	           { <FN>, color="grey20" },
+		   <LWIN>,
+		   { <LALT>, "LALT" },
+		   { <SPCE>, "SPCE" },
+		   <RALT>,
+		   { <RCTL>, "LALT" }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 136;
+	left= 250;
+	key.shape= "FUNC";
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    left= 18.2;
+	    keys { <UP> };
+	};
+	row {
+	    top= 14;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "latitude" geometry
+
+xkb_geometry "pc104alt" {
+
+    description= "Generic 104 with L-shaped Enter and small Backspace with Backslash left to it";
+    width= 470;
+    height= 210;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
+    shape "BKSP" { { [ 19,18] }, { [2,1], [ 17,16] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
+//    shape "RTRN" { { [ 0,19 ], [ 0,37 ], [ 42,37 ], [ 42,0 ], [ 14,0 ], [ 14,19 ] },
+//                   { [ 2,20 ], [ 2,35 ], [ 40,35 ], [ 40,1 ], [ 16,1 ], [ 16,20 ] },
+//                   approx = { [ 17,21 ], [ 39,34 ] }
+//                 };
+    shape "RTRN" { { [ -14,19 ], [ -14,37 ], [ 28,37 ], [ 28,0 ], [ 0,0 ], [ 0,19 ] },
+                   { [ -12,20 ], [ -12,35 ], [ 26,35 ], [ 26,1 ], [ 2,1 ], [ 2,20 ] },
+                   approx = { [ 3,21 ], [ 25,34 ] }
+                 };
+    shape "CAPS" { { [ 33,18] }, { [2,1], [ 31,16] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,16] } };
+    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
+    shape "SMOD" { { [ 23,18] }, { [2,1], [ 21,16] } };
+    shape "SPCE" { { [113,18] }, { [2,1], [111,16] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
+
+    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  52;
+	left= 377;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 67;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 382; };
+    indicator "Caps Lock"    { left= 407; };
+    indicator "Scroll Lock"  { left= 433; };
+    text.top= 55;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 52;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 91;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, <BKSL>,
+		   { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+//		   <AD11>, <AD12>, { <RTRN>, -13, "RTRN", color="grey20" }
+		   <AD11>, <AD12>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "SMOD";
+	    key.color= "grey20";
+	    keys { { <LCTL>, "MODK" }, <LWIN>, <LALT>,
+		   { <SPCE>, "SPCE", color="white" },
+		   <RALT>, <RWIN>, <MENU>, <RCTL>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 91;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 91;
+	left= 376;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "pc104" geometry
diff --git a/xorg-server/xkeyboard-config/geometry/sanwa b/xorg-server/xkeyboard-config/geometry/sanwa
index af134d725..350dbd160 100644
--- a/xorg-server/xkeyboard-config/geometry/sanwa
+++ b/xorg-server/xkeyboard-config/geometry/sanwa
@@ -1,150 +1,150 @@
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//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 OPEN GROUP 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 Open Group 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 Open Group.
-//
-default xkb_geometry "sanwaskbkg3" {
-
-    description= "Sanwa Supply SKB-KG3";
-    // SKB-KG3BK (black)
-    // http://www.sanwa.co.jp/product/syohin.asp?code=SKB-KG3BK
-    // http://www.sanwa.co.jp/zooma/keybord/SKB-KG3BK/
-    // SKB-KG3W (white)
-    // http://www.sanwa.co.jp/product/syohin.asp?code=SKB-KG3W
-    // http://www.sanwa.co.jp/zooma/keybord/SKB-KG3SW/
-    // SKB-KG3SV (silver)
-    // http://www.sanwa.co.jp/product/syohin.asp?code=SKB-KG3SV
-    // http://www.sanwa.co.jp/zooma/keybord/SKB-KG3SV/
-
-    width= 304;
-    height= 127;
-
-    shape.cornerRadius= 1;
-    shape "TOP"  { { [15.25,13] }, { [2,2], [13.25,11] } };
-    shape "NORM" { { [17,16] }, { [2,2], [15,14] } };
-    shape "TBBK" { { [24.5,16] }, { [2,2], [22.5,14] } };
-    shape "RTRN" { { [0,0], [36,0], [36,34], [8.5,34], [8.5,16], [0,16] },
-                   { [2,2], [34,2], [34,32], [10.5,32], [10.5,14], [2,14] } };
-    shape "CAPS" { { [33,16] }, { [28,16] }, { [2,2], [26,14] } };
-    shape "LFSH" { { [41,16] }, { [2,2], [39,14] } };
-    shape "CTSH" { { [19.5,16] }, { [2,2], [17.5,14] } };
-    shape "SPCE" { { [57.5,16] }, { [2,2], [55.5,14] } };
-
-    shape "LED"  { cornerRadius= 0, { [5,1] } };
-
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 3;
-    indicator.shape= "LED";
-    indicator "Num Lock"    { left= 247; };
-    indicator "Caps Lock"   { left= 266; };
-    indicator "Scroll Lock" { left= 285; };
-    text.color= "black";
-    text.top= 1;
-    text "Vendor1"          { left=  10; text="SANWA"; };
-    text.top= 4.5;
-    text "Vendor2"          { left=  10; text="SUPPLY"; };
-    text "NumLockLabel"     { left= 241; text="Num Lock"; };
-    text "CapsLockLabel"    { left= 260; text="Caps Lock"; };
-    text "ScrollLockLabel"  { left= 279; text="Scroll Lock"; };
-
-    section.left= 3;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap= 2;
-    section "Function" {
-        key.shape= "TOP";
-        top= 10;
-        row {
-            top= 1;
-            keys { <ESC>, <FK01>, <FK02>, <FK03>, <FK04>, <FK05>, <FK06>,
-                   <FK07>, <FK08>, <FK09>, <FK10>, <FK11>, <FK12>, <PRSC>,
-                   {<NMLK>, color="grey20"}, <PAUS>, {<DELE>, color="grey20"}
-            };
-        };
-        overlay "SCLK" {
-            <NMLK>=<SCLK>
-        };
-        overlay "FN" {
-            <DELE>=<INS>
-        };
-    }; // End of "Function" section
-
-    section "Alpha" {
-        top= 24;
-        row {
-            top= 2;
-            keys { <HZTG>, <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>,
-                   {<AE07>, color="grey20"}, {<AE08>, color="grey20"},
-                   {<AE09>, color="grey20"}, {<AE10>, color="grey20"},
-                   <AE11>, <AE12>, <AE13>, { <BKSP>, "TBBK" }
-            };
-        };
-        row {
-            top= 20;
-            keys { { <TAB>, "TBBK" }, <AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
-                   <AD06>, {<AD07>, color="grey20"}, {<AD08>, color="grey20"},
-                   {<AD09>, color="grey20"}, {<AD10>, color="grey20"}, <AD11>,
-                   <AD12>, { <RTRN>, "RTRN" }
-            };
-        };
-        row {
-            top= 38;
-            keys { { <CAPS>, "CAPS" }, <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
-                   <AC06>, {<AC07>, color="grey20"}, {<AC08>, color="grey20"},
-                   {<AC09>, color="grey20"}, {<AC10>, color="grey20"}, <AC11>,
-                   <AC12>
-            };
-        };
-        row {
-            top= 56;
-            keys { { <LFSH>, "LFSH" }, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>,
-                   <AB06>, {<AB07>, color="grey20"}, <AB08>,
-                   {<AB09>, color="grey20"}, {<AB10>, color="grey20"}, <AB11>,
-                   {<UP>, color="grey20"}, {<RTSH>, key.shape= "CTSH" }
-            };
-        };
-        row {
-            top= 74;
-            keys { { <LCTL>, key.shape= "CTSH" }, {<FN>, color="grey20"},
-                   <LWIN>, <LALT>, <NFER>, {<SPCE>, "SPCE" }, <XFER>, <HKTG>,
-                   <RALT>, <MENU>, {<LEFT>, color="grey20"},
-                   {<DOWN>, color="grey20"},
-                   {<RGHT>, key.shape= "CTSH", color="grey20"}
-            };
-        };
-        overlay "SCLK" {
-            <AE07>=<KO7>, <AE08>=<KO8>, <AE09>=<KO9>, <AE10>=<KOMU>,
-            <AD07>=<KO4>, <AD08>=<KO5>, <AD09>=<KO6>, <AD10>=<KOSU>,
-            <AC07>=<KO1>, <AC08>=<KO2>, <AC09>=<KO3>, <AC10>=<KOAD>,
-            <AB07>=<KO0>, <AB09>=<KODL>, <AB10>=<KODV>
-        };
-        overlay "FN" {
-            <UP>=<PGUP>, <LEFT>=<HOME>, <DOWN>=<PGDN>, <RGHT>=<END>
-        };
-    }; // End of "Alpha" section
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-
-}; // End of "default" geometry
+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//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 OPEN GROUP 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 Open Group 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 Open Group.
+//
+default xkb_geometry "sanwaskbkg3" {
+
+    description= "Sanwa Supply SKB-KG3";
+    // SKB-KG3BK (black)
+    // http://www.sanwa.co.jp/product/syohin.asp?code=SKB-KG3BK
+    // http://www.sanwa.co.jp/zooma/keybord/SKB-KG3BK/
+    // SKB-KG3W (white)
+    // http://www.sanwa.co.jp/product/syohin.asp?code=SKB-KG3W
+    // http://www.sanwa.co.jp/zooma/keybord/SKB-KG3SW/
+    // SKB-KG3SV (silver)
+    // http://www.sanwa.co.jp/product/syohin.asp?code=SKB-KG3SV
+    // http://www.sanwa.co.jp/zooma/keybord/SKB-KG3SV/
+
+    width= 304;
+    height= 127;
+
+    shape.cornerRadius= 1;
+    shape "TOP"  { { [15.25,13] }, { [2,2], [13.25,11] } };
+    shape "NORM" { { [17,16] }, { [2,2], [15,14] } };
+    shape "TBBK" { { [24.5,16] }, { [2,2], [22.5,14] } };
+    shape "RTRN" { { [0,0], [36,0], [36,34], [8.5,34], [8.5,16], [0,16] },
+                   { [2,2], [34,2], [34,32], [10.5,32], [10.5,14], [2,14] } };
+    shape "CAPS" { { [33,16] }, { [28,16] }, { [2,2], [26,14] } };
+    shape "LFSH" { { [41,16] }, { [2,2], [39,14] } };
+    shape "CTSH" { { [19.5,16] }, { [2,2], [17.5,14] } };
+    shape "SPCE" { { [57.5,16] }, { [2,2], [55.5,14] } };
+
+    shape "LED"  { cornerRadius= 0, { [5,1] } };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 3;
+    indicator.shape= "LED";
+    indicator "Num Lock"    { left= 247; };
+    indicator "Caps Lock"   { left= 266; };
+    indicator "Scroll Lock" { left= 285; };
+    text.color= "black";
+    text.top= 1;
+    text "Vendor1"          { left=  10; text="SANWA"; };
+    text.top= 4.5;
+    text "Vendor2"          { left=  10; text="SUPPLY"; };
+    text "NumLockLabel"     { left= 241; text="Num Lock"; };
+    text "CapsLockLabel"    { left= 260; text="Caps Lock"; };
+    text "ScrollLockLabel"  { left= 279; text="Scroll Lock"; };
+
+    section.left= 3;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap= 2;
+    section "Function" {
+        key.shape= "TOP";
+        top= 10;
+        row {
+            top= 1;
+            keys { <ESC>, <FK01>, <FK02>, <FK03>, <FK04>, <FK05>, <FK06>,
+                   <FK07>, <FK08>, <FK09>, <FK10>, <FK11>, <FK12>, <PRSC>,
+                   {<NMLK>, color="grey20"}, <PAUS>, {<DELE>, color="grey20"}
+            };
+        };
+        overlay "SCLK" {
+            <NMLK>=<SCLK>
+        };
+        overlay "FN" {
+            <DELE>=<INS>
+        };
+    }; // End of "Function" section
+
+    section "Alpha" {
+        top= 24;
+        row {
+            top= 2;
+            keys { <HZTG>, <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>,
+                   {<AE07>, color="grey20"}, {<AE08>, color="grey20"},
+                   {<AE09>, color="grey20"}, {<AE10>, color="grey20"},
+                   <AE11>, <AE12>, <AE13>, { <BKSP>, "TBBK" }
+            };
+        };
+        row {
+            top= 20;
+            keys { { <TAB>, "TBBK" }, <AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
+                   <AD06>, {<AD07>, color="grey20"}, {<AD08>, color="grey20"},
+                   {<AD09>, color="grey20"}, {<AD10>, color="grey20"}, <AD11>,
+                   <AD12>, { <RTRN>, "RTRN" }
+            };
+        };
+        row {
+            top= 38;
+            keys { { <CAPS>, "CAPS" }, <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+                   <AC06>, {<AC07>, color="grey20"}, {<AC08>, color="grey20"},
+                   {<AC09>, color="grey20"}, {<AC10>, color="grey20"}, <AC11>,
+                   <AC12>
+            };
+        };
+        row {
+            top= 56;
+            keys { { <LFSH>, "LFSH" }, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>,
+                   <AB06>, {<AB07>, color="grey20"}, <AB08>,
+                   {<AB09>, color="grey20"}, {<AB10>, color="grey20"}, <AB11>,
+                   {<UP>, color="grey20"}, {<RTSH>, key.shape= "CTSH" }
+            };
+        };
+        row {
+            top= 74;
+            keys { { <LCTL>, key.shape= "CTSH" }, {<FN>, color="grey20"},
+                   <LWIN>, <LALT>, <NFER>, {<SPCE>, "SPCE" }, <XFER>, <HKTG>,
+                   <RALT>, <MENU>, {<LEFT>, color="grey20"},
+                   {<DOWN>, color="grey20"},
+                   {<RGHT>, key.shape= "CTSH", color="grey20"}
+            };
+        };
+        overlay "SCLK" {
+            <AE07>=<KO7>, <AE08>=<KO8>, <AE09>=<KO9>, <AE10>=<KOMU>,
+            <AD07>=<KO4>, <AD08>=<KO5>, <AD09>=<KO6>, <AD10>=<KOSU>,
+            <AC07>=<KO1>, <AC08>=<KO2>, <AC09>=<KO3>, <AC10>=<KOAD>,
+            <AB07>=<KO0>, <AB09>=<KODL>, <AB10>=<KODV>
+        };
+        overlay "FN" {
+            <UP>=<PGUP>, <LEFT>=<HOME>, <DOWN>=<PGDN>, <RGHT>=<END>
+        };
+    }; // End of "Alpha" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "default" geometry
diff --git a/xorg-server/xkeyboard-config/geometry/sgi_vndr/Makefile.am b/xorg-server/xkeyboard-config/geometry/sgi_vndr/Makefile.am
index 5c76e4b4c..11911db3c 100644
--- a/xorg-server/xkeyboard-config/geometry/sgi_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/geometry/sgi_vndr/Makefile.am
@@ -1,4 +1,4 @@
-geomdir = $(xkb_base)/geometry/sgi_vndr
-
-dist_geom_DATA = \
-indigo  indy  O2
+geomdir = $(xkb_base)/geometry/sgi_vndr
+
+dist_geom_DATA = \
+indigo  indy  O2
diff --git a/xorg-server/xkeyboard-config/geometry/sgi_vndr/O2 b/xorg-server/xkeyboard-config/geometry/sgi_vndr/O2
index afaed76f2..8bd177970 100644
--- a/xorg-server/xkeyboard-config/geometry/sgi_vndr/O2
+++ b/xorg-server/xkeyboard-config/geometry/sgi_vndr/O2
@@ -1,614 +1,614 @@
-//
-// Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
-//
-// Permission to use, copy, modify, and distribute this
-// software and its documentation for any purpose and without
-// fee is hereby granted, provided that the above copyright
-// notice appear in all copies and that both that copyright
-// notice and this permission notice appear in supporting
-// documentation, and that the name of Silicon Graphics not be 
-// used in advertising or publicity pertaining to distribution 
-// of the software without specific prior written permission.
-// Silicon Graphics makes no representation about the suitability 
-// of this software for any purpose. It is provided "as is"
-// without any express or implied warranty.
-// 
-// SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-// SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-// AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-// GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-// DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-// DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-// THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-default xkb_geometry "pc101" {
-
-    // This is an approximate layout for a 101-key (US/ASCII) SGI
-    // keyboard.  I just took a similar layout (101 key PC keyboard)
-    // and adjusted the sizes of a few keys by eye.  I didn't actually
-    // *measure* a real keyboard.
-
-    description= "101-key keyboard for Silicon Graphics O2";
-
-    width= 448;
-    height= 162;
-
-    shape "EDGE" { 
-	cornerRadius= 2, 
-	{ [ 15,    0 ], [ 433,   0 ], [ 433, 10 ], [ 448, 10 ],
-	  [ 448, 162 ], [   0, 162 ], [   0, 10 ], [ 15,  10 ] }
-    };
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
-    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "TABK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "BKSL" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "RTRN" { { [ 40,18] }, { [2,1], [37,17] } };
-    shape "CAPS" { { [ 34,18] }, { [2,1], [29,17] } };
-    shape "RTSH" { { [ 49,18] }, { [2,1], [47,17] } };
-    shape "LFSH" { { [ 44,18] }, { [2,1], [42,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "SPCE" { { [130,18] }, { [2,1], [128,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-    shape "LOGO" { { [ 12,12] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 6;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 25;
-	row {
-	    top= 1;
-	    keys {	{ <ESC>, color="grey20" },
-			{ <FK01>, 19}, <FK02>, <FK03>, <FK04>,
-			{ <FK05>, 11}, <FK06>, <FK07>, <FK08>,
-			{ <FK09>, 11}, <FK10>, <FK11>, <FK12>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 58;
-	row {
-	    top= 1;
-	    keys { 	<TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
-			<AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-			<AE10>, <AE11>, <AE12>,
-			{ <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys {	{ <TAB>, "TABK", color= "grey20" },
-			<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-			<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-			<AD11>, <AD12>,
-			{ <BKSL>, "BKSL" }
-	    };	
-	};
-	row {
-	    top= 39;
-	    keys { 	{ <CAPS>, "CAPS", color="grey20" },
-	 		<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-			<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-			<AC11>, { <RTRN>, "RTRN", color="grey20" }
-	    };
-	};
-	row {
-	    top= 58;
-	    keys {	{ <LFSH>, "LFSH", color="grey20" }, 
-	 		<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-			<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-			{ <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "MODK";
-	    key.color= "grey20";
-	    keys {	<LCTL>,	{ <LALT>, 20 },
-			{ <SPCE>, "SPCE",color="white" },
-			<RALT>, { <RCTL>, 20 }
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 25;
-	left= 299;
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    keys { <PRSC>, <SCLK>, <PAUS> };
-	};
-	row {
-	    top= 33;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-	row {
-	    top= 53;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 91;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 110;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
-    shape "LED"  { cornerRadius= 0, { [  3, 1.5] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  25;
-	left= 364;
-	color= "grey10";
-    };
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 40.5;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { left= 372; };
-    indicator "Caps Lock"    { left= 397; };
-    indicator "Scro llLock"  { left= 422; };
-
-    text.font= "helvetica";
-    text.weight= "bold";
-    text.slant= "r";
-    text.fontWidth= "normal";
-    text.fontSize= 12;
-    text.top= 39.5;
-    text.color= "black";
-    text "NumLockLabel"		{ left= 376.5; text="1"; };
-    text "CapsLockLabel"	{ left= 401.5; text="A"; };
-    text "ScrollLockLabel"	{ left= 426.5; text="S"; };
-    
-    logo "SGILogoImage" 	{ 
-	top= 26.5;
-	left= 396;
-	name= "SGI"; 
-	shape= "LOGO"; 
-    };
-    text.font= "helvetica";
-    text.weight= "bold";
-    text.slant= "o";
-    text.fontWidth= "narrow";
-    text.fontSize= 18;
-    text "SiliconLogoText"	{
-	top= 27;
-	left= 375;
-	width= 20;
-	text= "Silicon";
-    };
-    text "GraphicsLogoText"	{
-	top= 27;
-	left= 409;
-	width= 20;
-	text= "Graphics";
-    };
-
-    section "Keypad" {
-	top= 58;
-	left= 363;
-	row {
-	    top= 1;
-	    key.color= "grey20";
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-    	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-};
-
-xkb_geometry "pc102" {
-
-    // This is an approximate layout for 102-key SGI international
-    // keyboards.  I just took a similar layout (101 key PC keyboard)
-    // and adjusted the sizes of a few keys by eye.  I didn't actually
-    // *measure* a real keyboard.
-
-    description= "Silicon Graphics 102-key Keyboard";
-    width= 470;
-    height= 193;
-
-    shape.cornerRadius= 1;
-    shape "EDGE" { cornerRadius=2, { [ 470, 193 ] } };
-    shape "NORM" { { [18,18] }, { [2,1], [16,17] } };
-    shape "BKSP" { { [35,18] }, { [2,1], [33,17] } };
-    shape "TABK" { { [27,18] }, { [2,1], [25,17] } };
-    shape "RTRN" {
-	approx = { [ 0, 0], [26,37] },
-	{ [ 0, 0], [26, 0], [26,37],
-	  [ 5,37], [ 5,18], [ 0,18] },
-	{ [ 1, 1], [24, 1], [24,36],
-	  [ 7,36], [ 7,17], [ 1,17] }
-    };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [25,17] } };
-    shape "RTSH" { { [ 50,18] }, { [2,1], [48,17] } };
-    shape "LFSH" { { [ 22,18] }, { [2,1], [20,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "SPCE" { { [130,18] }, { [2,1], [128,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-    shape "LOGO" { { [ 16,16] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 19;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 50;
-	row {
-	    top= 1;
-	    keys {  	{ <ESC>, color="grey20" },
-			{ <FK01>, 18}, <FK02>, <FK03>, <FK04>,
-			{ <FK05>, 10}, <FK06>, <FK07>, <FK08>,
-			{ <FK09>, 10}, <FK10>, <FK11>, <FK12>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 83;
-	row {
-	    top= 1;
-	    keys { 	<TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
-			<AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-			<AE10>, <AE11>, <AE12>,
-			{ <BKSP>, "BKSP", color= "grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { 	{ <TAB>, "TABK", color= "grey20" },
-			<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-			<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-			<AD11>, <AD12>,
-			{ <RTRN>, "RTRN", color= "grey20" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { 	{ <CAPS>, "CAPS", color= "grey20" },
-			<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-			<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-			<AC11>, <BKSL>
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { 	{ <LFSH>, "LFSH", color= "grey20" }, <LSGT>,
-			<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-			<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-			{ <RTSH>, "RTSH", color= "grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "MODK";
-	    key.color= "grey20";
-	    keys {	<LCTL>,
-			{ <LALT>, 19 },
-			{ <SPCE>, "SPCE", color="white" },
-			<RALT>,
-			{ <RCTL>, 19 }
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 50;
-	left= 308;
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    keys { <PRSC>, <SCLK>, <PAUS> };
-	};
-	row {
-	    top= 33;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-	row {
-	    top= 53;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 91;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 110;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
-    shape "LED"  { cornerRadius= 0, { [  1,  3 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  50;
-	left= 375;
-	color= "grey10";
-    };
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 64.5;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { left= 384; };
-    indicator "Caps Lock"    { left= 409; };
-    indicator "Scroll Lock"  { left= 434; };
-    text.top= 52;
-    text.color= "black";
-    text "NumLockLabel"		{ left= 380.5; text="Num\nLock"; };
-    text "CapsLockLabel"	{ left= 405; text="Caps\nLock"; };
-    text "ScrollLockLabel"	{ left= 430; text="Scroll\nLock"; };
-
-    logo "SGILogoImage" { 
-	top= 17;
-	left= 22;
-	name= "SGI"; 
-	shape= "LOGO"; 
-    };
-    text "SGILogoText"	{
-	top= 21;
-	left= 40;
-	width= 50;
-	text= "SiliconGraphics";
-	font= "helvetica";
-	slant= "o";
-	weight= "bold";
-	setWidth= "narrow";
-	fontSize= 24;
-    };
-
-    section "Keypad" {
-	top= 83;
-	left= 374;
-	row {
-	    top= 1;
-	    key.color= "grey20";
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-};
-
-xkb_geometry "jp106" {
-    description= "Silicon Graphics 106-key Japanese keyboard";
-    width= 442;
-    height= 167;
-
-    shape "EDGE" { cornerRadius= 2, { [ 442, 167 ] } };
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
-    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };
-    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "BKSL" { { [ 27,18] }, { [2,1], [ 25,17] } };
-    shape "RTRN" {
-        { [0,0],[ 27,0],[27,37],[4,37],[4,18],[0,18] } ,
-        { [2,1],[ 25,1],[25,36],[5,36],[5,17],[2,17] } };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [ 30,17] } };
-    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,17] } };
-    shape "RTSH" { { [ 32,18] }, { [2,1], [ 30,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "SPCE" { { [ 46,18] }, { [2,1], [ 44,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,36] } };
-    shape "LOGO" { { [ 16,16] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    logo "SGILogoImage" { 
-	top= 5;
-	left= 6;
-	name= "SGI"; 
-	shape= "LOGO"; 
-    };
-
-    text "SGILogoText"	{
-	top= 9;
-	left= 25;
-	width= 50;
-	text= "SiliconGraphics";
-	font= "helvetica";
-	slant= "o";
-	weight= "bold";
-	fontWidth= "narrow";
-	fontSize= 24;
-    };
-
-    shape "LEDS" { cornerRadius= 0.1, { [ 76 ,20 ] } };
-    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  25;
-	left= 362;
-	color= "grey10";
-    };
-
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 40;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { left= 366; };
-    indicator "Caps Lock"    { left= 391; };
-    indicator "Scroll Lock"  { left= 416; };
-    text.top= 28;
-    text.color= "black";
-    text "NumLockLabel"		{ left= 366; text="Num\nLock"; };
-    text "CapsLockLabel"	{ left= 391; text="Caps\nLock"; };
-    text "ScrollLockLabel"	{ left= 416; text="Scroll\nLock"; };
-
-    section.left= 5;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 25;
-	row {
-	    top= 1;
-	    keys {  { <ESC>, color="grey20" },
-		    { <FK01>, 18 }, <FK02>, <FK03>, <FK04>,
-		    { <FK05>, 11 ,color="grey20"}, {<FK06>,color="grey20"}, 
-		    { <FK07>, color="grey20"}, {<FK08>,color="grey20"},
-		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
-		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 61;
-	row {
-	    top= 1;
-	    keys { {<HZTG>,color="grey20"}, <AE01>, <AE02>, 
-                    <AE03>, <AE04>, <AE05>, <AE06>, <AE07>, 
-	            <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
-		    <AE13>, { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK", color="grey20" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <RTRN>, 1 ,"RTRN",color="grey20" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <CAPS>, "CAPS", color="grey20" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, <AC12>
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "LFSH", color="grey20" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		    <AB11>, { <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "MODK";
-	    key.color= "grey20";
-	    keys { <LCTL>, { <LALT>, 20 },<NFER>,
-		   { <SPCE>, "SPCE", color="white" },
-		   <XFER>,<HKTG>,<RALT>, { <RCTL>, 17 }
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 61;
-	left= 296;
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-        row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 61;
-	left= 361;
-	row {
-	    top= 1;
-	    key.color= "grey20";
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-
-}; // End of "jp106" geometry
+//
+// Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
+//
+// Permission to use, copy, modify, and distribute this
+// software and its documentation for any purpose and without
+// fee is hereby granted, provided that the above copyright
+// notice appear in all copies and that both that copyright
+// notice and this permission notice appear in supporting
+// documentation, and that the name of Silicon Graphics not be 
+// used in advertising or publicity pertaining to distribution 
+// of the software without specific prior written permission.
+// Silicon Graphics makes no representation about the suitability 
+// of this software for any purpose. It is provided "as is"
+// without any express or implied warranty.
+// 
+// SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+// SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+// AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+// GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
+// DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
+// DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+// THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+default xkb_geometry "pc101" {
+
+    // This is an approximate layout for a 101-key (US/ASCII) SGI
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes of a few keys by eye.  I didn't actually
+    // *measure* a real keyboard.
+
+    description= "101-key keyboard for Silicon Graphics O2";
+
+    width= 448;
+    height= 162;
+
+    shape "EDGE" { 
+	cornerRadius= 2, 
+	{ [ 15,    0 ], [ 433,   0 ], [ 433, 10 ], [ 448, 10 ],
+	  [ 448, 162 ], [   0, 162 ], [   0, 10 ], [ 15,  10 ] }
+    };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "BKSL" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" { { [ 40,18] }, { [2,1], [37,17] } };
+    shape "CAPS" { { [ 34,18] }, { [2,1], [29,17] } };
+    shape "RTSH" { { [ 49,18] }, { [2,1], [47,17] } };
+    shape "LFSH" { { [ 44,18] }, { [2,1], [42,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [130,18] }, { [2,1], [128,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "LOGO" { { [ 12,12] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 6;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 25;
+	row {
+	    top= 1;
+	    keys {	{ <ESC>, color="grey20" },
+			{ <FK01>, 19}, <FK02>, <FK03>, <FK04>,
+			{ <FK05>, 11}, <FK06>, <FK07>, <FK08>,
+			{ <FK09>, 11}, <FK10>, <FK11>, <FK12>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 58;
+	row {
+	    top= 1;
+	    keys { 	<TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+			<AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+			<AE10>, <AE11>, <AE12>,
+			{ <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys {	{ <TAB>, "TABK", color= "grey20" },
+			<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+			<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+			<AD11>, <AD12>,
+			{ <BKSL>, "BKSL" }
+	    };	
+	};
+	row {
+	    top= 39;
+	    keys { 	{ <CAPS>, "CAPS", color="grey20" },
+	 		<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+			<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+			<AC11>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys {	{ <LFSH>, "LFSH", color="grey20" }, 
+	 		<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+			<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+			{ <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys {	<LCTL>,	{ <LALT>, 20 },
+			{ <SPCE>, "SPCE",color="white" },
+			<RALT>, { <RCTL>, 20 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 25;
+	left= 299;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <PRSC>, <SCLK>, <PAUS> };
+	};
+	row {
+	    top= 33;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 53;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 91;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 110;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  3, 1.5] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  25;
+	left= 364;
+	color= "grey10";
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 40.5;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 372; };
+    indicator "Caps Lock"    { left= 397; };
+    indicator "Scro llLock"  { left= 422; };
+
+    text.font= "helvetica";
+    text.weight= "bold";
+    text.slant= "r";
+    text.fontWidth= "normal";
+    text.fontSize= 12;
+    text.top= 39.5;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 376.5; text="1"; };
+    text "CapsLockLabel"	{ left= 401.5; text="A"; };
+    text "ScrollLockLabel"	{ left= 426.5; text="S"; };
+    
+    logo "SGILogoImage" 	{ 
+	top= 26.5;
+	left= 396;
+	name= "SGI"; 
+	shape= "LOGO"; 
+    };
+    text.font= "helvetica";
+    text.weight= "bold";
+    text.slant= "o";
+    text.fontWidth= "narrow";
+    text.fontSize= 18;
+    text "SiliconLogoText"	{
+	top= 27;
+	left= 375;
+	width= 20;
+	text= "Silicon";
+    };
+    text "GraphicsLogoText"	{
+	top= 27;
+	left= 409;
+	width= 20;
+	text= "Graphics";
+    };
+
+    section "Keypad" {
+	top= 58;
+	left= 363;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+    	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+};
+
+xkb_geometry "pc102" {
+
+    // This is an approximate layout for 102-key SGI international
+    // keyboards.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes of a few keys by eye.  I didn't actually
+    // *measure* a real keyboard.
+
+    description= "Silicon Graphics 102-key Keyboard";
+    width= 470;
+    height= 193;
+
+    shape.cornerRadius= 1;
+    shape "EDGE" { cornerRadius=2, { [ 470, 193 ] } };
+    shape "NORM" { { [18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [35,18] }, { [2,1], [33,17] } };
+    shape "TABK" { { [27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" {
+	approx = { [ 0, 0], [26,37] },
+	{ [ 0, 0], [26, 0], [26,37],
+	  [ 5,37], [ 5,18], [ 0,18] },
+	{ [ 1, 1], [24, 1], [24,36],
+	  [ 7,36], [ 7,17], [ 1,17] }
+    };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [25,17] } };
+    shape "RTSH" { { [ 50,18] }, { [2,1], [48,17] } };
+    shape "LFSH" { { [ 22,18] }, { [2,1], [20,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [130,18] }, { [2,1], [128,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 50;
+	row {
+	    top= 1;
+	    keys {  	{ <ESC>, color="grey20" },
+			{ <FK01>, 18}, <FK02>, <FK03>, <FK04>,
+			{ <FK05>, 10}, <FK06>, <FK07>, <FK08>,
+			{ <FK09>, 10}, <FK10>, <FK11>, <FK12>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 83;
+	row {
+	    top= 1;
+	    keys { 	<TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+			<AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+			<AE10>, <AE11>, <AE12>,
+			{ <BKSP>, "BKSP", color= "grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { 	{ <TAB>, "TABK", color= "grey20" },
+			<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+			<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+			<AD11>, <AD12>,
+			{ <RTRN>, "RTRN", color= "grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { 	{ <CAPS>, "CAPS", color= "grey20" },
+			<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+			<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+			<AC11>, <BKSL>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { 	{ <LFSH>, "LFSH", color= "grey20" }, <LSGT>,
+			<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+			<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+			{ <RTSH>, "RTSH", color= "grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys {	<LCTL>,
+			{ <LALT>, 19 },
+			{ <SPCE>, "SPCE", color="white" },
+			<RALT>,
+			{ <RCTL>, 19 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 50;
+	left= 308;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <PRSC>, <SCLK>, <PAUS> };
+	};
+	row {
+	    top= 33;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 53;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 91;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 110;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  1,  3 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  50;
+	left= 375;
+	color= "grey10";
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 64.5;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 384; };
+    indicator "Caps Lock"    { left= 409; };
+    indicator "Scroll Lock"  { left= 434; };
+    text.top= 52;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 380.5; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 405; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 430; text="Scroll\nLock"; };
+
+    logo "SGILogoImage" { 
+	top= 17;
+	left= 22;
+	name= "SGI"; 
+	shape= "LOGO"; 
+    };
+    text "SGILogoText"	{
+	top= 21;
+	left= 40;
+	width= 50;
+	text= "SiliconGraphics";
+	font= "helvetica";
+	slant= "o";
+	weight= "bold";
+	setWidth= "narrow";
+	fontSize= 24;
+    };
+
+    section "Keypad" {
+	top= 83;
+	left= 374;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+};
+
+xkb_geometry "jp106" {
+    description= "Silicon Graphics 106-key Japanese keyboard";
+    width= 442;
+    height= 167;
+
+    shape "EDGE" { cornerRadius= 2, { [ 442, 167 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "BKSL" { { [ 27,18] }, { [2,1], [ 25,17] } };
+    shape "RTRN" {
+        { [0,0],[ 27,0],[27,37],[4,37],[4,18],[0,18] } ,
+        { [2,1],[ 25,1],[25,36],[5,36],[5,17],[2,17] } };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,17] } };
+    shape "RTSH" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "SPCE" { { [ 46,18] }, { [2,1], [ 44,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,36] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    logo "SGILogoImage" { 
+	top= 5;
+	left= 6;
+	name= "SGI"; 
+	shape= "LOGO"; 
+    };
+
+    text "SGILogoText"	{
+	top= 9;
+	left= 25;
+	width= 50;
+	text= "SiliconGraphics";
+	font= "helvetica";
+	slant= "o";
+	weight= "bold";
+	fontWidth= "narrow";
+	fontSize= 24;
+    };
+
+    shape "LEDS" { cornerRadius= 0.1, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  25;
+	left= 362;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 40;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 366; };
+    indicator "Caps Lock"    { left= 391; };
+    indicator "Scroll Lock"  { left= 416; };
+    text.top= 28;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 366; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 391; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 416; text="Scroll\nLock"; };
+
+    section.left= 5;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 25;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 18 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 ,color="grey20"}, {<FK06>,color="grey20"}, 
+		    { <FK07>, color="grey20"}, {<FK08>,color="grey20"},
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { {<HZTG>,color="grey20"}, <AE01>, <AE02>, 
+                    <AE03>, <AE04>, <AE05>, <AE06>, <AE07>, 
+	            <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
+		    <AE13>, { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, 1 ,"RTRN",color="grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <AC12>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    <AB11>, { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LCTL>, { <LALT>, 20 },<NFER>,
+		   { <SPCE>, "SPCE", color="white" },
+		   <XFER>,<HKTG>,<RALT>, { <RCTL>, 17 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 296;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 361;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "jp106" geometry
diff --git a/xorg-server/xkeyboard-config/geometry/sgi_vndr/indigo b/xorg-server/xkeyboard-config/geometry/sgi_vndr/indigo
index 076109dbe..2c174666b 100644
--- a/xorg-server/xkeyboard-config/geometry/sgi_vndr/indigo
+++ b/xorg-server/xkeyboard-config/geometry/sgi_vndr/indigo
@@ -1,410 +1,410 @@
-//
-// Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
-//
-// Permission to use, copy, modify, and distribute this
-// software and its documentation for any purpose and without
-// fee is hereby granted, provided that the above copyright
-// notice appear in all copies and that both that copyright
-// notice and this permission notice appear in supporting
-// documentation, and that the name of Silicon Graphics not be 
-// used in advertising or publicity pertaining to distribution 
-// of the software without specific prior written permission.
-// Silicon Graphics makes no representation about the suitability 
-// of this software for any purpose. It is provided "as is"
-// without any express or implied warranty.
-// 
-// SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-// SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-// AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-// GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-// DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-// DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-// THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-default xkb_geometry "pc101" {
-
-    // This is an approximate layout for a 101-key (US/ASCII) SGI
-    // keyboard.  I just took a similar layout (101 key PC keyboard)
-    // and adjusted the sizes of a few keys by eye.  I didn't actually
-    // *measure* a real keyboard.
-
-    description= "Silicon Graphics 101-key keyboard";
-
-    width= 472;
-    height= 193;
-
-    shape "EDGE" { cornerRadius= 2, { [ 472, 193 ] } };
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
-    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "TABK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "BKSL" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "RTRN" { { [ 40,18] }, { [2,1], [37,17] } };
-    shape "CAPS" { { [ 34,18] }, { [2,1], [29,17] } };
-    shape "RTSH" { { [ 49,18] }, { [2,1], [47,17] } };
-    shape "LFSH" { { [ 44,18] }, { [2,1], [42,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "SPCE" { { [130,18] }, { [2,1], [128,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-    shape "LOGO" { { [ 16,16] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 19;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 50;
-	row {
-	    top= 1;
-	    keys {	{ <ESC>, color="grey20" },
-			{ <FK01>, 19}, <FK02>, <FK03>, <FK04>,
-			{ <FK05>, 11}, <FK06>, <FK07>, <FK08>,
-			{ <FK09>, 11}, <FK10>, <FK11>, <FK12>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 83;
-	row {
-	    top= 1;
-	    keys { 	<TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
-			<AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-			<AE10>, <AE11>, <AE12>,
-			{ <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys {	{ <TAB>, "TABK", color= "grey20" },
-			<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-			<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-			<AD11>, <AD12>,
-			{ <BKSL>, "BKSL" }
-	    };	
-	};
-	row {
-	    top= 39;
-	    keys { 	{ <CAPS>, "CAPS", color="grey20" },
-	 		<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-			<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-			<AC11>, { <RTRN>, "RTRN", color="grey20" }
-	    };
-	};
-	row {
-	    top= 58;
-	    keys {	{ <LFSH>, "LFSH", color="grey20" }, 
-	 		<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-			<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-			{ <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "MODK";
-	    key.color= "grey20";
-	    keys {	<LCTL>,	{ <LALT>, 20 },
-			{ <SPCE>, "SPCE",color="white" },
-			<RALT>, { <RCTL>, 20 }
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 50;
-	left= 312;
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    keys { <PRSC>, <SCLK>, <PAUS> };
-	};
-	row {
-	    top= 33;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-	row {
-	    top= 53;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 91;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 110;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
-    shape "LED"  { cornerRadius= 0, { [  1,  3 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  50;
-	left= 377;
-	color= "grey10";
-    };
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 64.5;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { left= 386; };
-    indicator "Caps Lock"    { left= 411; };
-    indicator "Scroll Lock"  { left= 436; };
-    text.top= 52;
-    text.color= "black";
-    text "NumLockLabel"		{ left= 382.5; text="Num\nLock"; };
-    text "CapsLockLabel"	{ left= 407; text="Caps\nLock"; };
-    text "ScrollLockLabel"	{ left= 432; text="Scroll\nLock"; };
-    
-    logo "SGILogoImage" 	{ 
-	top= 17;
-	left= 22;
-	name= "SGI"; 
-	shape= "LOGO"; 
-    };
-    text "SGILogoText"	{
-	top= 21;
-	left= 40;
-	width= 50;
-	text= "SiliconGraphics";
-	font= "helvetica";
-	slant= "o";
-	weight= "bold";
-	fontWidth= "narrow";
-	fontSize= 24;
-    };
-
-    section "Keypad" {
-	top= 83;
-	left= 376;
-	row {
-	    top= 1;
-	    key.color= "grey20";
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-    	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-};
-xkb_geometry "pc102" {
-
-    // This is an approximate layout for 102-key SGI international
-    // keyboards.  I just took a similar layout (101 key PC keyboard)
-    // and adjusted the sizes of a few keys by eye.  I didn't actually
-    // *measure* a real keyboard.
-
-    description= "Silicon Graphics 102-key Keyboard";
-    width= 470;
-    height= 193;
-
-    shape.cornerRadius= 1;
-    shape "EDGE" { cornerRadius=2, { [ 470, 193 ] } };
-    shape "NORM" { { [18,18] }, { [2,1], [16,17] } };
-    shape "BKSP" { { [35,18] }, { [2,1], [33,17] } };
-    shape "TABK" { { [27,18] }, { [2,1], [25,17] } };
-    shape "RTRN" {
-	approx = { [ 0, 0], [26,37] },
-	{ [ 0, 0], [26, 0], [26,37],
-	  [ 5,37], [ 5,18], [ 0,18] },
-	{ [ 1, 1], [24, 1], [24,36],
-	  [ 7,36], [ 7,17], [ 1,17] }
-    };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [25,17] } };
-    shape "RTSH" { { [ 50,18] }, { [2,1], [48,17] } };
-    shape "LFSH" { { [ 22,18] }, { [2,1], [20,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "SPCE" { { [130,18] }, { [2,1], [128,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-    shape "LOGO" { { [ 16,16] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 19;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 50;
-	row {
-	    top= 1;
-	    keys {  	{ <ESC>, color="grey20" },
-			{ <FK01>, 18}, <FK02>, <FK03>, <FK04>,
-			{ <FK05>, 10}, <FK06>, <FK07>, <FK08>,
-			{ <FK09>, 10}, <FK10>, <FK11>, <FK12>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 83;
-	row {
-	    top= 1;
-	    keys { 	<TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
-			<AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-			<AE10>, <AE11>, <AE12>,
-			{ <BKSP>, "BKSP", color= "grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { 	{ <TAB>, "TABK", color= "grey20" },
-			<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-			<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-			<AD11>, <AD12>,
-			{ <RTRN>, "RTRN", color= "grey20" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { 	{ <CAPS>, "CAPS", color= "grey20" },
-			<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-			<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-			<AC11>, <BKSL>
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { 	{ <LFSH>, "LFSH", color= "grey20" }, <LSGT>,
-			<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-			<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-			{ <RTSH>, "RTSH", color= "grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "MODK";
-	    key.color= "grey20";
-	    keys {	<LCTL>,
-			{ <LALT>, 19 },
-			{ <SPCE>, "SPCE", color="white" },
-			<RALT>,
-			{ <RCTL>, 19 }
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 50;
-	left= 308;
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    keys { <PRSC>, <SCLK>, <PAUS> };
-	};
-	row {
-	    top= 33;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-	row {
-	    top= 53;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 91;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 110;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
-    shape "LED"  { cornerRadius= 0, { [  1,  3 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  50;
-	left= 375;
-	color= "grey10";
-    };
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 64.5;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { left= 384; };
-    indicator "Caps Lock"    { left= 409; };
-    indicator "Scroll Lock"  { left= 434; };
-    text.top= 52;
-    text.color= "black";
-    text "NumLockLabel"		{ left= 380.5; text="Num\nLock"; };
-    text "CapsLockLabel"	{ left= 405; text="Caps\nLock"; };
-    text "ScrollLockLabel"	{ left= 430; text="Scroll\nLock"; };
-
-    logo "SGILogoImage" { 
-	top= 17;
-	left= 22;
-	name= "SGI"; 
-	shape= "LOGO"; 
-    };
-    text "SGILogoText"	{
-	top= 21;
-	left= 40;
-	width= 50;
-	text= "SiliconGraphics";
-	font= "helvetica";
-	slant= "o";
-	weight= "bold";
-	setWidth= "narrow";
-	fontSize= 24;
-    };
-
-    section "Keypad" {
-	top= 83;
-	left= 374;
-	row {
-	    top= 1;
-	    key.color= "grey20";
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-};
+//
+// Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
+//
+// Permission to use, copy, modify, and distribute this
+// software and its documentation for any purpose and without
+// fee is hereby granted, provided that the above copyright
+// notice appear in all copies and that both that copyright
+// notice and this permission notice appear in supporting
+// documentation, and that the name of Silicon Graphics not be 
+// used in advertising or publicity pertaining to distribution 
+// of the software without specific prior written permission.
+// Silicon Graphics makes no representation about the suitability 
+// of this software for any purpose. It is provided "as is"
+// without any express or implied warranty.
+// 
+// SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+// SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+// AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+// GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
+// DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
+// DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+// THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+default xkb_geometry "pc101" {
+
+    // This is an approximate layout for a 101-key (US/ASCII) SGI
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes of a few keys by eye.  I didn't actually
+    // *measure* a real keyboard.
+
+    description= "Silicon Graphics 101-key keyboard";
+
+    width= 472;
+    height= 193;
+
+    shape "EDGE" { cornerRadius= 2, { [ 472, 193 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "BKSL" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" { { [ 40,18] }, { [2,1], [37,17] } };
+    shape "CAPS" { { [ 34,18] }, { [2,1], [29,17] } };
+    shape "RTSH" { { [ 49,18] }, { [2,1], [47,17] } };
+    shape "LFSH" { { [ 44,18] }, { [2,1], [42,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [130,18] }, { [2,1], [128,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 50;
+	row {
+	    top= 1;
+	    keys {	{ <ESC>, color="grey20" },
+			{ <FK01>, 19}, <FK02>, <FK03>, <FK04>,
+			{ <FK05>, 11}, <FK06>, <FK07>, <FK08>,
+			{ <FK09>, 11}, <FK10>, <FK11>, <FK12>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 83;
+	row {
+	    top= 1;
+	    keys { 	<TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+			<AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+			<AE10>, <AE11>, <AE12>,
+			{ <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys {	{ <TAB>, "TABK", color= "grey20" },
+			<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+			<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+			<AD11>, <AD12>,
+			{ <BKSL>, "BKSL" }
+	    };	
+	};
+	row {
+	    top= 39;
+	    keys { 	{ <CAPS>, "CAPS", color="grey20" },
+	 		<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+			<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+			<AC11>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys {	{ <LFSH>, "LFSH", color="grey20" }, 
+	 		<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+			<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+			{ <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys {	<LCTL>,	{ <LALT>, 20 },
+			{ <SPCE>, "SPCE",color="white" },
+			<RALT>, { <RCTL>, 20 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 50;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <PRSC>, <SCLK>, <PAUS> };
+	};
+	row {
+	    top= 33;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 53;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 91;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 110;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  1,  3 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  50;
+	left= 377;
+	color= "grey10";
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 64.5;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 386; };
+    indicator "Caps Lock"    { left= 411; };
+    indicator "Scroll Lock"  { left= 436; };
+    text.top= 52;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 382.5; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 407; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 432; text="Scroll\nLock"; };
+    
+    logo "SGILogoImage" 	{ 
+	top= 17;
+	left= 22;
+	name= "SGI"; 
+	shape= "LOGO"; 
+    };
+    text "SGILogoText"	{
+	top= 21;
+	left= 40;
+	width= 50;
+	text= "SiliconGraphics";
+	font= "helvetica";
+	slant= "o";
+	weight= "bold";
+	fontWidth= "narrow";
+	fontSize= 24;
+    };
+
+    section "Keypad" {
+	top= 83;
+	left= 376;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+    	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+};
+xkb_geometry "pc102" {
+
+    // This is an approximate layout for 102-key SGI international
+    // keyboards.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes of a few keys by eye.  I didn't actually
+    // *measure* a real keyboard.
+
+    description= "Silicon Graphics 102-key Keyboard";
+    width= 470;
+    height= 193;
+
+    shape.cornerRadius= 1;
+    shape "EDGE" { cornerRadius=2, { [ 470, 193 ] } };
+    shape "NORM" { { [18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [35,18] }, { [2,1], [33,17] } };
+    shape "TABK" { { [27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" {
+	approx = { [ 0, 0], [26,37] },
+	{ [ 0, 0], [26, 0], [26,37],
+	  [ 5,37], [ 5,18], [ 0,18] },
+	{ [ 1, 1], [24, 1], [24,36],
+	  [ 7,36], [ 7,17], [ 1,17] }
+    };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [25,17] } };
+    shape "RTSH" { { [ 50,18] }, { [2,1], [48,17] } };
+    shape "LFSH" { { [ 22,18] }, { [2,1], [20,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [130,18] }, { [2,1], [128,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 50;
+	row {
+	    top= 1;
+	    keys {  	{ <ESC>, color="grey20" },
+			{ <FK01>, 18}, <FK02>, <FK03>, <FK04>,
+			{ <FK05>, 10}, <FK06>, <FK07>, <FK08>,
+			{ <FK09>, 10}, <FK10>, <FK11>, <FK12>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 83;
+	row {
+	    top= 1;
+	    keys { 	<TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+			<AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+			<AE10>, <AE11>, <AE12>,
+			{ <BKSP>, "BKSP", color= "grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { 	{ <TAB>, "TABK", color= "grey20" },
+			<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+			<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+			<AD11>, <AD12>,
+			{ <RTRN>, "RTRN", color= "grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { 	{ <CAPS>, "CAPS", color= "grey20" },
+			<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+			<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+			<AC11>, <BKSL>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { 	{ <LFSH>, "LFSH", color= "grey20" }, <LSGT>,
+			<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+			<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+			{ <RTSH>, "RTSH", color= "grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys {	<LCTL>,
+			{ <LALT>, 19 },
+			{ <SPCE>, "SPCE", color="white" },
+			<RALT>,
+			{ <RCTL>, 19 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 50;
+	left= 308;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <PRSC>, <SCLK>, <PAUS> };
+	};
+	row {
+	    top= 33;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 53;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 91;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 110;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  1,  3 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  50;
+	left= 375;
+	color= "grey10";
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 64.5;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 384; };
+    indicator "Caps Lock"    { left= 409; };
+    indicator "Scroll Lock"  { left= 434; };
+    text.top= 52;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 380.5; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 405; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 430; text="Scroll\nLock"; };
+
+    logo "SGILogoImage" { 
+	top= 17;
+	left= 22;
+	name= "SGI"; 
+	shape= "LOGO"; 
+    };
+    text "SGILogoText"	{
+	top= 21;
+	left= 40;
+	width= 50;
+	text= "SiliconGraphics";
+	font= "helvetica";
+	slant= "o";
+	weight= "bold";
+	setWidth= "narrow";
+	fontSize= 24;
+    };
+
+    section "Keypad" {
+	top= 83;
+	left= 374;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+};
diff --git a/xorg-server/xkeyboard-config/geometry/sgi_vndr/indy b/xorg-server/xkeyboard-config/geometry/sgi_vndr/indy
index ca1dd2b66..9b7a40dec 100644
--- a/xorg-server/xkeyboard-config/geometry/sgi_vndr/indy
+++ b/xorg-server/xkeyboard-config/geometry/sgi_vndr/indy
@@ -1,598 +1,598 @@
-//
-// Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
-//
-// Permission to use, copy, modify, and distribute this
-// software and its documentation for any purpose and without
-// fee is hereby granted, provided that the above copyright
-// notice appear in all copies and that both that copyright
-// notice and this permission notice appear in supporting
-// documentation, and that the name of Silicon Graphics not be 
-// used in advertising or publicity pertaining to distribution 
-// of the software without specific prior written permission.
-// Silicon Graphics makes no representation about the suitability 
-// of this software for any purpose. It is provided "as is"
-// without any express or implied warranty.
-// 
-// SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-// SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-// AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-// GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-// DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-// DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
-// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-// THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-default xkb_geometry "pc101" {
-
-    // This is an approximate layout for a 101-key (US/ASCII) SGI
-    // keyboard.  I just took a similar layout (101 key PC keyboard)
-    // and adjusted the sizes of a few keys by eye.  I didn't actually
-    // *measure* a real keyboard.
-
-    description= "Silicon Graphics 101-key keyboard";
-
-    width= 472;
-    height= 193;
-
-    shape "EDGE" { cornerRadius= 2, { [ 472, 193 ] } };
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
-    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "TABK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "BKSL" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "RTRN" { { [ 40,18] }, { [2,1], [37,17] } };
-    shape "CAPS" { { [ 34,18] }, { [2,1], [29,17] } };
-    shape "RTSH" { { [ 49,18] }, { [2,1], [47,17] } };
-    shape "LFSH" { { [ 44,18] }, { [2,1], [42,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "SPCE" { { [130,18] }, { [2,1], [128,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-    shape "LOGO" { { [ 16,16] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 19;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 50;
-	row {
-	    top= 1;
-	    keys {	{ <ESC>, color="grey20" },
-			{ <FK01>, 19}, <FK02>, <FK03>, <FK04>,
-			{ <FK05>, 11}, <FK06>, <FK07>, <FK08>,
-			{ <FK09>, 11}, <FK10>, <FK11>, <FK12>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 83;
-	row {
-	    top= 1;
-	    keys { 	<TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
-			<AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-			<AE10>, <AE11>, <AE12>,
-			{ <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys {	{ <TAB>, "TABK", color= "grey20" },
-			<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-			<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-			<AD11>, <AD12>,
-			{ <BKSL>, "BKSL" }
-	    };	
-	};
-	row {
-	    top= 39;
-	    keys { 	{ <CAPS>, "CAPS", color="grey20" },
-	 		<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-			<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-			<AC11>, { <RTRN>, "RTRN", color="grey20" }
-	    };
-	};
-	row {
-	    top= 58;
-	    keys {	{ <LFSH>, "LFSH", color="grey20" }, 
-	 		<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-			<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-			{ <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "MODK";
-	    key.color= "grey20";
-	    keys {	<LCTL>,	{ <LALT>, 20 },
-			{ <SPCE>, "SPCE",color="white" },
-			<RALT>, { <RCTL>, 20 }
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 50;
-	left= 312;
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    keys { <PRSC>, <SCLK>, <PAUS> };
-	};
-	row {
-	    top= 33;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-	row {
-	    top= 53;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 91;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 110;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
-    shape "LED"  { cornerRadius= 0, { [  1,  3 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  50;
-	left= 377;
-	color= "grey10";
-    };
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 64.5;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { left= 386; };
-    indicator "Caps Lock"    { left= 411; };
-    indicator "Scroll Lock"  { left= 436; };
-    text.top= 52;
-    text.color= "black";
-    text "NumLockLabel"		{ left= 382.5; text="Num\nLock"; };
-    text "CapsLockLabel"	{ left= 407; text="Caps\nLock"; };
-    text "ScrollLockLabel"	{ left= 432; text="Scroll\nLock"; };
-    
-    logo "SGILogoImage" 	{ 
-	top= 17;
-	left= 22;
-	name= "SGI"; 
-	shape= "LOGO"; 
-    };
-    text "SGILogoText"	{
-	top= 21;
-	left= 40;
-	width= 50;
-	text= "SiliconGraphics";
-	font= "helvetica";
-	slant= "o";
-	weight= "bold";
-	fontWidth= "narrow";
-	fontSize= 24;
-    };
-
-    section "Keypad" {
-	top= 83;
-	left= 376;
-	row {
-	    top= 1;
-	    key.color= "grey20";
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-    	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-};
-
-xkb_geometry "pc102" {
-
-    // This is an approximate layout for 102-key SGI international
-    // keyboards.  I just took a similar layout (101 key PC keyboard)
-    // and adjusted the sizes of a few keys by eye.  I didn't actually
-    // *measure* a real keyboard.
-
-    description= "Silicon Graphics 102-key Keyboard";
-    width= 470;
-    height= 193;
-
-    shape.cornerRadius= 1;
-    shape "EDGE" { cornerRadius=2, { [ 470, 193 ] } };
-    shape "NORM" { { [18,18] }, { [2,1], [16,17] } };
-    shape "BKSP" { { [35,18] }, { [2,1], [33,17] } };
-    shape "TABK" { { [27,18] }, { [2,1], [25,17] } };
-    shape "RTRN" {
-	approx = { [ 0, 0], [26,37] },
-	{ [ 0, 0], [26, 0], [26,37],
-	  [ 5,37], [ 5,18], [ 0,18] },
-	{ [ 1, 1], [24, 1], [24,36],
-	  [ 7,36], [ 7,17], [ 1,17] }
-    };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [25,17] } };
-    shape "RTSH" { { [ 50,18] }, { [2,1], [48,17] } };
-    shape "LFSH" { { [ 22,18] }, { [2,1], [20,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "SPCE" { { [130,18] }, { [2,1], [128,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-    shape "LOGO" { { [ 16,16] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 19;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 50;
-	row {
-	    top= 1;
-	    keys {  	{ <ESC>, color="grey20" },
-			{ <FK01>, 18}, <FK02>, <FK03>, <FK04>,
-			{ <FK05>, 10}, <FK06>, <FK07>, <FK08>,
-			{ <FK09>, 10}, <FK10>, <FK11>, <FK12>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 83;
-	row {
-	    top= 1;
-	    keys { 	<TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
-			<AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-			<AE10>, <AE11>, <AE12>,
-			{ <BKSP>, "BKSP", color= "grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { 	{ <TAB>, "TABK", color= "grey20" },
-			<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-			<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-			<AD11>, <AD12>,
-			{ <RTRN>, "RTRN", color= "grey20" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { 	{ <CAPS>, "CAPS", color= "grey20" },
-			<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-			<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-			<AC11>, <BKSL>
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { 	{ <LFSH>, "LFSH", color= "grey20" }, <LSGT>,
-			<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-			<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-			{ <RTSH>, "RTSH", color= "grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "MODK";
-	    key.color= "grey20";
-	    keys {	<LCTL>,
-			{ <LALT>, 19 },
-			{ <SPCE>, "SPCE", color="white" },
-			<RALT>,
-			{ <RCTL>, 19 }
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 50;
-	left= 308;
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    keys { <PRSC>, <SCLK>, <PAUS> };
-	};
-	row {
-	    top= 33;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-	row {
-	    top= 53;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 91;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 110;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
-    shape "LED"  { cornerRadius= 0, { [  1,  3 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  50;
-	left= 375;
-	color= "grey10";
-    };
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 64.5;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { left= 384; };
-    indicator "Caps Lock"    { left= 409; };
-    indicator "Scroll Lock"  { left= 434; };
-    text.top= 52;
-    text.color= "black";
-    text "NumLockLabel"		{ left= 380.5; text="Num\nLock"; };
-    text "CapsLockLabel"	{ left= 405; text="Caps\nLock"; };
-    text "ScrollLockLabel"	{ left= 430; text="Scroll\nLock"; };
-
-    logo "SGILogoImage" { 
-	top= 17;
-	left= 22;
-	name= "SGI"; 
-	shape= "LOGO"; 
-    };
-    text "SGILogoText"	{
-	top= 21;
-	left= 40;
-	width= 50;
-	text= "SiliconGraphics";
-	font= "helvetica";
-	slant= "o";
-	weight= "bold";
-	setWidth= "narrow";
-	fontSize= 24;
-    };
-
-    section "Keypad" {
-	top= 83;
-	left= 374;
-	row {
-	    top= 1;
-	    key.color= "grey20";
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-};
-
-xkb_geometry "jp106" {
-    description= "Silicon Graphics 106-key Japanese keyboard";
-    width= 442;
-    height= 167;
-
-    shape "EDGE" { cornerRadius= 2, { [ 442, 167 ] } };
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
-    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };
-    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "BKSL" { { [ 27,18] }, { [2,1], [ 25,17] } };
-    shape "RTRN" {
-        { [0,0],[ 27,0],[27,37],[4,37],[4,18],[0,18] } ,
-        { [2,1],[ 25,1],[25,36],[5,36],[5,17],[2,17] } };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [ 30,17] } };
-    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,17] } };
-    shape "RTSH" { { [ 32,18] }, { [2,1], [ 30,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "SPCE" { { [ 46,18] }, { [2,1], [ 44,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,36] } };
-    shape "LOGO" { { [ 16,16] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    logo "SGILogoImage" { 
-	top= 5;
-	left= 6;
-	name= "SGI"; 
-	shape= "LOGO"; 
-    };
-
-    text "SGILogoText"	{
-	top= 9;
-	left= 25;
-	width= 50;
-	text= "SiliconGraphics";
-	font= "helvetica";
-	slant= "o";
-	weight= "bold";
-	fontWidth= "narrow";
-	fontSize= 24;
-    };
-
-    shape "LEDS" { cornerRadius= 0.1, { [ 76 ,20 ] } };
-    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  25;
-	left= 362;
-	color= "grey10";
-    };
-
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 40;
-    indicator.shape= "LED";
-    indicator "Num Lock"     { left= 366; };
-    indicator "Caps Lock"    { left= 391; };
-    indicator "Scroll Lock"  { left= 416; };
-    text.top= 28;
-    text.color= "black";
-    text "NumLockLabel"		{ left= 366; text="Num\nLock"; };
-    text "CapsLockLabel"	{ left= 391; text="Caps\nLock"; };
-    text "ScrollLockLabel"	{ left= 416; text="Scroll\nLock"; };
-
-    section.left= 5;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 25;
-	row {
-	    top= 1;
-	    keys {  { <ESC>, color="grey20" },
-		    { <FK01>, 18 }, <FK02>, <FK03>, <FK04>,
-		    { <FK05>, 11 ,color="grey20"}, {<FK06>,color="grey20"}, 
-		    { <FK07>, color="grey20"}, {<FK08>,color="grey20"},
-		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
-		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 61;
-	row {
-	    top= 1;
-	    keys { {<HZTG>,color="grey20"}, <AE01>, <AE02>, 
-                    <AE03>, <AE04>, <AE05>, <AE06>, <AE07>, 
-	            <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
-		    <AE13>, { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK", color="grey20" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <RTRN>, 1 ,"RTRN",color="grey20" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <CAPS>, "CAPS", color="grey20" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, <AC12>
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "LFSH", color="grey20" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		    <AB11>, { <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "MODK";
-	    key.color= "grey20";
-	    keys { <LCTL>, { <LALT>, 20 },<NFER>,
-		   { <SPCE>, "SPCE", color="white" },
-		   <XFER>,<HKTG>,<RALT>, { <RCTL>, 17 }
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 61;
-	left= 296;
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-        row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 61;
-	left= 361;
-	row {
-	    top= 1;
-	    key.color= "grey20";
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-
-}; // End of "jp106" geometry
+//
+// Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
+//
+// Permission to use, copy, modify, and distribute this
+// software and its documentation for any purpose and without
+// fee is hereby granted, provided that the above copyright
+// notice appear in all copies and that both that copyright
+// notice and this permission notice appear in supporting
+// documentation, and that the name of Silicon Graphics not be 
+// used in advertising or publicity pertaining to distribution 
+// of the software without specific prior written permission.
+// Silicon Graphics makes no representation about the suitability 
+// of this software for any purpose. It is provided "as is"
+// without any express or implied warranty.
+// 
+// SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+// SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+// AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+// GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
+// DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
+// DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+// THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+default xkb_geometry "pc101" {
+
+    // This is an approximate layout for a 101-key (US/ASCII) SGI
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes of a few keys by eye.  I didn't actually
+    // *measure* a real keyboard.
+
+    description= "Silicon Graphics 101-key keyboard";
+
+    width= 472;
+    height= 193;
+
+    shape "EDGE" { cornerRadius= 2, { [ 472, 193 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "BKSL" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" { { [ 40,18] }, { [2,1], [37,17] } };
+    shape "CAPS" { { [ 34,18] }, { [2,1], [29,17] } };
+    shape "RTSH" { { [ 49,18] }, { [2,1], [47,17] } };
+    shape "LFSH" { { [ 44,18] }, { [2,1], [42,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [130,18] }, { [2,1], [128,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 50;
+	row {
+	    top= 1;
+	    keys {	{ <ESC>, color="grey20" },
+			{ <FK01>, 19}, <FK02>, <FK03>, <FK04>,
+			{ <FK05>, 11}, <FK06>, <FK07>, <FK08>,
+			{ <FK09>, 11}, <FK10>, <FK11>, <FK12>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 83;
+	row {
+	    top= 1;
+	    keys { 	<TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+			<AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+			<AE10>, <AE11>, <AE12>,
+			{ <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys {	{ <TAB>, "TABK", color= "grey20" },
+			<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+			<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+			<AD11>, <AD12>,
+			{ <BKSL>, "BKSL" }
+	    };	
+	};
+	row {
+	    top= 39;
+	    keys { 	{ <CAPS>, "CAPS", color="grey20" },
+	 		<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+			<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+			<AC11>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys {	{ <LFSH>, "LFSH", color="grey20" }, 
+	 		<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+			<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+			{ <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys {	<LCTL>,	{ <LALT>, 20 },
+			{ <SPCE>, "SPCE",color="white" },
+			<RALT>, { <RCTL>, 20 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 50;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <PRSC>, <SCLK>, <PAUS> };
+	};
+	row {
+	    top= 33;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 53;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 91;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 110;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  1,  3 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  50;
+	left= 377;
+	color= "grey10";
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 64.5;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 386; };
+    indicator "Caps Lock"    { left= 411; };
+    indicator "Scroll Lock"  { left= 436; };
+    text.top= 52;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 382.5; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 407; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 432; text="Scroll\nLock"; };
+    
+    logo "SGILogoImage" 	{ 
+	top= 17;
+	left= 22;
+	name= "SGI"; 
+	shape= "LOGO"; 
+    };
+    text "SGILogoText"	{
+	top= 21;
+	left= 40;
+	width= 50;
+	text= "SiliconGraphics";
+	font= "helvetica";
+	slant= "o";
+	weight= "bold";
+	fontWidth= "narrow";
+	fontSize= 24;
+    };
+
+    section "Keypad" {
+	top= 83;
+	left= 376;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+    	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+};
+
+xkb_geometry "pc102" {
+
+    // This is an approximate layout for 102-key SGI international
+    // keyboards.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes of a few keys by eye.  I didn't actually
+    // *measure* a real keyboard.
+
+    description= "Silicon Graphics 102-key Keyboard";
+    width= 470;
+    height= 193;
+
+    shape.cornerRadius= 1;
+    shape "EDGE" { cornerRadius=2, { [ 470, 193 ] } };
+    shape "NORM" { { [18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [35,18] }, { [2,1], [33,17] } };
+    shape "TABK" { { [27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" {
+	approx = { [ 0, 0], [26,37] },
+	{ [ 0, 0], [26, 0], [26,37],
+	  [ 5,37], [ 5,18], [ 0,18] },
+	{ [ 1, 1], [24, 1], [24,36],
+	  [ 7,36], [ 7,17], [ 1,17] }
+    };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [25,17] } };
+    shape "RTSH" { { [ 50,18] }, { [2,1], [48,17] } };
+    shape "LFSH" { { [ 22,18] }, { [2,1], [20,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [130,18] }, { [2,1], [128,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 50;
+	row {
+	    top= 1;
+	    keys {  	{ <ESC>, color="grey20" },
+			{ <FK01>, 18}, <FK02>, <FK03>, <FK04>,
+			{ <FK05>, 10}, <FK06>, <FK07>, <FK08>,
+			{ <FK09>, 10}, <FK10>, <FK11>, <FK12>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 83;
+	row {
+	    top= 1;
+	    keys { 	<TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+			<AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+			<AE10>, <AE11>, <AE12>,
+			{ <BKSP>, "BKSP", color= "grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { 	{ <TAB>, "TABK", color= "grey20" },
+			<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+			<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+			<AD11>, <AD12>,
+			{ <RTRN>, "RTRN", color= "grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { 	{ <CAPS>, "CAPS", color= "grey20" },
+			<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+			<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+			<AC11>, <BKSL>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { 	{ <LFSH>, "LFSH", color= "grey20" }, <LSGT>,
+			<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+			<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+			{ <RTSH>, "RTSH", color= "grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys {	<LCTL>,
+			{ <LALT>, 19 },
+			{ <SPCE>, "SPCE", color="white" },
+			<RALT>,
+			{ <RCTL>, 19 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 50;
+	left= 308;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <PRSC>, <SCLK>, <PAUS> };
+	};
+	row {
+	    top= 33;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 53;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 91;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 110;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  1,  3 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  50;
+	left= 375;
+	color= "grey10";
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 64.5;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 384; };
+    indicator "Caps Lock"    { left= 409; };
+    indicator "Scroll Lock"  { left= 434; };
+    text.top= 52;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 380.5; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 405; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 430; text="Scroll\nLock"; };
+
+    logo "SGILogoImage" { 
+	top= 17;
+	left= 22;
+	name= "SGI"; 
+	shape= "LOGO"; 
+    };
+    text "SGILogoText"	{
+	top= 21;
+	left= 40;
+	width= 50;
+	text= "SiliconGraphics";
+	font= "helvetica";
+	slant= "o";
+	weight= "bold";
+	setWidth= "narrow";
+	fontSize= 24;
+    };
+
+    section "Keypad" {
+	top= 83;
+	left= 374;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+};
+
+xkb_geometry "jp106" {
+    description= "Silicon Graphics 106-key Japanese keyboard";
+    width= 442;
+    height= 167;
+
+    shape "EDGE" { cornerRadius= 2, { [ 442, 167 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "BKSL" { { [ 27,18] }, { [2,1], [ 25,17] } };
+    shape "RTRN" {
+        { [0,0],[ 27,0],[27,37],[4,37],[4,18],[0,18] } ,
+        { [2,1],[ 25,1],[25,36],[5,36],[5,17],[2,17] } };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,17] } };
+    shape "RTSH" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "SPCE" { { [ 46,18] }, { [2,1], [ 44,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,36] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    logo "SGILogoImage" { 
+	top= 5;
+	left= 6;
+	name= "SGI"; 
+	shape= "LOGO"; 
+    };
+
+    text "SGILogoText"	{
+	top= 9;
+	left= 25;
+	width= 50;
+	text= "SiliconGraphics";
+	font= "helvetica";
+	slant= "o";
+	weight= "bold";
+	fontWidth= "narrow";
+	fontSize= 24;
+    };
+
+    shape "LEDS" { cornerRadius= 0.1, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  25;
+	left= 362;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 40;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 366; };
+    indicator "Caps Lock"    { left= 391; };
+    indicator "Scroll Lock"  { left= 416; };
+    text.top= 28;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 366; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 391; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 416; text="Scroll\nLock"; };
+
+    section.left= 5;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 25;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 18 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 ,color="grey20"}, {<FK06>,color="grey20"}, 
+		    { <FK07>, color="grey20"}, {<FK08>,color="grey20"},
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { {<HZTG>,color="grey20"}, <AE01>, <AE02>, 
+                    <AE03>, <AE04>, <AE05>, <AE06>, <AE07>, 
+	            <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
+		    <AE13>, { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, 1 ,"RTRN",color="grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <AC12>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    <AB11>, { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LCTL>, { <LALT>, 20 },<NFER>,
+		   { <SPCE>, "SPCE", color="white" },
+		   <XFER>,<HKTG>,<RALT>, { <RCTL>, 17 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 296;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 361;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "jp106" geometry
diff --git a/xorg-server/xkeyboard-config/geometry/sony b/xorg-server/xkeyboard-config/geometry/sony
index cfd6f0388..70714941e 100644
--- a/xorg-server/xkeyboard-config/geometry/sony
+++ b/xorg-server/xkeyboard-config/geometry/sony
@@ -1,179 +1,179 @@
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//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 OPEN GROUP 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 Open Group 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 Open Group.
-//
-default xkb_geometry "nwp5461" {
-
-    description= "Sony NEWS NWS-5000 Keyboard";
-    width= 425;
-    height= 190;
-
-    shape.cornerRadius= 1;
-    shape "NORM" { { [18,18] }, { [2,1], [16,17] } };
-    shape "BKSP" { { [28,18] }, { [2,1], [26,17] } };
-    shape "TABK" { { [28,18] }, { [2,1], [26,17] } };
-    shape "BKSL" { { [28,18] }, { [2,1], [26,17] } };
-    shape "RTRN" {
-        approx = { [15, 0], [33,37] },
-        { [15, 0], [33, 0], [33,37],
-          [ 0,37], [ 0,19], [15,19] },
-        { [17, 1], [31, 1], [31,36],
-          [ 2,36], [ 2,20], [17,20] }
-    };
-    shape "SHFT" { { [42,18] }, { [2,1], [40,17] } };
-    shape "MODK" { { [33,18] }, { [2,1], [31,17] } };
-    shape "SPCE" { { [85,18] }, { [2,1], [83,17] } };
-    shape "KPEN" { { [18,38] }, { [2,1], [16,37] } };
-    shape "STOP" { { [28,18] }, { [2,1], [26,17] } };
-    shape "CUT"  { { [55,18] }, { [2,1], [53,17] } };
-    shape "EXEC" { { [32,18] }, { [2,1], [30,17] } };
-    shape "UNK"  { { [18,18] }, { [2,1], [16,17] } };
-    shape "CAPS" { { [18,18] }, { [2,1], [16,17] } };
-    shape "FKEY" { { [23,18] }, { [2,1], [21,17] } };
-
-    section.left= 13;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 55;
-	row {
-	    top= 1;
-	    left= 37;
-	    key.shape="FKEY";
-	    keys {    <FK01>, <FK02>, <FK03>, <FK04>, <FK05>, 
-		    { <FK06>, 5 }, <FK07>, <FK08>, <FK09>, <FK10>, 
-		    { <FK11>, 5 }, <FK12>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 80;
-	row {
-	    top= 1;
-	    keys { { <ESC>, color="grey20" } , 
-		   <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, 
-		   <AE09>, <AE10>, <AE11>, <AE12>, 
-		   <BKSL>, { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TABK", color="grey20" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <DELE>, color="grey20" }, 
-		   { <RTRN>, "RTRN", -14, color="grey20" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <LCTL>, "MODK", color="grey20" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, <TLDE>
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { { <LFSH>, "SHFT", color="grey20" },
-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <AB11>,
-		    { <RTSH>, "SHFT", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.shape= "MODK";
-	    key.color= "grey20";
-	    keys { <LALT>, { <CAPS>, "CAPS" },
-		   { <STOP>, "STOP", color="white" },
-		   { <SPCE>, "SPCE", color="white" },
-		   { <CUT>, "CUT", color="white" },
-		   { <UNK0>, "UNK" }, { <UNK1>, "UNK" }, 
-		   { <EXEC>, "EXEC" }
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 80;
-	left= 312;
-	key.color= "grey20";
-	row {
-	    top= 1;
-	    keys { <HELP> };
-	};
-        row {
-	    top= 20;
-	    keys { <INS> };
-	};
-        row {
-	    top= 39;
-	    keys { <CLR> };
-	};
-	row {
-	    top= 58;
-	    keys { <PGUP> };
-	};
-	row {
-	    top= 77;
-	    keys { <PGDN> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 61;
-	left= 334;
-	row {
-	    top= 1;
-	    key.color= "grey20";
-	    keys { { <KPMU>, 19 }, <KPDV>, <KPAD> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPSU>, color="grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6>, { <KPSP>, color="grey20" } };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN", color="grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { <KP0>, { <KPDC>, color="grey20" }, <UP> };
-	};
-	row {
-	    top= 96;
-	    key.color= "grey20";
-	    keys { <KPTB>, <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Keypad" section
-
-}; // End of "default" geometry
+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//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 OPEN GROUP 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 Open Group 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 Open Group.
+//
+default xkb_geometry "nwp5461" {
+
+    description= "Sony NEWS NWS-5000 Keyboard";
+    width= 425;
+    height= 190;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [28,18] }, { [2,1], [26,17] } };
+    shape "TABK" { { [28,18] }, { [2,1], [26,17] } };
+    shape "BKSL" { { [28,18] }, { [2,1], [26,17] } };
+    shape "RTRN" {
+        approx = { [15, 0], [33,37] },
+        { [15, 0], [33, 0], [33,37],
+          [ 0,37], [ 0,19], [15,19] },
+        { [17, 1], [31, 1], [31,36],
+          [ 2,36], [ 2,20], [17,20] }
+    };
+    shape "SHFT" { { [42,18] }, { [2,1], [40,17] } };
+    shape "MODK" { { [33,18] }, { [2,1], [31,17] } };
+    shape "SPCE" { { [85,18] }, { [2,1], [83,17] } };
+    shape "KPEN" { { [18,38] }, { [2,1], [16,37] } };
+    shape "STOP" { { [28,18] }, { [2,1], [26,17] } };
+    shape "CUT"  { { [55,18] }, { [2,1], [53,17] } };
+    shape "EXEC" { { [32,18] }, { [2,1], [30,17] } };
+    shape "UNK"  { { [18,18] }, { [2,1], [16,17] } };
+    shape "CAPS" { { [18,18] }, { [2,1], [16,17] } };
+    shape "FKEY" { { [23,18] }, { [2,1], [21,17] } };
+
+    section.left= 13;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 55;
+	row {
+	    top= 1;
+	    left= 37;
+	    key.shape="FKEY";
+	    keys {    <FK01>, <FK02>, <FK03>, <FK04>, <FK05>, 
+		    { <FK06>, 5 }, <FK07>, <FK08>, <FK09>, <FK10>, 
+		    { <FK11>, 5 }, <FK12>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 80;
+	row {
+	    top= 1;
+	    keys { { <ESC>, color="grey20" } , 
+		   <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, 
+		   <AE09>, <AE10>, <AE11>, <AE12>, 
+		   <BKSL>, { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <DELE>, color="grey20" }, 
+		   { <RTRN>, "RTRN", -14, color="grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <LCTL>, "MODK", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <TLDE>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "SHFT", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <AB11>,
+		    { <RTSH>, "SHFT", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LALT>, { <CAPS>, "CAPS" },
+		   { <STOP>, "STOP", color="white" },
+		   { <SPCE>, "SPCE", color="white" },
+		   { <CUT>, "CUT", color="white" },
+		   { <UNK0>, "UNK" }, { <UNK1>, "UNK" }, 
+		   { <EXEC>, "EXEC" }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 80;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <HELP> };
+	};
+        row {
+	    top= 20;
+	    keys { <INS> };
+	};
+        row {
+	    top= 39;
+	    keys { <CLR> };
+	};
+	row {
+	    top= 58;
+	    keys { <PGUP> };
+	};
+	row {
+	    top= 77;
+	    keys { <PGDN> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 334;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { { <KPMU>, 19 }, <KPDV>, <KPAD> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPSU>, color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, { <KPSP>, color="grey20" } };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { <KP0>, { <KPDC>, color="grey20" }, <UP> };
+	};
+	row {
+	    top= 96;
+	    key.color= "grey20";
+	    keys { <KPTB>, <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Keypad" section
+
+}; // End of "default" geometry
diff --git a/xorg-server/xkeyboard-config/geometry/sun b/xorg-server/xkeyboard-config/geometry/sun
index 8aef7f6c3..4b7126d45 100644
--- a/xorg-server/xkeyboard-config/geometry/sun
+++ b/xorg-server/xkeyboard-config/geometry/sun
@@ -1,3046 +1,3046 @@
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//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 OPEN GROUP 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 Open Group 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 Open Group.
-//
-// ---------------------------------------------------------------------------
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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 (including the next
-// paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
-//
-// ---------------------------------------------------------------------------
-//
-xkb_geometry "type4" {
-
-    // This is an approximate layout for a (US/ASCII) Sun Type4 US
-    // keyboard.  
-
-    description= "Sun Type4 keyboard";
-
-    width= 452;
-    height= 185;
-
-    shape "EDGE" { cornerRadius= 2, { [ 452, 185 ] } };
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
-    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "DELE" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "RTRN" { 
-	    approx = { [ 0, 0], [28,37] },
-	    { [ 0, 0], [28, 0], [28,37],
-	      [ 5,37], [ 5,19], [ 0,19] },
-	    { [ 1, 1], [26, 1], [26,36],
-	      [ 7,36], [ 7,18], [ 1,18] }
-    };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "LFSH" { { [ 41,18] }, { [2,1], [39,17] } };
-    shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } };
-    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "SPCE" { { [170,18] }, { [2,1], [168,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 17;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-
-    section "Alpha" {
-	top= 58;
-	row {
-	    top= 1;
-	    keys { <STOP>, <AGAI>,
-		 { <FK01>, 9 }, <FK02>, <FK03>, <FK04>,
-		   <FK05>, <FK06>, <FK07>, <FK08>,
-		   <FK09>, <FK10>, <FK11>, <FK12>,
-		   <BKSL>, { <DELE>, "DELE" },
-		 { <PAUS>, 9 }, <PRSC>, <SCLK>, <NMLK>
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { <PROP>, <UNDO>, { <ESC>, 9 }, 
-		   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, 
-		   <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, 
-		   <AE11>, <AE12>,
-		 { <BKSP>, "BKSP" },
-		 { <KPEQ>, 9 }, <KPDV>, <KPMU>, <KPSU> 
-
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { <FRNT>, <COPY>, 
-		 { <TAB>, 9, shape="TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <RTRN>, "RTRN" },
-		 { <KP7>, 9 }, <KP8>, <KP9>, { <KPAD>, "KPAD" } 
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { <OPEN>, <PAST>, 
-		 { <LCTL>, 9, shape="LCTL" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, <TLDE>,
-		 { <KP4>, 33 }, <KP5>, <KP6>
-	    };
-	};
-	row {
-	    top= 77;
-	    keys { <FIND>, <CUT>, 
-		 { <LFSH>, 9 , shape="LFSH" }, 
-		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		 { <RTSH>, "RTSH" }, <LNFD>,
-		 { <KP1>, 9} , <KP2>, <KP3>, { <KPEN>, "KPAD" }
-	    };
-	};
-	row {
-	    top= 96;
-	    keys { { <HELP>, "HELP" }, { <CAPS>, 9 },
-		   <LALT>, <LMTA>, { <SPCE>, "SPCE" },
-		   <RMTA>, <COMP>, <ALGR>,
-		 { <KP0>, 9, shape="KP0" }, <KPDL>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } };
-    shape "LED"  { cornerRadius= 0, { [  7,  4 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  28;
-	left= 358;
-    };
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 43;
-    indicator.shape= "LED";
-    indicator "Caps Lock"	{ left= 364; };
-    indicator "Compose"		{ left= 383; };
-    indicator "Scroll Lock"	{ left= 402; };
-    indicator "Num Lock"	{ left= 421; };
-    text.top= 34;
-    text.color= "black";
-    text "CapsLockLabel"	{ left= 364; text="Caps\nLock"; };
-    text "ComposeLabel"		{ left= 380; text="Compose"; };
-    text "ScrollLockLabel"	{ left= 402; text="Scroll\nLock"; };
-    text "NumLockLabel"		{ left= 421; text="Num\nLock"; };
-};
-
-xkb_geometry "type4tuv" {
-
-    // This is an approximate layout for a (US/ASCII) Sun Type4 TUV
-    // (European) keyboard with an extra key between the Shift_L
-    // and the Z keys, and two keys above the Bksp key, instead
-    // of a large delete key.
-
-    description= "Sun Type4tuv keyboard";
-
-    width= 452;
-    height= 185;
-
-    shape "EDGE" { cornerRadius= 2, { [ 452, 185 ] } };
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
-    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
-
-    shape "RTRN" {
-          approx = { [ 0, 0], [28,37] },
-          { [ 0, 0], [28, 0], [28,37],
-            [ 5,37], [ 5,19], [ 0,19] },
-          { [ 1, 1], [26, 1], [26,36],
-            [ 7,36], [ 7,18], [ 1,18] }
-    };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } };
-    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "SPCE" { { [170,18] }, { [2,1], [168,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 17;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-
-    section "Alpha" {
-	top= 58;
-	row {
-	    top= 1;
-	    keys { <STOP>, <AGAI>,
-		 { <FK01>, 9 }, <FK02>, <FK03>, <FK04>,
-		   <FK05>, <FK06>, <FK07>, <FK08>,
-		   <FK09>, <FK10>, <FK11>, <FK12>,
-		   <BKSL>, <BRCR>,<DELE>,
-		 { <PAUS>, 9 }, <PRSC>, <SCLK>, <NMLK>
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { <PROP>, <UNDO>, { <ESC>, 9 }, 
-		   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, 
-		   <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, 
-		   <AE11>, <AE12>,
-		 { <BKSP>, "BKSP" },
-		 { <KPEQ>, 9 }, <KPDV>, <KPMU>, <KPSU> 
-
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { <FRNT>, <COPY>, 
-		 { <TAB>, 9, shape="TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <RTRN>, "RTRN" },
-		 { <KP7>, 9 }, <KP8>, <KP9>, { <KPAD>, "KPAD" } 
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { <OPEN>, <PAST>, 
-		 { <LCTL>, 9, shape="LCTL" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, <TLDE>,
-		 { <KP4>, 33 }, <KP5>, <KP6>
-	    };
-	};
-	row {
-	    top= 77;
-	    keys { <FIND>, <CUT>, 
-		 { <LFSH>, 9 }, <LSGT>,
-		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		 { <RTSH>, "RTSH" }, <LNFD>,
-		 { <KP1>, 9} , <KP2>, <KP3>, { <KPEN>, "KPAD" }
-	    };
-	};
-	row {
-	    top= 96;
-	    keys { { <HELP>, "HELP" }, { <CAPS>, 9 },
-		   <LALT>, <LMTA>, { <SPCE>, "SPCE" },
-		   <RMTA>, <COMP>, <ALGR>,
-		 { <KP0>, 9, shape="KP0" }, <KPDL>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } };
-    shape "LED"  { cornerRadius= 0, { [  7,  4 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  28;
-	left= 358;
-    };
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 43;
-    indicator.shape= "LED";
-    indicator "CapsLock"	{ left= 364; };
-    indicator "Compose"	{ left= 383; };
-    indicator "ScrollLock"	{ left= 402; };
-    indicator "NumLock"	{ left= 421; };
-    text.top= 34;
-    text.color= "black";
-    text "CapsLockLabel"	{ left= 364; text="Caps\nLock"; };
-    text "ComposeLabel"		{ left= 380; text="Compose"; };
-    text "ScrollLockLabel"	{ left= 402; text="Scroll\nLock"; };
-    text "NumLockLabel"		{ left= 421; text="Num\nLock"; };
-};
-
-xkb_geometry "type4_ca" {
-
-    // This is an approximate layout for a (US/ASCII) Sun Type4
-    // Canadian and British keyboard with an extra key between
-    // the Shift_L 
-    // and the Z keys.
-
-    description= "Sun Type4_uk keyboard";
-
-    width= 452;
-    height= 185;
-
-    shape "EDGE" { cornerRadius= 2, { [ 452, 185 ] } };
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
-    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "DELE" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "RTRN" { 
-            approx = { [ 0, 0], [28,37] },
-            { [ 0, 0], [28, 0], [28,37],
-              [ 5,37], [ 5,19], [ 0,19] },
-            { [ 1, 1], [26, 1], [26,36],
-              [ 7,36], [ 7,18], [ 1,18] }
-    };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } };
-    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "SPCE" { { [170,18] }, { [2,1], [168,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
-
-    outline "Edges" {
-        top= 0;
-        left= 0;
-        shape= "EDGE";
-    };
-
-    section.left= 17;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-
-    section "Alpha" {
-        top= 58;
-        row {
-            top= 1;
-            keys { <STOP>, <AGAI>,
-                 { <FK01>, 9 }, <FK02>, <FK03>, <FK04>,
-                   <FK05>, <FK06>, <FK07>, <FK08>,
-                   <FK09>, <FK10>, <FK11>, <FK12>,
-                   <BKSL>, { <DELE>, "DELE" },
-                 { <PAUS>, 9 }, <PRSC>, <SCLK>, <NMLK>
-            };
-        };
-        row {
-            top= 20;
-            keys { <PROP>, <UNDO>, { <ESC>, 9 }, 
-                   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>,
-                   <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, 
-                   <AE11>, <AE12>,
-                 { <BKSP>, "BKSP" },
-                 { <KPEQ>, 9 }, <KPDV>, <KPMU>, <KPSU> 
-
-            };
-        };
-        row {
-            top= 39;
-            keys { <FRNT>, <COPY>, 
-                 { <TAB>, 9, shape="TABK" },
-                   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-                   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-                   <AD11>, <AD12>, { <RTRN>, "RTRN" },
-                 { <KP7>, 9 }, <KP8>, <KP9>, { <KPAD>, "KPAD" } 
-            };
-        };
-        row {
-            top= 58;
-            keys { <OPEN>, <PAST>, 
-                 { <LCTL>, 9, shape="LCTL" },
-                   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-                   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-                   <AC11>, <TLDE>,
-                 { <KP4>, 33 }, <KP5>, <KP6>
-            };
-        };
-        row {
-            top= 77;
-            keys { <FIND>, <CUT>, 
-                 { <LFSH>, 9 }, <LSGT>,
-                   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-                   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-                 { <RTSH>, "RTSH" }, <LNFD>,
-                 { <KP1>, 9} , <KP2>, <KP3>, { <KPEN>, "KPAD" }
-            };
-        };
-        row {
-            top= 96;
-            keys { { <HELP>, "HELP" }, { <CAPS>, 9 },
-                   <LALT>, <LMTA>, { <SPCE>, "SPCE" },
-                   <RMTA>, <COMP>, <ALGR>,
-                 { <KP0>, 9, shape="KP0" }, <KPDL>
-            };
-        };
-    }; // End of "Alpha" section
-
-    shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } };
-    shape "LED"  { cornerRadius= 0, { [  7,  4 ] } };
-    solid "LedPanel" {
-        shape= "LEDS";
-        top=  28;
-        left= 358;
-    };
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 43;
-    indicator.shape= "LED";
-    indicator "CapsLock"        { left= 364; };
-    indicator "Compose" { left= 383; };
-    indicator "ScrollLock"      { left= 402; };
-    indicator "NumLock" { left= 421; };
-    text.top= 34;
-    text.color= "black";
-    text "CapsLockLabel"        { left= 364; text="Caps\nLock"; };
-    text "ComposeLabel"         { left= 380; text="Compose"; };
-    text "ScrollLockLabel"      { left= 402; text="Scroll\nLock"; }
-;
-    text "NumLockLabel"         { left= 421; text="Num\nLock"; };
-};
-
-xkb_geometry "type4jp" {
-
-    // This is an approximate layout for a Japanese Sun Type4
-    // keyboard, based on the European TUV keyboard.  It has two keys
-    // above the Bksp key, instead of a large delete key, but lacks
-    // the extra key between Shift_L and Z.
-
-    description= "Sun Japanese Type4 keyboard";
-
-    width= 452;
-    height= 185;
-
-    shape "EDGE" { cornerRadius= 2, { [ 452, 185 ] } };
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
-    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
-
-    shape "RTRN" { 
-	    approx = { [ 0, 0], [28,37] },
-	    { [ 0, 0], [28, 0], [28,37],
-	      [ 5,37], [ 5,19], [ 0,19] },
-	    { [ 1, 1], [26, 1], [26,36],
-	      [ 7,36], [ 7,18], [ 1,18] }
-    };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } };
-    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "SPCE" { { [ 97,18] }, { [2,1], [95,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "LFSH" { { [ 41,18] }, { [2,1], [39,17] } };
-    shape "KANJ" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "EXEC" { { [ 27,18] }, { [2,1], [25,17] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 17;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-
-    section "Alpha" {
-	top= 58;
-	row {
-	    top= 1;
-	    keys { <STOP>, <AGAI>,
-		 { <FK01>, 9 }, <FK02>, <FK03>, <FK04>,
-		   <FK05>, <FK06>, <FK07>, <FK08>,
-		   <FK09>, <FK10>, <FK11>, <FK12>,
-		   <BKSL>, <BRCR>,<DELE>,
-		 { <PAUS>, 9 }, <PRSC>, <SCLK>, <NMLK>
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { <PROP>, <UNDO>, { <ESC>, 9 }, 
-		   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, 
-		   <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, 
-		   <AE11>, <AE12>,
-		 { <BKSP>, "BKSP" },
-		 { <KPEQ>, 9 }, <KPDV>, <KPMU>, <KPSU> 
-
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { <FRNT>, <COPY>, 
-		 { <TAB>, 9, shape="TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <RTRN>, "RTRN" },
-		 { <KP7>, 9 }, <KP8>, <KP9>, { <KPAD>, "KPAD" } 
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { <OPEN>, <PAST>, 
-		 { <LCTL>, 9, shape="LCTL" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, <TLDE>,
-		 { <KP4>, 33 }, <KP5>, <KP6>
-	    };
-	};
-	row {
-	    top= 77;
-	    keys { <FIND>, <CUT>, 
-		 { <LFSH>, 9, shape="LFSH" },
-		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		   <LNFD>, { <RTSH>, "RTSH" },
-		 { <KP1>, 9} , <KP2>, <KP3>, { <KPEN>, "KPAD" }
-	    };
-	};
-	row {
-	    top= 96;
-	    keys { { <HELP>, "HELP" }, { <CAPS>, 9 },
-		   <LALT>, <LMTA>, { <EXEC>, "EXEC"} , { <SPCE>, "SPCE" },
-		   { <KANJ>, "KANJ" }, <HENK>, <RMTA>, <COMP>, <ALGR>,
-		 { <KP0>, 9, shape="KP0" }, <KPDL>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } };
-    shape "LED"  { cornerRadius= 0, { [  7,  4 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  28;
-	left= 358;
-    };
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 43;
-    indicator.shape= "LED";
-    indicator "CapsLock"	{ left= 364; };
-    indicator "Compose"	{ left= 383; };
-    indicator "ScrollLock"	{ left= 402; };
-    indicator "NumLock"	{ left= 421; };
-    text.top= 34;
-    text.color= "black";
-    text "CapsLockLabel"	{ left= 364; text="Caps\nLock"; };
-    text "ComposeLabel"		{ left= 380; text="Compose"; };
-    text "ScrollLockLabel"	{ left= 402; text="Scroll\nLock"; };
-    text "NumLockLabel"		{ left= 421; text="Num\nLock"; };
-};
-
-xkb_geometry "t5" {
-
-    // This is an approximate layout for a (US/ASCII) Sun Type5
-    // keyboard.  I just took a similar layout (101 key PC keyboard)
-    // and adjusted the sizes.
-
-    width= 515;
-    height= 170;
-
-    shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } };
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
-    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "BKSL" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "RTRN" { { [ 42,18] }, { [2,1], [40,17] } };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } };
-    shape "RTSH" { { [ 51,18] }, { [2,1], [49,17] } };
-    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "SPCE" { { [156,18] }, { [2,1], [154,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "LOGO" { { [ 16,16] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 14;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 24;
-	row {
-	    top= 1;
-	    keys { { <HELP>, "HELP" }, { <ESC>, 9 },
-		   { <FK01>, 19 }, <FK02>, <FK03>, <FK04>,
-		   { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
-		   { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
-		   { <PRSC>,  9 }, <SCLK>, <PAUS>,
-		   { <MUTE>,  9 }, <VOL->, <VOL+>, <POWR>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 61;
-	row {
-	    top= 1;
-	    keys { <STOP>, <AGAI>,
-		 { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>,
-		 { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>,
-		 { <BKSL>, "BKSL" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>,
-		 { <RTRN>, "RTRN" }
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, 
-		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		 { <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    keys { <FIND>, <CUT>, { <LCTL>, 9, shape="LCTL" },
-		   <LALT>, <LMTA>,
-		 { <SPCE>, "SPCE" },
-		   <RMTA>, <COMP>, <ALGR>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 61;
-	left= 352;
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-	row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 61;
-	left= 420;
-	row {
-	    top= 1;
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-};
-
-xkb_geometry "t5tuv" {
-
-    // This is an approximate layout for a TUV/European Sun Type5 keyboard.
-
-    width= 515;
-    height= 170;
-
-    shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } };
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
-    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "RTRN" {
-        approx = { [ 0, 0], [28,37] },
-        { [ 0, 0], [28, 0], [28,37],
-          [ 5,37], [ 5,18], [ 0,18] },
-        { [ 1, 1], [26, 1], [26,36],
-          [ 7,36], [ 7,17], [ 1,17] }
-    };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "LFSH" { { [ 24,18] }, { [2,1], [22,17] } };
-    shape "RTSH" { { [ 51,18] }, { [2,1], [49,17] } };
-    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "SPCE" { { [157,18] }, { [2,1], [155,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "LOGO" { { [ 16,16] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 14;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 24;
-	row {
-	    top= 1;
-	    keys { { <HELP>, "HELP" }, { <ESC>, 9 },
-		   { <FK01>, 19 }, <FK02>, <FK03>, <FK04>,
-		   { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
-		   { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
-		   { <PRSC>,  9 }, <SCLK>, <PAUS>,
-		   { <MUTE>,  9 }, <VOL->, <VOL+>, <POWR>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 61;
-	row {
-	    top= 1;
-	    keys { <STOP>, <AGAI>,
-		 { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>,
-		 { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>,
-		 { <RTRN>, "RTRN" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, <BKSL>
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, <LSGT>, 
-		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		 { <RTSH>, "RTSH" }
-	    };
-	};
-	row {
-	    top= 77;
-	    keys { <FIND>, <CUT>, { <LCTL>, 9, shape="LCTL" },
-		   <LALT>, <LMTA>,
-		 { <SPCE>, "SPCE" },
-		   <RMTA>, <COMP>, <ALGR>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 61;
-	left= 352;
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-	row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 61;
-	left= 420;
-	row {
-	    top= 1;
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-};
-
-
-xkb_geometry "t5jp" {
-
-    // This is an approximate layout for a Japanese Sun Type5 keyboard.
-
-    width= 515;
-    height= 170;
-
-    shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } };
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
-    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "KANJ" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "EXEC" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "RTRN" { 
-        approx = { [ 0, 0], [28,37] },
-        { [ 0, 0], [28, 0], [28,37],
-          [ 5,37], [ 5,18], [ 0,18] },
-        { [ 1, 1], [26, 1], [26,36],
-          [ 7,36], [ 7,17], [ 1,17] }
-    };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } };
-    shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "SPCE" { { [ 97,18] }, { [2,1], [95,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "LOGO" { { [ 16,16] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 14;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 24;
-	row {
-	    top= 1;
-	    keys { { <HELP>, "HELP" }, { <ESC>, 9 },
-		   { <FK01>, 19 }, <FK02>, <FK03>, <FK04>,
-		   { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
-		   { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
-		   { <PRSC>,  9 }, <SCLK>, <PAUS>,
-		   { <MUTE>,  9 }, <VOL->, <VOL+>, <POWR>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 61;
-	row {
-	    top= 1;
-	    keys { <STOP>, <AGAI>,
-		 { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>,
-		 { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, 
-		   { <RTRN>, "RTRN" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, <BKSL>
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, 
-		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <UNDR>,
-		 { <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    keys { <FIND>, <CUT>, { <LCTL>, 9 },
-		   <LALT>, <LMTA>, { <EXEC>, "EXEC" },
-		 { <SPCE>, "SPCE" }, { <KANJ>, "KANJ" }, <HENK>,
-		   <RMTA>, <COMP>, <ALGR>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 61;
-	left= 352;
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-	row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 61;
-	left= 420;
-	row {
-	    top= 1;
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-};
-
-xkb_geometry "t5unix" {
-
-    // This is an approximate layout for a (US/ASCII) Sun Type5
-    // keyboard.  I just took a similar layout (101 key PC keyboard)
-    // and adjusted the sizes.
-
-    width= 515;
-    height= 170;
-
-    shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } };
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
-    shape "BKSP" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "BKSL" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "RTRN" { { [ 42,18] }, { [2,1], [40,17] } };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } };
-    shape "RTSH" { { [ 51,18] }, { [2,1], [49,17] } };
-    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "SPCE" { { [157,18] }, { [2,1], [155,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "LOGO" { { [ 16,16] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 14;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-    top= 24;
-	row {
-	    top= 1;
-	    keys { { <HELP>, "HELP" }, { <NONE>, 9 },
-		   { <FK01>, 19 }, <FK02>, <FK03>, <FK04>,
-		   { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
-		   { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
-		   { <PRSC>,  9 }, <SCLK>, <PAUS>,
-		   { <MUTE>,  9 }, <VOL->, <VOL+>, <POWR>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 61;
-	row {
-	    top= 1;
-	    keys { <STOP>, <AGAI>,
-		 { <ESC>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>,
-		   <BKSL>, <TLDE>
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>,
-		 { <BKSP>, "BKSP" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { <FRNT>, <COPY>, { <LCTL>, 9, shape="LCTL" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>,
-		 { <RTRN>, "RTRN" }
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, 
-		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		 { <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    keys { <FIND>, <CUT>, { <CAPS>, 9, shape="CAPS" },
-		   <LALT>, <LMTA>,
-		 { <SPCE>, "SPCE" },
-		   <RMTA>, <COMP>, <ALGR>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 61;
-	left= 352;
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-	row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 61;
-	left= 420;
-	row {
-	    top= 1;
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-};
-
-xkb_geometry "t5hobo" {
-
-    // This is an approximate layout for a (US/ASCII) Sun Type5
-    // keyboard.  I just took a similar layout (101 key PC keyboard)
-    // and adjusted the sizes.
-    //
-    // I modified this to look like the hobo keyboard.
-
-    width= 425;
-    height= 170;
-
-    shape "EDGE" { cornerRadius= 2, { [ 425, 170 ] } };
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
-    shape "FKEY" { { [ 15,18] }, { [0.5,0.5], [14.5, 17.5] } };
-    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "BKSL" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "RTRN" { { [ 42,18] }, { [2,1], [40,17] } };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } };
-    shape "RTSH" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "SPCE" { { [156,18] }, { [2,1], [154,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "LOGO" { { [ 16,16] } };
-    
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 14;
-    row.left= 1;
-    key.shape= "FKEY";
-    key.gap=  1;
-    section "Function" {
-	top= 24;
-	row {
-	    top= 1;
-	    keys { { <HELP>, "HELP" }, { <ESC>, 9 },
-		   { <FK01>, 4 }, <FK02>, <FK03>, <FK04>,
-		   { <FK05>, 4 }, <FK06>, <FK07>, <FK08>,
-		   { <FK09>, 4 }, <FK10>, <FK11>, <FK12>,
-		   { <MUTE>, 4 }, <VOL->, <VOL+>, <POWR>, 
-		   { <PRSC>,  9, "NORM" }, {<SCLK>, "NORM"}, {<PAUS>, "NORM"}
-	    };
-	};
-    }; // End of "Function" section
-
-    key.shape= "NORM";
-    section "Alpha" {
-	top= 61;
-	row {
-	    top= 1;
-	    keys { <STOP>, <AGAI>,
-		 { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>,
-		 { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>,
-		 { <BKSL>, "BKSL" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>,
-		 { <RTRN>, "RTRN" }
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, 
-		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		 { <RTSH>, "RTSH", color="grey20" }, <ALGR>
-	    };
-	};
-	row {
-	    top= 77;
-	    keys { <FIND>, <CUT>, { <LCTL>, 9, shape="LCTL" },
-		   <LALT>, <LMTA>,
-		 { <SPCE>, "SPCE" },
-		   <RMTA>, <COMP>, <NMLK>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 61;
-	left= 352;
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-	row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-};
-
-xkb_geometry "t5tuvhobo" {
-
-    // This is an approximate layout for a (US/ASCII) Sun Type5
-    // keyboard.  I just took a similar layout (101 key PC keyboard)
-    // and adjusted the sizes.
-    //
-    // I modified this to look like the hobo keyboard.
-
-    width= 425;
-    height= 170;
-
-    shape "EDGE" { cornerRadius= 2, { [ 425, 170 ] } };
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
-    shape "FKEY" { { [ 15,18] }, { [0.5,0.5], [14.5, 17.5] } };
-    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "BKSL" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "RTRN" { { [ 42,18] }, { [2,1], [40,17] } };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "LFSH" { { [ 24,18] }, { [2,1], [22,17] } };
-    shape "RTSH" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "SPCE" { { [156,18] }, { [2,1], [154,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "LOGO" { { [ 16,16] } };
-    
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 14;
-    row.left= 1;
-    key.shape= "FKEY";
-    key.gap=  1;
-    section "Function" {
-	top= 24;
-	row {
-	    top= 1;
-	    keys { { <HELP>, "HELP" }, { <ESC>, 9 },
-		   { <FK01>, 4 }, <FK02>, <FK03>, <FK04>,
-		   { <FK05>, 4 }, <FK06>, <FK07>, <FK08>,
-		   { <FK09>, 4 }, <FK10>, <FK11>, <FK12>,
-		   { <MUTE>, 4 }, <VOL->, <VOL+>, <POWR>, 
-		   { <PRSC>,  9, "NORM" }, {<SCLK>, "NORM"}, {<PAUS>, "NORM"}
-	    };
-	};
-    }; // End of "Function" section
-
-    key.shape= "NORM";
-    section "Alpha" {
-	top= 61;
-	row {
-	    top= 1;
-	    keys { <STOP>, <AGAI>,
-		 { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>,
-		 { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>,
-		 { <BKSL>, "BKSL" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>,
-		 { <RTRN>, "RTRN" }
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, <LSGT>,
-		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		 { <RTSH>, "RTSH", color="grey20" }, <ALGR>
-	    };
-	};
-	row {
-	    top= 77;
-	    keys { <FIND>, <CUT>, { <LCTL>, 9, shape="LCTL" },
-		   <LALT>, <LMTA>,
-		 { <SPCE>, "SPCE" },
-		   <RMTA>, <COMP>, <NMLK>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 61;
-	left= 352;
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-	row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-};
-
-xkb_geometry "t5jphobo" {
-
-    // This is an approximate layout for a (US/ASCII) Sun Type5
-    // keyboard.  I just took a similar layout (101 key PC keyboard)
-    // and adjusted the sizes.
-
-    width= 425;
-    height= 170;
-
-    shape "EDGE" { cornerRadius= 2, { [ 425, 170 ] } };
-    shape.cornerRadius= 1;
-    shape "FKEY" { { [ 15,18] }, { [0.5,0.5], [14.5, 17.5] } };
-    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
-    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "KANJ" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "EXEC" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "RTRN" { 
-        approx = { [ 0, 0], [28,37] },
-        { [ 0, 0], [28, 0], [28,37],
-          [ 5,37], [ 5,18], [ 0,18] },
-        { [ 1, 1], [26, 1], [26,36],
-          [ 7,36], [ 7,17], [ 1,17] }
-    };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } };
-    shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "SPCE" { { [ 97,18] }, { [2,1], [95,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "LOGO" { { [ 16,16] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 14;
-    row.left= 1;
-    key.shape= "FKEY";
-    key.gap=  1;
-    section "Function" {
-	top= 24;
-	row {
-	    top= 1;
-	    keys { { <HELP>, "HELP" }, { <ESC>, 9 },
-		   { <FK01>, 4 }, <FK02>, <FK03>, <FK04>,
-		   { <FK05>, 4 }, <FK06>, <FK07>, <FK08>,
-		   { <FK09>, 4 }, <FK10>, <FK11>, <FK12>,
-		   { <MUTE>, 4 }, <VOL->, <VOL+>, <POWR>, 
-		   { <PRSC>,  9, "NORM" }, {<SCLK>, "NORM"}, {<PAUS>, "NORM"}
-	    };
-	};
-    }; // End of "Function" section
-
-    key.shape= "NORM";
-    section "Alpha" {
-	top= 61;
-	row {
-	    top= 1;
-	    keys { <STOP>, <AGAI>,
-		 { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>,
-		 { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, 
-		   { <RTRN>, "RTRN" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, <BKSL>
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, 
-		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <UNDR>,
-		 { <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    keys { <FIND>, <CUT>, { <LCTL>, 9 },
-		   <LALT>, <LMTA>, { <EXEC>, "EXEC" },
-		 { <SPCE>, "SPCE" }, { <KANJ>, "KANJ" }, <HENK>,
-		   <RMTA>, <COMP>, <ALGR>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 61;
-	left= 352;
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-	row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-};
-
-xkb_geometry "type5_se" {
-
-    // kbd: type = 4, layout = 43
-
-    description= "Sun Type5 keyboard (Sweden)";
-
-    width=       510;
-    height=      170;
-
-    baseColor=   "grey";
-    labelColor=  "black";
-
-    shape.cornerRadius=	1;
-
-    shape "EDGE" { cornerRadius= 2, { [ 510, 170 ] } };
-    shape "LOGO" { cornerRadius= 2,
-      { [ 0, 8], [ 8, 16], [ 16, 8], [ 8, 0] }
-    };
-
-    shape "NORM" { { [ 18, 18] }, { [ 2, 1], [ 16, 17] } };
-    shape "BKSP" { { [ 38, 18] }, { [ 2, 1], [ 36, 17] } };
-    shape "TABK" { { [ 27, 18] }, { [ 2, 1], [ 25, 17] } };
-    shape "RTRN" { 
-      {	[ 0, 0], [ 29, 0], [ 29, 37], [ 5, 37], [ 5, 18], [ 0, 18] },
-      { [ 2, 1], [ 27, 1], [ 27, 36], [ 7, 36], [ 7, 17], [ 2, 17] }
-    };
-    shape "CAPS" { { [ 32, 18] }, { [ 2, 1], [ 30, 17 ] } };
-    shape "LFSH" { { [ 24, 18] }, { [ 2, 1], [ 22, 17 ] } };
-    shape "RTSH" { { [ 51, 18] }, { [ 2, 1], [ 49, 17 ] } };
-    shape "LCTL" { { [ 32, 18] }, { [ 2, 1], [ 30, 17 ] } };
-    shape "MODK" { { [ 28, 18] }, { [ 2, 1], [ 26, 17 ] } };
-    shape "SPCE" { { [157, 18] }, { [ 2, 1], [155, 17 ] } };
-    shape "KP0"  { { [ 37, 18] }, { [ 2, 1], [ 35, 17 ] } };
-    shape "KPAD" { { [ 18, 37] }, { [ 2, 1], [ 16, 36 ] } };
-    shape "HELP" { { [ 37, 18] }, { [ 2, 1], [ 35, 17 ] } };
-
-    section "Function" {
-        key.color= "grey10";
-        priority=  1;
-        top=       24;
-        left=      14;
-        width=     481;
-        height=    19;
-        row {
-            top=  1;
-            left= 1;
-            keys {
-                { <HELP>, "HELP",   1 }, {  <ESC>, "NORM",   9 },
-                { <FK01>, "NORM",  19 }, { <FK02>, "NORM",   1 },
-                { <FK03>, "NORM",   1 }, { <FK04>, "NORM",   1 },
-                { <FK05>, "NORM",  11 }, { <FK06>, "NORM",   1 },
-                { <FK07>, "NORM",   1 }, { <FK08>, "NORM",   1 },
-                { <FK09>, "NORM",  11 }, { <FK10>, "NORM",   1 },
-                { <FK11>, "NORM",   1 }, { <FK12>, "NORM",   1 },
-                { <PRSC>, "NORM",   9 }, { <SCLK>, "NORM",   1 },
-                { <PAUS>, "NORM",   1 }, { <MUTE>, "NORM",  11 },
-                { <VOL->, "NORM",   1 }, { <VOL+>, "NORM",   1 },
-		{ <POWR>, "NORM",   1, color= "white" }
-            };
-        };
-    }; // End of "Function" section
-
-    section "Alpha" {
-        key.color= "white";
-        priority=  2;
-        top=       61;
-        left=      14;
-        width=     333;
-        height=    95;
-        row {
-            top=  1;
-            left= 1;
-            keys {
-                { <STOP>, "NORM",   1, color= "grey10" },
-		{ <AGAI>, "NORM",   1, color= "grey10" },
-                { <TLDE>, "NORM",   9 }, { <AE01>, "NORM",   1 },
-                { <AE02>, "NORM",   1 }, { <AE03>, "NORM",   1 },
-                { <AE04>, "NORM",   1 }, { <AE05>, "NORM",   1 },
-                { <AE06>, "NORM",   1 }, { <AE07>, "NORM",   1 },
-                { <AE08>, "NORM",   1 }, { <AE09>, "NORM",   1 },
-                { <AE10>, "NORM",   1 }, { <AE11>, "NORM",   1 },
-                { <AE12>, "NORM",   1 },
-                { <BKSP>, "BKSP",   1, color="grey10" }
-            };
-        };
-        row {
-            top=  20;
-            left= 1;
-            keys {
-                { <PROP>, "NORM",   1, color= "grey10" },
-		{ <UNDO>, "NORM",   1, color= "grey10" },
-                {  <TAB>, "TABK",   9, color= "grey10" },
-		{ <AD01>, "NORM",   1 },
-                { <AD02>, "NORM",   1 }, { <AD03>, "NORM",   1 },
-                { <AD04>, "NORM",   1 }, { <AD05>, "NORM",   1 },
-                { <AD06>, "NORM",   1 }, { <AD07>, "NORM",   1 },
-                { <AD08>, "NORM",   1 }, { <AD09>, "NORM",   1 },
-                { <AD10>, "NORM",   1 }, { <AD11>, "NORM",   1 },
-                { <AD12>, "NORM",   1 },
-		{ <RTRN>, "RTRN",   1, color= "grey10" }
-            };
-        };
-        row {
-            top=  39;
-            left= 1;
-            keys {
-                { <FRNT>, "NORM",   1, color= "grey10" },
-		{ <COPY>, "NORM",   1, color= "grey10" },
-                { <CAPS>, "CAPS",   9, color= "grey10" }, 
-	        { <AC01>, "NORM",   1 },
-                { <AC02>, "NORM",   1 }, { <AC03>, "NORM",   1 },
-                { <AC04>, "NORM",   1 }, { <AC05>, "NORM",   1 },
-                { <AC06>, "NORM",   1 }, { <AC07>, "NORM",   1 },
-                { <AC08>, "NORM",   1 }, { <AC09>, "NORM",   1 },
-                { <AC10>, "NORM",   1 }, { <AC11>, "NORM",   1 },
-		{ <AC12>, "NORM",   1 }
-            };
-        };
-        row {
-            top=  58;
-            left= 1;
-            keys {
-                { <OPEN>, "NORM",   1, color= "grey10" },
-		{ <PAST>, "NORM",   1, color= "grey10" },
-		{ <LFSH>, "LFSH",   9, color= "grey10" },
-		{ <AB00>, "NORM",   1 }, { <AB01>, "NORM",   1 },
-                { <AB02>, "NORM",   1 }, { <AB03>, "NORM",   1 },
-                { <AB04>, "NORM",   1 }, { <AB05>, "NORM",   1 },
-                { <AB06>, "NORM",   1 }, { <AB07>, "NORM",   1 },
-                { <AB08>, "NORM",   1 }, { <AB09>, "NORM",   1 },
-                { <AB10>, "NORM",   1 },
-                { <RTSH>, "RTSH",   1, color="grey10" }
-            };
-        };
-        row {
-            top=  77;
-            left= 1;
-	    key.color= "grey10";
-            keys {
-                { <FIND>, "NORM",   1 }, {  <CUT>, "NORM",   1 },
-                { <LCTL>, "LCTL",   9 }, { <LALT>, "NORM",   1 },
-                { <LMTA>, "NORM",   1 },
-		{ <SPCE>, "SPCE",   1, color= "white" },
-                { <RMTA>, "NORM",   1 }, { <COMP>, "NORM",   1 },
-                { <ALGR>, "NORM",   1 }
-            };
-        };
-    }; // End of "Alpha" section
-
-    section "Editing" {
-        key.color= "grey10";
-        priority=  3;
-        top=       61;
-        left=      352;
-        width=     58;
-        height=    95;
-        row {
-            top=  1;
-            left= 1;
-            keys {
-                {  <INS>, "NORM",   1 }, { <HOME>, "NORM",   1 },
-                { <PGUP>, "NORM",   1 }
-            };
-        };
-        row {
-            top=  20;
-            left= 1;
-            keys {
-                { <DELE>, "NORM",   1 }, {  <END>, "NORM",   1 },
-                { <PGDN>, "NORM",   1 }
-            };
-        };
-        row {
-            top=  58;
-            left= 20;
-            keys {
-                {   <UP>, "NORM",   1 }
-            };
-        };
-        row {
-            top=  77;
-            left= 1;
-            keys {
-                { <LEFT>, "NORM",   1 }, { <DOWN>, "NORM",   1 },
-                { <RGHT>, "NORM",   1 }
-            };
-        };
-    }; // End of "Editing" section
-
-    section "Keypad" {
-        key.color= "white";
-        priority=  4;
-        top=       61;
-        left=      420;
-        width=     77;
-        height=    95;
-        row {
-            top=  1;
-            left= 1;
-	    key.color= "grey10";
-            keys {
-                { <NMLK>, "NORM",   1 }, { <KPDV>, "NORM",   1 },
-                { <KPMU>, "NORM",   1 }, { <KPSU>, "NORM",   1 }
-            };
-        };
-        row {
-            top=  20;
-            left= 1;
-            keys {
-                {  <KP7>, "NORM",   1 }, {  <KP8>, "NORM",   1 },
-                {  <KP9>, "NORM",   1 },
-                { <KPAD>, "KPAD",   1, color="grey10" }
-            };
-        };
-        row {
-            top=  39;
-            left= 1;
-            keys {
-                {  <KP4>, "NORM",   1 }, {  <KP5>, "NORM",   1 },
-                {  <KP6>, "NORM",   1 }
-            };
-        };
-        row {
-            top=  58;
-            left= 1;
-            keys {
-                {  <KP1>, "NORM",   1 }, {  <KP2>, "NORM",   1 },
-                {  <KP3>, "NORM",   1 },
-                { <KPEN>, "KPAD",   1, color="grey10" }
-            };
-        };
-        row {
-            top=  77;
-            left= 1;
-            keys {
-                {  <KP0>, "KP0",   1 }, { <KPDL>, "NORM",   1 }
-            };
-        };
-    }; // End of "Keypad" section
-
-    outline "Edges" {
-        top=      0;
-        left=     0;
-        priority= 0;
-        shape= "EDGE";
-    };
-
-    solid "Logos" {
-      color= "blue";
-      top=	5;
-      left=	25;
-      priority=	0;
-      shape= "LOGO";
-    };
-    
-    logo "SUNLogoImage" {
-      top=	5;
-      left=	25;
-      name= "SUN";
-      priority=	1;
-      shape= "LOGO";
-    };
-
-    shape "LED" { cornerRadius= 1,
-      { [ 0, 1.5], [ 1.5, 3], [ 3, 1.5], [ 1.5, 0] }
-    };
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.shape= "LED";
-    indicator "Caps Lock" { left= 75; top= 103; priority= 5; };
-    indicator "Compose"	  { left= 314; top= 142; priority= 5; };
-    indicator "Scroll Lock" { left= 378; top= 29; };
-    indicator "Num Lock"  { left= 426; top= 66; };
-};
-
-xkb_geometry "type5c_se" {
-
-    // kbd: type = 4, layout = 43
-
-    description= "Sun Type5c keyboard (Sweden)";
-
-    width=       510;
-    height=      170;
-
-    baseColor=   "grey";
-    labelColor=  "black";
-
-    shape.cornerRadius=	1;
-
-    shape "EDGE" { cornerRadius= 2, { [ 510, 170 ] } };
-    shape "LOGO" { cornerRadius= 2,
-      { [ 0, 8], [ 8, 16], [ 16, 8], [ 8, 0] }
-    };
-
-    shape "NORM" { { [ 18, 18] }, { [ 2, 1], [ 16, 17] } };
-    shape "BKSP" { { [ 38, 18] }, { [ 2, 1], [ 36, 17] } };
-    shape "TABK" { { [ 27, 18] }, { [ 2, 1], [ 25, 17] } };
-    shape "META" { { [ 27, 18] }, { [ 2, 1], [ 25, 17] } };
-    shape "RTRN" { 
-      {	[ 0, 0], [ 29, 0], [ 29, 37], [ 5, 37], [ 5, 18], [ 0, 18] },
-      { [ 2, 1], [ 27, 1], [ 27, 36], [ 7, 36], [ 7, 17], [ 2, 17] }
-    };
-    shape "CAPS" { { [ 32, 18] }, { [ 2, 1], [ 30, 17 ] } };
-    shape "LFSH" { { [ 24, 18] }, { [ 2, 1], [ 22, 17 ] } };
-    shape "RTSH" { { [ 51, 18] }, { [ 2, 1], [ 49, 17 ] } };
-    shape "LCTL" { { [ 32, 18] }, { [ 2, 1], [ 30, 17 ] } };
-    shape "MODK" { { [ 28, 18] }, { [ 2, 1], [ 26, 17 ] } };
-    shape "SPCE" { { [139, 18] }, { [ 2, 1], [137, 17 ] } };
-    shape "KP0"  { { [ 37, 18] }, { [ 2, 1], [ 35, 17 ] } };
-    shape "KPAD" { { [ 18, 37] }, { [ 2, 1], [ 16, 36 ] } };
-    shape "HELP" { { [ 37, 18] }, { [ 2, 1], [ 35, 17 ] } };
-
-    section "Function" {
-        key.color= "grey10";
-        priority=  1;
-        top=       24;
-        left=      14;
-        width=     481;
-        height=    19;
-        row {
-            top=  1;
-            left= 1;
-            keys {
-                { <HELP>, "HELP",   1 }, {  <ESC>, "NORM",   9 },
-                { <FK01>, "NORM",  19 }, { <FK02>, "NORM",   1 },
-                { <FK03>, "NORM",   1 }, { <FK04>, "NORM",   1 },
-                { <FK05>, "NORM",  11 }, { <FK06>, "NORM",   1 },
-                { <FK07>, "NORM",   1 }, { <FK08>, "NORM",   1 },
-                { <FK09>, "NORM",  11 }, { <FK10>, "NORM",   1 },
-                { <FK11>, "NORM",   1 }, { <FK12>, "NORM",   1 },
-                { <PRSC>, "NORM",   9 }, { <SCLK>, "NORM",   1 },
-                { <PAUS>, "NORM",   1 }, { <MUTE>, "NORM",  11 },
-                { <VOL->, "NORM",   1 }, { <VOL+>, "NORM",   1 },
-		{ <POWR>, "NORM",   1, color= "white" }
-            };
-        };
-    }; // End of "Function" section
-
-    section "Alpha" {
-        key.color= "white";
-        priority=  2;
-        top=       61;
-        left=      14;
-        width=     333;
-        height=    95;
-        row {
-            top=  1;
-            left= 1;
-            keys {
-                { <STOP>, "NORM",   1, color= "grey10" },
-		{ <AGAI>, "NORM",   1, color= "grey10" },
-                { <TLDE>, "NORM",   9 }, { <AE01>, "NORM",   1 },
-                { <AE02>, "NORM",   1 }, { <AE03>, "NORM",   1 },
-                { <AE04>, "NORM",   1 }, { <AE05>, "NORM",   1 },
-                { <AE06>, "NORM",   1 }, { <AE07>, "NORM",   1 },
-                { <AE08>, "NORM",   1 }, { <AE09>, "NORM",   1 },
-                { <AE10>, "NORM",   1 }, { <AE11>, "NORM",   1 },
-                { <AE12>, "NORM",   1 },
-                { <BKSP>, "BKSP",   1, color="grey10" }
-            };
-        };
-        row {
-            top=  20;
-            left= 1;
-            keys {
-                { <PROP>, "NORM",   1, color= "grey10" },
-		{ <UNDO>, "NORM",   1, color= "grey10" },
-                {  <TAB>, "TABK",   9, color= "grey10" },
-		{ <AD01>, "NORM",   1 },
-                { <AD02>, "NORM",   1 }, { <AD03>, "NORM",   1 },
-                { <AD04>, "NORM",   1 }, { <AD05>, "NORM",   1 },
-                { <AD06>, "NORM",   1 }, { <AD07>, "NORM",   1 },
-                { <AD08>, "NORM",   1 }, { <AD09>, "NORM",   1 },
-                { <AD10>, "NORM",   1 }, { <AD11>, "NORM",   1 },
-                { <AD12>, "NORM",   1 },
-		{ <RTRN>, "RTRN",   1, color= "grey10" }
-            };
-        };
-        row {
-            top=  39;
-            left= 1;
-            keys {
-                { <FRNT>, "NORM",   1, color= "grey10" },
-		{ <COPY>, "NORM",   1, color= "grey10" },
-                { <CAPS>, "CAPS",   9, color= "grey10" }, 
-	        { <AC01>, "NORM",   1 },
-                { <AC02>, "NORM",   1 }, { <AC03>, "NORM",   1 },
-                { <AC04>, "NORM",   1 }, { <AC05>, "NORM",   1 },
-                { <AC06>, "NORM",   1 }, { <AC07>, "NORM",   1 },
-                { <AC08>, "NORM",   1 }, { <AC09>, "NORM",   1 },
-                { <AC10>, "NORM",   1 }, { <AC11>, "NORM",   1 },
-		{ <AC12>, "NORM",   1 }
-            };
-        };
-        row {
-            top=  58;
-            left= 1;
-            keys {
-                { <OPEN>, "NORM",   1, color= "grey10" },
-		{ <PAST>, "NORM",   1, color= "grey10" },
-		{ <LFSH>, "LFSH",   9, color= "grey10" },
-		{ <AB00>, "NORM",   1 }, { <AB01>, "NORM",   1 },
-                { <AB02>, "NORM",   1 }, { <AB03>, "NORM",   1 },
-                { <AB04>, "NORM",   1 }, { <AB05>, "NORM",   1 },
-                { <AB06>, "NORM",   1 }, { <AB07>, "NORM",   1 },
-                { <AB08>, "NORM",   1 }, { <AB09>, "NORM",   1 },
-                { <AB10>, "NORM",   1 },
-                { <RTSH>, "RTSH",   1, color="grey10" }
-            };
-        };
-        row {
-            top=  77;
-            left= 1;
-	    key.color= "grey10";
-            keys {
-                { <FIND>, "NORM",   1 }, {  <CUT>, "NORM",   1 },
-                { <LCTL>, "LCTL",   9 }, { <LALT>, "NORM",   1 },
-                { <LMTA>, "META",   1 },
-		{ <SPCE>, "SPCE",   1, color= "white" },
-                { <RMTA>, "META",   1 }, { <COMP>, "NORM",   1 },
-                { <ALGR>, "NORM",   1 }
-            };
-        };
-    }; // End of "Alpha" section
-
-    section "Editing" {
-        key.color= "grey10";
-        priority=  3;
-        top=       61;
-        left=      352;
-        width=     58;
-        height=    95;
-        row {
-            top=  1;
-            left= 1;
-            keys {
-                {  <INS>, "NORM",   1 }, { <HOME>, "NORM",   1 },
-                { <PGUP>, "NORM",   1 }
-            };
-        };
-        row {
-            top=  20;
-            left= 1;
-            keys {
-                { <DELE>, "NORM",   1 }, {  <END>, "NORM",   1 },
-                { <PGDN>, "NORM",   1 }
-            };
-        };
-        row {
-            top=  58;
-            left= 20;
-            keys {
-                {   <UP>, "NORM",   1 }
-            };
-        };
-        row {
-            top=  77;
-            left= 1;
-            keys {
-                { <LEFT>, "NORM",   1 }, { <DOWN>, "NORM",   1 },
-                { <RGHT>, "NORM",   1 }
-            };
-        };
-    }; // End of "Editing" section
-
-    section "Keypad" {
-        key.color= "white";
-        priority=  4;
-        top=       61;
-        left=      420;
-        width=     77;
-        height=    95;
-        row {
-            top=  1;
-            left= 1;
-	    key.color= "grey10";
-            keys {
-                { <NMLK>, "NORM",   1 }, { <KPDV>, "NORM",   1 },
-                { <KPMU>, "NORM",   1 }, { <KPSU>, "NORM",   1 }
-            };
-        };
-        row {
-            top=  20;
-            left= 1;
-            keys {
-                {  <KP7>, "NORM",   1 }, {  <KP8>, "NORM",   1 },
-                {  <KP9>, "NORM",   1 },
-                { <KPAD>, "KPAD",   1, color="grey10" }
-            };
-        };
-        row {
-            top=  39;
-            left= 1;
-            keys {
-                {  <KP4>, "NORM",   1 }, {  <KP5>, "NORM",   1 },
-                {  <KP6>, "NORM",   1 }
-            };
-        };
-        row {
-            top=  58;
-            left= 1;
-            keys {
-                {  <KP1>, "NORM",   1 }, {  <KP2>, "NORM",   1 },
-                {  <KP3>, "NORM",   1 },
-                { <KPEN>, "KPAD",   1, color="grey10" }
-            };
-        };
-        row {
-            top=  77;
-            left= 1;
-            keys {
-                {  <KP0>, "KP0",   1 }, { <KPDL>, "NORM",   1 }
-            };
-        };
-    }; // End of "Keypad" section
-
-    outline "Edges" {
-        top=      0;
-        left=     0;
-        priority= 0;
-        shape= "EDGE";
-    };
-
-    solid "Logos" {
-      color= "blue";
-      top=	5;
-      left=	15;
-      priority=	0;
-      shape= "LOGO";
-    };
-    
-    logo "SUNLogoImage" {
-      top=	5;
-      left=	15;
-      name= "SUN";
-      priority=	1;
-      shape= "LOGO";
-    };
-
-    text.font= "charter";
-    text.weight= "medium";
-    text.slant= "i";
-    text.fontSize= 40;
-    text "SunLogoText" {
-      top=	5;
-      left=    32;
-      color= "blue";
-      text= "Sun";
-    };
-
-    shape "LED" { cornerRadius= 1,
-      { [ 0, 1.5], [ 1.5, 3], [ 3, 1.5], [ 1.5, 0] }
-    };
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.shape= "LED";
-    indicator "Caps Lock"   { left= 75; top= 103; priority= 5; };
-    indicator "Compose"     { left= 314; top= 142; priority= 5; };
-    indicator "Scroll Lock" { left= 378; top= 29; };
-    indicator "Num Lock"    { left= 426; top= 66; };
-};
-
-xkb_geometry "type4_se" {
-
-    // kbd: type = 4, layout = 11
-
-    description= "Sun Type4 keyboard (Sweden)";
-    
-
-    width=       453;
-    height=      183;
-
-    baseColor=   "grey";
-    labelColor=  "black";
-
-    shape "EDGE" { cornerRadius= 2, { [ 452, 185 ] } };
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
-    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "DELE" { { [ 18,18] }, { [2,1], [16,17] } };
-    shape "RTRN" { 
-	    approx = { [ 0, 0], [28,37] },
-	    { [ 0, 0], [28, 0], [28,37],
-	      [ 5,37], [ 5,19], [ 0,19] },
-	    { [ 1, 1], [26, 1], [26,36],
-	      [ 7,36], [ 7,18], [ 1,18] }
-    };
-    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "LFSH" { { [ 22,18] }, { [2,1], [20,17] } };
-    shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "SPCE" { { [170,18] }, { [2,1], [168,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 17;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-
-    section "Alpha" {
-	top= 58;
-	row {
-	    top= 1;
-	    key.color=	"grey10";
-	    keys { <STOP>, <AGAI>, { <FK01>, 9 },
-		   <FK02>, <FK03>, <FK04>,
-		   <FK05>, <FK06>, <FK07>, <FK08>,
-		   <FK09>, <FK10>, <FK11>, <FK12>,
-		 { <AF13>, 	color=	"white"},
-		 { <AF14>, 	color=	"white"},
-		   <DELE>, { <PAUS>, 9 },
-		   <PRSC>, <SCLK>, <NMLK>
-	    };
-	};
-	row {
-	    top= 20;
-	    key.color=	"white";
-	    keys {
-		 { <PROP>,	color=	"grey10" },
-		 { <UNDO>,	color=	"grey10" },
-		 {  <ESC>, 9,	color=	"grey10" }, 
-		   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, 
-		   <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, 
-		   <AE11>, <AE12>,
-		 { <BKSP>, "BKSP", 	color=	"grey10" },
-		 { <KPEQ>, 9, 	color=	"grey10" },
-		 { <KPDV>, 	color=	"grey10" },
-		 { <KPMU>, 	color=	"grey10" },
-		 { <KPSU>, 	color=	"grey10" }
-	    };
-	};
-	row {
-	    top= 39;
-	    key.color=	"white";
-	    keys {
-		 { <FRNT>, 	color=	"grey10" },
-		 { <COPY>,	color=	"grey10" },
-		 {  <TAB>, 9, 	"TABK",	color=	"grey10" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>,
-		 { <RTRN>,	"RTRN",	color=	"grey10" },
-		 {  <KP7>, 9, 	color=	"grey10" },
-		 {  <KP8>,  	color=	"grey10" },
-		 {  <KP9>,  	color=	"grey10" },
-		 { <KPAD>,	"KPAD",	color=	"grey10" } 
-	    };
-	};
-	row {
-	    top= 58;
-	    key.color=	"white";
-	    keys {
-		 { <OPEN>, 	color=	"grey10" },
-		 { <PAST>, 	color=	"grey10" },
-		 { <CAPS>, 9,	"LCTL",	color=	"grey10" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, <AC12>,
-		 {  <KP4>, 33,	color=	"grey10" },
-		 {  <KP5>,  	color=	"grey10" },
-		 {  <KP6>,  	color=	"grey10" }
-	    };
-	};
-	row {
-	    top= 77;
-	    key.color=	"white";
-	    keys { 
-		 { <FIND>, 	color=	"grey10" },
-		 {  <CUT>, 	color=	"grey10" },
-		 { <LFSH>, 9 ,	"LFSH",	color=	"grey10" },
-		   <AB00>, <AB01>, <AB02>, <AB03>,
-		   <AB04>, <AB05>, <AB06>, <AB07>,
-		   <AB08>, <AB09>, <AB10>,
-		 { <RTSH>, 	"RTSH",	color=	"grey10" },
-		 { <LNFD>,	color=	"grey10" },
-		 {  <KP1>, 9, 	color=	"grey10" },
-		 {  <KP2>,  	color=	"grey10" },
-		 {  <KP3>,  	color=	"grey10" },
-		 { <KPEN>,	"KPAD",	color=	"grey10" }
-	    };
-	};
-	row {
-	    top= 96;
-	    key.color=	"grey10";
-	    keys {
-		 { <HELP>, "HELP" }, { <LCTL>, 9 },
-		   <LALT>, <LMTA>,
-		 { <SPCE>, 	"SPCE",	color=	"white" },
-		   <RMTA>, <COMP>, <ALGR>,
-		 { <KP0>, 9, 	"KP0" }, <KPDL>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    shape "RIDGE" { cornerRadius= 1, { [  0, 1], [  1, 0 ],
-				       [330, 0], [331, 1],
-				       [330, 2], [  1, 2] } };
-    solid "Ridge" {
-	shape=	"RIDGE";
-	top=	48;
-	left=	18;
-    };
-
-    shape "LEDS" { cornerRadius= 1, { [ 75 ,21 ] } };
-    shape "LED"  { cornerRadius= 0, { [  7,  4 ] } };
-    outline "LedPanel" {
-	shape= "LEDS";
-	top=  28;
-	left= 358;
-    };
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 43;
-    indicator.shape= "LED";
-    indicator "Caps Lock"	{ left= 364; };
-    indicator "Compose"		{ left= 383; };
-    indicator "Scroll Lock"	{ left= 402; };
-    indicator "Num Lock"	{ left= 421; };
-    text.top= 32;
-    text.color= "black";
-    text "CapsLockLabel"	{ left= 364; text="Caps\nLock"; };
-    text "ComposeLabel"		{ left= 380; text="\nCompose"; };
-    text "ScrollLockLabel"	{ left= 402; text="Scroll\nLock"; };
-    text "NumLockLabel"		{ left= 421; text="Num\nLock"; };
-};
-
-xkb_geometry "t6" {
-
-    // This is an approximate layout for a (US/ASCII) Sun Type6
-    // keyboard.  I just took a similar layout (101 key PC keyboard)
-    // and adjusted the sizes.
-
-    width= 515;
-    height= 170;
-
-    shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } };
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
-    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "BKSL" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "RTRN" { { [ 42,18] }, { [2,1], [40,17] } };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } };
-    shape "RTSH" { { [ 51,18] }, { [2,1], [49,17] } };
-    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "SPCE" { { [136,18] }, { [2,1], [134,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "RMTA" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "LMTA" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "LOGO" { { [ 16,16] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 14;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 24;
-	row {
-	    top= 1;
-	    keys { { <HELP>, "HELP" }, { <ESC>, 9 },
-		   { <FK01>, 19 }, <FK02>, <FK03>, <FK04>,
-		   { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
-		   { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
-		   { <PRSC>,  9 }, <SCLK>, <PAUS>,
-		   { <MUTE>,  9 }, <VOL->, <VOL+>, <POWR>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 61;
-	row {
-	    top= 1;
-	    keys { <STOP>, <AGAI>,
-		 { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>,
-		 { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>,
-		 { <BKSL>, "BKSL" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>,
-		 { <RTRN>, "RTRN" }
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, 
-		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		 { <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    keys { <FIND>, <CUT>, { <LCTL>, 9, shape="LCTL" },
-		   <LALT>, { <LMTA>, "LMTA" },
-		 { <SPCE>, "SPCE" },
-		 { <RMTA>, "RMTA" }, <COMP>, <ALGR>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 61;
-	left= 352;
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-	row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 61;
-	left= 420;
-	row {
-	    top= 1;
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-
-    shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } };
-    shape "LED"  { cornerRadius= 2, { [  3,  6 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  1;
-	left= 218;
-    };
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 10;
-    indicator.shape= "LED";
-    indicator "CapsLock"	{ left= 243; };
-    indicator "Compose"	{ left= 281; };
-    indicator "ScrollLock"	{ left= 262; };
-    indicator "NumLock"	{ left= 224; };
-    text.top= 1;
-    text.color= "black";
-    text "CapsLockLabel"	{ left= 243; text="Caps\nLock"; };
-    text "ComposeLabel"		{ left= 281; text="Compose"; };
-    text "ScrollLockLabel"	{ left= 262; text="Scroll\nLock"; };
-    text "NumLockLabel"		{ left= 224; text="Num\nLock"; };
-
-
-};
-
-xkb_geometry "t6tuv" {
-
-    // This is an approximate layout for a (US/ASCII) Sun Type6
-    // keyboard.  I just took a similar layout (101 key PC keyboard)
-    // and adjusted the sizes.
-
-    width= 515;
-    height= 170;
-
-    shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } };
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } }; 
-    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "RTRN" { 
-        approx = { [ 0, 0], [28,37] },
-        { [ 0, 0], [28, 0], [28,37],
-          [ 5,37], [ 5,18], [ 0,18] },
-        { [ 1, 1], [26, 1], [26,36],
-          [ 7,36], [ 7,17], [ 1,17] }
-    };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "LFSH" { { [ 24,18] }, { [2,1], [22,17] } };
-    shape "RTSH" { { [ 51,18] }, { [2,1], [49,17] } };
-    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "SPCE" { { [137,18] }, { [2,1], [135,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-    shape "RMTA" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "LMTA" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "LOGO" { { [ 16,16] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 14;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 24;
-	row {
-	    top= 1;
-	    keys { { <HELP>, "HELP" }, { <ESC>, 9 },
-		   { <FK01>, 19 }, <FK02>, <FK03>, <FK04>,
-		   { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
-		   { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
-		   { <PRSC>,  9 }, <SCLK>, <PAUS>,
-		   { <MUTE>,  9 }, <VOL->, <VOL+>, <POWR>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 61;
-	row {
-	    top= 1;
-	    keys { <STOP>, <AGAI>,
-		 { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>,
-		 { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, 
-		   { <RTRN>, "RTRN" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, <BKSL>
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, <LSGT>, 
-		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		 { <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    keys { <FIND>, <CUT>, { <LCTL>, 9, shape="LCTL" },
-		   <LALT>, { <LMTA>, "LMTA" },
-		 { <SPCE>, "SPCE" },
-		 { <RMTA>, "RMTA" }, <COMP>, <ALGR>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 61;
-	left= 352;
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-	row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 61;
-	left= 420;
-	row {
-	    top= 1;
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-
-    shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } };
-    shape "LED"  { cornerRadius= 2, { [  3,  6 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  1;
-	left= 218;
-    };
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 10;
-    indicator.shape= "LED";
-    indicator "CapsLock"	{ left= 243; };
-    indicator "Compose"	{ left= 281; };
-    indicator "ScrollLock"	{ left= 262; };
-    indicator "NumLock"	{ left= 224; };
-    text.top= 1;
-    text.color= "black";
-    text "CapsLockLabel"	{ left= 243; text="Caps\nLock"; };
-    text "ComposeLabel"		{ left= 281; text="Compose"; };
-    text "ScrollLockLabel"	{ left= 262; text="Scroll\nLock"; };
-    text "NumLockLabel"		{ left= 224; text="Num\nLock"; };
-
-};
-
-xkb_geometry "t6jp" {
-
-    // This is an approximate layout for a (US/ASCII) Sun Type6
-    // keyboard.  I just took a similar layout (101 key PC keyboard)
-    // and adjusted the sizes.
-
-    width= 515;
-    height= 170;
-
-    shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } };
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
-    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "KANJ" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "EXEC" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "RTRN" { 
-        approx = { [ 0, 0], [28,37] },
-        { [ 0, 0], [28, 0], [28,37],
-          [ 5,37], [ 5,18], [ 0,18] },
-        { [ 1, 1], [26, 1], [26,36],
-          [ 7,36], [ 7,17], [ 1,17] }
-    };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } };
-    shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "SPCE" { { [ 96,18] }, { [2,1], [94,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "LOGO" { { [ 16,16] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 14;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 24;
-	row {
-	    top= 1;
-	    keys { { <HELP>, "HELP" }, { <ESC>, 9 },
-		   { <FK01>, 19 }, <FK02>, <FK03>, <FK04>,
-		   { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
-		   { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
-		   { <PRSC>,  9 }, <SCLK>, <PAUS>,
-		   { <MUTE>,  9 }, <VOL->, <VOL+>, <POWR>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 61;
-	row {
-	    top= 1;
-	    keys { <STOP>, <AGAI>,
-		 { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>,
-		 { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, 
-		   { <RTRN>, "RTRN" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, <BKSL>
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, 
-		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <UNDR>,
-		 { <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    keys { <FIND>, <CUT>, { <LCTL>, 9 },
-		   <LALT>, <LMTA>, { <EXEC>, "EXEC" },
-		 { <SPCE>, "SPCE" }, { <KANJ>, "KANJ" }, <HENK>,
-		   <RMTA>, <COMP>, <ALGR>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 61;
-	left= 352;
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-	row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 61;
-	left= 420;
-	row {
-	    top= 1;
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-
-    shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } };
-    shape "LED"  { cornerRadius= 2, { [  3,  6 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  1;
-	left= 218;
-    };
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 10;
-    indicator.shape= "LED";
-    indicator "CapsLock"	{ left= 243; };
-    indicator "Compose"	{ left= 281; };
-    indicator "ScrollLock"	{ left= 262; };
-    indicator "NumLock"	{ left= 224; };
-    text.top= 1;
-    text.color= "black";
-    text "CapsLockLabel"	{ left= 243; text="Caps\nLock"; };
-    text "ComposeLabel"		{ left= 281; text="Compose"; };
-    text "ScrollLockLabel"	{ left= 262; text="Scroll\nLock"; };
-    text "NumLockLabel"		{ left= 224; text="Num\nLock"; };
-
-};
-
-xkb_geometry "t6unix" {
-
-    // This is an approximate layout for a (US/ASCII) Sun Type6
-    // keyboard.  I just took a similar layout (101 key PC keyboard)
-    // and adjusted the sizes.
-
-    width= 515;
-    height= 170;
-
-    shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } };
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
-    shape "BKSP" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
-    shape "RTRN" { { [ 42,18] }, { [2,1], [40,17] } };
-    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } };
-    shape "RTSH" { { [ 51,18] }, { [2,1], [49,17] } };
-    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
-    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "SPCE" { { [136,18] }, { [2,1], [134,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
-    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
-    shape "RMTA" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "LMTA" { { [ 28,18] }, { [2,1], [26,17] } };
-    shape "LOGO" { { [ 16,16] } };
-
-    outline "Edges" {
-	top= 0;
-	left= 0;
-	shape= "EDGE";
-    };
-
-    section.left= 14;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-    section "Function" {
-	top= 24;
-	row {
-	    top= 1;
-	    keys { { <HELP>, "HELP" }, { <NONE>, 9 },
-		   { <FK01>, 19 }, <FK02>, <FK03>, <FK04>,
-		   { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
-		   { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
-		   { <PRSC>,  9 }, <SCLK>, <PAUS>,
-		   { <MUTE>,  9 }, <VOL->, <VOL+>, <POWR>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-	top= 61;
-	row {
-	    top= 1;
-	    keys { <STOP>, <AGAI>,
-		 { <ESC>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>,
-		   <BKSL>, <TLDE>
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>,
-		 { <BKSP>, "BKSP", color="grey20" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>,
-		 { <RTRN>, "RTRN" }
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, 
-		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		 { <RTSH>, "RTSH", color="grey20" }
-	    };
-	};
-	row {
-	    top= 77;
-	    keys { <FIND>, <CUT>, { <LCTL>, 9, shape="LCTL" },
-		   <LALT>, {<LMTA>, "LMTA"},
-		 { <SPCE>, "SPCE" },
-		   {<RMTA>, "RMTA"}, <COMP>, <ALGR>
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-	top= 61;
-	left= 352;
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-	row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-	top= 61;
-	left= 420;
-	row {
-	    top= 1;
-	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" }, <KPDL> };
-	};
-    }; // End of "Keypad" section
-
-    shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } };
-    shape "LED"  { cornerRadius= 2, { [  3,  6 ] } };
-    solid "LedPanel" {
-	shape= "LEDS";
-	top=  1;
-	left= 218;
-    };
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top= 10;
-    indicator.shape= "LED";
-    indicator "CapsLock"	{ left= 243; };
-    indicator "Compose"	{ left= 281; };
-    indicator "ScrollLock"	{ left= 262; };
-    indicator "NumLock"	{ left= 224; };
-    text.top= 1;
-    text.color= "black";
-    text "CapsLockLabel"	{ left= 243; text="Caps\nLock"; };
-    text "ComposeLabel"		{ left= 281; text="Compose"; };
-    text "ScrollLockLabel"	{ left= 262; text="Scroll\nLock"; };
-    text "NumLockLabel"		{ left= 224; text="Num\nLock"; };
-};
-
-xkb_geometry "type5" {
-    include "sun(t5)"
-    description= "Sun Type5 keyboard";
-};
-
-xkb_geometry "type5jp" {
-    include "sun(t5jp)"
-    description= "Sun Type5 Japanese keyboard";
-};
-
-xkb_geometry "type5tuv" {
-    include "sun(t5tuv)"
-    description= "Sun Type5 keyboard";
-};
-
-xkb_geometry "type5euro" {
-    include "sun(t5tuv)"
-    description= "Sun Type5 keyboard";
-};
-
-xkb_geometry "type5unix" {
-    include "sun(t5unix)"
-    description= "Sun Type5 Unix keyboard";
-};
-
-xkb_geometry "type5hobo" {
-    include "sun(t5hobo)"
-    description= "Sun Type5 Hobo keyboard";
-};
-
-xkb_geometry "type5tuvhobo" {
-    include "sun(t5tuvhobo)"
-    description= "Sun Type5 Hobo keyboard";
-};
-
-xkb_geometry "type5jphobo" {
-    include "sun(t5jphobo)"
-    description= "Sun Type5 Japanese Hobo keyboard";
-};
-
-default xkb_geometry "type6" {
-    include "sun(t6)"
-    description= "Sun Type6 keyboard (US, Korea, Taiwan)";
-};
-
-xkb_geometry "type6jp" {
-    include "sun(t6jp)"
-    description= "Sun Type6 Japanese keyboard";
-};
-
-xkb_geometry "type6tuv" {
-    include "sun(t6tuv)"
-    description= "Sun Type6 TUV keyboard";
-};
-
-xkb_geometry "type6unix" {
-    include "sun(t6unix)"
-    description= "Sun Type6 Unix keyboard";
-};
-
-xkb_geometry "x86" {
-    include "pc(pc101)"
-    description= "x86 Style Keyboard";
-};
-
-xkb_geometry "MS_x86" {
-    include "pc(pc104)"
-    description= "x86 104 Key Keyboard";
-};
-
-xkb_geometry "x86tuv" {
-    include "pc(pc102)"
-    description= "x86 European Style Keyboard";
-};
+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//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 OPEN GROUP 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 Open Group 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 Open Group.
+//
+// ---------------------------------------------------------------------------
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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 (including the next
+// paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+//
+// ---------------------------------------------------------------------------
+//
+xkb_geometry "type4" {
+
+    // This is an approximate layout for a (US/ASCII) Sun Type4 US
+    // keyboard.  
+
+    description= "Sun Type4 keyboard";
+
+    width= 452;
+    height= 185;
+
+    shape "EDGE" { cornerRadius= 2, { [ 452, 185 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "DELE" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "RTRN" { 
+	    approx = { [ 0, 0], [28,37] },
+	    { [ 0, 0], [28, 0], [28,37],
+	      [ 5,37], [ 5,19], [ 0,19] },
+	    { [ 1, 1], [26, 1], [26,36],
+	      [ 7,36], [ 7,18], [ 1,18] }
+    };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LFSH" { { [ 41,18] }, { [2,1], [39,17] } };
+    shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [170,18] }, { [2,1], [168,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 17;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+
+    section "Alpha" {
+	top= 58;
+	row {
+	    top= 1;
+	    keys { <STOP>, <AGAI>,
+		 { <FK01>, 9 }, <FK02>, <FK03>, <FK04>,
+		   <FK05>, <FK06>, <FK07>, <FK08>,
+		   <FK09>, <FK10>, <FK11>, <FK12>,
+		   <BKSL>, { <DELE>, "DELE" },
+		 { <PAUS>, 9 }, <PRSC>, <SCLK>, <NMLK>
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { <PROP>, <UNDO>, { <ESC>, 9 }, 
+		   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, 
+		   <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, 
+		   <AE11>, <AE12>,
+		 { <BKSP>, "BKSP" },
+		 { <KPEQ>, 9 }, <KPDV>, <KPMU>, <KPSU> 
+
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <FRNT>, <COPY>, 
+		 { <TAB>, 9, shape="TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN" },
+		 { <KP7>, 9 }, <KP8>, <KP9>, { <KPAD>, "KPAD" } 
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { <OPEN>, <PAST>, 
+		 { <LCTL>, 9, shape="LCTL" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <TLDE>,
+		 { <KP4>, 33 }, <KP5>, <KP6>
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <FIND>, <CUT>, 
+		 { <LFSH>, 9 , shape="LFSH" }, 
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		 { <RTSH>, "RTSH" }, <LNFD>,
+		 { <KP1>, 9} , <KP2>, <KP3>, { <KPEN>, "KPAD" }
+	    };
+	};
+	row {
+	    top= 96;
+	    keys { { <HELP>, "HELP" }, { <CAPS>, 9 },
+		   <LALT>, <LMTA>, { <SPCE>, "SPCE" },
+		   <RMTA>, <COMP>, <ALGR>,
+		 { <KP0>, 9, shape="KP0" }, <KPDL>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } };
+    shape "LED"  { cornerRadius= 0, { [  7,  4 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  28;
+	left= 358;
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 43;
+    indicator.shape= "LED";
+    indicator "Caps Lock"	{ left= 364; };
+    indicator "Compose"		{ left= 383; };
+    indicator "Scroll Lock"	{ left= 402; };
+    indicator "Num Lock"	{ left= 421; };
+    text.top= 34;
+    text.color= "black";
+    text "CapsLockLabel"	{ left= 364; text="Caps\nLock"; };
+    text "ComposeLabel"		{ left= 380; text="Compose"; };
+    text "ScrollLockLabel"	{ left= 402; text="Scroll\nLock"; };
+    text "NumLockLabel"		{ left= 421; text="Num\nLock"; };
+};
+
+xkb_geometry "type4tuv" {
+
+    // This is an approximate layout for a (US/ASCII) Sun Type4 TUV
+    // (European) keyboard with an extra key between the Shift_L
+    // and the Z keys, and two keys above the Bksp key, instead
+    // of a large delete key.
+
+    description= "Sun Type4tuv keyboard";
+
+    width= 452;
+    height= 185;
+
+    shape "EDGE" { cornerRadius= 2, { [ 452, 185 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
+
+    shape "RTRN" {
+          approx = { [ 0, 0], [28,37] },
+          { [ 0, 0], [28, 0], [28,37],
+            [ 5,37], [ 5,19], [ 0,19] },
+          { [ 1, 1], [26, 1], [26,36],
+            [ 7,36], [ 7,18], [ 1,18] }
+    };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [170,18] }, { [2,1], [168,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 17;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+
+    section "Alpha" {
+	top= 58;
+	row {
+	    top= 1;
+	    keys { <STOP>, <AGAI>,
+		 { <FK01>, 9 }, <FK02>, <FK03>, <FK04>,
+		   <FK05>, <FK06>, <FK07>, <FK08>,
+		   <FK09>, <FK10>, <FK11>, <FK12>,
+		   <BKSL>, <BRCR>,<DELE>,
+		 { <PAUS>, 9 }, <PRSC>, <SCLK>, <NMLK>
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { <PROP>, <UNDO>, { <ESC>, 9 }, 
+		   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, 
+		   <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, 
+		   <AE11>, <AE12>,
+		 { <BKSP>, "BKSP" },
+		 { <KPEQ>, 9 }, <KPDV>, <KPMU>, <KPSU> 
+
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <FRNT>, <COPY>, 
+		 { <TAB>, 9, shape="TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN" },
+		 { <KP7>, 9 }, <KP8>, <KP9>, { <KPAD>, "KPAD" } 
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { <OPEN>, <PAST>, 
+		 { <LCTL>, 9, shape="LCTL" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <TLDE>,
+		 { <KP4>, 33 }, <KP5>, <KP6>
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <FIND>, <CUT>, 
+		 { <LFSH>, 9 }, <LSGT>,
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		 { <RTSH>, "RTSH" }, <LNFD>,
+		 { <KP1>, 9} , <KP2>, <KP3>, { <KPEN>, "KPAD" }
+	    };
+	};
+	row {
+	    top= 96;
+	    keys { { <HELP>, "HELP" }, { <CAPS>, 9 },
+		   <LALT>, <LMTA>, { <SPCE>, "SPCE" },
+		   <RMTA>, <COMP>, <ALGR>,
+		 { <KP0>, 9, shape="KP0" }, <KPDL>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } };
+    shape "LED"  { cornerRadius= 0, { [  7,  4 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  28;
+	left= 358;
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 43;
+    indicator.shape= "LED";
+    indicator "CapsLock"	{ left= 364; };
+    indicator "Compose"	{ left= 383; };
+    indicator "ScrollLock"	{ left= 402; };
+    indicator "NumLock"	{ left= 421; };
+    text.top= 34;
+    text.color= "black";
+    text "CapsLockLabel"	{ left= 364; text="Caps\nLock"; };
+    text "ComposeLabel"		{ left= 380; text="Compose"; };
+    text "ScrollLockLabel"	{ left= 402; text="Scroll\nLock"; };
+    text "NumLockLabel"		{ left= 421; text="Num\nLock"; };
+};
+
+xkb_geometry "type4_ca" {
+
+    // This is an approximate layout for a (US/ASCII) Sun Type4
+    // Canadian and British keyboard with an extra key between
+    // the Shift_L 
+    // and the Z keys.
+
+    description= "Sun Type4_uk keyboard";
+
+    width= 452;
+    height= 185;
+
+    shape "EDGE" { cornerRadius= 2, { [ 452, 185 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "DELE" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "RTRN" { 
+            approx = { [ 0, 0], [28,37] },
+            { [ 0, 0], [28, 0], [28,37],
+              [ 5,37], [ 5,19], [ 0,19] },
+            { [ 1, 1], [26, 1], [26,36],
+              [ 7,36], [ 7,18], [ 1,18] }
+    };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [170,18] }, { [2,1], [168,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
+
+    outline "Edges" {
+        top= 0;
+        left= 0;
+        shape= "EDGE";
+    };
+
+    section.left= 17;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+
+    section "Alpha" {
+        top= 58;
+        row {
+            top= 1;
+            keys { <STOP>, <AGAI>,
+                 { <FK01>, 9 }, <FK02>, <FK03>, <FK04>,
+                   <FK05>, <FK06>, <FK07>, <FK08>,
+                   <FK09>, <FK10>, <FK11>, <FK12>,
+                   <BKSL>, { <DELE>, "DELE" },
+                 { <PAUS>, 9 }, <PRSC>, <SCLK>, <NMLK>
+            };
+        };
+        row {
+            top= 20;
+            keys { <PROP>, <UNDO>, { <ESC>, 9 }, 
+                   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>,
+                   <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, 
+                   <AE11>, <AE12>,
+                 { <BKSP>, "BKSP" },
+                 { <KPEQ>, 9 }, <KPDV>, <KPMU>, <KPSU> 
+
+            };
+        };
+        row {
+            top= 39;
+            keys { <FRNT>, <COPY>, 
+                 { <TAB>, 9, shape="TABK" },
+                   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+                   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+                   <AD11>, <AD12>, { <RTRN>, "RTRN" },
+                 { <KP7>, 9 }, <KP8>, <KP9>, { <KPAD>, "KPAD" } 
+            };
+        };
+        row {
+            top= 58;
+            keys { <OPEN>, <PAST>, 
+                 { <LCTL>, 9, shape="LCTL" },
+                   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+                   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+                   <AC11>, <TLDE>,
+                 { <KP4>, 33 }, <KP5>, <KP6>
+            };
+        };
+        row {
+            top= 77;
+            keys { <FIND>, <CUT>, 
+                 { <LFSH>, 9 }, <LSGT>,
+                   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+                   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+                 { <RTSH>, "RTSH" }, <LNFD>,
+                 { <KP1>, 9} , <KP2>, <KP3>, { <KPEN>, "KPAD" }
+            };
+        };
+        row {
+            top= 96;
+            keys { { <HELP>, "HELP" }, { <CAPS>, 9 },
+                   <LALT>, <LMTA>, { <SPCE>, "SPCE" },
+                   <RMTA>, <COMP>, <ALGR>,
+                 { <KP0>, 9, shape="KP0" }, <KPDL>
+            };
+        };
+    }; // End of "Alpha" section
+
+    shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } };
+    shape "LED"  { cornerRadius= 0, { [  7,  4 ] } };
+    solid "LedPanel" {
+        shape= "LEDS";
+        top=  28;
+        left= 358;
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 43;
+    indicator.shape= "LED";
+    indicator "CapsLock"        { left= 364; };
+    indicator "Compose" { left= 383; };
+    indicator "ScrollLock"      { left= 402; };
+    indicator "NumLock" { left= 421; };
+    text.top= 34;
+    text.color= "black";
+    text "CapsLockLabel"        { left= 364; text="Caps\nLock"; };
+    text "ComposeLabel"         { left= 380; text="Compose"; };
+    text "ScrollLockLabel"      { left= 402; text="Scroll\nLock"; }
+;
+    text "NumLockLabel"         { left= 421; text="Num\nLock"; };
+};
+
+xkb_geometry "type4jp" {
+
+    // This is an approximate layout for a Japanese Sun Type4
+    // keyboard, based on the European TUV keyboard.  It has two keys
+    // above the Bksp key, instead of a large delete key, but lacks
+    // the extra key between Shift_L and Z.
+
+    description= "Sun Japanese Type4 keyboard";
+
+    width= 452;
+    height= 185;
+
+    shape "EDGE" { cornerRadius= 2, { [ 452, 185 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
+
+    shape "RTRN" { 
+	    approx = { [ 0, 0], [28,37] },
+	    { [ 0, 0], [28, 0], [28,37],
+	      [ 5,37], [ 5,19], [ 0,19] },
+	    { [ 1, 1], [26, 1], [26,36],
+	      [ 7,36], [ 7,18], [ 1,18] }
+    };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [ 97,18] }, { [2,1], [95,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "LFSH" { { [ 41,18] }, { [2,1], [39,17] } };
+    shape "KANJ" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "EXEC" { { [ 27,18] }, { [2,1], [25,17] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 17;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+
+    section "Alpha" {
+	top= 58;
+	row {
+	    top= 1;
+	    keys { <STOP>, <AGAI>,
+		 { <FK01>, 9 }, <FK02>, <FK03>, <FK04>,
+		   <FK05>, <FK06>, <FK07>, <FK08>,
+		   <FK09>, <FK10>, <FK11>, <FK12>,
+		   <BKSL>, <BRCR>,<DELE>,
+		 { <PAUS>, 9 }, <PRSC>, <SCLK>, <NMLK>
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { <PROP>, <UNDO>, { <ESC>, 9 }, 
+		   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, 
+		   <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, 
+		   <AE11>, <AE12>,
+		 { <BKSP>, "BKSP" },
+		 { <KPEQ>, 9 }, <KPDV>, <KPMU>, <KPSU> 
+
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <FRNT>, <COPY>, 
+		 { <TAB>, 9, shape="TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN" },
+		 { <KP7>, 9 }, <KP8>, <KP9>, { <KPAD>, "KPAD" } 
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { <OPEN>, <PAST>, 
+		 { <LCTL>, 9, shape="LCTL" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <TLDE>,
+		 { <KP4>, 33 }, <KP5>, <KP6>
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <FIND>, <CUT>, 
+		 { <LFSH>, 9, shape="LFSH" },
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		   <LNFD>, { <RTSH>, "RTSH" },
+		 { <KP1>, 9} , <KP2>, <KP3>, { <KPEN>, "KPAD" }
+	    };
+	};
+	row {
+	    top= 96;
+	    keys { { <HELP>, "HELP" }, { <CAPS>, 9 },
+		   <LALT>, <LMTA>, { <EXEC>, "EXEC"} , { <SPCE>, "SPCE" },
+		   { <KANJ>, "KANJ" }, <HENK>, <RMTA>, <COMP>, <ALGR>,
+		 { <KP0>, 9, shape="KP0" }, <KPDL>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } };
+    shape "LED"  { cornerRadius= 0, { [  7,  4 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  28;
+	left= 358;
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 43;
+    indicator.shape= "LED";
+    indicator "CapsLock"	{ left= 364; };
+    indicator "Compose"	{ left= 383; };
+    indicator "ScrollLock"	{ left= 402; };
+    indicator "NumLock"	{ left= 421; };
+    text.top= 34;
+    text.color= "black";
+    text "CapsLockLabel"	{ left= 364; text="Caps\nLock"; };
+    text "ComposeLabel"		{ left= 380; text="Compose"; };
+    text "ScrollLockLabel"	{ left= 402; text="Scroll\nLock"; };
+    text "NumLockLabel"		{ left= 421; text="Num\nLock"; };
+};
+
+xkb_geometry "t5" {
+
+    // This is an approximate layout for a (US/ASCII) Sun Type5
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes.
+
+    width= 515;
+    height= 170;
+
+    shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "BKSL" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [40,17] } };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } };
+    shape "RTSH" { { [ 51,18] }, { [2,1], [49,17] } };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [156,18] }, { [2,1], [154,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 14;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 24;
+	row {
+	    top= 1;
+	    keys { { <HELP>, "HELP" }, { <ESC>, 9 },
+		   { <FK01>, 19 }, <FK02>, <FK03>, <FK04>,
+		   { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		   { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		   { <PRSC>,  9 }, <SCLK>, <PAUS>,
+		   { <MUTE>,  9 }, <VOL->, <VOL+>, <POWR>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { <STOP>, <AGAI>,
+		 { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		 { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>,
+		 { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>,
+		 { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, 
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		 { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <FIND>, <CUT>, { <LCTL>, 9, shape="LCTL" },
+		   <LALT>, <LMTA>,
+		 { <SPCE>, "SPCE" },
+		   <RMTA>, <COMP>, <ALGR>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 352;
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 420;
+	row {
+	    top= 1;
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+};
+
+xkb_geometry "t5tuv" {
+
+    // This is an approximate layout for a TUV/European Sun Type5 keyboard.
+
+    width= 515;
+    height= 170;
+
+    shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" {
+        approx = { [ 0, 0], [28,37] },
+        { [ 0, 0], [28, 0], [28,37],
+          [ 5,37], [ 5,18], [ 0,18] },
+        { [ 1, 1], [26, 1], [26,36],
+          [ 7,36], [ 7,17], [ 1,17] }
+    };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LFSH" { { [ 24,18] }, { [2,1], [22,17] } };
+    shape "RTSH" { { [ 51,18] }, { [2,1], [49,17] } };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [157,18] }, { [2,1], [155,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 14;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 24;
+	row {
+	    top= 1;
+	    keys { { <HELP>, "HELP" }, { <ESC>, 9 },
+		   { <FK01>, 19 }, <FK02>, <FK03>, <FK04>,
+		   { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		   { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		   { <PRSC>,  9 }, <SCLK>, <PAUS>,
+		   { <MUTE>,  9 }, <VOL->, <VOL+>, <POWR>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { <STOP>, <AGAI>,
+		 { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		 { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>,
+		 { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <BKSL>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, <LSGT>, 
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		 { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <FIND>, <CUT>, { <LCTL>, 9, shape="LCTL" },
+		   <LALT>, <LMTA>,
+		 { <SPCE>, "SPCE" },
+		   <RMTA>, <COMP>, <ALGR>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 352;
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 420;
+	row {
+	    top= 1;
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+};
+
+
+xkb_geometry "t5jp" {
+
+    // This is an approximate layout for a Japanese Sun Type5 keyboard.
+
+    width= 515;
+    height= 170;
+
+    shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "KANJ" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "EXEC" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" { 
+        approx = { [ 0, 0], [28,37] },
+        { [ 0, 0], [28, 0], [28,37],
+          [ 5,37], [ 5,18], [ 0,18] },
+        { [ 1, 1], [26, 1], [26,36],
+          [ 7,36], [ 7,17], [ 1,17] }
+    };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } };
+    shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [ 97,18] }, { [2,1], [95,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 14;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 24;
+	row {
+	    top= 1;
+	    keys { { <HELP>, "HELP" }, { <ESC>, 9 },
+		   { <FK01>, 19 }, <FK02>, <FK03>, <FK04>,
+		   { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		   { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		   { <PRSC>,  9 }, <SCLK>, <PAUS>,
+		   { <MUTE>,  9 }, <VOL->, <VOL+>, <POWR>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { <STOP>, <AGAI>,
+		 { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		 { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, 
+		   { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <BKSL>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, 
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <UNDR>,
+		 { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <FIND>, <CUT>, { <LCTL>, 9 },
+		   <LALT>, <LMTA>, { <EXEC>, "EXEC" },
+		 { <SPCE>, "SPCE" }, { <KANJ>, "KANJ" }, <HENK>,
+		   <RMTA>, <COMP>, <ALGR>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 352;
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 420;
+	row {
+	    top= 1;
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+};
+
+xkb_geometry "t5unix" {
+
+    // This is an approximate layout for a (US/ASCII) Sun Type5
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes.
+
+    width= 515;
+    height= 170;
+
+    shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "BKSL" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [40,17] } };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } };
+    shape "RTSH" { { [ 51,18] }, { [2,1], [49,17] } };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [157,18] }, { [2,1], [155,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 14;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+    top= 24;
+	row {
+	    top= 1;
+	    keys { { <HELP>, "HELP" }, { <NONE>, 9 },
+		   { <FK01>, 19 }, <FK02>, <FK03>, <FK04>,
+		   { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		   { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		   { <PRSC>,  9 }, <SCLK>, <PAUS>,
+		   { <MUTE>,  9 }, <VOL->, <VOL+>, <POWR>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { <STOP>, <AGAI>,
+		 { <ESC>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   <BKSL>, <TLDE>
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>,
+		 { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <FRNT>, <COPY>, { <LCTL>, 9, shape="LCTL" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>,
+		 { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, 
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		 { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <FIND>, <CUT>, { <CAPS>, 9, shape="CAPS" },
+		   <LALT>, <LMTA>,
+		 { <SPCE>, "SPCE" },
+		   <RMTA>, <COMP>, <ALGR>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 352;
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 420;
+	row {
+	    top= 1;
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+};
+
+xkb_geometry "t5hobo" {
+
+    // This is an approximate layout for a (US/ASCII) Sun Type5
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes.
+    //
+    // I modified this to look like the hobo keyboard.
+
+    width= 425;
+    height= 170;
+
+    shape "EDGE" { cornerRadius= 2, { [ 425, 170 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "FKEY" { { [ 15,18] }, { [0.5,0.5], [14.5, 17.5] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "BKSL" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [40,17] } };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } };
+    shape "RTSH" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [156,18] }, { [2,1], [154,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "LOGO" { { [ 16,16] } };
+    
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 14;
+    row.left= 1;
+    key.shape= "FKEY";
+    key.gap=  1;
+    section "Function" {
+	top= 24;
+	row {
+	    top= 1;
+	    keys { { <HELP>, "HELP" }, { <ESC>, 9 },
+		   { <FK01>, 4 }, <FK02>, <FK03>, <FK04>,
+		   { <FK05>, 4 }, <FK06>, <FK07>, <FK08>,
+		   { <FK09>, 4 }, <FK10>, <FK11>, <FK12>,
+		   { <MUTE>, 4 }, <VOL->, <VOL+>, <POWR>, 
+		   { <PRSC>,  9, "NORM" }, {<SCLK>, "NORM"}, {<PAUS>, "NORM"}
+	    };
+	};
+    }; // End of "Function" section
+
+    key.shape= "NORM";
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { <STOP>, <AGAI>,
+		 { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		 { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>,
+		 { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>,
+		 { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, 
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		 { <RTSH>, "RTSH", color="grey20" }, <ALGR>
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <FIND>, <CUT>, { <LCTL>, 9, shape="LCTL" },
+		   <LALT>, <LMTA>,
+		 { <SPCE>, "SPCE" },
+		   <RMTA>, <COMP>, <NMLK>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 352;
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+};
+
+xkb_geometry "t5tuvhobo" {
+
+    // This is an approximate layout for a (US/ASCII) Sun Type5
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes.
+    //
+    // I modified this to look like the hobo keyboard.
+
+    width= 425;
+    height= 170;
+
+    shape "EDGE" { cornerRadius= 2, { [ 425, 170 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "FKEY" { { [ 15,18] }, { [0.5,0.5], [14.5, 17.5] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "BKSL" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [40,17] } };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LFSH" { { [ 24,18] }, { [2,1], [22,17] } };
+    shape "RTSH" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [156,18] }, { [2,1], [154,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "LOGO" { { [ 16,16] } };
+    
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 14;
+    row.left= 1;
+    key.shape= "FKEY";
+    key.gap=  1;
+    section "Function" {
+	top= 24;
+	row {
+	    top= 1;
+	    keys { { <HELP>, "HELP" }, { <ESC>, 9 },
+		   { <FK01>, 4 }, <FK02>, <FK03>, <FK04>,
+		   { <FK05>, 4 }, <FK06>, <FK07>, <FK08>,
+		   { <FK09>, 4 }, <FK10>, <FK11>, <FK12>,
+		   { <MUTE>, 4 }, <VOL->, <VOL+>, <POWR>, 
+		   { <PRSC>,  9, "NORM" }, {<SCLK>, "NORM"}, {<PAUS>, "NORM"}
+	    };
+	};
+    }; // End of "Function" section
+
+    key.shape= "NORM";
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { <STOP>, <AGAI>,
+		 { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		 { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>,
+		 { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>,
+		 { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, <LSGT>,
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		 { <RTSH>, "RTSH", color="grey20" }, <ALGR>
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <FIND>, <CUT>, { <LCTL>, 9, shape="LCTL" },
+		   <LALT>, <LMTA>,
+		 { <SPCE>, "SPCE" },
+		   <RMTA>, <COMP>, <NMLK>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 352;
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+};
+
+xkb_geometry "t5jphobo" {
+
+    // This is an approximate layout for a (US/ASCII) Sun Type5
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes.
+
+    width= 425;
+    height= 170;
+
+    shape "EDGE" { cornerRadius= 2, { [ 425, 170 ] } };
+    shape.cornerRadius= 1;
+    shape "FKEY" { { [ 15,18] }, { [0.5,0.5], [14.5, 17.5] } };
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "KANJ" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "EXEC" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" { 
+        approx = { [ 0, 0], [28,37] },
+        { [ 0, 0], [28, 0], [28,37],
+          [ 5,37], [ 5,18], [ 0,18] },
+        { [ 1, 1], [26, 1], [26,36],
+          [ 7,36], [ 7,17], [ 1,17] }
+    };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } };
+    shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [ 97,18] }, { [2,1], [95,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 14;
+    row.left= 1;
+    key.shape= "FKEY";
+    key.gap=  1;
+    section "Function" {
+	top= 24;
+	row {
+	    top= 1;
+	    keys { { <HELP>, "HELP" }, { <ESC>, 9 },
+		   { <FK01>, 4 }, <FK02>, <FK03>, <FK04>,
+		   { <FK05>, 4 }, <FK06>, <FK07>, <FK08>,
+		   { <FK09>, 4 }, <FK10>, <FK11>, <FK12>,
+		   { <MUTE>, 4 }, <VOL->, <VOL+>, <POWR>, 
+		   { <PRSC>,  9, "NORM" }, {<SCLK>, "NORM"}, {<PAUS>, "NORM"}
+	    };
+	};
+    }; // End of "Function" section
+
+    key.shape= "NORM";
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { <STOP>, <AGAI>,
+		 { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		 { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, 
+		   { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <BKSL>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, 
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <UNDR>,
+		 { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <FIND>, <CUT>, { <LCTL>, 9 },
+		   <LALT>, <LMTA>, { <EXEC>, "EXEC" },
+		 { <SPCE>, "SPCE" }, { <KANJ>, "KANJ" }, <HENK>,
+		   <RMTA>, <COMP>, <ALGR>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 352;
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+};
+
+xkb_geometry "type5_se" {
+
+    // kbd: type = 4, layout = 43
+
+    description= "Sun Type5 keyboard (Sweden)";
+
+    width=       510;
+    height=      170;
+
+    baseColor=   "grey";
+    labelColor=  "black";
+
+    shape.cornerRadius=	1;
+
+    shape "EDGE" { cornerRadius= 2, { [ 510, 170 ] } };
+    shape "LOGO" { cornerRadius= 2,
+      { [ 0, 8], [ 8, 16], [ 16, 8], [ 8, 0] }
+    };
+
+    shape "NORM" { { [ 18, 18] }, { [ 2, 1], [ 16, 17] } };
+    shape "BKSP" { { [ 38, 18] }, { [ 2, 1], [ 36, 17] } };
+    shape "TABK" { { [ 27, 18] }, { [ 2, 1], [ 25, 17] } };
+    shape "RTRN" { 
+      {	[ 0, 0], [ 29, 0], [ 29, 37], [ 5, 37], [ 5, 18], [ 0, 18] },
+      { [ 2, 1], [ 27, 1], [ 27, 36], [ 7, 36], [ 7, 17], [ 2, 17] }
+    };
+    shape "CAPS" { { [ 32, 18] }, { [ 2, 1], [ 30, 17 ] } };
+    shape "LFSH" { { [ 24, 18] }, { [ 2, 1], [ 22, 17 ] } };
+    shape "RTSH" { { [ 51, 18] }, { [ 2, 1], [ 49, 17 ] } };
+    shape "LCTL" { { [ 32, 18] }, { [ 2, 1], [ 30, 17 ] } };
+    shape "MODK" { { [ 28, 18] }, { [ 2, 1], [ 26, 17 ] } };
+    shape "SPCE" { { [157, 18] }, { [ 2, 1], [155, 17 ] } };
+    shape "KP0"  { { [ 37, 18] }, { [ 2, 1], [ 35, 17 ] } };
+    shape "KPAD" { { [ 18, 37] }, { [ 2, 1], [ 16, 36 ] } };
+    shape "HELP" { { [ 37, 18] }, { [ 2, 1], [ 35, 17 ] } };
+
+    section "Function" {
+        key.color= "grey10";
+        priority=  1;
+        top=       24;
+        left=      14;
+        width=     481;
+        height=    19;
+        row {
+            top=  1;
+            left= 1;
+            keys {
+                { <HELP>, "HELP",   1 }, {  <ESC>, "NORM",   9 },
+                { <FK01>, "NORM",  19 }, { <FK02>, "NORM",   1 },
+                { <FK03>, "NORM",   1 }, { <FK04>, "NORM",   1 },
+                { <FK05>, "NORM",  11 }, { <FK06>, "NORM",   1 },
+                { <FK07>, "NORM",   1 }, { <FK08>, "NORM",   1 },
+                { <FK09>, "NORM",  11 }, { <FK10>, "NORM",   1 },
+                { <FK11>, "NORM",   1 }, { <FK12>, "NORM",   1 },
+                { <PRSC>, "NORM",   9 }, { <SCLK>, "NORM",   1 },
+                { <PAUS>, "NORM",   1 }, { <MUTE>, "NORM",  11 },
+                { <VOL->, "NORM",   1 }, { <VOL+>, "NORM",   1 },
+		{ <POWR>, "NORM",   1, color= "white" }
+            };
+        };
+    }; // End of "Function" section
+
+    section "Alpha" {
+        key.color= "white";
+        priority=  2;
+        top=       61;
+        left=      14;
+        width=     333;
+        height=    95;
+        row {
+            top=  1;
+            left= 1;
+            keys {
+                { <STOP>, "NORM",   1, color= "grey10" },
+		{ <AGAI>, "NORM",   1, color= "grey10" },
+                { <TLDE>, "NORM",   9 }, { <AE01>, "NORM",   1 },
+                { <AE02>, "NORM",   1 }, { <AE03>, "NORM",   1 },
+                { <AE04>, "NORM",   1 }, { <AE05>, "NORM",   1 },
+                { <AE06>, "NORM",   1 }, { <AE07>, "NORM",   1 },
+                { <AE08>, "NORM",   1 }, { <AE09>, "NORM",   1 },
+                { <AE10>, "NORM",   1 }, { <AE11>, "NORM",   1 },
+                { <AE12>, "NORM",   1 },
+                { <BKSP>, "BKSP",   1, color="grey10" }
+            };
+        };
+        row {
+            top=  20;
+            left= 1;
+            keys {
+                { <PROP>, "NORM",   1, color= "grey10" },
+		{ <UNDO>, "NORM",   1, color= "grey10" },
+                {  <TAB>, "TABK",   9, color= "grey10" },
+		{ <AD01>, "NORM",   1 },
+                { <AD02>, "NORM",   1 }, { <AD03>, "NORM",   1 },
+                { <AD04>, "NORM",   1 }, { <AD05>, "NORM",   1 },
+                { <AD06>, "NORM",   1 }, { <AD07>, "NORM",   1 },
+                { <AD08>, "NORM",   1 }, { <AD09>, "NORM",   1 },
+                { <AD10>, "NORM",   1 }, { <AD11>, "NORM",   1 },
+                { <AD12>, "NORM",   1 },
+		{ <RTRN>, "RTRN",   1, color= "grey10" }
+            };
+        };
+        row {
+            top=  39;
+            left= 1;
+            keys {
+                { <FRNT>, "NORM",   1, color= "grey10" },
+		{ <COPY>, "NORM",   1, color= "grey10" },
+                { <CAPS>, "CAPS",   9, color= "grey10" }, 
+	        { <AC01>, "NORM",   1 },
+                { <AC02>, "NORM",   1 }, { <AC03>, "NORM",   1 },
+                { <AC04>, "NORM",   1 }, { <AC05>, "NORM",   1 },
+                { <AC06>, "NORM",   1 }, { <AC07>, "NORM",   1 },
+                { <AC08>, "NORM",   1 }, { <AC09>, "NORM",   1 },
+                { <AC10>, "NORM",   1 }, { <AC11>, "NORM",   1 },
+		{ <AC12>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  58;
+            left= 1;
+            keys {
+                { <OPEN>, "NORM",   1, color= "grey10" },
+		{ <PAST>, "NORM",   1, color= "grey10" },
+		{ <LFSH>, "LFSH",   9, color= "grey10" },
+		{ <AB00>, "NORM",   1 }, { <AB01>, "NORM",   1 },
+                { <AB02>, "NORM",   1 }, { <AB03>, "NORM",   1 },
+                { <AB04>, "NORM",   1 }, { <AB05>, "NORM",   1 },
+                { <AB06>, "NORM",   1 }, { <AB07>, "NORM",   1 },
+                { <AB08>, "NORM",   1 }, { <AB09>, "NORM",   1 },
+                { <AB10>, "NORM",   1 },
+                { <RTSH>, "RTSH",   1, color="grey10" }
+            };
+        };
+        row {
+            top=  77;
+            left= 1;
+	    key.color= "grey10";
+            keys {
+                { <FIND>, "NORM",   1 }, {  <CUT>, "NORM",   1 },
+                { <LCTL>, "LCTL",   9 }, { <LALT>, "NORM",   1 },
+                { <LMTA>, "NORM",   1 },
+		{ <SPCE>, "SPCE",   1, color= "white" },
+                { <RMTA>, "NORM",   1 }, { <COMP>, "NORM",   1 },
+                { <ALGR>, "NORM",   1 }
+            };
+        };
+    }; // End of "Alpha" section
+
+    section "Editing" {
+        key.color= "grey10";
+        priority=  3;
+        top=       61;
+        left=      352;
+        width=     58;
+        height=    95;
+        row {
+            top=  1;
+            left= 1;
+            keys {
+                {  <INS>, "NORM",   1 }, { <HOME>, "NORM",   1 },
+                { <PGUP>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  20;
+            left= 1;
+            keys {
+                { <DELE>, "NORM",   1 }, {  <END>, "NORM",   1 },
+                { <PGDN>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  58;
+            left= 20;
+            keys {
+                {   <UP>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  77;
+            left= 1;
+            keys {
+                { <LEFT>, "NORM",   1 }, { <DOWN>, "NORM",   1 },
+                { <RGHT>, "NORM",   1 }
+            };
+        };
+    }; // End of "Editing" section
+
+    section "Keypad" {
+        key.color= "white";
+        priority=  4;
+        top=       61;
+        left=      420;
+        width=     77;
+        height=    95;
+        row {
+            top=  1;
+            left= 1;
+	    key.color= "grey10";
+            keys {
+                { <NMLK>, "NORM",   1 }, { <KPDV>, "NORM",   1 },
+                { <KPMU>, "NORM",   1 }, { <KPSU>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  20;
+            left= 1;
+            keys {
+                {  <KP7>, "NORM",   1 }, {  <KP8>, "NORM",   1 },
+                {  <KP9>, "NORM",   1 },
+                { <KPAD>, "KPAD",   1, color="grey10" }
+            };
+        };
+        row {
+            top=  39;
+            left= 1;
+            keys {
+                {  <KP4>, "NORM",   1 }, {  <KP5>, "NORM",   1 },
+                {  <KP6>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  58;
+            left= 1;
+            keys {
+                {  <KP1>, "NORM",   1 }, {  <KP2>, "NORM",   1 },
+                {  <KP3>, "NORM",   1 },
+                { <KPEN>, "KPAD",   1, color="grey10" }
+            };
+        };
+        row {
+            top=  77;
+            left= 1;
+            keys {
+                {  <KP0>, "KP0",   1 }, { <KPDL>, "NORM",   1 }
+            };
+        };
+    }; // End of "Keypad" section
+
+    outline "Edges" {
+        top=      0;
+        left=     0;
+        priority= 0;
+        shape= "EDGE";
+    };
+
+    solid "Logos" {
+      color= "blue";
+      top=	5;
+      left=	25;
+      priority=	0;
+      shape= "LOGO";
+    };
+    
+    logo "SUNLogoImage" {
+      top=	5;
+      left=	25;
+      name= "SUN";
+      priority=	1;
+      shape= "LOGO";
+    };
+
+    shape "LED" { cornerRadius= 1,
+      { [ 0, 1.5], [ 1.5, 3], [ 3, 1.5], [ 1.5, 0] }
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.shape= "LED";
+    indicator "Caps Lock" { left= 75; top= 103; priority= 5; };
+    indicator "Compose"	  { left= 314; top= 142; priority= 5; };
+    indicator "Scroll Lock" { left= 378; top= 29; };
+    indicator "Num Lock"  { left= 426; top= 66; };
+};
+
+xkb_geometry "type5c_se" {
+
+    // kbd: type = 4, layout = 43
+
+    description= "Sun Type5c keyboard (Sweden)";
+
+    width=       510;
+    height=      170;
+
+    baseColor=   "grey";
+    labelColor=  "black";
+
+    shape.cornerRadius=	1;
+
+    shape "EDGE" { cornerRadius= 2, { [ 510, 170 ] } };
+    shape "LOGO" { cornerRadius= 2,
+      { [ 0, 8], [ 8, 16], [ 16, 8], [ 8, 0] }
+    };
+
+    shape "NORM" { { [ 18, 18] }, { [ 2, 1], [ 16, 17] } };
+    shape "BKSP" { { [ 38, 18] }, { [ 2, 1], [ 36, 17] } };
+    shape "TABK" { { [ 27, 18] }, { [ 2, 1], [ 25, 17] } };
+    shape "META" { { [ 27, 18] }, { [ 2, 1], [ 25, 17] } };
+    shape "RTRN" { 
+      {	[ 0, 0], [ 29, 0], [ 29, 37], [ 5, 37], [ 5, 18], [ 0, 18] },
+      { [ 2, 1], [ 27, 1], [ 27, 36], [ 7, 36], [ 7, 17], [ 2, 17] }
+    };
+    shape "CAPS" { { [ 32, 18] }, { [ 2, 1], [ 30, 17 ] } };
+    shape "LFSH" { { [ 24, 18] }, { [ 2, 1], [ 22, 17 ] } };
+    shape "RTSH" { { [ 51, 18] }, { [ 2, 1], [ 49, 17 ] } };
+    shape "LCTL" { { [ 32, 18] }, { [ 2, 1], [ 30, 17 ] } };
+    shape "MODK" { { [ 28, 18] }, { [ 2, 1], [ 26, 17 ] } };
+    shape "SPCE" { { [139, 18] }, { [ 2, 1], [137, 17 ] } };
+    shape "KP0"  { { [ 37, 18] }, { [ 2, 1], [ 35, 17 ] } };
+    shape "KPAD" { { [ 18, 37] }, { [ 2, 1], [ 16, 36 ] } };
+    shape "HELP" { { [ 37, 18] }, { [ 2, 1], [ 35, 17 ] } };
+
+    section "Function" {
+        key.color= "grey10";
+        priority=  1;
+        top=       24;
+        left=      14;
+        width=     481;
+        height=    19;
+        row {
+            top=  1;
+            left= 1;
+            keys {
+                { <HELP>, "HELP",   1 }, {  <ESC>, "NORM",   9 },
+                { <FK01>, "NORM",  19 }, { <FK02>, "NORM",   1 },
+                { <FK03>, "NORM",   1 }, { <FK04>, "NORM",   1 },
+                { <FK05>, "NORM",  11 }, { <FK06>, "NORM",   1 },
+                { <FK07>, "NORM",   1 }, { <FK08>, "NORM",   1 },
+                { <FK09>, "NORM",  11 }, { <FK10>, "NORM",   1 },
+                { <FK11>, "NORM",   1 }, { <FK12>, "NORM",   1 },
+                { <PRSC>, "NORM",   9 }, { <SCLK>, "NORM",   1 },
+                { <PAUS>, "NORM",   1 }, { <MUTE>, "NORM",  11 },
+                { <VOL->, "NORM",   1 }, { <VOL+>, "NORM",   1 },
+		{ <POWR>, "NORM",   1, color= "white" }
+            };
+        };
+    }; // End of "Function" section
+
+    section "Alpha" {
+        key.color= "white";
+        priority=  2;
+        top=       61;
+        left=      14;
+        width=     333;
+        height=    95;
+        row {
+            top=  1;
+            left= 1;
+            keys {
+                { <STOP>, "NORM",   1, color= "grey10" },
+		{ <AGAI>, "NORM",   1, color= "grey10" },
+                { <TLDE>, "NORM",   9 }, { <AE01>, "NORM",   1 },
+                { <AE02>, "NORM",   1 }, { <AE03>, "NORM",   1 },
+                { <AE04>, "NORM",   1 }, { <AE05>, "NORM",   1 },
+                { <AE06>, "NORM",   1 }, { <AE07>, "NORM",   1 },
+                { <AE08>, "NORM",   1 }, { <AE09>, "NORM",   1 },
+                { <AE10>, "NORM",   1 }, { <AE11>, "NORM",   1 },
+                { <AE12>, "NORM",   1 },
+                { <BKSP>, "BKSP",   1, color="grey10" }
+            };
+        };
+        row {
+            top=  20;
+            left= 1;
+            keys {
+                { <PROP>, "NORM",   1, color= "grey10" },
+		{ <UNDO>, "NORM",   1, color= "grey10" },
+                {  <TAB>, "TABK",   9, color= "grey10" },
+		{ <AD01>, "NORM",   1 },
+                { <AD02>, "NORM",   1 }, { <AD03>, "NORM",   1 },
+                { <AD04>, "NORM",   1 }, { <AD05>, "NORM",   1 },
+                { <AD06>, "NORM",   1 }, { <AD07>, "NORM",   1 },
+                { <AD08>, "NORM",   1 }, { <AD09>, "NORM",   1 },
+                { <AD10>, "NORM",   1 }, { <AD11>, "NORM",   1 },
+                { <AD12>, "NORM",   1 },
+		{ <RTRN>, "RTRN",   1, color= "grey10" }
+            };
+        };
+        row {
+            top=  39;
+            left= 1;
+            keys {
+                { <FRNT>, "NORM",   1, color= "grey10" },
+		{ <COPY>, "NORM",   1, color= "grey10" },
+                { <CAPS>, "CAPS",   9, color= "grey10" }, 
+	        { <AC01>, "NORM",   1 },
+                { <AC02>, "NORM",   1 }, { <AC03>, "NORM",   1 },
+                { <AC04>, "NORM",   1 }, { <AC05>, "NORM",   1 },
+                { <AC06>, "NORM",   1 }, { <AC07>, "NORM",   1 },
+                { <AC08>, "NORM",   1 }, { <AC09>, "NORM",   1 },
+                { <AC10>, "NORM",   1 }, { <AC11>, "NORM",   1 },
+		{ <AC12>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  58;
+            left= 1;
+            keys {
+                { <OPEN>, "NORM",   1, color= "grey10" },
+		{ <PAST>, "NORM",   1, color= "grey10" },
+		{ <LFSH>, "LFSH",   9, color= "grey10" },
+		{ <AB00>, "NORM",   1 }, { <AB01>, "NORM",   1 },
+                { <AB02>, "NORM",   1 }, { <AB03>, "NORM",   1 },
+                { <AB04>, "NORM",   1 }, { <AB05>, "NORM",   1 },
+                { <AB06>, "NORM",   1 }, { <AB07>, "NORM",   1 },
+                { <AB08>, "NORM",   1 }, { <AB09>, "NORM",   1 },
+                { <AB10>, "NORM",   1 },
+                { <RTSH>, "RTSH",   1, color="grey10" }
+            };
+        };
+        row {
+            top=  77;
+            left= 1;
+	    key.color= "grey10";
+            keys {
+                { <FIND>, "NORM",   1 }, {  <CUT>, "NORM",   1 },
+                { <LCTL>, "LCTL",   9 }, { <LALT>, "NORM",   1 },
+                { <LMTA>, "META",   1 },
+		{ <SPCE>, "SPCE",   1, color= "white" },
+                { <RMTA>, "META",   1 }, { <COMP>, "NORM",   1 },
+                { <ALGR>, "NORM",   1 }
+            };
+        };
+    }; // End of "Alpha" section
+
+    section "Editing" {
+        key.color= "grey10";
+        priority=  3;
+        top=       61;
+        left=      352;
+        width=     58;
+        height=    95;
+        row {
+            top=  1;
+            left= 1;
+            keys {
+                {  <INS>, "NORM",   1 }, { <HOME>, "NORM",   1 },
+                { <PGUP>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  20;
+            left= 1;
+            keys {
+                { <DELE>, "NORM",   1 }, {  <END>, "NORM",   1 },
+                { <PGDN>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  58;
+            left= 20;
+            keys {
+                {   <UP>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  77;
+            left= 1;
+            keys {
+                { <LEFT>, "NORM",   1 }, { <DOWN>, "NORM",   1 },
+                { <RGHT>, "NORM",   1 }
+            };
+        };
+    }; // End of "Editing" section
+
+    section "Keypad" {
+        key.color= "white";
+        priority=  4;
+        top=       61;
+        left=      420;
+        width=     77;
+        height=    95;
+        row {
+            top=  1;
+            left= 1;
+	    key.color= "grey10";
+            keys {
+                { <NMLK>, "NORM",   1 }, { <KPDV>, "NORM",   1 },
+                { <KPMU>, "NORM",   1 }, { <KPSU>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  20;
+            left= 1;
+            keys {
+                {  <KP7>, "NORM",   1 }, {  <KP8>, "NORM",   1 },
+                {  <KP9>, "NORM",   1 },
+                { <KPAD>, "KPAD",   1, color="grey10" }
+            };
+        };
+        row {
+            top=  39;
+            left= 1;
+            keys {
+                {  <KP4>, "NORM",   1 }, {  <KP5>, "NORM",   1 },
+                {  <KP6>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  58;
+            left= 1;
+            keys {
+                {  <KP1>, "NORM",   1 }, {  <KP2>, "NORM",   1 },
+                {  <KP3>, "NORM",   1 },
+                { <KPEN>, "KPAD",   1, color="grey10" }
+            };
+        };
+        row {
+            top=  77;
+            left= 1;
+            keys {
+                {  <KP0>, "KP0",   1 }, { <KPDL>, "NORM",   1 }
+            };
+        };
+    }; // End of "Keypad" section
+
+    outline "Edges" {
+        top=      0;
+        left=     0;
+        priority= 0;
+        shape= "EDGE";
+    };
+
+    solid "Logos" {
+      color= "blue";
+      top=	5;
+      left=	15;
+      priority=	0;
+      shape= "LOGO";
+    };
+    
+    logo "SUNLogoImage" {
+      top=	5;
+      left=	15;
+      name= "SUN";
+      priority=	1;
+      shape= "LOGO";
+    };
+
+    text.font= "charter";
+    text.weight= "medium";
+    text.slant= "i";
+    text.fontSize= 40;
+    text "SunLogoText" {
+      top=	5;
+      left=    32;
+      color= "blue";
+      text= "Sun";
+    };
+
+    shape "LED" { cornerRadius= 1,
+      { [ 0, 1.5], [ 1.5, 3], [ 3, 1.5], [ 1.5, 0] }
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.shape= "LED";
+    indicator "Caps Lock"   { left= 75; top= 103; priority= 5; };
+    indicator "Compose"     { left= 314; top= 142; priority= 5; };
+    indicator "Scroll Lock" { left= 378; top= 29; };
+    indicator "Num Lock"    { left= 426; top= 66; };
+};
+
+xkb_geometry "type4_se" {
+
+    // kbd: type = 4, layout = 11
+
+    description= "Sun Type4 keyboard (Sweden)";
+    
+
+    width=       453;
+    height=      183;
+
+    baseColor=   "grey";
+    labelColor=  "black";
+
+    shape "EDGE" { cornerRadius= 2, { [ 452, 185 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "DELE" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "RTRN" { 
+	    approx = { [ 0, 0], [28,37] },
+	    { [ 0, 0], [28, 0], [28,37],
+	      [ 5,37], [ 5,19], [ 0,19] },
+	    { [ 1, 1], [26, 1], [26,36],
+	      [ 7,36], [ 7,18], [ 1,18] }
+    };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LFSH" { { [ 22,18] }, { [2,1], [20,17] } };
+    shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [170,18] }, { [2,1], [168,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 17;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+
+    section "Alpha" {
+	top= 58;
+	row {
+	    top= 1;
+	    key.color=	"grey10";
+	    keys { <STOP>, <AGAI>, { <FK01>, 9 },
+		   <FK02>, <FK03>, <FK04>,
+		   <FK05>, <FK06>, <FK07>, <FK08>,
+		   <FK09>, <FK10>, <FK11>, <FK12>,
+		 { <AF13>, 	color=	"white"},
+		 { <AF14>, 	color=	"white"},
+		   <DELE>, { <PAUS>, 9 },
+		   <PRSC>, <SCLK>, <NMLK>
+	    };
+	};
+	row {
+	    top= 20;
+	    key.color=	"white";
+	    keys {
+		 { <PROP>,	color=	"grey10" },
+		 { <UNDO>,	color=	"grey10" },
+		 {  <ESC>, 9,	color=	"grey10" }, 
+		   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, 
+		   <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, 
+		   <AE11>, <AE12>,
+		 { <BKSP>, "BKSP", 	color=	"grey10" },
+		 { <KPEQ>, 9, 	color=	"grey10" },
+		 { <KPDV>, 	color=	"grey10" },
+		 { <KPMU>, 	color=	"grey10" },
+		 { <KPSU>, 	color=	"grey10" }
+	    };
+	};
+	row {
+	    top= 39;
+	    key.color=	"white";
+	    keys {
+		 { <FRNT>, 	color=	"grey10" },
+		 { <COPY>,	color=	"grey10" },
+		 {  <TAB>, 9, 	"TABK",	color=	"grey10" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>,
+		 { <RTRN>,	"RTRN",	color=	"grey10" },
+		 {  <KP7>, 9, 	color=	"grey10" },
+		 {  <KP8>,  	color=	"grey10" },
+		 {  <KP9>,  	color=	"grey10" },
+		 { <KPAD>,	"KPAD",	color=	"grey10" } 
+	    };
+	};
+	row {
+	    top= 58;
+	    key.color=	"white";
+	    keys {
+		 { <OPEN>, 	color=	"grey10" },
+		 { <PAST>, 	color=	"grey10" },
+		 { <CAPS>, 9,	"LCTL",	color=	"grey10" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <AC12>,
+		 {  <KP4>, 33,	color=	"grey10" },
+		 {  <KP5>,  	color=	"grey10" },
+		 {  <KP6>,  	color=	"grey10" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.color=	"white";
+	    keys { 
+		 { <FIND>, 	color=	"grey10" },
+		 {  <CUT>, 	color=	"grey10" },
+		 { <LFSH>, 9 ,	"LFSH",	color=	"grey10" },
+		   <AB00>, <AB01>, <AB02>, <AB03>,
+		   <AB04>, <AB05>, <AB06>, <AB07>,
+		   <AB08>, <AB09>, <AB10>,
+		 { <RTSH>, 	"RTSH",	color=	"grey10" },
+		 { <LNFD>,	color=	"grey10" },
+		 {  <KP1>, 9, 	color=	"grey10" },
+		 {  <KP2>,  	color=	"grey10" },
+		 {  <KP3>,  	color=	"grey10" },
+		 { <KPEN>,	"KPAD",	color=	"grey10" }
+	    };
+	};
+	row {
+	    top= 96;
+	    key.color=	"grey10";
+	    keys {
+		 { <HELP>, "HELP" }, { <LCTL>, 9 },
+		   <LALT>, <LMTA>,
+		 { <SPCE>, 	"SPCE",	color=	"white" },
+		   <RMTA>, <COMP>, <ALGR>,
+		 { <KP0>, 9, 	"KP0" }, <KPDL>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    shape "RIDGE" { cornerRadius= 1, { [  0, 1], [  1, 0 ],
+				       [330, 0], [331, 1],
+				       [330, 2], [  1, 2] } };
+    solid "Ridge" {
+	shape=	"RIDGE";
+	top=	48;
+	left=	18;
+    };
+
+    shape "LEDS" { cornerRadius= 1, { [ 75 ,21 ] } };
+    shape "LED"  { cornerRadius= 0, { [  7,  4 ] } };
+    outline "LedPanel" {
+	shape= "LEDS";
+	top=  28;
+	left= 358;
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 43;
+    indicator.shape= "LED";
+    indicator "Caps Lock"	{ left= 364; };
+    indicator "Compose"		{ left= 383; };
+    indicator "Scroll Lock"	{ left= 402; };
+    indicator "Num Lock"	{ left= 421; };
+    text.top= 32;
+    text.color= "black";
+    text "CapsLockLabel"	{ left= 364; text="Caps\nLock"; };
+    text "ComposeLabel"		{ left= 380; text="\nCompose"; };
+    text "ScrollLockLabel"	{ left= 402; text="Scroll\nLock"; };
+    text "NumLockLabel"		{ left= 421; text="Num\nLock"; };
+};
+
+xkb_geometry "t6" {
+
+    // This is an approximate layout for a (US/ASCII) Sun Type6
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes.
+
+    width= 515;
+    height= 170;
+
+    shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "BKSL" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [40,17] } };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } };
+    shape "RTSH" { { [ 51,18] }, { [2,1], [49,17] } };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [136,18] }, { [2,1], [134,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "RMTA" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "LMTA" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 14;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 24;
+	row {
+	    top= 1;
+	    keys { { <HELP>, "HELP" }, { <ESC>, 9 },
+		   { <FK01>, 19 }, <FK02>, <FK03>, <FK04>,
+		   { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		   { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		   { <PRSC>,  9 }, <SCLK>, <PAUS>,
+		   { <MUTE>,  9 }, <VOL->, <VOL+>, <POWR>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { <STOP>, <AGAI>,
+		 { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		 { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>,
+		 { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>,
+		 { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, 
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		 { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <FIND>, <CUT>, { <LCTL>, 9, shape="LCTL" },
+		   <LALT>, { <LMTA>, "LMTA" },
+		 { <SPCE>, "SPCE" },
+		 { <RMTA>, "RMTA" }, <COMP>, <ALGR>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 352;
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 420;
+	row {
+	    top= 1;
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } };
+    shape "LED"  { cornerRadius= 2, { [  3,  6 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  1;
+	left= 218;
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 10;
+    indicator.shape= "LED";
+    indicator "CapsLock"	{ left= 243; };
+    indicator "Compose"	{ left= 281; };
+    indicator "ScrollLock"	{ left= 262; };
+    indicator "NumLock"	{ left= 224; };
+    text.top= 1;
+    text.color= "black";
+    text "CapsLockLabel"	{ left= 243; text="Caps\nLock"; };
+    text "ComposeLabel"		{ left= 281; text="Compose"; };
+    text "ScrollLockLabel"	{ left= 262; text="Scroll\nLock"; };
+    text "NumLockLabel"		{ left= 224; text="Num\nLock"; };
+
+
+};
+
+xkb_geometry "t6tuv" {
+
+    // This is an approximate layout for a (US/ASCII) Sun Type6
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes.
+
+    width= 515;
+    height= 170;
+
+    shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } }; 
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" { 
+        approx = { [ 0, 0], [28,37] },
+        { [ 0, 0], [28, 0], [28,37],
+          [ 5,37], [ 5,18], [ 0,18] },
+        { [ 1, 1], [26, 1], [26,36],
+          [ 7,36], [ 7,17], [ 1,17] }
+    };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LFSH" { { [ 24,18] }, { [2,1], [22,17] } };
+    shape "RTSH" { { [ 51,18] }, { [2,1], [49,17] } };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [137,18] }, { [2,1], [135,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "RMTA" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "LMTA" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 14;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 24;
+	row {
+	    top= 1;
+	    keys { { <HELP>, "HELP" }, { <ESC>, 9 },
+		   { <FK01>, 19 }, <FK02>, <FK03>, <FK04>,
+		   { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		   { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		   { <PRSC>,  9 }, <SCLK>, <PAUS>,
+		   { <MUTE>,  9 }, <VOL->, <VOL+>, <POWR>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { <STOP>, <AGAI>,
+		 { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		 { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, 
+		   { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <BKSL>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, <LSGT>, 
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		 { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <FIND>, <CUT>, { <LCTL>, 9, shape="LCTL" },
+		   <LALT>, { <LMTA>, "LMTA" },
+		 { <SPCE>, "SPCE" },
+		 { <RMTA>, "RMTA" }, <COMP>, <ALGR>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 352;
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 420;
+	row {
+	    top= 1;
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } };
+    shape "LED"  { cornerRadius= 2, { [  3,  6 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  1;
+	left= 218;
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 10;
+    indicator.shape= "LED";
+    indicator "CapsLock"	{ left= 243; };
+    indicator "Compose"	{ left= 281; };
+    indicator "ScrollLock"	{ left= 262; };
+    indicator "NumLock"	{ left= 224; };
+    text.top= 1;
+    text.color= "black";
+    text "CapsLockLabel"	{ left= 243; text="Caps\nLock"; };
+    text "ComposeLabel"		{ left= 281; text="Compose"; };
+    text "ScrollLockLabel"	{ left= 262; text="Scroll\nLock"; };
+    text "NumLockLabel"		{ left= 224; text="Num\nLock"; };
+
+};
+
+xkb_geometry "t6jp" {
+
+    // This is an approximate layout for a (US/ASCII) Sun Type6
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes.
+
+    width= 515;
+    height= 170;
+
+    shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "KANJ" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "EXEC" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" { 
+        approx = { [ 0, 0], [28,37] },
+        { [ 0, 0], [28, 0], [28,37],
+          [ 5,37], [ 5,18], [ 0,18] },
+        { [ 1, 1], [26, 1], [26,36],
+          [ 7,36], [ 7,17], [ 1,17] }
+    };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } };
+    shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [ 96,18] }, { [2,1], [94,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 14;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 24;
+	row {
+	    top= 1;
+	    keys { { <HELP>, "HELP" }, { <ESC>, 9 },
+		   { <FK01>, 19 }, <FK02>, <FK03>, <FK04>,
+		   { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		   { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		   { <PRSC>,  9 }, <SCLK>, <PAUS>,
+		   { <MUTE>,  9 }, <VOL->, <VOL+>, <POWR>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { <STOP>, <AGAI>,
+		 { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		 { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, 
+		   { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <BKSL>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, 
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <UNDR>,
+		 { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <FIND>, <CUT>, { <LCTL>, 9 },
+		   <LALT>, <LMTA>, { <EXEC>, "EXEC" },
+		 { <SPCE>, "SPCE" }, { <KANJ>, "KANJ" }, <HENK>,
+		   <RMTA>, <COMP>, <ALGR>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 352;
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 420;
+	row {
+	    top= 1;
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } };
+    shape "LED"  { cornerRadius= 2, { [  3,  6 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  1;
+	left= 218;
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 10;
+    indicator.shape= "LED";
+    indicator "CapsLock"	{ left= 243; };
+    indicator "Compose"	{ left= 281; };
+    indicator "ScrollLock"	{ left= 262; };
+    indicator "NumLock"	{ left= 224; };
+    text.top= 1;
+    text.color= "black";
+    text "CapsLockLabel"	{ left= 243; text="Caps\nLock"; };
+    text "ComposeLabel"		{ left= 281; text="Compose"; };
+    text "ScrollLockLabel"	{ left= 262; text="Scroll\nLock"; };
+    text "NumLockLabel"		{ left= 224; text="Num\nLock"; };
+
+};
+
+xkb_geometry "t6unix" {
+
+    // This is an approximate layout for a (US/ASCII) Sun Type6
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes.
+
+    width= 515;
+    height= 170;
+
+    shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [40,17] } };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } };
+    shape "RTSH" { { [ 51,18] }, { [2,1], [49,17] } };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [136,18] }, { [2,1], [134,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "RMTA" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "LMTA" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 14;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 24;
+	row {
+	    top= 1;
+	    keys { { <HELP>, "HELP" }, { <NONE>, 9 },
+		   { <FK01>, 19 }, <FK02>, <FK03>, <FK04>,
+		   { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		   { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		   { <PRSC>,  9 }, <SCLK>, <PAUS>,
+		   { <MUTE>,  9 }, <VOL->, <VOL+>, <POWR>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { <STOP>, <AGAI>,
+		 { <ESC>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   <BKSL>, <TLDE>
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>,
+		 { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>,
+		 { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, 
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		 { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <FIND>, <CUT>, { <LCTL>, 9, shape="LCTL" },
+		   <LALT>, {<LMTA>, "LMTA"},
+		 { <SPCE>, "SPCE" },
+		   {<RMTA>, "RMTA"}, <COMP>, <ALGR>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 352;
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 420;
+	row {
+	    top= 1;
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } };
+    shape "LED"  { cornerRadius= 2, { [  3,  6 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  1;
+	left= 218;
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 10;
+    indicator.shape= "LED";
+    indicator "CapsLock"	{ left= 243; };
+    indicator "Compose"	{ left= 281; };
+    indicator "ScrollLock"	{ left= 262; };
+    indicator "NumLock"	{ left= 224; };
+    text.top= 1;
+    text.color= "black";
+    text "CapsLockLabel"	{ left= 243; text="Caps\nLock"; };
+    text "ComposeLabel"		{ left= 281; text="Compose"; };
+    text "ScrollLockLabel"	{ left= 262; text="Scroll\nLock"; };
+    text "NumLockLabel"		{ left= 224; text="Num\nLock"; };
+};
+
+xkb_geometry "type5" {
+    include "sun(t5)"
+    description= "Sun Type5 keyboard";
+};
+
+xkb_geometry "type5jp" {
+    include "sun(t5jp)"
+    description= "Sun Type5 Japanese keyboard";
+};
+
+xkb_geometry "type5tuv" {
+    include "sun(t5tuv)"
+    description= "Sun Type5 keyboard";
+};
+
+xkb_geometry "type5euro" {
+    include "sun(t5tuv)"
+    description= "Sun Type5 keyboard";
+};
+
+xkb_geometry "type5unix" {
+    include "sun(t5unix)"
+    description= "Sun Type5 Unix keyboard";
+};
+
+xkb_geometry "type5hobo" {
+    include "sun(t5hobo)"
+    description= "Sun Type5 Hobo keyboard";
+};
+
+xkb_geometry "type5tuvhobo" {
+    include "sun(t5tuvhobo)"
+    description= "Sun Type5 Hobo keyboard";
+};
+
+xkb_geometry "type5jphobo" {
+    include "sun(t5jphobo)"
+    description= "Sun Type5 Japanese Hobo keyboard";
+};
+
+default xkb_geometry "type6" {
+    include "sun(t6)"
+    description= "Sun Type6 keyboard (US, Korea, Taiwan)";
+};
+
+xkb_geometry "type6jp" {
+    include "sun(t6jp)"
+    description= "Sun Type6 Japanese keyboard";
+};
+
+xkb_geometry "type6tuv" {
+    include "sun(t6tuv)"
+    description= "Sun Type6 TUV keyboard";
+};
+
+xkb_geometry "type6unix" {
+    include "sun(t6unix)"
+    description= "Sun Type6 Unix keyboard";
+};
+
+xkb_geometry "x86" {
+    include "pc(pc101)"
+    description= "x86 Style Keyboard";
+};
+
+xkb_geometry "MS_x86" {
+    include "pc(pc104)"
+    description= "x86 104 Key Keyboard";
+};
+
+xkb_geometry "x86tuv" {
+    include "pc(pc102)"
+    description= "x86 European Style Keyboard";
+};
diff --git a/xorg-server/xkeyboard-config/geometry/thinkpad b/xorg-server/xkeyboard-config/geometry/thinkpad
index fb1118040..48e8cdcce 100644
--- a/xorg-server/xkeyboard-config/geometry/thinkpad
+++ b/xorg-server/xkeyboard-config/geometry/thinkpad
@@ -1,470 +1,470 @@
-// -*- indent-tabs-mode: nil -*-
-
-// Created by Alexander Pohoyda <alexander.pohoyda@gmx.net>
-// Geometry specification for IBM ThinkPad keyboard.
-// Compatible Models: THINKPAD 560Z 2640-90U, THINKPAD 560Z 2640-91U,
-//    THINKPAD 560Z 2640-B0U, THINKPAD 560Z 2640-B1U, THINKPAD 560Z 2640-RR3,
-//    THINKPAD 600 2645-31U, THINKPAD 600 2645-35U, THINKPAD 600 2645-41U,
-//    THINKPAD 600 2645-42U, THINKPAD 600 2645-45U, THINKPAD 600 2645-48U,
-//    THINKPAD 600 2645-51U, THINKPAD 600 2645-85U, THINKPAD 600 2645-A1U,
-//    THINKPAD 600 2645-RR1, THINKPAD 600 2645-RR2, THINKPAD 600E 2645-3AU,
-//    THINKPAD 600E 2645-4AU, THINKPAD 600E 2645-4BU, THINKPAD 600E 2645-55U,
-//    THINKPAD 600E 2645-5AU, THINKPAD 600E 2645-5BU, THINKPAD 600E 2645-5JU,
-//    THINKPAD 600E 2645-8AO, THINKPAD 600E 2645-8AU, THINKPAD 600E 2645-8BU,
-//    THINKPAD 600E 2645-AAU, THINKPAD 600E 2645-RRB, THINKPAD 600E 2645-RRD,
-//    THINKPAD 600E 2645-RRF, THINKPAD 600E 2645-RRS, THINKPAD A22E 2645-45U
-
-xkb_geometry "common" {
-    width = 290;
-    height = 150;
-    baseColor = "grey80";
-    labelColor = "white";
-
-    shape "FN0"  { cornerRadius = 1, { [17, 12] }, { [2, 0], [15, 10] } };
-    shape "NORM" { cornerRadius = 1, { [18, 18] }, { [2.5, 0], [15.5, 14] } };
-    shape "BKSP" { cornerRadius = 1, { [37, 18] }, { [2.5, 0], [34.5, 14] } };
-    shape "TABK" { cornerRadius = 1, { [27, 18] }, { [2.5, 0], [24.5, 14] } };
-    shape "CAPS" { cornerRadius = 1, { [31, 18] }, { [1, 0], [30, 16] },
-				                   { [1, 0], [26, 16] },
-				                   { [2.5, 0], [24.5, 14] } };
-    shape "RTSH" { cornerRadius = 1, { [50, 18] }, { [2.5, 0], [46.5, 14] } };
-    shape "MODK" { cornerRadius = 1, { [27.5, 18] }, { [2.5, 0], [25, 14] } };
-    shape "SPCE" { cornerRadius = 1, { [100, 18] }, { [2.5, 0], [97.5, 14] } };
-    shape "ARRS" { cornerRadius = 1, { [16, 13] }, { [1.5, 0], [14.5, 11] } };
-
-    shape "LED"  { cornerRadius = 2, { [3, 3] } };
-
-    shape "KEYS" { cornerRadius = 2,
-                   { [0, 0], [19, 0], [19, 13], [172, 13],
-	             [172, 0], [286, 0], [286, 138], [216, 138],
-	             [216, 124], [0, 124] } };
-
-    solid "KeyPanel" {
-	shape = "KEYS";
-	left = 2;
-	top = 5;
-	color = "black";
-    };
-
-    shape "NULL1" { cornerRadius = 1,
-                    { [0, 0], [50, 0], [50, 18], [34, 18], [34, 4],
-		      [16, 4], [16, 18], [0, 18] } };
-
-    solid "NullPanel1" {
-	shape = "NULL1";
-	left = 237;
-	top = 110;
-	color = "grey80";
-    };
-
-    shape "NULL2" { cornerRadius = 1, { [17, 13] } };
-
-    solid "NullPanel2" {
-	shape = "NULL2";
-	left = 219;
-	top = 129;
-	color = "grey80";
-    };
-
-    shape "NULL3" { cornerRadius = 1,
-                    { [0, 26],
-		      [72, 26], [72, 13], [76, 13], [76, 26],
-		      [149, 26], [149, 13], [153, 13], [153, 26],
-		      [226, 26], [226, 0], [230, 0], [230, 26],
-		      [284, 26], [285, 27],
-		      [0, 27] } };
-
-    solid "NullPanel3" {
-	shape = "NULL3";
-	left = 3;
-	top = 6;
-	color = "grey80";
-    };
-
-    indicator.onColor = "green";
-    indicator.offColor = "grey10";
-    indicator.top = 4;
-    indicator.shape = "LED";
-    indicator "HDDActivity" { onColor = "red"; left = 100; };
-    indicator "Num Lock"     { left = 108; };
-    indicator "Caps Lock"    { left = 114; };
-    indicator "Scroll Lock"  { left = 120; };
-    indicator "Power"	     { left = 128; };
-
-    key.gap = 1;
-    key.color = "grey60";
-
-    section "Function" {
-	left = 2;
-	top = 5;
-	key.shape = "FN0";
-	row {
-	    top = 1;
-	    keys {  <ESC>, { <PRSC>, 155 }, <SCLK>, <PAUS> };
-	};
-	row {
-	    top = 14;
-	    keys {  <FK01>, <FK02>, <FK03>, <FK04>,
-		    { <FK05>, 6 }, <FK06>, <FK07>, <FK08>,
-		    { <FK09>, 6 }, <FK10>, <FK11>, <FK12>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Control" {
-	left= 2;
-	top = 109;
-	key.shape = "MODK";
-	row {
-	    top = 1;
-	    keys { { <FN>, "NORM" }, <LCTL>, <LALT>,
-		   { <SPCE>, "SPCE" }, <RALT>, <RCTL>
-	    };
-	};
-    }; // End of "Control" section
-
-    section "Editing" {
-	top = 5;
-	left = 233;
-        key.shape = "FN0";
-	row {
-	    top = 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-        row {
-	    top = 14;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-    }; // End of "Editing" section
-
-    section "Navigation" {
-	top = 114;
-	left = 236;
-	key.shape = "ARRS";
-	row {
-	    top = 1;
-	    left = 17;
-	    keys { <UP> };
-	};
-	row {
-	    top = 15;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Navigation" section
-    
-    shape "STIK" { cornerRadius = 4, { [7, 7] } };
-
-    solid "STIK" {
-	priority = 255;
-	color = "red";
-	shape = "STIK";
-	top = 85;
-	left = 126;
-    };
-};
-
-// 85 keys
-// US/English (FRU 02K4785).
-xkb_geometry "us" {
-    include "thinkpad(common)"
-    description = "IBM ThinkPad 560Z/600/600E/A22E, US";
-
-    shape "RTRN" { cornerRadius = 1, { [43, 18] }, { [2.5, 0], [40.5, 14] } };
-    shape "LFSH" { cornerRadius = 1, { [43, 18] }, { [2.5, 0], [40.5, 14] } };
-    shape "BKSL" { cornerRadius = 1, { [28, 18] }, { [2.5, 0], [25.5, 14] } };
-
-    section "Alpha" {
-	left = 2;
-	top = 33;
-	key.gap = 1;
-	key.color = "grey60";
-	key.shape = "NORM";
-	row {
-	    top = 1;
-	    keys { <AE00>, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
-	    };
-	};
-	row {
-	    top = 20;
-	    keys { { <TAB>, "TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
-	    };
-	};
-	row {
-	    top = 39;
-	    keys { { <CAPS>, "CAPS" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, { <RTRN>, "RTRN" }
-	    };
-	};
-	row {
-	    top = 58;
-	    keys { { <LFSH>, "LFSH" },
-		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
-		   { <RTSH>, "RTSH" }
-	    };
-	};
-    }; // End of "Alpha" section
-};
-
-// 86 keys
-// Tested on: DE/German, UK/English (FRU 02K4787).
-xkb_geometry "intl" {
-    include "thinkpad(common)"
-    description = "IBM ThinkPad 560Z/600/600E/A22E, Intl";
-
-    shape "RTRN" { cornerRadius = 1, { [28, 0], [28, 37], [4, 37], [4, 18],
-                                       [0, 18], [0, 0] },
-                                     { [25.5, 0], [25.5, 33], [6.5, 33],
-				       [6.5, 14], [2.5, 14], [2.5, 0] } };
-    shape "LFSH" { cornerRadius = 1, { [24, 18] }, { [2.5, 0], [21.5, 14] } };
-
-    section "Alpha" {
-	left = 2;
-	top = 33;
-	key.gap = 1;
-	key.color = "grey60";
-	key.shape = "NORM";
-	row {
-	    top = 1;
-	    keys { <AE00>, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
-	    };
-	};
-	row {
-	    top = 20;
-	    keys { { <TAB>, "TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <RTRN>, "RTRN" }
-	    };
-	};
-	row {
-	    top = 39;
-	    keys { { <CAPS>, "CAPS" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, <AC12>
-	    };
-	};
-	row {
-	    top = 58;
-	    keys { { <LFSH>, "LFSH" }, <AB00>,
-		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
-		   { <RTSH>, "RTSH" }
-	    };
-	};
-    }; // End of "Alpha" section
-};
-
-xkb_geometry "60" {
-    width = 290;
-    height = 140;
-    baseColor = "grey80";
-    labelColor = "white";
-
-    shape "NORM" { cornerRadius = 1, { [18,   18] }, { [2, 0], [16, 16] } };
-
-    shape "ESC"  { cornerRadius = 1, { [17,   13] }, { [1.5, 0], [15.5, 12] } };
-    shape "FN0"  { cornerRadius = 1, { [17,   11] }, { [1.5, 0], [15.5, 10] } };
-
-    shape "BKSP" { cornerRadius = 1, { [37,   18] }, { [2, 0], [35, 16] } };
-
-    shape "TABK" { cornerRadius = 1, { [27.5, 18] }, { [2, 0], [25.5, 16] } };
-    shape "BKSL" { cornerRadius = 1, { [27.5, 18] }, { [2, 0], [25.5, 16] } };
-
-    shape "CAPS" { cornerRadius = 1, { [30.5, 18] }, { [2, 0], [28.5, 16] } };
-    shape "RTRN" { cornerRadius = 1, { [43.5, 18] }, { [2, 0], [41.5, 16] } };
-
-    shape "LFSH" { cornerRadius = 1, { [40,   18] }, { [2, 0], [38, 16] } };
-    shape "RTSH" { cornerRadius = 1, { [53,   18] }, { [2, 0], [51, 16] } };
-
-    shape "LCTL" { cornerRadius = 1, { [21,   18] }, { [2, 0], [19, 16] } };
-    shape "LWIN" { cornerRadius = 1, { [15,   18] }, { [1.5, 0], [13.5, 16] } };
-
-    shape "SPCE" { cornerRadius = 1, { [97,   18] }, { [2, 0], [95, 16] } };
-
-    shape "ARR1" { cornerRadius = 1, { [17,   13] }, { [1.5, 0], [15.5, 12] } };
-    shape "ARR2" { cornerRadius = 1, { [17,   11] }, { [1.5, 0], [15.5, 10] } };
-
-    shape "VOL"  { cornerRadius = 2.5, { [5, 5] } };
-    shape "TVTG" { cornerRadius = 0.5, { [0, 1], [17, 1], [17, 4], [0, 4] } };
-
-    shape "KEYS" { cornerRadius = 2,
-                   { [0, 0], [19, 0], [19, 16], [172, 16],
-	             [172, 4], [286, 4], [286, 133], [231, 133],
-	             [231, 126], [0, 126] } };
-
-    solid "KeyPanel" {
-	shape = "KEYS";
-	left = 2;
-	top = 3;
-	color = "black";
-    };
-
-    shape "NULL0" { cornerRadius = 0.5,
-                    { [0, 26],
-		      [72, 26], [72, 14], [76, 14], [76, 26],
-		      [149, 26], [149, 14], [153, 14], [153, 26],
-		      [226, 26], [226, 2], [230, 2], [230, 26],
-		      [284, 26], [284, 27],
-		      [0, 27] } };
-
-    solid "NullPanel0" {
-	shape = "NULL0";
-	left = 3;
-	top = 6;
-	color = "grey80";
-    };
-
-    shape "NULL1" { cornerRadius = 0.5, { [0, 12], [17, 12], [17, 13], [0, 13] } };
-
-    solid "NullPanel1" {
-	shape = "NULL1";
-	left = 3;
-	top = 6;
-	color = "grey80";
-    };
-
-    shape "MEDIA" { cornerRadius = 0.5, { [0, 0], [55, 0], [55, 10], [0, 10] } };
-
-    solid "MediaPanel" {
-	shape = "MEDIA";
-	left = 25.5;
-	top = 6;
-	color = "black";
-    };
-
-    section "Volume" {
-	left = 22;
-	top = 8.5;
-	key.shape = "VOL";
-	key.gap = 6;
-	key.color = "grey20";
-
-	row {
-	    keys { <MUTE>, <VOL->, <VOL+>, {<I1F>, "TVTG", color = "blue"} };
-	};
-    };
-
-    key.gap = 1;
-    key.color = "grey60";
-
-    section "Function" {
-	left = 2;
-	top = 3;
-	key.shape = "FN0";
-	row {
-	    key.shape = "ESC";
-	    top = 1;
-	    keys {  <ESC> };
-	};
-	row {
-	    top = 5;
-	    keys { { <PRSC>, 173 }, <SCLK>, <PAUS> };
-	};
-	row {
-	    top = 17;
-	    keys {  <FK01>, <FK02>, <FK03>, <FK04>,
-		    { <FK05>, 6 }, <FK06>, <FK07>, <FK08>,
-		    { <FK09>, 6 }, <FK10>, <FK11>, <FK12>
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Control" {
-	left = 2;
-	top = 109;
-	key.shape = "NORM";
-	row {
-	    top = 1;
-	    keys { <FN>, { <LCTL>, "LCTL" }, { <LWIN>, "LWIN" }, <LALT>,
-		   { <SPCE>, "SPCE" }, <RALT>, <MENU>, <RCTL>
-	    };
-	};
-    }; // End of "Control" section
-
-    section "Editing" {
-	top = 7;
-	left = 233;
-        key.shape = "FN0";
-	row {
-	    top = 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-        row {
-	    top = 13;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-    }; // End of "Editing" section
-
-    section "Navigation" {
-	top = 109;
-	left = 233;
-	row {
-	    key.shape = "ARR1";
-	    top = 1;
-	    keys { <I6A>, <UP>, <I69> };
-	};
-	row {
-	    key.shape = "ARR2";
-	    top = 15;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Navigation" section
-    
-    shape "STIK" { cornerRadius = 3.5, { [7, 7] } };
-
-    solid "STIK" {
-	priority = 255;
-	color = "red";
-	shape = "STIK";
-	top = 85.5;
-	left = 125.5;
-    };
-
-    section "Alpha" {
-	left = 2;
-	top = 33;
-	key.shape = "NORM";
-	row {
-	    top = 1;
-	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
-		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
-	    };
-	};
-	row {
-	    top = 20;
-	    keys { { <TAB>, "TABK" },
-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
-		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
-	    };
-	};
-	row {
-	    top = 39;
-	    keys { { <CAPS>, "CAPS" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		   <AC11>, { <RTRN>, "RTRN", color = "blue" }
-	    };
-	};
-	row {
-	    top = 58;
-	    keys { { <LFSH>, "LFSH" },
-		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
-		   { <RTSH>, "RTSH" }
-	    };
-	};
-    }; // End of "Alpha" section
-};
+// -*- indent-tabs-mode: nil -*-
+
+// Created by Alexander Pohoyda <alexander.pohoyda@gmx.net>
+// Geometry specification for IBM ThinkPad keyboard.
+// Compatible Models: THINKPAD 560Z 2640-90U, THINKPAD 560Z 2640-91U,
+//    THINKPAD 560Z 2640-B0U, THINKPAD 560Z 2640-B1U, THINKPAD 560Z 2640-RR3,
+//    THINKPAD 600 2645-31U, THINKPAD 600 2645-35U, THINKPAD 600 2645-41U,
+//    THINKPAD 600 2645-42U, THINKPAD 600 2645-45U, THINKPAD 600 2645-48U,
+//    THINKPAD 600 2645-51U, THINKPAD 600 2645-85U, THINKPAD 600 2645-A1U,
+//    THINKPAD 600 2645-RR1, THINKPAD 600 2645-RR2, THINKPAD 600E 2645-3AU,
+//    THINKPAD 600E 2645-4AU, THINKPAD 600E 2645-4BU, THINKPAD 600E 2645-55U,
+//    THINKPAD 600E 2645-5AU, THINKPAD 600E 2645-5BU, THINKPAD 600E 2645-5JU,
+//    THINKPAD 600E 2645-8AO, THINKPAD 600E 2645-8AU, THINKPAD 600E 2645-8BU,
+//    THINKPAD 600E 2645-AAU, THINKPAD 600E 2645-RRB, THINKPAD 600E 2645-RRD,
+//    THINKPAD 600E 2645-RRF, THINKPAD 600E 2645-RRS, THINKPAD A22E 2645-45U
+
+xkb_geometry "common" {
+    width = 290;
+    height = 150;
+    baseColor = "grey80";
+    labelColor = "white";
+
+    shape "FN0"  { cornerRadius = 1, { [17, 12] }, { [2, 0], [15, 10] } };
+    shape "NORM" { cornerRadius = 1, { [18, 18] }, { [2.5, 0], [15.5, 14] } };
+    shape "BKSP" { cornerRadius = 1, { [37, 18] }, { [2.5, 0], [34.5, 14] } };
+    shape "TABK" { cornerRadius = 1, { [27, 18] }, { [2.5, 0], [24.5, 14] } };
+    shape "CAPS" { cornerRadius = 1, { [31, 18] }, { [1, 0], [30, 16] },
+				                   { [1, 0], [26, 16] },
+				                   { [2.5, 0], [24.5, 14] } };
+    shape "RTSH" { cornerRadius = 1, { [50, 18] }, { [2.5, 0], [46.5, 14] } };
+    shape "MODK" { cornerRadius = 1, { [27.5, 18] }, { [2.5, 0], [25, 14] } };
+    shape "SPCE" { cornerRadius = 1, { [100, 18] }, { [2.5, 0], [97.5, 14] } };
+    shape "ARRS" { cornerRadius = 1, { [16, 13] }, { [1.5, 0], [14.5, 11] } };
+
+    shape "LED"  { cornerRadius = 2, { [3, 3] } };
+
+    shape "KEYS" { cornerRadius = 2,
+                   { [0, 0], [19, 0], [19, 13], [172, 13],
+	             [172, 0], [286, 0], [286, 138], [216, 138],
+	             [216, 124], [0, 124] } };
+
+    solid "KeyPanel" {
+	shape = "KEYS";
+	left = 2;
+	top = 5;
+	color = "black";
+    };
+
+    shape "NULL1" { cornerRadius = 1,
+                    { [0, 0], [50, 0], [50, 18], [34, 18], [34, 4],
+		      [16, 4], [16, 18], [0, 18] } };
+
+    solid "NullPanel1" {
+	shape = "NULL1";
+	left = 237;
+	top = 110;
+	color = "grey80";
+    };
+
+    shape "NULL2" { cornerRadius = 1, { [17, 13] } };
+
+    solid "NullPanel2" {
+	shape = "NULL2";
+	left = 219;
+	top = 129;
+	color = "grey80";
+    };
+
+    shape "NULL3" { cornerRadius = 1,
+                    { [0, 26],
+		      [72, 26], [72, 13], [76, 13], [76, 26],
+		      [149, 26], [149, 13], [153, 13], [153, 26],
+		      [226, 26], [226, 0], [230, 0], [230, 26],
+		      [284, 26], [285, 27],
+		      [0, 27] } };
+
+    solid "NullPanel3" {
+	shape = "NULL3";
+	left = 3;
+	top = 6;
+	color = "grey80";
+    };
+
+    indicator.onColor = "green";
+    indicator.offColor = "grey10";
+    indicator.top = 4;
+    indicator.shape = "LED";
+    indicator "HDDActivity" { onColor = "red"; left = 100; };
+    indicator "Num Lock"     { left = 108; };
+    indicator "Caps Lock"    { left = 114; };
+    indicator "Scroll Lock"  { left = 120; };
+    indicator "Power"	     { left = 128; };
+
+    key.gap = 1;
+    key.color = "grey60";
+
+    section "Function" {
+	left = 2;
+	top = 5;
+	key.shape = "FN0";
+	row {
+	    top = 1;
+	    keys {  <ESC>, { <PRSC>, 155 }, <SCLK>, <PAUS> };
+	};
+	row {
+	    top = 14;
+	    keys {  <FK01>, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 6 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 6 }, <FK10>, <FK11>, <FK12>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Control" {
+	left= 2;
+	top = 109;
+	key.shape = "MODK";
+	row {
+	    top = 1;
+	    keys { { <FN>, "NORM" }, <LCTL>, <LALT>,
+		   { <SPCE>, "SPCE" }, <RALT>, <RCTL>
+	    };
+	};
+    }; // End of "Control" section
+
+    section "Editing" {
+	top = 5;
+	left = 233;
+        key.shape = "FN0";
+	row {
+	    top = 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top = 14;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+    }; // End of "Editing" section
+
+    section "Navigation" {
+	top = 114;
+	left = 236;
+	key.shape = "ARRS";
+	row {
+	    top = 1;
+	    left = 17;
+	    keys { <UP> };
+	};
+	row {
+	    top = 15;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Navigation" section
+    
+    shape "STIK" { cornerRadius = 4, { [7, 7] } };
+
+    solid "STIK" {
+	priority = 255;
+	color = "red";
+	shape = "STIK";
+	top = 85;
+	left = 126;
+    };
+};
+
+// 85 keys
+// US/English (FRU 02K4785).
+xkb_geometry "us" {
+    include "thinkpad(common)"
+    description = "IBM ThinkPad 560Z/600/600E/A22E, US";
+
+    shape "RTRN" { cornerRadius = 1, { [43, 18] }, { [2.5, 0], [40.5, 14] } };
+    shape "LFSH" { cornerRadius = 1, { [43, 18] }, { [2.5, 0], [40.5, 14] } };
+    shape "BKSL" { cornerRadius = 1, { [28, 18] }, { [2.5, 0], [25.5, 14] } };
+
+    section "Alpha" {
+	left = 2;
+	top = 33;
+	key.gap = 1;
+	key.color = "grey60";
+	key.shape = "NORM";
+	row {
+	    top = 1;
+	    keys { <AE00>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top = 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top = 39;
+	    keys { { <CAPS>, "CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top = 58;
+	    keys { { <LFSH>, "LFSH" },
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		   { <RTSH>, "RTSH" }
+	    };
+	};
+    }; // End of "Alpha" section
+};
+
+// 86 keys
+// Tested on: DE/German, UK/English (FRU 02K4787).
+xkb_geometry "intl" {
+    include "thinkpad(common)"
+    description = "IBM ThinkPad 560Z/600/600E/A22E, Intl";
+
+    shape "RTRN" { cornerRadius = 1, { [28, 0], [28, 37], [4, 37], [4, 18],
+                                       [0, 18], [0, 0] },
+                                     { [25.5, 0], [25.5, 33], [6.5, 33],
+				       [6.5, 14], [2.5, 14], [2.5, 0] } };
+    shape "LFSH" { cornerRadius = 1, { [24, 18] }, { [2.5, 0], [21.5, 14] } };
+
+    section "Alpha" {
+	left = 2;
+	top = 33;
+	key.gap = 1;
+	key.color = "grey60";
+	key.shape = "NORM";
+	row {
+	    top = 1;
+	    keys { <AE00>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top = 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top = 39;
+	    keys { { <CAPS>, "CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <AC12>
+	    };
+	};
+	row {
+	    top = 58;
+	    keys { { <LFSH>, "LFSH" }, <AB00>,
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		   { <RTSH>, "RTSH" }
+	    };
+	};
+    }; // End of "Alpha" section
+};
+
+xkb_geometry "60" {
+    width = 290;
+    height = 140;
+    baseColor = "grey80";
+    labelColor = "white";
+
+    shape "NORM" { cornerRadius = 1, { [18,   18] }, { [2, 0], [16, 16] } };
+
+    shape "ESC"  { cornerRadius = 1, { [17,   13] }, { [1.5, 0], [15.5, 12] } };
+    shape "FN0"  { cornerRadius = 1, { [17,   11] }, { [1.5, 0], [15.5, 10] } };
+
+    shape "BKSP" { cornerRadius = 1, { [37,   18] }, { [2, 0], [35, 16] } };
+
+    shape "TABK" { cornerRadius = 1, { [27.5, 18] }, { [2, 0], [25.5, 16] } };
+    shape "BKSL" { cornerRadius = 1, { [27.5, 18] }, { [2, 0], [25.5, 16] } };
+
+    shape "CAPS" { cornerRadius = 1, { [30.5, 18] }, { [2, 0], [28.5, 16] } };
+    shape "RTRN" { cornerRadius = 1, { [43.5, 18] }, { [2, 0], [41.5, 16] } };
+
+    shape "LFSH" { cornerRadius = 1, { [40,   18] }, { [2, 0], [38, 16] } };
+    shape "RTSH" { cornerRadius = 1, { [53,   18] }, { [2, 0], [51, 16] } };
+
+    shape "LCTL" { cornerRadius = 1, { [21,   18] }, { [2, 0], [19, 16] } };
+    shape "LWIN" { cornerRadius = 1, { [15,   18] }, { [1.5, 0], [13.5, 16] } };
+
+    shape "SPCE" { cornerRadius = 1, { [97,   18] }, { [2, 0], [95, 16] } };
+
+    shape "ARR1" { cornerRadius = 1, { [17,   13] }, { [1.5, 0], [15.5, 12] } };
+    shape "ARR2" { cornerRadius = 1, { [17,   11] }, { [1.5, 0], [15.5, 10] } };
+
+    shape "VOL"  { cornerRadius = 2.5, { [5, 5] } };
+    shape "TVTG" { cornerRadius = 0.5, { [0, 1], [17, 1], [17, 4], [0, 4] } };
+
+    shape "KEYS" { cornerRadius = 2,
+                   { [0, 0], [19, 0], [19, 16], [172, 16],
+	             [172, 4], [286, 4], [286, 133], [231, 133],
+	             [231, 126], [0, 126] } };
+
+    solid "KeyPanel" {
+	shape = "KEYS";
+	left = 2;
+	top = 3;
+	color = "black";
+    };
+
+    shape "NULL0" { cornerRadius = 0.5,
+                    { [0, 26],
+		      [72, 26], [72, 14], [76, 14], [76, 26],
+		      [149, 26], [149, 14], [153, 14], [153, 26],
+		      [226, 26], [226, 2], [230, 2], [230, 26],
+		      [284, 26], [284, 27],
+		      [0, 27] } };
+
+    solid "NullPanel0" {
+	shape = "NULL0";
+	left = 3;
+	top = 6;
+	color = "grey80";
+    };
+
+    shape "NULL1" { cornerRadius = 0.5, { [0, 12], [17, 12], [17, 13], [0, 13] } };
+
+    solid "NullPanel1" {
+	shape = "NULL1";
+	left = 3;
+	top = 6;
+	color = "grey80";
+    };
+
+    shape "MEDIA" { cornerRadius = 0.5, { [0, 0], [55, 0], [55, 10], [0, 10] } };
+
+    solid "MediaPanel" {
+	shape = "MEDIA";
+	left = 25.5;
+	top = 6;
+	color = "black";
+    };
+
+    section "Volume" {
+	left = 22;
+	top = 8.5;
+	key.shape = "VOL";
+	key.gap = 6;
+	key.color = "grey20";
+
+	row {
+	    keys { <MUTE>, <VOL->, <VOL+>, {<I1F>, "TVTG", color = "blue"} };
+	};
+    };
+
+    key.gap = 1;
+    key.color = "grey60";
+
+    section "Function" {
+	left = 2;
+	top = 3;
+	key.shape = "FN0";
+	row {
+	    key.shape = "ESC";
+	    top = 1;
+	    keys {  <ESC> };
+	};
+	row {
+	    top = 5;
+	    keys { { <PRSC>, 173 }, <SCLK>, <PAUS> };
+	};
+	row {
+	    top = 17;
+	    keys {  <FK01>, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 6 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 6 }, <FK10>, <FK11>, <FK12>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Control" {
+	left = 2;
+	top = 109;
+	key.shape = "NORM";
+	row {
+	    top = 1;
+	    keys { <FN>, { <LCTL>, "LCTL" }, { <LWIN>, "LWIN" }, <LALT>,
+		   { <SPCE>, "SPCE" }, <RALT>, <MENU>, <RCTL>
+	    };
+	};
+    }; // End of "Control" section
+
+    section "Editing" {
+	top = 7;
+	left = 233;
+        key.shape = "FN0";
+	row {
+	    top = 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top = 13;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+    }; // End of "Editing" section
+
+    section "Navigation" {
+	top = 109;
+	left = 233;
+	row {
+	    key.shape = "ARR1";
+	    top = 1;
+	    keys { <I6A>, <UP>, <I69> };
+	};
+	row {
+	    key.shape = "ARR2";
+	    top = 15;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Navigation" section
+    
+    shape "STIK" { cornerRadius = 3.5, { [7, 7] } };
+
+    solid "STIK" {
+	priority = 255;
+	color = "red";
+	shape = "STIK";
+	top = 85.5;
+	left = 125.5;
+    };
+
+    section "Alpha" {
+	left = 2;
+	top = 33;
+	key.shape = "NORM";
+	row {
+	    top = 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top = 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top = 39;
+	    keys { { <CAPS>, "CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, "RTRN", color = "blue" }
+	    };
+	};
+	row {
+	    top = 58;
+	    keys { { <LFSH>, "LFSH" },
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		   { <RTSH>, "RTSH" }
+	    };
+	};
+    }; // End of "Alpha" section
+};
diff --git a/xorg-server/xkeyboard-config/geometry/typematrix b/xorg-server/xkeyboard-config/geometry/typematrix
index d86976f8f..65afd5f7d 100644
--- a/xorg-server/xkeyboard-config/geometry/typematrix
+++ b/xorg-server/xkeyboard-config/geometry/typematrix
@@ -1,745 +1,745 @@
-// -*- indent-tabs-mode: nil -*-
-
-// Created by Frédéric Boiteux <fboiteux (at) free (dot) fr>
-// and Gildas Cotomale <gildas (dot) cotomale (at) gmail (dot) com>
-
-// Note : the special/multimedia keys (Calc, WWW, Desktop…) have a keycode
-// <I[XX]>, found in definition file /usr/share/X11/xkb/keycodes/evdev.
-// Fn           = <I120>;
-// Calc         = <I148>;
-// WWW          = <I158>;
-// CycleWindows = <I162>;
-// Mail         = <I163>;
-// PlayPause    = <I172>;
-// Desktop      = <I243>;
-
-
-xkb_geometry "tm2020" {
-    description = "TypeMatrix EZ-Reach 2020";
-
-    // Keyboard total size :
-    width  = 308;
-    height = 152;
-    // background / foreground colours :
-    baseColor  = "white";
-    labelColor = "black";
-
-    // Key shapes : base key = 16 mm each side
-    shape "NORM" { cornerRadius=1, { [16,    16]   }, { [1,   1], [15,   15] }};
-    shape "ALPL" { cornerRadius=1, { [24.25, 16]   }, { [1,   1], [23,   15] }};
-    shape "DHAL" { cornerRadius=1, { [24.25, 32.5] }, { [1,   1], [23, 31.5] }};
-    shape "FUNC" { cornerRadius=1, { [16,    12]   }, { [2.5, 0], [13.5, 10] }};
-    shape "FUNL" { cornerRadius=1, { [24.25, 12]   }, { [2.5, 0], [21.5, 10] }};
-    shape "SPCE" { cornerRadius=1, { [57,    26]   }, { [2.5, 1], [54.5, 24] }};
-    shape "DBLA" { cornerRadius=1, { [32.5,  16]   }, { [1,   1], [31,   15] }};
-    shape "LED"  { cornerRadius=2, { [4,      4]   }};
-    shape "DECO" { cornerRadius=1, { [3,     18]   }};
-
-    // Function keys row
-    section "Function" {
-        left = 4;
-        top  = 24;
-        key.gap = 0.5;
-        key.color = "grey10";
-        key.shape = "FUNC";
-        row {
-            keys { { <ESC>,  "FUNL" },
-                   <FK01>, <FK02>, <FK03>, <FK04>, <FK05> };
-            key.color = "grey20";
-            keys { { <NMLK>, "FUNL" } };
-        };
-        row {
-            left = 150;
-            key.color = "red";
-            keys { { <DELE>, "FUNL" } };
-            key.color = "grey10";
-            keys { <FK06>, <FK07>, <FK08>, <FK09>, <FK10>, <FK11>,
-                   { <FK12>, "FUNL" } };
-        };
-    };
-
-    // Alpha-numeric keys rows
-    section "Alpha" {
-        left = 4;
-        top  = 36.5;
-        key.gap = 0.5;
-        key.color = "grey10";
-        key.shape = "NORM";
-        row {
-            top  = 0;
-            keys { { <TLDE>, "ALPL" },
-                   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>,
-                   { <BKSP>, "DHAL" } };
-        };
-        row {
-            top  = 16.5;
-            keys { { <TAB>, "ALPL" },
-                   <AD01>, <AD02>, <AD03>, <AD04>, <AD05> };
-        };
-        row {
-            top  = 33;
-            keys { { <LFSH>, "DHAL" },
-                   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
-                   { <TAB>,  "DHAL" } };
-        };
-        row {
-            top  = 49.5;
-            left = 24.5;
-            keys { <AB01>, <AB02>, <AB03>, <AB04>, <AB05> };
-        };
-        row {
-            top  = 0;
-            left = 150;
-            keys { { <BKSP>, "DHAL" },
-                   <AE06>, <AE07>, <AE08> };
-            key.color = "grey20";
-            keys { <AE09>, <AE10>, <AE11>, { <AE12>, "ALPL" } };
-        };
-        row {
-            top  = 16.5;
-            left = 174.5;
-            keys { <AD06>, <AD07>, <AD08> };
-            key.color = "grey20";
-            keys { <AD09>, <AD10>, <AD11>, { <AD12>, "ALPL" } };
-        };
-        row {
-            top  = 33;
-            left = 150;
-            keys { { <RTRN>, "DHAL" },
-                   <AC06>, <AC07>, <AC08> };
-            key.color = "grey20";
-            keys { <AC09>, <AC10>, <AC11>, { <RTSH>, "DHAL" } };
-        };
-        row {
-            top  = 49.5;
-            left = 174.5;
-            keys { <AB06>, <AB07>, <AB08> };
-            key.color = "grey20";
-            keys { <AB09>, <AB10>, <BKSL> };
-        };
-    };
-
-    // Control keys rows
-    section "Control" {
-        left = 4;
-        top  = 102.5;
-        key.gap = 0.5;
-        key.color = "grey10";
-        key.shape = "ALPL";
-        row {
-            top  = 0;
-            keys { <LCTL>, <LALT>, <CAPS> };
-            keys { { <SPCE>, "SPCE"} };
-        };
-        row {
-            top  = 16.5;
-            keys { <I120>, <LWIN>, <MENU> };
-        };
-        row {
-            top  = 0;
-            left = 150;
-            key.shape = "NORM";
-            keys { { <SPCE>, "SPCE"}, <RALT> };
-            key.color = "grey20";
-            keys { <RCTL>, <UP>, <I162>, { <KPEN>, "DHAL" } };
-        };
-        row {
-            top  = 16.5;
-            left = 207.5;
-            key.shape = "NORM";
-            key.color = "grey20";
-            keys { { <LEFT>, "DBLA" }, <DOWN>, <RGHT> };
-        };
-    };
-
-    // Diods
-    indicator.top      = 12;
-    indicator.onColor  = "green";
-    indicator.offColor = "grey10";
-    indicator.shape    = "LED";
-    indicator "Num Lock"   { left = 252; };
-    indicator "Caps Lock"  { left = 266; };
-    indicator "Misc"       { left = 280; };
-    text.top= 5;
-    text.color= "black";
-    text "NumLockLabel"		{ left= 252; text="1"; };
-    text "CapsLockLabel"	{ left= 266; text="A"; };
-    text "MiscLabel"    	{ left= 280; text="D"; };
-
-    text "Logo" { left = 29; top = 10; text="TypeMatrix™"; };
-
-    // other decorations : drawings
-    solid "rainure1"  { shape = "DECO"; top = 1; left = 110; color = "grey10";};
-    solid "rainure2"  { shape = "DECO"; top = 1; left = 115; color = "grey10";};
-    solid "rainure3"  { shape = "DECO"; top = 1; left = 120; color = "grey10";};
-    solid "rainure4"  { shape = "DECO"; top = 1; left = 125; color = "grey10";};
-    solid "rainure5"  { shape = "DECO"; top = 1; left = 130; color = "grey10";};
-    solid "rainure6"  { shape = "DECO"; top = 1; left = 135; color = "grey10";};
-    solid "rainure7"  { shape = "DECO"; top = 1; left = 140; color = "grey10";};
-    solid "rainure8"  { shape = "DECO"; top = 1; left = 145; color = "grey10";};
-    solid "rainure9"  { shape = "DECO"; top = 1; left = 150; color = "grey10";};
-    solid "rainure10" { shape = "DECO"; top = 1; left = 155; color = "grey10";};
-    solid "rainure11" { shape = "DECO"; top = 1; left = 160; color = "grey10";};
-    solid "rainure12" { shape = "DECO"; top = 1; left = 165; color = "grey10";};
-    solid "rainure13" { shape = "DECO"; top = 1; left = 170; color = "grey10";};
-}; // geometry tm2020
-
-
-xkb_geometry "tm2030_shape" {
-    // Keyboard total size
-    width  = 320;
-    height = 130;
-    // background / foreground colours :
-    baseColor  = "white";
-    labelColor = "black";
-
-    // Key shapes : base key = 20 mm each side
-    shape "NORM" { cornerRadius=1, { [18,   18] }, { [1.5, 1.5], [16.5, 14] } };
-    shape "FUNC" { cornerRadius=1, { [18,   12] }, { [2.5,   0], [15.5, 10] } };
-    shape "LFSH" { cornerRadius=1, { [18, 36.5] }, { [2.5,   0], [15.5, 30] } };
-    shape "ALT1" { cornerRadius=1, { [27.5, 18] }, { [2.5,   0], [23.5, 14] } };
-    shape "BKSP" { cornerRadius=1, { [18, 30.5] }, { [1.5, 1.5], [16.5, 29] } };
-    shape "SPCE" { cornerRadius=1, { [92,   25] }, { [1.5, 1.5], [90.5, 22] } };
-    shape "LED"  { cornerRadius=2, { [4,     4] } };
-    shape "PAN1" { cornerRadius=1, { [27, 126.5] } };
-    shape "PAN2" { cornerRadius=1, { [92,   13] } };
-
-    // other decorations : panels
-    solid "panneau1" {
-        shape = "PAN1";
-        left  = 0;
-        top   = 0;
-        color = "grey40";
-    };
-    solid "panneau2" {
-        shape = "PAN2";
-        left = 101.5;
-        top = 113.5;
-        color = "grey40";
-    };
-
-    // Diods (Indicators) : they have to be put after panels, either the panels
-    // overwrites them.
-    indicator.left     = 6;
-    indicator.onColor  = "green";
-    indicator.offColor = "grey10";
-    indicator.shape    = "LED";
-
-    indicator "Num Lock"     { top = 11  ; };
-    indicator "Caps Lock"    { top = 27.5; };
-    indicator "Scroll Lock"  { top = 44  ; };
-
-    text.left          = 12;
-    text.color         = "black";
-    text "NumLockLabel"		{ top = 11;   text="num";           };
-    text "CapsLockLabel"	{ top = 27.5; text="caps";          };
-    text "SrollLockLabel"	{ top = 44;   text="scroll";        };
-}; // geometry tm2030_shape
-
-xkb_geometry "tm2030_MiscDiod_dvk" {
-    text "ModeLabel" { left = 12; top = 58; color = "black";  text="Dvorak"; };
-}; // geometry tm2030_MiscDiod_dvk
-
-xkb_geometry "tm2030_MiscDiod_102" {
-    text "ModeLabel" { left = 12; top = 58; color = "black";  text="102"; };
-}; // geometry tm2030_MiscDiod_102
-
-xkb_geometry "tm2030_MiscDiod_106" {
-    text "ModeLabel" { left = 12; top = 58; color = "black";  text="106"; };
-}; // geometry tm2030_MiscDiod_106
-
-xkb_geometry "tm2030_MiscDiod_off" {
-    indicator "Misc" { left = 6; top = 60.5; shape = "LED";
-                       offColor = "grey10"; onColor = "grey10"; };
-}; // geometry tm2030_MiscDiod_off
-
-xkb_geometry "tm2030_MiscDiod_on" {
-    indicator "Misc" { left = 6; top = 60.5; shape = "LED";
-                       offColor = "green"; onColor = "green"; };
-}; // geometry tm2030_MiscDiod_on
-
-
-xkb_geometry "tm2030USB_func" {
-    // Function keys rows
-    section "Function" {
-        left      = 27;
-        top       = 1.5;
-        key.gap   = 0.5;
-        key.color = "grey30";
-        key.shape = "FUNC";
-        row {
-            keys { <ESC>,  <FK01>, <FK02>, <FK03>, <FK04>, <FK05> };
-        };
-        row {
-            left = 129.5;
-            keys { <FK06>, <FK07>, <FK08>, <FK09>, <FK10>, <FK11>,
-                   <FK12>, <NMLK> };
-        };
-    };
-}; // geometry tm2030USB_func
-
-
-xkb_geometry "tm2030USB_alpha" {
-    // Alpha-numeric keys rows
-    section "Alpha" {
-        left = 27;
-        top  = 14;
-        key.gap = 0.5;
-        key.color = "grey10";
-        key.shape = "NORM";
-        row {
-            top  = 0;
-            keys { <TLDE>,             <AE01>, <AE02>, <AE03>, <AE04>, <AE05> };
-        };
-        row {
-            top  = 18.5;
-            keys { <TAB>,              <AD01>, <AD02>, <AD03>, <AD04>, <AD05> };
-        };
-        row {
-            top  = 37;
-            keys { { <LFSH>, "LFSH" }, <AC01>, <AC02>, <AC03>, <AC04>, <AC05> };
-        };
-        row {
-            top  = 55.5;
-            left = 18.5;
-            keys {                     <AB01>, <AB02>, <AB03>, <AB04>, <AB05> };
-        };
-
-        row {
-            top  = 0;
-            left = 129.5;
-            keys { <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, <I148> };
-        };
-        row {
-            top  = 18.5;
-            left = 129.5;
-            keys { <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, <I163> };
-        };
-        row {
-            top  = 37;
-            left = 129.5;
-            keys { <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTSH>, "LFSH" }, <CAPS> };
-        };
-        row {
-            top  = 55.5;
-            left = 129.5;
-            keys { <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <BKSL> };
-        };
-        row {
-            top  = 55.5;
-            left = 259;
-            keys { <I158> };
-        };
-        row {
-            top  = 74;
-            left = 74;
-            keys { { <SPCE>, "SPCE" } };
-        };
-    };
-}; // geometry tm2030USB_alpha
-
-
-xkb_geometry "tm2030USB_ctrl" {
-    // Control keys rows
-    section "Control" {
-        left = 27;
-        top  = 0;
-        key.gap = 0.5;
-        key.color = "grey30";
-        key.shape = "NORM";
-        row {
-            top  = 88;
-            keys { <LCTL>, <I172>, <MENU>, <I162> };
-        };
-        row {
-            top = 106.5;
-            keys { <I120>, { <LWIN>, "ALT1" }, { <LALT>, "ALT1" } };
-        };
-        row {
-            top  = 88;
-            left = 166.5;
-            keys { <I243>, <HOME>, <UP>, <END>, { <RCTL>, "LFSH"}, <PGUP> };
-        };
-        row {
-            top = 106.5;
-            left = 166.5;
-            keys { <RALT>, <LEFT>, <DOWN>, <RGHT> };
-        };
-        row {
-            top = 106.5;
-            left = 259;
-            keys { <PGDN> };
-        };
-        row {
-            top  = 1;
-            left = 111.5;
-            vertical = true;
-            keys { <DELE>, { <BKSP>, "BKSP" }, { <RTRN>, "LFSH" } };
-        };
-    };
-}; // geometry tm2030USB_ctrl
-
-
-xkb_geometry "tm2030PS2" {
-    include "typematrix(tm2030_shape)"
-    include "typematrix(tm2030_MiscDiod_dvk)"
-    include "typematrix(tm2030_MiscDiod_off)"
-
-    description = "TypeMatrix EZ-Reach 2030 PS2";
-
-    // Function keys row
-    section "Function" {
-        left = 27;
-        top  = 1.5;
-        key.gap = 0.5;
-        key.color = "grey10";
-        key.shape = "FUNC";
-        row {
-            key.color = "grey30";
-            keys { <ESC> };
-        };
-        row {
-            left = 18.5;
-            keys { <FK01>, <FK02>, <FK03>, <FK04> };
-        };
-        row {
-            left = 92.5;
-            key.color = "grey30";
-            keys { <FK05> };
-        };
-        row {
-            left = 129.5;
-            key.color = "grey30";
-            keys { <FK06>, <FK07>, <FK08> };
-        };
-        row {
-            left = 185;
-            keys { <FK09>, <FK10>, <FK11>, <FK12> };
-        };
-        row {
-            left = 259;
-            key.color = "grey30";
-            keys { <NMLK> };
-        };
-    };
-
-    // Alpha-numeric keys rows
-    section "Alpha" {
-        left = 27;
-        top  = 14;
-        key.gap = 0.5;
-        key.color = "grey10";
-        key.shape = "NORM";
-        row {
-            top  = 0;
-            keys { <TLDE>,             <AE01>, <AE02>, <AE03>, <AE04>, <AE05> };
-        };
-        row {
-            top  = 18.5;
-            keys { <TAB>,              <AD01>, <AD02>, <AD03>, <AD04>, <AD05> };
-        };
-        row {
-            top  = 37;
-            keys { { <LFSH>, "LFSH" }, <AC01>, <AC02>, <AC03>, <AC04>, <AC05> };
-        };
-        row {
-            top  = 55.5;
-            left = 18.5;
-            keys {                     <AB01>, <AB02>, <AB03>, <AB04>, <AB05> };
-        };
-
-        row {
-            top  = 0;
-            left = 129.5;
-            keys { <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, <I120> };
-        };
-        row {
-            top  = 18.5;
-            left = 129.5;
-            keys { <AD06>, <AD07>, <AD08> };
-        };
-        row {
-            top  = 18.5;
-            left = 185;
-            key.color = "grey30";
-            keys { <AD09>, <AD10>, <AD11>, <AD12>};
-        };
-        row {
-            top  = 18.5;
-            left = 259;
-            keys { <BKSP> };
-        };
-        row {
-            top  = 37;
-            left = 129.5;
-            keys { <AC06>, <AC07>, <AC08> };
-        };
-        row {
-            top  = 37;
-            left = 185;
-            key.color = "grey30";
-            keys { <AC09>, <AC10>, <AC11>, { <RTSH>, "LFSH" },
-                   {<DELE>, key.color="red"} };
-        };
-        row {
-            top  = 55.5;
-            left = 129.5;
-            keys { <AB06>, <AB07>, <AB08> };
-        };
-        row {
-            top  = 55.5;
-            left = 185;
-            key.color = "grey30";
-            keys { <AB09>, <AB10>, <BKSL> };
-        };
-        row {
-            top  = 55.5;
-            left = 259;
-            keys { <INS> };
-        };
-        row {
-            top  = 74;
-            left = 74;
-            keys { { <SPCE>, "SPCE" } };
-        };
-    }; // end section "Alpha"
-
-    // Control keys rows
-    section "Control" {
-        left = 27;
-        top  = 0;
-        key.gap = 0.5;
-        key.color = "grey10";
-        key.shape = "NORM";
-        row {
-            top  = 88;
-            keys { <I120>, <LWIN>, <MENU>, <I162> };
-        };
-        row {
-            top = 106.5;
-            keys { <LCTL>, { <LALT>, "ALT1" }, { <LTSH>, "ALT1" } };
-        };
-        row {
-            top  = 88;
-            left = 166.5;
-            keys { <PGUP> };
-        };
-        row {
-            top  = 88;
-            left = 185;
-            key.color = "grey30";
-            keys { <HOME>, <UP>, <END>, { <KPEN>, "LFSH"} };
-        };
-        row {
-            top  = 88;
-            left = 259;
-            keys { <RCTL> };
-        };
-        row {
-            top = 106.5;
-            left = 166.5;
-            keys { <PGDN> };
-        };
-        row {
-            top = 106.5;
-            left = 185;
-            key.color = "grey30";
-            keys { <LEFT>, <DOWN>, <RGHT> };
-        };
-        row {
-            top = 106.5;
-            left = 259;
-            keys { <RALT> };
-        };
-        row {
-            top  = 1;
-            left = 111.5;
-            key.color = "grey10";
-            vertical = true;
-            keys { <CAPS>, { <BKSP>, "BKSP" }, { <RTRN>, "LFSH" } };
-        };
-    }; // end section "Control"
-}; // geometry tm2030PS2
-
-
-xkb_geometry "tm2030USB" {
-    include "typematrix(tm2030_shape)"
-    include "typematrix(tm2030_MiscDiod_102)"
-    include "typematrix(tm2030_MiscDiod_off)"
-
-    description = "TypeMatrix EZ-Reach 2030 USB";
-
-    include "typematrix(tm2030USB_func)"
-    include "typematrix(tm2030USB_alpha)"
-    include "typematrix(tm2030USB_ctrl)"
-}; // geometry tm2030USB
-
-
-// European 102/105 keys mode :
-// Same as the standard keyboard, except for one key, Play becomes LSGT
-xkb_geometry "tm2030USB-102" {
-    include "typematrix(tm2030_shape)"
-    include "typematrix(tm2030_MiscDiod_102)"
-    include "typematrix(tm2030_MiscDiod_on)"
-
-    description = "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)";
-
-    include "typematrix(tm2030USB_func)"
-    include "typematrix(tm2030USB_alpha)"
-
-    // Control keys rows
-    section "Control" {
-        left = 27;
-        top  = 0;
-        key.gap = 0.5;
-        key.color = "grey30";
-        key.shape = "NORM";
-        row {
-            top  = 88;
-            keys { <LCTL>, <LSGT>, <MENU>, <I162> };
-        };
-        row {
-            top = 106.5;
-            keys { <I120>, { <LWIN>, "ALT1" }, { <LALT>, "ALT1" } };
-        };
-        row {
-            top  = 88;
-            left = 166.5;
-            keys { <I243>, <HOME>, <UP>, <END>, { <RCTL>, "LFSH"}, <PGUP> };
-        };
-        row {
-            top = 106.5;
-            left = 166.5;
-            keys { <RALT>, <LEFT>, <DOWN>, <RGHT> };
-        };
-        row {
-            top = 106.5;
-            left = 259;
-            keys { <PGDN> };
-        };
-        row {
-            top  = 1;
-            left = 111.5;
-            vertical = true;
-            keys { <DELE>, { <BKSP>, "BKSP" }, { <RTRN>, "LFSH" } };
-        };
-    };
-}; // geometry tm2030USB-102
-
-
-// Japan / Korean 106 keys mode :
-// Same as the standard keyboard, except for following keys :
-// – <TLDE> is replaced by <HZTG>
-// – WWW key becomes <HKTG>
-// — Calc key becomes <AE13>
-// — Mail key becomes <BKSL>, and <BKSL> key becomes <AB11>
-
-// about Controls:
-// NFER/MEHU and XFER/KANJ : TMx keeps LWIN (and RWIN if it happend to exist)
-// HKTG/HIRA : TMx keeps MENU/COMP, but locates this key in alpha section
-// (see upper).
-
-xkb_geometry "tm2030USB-106" {
-    include "typematrix(tm2030_shape)"
-    include "typematrix(tm2030_MiscDiod_106)"
-    include "typematrix(tm2030_MiscDiod_on)"
-
-    description = "TypeMatrix EZ-Reach 2030 USB (106:JP mode)";
-
-    include "typematrix(tm2030USB_func)"
-
-    // Alpha-numeric keys rows
-    section "Alpha" {
-        left = 27;
-        top  = 14;
-        key.gap = 0.5;
-        key.color = "grey10";
-        key.shape = "NORM";
-        row {
-            top  = 0;
-            keys { <HZTG>,             <AE01>, <AE02>, <AE03>, <AE04>, <AE05> };
-        };
-        row {
-            top  = 18.5;
-            keys { <TAB>,              <AD01>, <AD02>, <AD03>, <AD04>, <AD05> };
-        };
-        row {
-            top  = 37;
-            keys { { <LFSH>, "LFSH" }, <AC01>, <AC02>, <AC03>, <AC04>, <AC05> };
-        };
-        row {
-            top  = 55.5;
-            left = 18.5;
-            keys {                     <AB01>, <AB02>, <AB03>, <AB04>, <AB05> };
-        };
-
-        row {
-            top  = 0;
-            left = 129.5;
-            keys { <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, <AE13> };
-        };
-        row {
-            top  = 18.5;
-            left = 129.5;
-            keys { <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, <BKSL> };
-        };
-        row {
-            top  = 37;
-            left = 129.5;
-            keys { <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTSH>, "LFSH" }, <CAPS> };
-        };
-        row {
-            top  = 55.5;
-            left = 129.5;
-            keys { <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <AB11> };
-        };
-        row {
-            top  = 55.5;
-            left = 259;
-            keys { <HKTG> };
-        };
-        row {
-            top  = 74;
-            left = 74;
-            keys { { <SPCE>, "SPCE" } };
-        };
-    };
-
-    // Control keys rows
-    section "Control" {
-        left = 27;
-        top  = 0;
-        key.gap = 0.5;
-        key.color = "grey30";
-        key.shape = "NORM";
-        row {
-            top  = 88;
-            keys { <LCTL>, <I172>, <MENU>, <I162> };
-        };
-        row {
-            top = 106.5;
-            keys { <I120>, { <LWIN>, "ALT1" }, { <LALT>, "ALT1" } };
-        };
-        row {
-            top  = 88;
-            left = 166.5;
-            keys { <I243>, <HOME>, <UP>, <END>, { <RCTL>, "LFSH"}, <PGUP> };
-        };
-        row {
-            top = 106.5;
-            left = 166.5;
-            keys { <RALT>, <LEFT>, <DOWN>, <RGHT> };
-        };
-        row {
-            top = 106.5;
-            left = 259;
-            keys { <PGDN> };
-        };
-        row {
-            top  = 1;
-            left = 111.5;
-            vertical = true;
-            keys { <DELE>, { <BKSP>, "BKSP" }, { <RTRN>, "LFSH" } };
-        };
-    };
-}; // geometry tm2030USB-106
+// -*- indent-tabs-mode: nil -*-
+
+// Created by Frédéric Boiteux <fboiteux (at) free (dot) fr>
+// and Gildas Cotomale <gildas (dot) cotomale (at) gmail (dot) com>
+
+// Note : the special/multimedia keys (Calc, WWW, Desktop…) have a keycode
+// <I[XX]>, found in definition file /usr/share/X11/xkb/keycodes/evdev.
+// Fn           = <I120>;
+// Calc         = <I148>;
+// WWW          = <I158>;
+// CycleWindows = <I162>;
+// Mail         = <I163>;
+// PlayPause    = <I172>;
+// Desktop      = <I243>;
+
+
+xkb_geometry "tm2020" {
+    description = "TypeMatrix EZ-Reach 2020";
+
+    // Keyboard total size :
+    width  = 308;
+    height = 152;
+    // background / foreground colours :
+    baseColor  = "white";
+    labelColor = "black";
+
+    // Key shapes : base key = 16 mm each side
+    shape "NORM" { cornerRadius=1, { [16,    16]   }, { [1,   1], [15,   15] }};
+    shape "ALPL" { cornerRadius=1, { [24.25, 16]   }, { [1,   1], [23,   15] }};
+    shape "DHAL" { cornerRadius=1, { [24.25, 32.5] }, { [1,   1], [23, 31.5] }};
+    shape "FUNC" { cornerRadius=1, { [16,    12]   }, { [2.5, 0], [13.5, 10] }};
+    shape "FUNL" { cornerRadius=1, { [24.25, 12]   }, { [2.5, 0], [21.5, 10] }};
+    shape "SPCE" { cornerRadius=1, { [57,    26]   }, { [2.5, 1], [54.5, 24] }};
+    shape "DBLA" { cornerRadius=1, { [32.5,  16]   }, { [1,   1], [31,   15] }};
+    shape "LED"  { cornerRadius=2, { [4,      4]   }};
+    shape "DECO" { cornerRadius=1, { [3,     18]   }};
+
+    // Function keys row
+    section "Function" {
+        left = 4;
+        top  = 24;
+        key.gap = 0.5;
+        key.color = "grey10";
+        key.shape = "FUNC";
+        row {
+            keys { { <ESC>,  "FUNL" },
+                   <FK01>, <FK02>, <FK03>, <FK04>, <FK05> };
+            key.color = "grey20";
+            keys { { <NMLK>, "FUNL" } };
+        };
+        row {
+            left = 150;
+            key.color = "red";
+            keys { { <DELE>, "FUNL" } };
+            key.color = "grey10";
+            keys { <FK06>, <FK07>, <FK08>, <FK09>, <FK10>, <FK11>,
+                   { <FK12>, "FUNL" } };
+        };
+    };
+
+    // Alpha-numeric keys rows
+    section "Alpha" {
+        left = 4;
+        top  = 36.5;
+        key.gap = 0.5;
+        key.color = "grey10";
+        key.shape = "NORM";
+        row {
+            top  = 0;
+            keys { { <TLDE>, "ALPL" },
+                   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>,
+                   { <BKSP>, "DHAL" } };
+        };
+        row {
+            top  = 16.5;
+            keys { { <TAB>, "ALPL" },
+                   <AD01>, <AD02>, <AD03>, <AD04>, <AD05> };
+        };
+        row {
+            top  = 33;
+            keys { { <LFSH>, "DHAL" },
+                   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+                   { <TAB>,  "DHAL" } };
+        };
+        row {
+            top  = 49.5;
+            left = 24.5;
+            keys { <AB01>, <AB02>, <AB03>, <AB04>, <AB05> };
+        };
+        row {
+            top  = 0;
+            left = 150;
+            keys { { <BKSP>, "DHAL" },
+                   <AE06>, <AE07>, <AE08> };
+            key.color = "grey20";
+            keys { <AE09>, <AE10>, <AE11>, { <AE12>, "ALPL" } };
+        };
+        row {
+            top  = 16.5;
+            left = 174.5;
+            keys { <AD06>, <AD07>, <AD08> };
+            key.color = "grey20";
+            keys { <AD09>, <AD10>, <AD11>, { <AD12>, "ALPL" } };
+        };
+        row {
+            top  = 33;
+            left = 150;
+            keys { { <RTRN>, "DHAL" },
+                   <AC06>, <AC07>, <AC08> };
+            key.color = "grey20";
+            keys { <AC09>, <AC10>, <AC11>, { <RTSH>, "DHAL" } };
+        };
+        row {
+            top  = 49.5;
+            left = 174.5;
+            keys { <AB06>, <AB07>, <AB08> };
+            key.color = "grey20";
+            keys { <AB09>, <AB10>, <BKSL> };
+        };
+    };
+
+    // Control keys rows
+    section "Control" {
+        left = 4;
+        top  = 102.5;
+        key.gap = 0.5;
+        key.color = "grey10";
+        key.shape = "ALPL";
+        row {
+            top  = 0;
+            keys { <LCTL>, <LALT>, <CAPS> };
+            keys { { <SPCE>, "SPCE"} };
+        };
+        row {
+            top  = 16.5;
+            keys { <I120>, <LWIN>, <MENU> };
+        };
+        row {
+            top  = 0;
+            left = 150;
+            key.shape = "NORM";
+            keys { { <SPCE>, "SPCE"}, <RALT> };
+            key.color = "grey20";
+            keys { <RCTL>, <UP>, <I162>, { <KPEN>, "DHAL" } };
+        };
+        row {
+            top  = 16.5;
+            left = 207.5;
+            key.shape = "NORM";
+            key.color = "grey20";
+            keys { { <LEFT>, "DBLA" }, <DOWN>, <RGHT> };
+        };
+    };
+
+    // Diods
+    indicator.top      = 12;
+    indicator.onColor  = "green";
+    indicator.offColor = "grey10";
+    indicator.shape    = "LED";
+    indicator "Num Lock"   { left = 252; };
+    indicator "Caps Lock"  { left = 266; };
+    indicator "Misc"       { left = 280; };
+    text.top= 5;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 252; text="1"; };
+    text "CapsLockLabel"	{ left= 266; text="A"; };
+    text "MiscLabel"    	{ left= 280; text="D"; };
+
+    text "Logo" { left = 29; top = 10; text="TypeMatrix™"; };
+
+    // other decorations : drawings
+    solid "rainure1"  { shape = "DECO"; top = 1; left = 110; color = "grey10";};
+    solid "rainure2"  { shape = "DECO"; top = 1; left = 115; color = "grey10";};
+    solid "rainure3"  { shape = "DECO"; top = 1; left = 120; color = "grey10";};
+    solid "rainure4"  { shape = "DECO"; top = 1; left = 125; color = "grey10";};
+    solid "rainure5"  { shape = "DECO"; top = 1; left = 130; color = "grey10";};
+    solid "rainure6"  { shape = "DECO"; top = 1; left = 135; color = "grey10";};
+    solid "rainure7"  { shape = "DECO"; top = 1; left = 140; color = "grey10";};
+    solid "rainure8"  { shape = "DECO"; top = 1; left = 145; color = "grey10";};
+    solid "rainure9"  { shape = "DECO"; top = 1; left = 150; color = "grey10";};
+    solid "rainure10" { shape = "DECO"; top = 1; left = 155; color = "grey10";};
+    solid "rainure11" { shape = "DECO"; top = 1; left = 160; color = "grey10";};
+    solid "rainure12" { shape = "DECO"; top = 1; left = 165; color = "grey10";};
+    solid "rainure13" { shape = "DECO"; top = 1; left = 170; color = "grey10";};
+}; // geometry tm2020
+
+
+xkb_geometry "tm2030_shape" {
+    // Keyboard total size
+    width  = 320;
+    height = 130;
+    // background / foreground colours :
+    baseColor  = "white";
+    labelColor = "black";
+
+    // Key shapes : base key = 20 mm each side
+    shape "NORM" { cornerRadius=1, { [18,   18] }, { [1.5, 1.5], [16.5, 14] } };
+    shape "FUNC" { cornerRadius=1, { [18,   12] }, { [2.5,   0], [15.5, 10] } };
+    shape "LFSH" { cornerRadius=1, { [18, 36.5] }, { [2.5,   0], [15.5, 30] } };
+    shape "ALT1" { cornerRadius=1, { [27.5, 18] }, { [2.5,   0], [23.5, 14] } };
+    shape "BKSP" { cornerRadius=1, { [18, 30.5] }, { [1.5, 1.5], [16.5, 29] } };
+    shape "SPCE" { cornerRadius=1, { [92,   25] }, { [1.5, 1.5], [90.5, 22] } };
+    shape "LED"  { cornerRadius=2, { [4,     4] } };
+    shape "PAN1" { cornerRadius=1, { [27, 126.5] } };
+    shape "PAN2" { cornerRadius=1, { [92,   13] } };
+
+    // other decorations : panels
+    solid "panneau1" {
+        shape = "PAN1";
+        left  = 0;
+        top   = 0;
+        color = "grey40";
+    };
+    solid "panneau2" {
+        shape = "PAN2";
+        left = 101.5;
+        top = 113.5;
+        color = "grey40";
+    };
+
+    // Diods (Indicators) : they have to be put after panels, either the panels
+    // overwrites them.
+    indicator.left     = 6;
+    indicator.onColor  = "green";
+    indicator.offColor = "grey10";
+    indicator.shape    = "LED";
+
+    indicator "Num Lock"     { top = 11  ; };
+    indicator "Caps Lock"    { top = 27.5; };
+    indicator "Scroll Lock"  { top = 44  ; };
+
+    text.left          = 12;
+    text.color         = "black";
+    text "NumLockLabel"		{ top = 11;   text="num";           };
+    text "CapsLockLabel"	{ top = 27.5; text="caps";          };
+    text "SrollLockLabel"	{ top = 44;   text="scroll";        };
+}; // geometry tm2030_shape
+
+xkb_geometry "tm2030_MiscDiod_dvk" {
+    text "ModeLabel" { left = 12; top = 58; color = "black";  text="Dvorak"; };
+}; // geometry tm2030_MiscDiod_dvk
+
+xkb_geometry "tm2030_MiscDiod_102" {
+    text "ModeLabel" { left = 12; top = 58; color = "black";  text="102"; };
+}; // geometry tm2030_MiscDiod_102
+
+xkb_geometry "tm2030_MiscDiod_106" {
+    text "ModeLabel" { left = 12; top = 58; color = "black";  text="106"; };
+}; // geometry tm2030_MiscDiod_106
+
+xkb_geometry "tm2030_MiscDiod_off" {
+    indicator "Misc" { left = 6; top = 60.5; shape = "LED";
+                       offColor = "grey10"; onColor = "grey10"; };
+}; // geometry tm2030_MiscDiod_off
+
+xkb_geometry "tm2030_MiscDiod_on" {
+    indicator "Misc" { left = 6; top = 60.5; shape = "LED";
+                       offColor = "green"; onColor = "green"; };
+}; // geometry tm2030_MiscDiod_on
+
+
+xkb_geometry "tm2030USB_func" {
+    // Function keys rows
+    section "Function" {
+        left      = 27;
+        top       = 1.5;
+        key.gap   = 0.5;
+        key.color = "grey30";
+        key.shape = "FUNC";
+        row {
+            keys { <ESC>,  <FK01>, <FK02>, <FK03>, <FK04>, <FK05> };
+        };
+        row {
+            left = 129.5;
+            keys { <FK06>, <FK07>, <FK08>, <FK09>, <FK10>, <FK11>,
+                   <FK12>, <NMLK> };
+        };
+    };
+}; // geometry tm2030USB_func
+
+
+xkb_geometry "tm2030USB_alpha" {
+    // Alpha-numeric keys rows
+    section "Alpha" {
+        left = 27;
+        top  = 14;
+        key.gap = 0.5;
+        key.color = "grey10";
+        key.shape = "NORM";
+        row {
+            top  = 0;
+            keys { <TLDE>,             <AE01>, <AE02>, <AE03>, <AE04>, <AE05> };
+        };
+        row {
+            top  = 18.5;
+            keys { <TAB>,              <AD01>, <AD02>, <AD03>, <AD04>, <AD05> };
+        };
+        row {
+            top  = 37;
+            keys { { <LFSH>, "LFSH" }, <AC01>, <AC02>, <AC03>, <AC04>, <AC05> };
+        };
+        row {
+            top  = 55.5;
+            left = 18.5;
+            keys {                     <AB01>, <AB02>, <AB03>, <AB04>, <AB05> };
+        };
+
+        row {
+            top  = 0;
+            left = 129.5;
+            keys { <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, <I148> };
+        };
+        row {
+            top  = 18.5;
+            left = 129.5;
+            keys { <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, <I163> };
+        };
+        row {
+            top  = 37;
+            left = 129.5;
+            keys { <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTSH>, "LFSH" }, <CAPS> };
+        };
+        row {
+            top  = 55.5;
+            left = 129.5;
+            keys { <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <BKSL> };
+        };
+        row {
+            top  = 55.5;
+            left = 259;
+            keys { <I158> };
+        };
+        row {
+            top  = 74;
+            left = 74;
+            keys { { <SPCE>, "SPCE" } };
+        };
+    };
+}; // geometry tm2030USB_alpha
+
+
+xkb_geometry "tm2030USB_ctrl" {
+    // Control keys rows
+    section "Control" {
+        left = 27;
+        top  = 0;
+        key.gap = 0.5;
+        key.color = "grey30";
+        key.shape = "NORM";
+        row {
+            top  = 88;
+            keys { <LCTL>, <I172>, <MENU>, <I162> };
+        };
+        row {
+            top = 106.5;
+            keys { <I120>, { <LWIN>, "ALT1" }, { <LALT>, "ALT1" } };
+        };
+        row {
+            top  = 88;
+            left = 166.5;
+            keys { <I243>, <HOME>, <UP>, <END>, { <RCTL>, "LFSH"}, <PGUP> };
+        };
+        row {
+            top = 106.5;
+            left = 166.5;
+            keys { <RALT>, <LEFT>, <DOWN>, <RGHT> };
+        };
+        row {
+            top = 106.5;
+            left = 259;
+            keys { <PGDN> };
+        };
+        row {
+            top  = 1;
+            left = 111.5;
+            vertical = true;
+            keys { <DELE>, { <BKSP>, "BKSP" }, { <RTRN>, "LFSH" } };
+        };
+    };
+}; // geometry tm2030USB_ctrl
+
+
+xkb_geometry "tm2030PS2" {
+    include "typematrix(tm2030_shape)"
+    include "typematrix(tm2030_MiscDiod_dvk)"
+    include "typematrix(tm2030_MiscDiod_off)"
+
+    description = "TypeMatrix EZ-Reach 2030 PS2";
+
+    // Function keys row
+    section "Function" {
+        left = 27;
+        top  = 1.5;
+        key.gap = 0.5;
+        key.color = "grey10";
+        key.shape = "FUNC";
+        row {
+            key.color = "grey30";
+            keys { <ESC> };
+        };
+        row {
+            left = 18.5;
+            keys { <FK01>, <FK02>, <FK03>, <FK04> };
+        };
+        row {
+            left = 92.5;
+            key.color = "grey30";
+            keys { <FK05> };
+        };
+        row {
+            left = 129.5;
+            key.color = "grey30";
+            keys { <FK06>, <FK07>, <FK08> };
+        };
+        row {
+            left = 185;
+            keys { <FK09>, <FK10>, <FK11>, <FK12> };
+        };
+        row {
+            left = 259;
+            key.color = "grey30";
+            keys { <NMLK> };
+        };
+    };
+
+    // Alpha-numeric keys rows
+    section "Alpha" {
+        left = 27;
+        top  = 14;
+        key.gap = 0.5;
+        key.color = "grey10";
+        key.shape = "NORM";
+        row {
+            top  = 0;
+            keys { <TLDE>,             <AE01>, <AE02>, <AE03>, <AE04>, <AE05> };
+        };
+        row {
+            top  = 18.5;
+            keys { <TAB>,              <AD01>, <AD02>, <AD03>, <AD04>, <AD05> };
+        };
+        row {
+            top  = 37;
+            keys { { <LFSH>, "LFSH" }, <AC01>, <AC02>, <AC03>, <AC04>, <AC05> };
+        };
+        row {
+            top  = 55.5;
+            left = 18.5;
+            keys {                     <AB01>, <AB02>, <AB03>, <AB04>, <AB05> };
+        };
+
+        row {
+            top  = 0;
+            left = 129.5;
+            keys { <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, <I120> };
+        };
+        row {
+            top  = 18.5;
+            left = 129.5;
+            keys { <AD06>, <AD07>, <AD08> };
+        };
+        row {
+            top  = 18.5;
+            left = 185;
+            key.color = "grey30";
+            keys { <AD09>, <AD10>, <AD11>, <AD12>};
+        };
+        row {
+            top  = 18.5;
+            left = 259;
+            keys { <BKSP> };
+        };
+        row {
+            top  = 37;
+            left = 129.5;
+            keys { <AC06>, <AC07>, <AC08> };
+        };
+        row {
+            top  = 37;
+            left = 185;
+            key.color = "grey30";
+            keys { <AC09>, <AC10>, <AC11>, { <RTSH>, "LFSH" },
+                   {<DELE>, key.color="red"} };
+        };
+        row {
+            top  = 55.5;
+            left = 129.5;
+            keys { <AB06>, <AB07>, <AB08> };
+        };
+        row {
+            top  = 55.5;
+            left = 185;
+            key.color = "grey30";
+            keys { <AB09>, <AB10>, <BKSL> };
+        };
+        row {
+            top  = 55.5;
+            left = 259;
+            keys { <INS> };
+        };
+        row {
+            top  = 74;
+            left = 74;
+            keys { { <SPCE>, "SPCE" } };
+        };
+    }; // end section "Alpha"
+
+    // Control keys rows
+    section "Control" {
+        left = 27;
+        top  = 0;
+        key.gap = 0.5;
+        key.color = "grey10";
+        key.shape = "NORM";
+        row {
+            top  = 88;
+            keys { <I120>, <LWIN>, <MENU>, <I162> };
+        };
+        row {
+            top = 106.5;
+            keys { <LCTL>, { <LALT>, "ALT1" }, { <LTSH>, "ALT1" } };
+        };
+        row {
+            top  = 88;
+            left = 166.5;
+            keys { <PGUP> };
+        };
+        row {
+            top  = 88;
+            left = 185;
+            key.color = "grey30";
+            keys { <HOME>, <UP>, <END>, { <KPEN>, "LFSH"} };
+        };
+        row {
+            top  = 88;
+            left = 259;
+            keys { <RCTL> };
+        };
+        row {
+            top = 106.5;
+            left = 166.5;
+            keys { <PGDN> };
+        };
+        row {
+            top = 106.5;
+            left = 185;
+            key.color = "grey30";
+            keys { <LEFT>, <DOWN>, <RGHT> };
+        };
+        row {
+            top = 106.5;
+            left = 259;
+            keys { <RALT> };
+        };
+        row {
+            top  = 1;
+            left = 111.5;
+            key.color = "grey10";
+            vertical = true;
+            keys { <CAPS>, { <BKSP>, "BKSP" }, { <RTRN>, "LFSH" } };
+        };
+    }; // end section "Control"
+}; // geometry tm2030PS2
+
+
+xkb_geometry "tm2030USB" {
+    include "typematrix(tm2030_shape)"
+    include "typematrix(tm2030_MiscDiod_102)"
+    include "typematrix(tm2030_MiscDiod_off)"
+
+    description = "TypeMatrix EZ-Reach 2030 USB";
+
+    include "typematrix(tm2030USB_func)"
+    include "typematrix(tm2030USB_alpha)"
+    include "typematrix(tm2030USB_ctrl)"
+}; // geometry tm2030USB
+
+
+// European 102/105 keys mode :
+// Same as the standard keyboard, except for one key, Play becomes LSGT
+xkb_geometry "tm2030USB-102" {
+    include "typematrix(tm2030_shape)"
+    include "typematrix(tm2030_MiscDiod_102)"
+    include "typematrix(tm2030_MiscDiod_on)"
+
+    description = "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)";
+
+    include "typematrix(tm2030USB_func)"
+    include "typematrix(tm2030USB_alpha)"
+
+    // Control keys rows
+    section "Control" {
+        left = 27;
+        top  = 0;
+        key.gap = 0.5;
+        key.color = "grey30";
+        key.shape = "NORM";
+        row {
+            top  = 88;
+            keys { <LCTL>, <LSGT>, <MENU>, <I162> };
+        };
+        row {
+            top = 106.5;
+            keys { <I120>, { <LWIN>, "ALT1" }, { <LALT>, "ALT1" } };
+        };
+        row {
+            top  = 88;
+            left = 166.5;
+            keys { <I243>, <HOME>, <UP>, <END>, { <RCTL>, "LFSH"}, <PGUP> };
+        };
+        row {
+            top = 106.5;
+            left = 166.5;
+            keys { <RALT>, <LEFT>, <DOWN>, <RGHT> };
+        };
+        row {
+            top = 106.5;
+            left = 259;
+            keys { <PGDN> };
+        };
+        row {
+            top  = 1;
+            left = 111.5;
+            vertical = true;
+            keys { <DELE>, { <BKSP>, "BKSP" }, { <RTRN>, "LFSH" } };
+        };
+    };
+}; // geometry tm2030USB-102
+
+
+// Japan / Korean 106 keys mode :
+// Same as the standard keyboard, except for following keys :
+// – <TLDE> is replaced by <HZTG>
+// – WWW key becomes <HKTG>
+// — Calc key becomes <AE13>
+// — Mail key becomes <BKSL>, and <BKSL> key becomes <AB11>
+
+// about Controls:
+// NFER/MEHU and XFER/KANJ : TMx keeps LWIN (and RWIN if it happend to exist)
+// HKTG/HIRA : TMx keeps MENU/COMP, but locates this key in alpha section
+// (see upper).
+
+xkb_geometry "tm2030USB-106" {
+    include "typematrix(tm2030_shape)"
+    include "typematrix(tm2030_MiscDiod_106)"
+    include "typematrix(tm2030_MiscDiod_on)"
+
+    description = "TypeMatrix EZ-Reach 2030 USB (106:JP mode)";
+
+    include "typematrix(tm2030USB_func)"
+
+    // Alpha-numeric keys rows
+    section "Alpha" {
+        left = 27;
+        top  = 14;
+        key.gap = 0.5;
+        key.color = "grey10";
+        key.shape = "NORM";
+        row {
+            top  = 0;
+            keys { <HZTG>,             <AE01>, <AE02>, <AE03>, <AE04>, <AE05> };
+        };
+        row {
+            top  = 18.5;
+            keys { <TAB>,              <AD01>, <AD02>, <AD03>, <AD04>, <AD05> };
+        };
+        row {
+            top  = 37;
+            keys { { <LFSH>, "LFSH" }, <AC01>, <AC02>, <AC03>, <AC04>, <AC05> };
+        };
+        row {
+            top  = 55.5;
+            left = 18.5;
+            keys {                     <AB01>, <AB02>, <AB03>, <AB04>, <AB05> };
+        };
+
+        row {
+            top  = 0;
+            left = 129.5;
+            keys { <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, <AE13> };
+        };
+        row {
+            top  = 18.5;
+            left = 129.5;
+            keys { <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, <BKSL> };
+        };
+        row {
+            top  = 37;
+            left = 129.5;
+            keys { <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTSH>, "LFSH" }, <CAPS> };
+        };
+        row {
+            top  = 55.5;
+            left = 129.5;
+            keys { <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <AB11> };
+        };
+        row {
+            top  = 55.5;
+            left = 259;
+            keys { <HKTG> };
+        };
+        row {
+            top  = 74;
+            left = 74;
+            keys { { <SPCE>, "SPCE" } };
+        };
+    };
+
+    // Control keys rows
+    section "Control" {
+        left = 27;
+        top  = 0;
+        key.gap = 0.5;
+        key.color = "grey30";
+        key.shape = "NORM";
+        row {
+            top  = 88;
+            keys { <LCTL>, <I172>, <MENU>, <I162> };
+        };
+        row {
+            top = 106.5;
+            keys { <I120>, { <LWIN>, "ALT1" }, { <LALT>, "ALT1" } };
+        };
+        row {
+            top  = 88;
+            left = 166.5;
+            keys { <I243>, <HOME>, <UP>, <END>, { <RCTL>, "LFSH"}, <PGUP> };
+        };
+        row {
+            top = 106.5;
+            left = 166.5;
+            keys { <RALT>, <LEFT>, <DOWN>, <RGHT> };
+        };
+        row {
+            top = 106.5;
+            left = 259;
+            keys { <PGDN> };
+        };
+        row {
+            top  = 1;
+            left = 111.5;
+            vertical = true;
+            keys { <DELE>, { <BKSP>, "BKSP" }, { <RTRN>, "LFSH" } };
+        };
+    };
+}; // geometry tm2030USB-106
diff --git a/xorg-server/xkeyboard-config/geometry/winbook b/xorg-server/xkeyboard-config/geometry/winbook
index 570deb358..842eefbff 100644
--- a/xorg-server/xkeyboard-config/geometry/winbook
+++ b/xorg-server/xkeyboard-config/geometry/winbook
@@ -1,143 +1,143 @@
-default xkb_geometry "XP5" {
-
-    description= "WinBook XP5";
-    width= 281;
-    height= 180;
-
-    shape.cornerRadius= 1;
-
-    shape "NORM" { 
-	{ [17,17] },
-	{ [ 2, 1], [ 15, 15 ] }
-    };
-    shape "FKEY" {
-	{ [ 15, 10 ] },
-	{ [  1,  0 ], [ 14, 9.5 ] }
-    };
-    shape "ONE" {
-	{ [ 28, 17 ] },
-	{ [ 11, 0 ], [ 28, 17 ] },
-	{ [ 13, 1 ], [ 26, 15 ] }
-    };
-    shape "WIDE" {	// backspace, caps lock, ctrl alt ?
-	{ [  24.5, 17 ] },
-	{ [   2,  1 ], [ 22.5, 15 ] }
-    };
-    shape "WIDR" { // backslash, left shift
-	{ [ 35, 17 ] },
-	{ [ 2, 1 ], [ 33, 15 ] }
-    };
-    shape "RTRN" {
-	{ [  45, 17 ] },
-	{ [  2,  1 ], [ 43, 15 ] }
-    };
-    shape "SPCE" {
-	{ [  90, 17 ] },
-	{ [  2,  1 ], [ 88, 15 ] }
-    };
-    shape "STIK" {
-	cornerRadius= 4,
-	{ [  8,  8 ] }
-    };
-    shape "BTN" {
-	{ [ 31, 6 ] }
-    };
-
-    section.left= 2;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  0.5;
-
-    key.color= "grey10";
-    labelColor= "white";
-    baseColor= "grey20";
-
-    section "Whole" {
-	top= 10;
-	row {
-	    top= 11; 
-	    key.shape= "FKEY";
-	    keys { 
-	    	<ESC>,  
-	    	<FK01>, <FK02>, <FK03>, <FK04>, <FK05>, <FK06>,
-		<FK07>, <FK08>, <FK09>, <FK10>, <FK11>, <FK12>,
-		<PAUS>, <HOME>, <END>, <PGUP>
-	    };
-	};
-	row {
-	    top= 22;
-	    keys { 
-	    	{ <AEO1>, "ONE" },
-		<AE02>, <AE03>, <AE04>, <AE05>, <AE06>,
-		<AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
-		{ <BKSP>, shape="WIDE" }, 
-		<PGDN>
-	    };
-	};
-	row {
-	    top= 40;
-	    keys { 
-	    	<TAB>, <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>,
-		<AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>,
-		{ <BKSL>, "WIDR" }
-	    };
-	};
-	row {
-	    top= 58;
-	    keys { { <CAPS>, shape="WIDE" },
-		<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
-		<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
-		<AC11>, 
-		{ <RTRN>, shape="RTRN" }
-	    };
-	};
-	row {
-	    top= 76;
-	    keys { 
-		{ <LFSH>, shape="WIDR" },
-		<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
-		<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
-		<RTSH>, <UP>, <NMLK> 
-	    };
-	};
-	row {
-	    top= 94;
-	    keys { 
-		{ <LCTL>, "WIDE" }, <FUNC>, { <LALT>, "WIDE" }, 
-		<TLDE>, { <SPCE>, shape="SPCE" }, <INS>, <DELE>, 
-		<LEFT>, <DOWN>, <RGHT>
-	    };
-	};
-	overlay "KPAD" {
-	    <AE07>=<KP7>,  <AE08>=<KP8>, <AE09>=<KP9>,  <AE10>=<KPMU>,
-	    <AD07>=<KP4>,  <AD08>=<KP5>, <AD09>=<KP6>,  <AD10>=<KPSU>,
-	    <AC07>=<KP1>,  <AC08>=<KP2>, <AC09>=<KP3>,  <AC10>=<KPAD>,
-	    <AB07>=<KP0>,                <AB09>=<KPDL>, <AB10>=<KPSL>
-	};
-    }; // End of "Whole" section
-
-    solid "STIK" {
-	color= "red";
-	shape= "STIK";
-	top= 81;
-	left= 112;
-    };
-
-    solid "BTN1" {
-    	color= "red";
-	shape= "BTN";
-	top= 137;
-	left= 93;
-    };
-
-    solid "BTN2" {
-	color= "red";
-	shape= "BTN";
-	top= 137;
-	left= 127;
-    };
-
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-
-};
+default xkb_geometry "XP5" {
+
+    description= "WinBook XP5";
+    width= 281;
+    height= 180;
+
+    shape.cornerRadius= 1;
+
+    shape "NORM" { 
+	{ [17,17] },
+	{ [ 2, 1], [ 15, 15 ] }
+    };
+    shape "FKEY" {
+	{ [ 15, 10 ] },
+	{ [  1,  0 ], [ 14, 9.5 ] }
+    };
+    shape "ONE" {
+	{ [ 28, 17 ] },
+	{ [ 11, 0 ], [ 28, 17 ] },
+	{ [ 13, 1 ], [ 26, 15 ] }
+    };
+    shape "WIDE" {	// backspace, caps lock, ctrl alt ?
+	{ [  24.5, 17 ] },
+	{ [   2,  1 ], [ 22.5, 15 ] }
+    };
+    shape "WIDR" { // backslash, left shift
+	{ [ 35, 17 ] },
+	{ [ 2, 1 ], [ 33, 15 ] }
+    };
+    shape "RTRN" {
+	{ [  45, 17 ] },
+	{ [  2,  1 ], [ 43, 15 ] }
+    };
+    shape "SPCE" {
+	{ [  90, 17 ] },
+	{ [  2,  1 ], [ 88, 15 ] }
+    };
+    shape "STIK" {
+	cornerRadius= 4,
+	{ [  8,  8 ] }
+    };
+    shape "BTN" {
+	{ [ 31, 6 ] }
+    };
+
+    section.left= 2;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  0.5;
+
+    key.color= "grey10";
+    labelColor= "white";
+    baseColor= "grey20";
+
+    section "Whole" {
+	top= 10;
+	row {
+	    top= 11; 
+	    key.shape= "FKEY";
+	    keys { 
+	    	<ESC>,  
+	    	<FK01>, <FK02>, <FK03>, <FK04>, <FK05>, <FK06>,
+		<FK07>, <FK08>, <FK09>, <FK10>, <FK11>, <FK12>,
+		<PAUS>, <HOME>, <END>, <PGUP>
+	    };
+	};
+	row {
+	    top= 22;
+	    keys { 
+	    	{ <AEO1>, "ONE" },
+		<AE02>, <AE03>, <AE04>, <AE05>, <AE06>,
+		<AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
+		{ <BKSP>, shape="WIDE" }, 
+		<PGDN>
+	    };
+	};
+	row {
+	    top= 40;
+	    keys { 
+	    	<TAB>, <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>,
+		<AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>,
+		{ <BKSL>, "WIDR" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <CAPS>, shape="WIDE" },
+		<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		<AC11>, 
+		{ <RTRN>, shape="RTRN" }
+	    };
+	};
+	row {
+	    top= 76;
+	    keys { 
+		{ <LFSH>, shape="WIDR" },
+		<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		<RTSH>, <UP>, <NMLK> 
+	    };
+	};
+	row {
+	    top= 94;
+	    keys { 
+		{ <LCTL>, "WIDE" }, <FUNC>, { <LALT>, "WIDE" }, 
+		<TLDE>, { <SPCE>, shape="SPCE" }, <INS>, <DELE>, 
+		<LEFT>, <DOWN>, <RGHT>
+	    };
+	};
+	overlay "KPAD" {
+	    <AE07>=<KP7>,  <AE08>=<KP8>, <AE09>=<KP9>,  <AE10>=<KPMU>,
+	    <AD07>=<KP4>,  <AD08>=<KP5>, <AD09>=<KP6>,  <AD10>=<KPSU>,
+	    <AC07>=<KP1>,  <AC08>=<KP2>, <AC09>=<KP3>,  <AC10>=<KPAD>,
+	    <AB07>=<KP0>,                <AB09>=<KPDL>, <AB10>=<KPSL>
+	};
+    }; // End of "Whole" section
+
+    solid "STIK" {
+	color= "red";
+	shape= "STIK";
+	top= 81;
+	left= 112;
+    };
+
+    solid "BTN1" {
+    	color= "red";
+	shape= "BTN";
+	top= 137;
+	left= 93;
+    };
+
+    solid "BTN2" {
+	color= "red";
+	shape= "BTN";
+	top= 137;
+	left= 127;
+    };
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/README b/xorg-server/xkeyboard-config/keycodes/README
index 6363f3d55..31e061861 100644
--- a/xorg-server/xkeyboard-config/keycodes/README
+++ b/xorg-server/xkeyboard-config/keycodes/README
@@ -1,6 +1,6 @@
-The keycodes component of a keyboard mapping specifies the range and
-interpretation of the raw keycodes reported by the device. It sets the keycodes
-symbolic name, the minimum and maximum legal codes for the keyboard, and the
-symbolic name for each key. The keycodes component might also contain aliases
-for some keys, symbolic names for some indicators and a description of which
-indicators are physically present.
+The keycodes component of a keyboard mapping specifies the range and
+interpretation of the raw keycodes reported by the device. It sets the keycodes
+symbolic name, the minimum and maximum legal codes for the keyboard, and the
+symbolic name for each key. The keycodes component might also contain aliases
+for some keys, symbolic names for some indicators and a description of which
+indicators are physically present.
diff --git a/xorg-server/xkeyboard-config/keycodes/aliases b/xorg-server/xkeyboard-config/keycodes/aliases
index f398772fe..d80493f95 100644
--- a/xorg-server/xkeyboard-config/keycodes/aliases
+++ b/xorg-server/xkeyboard-config/keycodes/aliases
@@ -1,99 +1,99 @@
-
-// keycode aliases for phonetic keyboard maps
-
-default
-xkb_keycodes "qwerty" {
-
-   alias <LatQ> = <AD01>;
-   alias <LatW> = <AD02>;
-   alias <LatE> = <AD03>;
-   alias <LatR> = <AD04>;
-   alias <LatT> = <AD05>;
-   alias <LatY> = <AD06>;
-   alias <LatU> = <AD07>;
-   alias <LatI> = <AD08>;
-   alias <LatO> = <AD09>;
-   alias <LatP> = <AD10>;
-
-   alias <LatA> = <AC01>;
-   alias <LatS> = <AC02>;
-   alias <LatD> = <AC03>;
-   alias <LatF> = <AC04>;
-   alias <LatG> = <AC05>;
-   alias <LatH> = <AC06>;
-   alias <LatJ> = <AC07>;
-   alias <LatK> = <AC08>;
-   alias <LatL> = <AC09>;
-
-   alias <LatZ> = <AB01>;
-   alias <LatX> = <AB02>;
-   alias <LatC> = <AB03>;
-   alias <LatV> = <AB04>;
-   alias <LatB> = <AB05>;
-   alias <LatN> = <AB06>;
-   alias <LatM> = <AB07>;
-};
-
-xkb_keycodes "azerty" {
-
-   alias <LatA> = <AD01>;
-   alias <LatZ> = <AD02>;
-   alias <LatE> = <AD03>;
-   alias <LatR> = <AD04>;
-   alias <LatT> = <AD05>;
-   alias <LatY> = <AD06>;
-   alias <LatU> = <AD07>;
-   alias <LatI> = <AD08>;
-   alias <LatO> = <AD09>;
-   alias <LatP> = <AD10>;
-
-   alias <LatQ> = <AC01>;
-   alias <LatS> = <AC02>;
-   alias <LatD> = <AC03>;
-   alias <LatF> = <AC04>;
-   alias <LatG> = <AC05>;
-   alias <LatH> = <AC06>;
-   alias <LatJ> = <AC07>;
-   alias <LatK> = <AC08>;
-   alias <LatL> = <AC09>;
-   alias <LatM> = <AC10>;
-
-   alias <LatW> = <AB01>;
-   alias <LatX> = <AB02>;
-   alias <LatC> = <AB03>;
-   alias <LatV> = <AB04>;
-   alias <LatB> = <AB05>;
-   alias <LatN> = <AB06>;
-};
-
-xkb_keycodes "qwertz" {
-
-   alias <LatQ> = <AD01>;
-   alias <LatW> = <AD02>;
-   alias <LatE> = <AD03>;
-   alias <LatR> = <AD04>;
-   alias <LatT> = <AD05>;
-   alias <LatZ> = <AD06>;
-   alias <LatU> = <AD07>;
-   alias <LatI> = <AD08>;
-   alias <LatO> = <AD09>;
-   alias <LatP> = <AD10>;
-
-   alias <LatA> = <AC01>;
-   alias <LatS> = <AC02>;
-   alias <LatD> = <AC03>;
-   alias <LatF> = <AC04>;
-   alias <LatG> = <AC05>;
-   alias <LatH> = <AC06>;
-   alias <LatJ> = <AC07>;
-   alias <LatK> = <AC08>;
-   alias <LatL> = <AC09>;
-
-   alias <LatY> = <AB01>;
-   alias <LatX> = <AB02>;
-   alias <LatC> = <AB03>;
-   alias <LatV> = <AB04>;
-   alias <LatB> = <AB05>;
-   alias <LatN> = <AB06>;
-   alias <LatM> = <AB07>;
-};
+
+// keycode aliases for phonetic keyboard maps
+
+default
+xkb_keycodes "qwerty" {
+
+   alias <LatQ> = <AD01>;
+   alias <LatW> = <AD02>;
+   alias <LatE> = <AD03>;
+   alias <LatR> = <AD04>;
+   alias <LatT> = <AD05>;
+   alias <LatY> = <AD06>;
+   alias <LatU> = <AD07>;
+   alias <LatI> = <AD08>;
+   alias <LatO> = <AD09>;
+   alias <LatP> = <AD10>;
+
+   alias <LatA> = <AC01>;
+   alias <LatS> = <AC02>;
+   alias <LatD> = <AC03>;
+   alias <LatF> = <AC04>;
+   alias <LatG> = <AC05>;
+   alias <LatH> = <AC06>;
+   alias <LatJ> = <AC07>;
+   alias <LatK> = <AC08>;
+   alias <LatL> = <AC09>;
+
+   alias <LatZ> = <AB01>;
+   alias <LatX> = <AB02>;
+   alias <LatC> = <AB03>;
+   alias <LatV> = <AB04>;
+   alias <LatB> = <AB05>;
+   alias <LatN> = <AB06>;
+   alias <LatM> = <AB07>;
+};
+
+xkb_keycodes "azerty" {
+
+   alias <LatA> = <AD01>;
+   alias <LatZ> = <AD02>;
+   alias <LatE> = <AD03>;
+   alias <LatR> = <AD04>;
+   alias <LatT> = <AD05>;
+   alias <LatY> = <AD06>;
+   alias <LatU> = <AD07>;
+   alias <LatI> = <AD08>;
+   alias <LatO> = <AD09>;
+   alias <LatP> = <AD10>;
+
+   alias <LatQ> = <AC01>;
+   alias <LatS> = <AC02>;
+   alias <LatD> = <AC03>;
+   alias <LatF> = <AC04>;
+   alias <LatG> = <AC05>;
+   alias <LatH> = <AC06>;
+   alias <LatJ> = <AC07>;
+   alias <LatK> = <AC08>;
+   alias <LatL> = <AC09>;
+   alias <LatM> = <AC10>;
+
+   alias <LatW> = <AB01>;
+   alias <LatX> = <AB02>;
+   alias <LatC> = <AB03>;
+   alias <LatV> = <AB04>;
+   alias <LatB> = <AB05>;
+   alias <LatN> = <AB06>;
+};
+
+xkb_keycodes "qwertz" {
+
+   alias <LatQ> = <AD01>;
+   alias <LatW> = <AD02>;
+   alias <LatE> = <AD03>;
+   alias <LatR> = <AD04>;
+   alias <LatT> = <AD05>;
+   alias <LatZ> = <AD06>;
+   alias <LatU> = <AD07>;
+   alias <LatI> = <AD08>;
+   alias <LatO> = <AD09>;
+   alias <LatP> = <AD10>;
+
+   alias <LatA> = <AC01>;
+   alias <LatS> = <AC02>;
+   alias <LatD> = <AC03>;
+   alias <LatF> = <AC04>;
+   alias <LatG> = <AC05>;
+   alias <LatH> = <AC06>;
+   alias <LatJ> = <AC07>;
+   alias <LatK> = <AC08>;
+   alias <LatL> = <AC09>;
+
+   alias <LatY> = <AB01>;
+   alias <LatX> = <AB02>;
+   alias <LatC> = <AB03>;
+   alias <LatV> = <AB04>;
+   alias <LatB> = <AB05>;
+   alias <LatN> = <AB06>;
+   alias <LatM> = <AB07>;
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/amiga b/xorg-server/xkeyboard-config/keycodes/amiga
index f374ea658..877d94f9d 100644
--- a/xorg-server/xkeyboard-config/keycodes/amiga
+++ b/xorg-server/xkeyboard-config/keycodes/amiga
@@ -1,225 +1,225 @@
-default xkb_keycodes "usa1" {
-
-    minimum= 8;
-    maximum= 255;
-
-    <ESC>  = 77;
-    <FK01> = 88;
-    <FK02> = 89;
-    <FK03> = 90;
-    <FK04> = 91;
-    <FK05> = 92;
-    <FK06> = 93;
-    <FK07> = 94;
-    <FK08> = 95;
-    <FK09> = 96;
-    <FK10> = 97;
-
-    <TLDE> = 8;
-    <AE01> = 9;
-    <AE02> = 10;
-    <AE03> = 11;
-    <AE04> = 12;
-    <AE05> = 13;
-    <AE06> = 14;
-    <AE07> = 15;
-    <AE08> = 16;
-    <AE09> = 17;
-    <AE10> = 18;
-    <AE11> = 19;
-    <AE12> = 20;
-    <BKSL> = 21;
-    <BKSP> = 73;
-
-    <TAB>  = 74;
-    <AD01> = 24;
-    <AD02> = 25;
-    <AD03> = 26;
-    <AD04> = 27;
-    <AD05> = 28;
-    <AD06> = 29;
-    <AD07> = 30;
-    <AD08> = 31;
-    <AD09> = 32;
-    <AD10> = 33;
-    <AD11> = 34;
-    <AD12> = 35;
-    <RTRN> = 76;
-
-    <LCTL> = 107;
-    <CAPS> = 106;
-    <AC01> = 40;
-    <AC02> = 41;
-    <AC03> = 42;
-    <AC04> = 43;
-    <AC05> = 44;
-    <AC06> = 45;
-    <AC07> = 46;
-    <AC08> = 47;
-    <AC09> = 48;
-    <AC10> = 49;
-    <AC11> = 50;
-
-    <LFSH> = 104;
-    <AB01> = 57;
-    <AB02> = 58;
-    <AB03> = 59;
-    <AB04> = 60;
-    <AB05> = 61;
-    <AB06> = 62;
-    <AB07> = 63;
-    <AB08> = 64;
-    <AB09> = 65;
-    <AB10> = 66;
-    <RTSH> = 105;
-
-    <LALT> = 108;
-    <LAMI> = 110;
-    <SPCE> = 72;
-    <RAMI> = 111;
-    <RALT> = 109;
-
-    <DELE> = 78;
-    <HELP> = 103;
-    <UP>   = 84;
-    <LEFT> = 87;
-    <DOWN> = 85;
-    <RGHT> = 86;
-
-    <KPLP> = 98;
-    <KPRP> = 99;
-    <KPDV> = 100;
-    <KPMU> = 101;
-
-    <KP7>  = 69;
-    <KP8>  = 70;
-    <KP9>  = 71;
-    <KPSU> = 82;
-
-    <KP4>  = 53;
-    <KP5>  = 54;
-    <KP6>  = 55;
-    <KPAD> = 102;
-
-    <KP1>  = 37;
-    <KP2>  = 38;
-    <KP3>  = 39;
-
-    <KP0>  = 23;
-    <KPDC> = 68;
-    <KPEN> = 75;
-};
-
-xkb_keycodes "de" {
-
-    minimum= 8;
-    maximum= 255;
-
-    <ESC>  = 77;
-    <FK01> = 88;
-    <FK02> = 89;
-    <FK03> = 90;
-    <FK04> = 91;
-    <FK05> = 92;
-    <FK06> = 93;
-    <FK07> = 94;
-    <FK08> = 95;
-    <FK09> = 96;
-    <FK10> = 97;
-
-    <TLDE> = 8;
-    <AE01> = 9;
-    <AE02> = 10;
-    <AE03> = 11;
-    <AE04> = 12;
-    <AE05> = 13;
-    <AE06> = 14;
-    <AE07> = 15;
-    <AE08> = 16;
-    <AE09> = 17;
-    <AE10> = 18;
-    <AE11> = 19;
-    <AE12> = 20;
-    <BKSL> = 21;
-    <BKSP> = 73;
-
-    <TAB>  = 74;
-    <AD01> = 24;
-    <AD02> = 25;
-    <AD03> = 26;
-    <AD04> = 27;
-    <AD05> = 28;
-    <AD06> = 29;
-    <AD07> = 30;
-    <AD08> = 31;
-    <AD09> = 32;
-    <AD10> = 33;
-    <AD11> = 34;
-    <AD12> = 35;
-    <RTRN> = 76;
-
-    <LCTL> = 107;
-    <CAPS> = 106;
-    <AC01> = 40;
-    <AC02> = 41;
-    <AC03> = 42;
-    <AC04> = 43;
-    <AC05> = 44;
-    <AC06> = 45;
-    <AC07> = 46;
-    <AC08> = 47;
-    <AC09> = 48;
-    <AC10> = 49;
-    <AC11> = 50;
-    <AC12> = 51;
-
-    <LFSH> = 104;
-    <LSGT> = 56;
-    <AB01> = 57;
-    <AB02> = 58;
-    <AB03> = 59;
-    <AB04> = 60;
-    <AB05> = 61;
-    <AB06> = 62;
-    <AB07> = 63;
-    <AB08> = 64;
-    <AB09> = 65;
-    <AB10> = 66;
-    <RTSH> = 105;
-
-    <LALT> = 108;
-    <LAMI> = 110;
-    <SPCE> = 72;
-    <RAMI> = 111;
-    <RALT> = 109;
-
-    <DELE> = 78;
-    <HELP> = 103;
-    <UP>   = 84;
-    <LEFT> = 87;
-    <DOWN> = 85;
-    <RGHT> = 86;
-
-    <KPLP> = 98;
-    <KPRP> = 99;
-    <KPDV> = 100;
-    <KPMU> = 101;
-
-    <KP7>  = 69;
-    <KP8>  = 70;
-    <KP9>  = 71;
-    <KPSU> = 82;
-
-    <KP4>  = 53;
-    <KP5>  = 54;
-    <KP6>  = 55;
-    <KPAD> = 102;
-
-    <KP1>  = 37;
-    <KP2>  = 38;
-    <KP3>  = 39;
-
-    <KP0>  = 23;
-    <KPDC> = 68;
-    <KPEN> = 75;
-};
+default xkb_keycodes "usa1" {
+
+    minimum= 8;
+    maximum= 255;
+
+    <ESC>  = 77;
+    <FK01> = 88;
+    <FK02> = 89;
+    <FK03> = 90;
+    <FK04> = 91;
+    <FK05> = 92;
+    <FK06> = 93;
+    <FK07> = 94;
+    <FK08> = 95;
+    <FK09> = 96;
+    <FK10> = 97;
+
+    <TLDE> = 8;
+    <AE01> = 9;
+    <AE02> = 10;
+    <AE03> = 11;
+    <AE04> = 12;
+    <AE05> = 13;
+    <AE06> = 14;
+    <AE07> = 15;
+    <AE08> = 16;
+    <AE09> = 17;
+    <AE10> = 18;
+    <AE11> = 19;
+    <AE12> = 20;
+    <BKSL> = 21;
+    <BKSP> = 73;
+
+    <TAB>  = 74;
+    <AD01> = 24;
+    <AD02> = 25;
+    <AD03> = 26;
+    <AD04> = 27;
+    <AD05> = 28;
+    <AD06> = 29;
+    <AD07> = 30;
+    <AD08> = 31;
+    <AD09> = 32;
+    <AD10> = 33;
+    <AD11> = 34;
+    <AD12> = 35;
+    <RTRN> = 76;
+
+    <LCTL> = 107;
+    <CAPS> = 106;
+    <AC01> = 40;
+    <AC02> = 41;
+    <AC03> = 42;
+    <AC04> = 43;
+    <AC05> = 44;
+    <AC06> = 45;
+    <AC07> = 46;
+    <AC08> = 47;
+    <AC09> = 48;
+    <AC10> = 49;
+    <AC11> = 50;
+
+    <LFSH> = 104;
+    <AB01> = 57;
+    <AB02> = 58;
+    <AB03> = 59;
+    <AB04> = 60;
+    <AB05> = 61;
+    <AB06> = 62;
+    <AB07> = 63;
+    <AB08> = 64;
+    <AB09> = 65;
+    <AB10> = 66;
+    <RTSH> = 105;
+
+    <LALT> = 108;
+    <LAMI> = 110;
+    <SPCE> = 72;
+    <RAMI> = 111;
+    <RALT> = 109;
+
+    <DELE> = 78;
+    <HELP> = 103;
+    <UP>   = 84;
+    <LEFT> = 87;
+    <DOWN> = 85;
+    <RGHT> = 86;
+
+    <KPLP> = 98;
+    <KPRP> = 99;
+    <KPDV> = 100;
+    <KPMU> = 101;
+
+    <KP7>  = 69;
+    <KP8>  = 70;
+    <KP9>  = 71;
+    <KPSU> = 82;
+
+    <KP4>  = 53;
+    <KP5>  = 54;
+    <KP6>  = 55;
+    <KPAD> = 102;
+
+    <KP1>  = 37;
+    <KP2>  = 38;
+    <KP3>  = 39;
+
+    <KP0>  = 23;
+    <KPDC> = 68;
+    <KPEN> = 75;
+};
+
+xkb_keycodes "de" {
+
+    minimum= 8;
+    maximum= 255;
+
+    <ESC>  = 77;
+    <FK01> = 88;
+    <FK02> = 89;
+    <FK03> = 90;
+    <FK04> = 91;
+    <FK05> = 92;
+    <FK06> = 93;
+    <FK07> = 94;
+    <FK08> = 95;
+    <FK09> = 96;
+    <FK10> = 97;
+
+    <TLDE> = 8;
+    <AE01> = 9;
+    <AE02> = 10;
+    <AE03> = 11;
+    <AE04> = 12;
+    <AE05> = 13;
+    <AE06> = 14;
+    <AE07> = 15;
+    <AE08> = 16;
+    <AE09> = 17;
+    <AE10> = 18;
+    <AE11> = 19;
+    <AE12> = 20;
+    <BKSL> = 21;
+    <BKSP> = 73;
+
+    <TAB>  = 74;
+    <AD01> = 24;
+    <AD02> = 25;
+    <AD03> = 26;
+    <AD04> = 27;
+    <AD05> = 28;
+    <AD06> = 29;
+    <AD07> = 30;
+    <AD08> = 31;
+    <AD09> = 32;
+    <AD10> = 33;
+    <AD11> = 34;
+    <AD12> = 35;
+    <RTRN> = 76;
+
+    <LCTL> = 107;
+    <CAPS> = 106;
+    <AC01> = 40;
+    <AC02> = 41;
+    <AC03> = 42;
+    <AC04> = 43;
+    <AC05> = 44;
+    <AC06> = 45;
+    <AC07> = 46;
+    <AC08> = 47;
+    <AC09> = 48;
+    <AC10> = 49;
+    <AC11> = 50;
+    <AC12> = 51;
+
+    <LFSH> = 104;
+    <LSGT> = 56;
+    <AB01> = 57;
+    <AB02> = 58;
+    <AB03> = 59;
+    <AB04> = 60;
+    <AB05> = 61;
+    <AB06> = 62;
+    <AB07> = 63;
+    <AB08> = 64;
+    <AB09> = 65;
+    <AB10> = 66;
+    <RTSH> = 105;
+
+    <LALT> = 108;
+    <LAMI> = 110;
+    <SPCE> = 72;
+    <RAMI> = 111;
+    <RALT> = 109;
+
+    <DELE> = 78;
+    <HELP> = 103;
+    <UP>   = 84;
+    <LEFT> = 87;
+    <DOWN> = 85;
+    <RGHT> = 86;
+
+    <KPLP> = 98;
+    <KPRP> = 99;
+    <KPDV> = 100;
+    <KPMU> = 101;
+
+    <KP7>  = 69;
+    <KP8>  = 70;
+    <KP9>  = 71;
+    <KPSU> = 82;
+
+    <KP4>  = 53;
+    <KP5>  = 54;
+    <KP6>  = 55;
+    <KPAD> = 102;
+
+    <KP1>  = 37;
+    <KP2>  = 38;
+    <KP3>  = 39;
+
+    <KP0>  = 23;
+    <KPDC> = 68;
+    <KPEN> = 75;
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/ataritt b/xorg-server/xkeyboard-config/keycodes/ataritt
index c6d31d3ae..c7df8dd3c 100644
--- a/xorg-server/xkeyboard-config/keycodes/ataritt
+++ b/xorg-server/xkeyboard-config/keycodes/ataritt
@@ -1,117 +1,117 @@
-default xkb_keycodes "us" {
-
-    minimum= 8;
-    maximum= 255;
-
-    <ESC>  =   9;
-    <AE01> =  10;
-    <AE02> =  11;
-    <AE03> =  12;
-    <AE04> =  13;
-    <AE05> =  14;
-    <AE06> =  15;
-    <AE07> =  16;
-    <AE08> =  17;
-    <AE09> =  18;
-    <AE10> =  19;
-    <AE11> =  20;
-    <AE12> =  21;
-    <TLDE> =  49;
-    <BKSP> =  22;
-
-    <TAB>  =  23;
-    <AD01> =  24;
-    <AD02> =  25;
-    <AD03> =  26;
-    <AD04> =  27;
-    <AD05> =  28;
-    <AD06> =  29;
-    <AD07> =  30;
-    <AD08> =  31;
-    <AD09> =  32;
-    <AD10> =  33;
-    <AD11> =  34;
-    <AD12> =  35;
-    <RTRN> =  36;
-    <DELE> =  91;
-
-    <LCTL> =  37;
-    <AC01> =  38;
-    <AC02> =  39;
-    <AC03> =  40;
-    <AC04> =  41;
-    <AC05> =  42;
-    <AC06> =  43;
-    <AC07> =  44;
-    <AC08> =  45;
-    <AC09> =  46;
-    <AC10> =  47;
-    <AC11> =  48;
-    <BKSL> =  51;
-
-    <LFSH> =  50;
-    <AB01> =  52;
-    <AB02> =  53;
-    <AB03> =  54;
-    <AB04> =  55;
-    <AB05> =  56;
-    <AB06> =  57;
-    <AB07> =  58;
-    <AB08> =  59;
-    <AB09> =  60;
-    <AB10> =  61;
-    <RTSH> =  62;
-
-    <ALT>  =  64;
-    <SPCE> =  65;
-    <CAPS> =  66;
-
-    <FK01> =  67;
-    <FK02> =  68;
-    <FK03> =  69;
-    <FK04> =  70;
-    <FK05> =  71;
-    <FK06> =  72;
-    <FK07> =  73;
-    <FK08> =  74;
-    <FK09> =  75;
-    <FK10> =  76;
-
-    <HELP> = 106;
-    <UNDO> = 105;
-    <INS>  =  90;
-    <HOME> =  79;
-    <UP>   =  80;
-    <LEFT> =  83;
-    <DOWN> =  88;
-    <RGHT> =  85;
-
-    <KPLP> = 107;
-    <KPRP> = 108;
-    <KPDV> = 109;
-    <KPMU> = 110;
-
-    <KP7>  = 111;
-    <KP8>  = 112;
-    <KP9>  = 113;
-    <KPSU> =  82;
-
-    <KP4>  = 114;
-    <KP5>  = 115;
-    <KP6>  = 116;
-    <KPAD> =  86;
-
-    <KP1>  = 117;
-    <KP2>  = 118;
-    <KP3>  = 119;
-
-    <KP0>  = 120;
-    <KPDC> = 121;
-    <KPEN> = 122;
-};
-
-xkb_keycodes "de" {
-    include "ataritt(us)"
-
-    <LSGT> = 104;
-};
+default xkb_keycodes "us" {
+
+    minimum= 8;
+    maximum= 255;
+
+    <ESC>  =   9;
+    <AE01> =  10;
+    <AE02> =  11;
+    <AE03> =  12;
+    <AE04> =  13;
+    <AE05> =  14;
+    <AE06> =  15;
+    <AE07> =  16;
+    <AE08> =  17;
+    <AE09> =  18;
+    <AE10> =  19;
+    <AE11> =  20;
+    <AE12> =  21;
+    <TLDE> =  49;
+    <BKSP> =  22;
+
+    <TAB>  =  23;
+    <AD01> =  24;
+    <AD02> =  25;
+    <AD03> =  26;
+    <AD04> =  27;
+    <AD05> =  28;
+    <AD06> =  29;
+    <AD07> =  30;
+    <AD08> =  31;
+    <AD09> =  32;
+    <AD10> =  33;
+    <AD11> =  34;
+    <AD12> =  35;
+    <RTRN> =  36;
+    <DELE> =  91;
+
+    <LCTL> =  37;
+    <AC01> =  38;
+    <AC02> =  39;
+    <AC03> =  40;
+    <AC04> =  41;
+    <AC05> =  42;
+    <AC06> =  43;
+    <AC07> =  44;
+    <AC08> =  45;
+    <AC09> =  46;
+    <AC10> =  47;
+    <AC11> =  48;
+    <BKSL> =  51;
+
+    <LFSH> =  50;
+    <AB01> =  52;
+    <AB02> =  53;
+    <AB03> =  54;
+    <AB04> =  55;
+    <AB05> =  56;
+    <AB06> =  57;
+    <AB07> =  58;
+    <AB08> =  59;
+    <AB09> =  60;
+    <AB10> =  61;
+    <RTSH> =  62;
+
+    <ALT>  =  64;
+    <SPCE> =  65;
+    <CAPS> =  66;
+
+    <FK01> =  67;
+    <FK02> =  68;
+    <FK03> =  69;
+    <FK04> =  70;
+    <FK05> =  71;
+    <FK06> =  72;
+    <FK07> =  73;
+    <FK08> =  74;
+    <FK09> =  75;
+    <FK10> =  76;
+
+    <HELP> = 106;
+    <UNDO> = 105;
+    <INS>  =  90;
+    <HOME> =  79;
+    <UP>   =  80;
+    <LEFT> =  83;
+    <DOWN> =  88;
+    <RGHT> =  85;
+
+    <KPLP> = 107;
+    <KPRP> = 108;
+    <KPDV> = 109;
+    <KPMU> = 110;
+
+    <KP7>  = 111;
+    <KP8>  = 112;
+    <KP9>  = 113;
+    <KPSU> =  82;
+
+    <KP4>  = 114;
+    <KP5>  = 115;
+    <KP6>  = 116;
+    <KPAD> =  86;
+
+    <KP1>  = 117;
+    <KP2>  = 118;
+    <KP3>  = 119;
+
+    <KP0>  = 120;
+    <KPDC> = 121;
+    <KPEN> = 122;
+};
+
+xkb_keycodes "de" {
+    include "ataritt(us)"
+
+    <LSGT> = 104;
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/digital_vndr/Makefile.am b/xorg-server/xkeyboard-config/keycodes/digital_vndr/Makefile.am
index 4f4cc4fd9..9f94efa7c 100644
--- a/xorg-server/xkeyboard-config/keycodes/digital_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/keycodes/digital_vndr/Makefile.am
@@ -1,4 +1,4 @@
-keycodesdir = $(xkb_base)/keycodes/digital_vndr
-
-dist_keycodes_DATA = \
-lk pc
+keycodesdir = $(xkb_base)/keycodes/digital_vndr
+
+dist_keycodes_DATA = \
+lk pc
diff --git a/xorg-server/xkeyboard-config/keycodes/digital_vndr/lk b/xorg-server/xkeyboard-config/keycodes/digital_vndr/lk
index 2c1421e88..30b49d311 100644
--- a/xorg-server/xkeyboard-config/keycodes/digital_vndr/lk
+++ b/xorg-server/xkeyboard-config/keycodes/digital_vndr/lk
@@ -1,270 +1,270 @@
-//
-//Copyright (c) 1996  Digital Equipment Corporation
-//
-//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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment 
-//Corporation shall not be used in advertising or otherwise to promote
-//the sale, use or other dealings in this Software without prior written
-//authorization from Digital Equipment Corporation.
-//
-// HISTORY
-// Log
-// Revision 1.2  1996/06/18  09:13:22  erik
-// use flags correctly, assorted cleanups and consortium fixes
-//
-// Revision 1.1.6.2  1995/08/07  17:40:34  William_Walker
-// 	Upgrade XKB to protocol 0.62 (dual submit from decx11)
-// 	[1995/08/06  14:06:25  William_Walker]
-//
-// Revision 1.1.2.4  1995/08/05  15:25:55  William_Walker
-// 	Upgrade to XKB protocol 0.62
-// 	[1995/08/05  14:39:58  William_Walker]
-// 
-// Revision 1.1.2.3  1995/06/27  12:17:31  William_Walker
-// 	     Rename <TLDE> to ISO9995 compliant <AE00>.
-// 	[1995/06/26  20:24:04  William_Walker]
-// 
-// Revision 1.1.2.2  1995/06/05  19:21:28  William_Walker
-// 	New file.  I love keymaps.
-// 	[1995/06/05  18:07:29  William_Walker]
-// 
-// EndLog
-// 
-// @(#)RCSfile: lk  Revision: /main/3  (DEC) Date: 1996/01/24 12:13:31 
-// 
-xkb_keycodes "lk_common" {
-    // "Function" keys
-    <FK01>	= 86;
-    <FK02>	= 87;
-    <FK03>	= 88;
-    <FK04>	= 89;
-    <FK05>	= 90;
-    <FK06>	= 100;
-    <FK07>	= 101;
-    <FK08>	= 102;
-    <FK09>	= 103;
-    <FK10>	= 104;
-    <FK11>	= 113;
-    <FK12>	= 114;
-
-    <UP>	= 170;
-    <LEFT>	= 167;
-    <DOWN>	= 169;
-    <RGHT>	= 168;
-
-    // "Keypad" keys
-    <KP7>	= 157;
-    <KP8>	= 158;
-    <KP9>	= 159;
-    <KP4>	= 153;
-    <KP5>	= 154;
-    <KP6>	= 155;
-    <KP1>	= 150;
-    <KP2>	= 151;
-    <KP3>	= 152;
-    <KPEN>	= 149;
-    <KP0>	= 146;
-    <KPDL>	= 148;
-
-    // "Alphanumeric" keys
-    <AE00>	= 191;
-    <AE01>	= 192;
-    <AE02>	= 197;
-    <AE03>	= 203;
-    <AE04>	= 208;
-    <AE05>	= 214;
-    <AE06>	= 219;
-    <AE07>	= 224;
-    <AE08>	= 229;
-    <AE09>	= 234;
-    <AE10>	= 239;
-    <AE11>	= 249;
-    <AE12>	= 245;
-    <BKSP>	= 188;
-
-    <TAB>	= 190;
-    <AD01>	= 193;
-    <AD02>	= 198;
-    <AD03>	= 204;
-    <AD04>	= 209;
-    <AD05>	= 215;
-    <AD06>	= 220;
-    <AD07>	= 225;
-    <AD08>	= 230;
-    <AD09>	= 235;
-    <AD10>	= 240;
-    <AD11>	= 250;
-    <AD12>	= 246;
-    <RTRN>	= 189;
-
-    <LCTL>	= 175;
-    <CAPS>	= 176;
-    <AC01>	= 194;
-    <AC02>	= 199;
-    <AC03>	= 205;
-    <AC04>	= 210;
-    <AC05>	= 216;
-    <AC06>	= 221;
-    <AC07>	= 226;
-    <AC08>	= 231;
-    <AC09>	= 236;
-    <AC10>	= 242;
-    <AC11>	= 251;
-
-    <LFSH>	= 174;
-    <AB01>	= 195;
-    <AB02>	= 200;
-    <AB03>	= 206;
-    <AB04>	= 211;
-    <AB05>	= 217;
-    <AB06>	= 222;
-    <AB07>	= 227;
-    <AB08>	= 232;
-    <AB09>	= 237;
-    <AB10>	= 243;
-    <RTSH>	= 171;
-
-    <SPCE>	= 212;
-
-    <LDM>	= 255; // Support R5 Lock Down Modifiers
-
-    alias <TLDE> = <AE00>;
-};
-
-xkb_keycodes "lkx01" {
-    include "digital_vndr/lk(lk_common)"
-    <AB00>	= 201;
-    <FK13>	= 115;
-    <FK14>	= 116;
-    <FK17>	= 128;
-    <FK18>	= 129;
-    <FK19>	= 130;
-    <FK20>	= 131;
-    <HELP>	= 124;
-    <DO>	= 125;
-    <FIND>	= 138;
-    <INS>	= 139;
-    <DELE>	= 140;
-    <SELE>	= 141;
-    <PGUP>	= 142;
-    <PGDN>	= 143;
-    <KPF1>	= 161;
-    <KPF2>	= 162;
-    <KPF3>	= 163;
-    <KPF4>	= 164;
-    <KPSU>	= 160;
-    <KPCO>	= 156;
-    <BKSL>	= 247;
-    <LCMP>	= 177;
-};
-
-xkb_keycodes "lk201" {
-    include "digital_vndr/lk(lkx01)"
-    indicator 4 = "Scroll Lock";
-    indicator 3 = "Caps Lock";
-    indicator 2 = "Compose";
-    indicator 1 = "Wait";
-};
-
-xkb_keycodes "lk421" {
-    include	"digital_vndr/lk(lkx01)"
-    <LALT>	= 172;
-    <RALT>	= 178;
-    <RCMP>	= 173;
-};
-
-xkb_keycodes "lk401" {
-    include	"digital_vndr/lk(lk421)"
-    indicator 4 = "Scroll Lock";
-    indicator 3 = "Caps Lock";
-};
-
-xkb_keycodes "lk44x" {
-    include "digital_vndr/lk(lk_common)"
-    <ESC>	= 85;
-    <PRSC>	= 115;
-    <SCLK>	= 116;
-    <PAUS>	= 124;
-    <INS>	= 138;
-    <HOME>	= 139;
-    <PGUP>	= 140;
-    <DELE>	= 141;
-    <END>	= 142;
-    <PGDN>	= 143;
-    <NMLK>	= 161;
-    <KPDV>	= 162;
-    <KPMU>	= 163;
-    <KPSU>	= 164;
-    <KPAD>	= 156;
-    <LALT>	= 172;
-    <RALT>	= 178;
-    <RCTL>	= 173;
-};
-
-xkb_keycodes "lk443" {
-    include "digital_vndr/lk(lk44x)"
-    <BKSL>	= 247;
-    indicator 3 = "Caps Lock";
-    indicator 4 = "Scroll Lock";
-    indicator 5 = "Num Lock";
-};
-
-xkb_keycodes "lk444" {
-    include "digital_vndr/lk(lk44x)"
-    <BKSL>	= 201;
-    <AC12>	= 247;
-    indicator 3 = "Caps Lock";
-    indicator 4 = "Scroll Lock";
-    indicator 5 = "Num Lock";
-};
-
-// LK201-LT = lk201
-// LK421-AJ = lk421  +AB11
-// LK421-JJ = lk421aj+MUHE+KANJ+HIRA
-// LK401-AJ = lk401
-// LK401-BJ = lk401  +MUHE+KANJ+HIRA
-// LK401-JJ = lk401bj+AB11
-// LK401-LT = lk401
-// LK441-LT = lk443
-
-xkb_keycodes "lk421aj" {
-    include "digital_vndr/lk(lk421)"
-    <AB11>  = 252;
-};
-
-xkb_keycodes "lk421jj" {
-    include "digital_vndr/lk(lk421aj)"
-    <MUHE>  = 94;
-    <KANJ>  = 95;
-    <HIRA>  = 97;
-};
-
-xkb_keycodes "lk401bj" {
-    include "digital_vndr/lk(lk401)"
-    <MUHE>  = 94;
-    <KANJ>  = 95;
-    <HIRA>  = 97;
-};
-
-xkb_keycodes "lk401jj" {
-    include "digital_vndr/lk(lk401bj)"
-    <AB11>  = 252;
-};
+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log
+// Revision 1.2  1996/06/18  09:13:22  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.6.2  1995/08/07  17:40:34  William_Walker
+// 	Upgrade XKB to protocol 0.62 (dual submit from decx11)
+// 	[1995/08/06  14:06:25  William_Walker]
+//
+// Revision 1.1.2.4  1995/08/05  15:25:55  William_Walker
+// 	Upgrade to XKB protocol 0.62
+// 	[1995/08/05  14:39:58  William_Walker]
+// 
+// Revision 1.1.2.3  1995/06/27  12:17:31  William_Walker
+// 	     Rename <TLDE> to ISO9995 compliant <AE00>.
+// 	[1995/06/26  20:24:04  William_Walker]
+// 
+// Revision 1.1.2.2  1995/06/05  19:21:28  William_Walker
+// 	New file.  I love keymaps.
+// 	[1995/06/05  18:07:29  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: lk  Revision: /main/3  (DEC) Date: 1996/01/24 12:13:31 
+// 
+xkb_keycodes "lk_common" {
+    // "Function" keys
+    <FK01>	= 86;
+    <FK02>	= 87;
+    <FK03>	= 88;
+    <FK04>	= 89;
+    <FK05>	= 90;
+    <FK06>	= 100;
+    <FK07>	= 101;
+    <FK08>	= 102;
+    <FK09>	= 103;
+    <FK10>	= 104;
+    <FK11>	= 113;
+    <FK12>	= 114;
+
+    <UP>	= 170;
+    <LEFT>	= 167;
+    <DOWN>	= 169;
+    <RGHT>	= 168;
+
+    // "Keypad" keys
+    <KP7>	= 157;
+    <KP8>	= 158;
+    <KP9>	= 159;
+    <KP4>	= 153;
+    <KP5>	= 154;
+    <KP6>	= 155;
+    <KP1>	= 150;
+    <KP2>	= 151;
+    <KP3>	= 152;
+    <KPEN>	= 149;
+    <KP0>	= 146;
+    <KPDL>	= 148;
+
+    // "Alphanumeric" keys
+    <AE00>	= 191;
+    <AE01>	= 192;
+    <AE02>	= 197;
+    <AE03>	= 203;
+    <AE04>	= 208;
+    <AE05>	= 214;
+    <AE06>	= 219;
+    <AE07>	= 224;
+    <AE08>	= 229;
+    <AE09>	= 234;
+    <AE10>	= 239;
+    <AE11>	= 249;
+    <AE12>	= 245;
+    <BKSP>	= 188;
+
+    <TAB>	= 190;
+    <AD01>	= 193;
+    <AD02>	= 198;
+    <AD03>	= 204;
+    <AD04>	= 209;
+    <AD05>	= 215;
+    <AD06>	= 220;
+    <AD07>	= 225;
+    <AD08>	= 230;
+    <AD09>	= 235;
+    <AD10>	= 240;
+    <AD11>	= 250;
+    <AD12>	= 246;
+    <RTRN>	= 189;
+
+    <LCTL>	= 175;
+    <CAPS>	= 176;
+    <AC01>	= 194;
+    <AC02>	= 199;
+    <AC03>	= 205;
+    <AC04>	= 210;
+    <AC05>	= 216;
+    <AC06>	= 221;
+    <AC07>	= 226;
+    <AC08>	= 231;
+    <AC09>	= 236;
+    <AC10>	= 242;
+    <AC11>	= 251;
+
+    <LFSH>	= 174;
+    <AB01>	= 195;
+    <AB02>	= 200;
+    <AB03>	= 206;
+    <AB04>	= 211;
+    <AB05>	= 217;
+    <AB06>	= 222;
+    <AB07>	= 227;
+    <AB08>	= 232;
+    <AB09>	= 237;
+    <AB10>	= 243;
+    <RTSH>	= 171;
+
+    <SPCE>	= 212;
+
+    <LDM>	= 255; // Support R5 Lock Down Modifiers
+
+    alias <TLDE> = <AE00>;
+};
+
+xkb_keycodes "lkx01" {
+    include "digital_vndr/lk(lk_common)"
+    <AB00>	= 201;
+    <FK13>	= 115;
+    <FK14>	= 116;
+    <FK17>	= 128;
+    <FK18>	= 129;
+    <FK19>	= 130;
+    <FK20>	= 131;
+    <HELP>	= 124;
+    <DO>	= 125;
+    <FIND>	= 138;
+    <INS>	= 139;
+    <DELE>	= 140;
+    <SELE>	= 141;
+    <PGUP>	= 142;
+    <PGDN>	= 143;
+    <KPF1>	= 161;
+    <KPF2>	= 162;
+    <KPF3>	= 163;
+    <KPF4>	= 164;
+    <KPSU>	= 160;
+    <KPCO>	= 156;
+    <BKSL>	= 247;
+    <LCMP>	= 177;
+};
+
+xkb_keycodes "lk201" {
+    include "digital_vndr/lk(lkx01)"
+    indicator 4 = "Scroll Lock";
+    indicator 3 = "Caps Lock";
+    indicator 2 = "Compose";
+    indicator 1 = "Wait";
+};
+
+xkb_keycodes "lk421" {
+    include	"digital_vndr/lk(lkx01)"
+    <LALT>	= 172;
+    <RALT>	= 178;
+    <RCMP>	= 173;
+};
+
+xkb_keycodes "lk401" {
+    include	"digital_vndr/lk(lk421)"
+    indicator 4 = "Scroll Lock";
+    indicator 3 = "Caps Lock";
+};
+
+xkb_keycodes "lk44x" {
+    include "digital_vndr/lk(lk_common)"
+    <ESC>	= 85;
+    <PRSC>	= 115;
+    <SCLK>	= 116;
+    <PAUS>	= 124;
+    <INS>	= 138;
+    <HOME>	= 139;
+    <PGUP>	= 140;
+    <DELE>	= 141;
+    <END>	= 142;
+    <PGDN>	= 143;
+    <NMLK>	= 161;
+    <KPDV>	= 162;
+    <KPMU>	= 163;
+    <KPSU>	= 164;
+    <KPAD>	= 156;
+    <LALT>	= 172;
+    <RALT>	= 178;
+    <RCTL>	= 173;
+};
+
+xkb_keycodes "lk443" {
+    include "digital_vndr/lk(lk44x)"
+    <BKSL>	= 247;
+    indicator 3 = "Caps Lock";
+    indicator 4 = "Scroll Lock";
+    indicator 5 = "Num Lock";
+};
+
+xkb_keycodes "lk444" {
+    include "digital_vndr/lk(lk44x)"
+    <BKSL>	= 201;
+    <AC12>	= 247;
+    indicator 3 = "Caps Lock";
+    indicator 4 = "Scroll Lock";
+    indicator 5 = "Num Lock";
+};
+
+// LK201-LT = lk201
+// LK421-AJ = lk421  +AB11
+// LK421-JJ = lk421aj+MUHE+KANJ+HIRA
+// LK401-AJ = lk401
+// LK401-BJ = lk401  +MUHE+KANJ+HIRA
+// LK401-JJ = lk401bj+AB11
+// LK401-LT = lk401
+// LK441-LT = lk443
+
+xkb_keycodes "lk421aj" {
+    include "digital_vndr/lk(lk421)"
+    <AB11>  = 252;
+};
+
+xkb_keycodes "lk421jj" {
+    include "digital_vndr/lk(lk421aj)"
+    <MUHE>  = 94;
+    <KANJ>  = 95;
+    <HIRA>  = 97;
+};
+
+xkb_keycodes "lk401bj" {
+    include "digital_vndr/lk(lk401)"
+    <MUHE>  = 94;
+    <KANJ>  = 95;
+    <HIRA>  = 97;
+};
+
+xkb_keycodes "lk401jj" {
+    include "digital_vndr/lk(lk401bj)"
+    <AB11>  = 252;
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/digital_vndr/pc b/xorg-server/xkeyboard-config/keycodes/digital_vndr/pc
index 8cf06f3f0..33ef848d6 100644
--- a/xorg-server/xkeyboard-config/keycodes/digital_vndr/pc
+++ b/xorg-server/xkeyboard-config/keycodes/digital_vndr/pc
@@ -1,277 +1,277 @@
-//
-//Copyright (c) 1996  Digital Equipment Corporation
-//
-//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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment 
-//Corporation shall not be used in advertising or otherwise to promote
-//the sale, use or other dealings in this Software without prior written
-//authorization from Digital Equipment Corporation.
-//
-// HISTORY
-// Log
-// Revision 1.2  1996/06/18  09:13:25  erik
-// use flags correctly, assorted cleanups and consortium fixes
-//
-// Revision 1.1.6.3  1995/10/25  21:00:14  William_Walker
-// 	Add pc104-key support
-// 	[1995/10/23  15:46:21  William_Walker]
-//
-// Revision 1.1.6.2  1995/08/07  17:40:37  William_Walker
-// 	Upgrade XKB to protocol 0.62 (dual submit from decx11)
-// 	[1995/08/06  14:06:28  William_Walker]
-// 
-// Revision 1.1.2.4  1995/08/05  15:25:56  William_Walker
-// 	Upgrade to XKB protocol 0.62
-// 	[1995/08/05  14:40:02  William_Walker]
-// 
-// Revision 1.1.2.3  1995/06/27  12:17:32  William_Walker
-// 	     Rename <TLDE> to ISO9995 compliant <AE00>.
-// 	[1995/06/26  20:24:07  William_Walker]
-// 
-// Revision 1.1.2.2  1995/06/05  19:21:31  William_Walker
-// 	New file.  I love keymaps.
-// 	[1995/06/05  18:07:34  William_Walker]
-// 
-// EndLog
-// 
-// @(#)RCSfile: pc  Revision: /main/3  (DEC) Date: 1996/01/24 12:13:36 
-// 
-xkb_keycodes "pc_common" {
-    // "Function" keys
-    <FK01>	= 9;
-    <FK02>	= 15;
-    <FK03>	= 23;
-    <FK04>	= 31;
-    <FK05>	= 39;
-    <FK06>	= 47;
-    <FK07>	= 55;
-    <FK08>	= 63;
-    <FK09>	= 71;
-    <FK10>	= 79;
-    <FK11>	= 86;
-    <FK12>	= 94;
-
-    // "Editing" keys
-
-    <UP>	= 99;
-    <LEFT>	= 97;
-    <DOWN>	= 96;
-    <RGHT>	= 106;
-
-    // "Keypad" keys
-    <KP7>	= 108;
-    <KP8>	= 117;
-    <KP9>	= 125;
-
-    <KP4>	= 107;
-    <KP5>	= 115;
-    <KP6>	= 116;
-
-    <KP1>	= 105;
-    <KP2>	= 114;
-    <KP3>	= 122;
-    <KPEN>	= 121;
-
-    <KP0>	= 112;
-    <KPDL>	= 113;
-
-    // "Alphanumeric" keys
-    <AE01>	= 22;
-    <AE02>	= 30;
-    <AE03>	= 38;
-    <AE04>	= 37;
-    <AE05>	= 46;
-    <AE06>	= 54;
-    <AE07>	= 61;
-    <AE08>	= 62;
-    <AE09>	= 70;
-    <AE10>	= 69;
-    <AE11>	= 78;
-    <AE12>	= 85;
-    <BKSP>	= 102;
-
-    <TAB>	= 13;
-    <AD01>	= 21;
-    <AD02>	= 29;
-    <AD03>	= 36;
-    <AD04>	= 45;
-    <AD05>	= 44;
-    <AD06>	= 53;
-    <AD07>	= 60;
-    <AD08>	= 67;
-    <AD09>	= 68;
-    <AD10>	= 77;
-    <AD11>	= 84;
-    <AD12>	= 91;
-
-    <CAPS>	= 20;
-    <AC01>	= 28;
-    <AC02>	= 27;
-    <AC03>	= 35;
-    <AC04>	= 43;
-    <AC05>	= 52;
-    <AC06>	= 51;
-    <AC07>	= 59;
-    <AC08>	= 66;
-    <AC09>	= 75;
-    <AC10>	= 76;
-    <AC11>	= 82;
-    <RTRN>	= 90;
-
-    <LFSH>	= 18;
-    <AB01>	= 26;
-    <AB02>	= 34;
-    <AB03>	= 33;
-    <AB04>	= 42;
-    <AB05>	= 50;
-    <AB06>	= 49;
-    <AB07>	= 58;
-    <AB08>	= 65;
-    <AB09>	= 73;
-    <AB10>	= 74;
-    <RTSH>	= 89;
-
-    <LCTL>	= 17;
-    <LALT>	= 25;
-    <SPCE>	= 41;
-    <RALT>	= 57;
-
-    <LDM>	= 255; // Support R5 Lock Down Modifiers
-
-};
-
-xkb_keycodes "pc10x" {
-    include "digital_vndr/pc(pc_common)"
-    <ESC>	= 8;
-    <AE00>	= 14;
-    <PRSC>	= 87;
-    <SCLK>	= 95;
-    <PAUS>	= 98;
-    <INS>	= 103;
-    <HOME>	= 110;
-    <PGUP>	= 111;
-    <DELE>	= 100;
-    <END>	= 101;
-    <PGDN>	= 109;
-    <NMLK>	= 118;
-    <KPDV>	= 119;
-    <KPMU>	= 126;
-    <KPSU>	= 132;
-    <KPAD>	= 124;
-    <RCTL>	= 88;
-
-    alias <TLDE> = <AE00>;
-
-    indicator 3 = "Caps Lock";
-    indicator 4 = "Scroll Lock";
-};
-
-xkb_keycodes "pc101" {
-    include "digital_vndr/pc(pc10x)"
-    <BKSL>  = 92;
-    indicator 5 = "Num Lock";
-};
-
-
-xkb_keycodes "pc102" {
-    include "digital_vndr/pc(pc10x)"
-    <BKSL>  = 19;
-    <AC12>  = 83;
-    indicator 5 = "Num Lock";
-};
-
-xkb_keycodes "pc104" {
-    include "digital_vndr/pc(pc101)"
-    <LWIN>  = 139;
-    <RWIN>  = 140;
-    <MENU>  = 141;
-};
-
-xkb_keycodes "lk411_common" {
-    include "digital_vndr/pc(pc_common)"
-    <AE00>      = 8;
-    <AB00>      = 14;
-    <FK13>	= 24;
-    <FK14>	= 10;
-    <FK17>	= 16;
-    <FK18>	= 87;
-    <FK19>	= 95;
-    <FK20>	= 98;
-    <HELP>	= 11;
-    <DO>	= 12;
-    <FIND>	= 110;
-    <INS>	= 103;
-    <DELE>	= 100;
-    <SELE>	= 101;
-    <PGUP>	= 111;
-    <PGDN>	= 109;
-    <KPF1>	= 118;
-    <KPF2>	= 119;
-    <KPF3>	= 126;
-    <KPF4>	= 132;
-    <KPSU>	= 19;
-    <KPCO>	= 124;
-    <LCMP>	= 40;
-    <RCMP>	= 88;
-
-    alias <TLDE> = <AE00>;
-
-    indicator 3 = "Caps Lock";
-    indicator 4 = "Scroll Lock";
-};
-
-xkb_keycodes "lk411" {
-    include "digital_vndr/pc(lk411_common)"
-    <BKSL>	= 92;
-};
-
-xkb_keycodes "lk450" {
-    include	"digital_vndr/pc(lk411)"
-    indicator 2 = "Compose";
-    indicator 1 = "Wait";
-};
-
-// Japanese variants
-//
-// PCXAJ-AA = pc+BKSL+AC12+AB11+MUHE+KANJ+HIRA+indicator
-// LK411-AJ = lk411+MUHE+KANJ+HIRA
-// LK411-JJ = lk411+BKSL+AZ01+MUHE+KANJ+HIRA
-// LK411-LT = lk411
-
-xkb_keycodes "pcxajaa" {
-    include "digital_vndr/pc(pc10x)"
-    <BKSL>  = 93;
-    <AC12>  = 83;
-    <AB11>  = 81;
-    <MUHE>  = 133;
-    <KANJ>  = 134;
-    <HIRA>  = 135;
-    indicator 5 = "Group 2";
-};
-
-xkb_keycodes "lk411jj" {
-    include "digital_vndr/pc(lk411_common)"
-    <AB11>  = 81;
-    <BKSL>  = 83;
-    <MUHE>  = 133;
-    <KANJ>  = 134;
-    <HIRA>  = 135;
-};
+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log
+// Revision 1.2  1996/06/18  09:13:25  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.6.3  1995/10/25  21:00:14  William_Walker
+// 	Add pc104-key support
+// 	[1995/10/23  15:46:21  William_Walker]
+//
+// Revision 1.1.6.2  1995/08/07  17:40:37  William_Walker
+// 	Upgrade XKB to protocol 0.62 (dual submit from decx11)
+// 	[1995/08/06  14:06:28  William_Walker]
+// 
+// Revision 1.1.2.4  1995/08/05  15:25:56  William_Walker
+// 	Upgrade to XKB protocol 0.62
+// 	[1995/08/05  14:40:02  William_Walker]
+// 
+// Revision 1.1.2.3  1995/06/27  12:17:32  William_Walker
+// 	     Rename <TLDE> to ISO9995 compliant <AE00>.
+// 	[1995/06/26  20:24:07  William_Walker]
+// 
+// Revision 1.1.2.2  1995/06/05  19:21:31  William_Walker
+// 	New file.  I love keymaps.
+// 	[1995/06/05  18:07:34  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: pc  Revision: /main/3  (DEC) Date: 1996/01/24 12:13:36 
+// 
+xkb_keycodes "pc_common" {
+    // "Function" keys
+    <FK01>	= 9;
+    <FK02>	= 15;
+    <FK03>	= 23;
+    <FK04>	= 31;
+    <FK05>	= 39;
+    <FK06>	= 47;
+    <FK07>	= 55;
+    <FK08>	= 63;
+    <FK09>	= 71;
+    <FK10>	= 79;
+    <FK11>	= 86;
+    <FK12>	= 94;
+
+    // "Editing" keys
+
+    <UP>	= 99;
+    <LEFT>	= 97;
+    <DOWN>	= 96;
+    <RGHT>	= 106;
+
+    // "Keypad" keys
+    <KP7>	= 108;
+    <KP8>	= 117;
+    <KP9>	= 125;
+
+    <KP4>	= 107;
+    <KP5>	= 115;
+    <KP6>	= 116;
+
+    <KP1>	= 105;
+    <KP2>	= 114;
+    <KP3>	= 122;
+    <KPEN>	= 121;
+
+    <KP0>	= 112;
+    <KPDL>	= 113;
+
+    // "Alphanumeric" keys
+    <AE01>	= 22;
+    <AE02>	= 30;
+    <AE03>	= 38;
+    <AE04>	= 37;
+    <AE05>	= 46;
+    <AE06>	= 54;
+    <AE07>	= 61;
+    <AE08>	= 62;
+    <AE09>	= 70;
+    <AE10>	= 69;
+    <AE11>	= 78;
+    <AE12>	= 85;
+    <BKSP>	= 102;
+
+    <TAB>	= 13;
+    <AD01>	= 21;
+    <AD02>	= 29;
+    <AD03>	= 36;
+    <AD04>	= 45;
+    <AD05>	= 44;
+    <AD06>	= 53;
+    <AD07>	= 60;
+    <AD08>	= 67;
+    <AD09>	= 68;
+    <AD10>	= 77;
+    <AD11>	= 84;
+    <AD12>	= 91;
+
+    <CAPS>	= 20;
+    <AC01>	= 28;
+    <AC02>	= 27;
+    <AC03>	= 35;
+    <AC04>	= 43;
+    <AC05>	= 52;
+    <AC06>	= 51;
+    <AC07>	= 59;
+    <AC08>	= 66;
+    <AC09>	= 75;
+    <AC10>	= 76;
+    <AC11>	= 82;
+    <RTRN>	= 90;
+
+    <LFSH>	= 18;
+    <AB01>	= 26;
+    <AB02>	= 34;
+    <AB03>	= 33;
+    <AB04>	= 42;
+    <AB05>	= 50;
+    <AB06>	= 49;
+    <AB07>	= 58;
+    <AB08>	= 65;
+    <AB09>	= 73;
+    <AB10>	= 74;
+    <RTSH>	= 89;
+
+    <LCTL>	= 17;
+    <LALT>	= 25;
+    <SPCE>	= 41;
+    <RALT>	= 57;
+
+    <LDM>	= 255; // Support R5 Lock Down Modifiers
+
+};
+
+xkb_keycodes "pc10x" {
+    include "digital_vndr/pc(pc_common)"
+    <ESC>	= 8;
+    <AE00>	= 14;
+    <PRSC>	= 87;
+    <SCLK>	= 95;
+    <PAUS>	= 98;
+    <INS>	= 103;
+    <HOME>	= 110;
+    <PGUP>	= 111;
+    <DELE>	= 100;
+    <END>	= 101;
+    <PGDN>	= 109;
+    <NMLK>	= 118;
+    <KPDV>	= 119;
+    <KPMU>	= 126;
+    <KPSU>	= 132;
+    <KPAD>	= 124;
+    <RCTL>	= 88;
+
+    alias <TLDE> = <AE00>;
+
+    indicator 3 = "Caps Lock";
+    indicator 4 = "Scroll Lock";
+};
+
+xkb_keycodes "pc101" {
+    include "digital_vndr/pc(pc10x)"
+    <BKSL>  = 92;
+    indicator 5 = "Num Lock";
+};
+
+
+xkb_keycodes "pc102" {
+    include "digital_vndr/pc(pc10x)"
+    <BKSL>  = 19;
+    <AC12>  = 83;
+    indicator 5 = "Num Lock";
+};
+
+xkb_keycodes "pc104" {
+    include "digital_vndr/pc(pc101)"
+    <LWIN>  = 139;
+    <RWIN>  = 140;
+    <MENU>  = 141;
+};
+
+xkb_keycodes "lk411_common" {
+    include "digital_vndr/pc(pc_common)"
+    <AE00>      = 8;
+    <AB00>      = 14;
+    <FK13>	= 24;
+    <FK14>	= 10;
+    <FK17>	= 16;
+    <FK18>	= 87;
+    <FK19>	= 95;
+    <FK20>	= 98;
+    <HELP>	= 11;
+    <DO>	= 12;
+    <FIND>	= 110;
+    <INS>	= 103;
+    <DELE>	= 100;
+    <SELE>	= 101;
+    <PGUP>	= 111;
+    <PGDN>	= 109;
+    <KPF1>	= 118;
+    <KPF2>	= 119;
+    <KPF3>	= 126;
+    <KPF4>	= 132;
+    <KPSU>	= 19;
+    <KPCO>	= 124;
+    <LCMP>	= 40;
+    <RCMP>	= 88;
+
+    alias <TLDE> = <AE00>;
+
+    indicator 3 = "Caps Lock";
+    indicator 4 = "Scroll Lock";
+};
+
+xkb_keycodes "lk411" {
+    include "digital_vndr/pc(lk411_common)"
+    <BKSL>	= 92;
+};
+
+xkb_keycodes "lk450" {
+    include	"digital_vndr/pc(lk411)"
+    indicator 2 = "Compose";
+    indicator 1 = "Wait";
+};
+
+// Japanese variants
+//
+// PCXAJ-AA = pc+BKSL+AC12+AB11+MUHE+KANJ+HIRA+indicator
+// LK411-AJ = lk411+MUHE+KANJ+HIRA
+// LK411-JJ = lk411+BKSL+AZ01+MUHE+KANJ+HIRA
+// LK411-LT = lk411
+
+xkb_keycodes "pcxajaa" {
+    include "digital_vndr/pc(pc10x)"
+    <BKSL>  = 93;
+    <AC12>  = 83;
+    <AB11>  = 81;
+    <MUHE>  = 133;
+    <KANJ>  = 134;
+    <HIRA>  = 135;
+    indicator 5 = "Group 2";
+};
+
+xkb_keycodes "lk411jj" {
+    include "digital_vndr/pc(lk411_common)"
+    <AB11>  = 81;
+    <BKSL>  = 83;
+    <MUHE>  = 133;
+    <KANJ>  = 134;
+    <HIRA>  = 135;
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/evdev b/xorg-server/xkeyboard-config/keycodes/evdev
index de035c898..624ac687c 100644
--- a/xorg-server/xkeyboard-config/keycodes/evdev
+++ b/xorg-server/xkeyboard-config/keycodes/evdev
@@ -1,314 +1,314 @@
-// translation from evdev scancodes to something resembling xfree86 keycodes.
-
-default xkb_keycodes "evdev" {
-	minimum = 8;
-	maximum = 255;
-
-        # Added for pc105 compatibility
-        <LSGT> = 94;
-
-	<TLDE> = 49;
-	<AE01> = 10;
-	<AE02> = 11;
-	<AE03> = 12;
-	<AE04> = 13;
-	<AE05> = 14;
-	<AE06> = 15;
-	<AE07> = 16;
-	<AE08> = 17;
-	<AE09> = 18;
-	<AE10> = 19;
-	<AE11> = 20;
-	<AE12> = 21;
-	<BKSP> = 22;
-
-	<TAB> = 23;
-	<AD01> = 24;
-	<AD02> = 25;
-	<AD03> = 26;
-	<AD04> = 27;
-	<AD05> = 28;
-	<AD06> = 29;
-	<AD07> = 30;
-	<AD08> = 31;
-	<AD09> = 32;
-	<AD10> = 33;
-	<AD11> = 34;
-	<AD12> = 35;
-	<BKSL> = 51;
-	alias <AC12> = <BKSL>;
-	<RTRN> = 36;
-
-	<CAPS> = 66;
-	<AC01> = 38;
-	<AC02> = 39;
-	<AC03> = 40;
-	<AC04> = 41;
-	<AC05> = 42;
-	<AC06> = 43;
-	<AC07> = 44;
-	<AC08> = 45;
-	<AC09> = 46;
-	<AC10> = 47;
-	<AC11> = 48;
-
-	<LFSH> = 50;
-	<AB01> = 52;
-	<AB02> = 53;
-	<AB03> = 54;
-	<AB04> = 55;
-	<AB05> = 56;
-	<AB06> = 57;
-	<AB07> = 58;
-	<AB08> = 59;
-	<AB09> = 60;
-	<AB10> = 61;
-	<RTSH> = 62;
-
-	<LALT> = 64;
-	<LCTL> = 37;
-	<SPCE> = 65;
-	<RCTL> = 105;
-	<RALT> = 108;
-	// Microsoft keyboard extra keys
-	<LWIN> = 133;
-	<RWIN> = 134;
-	<COMP> = 135;
-	alias <MENU> = <COMP>;
-
-	<ESC> = 9;
-	<FK01> = 67;
-	<FK02> = 68;
-	<FK03> = 69;
-	<FK04> = 70;
-	<FK05> = 71;
-	<FK06> = 72;
-	<FK07> = 73;
-	<FK08> = 74;
-	<FK09> = 75;
-	<FK10> = 76;
-	<FK11> = 95;
-	<FK12> = 96;
-
-	<PRSC> = 107;
-	// <SYRQ> = 107;
-	<SCLK> = 78;
-	<PAUS> = 127;
-	// <BRK> = 419;
-
-	<INS> = 118;
-	<HOME> = 110;
-	<PGUP> = 112;
-	<DELE> = 119;
-	<END> = 115;
-	<PGDN> = 117;
-
-	<UP> = 111;
-	<LEFT> = 113;
-	<DOWN> = 116;
-	<RGHT> = 114;
-
-	<NMLK> = 77;
-	<KPDV> = 106;
-	<KPMU> = 63;
-	<KPSU> = 82;
-
-	<KP7> = 79;
-	<KP8> = 80;
-	<KP9> = 81;
-	<KPAD> = 86;
-
-	<KP4> = 83;
-	<KP5> = 84;
-	<KP6> = 85;
-
-	<KP1> = 87;
-	<KP2> = 88;
-	<KP3> = 89;
-	<KPEN> = 104;
-
-	<KP0> = 90;
-	<KPDL> = 91;
-	<KPEQ> = 125;
-
-	<FK13> = 191;
-	<FK14> = 192;
-	<FK15> = 193;
-	<FK16> = 194;
-	<FK17> = 195;
-	<FK18> = 196;
-	<FK19> = 197;
-	<FK20> = 198;
-	<FK21> = 199;
-	<FK22> = 200;
-	<FK23> = 201;
-	<FK24> = 202;
-
-	// Keys that are generated on Japanese keyboards
-
-	//<HZTG> =  93;	// Hankaku/Zenkakau toggle - not actually used
-	alias <HZTG> = <TLDE>;
-	<HKTG> = 101;	// Hiragana/Katakana toggle
-	<AB11> = 97;	// backslash/underscore
-	<HENK> = 100;	// Henkan
-	<MUHE> = 102;	// Muhenkan
-	<AE13> = 132;	// Yen
-	<KATA> =  98;	// Katakana
-	<HIRA> =  99;	// Hiragana
-	<JPCM> = 103;	// KPJPComma
-	//<RO>   =  97;	// Romaji
-
-	// Keys that are generated on Korean keyboards
-
-	<HNGL> = 130;	// Hangul Latin toggle
-	<HJCV> = 131;	// Hangul to Hanja conversion
-
-	// Solaris compatibility
-
-	alias <LMTA> = <LWIN>;
-	alias <RMTA> = <RWIN>;
-	<MUTE> = 121;
-	<VOL-> = 122;
-	<VOL+> = 123;
-	<POWR> = 124;
-	<STOP> = 136;
-	<AGAI> = 137;
-	<PROP> = 138;
-	<UNDO> = 139;
-	<FRNT> = 140;
-	<COPY> = 141;
-	<OPEN> = 142;
-	<PAST> = 143;
-	<FIND> = 144;
-	<CUT>  = 145;
-	<HELP> = 146;
-
-	// Extended keys that may be generated on "Internet" keyboards.
-	// evdev has standardize names for these.
-
-	<LNFD> = 109;	// #define KEY_LINEFEED            101
-	<I120> = 120;	// #define KEY_MACRO               112
-	<I126> = 126;	// #define KEY_KPPLUSMINUS         118
-	<I128> = 128;   // #define KEY_SCALE               120
-	<I129> = 129;	// #define KEY_KPCOMMA             121
-	<I147> = 147;	// #define KEY_MENU                139
-	<I148> = 148;	// #define KEY_CALC                140
-	<I149> = 149;	// #define KEY_SETUP               141
-	<I150> = 150;	// #define KEY_SLEEP               142
-	<I151> = 151;	// #define KEY_WAKEUP              143
-	<I152> = 152;	// #define KEY_FILE                144
-	<I153> = 153;	// #define KEY_SENDFILE            145
-	<I154> = 154;	// #define KEY_DELETEFILE          146
-	<I155> = 155;	// #define KEY_XFER                147
-	<I156> = 156;	// #define KEY_PROG1               148
-	<I157> = 157;	// #define KEY_PROG2               149
-	<I158> = 158;	// #define KEY_WWW                 150
-	<I159> = 159;	// #define KEY_MSDOS               151
-	<I160> = 160;	// #define KEY_COFFEE              152
-	<I161> = 161;	// #define KEY_DIRECTION           153
-	<I162> = 162;	// #define KEY_CYCLEWINDOWS        154
-	<I163> = 163;	// #define KEY_MAIL                155
-	<I164> = 164;	// #define KEY_BOOKMARKS           156
-	<I165> = 165;	// #define KEY_COMPUTER            157
-	<I166> = 166;	// #define KEY_BACK                158
-	<I167> = 167;	// #define KEY_FORWARD             159
-	<I168> = 168;	// #define KEY_CLOSECD             160
-	<I169> = 169;	// #define KEY_EJECTCD             161
-	<I170> = 170;	// #define KEY_EJECTCLOSECD        162
-	<I171> = 171;	// #define KEY_NEXTSONG            163
-	<I172> = 172;	// #define KEY_PLAYPAUSE           164
-	<I173> = 173;	// #define KEY_PREVIOUSSONG        165
-	<I174> = 174;	// #define KEY_STOPCD              166
-	<I175> = 175;	// #define KEY_RECORD              167
-	<I176> = 176;	// #define KEY_REWIND              168
-	<I177> = 177;	// #define KEY_PHONE               169
-	<I178> = 178;	// #define KEY_ISO                 170
-	<I179> = 179;	// #define KEY_CONFIG              171
-	<I180> = 180;	// #define KEY_HOMEPAGE            172
-	<I181> = 181;	// #define KEY_REFRESH             173
-	<I182> = 182;	// #define KEY_EXIT                174
-	<I183> = 183;	// #define KEY_MOVE                175
-	<I184> = 184;	// #define KEY_EDIT                176
-	<I185> = 185;	// #define KEY_SCROLLUP            177
-	<I186> = 186;	// #define KEY_SCROLLDOWN          178
-	<I187> = 187;	// #define KEY_KPLEFTPAREN         179
-	<I188> = 188;	// #define KEY_KPRIGHTPAREN        180
-	<I189> = 189;	// #define KEY_NEW                 181
-	<I190> = 190;	// #define KEY_REDO                182
-	<I208> = 208;	// #define KEY_PLAYCD              200
-	<I209> = 209;	// #define KEY_PAUSECD             201
-	<I210> = 210;	// #define KEY_PROG3               202
-	<I211> = 211;	// #define KEY_PROG4               203 conflicts with AB11
-	<I212> = 212;   // #define KEY_DASHBOARD           204
-	<I213> = 213;	// #define KEY_SUSPEND             205
-	<I214> = 214;	// #define KEY_CLOSE               206
-	<I215> = 215;	// #define KEY_PLAY                207
-	<I216> = 216;	// #define KEY_FASTFORWARD         208
-	<I217> = 217;	// #define KEY_BASSBOOST           209
-	<I218> = 218;	// #define KEY_PRINT               210
-	<I219> = 219;	// #define KEY_HP                  211
-	<I220> = 220;	// #define KEY_CAMERA              212
-	<I221> = 221;	// #define KEY_SOUND               213
-	<I222> = 222;	// #define KEY_QUESTION            214
-	<I223> = 223;	// #define KEY_EMAIL               215
-	<I224> = 224;	// #define KEY_CHAT                216
-	<I225> = 225;	// #define KEY_SEARCH              217
-	<I226> = 226;	// #define KEY_CONNECT             218
-	<I227> = 227;	// #define KEY_FINANCE             219
-	<I228> = 228;	// #define KEY_SPORT               220
-	<I229> = 229;	// #define KEY_SHOP                221
-	<I230> = 230;	// #define KEY_ALTERASE            222
-	<I231> = 231;	// #define KEY_CANCEL              223
-	<I232> = 232;	// #define KEY_BRIGHTNESSDOWN      224
-	<I233> = 233;	// #define KEY_BRIGHTNESSUP        225
-	<I234> = 234;	// #define KEY_MEDIA               226
-	<I235> = 235;	// #define KEY_SWITCHVIDEOMODE     227
-	<I236> = 236;	// #define KEY_KBDILLUMTOGGLE      228
-	<I237> = 237;	// #define KEY_KBDILLUMDOWN        229
-	<I238> = 238;	// #define KEY_KBDILLUMUP          230
-	<I239> = 239;	// #define KEY_SEND                231
-	<I240> = 240;	// #define KEY_REPLY               232
-	<I241> = 241;	// #define KEY_FORWARDMAIL         233
-	<I242> = 242;	// #define KEY_SAVE                234
-	<I243> = 243;	// #define KEY_DOCUMENTS           235
-	<I244> = 244;	// #define KEY_BATTERY             236
-	<I245> = 245;	// #define KEY_BLUETOOTH           237
-	<I246> = 246;	// #define KEY_WLAN                238
-	<I247> = 247;	// #define KEY_UWB                 239
-	<I248> = 248;	// #define KEY_UNKNOWN             240
-	<I249> = 249;	// #define KEY_VIDEO_NEXT          241
-	<I250> = 250;	// #define KEY_VIDEO_PREV          242
-	<I251> = 251;	// #define KEY_BRIGHTNESS_CYCLE    243
-	<I252> = 252;	// #define KEY_BRIGHTNESS_ZERO     244
-	<I253> = 253;	// #define KEY_DISPLAY_OFF         245
-
-	// Fake keycodes for virtual keys
-	<LVL3> =   92;
-	<MDSW> =   203;
-	<ALT>  =   204;
-	<META> =   205;
-	<SUPR> =   206;
-	<HYPR> =   207;
-
-	indicator 1  = "Caps Lock";
-	indicator 2  = "Num Lock";
-	indicator 3  = "Scroll Lock";
-	indicator 4  = "Compose";
-	indicator 5  = "Kana";
-	indicator 6  = "Sleep";
-	indicator 7  = "Suspend";
-	indicator 8  = "Mute";
-	indicator 9  = "Misc";
-	indicator 10 = "Mail";
-	indicator 11 = "Charging";
-
-	alias <ALGR> = <RALT>;
-
-	// For Brazilian ABNT2
-	alias <KPPT> = <I129>;
-};
-
-// PC98
-xkb_keycodes "pc98" {
-    include "evdev(evdev)"
-};
+// translation from evdev scancodes to something resembling xfree86 keycodes.
+
+default xkb_keycodes "evdev" {
+	minimum = 8;
+	maximum = 255;
+
+        # Added for pc105 compatibility
+        <LSGT> = 94;
+
+	<TLDE> = 49;
+	<AE01> = 10;
+	<AE02> = 11;
+	<AE03> = 12;
+	<AE04> = 13;
+	<AE05> = 14;
+	<AE06> = 15;
+	<AE07> = 16;
+	<AE08> = 17;
+	<AE09> = 18;
+	<AE10> = 19;
+	<AE11> = 20;
+	<AE12> = 21;
+	<BKSP> = 22;
+
+	<TAB> = 23;
+	<AD01> = 24;
+	<AD02> = 25;
+	<AD03> = 26;
+	<AD04> = 27;
+	<AD05> = 28;
+	<AD06> = 29;
+	<AD07> = 30;
+	<AD08> = 31;
+	<AD09> = 32;
+	<AD10> = 33;
+	<AD11> = 34;
+	<AD12> = 35;
+	<BKSL> = 51;
+	alias <AC12> = <BKSL>;
+	<RTRN> = 36;
+
+	<CAPS> = 66;
+	<AC01> = 38;
+	<AC02> = 39;
+	<AC03> = 40;
+	<AC04> = 41;
+	<AC05> = 42;
+	<AC06> = 43;
+	<AC07> = 44;
+	<AC08> = 45;
+	<AC09> = 46;
+	<AC10> = 47;
+	<AC11> = 48;
+
+	<LFSH> = 50;
+	<AB01> = 52;
+	<AB02> = 53;
+	<AB03> = 54;
+	<AB04> = 55;
+	<AB05> = 56;
+	<AB06> = 57;
+	<AB07> = 58;
+	<AB08> = 59;
+	<AB09> = 60;
+	<AB10> = 61;
+	<RTSH> = 62;
+
+	<LALT> = 64;
+	<LCTL> = 37;
+	<SPCE> = 65;
+	<RCTL> = 105;
+	<RALT> = 108;
+	// Microsoft keyboard extra keys
+	<LWIN> = 133;
+	<RWIN> = 134;
+	<COMP> = 135;
+	alias <MENU> = <COMP>;
+
+	<ESC> = 9;
+	<FK01> = 67;
+	<FK02> = 68;
+	<FK03> = 69;
+	<FK04> = 70;
+	<FK05> = 71;
+	<FK06> = 72;
+	<FK07> = 73;
+	<FK08> = 74;
+	<FK09> = 75;
+	<FK10> = 76;
+	<FK11> = 95;
+	<FK12> = 96;
+
+	<PRSC> = 107;
+	// <SYRQ> = 107;
+	<SCLK> = 78;
+	<PAUS> = 127;
+	// <BRK> = 419;
+
+	<INS> = 118;
+	<HOME> = 110;
+	<PGUP> = 112;
+	<DELE> = 119;
+	<END> = 115;
+	<PGDN> = 117;
+
+	<UP> = 111;
+	<LEFT> = 113;
+	<DOWN> = 116;
+	<RGHT> = 114;
+
+	<NMLK> = 77;
+	<KPDV> = 106;
+	<KPMU> = 63;
+	<KPSU> = 82;
+
+	<KP7> = 79;
+	<KP8> = 80;
+	<KP9> = 81;
+	<KPAD> = 86;
+
+	<KP4> = 83;
+	<KP5> = 84;
+	<KP6> = 85;
+
+	<KP1> = 87;
+	<KP2> = 88;
+	<KP3> = 89;
+	<KPEN> = 104;
+
+	<KP0> = 90;
+	<KPDL> = 91;
+	<KPEQ> = 125;
+
+	<FK13> = 191;
+	<FK14> = 192;
+	<FK15> = 193;
+	<FK16> = 194;
+	<FK17> = 195;
+	<FK18> = 196;
+	<FK19> = 197;
+	<FK20> = 198;
+	<FK21> = 199;
+	<FK22> = 200;
+	<FK23> = 201;
+	<FK24> = 202;
+
+	// Keys that are generated on Japanese keyboards
+
+	//<HZTG> =  93;	// Hankaku/Zenkakau toggle - not actually used
+	alias <HZTG> = <TLDE>;
+	<HKTG> = 101;	// Hiragana/Katakana toggle
+	<AB11> = 97;	// backslash/underscore
+	<HENK> = 100;	// Henkan
+	<MUHE> = 102;	// Muhenkan
+	<AE13> = 132;	// Yen
+	<KATA> =  98;	// Katakana
+	<HIRA> =  99;	// Hiragana
+	<JPCM> = 103;	// KPJPComma
+	//<RO>   =  97;	// Romaji
+
+	// Keys that are generated on Korean keyboards
+
+	<HNGL> = 130;	// Hangul Latin toggle
+	<HJCV> = 131;	// Hangul to Hanja conversion
+
+	// Solaris compatibility
+
+	alias <LMTA> = <LWIN>;
+	alias <RMTA> = <RWIN>;
+	<MUTE> = 121;
+	<VOL-> = 122;
+	<VOL+> = 123;
+	<POWR> = 124;
+	<STOP> = 136;
+	<AGAI> = 137;
+	<PROP> = 138;
+	<UNDO> = 139;
+	<FRNT> = 140;
+	<COPY> = 141;
+	<OPEN> = 142;
+	<PAST> = 143;
+	<FIND> = 144;
+	<CUT>  = 145;
+	<HELP> = 146;
+
+	// Extended keys that may be generated on "Internet" keyboards.
+	// evdev has standardize names for these.
+
+	<LNFD> = 109;	// #define KEY_LINEFEED            101
+	<I120> = 120;	// #define KEY_MACRO               112
+	<I126> = 126;	// #define KEY_KPPLUSMINUS         118
+	<I128> = 128;   // #define KEY_SCALE               120
+	<I129> = 129;	// #define KEY_KPCOMMA             121
+	<I147> = 147;	// #define KEY_MENU                139
+	<I148> = 148;	// #define KEY_CALC                140
+	<I149> = 149;	// #define KEY_SETUP               141
+	<I150> = 150;	// #define KEY_SLEEP               142
+	<I151> = 151;	// #define KEY_WAKEUP              143
+	<I152> = 152;	// #define KEY_FILE                144
+	<I153> = 153;	// #define KEY_SENDFILE            145
+	<I154> = 154;	// #define KEY_DELETEFILE          146
+	<I155> = 155;	// #define KEY_XFER                147
+	<I156> = 156;	// #define KEY_PROG1               148
+	<I157> = 157;	// #define KEY_PROG2               149
+	<I158> = 158;	// #define KEY_WWW                 150
+	<I159> = 159;	// #define KEY_MSDOS               151
+	<I160> = 160;	// #define KEY_COFFEE              152
+	<I161> = 161;	// #define KEY_DIRECTION           153
+	<I162> = 162;	// #define KEY_CYCLEWINDOWS        154
+	<I163> = 163;	// #define KEY_MAIL                155
+	<I164> = 164;	// #define KEY_BOOKMARKS           156
+	<I165> = 165;	// #define KEY_COMPUTER            157
+	<I166> = 166;	// #define KEY_BACK                158
+	<I167> = 167;	// #define KEY_FORWARD             159
+	<I168> = 168;	// #define KEY_CLOSECD             160
+	<I169> = 169;	// #define KEY_EJECTCD             161
+	<I170> = 170;	// #define KEY_EJECTCLOSECD        162
+	<I171> = 171;	// #define KEY_NEXTSONG            163
+	<I172> = 172;	// #define KEY_PLAYPAUSE           164
+	<I173> = 173;	// #define KEY_PREVIOUSSONG        165
+	<I174> = 174;	// #define KEY_STOPCD              166
+	<I175> = 175;	// #define KEY_RECORD              167
+	<I176> = 176;	// #define KEY_REWIND              168
+	<I177> = 177;	// #define KEY_PHONE               169
+	<I178> = 178;	// #define KEY_ISO                 170
+	<I179> = 179;	// #define KEY_CONFIG              171
+	<I180> = 180;	// #define KEY_HOMEPAGE            172
+	<I181> = 181;	// #define KEY_REFRESH             173
+	<I182> = 182;	// #define KEY_EXIT                174
+	<I183> = 183;	// #define KEY_MOVE                175
+	<I184> = 184;	// #define KEY_EDIT                176
+	<I185> = 185;	// #define KEY_SCROLLUP            177
+	<I186> = 186;	// #define KEY_SCROLLDOWN          178
+	<I187> = 187;	// #define KEY_KPLEFTPAREN         179
+	<I188> = 188;	// #define KEY_KPRIGHTPAREN        180
+	<I189> = 189;	// #define KEY_NEW                 181
+	<I190> = 190;	// #define KEY_REDO                182
+	<I208> = 208;	// #define KEY_PLAYCD              200
+	<I209> = 209;	// #define KEY_PAUSECD             201
+	<I210> = 210;	// #define KEY_PROG3               202
+	<I211> = 211;	// #define KEY_PROG4               203 conflicts with AB11
+	<I212> = 212;   // #define KEY_DASHBOARD           204
+	<I213> = 213;	// #define KEY_SUSPEND             205
+	<I214> = 214;	// #define KEY_CLOSE               206
+	<I215> = 215;	// #define KEY_PLAY                207
+	<I216> = 216;	// #define KEY_FASTFORWARD         208
+	<I217> = 217;	// #define KEY_BASSBOOST           209
+	<I218> = 218;	// #define KEY_PRINT               210
+	<I219> = 219;	// #define KEY_HP                  211
+	<I220> = 220;	// #define KEY_CAMERA              212
+	<I221> = 221;	// #define KEY_SOUND               213
+	<I222> = 222;	// #define KEY_QUESTION            214
+	<I223> = 223;	// #define KEY_EMAIL               215
+	<I224> = 224;	// #define KEY_CHAT                216
+	<I225> = 225;	// #define KEY_SEARCH              217
+	<I226> = 226;	// #define KEY_CONNECT             218
+	<I227> = 227;	// #define KEY_FINANCE             219
+	<I228> = 228;	// #define KEY_SPORT               220
+	<I229> = 229;	// #define KEY_SHOP                221
+	<I230> = 230;	// #define KEY_ALTERASE            222
+	<I231> = 231;	// #define KEY_CANCEL              223
+	<I232> = 232;	// #define KEY_BRIGHTNESSDOWN      224
+	<I233> = 233;	// #define KEY_BRIGHTNESSUP        225
+	<I234> = 234;	// #define KEY_MEDIA               226
+	<I235> = 235;	// #define KEY_SWITCHVIDEOMODE     227
+	<I236> = 236;	// #define KEY_KBDILLUMTOGGLE      228
+	<I237> = 237;	// #define KEY_KBDILLUMDOWN        229
+	<I238> = 238;	// #define KEY_KBDILLUMUP          230
+	<I239> = 239;	// #define KEY_SEND                231
+	<I240> = 240;	// #define KEY_REPLY               232
+	<I241> = 241;	// #define KEY_FORWARDMAIL         233
+	<I242> = 242;	// #define KEY_SAVE                234
+	<I243> = 243;	// #define KEY_DOCUMENTS           235
+	<I244> = 244;	// #define KEY_BATTERY             236
+	<I245> = 245;	// #define KEY_BLUETOOTH           237
+	<I246> = 246;	// #define KEY_WLAN                238
+	<I247> = 247;	// #define KEY_UWB                 239
+	<I248> = 248;	// #define KEY_UNKNOWN             240
+	<I249> = 249;	// #define KEY_VIDEO_NEXT          241
+	<I250> = 250;	// #define KEY_VIDEO_PREV          242
+	<I251> = 251;	// #define KEY_BRIGHTNESS_CYCLE    243
+	<I252> = 252;	// #define KEY_BRIGHTNESS_ZERO     244
+	<I253> = 253;	// #define KEY_DISPLAY_OFF         245
+
+	// Fake keycodes for virtual keys
+	<LVL3> =   92;
+	<MDSW> =   203;
+	<ALT>  =   204;
+	<META> =   205;
+	<SUPR> =   206;
+	<HYPR> =   207;
+
+	indicator 1  = "Caps Lock";
+	indicator 2  = "Num Lock";
+	indicator 3  = "Scroll Lock";
+	indicator 4  = "Compose";
+	indicator 5  = "Kana";
+	indicator 6  = "Sleep";
+	indicator 7  = "Suspend";
+	indicator 8  = "Mute";
+	indicator 9  = "Misc";
+	indicator 10 = "Mail";
+	indicator 11 = "Charging";
+
+	alias <ALGR> = <RALT>;
+
+	// For Brazilian ABNT2
+	alias <KPPT> = <I129>;
+};
+
+// PC98
+xkb_keycodes "pc98" {
+    include "evdev(evdev)"
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/fujitsu b/xorg-server/xkeyboard-config/keycodes/fujitsu
index 373621038..ca259f80f 100644
--- a/xorg-server/xkeyboard-config/keycodes/fujitsu
+++ b/xorg-server/xkeyboard-config/keycodes/fujitsu
@@ -1,186 +1,186 @@
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//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 OPEN GROUP 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 Open Group 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 Open Group.
-//
-default xkb_keycodes "138" {
-
-    minimum= 8;
-    maximum= 255;
-
-    <ESC>  = 37;
-    <AE01> = 38;
-    <AE02> = 39;
-    <AE03> = 40;
-    <AE04> = 41;
-    <AE05> = 42;
-    <AE06> = 43;
-    <AE07> = 44;
-    <AE08> = 45;
-    <AE09> = 46;
-    <AE10> = 47;
-    <AE11> = 48;
-    <AE12> = 49;
-    <TLDE> = 50;
-    <BKSP> = 51;
-
-    <TAB>  = 61;
-    <AD01> = 62;
-    <AD02> = 63;
-    <AD03> = 64;
-    <AD04> = 65;
-    <AD05> = 66;
-    <AD06> = 67;
-    <AD07> = 68;
-    <AD08> = 69;
-    <AD09> = 70;
-    <AD10> = 71;
-    <AD11> = 72;
-    <AD12> = 73;
-
-    <LCTL> = 84;
-    <AC01> = 85;
-    <AC02> = 86;
-    <AC03> = 87;
-    <AC04> = 88;
-    <AC05> = 89;
-    <AC06> = 90;
-    <AC07> = 91;
-    <AC08> = 92;
-    <AC09> = 93;
-    <AC10> = 94;
-    <AC11> = 95;
-    <BKSL> = 96;
-    <RTRN> = 97;
-
-    <LFSH> = 107;
-    <AB01> = 108;
-    <AB02> = 109;
-    <AB03> = 110;
-    <AB04> = 111;
-    <AB05> = 112;
-    <AB06> = 113;
-    <AB07> = 114;
-    <AB08> = 115;
-    <AB09> = 116;
-    <AB10> = 117;
-    <AB11> = 52;
-    <RTSH> = 118;
-
-    <CAPS> = 127;
-    <LALT> = 27;
-    <LMTA> = 128;
-    <UNK4> = 125;
-    <SPCE> = 129;
-    <UNK5> = 10;
-    <RMTA> = 130;
-    <RALT> = 23;
-    <COMP> = 75;
-    <LNFD> = 119;
-    <UNK6> = 56;
-
-    <FK01> = 13;
-    <FK02> = 14;
-    <FK03> = 16;
-    <FK04> = 18;
-    <FK05> = 20;
-    <FK06> = 22;
-    <FK07> = 24;
-    <FK08> = 25;
-    <FK09> = 26;
-    <FK10> = 15;
-    <FK11> = 17;
-    <FK12> = 19;
-    <FK13> = 137;
-    <FK14> = 138;
-    <FK15> = 139;
-    <FK16> = 140;
-    <FK17> = 141;
-    <FK18> = 142;
-    <FK19> = 143;
-    <FK20> = 144;
-    <FK21> = 145;
-    <FK22> = 146;
-    <FK23> = 147;
-    <FK24> = 148;
-    <FK25> = 153;
-    <FK26> = 154;
-    <FK27> = 155;
-    <FK28> = 156;
-    <FK29> = 149;
-    <FK30> = 150;
-    <FK31> = 151;
-    <FK32> = 152;
-
-    <UNDO> = 34;
-    <COPY> = 59;
-    <PAST> = 81;
-     <CUT> = 105;
-    <HELP> = 126;
-
-    <BREA> = 9;
-    <PRSC> = 30;
-    <KNJI> = 21;
-    <PAUS> = 29;
-
-    <UNK0> = 82;
-    <UNK1> = 83;
-    <UNK2> = 12;
-    <PGUP> = 35;
-    <HOME> = 32;
-    <PGDN> = 36;
-    <UNK3> = 28;
-     <DEL> = 74;
-     <INS> = 60;
-      <UP> = 33;
-    <DOWN> = 103;
-    <LEFT> = 57;
-    <RGHT> = 80;
-    <EXEC> = 11;
-
-    <KPMU> = 55;
-    <KPDV> = 54;
-    <KPAD> = 133;
-    <KPSU> = 79;
-
-    <KP7>  = 76;
-    <KP8>  = 77;
-    <KP9>  = 78;
-    <KPEQ> = 53;
-
-    <KP4>  = 99;
-    <KP5>  = 100;
-    <KP6>  = 101;
-    <KPDC> = 58;
-
-    <KP1>  = 120;
-    <KP2>  = 121;
-    <KP3>  = 122;
-    <KPEN> = 98;
-
-    <KP0>  = 102;
-    <KP00> = 31;
-
-    <UNK7> = 123;
-    <UNK8> = 124;
-};
+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//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 OPEN GROUP 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 Open Group 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 Open Group.
+//
+default xkb_keycodes "138" {
+
+    minimum= 8;
+    maximum= 255;
+
+    <ESC>  = 37;
+    <AE01> = 38;
+    <AE02> = 39;
+    <AE03> = 40;
+    <AE04> = 41;
+    <AE05> = 42;
+    <AE06> = 43;
+    <AE07> = 44;
+    <AE08> = 45;
+    <AE09> = 46;
+    <AE10> = 47;
+    <AE11> = 48;
+    <AE12> = 49;
+    <TLDE> = 50;
+    <BKSP> = 51;
+
+    <TAB>  = 61;
+    <AD01> = 62;
+    <AD02> = 63;
+    <AD03> = 64;
+    <AD04> = 65;
+    <AD05> = 66;
+    <AD06> = 67;
+    <AD07> = 68;
+    <AD08> = 69;
+    <AD09> = 70;
+    <AD10> = 71;
+    <AD11> = 72;
+    <AD12> = 73;
+
+    <LCTL> = 84;
+    <AC01> = 85;
+    <AC02> = 86;
+    <AC03> = 87;
+    <AC04> = 88;
+    <AC05> = 89;
+    <AC06> = 90;
+    <AC07> = 91;
+    <AC08> = 92;
+    <AC09> = 93;
+    <AC10> = 94;
+    <AC11> = 95;
+    <BKSL> = 96;
+    <RTRN> = 97;
+
+    <LFSH> = 107;
+    <AB01> = 108;
+    <AB02> = 109;
+    <AB03> = 110;
+    <AB04> = 111;
+    <AB05> = 112;
+    <AB06> = 113;
+    <AB07> = 114;
+    <AB08> = 115;
+    <AB09> = 116;
+    <AB10> = 117;
+    <AB11> = 52;
+    <RTSH> = 118;
+
+    <CAPS> = 127;
+    <LALT> = 27;
+    <LMTA> = 128;
+    <UNK4> = 125;
+    <SPCE> = 129;
+    <UNK5> = 10;
+    <RMTA> = 130;
+    <RALT> = 23;
+    <COMP> = 75;
+    <LNFD> = 119;
+    <UNK6> = 56;
+
+    <FK01> = 13;
+    <FK02> = 14;
+    <FK03> = 16;
+    <FK04> = 18;
+    <FK05> = 20;
+    <FK06> = 22;
+    <FK07> = 24;
+    <FK08> = 25;
+    <FK09> = 26;
+    <FK10> = 15;
+    <FK11> = 17;
+    <FK12> = 19;
+    <FK13> = 137;
+    <FK14> = 138;
+    <FK15> = 139;
+    <FK16> = 140;
+    <FK17> = 141;
+    <FK18> = 142;
+    <FK19> = 143;
+    <FK20> = 144;
+    <FK21> = 145;
+    <FK22> = 146;
+    <FK23> = 147;
+    <FK24> = 148;
+    <FK25> = 153;
+    <FK26> = 154;
+    <FK27> = 155;
+    <FK28> = 156;
+    <FK29> = 149;
+    <FK30> = 150;
+    <FK31> = 151;
+    <FK32> = 152;
+
+    <UNDO> = 34;
+    <COPY> = 59;
+    <PAST> = 81;
+     <CUT> = 105;
+    <HELP> = 126;
+
+    <BREA> = 9;
+    <PRSC> = 30;
+    <KNJI> = 21;
+    <PAUS> = 29;
+
+    <UNK0> = 82;
+    <UNK1> = 83;
+    <UNK2> = 12;
+    <PGUP> = 35;
+    <HOME> = 32;
+    <PGDN> = 36;
+    <UNK3> = 28;
+     <DEL> = 74;
+     <INS> = 60;
+      <UP> = 33;
+    <DOWN> = 103;
+    <LEFT> = 57;
+    <RGHT> = 80;
+    <EXEC> = 11;
+
+    <KPMU> = 55;
+    <KPDV> = 54;
+    <KPAD> = 133;
+    <KPSU> = 79;
+
+    <KP7>  = 76;
+    <KP8>  = 77;
+    <KP9>  = 78;
+    <KPEQ> = 53;
+
+    <KP4>  = 99;
+    <KP5>  = 100;
+    <KP6>  = 101;
+    <KPDC> = 58;
+
+    <KP1>  = 120;
+    <KP2>  = 121;
+    <KP3>  = 122;
+    <KPEN> = 98;
+
+    <KP0>  = 102;
+    <KP00> = 31;
+
+    <UNK7> = 123;
+    <UNK8> = 124;
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/hp b/xorg-server/xkeyboard-config/keycodes/hp
index 544389578..81983a02a 100644
--- a/xorg-server/xkeyboard-config/keycodes/hp
+++ b/xorg-server/xkeyboard-config/keycodes/hp
@@ -1,270 +1,270 @@
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//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 OPEN GROUP 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 Open Group 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 Open Group.
-//
-default xkb_keycodes "hp-101" {
-
-    <TLDE> = 23;
-    <AE01> = 31;
-    <AE02> = 39;
-    <AE03> = 47;
-    <AE04> = 46;
-    <AE05> = 55;
-    <AE06> = 63;
-    <AE07> = 70;
-    <AE08> = 71;
-    <AE09> = 79;
-    <AE10> = 78;
-    <AE11> = 87;
-    <AE12> = 94;
-    <BKSP> = 111;
-
-    <TAB>  = 22;
-    <AD01> = 30;
-    <AD02> = 38;
-    <AD03> = 45;
-    <AD04> = 54;
-    <AD05> = 53;
-    <AD06> = 62;
-    <AD07> = 69;
-    <AD08> = 76;
-    <AD09> = 77;
-    <AD10> = 86;
-    <AD11> = 93;
-    <AD12> = 100;
-    <BKSL> = 101;
-
-    <CAPS> = 29;
-    <AC01> = 37;
-    <AC02> = 36;
-    <AC03> = 44;
-    <AC04> = 52;
-    <AC05> = 61;
-    <AC06> = 60;
-    <AC07> = 68;
-    <AC08> = 75;
-    <AC09> = 84;
-    <AC10> = 85;
-    <AC11> = 91;
-    <RTRN> = 99;
-
-    <LFSH> = 27;
-    <AB01> = 35;
-    <AB02> = 43;
-    <AB03> = 42;
-    <AB04> = 51;
-    <AB05> = 59;
-    <AB06> = 58;
-    <AB07> = 67;
-    <AB08> = 74;
-    <AB09> = 82;
-    <AB10> = 83;
-    <RTSH> = 98;
-
-    <LCTL> = 26;
-    <LALT> = 34;
-    <SPCE> = 50;
-    <RALT> = 66;
-    <RCTL> = 97;
-
-    <ESC>  = 17;
-    <FK01> = 16;
-    <FK02> = 24;
-    <FK03> = 32;
-    <FK04> = 40;
-    <FK05> = 48;
-    <FK06> = 56;
-    <FK07> = 64;
-    <FK08> = 72;
-    <FK09> = 80;
-    <FK10> = 88;
-    <FK11> = 95;
-    <FK12> = 103;
-
-    <PRSC> = 96;
-    <SCLK> = 104;
-    <PAUS> = 107;
-
-    <INS>  = 112;
-    <HOME> = 119;
-    <PGUP> = 120;
-    <DELE> = 109;
-    <END>  = 110;
-    <PGDN> = 118;
-
-    <UP>   = 108;
-    <LEFT> = 106;
-    <DOWN> = 105;
-    <RGHT> = 115;
-
-    <NMLK> = 127;
-    <KPDV> = 128;
-    <KPMU> = 135;
-    <KPSU> = 141;
-
-     <KP7> = 117;
-     <KP8> = 126;
-     <KP9> = 134;
-    <KPAD> = 133;
-
-     <KP4> = 116;
-     <KP5> = 124;
-     <KP6> = 125;
-
-     <KP1> = 114;
-     <KP2> = 123;
-     <KP3> = 131;
-    <KPEN> = 130;
-
-     <KP0> = 121;
-    <KPDL> = 122;
-
-    indicator 1 = "Caps Lock";
-    indicator 2 = "Num Lock";
-    indicator 3 = "Scroll Lock";
-};
-
-xkb_keycodes "hil" {
-
-    <TLDE> = 71;
-    <AE01> = 70;
-    <AE02> = 69;
-    <AE03> = 68;
-    <AE04> = 67;
-    <AE05> = 66;
-    <AE06> = 65;
-    <AE07> = 64;
-    <AE08> = 96;
-    <AE09> = 97;
-    <AE10> = 98;
-    <AE11> = 99;
-    <AE12> = 100;
-    <BKSP> = 101;
-
-    <TAB>  = 63;
-    <AD01> = 62;
-    <AD02> = 61;
-    <AD03> = 60;
-    <AD04> = 59;
-    <AD05> = 58;
-    <AD06> = 57;
-    <AD07> = 56;
-    <AD08> = 104;
-    <AD09> = 105;
-    <AD10> = 106;
-    <AD11> = 107;
-    <AD12> = 108;
-    <BKSL> = 109;
-
-    <CAPS> = 55;
-    <AC01> = 53;
-    <AC02> = 52;
-    <AC03> = 51;
-    <AC04> = 50;
-    <AC05> = 49;
-    <AC06> = 48;
-    <AC07> = 112;
-    <AC08> = 113;
-    <AC09> = 114;
-    <AC10> = 115;
-    <AC11> = 116;
-    <RTRN> = 117;
-
-    <LFSH> = 13;
-    <AB01> = 36;
-    <AB02> = 35;
-    <AB03> = 34;
-    <AB04> = 33;
-    <AB05> = 32;
-    <AB06> = 128;
-    <AB07> = 120;
-    <AB08> = 121;
-    <AB09> = 122;
-    <AB10> = 123;
-    <RTSH> = 12;
-
-    <LCTL> = 14;
-    <LALT> = 11;
-    <SPCE> = 129;
-    <RALT> = 10;
-    <PRSC> = 87;
-
-    <ESC>  = 39;
-    <BRK>  = 15;
-    <STOP> = 86;
-    <FK01> = 84;
-    <FK02> = 83;
-    <FK03> = 82;
-    <FK04> = 81;
-    <MENU> = 80;
-    <SYST> = 88;
-    <FK05> = 89;
-    <FK06> = 90;
-    <FK07> = 91;
-    <FK08> = 92;
-    <FK09> = 45;
-    <FK10> = 41;
-    <FK11> = 43;
-    <FK12> = 47;
-    <CLRL> = 94;
-    <CLR>  = 95;
-
-    <INSL> = 102;
-    <DELL> = 103;
-    <INSC> = 110;
-    <DELC> = 111;
-
-    <HOME> = 118;
-    <PGUP> = 119;
-    <PGDN> = 127;
-    <SELE> = 125;
-
-    <UP>   = 134;
-    <LEFT> = 132;
-    <DOWN> = 133;
-    <RGHT> = 135;
-
-    <KPDV> = 25;
-    <KPMU> = 29;
-    <KPAD> = 27;
-    <KPSU> = 31;
-
-     <KP7> = 21;
-     <KP8> = 17;
-     <KP9> = 19;
-    <KPEN> = 23;
-
-     <KP4> = 16;
-     <KP5> = 18;
-     <KP6> = 20;
-    <KPSP> = 22;
-
-     <KP1> = 24;
-     <KP2> = 26;
-     <KP3> = 28;
-    <KPTB> = 46;
-
-     <KP0> = 30;
-    <KPDL> = 44;
-};
+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//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 OPEN GROUP 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 Open Group 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 Open Group.
+//
+default xkb_keycodes "hp-101" {
+
+    <TLDE> = 23;
+    <AE01> = 31;
+    <AE02> = 39;
+    <AE03> = 47;
+    <AE04> = 46;
+    <AE05> = 55;
+    <AE06> = 63;
+    <AE07> = 70;
+    <AE08> = 71;
+    <AE09> = 79;
+    <AE10> = 78;
+    <AE11> = 87;
+    <AE12> = 94;
+    <BKSP> = 111;
+
+    <TAB>  = 22;
+    <AD01> = 30;
+    <AD02> = 38;
+    <AD03> = 45;
+    <AD04> = 54;
+    <AD05> = 53;
+    <AD06> = 62;
+    <AD07> = 69;
+    <AD08> = 76;
+    <AD09> = 77;
+    <AD10> = 86;
+    <AD11> = 93;
+    <AD12> = 100;
+    <BKSL> = 101;
+
+    <CAPS> = 29;
+    <AC01> = 37;
+    <AC02> = 36;
+    <AC03> = 44;
+    <AC04> = 52;
+    <AC05> = 61;
+    <AC06> = 60;
+    <AC07> = 68;
+    <AC08> = 75;
+    <AC09> = 84;
+    <AC10> = 85;
+    <AC11> = 91;
+    <RTRN> = 99;
+
+    <LFSH> = 27;
+    <AB01> = 35;
+    <AB02> = 43;
+    <AB03> = 42;
+    <AB04> = 51;
+    <AB05> = 59;
+    <AB06> = 58;
+    <AB07> = 67;
+    <AB08> = 74;
+    <AB09> = 82;
+    <AB10> = 83;
+    <RTSH> = 98;
+
+    <LCTL> = 26;
+    <LALT> = 34;
+    <SPCE> = 50;
+    <RALT> = 66;
+    <RCTL> = 97;
+
+    <ESC>  = 17;
+    <FK01> = 16;
+    <FK02> = 24;
+    <FK03> = 32;
+    <FK04> = 40;
+    <FK05> = 48;
+    <FK06> = 56;
+    <FK07> = 64;
+    <FK08> = 72;
+    <FK09> = 80;
+    <FK10> = 88;
+    <FK11> = 95;
+    <FK12> = 103;
+
+    <PRSC> = 96;
+    <SCLK> = 104;
+    <PAUS> = 107;
+
+    <INS>  = 112;
+    <HOME> = 119;
+    <PGUP> = 120;
+    <DELE> = 109;
+    <END>  = 110;
+    <PGDN> = 118;
+
+    <UP>   = 108;
+    <LEFT> = 106;
+    <DOWN> = 105;
+    <RGHT> = 115;
+
+    <NMLK> = 127;
+    <KPDV> = 128;
+    <KPMU> = 135;
+    <KPSU> = 141;
+
+     <KP7> = 117;
+     <KP8> = 126;
+     <KP9> = 134;
+    <KPAD> = 133;
+
+     <KP4> = 116;
+     <KP5> = 124;
+     <KP6> = 125;
+
+     <KP1> = 114;
+     <KP2> = 123;
+     <KP3> = 131;
+    <KPEN> = 130;
+
+     <KP0> = 121;
+    <KPDL> = 122;
+
+    indicator 1 = "Caps Lock";
+    indicator 2 = "Num Lock";
+    indicator 3 = "Scroll Lock";
+};
+
+xkb_keycodes "hil" {
+
+    <TLDE> = 71;
+    <AE01> = 70;
+    <AE02> = 69;
+    <AE03> = 68;
+    <AE04> = 67;
+    <AE05> = 66;
+    <AE06> = 65;
+    <AE07> = 64;
+    <AE08> = 96;
+    <AE09> = 97;
+    <AE10> = 98;
+    <AE11> = 99;
+    <AE12> = 100;
+    <BKSP> = 101;
+
+    <TAB>  = 63;
+    <AD01> = 62;
+    <AD02> = 61;
+    <AD03> = 60;
+    <AD04> = 59;
+    <AD05> = 58;
+    <AD06> = 57;
+    <AD07> = 56;
+    <AD08> = 104;
+    <AD09> = 105;
+    <AD10> = 106;
+    <AD11> = 107;
+    <AD12> = 108;
+    <BKSL> = 109;
+
+    <CAPS> = 55;
+    <AC01> = 53;
+    <AC02> = 52;
+    <AC03> = 51;
+    <AC04> = 50;
+    <AC05> = 49;
+    <AC06> = 48;
+    <AC07> = 112;
+    <AC08> = 113;
+    <AC09> = 114;
+    <AC10> = 115;
+    <AC11> = 116;
+    <RTRN> = 117;
+
+    <LFSH> = 13;
+    <AB01> = 36;
+    <AB02> = 35;
+    <AB03> = 34;
+    <AB04> = 33;
+    <AB05> = 32;
+    <AB06> = 128;
+    <AB07> = 120;
+    <AB08> = 121;
+    <AB09> = 122;
+    <AB10> = 123;
+    <RTSH> = 12;
+
+    <LCTL> = 14;
+    <LALT> = 11;
+    <SPCE> = 129;
+    <RALT> = 10;
+    <PRSC> = 87;
+
+    <ESC>  = 39;
+    <BRK>  = 15;
+    <STOP> = 86;
+    <FK01> = 84;
+    <FK02> = 83;
+    <FK03> = 82;
+    <FK04> = 81;
+    <MENU> = 80;
+    <SYST> = 88;
+    <FK05> = 89;
+    <FK06> = 90;
+    <FK07> = 91;
+    <FK08> = 92;
+    <FK09> = 45;
+    <FK10> = 41;
+    <FK11> = 43;
+    <FK12> = 47;
+    <CLRL> = 94;
+    <CLR>  = 95;
+
+    <INSL> = 102;
+    <DELL> = 103;
+    <INSC> = 110;
+    <DELC> = 111;
+
+    <HOME> = 118;
+    <PGUP> = 119;
+    <PGDN> = 127;
+    <SELE> = 125;
+
+    <UP>   = 134;
+    <LEFT> = 132;
+    <DOWN> = 133;
+    <RGHT> = 135;
+
+    <KPDV> = 25;
+    <KPMU> = 29;
+    <KPAD> = 27;
+    <KPSU> = 31;
+
+     <KP7> = 21;
+     <KP8> = 17;
+     <KP9> = 19;
+    <KPEN> = 23;
+
+     <KP4> = 16;
+     <KP5> = 18;
+     <KP6> = 20;
+    <KPSP> = 22;
+
+     <KP1> = 24;
+     <KP2> = 26;
+     <KP3> = 28;
+    <KPTB> = 46;
+
+     <KP0> = 30;
+    <KPDL> = 44;
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/ibm b/xorg-server/xkeyboard-config/keycodes/ibm
index 3ce84a70a..9ebf0586d 100644
--- a/xorg-server/xkeyboard-config/keycodes/ibm
+++ b/xorg-server/xkeyboard-config/keycodes/ibm
@@ -1,150 +1,150 @@
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//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 OPEN GROUP 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 Open Group 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 Open Group.
-//
-xkb_keycodes "rs6k-101" {
-
-    <TLDE> = 9;
-    <AE01> = 10;
-    <AE02> = 11;
-    <AE03> = 12;
-    <AE04> = 13;
-    <AE05> = 14;
-    <AE06> = 15;
-    <AE07> = 16;
-    <AE08> = 17;
-    <AE09> = 18;
-    <AE10> = 19;
-    <AE11> = 20;
-    <AE12> = 21;
-    <BKSP> = 23;
-
-    <TAB>  = 24;
-    <AD01> = 25;
-    <AD02> = 26;
-    <AD03> = 27;
-    <AD04> = 28;
-    <AD05> = 29;
-    <AD06> = 30;
-    <AD07> = 31;
-    <AD08> = 32;
-    <AD09> = 33;
-    <AD10> = 34;
-    <AD11> = 35;
-    <AD12> = 36;
-    <BKSL> = 37;
-
-    <CAPS> = 38;
-    <AC01> = 39;
-    <AC02> = 40;
-    <AC03> = 41;
-    <AC04> = 42;
-    <AC05> = 43;
-    <AC06> = 44;
-    <AC07> = 45;
-    <AC08> = 46;
-    <AC09> = 47;
-    <AC10> = 48;
-    <AC11> = 49;
-    <RTRN> = 51;
-
-    <LFSH> = 52;
-    <AB01> = 54;
-    <AB02> = 55;
-    <AB03> = 56;
-    <AB04> = 57;
-    <AB05> = 58;
-    <AB06> = 59;
-    <AB07> = 60;
-    <AB08> = 61;
-    <AB09> = 62;
-    <AB10> = 63;
-    <RTSH> = 65;
-
-    <LCTL> = 66;
-    <LALT> = 68;
-    <SPCE> = 69;
-    <RALT> = 70;
-    <RCTL> = 72;
-
-    <ESC>  = 118;
-    <FK01> = 120;
-    <FK02> = 121;
-    <FK03> = 122;
-    <FK04> = 123;
-    <FK05> = 124;
-    <FK06> = 125;
-    <FK07> = 126;
-    <FK08> = 127;
-    <FK09> = 128;
-    <FK10> = 129;
-    <FK11> = 130;
-    <FK12> = 131;
-
-    <PRSC> = 132;
-    <SCLK> = 133;
-    <PAUS> = 134;
-
-    <INS>  = 83;
-    <HOME> = 88;
-    <PGUP> = 93;
-    <DELE> = 84;
-    <END>  = 89;
-    <PGDN> = 94;
-
-    <UP>   = 91;
-    <LEFT> = 87;
-    <DOWN> = 92;
-    <RGHT> = 97;
-
-    <NMLK> = 98;
-    <KPDV> = 103;
-    <KPMU> = 108;
-    <KPSU> = 113;
-
-     <KP7> = 99;
-     <KP8> = 104;
-     <KP9> = 109;
-    <KPAD> = 114;
-
-     <KP4> = 100;
-     <KP5> = 105;
-     <KP6> = 110;
-
-     <KP1> = 101;
-     <KP2> = 106;
-     <KP3> = 111;
-    <KPEN> = 116;
-
-     <KP0> = 107;
-    <KPDL> = 112;
-
-    indicator 1 = "Caps Lock";
-    indicator 2 = "Num Lock";
-    indicator 3 = "Scroll Lock";
-};
-xkb_keycodes "rs6k-102" {
-    include "ibm(rs6k-101)"
-    <LSGT> = 53;
-};
+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//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 OPEN GROUP 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 Open Group 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 Open Group.
+//
+xkb_keycodes "rs6k-101" {
+
+    <TLDE> = 9;
+    <AE01> = 10;
+    <AE02> = 11;
+    <AE03> = 12;
+    <AE04> = 13;
+    <AE05> = 14;
+    <AE06> = 15;
+    <AE07> = 16;
+    <AE08> = 17;
+    <AE09> = 18;
+    <AE10> = 19;
+    <AE11> = 20;
+    <AE12> = 21;
+    <BKSP> = 23;
+
+    <TAB>  = 24;
+    <AD01> = 25;
+    <AD02> = 26;
+    <AD03> = 27;
+    <AD04> = 28;
+    <AD05> = 29;
+    <AD06> = 30;
+    <AD07> = 31;
+    <AD08> = 32;
+    <AD09> = 33;
+    <AD10> = 34;
+    <AD11> = 35;
+    <AD12> = 36;
+    <BKSL> = 37;
+
+    <CAPS> = 38;
+    <AC01> = 39;
+    <AC02> = 40;
+    <AC03> = 41;
+    <AC04> = 42;
+    <AC05> = 43;
+    <AC06> = 44;
+    <AC07> = 45;
+    <AC08> = 46;
+    <AC09> = 47;
+    <AC10> = 48;
+    <AC11> = 49;
+    <RTRN> = 51;
+
+    <LFSH> = 52;
+    <AB01> = 54;
+    <AB02> = 55;
+    <AB03> = 56;
+    <AB04> = 57;
+    <AB05> = 58;
+    <AB06> = 59;
+    <AB07> = 60;
+    <AB08> = 61;
+    <AB09> = 62;
+    <AB10> = 63;
+    <RTSH> = 65;
+
+    <LCTL> = 66;
+    <LALT> = 68;
+    <SPCE> = 69;
+    <RALT> = 70;
+    <RCTL> = 72;
+
+    <ESC>  = 118;
+    <FK01> = 120;
+    <FK02> = 121;
+    <FK03> = 122;
+    <FK04> = 123;
+    <FK05> = 124;
+    <FK06> = 125;
+    <FK07> = 126;
+    <FK08> = 127;
+    <FK09> = 128;
+    <FK10> = 129;
+    <FK11> = 130;
+    <FK12> = 131;
+
+    <PRSC> = 132;
+    <SCLK> = 133;
+    <PAUS> = 134;
+
+    <INS>  = 83;
+    <HOME> = 88;
+    <PGUP> = 93;
+    <DELE> = 84;
+    <END>  = 89;
+    <PGDN> = 94;
+
+    <UP>   = 91;
+    <LEFT> = 87;
+    <DOWN> = 92;
+    <RGHT> = 97;
+
+    <NMLK> = 98;
+    <KPDV> = 103;
+    <KPMU> = 108;
+    <KPSU> = 113;
+
+     <KP7> = 99;
+     <KP8> = 104;
+     <KP9> = 109;
+    <KPAD> = 114;
+
+     <KP4> = 100;
+     <KP5> = 105;
+     <KP6> = 110;
+
+     <KP1> = 101;
+     <KP2> = 106;
+     <KP3> = 111;
+    <KPEN> = 116;
+
+     <KP0> = 107;
+    <KPDL> = 112;
+
+    indicator 1 = "Caps Lock";
+    indicator 2 = "Num Lock";
+    indicator 3 = "Scroll Lock";
+};
+xkb_keycodes "rs6k-102" {
+    include "ibm(rs6k-101)"
+    <LSGT> = 53;
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/macintosh b/xorg-server/xkeyboard-config/keycodes/macintosh
index a6e6ee061..4c76e5ed2 100644
--- a/xorg-server/xkeyboard-config/keycodes/macintosh
+++ b/xorg-server/xkeyboard-config/keycodes/macintosh
@@ -1,208 +1,208 @@
-//
-//Copyright (c) 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.
-//
-//
-default xkb_keycodes "macintosh" {
-   include "xfree86"
-
-   <FK13> = 182;
-   <FK14> = 183;
-   <FK15> = 184;
-   <KPEQ> = 157;
-   
-};
-
-xkb_keycodes "old" {
-
-    minimum= 8;
-    maximum= 255;
-
-    <ESC>  = 61;
-    <TLDE> = 58;
-    <AE01> = 26;
-    <AE02> = 27;
-    <AE03> = 28;
-    <AE04> = 29;
-    <AE05> = 31;
-    <AE06> = 30;
-    <AE07> = 34;
-    <AE08> = 36;
-    <AE09> = 33;
-    <AE10> = 37;
-    <AE11> = 35;
-    <AE12> = 32;
-    <BKSP> = 59;
-
-    <TAB>  = 56;
-    <AD01> = 20;
-    <AD02> = 21;
-    <AD03> = 22;
-    <AD04> = 23;
-    <AD05> = 25;
-    <AD06> = 24;
-    <AD07> = 40;
-    <AD08> = 42;
-    <AD09> = 39;
-    <AD10> = 43;
-    <AD11> = 41;
-    <AD12> = 38;
-    <BKSL> = 50;
-
-    <CAPS> = 65;
-    <AC01> = 8;
-    <AC02> = 9;
-    <AC03> = 10;
-    <AC04> = 11;
-    <AC05> = 13;
-    <AC06> = 12;
-    <AC07> = 46;
-    <AC08> = 48;
-    <AC09> = 45;
-    <AC10> = 49;
-    <AC11> = 47;
-    <RTRN> = 44;
-
-    <LSGT> = 18;
-    <AB01> = 14;
-    <AB02> = 15;
-    <AB03> = 16;
-    <AB04> = 17;
-    <AB05> = 19;
-    <AB06> = 53;
-    <AB07> = 54;
-    <AB08> = 51;
-    <AB09> = 55;
-    <AB10> = 52;
-
-    <SPCE> = 57;
-
-    <LCTL> = 62;  // Left Control
-    <LALT> = 63;  // Left Option
-    <LFSH> = 64;  // Left Shift
-    <RALT> = 66;  // Left Command
-//    <RTSH> = 131; // Right Shift
-//    <RALT> = 132; // Right Command
-//    <RCTL> = 133; // Right Control
-//    <RMTA> = 134; // Right Option
-
-    <FK01> = 130;
-    <FK02> = 128;
-    <FK03> = 107;
-    <FK04> = 126;
-    <FK05> = 104;
-    <FK06> = 105;
-    <FK07> = 106;
-    <FK08> = 108;
-    <FK09> = 109;
-    <FK10> = 117;
-    <FK11> = 111;
-    <FK12> = 119;
-
-    <PRSC> = 113;
-    <SCLK> = 115;
-    <PAUS> = 121;
-
-    <INS>  = 122;
-    <HOME> = 123;
-    <PGUP> = 124;
-    <DELE> = 125;
-    <END>  = 127;
-    <PGDN> = 129;
-
-    <UP>   = 70;
-    <LEFT> = 67;
-    <DOWN> = 69;
-    <RGHT> = 68;
-
-    <NMLK> = 79;
-    <KPEQ> = 89;
-    <KPDV> = 83;
-    <KPMU> = 75;
-
-    <KP7>  = 97;
-    <KP8>  = 99;
-    <KP9>  = 100;
-    <KPSU> = 86;
-
-    <KP4>  = 94;
-    <KP5>  = 95;
-    <KP6>  = 96;
-    <KPAD> = 77;
-
-    <KP1>  = 91;
-    <KP2>  = 92;
-    <KP3>  = 93;
-    <KPEN> = 84;
-
-    <KP0>  = 90;
-    <KPDL> = 73;
-
-    indicator 3 = "Scroll Lock";
-    indicator 2 = "Num Lock";
-    indicator 1 = "Caps Lock";
-
-    alias <ALGR> = <RALT>;
-};
-
-xkb_keycodes "hhk" {
-   include "macintosh"
-
-    <AC12> = 51;
-
-    <LWIN> = 49;
-    <EISU> = 131;
-    <KANA> = 129;
-    <RWIN> = 208;
-
-    <FK13> = 111;
-    <FK14> = 78;
-    <FK15> = 110;
-};
-
-// Aluminium Keyboards
-xkb_keycodes "alukbd" {
-    include "xfree86"
-
-    // Fkeys missing in xfree86 keycodes
-    <FK18> = 129;
-    <FK19> = 130;
-
-    // Eject key that matches the geometry definition
-    alias <I169> = <K6C>;
-
-    // Japanese keypad separator (KPSP in base, JPCM in evdev)
-    alias <JPCM> = <KPDC>;
-};
-
-// Aluminium Keyboards JIS
-// As of HID Usage Table v1.11, it seems there are no usages
-// for keys EISU or KANA. JIS Aluminium Keyboards overcome
-// this by outputting usages of keys Hanja and Hangul
-xkb_keycodes "jisevdev" {
-    alias <KANA> = <HJCV>;   // Switch to kana mode
-    alias <EISU> = <HNGL>;   // Switch to alphanumeric mode
-};
+//
+//Copyright (c) 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.
+//
+//
+default xkb_keycodes "macintosh" {
+   include "xfree86"
+
+   <FK13> = 182;
+   <FK14> = 183;
+   <FK15> = 184;
+   <KPEQ> = 157;
+   
+};
+
+xkb_keycodes "old" {
+
+    minimum= 8;
+    maximum= 255;
+
+    <ESC>  = 61;
+    <TLDE> = 58;
+    <AE01> = 26;
+    <AE02> = 27;
+    <AE03> = 28;
+    <AE04> = 29;
+    <AE05> = 31;
+    <AE06> = 30;
+    <AE07> = 34;
+    <AE08> = 36;
+    <AE09> = 33;
+    <AE10> = 37;
+    <AE11> = 35;
+    <AE12> = 32;
+    <BKSP> = 59;
+
+    <TAB>  = 56;
+    <AD01> = 20;
+    <AD02> = 21;
+    <AD03> = 22;
+    <AD04> = 23;
+    <AD05> = 25;
+    <AD06> = 24;
+    <AD07> = 40;
+    <AD08> = 42;
+    <AD09> = 39;
+    <AD10> = 43;
+    <AD11> = 41;
+    <AD12> = 38;
+    <BKSL> = 50;
+
+    <CAPS> = 65;
+    <AC01> = 8;
+    <AC02> = 9;
+    <AC03> = 10;
+    <AC04> = 11;
+    <AC05> = 13;
+    <AC06> = 12;
+    <AC07> = 46;
+    <AC08> = 48;
+    <AC09> = 45;
+    <AC10> = 49;
+    <AC11> = 47;
+    <RTRN> = 44;
+
+    <LSGT> = 18;
+    <AB01> = 14;
+    <AB02> = 15;
+    <AB03> = 16;
+    <AB04> = 17;
+    <AB05> = 19;
+    <AB06> = 53;
+    <AB07> = 54;
+    <AB08> = 51;
+    <AB09> = 55;
+    <AB10> = 52;
+
+    <SPCE> = 57;
+
+    <LCTL> = 62;  // Left Control
+    <LALT> = 63;  // Left Option
+    <LFSH> = 64;  // Left Shift
+    <RALT> = 66;  // Left Command
+//    <RTSH> = 131; // Right Shift
+//    <RALT> = 132; // Right Command
+//    <RCTL> = 133; // Right Control
+//    <RMTA> = 134; // Right Option
+
+    <FK01> = 130;
+    <FK02> = 128;
+    <FK03> = 107;
+    <FK04> = 126;
+    <FK05> = 104;
+    <FK06> = 105;
+    <FK07> = 106;
+    <FK08> = 108;
+    <FK09> = 109;
+    <FK10> = 117;
+    <FK11> = 111;
+    <FK12> = 119;
+
+    <PRSC> = 113;
+    <SCLK> = 115;
+    <PAUS> = 121;
+
+    <INS>  = 122;
+    <HOME> = 123;
+    <PGUP> = 124;
+    <DELE> = 125;
+    <END>  = 127;
+    <PGDN> = 129;
+
+    <UP>   = 70;
+    <LEFT> = 67;
+    <DOWN> = 69;
+    <RGHT> = 68;
+
+    <NMLK> = 79;
+    <KPEQ> = 89;
+    <KPDV> = 83;
+    <KPMU> = 75;
+
+    <KP7>  = 97;
+    <KP8>  = 99;
+    <KP9>  = 100;
+    <KPSU> = 86;
+
+    <KP4>  = 94;
+    <KP5>  = 95;
+    <KP6>  = 96;
+    <KPAD> = 77;
+
+    <KP1>  = 91;
+    <KP2>  = 92;
+    <KP3>  = 93;
+    <KPEN> = 84;
+
+    <KP0>  = 90;
+    <KPDL> = 73;
+
+    indicator 3 = "Scroll Lock";
+    indicator 2 = "Num Lock";
+    indicator 1 = "Caps Lock";
+
+    alias <ALGR> = <RALT>;
+};
+
+xkb_keycodes "hhk" {
+   include "macintosh"
+
+    <AC12> = 51;
+
+    <LWIN> = 49;
+    <EISU> = 131;
+    <KANA> = 129;
+    <RWIN> = 208;
+
+    <FK13> = 111;
+    <FK14> = 78;
+    <FK15> = 110;
+};
+
+// Aluminium Keyboards
+xkb_keycodes "alukbd" {
+    include "xfree86"
+
+    // Fkeys missing in xfree86 keycodes
+    <FK18> = 129;
+    <FK19> = 130;
+
+    // Eject key that matches the geometry definition
+    alias <I169> = <K6C>;
+
+    // Japanese keypad separator (KPSP in base, JPCM in evdev)
+    alias <JPCM> = <KPDC>;
+};
+
+// Aluminium Keyboards JIS
+// As of HID Usage Table v1.11, it seems there are no usages
+// for keys EISU or KANA. JIS Aluminium Keyboards overcome
+// this by outputting usages of keys Hanja and Hangul
+xkb_keycodes "jisevdev" {
+    alias <KANA> = <HJCV>;   // Switch to kana mode
+    alias <EISU> = <HNGL>;   // Switch to alphanumeric mode
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/sgi_vndr/Makefile.am b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/Makefile.am
index f601268e2..5680fd8a5 100644
--- a/xorg-server/xkeyboard-config/keycodes/sgi_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/Makefile.am
@@ -1,4 +1,4 @@
-keycodesdir = $(xkb_base)/keycodes/sgi_vndr
-
-dist_keycodes_DATA = \
-indigo indy iris
+keycodesdir = $(xkb_base)/keycodes/sgi_vndr
+
+dist_keycodes_DATA = \
+indigo indy iris
diff --git a/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indigo b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indigo
index 2f5f45bfc..1ce551da5 100644
--- a/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indigo
+++ b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indigo
@@ -1,139 +1,139 @@
-default xkb_keycodes "pc101" {
-    minimum= 8;
-    maximum= 255;
-
-    <TLDE> = 62;
-    <AE01> = 15;
-    <AE02> = 21;
-    <AE03> = 22;
-    <AE04> = 29;
-    <AE05> = 30;
-    <AE06> = 37;
-    <AE07> = 38;
-    <AE08> = 45;
-    <AE09> = 46;
-    <AE10> = 53;
-    <AE11> = 54;
-    <AE12> = 61;
-    <BKSP> = 68;
-
-    <TAB>  = 16;
-    <AD01> = 17;
-    <AD02> = 23;
-    <AD03> = 24;
-    <AD04> = 31;
-    <AD05> = 32;
-    <AD06> = 39;
-    <AD07> = 40;
-    <AD08> = 47;
-    <AD09> = 48;
-    <AD10> = 55;
-    <AD11> = 56;
-    <AD12> = 63;
-    <RTRN> = 58;
-
-    <CAPS> = 11;
-    <AC01> = 18;
-    <AC02> = 19;
-    <AC03> = 25;
-    <AC04> = 26;
-    <AC05> = 33;
-    <AC06> = 34;
-    <AC07> = 41;
-    <AC08> = 42;
-    <AC09> = 49;
-    <AC10> = 50;
-    <AC11> = 57;
-
-    <LFSH> = 13;
-    <AB01> = 27;
-    <AB02> = 28;
-    <AB03> = 35;
-    <AB04> = 36;
-    <AB05> = 43;
-    <AB06> = 44;
-    <AB07> = 51;
-    <AB08> = 52;
-    <AB09> = 59;
-    <AB10> = 60;
-    <RTSH> = 12;
-    <BKSL> = 64;
-
-    <LALT> = 91;
-    <LCTL> = 10;
-    <SPCE> = 90;
-    <RCTL> = 93;
-    <RALT> = 92;
-
-    <ESC>  = 14;
-    <FK01> = 94;
-    <FK02> = 95;
-    <FK03> = 96;
-    <FK04> = 97;
-    <FK05> = 98;
-    <FK06> = 99;
-    <FK07> = 100;
-    <FK08> = 101;
-    <FK09> = 102;
-    <FK10> = 103;
-    <FK11> = 104;
-    <FK12> = 105;
-
-    <PRSC> = 106;
-    <SCLK> = 107;
-    <PAUS> = 108;
-
-    <INS>  = 109;
-    <HOME> = 110;
-    <PGUP> = 111;
-    <DELE> = 69;
-    <END>  = 112;
-    <PGDN> = 113;
-
-    <UP>   = 88;
-    <LEFT> = 80;
-    <DOWN> = 81;
-    <RGHT> = 87;
-
-    <NMLK> = 114;
-    <KPDV> = 115;
-    <KPMU> = 116;
-    <KPSU> = 83;
-
-    <KP7>  = 74;
-    <KP8>  = 75;
-    <KP9>  = 82;
-    <KPAD> = 117;
-
-    <KP4>  = 70;
-    <KP5>  = 76;
-    <KP6>  = 77;
-
-    <KP1>  = 65;
-    <KP2>  = 71;
-    <KP3>  = 72;
-    <KPEN> = 89;
-
-    <KP0>  = 66;
-    <KPDL> = 73;
-
-    alias <AE00> = <TLDE>;
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-    alias <AA01> = <LALT>;
-    alias <AA09> = <RALT>;
-    alias <ALGR> = <RALT>;
-    alias <AA12> = <RCTL>;
-
-    virtual indicator 1 = "L1";
-    virtual indicator 2 = "L2";
-    virtual indicator 3 = "L3";
-    virtual indicator 4 = "L4";
-    indicator 5 = "Caps Lock";
-    indicator 6 = "Num Lock";
-    indicator 7 = "Scroll Lock";
-};
-xkb_keycodes "pc102" {
-    include "sgi_vndr/indigo(pc101)"
-    <LSGT> = 118;
-};
+default xkb_keycodes "pc101" {
+    minimum= 8;
+    maximum= 255;
+
+    <TLDE> = 62;
+    <AE01> = 15;
+    <AE02> = 21;
+    <AE03> = 22;
+    <AE04> = 29;
+    <AE05> = 30;
+    <AE06> = 37;
+    <AE07> = 38;
+    <AE08> = 45;
+    <AE09> = 46;
+    <AE10> = 53;
+    <AE11> = 54;
+    <AE12> = 61;
+    <BKSP> = 68;
+
+    <TAB>  = 16;
+    <AD01> = 17;
+    <AD02> = 23;
+    <AD03> = 24;
+    <AD04> = 31;
+    <AD05> = 32;
+    <AD06> = 39;
+    <AD07> = 40;
+    <AD08> = 47;
+    <AD09> = 48;
+    <AD10> = 55;
+    <AD11> = 56;
+    <AD12> = 63;
+    <RTRN> = 58;
+
+    <CAPS> = 11;
+    <AC01> = 18;
+    <AC02> = 19;
+    <AC03> = 25;
+    <AC04> = 26;
+    <AC05> = 33;
+    <AC06> = 34;
+    <AC07> = 41;
+    <AC08> = 42;
+    <AC09> = 49;
+    <AC10> = 50;
+    <AC11> = 57;
+
+    <LFSH> = 13;
+    <AB01> = 27;
+    <AB02> = 28;
+    <AB03> = 35;
+    <AB04> = 36;
+    <AB05> = 43;
+    <AB06> = 44;
+    <AB07> = 51;
+    <AB08> = 52;
+    <AB09> = 59;
+    <AB10> = 60;
+    <RTSH> = 12;
+    <BKSL> = 64;
+
+    <LALT> = 91;
+    <LCTL> = 10;
+    <SPCE> = 90;
+    <RCTL> = 93;
+    <RALT> = 92;
+
+    <ESC>  = 14;
+    <FK01> = 94;
+    <FK02> = 95;
+    <FK03> = 96;
+    <FK04> = 97;
+    <FK05> = 98;
+    <FK06> = 99;
+    <FK07> = 100;
+    <FK08> = 101;
+    <FK09> = 102;
+    <FK10> = 103;
+    <FK11> = 104;
+    <FK12> = 105;
+
+    <PRSC> = 106;
+    <SCLK> = 107;
+    <PAUS> = 108;
+
+    <INS>  = 109;
+    <HOME> = 110;
+    <PGUP> = 111;
+    <DELE> = 69;
+    <END>  = 112;
+    <PGDN> = 113;
+
+    <UP>   = 88;
+    <LEFT> = 80;
+    <DOWN> = 81;
+    <RGHT> = 87;
+
+    <NMLK> = 114;
+    <KPDV> = 115;
+    <KPMU> = 116;
+    <KPSU> = 83;
+
+    <KP7>  = 74;
+    <KP8>  = 75;
+    <KP9>  = 82;
+    <KPAD> = 117;
+
+    <KP4>  = 70;
+    <KP5>  = 76;
+    <KP6>  = 77;
+
+    <KP1>  = 65;
+    <KP2>  = 71;
+    <KP3>  = 72;
+    <KPEN> = 89;
+
+    <KP0>  = 66;
+    <KPDL> = 73;
+
+    alias <AE00> = <TLDE>;
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+    alias <AA01> = <LALT>;
+    alias <AA09> = <RALT>;
+    alias <ALGR> = <RALT>;
+    alias <AA12> = <RCTL>;
+
+    virtual indicator 1 = "L1";
+    virtual indicator 2 = "L2";
+    virtual indicator 3 = "L3";
+    virtual indicator 4 = "L4";
+    indicator 5 = "Caps Lock";
+    indicator 6 = "Num Lock";
+    indicator 7 = "Scroll Lock";
+};
+xkb_keycodes "pc102" {
+    include "sgi_vndr/indigo(pc101)"
+    <LSGT> = 118;
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indy b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indy
index aab3749b5..55cb18950 100644
--- a/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indy
+++ b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/indy
@@ -1,202 +1,202 @@
-default xkb_keycodes "universal" {
-    minimum= 8;
-    maximum= 255;
-    include "sgi_vndr/indy(pc105)"
-    alternate <BKSL> = 91;
-    alternate <BKSL> = 100;
-    alternate <BKSL> = 101;
-};
-xkb_keycodes "pc101" {
-    minimum= 8;
-    maximum= 255;
-
-    <TLDE> = 22;
-    <AE01> = 30;
-    <AE02> = 38;
-    <AE03> = 46;
-    <AE04> = 45;
-    <AE05> = 54;
-    <AE06> = 62;
-    <AE07> = 69;
-    <AE08> = 70;
-    <AE09> = 78;
-    <AE10> = 77;
-    <AE11> = 86;
-    <AE12> = 93;
-    <BKSP> = 110;
-
-    <TAB>  = 21;
-    <AD01> = 29;
-    <AD02> = 37;
-    <AD03> = 44;
-    <AD04> = 53;
-    <AD05> = 52;
-    <AD06> = 61;
-    <AD07> = 68;
-    <AD08> = 75;
-    <AD09> = 76;
-    <AD10> = 85;
-    <AD11> = 92;
-    <AD12> = 99;
-    <RTRN> = 98;
-
-    <CAPS> = 28;
-    <AC01> = 36;
-    <AC02> = 35;
-    <AC03> = 43;
-    <AC04> = 51;
-    <AC05> = 60;
-    <AC06> = 59;
-    <AC07> = 67;
-    <AC08> = 74;
-    <AC09> = 83;
-    <AC10> = 84;
-    <AC11> = 90;
-
-    <LFSH> = 26;
-    <AB01> = 34;
-    <AB02> = 42;
-    <AB03> = 41;
-    <AB04> = 50;
-    <AB05> = 58;
-    <AB06> = 57;
-    <AB07> = 66;
-    <AB08> = 73;
-    <AB09> = 81;
-    <AB10> = 82;
-    <RTSH> = 97;
-    <BKSL> = 100;
-
-    <LALT> = 33;
-    <LCTL> = 25;
-    <SPCE> = 49;
-    <RCTL> = 96;
-    <RALT> = 65;
-
-    <ESC>  = 16;
-    <FK01> = 15;
-    <FK02> = 23;
-    <FK03> = 31;
-    <FK04> = 39;
-    <FK05> = 47;
-    <FK06> = 55;
-    <FK07> = 63;
-    <FK08> = 71;
-    <FK09> = 79;
-    <FK10> = 87;
-    <FK11> = 94;
-    <FK12> = 102;
-
-    <PRSC> = 95;
-    <SCLK> = 103;
-    <PAUS> = 106;
-
-    <INS>  = 111;
-    <HOME> = 118;
-    <PGUP> = 119;
-    <DELE> = 108;
-    <END>  = 109;
-    <PGDN> = 117;
-
-    <UP>   = 107;
-    <LEFT> = 105;
-    <DOWN> = 104;
-    <RGHT> = 114;
-
-    <NMLK> = 126;
-    <KPDV> = 127;
-    <KPMU> = 134;
-    <KPSU> = 140;
-
-    <KP7>  = 116;
-    <KP8>  = 125;
-    <KP9>  = 133;
-    <KPAD> = 132;
-
-    <KP4>  = 115;
-    <KP5>  = 123;
-    <KP6>  = 124;
-
-    <KP1>  = 113;
-    <KP2>  = 122;
-    <KP3>  = 130;
-    <KPEN> = 129;
-
-    <KP0>  = 120;
-    <KPDL> = 121;
-
-    alias <AE00> = <TLDE>;
-    alias <AC00> = <CAPS>;
-    alias <AA00> = <LCTL>;
-    alias <AA01> = <LALT>;
-    alias <AA09> = <RALT>;
-    alias <ALGR> = <RALT>;
-    alias <AA12> = <RCTL>;
-
-    virtual indicator 1 = "L1";
-    virtual indicator 2 = "L2";
-    virtual indicator 3 = "L3";
-    virtual indicator 4 = "L4";
-    indicator 5 = "Caps Lock";
-    indicator 6 = "Num Lock";
-    indicator 7 = "Scroll Lock";
-
-};
-xkb_keycodes "pc102" {
-    <BKSL> = 91;
-    <LSGT> = 27;
-    augment "sgi_vndr/indy(pc101)"
-    maximum= 255;
-    minimum= 8;
-};
-xkb_keycodes "pc104" {
-    include "sgi_vndr/indy(pc101)"
-    minimum= 8;
-    maximum= 255;
-
-    // These key names are here to support so-called "Windows95"
-    // keyboards like the Microsoft Natural keyboard.
-    <LWIN> = 147;
-    <RWIN> = 148;
-    <MENU> = 149;
-};
-xkb_keycodes "pc105" {
-    <LSGT> = 27;
-    augment "sgi_vndr/indy(pc104)"
-    minimum= 8;
-    maximum= 255;
-};
-xkb_keycodes "jp106" {
-    <HZTG> = 22;
-    <AB11> = 89;
-    <AC12> = 91;
-    <NFER> = 141;
-    <XFER> = 142;
-    <HKTG> = 143;
-    alias <TLDE> = <HZTG>;
-    alias <AE00> = <HZTG>;
-    alias <AE13> = <BKSL>;
-    augment "sgi_vndr/indy(pc101)"
-    minimum= 8;
-    maximum= 255;
-};
-// can be combined with any other "indy" keycode
-// description to add virtual keys which can be
-// used to implement an overlay-based numeric
-// keypad.
-partial hidden xkb_keycodes "overlayKeypad" {
-    <KO7> = 17;
-    <KO8> = 18;
-    <KO9> = 19;
-    <KO6> = 146;
-    <KO5> = 145;
-    <KO4> = 144;
-    <KO1> = 136;
-    <KO2> = 137;
-    <KO3> = 138;
-    <KO0> = 135;
-    <KODL> = 139;
-};
-partial hidden xkb_keycodes "shiftLock" {
-    indicator 5 = "Shift Lock";
-};
+default xkb_keycodes "universal" {
+    minimum= 8;
+    maximum= 255;
+    include "sgi_vndr/indy(pc105)"
+    alternate <BKSL> = 91;
+    alternate <BKSL> = 100;
+    alternate <BKSL> = 101;
+};
+xkb_keycodes "pc101" {
+    minimum= 8;
+    maximum= 255;
+
+    <TLDE> = 22;
+    <AE01> = 30;
+    <AE02> = 38;
+    <AE03> = 46;
+    <AE04> = 45;
+    <AE05> = 54;
+    <AE06> = 62;
+    <AE07> = 69;
+    <AE08> = 70;
+    <AE09> = 78;
+    <AE10> = 77;
+    <AE11> = 86;
+    <AE12> = 93;
+    <BKSP> = 110;
+
+    <TAB>  = 21;
+    <AD01> = 29;
+    <AD02> = 37;
+    <AD03> = 44;
+    <AD04> = 53;
+    <AD05> = 52;
+    <AD06> = 61;
+    <AD07> = 68;
+    <AD08> = 75;
+    <AD09> = 76;
+    <AD10> = 85;
+    <AD11> = 92;
+    <AD12> = 99;
+    <RTRN> = 98;
+
+    <CAPS> = 28;
+    <AC01> = 36;
+    <AC02> = 35;
+    <AC03> = 43;
+    <AC04> = 51;
+    <AC05> = 60;
+    <AC06> = 59;
+    <AC07> = 67;
+    <AC08> = 74;
+    <AC09> = 83;
+    <AC10> = 84;
+    <AC11> = 90;
+
+    <LFSH> = 26;
+    <AB01> = 34;
+    <AB02> = 42;
+    <AB03> = 41;
+    <AB04> = 50;
+    <AB05> = 58;
+    <AB06> = 57;
+    <AB07> = 66;
+    <AB08> = 73;
+    <AB09> = 81;
+    <AB10> = 82;
+    <RTSH> = 97;
+    <BKSL> = 100;
+
+    <LALT> = 33;
+    <LCTL> = 25;
+    <SPCE> = 49;
+    <RCTL> = 96;
+    <RALT> = 65;
+
+    <ESC>  = 16;
+    <FK01> = 15;
+    <FK02> = 23;
+    <FK03> = 31;
+    <FK04> = 39;
+    <FK05> = 47;
+    <FK06> = 55;
+    <FK07> = 63;
+    <FK08> = 71;
+    <FK09> = 79;
+    <FK10> = 87;
+    <FK11> = 94;
+    <FK12> = 102;
+
+    <PRSC> = 95;
+    <SCLK> = 103;
+    <PAUS> = 106;
+
+    <INS>  = 111;
+    <HOME> = 118;
+    <PGUP> = 119;
+    <DELE> = 108;
+    <END>  = 109;
+    <PGDN> = 117;
+
+    <UP>   = 107;
+    <LEFT> = 105;
+    <DOWN> = 104;
+    <RGHT> = 114;
+
+    <NMLK> = 126;
+    <KPDV> = 127;
+    <KPMU> = 134;
+    <KPSU> = 140;
+
+    <KP7>  = 116;
+    <KP8>  = 125;
+    <KP9>  = 133;
+    <KPAD> = 132;
+
+    <KP4>  = 115;
+    <KP5>  = 123;
+    <KP6>  = 124;
+
+    <KP1>  = 113;
+    <KP2>  = 122;
+    <KP3>  = 130;
+    <KPEN> = 129;
+
+    <KP0>  = 120;
+    <KPDL> = 121;
+
+    alias <AE00> = <TLDE>;
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+    alias <AA01> = <LALT>;
+    alias <AA09> = <RALT>;
+    alias <ALGR> = <RALT>;
+    alias <AA12> = <RCTL>;
+
+    virtual indicator 1 = "L1";
+    virtual indicator 2 = "L2";
+    virtual indicator 3 = "L3";
+    virtual indicator 4 = "L4";
+    indicator 5 = "Caps Lock";
+    indicator 6 = "Num Lock";
+    indicator 7 = "Scroll Lock";
+
+};
+xkb_keycodes "pc102" {
+    <BKSL> = 91;
+    <LSGT> = 27;
+    augment "sgi_vndr/indy(pc101)"
+    maximum= 255;
+    minimum= 8;
+};
+xkb_keycodes "pc104" {
+    include "sgi_vndr/indy(pc101)"
+    minimum= 8;
+    maximum= 255;
+
+    // These key names are here to support so-called "Windows95"
+    // keyboards like the Microsoft Natural keyboard.
+    <LWIN> = 147;
+    <RWIN> = 148;
+    <MENU> = 149;
+};
+xkb_keycodes "pc105" {
+    <LSGT> = 27;
+    augment "sgi_vndr/indy(pc104)"
+    minimum= 8;
+    maximum= 255;
+};
+xkb_keycodes "jp106" {
+    <HZTG> = 22;
+    <AB11> = 89;
+    <AC12> = 91;
+    <NFER> = 141;
+    <XFER> = 142;
+    <HKTG> = 143;
+    alias <TLDE> = <HZTG>;
+    alias <AE00> = <HZTG>;
+    alias <AE13> = <BKSL>;
+    augment "sgi_vndr/indy(pc101)"
+    minimum= 8;
+    maximum= 255;
+};
+// can be combined with any other "indy" keycode
+// description to add virtual keys which can be
+// used to implement an overlay-based numeric
+// keypad.
+partial hidden xkb_keycodes "overlayKeypad" {
+    <KO7> = 17;
+    <KO8> = 18;
+    <KO9> = 19;
+    <KO6> = 146;
+    <KO5> = 145;
+    <KO4> = 144;
+    <KO1> = 136;
+    <KO2> = 137;
+    <KO3> = 138;
+    <KO0> = 135;
+    <KODL> = 139;
+};
+partial hidden xkb_keycodes "shiftLock" {
+    indicator 5 = "Shift Lock";
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/sgi_vndr/iris b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/iris
index 18068175d..047334712 100644
--- a/xorg-server/xkeyboard-config/keycodes/sgi_vndr/iris
+++ b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/iris
@@ -1,10 +1,10 @@
-default xkb_keycodes "iris" {
-    include "sgi_vndr/indigo(pc101)"
-    indicator 1 = "L1";
-    indicator 2 = "L2";
-    indicator 3 = "L3";
-    indicator 4 = "L4";
-    indicator 5 = "Caps Lock";
-    indicator 6 = "Num Lock";
-    indicator 7 = "Scroll Lock";
-};
+default xkb_keycodes "iris" {
+    include "sgi_vndr/indigo(pc101)"
+    indicator 1 = "L1";
+    indicator 2 = "L2";
+    indicator 3 = "L3";
+    indicator 4 = "L4";
+    indicator 5 = "Caps Lock";
+    indicator 6 = "Num Lock";
+    indicator 7 = "Scroll Lock";
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/sony b/xorg-server/xkeyboard-config/keycodes/sony
index def1eaf6b..5c034711f 100644
--- a/xorg-server/xkeyboard-config/keycodes/sony
+++ b/xorg-server/xkeyboard-config/keycodes/sony
@@ -1,141 +1,141 @@
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//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 OPEN GROUP 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 Open Group 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 Open Group.
-//
-xkb_keycodes "nwp5461" {
-
-     <ESC> = 18;
-    <AE01> = 19;
-    <AE02> = 20;
-    <AE03> = 21;
-    <AE04> = 22;
-    <AE05> = 23;
-    <AE06> = 24;
-    <AE07> = 25;
-    <AE08> = 26;
-    <AE09> = 27;
-    <AE10> = 28;
-    <AE11> = 29;
-    <AE12> = 30;
-    <BKSL> = 31;
-    <BKSP> = 32;
-
-    <TAB>  = 33;
-    <AD01> = 34;
-    <AD02> = 35;
-    <AD03> = 36;
-    <AD04> = 37;
-    <AD05> = 38;
-    <AD06> = 39;
-    <AD07> = 40;
-    <AD08> = 41;
-    <AD09> = 42;
-    <AD10> = 43;
-    <AD11> = 44;
-    <AD12> = 45;
-    <DELE> = 46;
-
-    <LCTL> = 47;
-    <AC01> = 48;
-    <AC02> = 49;
-    <AC03> = 50;
-    <AC04> = 51;
-    <AC05> = 52;
-    <AC06> = 53;
-    <AC07> = 54;
-    <AC08> = 55;
-    <AC09> = 56;
-    <AC10> = 57;
-    <AC11> = 58;
-    <TLDE> = 59;
-    <RTRN> = 60;
-
-    <LFSH> = 61;
-    <AB01> = 62;
-    <AB02> = 63;
-    <AB03> = 64;
-    <AB04> = 65;
-    <AB05> = 66;
-    <AB06> = 67;
-    <AB07> = 68;
-    <AB08> = 69;
-    <AB09> = 70;
-    <AB10> = 71;
-    <AB11> = 72;
-    <RTSH> = 73;
-
-    <LALT> = 74;
-    <CAPS> = 75;
-    <STOP> = 76;
-    <SPCE> = 77;
-     <CUT> = 78;
-    <EXEC> = 81;
-
-    <FK01> = 8;
-    <FK02> = 9;
-    <FK03> = 10;
-    <FK04> = 11;
-    <FK05> = 12;
-    <FK06> = 13;
-    <FK07> = 14;
-    <FK08> = 15;
-    <FK09> = 16;
-    <FK10> = 17;
-    <FK11> = 111;
-    <FK12> = 112;
-
-    <HELP> = 113;
-     <INS> = 114;
-     <CLR> = 115;
-    <PGUP> = 116;
-    <PGDN> = 117;
-
-    <KPTB> = 109;
-      <UP> = 95;
-    <LEFT> = 98;
-    <DOWN> = 99;
-    <RGHT> = 100;
-
-    <KPMU> = 107;
-    <KPDV> = 108;
-    <KPAD> = 89;
-
-     <KP7> = 82;
-     <KP8> = 83;
-     <KP9> = 84;
-    <KPSU> = 85;
-
-     <KP4> = 86;
-     <KP5> = 87;
-     <KP6> = 88;
-    <KPSP> = 93;
-
-     <KP1> = 90;
-     <KP2> = 91;
-     <KP3> = 92;
-    <KPEN> = 97;
-
-     <KP0> = 94;
-    <KPDC> = 96;
-};
+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//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 OPEN GROUP 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 Open Group 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 Open Group.
+//
+xkb_keycodes "nwp5461" {
+
+     <ESC> = 18;
+    <AE01> = 19;
+    <AE02> = 20;
+    <AE03> = 21;
+    <AE04> = 22;
+    <AE05> = 23;
+    <AE06> = 24;
+    <AE07> = 25;
+    <AE08> = 26;
+    <AE09> = 27;
+    <AE10> = 28;
+    <AE11> = 29;
+    <AE12> = 30;
+    <BKSL> = 31;
+    <BKSP> = 32;
+
+    <TAB>  = 33;
+    <AD01> = 34;
+    <AD02> = 35;
+    <AD03> = 36;
+    <AD04> = 37;
+    <AD05> = 38;
+    <AD06> = 39;
+    <AD07> = 40;
+    <AD08> = 41;
+    <AD09> = 42;
+    <AD10> = 43;
+    <AD11> = 44;
+    <AD12> = 45;
+    <DELE> = 46;
+
+    <LCTL> = 47;
+    <AC01> = 48;
+    <AC02> = 49;
+    <AC03> = 50;
+    <AC04> = 51;
+    <AC05> = 52;
+    <AC06> = 53;
+    <AC07> = 54;
+    <AC08> = 55;
+    <AC09> = 56;
+    <AC10> = 57;
+    <AC11> = 58;
+    <TLDE> = 59;
+    <RTRN> = 60;
+
+    <LFSH> = 61;
+    <AB01> = 62;
+    <AB02> = 63;
+    <AB03> = 64;
+    <AB04> = 65;
+    <AB05> = 66;
+    <AB06> = 67;
+    <AB07> = 68;
+    <AB08> = 69;
+    <AB09> = 70;
+    <AB10> = 71;
+    <AB11> = 72;
+    <RTSH> = 73;
+
+    <LALT> = 74;
+    <CAPS> = 75;
+    <STOP> = 76;
+    <SPCE> = 77;
+     <CUT> = 78;
+    <EXEC> = 81;
+
+    <FK01> = 8;
+    <FK02> = 9;
+    <FK03> = 10;
+    <FK04> = 11;
+    <FK05> = 12;
+    <FK06> = 13;
+    <FK07> = 14;
+    <FK08> = 15;
+    <FK09> = 16;
+    <FK10> = 17;
+    <FK11> = 111;
+    <FK12> = 112;
+
+    <HELP> = 113;
+     <INS> = 114;
+     <CLR> = 115;
+    <PGUP> = 116;
+    <PGDN> = 117;
+
+    <KPTB> = 109;
+      <UP> = 95;
+    <LEFT> = 98;
+    <DOWN> = 99;
+    <RGHT> = 100;
+
+    <KPMU> = 107;
+    <KPDV> = 108;
+    <KPAD> = 89;
+
+     <KP7> = 82;
+     <KP8> = 83;
+     <KP9> = 84;
+    <KPSU> = 85;
+
+     <KP4> = 86;
+     <KP5> = 87;
+     <KP6> = 88;
+    <KPSP> = 93;
+
+     <KP1> = 90;
+     <KP2> = 91;
+     <KP3> = 92;
+    <KPEN> = 97;
+
+     <KP0> = 94;
+    <KPDC> = 96;
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/sun b/xorg-server/xkeyboard-config/keycodes/sun
index 7cb38e304..ea696a8a1 100644
--- a/xorg-server/xkeyboard-config/keycodes/sun
+++ b/xorg-server/xkeyboard-config/keycodes/sun
@@ -1,950 +1,950 @@
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//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 OPEN GROUP 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 Open Group 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 Open Group.
-//
-// ---------------------------------------------------------------------------
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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 (including the next
-// paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
-//
-// ---------------------------------------------------------------------------
-//
-
-default xkb_keycodes "type4" {
-
-    minimum= 8;
-    maximum= 255;
-
-    <ESC>  = 36;
-    <AE01> = 37;
-    <AE02> = 38;
-    <AE03> = 39;
-    <AE04> = 40;
-    <AE05> = 41;
-    <AE06> = 42;
-    <AE07> = 43;
-    <AE08> = 44;
-    <AE09> = 45;
-    <AE10> = 46;
-    <AE11> = 47;
-    <AE12> = 48;
-    <TLDE> = 49;
-    <BKSP> = 50;
-
-    <TAB>  = 60;
-    <AD01> = 61;
-    <AD02> = 62;
-    <AD03> = 63;
-    <AD04> = 64;
-    <AD05> = 65;
-    <AD06> = 66;
-    <AD07> = 67;
-    <AD08> = 68;
-    <AD09> = 69;
-    <AD10> = 70;
-    <AD11> = 71;
-    <AD12> = 72;
-    <DELE> = 73;
-
-    <LCTL> = 83;
-    <AC01> = 84;
-    <AC02> = 85;
-    <AC03> = 86;
-    <AC04> = 87;
-    <AC05> = 88;
-    <AC06> = 89;
-    <AC07> = 90;
-    <AC08> = 91;
-    <AC09> = 92;
-    <AC10> = 93;
-    <AC11> = 94;
-    <BKSL> = 95;
-    <RTRN> = 96;
-
-    <LFSH> = 106;
-    <AB01> = 107;
-    <AB02> = 108;
-    <AB03> = 109;
-    <AB04> = 110;
-    <AB05> = 111;
-    <AB06> = 112;
-    <AB07> = 113;
-    <AB08> = 114;
-    <AB09> = 115;
-    <AB10> = 116;
-    <RTSH> = 117;
-    <LNFD> = 118;
-
-    <HELP> = 125;
-    <CAPS> = 126;
-    <LALT> = 26;
-    <LMTA> = 127;
-    <SPCE> = 128;
-    <RMTA> = 129;
-    <COMP> = 74;
-    <ALGR> = 20;
-    alias <RALT> = <ALGR>;
-
-    <FK01> = 12;
-    <FK02> = 13;
-    <FK03> = 15;
-    <FK04> = 17;
-    <FK05> = 19;
-    <FK06> = 21;
-    <FK07> = 23;
-    <FK08> = 24;
-    <FK09> = 25;
-    <FK10> = 14;
-    <FK11> = 16;
-    <FK12> = 18;
-
-    <STOP> = 8;
-    <AGAI> = 10;
-    <PROP> = 32;
-    <UNDO> = 33;
-    <FRNT> = 56;
-    <COPY> = 58;
-    <OPEN> = 79;
-    <PAST> = 80;
-    <FIND> = 102;
-    <CUT>  = 104;
-
-    <PRSC> = 29;
-    <SCLK> = 30;
-    <PAUS> = 28;
-
-    <NMLK> = 105;
-    <KPEQ> = 52;
-    <KPDV> = 53;
-    <KPMU> = 54;
-    <KPSU> = 78;
-
-    <KP7>  = 75;
-    <KP8>  = 76;
-    <KP9>  = 77;
-    <KPAD> = 132;
-
-    <KP4>  = 98;
-    <KP5>  = 99;
-    <KP6>  = 100;
-
-    <KP1>  = 119;
-    <KP2>  = 120;
-    <KP3>  = 121;
-    <KPEN> = 97;
-
-    <KP0>  = 101;
-    <KPDL> = 57;
-    indicator 4 = "Caps Lock";
-    indicator 3 = "Compose";
-    indicator 2 = "Scroll Lock";
-    indicator 1 = "Num Lock";
-};
-
-xkb_keycodes "type5" {
-
-    minimum= 8;
-    maximum= 255;
-
-    <ESC>  = 36;
-    <AE01> = 37;
-    <AE02> = 38;
-    <AE03> = 39;
-    <AE04> = 40;
-    <AE05> = 41;
-    <AE06> = 42;
-    <AE07> = 43;
-    <AE08> = 44;
-    <AE09> = 45;
-    <AE10> = 46;
-    <AE11> = 47;
-    <AE12> = 48;
-    <TLDE> = 49;
-    <BKSP> = 50;
-
-    <TAB>  = 60;
-    <AD01> = 61;
-    <AD02> = 62;
-    <AD03> = 63;
-    <AD04> = 64;
-    <AD05> = 65;
-    <AD06> = 66;
-    <AD07> = 67;
-    <AD08> = 68;
-    <AD09> = 69;
-    <AD10> = 70;
-    <AD11> = 71;
-    <AD12> = 72;
-    <DELE> = 73;
-    <COMP> = 74;
-    <ALGR> = 20;
-    alias <RALT> = <ALGR>;
-
-    <LCTL> = 83;
-    <AC01> = 84;
-    <AC02> = 85;
-    <AC03> = 86;
-    <AC04> = 87;
-    <AC05> = 88;
-    <AC06> = 89;
-    <AC07> = 90;
-    <AC08> = 91;
-    <AC09> = 92;
-    <AC10> = 93;
-    <AC11> = 94;
-    <BKSL> = 95;
-    <RTRN> = 96;
-
-    <LFSH> = 106;
-    <AB01> = 107;
-    <AB02> = 108;
-    <AB03> = 109;
-    <AB04> = 110;
-    <AB05> = 111;
-    <AB06> = 112;
-    <AB07> = 113;
-    <AB08> = 114;
-    <AB09> = 115;
-    <AB10> = 116;
-    <RTSH> = 117;
-
-    <LALT> = 26;
-    <CAPS> = 126;
-    <LMTA> = 127;
-    <SPCE> = 128;
-    <RMTA> = 129;
-
-    <FK01> = 12;
-    <FK02> = 13;
-    <FK03> = 15;
-    <FK04> = 17;
-    <FK05> = 19;
-    <FK06> = 21;
-    <FK07> = 23;
-    <FK08> = 24;
-    <FK09> = 25;
-    <FK10> = 14;
-    <FK11> = 16;
-    <FK12> = 18;
-    <STOP> = 8;
-    <AGAI> = 10;
-    <PROP> = 32;
-    <UNDO> = 33;
-    <FRNT> = 56;
-    <COPY> = 58;
-    <OPEN> = 79;
-    <PAST> = 80;
-    <FIND> = 102;
-    <CUT>  = 104;
-
-    <PRSC> = 29;
-    <SCLK> = 30;
-    <PAUS> = 28;
-
-    <NMLK> = 105;
-    <KPDV> = 53;
-    <KPMU> = 54;
-    <KPSU> = 78;
-
-    <KP7>  = 75;
-    <KP8>  = 76;
-    <KP9>  = 77;
-    <KPAD> = 132;
-
-    <KP4>  = 98;
-    <KP5>  = 99;
-    <KP6>  = 100;
-
-    <KP1>  = 119;
-    <KP2>  = 120;
-    <KP3>  = 121;
-    <KPEN> = 97;
-
-    <KP0>  = 101;
-    <KPDL> = 57;
-
-    <UP>   = 27;
-    <LEFT> = 31;
-    <DOWN> = 34;
-    <RGHT> = 35;
-
-    <INS>  = 51;
-    <HOME> = 59;
-    <END>  = 81;
-    <PGUP> = 103;
-    <PGDN> = 130;
-    <HELP> = 125;
-
-    <MUTE> = 52;
-    <VOL-> = 9;
-    <VOL+> = 11;
-    <POWR> = 55;
-    indicator 4 = "Caps Lock";
-    indicator 3 = "Compose";
-    indicator 2 = "Scroll Lock";
-    indicator 1 = "Num Lock";
-};
-
-xkb_keycodes "type4tuv" {
-    include "sun(type4)"
-    <LSGT> = 131;
-    <BRCR> = 22;
-};
-
-xkb_keycodes "type4_ca" {
-    include "sun(type4)"
-    <LSGT> = 131;
-};
-
-xkb_keycodes "type4_jp" {
-    include "sun(type4)"
-    <EXEC> = 122;
-    <KANJ> = 123;
-    <HENK> = 124;
-    <BRCR> = 22;
-    alias <UNDR> = <LNFD>;
-};
-
-xkb_keycodes "type4_euro" {
-    include "sun(type4)"
-    <LSGT> = 131;
-};
-
-xkb_keycodes "type5tuv" {
-    include "sun(type5)"
-    <LSGT> = 131;
-};
-
-xkb_keycodes "type5_jp" {
-    include "sun(type5)"
-    <EXEC> = 122;
-    <KANJ> = 123;
-    <HENK> = 124;
-    <UNDR> = 118;
-};
-
-xkb_keycodes "type5_euro" {
-    include "sun(type5)"
-    <LSGT> = 131;
-};
-
-xkb_keycodes "type5hobo" {
-
-    minimum= 8;
-    maximum= 255;
-
-    <ESC>  = 36;
-    <AE01> = 37;
-    <AE02> = 38;
-    <AE03> = 39;
-    <AE04> = 40;
-    <AE05> = 41;
-    <AE06> = 42;
-    <AE07> = 43;
-    <AE08> = 44;
-    <AE09> = 45;
-    <AE10> = 46;
-    <AE11> = 47;
-    <AE12> = 48;
-    <TLDE> = 49;
-    <BKSP> = 50;
-
-    <TAB>  = 60;
-    <AD01> = 61;
-    <AD02> = 62;
-    <AD03> = 63;
-    <AD04> = 64;
-    <AD05> = 65;
-    <AD06> = 66;
-    <AD07> = 67;
-    <AD08> = 68;
-    <AD09> = 69;
-    <AD10> = 70;
-    <AD11> = 71;
-    <AD12> = 72;
-    <DELE> = 73;
-    <COMP> = 74;
-    <ALGR> = 20;
-    alias <RALT> = <ALGR>;
-
-    <LCTL> = 83;
-    <AC01> = 84;
-    <AC02> = 85;
-    <AC03> = 86;
-    <AC04> = 87;
-    <AC05> = 88;
-    <AC06> = 89;
-    <AC07> = 90;
-    <AC08> = 91;
-    <AC09> = 92;
-    <AC10> = 93;
-    <AC11> = 94;
-    <BKSL> = 95;
-    <RTRN> = 96;
-
-    <LFSH> = 106;
-    <AB01> = 107;
-    <AB02> = 108;
-    <AB03> = 109;
-    <AB04> = 110;
-    <AB05> = 111;
-    <AB06> = 112;
-    <AB07> = 113;
-    <AB08> = 114;
-    <AB09> = 115;
-    <AB10> = 116;
-    <RTSH> = 117;
-
-    <LALT> = 26;
-    <CAPS> = 126;
-    <LMTA> = 127;
-    <SPCE> = 128;
-    <RMTA> = 129;
-
-    <FK01> = 12;
-    <FK02> = 13;
-    <FK03> = 15;
-    <FK04> = 17;
-    <FK05> = 19;
-    <FK06> = 21;
-    <FK07> = 23;
-    <FK08> = 24;
-    <FK09> = 25;
-    <FK10> = 14;
-    <FK11> = 16;
-    <FK12> = 18;
-    <STOP> = 8;
-    <AGAI> = 10;
-    <PROP> = 32;
-    <UNDO> = 33;
-    <FRNT> = 56;
-    <COPY> = 58;
-    <OPEN> = 79;
-    <PAST> = 80;
-    <FIND> = 102;
-    <CUT>  = 104;
-
-    <PRSC> = 29;
-    <SCLK> = 30;
-    <PAUS> = 28;
-
-    <NMLK> = 105;
-//     <KPDV> = 53;
-//     <KPMU> = 54;
-//     <KPSU> = 78;
-
-//     <KP7>  = 75;
-//     <KP8>  = 76;
-//     <KP9>  = 77;
-//     <KPAD> = 132;
-
-//     <KP4>  = 98;
-//     <KP5>  = 99;
-//     <KP6>  = 100;
-
-//     <KP1>  = 119;
-//     <KP2>  = 120;
-//     <KP3>  = 121;
-//     <KPEN> = 97;
-
-//     <KP0>  = 101;
-//     <KPDL> = 57;
-
-    <UP>   = 27;
-    <LEFT> = 31;
-    <DOWN> = 34;
-    <RGHT> = 35;
-
-    <INS>  = 51;
-    <HOME> = 59;
-    <END>  = 81;
-    <PGUP> = 103;
-    <PGDN> = 130;
-    <HELP> = 125;
-
-    <MUTE> = 52;
-    <VOL-> = 9;
-    <VOL+> = 11;
-    <POWR> = 55;
-    indicator 4 = "Caps Lock";
-    indicator 3 = "Compose";
-    indicator 2 = "Scroll Lock";
-    indicator 1 = "Num Lock";
-};
-
-xkb_keycodes "type5tuvhobo" {
-    include "sun(type5hobo)"
-    <LSGT> = 131;
-
-};
-
-xkb_keycodes "type5_jphobo" {
-    include "sun(type5hobo)"
-    <EXEC> = 122;
-    <KANJ> = 123;
-    <HENK> = 124;
-    <UNDR> = 118;
-};
-
-xkb_keycodes "type6" {
-    include "sun(type5)"
-};
-
-xkb_keycodes "type6tuv" {
-    include "sun(type5tuv)"
-};
-
-xkb_keycodes "type6unix" {
-    include "sun(type5)"
-};
-
-xkb_keycodes "type6_jp" {
-    include "sun(type5_jp)"
-};
-
-xkb_keycodes "type6_euro" {
-    include "sun(type5_euro)"
-};
-
-// Even though this is labeled as _usb, I verified these keycodes as accurate
-// on my type5 serial and type6 serial keyboards as well on linux-2.6 boxes.
-// I'm not sure where the "type5" keycodes above are coming from...
-xkb_keycodes "type6_usb" {
-    include "xfree86"
-
-    <STOP> = 232;
-    <AGAI> = 133;
-    <PROP> = 134;
-    <UNDO> = 135;
-    <FRNT> = 140;
-    <COPY> = 248;
-    <OPEN> = 191;
-    <PAST> = 192;
-    <FIND> = 122;
-    <CUT>  = 188;
-
-    <HELP> = 245;
-
-    // The blank has keycode 239 on my type6 serial kb, but 134 on
-    // my type6 usb keyboard (same as <PROP>)
-    <BLNK> = 239;
-
-    // AltGr + PrScr actually sends a different keycode
-    <SYRQ> = 92;
-
-    <MUTE> = 160;
-    <VOL-> = 174;
-    <VOL+> = 176;
-    <POWR> = 222;
-
-    indicator 4 = "Compose";
-};
-
-xkb_keycodes "type6tuv_usb" {
-    include "sun(type6_usb)"
-    <LSGT> = 94;
-//    <BKSL> = 51;
-};
-
-xkb_keycodes "type6_jp_usb" {
-    include "sun(type6_usb)"
-    alias <UNDR> = <KPDC>;  // 123
-    alias <EXEC> = <I0B>;   // 139 
-    alias <KANJ> = <I0A>;   // 138
-    alias <HENK> = <XFER>;  // 129
-    indicator 5 = "Kana";
-};
-
-xkb_keycodes "type5_se" {
-
-    minimum= 8;
-    maximum= 255;
-
-    // Row G
-    <HELP> = 125;
-    //
-    <ESC>  = 36;
-    //
-    <FK01> = 12;
-    <FK02> = 13;
-    <FK03> = 15;
-    <FK04> = 17;
-    //
-    <FK05> = 19;
-    <FK06> = 21;
-    <FK07> = 23;
-    <FK08> = 24;
-    //
-    <FK09> = 25;
-    <FK10> = 14;
-    <FK11> = 16;
-    <FK12> = 18;
-    //
-    <PRSC> = 29;
-    <SCLK> = 30;
-    <PAUS> = 28;
-    //
-    <MUTE> = 52;
-    <VOL-> = 9;
-    <VOL+> = 11;
-    <POWR> = 55;
-    // End Row G
-
-    // Row F
-    //
-    // End Row F
-
-    // Row E
-    <STOP> = 8;
-    <AGAI> = 10;
-    //
-    <AE00> = 49;
-    alias <TLDE> = <AE00>;
-    <AE01> = 37;
-    <AE02> = 38;
-    <AE03> = 39;
-    <AE04> = 40;
-    <AE05> = 41;
-    <AE06> = 42;
-    <AE07> = 43;
-    <AE08> = 44;
-    <AE09> = 45;
-    <AE10> = 46;
-    <AE11> = 47;
-    <AE12> = 48;
-    <BKSP> = 50;
-    //
-    <INS>  = 51;
-    <HOME> = 59;
-    <PGUP> = 103;
-    //
-    <NMLK> = 105;
-    <KPDV> = 53;
-    <KPMU> = 54;
-    <KPSU> = 78;
-    //End Row E
-
-    // Row D
-    <PROP> = 32;
-    <UNDO> = 33;
-    //
-    <AD00> = 60;
-    alias <TAB> = <AD00>;
-    <AD01> = 61;
-    <AD02> = 62;
-    <AD03> = 63;
-    <AD04> = 64;
-    <AD05> = 65;
-    <AD06> = 66;
-    <AD07> = 67;
-    <AD08> = 68;
-    <AD09> = 69;
-    <AD10> = 70;
-    <AD11> = 71;
-    <AD12> = 72;
-    //
-    <DELE> = 73;
-    <END>  = 81;
-    <PGDN> = 130;
-    //
-    <KP7>  = 75;
-    <KP8>  = 76;
-    <KP9>  = 77;
-    <KPAD> = 132;
-    // End Row D
-
-    // Row C
-    <FRNT> = 56;
-    <COPY> = 58;
-    //
-    <AC00> = 126;
-    alias <CAPS> = <AC00>;
-    <AC01> = 84;
-    <AC02> = 85;
-    <AC03> = 86;
-    <AC04> = 87;
-    <AC05> = 88;
-    <AC06> = 89;
-    <AC07> = 90;
-    <AC08> = 91;
-    <AC09> = 92;
-    <AC10> = 93;
-    <AC11> = 94;
-    <AC12> = 95;
-    alias <BKSL> = <AC12>;
-    <RTRN> = 96;
-    //
-    <KP4>  = 98;
-    <KP5>  = 99;
-    <KP6>  = 100;
-    // End Row C
-
-    // Row B
-    <OPEN> = 79;
-    <PAST> = 80;
-    //
-    <LFSH> = 106;
-    <AB00> = 131;
-    alias <LSGT> = <AB00>;
-    <AB01> = 107;
-    <AB02> = 108;
-    <AB03> = 109;
-    <AB04> = 110;
-    <AB05> = 111;
-    <AB06> = 112;
-    <AB07> = 113;
-    <AB08> = 114;
-    <AB09> = 115;
-    <AB10> = 116;
-    <RTSH> = 117;
-    //
-    <UP>   = 27;
-    //
-    <KP1>  = 119;
-    <KP2>  = 120;
-    <KP3>  = 121;
-    <KPEN> = 97;
-    // End Row B
-
-    // Row A
-    <FIND> = 102;
-    <CUT>  = 104;
-    //
-    <LCTL> = 83;
-    <LALT> = 26;
-    <LMTA> = 127;
-    <SPCE> = 128;
-    <RMTA> = 129;
-    <COMP> = 74;
-    <ALGR> = 20;
-    alias <RALT> = <ALGR>;
-    //
-    <LEFT> = 31;
-    <DOWN> = 34;
-    <RGHT> = 35;
-    //
-    <KP0>  = 101;
-    <KPDL> = 57;
-    // End Row A
-
-    indicator 4 = "Caps Lock";
-    indicator 3 = "Compose";
-    indicator 2 = "Scroll Lock";
-    indicator 1 = "Num Lock";
-};
-
-xkb_keycodes "type5c_se" {
-    include "sun(type5_se)"
-};
-
-xkb_keycodes "type4__se" {
-
-    minimum= 8;
-    maximum= 255;
-
-    // Row F
-    <STOP> = 8;
-    <AGAI> = 10;
-    //
-    <FK01> = 12;
-    <FK02> = 13;
-    <FK03> = 15;
-    <FK04> = 17;
-    <FK05> = 19;
-    <FK06> = 21;
-    <FK07> = 23;
-    <FK08> = 24;
-    <FK09> = 25;
-    <FK10> = 14;
-    <FK11> = 16;
-    <FK12> = 18;
-    <AF13> = 95;
-    alias <TLDE> = <AF13>;
-    <AF14> = 22;
-    <DELE> = 73;
-    //
-    <PAUS> = 28;
-    <PRSC> = 29;
-    <SCLK> = 30;
-    <NMLK> = 105;
-    // End Row F
-
-    // Row E
-    <PROP> = 32;
-    <UNDO> = 33;
-    //
-    <AE00> = 36;
-    alias <ESC> = <AE00>;
-    <AE01> = 37;
-    <AE02> = 38;
-    <AE03> = 39;
-    <AE04> = 40;
-    <AE05> = 41;
-    <AE06> = 42;
-    <AE07> = 43;
-    <AE08> = 44;
-    <AE09> = 45;
-    <AE10> = 46;
-    <AE11> = 47;
-    <AE12> = 48;
-    <BKSP> = 50;
-    //
-    <KPEQ> = 52;
-    <KPDV> = 53;
-    <KPMU> = 54;
-    <KPSU> = 78;
-    // End Row E
-
-    // Row D
-    <FRNT> = 56;
-    <COPY> = 58;
-    //
-    <AD00> = 60;
-    alias <TAB> = <AD00>;
-    <AD01> = 61;
-    <AD02> = 62;
-    <AD03> = 63;
-    <AD04> = 64;
-    <AD05> = 65;
-    <AD06> = 66;
-    <AD07> = 67;
-    <AD08> = 68;
-    <AD09> = 69;
-    <AD10> = 70;
-    <AD11> = 71;
-    <AD12> = 72;
-    //
-    <KP7>  = 75;
-    <KP8>  = 76;
-    <KP9>  = 77;
-    <KPAD> = 132;
-    // End Row D
-
-    // Row C
-    <OPEN> = 79;
-    <PAST> = 80;
-    //
-    <AC00> = 83;
-    //    alias <CAPS> = <AC00>;
-    <AC01> = 84;
-    <AC02> = 85;
-    <AC03> = 86;
-    <AC04> = 87;
-    <AC05> = 88;
-    <AC06> = 89;
-    <AC07> = 90;
-    <AC08> = 91;
-    <AC09> = 92;
-    <AC10> = 93;
-    <AC11> = 94;
-    <AC12> = 49;
-    alias <BKSL> = <AC12>;
-    <RTRN> = 96;
-    //
-    <KP4>  = 98;
-    <KP5>  = 99;
-    <KP6>  = 100;
-    // End Row C
-
-    // Row B
-    <FIND> = 102;
-    <CUT>  = 104;
-    //
-    <LFSH> = 106;
-    <AB00> = 131;
-    alias <LSGT> = <AB00>;
-    <AB01> = 107;
-    <AB02> = 108;
-    <AB03> = 109;
-    <AB04> = 110;
-    <AB05> = 111;
-    <AB06> = 112;
-    <AB07> = 113;
-    <AB08> = 114;
-    <AB09> = 115;
-    <AB10> = 116;
-    <RTSH> = 117;
-    <LNFD> = 118;
-    //
-    <KP1>  = 119;
-    <KP2>  = 120;
-    <KP3>  = 121;
-    <KPEN> = 97;
-    // End Row B
-
-    // Row A
-    <HELP> = 125;
-    //
-    <AA00> = 126;
-    //    alias <LCTL> = <AA00>;
-    <LALT> = 26;
-    <LMTA> = 127;
-    <SPCE> = 128;
-    <RMTA> = 129;
-    <COMP> = 74;
-    <ALGR> = 20;
-    alias <RALT> = <ALGR>;
-    //
-    <KP0>  = 101;
-    <KPDL> = 57;
-    // End Row A
-
-    indicator 4 = "Caps Lock";
-    indicator 3 = "Compose";
-    indicator 2 = "Scroll Lock";
-    indicator 1 = "Num Lock";
-};
-
-xkb_keycodes "type4_se" {
-
-    include "sun(type4__se)"
-
-    alias <LCTL> = <AA00>;
-    alias <CAPS> = <AC00>;
-};
-
-xkb_keycodes "type4_se_swapctl" {
-
-    include "sun(type4__se)"
-
-    alias <LCTL> = <AC00>;
-    alias <CAPS> = <AA00>;
-};
+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//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 OPEN GROUP 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 Open Group 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 Open Group.
+//
+// ---------------------------------------------------------------------------
+// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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 (including the next
+// paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+//
+// ---------------------------------------------------------------------------
+//
+
+default xkb_keycodes "type4" {
+
+    minimum= 8;
+    maximum= 255;
+
+    <ESC>  = 36;
+    <AE01> = 37;
+    <AE02> = 38;
+    <AE03> = 39;
+    <AE04> = 40;
+    <AE05> = 41;
+    <AE06> = 42;
+    <AE07> = 43;
+    <AE08> = 44;
+    <AE09> = 45;
+    <AE10> = 46;
+    <AE11> = 47;
+    <AE12> = 48;
+    <TLDE> = 49;
+    <BKSP> = 50;
+
+    <TAB>  = 60;
+    <AD01> = 61;
+    <AD02> = 62;
+    <AD03> = 63;
+    <AD04> = 64;
+    <AD05> = 65;
+    <AD06> = 66;
+    <AD07> = 67;
+    <AD08> = 68;
+    <AD09> = 69;
+    <AD10> = 70;
+    <AD11> = 71;
+    <AD12> = 72;
+    <DELE> = 73;
+
+    <LCTL> = 83;
+    <AC01> = 84;
+    <AC02> = 85;
+    <AC03> = 86;
+    <AC04> = 87;
+    <AC05> = 88;
+    <AC06> = 89;
+    <AC07> = 90;
+    <AC08> = 91;
+    <AC09> = 92;
+    <AC10> = 93;
+    <AC11> = 94;
+    <BKSL> = 95;
+    <RTRN> = 96;
+
+    <LFSH> = 106;
+    <AB01> = 107;
+    <AB02> = 108;
+    <AB03> = 109;
+    <AB04> = 110;
+    <AB05> = 111;
+    <AB06> = 112;
+    <AB07> = 113;
+    <AB08> = 114;
+    <AB09> = 115;
+    <AB10> = 116;
+    <RTSH> = 117;
+    <LNFD> = 118;
+
+    <HELP> = 125;
+    <CAPS> = 126;
+    <LALT> = 26;
+    <LMTA> = 127;
+    <SPCE> = 128;
+    <RMTA> = 129;
+    <COMP> = 74;
+    <ALGR> = 20;
+    alias <RALT> = <ALGR>;
+
+    <FK01> = 12;
+    <FK02> = 13;
+    <FK03> = 15;
+    <FK04> = 17;
+    <FK05> = 19;
+    <FK06> = 21;
+    <FK07> = 23;
+    <FK08> = 24;
+    <FK09> = 25;
+    <FK10> = 14;
+    <FK11> = 16;
+    <FK12> = 18;
+
+    <STOP> = 8;
+    <AGAI> = 10;
+    <PROP> = 32;
+    <UNDO> = 33;
+    <FRNT> = 56;
+    <COPY> = 58;
+    <OPEN> = 79;
+    <PAST> = 80;
+    <FIND> = 102;
+    <CUT>  = 104;
+
+    <PRSC> = 29;
+    <SCLK> = 30;
+    <PAUS> = 28;
+
+    <NMLK> = 105;
+    <KPEQ> = 52;
+    <KPDV> = 53;
+    <KPMU> = 54;
+    <KPSU> = 78;
+
+    <KP7>  = 75;
+    <KP8>  = 76;
+    <KP9>  = 77;
+    <KPAD> = 132;
+
+    <KP4>  = 98;
+    <KP5>  = 99;
+    <KP6>  = 100;
+
+    <KP1>  = 119;
+    <KP2>  = 120;
+    <KP3>  = 121;
+    <KPEN> = 97;
+
+    <KP0>  = 101;
+    <KPDL> = 57;
+    indicator 4 = "Caps Lock";
+    indicator 3 = "Compose";
+    indicator 2 = "Scroll Lock";
+    indicator 1 = "Num Lock";
+};
+
+xkb_keycodes "type5" {
+
+    minimum= 8;
+    maximum= 255;
+
+    <ESC>  = 36;
+    <AE01> = 37;
+    <AE02> = 38;
+    <AE03> = 39;
+    <AE04> = 40;
+    <AE05> = 41;
+    <AE06> = 42;
+    <AE07> = 43;
+    <AE08> = 44;
+    <AE09> = 45;
+    <AE10> = 46;
+    <AE11> = 47;
+    <AE12> = 48;
+    <TLDE> = 49;
+    <BKSP> = 50;
+
+    <TAB>  = 60;
+    <AD01> = 61;
+    <AD02> = 62;
+    <AD03> = 63;
+    <AD04> = 64;
+    <AD05> = 65;
+    <AD06> = 66;
+    <AD07> = 67;
+    <AD08> = 68;
+    <AD09> = 69;
+    <AD10> = 70;
+    <AD11> = 71;
+    <AD12> = 72;
+    <DELE> = 73;
+    <COMP> = 74;
+    <ALGR> = 20;
+    alias <RALT> = <ALGR>;
+
+    <LCTL> = 83;
+    <AC01> = 84;
+    <AC02> = 85;
+    <AC03> = 86;
+    <AC04> = 87;
+    <AC05> = 88;
+    <AC06> = 89;
+    <AC07> = 90;
+    <AC08> = 91;
+    <AC09> = 92;
+    <AC10> = 93;
+    <AC11> = 94;
+    <BKSL> = 95;
+    <RTRN> = 96;
+
+    <LFSH> = 106;
+    <AB01> = 107;
+    <AB02> = 108;
+    <AB03> = 109;
+    <AB04> = 110;
+    <AB05> = 111;
+    <AB06> = 112;
+    <AB07> = 113;
+    <AB08> = 114;
+    <AB09> = 115;
+    <AB10> = 116;
+    <RTSH> = 117;
+
+    <LALT> = 26;
+    <CAPS> = 126;
+    <LMTA> = 127;
+    <SPCE> = 128;
+    <RMTA> = 129;
+
+    <FK01> = 12;
+    <FK02> = 13;
+    <FK03> = 15;
+    <FK04> = 17;
+    <FK05> = 19;
+    <FK06> = 21;
+    <FK07> = 23;
+    <FK08> = 24;
+    <FK09> = 25;
+    <FK10> = 14;
+    <FK11> = 16;
+    <FK12> = 18;
+    <STOP> = 8;
+    <AGAI> = 10;
+    <PROP> = 32;
+    <UNDO> = 33;
+    <FRNT> = 56;
+    <COPY> = 58;
+    <OPEN> = 79;
+    <PAST> = 80;
+    <FIND> = 102;
+    <CUT>  = 104;
+
+    <PRSC> = 29;
+    <SCLK> = 30;
+    <PAUS> = 28;
+
+    <NMLK> = 105;
+    <KPDV> = 53;
+    <KPMU> = 54;
+    <KPSU> = 78;
+
+    <KP7>  = 75;
+    <KP8>  = 76;
+    <KP9>  = 77;
+    <KPAD> = 132;
+
+    <KP4>  = 98;
+    <KP5>  = 99;
+    <KP6>  = 100;
+
+    <KP1>  = 119;
+    <KP2>  = 120;
+    <KP3>  = 121;
+    <KPEN> = 97;
+
+    <KP0>  = 101;
+    <KPDL> = 57;
+
+    <UP>   = 27;
+    <LEFT> = 31;
+    <DOWN> = 34;
+    <RGHT> = 35;
+
+    <INS>  = 51;
+    <HOME> = 59;
+    <END>  = 81;
+    <PGUP> = 103;
+    <PGDN> = 130;
+    <HELP> = 125;
+
+    <MUTE> = 52;
+    <VOL-> = 9;
+    <VOL+> = 11;
+    <POWR> = 55;
+    indicator 4 = "Caps Lock";
+    indicator 3 = "Compose";
+    indicator 2 = "Scroll Lock";
+    indicator 1 = "Num Lock";
+};
+
+xkb_keycodes "type4tuv" {
+    include "sun(type4)"
+    <LSGT> = 131;
+    <BRCR> = 22;
+};
+
+xkb_keycodes "type4_ca" {
+    include "sun(type4)"
+    <LSGT> = 131;
+};
+
+xkb_keycodes "type4_jp" {
+    include "sun(type4)"
+    <EXEC> = 122;
+    <KANJ> = 123;
+    <HENK> = 124;
+    <BRCR> = 22;
+    alias <UNDR> = <LNFD>;
+};
+
+xkb_keycodes "type4_euro" {
+    include "sun(type4)"
+    <LSGT> = 131;
+};
+
+xkb_keycodes "type5tuv" {
+    include "sun(type5)"
+    <LSGT> = 131;
+};
+
+xkb_keycodes "type5_jp" {
+    include "sun(type5)"
+    <EXEC> = 122;
+    <KANJ> = 123;
+    <HENK> = 124;
+    <UNDR> = 118;
+};
+
+xkb_keycodes "type5_euro" {
+    include "sun(type5)"
+    <LSGT> = 131;
+};
+
+xkb_keycodes "type5hobo" {
+
+    minimum= 8;
+    maximum= 255;
+
+    <ESC>  = 36;
+    <AE01> = 37;
+    <AE02> = 38;
+    <AE03> = 39;
+    <AE04> = 40;
+    <AE05> = 41;
+    <AE06> = 42;
+    <AE07> = 43;
+    <AE08> = 44;
+    <AE09> = 45;
+    <AE10> = 46;
+    <AE11> = 47;
+    <AE12> = 48;
+    <TLDE> = 49;
+    <BKSP> = 50;
+
+    <TAB>  = 60;
+    <AD01> = 61;
+    <AD02> = 62;
+    <AD03> = 63;
+    <AD04> = 64;
+    <AD05> = 65;
+    <AD06> = 66;
+    <AD07> = 67;
+    <AD08> = 68;
+    <AD09> = 69;
+    <AD10> = 70;
+    <AD11> = 71;
+    <AD12> = 72;
+    <DELE> = 73;
+    <COMP> = 74;
+    <ALGR> = 20;
+    alias <RALT> = <ALGR>;
+
+    <LCTL> = 83;
+    <AC01> = 84;
+    <AC02> = 85;
+    <AC03> = 86;
+    <AC04> = 87;
+    <AC05> = 88;
+    <AC06> = 89;
+    <AC07> = 90;
+    <AC08> = 91;
+    <AC09> = 92;
+    <AC10> = 93;
+    <AC11> = 94;
+    <BKSL> = 95;
+    <RTRN> = 96;
+
+    <LFSH> = 106;
+    <AB01> = 107;
+    <AB02> = 108;
+    <AB03> = 109;
+    <AB04> = 110;
+    <AB05> = 111;
+    <AB06> = 112;
+    <AB07> = 113;
+    <AB08> = 114;
+    <AB09> = 115;
+    <AB10> = 116;
+    <RTSH> = 117;
+
+    <LALT> = 26;
+    <CAPS> = 126;
+    <LMTA> = 127;
+    <SPCE> = 128;
+    <RMTA> = 129;
+
+    <FK01> = 12;
+    <FK02> = 13;
+    <FK03> = 15;
+    <FK04> = 17;
+    <FK05> = 19;
+    <FK06> = 21;
+    <FK07> = 23;
+    <FK08> = 24;
+    <FK09> = 25;
+    <FK10> = 14;
+    <FK11> = 16;
+    <FK12> = 18;
+    <STOP> = 8;
+    <AGAI> = 10;
+    <PROP> = 32;
+    <UNDO> = 33;
+    <FRNT> = 56;
+    <COPY> = 58;
+    <OPEN> = 79;
+    <PAST> = 80;
+    <FIND> = 102;
+    <CUT>  = 104;
+
+    <PRSC> = 29;
+    <SCLK> = 30;
+    <PAUS> = 28;
+
+    <NMLK> = 105;
+//     <KPDV> = 53;
+//     <KPMU> = 54;
+//     <KPSU> = 78;
+
+//     <KP7>  = 75;
+//     <KP8>  = 76;
+//     <KP9>  = 77;
+//     <KPAD> = 132;
+
+//     <KP4>  = 98;
+//     <KP5>  = 99;
+//     <KP6>  = 100;
+
+//     <KP1>  = 119;
+//     <KP2>  = 120;
+//     <KP3>  = 121;
+//     <KPEN> = 97;
+
+//     <KP0>  = 101;
+//     <KPDL> = 57;
+
+    <UP>   = 27;
+    <LEFT> = 31;
+    <DOWN> = 34;
+    <RGHT> = 35;
+
+    <INS>  = 51;
+    <HOME> = 59;
+    <END>  = 81;
+    <PGUP> = 103;
+    <PGDN> = 130;
+    <HELP> = 125;
+
+    <MUTE> = 52;
+    <VOL-> = 9;
+    <VOL+> = 11;
+    <POWR> = 55;
+    indicator 4 = "Caps Lock";
+    indicator 3 = "Compose";
+    indicator 2 = "Scroll Lock";
+    indicator 1 = "Num Lock";
+};
+
+xkb_keycodes "type5tuvhobo" {
+    include "sun(type5hobo)"
+    <LSGT> = 131;
+
+};
+
+xkb_keycodes "type5_jphobo" {
+    include "sun(type5hobo)"
+    <EXEC> = 122;
+    <KANJ> = 123;
+    <HENK> = 124;
+    <UNDR> = 118;
+};
+
+xkb_keycodes "type6" {
+    include "sun(type5)"
+};
+
+xkb_keycodes "type6tuv" {
+    include "sun(type5tuv)"
+};
+
+xkb_keycodes "type6unix" {
+    include "sun(type5)"
+};
+
+xkb_keycodes "type6_jp" {
+    include "sun(type5_jp)"
+};
+
+xkb_keycodes "type6_euro" {
+    include "sun(type5_euro)"
+};
+
+// Even though this is labeled as _usb, I verified these keycodes as accurate
+// on my type5 serial and type6 serial keyboards as well on linux-2.6 boxes.
+// I'm not sure where the "type5" keycodes above are coming from...
+xkb_keycodes "type6_usb" {
+    include "xfree86"
+
+    <STOP> = 232;
+    <AGAI> = 133;
+    <PROP> = 134;
+    <UNDO> = 135;
+    <FRNT> = 140;
+    <COPY> = 248;
+    <OPEN> = 191;
+    <PAST> = 192;
+    <FIND> = 122;
+    <CUT>  = 188;
+
+    <HELP> = 245;
+
+    // The blank has keycode 239 on my type6 serial kb, but 134 on
+    // my type6 usb keyboard (same as <PROP>)
+    <BLNK> = 239;
+
+    // AltGr + PrScr actually sends a different keycode
+    <SYRQ> = 92;
+
+    <MUTE> = 160;
+    <VOL-> = 174;
+    <VOL+> = 176;
+    <POWR> = 222;
+
+    indicator 4 = "Compose";
+};
+
+xkb_keycodes "type6tuv_usb" {
+    include "sun(type6_usb)"
+    <LSGT> = 94;
+//    <BKSL> = 51;
+};
+
+xkb_keycodes "type6_jp_usb" {
+    include "sun(type6_usb)"
+    alias <UNDR> = <KPDC>;  // 123
+    alias <EXEC> = <I0B>;   // 139 
+    alias <KANJ> = <I0A>;   // 138
+    alias <HENK> = <XFER>;  // 129
+    indicator 5 = "Kana";
+};
+
+xkb_keycodes "type5_se" {
+
+    minimum= 8;
+    maximum= 255;
+
+    // Row G
+    <HELP> = 125;
+    //
+    <ESC>  = 36;
+    //
+    <FK01> = 12;
+    <FK02> = 13;
+    <FK03> = 15;
+    <FK04> = 17;
+    //
+    <FK05> = 19;
+    <FK06> = 21;
+    <FK07> = 23;
+    <FK08> = 24;
+    //
+    <FK09> = 25;
+    <FK10> = 14;
+    <FK11> = 16;
+    <FK12> = 18;
+    //
+    <PRSC> = 29;
+    <SCLK> = 30;
+    <PAUS> = 28;
+    //
+    <MUTE> = 52;
+    <VOL-> = 9;
+    <VOL+> = 11;
+    <POWR> = 55;
+    // End Row G
+
+    // Row F
+    //
+    // End Row F
+
+    // Row E
+    <STOP> = 8;
+    <AGAI> = 10;
+    //
+    <AE00> = 49;
+    alias <TLDE> = <AE00>;
+    <AE01> = 37;
+    <AE02> = 38;
+    <AE03> = 39;
+    <AE04> = 40;
+    <AE05> = 41;
+    <AE06> = 42;
+    <AE07> = 43;
+    <AE08> = 44;
+    <AE09> = 45;
+    <AE10> = 46;
+    <AE11> = 47;
+    <AE12> = 48;
+    <BKSP> = 50;
+    //
+    <INS>  = 51;
+    <HOME> = 59;
+    <PGUP> = 103;
+    //
+    <NMLK> = 105;
+    <KPDV> = 53;
+    <KPMU> = 54;
+    <KPSU> = 78;
+    //End Row E
+
+    // Row D
+    <PROP> = 32;
+    <UNDO> = 33;
+    //
+    <AD00> = 60;
+    alias <TAB> = <AD00>;
+    <AD01> = 61;
+    <AD02> = 62;
+    <AD03> = 63;
+    <AD04> = 64;
+    <AD05> = 65;
+    <AD06> = 66;
+    <AD07> = 67;
+    <AD08> = 68;
+    <AD09> = 69;
+    <AD10> = 70;
+    <AD11> = 71;
+    <AD12> = 72;
+    //
+    <DELE> = 73;
+    <END>  = 81;
+    <PGDN> = 130;
+    //
+    <KP7>  = 75;
+    <KP8>  = 76;
+    <KP9>  = 77;
+    <KPAD> = 132;
+    // End Row D
+
+    // Row C
+    <FRNT> = 56;
+    <COPY> = 58;
+    //
+    <AC00> = 126;
+    alias <CAPS> = <AC00>;
+    <AC01> = 84;
+    <AC02> = 85;
+    <AC03> = 86;
+    <AC04> = 87;
+    <AC05> = 88;
+    <AC06> = 89;
+    <AC07> = 90;
+    <AC08> = 91;
+    <AC09> = 92;
+    <AC10> = 93;
+    <AC11> = 94;
+    <AC12> = 95;
+    alias <BKSL> = <AC12>;
+    <RTRN> = 96;
+    //
+    <KP4>  = 98;
+    <KP5>  = 99;
+    <KP6>  = 100;
+    // End Row C
+
+    // Row B
+    <OPEN> = 79;
+    <PAST> = 80;
+    //
+    <LFSH> = 106;
+    <AB00> = 131;
+    alias <LSGT> = <AB00>;
+    <AB01> = 107;
+    <AB02> = 108;
+    <AB03> = 109;
+    <AB04> = 110;
+    <AB05> = 111;
+    <AB06> = 112;
+    <AB07> = 113;
+    <AB08> = 114;
+    <AB09> = 115;
+    <AB10> = 116;
+    <RTSH> = 117;
+    //
+    <UP>   = 27;
+    //
+    <KP1>  = 119;
+    <KP2>  = 120;
+    <KP3>  = 121;
+    <KPEN> = 97;
+    // End Row B
+
+    // Row A
+    <FIND> = 102;
+    <CUT>  = 104;
+    //
+    <LCTL> = 83;
+    <LALT> = 26;
+    <LMTA> = 127;
+    <SPCE> = 128;
+    <RMTA> = 129;
+    <COMP> = 74;
+    <ALGR> = 20;
+    alias <RALT> = <ALGR>;
+    //
+    <LEFT> = 31;
+    <DOWN> = 34;
+    <RGHT> = 35;
+    //
+    <KP0>  = 101;
+    <KPDL> = 57;
+    // End Row A
+
+    indicator 4 = "Caps Lock";
+    indicator 3 = "Compose";
+    indicator 2 = "Scroll Lock";
+    indicator 1 = "Num Lock";
+};
+
+xkb_keycodes "type5c_se" {
+    include "sun(type5_se)"
+};
+
+xkb_keycodes "type4__se" {
+
+    minimum= 8;
+    maximum= 255;
+
+    // Row F
+    <STOP> = 8;
+    <AGAI> = 10;
+    //
+    <FK01> = 12;
+    <FK02> = 13;
+    <FK03> = 15;
+    <FK04> = 17;
+    <FK05> = 19;
+    <FK06> = 21;
+    <FK07> = 23;
+    <FK08> = 24;
+    <FK09> = 25;
+    <FK10> = 14;
+    <FK11> = 16;
+    <FK12> = 18;
+    <AF13> = 95;
+    alias <TLDE> = <AF13>;
+    <AF14> = 22;
+    <DELE> = 73;
+    //
+    <PAUS> = 28;
+    <PRSC> = 29;
+    <SCLK> = 30;
+    <NMLK> = 105;
+    // End Row F
+
+    // Row E
+    <PROP> = 32;
+    <UNDO> = 33;
+    //
+    <AE00> = 36;
+    alias <ESC> = <AE00>;
+    <AE01> = 37;
+    <AE02> = 38;
+    <AE03> = 39;
+    <AE04> = 40;
+    <AE05> = 41;
+    <AE06> = 42;
+    <AE07> = 43;
+    <AE08> = 44;
+    <AE09> = 45;
+    <AE10> = 46;
+    <AE11> = 47;
+    <AE12> = 48;
+    <BKSP> = 50;
+    //
+    <KPEQ> = 52;
+    <KPDV> = 53;
+    <KPMU> = 54;
+    <KPSU> = 78;
+    // End Row E
+
+    // Row D
+    <FRNT> = 56;
+    <COPY> = 58;
+    //
+    <AD00> = 60;
+    alias <TAB> = <AD00>;
+    <AD01> = 61;
+    <AD02> = 62;
+    <AD03> = 63;
+    <AD04> = 64;
+    <AD05> = 65;
+    <AD06> = 66;
+    <AD07> = 67;
+    <AD08> = 68;
+    <AD09> = 69;
+    <AD10> = 70;
+    <AD11> = 71;
+    <AD12> = 72;
+    //
+    <KP7>  = 75;
+    <KP8>  = 76;
+    <KP9>  = 77;
+    <KPAD> = 132;
+    // End Row D
+
+    // Row C
+    <OPEN> = 79;
+    <PAST> = 80;
+    //
+    <AC00> = 83;
+    //    alias <CAPS> = <AC00>;
+    <AC01> = 84;
+    <AC02> = 85;
+    <AC03> = 86;
+    <AC04> = 87;
+    <AC05> = 88;
+    <AC06> = 89;
+    <AC07> = 90;
+    <AC08> = 91;
+    <AC09> = 92;
+    <AC10> = 93;
+    <AC11> = 94;
+    <AC12> = 49;
+    alias <BKSL> = <AC12>;
+    <RTRN> = 96;
+    //
+    <KP4>  = 98;
+    <KP5>  = 99;
+    <KP6>  = 100;
+    // End Row C
+
+    // Row B
+    <FIND> = 102;
+    <CUT>  = 104;
+    //
+    <LFSH> = 106;
+    <AB00> = 131;
+    alias <LSGT> = <AB00>;
+    <AB01> = 107;
+    <AB02> = 108;
+    <AB03> = 109;
+    <AB04> = 110;
+    <AB05> = 111;
+    <AB06> = 112;
+    <AB07> = 113;
+    <AB08> = 114;
+    <AB09> = 115;
+    <AB10> = 116;
+    <RTSH> = 117;
+    <LNFD> = 118;
+    //
+    <KP1>  = 119;
+    <KP2>  = 120;
+    <KP3>  = 121;
+    <KPEN> = 97;
+    // End Row B
+
+    // Row A
+    <HELP> = 125;
+    //
+    <AA00> = 126;
+    //    alias <LCTL> = <AA00>;
+    <LALT> = 26;
+    <LMTA> = 127;
+    <SPCE> = 128;
+    <RMTA> = 129;
+    <COMP> = 74;
+    <ALGR> = 20;
+    alias <RALT> = <ALGR>;
+    //
+    <KP0>  = 101;
+    <KPDL> = 57;
+    // End Row A
+
+    indicator 4 = "Caps Lock";
+    indicator 3 = "Compose";
+    indicator 2 = "Scroll Lock";
+    indicator 1 = "Num Lock";
+};
+
+xkb_keycodes "type4_se" {
+
+    include "sun(type4__se)"
+
+    alias <LCTL> = <AA00>;
+    alias <CAPS> = <AC00>;
+};
+
+xkb_keycodes "type4_se_swapctl" {
+
+    include "sun(type4__se)"
+
+    alias <LCTL> = <AC00>;
+    alias <CAPS> = <AA00>;
+};
diff --git a/xorg-server/xkeyboard-config/keycodes/xfree98 b/xorg-server/xkeyboard-config/keycodes/xfree98
index 3faea5ca5..734573aea 100644
--- a/xorg-server/xkeyboard-config/keycodes/xfree98
+++ b/xorg-server/xkeyboard-config/keycodes/xfree98
@@ -1,152 +1,152 @@
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//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 OPEN GROUP 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 Open Group 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 Open Group.
-//
-//
-default xkb_keycodes "pc98" {
-
-    minimum= 8;
-    maximum= 255;
-
-    <ESC>  =   8;
-    <AE01> =   9;
-    <AE02> =  10;
-    <AE03> =  11;
-    <AE04> =  12;
-    <AE05> =  13;
-    <AE06> =  14;
-    <AE07> =  15;
-    <AE08> =  16;
-    <AE09> =  17;
-    <AE10> =  18;
-    <AE11> =  19;
-    <AE12> =  20;
-    <BKSL> =  21;
-    <BKSP> =  22;
-
-    <TAB>  =  23;
-    <AD01> =  24;
-    <AD02> =  25;
-    <AD03> =  26;
-    <AD04> =  27;
-    <AD05> =  28;
-    <AD06> =  29;
-    <AD07> =  30;
-    <AD08> =  31;
-    <AD09> =  32;
-    <AD10> =  33;
-    <AD11> =  34;
-    <AD12> =  35;
-    <RTRN> =  36;
-
-    <LCTL> =  124;
-    <CAPS> =  121;
-    <AC01> =  37;
-    <AC02> =  38;
-    <AC03> =  39;
-    <AC04> =  40;
-    <AC05> =  41;
-    <AC06> =  42;
-    <AC07> =  43;
-    <AC08> =  44;
-    <AC09> =  45;
-    <AC10> =  46;
-    <AC11> =  47;
-    <AC12> =  48;
-
-    <LFSH> = 120;
-    <AB01> =  49;
-    <AB02> =  50;
-    <AB03> =  51;
-    <AB04> =  52;
-    <AB05> =  53;
-    <AB06> =  54;
-    <AB07> =  55;
-    <AB08> =  56;
-    <AB09> =  57;
-    <AB10> =  58;
-    <AB11> =  59;
-
-    <ALGR> = 122;
-    <LALT> = 123;
-    <NFER> =  89;
-    <SPCE> =  60;
-    <XFER> =  61;
-
-    <BRK>  = 104;
-    <PRSC> = 105;
-    <FK01> = 106;
-    <FK02> = 107;
-    <FK03> = 108;
-    <FK04> = 109;
-    <FK05> = 110;
-    <FK06> = 111;
-    <FK07> = 112;
-    <FK08> = 113;
-    <FK09> = 114;
-    <FK10> = 115;
-    <FK11> =  90;
-    <FK12> =  91;
-    <FK13> =  92;
-    <FK14> =  93;
-    <FK15> =  94;
-
-
-    <INS>  =  64;
-    <DELE> =  65;
-    <PGUP> =  63;
-    <PGDN> =  62;
-    <UP>   =  66;
-    <LEFT> =  67;
-    <RGHT> =  68;
-    <DOWN> =  69;
-
-    <HOME> =  70;
-    <HELP> =  71;
-
-    <KPSU> =  72;
-    <KPDV> =  73;
-
-    <KP7>  =  74;
-    <KP8>  =  75;
-    <KP9>  =  76;
-    <KPMU> =  77;
-
-    <KP4>  =  78;
-    <KP5>  =  79;
-    <KP6>  =  80;
-    <KPAD> =  81;
-
-    <KP1>  =  82;
-    <KP2>  =  83;
-    <KP3>  =  84;
-    <KPEQ> =  85;
-
-    <KP0>  =  86;
-    <KPSP> =  87;
-    <KPDC> =  88;
-
-    indicator 1 = "Caps Lock";
-    indicator 2 = "Kana";
-};
+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//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 OPEN GROUP 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 Open Group 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 Open Group.
+//
+//
+default xkb_keycodes "pc98" {
+
+    minimum= 8;
+    maximum= 255;
+
+    <ESC>  =   8;
+    <AE01> =   9;
+    <AE02> =  10;
+    <AE03> =  11;
+    <AE04> =  12;
+    <AE05> =  13;
+    <AE06> =  14;
+    <AE07> =  15;
+    <AE08> =  16;
+    <AE09> =  17;
+    <AE10> =  18;
+    <AE11> =  19;
+    <AE12> =  20;
+    <BKSL> =  21;
+    <BKSP> =  22;
+
+    <TAB>  =  23;
+    <AD01> =  24;
+    <AD02> =  25;
+    <AD03> =  26;
+    <AD04> =  27;
+    <AD05> =  28;
+    <AD06> =  29;
+    <AD07> =  30;
+    <AD08> =  31;
+    <AD09> =  32;
+    <AD10> =  33;
+    <AD11> =  34;
+    <AD12> =  35;
+    <RTRN> =  36;
+
+    <LCTL> =  124;
+    <CAPS> =  121;
+    <AC01> =  37;
+    <AC02> =  38;
+    <AC03> =  39;
+    <AC04> =  40;
+    <AC05> =  41;
+    <AC06> =  42;
+    <AC07> =  43;
+    <AC08> =  44;
+    <AC09> =  45;
+    <AC10> =  46;
+    <AC11> =  47;
+    <AC12> =  48;
+
+    <LFSH> = 120;
+    <AB01> =  49;
+    <AB02> =  50;
+    <AB03> =  51;
+    <AB04> =  52;
+    <AB05> =  53;
+    <AB06> =  54;
+    <AB07> =  55;
+    <AB08> =  56;
+    <AB09> =  57;
+    <AB10> =  58;
+    <AB11> =  59;
+
+    <ALGR> = 122;
+    <LALT> = 123;
+    <NFER> =  89;
+    <SPCE> =  60;
+    <XFER> =  61;
+
+    <BRK>  = 104;
+    <PRSC> = 105;
+    <FK01> = 106;
+    <FK02> = 107;
+    <FK03> = 108;
+    <FK04> = 109;
+    <FK05> = 110;
+    <FK06> = 111;
+    <FK07> = 112;
+    <FK08> = 113;
+    <FK09> = 114;
+    <FK10> = 115;
+    <FK11> =  90;
+    <FK12> =  91;
+    <FK13> =  92;
+    <FK14> =  93;
+    <FK15> =  94;
+
+
+    <INS>  =  64;
+    <DELE> =  65;
+    <PGUP> =  63;
+    <PGDN> =  62;
+    <UP>   =  66;
+    <LEFT> =  67;
+    <RGHT> =  68;
+    <DOWN> =  69;
+
+    <HOME> =  70;
+    <HELP> =  71;
+
+    <KPSU> =  72;
+    <KPDV> =  73;
+
+    <KP7>  =  74;
+    <KP8>  =  75;
+    <KP9>  =  76;
+    <KPMU> =  77;
+
+    <KP4>  =  78;
+    <KP5>  =  79;
+    <KP6>  =  80;
+    <KPAD> =  81;
+
+    <KP1>  =  82;
+    <KP2>  =  83;
+    <KP3>  =  84;
+    <KPEQ> =  85;
+
+    <KP0>  =  86;
+    <KPSP> =  87;
+    <KPDC> =  88;
+
+    indicator 1 = "Caps Lock";
+    indicator 2 = "Kana";
+};
diff --git a/xorg-server/xkeyboard-config/po/ChangeLog b/xorg-server/xkeyboard-config/po/ChangeLog
index 254a4768f..34369d6bc 100644
--- a/xorg-server/xkeyboard-config/po/ChangeLog
+++ b/xorg-server/xkeyboard-config/po/ChangeLog
@@ -1,264 +1,264 @@
-2009-01-27  svu
-
-	* *.po: sync with TP
-
-2008-09-30  svu
-
-	* *.po: sync with TP
-
-2008-05-27  svu
-
-	* *.po: sync with TP
-
-2008-01-29  svu
-
-	* *.po: sync with TP
-
-2007-10-02  gettextize  <bug-gnu-gettext@gnu.org>
-
-	* Makefile.in.in: New file, from gettext-0.16.1.
-
-2007-09-25  svu
-
-	* *.po: sync with TP
-
-2007-09-11  Maxim V. Dziumanenko <dziumanenko@gmail.com>
-
-	* uk.po: updated Ukrainian translation, lost and found
-
-2007-09-11  Nilgün Belma Bugüner <nilgun@buguner.name.tr>
-
-	* tr.po: updated Turkish translation, lost and found
-
-2007-09-11  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: updated Swedish translation, lost and found
-
-2007-09-11  Zdenko Podobný <zdpo@mailbox.sk>
-
-	* sk.po: updated Slovak translation, lost and found
-
-2007-09-11  Simos Xenitellis <simos74@gmx.net>
-
-	* el.po: updated Greek translation, lost and found
-
-2007-09-11  Tino Meinen <a.t.meinen@chello.nl>
-
-	* nl.po: updated Dutch translation, lost and found
-
-2007-03-12  Changwoo Ryu <cwryu@debian.org>
-
-	* ko.po: added Korean translation
-
-2007-02-25  Tommi Vainikainen <Tommi.Vainikainen@iki.fi>
-
-	* fi.po: updated Finnish translation
-
-2007-02-01  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: updated Swedish translation
-
-2007-01-12  Andriy Rysin <arysin@myrealbox.com>
-
-	* uk.po: updated Ukrainian translation
-
-2006-12-28  Maxim V. Dziumanenko <dziumanenko@gmail.com>
-
-	* uk.po: updated Ukrainian translation
-
-2005-11-28 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
-
-	* ru.po: updated Russian translation
-
-2005-10-17 Matej Urbančič <matej.urban@gmail.com> 
-
-	* sl.po: updated Slovenian translation
-
-2006-10-13  Gabor Kelemen <kelemeng@gnome.hu>
-
-	* hu.po: updated Hungarian translation
-
-2006-10-07  Sergey E Kvyato <kvantos@plotinka.ru>
-
-	* ru.po: updated Russian translation
-
-2006-10-03  Denis Barbier <barbier@linuxfr.org>
-
-	* fr.po: updated French translation
-
-2006-10-03  Nilgün Belma Bugüner <nilgun@buguner.name.tr>
-
-	* tr.po: updated Turkish translation
-
-2006-10-02  Gabor Kelemen <kelemeng@gnome.hu>
-
-	* hu.po: updated Hungarian translation
-
-2006-09-24  Vladimer Sichinava <vlsichinava@gmail.com>
-
-	* ka.po: added Georgian translation
-
-2006-09-24  Denis Barbier <barbier@linuxfr.org>
-
-	* fr.po: updated French translation
-
-2006-09-09  svu
-
-	* ru.po: updated Ukrainian translation
-
-2006-08-31  Andriy Rysin <arysin@myrealbox.com>
-
-	* uk.po: updated Ukrainian translation
-
-2006-06-29  Francisco Javier F. Serrador <serrador@cvs.gnome.org>
-
-	* es.po: updated Spanish translation
-
-2006-04-09  Francisco Javier F. Serrador <serrador@cvs.gnome.org>
-
-	* es.po: added Spanish translation
-
-2006-04-05  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: updated Swedish translation
-
-2006-04-01  Maxim V. Dziumanenko <mvd@mylinux.com.ua>
-
-	* uk.po: updated Ukrainian translation
-
-2006-03-17  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: updated Swedish translation
-
-2006-03-12  Gabor Kelemen <kelemeng@gnome.hu>
-
-	* hu.po: updated Hungarian translation
-
-2006-03-09  Denis Barbier <barbier@linuxfr.org>
-
-	* fr.po: updated French translation
-
-2006-03-04  Данило Шеган <danilo@gnome.org> 
-
-	* sr.po: updated Serbian translation
-
-2006-02-27  Luca Ferretti <elle.uca@infinito.it>
-
-	* it.po: updated Italian translation
-
-2006-01-21  Taco Witte <tcwitte@cs.uu.nl>
-
-	* nl.po: updated Dutch translation
-
-2005-12-31  svu
-
-	* ru.po: updated Russian translation
-
-2005-12-31  jeroen-91@home.nl
-
-	* nl.po: updated Dutch translation
-
-2005-12-01  svu
-
-	* ru.po: updated Russian translation
-
-2005-10-13   Denis Barbier <barbier@linuxfr.org>
-
-	* fr.po: updated French translation
-
-2005-10-02  svu
-
-	* ru.po: updated Russian translation
-
-2005-09-30 Matej Urbančič <matej.urban@gmail.com> 
-
-	* sl.po: adding Slovenian translation
-
-2005-09-13  Wei-Lun Chao <chaoweilun@pcmail.com.tw>
-
-	* zh_TW.po: adding Chinise (traditional) translation
-
-2005-09-13  Tommi Vainikainen <Tommi.Vainikainen@iki.fi>
-
-	* fi.po: adding Finnish translation
-
-2005-09-05  Alexander Shopov <ash@contact.bg>
-
-	* bg.po: updated Bulgarian translation
-
-2005-09-04  svu
-
-	* ru.po: updated Russian translation
-
-2005-08-25  Danilo Segan <dsegan@gmx.net>
-
-	* sr.po: updated Serbian translation
-
-2005-08-23  svu
-
-	* ru.po: updated Russian translation
-
-2005-08-17  nilgun@buguner.name.tr
-
-	* tr.po: updated Turkish translation
-
-2005-08-01  svu
-
-	* ru.po: updated Russian translation
-
-2005-07-31  svu
-
-	* ru.po: updated Russian translation
-
-2005-07-24  svu
-
-	* ru.po: updated Russian translation
-
-2005-05-28  teppi8.gmail.com
-
-	* vi.po: new Vietnamese translation
-
-2005-04-09  chris@protactin.co.uk
-
-	* en_GB.po: new British translation
-
-2005-04-06  Steve Murphy <murf@e-tools.com>
-
-	* rw.po: updated Kinyarwanda translation
-
-2005-01-31  Taco Witte <tcwitte@cs.uu.nl>
-
-	* nl.po: updated Dutch translation
-
-2005-01-26  svu
-
-	* ru.po: updated Russian translation
-
-2005-01-24  svu
-
-	* ru.po: updated Russian translation
-
-2005-01-16  svu
-
-	* ru.po: updated Russian translation
-
-2004-12-22  svu
-
-	* ru.po: updated Russian translation
-
-2004-12-21  Simos Xenitellis <simos74@gmx.net>
-
-	* el.po: adding Greek translation
-
-2004-10-26  Elros Cyriatan <cyriatan@fastmail.fm>
-
-	* nl.po: updated Dutch translation
-
-2004-10-26  svu
-
-	* ru.po: updated Russian translation
-
-2004-10-12  svu
-
-	* ru.po: updated Russian translation
-
+2009-01-27  svu
+
+	* *.po: sync with TP
+
+2008-09-30  svu
+
+	* *.po: sync with TP
+
+2008-05-27  svu
+
+	* *.po: sync with TP
+
+2008-01-29  svu
+
+	* *.po: sync with TP
+
+2007-10-02  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* Makefile.in.in: New file, from gettext-0.16.1.
+
+2007-09-25  svu
+
+	* *.po: sync with TP
+
+2007-09-11  Maxim V. Dziumanenko <dziumanenko@gmail.com>
+
+	* uk.po: updated Ukrainian translation, lost and found
+
+2007-09-11  Nilgün Belma Bugüner <nilgun@buguner.name.tr>
+
+	* tr.po: updated Turkish translation, lost and found
+
+2007-09-11  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: updated Swedish translation, lost and found
+
+2007-09-11  Zdenko Podobný <zdpo@mailbox.sk>
+
+	* sk.po: updated Slovak translation, lost and found
+
+2007-09-11  Simos Xenitellis <simos74@gmx.net>
+
+	* el.po: updated Greek translation, lost and found
+
+2007-09-11  Tino Meinen <a.t.meinen@chello.nl>
+
+	* nl.po: updated Dutch translation, lost and found
+
+2007-03-12  Changwoo Ryu <cwryu@debian.org>
+
+	* ko.po: added Korean translation
+
+2007-02-25  Tommi Vainikainen <Tommi.Vainikainen@iki.fi>
+
+	* fi.po: updated Finnish translation
+
+2007-02-01  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: updated Swedish translation
+
+2007-01-12  Andriy Rysin <arysin@myrealbox.com>
+
+	* uk.po: updated Ukrainian translation
+
+2006-12-28  Maxim V. Dziumanenko <dziumanenko@gmail.com>
+
+	* uk.po: updated Ukrainian translation
+
+2005-11-28 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
+
+	* ru.po: updated Russian translation
+
+2005-10-17 Matej Urbančič <matej.urban@gmail.com> 
+
+	* sl.po: updated Slovenian translation
+
+2006-10-13  Gabor Kelemen <kelemeng@gnome.hu>
+
+	* hu.po: updated Hungarian translation
+
+2006-10-07  Sergey E Kvyato <kvantos@plotinka.ru>
+
+	* ru.po: updated Russian translation
+
+2006-10-03  Denis Barbier <barbier@linuxfr.org>
+
+	* fr.po: updated French translation
+
+2006-10-03  Nilgün Belma Bugüner <nilgun@buguner.name.tr>
+
+	* tr.po: updated Turkish translation
+
+2006-10-02  Gabor Kelemen <kelemeng@gnome.hu>
+
+	* hu.po: updated Hungarian translation
+
+2006-09-24  Vladimer Sichinava <vlsichinava@gmail.com>
+
+	* ka.po: added Georgian translation
+
+2006-09-24  Denis Barbier <barbier@linuxfr.org>
+
+	* fr.po: updated French translation
+
+2006-09-09  svu
+
+	* ru.po: updated Ukrainian translation
+
+2006-08-31  Andriy Rysin <arysin@myrealbox.com>
+
+	* uk.po: updated Ukrainian translation
+
+2006-06-29  Francisco Javier F. Serrador <serrador@cvs.gnome.org>
+
+	* es.po: updated Spanish translation
+
+2006-04-09  Francisco Javier F. Serrador <serrador@cvs.gnome.org>
+
+	* es.po: added Spanish translation
+
+2006-04-05  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: updated Swedish translation
+
+2006-04-01  Maxim V. Dziumanenko <mvd@mylinux.com.ua>
+
+	* uk.po: updated Ukrainian translation
+
+2006-03-17  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: updated Swedish translation
+
+2006-03-12  Gabor Kelemen <kelemeng@gnome.hu>
+
+	* hu.po: updated Hungarian translation
+
+2006-03-09  Denis Barbier <barbier@linuxfr.org>
+
+	* fr.po: updated French translation
+
+2006-03-04  Данило Шеган <danilo@gnome.org> 
+
+	* sr.po: updated Serbian translation
+
+2006-02-27  Luca Ferretti <elle.uca@infinito.it>
+
+	* it.po: updated Italian translation
+
+2006-01-21  Taco Witte <tcwitte@cs.uu.nl>
+
+	* nl.po: updated Dutch translation
+
+2005-12-31  svu
+
+	* ru.po: updated Russian translation
+
+2005-12-31  jeroen-91@home.nl
+
+	* nl.po: updated Dutch translation
+
+2005-12-01  svu
+
+	* ru.po: updated Russian translation
+
+2005-10-13   Denis Barbier <barbier@linuxfr.org>
+
+	* fr.po: updated French translation
+
+2005-10-02  svu
+
+	* ru.po: updated Russian translation
+
+2005-09-30 Matej Urbančič <matej.urban@gmail.com> 
+
+	* sl.po: adding Slovenian translation
+
+2005-09-13  Wei-Lun Chao <chaoweilun@pcmail.com.tw>
+
+	* zh_TW.po: adding Chinise (traditional) translation
+
+2005-09-13  Tommi Vainikainen <Tommi.Vainikainen@iki.fi>
+
+	* fi.po: adding Finnish translation
+
+2005-09-05  Alexander Shopov <ash@contact.bg>
+
+	* bg.po: updated Bulgarian translation
+
+2005-09-04  svu
+
+	* ru.po: updated Russian translation
+
+2005-08-25  Danilo Segan <dsegan@gmx.net>
+
+	* sr.po: updated Serbian translation
+
+2005-08-23  svu
+
+	* ru.po: updated Russian translation
+
+2005-08-17  nilgun@buguner.name.tr
+
+	* tr.po: updated Turkish translation
+
+2005-08-01  svu
+
+	* ru.po: updated Russian translation
+
+2005-07-31  svu
+
+	* ru.po: updated Russian translation
+
+2005-07-24  svu
+
+	* ru.po: updated Russian translation
+
+2005-05-28  teppi8.gmail.com
+
+	* vi.po: new Vietnamese translation
+
+2005-04-09  chris@protactin.co.uk
+
+	* en_GB.po: new British translation
+
+2005-04-06  Steve Murphy <murf@e-tools.com>
+
+	* rw.po: updated Kinyarwanda translation
+
+2005-01-31  Taco Witte <tcwitte@cs.uu.nl>
+
+	* nl.po: updated Dutch translation
+
+2005-01-26  svu
+
+	* ru.po: updated Russian translation
+
+2005-01-24  svu
+
+	* ru.po: updated Russian translation
+
+2005-01-16  svu
+
+	* ru.po: updated Russian translation
+
+2004-12-22  svu
+
+	* ru.po: updated Russian translation
+
+2004-12-21  Simos Xenitellis <simos74@gmx.net>
+
+	* el.po: adding Greek translation
+
+2004-10-26  Elros Cyriatan <cyriatan@fastmail.fm>
+
+	* nl.po: updated Dutch translation
+
+2004-10-26  svu
+
+	* ru.po: updated Russian translation
+
+2004-10-12  svu
+
+	* ru.po: updated Russian translation
+
diff --git a/xorg-server/xkeyboard-config/po/Makevars b/xorg-server/xkeyboard-config/po/Makevars
index 03f092c96..45916d2bb 100644
--- a/xorg-server/xkeyboard-config/po/Makevars
+++ b/xorg-server/xkeyboard-config/po/Makevars
@@ -1,41 +1,41 @@
-# Makefile variables for PO directory in any package using GNU gettext.
-
-# Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
-
-# These two variables depend on the location of this directory.
-subdir = po
-top_builddir = ..
-
-# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
-
-# This is the copyright holder that gets inserted into the header of the
-# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
-# package.  (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.)  Translators are
-# expected to transfer the copyright for their translations to this person
-# or entity, or to disclaim their copyright.  The empty string stands for
-# the public domain; in this case the translators are expected to disclaim
-# their copyright.
-COPYRIGHT_HOLDER = XFree86
-
-# This is the email address or URL to which the translators shall report
-# bugs in the untranslated strings:
-# - Strings which are not entire sentences, see the maintainer guidelines
-#   in the GNU gettext documentation, section 'Preparing Strings'.
-# - Strings which use unclear terms or require additional context to be
-#   understood.
-# - Strings which make invalid assumptions about notation of date, time or
-#   money.
-# - Pluralisation problems.
-# - Incorrect English spelling.
-# - Incorrect formatting.
-# It can be your email address, or a mailing list address where translators
-# can write to without being subscribed, or the URL of a web page through
-# which the translators can contact you.
-MSGID_BUGS_ADDRESS = svu@users.sourceforge.net
-
-# This is the list of locale categories, beyond LC_MESSAGES, for which the
-# message catalogs shall be used.  It is usually empty.
-EXTRA_LOCALE_CATEGORIES =
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = XFree86
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = svu@users.sourceforge.net
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/xorg-server/xkeyboard-config/po/POTFILES.in b/xorg-server/xkeyboard-config/po/POTFILES.in
index 901d327d4..a47595899 100644
--- a/xorg-server/xkeyboard-config/po/POTFILES.in
+++ b/xorg-server/xkeyboard-config/po/POTFILES.in
@@ -1,2 +1,2 @@
-rules/base.xml.in
-rules/base.extras.xml.in
+rules/base.xml.in
+rules/base.extras.xml.in
diff --git a/xorg-server/xkeyboard-config/po/POTFILES.skip b/xorg-server/xkeyboard-config/po/POTFILES.skip
index 67c1092e1..7c75518d9 100644
--- a/xorg-server/xkeyboard-config/po/POTFILES.skip
+++ b/xorg-server/xkeyboard-config/po/POTFILES.skip
@@ -1,2 +1,2 @@
-rules/evdev.xml.in
-rules/evdev.extras.xml.in
+rules/evdev.xml.in
+rules/evdev.extras.xml.in
diff --git a/xorg-server/xkeyboard-config/po/af.po b/xorg-server/xkeyboard-config/po/af.po
index e2c453d11..ced2c2b68 100644
--- a/xorg-server/xkeyboard-config/po/af.po
+++ b/xorg-server/xkeyboard-config/po/af.po
@@ -1,1464 +1,1464 @@
-# xfree86_xkb_xml
-# Copyright (C) 2004 Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# Petri Jooste <rkwjpj@puk.ac.za>, 2004.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-25 23:38+0000\n"
-"PO-Revision-Date: 2004-03-18 00:17+0200\n"
-"Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n"
-"Language-Team: Afrikaans <i18n@af.org.za>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: xfree86.xml.in.h:1
-msgid "\"Typewriter\""
-msgstr "\"Tikmasjien\""
-
-#: xfree86.xml.in.h:2
-msgid "A Tamil typewrite-style keymap; TAB encoding"
-msgstr "'n Tamil tikmasjienstyl sleutelbinding; TAB-enkodering"
-
-#: xfree86.xml.in.h:3
-msgid "A Tamil typewrite-style keymap; TSCII encoding"
-msgstr "'n Tamil tikmasjienstyl sleutelbinding; TSCII-enkodering"
-
-#: xfree86.xml.in.h:4
-msgid "A Tamil typewrite-style keymap; Unicode encoding"
-msgstr "'n Tamil tikmasjienstyl sleutelbinding; Unicode-enkodering"
-
-#: xfree86.xml.in.h:5
-msgid "ACPI Standard"
-msgstr "ACPI Standaard"
-
-#: xfree86.xml.in.h:6
-msgid "Acer AirKey V"
-msgstr "Acer AirKey V"
-
-#: xfree86.xml.in.h:7
-msgid "Acts as Shift with locking. Shift cancels Caps."
-msgstr "Tree op as Shift met sluit-aksie. Shift kanseleer Caps."
-
-#: xfree86.xml.in.h:8
-msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
-msgstr "Tree op as Shift met sluiting.  Shift kanseleer nie Caps nie."
-
-#: xfree86.xml.in.h:9
-msgid "Add the standard behavior to Menu key."
-msgstr "Voeg by die standaardgedrag by die Kieslyssleutel."
-
-#: xfree86.xml.in.h:10
-msgid "Advance Scorpius KI"
-msgstr "Advance Scorpius KI"
-
-#: xfree86.xml.in.h:11
-msgid "Alb"
-msgstr "Alb"
-
-#: xfree86.xml.in.h:12
-msgid "Albanian"
-msgstr "Albanies"
-
-#: xfree86.xml.in.h:13
-msgid "Alt and Meta on the Alt keys (default)."
-msgstr "Alt en Meta op die Alt sleutels (verstek)."
-
-#: xfree86.xml.in.h:14
-msgid "Alt+Control changes group"
-msgstr "Alt+Kontrole verander groep"
-
-#: xfree86.xml.in.h:15
-msgid "Alt+Shift changes group"
-msgstr "Alt+Shift verander groep"
-
-#: xfree86.xml.in.h:16
-msgid "Alt/Win key behavior"
-msgstr "Alt/Win-sleutel gedrag"
-
-#: xfree86.xml.in.h:17
-msgid "Alternate"
-msgstr "Alterneer"
-
-#: xfree86.xml.in.h:18
-msgid "Arabic"
-msgstr "Arabies"
-
-#: xfree86.xml.in.h:19
-msgid "Arb"
-msgstr "Arb"
-
-#: xfree86.xml.in.h:20
-msgid "Arm"
-msgstr "Arm"
-
-#: xfree86.xml.in.h:21
-msgid "Armenian"
-msgstr "Armeens"
-
-#: xfree86.xml.in.h:22
-msgid "Aze"
-msgstr "Aze"
-
-#: xfree86.xml.in.h:23
-msgid "Azerbaijani"
-msgstr "Azerbaijaans"
-
-#: xfree86.xml.in.h:24
-msgid "BTC 5090"
-msgstr "BTC 5090"
-
-#: xfree86.xml.in.h:25
-msgid "BTC 5113RF Multimedia"
-msgstr "BTC 5113RF Multimedia"
-
-#: xfree86.xml.in.h:26
-msgid "BTC 5126T"
-msgstr "BTC 5126T"
-
-#: xfree86.xml.in.h:27
-msgid "BTC 9000"
-msgstr "BTC 9000"
-
-#: xfree86.xml.in.h:28
-msgid "BTC 9000A"
-msgstr "BTC 9000A"
-
-#: xfree86.xml.in.h:29
-msgid "BTC 9001AH"
-msgstr "BTC 9001AH"
-
-#: xfree86.xml.in.h:30
-msgid "Basic"
-msgstr "Basies"
-
-#: xfree86.xml.in.h:31
-msgid "Bel"
-msgstr "Bel"
-
-#: xfree86.xml.in.h:32
-msgid "Belarusian"
-msgstr "Belarussies"
-
-#: xfree86.xml.in.h:33
-msgid "Belgian"
-msgstr "Belgies"
-
-#: xfree86.xml.in.h:34
-msgid "Ben"
-msgstr "Ben"
-
-#: xfree86.xml.in.h:35
-msgid "Bengali"
-msgstr "Bengaals"
-
-#: xfree86.xml.in.h:36
-msgid "Bgr"
-msgstr "Bgr"
-
-#: xfree86.xml.in.h:37
-msgid "Bih"
-msgstr "Bih"
-
-#: xfree86.xml.in.h:38
-msgid "Blr"
-msgstr "Blr"
-
-#: xfree86.xml.in.h:39
-msgid "Bosnian"
-msgstr "Bosnies"
-
-#: xfree86.xml.in.h:40
-msgid "Both Alt keys together change group"
-msgstr "Beide Alt-sleutels tesame verander groep"
-
-#: xfree86.xml.in.h:41
-msgid "Both Ctrl keys together change group"
-msgstr "Beide Ctrl-sleutels tesame verander groep"
-
-#: xfree86.xml.in.h:42
-msgid "Both Shift keys together change group"
-msgstr "Beide Shift-sleutels tesame verander groep"
-
-#: xfree86.xml.in.h:43
-msgid "Both Win-keys switch group while pressed"
-msgstr "Beide Win-sleutels wissel groep terwyl gedruk"
-
-#: xfree86.xml.in.h:44
-msgid "Bra"
-msgstr "Bra"
-
-#: xfree86.xml.in.h:45
-msgid "Brazilian"
-msgstr "Braziliaans"
-
-#: xfree86.xml.in.h:46
-msgid "Brazilian ABNT2"
-msgstr "Braziliaans ABNT2"
-
-#: xfree86.xml.in.h:47
-msgid "Brother Internet Keyboard"
-msgstr "Brother Internetsleutelbord"
-
-#: xfree86.xml.in.h:48
-msgid "Bulgarian"
-msgstr "Bulgaars"
-
-#: xfree86.xml.in.h:49
-msgid "Burmese"
-msgstr "Burmees"
-
-#: xfree86.xml.in.h:50
-msgid "Can"
-msgstr "Kan"
-
-#: xfree86.xml.in.h:51
-msgid "Canadian"
-msgstr "Kanadees"
-
-#: xfree86.xml.in.h:52
-msgid "Caps Lock key changes group"
-msgstr "CapsLock-sleutel verander groep"
-
-#: xfree86.xml.in.h:53
-msgid "CapsLock key behavior"
-msgstr "CapsLock-sleutelgedrag"
-
-#: xfree86.xml.in.h:54
-msgid "Caps_Lock LED shows alternative group"
-msgstr "Caps_Lock LED vertoon alternatiewe groep"
-
-#: xfree86.xml.in.h:55
-msgid "Cherry Blue Line CyBo@rd"
-msgstr "Cherry Blue Line CyBo@rd"
-
-#: xfree86.xml.in.h:56
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr "Cherry Blue Line CyBo@rd (alternatief)"
-
-#: xfree86.xml.in.h:57
-msgid "Chicony Internet Keyboard"
-msgstr "Chicony Internetsleutelbord"
-
-#: xfree86.xml.in.h:58
-msgid "Chicony KB-9885"
-msgstr "Chicony KB-9885"
-
-#: xfree86.xml.in.h:59
-msgid "CloGaelach"
-msgstr "CloGaelach"
-
-#: xfree86.xml.in.h:60
-msgid "CloGaelach Laptop"
-msgstr "CloGaelach Skootrekenaar"
-
-#: xfree86.xml.in.h:61
-msgid "Compaq Easy Access Keyboard"
-msgstr "Compaq Easy Access Keyboard"
-
-#: xfree86.xml.in.h:62
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr "Compaq Internet Keyboard (13 sleutels)"
-
-#: xfree86.xml.in.h:63
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr "Compaq Internet Keyboard (18 sleutels)"
-
-#: xfree86.xml.in.h:64
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr "Compaq Internet Keyboard (7 sleutels)"
-
-#: xfree86.xml.in.h:65
-msgid "Compaq iPaq Keyboard"
-msgstr "Compaq iPaq Keyboard"
-
-#: xfree86.xml.in.h:66
-msgid "Control Key Position"
-msgstr "Kontrolesleutel posisie"
-
-#: xfree86.xml.in.h:67
-msgid "Control key at bottom left"
-msgstr "Kontrolesleutel links onder"
-
-#: xfree86.xml.in.h:68
-msgid "Control key at left of 'A'"
-msgstr "Kontrolesleutel links van 'A'"
-
-#: xfree86.xml.in.h:69
-msgid "Control+Shift changes group"
-msgstr "Ctrl+Shift verander groep"
-
-#: xfree86.xml.in.h:70
-msgid "Croatian"
-msgstr "Kroaties"
-
-#: xfree86.xml.in.h:71
-msgid "Cyrillic"
-msgstr "Kirrillies"
-
-#: xfree86.xml.in.h:72
-msgid "Cze"
-msgstr "Cze"
-
-#: xfree86.xml.in.h:73
-msgid "Czech"
-msgstr "Tsjeggies"
-
-#: xfree86.xml.in.h:74
-msgid "Czech (qwerty)"
-msgstr "Tsjeggies (qwerty)"
-
-#: xfree86.xml.in.h:75
-msgid "Danish"
-msgstr "Deens"
-
-#: xfree86.xml.in.h:76
-msgid "Dead acute"
-msgstr "Dooie akuutaksent"
-
-#: xfree86.xml.in.h:77
-msgid "Dead grave acute"
-msgstr "Dooie gravisaksent"
-
-#: xfree86.xml.in.h:78
-msgid "Dell"
-msgstr "Dell"
-
-#: xfree86.xml.in.h:79
-msgid "Dell 101-key PC"
-msgstr "Dell 101-key PC"
-
-#: xfree86.xml.in.h:80
-msgid "Deu"
-msgstr "Deu"
-
-#: xfree86.xml.in.h:81
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr "Dexxa Wireless Desktop Keyboard"
-
-#: xfree86.xml.in.h:82
-msgid "Diamond 9801 / 9802 series"
-msgstr "Diamond 9801 / 9802 series"
-
-#: xfree86.xml.in.h:83
-msgid "Dnk"
-msgstr "Dnk"
-
-#: xfree86.xml.in.h:84
-msgid "Dutch"
-msgstr "Nederlands"
-
-#: xfree86.xml.in.h:85
-msgid "Dvo"
-msgstr "Dvo"
-
-#: xfree86.xml.in.h:86
-msgid "Dvorak"
-msgstr "Dvorak"
-
-#: xfree86.xml.in.h:87
-msgid "Eliminate dead keys"
-msgstr "Elimineer dooie sleutels"
-
-#: xfree86.xml.in.h:88
-msgid "Ennyah DKB-1008"
-msgstr "Ennyah DKB-1008"
-
-#: xfree86.xml.in.h:89
-msgid "Esp"
-msgstr "Esp"
-
-#: xfree86.xml.in.h:90
-msgid "Est"
-msgstr "Est"
-
-#: xfree86.xml.in.h:91
-msgid "Estonian"
-msgstr "Estoniaans"
-
-#: xfree86.xml.in.h:92
-msgid "Everex STEPnote"
-msgstr "Everex STEPnote"
-
-#: xfree86.xml.in.h:93
-msgid "Extended"
-msgstr "Uitgebreide"
-
-#: xfree86.xml.in.h:94
-msgid "Fao"
-msgstr "Fao"
-
-#: xfree86.xml.in.h:95
-msgid "Faroese"
-msgstr "Faroees"
-
-#: xfree86.xml.in.h:96
-msgid "Farsi"
-msgstr "Farsi"
-
-#: xfree86.xml.in.h:97
-msgid "Fin"
-msgstr "Fin"
-
-#: xfree86.xml.in.h:98
-msgid "Finnish"
-msgstr "Fins"
-
-#: xfree86.xml.in.h:99
-msgid "Fra"
-msgstr "Fra"
-
-#: xfree86.xml.in.h:100
-msgid "French"
-msgstr "Frans"
-
-#: xfree86.xml.in.h:101
-msgid "French (alternative)"
-msgstr "Frans (alternatief)"
-
-#: xfree86.xml.in.h:102
-msgid "French Canadian"
-msgstr "Franse Kanadees"
-
-#: xfree86.xml.in.h:103
-msgid "GBr"
-msgstr "GBr"
-
-#: xfree86.xml.in.h:104
-msgid "Generic 101-key PC"
-msgstr "Generies 101-sleutel PC"
-
-#: xfree86.xml.in.h:105
-msgid "Generic 102-key (Intl) PC"
-msgstr "Generies 102-sleutel (Intl) PC"
-
-#: xfree86.xml.in.h:106
-msgid "Generic 104-key PC"
-msgstr "Generies 104-sleutel PC"
-
-#: xfree86.xml.in.h:107
-msgid "Generic 105-key (Intl) PC"
-msgstr "Generies 105-sleutel (Intl) PC"
-
-#: xfree86.xml.in.h:108
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-
-#: xfree86.xml.in.h:109
-msgid "Geo"
-msgstr "Geo"
-
-#: xfree86.xml.in.h:110
-msgid "Georgian (latin)"
-msgstr "Georgies (latyns)"
-
-#: xfree86.xml.in.h:111
-msgid "Georgian (russian)"
-msgstr "Georgies (russies)"
-
-#: xfree86.xml.in.h:112
-msgid "German"
-msgstr "Duits"
-
-#: xfree86.xml.in.h:113
-msgid "Grc"
-msgstr "Grc"
-
-#: xfree86.xml.in.h:114
-msgid "Greek"
-msgstr "Grieks"
-
-#: xfree86.xml.in.h:115
-msgid "Group Shift/Lock behavior"
-msgstr "Groep Shift/Lock gedrag"
-
-#: xfree86.xml.in.h:116
-msgid "Guj"
-msgstr "Guj"
-
-#: xfree86.xml.in.h:117
-msgid "Gujarati"
-msgstr "Gujarati"
-
-#: xfree86.xml.in.h:118
-msgid "Gurmukhi"
-msgstr "Gurmukhi"
-
-#: xfree86.xml.in.h:119
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr "Hewlett-Packard Internet Keyboard"
-
-#: xfree86.xml.in.h:120
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr "Hewlett-Packard Omnibook 500 FA"
-
-#: xfree86.xml.in.h:121
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr "Hewlett-Packard Omnibook 5xx"
-
-#: xfree86.xml.in.h:122
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr "Hewlett-Packard Omnibook 6000/6100"
-
-#: xfree86.xml.in.h:123
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr "Hewlett-Packard Omnibook XE3 GC"
-
-#: xfree86.xml.in.h:124
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr "Hewlett-Packard Omnibook XE3 GF"
-
-#: xfree86.xml.in.h:125
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr "Hewlett-Packard Omnibook XT1000"
-
-#: xfree86.xml.in.h:126
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr "Hewlett-Packard Pavilion ZT11xx"
-
-#: xfree86.xml.in.h:127
-msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
-
-#: xfree86.xml.in.h:128
-msgid "Hewlett-Packard SK-2505 Internet Keyboard"
-msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
-
-#: xfree86.xml.in.h:129
-msgid "Hin"
-msgstr "Hin"
-
-#: xfree86.xml.in.h:130
-msgid "Hindi"
-msgstr "Hindi"
-
-#: xfree86.xml.in.h:131
-msgid "Honeywell Euroboard"
-msgstr "Honeywell Euroboard"
-
-#: xfree86.xml.in.h:132
-msgid "Hrv"
-msgstr "Hrv"
-
-#: xfree86.xml.in.h:133
-msgid "Hun"
-msgstr "Hun"
-
-#: xfree86.xml.in.h:134
-msgid "Hungarian"
-msgstr "Hongaars"
-
-#: xfree86.xml.in.h:135
-msgid "Hungarian (qwerty)"
-msgstr "Hongaars (qwerty)"
-
-#: xfree86.xml.in.h:136
-msgid "Hyper is mapped to the Win-keys."
-msgstr "Hiper is verbind aan die Win-sleutels."
-
-#: xfree86.xml.in.h:137
-msgid "IBM Rapid Access"
-msgstr "IBM Rapid Access"
-
-#: xfree86.xml.in.h:138
-msgid "IBM Rapid Access II"
-msgstr "IBM Rapid Access II"
-
-#: xfree86.xml.in.h:139
-msgid "IBM Rapid Access II (alternate option)"
-msgstr "IBM Rapid Access II (alternate option)"
-
-#: xfree86.xml.in.h:140
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
-
-#: xfree86.xml.in.h:141
-msgid "INSCRIPT layout"
-msgstr "INSCRIPT-uitleg"
-
-#: xfree86.xml.in.h:142
-msgid "IS434"
-msgstr "IS434"
-
-#: xfree86.xml.in.h:143
-msgid "IS434 laptop"
-msgstr "IS434 laptop"
-
-#: xfree86.xml.in.h:144
-msgid "ISO Alternate"
-msgstr "ISO Alternatief"
-
-#: xfree86.xml.in.h:145
-msgid "Icelandic"
-msgstr "Yslandies"
-
-#: xfree86.xml.in.h:146
-msgid "Iku"
-msgstr "Iku"
-
-#: xfree86.xml.in.h:147
-msgid "Inuktitut"
-msgstr "Inuktitut"
-
-#: xfree86.xml.in.h:148
-msgid "Irish"
-msgstr "Iers"
-
-#: xfree86.xml.in.h:149
-msgid "Irl"
-msgstr "Irl"
-
-#: xfree86.xml.in.h:150
-msgid "Irn"
-msgstr "Irn"
-
-#: xfree86.xml.in.h:151
-msgid "Isl"
-msgstr "Isl"
-
-#: xfree86.xml.in.h:152
-msgid "Isr"
-msgstr "Isr"
-
-#: xfree86.xml.in.h:153
-msgid "Israeli"
-msgstr "Israelies"
-
-#: xfree86.xml.in.h:154
-msgid "Ita"
-msgstr "Ita"
-
-#: xfree86.xml.in.h:155
-msgid "Italian"
-msgstr "Italiaans"
-
-#: xfree86.xml.in.h:156
-msgid "Japanese"
-msgstr "Japanees"
-
-#: xfree86.xml.in.h:157
-msgid "Japanese 106-key"
-msgstr "Japanees 106-sleutel"
-
-#: xfree86.xml.in.h:158
-msgid "Jpn"
-msgstr "Jpn"
-
-#: xfree86.xml.in.h:159
-msgid "Kan"
-msgstr "Kan"
-
-#: xfree86.xml.in.h:160
-msgid "Kannada"
-msgstr "Kannada"
-
-#: xfree86.xml.in.h:161
-msgid "Keytronic FlexPro"
-msgstr "Keytronic FlexPro"
-
-#: xfree86.xml.in.h:162
-msgid "LAm"
-msgstr "LAm"
-
-#: xfree86.xml.in.h:163
-msgid "Laptop"
-msgstr "Skootrekenaar"
-
-#: xfree86.xml.in.h:164
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-
-#: xfree86.xml.in.h:165
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-
-#: xfree86.xml.in.h:166
-msgid "Laptop/notebook Dell Inspiron 8xxx"
-msgstr "Laptop/notebook Dell Inspiron 8xxx"
-
-#: xfree86.xml.in.h:167
-msgid "Latin"
-msgstr "Latyns"
-
-#: xfree86.xml.in.h:168
-msgid "Latin America"
-msgstr "Latyns Amerika"
-
-#: xfree86.xml.in.h:169
-msgid "Latvian"
-msgstr "Latvies"
-
-#: xfree86.xml.in.h:170
-msgid "Left Alt key changes group"
-msgstr "Linkerkant Alt-sleutel verander groep"
-
-#: xfree86.xml.in.h:171
-msgid "Left Ctrl key changes group"
-msgstr "Linkerkant Ctrl-sleutel verander groep"
-
-#: xfree86.xml.in.h:172
-msgid "Left Shift key changes group"
-msgstr "Linkerkant Shift-sleutel verander groep"
-
-#: xfree86.xml.in.h:173
-msgid "Left Win-key changes group"
-msgstr "Linkerkant Win-sleutel verander groep"
-
-#: xfree86.xml.in.h:174
-msgid "Left Win-key switches group while pressed"
-msgstr "Linkerkant Win-sleutel wissel groep terwyl gedruk"
-
-#: xfree86.xml.in.h:175
-msgid "Lithuanian azerty standard"
-msgstr "Lithuaniese azerty standaard"
-
-#: xfree86.xml.in.h:176
-msgid "Lithuanian qwerty \"numeric\""
-msgstr "Lithuanian qwerty \"numeries\""
-
-#: xfree86.xml.in.h:177
-msgid "Logitech Cordless Desktop"
-msgstr "Logitech Cordless Desktop"
-
-#: xfree86.xml.in.h:178
-msgid "Logitech Cordless Desktop Navigator"
-msgstr "Logitech Cordless Desktop Navigator"
-
-#: xfree86.xml.in.h:179
-msgid "Logitech Cordless Desktop Optical"
-msgstr "Logitech Cordless Desktop Optical"
-
-#: xfree86.xml.in.h:180
-msgid "Logitech Cordless Desktop Pro"
-msgstr "Logitech Cordless Desktop Pro"
-
-#: xfree86.xml.in.h:181
-msgid "Logitech Cordless Desktop Pro (alternate option)"
-msgstr "Logitech Cordless Desktop Pro (alternatiewe opsie)"
-
-#: xfree86.xml.in.h:182
-msgid "Logitech Cordless Desktop Pro (alternate option2)"
-msgstr "Logitech Cordless Desktop Pro (alternatiewe opsie2)"
-
-#: xfree86.xml.in.h:183
-msgid "Logitech Cordless Desktop iTouch"
-msgstr "Logitech Cordless Desktop iTouch"
-
-#: xfree86.xml.in.h:184
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr "Logitech Cordless Freedom/Desktop Navigator"
-
-#: xfree86.xml.in.h:185
-msgid "Logitech Deluxe Access Keyboard"
-msgstr "Logitech Deluxe Access Keyboard"
-
-#: xfree86.xml.in.h:186
-msgid "Logitech Internet Keyboard"
-msgstr "Logitech Internet Keyboard"
-
-#: xfree86.xml.in.h:187
-msgid "Logitech Internet Navigator Keyboard"
-msgstr "Logitech Internet Navigator Keyboard"
-
-#: xfree86.xml.in.h:188
-msgid "Logitech iTouch"
-msgstr "Logitech iTouch"
-
-#: xfree86.xml.in.h:189
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-
-#: xfree86.xml.in.h:190
-msgid "Logitech iTouch keyboard Internet Navigator"
-msgstr "Logitech iTouch keyboard Internet Navigator"
-
-#: xfree86.xml.in.h:191
-msgid "Ltu"
-msgstr "Ltu"
-
-#: xfree86.xml.in.h:192
-msgid "Lva"
-msgstr "Lva"
-
-#: xfree86.xml.in.h:193
-msgid "Macedonian"
-msgstr "Masedonies"
-
-#: xfree86.xml.in.h:194
-msgid "Macintosh"
-msgstr "Macintosh"
-
-#: xfree86.xml.in.h:195
-msgid "Macintosh Old"
-msgstr "Macintosh (oud)"
-
-#: xfree86.xml.in.h:196
-msgid "Make CapsLock an additional Control"
-msgstr "Maak CapsLock 'n adisionele Kontrole"
-
-#: xfree86.xml.in.h:197
-msgid "Mal"
-msgstr "Mal"
-
-#: xfree86.xml.in.h:198
-msgid "Malayalam"
-msgstr "Malayalam"
-
-#: xfree86.xml.in.h:199
-msgid "Maltese"
-msgstr "Maltees"
-
-#: xfree86.xml.in.h:200
-msgid "Maltese (US layout)"
-msgstr "Maltese (VSA-uitleg)"
-
-#: xfree86.xml.in.h:201
-msgid "Memorex MX1998"
-msgstr "Memorex MX1998"
-
-#: xfree86.xml.in.h:202
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr "Memorex MX2500 EZ-Access Keyboard"
-
-#: xfree86.xml.in.h:203
-msgid "Memorex MX2750"
-msgstr "Memorex MX2750"
-
-#: xfree86.xml.in.h:204
-msgid "Menu is Compose"
-msgstr "Kieslys-sleutel is Komponeer"
-
-#: xfree86.xml.in.h:205
-msgid "Menu key changes group"
-msgstr "Kieslyssleutel verander groep"
-
-#: xfree86.xml.in.h:206
-msgid "Meta is mapped to the Win-keys."
-msgstr "Meta is verbind aan die Win-sleutels."
-
-#: xfree86.xml.in.h:207
-msgid "Meta is mapped to the left Win-key."
-msgstr "Meta is verbind aan die linkerkantste Win-sleutel."
-
-#: xfree86.xml.in.h:208
-msgid "Microsoft Internet Keyboard"
-msgstr "Microsoft Internetsleutelbord"
-
-#: xfree86.xml.in.h:209
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "Microsoft Internet Keyboard Pro, Sweeds"
-
-#: xfree86.xml.in.h:210
-msgid "Microsoft Natural"
-msgstr "Microsoft Natuurlik"
-
-#: xfree86.xml.in.h:211
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-
-#: xfree86.xml.in.h:212
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr "Microsoft Natural Keyboard Pro OEM"
-
-#: xfree86.xml.in.h:213
-msgid "Microsoft Office Keyboard"
-msgstr "Microsoft Office sleutelbord"
-
-#: xfree86.xml.in.h:214
-msgid "Miscellaneous compatibility options"
-msgstr "Verskeie versoenbaarheid-opsies"
-
-#: xfree86.xml.in.h:215
-msgid "Mkd"
-msgstr "Mkd"
-
-#: xfree86.xml.in.h:216
-msgid "Mlt"
-msgstr "Mlt"
-
-#: xfree86.xml.in.h:217
-msgid "Mmr"
-msgstr "Mmr"
-
-#: xfree86.xml.in.h:218
-msgid "Mng"
-msgstr "Mng"
-
-#: xfree86.xml.in.h:219
-msgid "Mongolian"
-msgstr "Mongolees"
-
-#: xfree86.xml.in.h:220
-msgid "Nld"
-msgstr "Nld"
-
-#: xfree86.xml.in.h:221
-msgid "Nor"
-msgstr "Nor"
-
-#: xfree86.xml.in.h:222
-msgid "Northern Saami (Finland)"
-msgstr "Noordelike Saami (Finland)"
-
-#: xfree86.xml.in.h:223
-msgid "Northern Saami (Norway)"
-msgstr "Noordelike Saami (Noorwe�)"
-
-#: xfree86.xml.in.h:224
-msgid "Northern Saami (Sweden)"
-msgstr "Noordelike Saami (Swede)"
-
-#: xfree86.xml.in.h:225
-msgid "Northgate OmniKey 101"
-msgstr "Northgate OmniKey 101"
-
-#: xfree86.xml.in.h:226
-msgid "Norwegian"
-msgstr "Noorweegs"
-
-#: xfree86.xml.in.h:227
-msgid "Num_Lock LED shows alternative group"
-msgstr "Num_Lock LED vertoon alternatiewe groep"
-
-#: xfree86.xml.in.h:228
-msgid "Ogh"
-msgstr "Ogh"
-
-#: xfree86.xml.in.h:229
-msgid "Ogham"
-msgstr "Ogham"
-
-#: xfree86.xml.in.h:230
-msgid "Oretec MCK-800 MM/Internet keyboard"
-msgstr "Oretec MCK-800 MM/Internet keyboard"
-
-#: xfree86.xml.in.h:231
-msgid "Ori"
-msgstr "Ori"
-
-#: xfree86.xml.in.h:232
-msgid "Oriya"
-msgstr "Oriya"
-
-#: xfree86.xml.in.h:233
-msgid "PC-98xx Series"
-msgstr "PC-98xx Reeks"
-
-#: xfree86.xml.in.h:234
-msgid "PC104"
-msgstr "PC104"
-
-#: xfree86.xml.in.h:235
-msgid "Pan"
-msgstr "Pan"
-
-#: xfree86.xml.in.h:236
-msgid "Phonetic"
-msgstr "Foneties"
-
-#: xfree86.xml.in.h:237
-msgid "Pol"
-msgstr "Pol"
-
-#: xfree86.xml.in.h:238
-msgid "Polish"
-msgstr "Pools"
-
-#: xfree86.xml.in.h:239
-msgid "Polish (qwertz)"
-msgstr "Pools (qwertz)"
-
-#: xfree86.xml.in.h:240
-msgid "Polytonic"
-msgstr "Polytonic"
-
-#: xfree86.xml.in.h:241
-msgid "Portuguese"
-msgstr "Portugees"
-
-#: xfree86.xml.in.h:242
-msgid "PowerPC PS/2"
-msgstr "PowerPC PS/2"
-
-#: xfree86.xml.in.h:243
-msgid "Press Left Win-key to choose 3rd level"
-msgstr "Druk Linkerkantste Win-sleutel om die 3de vlak te kies"
-
-#: xfree86.xml.in.h:244
-msgid "Press Menu key to choose 3rd level"
-msgstr "Druk Kieslys-sleutel om die 3de vlak te kies"
-
-#: xfree86.xml.in.h:245
-msgid "Press Right Control to choose 3rd level"
-msgstr "Druk Regterkantste Ctrl-sleutel om die 3de vlak te kies"
-
-#: xfree86.xml.in.h:246
-msgid "Press Right Win-key to choose 3rd level"
-msgstr "Druk Regterkantste Win-sleutel om die 3de vlak te kies"
-
-#: xfree86.xml.in.h:247
-msgid "Press any of Win-keys to choose 3rd level"
-msgstr "Druk enige van die Win-sleutels om die 3de vlak te kies"
-
-#: xfree86.xml.in.h:248
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "Propeller Voyager (KTEZ-1000)"
-
-#: xfree86.xml.in.h:249
-msgid "Prt"
-msgstr "Prt"
-
-#: xfree86.xml.in.h:250
-msgid "QTronix Scorpius 98N+"
-msgstr "QTronix Scorpius 98N+"
-
-#: xfree86.xml.in.h:251
-msgid "R-Alt switches group while pressed"
-msgstr "R-Alt wissel die groep terwyl gedruk"
-
-#: xfree86.xml.in.h:252
-msgid "Right Alt is Compose"
-msgstr "Regterkant Alt is Komponeer"
-
-#: xfree86.xml.in.h:253
-msgid "Right Alt key changes group"
-msgstr "Regterkant Alt-sleutel verander groep"
-
-#: xfree86.xml.in.h:254
-msgid "Right Control key works as Right Alt"
-msgstr "Regterkant Ctrl-sleutel werk soos Regterkant Alt"
-
-#: xfree86.xml.in.h:255
-msgid "Right Ctrl key changes group"
-msgstr "Regterkant Ctrl-sleutel verander groep"
-
-#: xfree86.xml.in.h:256
-msgid "Right Shift key changes group"
-msgstr "Regterkant Shift-sleutel verander groep"
-
-#: xfree86.xml.in.h:257
-msgid "Right Win-key changes group"
-msgstr "Regterkant Win-sleutel verander groep"
-
-#: xfree86.xml.in.h:258
-msgid "Right Win-key is Compose"
-msgstr "Regterkant Win-sleutel is Komponeer"
-
-#: xfree86.xml.in.h:259
-msgid "Right Win-key switches group while pressed"
-msgstr "Regterkant Win-sleutel skakel groep terwyl gedruk"
-
-#: xfree86.xml.in.h:260
-msgid "Romanian"
-msgstr "Romeens"
-
-#: xfree86.xml.in.h:261
-msgid "Rou"
-msgstr "Rou"
-
-#: xfree86.xml.in.h:262
-msgid "Rus"
-msgstr "Rus"
-
-#: xfree86.xml.in.h:263
-msgid "Russian"
-msgstr "Russies"
-
-#: xfree86.xml.in.h:264
-msgid "SK-1300"
-msgstr "SK-1300"
-
-#: xfree86.xml.in.h:265
-msgid "SK-2500"
-msgstr "SK-2500"
-
-#: xfree86.xml.in.h:266
-msgid "SK-6200"
-msgstr "SK-6200"
-
-#: xfree86.xml.in.h:267
-msgid "SK-7100"
-msgstr "SK-7100"
-
-#: xfree86.xml.in.h:268
-msgid "SVEN Ergonomic 2500"
-msgstr "SVEN Ergonomic 2500"
-
-#: xfree86.xml.in.h:269
-msgid "Samsung SDM 4500P"
-msgstr "Samsung SDM 4500P"
-
-#: xfree86.xml.in.h:270
-msgid "Samsung SDM 4510P"
-msgstr "Samsung SDM 4510P"
-
-#: xfree86.xml.in.h:271
-msgid "Sapmi"
-msgstr "Sapmi"
-
-#: xfree86.xml.in.h:272
-msgid "Scg"
-msgstr "Scg"
-
-#: xfree86.xml.in.h:273
-msgid "Scroll_Lock LED shows alternative group"
-msgstr "Scroll_Lock LED wys alternatiewe groep"
-
-#: xfree86.xml.in.h:274
-msgid "Serbian"
-msgstr "Serbies"
-
-#: xfree86.xml.in.h:275
-msgid "Shift with numpad keys works as in MS Windows"
-msgstr "Shift met numeriese sleutels werk soos in MS Windows"
-
-#: xfree86.xml.in.h:276
-msgid "Slovak"
-msgstr "Slovaaks"
-
-#: xfree86.xml.in.h:277
-msgid "Slovak (qwerty)"
-msgstr "Slovaaks (qwerty)"
-
-#: xfree86.xml.in.h:278
-msgid "Slovenian"
-msgstr "Sloveens"
-
-#: xfree86.xml.in.h:279
-msgid "Sme"
-msgstr "Sme"
-
-#: xfree86.xml.in.h:280
-msgid "Spanish"
-msgstr "Spaans"
-
-#: xfree86.xml.in.h:281
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
-msgstr "Spesiale sleutels (Ctrl+Alt+&lt;sleutel&gt;) word hanteer in 'n bediener."
-
-#: xfree86.xml.in.h:282
-msgid "Standard"
-msgstr "Standaard"
-
-#: xfree86.xml.in.h:283
-msgid "Sun dead keys"
-msgstr "Sun (dooie sleutels)"
-
-#: xfree86.xml.in.h:284
-msgid "Super is mapped to the Win-keys (default)."
-msgstr "Super is verbind aan die Win-sleutels (verstek)."
-
-#: xfree86.xml.in.h:285
-msgid "Sv"
-msgstr "Sv"
-
-#: xfree86.xml.in.h:286
-msgid "Svk"
-msgstr "Svk"
-
-#: xfree86.xml.in.h:287
-msgid "Svn"
-msgstr "Svn"
-
-#: xfree86.xml.in.h:288
-msgid "Swap Control and Caps Lock"
-msgstr "Ruil Ctrl en CapsLock om"
-
-#: xfree86.xml.in.h:289
-msgid "Swe"
-msgstr "Swe"
-
-#: xfree86.xml.in.h:290
-msgid "Swedish"
-msgstr "Sweeds"
-
-#: xfree86.xml.in.h:291
-msgid "Swiss French"
-msgstr "Switserse Frans"
-
-#: xfree86.xml.in.h:292
-msgid "Swiss German"
-msgstr "Switserse Duits"
-
-#: xfree86.xml.in.h:293
-msgid "Symplon PaceBook (tablet PC)"
-msgstr "Symplon PaceBook (tablet PC)"
-
-#: xfree86.xml.in.h:294
-msgid "Syr"
-msgstr "Syr"
-
-#: xfree86.xml.in.h:295
-msgid "Syriac"
-msgstr "Siries"
-
-#: xfree86.xml.in.h:296
-msgid "Tajik"
-msgstr "Tajikees"
-
-#: xfree86.xml.in.h:297
-msgid "Tamil"
-msgstr "Tamilees"
-
-#: xfree86.xml.in.h:298
-msgid "Tel"
-msgstr "Tel"
-
-#: xfree86.xml.in.h:299
-msgid "Telugu"
-msgstr "Telugu"
-
-#: xfree86.xml.in.h:300
-msgid "Tha"
-msgstr "Tha"
-
-#: xfree86.xml.in.h:301
-msgid "Thai (Kedmanee)"
-msgstr "Thai (Kedmanee)"
-
-#: xfree86.xml.in.h:302
-msgid "Thai (Pattachote)"
-msgstr "Thai (Pattachote)"
-
-#: xfree86.xml.in.h:303
-msgid "Thai (TIS-820.2538)"
-msgstr "Thai (TIS-820.2538)"
-
-#: xfree86.xml.in.h:304
-msgid "Third level choosers"
-msgstr "Derdevlak kiesers"
-
-#: xfree86.xml.in.h:305
-msgid "Tjk"
-msgstr "Tjk"
-
-#: xfree86.xml.in.h:306
-msgid "Tml"
-msgstr "Tml"
-
-#: xfree86.xml.in.h:307
-msgid "Toshiba Satellite S3000"
-msgstr "Toshiba Satellite S3000"
-
-#: xfree86.xml.in.h:308
-msgid "Trust Direct Access Keyboard"
-msgstr "Trust Direct Access Keyboard"
-
-#: xfree86.xml.in.h:309
-msgid "Trust Wireless Keyboard Classic"
-msgstr "Trust Wireless Keyboard Classic"
-
-#: xfree86.xml.in.h:310
-msgid "Tur"
-msgstr "Tur"
-
-#: xfree86.xml.in.h:311
-msgid "Turkish"
-msgstr "Turks"
-
-#: xfree86.xml.in.h:312
-msgid "Turkish (F)"
-msgstr "Turks (F)"
-
-#: xfree86.xml.in.h:313
-msgid "Turkish Alt-Q Layout"
-msgstr "Turks Alt-Q-uitleg"
-
-#: xfree86.xml.in.h:314
-msgid "U.S. English"
-msgstr "VSA Engels"
-
-#: xfree86.xml.in.h:315
-msgid "U.S. English w/ ISO9995-3"
-msgstr "VSA Engels met ISO9995-3"
-
-#: xfree86.xml.in.h:316
-msgid "U.S. English w/ dead keys"
-msgstr "VSA Engels met dooie sleutels"
-
-#: xfree86.xml.in.h:317
-msgid "US"
-msgstr "VSA"
-
-#: xfree86.xml.in.h:318
-msgid "US keyboard with Romanian letters"
-msgstr "VSA sleutelbord met Romeense letters"
-
-#: xfree86.xml.in.h:319
-msgid "USA"
-msgstr "VSA"
-
-#: xfree86.xml.in.h:320
-msgid "Ukr"
-msgstr "Ukr"
-
-#: xfree86.xml.in.h:321
-msgid "Ukrainian"
-msgstr "Ukra�nies"
-
-#: xfree86.xml.in.h:322
-msgid "UnicodeExpert"
-msgstr "UnicodeExpert"
-
-#: xfree86.xml.in.h:323
-msgid "United Kingdom"
-msgstr "Vereenigde Koninkryk"
-
-#: xfree86.xml.in.h:324
-msgid "Use keyboard LED to show alternative group"
-msgstr "Gebruik sleutelbord LED om alternatiewe groep te wys"
-
-#: xfree86.xml.in.h:325
-msgid "Uses internal capitalization. Shift cancels Caps."
-msgstr "Gebruik interne bokas. Shift kanseleer Caps."
-
-#: xfree86.xml.in.h:326
-msgid "Uses internal capitalization. Shift doesn't cancel Caps."
-msgstr "Gebruik interne bokas.  Shift kanseleer nie Caps nie."
-
-#: xfree86.xml.in.h:327
-msgid "Uzb"
-msgstr "Uzb"
-
-#: xfree86.xml.in.h:328
-msgid "Uzbek"
-msgstr "Uzbek"
-
-#: xfree86.xml.in.h:329
-msgid "Vietnamese"
-msgstr "Vi�tnamees"
-
-#: xfree86.xml.in.h:330
-msgid "Vnm"
-msgstr "Vnm"
-
-#: xfree86.xml.in.h:331
-msgid "Winbook Model XP5"
-msgstr "Winbook Model XP5"
-
-#: xfree86.xml.in.h:332
-msgid "Winkeys"
-msgstr "Winkeys"
-
-#: xfree86.xml.in.h:333
-msgid "Yahoo! Internet Keyboard"
-msgstr "Yahoo! Internetsleutelbord"
-
-#: xfree86.xml.in.h:334
-msgid "Yug"
-msgstr "Yug"
-
-#: xfree86.xml.in.h:335
-msgid "Yugoslavian"
-msgstr "Joegoslaafs"
-
-#: xfree86.xml.in.h:336
-msgid "abnt2"
-msgstr "abnt2"
-
-#: xfree86.xml.in.h:337
-msgid "azerty"
-msgstr "azerty"
-
-#: xfree86.xml.in.h:338
-msgid "azerty/digits"
-msgstr "azerty/syfers"
-
-#: xfree86.xml.in.h:339
-msgid "bksl"
-msgstr "bksl"
-
-#: xfree86.xml.in.h:340
-msgid "digits"
-msgstr "syfers"
-
-#: xfree86.xml.in.h:341
-msgid "l2/101/qwerty/comma"
-msgstr "l2/101/qwerty/komma"
-
-#: xfree86.xml.in.h:342
-msgid "l2/101/qwerty/dot"
-msgstr "l2/101/qwerty/dot"
-
-#: xfree86.xml.in.h:343
-msgid "l2/101/qwertz/comma"
-msgstr "l2/101/qwertz/komma"
-
-#: xfree86.xml.in.h:344
-msgid "l2/101/qwertz/dot"
-msgstr "l2/101/qwertz/dot"
-
-#: xfree86.xml.in.h:345
-msgid "l2/102/qwerty/comma"
-msgstr "l2/102/qwerty/komma"
-
-#: xfree86.xml.in.h:346
-msgid "l2/102/qwerty/dot"
-msgstr "l2/102/qwerty/dot"
-
-#: xfree86.xml.in.h:347
-msgid "l2/102/qwertz/comma"
-msgstr "l2/102/qwertz/komma"
-
-#: xfree86.xml.in.h:348
-msgid "l2/102/qwertz/dot"
-msgstr "l2/102/qwertz/dot"
-
-#: xfree86.xml.in.h:349
-msgid "laptop"
-msgstr "skootrekenaar"
-
-#: xfree86.xml.in.h:350
-msgid "lyx"
-msgstr "lyx"
-
-#: xfree86.xml.in.h:351
-msgid "qwerty"
-msgstr "qwerty"
-
-#: xfree86.xml.in.h:352
-msgid "qwerty/digits"
-msgstr "qwerty/syfers"
-
-#: xfree86.xml.in.h:353
-msgid "sefi"
-msgstr "sefi"
-
-#: xfree86.xml.in.h:354
-msgid "si1452"
-msgstr "si1452"
-
-#: xfree86.xml.in.h:355
-msgid "uni/101/qwerty/comma"
-msgstr "uni/101/qwerty/komma"
-
-#: xfree86.xml.in.h:356
-msgid "uni/101/qwerty/dot"
-msgstr "uni/101/qwerty/dot"
-
-#: xfree86.xml.in.h:357
-msgid "uni/101/qwertz/comma"
-msgstr "uni/101/qwertz/komma"
-
-#: xfree86.xml.in.h:358
-msgid "uni/101/qwertz/dot"
-msgstr "uni/101/qwertz/dot"
-
-#: xfree86.xml.in.h:359
-msgid "uni/102/qwerty/comma"
-msgstr "uni/102/qwerty/komma"
-
-#: xfree86.xml.in.h:360
-msgid "uni/102/qwerty/dot"
-msgstr "uni/102/qwerty/dot"
-
-#: xfree86.xml.in.h:361
-msgid "uni/102/qwertz/comma"
-msgstr "uni/102/qwertz/comma"
-
-#: xfree86.xml.in.h:362
-msgid "uni/102/qwertz/dot"
-msgstr "uni/102/qwertz/dot"
+# xfree86_xkb_xml
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# Petri Jooste <rkwjpj@puk.ac.za>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-11-25 23:38+0000\n"
+"PO-Revision-Date: 2004-03-18 00:17+0200\n"
+"Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n"
+"Language-Team: Afrikaans <i18n@af.org.za>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: xfree86.xml.in.h:1
+msgid "\"Typewriter\""
+msgstr "\"Tikmasjien\""
+
+#: xfree86.xml.in.h:2
+msgid "A Tamil typewrite-style keymap; TAB encoding"
+msgstr "'n Tamil tikmasjienstyl sleutelbinding; TAB-enkodering"
+
+#: xfree86.xml.in.h:3
+msgid "A Tamil typewrite-style keymap; TSCII encoding"
+msgstr "'n Tamil tikmasjienstyl sleutelbinding; TSCII-enkodering"
+
+#: xfree86.xml.in.h:4
+msgid "A Tamil typewrite-style keymap; Unicode encoding"
+msgstr "'n Tamil tikmasjienstyl sleutelbinding; Unicode-enkodering"
+
+#: xfree86.xml.in.h:5
+msgid "ACPI Standard"
+msgstr "ACPI Standaard"
+
+#: xfree86.xml.in.h:6
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: xfree86.xml.in.h:7
+msgid "Acts as Shift with locking. Shift cancels Caps."
+msgstr "Tree op as Shift met sluit-aksie. Shift kanseleer Caps."
+
+#: xfree86.xml.in.h:8
+msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
+msgstr "Tree op as Shift met sluiting.  Shift kanseleer nie Caps nie."
+
+#: xfree86.xml.in.h:9
+msgid "Add the standard behavior to Menu key."
+msgstr "Voeg by die standaardgedrag by die Kieslyssleutel."
+
+#: xfree86.xml.in.h:10
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: xfree86.xml.in.h:11
+msgid "Alb"
+msgstr "Alb"
+
+#: xfree86.xml.in.h:12
+msgid "Albanian"
+msgstr "Albanies"
+
+#: xfree86.xml.in.h:13
+msgid "Alt and Meta on the Alt keys (default)."
+msgstr "Alt en Meta op die Alt sleutels (verstek)."
+
+#: xfree86.xml.in.h:14
+msgid "Alt+Control changes group"
+msgstr "Alt+Kontrole verander groep"
+
+#: xfree86.xml.in.h:15
+msgid "Alt+Shift changes group"
+msgstr "Alt+Shift verander groep"
+
+#: xfree86.xml.in.h:16
+msgid "Alt/Win key behavior"
+msgstr "Alt/Win-sleutel gedrag"
+
+#: xfree86.xml.in.h:17
+msgid "Alternate"
+msgstr "Alterneer"
+
+#: xfree86.xml.in.h:18
+msgid "Arabic"
+msgstr "Arabies"
+
+#: xfree86.xml.in.h:19
+msgid "Arb"
+msgstr "Arb"
+
+#: xfree86.xml.in.h:20
+msgid "Arm"
+msgstr "Arm"
+
+#: xfree86.xml.in.h:21
+msgid "Armenian"
+msgstr "Armeens"
+
+#: xfree86.xml.in.h:22
+msgid "Aze"
+msgstr "Aze"
+
+#: xfree86.xml.in.h:23
+msgid "Azerbaijani"
+msgstr "Azerbaijaans"
+
+#: xfree86.xml.in.h:24
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: xfree86.xml.in.h:25
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: xfree86.xml.in.h:26
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: xfree86.xml.in.h:27
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: xfree86.xml.in.h:28
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: xfree86.xml.in.h:29
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: xfree86.xml.in.h:30
+msgid "Basic"
+msgstr "Basies"
+
+#: xfree86.xml.in.h:31
+msgid "Bel"
+msgstr "Bel"
+
+#: xfree86.xml.in.h:32
+msgid "Belarusian"
+msgstr "Belarussies"
+
+#: xfree86.xml.in.h:33
+msgid "Belgian"
+msgstr "Belgies"
+
+#: xfree86.xml.in.h:34
+msgid "Ben"
+msgstr "Ben"
+
+#: xfree86.xml.in.h:35
+msgid "Bengali"
+msgstr "Bengaals"
+
+#: xfree86.xml.in.h:36
+msgid "Bgr"
+msgstr "Bgr"
+
+#: xfree86.xml.in.h:37
+msgid "Bih"
+msgstr "Bih"
+
+#: xfree86.xml.in.h:38
+msgid "Blr"
+msgstr "Blr"
+
+#: xfree86.xml.in.h:39
+msgid "Bosnian"
+msgstr "Bosnies"
+
+#: xfree86.xml.in.h:40
+msgid "Both Alt keys together change group"
+msgstr "Beide Alt-sleutels tesame verander groep"
+
+#: xfree86.xml.in.h:41
+msgid "Both Ctrl keys together change group"
+msgstr "Beide Ctrl-sleutels tesame verander groep"
+
+#: xfree86.xml.in.h:42
+msgid "Both Shift keys together change group"
+msgstr "Beide Shift-sleutels tesame verander groep"
+
+#: xfree86.xml.in.h:43
+msgid "Both Win-keys switch group while pressed"
+msgstr "Beide Win-sleutels wissel groep terwyl gedruk"
+
+#: xfree86.xml.in.h:44
+msgid "Bra"
+msgstr "Bra"
+
+#: xfree86.xml.in.h:45
+msgid "Brazilian"
+msgstr "Braziliaans"
+
+#: xfree86.xml.in.h:46
+msgid "Brazilian ABNT2"
+msgstr "Braziliaans ABNT2"
+
+#: xfree86.xml.in.h:47
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internetsleutelbord"
+
+#: xfree86.xml.in.h:48
+msgid "Bulgarian"
+msgstr "Bulgaars"
+
+#: xfree86.xml.in.h:49
+msgid "Burmese"
+msgstr "Burmees"
+
+#: xfree86.xml.in.h:50
+msgid "Can"
+msgstr "Kan"
+
+#: xfree86.xml.in.h:51
+msgid "Canadian"
+msgstr "Kanadees"
+
+#: xfree86.xml.in.h:52
+msgid "Caps Lock key changes group"
+msgstr "CapsLock-sleutel verander groep"
+
+#: xfree86.xml.in.h:53
+msgid "CapsLock key behavior"
+msgstr "CapsLock-sleutelgedrag"
+
+#: xfree86.xml.in.h:54
+msgid "Caps_Lock LED shows alternative group"
+msgstr "Caps_Lock LED vertoon alternatiewe groep"
+
+#: xfree86.xml.in.h:55
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: xfree86.xml.in.h:56
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (alternatief)"
+
+#: xfree86.xml.in.h:57
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internetsleutelbord"
+
+#: xfree86.xml.in.h:58
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: xfree86.xml.in.h:59
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: xfree86.xml.in.h:60
+msgid "CloGaelach Laptop"
+msgstr "CloGaelach Skootrekenaar"
+
+#: xfree86.xml.in.h:61
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
+
+#: xfree86.xml.in.h:62
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 sleutels)"
+
+#: xfree86.xml.in.h:63
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 sleutels)"
+
+#: xfree86.xml.in.h:64
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 sleutels)"
+
+#: xfree86.xml.in.h:65
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
+
+#: xfree86.xml.in.h:66
+msgid "Control Key Position"
+msgstr "Kontrolesleutel posisie"
+
+#: xfree86.xml.in.h:67
+msgid "Control key at bottom left"
+msgstr "Kontrolesleutel links onder"
+
+#: xfree86.xml.in.h:68
+msgid "Control key at left of 'A'"
+msgstr "Kontrolesleutel links van 'A'"
+
+#: xfree86.xml.in.h:69
+msgid "Control+Shift changes group"
+msgstr "Ctrl+Shift verander groep"
+
+#: xfree86.xml.in.h:70
+msgid "Croatian"
+msgstr "Kroaties"
+
+#: xfree86.xml.in.h:71
+msgid "Cyrillic"
+msgstr "Kirrillies"
+
+#: xfree86.xml.in.h:72
+msgid "Cze"
+msgstr "Cze"
+
+#: xfree86.xml.in.h:73
+msgid "Czech"
+msgstr "Tsjeggies"
+
+#: xfree86.xml.in.h:74
+msgid "Czech (qwerty)"
+msgstr "Tsjeggies (qwerty)"
+
+#: xfree86.xml.in.h:75
+msgid "Danish"
+msgstr "Deens"
+
+#: xfree86.xml.in.h:76
+msgid "Dead acute"
+msgstr "Dooie akuutaksent"
+
+#: xfree86.xml.in.h:77
+msgid "Dead grave acute"
+msgstr "Dooie gravisaksent"
+
+#: xfree86.xml.in.h:78
+msgid "Dell"
+msgstr "Dell"
+
+#: xfree86.xml.in.h:79
+msgid "Dell 101-key PC"
+msgstr "Dell 101-key PC"
+
+#: xfree86.xml.in.h:80
+msgid "Deu"
+msgstr "Deu"
+
+#: xfree86.xml.in.h:81
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
+
+#: xfree86.xml.in.h:82
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 series"
+
+#: xfree86.xml.in.h:83
+msgid "Dnk"
+msgstr "Dnk"
+
+#: xfree86.xml.in.h:84
+msgid "Dutch"
+msgstr "Nederlands"
+
+#: xfree86.xml.in.h:85
+msgid "Dvo"
+msgstr "Dvo"
+
+#: xfree86.xml.in.h:86
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: xfree86.xml.in.h:87
+msgid "Eliminate dead keys"
+msgstr "Elimineer dooie sleutels"
+
+#: xfree86.xml.in.h:88
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: xfree86.xml.in.h:89
+msgid "Esp"
+msgstr "Esp"
+
+#: xfree86.xml.in.h:90
+msgid "Est"
+msgstr "Est"
+
+#: xfree86.xml.in.h:91
+msgid "Estonian"
+msgstr "Estoniaans"
+
+#: xfree86.xml.in.h:92
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: xfree86.xml.in.h:93
+msgid "Extended"
+msgstr "Uitgebreide"
+
+#: xfree86.xml.in.h:94
+msgid "Fao"
+msgstr "Fao"
+
+#: xfree86.xml.in.h:95
+msgid "Faroese"
+msgstr "Faroees"
+
+#: xfree86.xml.in.h:96
+msgid "Farsi"
+msgstr "Farsi"
+
+#: xfree86.xml.in.h:97
+msgid "Fin"
+msgstr "Fin"
+
+#: xfree86.xml.in.h:98
+msgid "Finnish"
+msgstr "Fins"
+
+#: xfree86.xml.in.h:99
+msgid "Fra"
+msgstr "Fra"
+
+#: xfree86.xml.in.h:100
+msgid "French"
+msgstr "Frans"
+
+#: xfree86.xml.in.h:101
+msgid "French (alternative)"
+msgstr "Frans (alternatief)"
+
+#: xfree86.xml.in.h:102
+msgid "French Canadian"
+msgstr "Franse Kanadees"
+
+#: xfree86.xml.in.h:103
+msgid "GBr"
+msgstr "GBr"
+
+#: xfree86.xml.in.h:104
+msgid "Generic 101-key PC"
+msgstr "Generies 101-sleutel PC"
+
+#: xfree86.xml.in.h:105
+msgid "Generic 102-key (Intl) PC"
+msgstr "Generies 102-sleutel (Intl) PC"
+
+#: xfree86.xml.in.h:106
+msgid "Generic 104-key PC"
+msgstr "Generies 104-sleutel PC"
+
+#: xfree86.xml.in.h:107
+msgid "Generic 105-key (Intl) PC"
+msgstr "Generies 105-sleutel (Intl) PC"
+
+#: xfree86.xml.in.h:108
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+
+#: xfree86.xml.in.h:109
+msgid "Geo"
+msgstr "Geo"
+
+#: xfree86.xml.in.h:110
+msgid "Georgian (latin)"
+msgstr "Georgies (latyns)"
+
+#: xfree86.xml.in.h:111
+msgid "Georgian (russian)"
+msgstr "Georgies (russies)"
+
+#: xfree86.xml.in.h:112
+msgid "German"
+msgstr "Duits"
+
+#: xfree86.xml.in.h:113
+msgid "Grc"
+msgstr "Grc"
+
+#: xfree86.xml.in.h:114
+msgid "Greek"
+msgstr "Grieks"
+
+#: xfree86.xml.in.h:115
+msgid "Group Shift/Lock behavior"
+msgstr "Groep Shift/Lock gedrag"
+
+#: xfree86.xml.in.h:116
+msgid "Guj"
+msgstr "Guj"
+
+#: xfree86.xml.in.h:117
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: xfree86.xml.in.h:118
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: xfree86.xml.in.h:119
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
+
+#: xfree86.xml.in.h:120
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: xfree86.xml.in.h:121
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: xfree86.xml.in.h:122
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: xfree86.xml.in.h:123
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: xfree86.xml.in.h:124
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: xfree86.xml.in.h:125
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: xfree86.xml.in.h:126
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: xfree86.xml.in.h:127
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
+
+#: xfree86.xml.in.h:128
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
+
+#: xfree86.xml.in.h:129
+msgid "Hin"
+msgstr "Hin"
+
+#: xfree86.xml.in.h:130
+msgid "Hindi"
+msgstr "Hindi"
+
+#: xfree86.xml.in.h:131
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: xfree86.xml.in.h:132
+msgid "Hrv"
+msgstr "Hrv"
+
+#: xfree86.xml.in.h:133
+msgid "Hun"
+msgstr "Hun"
+
+#: xfree86.xml.in.h:134
+msgid "Hungarian"
+msgstr "Hongaars"
+
+#: xfree86.xml.in.h:135
+msgid "Hungarian (qwerty)"
+msgstr "Hongaars (qwerty)"
+
+#: xfree86.xml.in.h:136
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hiper is verbind aan die Win-sleutels."
+
+#: xfree86.xml.in.h:137
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: xfree86.xml.in.h:138
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: xfree86.xml.in.h:139
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (alternate option)"
+
+#: xfree86.xml.in.h:140
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: xfree86.xml.in.h:141
+msgid "INSCRIPT layout"
+msgstr "INSCRIPT-uitleg"
+
+#: xfree86.xml.in.h:142
+msgid "IS434"
+msgstr "IS434"
+
+#: xfree86.xml.in.h:143
+msgid "IS434 laptop"
+msgstr "IS434 laptop"
+
+#: xfree86.xml.in.h:144
+msgid "ISO Alternate"
+msgstr "ISO Alternatief"
+
+#: xfree86.xml.in.h:145
+msgid "Icelandic"
+msgstr "Yslandies"
+
+#: xfree86.xml.in.h:146
+msgid "Iku"
+msgstr "Iku"
+
+#: xfree86.xml.in.h:147
+msgid "Inuktitut"
+msgstr "Inuktitut"
+
+#: xfree86.xml.in.h:148
+msgid "Irish"
+msgstr "Iers"
+
+#: xfree86.xml.in.h:149
+msgid "Irl"
+msgstr "Irl"
+
+#: xfree86.xml.in.h:150
+msgid "Irn"
+msgstr "Irn"
+
+#: xfree86.xml.in.h:151
+msgid "Isl"
+msgstr "Isl"
+
+#: xfree86.xml.in.h:152
+msgid "Isr"
+msgstr "Isr"
+
+#: xfree86.xml.in.h:153
+msgid "Israeli"
+msgstr "Israelies"
+
+#: xfree86.xml.in.h:154
+msgid "Ita"
+msgstr "Ita"
+
+#: xfree86.xml.in.h:155
+msgid "Italian"
+msgstr "Italiaans"
+
+#: xfree86.xml.in.h:156
+msgid "Japanese"
+msgstr "Japanees"
+
+#: xfree86.xml.in.h:157
+msgid "Japanese 106-key"
+msgstr "Japanees 106-sleutel"
+
+#: xfree86.xml.in.h:158
+msgid "Jpn"
+msgstr "Jpn"
+
+#: xfree86.xml.in.h:159
+msgid "Kan"
+msgstr "Kan"
+
+#: xfree86.xml.in.h:160
+msgid "Kannada"
+msgstr "Kannada"
+
+#: xfree86.xml.in.h:161
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: xfree86.xml.in.h:162
+msgid "LAm"
+msgstr "LAm"
+
+#: xfree86.xml.in.h:163
+msgid "Laptop"
+msgstr "Skootrekenaar"
+
+#: xfree86.xml.in.h:164
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+
+#: xfree86.xml.in.h:165
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+
+#: xfree86.xml.in.h:166
+msgid "Laptop/notebook Dell Inspiron 8xxx"
+msgstr "Laptop/notebook Dell Inspiron 8xxx"
+
+#: xfree86.xml.in.h:167
+msgid "Latin"
+msgstr "Latyns"
+
+#: xfree86.xml.in.h:168
+msgid "Latin America"
+msgstr "Latyns Amerika"
+
+#: xfree86.xml.in.h:169
+msgid "Latvian"
+msgstr "Latvies"
+
+#: xfree86.xml.in.h:170
+msgid "Left Alt key changes group"
+msgstr "Linkerkant Alt-sleutel verander groep"
+
+#: xfree86.xml.in.h:171
+msgid "Left Ctrl key changes group"
+msgstr "Linkerkant Ctrl-sleutel verander groep"
+
+#: xfree86.xml.in.h:172
+msgid "Left Shift key changes group"
+msgstr "Linkerkant Shift-sleutel verander groep"
+
+#: xfree86.xml.in.h:173
+msgid "Left Win-key changes group"
+msgstr "Linkerkant Win-sleutel verander groep"
+
+#: xfree86.xml.in.h:174
+msgid "Left Win-key switches group while pressed"
+msgstr "Linkerkant Win-sleutel wissel groep terwyl gedruk"
+
+#: xfree86.xml.in.h:175
+msgid "Lithuanian azerty standard"
+msgstr "Lithuaniese azerty standaard"
+
+#: xfree86.xml.in.h:176
+msgid "Lithuanian qwerty \"numeric\""
+msgstr "Lithuanian qwerty \"numeries\""
+
+#: xfree86.xml.in.h:177
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: xfree86.xml.in.h:178
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: xfree86.xml.in.h:179
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: xfree86.xml.in.h:180
+msgid "Logitech Cordless Desktop Pro"
+msgstr "Logitech Cordless Desktop Pro"
+
+#: xfree86.xml.in.h:181
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Logitech Cordless Desktop Pro (alternatiewe opsie)"
+
+#: xfree86.xml.in.h:182
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (alternatiewe opsie2)"
+
+#: xfree86.xml.in.h:183
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: xfree86.xml.in.h:184
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: xfree86.xml.in.h:185
+msgid "Logitech Deluxe Access Keyboard"
+msgstr "Logitech Deluxe Access Keyboard"
+
+#: xfree86.xml.in.h:186
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: xfree86.xml.in.h:187
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: xfree86.xml.in.h:188
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: xfree86.xml.in.h:189
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+
+#: xfree86.xml.in.h:190
+msgid "Logitech iTouch keyboard Internet Navigator"
+msgstr "Logitech iTouch keyboard Internet Navigator"
+
+#: xfree86.xml.in.h:191
+msgid "Ltu"
+msgstr "Ltu"
+
+#: xfree86.xml.in.h:192
+msgid "Lva"
+msgstr "Lva"
+
+#: xfree86.xml.in.h:193
+msgid "Macedonian"
+msgstr "Masedonies"
+
+#: xfree86.xml.in.h:194
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: xfree86.xml.in.h:195
+msgid "Macintosh Old"
+msgstr "Macintosh (oud)"
+
+#: xfree86.xml.in.h:196
+msgid "Make CapsLock an additional Control"
+msgstr "Maak CapsLock 'n adisionele Kontrole"
+
+#: xfree86.xml.in.h:197
+msgid "Mal"
+msgstr "Mal"
+
+#: xfree86.xml.in.h:198
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: xfree86.xml.in.h:199
+msgid "Maltese"
+msgstr "Maltees"
+
+#: xfree86.xml.in.h:200
+msgid "Maltese (US layout)"
+msgstr "Maltese (VSA-uitleg)"
+
+#: xfree86.xml.in.h:201
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: xfree86.xml.in.h:202
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
+
+#: xfree86.xml.in.h:203
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: xfree86.xml.in.h:204
+msgid "Menu is Compose"
+msgstr "Kieslys-sleutel is Komponeer"
+
+#: xfree86.xml.in.h:205
+msgid "Menu key changes group"
+msgstr "Kieslyssleutel verander groep"
+
+#: xfree86.xml.in.h:206
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta is verbind aan die Win-sleutels."
+
+#: xfree86.xml.in.h:207
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta is verbind aan die linkerkantste Win-sleutel."
+
+#: xfree86.xml.in.h:208
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internetsleutelbord"
+
+#: xfree86.xml.in.h:209
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, Sweeds"
+
+#: xfree86.xml.in.h:210
+msgid "Microsoft Natural"
+msgstr "Microsoft Natuurlik"
+
+#: xfree86.xml.in.h:211
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: xfree86.xml.in.h:212
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: xfree86.xml.in.h:213
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office sleutelbord"
+
+#: xfree86.xml.in.h:214
+msgid "Miscellaneous compatibility options"
+msgstr "Verskeie versoenbaarheid-opsies"
+
+#: xfree86.xml.in.h:215
+msgid "Mkd"
+msgstr "Mkd"
+
+#: xfree86.xml.in.h:216
+msgid "Mlt"
+msgstr "Mlt"
+
+#: xfree86.xml.in.h:217
+msgid "Mmr"
+msgstr "Mmr"
+
+#: xfree86.xml.in.h:218
+msgid "Mng"
+msgstr "Mng"
+
+#: xfree86.xml.in.h:219
+msgid "Mongolian"
+msgstr "Mongolees"
+
+#: xfree86.xml.in.h:220
+msgid "Nld"
+msgstr "Nld"
+
+#: xfree86.xml.in.h:221
+msgid "Nor"
+msgstr "Nor"
+
+#: xfree86.xml.in.h:222
+msgid "Northern Saami (Finland)"
+msgstr "Noordelike Saami (Finland)"
+
+#: xfree86.xml.in.h:223
+msgid "Northern Saami (Norway)"
+msgstr "Noordelike Saami (Noorwe�)"
+
+#: xfree86.xml.in.h:224
+msgid "Northern Saami (Sweden)"
+msgstr "Noordelike Saami (Swede)"
+
+#: xfree86.xml.in.h:225
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: xfree86.xml.in.h:226
+msgid "Norwegian"
+msgstr "Noorweegs"
+
+#: xfree86.xml.in.h:227
+msgid "Num_Lock LED shows alternative group"
+msgstr "Num_Lock LED vertoon alternatiewe groep"
+
+#: xfree86.xml.in.h:228
+msgid "Ogh"
+msgstr "Ogh"
+
+#: xfree86.xml.in.h:229
+msgid "Ogham"
+msgstr "Ogham"
+
+#: xfree86.xml.in.h:230
+msgid "Oretec MCK-800 MM/Internet keyboard"
+msgstr "Oretec MCK-800 MM/Internet keyboard"
+
+#: xfree86.xml.in.h:231
+msgid "Ori"
+msgstr "Ori"
+
+#: xfree86.xml.in.h:232
+msgid "Oriya"
+msgstr "Oriya"
+
+#: xfree86.xml.in.h:233
+msgid "PC-98xx Series"
+msgstr "PC-98xx Reeks"
+
+#: xfree86.xml.in.h:234
+msgid "PC104"
+msgstr "PC104"
+
+#: xfree86.xml.in.h:235
+msgid "Pan"
+msgstr "Pan"
+
+#: xfree86.xml.in.h:236
+msgid "Phonetic"
+msgstr "Foneties"
+
+#: xfree86.xml.in.h:237
+msgid "Pol"
+msgstr "Pol"
+
+#: xfree86.xml.in.h:238
+msgid "Polish"
+msgstr "Pools"
+
+#: xfree86.xml.in.h:239
+msgid "Polish (qwertz)"
+msgstr "Pools (qwertz)"
+
+#: xfree86.xml.in.h:240
+msgid "Polytonic"
+msgstr "Polytonic"
+
+#: xfree86.xml.in.h:241
+msgid "Portuguese"
+msgstr "Portugees"
+
+#: xfree86.xml.in.h:242
+msgid "PowerPC PS/2"
+msgstr "PowerPC PS/2"
+
+#: xfree86.xml.in.h:243
+msgid "Press Left Win-key to choose 3rd level"
+msgstr "Druk Linkerkantste Win-sleutel om die 3de vlak te kies"
+
+#: xfree86.xml.in.h:244
+msgid "Press Menu key to choose 3rd level"
+msgstr "Druk Kieslys-sleutel om die 3de vlak te kies"
+
+#: xfree86.xml.in.h:245
+msgid "Press Right Control to choose 3rd level"
+msgstr "Druk Regterkantste Ctrl-sleutel om die 3de vlak te kies"
+
+#: xfree86.xml.in.h:246
+msgid "Press Right Win-key to choose 3rd level"
+msgstr "Druk Regterkantste Win-sleutel om die 3de vlak te kies"
+
+#: xfree86.xml.in.h:247
+msgid "Press any of Win-keys to choose 3rd level"
+msgstr "Druk enige van die Win-sleutels om die 3de vlak te kies"
+
+#: xfree86.xml.in.h:248
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: xfree86.xml.in.h:249
+msgid "Prt"
+msgstr "Prt"
+
+#: xfree86.xml.in.h:250
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: xfree86.xml.in.h:251
+msgid "R-Alt switches group while pressed"
+msgstr "R-Alt wissel die groep terwyl gedruk"
+
+#: xfree86.xml.in.h:252
+msgid "Right Alt is Compose"
+msgstr "Regterkant Alt is Komponeer"
+
+#: xfree86.xml.in.h:253
+msgid "Right Alt key changes group"
+msgstr "Regterkant Alt-sleutel verander groep"
+
+#: xfree86.xml.in.h:254
+msgid "Right Control key works as Right Alt"
+msgstr "Regterkant Ctrl-sleutel werk soos Regterkant Alt"
+
+#: xfree86.xml.in.h:255
+msgid "Right Ctrl key changes group"
+msgstr "Regterkant Ctrl-sleutel verander groep"
+
+#: xfree86.xml.in.h:256
+msgid "Right Shift key changes group"
+msgstr "Regterkant Shift-sleutel verander groep"
+
+#: xfree86.xml.in.h:257
+msgid "Right Win-key changes group"
+msgstr "Regterkant Win-sleutel verander groep"
+
+#: xfree86.xml.in.h:258
+msgid "Right Win-key is Compose"
+msgstr "Regterkant Win-sleutel is Komponeer"
+
+#: xfree86.xml.in.h:259
+msgid "Right Win-key switches group while pressed"
+msgstr "Regterkant Win-sleutel skakel groep terwyl gedruk"
+
+#: xfree86.xml.in.h:260
+msgid "Romanian"
+msgstr "Romeens"
+
+#: xfree86.xml.in.h:261
+msgid "Rou"
+msgstr "Rou"
+
+#: xfree86.xml.in.h:262
+msgid "Rus"
+msgstr "Rus"
+
+#: xfree86.xml.in.h:263
+msgid "Russian"
+msgstr "Russies"
+
+#: xfree86.xml.in.h:264
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: xfree86.xml.in.h:265
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: xfree86.xml.in.h:266
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: xfree86.xml.in.h:267
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: xfree86.xml.in.h:268
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: xfree86.xml.in.h:269
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: xfree86.xml.in.h:270
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: xfree86.xml.in.h:271
+msgid "Sapmi"
+msgstr "Sapmi"
+
+#: xfree86.xml.in.h:272
+msgid "Scg"
+msgstr "Scg"
+
+#: xfree86.xml.in.h:273
+msgid "Scroll_Lock LED shows alternative group"
+msgstr "Scroll_Lock LED wys alternatiewe groep"
+
+#: xfree86.xml.in.h:274
+msgid "Serbian"
+msgstr "Serbies"
+
+#: xfree86.xml.in.h:275
+msgid "Shift with numpad keys works as in MS Windows"
+msgstr "Shift met numeriese sleutels werk soos in MS Windows"
+
+#: xfree86.xml.in.h:276
+msgid "Slovak"
+msgstr "Slovaaks"
+
+#: xfree86.xml.in.h:277
+msgid "Slovak (qwerty)"
+msgstr "Slovaaks (qwerty)"
+
+#: xfree86.xml.in.h:278
+msgid "Slovenian"
+msgstr "Sloveens"
+
+#: xfree86.xml.in.h:279
+msgid "Sme"
+msgstr "Sme"
+
+#: xfree86.xml.in.h:280
+msgid "Spanish"
+msgstr "Spaans"
+
+#: xfree86.xml.in.h:281
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Spesiale sleutels (Ctrl+Alt+&lt;sleutel&gt;) word hanteer in 'n bediener."
+
+#: xfree86.xml.in.h:282
+msgid "Standard"
+msgstr "Standaard"
+
+#: xfree86.xml.in.h:283
+msgid "Sun dead keys"
+msgstr "Sun (dooie sleutels)"
+
+#: xfree86.xml.in.h:284
+msgid "Super is mapped to the Win-keys (default)."
+msgstr "Super is verbind aan die Win-sleutels (verstek)."
+
+#: xfree86.xml.in.h:285
+msgid "Sv"
+msgstr "Sv"
+
+#: xfree86.xml.in.h:286
+msgid "Svk"
+msgstr "Svk"
+
+#: xfree86.xml.in.h:287
+msgid "Svn"
+msgstr "Svn"
+
+#: xfree86.xml.in.h:288
+msgid "Swap Control and Caps Lock"
+msgstr "Ruil Ctrl en CapsLock om"
+
+#: xfree86.xml.in.h:289
+msgid "Swe"
+msgstr "Swe"
+
+#: xfree86.xml.in.h:290
+msgid "Swedish"
+msgstr "Sweeds"
+
+#: xfree86.xml.in.h:291
+msgid "Swiss French"
+msgstr "Switserse Frans"
+
+#: xfree86.xml.in.h:292
+msgid "Swiss German"
+msgstr "Switserse Duits"
+
+#: xfree86.xml.in.h:293
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: xfree86.xml.in.h:294
+msgid "Syr"
+msgstr "Syr"
+
+#: xfree86.xml.in.h:295
+msgid "Syriac"
+msgstr "Siries"
+
+#: xfree86.xml.in.h:296
+msgid "Tajik"
+msgstr "Tajikees"
+
+#: xfree86.xml.in.h:297
+msgid "Tamil"
+msgstr "Tamilees"
+
+#: xfree86.xml.in.h:298
+msgid "Tel"
+msgstr "Tel"
+
+#: xfree86.xml.in.h:299
+msgid "Telugu"
+msgstr "Telugu"
+
+#: xfree86.xml.in.h:300
+msgid "Tha"
+msgstr "Tha"
+
+#: xfree86.xml.in.h:301
+msgid "Thai (Kedmanee)"
+msgstr "Thai (Kedmanee)"
+
+#: xfree86.xml.in.h:302
+msgid "Thai (Pattachote)"
+msgstr "Thai (Pattachote)"
+
+#: xfree86.xml.in.h:303
+msgid "Thai (TIS-820.2538)"
+msgstr "Thai (TIS-820.2538)"
+
+#: xfree86.xml.in.h:304
+msgid "Third level choosers"
+msgstr "Derdevlak kiesers"
+
+#: xfree86.xml.in.h:305
+msgid "Tjk"
+msgstr "Tjk"
+
+#: xfree86.xml.in.h:306
+msgid "Tml"
+msgstr "Tml"
+
+#: xfree86.xml.in.h:307
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: xfree86.xml.in.h:308
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: xfree86.xml.in.h:309
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: xfree86.xml.in.h:310
+msgid "Tur"
+msgstr "Tur"
+
+#: xfree86.xml.in.h:311
+msgid "Turkish"
+msgstr "Turks"
+
+#: xfree86.xml.in.h:312
+msgid "Turkish (F)"
+msgstr "Turks (F)"
+
+#: xfree86.xml.in.h:313
+msgid "Turkish Alt-Q Layout"
+msgstr "Turks Alt-Q-uitleg"
+
+#: xfree86.xml.in.h:314
+msgid "U.S. English"
+msgstr "VSA Engels"
+
+#: xfree86.xml.in.h:315
+msgid "U.S. English w/ ISO9995-3"
+msgstr "VSA Engels met ISO9995-3"
+
+#: xfree86.xml.in.h:316
+msgid "U.S. English w/ dead keys"
+msgstr "VSA Engels met dooie sleutels"
+
+#: xfree86.xml.in.h:317
+msgid "US"
+msgstr "VSA"
+
+#: xfree86.xml.in.h:318
+msgid "US keyboard with Romanian letters"
+msgstr "VSA sleutelbord met Romeense letters"
+
+#: xfree86.xml.in.h:319
+msgid "USA"
+msgstr "VSA"
+
+#: xfree86.xml.in.h:320
+msgid "Ukr"
+msgstr "Ukr"
+
+#: xfree86.xml.in.h:321
+msgid "Ukrainian"
+msgstr "Ukra�nies"
+
+#: xfree86.xml.in.h:322
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: xfree86.xml.in.h:323
+msgid "United Kingdom"
+msgstr "Vereenigde Koninkryk"
+
+#: xfree86.xml.in.h:324
+msgid "Use keyboard LED to show alternative group"
+msgstr "Gebruik sleutelbord LED om alternatiewe groep te wys"
+
+#: xfree86.xml.in.h:325
+msgid "Uses internal capitalization. Shift cancels Caps."
+msgstr "Gebruik interne bokas. Shift kanseleer Caps."
+
+#: xfree86.xml.in.h:326
+msgid "Uses internal capitalization. Shift doesn't cancel Caps."
+msgstr "Gebruik interne bokas.  Shift kanseleer nie Caps nie."
+
+#: xfree86.xml.in.h:327
+msgid "Uzb"
+msgstr "Uzb"
+
+#: xfree86.xml.in.h:328
+msgid "Uzbek"
+msgstr "Uzbek"
+
+#: xfree86.xml.in.h:329
+msgid "Vietnamese"
+msgstr "Vi�tnamees"
+
+#: xfree86.xml.in.h:330
+msgid "Vnm"
+msgstr "Vnm"
+
+#: xfree86.xml.in.h:331
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: xfree86.xml.in.h:332
+msgid "Winkeys"
+msgstr "Winkeys"
+
+#: xfree86.xml.in.h:333
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internetsleutelbord"
+
+#: xfree86.xml.in.h:334
+msgid "Yug"
+msgstr "Yug"
+
+#: xfree86.xml.in.h:335
+msgid "Yugoslavian"
+msgstr "Joegoslaafs"
+
+#: xfree86.xml.in.h:336
+msgid "abnt2"
+msgstr "abnt2"
+
+#: xfree86.xml.in.h:337
+msgid "azerty"
+msgstr "azerty"
+
+#: xfree86.xml.in.h:338
+msgid "azerty/digits"
+msgstr "azerty/syfers"
+
+#: xfree86.xml.in.h:339
+msgid "bksl"
+msgstr "bksl"
+
+#: xfree86.xml.in.h:340
+msgid "digits"
+msgstr "syfers"
+
+#: xfree86.xml.in.h:341
+msgid "l2/101/qwerty/comma"
+msgstr "l2/101/qwerty/komma"
+
+#: xfree86.xml.in.h:342
+msgid "l2/101/qwerty/dot"
+msgstr "l2/101/qwerty/dot"
+
+#: xfree86.xml.in.h:343
+msgid "l2/101/qwertz/comma"
+msgstr "l2/101/qwertz/komma"
+
+#: xfree86.xml.in.h:344
+msgid "l2/101/qwertz/dot"
+msgstr "l2/101/qwertz/dot"
+
+#: xfree86.xml.in.h:345
+msgid "l2/102/qwerty/comma"
+msgstr "l2/102/qwerty/komma"
+
+#: xfree86.xml.in.h:346
+msgid "l2/102/qwerty/dot"
+msgstr "l2/102/qwerty/dot"
+
+#: xfree86.xml.in.h:347
+msgid "l2/102/qwertz/comma"
+msgstr "l2/102/qwertz/komma"
+
+#: xfree86.xml.in.h:348
+msgid "l2/102/qwertz/dot"
+msgstr "l2/102/qwertz/dot"
+
+#: xfree86.xml.in.h:349
+msgid "laptop"
+msgstr "skootrekenaar"
+
+#: xfree86.xml.in.h:350
+msgid "lyx"
+msgstr "lyx"
+
+#: xfree86.xml.in.h:351
+msgid "qwerty"
+msgstr "qwerty"
+
+#: xfree86.xml.in.h:352
+msgid "qwerty/digits"
+msgstr "qwerty/syfers"
+
+#: xfree86.xml.in.h:353
+msgid "sefi"
+msgstr "sefi"
+
+#: xfree86.xml.in.h:354
+msgid "si1452"
+msgstr "si1452"
+
+#: xfree86.xml.in.h:355
+msgid "uni/101/qwerty/comma"
+msgstr "uni/101/qwerty/komma"
+
+#: xfree86.xml.in.h:356
+msgid "uni/101/qwerty/dot"
+msgstr "uni/101/qwerty/dot"
+
+#: xfree86.xml.in.h:357
+msgid "uni/101/qwertz/comma"
+msgstr "uni/101/qwertz/komma"
+
+#: xfree86.xml.in.h:358
+msgid "uni/101/qwertz/dot"
+msgstr "uni/101/qwertz/dot"
+
+#: xfree86.xml.in.h:359
+msgid "uni/102/qwerty/comma"
+msgstr "uni/102/qwerty/komma"
+
+#: xfree86.xml.in.h:360
+msgid "uni/102/qwerty/dot"
+msgstr "uni/102/qwerty/dot"
+
+#: xfree86.xml.in.h:361
+msgid "uni/102/qwertz/comma"
+msgstr "uni/102/qwertz/comma"
+
+#: xfree86.xml.in.h:362
+msgid "uni/102/qwertz/dot"
+msgstr "uni/102/qwertz/dot"
diff --git a/xorg-server/xkeyboard-config/po/az.po b/xorg-server/xkeyboard-config/po/az.po
index d15d1bf64..adb65b123 100644
--- a/xorg-server/xkeyboard-config/po/az.po
+++ b/xorg-server/xkeyboard-config/po/az.po
@@ -1,1465 +1,1465 @@
-# Translation of 'xfree86+xkb+xml' messages to Azerbaijani.
-# Copyright (C) 2004 Free Software Foundation, Inc.
-# This file is put in the public domain.
-# Mətin Əmirov <metin@karegen.com>, 2004.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: xfree86_xkb_xml-4.4pre1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-25 23:38+0000\n"
-"PO-Revision-Date: 2004-03-21 20:00+0200\n"
-"Last-Translator: Metin Amiroff <metin@karegen.com>\n"
-"Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0.2\n"
-
-#: xfree86.xml.in.h:1
-msgid "\"Typewriter\""
-msgstr "\"Yazı Makinası\""
-
-#: xfree86.xml.in.h:2
-msgid "A Tamil typewrite-style keymap; TAB encoding"
-msgstr "Tamil yazı makinası tərzində düzülüş TAB kodlaması"
-
-#: xfree86.xml.in.h:3
-msgid "A Tamil typewrite-style keymap; TSCII encoding"
-msgstr "Tamil yazı makinası tərzində düzülüş TSCII kodlaması"
-
-#: xfree86.xml.in.h:4
-msgid "A Tamil typewrite-style keymap; Unicode encoding"
-msgstr "Tamil yazı makinası tərzində düzülüş Yunikod kodlaması"
-
-#: xfree86.xml.in.h:5
-msgid "ACPI Standard"
-msgstr "ACPI Standartı"
-
-#: xfree86.xml.in.h:6
-msgid "Acer AirKey V"
-msgstr "Acer AirKey V"
-
-#: xfree86.xml.in.h:7
-msgid "Acts as Shift with locking. Shift cancels Caps."
-msgstr "Qıfıllı Shift kimi davranır. Shift Caps-i ləğv edir."
-
-#: xfree86.xml.in.h:8
-msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
-msgstr "Qıfıllı Shift kimi davranır. Shift Caps-i ləğv etmir."
-
-#: xfree86.xml.in.h:9
-msgid "Add the standard behavior to Menu key."
-msgstr "Menyu düyməsinə standart davranış əlavə et."
-
-#: xfree86.xml.in.h:10
-msgid "Advance Scorpius KI"
-msgstr "Advance Scorpius KI"
-
-#: xfree86.xml.in.h:11
-msgid "Alb"
-msgstr "Alb"
-
-#: xfree86.xml.in.h:12
-msgid "Albanian"
-msgstr "Albanca"
-
-#: xfree86.xml.in.h:13
-msgid "Alt and Meta on the Alt keys (default)."
-msgstr "Alt düymələri üstündə Alt və Meta (ön qurğulu)."
-
-#: xfree86.xml.in.h:14
-msgid "Alt+Control changes group"
-msgstr "Alt+Control düyməsi qrupu dəyişdirir"
-
-#: xfree86.xml.in.h:15
-msgid "Alt+Shift changes group"
-msgstr "Alt+Shift düyməsi qrupu dəyişdirir"
-
-#: xfree86.xml.in.h:16
-msgid "Alt/Win key behavior"
-msgstr "Alt/Win düyməsinin davranışları"
-
-#: xfree86.xml.in.h:17
-msgid "Alternate"
-msgstr "Əvəz Et"
-
-#: xfree86.xml.in.h:18
-msgid "Arabic"
-msgstr "Ərəbcə"
-
-#: xfree86.xml.in.h:19
-msgid "Arb"
-msgstr "Ərb"
-
-#: xfree86.xml.in.h:20
-msgid "Arm"
-msgstr "Erm"
-
-#: xfree86.xml.in.h:21
-msgid "Armenian"
-msgstr "Ermənicə"
-
-#: xfree86.xml.in.h:22
-msgid "Aze"
-msgstr "Azə"
-
-#: xfree86.xml.in.h:23
-msgid "Azerbaijani"
-msgstr "Azərbaycanca"
-
-#: xfree86.xml.in.h:24
-msgid "BTC 5090"
-msgstr "BTC 5090"
-
-#: xfree86.xml.in.h:25
-msgid "BTC 5113RF Multimedia"
-msgstr "BTC 5113RF Multimedia"
-
-#: xfree86.xml.in.h:26
-msgid "BTC 5126T"
-msgstr "BTC 5126T"
-
-#: xfree86.xml.in.h:27
-msgid "BTC 9000"
-msgstr "BTC 9000"
-
-#: xfree86.xml.in.h:28
-msgid "BTC 9000A"
-msgstr "BTC 9000A"
-
-#: xfree86.xml.in.h:29
-msgid "BTC 9001AH"
-msgstr "BTC 9001AH"
-
-#: xfree86.xml.in.h:30
-msgid "Basic"
-msgstr "Əsas"
-
-#: xfree86.xml.in.h:31
-msgid "Bel"
-msgstr "Bel"
-
-#: xfree86.xml.in.h:32
-msgid "Belarusian"
-msgstr "Belarusca"
-
-#: xfree86.xml.in.h:33
-msgid "Belgian"
-msgstr "Belçikaca"
-
-#: xfree86.xml.in.h:34
-msgid "Ben"
-msgstr "Ben"
-
-#: xfree86.xml.in.h:35
-msgid "Bengali"
-msgstr "Benqalca"
-
-#: xfree86.xml.in.h:36
-msgid "Bgr"
-msgstr "Bgr"
-
-#: xfree86.xml.in.h:37
-msgid "Bih"
-msgstr "Bih"
-
-#: xfree86.xml.in.h:38
-msgid "Blr"
-msgstr "Blr"
-
-#: xfree86.xml.in.h:39
-msgid "Bosnian"
-msgstr "Bosniyaca"
-
-#: xfree86.xml.in.h:40
-msgid "Both Alt keys together change group"
-msgstr "İki Alt düyməsi də bərabər qrupu dəyişdirir"
-
-#: xfree86.xml.in.h:41
-msgid "Both Ctrl keys together change group"
-msgstr "İki Ctrl düyməsi də bərabər qrupu dəyişdirir"
-
-#: xfree86.xml.in.h:42
-msgid "Both Shift keys together change group"
-msgstr "Hər iki Shift düyməsi qrupu dəyişdirir"
-
-#: xfree86.xml.in.h:43
-msgid "Both Win-keys switch group while pressed"
-msgstr "İki Win düyməsi də basılı olduğu müddətcə qrupu dəyişdirir"
-
-#: xfree86.xml.in.h:44
-msgid "Bra"
-msgstr "Bra"
-
-#: xfree86.xml.in.h:45
-msgid "Brazilian"
-msgstr "Brazilya düzülüşü"
-
-#: xfree86.xml.in.h:46
-msgid "Brazilian ABNT2"
-msgstr "Brazilya düzülüşü ABNT2"
-
-#: xfree86.xml.in.h:47
-msgid "Brother Internet Keyboard"
-msgstr "Brother Internet Keyboard"
-
-#: xfree86.xml.in.h:48
-msgid "Bulgarian"
-msgstr "Bolqarca"
-
-#: xfree86.xml.in.h:49
-msgid "Burmese"
-msgstr "Burmaca"
-
-#: xfree86.xml.in.h:50
-msgid "Can"
-msgstr "Kan"
-
-#: xfree86.xml.in.h:51
-msgid "Canadian"
-msgstr "Kanada düzülüşü"
-
-#: xfree86.xml.in.h:52
-msgid "Caps Lock key changes group"
-msgstr "Caps Lock düyməsi qrupu dəyişdirir"
-
-#: xfree86.xml.in.h:53
-msgid "CapsLock key behavior"
-msgstr "CapsLock düyməsinin davranışı"
-
-#: xfree86.xml.in.h:54
-msgid "Caps_Lock LED shows alternative group"
-msgstr "Caps_Lock LED-ləri alternativ qrupları göstərir"
-
-#: xfree86.xml.in.h:55
-msgid "Cherry Blue Line CyBo@rd"
-msgstr "Cherry Blue Line CyBo@rd"
-
-#: xfree86.xml.in.h:56
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr "Cherry Blue Line CyBo@rd (alternate option)"
-
-#: xfree86.xml.in.h:57
-msgid "Chicony Internet Keyboard"
-msgstr "Chicony Internet Keyboard"
-
-#: xfree86.xml.in.h:58
-msgid "Chicony KB-9885"
-msgstr "Chicony KB-9885"
-
-#: xfree86.xml.in.h:59
-msgid "CloGaelach"
-msgstr "CloGaelach"
-
-#: xfree86.xml.in.h:60
-msgid "CloGaelach Laptop"
-msgstr "CloGaelach Laptop"
-
-#: xfree86.xml.in.h:61
-msgid "Compaq Easy Access Keyboard"
-msgstr "Compaq Easy Access Keyboard"
-
-#: xfree86.xml.in.h:62
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr "Compaq Internet Keyboard (13 düymə)"
-
-#: xfree86.xml.in.h:63
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr "Compaq Internet Keyboard (18 düymə)"
-
-#: xfree86.xml.in.h:64
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr "Compaq Internet Keyboard (7 düymə)"
-
-#: xfree86.xml.in.h:65
-msgid "Compaq iPaq Keyboard"
-msgstr "Compaq iPaq Keyboard"
-
-#: xfree86.xml.in.h:66
-msgid "Control Key Position"
-msgstr "Control Düyməsinin Yeri"
-
-#: xfree86.xml.in.h:67
-msgid "Control key at bottom left"
-msgstr "Control düyməsi sol altda"
-
-#: xfree86.xml.in.h:68
-msgid "Control key at left of 'A'"
-msgstr "Control düyməsi 'A' hərfinin solunda"
-
-#: xfree86.xml.in.h:69
-msgid "Control+Shift changes group"
-msgstr "Control+Shift düyməsi qrupu dəyişdirir"
-
-#: xfree86.xml.in.h:70
-msgid "Croatian"
-msgstr "Xorvatca"
-
-#: xfree86.xml.in.h:71
-msgid "Cyrillic"
-msgstr "Kiril"
-
-#: xfree86.xml.in.h:72
-msgid "Cze"
-msgstr "Çex"
-
-#: xfree86.xml.in.h:73
-msgid "Czech"
-msgstr "Çexcə"
-
-#: xfree86.xml.in.h:74
-msgid "Czech (qwerty)"
-msgstr "Çexcə (qwerty)"
-
-#: xfree86.xml.in.h:75
-msgid "Danish"
-msgstr "Danimarkaca"
-
-#: xfree86.xml.in.h:76
-msgid "Dead acute"
-msgstr "Dead acute"
-
-#: xfree86.xml.in.h:77
-msgid "Dead grave acute"
-msgstr "Dead grave acute"
-
-#: xfree86.xml.in.h:78
-msgid "Dell"
-msgstr "Dell"
-
-#: xfree86.xml.in.h:79
-msgid "Dell 101-key PC"
-msgstr "Dell 101-key PC"
-
-#: xfree86.xml.in.h:80
-msgid "Deu"
-msgstr "Deu"
-
-#: xfree86.xml.in.h:81
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr "Dexxa Wireless Desktop Keyboard"
-
-#: xfree86.xml.in.h:82
-msgid "Diamond 9801 / 9802 series"
-msgstr "Diamond 9801 / 9802 seryaları"
-
-#: xfree86.xml.in.h:83
-msgid "Dnk"
-msgstr "Dnk"
-
-#: xfree86.xml.in.h:84
-msgid "Dutch"
-msgstr "Niderlandca"
-
-#: xfree86.xml.in.h:85
-msgid "Dvo"
-msgstr "Dvo"
-
-#: xfree86.xml.in.h:86
-msgid "Dvorak"
-msgstr "Dvorak"
-
-#: xfree86.xml.in.h:87
-msgid "Eliminate dead keys"
-msgstr "Ölü düymələri sayma"
-
-#: xfree86.xml.in.h:88
-msgid "Ennyah DKB-1008"
-msgstr "Ennyah DKB-1008"
-
-#: xfree86.xml.in.h:89
-msgid "Esp"
-msgstr "İsp"
-
-#: xfree86.xml.in.h:90
-msgid "Est"
-msgstr "Est"
-
-#: xfree86.xml.in.h:91
-msgid "Estonian"
-msgstr "Estonca"
-
-#: xfree86.xml.in.h:92
-msgid "Everex STEPnote"
-msgstr "Everex STEPnote"
-
-#: xfree86.xml.in.h:93
-msgid "Extended"
-msgstr "Uzadılmış"
-
-#: xfree86.xml.in.h:94
-msgid "Fao"
-msgstr "Fao"
-
-#: xfree86.xml.in.h:95
-msgid "Faroese"
-msgstr "Faroescə"
-
-#: xfree86.xml.in.h:96
-msgid "Farsi"
-msgstr "Farsca"
-
-#: xfree86.xml.in.h:97
-msgid "Fin"
-msgstr "Fin"
-
-#: xfree86.xml.in.h:98
-msgid "Finnish"
-msgstr "Fincə"
-
-#: xfree86.xml.in.h:99
-msgid "Fra"
-msgstr "Fra"
-
-#: xfree86.xml.in.h:100
-msgid "French"
-msgstr "Fransızca"
-
-#: xfree86.xml.in.h:101
-msgid "French (alternative)"
-msgstr "Fransızca (alternativ)"
-
-#: xfree86.xml.in.h:102
-msgid "French Canadian"
-msgstr "Kanada Fransızcası"
-
-#: xfree86.xml.in.h:103
-msgid "GBr"
-msgstr "GBr"
-
-#: xfree86.xml.in.h:104
-msgid "Generic 101-key PC"
-msgstr "Generic 101-key PC"
-
-#: xfree86.xml.in.h:105
-msgid "Generic 102-key (Intl) PC"
-msgstr "Generic 102-key (Intl) PC"
-
-#: xfree86.xml.in.h:106
-msgid "Generic 104-key PC"
-msgstr "Generic 104-key PC"
-
-#: xfree86.xml.in.h:107
-msgid "Generic 105-key (Intl) PC"
-msgstr "Generic 105-key (Intl) PC"
-
-#: xfree86.xml.in.h:108
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-
-#: xfree86.xml.in.h:109
-msgid "Geo"
-msgstr "Gür"
-
-#: xfree86.xml.in.h:110
-msgid "Georgian (latin)"
-msgstr "Gürcücə (latın)"
-
-#: xfree86.xml.in.h:111
-msgid "Georgian (russian)"
-msgstr "Gürcücə (kiril)"
-
-#: xfree86.xml.in.h:112
-msgid "German"
-msgstr "Almaca"
-
-#: xfree86.xml.in.h:113
-msgid "Grc"
-msgstr "Yun"
-
-#: xfree86.xml.in.h:114
-msgid "Greek"
-msgstr "Yunanca"
-
-#: xfree86.xml.in.h:115
-msgid "Group Shift/Lock behavior"
-msgstr "Shift/Lock Qrupu Davranışı"
-
-#: xfree86.xml.in.h:116
-msgid "Guj"
-msgstr "Guj"
-
-#: xfree86.xml.in.h:117
-msgid "Gujarati"
-msgstr "Gujaraticə"
-
-#: xfree86.xml.in.h:118
-msgid "Gurmukhi"
-msgstr "Gurmukhi"
-
-#: xfree86.xml.in.h:119
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr "Hewlett-Packard Internet Keyboard"
-
-#: xfree86.xml.in.h:120
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr "Hewlett-Packard Omnibook 500 FA"
-
-#: xfree86.xml.in.h:121
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr "Hewlett-Packard Omnibook 5xx"
-
-#: xfree86.xml.in.h:122
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr "Hewlett-Packard Omnibook 6000/6100"
-
-#: xfree86.xml.in.h:123
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr "Hewlett-Packard Omnibook XE3 GC"
-
-#: xfree86.xml.in.h:124
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr "Hewlett-Packard Omnibook XE3 GF"
-
-#: xfree86.xml.in.h:125
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr "Hewlett-Packard Omnibook XT1000"
-
-#: xfree86.xml.in.h:126
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr "Hewlett-Packard Pavilion ZT11xx"
-
-#: xfree86.xml.in.h:127
-msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
-
-#: xfree86.xml.in.h:128
-msgid "Hewlett-Packard SK-2505 Internet Keyboard"
-msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
-
-#: xfree86.xml.in.h:129
-msgid "Hin"
-msgstr "Hin"
-
-#: xfree86.xml.in.h:130
-msgid "Hindi"
-msgstr "Hindi"
-
-#: xfree86.xml.in.h:131
-msgid "Honeywell Euroboard"
-msgstr "Honeywell Euroboard"
-
-#: xfree86.xml.in.h:132
-msgid "Hrv"
-msgstr "Xrv"
-
-#: xfree86.xml.in.h:133
-msgid "Hun"
-msgstr "Mac"
-
-#: xfree86.xml.in.h:134
-msgid "Hungarian"
-msgstr "Macarca"
-
-#: xfree86.xml.in.h:135
-msgid "Hungarian (qwerty)"
-msgstr "Macarca (qwerty)"
-
-#: xfree86.xml.in.h:136
-msgid "Hyper is mapped to the Win-keys."
-msgstr "Hyper Win düymələrinə xəritələnib."
-
-#: xfree86.xml.in.h:137
-msgid "IBM Rapid Access"
-msgstr "IBM Rapid Access"
-
-#: xfree86.xml.in.h:138
-msgid "IBM Rapid Access II"
-msgstr "IBM Rapid Access II"
-
-#: xfree86.xml.in.h:139
-msgid "IBM Rapid Access II (alternate option)"
-msgstr "IBM Rapid Access II (alternate option)"
-
-#: xfree86.xml.in.h:140
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
-
-#: xfree86.xml.in.h:141
-msgid "INSCRIPT layout"
-msgstr "INSCRIPT düzülüşü"
-
-#: xfree86.xml.in.h:142
-msgid "IS434"
-msgstr "IS434"
-
-#: xfree86.xml.in.h:143
-msgid "IS434 laptop"
-msgstr "IS434 laptop"
-
-#: xfree86.xml.in.h:144
-msgid "ISO Alternate"
-msgstr "ISO Alternate"
-
-#: xfree86.xml.in.h:145
-msgid "Icelandic"
-msgstr "Icelandic"
-
-#: xfree86.xml.in.h:146
-msgid "Iku"
-msgstr "İku"
-
-#: xfree86.xml.in.h:147
-msgid "Inuktitut"
-msgstr "İnuktitut"
-
-#: xfree86.xml.in.h:148
-msgid "Irish"
-msgstr "İrlandca"
-
-#: xfree86.xml.in.h:149
-msgid "Irl"
-msgstr "İrl"
-
-#: xfree86.xml.in.h:150
-msgid "Irn"
-msgstr "İrn"
-
-#: xfree86.xml.in.h:151
-msgid "Isl"
-msgstr "İsl"
-
-#: xfree86.xml.in.h:152
-msgid "Isr"
-msgstr "İsr"
-
-#: xfree86.xml.in.h:153
-msgid "Israeli"
-msgstr "Yəhudicə"
-
-#: xfree86.xml.in.h:154
-msgid "Ita"
-msgstr "İta"
-
-#: xfree86.xml.in.h:155
-msgid "Italian"
-msgstr "İtalyanca"
-
-#: xfree86.xml.in.h:156
-msgid "Japanese"
-msgstr "Yaponca"
-
-#: xfree86.xml.in.h:157
-msgid "Japanese 106-key"
-msgstr "Yaponca 106-düymə"
-
-#: xfree86.xml.in.h:158
-msgid "Jpn"
-msgstr "Ypn"
-
-#: xfree86.xml.in.h:159
-msgid "Kan"
-msgstr "Kan"
-
-#: xfree86.xml.in.h:160
-msgid "Kannada"
-msgstr "Kannada"
-
-#: xfree86.xml.in.h:161
-msgid "Keytronic FlexPro"
-msgstr "Keytronic FlexPro"
-
-#: xfree86.xml.in.h:162
-msgid "LAm"
-msgstr "LAm"
-
-#: xfree86.xml.in.h:163
-msgid "Laptop"
-msgstr "Laptop"
-
-#: xfree86.xml.in.h:164
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr "Laptop/notebook Compaq (məs. Armada) Laptop Klaviaturası"
-
-#: xfree86.xml.in.h:165
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr "Laptop/notebook Compaq (məs. Presario) İnternet Klaviaturası"
-
-#: xfree86.xml.in.h:166
-msgid "Laptop/notebook Dell Inspiron 8xxx"
-msgstr "Laptop/notebook Dell Inspiron 8xxx"
-
-#: xfree86.xml.in.h:167
-msgid "Latin"
-msgstr "Latın"
-
-#: xfree86.xml.in.h:168
-msgid "Latin America"
-msgstr "Latın Amerika"
-
-#: xfree86.xml.in.h:169
-msgid "Latvian"
-msgstr "Latışca"
-
-#: xfree86.xml.in.h:170
-msgid "Left Alt key changes group"
-msgstr "Sol Alt düyməsi qrupu dəyişdirir"
-
-#: xfree86.xml.in.h:171
-msgid "Left Ctrl key changes group"
-msgstr "Sol Ctrl düyməsi qrupu dəyişdirir"
-
-#: xfree86.xml.in.h:172
-msgid "Left Shift key changes group"
-msgstr "Sol Shift düyməsi qrupu dəyişdirir"
-
-#: xfree86.xml.in.h:173
-msgid "Left Win-key changes group"
-msgstr "Sol Win düyməsi qrupu dəyişdirir"
-
-#: xfree86.xml.in.h:174
-msgid "Left Win-key switches group while pressed"
-msgstr "Sol Win düyməsi basılı olduğu müddətcə qrupu dəyişdirir"
-
-#: xfree86.xml.in.h:175
-msgid "Lithuanian azerty standard"
-msgstr "Litovca azerty standart"
-
-#: xfree86.xml.in.h:176
-msgid "Lithuanian qwerty \"numeric\""
-msgstr "Litovca qwerty \"numeric\""
-
-#: xfree86.xml.in.h:177
-msgid "Logitech Cordless Desktop"
-msgstr "Logitech Cordless Desktop"
-
-#: xfree86.xml.in.h:178
-msgid "Logitech Cordless Desktop Navigator"
-msgstr "Logitech Cordless Desktop Navigator"
-
-#: xfree86.xml.in.h:179
-msgid "Logitech Cordless Desktop Optical"
-msgstr "Logitech Cordless Desktop Optical"
-
-#: xfree86.xml.in.h:180
-msgid "Logitech Cordless Desktop Pro"
-msgstr "Logitech Cordless Desktop Pro"
-
-#: xfree86.xml.in.h:181
-msgid "Logitech Cordless Desktop Pro (alternate option)"
-msgstr "Logitech Cordless Desktop Pro (alternate option)"
-
-#: xfree86.xml.in.h:182
-msgid "Logitech Cordless Desktop Pro (alternate option2)"
-msgstr "Logitech Cordless Desktop Pro (alternate option2)"
-
-#: xfree86.xml.in.h:183
-msgid "Logitech Cordless Desktop iTouch"
-msgstr "Logitech Cordless Desktop iTouch"
-
-#: xfree86.xml.in.h:184
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr "Logitech Cordless Freedom/Desktop Navigator"
-
-#: xfree86.xml.in.h:185
-msgid "Logitech Deluxe Access Keyboard"
-msgstr "Logitech Deluxe Access Keyboard"
-
-#: xfree86.xml.in.h:186
-msgid "Logitech Internet Keyboard"
-msgstr "Logitech Internet Keyboard"
-
-#: xfree86.xml.in.h:187
-msgid "Logitech Internet Navigator Keyboard"
-msgstr "Logitech Internet Navigator Keyboard"
-
-#: xfree86.xml.in.h:188
-msgid "Logitech iTouch"
-msgstr "Logitech iTouch"
-
-#: xfree86.xml.in.h:189
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-
-#: xfree86.xml.in.h:190
-msgid "Logitech iTouch keyboard Internet Navigator"
-msgstr "Logitech iTouch keyboard Internet Navigator"
-
-#: xfree86.xml.in.h:191
-msgid "Ltu"
-msgstr "Ltu"
-
-#: xfree86.xml.in.h:192
-msgid "Lva"
-msgstr "Lva"
-
-#: xfree86.xml.in.h:193
-msgid "Macedonian"
-msgstr "Makedonca"
-
-#: xfree86.xml.in.h:194
-msgid "Macintosh"
-msgstr "Macintosh"
-
-#: xfree86.xml.in.h:195
-msgid "Macintosh Old"
-msgstr "Macintosh Old"
-
-#: xfree86.xml.in.h:196
-msgid "Make CapsLock an additional Control"
-msgstr "CapsLock düyməsini əlavə idarə olaraq tə'yin et"
-
-#: xfree86.xml.in.h:197
-msgid "Mal"
-msgstr "Mal"
-
-#: xfree86.xml.in.h:198
-msgid "Malayalam"
-msgstr "Malayalamca"
-
-#: xfree86.xml.in.h:199
-msgid "Maltese"
-msgstr "Maltaca"
-
-#: xfree86.xml.in.h:200
-msgid "Maltese (US layout)"
-msgstr "Maltaca (ABŞ düzülüşü)"
-
-#: xfree86.xml.in.h:201
-msgid "Memorex MX1998"
-msgstr "Memorex MX1998"
-
-#: xfree86.xml.in.h:202
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr "Memorex MX2500 EZ-Access Keyboard"
-
-#: xfree86.xml.in.h:203
-msgid "Memorex MX2750"
-msgstr "Memorex MX2750"
-
-#: xfree86.xml.in.h:204
-msgid "Menu is Compose"
-msgstr "Menyu yazma düyməsidir"
-
-#: xfree86.xml.in.h:205
-msgid "Menu key changes group"
-msgstr "Menü düyməsi qrupu dəyişdirir"
-
-#: xfree86.xml.in.h:206
-msgid "Meta is mapped to the Win-keys."
-msgstr "Meta Win düymələrinə xəritələnib."
-
-#: xfree86.xml.in.h:207
-msgid "Meta is mapped to the left Win-key."
-msgstr "Meta sol Win düyməsinə xəritələnib."
-
-#: xfree86.xml.in.h:208
-msgid "Microsoft Internet Keyboard"
-msgstr "Microsoft Internet Keyboard"
-
-#: xfree86.xml.in.h:209
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "Microsoft Internet Keyboard Pro, Swedish"
-
-#: xfree86.xml.in.h:210
-msgid "Microsoft Natural"
-msgstr "Microsoft Natural"
-
-#: xfree86.xml.in.h:211
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-
-#: xfree86.xml.in.h:212
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr "Microsoft Natural Keyboard Pro OEM"
-
-#: xfree86.xml.in.h:213
-msgid "Microsoft Office Keyboard"
-msgstr "Microsoft Office Keyboard"
-
-#: xfree86.xml.in.h:214
-msgid "Miscellaneous compatibility options"
-msgstr "Müxtəlif yetişmə qabiliyyəti seçimləri"
-
-#: xfree86.xml.in.h:215
-msgid "Mkd"
-msgstr "Mkd"
-
-#: xfree86.xml.in.h:216
-msgid "Mlt"
-msgstr "Mlt"
-
-#: xfree86.xml.in.h:217
-msgid "Mmr"
-msgstr "Mmr"
-
-#: xfree86.xml.in.h:218
-msgid "Mng"
-msgstr "Mng"
-
-#: xfree86.xml.in.h:219
-msgid "Mongolian"
-msgstr "Monqolca"
-
-#: xfree86.xml.in.h:220
-msgid "Nld"
-msgstr "Nld"
-
-#: xfree86.xml.in.h:221
-msgid "Nor"
-msgstr "Nor"
-
-#: xfree86.xml.in.h:222
-msgid "Northern Saami (Finland)"
-msgstr "Şimali Saami (Finlandiya)"
-
-#: xfree86.xml.in.h:223
-msgid "Northern Saami (Norway)"
-msgstr "Şimali Saami (Norveç)"
-
-#: xfree86.xml.in.h:224
-msgid "Northern Saami (Sweden)"
-msgstr "Şimali Saami (İsveç)"
-
-#: xfree86.xml.in.h:225
-msgid "Northgate OmniKey 101"
-msgstr "Northgate OmniKey 101"
-
-#: xfree86.xml.in.h:226
-msgid "Norwegian"
-msgstr "Norveçcə"
-
-#: xfree86.xml.in.h:227
-msgid "Num_Lock LED shows alternative group"
-msgstr "Num_Lock LED-ləri alternativ qrupları göstərir"
-
-#: xfree86.xml.in.h:228
-msgid "Ogh"
-msgstr "Ogh"
-
-#: xfree86.xml.in.h:229
-msgid "Ogham"
-msgstr "Ogham"
-
-#: xfree86.xml.in.h:230
-msgid "Oretec MCK-800 MM/Internet keyboard"
-msgstr "Oretec MCK-800 MM/Internet keyboard"
-
-#: xfree86.xml.in.h:231
-msgid "Ori"
-msgstr "Ori"
-
-#: xfree86.xml.in.h:232
-msgid "Oriya"
-msgstr "Oriya"
-
-#: xfree86.xml.in.h:233
-msgid "PC-98xx Series"
-msgstr "PC-98xx Seriyaları"
-
-#: xfree86.xml.in.h:234
-msgid "PC104"
-msgstr "PC104"
-
-#: xfree86.xml.in.h:235
-msgid "Pan"
-msgstr "Pan"
-
-#: xfree86.xml.in.h:236
-msgid "Phonetic"
-msgstr "Fonetik"
-
-#: xfree86.xml.in.h:237
-msgid "Pol"
-msgstr "Pol"
-
-#: xfree86.xml.in.h:238
-msgid "Polish"
-msgstr "Polyakca"
-
-#: xfree86.xml.in.h:239
-msgid "Polish (qwertz)"
-msgstr "Polyakca (qwertz)"
-
-#: xfree86.xml.in.h:240
-msgid "Polytonic"
-msgstr "Politonik"
-
-#: xfree86.xml.in.h:241
-msgid "Portuguese"
-msgstr "Portuqalca"
-
-#: xfree86.xml.in.h:242
-msgid "PowerPC PS/2"
-msgstr "PowerPC PS/2"
-
-#: xfree86.xml.in.h:243
-msgid "Press Left Win-key to choose 3rd level"
-msgstr "3-cü səviyyəni seçmək üçün sol Win düyməsinə basılsın"
-
-#: xfree86.xml.in.h:244
-msgid "Press Menu key to choose 3rd level"
-msgstr "3-cü səviyyəni seçmək üçün sağ menyuya basılsın"
-
-#: xfree86.xml.in.h:245
-msgid "Press Right Control to choose 3rd level"
-msgstr "3-cü səviyyəni seçmək üçün sağ Control düyməsinə basılsın"
-
-#: xfree86.xml.in.h:246
-msgid "Press Right Win-key to choose 3rd level"
-msgstr "3-cü səviyyəni seçmək üçün sağ Win düyməsinə basılsın"
-
-#: xfree86.xml.in.h:247
-msgid "Press any of Win-keys to choose 3rd level"
-msgstr "3-cü səviyyəni seçmək üçün hər hansı bir Win düyməsinə basılsın"
-
-#: xfree86.xml.in.h:248
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "Propeller Voyager (KTEZ-1000)"
-
-#: xfree86.xml.in.h:249
-msgid "Prt"
-msgstr "Prt"
-
-#: xfree86.xml.in.h:250
-msgid "QTronix Scorpius 98N+"
-msgstr "QTronix Scorpius 98N+"
-
-#: xfree86.xml.in.h:251
-msgid "R-Alt switches group while pressed"
-msgstr "R-Alt basılı olduğu müddətcə qrupu dəyişdirir"
-
-#: xfree86.xml.in.h:252
-msgid "Right Alt is Compose"
-msgstr "Sağ Alt düyməsi yazma düyməsidir"
-
-#: xfree86.xml.in.h:253
-msgid "Right Alt key changes group"
-msgstr "Sağ Alt düyməsi qrupu dəyişdirir"
-
-#: xfree86.xml.in.h:254
-msgid "Right Control key works as Right Alt"
-msgstr "Sağ Control düyməsi sağ Alt kimi işləyir"
-
-#: xfree86.xml.in.h:255
-msgid "Right Ctrl key changes group"
-msgstr "Sağ Ctrl düyməsi qrupu dəyişdirir"
-
-#: xfree86.xml.in.h:256
-msgid "Right Shift key changes group"
-msgstr "Sağ Shift düyməsi qrupu dəyişdirir"
-
-#: xfree86.xml.in.h:257
-msgid "Right Win-key changes group"
-msgstr "Sağ Win düyməsi qrupu dəyişdirir"
-
-#: xfree86.xml.in.h:258
-msgid "Right Win-key is Compose"
-msgstr "Sağ Win düyməsi yazma düyməsidir"
-
-#: xfree86.xml.in.h:259
-msgid "Right Win-key switches group while pressed"
-msgstr "Sağ Win düyməsi basılı olduğu müddətcə qrupu dəyişdirir"
-
-#: xfree86.xml.in.h:260
-msgid "Romanian"
-msgstr "Rumınca"
-
-#: xfree86.xml.in.h:261
-msgid "Rou"
-msgstr "Rou"
-
-#: xfree86.xml.in.h:262
-msgid "Rus"
-msgstr "Rus"
-
-#: xfree86.xml.in.h:263
-msgid "Russian"
-msgstr "Rusca"
-
-#: xfree86.xml.in.h:264
-msgid "SK-1300"
-msgstr "SK-1300"
-
-#: xfree86.xml.in.h:265
-msgid "SK-2500"
-msgstr "SK-2500"
-
-#: xfree86.xml.in.h:266
-msgid "SK-6200"
-msgstr "SK-6200"
-
-#: xfree86.xml.in.h:267
-msgid "SK-7100"
-msgstr "SK-7100"
-
-#: xfree86.xml.in.h:268
-msgid "SVEN Ergonomic 2500"
-msgstr "SVEN Ergonomic 2500"
-
-#: xfree86.xml.in.h:269
-msgid "Samsung SDM 4500P"
-msgstr "Samsung SDM 4500P"
-
-#: xfree86.xml.in.h:270
-msgid "Samsung SDM 4510P"
-msgstr "Samsung SDM 4510P"
-
-#: xfree86.xml.in.h:271
-msgid "Sapmi"
-msgstr "Sapmi"
-
-#: xfree86.xml.in.h:272
-msgid "Scg"
-msgstr "Scg"
-
-#: xfree86.xml.in.h:273
-msgid "Scroll_Lock LED shows alternative group"
-msgstr "Scroll_Lock LED-ləri alternativ qrupları göstərir"
-
-#: xfree86.xml.in.h:274
-msgid "Serbian"
-msgstr "Servcə"
-
-#: xfree86.xml.in.h:275
-msgid "Shift with numpad keys works as in MS Windows"
-msgstr "Ədəd düymələrində Shift MS Windows-dakı kimi işləyir"
-
-#: xfree86.xml.in.h:276
-msgid "Slovak"
-msgstr "Slovakca"
-
-#: xfree86.xml.in.h:277
-msgid "Slovak (qwerty)"
-msgstr "Slovakca (qwerty)"
-
-#: xfree86.xml.in.h:278
-msgid "Slovenian"
-msgstr "Slovencə"
-
-#: xfree86.xml.in.h:279
-msgid "Sme"
-msgstr "Sme"
-
-#: xfree86.xml.in.h:280
-msgid "Spanish"
-msgstr "İspanca"
-
-#: xfree86.xml.in.h:281
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
-msgstr "Xüsusi düymələr (Ctrl+Alt+&lt;düyməsi&gt;) verici tərəfindən idarə edilsin."
-
-#: xfree86.xml.in.h:282
-msgid "Standard"
-msgstr "Standart"
-
-#: xfree86.xml.in.h:283
-msgid "Sun dead keys"
-msgstr "Sun ölü düymələr"
-
-#: xfree86.xml.in.h:284
-msgid "Super is mapped to the Win-keys (default)."
-msgstr "Super Win düymələrinə xəritələnib (ön qurğulu)."
-
-#: xfree86.xml.in.h:285
-msgid "Sv"
-msgstr "Sv"
-
-#: xfree86.xml.in.h:286
-msgid "Svk"
-msgstr "Svk"
-
-#: xfree86.xml.in.h:287
-msgid "Svn"
-msgstr "Svn"
-
-#: xfree86.xml.in.h:288
-msgid "Swap Control and Caps Lock"
-msgstr "Control və Caps Lock arasında dəyiş"
-
-#: xfree86.xml.in.h:289
-msgid "Swe"
-msgstr "Swe"
-
-#: xfree86.xml.in.h:290
-msgid "Swedish"
-msgstr "İsveçcə"
-
-#: xfree86.xml.in.h:291
-msgid "Swiss French"
-msgstr "İsveçrə Fransızcası"
-
-#: xfree86.xml.in.h:292
-msgid "Swiss German"
-msgstr "İsveçrə Almancası"
-
-#: xfree86.xml.in.h:293
-msgid "Symplon PaceBook (tablet PC)"
-msgstr "Symplon PaceBook (tablet PC)"
-
-#: xfree86.xml.in.h:294
-msgid "Syr"
-msgstr "Syr"
-
-#: xfree86.xml.in.h:295
-msgid "Syriac"
-msgstr "Syriac"
-
-#: xfree86.xml.in.h:296
-msgid "Tajik"
-msgstr "Tacikcə"
-
-#: xfree86.xml.in.h:297
-msgid "Tamil"
-msgstr "Tamilcə"
-
-#: xfree86.xml.in.h:298
-msgid "Tel"
-msgstr "Tel"
-
-#: xfree86.xml.in.h:299
-msgid "Telugu"
-msgstr "Telugu"
-
-#: xfree86.xml.in.h:300
-msgid "Tha"
-msgstr "Tay"
-
-#: xfree86.xml.in.h:301
-msgid "Thai (Kedmanee)"
-msgstr "Tayca (Kedmanee)"
-
-#: xfree86.xml.in.h:302
-msgid "Thai (Pattachote)"
-msgstr "Tayca (Pattachote)"
-
-#: xfree86.xml.in.h:303
-msgid "Thai (TIS-820.2538)"
-msgstr "Tayca (TIS-820.2538)"
-
-#: xfree86.xml.in.h:304
-msgid "Third level choosers"
-msgstr "Üçüncü səviyyə seçicilər"
-
-#: xfree86.xml.in.h:305
-msgid "Tjk"
-msgstr "Tac"
-
-#: xfree86.xml.in.h:306
-msgid "Tml"
-msgstr "Tml"
-
-#: xfree86.xml.in.h:307
-msgid "Toshiba Satellite S3000"
-msgstr "Toshiba Satellite S3000"
-
-#: xfree86.xml.in.h:308
-msgid "Trust Direct Access Keyboard"
-msgstr "Trust Direct Access Keyboard"
-
-#: xfree86.xml.in.h:309
-msgid "Trust Wireless Keyboard Classic"
-msgstr "Trust Wireless Keyboard Classic"
-
-#: xfree86.xml.in.h:310
-msgid "Tur"
-msgstr "Tür"
-
-#: xfree86.xml.in.h:311
-msgid "Turkish"
-msgstr "Türkcə"
-
-#: xfree86.xml.in.h:312
-msgid "Turkish (F)"
-msgstr "Türkcə (F)"
-
-#: xfree86.xml.in.h:313
-msgid "Turkish Alt-Q Layout"
-msgstr "Türkcə Alt-Q Düzülüşü"
-
-#: xfree86.xml.in.h:314
-msgid "U.S. English"
-msgstr "A.B.Ş. İngiliscəsi"
-
-#: xfree86.xml.in.h:315
-msgid "U.S. English w/ ISO9995-3"
-msgstr "A.B.Ş. İngiliscəsi və/ ISO9995-3"
-
-#: xfree86.xml.in.h:316
-msgid "U.S. English w/ dead keys"
-msgstr "A.B.Ş. İngiliscəsi və/ ölü düymələr"
-
-#: xfree86.xml.in.h:317
-msgid "US"
-msgstr "ABŞ"
-
-#: xfree86.xml.in.h:318
-msgid "US keyboard with Romanian letters"
-msgstr "Roman hərfli ABŞ klaviaturası"
-
-#: xfree86.xml.in.h:319
-msgid "USA"
-msgstr "ABŞ"
-
-#: xfree86.xml.in.h:320
-msgid "Ukr"
-msgstr "Ukr"
-
-#: xfree86.xml.in.h:321
-msgid "Ukrainian"
-msgstr "Ukraynaca"
-
-#: xfree86.xml.in.h:322
-msgid "UnicodeExpert"
-msgstr "UnicodeExpert"
-
-#: xfree86.xml.in.h:323
-msgid "United Kingdom"
-msgstr "Birləşik Krallıq"
-
-#: xfree86.xml.in.h:324
-msgid "Use keyboard LED to show alternative group"
-msgstr "Alternativ qrupu göstərmək üçün klaviatura LED-ini işlət"
-
-#: xfree86.xml.in.h:325
-msgid "Uses internal capitalization. Shift cancels Caps."
-msgstr "Daxili kapitalizasiya işlədir. Shift Caps-i ləğv edir."
-
-#: xfree86.xml.in.h:326
-msgid "Uses internal capitalization. Shift doesn't cancel Caps."
-msgstr "Daxili kapitalizasiya işlədir. Shift Caps-i ləğv etmir."
-
-#: xfree86.xml.in.h:327
-msgid "Uzb"
-msgstr "Özb"
-
-#: xfree86.xml.in.h:328
-msgid "Uzbek"
-msgstr "Özbəkcə"
-
-#: xfree86.xml.in.h:329
-msgid "Vietnamese"
-msgstr "Vyetnamca"
-
-#: xfree86.xml.in.h:330
-msgid "Vnm"
-msgstr "Vye"
-
-#: xfree86.xml.in.h:331
-msgid "Winbook Model XP5"
-msgstr "Winbook Model XP5"
-
-#: xfree86.xml.in.h:332
-msgid "Winkeys"
-msgstr "Winkeys"
-
-#: xfree86.xml.in.h:333
-msgid "Yahoo! Internet Keyboard"
-msgstr "Yahoo! Internet Keyboard"
-
-#: xfree86.xml.in.h:334
-msgid "Yug"
-msgstr "Yug"
-
-#: xfree86.xml.in.h:335
-msgid "Yugoslavian"
-msgstr "Yugoslavca"
-
-#: xfree86.xml.in.h:336
-msgid "abnt2"
-msgstr "abnt2"
-
-#: xfree86.xml.in.h:337
-msgid "azerty"
-msgstr "azerty"
-
-#: xfree86.xml.in.h:338
-msgid "azerty/digits"
-msgstr "azerty/ədədlər"
-
-#: xfree86.xml.in.h:339
-msgid "bksl"
-msgstr "bksl"
-
-#: xfree86.xml.in.h:340
-msgid "digits"
-msgstr "ədədlər"
-
-#: xfree86.xml.in.h:341
-msgid "l2/101/qwerty/comma"
-msgstr "l2/101/qwerty/vergül"
-
-#: xfree86.xml.in.h:342
-msgid "l2/101/qwerty/dot"
-msgstr "l2/101/qwerty/nöqtə"
-
-#: xfree86.xml.in.h:343
-msgid "l2/101/qwertz/comma"
-msgstr "l2/101/qwertz/vergül"
-
-#: xfree86.xml.in.h:344
-msgid "l2/101/qwertz/dot"
-msgstr "2/101/qwertz/nöqtə"
-
-#: xfree86.xml.in.h:345
-msgid "l2/102/qwerty/comma"
-msgstr "l2/102/qwerty/vergül"
-
-#: xfree86.xml.in.h:346
-msgid "l2/102/qwerty/dot"
-msgstr "l2/102/qwerty/nöqtə"
-
-#: xfree86.xml.in.h:347
-msgid "l2/102/qwertz/comma"
-msgstr "l2/102/qwertz/vergül"
-
-#: xfree86.xml.in.h:348
-msgid "l2/102/qwertz/dot"
-msgstr "l2/102/qwertz/nöqtə"
-
-#: xfree86.xml.in.h:349
-msgid "laptop"
-msgstr "laptop"
-
-#: xfree86.xml.in.h:350
-msgid "lyx"
-msgstr "lyx"
-
-#: xfree86.xml.in.h:351
-msgid "qwerty"
-msgstr "qwerty"
-
-#: xfree86.xml.in.h:352
-msgid "qwerty/digits"
-msgstr "qwerty/ədədlər"
-
-#: xfree86.xml.in.h:353
-msgid "sefi"
-msgstr "sefi"
-
-#: xfree86.xml.in.h:354
-msgid "si1452"
-msgstr "si1452"
-
-#: xfree86.xml.in.h:355
-msgid "uni/101/qwerty/comma"
-msgstr "uni/101/qwerty/vergül"
-
-#: xfree86.xml.in.h:356
-msgid "uni/101/qwerty/dot"
-msgstr "uni/101/qwerty/nöqtə"
-
-#: xfree86.xml.in.h:357
-msgid "uni/101/qwertz/comma"
-msgstr "uni/101/qwertz/vergül"
-
-#: xfree86.xml.in.h:358
-msgid "uni/101/qwertz/dot"
-msgstr "uni/101/qwertz/nöqtə"
-
-#: xfree86.xml.in.h:359
-msgid "uni/102/qwerty/comma"
-msgstr "uni/102/qwerty/vergül"
-
-#: xfree86.xml.in.h:360
-msgid "uni/102/qwerty/dot"
-msgstr "uni/102/qwerty/nöqtə"
-
-#: xfree86.xml.in.h:361
-msgid "uni/102/qwertz/comma"
-msgstr "uni/102/qwertz/vergül"
-
-#: xfree86.xml.in.h:362
-msgid "uni/102/qwertz/dot"
-msgstr "uni/102/qwertz/nöqtə"
+# Translation of 'xfree86+xkb+xml' messages to Azerbaijani.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is put in the public domain.
+# Mətin Əmirov <metin@karegen.com>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xfree86_xkb_xml-4.4pre1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-11-25 23:38+0000\n"
+"PO-Revision-Date: 2004-03-21 20:00+0200\n"
+"Last-Translator: Metin Amiroff <metin@karegen.com>\n"
+"Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.0.2\n"
+
+#: xfree86.xml.in.h:1
+msgid "\"Typewriter\""
+msgstr "\"Yazı Makinası\""
+
+#: xfree86.xml.in.h:2
+msgid "A Tamil typewrite-style keymap; TAB encoding"
+msgstr "Tamil yazı makinası tərzində düzülüş TAB kodlaması"
+
+#: xfree86.xml.in.h:3
+msgid "A Tamil typewrite-style keymap; TSCII encoding"
+msgstr "Tamil yazı makinası tərzində düzülüş TSCII kodlaması"
+
+#: xfree86.xml.in.h:4
+msgid "A Tamil typewrite-style keymap; Unicode encoding"
+msgstr "Tamil yazı makinası tərzində düzülüş Yunikod kodlaması"
+
+#: xfree86.xml.in.h:5
+msgid "ACPI Standard"
+msgstr "ACPI Standartı"
+
+#: xfree86.xml.in.h:6
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: xfree86.xml.in.h:7
+msgid "Acts as Shift with locking. Shift cancels Caps."
+msgstr "Qıfıllı Shift kimi davranır. Shift Caps-i ləğv edir."
+
+#: xfree86.xml.in.h:8
+msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
+msgstr "Qıfıllı Shift kimi davranır. Shift Caps-i ləğv etmir."
+
+#: xfree86.xml.in.h:9
+msgid "Add the standard behavior to Menu key."
+msgstr "Menyu düyməsinə standart davranış əlavə et."
+
+#: xfree86.xml.in.h:10
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: xfree86.xml.in.h:11
+msgid "Alb"
+msgstr "Alb"
+
+#: xfree86.xml.in.h:12
+msgid "Albanian"
+msgstr "Albanca"
+
+#: xfree86.xml.in.h:13
+msgid "Alt and Meta on the Alt keys (default)."
+msgstr "Alt düymələri üstündə Alt və Meta (ön qurğulu)."
+
+#: xfree86.xml.in.h:14
+msgid "Alt+Control changes group"
+msgstr "Alt+Control düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:15
+msgid "Alt+Shift changes group"
+msgstr "Alt+Shift düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:16
+msgid "Alt/Win key behavior"
+msgstr "Alt/Win düyməsinin davranışları"
+
+#: xfree86.xml.in.h:17
+msgid "Alternate"
+msgstr "Əvəz Et"
+
+#: xfree86.xml.in.h:18
+msgid "Arabic"
+msgstr "Ərəbcə"
+
+#: xfree86.xml.in.h:19
+msgid "Arb"
+msgstr "Ərb"
+
+#: xfree86.xml.in.h:20
+msgid "Arm"
+msgstr "Erm"
+
+#: xfree86.xml.in.h:21
+msgid "Armenian"
+msgstr "Ermənicə"
+
+#: xfree86.xml.in.h:22
+msgid "Aze"
+msgstr "Azə"
+
+#: xfree86.xml.in.h:23
+msgid "Azerbaijani"
+msgstr "Azərbaycanca"
+
+#: xfree86.xml.in.h:24
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: xfree86.xml.in.h:25
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: xfree86.xml.in.h:26
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: xfree86.xml.in.h:27
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: xfree86.xml.in.h:28
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: xfree86.xml.in.h:29
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: xfree86.xml.in.h:30
+msgid "Basic"
+msgstr "Əsas"
+
+#: xfree86.xml.in.h:31
+msgid "Bel"
+msgstr "Bel"
+
+#: xfree86.xml.in.h:32
+msgid "Belarusian"
+msgstr "Belarusca"
+
+#: xfree86.xml.in.h:33
+msgid "Belgian"
+msgstr "Belçikaca"
+
+#: xfree86.xml.in.h:34
+msgid "Ben"
+msgstr "Ben"
+
+#: xfree86.xml.in.h:35
+msgid "Bengali"
+msgstr "Benqalca"
+
+#: xfree86.xml.in.h:36
+msgid "Bgr"
+msgstr "Bgr"
+
+#: xfree86.xml.in.h:37
+msgid "Bih"
+msgstr "Bih"
+
+#: xfree86.xml.in.h:38
+msgid "Blr"
+msgstr "Blr"
+
+#: xfree86.xml.in.h:39
+msgid "Bosnian"
+msgstr "Bosniyaca"
+
+#: xfree86.xml.in.h:40
+msgid "Both Alt keys together change group"
+msgstr "İki Alt düyməsi də bərabər qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:41
+msgid "Both Ctrl keys together change group"
+msgstr "İki Ctrl düyməsi də bərabər qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:42
+msgid "Both Shift keys together change group"
+msgstr "Hər iki Shift düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:43
+msgid "Both Win-keys switch group while pressed"
+msgstr "İki Win düyməsi də basılı olduğu müddətcə qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:44
+msgid "Bra"
+msgstr "Bra"
+
+#: xfree86.xml.in.h:45
+msgid "Brazilian"
+msgstr "Brazilya düzülüşü"
+
+#: xfree86.xml.in.h:46
+msgid "Brazilian ABNT2"
+msgstr "Brazilya düzülüşü ABNT2"
+
+#: xfree86.xml.in.h:47
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
+
+#: xfree86.xml.in.h:48
+msgid "Bulgarian"
+msgstr "Bolqarca"
+
+#: xfree86.xml.in.h:49
+msgid "Burmese"
+msgstr "Burmaca"
+
+#: xfree86.xml.in.h:50
+msgid "Can"
+msgstr "Kan"
+
+#: xfree86.xml.in.h:51
+msgid "Canadian"
+msgstr "Kanada düzülüşü"
+
+#: xfree86.xml.in.h:52
+msgid "Caps Lock key changes group"
+msgstr "Caps Lock düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:53
+msgid "CapsLock key behavior"
+msgstr "CapsLock düyməsinin davranışı"
+
+#: xfree86.xml.in.h:54
+msgid "Caps_Lock LED shows alternative group"
+msgstr "Caps_Lock LED-ləri alternativ qrupları göstərir"
+
+#: xfree86.xml.in.h:55
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: xfree86.xml.in.h:56
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (alternate option)"
+
+#: xfree86.xml.in.h:57
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard"
+
+#: xfree86.xml.in.h:58
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: xfree86.xml.in.h:59
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: xfree86.xml.in.h:60
+msgid "CloGaelach Laptop"
+msgstr "CloGaelach Laptop"
+
+#: xfree86.xml.in.h:61
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
+
+#: xfree86.xml.in.h:62
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 düymə)"
+
+#: xfree86.xml.in.h:63
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 düymə)"
+
+#: xfree86.xml.in.h:64
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 düymə)"
+
+#: xfree86.xml.in.h:65
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
+
+#: xfree86.xml.in.h:66
+msgid "Control Key Position"
+msgstr "Control Düyməsinin Yeri"
+
+#: xfree86.xml.in.h:67
+msgid "Control key at bottom left"
+msgstr "Control düyməsi sol altda"
+
+#: xfree86.xml.in.h:68
+msgid "Control key at left of 'A'"
+msgstr "Control düyməsi 'A' hərfinin solunda"
+
+#: xfree86.xml.in.h:69
+msgid "Control+Shift changes group"
+msgstr "Control+Shift düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:70
+msgid "Croatian"
+msgstr "Xorvatca"
+
+#: xfree86.xml.in.h:71
+msgid "Cyrillic"
+msgstr "Kiril"
+
+#: xfree86.xml.in.h:72
+msgid "Cze"
+msgstr "Çex"
+
+#: xfree86.xml.in.h:73
+msgid "Czech"
+msgstr "Çexcə"
+
+#: xfree86.xml.in.h:74
+msgid "Czech (qwerty)"
+msgstr "Çexcə (qwerty)"
+
+#: xfree86.xml.in.h:75
+msgid "Danish"
+msgstr "Danimarkaca"
+
+#: xfree86.xml.in.h:76
+msgid "Dead acute"
+msgstr "Dead acute"
+
+#: xfree86.xml.in.h:77
+msgid "Dead grave acute"
+msgstr "Dead grave acute"
+
+#: xfree86.xml.in.h:78
+msgid "Dell"
+msgstr "Dell"
+
+#: xfree86.xml.in.h:79
+msgid "Dell 101-key PC"
+msgstr "Dell 101-key PC"
+
+#: xfree86.xml.in.h:80
+msgid "Deu"
+msgstr "Deu"
+
+#: xfree86.xml.in.h:81
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
+
+#: xfree86.xml.in.h:82
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 seryaları"
+
+#: xfree86.xml.in.h:83
+msgid "Dnk"
+msgstr "Dnk"
+
+#: xfree86.xml.in.h:84
+msgid "Dutch"
+msgstr "Niderlandca"
+
+#: xfree86.xml.in.h:85
+msgid "Dvo"
+msgstr "Dvo"
+
+#: xfree86.xml.in.h:86
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: xfree86.xml.in.h:87
+msgid "Eliminate dead keys"
+msgstr "Ölü düymələri sayma"
+
+#: xfree86.xml.in.h:88
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: xfree86.xml.in.h:89
+msgid "Esp"
+msgstr "İsp"
+
+#: xfree86.xml.in.h:90
+msgid "Est"
+msgstr "Est"
+
+#: xfree86.xml.in.h:91
+msgid "Estonian"
+msgstr "Estonca"
+
+#: xfree86.xml.in.h:92
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: xfree86.xml.in.h:93
+msgid "Extended"
+msgstr "Uzadılmış"
+
+#: xfree86.xml.in.h:94
+msgid "Fao"
+msgstr "Fao"
+
+#: xfree86.xml.in.h:95
+msgid "Faroese"
+msgstr "Faroescə"
+
+#: xfree86.xml.in.h:96
+msgid "Farsi"
+msgstr "Farsca"
+
+#: xfree86.xml.in.h:97
+msgid "Fin"
+msgstr "Fin"
+
+#: xfree86.xml.in.h:98
+msgid "Finnish"
+msgstr "Fincə"
+
+#: xfree86.xml.in.h:99
+msgid "Fra"
+msgstr "Fra"
+
+#: xfree86.xml.in.h:100
+msgid "French"
+msgstr "Fransızca"
+
+#: xfree86.xml.in.h:101
+msgid "French (alternative)"
+msgstr "Fransızca (alternativ)"
+
+#: xfree86.xml.in.h:102
+msgid "French Canadian"
+msgstr "Kanada Fransızcası"
+
+#: xfree86.xml.in.h:103
+msgid "GBr"
+msgstr "GBr"
+
+#: xfree86.xml.in.h:104
+msgid "Generic 101-key PC"
+msgstr "Generic 101-key PC"
+
+#: xfree86.xml.in.h:105
+msgid "Generic 102-key (Intl) PC"
+msgstr "Generic 102-key (Intl) PC"
+
+#: xfree86.xml.in.h:106
+msgid "Generic 104-key PC"
+msgstr "Generic 104-key PC"
+
+#: xfree86.xml.in.h:107
+msgid "Generic 105-key (Intl) PC"
+msgstr "Generic 105-key (Intl) PC"
+
+#: xfree86.xml.in.h:108
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+
+#: xfree86.xml.in.h:109
+msgid "Geo"
+msgstr "Gür"
+
+#: xfree86.xml.in.h:110
+msgid "Georgian (latin)"
+msgstr "Gürcücə (latın)"
+
+#: xfree86.xml.in.h:111
+msgid "Georgian (russian)"
+msgstr "Gürcücə (kiril)"
+
+#: xfree86.xml.in.h:112
+msgid "German"
+msgstr "Almaca"
+
+#: xfree86.xml.in.h:113
+msgid "Grc"
+msgstr "Yun"
+
+#: xfree86.xml.in.h:114
+msgid "Greek"
+msgstr "Yunanca"
+
+#: xfree86.xml.in.h:115
+msgid "Group Shift/Lock behavior"
+msgstr "Shift/Lock Qrupu Davranışı"
+
+#: xfree86.xml.in.h:116
+msgid "Guj"
+msgstr "Guj"
+
+#: xfree86.xml.in.h:117
+msgid "Gujarati"
+msgstr "Gujaraticə"
+
+#: xfree86.xml.in.h:118
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: xfree86.xml.in.h:119
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
+
+#: xfree86.xml.in.h:120
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: xfree86.xml.in.h:121
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: xfree86.xml.in.h:122
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: xfree86.xml.in.h:123
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: xfree86.xml.in.h:124
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: xfree86.xml.in.h:125
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: xfree86.xml.in.h:126
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: xfree86.xml.in.h:127
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
+
+#: xfree86.xml.in.h:128
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
+
+#: xfree86.xml.in.h:129
+msgid "Hin"
+msgstr "Hin"
+
+#: xfree86.xml.in.h:130
+msgid "Hindi"
+msgstr "Hindi"
+
+#: xfree86.xml.in.h:131
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: xfree86.xml.in.h:132
+msgid "Hrv"
+msgstr "Xrv"
+
+#: xfree86.xml.in.h:133
+msgid "Hun"
+msgstr "Mac"
+
+#: xfree86.xml.in.h:134
+msgid "Hungarian"
+msgstr "Macarca"
+
+#: xfree86.xml.in.h:135
+msgid "Hungarian (qwerty)"
+msgstr "Macarca (qwerty)"
+
+#: xfree86.xml.in.h:136
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper Win düymələrinə xəritələnib."
+
+#: xfree86.xml.in.h:137
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: xfree86.xml.in.h:138
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: xfree86.xml.in.h:139
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (alternate option)"
+
+#: xfree86.xml.in.h:140
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: xfree86.xml.in.h:141
+msgid "INSCRIPT layout"
+msgstr "INSCRIPT düzülüşü"
+
+#: xfree86.xml.in.h:142
+msgid "IS434"
+msgstr "IS434"
+
+#: xfree86.xml.in.h:143
+msgid "IS434 laptop"
+msgstr "IS434 laptop"
+
+#: xfree86.xml.in.h:144
+msgid "ISO Alternate"
+msgstr "ISO Alternate"
+
+#: xfree86.xml.in.h:145
+msgid "Icelandic"
+msgstr "Icelandic"
+
+#: xfree86.xml.in.h:146
+msgid "Iku"
+msgstr "İku"
+
+#: xfree86.xml.in.h:147
+msgid "Inuktitut"
+msgstr "İnuktitut"
+
+#: xfree86.xml.in.h:148
+msgid "Irish"
+msgstr "İrlandca"
+
+#: xfree86.xml.in.h:149
+msgid "Irl"
+msgstr "İrl"
+
+#: xfree86.xml.in.h:150
+msgid "Irn"
+msgstr "İrn"
+
+#: xfree86.xml.in.h:151
+msgid "Isl"
+msgstr "İsl"
+
+#: xfree86.xml.in.h:152
+msgid "Isr"
+msgstr "İsr"
+
+#: xfree86.xml.in.h:153
+msgid "Israeli"
+msgstr "Yəhudicə"
+
+#: xfree86.xml.in.h:154
+msgid "Ita"
+msgstr "İta"
+
+#: xfree86.xml.in.h:155
+msgid "Italian"
+msgstr "İtalyanca"
+
+#: xfree86.xml.in.h:156
+msgid "Japanese"
+msgstr "Yaponca"
+
+#: xfree86.xml.in.h:157
+msgid "Japanese 106-key"
+msgstr "Yaponca 106-düymə"
+
+#: xfree86.xml.in.h:158
+msgid "Jpn"
+msgstr "Ypn"
+
+#: xfree86.xml.in.h:159
+msgid "Kan"
+msgstr "Kan"
+
+#: xfree86.xml.in.h:160
+msgid "Kannada"
+msgstr "Kannada"
+
+#: xfree86.xml.in.h:161
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: xfree86.xml.in.h:162
+msgid "LAm"
+msgstr "LAm"
+
+#: xfree86.xml.in.h:163
+msgid "Laptop"
+msgstr "Laptop"
+
+#: xfree86.xml.in.h:164
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Laptop/notebook Compaq (məs. Armada) Laptop Klaviaturası"
+
+#: xfree86.xml.in.h:165
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Laptop/notebook Compaq (məs. Presario) İnternet Klaviaturası"
+
+#: xfree86.xml.in.h:166
+msgid "Laptop/notebook Dell Inspiron 8xxx"
+msgstr "Laptop/notebook Dell Inspiron 8xxx"
+
+#: xfree86.xml.in.h:167
+msgid "Latin"
+msgstr "Latın"
+
+#: xfree86.xml.in.h:168
+msgid "Latin America"
+msgstr "Latın Amerika"
+
+#: xfree86.xml.in.h:169
+msgid "Latvian"
+msgstr "Latışca"
+
+#: xfree86.xml.in.h:170
+msgid "Left Alt key changes group"
+msgstr "Sol Alt düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:171
+msgid "Left Ctrl key changes group"
+msgstr "Sol Ctrl düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:172
+msgid "Left Shift key changes group"
+msgstr "Sol Shift düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:173
+msgid "Left Win-key changes group"
+msgstr "Sol Win düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:174
+msgid "Left Win-key switches group while pressed"
+msgstr "Sol Win düyməsi basılı olduğu müddətcə qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:175
+msgid "Lithuanian azerty standard"
+msgstr "Litovca azerty standart"
+
+#: xfree86.xml.in.h:176
+msgid "Lithuanian qwerty \"numeric\""
+msgstr "Litovca qwerty \"numeric\""
+
+#: xfree86.xml.in.h:177
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: xfree86.xml.in.h:178
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: xfree86.xml.in.h:179
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: xfree86.xml.in.h:180
+msgid "Logitech Cordless Desktop Pro"
+msgstr "Logitech Cordless Desktop Pro"
+
+#: xfree86.xml.in.h:181
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Logitech Cordless Desktop Pro (alternate option)"
+
+#: xfree86.xml.in.h:182
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (alternate option2)"
+
+#: xfree86.xml.in.h:183
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: xfree86.xml.in.h:184
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: xfree86.xml.in.h:185
+msgid "Logitech Deluxe Access Keyboard"
+msgstr "Logitech Deluxe Access Keyboard"
+
+#: xfree86.xml.in.h:186
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: xfree86.xml.in.h:187
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: xfree86.xml.in.h:188
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: xfree86.xml.in.h:189
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+
+#: xfree86.xml.in.h:190
+msgid "Logitech iTouch keyboard Internet Navigator"
+msgstr "Logitech iTouch keyboard Internet Navigator"
+
+#: xfree86.xml.in.h:191
+msgid "Ltu"
+msgstr "Ltu"
+
+#: xfree86.xml.in.h:192
+msgid "Lva"
+msgstr "Lva"
+
+#: xfree86.xml.in.h:193
+msgid "Macedonian"
+msgstr "Makedonca"
+
+#: xfree86.xml.in.h:194
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: xfree86.xml.in.h:195
+msgid "Macintosh Old"
+msgstr "Macintosh Old"
+
+#: xfree86.xml.in.h:196
+msgid "Make CapsLock an additional Control"
+msgstr "CapsLock düyməsini əlavə idarə olaraq tə'yin et"
+
+#: xfree86.xml.in.h:197
+msgid "Mal"
+msgstr "Mal"
+
+#: xfree86.xml.in.h:198
+msgid "Malayalam"
+msgstr "Malayalamca"
+
+#: xfree86.xml.in.h:199
+msgid "Maltese"
+msgstr "Maltaca"
+
+#: xfree86.xml.in.h:200
+msgid "Maltese (US layout)"
+msgstr "Maltaca (ABŞ düzülüşü)"
+
+#: xfree86.xml.in.h:201
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: xfree86.xml.in.h:202
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
+
+#: xfree86.xml.in.h:203
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: xfree86.xml.in.h:204
+msgid "Menu is Compose"
+msgstr "Menyu yazma düyməsidir"
+
+#: xfree86.xml.in.h:205
+msgid "Menu key changes group"
+msgstr "Menü düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:206
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta Win düymələrinə xəritələnib."
+
+#: xfree86.xml.in.h:207
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta sol Win düyməsinə xəritələnib."
+
+#: xfree86.xml.in.h:208
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
+
+#: xfree86.xml.in.h:209
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, Swedish"
+
+#: xfree86.xml.in.h:210
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: xfree86.xml.in.h:211
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: xfree86.xml.in.h:212
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: xfree86.xml.in.h:213
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
+
+#: xfree86.xml.in.h:214
+msgid "Miscellaneous compatibility options"
+msgstr "Müxtəlif yetişmə qabiliyyəti seçimləri"
+
+#: xfree86.xml.in.h:215
+msgid "Mkd"
+msgstr "Mkd"
+
+#: xfree86.xml.in.h:216
+msgid "Mlt"
+msgstr "Mlt"
+
+#: xfree86.xml.in.h:217
+msgid "Mmr"
+msgstr "Mmr"
+
+#: xfree86.xml.in.h:218
+msgid "Mng"
+msgstr "Mng"
+
+#: xfree86.xml.in.h:219
+msgid "Mongolian"
+msgstr "Monqolca"
+
+#: xfree86.xml.in.h:220
+msgid "Nld"
+msgstr "Nld"
+
+#: xfree86.xml.in.h:221
+msgid "Nor"
+msgstr "Nor"
+
+#: xfree86.xml.in.h:222
+msgid "Northern Saami (Finland)"
+msgstr "Şimali Saami (Finlandiya)"
+
+#: xfree86.xml.in.h:223
+msgid "Northern Saami (Norway)"
+msgstr "Şimali Saami (Norveç)"
+
+#: xfree86.xml.in.h:224
+msgid "Northern Saami (Sweden)"
+msgstr "Şimali Saami (İsveç)"
+
+#: xfree86.xml.in.h:225
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: xfree86.xml.in.h:226
+msgid "Norwegian"
+msgstr "Norveçcə"
+
+#: xfree86.xml.in.h:227
+msgid "Num_Lock LED shows alternative group"
+msgstr "Num_Lock LED-ləri alternativ qrupları göstərir"
+
+#: xfree86.xml.in.h:228
+msgid "Ogh"
+msgstr "Ogh"
+
+#: xfree86.xml.in.h:229
+msgid "Ogham"
+msgstr "Ogham"
+
+#: xfree86.xml.in.h:230
+msgid "Oretec MCK-800 MM/Internet keyboard"
+msgstr "Oretec MCK-800 MM/Internet keyboard"
+
+#: xfree86.xml.in.h:231
+msgid "Ori"
+msgstr "Ori"
+
+#: xfree86.xml.in.h:232
+msgid "Oriya"
+msgstr "Oriya"
+
+#: xfree86.xml.in.h:233
+msgid "PC-98xx Series"
+msgstr "PC-98xx Seriyaları"
+
+#: xfree86.xml.in.h:234
+msgid "PC104"
+msgstr "PC104"
+
+#: xfree86.xml.in.h:235
+msgid "Pan"
+msgstr "Pan"
+
+#: xfree86.xml.in.h:236
+msgid "Phonetic"
+msgstr "Fonetik"
+
+#: xfree86.xml.in.h:237
+msgid "Pol"
+msgstr "Pol"
+
+#: xfree86.xml.in.h:238
+msgid "Polish"
+msgstr "Polyakca"
+
+#: xfree86.xml.in.h:239
+msgid "Polish (qwertz)"
+msgstr "Polyakca (qwertz)"
+
+#: xfree86.xml.in.h:240
+msgid "Polytonic"
+msgstr "Politonik"
+
+#: xfree86.xml.in.h:241
+msgid "Portuguese"
+msgstr "Portuqalca"
+
+#: xfree86.xml.in.h:242
+msgid "PowerPC PS/2"
+msgstr "PowerPC PS/2"
+
+#: xfree86.xml.in.h:243
+msgid "Press Left Win-key to choose 3rd level"
+msgstr "3-cü səviyyəni seçmək üçün sol Win düyməsinə basılsın"
+
+#: xfree86.xml.in.h:244
+msgid "Press Menu key to choose 3rd level"
+msgstr "3-cü səviyyəni seçmək üçün sağ menyuya basılsın"
+
+#: xfree86.xml.in.h:245
+msgid "Press Right Control to choose 3rd level"
+msgstr "3-cü səviyyəni seçmək üçün sağ Control düyməsinə basılsın"
+
+#: xfree86.xml.in.h:246
+msgid "Press Right Win-key to choose 3rd level"
+msgstr "3-cü səviyyəni seçmək üçün sağ Win düyməsinə basılsın"
+
+#: xfree86.xml.in.h:247
+msgid "Press any of Win-keys to choose 3rd level"
+msgstr "3-cü səviyyəni seçmək üçün hər hansı bir Win düyməsinə basılsın"
+
+#: xfree86.xml.in.h:248
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: xfree86.xml.in.h:249
+msgid "Prt"
+msgstr "Prt"
+
+#: xfree86.xml.in.h:250
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: xfree86.xml.in.h:251
+msgid "R-Alt switches group while pressed"
+msgstr "R-Alt basılı olduğu müddətcə qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:252
+msgid "Right Alt is Compose"
+msgstr "Sağ Alt düyməsi yazma düyməsidir"
+
+#: xfree86.xml.in.h:253
+msgid "Right Alt key changes group"
+msgstr "Sağ Alt düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:254
+msgid "Right Control key works as Right Alt"
+msgstr "Sağ Control düyməsi sağ Alt kimi işləyir"
+
+#: xfree86.xml.in.h:255
+msgid "Right Ctrl key changes group"
+msgstr "Sağ Ctrl düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:256
+msgid "Right Shift key changes group"
+msgstr "Sağ Shift düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:257
+msgid "Right Win-key changes group"
+msgstr "Sağ Win düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:258
+msgid "Right Win-key is Compose"
+msgstr "Sağ Win düyməsi yazma düyməsidir"
+
+#: xfree86.xml.in.h:259
+msgid "Right Win-key switches group while pressed"
+msgstr "Sağ Win düyməsi basılı olduğu müddətcə qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:260
+msgid "Romanian"
+msgstr "Rumınca"
+
+#: xfree86.xml.in.h:261
+msgid "Rou"
+msgstr "Rou"
+
+#: xfree86.xml.in.h:262
+msgid "Rus"
+msgstr "Rus"
+
+#: xfree86.xml.in.h:263
+msgid "Russian"
+msgstr "Rusca"
+
+#: xfree86.xml.in.h:264
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: xfree86.xml.in.h:265
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: xfree86.xml.in.h:266
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: xfree86.xml.in.h:267
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: xfree86.xml.in.h:268
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: xfree86.xml.in.h:269
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: xfree86.xml.in.h:270
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: xfree86.xml.in.h:271
+msgid "Sapmi"
+msgstr "Sapmi"
+
+#: xfree86.xml.in.h:272
+msgid "Scg"
+msgstr "Scg"
+
+#: xfree86.xml.in.h:273
+msgid "Scroll_Lock LED shows alternative group"
+msgstr "Scroll_Lock LED-ləri alternativ qrupları göstərir"
+
+#: xfree86.xml.in.h:274
+msgid "Serbian"
+msgstr "Servcə"
+
+#: xfree86.xml.in.h:275
+msgid "Shift with numpad keys works as in MS Windows"
+msgstr "Ədəd düymələrində Shift MS Windows-dakı kimi işləyir"
+
+#: xfree86.xml.in.h:276
+msgid "Slovak"
+msgstr "Slovakca"
+
+#: xfree86.xml.in.h:277
+msgid "Slovak (qwerty)"
+msgstr "Slovakca (qwerty)"
+
+#: xfree86.xml.in.h:278
+msgid "Slovenian"
+msgstr "Slovencə"
+
+#: xfree86.xml.in.h:279
+msgid "Sme"
+msgstr "Sme"
+
+#: xfree86.xml.in.h:280
+msgid "Spanish"
+msgstr "İspanca"
+
+#: xfree86.xml.in.h:281
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Xüsusi düymələr (Ctrl+Alt+&lt;düyməsi&gt;) verici tərəfindən idarə edilsin."
+
+#: xfree86.xml.in.h:282
+msgid "Standard"
+msgstr "Standart"
+
+#: xfree86.xml.in.h:283
+msgid "Sun dead keys"
+msgstr "Sun ölü düymələr"
+
+#: xfree86.xml.in.h:284
+msgid "Super is mapped to the Win-keys (default)."
+msgstr "Super Win düymələrinə xəritələnib (ön qurğulu)."
+
+#: xfree86.xml.in.h:285
+msgid "Sv"
+msgstr "Sv"
+
+#: xfree86.xml.in.h:286
+msgid "Svk"
+msgstr "Svk"
+
+#: xfree86.xml.in.h:287
+msgid "Svn"
+msgstr "Svn"
+
+#: xfree86.xml.in.h:288
+msgid "Swap Control and Caps Lock"
+msgstr "Control və Caps Lock arasında dəyiş"
+
+#: xfree86.xml.in.h:289
+msgid "Swe"
+msgstr "Swe"
+
+#: xfree86.xml.in.h:290
+msgid "Swedish"
+msgstr "İsveçcə"
+
+#: xfree86.xml.in.h:291
+msgid "Swiss French"
+msgstr "İsveçrə Fransızcası"
+
+#: xfree86.xml.in.h:292
+msgid "Swiss German"
+msgstr "İsveçrə Almancası"
+
+#: xfree86.xml.in.h:293
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: xfree86.xml.in.h:294
+msgid "Syr"
+msgstr "Syr"
+
+#: xfree86.xml.in.h:295
+msgid "Syriac"
+msgstr "Syriac"
+
+#: xfree86.xml.in.h:296
+msgid "Tajik"
+msgstr "Tacikcə"
+
+#: xfree86.xml.in.h:297
+msgid "Tamil"
+msgstr "Tamilcə"
+
+#: xfree86.xml.in.h:298
+msgid "Tel"
+msgstr "Tel"
+
+#: xfree86.xml.in.h:299
+msgid "Telugu"
+msgstr "Telugu"
+
+#: xfree86.xml.in.h:300
+msgid "Tha"
+msgstr "Tay"
+
+#: xfree86.xml.in.h:301
+msgid "Thai (Kedmanee)"
+msgstr "Tayca (Kedmanee)"
+
+#: xfree86.xml.in.h:302
+msgid "Thai (Pattachote)"
+msgstr "Tayca (Pattachote)"
+
+#: xfree86.xml.in.h:303
+msgid "Thai (TIS-820.2538)"
+msgstr "Tayca (TIS-820.2538)"
+
+#: xfree86.xml.in.h:304
+msgid "Third level choosers"
+msgstr "Üçüncü səviyyə seçicilər"
+
+#: xfree86.xml.in.h:305
+msgid "Tjk"
+msgstr "Tac"
+
+#: xfree86.xml.in.h:306
+msgid "Tml"
+msgstr "Tml"
+
+#: xfree86.xml.in.h:307
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: xfree86.xml.in.h:308
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: xfree86.xml.in.h:309
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: xfree86.xml.in.h:310
+msgid "Tur"
+msgstr "Tür"
+
+#: xfree86.xml.in.h:311
+msgid "Turkish"
+msgstr "Türkcə"
+
+#: xfree86.xml.in.h:312
+msgid "Turkish (F)"
+msgstr "Türkcə (F)"
+
+#: xfree86.xml.in.h:313
+msgid "Turkish Alt-Q Layout"
+msgstr "Türkcə Alt-Q Düzülüşü"
+
+#: xfree86.xml.in.h:314
+msgid "U.S. English"
+msgstr "A.B.Ş. İngiliscəsi"
+
+#: xfree86.xml.in.h:315
+msgid "U.S. English w/ ISO9995-3"
+msgstr "A.B.Ş. İngiliscəsi və/ ISO9995-3"
+
+#: xfree86.xml.in.h:316
+msgid "U.S. English w/ dead keys"
+msgstr "A.B.Ş. İngiliscəsi və/ ölü düymələr"
+
+#: xfree86.xml.in.h:317
+msgid "US"
+msgstr "ABŞ"
+
+#: xfree86.xml.in.h:318
+msgid "US keyboard with Romanian letters"
+msgstr "Roman hərfli ABŞ klaviaturası"
+
+#: xfree86.xml.in.h:319
+msgid "USA"
+msgstr "ABŞ"
+
+#: xfree86.xml.in.h:320
+msgid "Ukr"
+msgstr "Ukr"
+
+#: xfree86.xml.in.h:321
+msgid "Ukrainian"
+msgstr "Ukraynaca"
+
+#: xfree86.xml.in.h:322
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: xfree86.xml.in.h:323
+msgid "United Kingdom"
+msgstr "Birləşik Krallıq"
+
+#: xfree86.xml.in.h:324
+msgid "Use keyboard LED to show alternative group"
+msgstr "Alternativ qrupu göstərmək üçün klaviatura LED-ini işlət"
+
+#: xfree86.xml.in.h:325
+msgid "Uses internal capitalization. Shift cancels Caps."
+msgstr "Daxili kapitalizasiya işlədir. Shift Caps-i ləğv edir."
+
+#: xfree86.xml.in.h:326
+msgid "Uses internal capitalization. Shift doesn't cancel Caps."
+msgstr "Daxili kapitalizasiya işlədir. Shift Caps-i ləğv etmir."
+
+#: xfree86.xml.in.h:327
+msgid "Uzb"
+msgstr "Özb"
+
+#: xfree86.xml.in.h:328
+msgid "Uzbek"
+msgstr "Özbəkcə"
+
+#: xfree86.xml.in.h:329
+msgid "Vietnamese"
+msgstr "Vyetnamca"
+
+#: xfree86.xml.in.h:330
+msgid "Vnm"
+msgstr "Vye"
+
+#: xfree86.xml.in.h:331
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: xfree86.xml.in.h:332
+msgid "Winkeys"
+msgstr "Winkeys"
+
+#: xfree86.xml.in.h:333
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
+
+#: xfree86.xml.in.h:334
+msgid "Yug"
+msgstr "Yug"
+
+#: xfree86.xml.in.h:335
+msgid "Yugoslavian"
+msgstr "Yugoslavca"
+
+#: xfree86.xml.in.h:336
+msgid "abnt2"
+msgstr "abnt2"
+
+#: xfree86.xml.in.h:337
+msgid "azerty"
+msgstr "azerty"
+
+#: xfree86.xml.in.h:338
+msgid "azerty/digits"
+msgstr "azerty/ədədlər"
+
+#: xfree86.xml.in.h:339
+msgid "bksl"
+msgstr "bksl"
+
+#: xfree86.xml.in.h:340
+msgid "digits"
+msgstr "ədədlər"
+
+#: xfree86.xml.in.h:341
+msgid "l2/101/qwerty/comma"
+msgstr "l2/101/qwerty/vergül"
+
+#: xfree86.xml.in.h:342
+msgid "l2/101/qwerty/dot"
+msgstr "l2/101/qwerty/nöqtə"
+
+#: xfree86.xml.in.h:343
+msgid "l2/101/qwertz/comma"
+msgstr "l2/101/qwertz/vergül"
+
+#: xfree86.xml.in.h:344
+msgid "l2/101/qwertz/dot"
+msgstr "2/101/qwertz/nöqtə"
+
+#: xfree86.xml.in.h:345
+msgid "l2/102/qwerty/comma"
+msgstr "l2/102/qwerty/vergül"
+
+#: xfree86.xml.in.h:346
+msgid "l2/102/qwerty/dot"
+msgstr "l2/102/qwerty/nöqtə"
+
+#: xfree86.xml.in.h:347
+msgid "l2/102/qwertz/comma"
+msgstr "l2/102/qwertz/vergül"
+
+#: xfree86.xml.in.h:348
+msgid "l2/102/qwertz/dot"
+msgstr "l2/102/qwertz/nöqtə"
+
+#: xfree86.xml.in.h:349
+msgid "laptop"
+msgstr "laptop"
+
+#: xfree86.xml.in.h:350
+msgid "lyx"
+msgstr "lyx"
+
+#: xfree86.xml.in.h:351
+msgid "qwerty"
+msgstr "qwerty"
+
+#: xfree86.xml.in.h:352
+msgid "qwerty/digits"
+msgstr "qwerty/ədədlər"
+
+#: xfree86.xml.in.h:353
+msgid "sefi"
+msgstr "sefi"
+
+#: xfree86.xml.in.h:354
+msgid "si1452"
+msgstr "si1452"
+
+#: xfree86.xml.in.h:355
+msgid "uni/101/qwerty/comma"
+msgstr "uni/101/qwerty/vergül"
+
+#: xfree86.xml.in.h:356
+msgid "uni/101/qwerty/dot"
+msgstr "uni/101/qwerty/nöqtə"
+
+#: xfree86.xml.in.h:357
+msgid "uni/101/qwertz/comma"
+msgstr "uni/101/qwertz/vergül"
+
+#: xfree86.xml.in.h:358
+msgid "uni/101/qwertz/dot"
+msgstr "uni/101/qwertz/nöqtə"
+
+#: xfree86.xml.in.h:359
+msgid "uni/102/qwerty/comma"
+msgstr "uni/102/qwerty/vergül"
+
+#: xfree86.xml.in.h:360
+msgid "uni/102/qwerty/dot"
+msgstr "uni/102/qwerty/nöqtə"
+
+#: xfree86.xml.in.h:361
+msgid "uni/102/qwertz/comma"
+msgstr "uni/102/qwertz/vergül"
+
+#: xfree86.xml.in.h:362
+msgid "uni/102/qwertz/dot"
+msgstr "uni/102/qwertz/nöqtə"
diff --git a/xorg-server/xkeyboard-config/po/en_GB.po b/xorg-server/xkeyboard-config/po/en_GB.po
index 48af18093..0f1ac9874 100644
--- a/xorg-server/xkeyboard-config/po/en_GB.po
+++ b/xorg-server/xkeyboard-config/po/en_GB.po
@@ -1,1867 +1,1867 @@
-# British English translations for xkeyboard-config package.
-# Copyright (C) 2005 Free Software Foundation
-# This file is distributed under the same license as the xkeyboard-config package.
-# Christopher Orr <chris@protactin.co.uk>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: xkeyboard-config\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-04 23:04+0100\n"
-"PO-Revision-Date: 2005-04-09 16:58+0100\n"
-"Last-Translator: Christopher Orr <chris@protactin.co.uk>\n"
-"Language-Team: English <en_gb@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../rules/base.xml.in.h:1
-msgid "(F)"
-msgstr "(F)"
-
-#: ../rules/base.xml.in.h:2
-msgid "101/qwerty/comma/Dead keys"
-msgstr "101/qwerty/comma/Dead keys"
-
-#: ../rules/base.xml.in.h:3
-msgid "101/qwerty/comma/Eliminate dead keys"
-msgstr "101/qwerty/comma/Eliminate dead keys"
-
-#: ../rules/base.xml.in.h:4
-msgid "101/qwerty/dot/Dead keys"
-msgstr "101/qwerty/dot/Dead keys"
-
-#: ../rules/base.xml.in.h:5
-msgid "101/qwerty/dot/Eliminate dead keys"
-msgstr "101/qwerty/dot/Eliminate dead keys"
-
-#: ../rules/base.xml.in.h:6
-msgid "101/qwertz/comma/Dead keys"
-msgstr "101/qwertz/comma/Dead keys"
-
-#: ../rules/base.xml.in.h:7
-msgid "101/qwertz/comma/Eliminate dead keys"
-msgstr "101/qwertz/comma/Eliminate dead keys"
-
-#: ../rules/base.xml.in.h:8
-msgid "101/qwertz/dot/Dead keys"
-msgstr "101/qwertz/dot/Dead keys"
-
-#: ../rules/base.xml.in.h:9
-msgid "101/qwertz/dot/Eliminate dead keys"
-msgstr "101/qwertz/dot/Eliminate dead keys"
-
-#: ../rules/base.xml.in.h:10
-msgid "102/qwerty/comma/Dead keys"
-msgstr "102/qwerty/comma/Dead keys"
-
-#: ../rules/base.xml.in.h:11
-msgid "102/qwerty/comma/Eliminate dead keys"
-msgstr "102/qwerty/comma/Eliminate dead keys"
-
-#: ../rules/base.xml.in.h:12
-msgid "102/qwerty/dot/Dead keys"
-msgstr "102/qwerty/dot/Dead keys"
-
-#: ../rules/base.xml.in.h:13
-msgid "102/qwerty/dot/Eliminate dead keys"
-msgstr "102/qwerty/dot/Eliminate dead keys"
-
-#: ../rules/base.xml.in.h:14
-msgid "102/qwertz/comma/Dead keys"
-msgstr "102/qwertz/comma/Dead keys"
-
-#: ../rules/base.xml.in.h:15
-msgid "102/qwertz/comma/Eliminate dead keys"
-msgstr "102/qwertz/comma/Eliminate dead keys"
-
-#: ../rules/base.xml.in.h:16
-msgid "102/qwertz/dot/Dead keys"
-msgstr "102/qwertz/dot/Dead keys"
-
-#: ../rules/base.xml.in.h:17
-msgid "102/qwertz/dot/Eliminate dead keys"
-msgstr "102/qwertz/dot/Eliminate dead keys"
-
-#: ../rules/base.xml.in.h:18
-msgid "A4Tech KB-21"
-msgstr "A4Tech KB-21"
-
-#: ../rules/base.xml.in.h:19
-msgid "A4Tech KBS-8"
-msgstr "A4Tech KBS-8"
-
-#: ../rules/base.xml.in.h:20
-msgid "ACPI Standard"
-msgstr "ACPI Standard"
-
-#: ../rules/base.xml.in.h:21
-msgid "Acer AirKey V"
-msgstr "Acer AirKey V"
-
-#: ../rules/base.xml.in.h:22
-msgid "Acer TravelMate 800"
-msgstr "Acer TravelMate 800"
-
-#: ../rules/base.xml.in.h:23
-msgid "Add the EuroSign to the 2 key."
-msgstr "Add the Euro sign to the 2 key."
-
-#: ../rules/base.xml.in.h:24
-msgid "Add the EuroSign to the 5 key."
-msgstr "Add the Euro sign to the 5 key."
-
-#: ../rules/base.xml.in.h:25
-msgid "Add the EuroSign to the E key."
-msgstr "Add the Euro sign to the E key."
-
-#: ../rules/base.xml.in.h:26
-msgid "Add the standard behavior to Menu key."
-msgstr "Add the standard behaviour to Menu key."
-
-#: ../rules/base.xml.in.h:27
-msgid "Adding the EuroSign to certain keys"
-msgstr "Adding the Euro sign to certain keys"
-
-#: ../rules/base.xml.in.h:28
-msgid "Advance Scorpius KI"
-msgstr "Advance Scorpius KI"
-
-#: ../rules/base.xml.in.h:29
-msgid "Alb"
-msgstr "Alb"
-
-#: ../rules/base.xml.in.h:30
-msgid "Albania"
-msgstr "Albania"
-
-#: ../rules/base.xml.in.h:31
-msgid "Alt and Meta are on the Alt keys (default)."
-msgstr "Alt and Meta are on the Alt keys (default)."
-
-#: ../rules/base.xml.in.h:32
-msgid "Alt is mapped to the right Win-key and Super to Menu."
-msgstr "Alt is mapped to the right Win-key and Super to Menu."
-
-#: ../rules/base.xml.in.h:33
-#, fuzzy
-msgid "Alt+Ctrl changes group."
-msgstr "Alt+Control changes group."
-
-#: ../rules/base.xml.in.h:34
-msgid "Alt+Shift changes group."
-msgstr "Alt+Shift changes group."
-
-#: ../rules/base.xml.in.h:35
-msgid "Alt-Q"
-msgstr "Alt-Q"
-
-#: ../rules/base.xml.in.h:36
-msgid "Alt/Win key behavior"
-msgstr "Alt/Win key behaviour"
-
-#: ../rules/base.xml.in.h:37
-msgid "Alternative"
-msgstr "Alternative"
-
-#: ../rules/base.xml.in.h:38
-msgid "Alternative international (former us_intl)"
-msgstr "Alternative international (former us_intl)"
-
-#: ../rules/base.xml.in.h:39
-msgid "Alternative, Sun dead keys"
-msgstr "Alternative, Sun dead keys"
-
-#: ../rules/base.xml.in.h:40
-msgid "Alternative, eliminate dead keys"
-msgstr "Alternative, eliminate dead keys"
-
-#: ../rules/base.xml.in.h:41
-msgid "Apostrophe (') variant"
-msgstr "Apostrophe (') variant"
-
-#: ../rules/base.xml.in.h:42
-msgid "Ara"
-msgstr "Ara"
-
-#: ../rules/base.xml.in.h:43
-msgid "Arabic"
-msgstr "Arabic"
-
-#: ../rules/base.xml.in.h:44
-msgid "Arm"
-msgstr "Arm"
-
-#: ../rules/base.xml.in.h:45
-msgid "Armenia"
-msgstr "Armenia"
-
-#: ../rules/base.xml.in.h:46
-msgid "Aze"
-msgstr "Aze"
-
-#: ../rules/base.xml.in.h:47
-msgid "Azerbaijan"
-msgstr "Azerbaijan"
-
-#: ../rules/base.xml.in.h:48
-msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr "Azona RF2300 wireless Internet Keyboard"
-
-#: ../rules/base.xml.in.h:49
-msgid "BTC 5090"
-msgstr "BTC 5090"
-
-#: ../rules/base.xml.in.h:50
-msgid "BTC 5113RF Multimedia"
-msgstr "BTC 5113RF Multimedia"
-
-#: ../rules/base.xml.in.h:51
-msgid "BTC 5126T"
-msgstr "BTC 5126T"
-
-#: ../rules/base.xml.in.h:52
-msgid "BTC 9000"
-msgstr "BTC 9000"
-
-#: ../rules/base.xml.in.h:53
-msgid "BTC 9000A"
-msgstr "BTC 9000A"
-
-#: ../rules/base.xml.in.h:54
-msgid "BTC 9001AH"
-msgstr "BTC 9001AH"
-
-#: ../rules/base.xml.in.h:55
-#, fuzzy
-msgid "Ban"
-msgstr "Kan"
-
-#: ../rules/base.xml.in.h:56
-msgid "Bangladesh"
-msgstr ""
-
-#: ../rules/base.xml.in.h:57
-msgid "Bel"
-msgstr "Bel"
-
-#: ../rules/base.xml.in.h:58
-msgid "Belarus"
-msgstr "Belarus"
-
-#: ../rules/base.xml.in.h:59
-msgid "Belgium"
-msgstr "Belgium"
-
-#: ../rules/base.xml.in.h:60
-#, fuzzy
-msgid "Bengali"
-msgstr "Probhat"
-
-#: ../rules/base.xml.in.h:61
-#, fuzzy
-msgid "Bengali Probhat"
-msgstr "Probhat"
-
-#: ../rules/base.xml.in.h:62
-msgid "Bgr"
-msgstr "Bgr"
-
-#: ../rules/base.xml.in.h:63
-#, fuzzy
-msgid "Bhu"
-msgstr "Bih"
-
-#: ../rules/base.xml.in.h:64
-#, fuzzy
-msgid "Bhutan"
-msgstr "Kan"
-
-#: ../rules/base.xml.in.h:65
-msgid "Bih"
-msgstr "Bih"
-
-#: ../rules/base.xml.in.h:66
-msgid "Blr"
-msgstr "Blr"
-
-#: ../rules/base.xml.in.h:67
-msgid "Bosnia and Herzegovina"
-msgstr "Bosnia and Herzegovina"
-
-#: ../rules/base.xml.in.h:68
-msgid "Both Alt keys together change group."
-msgstr "Both Alt keys together change group."
-
-#: ../rules/base.xml.in.h:69
-msgid "Both Ctrl keys together change group."
-msgstr "Both Ctrl keys together change group."
-
-#: ../rules/base.xml.in.h:70
-msgid "Both Shift keys together change group."
-msgstr "Both Shift keys together change group."
-
-#: ../rules/base.xml.in.h:71
-msgid "Both Win-keys switch group while pressed."
-msgstr "Both Win-keys switch group while pressed."
-
-#: ../rules/base.xml.in.h:72
-msgid "Bra"
-msgstr "Bra"
-
-#: ../rules/base.xml.in.h:73
-msgid "Brazil"
-msgstr "Brazil"
-
-#: ../rules/base.xml.in.h:74
-msgid "Brazilian ABNT2"
-msgstr "Brazilian ABNT2"
-
-#: ../rules/base.xml.in.h:75
-msgid "Brother Internet Keyboard"
-msgstr "Brother Internet Keyboard"
-
-#: ../rules/base.xml.in.h:76
-msgid "Bulgaria"
-msgstr "Bulgaria"
-
-#: ../rules/base.xml.in.h:77
-msgid "Can"
-msgstr "Can"
-
-#: ../rules/base.xml.in.h:78
-msgid "Canada"
-msgstr "Canada"
-
-#: ../rules/base.xml.in.h:79
-msgid "CapsLock LED shows alternative group."
-msgstr "Caps Lock LED shows alternative group."
-
-#: ../rules/base.xml.in.h:80
-msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
-msgstr "Caps Lock acts as Shift with locking. Shift cancels Caps Lock."
-
-#: ../rules/base.xml.in.h:81
-msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
-msgstr "Caps Lock acts as Shift with locking. Shift doesn't cancel Caps Lock."
-
-#: ../rules/base.xml.in.h:82
-msgid "CapsLock just locks the Shift modifier."
-msgstr "Caps Lock just locks the Shift modifier."
-
-#: ../rules/base.xml.in.h:83
-msgid "CapsLock key behavior"
-msgstr "Caps Lock key behaviour"
-
-#: ../rules/base.xml.in.h:84
-msgid "CapsLock key changes group."
-msgstr "Caps Lock key changes group."
-
-#: ../rules/base.xml.in.h:85
-msgid "CapsLock toggles Shift so all keys are affected."
-msgstr "Caps Lock toggles Shift so all keys are affected."
-
-#: ../rules/base.xml.in.h:86
-msgid "CapsLock toggles normal capitalization of alphabetic characters."
-msgstr "Caps Lock toggles normal capitalisation of alphabetic characters."
-
-#: ../rules/base.xml.in.h:87
-msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
-msgstr "Caps Lock uses internal capitalisation. Shift cancels Caps Lock."
-
-#: ../rules/base.xml.in.h:88
-msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
-msgstr ""
-"Caps Lock uses internal capitalisation. Shift doesn't cancel Caps Lock."
-
-#: ../rules/base.xml.in.h:89
-msgid "Che"
-msgstr "Che"
-
-#: ../rules/base.xml.in.h:90
-msgid "Cherry Blue Line CyBo@rd"
-msgstr "Cherry Blue Line CyBo@rd"
-
-#: ../rules/base.xml.in.h:91
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr "Cherry Blue Line CyBo@rd (alternate option)"
-
-#: ../rules/base.xml.in.h:92
-msgid "Cherry CyMotion Master Linux"
-msgstr ""
-
-#: ../rules/base.xml.in.h:93
-msgid "Chicony Internet Keyboard"
-msgstr "Chicony Internet Keyboard"
-
-#: ../rules/base.xml.in.h:94
-msgid "Chicony KB-9885"
-msgstr "Chicony KB-9885"
-
-#: ../rules/base.xml.in.h:95
-msgid "CloGaelach"
-msgstr "CloGaelach"
-
-#: ../rules/base.xml.in.h:96
-msgid "Compaq Easy Access Keyboard"
-msgstr "Compaq Easy Access Keyboard"
-
-#: ../rules/base.xml.in.h:97
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr "Compaq Internet Keyboard (13 keys)"
-
-#: ../rules/base.xml.in.h:98
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr "Compaq Internet Keyboard (18 keys)"
-
-#: ../rules/base.xml.in.h:99
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr "Compaq Internet Keyboard (7 keys)"
-
-#: ../rules/base.xml.in.h:100
-msgid "Compaq iPaq Keyboard"
-msgstr "Compaq iPaq Keyboard"
-
-#: ../rules/base.xml.in.h:101
-#, fuzzy
-msgid "Compose key position"
-msgstr "Control Key Position"
-
-#: ../rules/base.xml.in.h:102
-msgid "Croatia"
-msgstr "Croatia"
-
-#: ../rules/base.xml.in.h:103
-#, fuzzy
-msgid "Ctrl key at bottom left"
-msgstr "Control key at bottom left"
-
-#: ../rules/base.xml.in.h:104
-#, fuzzy
-msgid "Ctrl key at left of 'A'"
-msgstr "Control key at left of 'A'"
-
-#: ../rules/base.xml.in.h:105
-#, fuzzy
-msgid "Ctrl key position"
-msgstr "Control Key Position"
-
-#: ../rules/base.xml.in.h:106
-#, fuzzy
-msgid "Ctrl+Shift changes group."
-msgstr "Control+Shift changes group."
-
-#: ../rules/base.xml.in.h:107
-msgid "Cyrillic"
-msgstr "Cyrillic"
-
-#: ../rules/base.xml.in.h:108
-msgid "Cze"
-msgstr "Cze"
-
-#: ../rules/base.xml.in.h:109
-msgid "Czechia"
-msgstr "Czechia"
-
-#: ../rules/base.xml.in.h:110
-msgid "DTK2000"
-msgstr "DTK2000"
-
-#: ../rules/base.xml.in.h:111
-msgid "Dead acute"
-msgstr "Dead acute"
-
-#: ../rules/base.xml.in.h:112
-msgid "Dead grave acute"
-msgstr "Dead grave acute"
-
-#: ../rules/base.xml.in.h:113
-msgid "Dell"
-msgstr "Dell"
-
-#: ../rules/base.xml.in.h:114
-msgid "Dell 101-key PC"
-msgstr "Dell 101-key PC"
-
-#: ../rules/base.xml.in.h:115
-msgid "Denmark"
-msgstr "Denmark"
-
-#: ../rules/base.xml.in.h:116
-msgid "Deu"
-msgstr "Deu"
-
-#: ../rules/base.xml.in.h:117
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr "Dexxa Wireless Desktop Keyboard"
-
-#: ../rules/base.xml.in.h:118
-msgid "Diamond 9801 / 9802 series"
-msgstr "Diamond 9801 / 9802 series"
-
-#: ../rules/base.xml.in.h:119
-msgid "Dnk"
-msgstr "Dnk"
-
-#: ../rules/base.xml.in.h:120
-msgid "Dvorak"
-msgstr "Dvorak"
-
-#: ../rules/base.xml.in.h:121
-msgid "Dvorak, Polish quotes on key \"1/!\""
-msgstr "Dvorak, Polish quotes on key \"1/!\""
-
-#: ../rules/base.xml.in.h:122
-msgid "Dvorak, Polish quotes on quotemark key"
-msgstr "Dvorak, Polish quotes on quotemark key"
-
-#: ../rules/base.xml.in.h:123
-msgid "Eliminate dead keys"
-msgstr "Eliminate dead keys"
-
-#: ../rules/base.xml.in.h:124
-msgid "Ennyah DKB-1008"
-msgstr "Ennyah DKB-1008"
-
-#: ../rules/base.xml.in.h:125
-msgid "Esp"
-msgstr "Esp"
-
-#: ../rules/base.xml.in.h:126
-msgid "Est"
-msgstr "Est"
-
-#: ../rules/base.xml.in.h:127
-msgid "Estonia"
-msgstr "Estonia"
-
-#: ../rules/base.xml.in.h:128
-msgid "Everex STEPnote"
-msgstr "Everex STEPnote"
-
-#: ../rules/base.xml.in.h:129
-msgid "Extended"
-msgstr "Extended"
-
-#: ../rules/base.xml.in.h:130
-msgid "Extended Backslash"
-msgstr "Extended Backslash"
-
-#: ../rules/base.xml.in.h:131
-msgid "F-letter (F) variant"
-msgstr "F-letter (F) variant"
-
-#: ../rules/base.xml.in.h:132
-msgid "Fao"
-msgstr "Fao"
-
-#: ../rules/base.xml.in.h:133
-msgid "Faroe Islands"
-msgstr "Faroe Islands"
-
-#: ../rules/base.xml.in.h:134
-msgid "Fin"
-msgstr "Fin"
-
-#: ../rules/base.xml.in.h:135
-msgid "Finland"
-msgstr "Finland"
-
-#: ../rules/base.xml.in.h:136
-msgid "Fra"
-msgstr "Fra"
-
-#: ../rules/base.xml.in.h:137
-msgid "France"
-msgstr "France"
-
-#: ../rules/base.xml.in.h:138
-msgid "French"
-msgstr "French"
-
-#: ../rules/base.xml.in.h:139
-msgid "French (legacy)"
-msgstr "French (legacy)"
-
-#: ../rules/base.xml.in.h:140
-msgid "French Dvorak"
-msgstr "French Dvorak"
-
-#: ../rules/base.xml.in.h:141
-msgid "French, Sun dead keys"
-msgstr "French, Sun dead keys"
-
-#: ../rules/base.xml.in.h:142
-msgid "French, eliminate dead keys"
-msgstr "French, eliminate dead keys"
-
-#: ../rules/base.xml.in.h:143
-msgid "GBr"
-msgstr "GBr"
-
-#: ../rules/base.xml.in.h:144
-msgid "Generic 101-key PC"
-msgstr "Generic 101-key PC"
-
-#: ../rules/base.xml.in.h:145
-msgid "Generic 102-key (Intl) PC"
-msgstr "Generic 102-key (Intl) PC"
-
-#: ../rules/base.xml.in.h:146
-msgid "Generic 104-key PC"
-msgstr "Generic 104-key PC"
-
-#: ../rules/base.xml.in.h:147
-msgid "Generic 105-key (Intl) PC"
-msgstr "Generic 105-key (Intl) PC"
-
-#: ../rules/base.xml.in.h:148
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-
-#: ../rules/base.xml.in.h:149
-msgid "Genius Comfy KB-21e-Scroll"
-msgstr "Genius Comfy KB-21e-Scroll"
-
-#: ../rules/base.xml.in.h:150
-msgid "Geo"
-msgstr "Geo"
-
-#: ../rules/base.xml.in.h:151
-msgid "Georgia"
-msgstr "Georgia"
-
-#: ../rules/base.xml.in.h:152
-msgid "German, Sun dead keys"
-msgstr "German, Sun dead keys"
-
-#: ../rules/base.xml.in.h:153
-msgid "German, eliminate dead keys"
-msgstr "German, eliminate dead keys"
-
-#: ../rules/base.xml.in.h:154
-msgid "Germany"
-msgstr "Germany"
-
-#: ../rules/base.xml.in.h:155
-msgid "Gre"
-msgstr "Gre"
-
-#: ../rules/base.xml.in.h:156
-msgid "Greece"
-msgstr "Greece"
-
-#: ../rules/base.xml.in.h:157
-msgid "Group Shift/Lock behavior"
-msgstr "Group Shift/Lock behaviour"
-
-#: ../rules/base.xml.in.h:158
-#, fuzzy
-msgid "Gujarati"
-msgstr "Gujarati"
-
-#: ../rules/base.xml.in.h:159
-#, fuzzy
-msgid "Gurmukhi"
-msgstr "Guru"
-
-#: ../rules/base.xml.in.h:160
-msgid "Gyration"
-msgstr "Gyration"
-
-#: ../rules/base.xml.in.h:161
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr "Hewlett-Packard Internet Keyboard"
-
-#: ../rules/base.xml.in.h:162
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr "Hewlett-Packard Omnibook 500 FA"
-
-#: ../rules/base.xml.in.h:163
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr "Hewlett-Packard Omnibook 5xx"
-
-#: ../rules/base.xml.in.h:164
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr "Hewlett-Packard Omnibook 6000/6100"
-
-#: ../rules/base.xml.in.h:165
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr "Hewlett-Packard Omnibook XE3 GC"
-
-#: ../rules/base.xml.in.h:166
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr "Hewlett-Packard Omnibook XE3 GF"
-
-#: ../rules/base.xml.in.h:167
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr "Hewlett-Packard Omnibook XT1000"
-
-#: ../rules/base.xml.in.h:168
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr "Hewlett-Packard Pavilion ZT11xx"
-
-#: ../rules/base.xml.in.h:169
-msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
-
-#: ../rules/base.xml.in.h:170
-msgid "Hewlett-Packard SK-2505 Internet Keyboard"
-msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
-
-#: ../rules/base.xml.in.h:171
-msgid "Honeywell Euroboard"
-msgstr "Honeywell Euroboard"
-
-#: ../rules/base.xml.in.h:172
-msgid "Hrv"
-msgstr "Hrv"
-
-#: ../rules/base.xml.in.h:173
-msgid "Hun"
-msgstr "Hun"
-
-#: ../rules/base.xml.in.h:174
-msgid "Hungary"
-msgstr "Hungary"
-
-#: ../rules/base.xml.in.h:175
-msgid "Hyper is mapped to the Win-keys."
-msgstr "Hyper is mapped to the Win-keys."
-
-#: ../rules/base.xml.in.h:176
-msgid "IBM Rapid Access"
-msgstr "IBM Rapid Access"
-
-#: ../rules/base.xml.in.h:177
-msgid "IBM Rapid Access II"
-msgstr "IBM Rapid Access II"
-
-#: ../rules/base.xml.in.h:178
-msgid "IBM Rapid Access II (alternate option)"
-msgstr "IBM Rapid Access II (alternate option)"
-
-#: ../rules/base.xml.in.h:179
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
-
-#: ../rules/base.xml.in.h:180
-msgid "ISO Alternate"
-msgstr "ISO Alternate"
-
-#: ../rules/base.xml.in.h:181
-msgid "Iceland"
-msgstr "Iceland"
-
-#: ../rules/base.xml.in.h:182
-#, fuzzy
-msgid "Ind"
-msgstr "Irn"
-
-#: ../rules/base.xml.in.h:183
-msgid "India"
-msgstr ""
-
-#: ../rules/base.xml.in.h:184
-msgid "International (with dead keys)"
-msgstr "International (with dead keys)"
-
-#: ../rules/base.xml.in.h:185
-msgid "Inuktitut"
-msgstr "Inuktitut"
-
-#: ../rules/base.xml.in.h:186
-msgid "Iran"
-msgstr "Iran"
-
-#: ../rules/base.xml.in.h:187
-msgid "Ireland"
-msgstr "Ireland"
-
-#: ../rules/base.xml.in.h:188
-msgid "Irl"
-msgstr "Irl"
-
-#: ../rules/base.xml.in.h:189
-msgid "Irn"
-msgstr "Irn"
-
-#: ../rules/base.xml.in.h:190
-msgid "Isl"
-msgstr "Isl"
-
-#: ../rules/base.xml.in.h:191
-msgid "Isr"
-msgstr "Isr"
-
-#: ../rules/base.xml.in.h:192
-msgid "Israel"
-msgstr "Israel"
-
-#: ../rules/base.xml.in.h:193
-msgid "Ita"
-msgstr "Ita"
-
-#: ../rules/base.xml.in.h:194
-msgid "Italy"
-msgstr "Italy"
-
-#: ../rules/base.xml.in.h:195
-msgid "Japan"
-msgstr "Japan"
-
-#: ../rules/base.xml.in.h:196
-msgid "Japanese 106-key"
-msgstr "Japanese 106-key"
-
-#: ../rules/base.xml.in.h:197
-msgid "Jpn"
-msgstr "Jpn"
-
-#: ../rules/base.xml.in.h:198
-#, fuzzy
-msgid "Kannada"
-msgstr "Canada"
-
-#: ../rules/base.xml.in.h:199
-msgid "Keypad"
-msgstr ""
-
-#: ../rules/base.xml.in.h:200
-msgid "Keytronic FlexPro"
-msgstr "Keytronic FlexPro"
-
-#: ../rules/base.xml.in.h:201
-msgid "Kyr"
-msgstr "Kyr"
-
-#: ../rules/base.xml.in.h:202
-msgid "Kyrgyzstan"
-msgstr "Kyrgyzstan"
-
-#: ../rules/base.xml.in.h:203
-msgid "LAm"
-msgstr "LAm"
-
-#: ../rules/base.xml.in.h:204
-msgid "Lao"
-msgstr "Lao"
-
-#: ../rules/base.xml.in.h:205
-msgid "Laos"
-msgstr "Laos"
-
-#: ../rules/base.xml.in.h:206
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-
-#: ../rules/base.xml.in.h:207
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-
-#: ../rules/base.xml.in.h:208
-msgid "Laptop/notebook Dell Inspiron 8xxx"
-msgstr "Laptop/notebook Dell Inspiron 8xxx"
-
-#: ../rules/base.xml.in.h:209
-msgid "Latin"
-msgstr "Latin"
-
-#: ../rules/base.xml.in.h:210
-msgid "Latin American"
-msgstr "Latin American"
-
-#: ../rules/base.xml.in.h:211
-msgid "Latin Unicode"
-msgstr "Latin Unicode"
-
-#: ../rules/base.xml.in.h:212
-msgid "Latin Unicode qwerty"
-msgstr "Latin Unicode qwerty"
-
-#: ../rules/base.xml.in.h:213
-msgid "Latin qwerty"
-msgstr "Latin qwerty"
-
-#: ../rules/base.xml.in.h:214
-msgid "Latin with guillemots"
-msgstr "Latin with guillemots"
-
-#: ../rules/base.xml.in.h:215
-msgid "Latvia"
-msgstr "Latvia"
-
-#: ../rules/base.xml.in.h:216
-msgid "Left Alt key changes group."
-msgstr "Left Alt key changes group."
-
-#: ../rules/base.xml.in.h:217
-msgid "Left Alt key switches group while pressed."
-msgstr "Left Alt key switches group while pressed."
-
-#: ../rules/base.xml.in.h:218
-msgid "Left Ctrl key changes group."
-msgstr "Left Ctrl key changes group."
-
-#: ../rules/base.xml.in.h:219
-msgid "Left Shift key changes group."
-msgstr "Left Shift key changes group."
-
-#: ../rules/base.xml.in.h:220
-msgid "Left Win-key changes group."
-msgstr "Left Win-key changes group."
-
-#: ../rules/base.xml.in.h:221
-msgid "Left Win-key switches group while pressed."
-msgstr "Left Win-key switches group while pressed."
-
-#: ../rules/base.xml.in.h:222
-msgid "Lithuania"
-msgstr "Lithuania"
-
-#: ../rules/base.xml.in.h:223
-msgid "Logitech Access Keyboard"
-msgstr "Logitech Access Keyboard"
-
-#: ../rules/base.xml.in.h:224
-msgid "Logitech Cordless Desktop"
-msgstr "Logitech Cordless Desktop"
-
-#: ../rules/base.xml.in.h:225
-msgid "Logitech Cordless Desktop Navigator"
-msgstr "Logitech Cordless Desktop Navigator"
-
-#: ../rules/base.xml.in.h:226
-msgid "Logitech Cordless Desktop Optical"
-msgstr "Logitech Cordless Desktop Optical"
-
-#: ../rules/base.xml.in.h:227
-msgid "Logitech Cordless Desktop Pro"
-msgstr "Logitech Cordless Desktop Pro"
-
-#: ../rules/base.xml.in.h:228
-msgid "Logitech Cordless Desktop Pro (alternate option)"
-msgstr "Logitech Cordless Desktop Pro (alternate option)"
-
-#: ../rules/base.xml.in.h:229
-msgid "Logitech Cordless Desktop Pro (alternate option2)"
-msgstr "Logitech Cordless Desktop Pro (alternate option2)"
-
-#: ../rules/base.xml.in.h:230
-msgid "Logitech Cordless Desktop iTouch"
-msgstr "Logitech Cordless Desktop iTouch"
-
-#: ../rules/base.xml.in.h:231
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr "Logitech Cordless Freedom/Desktop Navigator"
-
-#: ../rules/base.xml.in.h:232
-msgid "Logitech Deluxe Access Keyboard"
-msgstr "Logitech Deluxe Access Keyboard"
-
-#: ../rules/base.xml.in.h:233
-msgid "Logitech Internet Keyboard"
-msgstr "Logitech Internet Keyboard"
-
-#: ../rules/base.xml.in.h:234
-msgid "Logitech Internet Navigator Keyboard"
-msgstr "Logitech Internet Navigator Keyboard"
-
-#: ../rules/base.xml.in.h:235
-#, fuzzy
-msgid "Logitech Ultra-X Keyboard"
-msgstr "Logitech Internet Keyboard"
-
-#: ../rules/base.xml.in.h:236
-msgid "Logitech iTouch"
-msgstr "Logitech iTouch"
-
-#: ../rules/base.xml.in.h:237
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-
-#: ../rules/base.xml.in.h:238
-msgid "Logitech iTouch keyboard Internet Navigator"
-msgstr "Logitech iTouch keyboard Internet Navigator"
-
-#: ../rules/base.xml.in.h:239
-msgid "Ltu"
-msgstr "Ltu"
-
-#: ../rules/base.xml.in.h:240
-msgid "Lva"
-msgstr "Lva"
-
-#: ../rules/base.xml.in.h:241
-#, fuzzy
-msgid "Macedonia (FYROM)"
-msgstr "Macedonian"
-
-#: ../rules/base.xml.in.h:242
-msgid "Macintosh"
-msgstr "Macintosh"
-
-#: ../rules/base.xml.in.h:243
-msgid "Macintosh Old"
-msgstr "Macintosh Old"
-
-#: ../rules/base.xml.in.h:244
-#, fuzzy
-msgid "Make CapsLock an additional Ctrl."
-msgstr "Make Caps Lock an additional Control."
-
-#: ../rules/base.xml.in.h:245
-msgid "Mal"
-msgstr "Mal"
-
-#: ../rules/base.xml.in.h:246
-#, fuzzy
-msgid "Malayalam"
-msgstr "Malayalam"
-
-#: ../rules/base.xml.in.h:247
-msgid "Maldives"
-msgstr ""
-
-#: ../rules/base.xml.in.h:248
-msgid "Malta"
-msgstr "Malta"
-
-#: ../rules/base.xml.in.h:249
-msgid "Mao"
-msgstr "Mao"
-
-#: ../rules/base.xml.in.h:250
-msgid "Maori"
-msgstr "Maori"
-
-#: ../rules/base.xml.in.h:251
-msgid "Memorex MX1998"
-msgstr "Memorex MX1998"
-
-#: ../rules/base.xml.in.h:252
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr "Memorex MX2500 EZ-Access Keyboard"
-
-#: ../rules/base.xml.in.h:253
-msgid "Memorex MX2750"
-msgstr "Memorex MX2750"
-
-#: ../rules/base.xml.in.h:254
-msgid "Menu is Compose."
-msgstr "Menu is Compose."
-
-#: ../rules/base.xml.in.h:255
-msgid "Menu key changes group."
-msgstr "Menu key changes group."
-
-#: ../rules/base.xml.in.h:256
-msgid "Meta is mapped to the Win-keys."
-msgstr "Meta is mapped to the Win-keys."
-
-#: ../rules/base.xml.in.h:257
-msgid "Meta is mapped to the left Win-key."
-msgstr "Meta is mapped to the left Win-key."
-
-#: ../rules/base.xml.in.h:258
-msgid "Microsoft Internet Keyboard"
-msgstr "Microsoft Internet Keyboard"
-
-#: ../rules/base.xml.in.h:259
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "Microsoft Internet Keyboard Pro, Swedish"
-
-#: ../rules/base.xml.in.h:260
-msgid "Microsoft Natural"
-msgstr "Microsoft Natural"
-
-#: ../rules/base.xml.in.h:261
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-
-#: ../rules/base.xml.in.h:262
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr "Microsoft Natural Keyboard Pro OEM"
-
-#: ../rules/base.xml.in.h:263
-msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-
-#: ../rules/base.xml.in.h:264
-msgid "Microsoft Office Keyboard"
-msgstr "Microsoft Office Keyboard"
-
-#: ../rules/base.xml.in.h:265
-msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
-msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
-
-#: ../rules/base.xml.in.h:266
-msgid "Miscellaneous compatibility options"
-msgstr "Miscellaneous compatibility options"
-
-#: ../rules/base.xml.in.h:267
-msgid "Mkd"
-msgstr "Mkd"
-
-#: ../rules/base.xml.in.h:268
-msgid "Mlt"
-msgstr "Mlt"
-
-#: ../rules/base.xml.in.h:269
-msgid "Mmr"
-msgstr "Mmr"
-
-#: ../rules/base.xml.in.h:270
-msgid "Mng"
-msgstr "Mng"
-
-#: ../rules/base.xml.in.h:271
-msgid "Mongolia"
-msgstr "Mongolia"
-
-#: ../rules/base.xml.in.h:272
-msgid "Multilingual"
-msgstr "Multilingual"
-
-#: ../rules/base.xml.in.h:273
-msgid "Multilingual, second part"
-msgstr "Multilingual, second part"
-
-#: ../rules/base.xml.in.h:274
-msgid "Myanmar"
-msgstr "Myanmar"
-
-#: ../rules/base.xml.in.h:275
-msgid "Netherlands"
-msgstr "Netherlands"
-
-#: ../rules/base.xml.in.h:276
-msgid "Nld"
-msgstr "Nld"
-
-#: ../rules/base.xml.in.h:277
-msgid "Nor"
-msgstr "Nor"
-
-#: ../rules/base.xml.in.h:278
-msgid "Northern Saami"
-msgstr "Northern Saami"
-
-#: ../rules/base.xml.in.h:279
-#, fuzzy
-msgid "Northern Saami, eliminate dead keys"
-msgstr "Alternative, eliminate dead keys"
-
-#: ../rules/base.xml.in.h:280
-msgid "Northgate OmniKey 101"
-msgstr "Northgate OmniKey 101"
-
-#: ../rules/base.xml.in.h:281
-msgid "Norway"
-msgstr "Norway"
-
-#: ../rules/base.xml.in.h:282
-msgid "NumLock LED shows alternative group."
-msgstr "Num Lock LED shows alternative group."
-
-#: ../rules/base.xml.in.h:283
-msgid "Ogham"
-msgstr "Ogham"
-
-#: ../rules/base.xml.in.h:284
-#, fuzzy
-msgid "Ogham IS434"
-msgstr "IS434"
-
-#: ../rules/base.xml.in.h:285
-msgid "Oretec MCK-800 MM/Internet keyboard"
-msgstr "Oretec MCK-800 MM/Internet keyboard"
-
-#: ../rules/base.xml.in.h:286
-msgid "Oriya"
-msgstr "Oriya"
-
-#: ../rules/base.xml.in.h:287
-msgid "PC-98xx Series"
-msgstr "PC-98xx Series"
-
-#: ../rules/base.xml.in.h:288
-msgid "Pak"
-msgstr ""
-
-#: ../rules/base.xml.in.h:289
-#, fuzzy
-msgid "Pakistan"
-msgstr "Tajikistan"
-
-#: ../rules/base.xml.in.h:290
-msgid "Pattachote"
-msgstr "Pattachote"
-
-#: ../rules/base.xml.in.h:291
-msgid "Phonetic"
-msgstr "Phonetic"
-
-#: ../rules/base.xml.in.h:292
-msgid "Pol"
-msgstr "Pol"
-
-#: ../rules/base.xml.in.h:293
-msgid "Poland"
-msgstr "Poland"
-
-#: ../rules/base.xml.in.h:294
-msgid "Polytonic"
-msgstr "Polytonic"
-
-#: ../rules/base.xml.in.h:295
-msgid "Portugal"
-msgstr "Portugal"
-
-#: ../rules/base.xml.in.h:296
-#, fuzzy
-msgid "Power G5"
-msgstr "PowerPC PS/2"
-
-#: ../rules/base.xml.in.h:297
-msgid "PowerPC PS/2"
-msgstr "PowerPC PS/2"
-
-#: ../rules/base.xml.in.h:298
-msgid "Press Left Alt key to choose 3rd level."
-msgstr "Press Left Alt key to choose 3rd level."
-
-#: ../rules/base.xml.in.h:299
-msgid "Press Left Win-key to choose 3rd level."
-msgstr "Press Left Win-key to choose 3rd level."
-
-#: ../rules/base.xml.in.h:300
-msgid "Press Menu key to choose 3rd level."
-msgstr "Press Menu key to choose 3rd level."
-
-#: ../rules/base.xml.in.h:301
-msgid "Press Right Alt key to choose 3rd level."
-msgstr "Press Right Alt key to choose 3rd level."
-
-#: ../rules/base.xml.in.h:302
-#, fuzzy
-msgid "Press Right Ctrl to choose 3rd level."
-msgstr "Press Right Control to choose 3rd level."
-
-#: ../rules/base.xml.in.h:303
-msgid "Press Right Win-key to choose 3rd level."
-msgstr "Press Right Win-key to choose 3rd level."
-
-#: ../rules/base.xml.in.h:304
-msgid "Press any of Alt keys to choose 3rd level."
-msgstr "Press any of Alt keys to choose 3rd level."
-
-#: ../rules/base.xml.in.h:305
-msgid "Press any of Win-keys to choose 3rd level."
-msgstr "Press any of Win-keys to choose 3rd level."
-
-#: ../rules/base.xml.in.h:306
-#, fuzzy
-msgid "Pro"
-msgstr "Prt"
-
-#: ../rules/base.xml.in.h:307
-msgid "Pro Keypad"
-msgstr ""
-
-#: ../rules/base.xml.in.h:308
-msgid "Probhat"
-msgstr "Probhat"
-
-#: ../rules/base.xml.in.h:309
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "Propeller Voyager (KTEZ-1000)"
-
-#: ../rules/base.xml.in.h:310
-msgid "Prt"
-msgstr "Prt"
-
-#: ../rules/base.xml.in.h:311
-msgid "QTronix Scorpius 98N+"
-msgstr "QTronix Scorpius 98N+"
-
-#: ../rules/base.xml.in.h:312
-msgid "R-Alt switches group while pressed."
-msgstr "R-Alt switches group while pressed."
-
-#: ../rules/base.xml.in.h:313
-msgid "Right Alt is Compose."
-msgstr "Right Alt is Compose."
-
-#: ../rules/base.xml.in.h:314
-msgid "Right Alt key changes group."
-msgstr "Right Alt key changes group."
-
-#: ../rules/base.xml.in.h:315
-msgid "Right Ctrl is Compose."
-msgstr "Right Ctrl is Compose."
-
-#: ../rules/base.xml.in.h:316
-msgid "Right Ctrl key changes group."
-msgstr "Right Ctrl key changes group."
-
-#: ../rules/base.xml.in.h:317
-msgid "Right Ctrl key switches group while pressed."
-msgstr "Right Ctrl key switches group while pressed."
-
-#: ../rules/base.xml.in.h:318
-#, fuzzy
-msgid "Right Ctrl key works as Right Alt."
-msgstr "Right Control key works as Right Alt."
-
-#: ../rules/base.xml.in.h:319
-msgid "Right Shift key changes group."
-msgstr "Right Shift key changes group."
-
-#: ../rules/base.xml.in.h:320
-msgid "Right Win-key changes group."
-msgstr "Right Win-key changes group."
-
-#: ../rules/base.xml.in.h:321
-msgid "Right Win-key is Compose."
-msgstr "Right Win-key is Compose."
-
-#: ../rules/base.xml.in.h:322
-msgid "Right Win-key switches group while pressed."
-msgstr "Right Win-key switches group while pressed."
-
-#: ../rules/base.xml.in.h:323
-msgid "Romania"
-msgstr "Romania"
-
-#: ../rules/base.xml.in.h:324
-msgid "Romanian keyboard with German letters"
-msgstr "Romanian keyboard with German letters"
-
-#: ../rules/base.xml.in.h:325
-msgid "Romanian keyboard with German letters, eliminate dead keys"
-msgstr "Romanian keyboard with German letters, eliminate dead keys"
-
-#: ../rules/base.xml.in.h:326
-msgid "Rou"
-msgstr "Rou"
-
-#: ../rules/base.xml.in.h:327
-msgid "Rus"
-msgstr "Rus"
-
-#: ../rules/base.xml.in.h:328
-msgid "Russia"
-msgstr "Russia"
-
-#: ../rules/base.xml.in.h:329
-msgid "Russian"
-msgstr "Russian"
-
-#: ../rules/base.xml.in.h:330
-#, fuzzy
-msgid "Russian phonetic"
-msgstr "Russian"
-
-#: ../rules/base.xml.in.h:331
-#, fuzzy
-msgid "Russian phonetic, eliminate dead keys"
-msgstr "French, eliminate dead keys"
-
-#: ../rules/base.xml.in.h:332
-msgid "SCG"
-msgstr ""
-
-#: ../rules/base.xml.in.h:333
-msgid "SK-1300"
-msgstr "SK-1300"
-
-#: ../rules/base.xml.in.h:334
-msgid "SK-2500"
-msgstr "SK-2500"
-
-#: ../rules/base.xml.in.h:335
-msgid "SK-6200"
-msgstr "SK-6200"
-
-#: ../rules/base.xml.in.h:336
-msgid "SK-7100"
-msgstr "SK-7100"
-
-#: ../rules/base.xml.in.h:337
-msgid "SVEN Ergonomic 2500"
-msgstr "SVEN Ergonomic 2500"
-
-#: ../rules/base.xml.in.h:338
-msgid "Samsung SDM 4500P"
-msgstr "Samsung SDM 4500P"
-
-#: ../rules/base.xml.in.h:339
-msgid "Samsung SDM 4510P"
-msgstr "Samsung SDM 4510P"
-
-#: ../rules/base.xml.in.h:340
-msgid "ScrollLock LED shows alternative group."
-msgstr "Scroll Lock LED shows alternative group."
-
-#: ../rules/base.xml.in.h:341
-msgid "Serbia and Montenegro"
-msgstr ""
-
-#: ../rules/base.xml.in.h:342
-msgid "Shift with numpad keys works as in MS Windows."
-msgstr "Shift with numpad keys works as in MS Windows."
-
-#: ../rules/base.xml.in.h:343
-msgid "Shift+CapsLock changes group."
-msgstr "Shift+Caps Lock changes group."
-
-#: ../rules/base.xml.in.h:344
-msgid "Slovakia"
-msgstr "Slovakia"
-
-#: ../rules/base.xml.in.h:345
-msgid "Slovenia"
-msgstr "Slovenia"
-
-#: ../rules/base.xml.in.h:346
-msgid "Spain"
-msgstr "Spain"
-
-#: ../rules/base.xml.in.h:347
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
-msgstr "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
-
-#: ../rules/base.xml.in.h:348
-#, fuzzy
-msgid "SrL"
-msgstr "Syr"
-
-#: ../rules/base.xml.in.h:349
-#, fuzzy
-msgid "Sri Lanka"
-msgstr "Serbian"
-
-#: ../rules/base.xml.in.h:350
-msgid "Standard"
-msgstr "Standard"
-
-#. RSTU 2019-91
-#: ../rules/base.xml.in.h:352
-#, fuzzy
-msgid "Standard RSTU"
-msgstr "Standard"
-
-#. RSTU 2019-91
-#: ../rules/base.xml.in.h:354
-msgid "Standard RSTU on Russian layout"
-msgstr ""
-
-#: ../rules/base.xml.in.h:355
-msgid "Sun dead keys"
-msgstr "Sun dead keys"
-
-#: ../rules/base.xml.in.h:356
-msgid "Super Power Multimedia Keyboard"
-msgstr "Super Power Multimedia Keyboard"
-
-#: ../rules/base.xml.in.h:357
-msgid "Super is mapped to the Win-keys (default)."
-msgstr "Super is mapped to the Win-keys (default)."
-
-#: ../rules/base.xml.in.h:358
-msgid "Svk"
-msgstr "Svk"
-
-#: ../rules/base.xml.in.h:359
-msgid "Svn"
-msgstr "Svn"
-
-#: ../rules/base.xml.in.h:360
-#, fuzzy
-msgid "Swap Ctrl and CapsLock."
-msgstr "Swap Control and Caps Lock."
-
-#: ../rules/base.xml.in.h:361
-msgid "Swe"
-msgstr "Swe"
-
-#: ../rules/base.xml.in.h:362
-msgid "Sweden"
-msgstr "Sweden"
-
-#: ../rules/base.xml.in.h:363
-msgid "Switzerland"
-msgstr "Switzerland"
-
-#: ../rules/base.xml.in.h:364
-msgid "Symplon PaceBook (tablet PC)"
-msgstr "Symplon PaceBook (tablet PC)"
-
-#: ../rules/base.xml.in.h:365
-msgid "Syr"
-msgstr "Syr"
-
-#: ../rules/base.xml.in.h:366
-#, fuzzy
-msgid "Syria"
-msgstr "Syriac"
-
-#: ../rules/base.xml.in.h:367
-msgid "Syriac"
-msgstr "Syriac"
-
-#: ../rules/base.xml.in.h:368
-#, fuzzy
-msgid "Syriac phonetic"
-msgstr "Russian"
-
-#: ../rules/base.xml.in.h:369
-msgid "TIS-820.2538"
-msgstr "TIS-820.2538"
-
-#: ../rules/base.xml.in.h:370
-msgid "Tajikistan"
-msgstr "Tajikistan"
-
-#: ../rules/base.xml.in.h:371
-msgid "Tamil"
-msgstr "Tamil"
-
-#: ../rules/base.xml.in.h:372
-#, fuzzy
-msgid "Tamil TAB Typewriter"
-msgstr "\"Typewriter\""
-
-#: ../rules/base.xml.in.h:373
-msgid "Tamil TSCII Typewriter"
-msgstr ""
-
-#: ../rules/base.xml.in.h:374
-#, fuzzy
-msgid "Tamil Unicode"
-msgstr "Latin Unicode"
-
-#: ../rules/base.xml.in.h:375
-msgid "Telugu"
-msgstr "Telugu"
-
-#: ../rules/base.xml.in.h:376
-msgid "Tha"
-msgstr "Tha"
-
-#: ../rules/base.xml.in.h:377
-msgid "Thailand"
-msgstr "Thailand"
-
-#: ../rules/base.xml.in.h:378
-msgid "Third level choosers"
-msgstr "Third level choosers"
-
-#: ../rules/base.xml.in.h:379
-msgid "Tilde (~) variant"
-msgstr "Tilde (~) variant"
-
-#: ../rules/base.xml.in.h:380
-msgid "Tjk"
-msgstr "Tjk"
-
-#: ../rules/base.xml.in.h:381
-msgid "Toshiba Satellite S3000"
-msgstr "Toshiba Satellite S3000"
-
-#: ../rules/base.xml.in.h:382
-msgid "Trust Direct Access Keyboard"
-msgstr "Trust Direct Access Keyboard"
-
-#: ../rules/base.xml.in.h:383
-msgid "Trust Wireless Keyboard Classic"
-msgstr "Trust Wireless Keyboard Classic"
-
-#: ../rules/base.xml.in.h:384
-msgid "Tur"
-msgstr "Tur"
-
-#: ../rules/base.xml.in.h:385
-msgid "Turkish"
-msgstr "Turkish"
-
-#: ../rules/base.xml.in.h:386
-#, fuzzy
-msgid "Typewriter"
-msgstr "\"Typewriter\""
-
-#: ../rules/base.xml.in.h:387
-msgid "U.S. English"
-msgstr "U.S. English"
-
-#: ../rules/base.xml.in.h:388
-#, fuzzy
-msgid "US keyboard with Bosnian digraphs"
-msgstr "US keyboard with Romanian letters"
-
-#: ../rules/base.xml.in.h:389
-#, fuzzy
-msgid "US keyboard with Bosnian letters"
-msgstr "US keyboard with Romanian letters"
-
-#: ../rules/base.xml.in.h:390
-#, fuzzy
-msgid "US keyboard with Croatian digraphs"
-msgstr "US keyboard with Croatian letters"
-
-#: ../rules/base.xml.in.h:391
-msgid "US keyboard with Croatian letters"
-msgstr "US keyboard with Croatian letters"
-
-#: ../rules/base.xml.in.h:392
-msgid "US keyboard with Lithuanian letters"
-msgstr "US keyboard with Lithuanian letters"
-
-#: ../rules/base.xml.in.h:393
-msgid "US keyboard with Maltian letters"
-msgstr "US keyboard with Maltian letters"
-
-#: ../rules/base.xml.in.h:394
-#, fuzzy
-msgid "US keyboard with Slovenian digraphs"
-msgstr "US keyboard with Romanian letters"
-
-#: ../rules/base.xml.in.h:395
-#, fuzzy
-msgid "US keyboard with Slovenian letters"
-msgstr "US keyboard with Romanian letters"
-
-#: ../rules/base.xml.in.h:396
-msgid "USA"
-msgstr "USA"
-
-#: ../rules/base.xml.in.h:397
-msgid "Ukr"
-msgstr "Ukr"
-
-#: ../rules/base.xml.in.h:398
-msgid "Ukraine"
-msgstr "Ukraine"
-
-#: ../rules/base.xml.in.h:399
-msgid "UnicodeExpert"
-msgstr "UnicodeExpert"
-
-#: ../rules/base.xml.in.h:400
-msgid "United Kingdom"
-msgstr "United Kingdom"
-
-#: ../rules/base.xml.in.h:401
-msgid "Urdu"
-msgstr "Urdu"
-
-#: ../rules/base.xml.in.h:402
-msgid "Use Bosnian digraphs"
-msgstr ""
-
-#: ../rules/base.xml.in.h:403
-msgid "Use Croatian digraphs"
-msgstr ""
-
-#: ../rules/base.xml.in.h:404
-msgid "Use Slovenian digraphs"
-msgstr ""
-
-#: ../rules/base.xml.in.h:405
-msgid "Use guillemots for quotes"
-msgstr ""
-
-#: ../rules/base.xml.in.h:406
-msgid "Use keyboard LED to show alternative group."
-msgstr "Use keyboard LED to show alternative group."
-
-#: ../rules/base.xml.in.h:407
-msgid "Uzb"
-msgstr "Uzb"
-
-#: ../rules/base.xml.in.h:408
-msgid "Uzbekistan"
-msgstr "Uzbekistan"
-
-#: ../rules/base.xml.in.h:409
-msgid "Vietnam"
-msgstr "Vietnam"
-
-#: ../rules/base.xml.in.h:410
-msgid "Vnm"
-msgstr "Vnm"
-
-#: ../rules/base.xml.in.h:411
-msgid "Winbook Model XP5"
-msgstr "Winbook Model XP5"
-
-#: ../rules/base.xml.in.h:412
-msgid "Winkeys"
-msgstr "Winkeys"
-
-#: ../rules/base.xml.in.h:413
-msgid "With &lt;\\|&gt; key"
-msgstr "With &lt;\\|&gt; key"
-
-#: ../rules/base.xml.in.h:414
-msgid "With guillemots"
-msgstr "With guillemots"
-
-#: ../rules/base.xml.in.h:415
-msgid "Yahoo! Internet Keyboard"
-msgstr "Yahoo! Internet Keyboard"
-
-#: ../rules/base.xml.in.h:416
-msgid "Z and ZHE swapped"
-msgstr "Z and ZHE swapped"
-
-#: ../rules/base.xml.in.h:417
-msgid "azerty"
-msgstr "azerty"
-
-#: ../rules/base.xml.in.h:418
-msgid "azerty/digits"
-msgstr "azerty/digits"
-
-#: ../rules/base.xml.in.h:419
-msgid "digits"
-msgstr "digits"
-
-#: ../rules/base.xml.in.h:420
-msgid "lyx"
-msgstr "lyx"
-
-#: ../rules/base.xml.in.h:421
-msgid "qwerty"
-msgstr "qwerty"
-
-#: ../rules/base.xml.in.h:422
-msgid "qwerty, extended Backslash"
-msgstr "qwerty, extended Backslash"
-
-#: ../rules/base.xml.in.h:423
-msgid "qwerty/digits"
-msgstr "qwerty/digits"
-
-#: ../rules/base.xml.in.h:424
-msgid "qwertz"
-msgstr "qwertz"
-
-#: ../rules/base.xml.in.h:425
-msgid "si1452"
-msgstr "si1452"
-
-#~ msgid "\"Standard\""
-#~ msgstr "\"Standard\""
-
-#, fuzzy
-#~ msgid "Romanian keyboard with MS layout"
-#~ msgstr "Romanian keyboard with German letters"
-
-#, fuzzy
-#~ msgid "Romanian standard keyboard"
-#~ msgstr "Ukrainian standard RSTU"
-
-#, fuzzy
-#~ msgid "Serbia"
-#~ msgstr "Serbian"
-
-#~ msgid "Srp"
-#~ msgstr "Srp"
-
-#, fuzzy
-#~ msgid "Tamil INSCRIPT"
-#~ msgstr "Bengali"
-
-#~ msgid "US keyboard with Romanian letters"
-#~ msgstr "US keyboard with Romanian letters"
-
-#~ msgid "CloGaelach Laptop"
-#~ msgstr "CloGaelach Laptop"
-
-#~ msgid "Laptop"
-#~ msgstr "Laptop"
-
-#, fuzzy
-#~ msgid "Ogham IS434 laptop"
-#~ msgstr "IS434 laptop"
-
-#, fuzzy
-#~ msgid "Sinhala phonetic"
-#~ msgstr "Russian"
-
-#, fuzzy
-#~ msgid "Malayalam with Malayalam digits"
-#~ msgstr "With Malayalam digits"
-
-#, fuzzy
-#~ msgid "Devanagari INSCRIPT"
-#~ msgstr "Devanagari"
-
-#~ msgid "Dzo"
-#~ msgstr "Dzo"
-
-#~ msgid "Dzongkha"
-#~ msgstr "Dzongkha"
-
-#~ msgid "Finish and Swedish"
-#~ msgstr "Finish and Swedish"
-
-#, fuzzy
-#~ msgid "Gurmukhi INSCRIPT"
-#~ msgstr "Gurmukhi"
-
-#, fuzzy
-#~ msgid "Kannada INSCRIPT"
-#~ msgstr "Kannada"
-
-#~ msgid "Smi"
-#~ msgstr "Smi"
-
-#~ msgid "Ben"
-#~ msgstr "Ben"
-
-#~ msgid "Deva"
-#~ msgstr "Deva"
-
-#~ msgid "Guj"
-#~ msgstr "Guj"
-
-#~ msgid "INSCRIPT layout"
-#~ msgstr "INSCRIPT layout"
-
-#~ msgid "Iku"
-#~ msgstr "Iku"
-
-#~ msgid "Ogam"
-#~ msgstr "Ogam"
-
-#~ msgid "Ori"
-#~ msgstr "Ori"
-
-#~ msgid "Sin"
-#~ msgstr "Sin"
-
-#~ msgid "Sinhala"
-#~ msgstr "Sinhala"
-
-#~ msgid "Tam"
-#~ msgstr "Tam"
-
-#~ msgid "Tel"
-#~ msgstr "Tel"
-
-#~ msgid "Typewrite-style keymap; TAB encoding"
-#~ msgstr "Typewrite-style keymap; TAB encoding"
-
-#, fuzzy
-#~ msgid "Typewrite-style keymap; TSCII encoding"
-#~ msgstr "Typewrite-style keymap; TAB encoding"
-
-#~ msgid "Urd"
-#~ msgstr "Urd"
-
-#~ msgid "Typewrite-style keymap; Unicode encoding"
-#~ msgstr "Typewrite-style keymap; Unicode encoding"
+# British English translations for xkeyboard-config package.
+# Copyright (C) 2005 Free Software Foundation
+# This file is distributed under the same license as the xkeyboard-config package.
+# Christopher Orr <chris@protactin.co.uk>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-09-04 23:04+0100\n"
+"PO-Revision-Date: 2005-04-09 16:58+0100\n"
+"Last-Translator: Christopher Orr <chris@protactin.co.uk>\n"
+"Language-Team: English <en_gb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ASCII\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/comma/Dead keys"
+
+#: ../rules/base.xml.in.h:3
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/comma/Eliminate dead keys"
+
+#: ../rules/base.xml.in.h:4
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/dot/Dead keys"
+
+#: ../rules/base.xml.in.h:5
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/dot/Eliminate dead keys"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/comma/Dead keys"
+
+#: ../rules/base.xml.in.h:7
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/comma/Eliminate dead keys"
+
+#: ../rules/base.xml.in.h:8
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/dot/Dead keys"
+
+#: ../rules/base.xml.in.h:9
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/dot/Eliminate dead keys"
+
+#: ../rules/base.xml.in.h:10
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/comma/Dead keys"
+
+#: ../rules/base.xml.in.h:11
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/comma/Eliminate dead keys"
+
+#: ../rules/base.xml.in.h:12
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/dot/Dead keys"
+
+#: ../rules/base.xml.in.h:13
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/dot/Eliminate dead keys"
+
+#: ../rules/base.xml.in.h:14
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/comma/Dead keys"
+
+#: ../rules/base.xml.in.h:15
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/comma/Eliminate dead keys"
+
+#: ../rules/base.xml.in.h:16
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/dot/Dead keys"
+
+#: ../rules/base.xml.in.h:17
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/dot/Eliminate dead keys"
+
+#: ../rules/base.xml.in.h:18
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:19
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:20
+msgid "ACPI Standard"
+msgstr "ACPI Standard"
+
+#: ../rules/base.xml.in.h:21
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:22
+msgid "Acer TravelMate 800"
+msgstr "Acer TravelMate 800"
+
+#: ../rules/base.xml.in.h:23
+msgid "Add the EuroSign to the 2 key."
+msgstr "Add the Euro sign to the 2 key."
+
+#: ../rules/base.xml.in.h:24
+msgid "Add the EuroSign to the 5 key."
+msgstr "Add the Euro sign to the 5 key."
+
+#: ../rules/base.xml.in.h:25
+msgid "Add the EuroSign to the E key."
+msgstr "Add the Euro sign to the E key."
+
+#: ../rules/base.xml.in.h:26
+msgid "Add the standard behavior to Menu key."
+msgstr "Add the standard behaviour to Menu key."
+
+#: ../rules/base.xml.in.h:27
+msgid "Adding the EuroSign to certain keys"
+msgstr "Adding the Euro sign to certain keys"
+
+#: ../rules/base.xml.in.h:28
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../rules/base.xml.in.h:29
+msgid "Alb"
+msgstr "Alb"
+
+#: ../rules/base.xml.in.h:30
+msgid "Albania"
+msgstr "Albania"
+
+#: ../rules/base.xml.in.h:31
+msgid "Alt and Meta are on the Alt keys (default)."
+msgstr "Alt and Meta are on the Alt keys (default)."
+
+#: ../rules/base.xml.in.h:32
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Alt is mapped to the right Win-key and Super to Menu."
+
+#: ../rules/base.xml.in.h:33
+#, fuzzy
+msgid "Alt+Ctrl changes group."
+msgstr "Alt+Control changes group."
+
+#: ../rules/base.xml.in.h:34
+msgid "Alt+Shift changes group."
+msgstr "Alt+Shift changes group."
+
+#: ../rules/base.xml.in.h:35
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:36
+msgid "Alt/Win key behavior"
+msgstr "Alt/Win key behaviour"
+
+#: ../rules/base.xml.in.h:37
+msgid "Alternative"
+msgstr "Alternative"
+
+#: ../rules/base.xml.in.h:38
+msgid "Alternative international (former us_intl)"
+msgstr "Alternative international (former us_intl)"
+
+#: ../rules/base.xml.in.h:39
+msgid "Alternative, Sun dead keys"
+msgstr "Alternative, Sun dead keys"
+
+#: ../rules/base.xml.in.h:40
+msgid "Alternative, eliminate dead keys"
+msgstr "Alternative, eliminate dead keys"
+
+#: ../rules/base.xml.in.h:41
+msgid "Apostrophe (') variant"
+msgstr "Apostrophe (') variant"
+
+#: ../rules/base.xml.in.h:42
+msgid "Ara"
+msgstr "Ara"
+
+#: ../rules/base.xml.in.h:43
+msgid "Arabic"
+msgstr "Arabic"
+
+#: ../rules/base.xml.in.h:44
+msgid "Arm"
+msgstr "Arm"
+
+#: ../rules/base.xml.in.h:45
+msgid "Armenia"
+msgstr "Armenia"
+
+#: ../rules/base.xml.in.h:46
+msgid "Aze"
+msgstr "Aze"
+
+#: ../rules/base.xml.in.h:47
+msgid "Azerbaijan"
+msgstr "Azerbaijan"
+
+#: ../rules/base.xml.in.h:48
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 wireless Internet Keyboard"
+
+#: ../rules/base.xml.in.h:49
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:50
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: ../rules/base.xml.in.h:51
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:52
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:53
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:54
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:55
+#, fuzzy
+msgid "Ban"
+msgstr "Kan"
+
+#: ../rules/base.xml.in.h:56
+msgid "Bangladesh"
+msgstr ""
+
+#: ../rules/base.xml.in.h:57
+msgid "Bel"
+msgstr "Bel"
+
+#: ../rules/base.xml.in.h:58
+msgid "Belarus"
+msgstr "Belarus"
+
+#: ../rules/base.xml.in.h:59
+msgid "Belgium"
+msgstr "Belgium"
+
+#: ../rules/base.xml.in.h:60
+#, fuzzy
+msgid "Bengali"
+msgstr "Probhat"
+
+#: ../rules/base.xml.in.h:61
+#, fuzzy
+msgid "Bengali Probhat"
+msgstr "Probhat"
+
+#: ../rules/base.xml.in.h:62
+msgid "Bgr"
+msgstr "Bgr"
+
+#: ../rules/base.xml.in.h:63
+#, fuzzy
+msgid "Bhu"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:64
+#, fuzzy
+msgid "Bhutan"
+msgstr "Kan"
+
+#: ../rules/base.xml.in.h:65
+msgid "Bih"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:66
+msgid "Blr"
+msgstr "Blr"
+
+#: ../rules/base.xml.in.h:67
+msgid "Bosnia and Herzegovina"
+msgstr "Bosnia and Herzegovina"
+
+#: ../rules/base.xml.in.h:68
+msgid "Both Alt keys together change group."
+msgstr "Both Alt keys together change group."
+
+#: ../rules/base.xml.in.h:69
+msgid "Both Ctrl keys together change group."
+msgstr "Both Ctrl keys together change group."
+
+#: ../rules/base.xml.in.h:70
+msgid "Both Shift keys together change group."
+msgstr "Both Shift keys together change group."
+
+#: ../rules/base.xml.in.h:71
+msgid "Both Win-keys switch group while pressed."
+msgstr "Both Win-keys switch group while pressed."
+
+#: ../rules/base.xml.in.h:72
+msgid "Bra"
+msgstr "Bra"
+
+#: ../rules/base.xml.in.h:73
+msgid "Brazil"
+msgstr "Brazil"
+
+#: ../rules/base.xml.in.h:74
+msgid "Brazilian ABNT2"
+msgstr "Brazilian ABNT2"
+
+#: ../rules/base.xml.in.h:75
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
+
+#: ../rules/base.xml.in.h:76
+msgid "Bulgaria"
+msgstr "Bulgaria"
+
+#: ../rules/base.xml.in.h:77
+msgid "Can"
+msgstr "Can"
+
+#: ../rules/base.xml.in.h:78
+msgid "Canada"
+msgstr "Canada"
+
+#: ../rules/base.xml.in.h:79
+msgid "CapsLock LED shows alternative group."
+msgstr "Caps Lock LED shows alternative group."
+
+#: ../rules/base.xml.in.h:80
+msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
+msgstr "Caps Lock acts as Shift with locking. Shift cancels Caps Lock."
+
+#: ../rules/base.xml.in.h:81
+msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
+msgstr "Caps Lock acts as Shift with locking. Shift doesn't cancel Caps Lock."
+
+#: ../rules/base.xml.in.h:82
+msgid "CapsLock just locks the Shift modifier."
+msgstr "Caps Lock just locks the Shift modifier."
+
+#: ../rules/base.xml.in.h:83
+msgid "CapsLock key behavior"
+msgstr "Caps Lock key behaviour"
+
+#: ../rules/base.xml.in.h:84
+msgid "CapsLock key changes group."
+msgstr "Caps Lock key changes group."
+
+#: ../rules/base.xml.in.h:85
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "Caps Lock toggles Shift so all keys are affected."
+
+#: ../rules/base.xml.in.h:86
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "Caps Lock toggles normal capitalisation of alphabetic characters."
+
+#: ../rules/base.xml.in.h:87
+msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
+msgstr "Caps Lock uses internal capitalisation. Shift cancels Caps Lock."
+
+#: ../rules/base.xml.in.h:88
+msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
+msgstr ""
+"Caps Lock uses internal capitalisation. Shift doesn't cancel Caps Lock."
+
+#: ../rules/base.xml.in.h:89
+msgid "Che"
+msgstr "Che"
+
+#: ../rules/base.xml.in.h:90
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:91
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (alternate option)"
+
+#: ../rules/base.xml.in.h:92
+msgid "Cherry CyMotion Master Linux"
+msgstr ""
+
+#: ../rules/base.xml.in.h:93
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard"
+
+#: ../rules/base.xml.in.h:94
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:95
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:96
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
+
+#: ../rules/base.xml.in.h:97
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 keys)"
+
+#: ../rules/base.xml.in.h:98
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 keys)"
+
+#: ../rules/base.xml.in.h:99
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 keys)"
+
+#: ../rules/base.xml.in.h:100
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
+
+#: ../rules/base.xml.in.h:101
+#, fuzzy
+msgid "Compose key position"
+msgstr "Control Key Position"
+
+#: ../rules/base.xml.in.h:102
+msgid "Croatia"
+msgstr "Croatia"
+
+#: ../rules/base.xml.in.h:103
+#, fuzzy
+msgid "Ctrl key at bottom left"
+msgstr "Control key at bottom left"
+
+#: ../rules/base.xml.in.h:104
+#, fuzzy
+msgid "Ctrl key at left of 'A'"
+msgstr "Control key at left of 'A'"
+
+#: ../rules/base.xml.in.h:105
+#, fuzzy
+msgid "Ctrl key position"
+msgstr "Control Key Position"
+
+#: ../rules/base.xml.in.h:106
+#, fuzzy
+msgid "Ctrl+Shift changes group."
+msgstr "Control+Shift changes group."
+
+#: ../rules/base.xml.in.h:107
+msgid "Cyrillic"
+msgstr "Cyrillic"
+
+#: ../rules/base.xml.in.h:108
+msgid "Cze"
+msgstr "Cze"
+
+#: ../rules/base.xml.in.h:109
+msgid "Czechia"
+msgstr "Czechia"
+
+#: ../rules/base.xml.in.h:110
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:111
+msgid "Dead acute"
+msgstr "Dead acute"
+
+#: ../rules/base.xml.in.h:112
+msgid "Dead grave acute"
+msgstr "Dead grave acute"
+
+#: ../rules/base.xml.in.h:113
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:114
+msgid "Dell 101-key PC"
+msgstr "Dell 101-key PC"
+
+#: ../rules/base.xml.in.h:115
+msgid "Denmark"
+msgstr "Denmark"
+
+#: ../rules/base.xml.in.h:116
+msgid "Deu"
+msgstr "Deu"
+
+#: ../rules/base.xml.in.h:117
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:118
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 series"
+
+#: ../rules/base.xml.in.h:119
+msgid "Dnk"
+msgstr "Dnk"
+
+#: ../rules/base.xml.in.h:120
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:121
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "Dvorak, Polish quotes on key \"1/!\""
+
+#: ../rules/base.xml.in.h:122
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorak, Polish quotes on quotemark key"
+
+#: ../rules/base.xml.in.h:123
+msgid "Eliminate dead keys"
+msgstr "Eliminate dead keys"
+
+#: ../rules/base.xml.in.h:124
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:125
+msgid "Esp"
+msgstr "Esp"
+
+#: ../rules/base.xml.in.h:126
+msgid "Est"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:127
+msgid "Estonia"
+msgstr "Estonia"
+
+#: ../rules/base.xml.in.h:128
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:129
+msgid "Extended"
+msgstr "Extended"
+
+#: ../rules/base.xml.in.h:130
+msgid "Extended Backslash"
+msgstr "Extended Backslash"
+
+#: ../rules/base.xml.in.h:131
+msgid "F-letter (F) variant"
+msgstr "F-letter (F) variant"
+
+#: ../rules/base.xml.in.h:132
+msgid "Fao"
+msgstr "Fao"
+
+#: ../rules/base.xml.in.h:133
+msgid "Faroe Islands"
+msgstr "Faroe Islands"
+
+#: ../rules/base.xml.in.h:134
+msgid "Fin"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:135
+msgid "Finland"
+msgstr "Finland"
+
+#: ../rules/base.xml.in.h:136
+msgid "Fra"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:137
+msgid "France"
+msgstr "France"
+
+#: ../rules/base.xml.in.h:138
+msgid "French"
+msgstr "French"
+
+#: ../rules/base.xml.in.h:139
+msgid "French (legacy)"
+msgstr "French (legacy)"
+
+#: ../rules/base.xml.in.h:140
+msgid "French Dvorak"
+msgstr "French Dvorak"
+
+#: ../rules/base.xml.in.h:141
+msgid "French, Sun dead keys"
+msgstr "French, Sun dead keys"
+
+#: ../rules/base.xml.in.h:142
+msgid "French, eliminate dead keys"
+msgstr "French, eliminate dead keys"
+
+#: ../rules/base.xml.in.h:143
+msgid "GBr"
+msgstr "GBr"
+
+#: ../rules/base.xml.in.h:144
+msgid "Generic 101-key PC"
+msgstr "Generic 101-key PC"
+
+#: ../rules/base.xml.in.h:145
+msgid "Generic 102-key (Intl) PC"
+msgstr "Generic 102-key (Intl) PC"
+
+#: ../rules/base.xml.in.h:146
+msgid "Generic 104-key PC"
+msgstr "Generic 104-key PC"
+
+#: ../rules/base.xml.in.h:147
+msgid "Generic 105-key (Intl) PC"
+msgstr "Generic 105-key (Intl) PC"
+
+#: ../rules/base.xml.in.h:148
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+
+#: ../rules/base.xml.in.h:149
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:150
+msgid "Geo"
+msgstr "Geo"
+
+#: ../rules/base.xml.in.h:151
+msgid "Georgia"
+msgstr "Georgia"
+
+#: ../rules/base.xml.in.h:152
+msgid "German, Sun dead keys"
+msgstr "German, Sun dead keys"
+
+#: ../rules/base.xml.in.h:153
+msgid "German, eliminate dead keys"
+msgstr "German, eliminate dead keys"
+
+#: ../rules/base.xml.in.h:154
+msgid "Germany"
+msgstr "Germany"
+
+#: ../rules/base.xml.in.h:155
+msgid "Gre"
+msgstr "Gre"
+
+#: ../rules/base.xml.in.h:156
+msgid "Greece"
+msgstr "Greece"
+
+#: ../rules/base.xml.in.h:157
+msgid "Group Shift/Lock behavior"
+msgstr "Group Shift/Lock behaviour"
+
+#: ../rules/base.xml.in.h:158
+#, fuzzy
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../rules/base.xml.in.h:159
+#, fuzzy
+msgid "Gurmukhi"
+msgstr "Guru"
+
+#: ../rules/base.xml.in.h:160
+msgid "Gyration"
+msgstr "Gyration"
+
+#: ../rules/base.xml.in.h:161
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
+
+#: ../rules/base.xml.in.h:162
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:163
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:164
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:165
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:166
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:167
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:168
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:169
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:170
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
+
+#: ../rules/base.xml.in.h:171
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:172
+msgid "Hrv"
+msgstr "Hrv"
+
+#: ../rules/base.xml.in.h:173
+msgid "Hun"
+msgstr "Hun"
+
+#: ../rules/base.xml.in.h:174
+msgid "Hungary"
+msgstr "Hungary"
+
+#: ../rules/base.xml.in.h:175
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper is mapped to the Win-keys."
+
+#: ../rules/base.xml.in.h:176
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:177
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:178
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (alternate option)"
+
+#: ../rules/base.xml.in.h:179
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:180
+msgid "ISO Alternate"
+msgstr "ISO Alternate"
+
+#: ../rules/base.xml.in.h:181
+msgid "Iceland"
+msgstr "Iceland"
+
+#: ../rules/base.xml.in.h:182
+#, fuzzy
+msgid "Ind"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:183
+msgid "India"
+msgstr ""
+
+#: ../rules/base.xml.in.h:184
+msgid "International (with dead keys)"
+msgstr "International (with dead keys)"
+
+#: ../rules/base.xml.in.h:185
+msgid "Inuktitut"
+msgstr "Inuktitut"
+
+#: ../rules/base.xml.in.h:186
+msgid "Iran"
+msgstr "Iran"
+
+#: ../rules/base.xml.in.h:187
+msgid "Ireland"
+msgstr "Ireland"
+
+#: ../rules/base.xml.in.h:188
+msgid "Irl"
+msgstr "Irl"
+
+#: ../rules/base.xml.in.h:189
+msgid "Irn"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:190
+msgid "Isl"
+msgstr "Isl"
+
+#: ../rules/base.xml.in.h:191
+msgid "Isr"
+msgstr "Isr"
+
+#: ../rules/base.xml.in.h:192
+msgid "Israel"
+msgstr "Israel"
+
+#: ../rules/base.xml.in.h:193
+msgid "Ita"
+msgstr "Ita"
+
+#: ../rules/base.xml.in.h:194
+msgid "Italy"
+msgstr "Italy"
+
+#: ../rules/base.xml.in.h:195
+msgid "Japan"
+msgstr "Japan"
+
+#: ../rules/base.xml.in.h:196
+msgid "Japanese 106-key"
+msgstr "Japanese 106-key"
+
+#: ../rules/base.xml.in.h:197
+msgid "Jpn"
+msgstr "Jpn"
+
+#: ../rules/base.xml.in.h:198
+#, fuzzy
+msgid "Kannada"
+msgstr "Canada"
+
+#: ../rules/base.xml.in.h:199
+msgid "Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:200
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:201
+msgid "Kyr"
+msgstr "Kyr"
+
+#: ../rules/base.xml.in.h:202
+msgid "Kyrgyzstan"
+msgstr "Kyrgyzstan"
+
+#: ../rules/base.xml.in.h:203
+msgid "LAm"
+msgstr "LAm"
+
+#: ../rules/base.xml.in.h:204
+msgid "Lao"
+msgstr "Lao"
+
+#: ../rules/base.xml.in.h:205
+msgid "Laos"
+msgstr "Laos"
+
+#: ../rules/base.xml.in.h:206
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+
+#: ../rules/base.xml.in.h:207
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+
+#: ../rules/base.xml.in.h:208
+msgid "Laptop/notebook Dell Inspiron 8xxx"
+msgstr "Laptop/notebook Dell Inspiron 8xxx"
+
+#: ../rules/base.xml.in.h:209
+msgid "Latin"
+msgstr "Latin"
+
+#: ../rules/base.xml.in.h:210
+msgid "Latin American"
+msgstr "Latin American"
+
+#: ../rules/base.xml.in.h:211
+msgid "Latin Unicode"
+msgstr "Latin Unicode"
+
+#: ../rules/base.xml.in.h:212
+msgid "Latin Unicode qwerty"
+msgstr "Latin Unicode qwerty"
+
+#: ../rules/base.xml.in.h:213
+msgid "Latin qwerty"
+msgstr "Latin qwerty"
+
+#: ../rules/base.xml.in.h:214
+msgid "Latin with guillemots"
+msgstr "Latin with guillemots"
+
+#: ../rules/base.xml.in.h:215
+msgid "Latvia"
+msgstr "Latvia"
+
+#: ../rules/base.xml.in.h:216
+msgid "Left Alt key changes group."
+msgstr "Left Alt key changes group."
+
+#: ../rules/base.xml.in.h:217
+msgid "Left Alt key switches group while pressed."
+msgstr "Left Alt key switches group while pressed."
+
+#: ../rules/base.xml.in.h:218
+msgid "Left Ctrl key changes group."
+msgstr "Left Ctrl key changes group."
+
+#: ../rules/base.xml.in.h:219
+msgid "Left Shift key changes group."
+msgstr "Left Shift key changes group."
+
+#: ../rules/base.xml.in.h:220
+msgid "Left Win-key changes group."
+msgstr "Left Win-key changes group."
+
+#: ../rules/base.xml.in.h:221
+msgid "Left Win-key switches group while pressed."
+msgstr "Left Win-key switches group while pressed."
+
+#: ../rules/base.xml.in.h:222
+msgid "Lithuania"
+msgstr "Lithuania"
+
+#: ../rules/base.xml.in.h:223
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
+
+#: ../rules/base.xml.in.h:224
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:225
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:226
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:227
+msgid "Logitech Cordless Desktop Pro"
+msgstr "Logitech Cordless Desktop Pro"
+
+#: ../rules/base.xml.in.h:228
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Logitech Cordless Desktop Pro (alternate option)"
+
+#: ../rules/base.xml.in.h:229
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (alternate option2)"
+
+#: ../rules/base.xml.in.h:230
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:231
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:232
+msgid "Logitech Deluxe Access Keyboard"
+msgstr "Logitech Deluxe Access Keyboard"
+
+#: ../rules/base.xml.in.h:233
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:234
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: ../rules/base.xml.in.h:235
+#, fuzzy
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:236
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:237
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+
+#: ../rules/base.xml.in.h:238
+msgid "Logitech iTouch keyboard Internet Navigator"
+msgstr "Logitech iTouch keyboard Internet Navigator"
+
+#: ../rules/base.xml.in.h:239
+msgid "Ltu"
+msgstr "Ltu"
+
+#: ../rules/base.xml.in.h:240
+msgid "Lva"
+msgstr "Lva"
+
+#: ../rules/base.xml.in.h:241
+#, fuzzy
+msgid "Macedonia (FYROM)"
+msgstr "Macedonian"
+
+#: ../rules/base.xml.in.h:242
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:243
+msgid "Macintosh Old"
+msgstr "Macintosh Old"
+
+#: ../rules/base.xml.in.h:244
+#, fuzzy
+msgid "Make CapsLock an additional Ctrl."
+msgstr "Make Caps Lock an additional Control."
+
+#: ../rules/base.xml.in.h:245
+msgid "Mal"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:246
+#, fuzzy
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../rules/base.xml.in.h:247
+msgid "Maldives"
+msgstr ""
+
+#: ../rules/base.xml.in.h:248
+msgid "Malta"
+msgstr "Malta"
+
+#: ../rules/base.xml.in.h:249
+msgid "Mao"
+msgstr "Mao"
+
+#: ../rules/base.xml.in.h:250
+msgid "Maori"
+msgstr "Maori"
+
+#: ../rules/base.xml.in.h:251
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:252
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
+
+#: ../rules/base.xml.in.h:253
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:254
+msgid "Menu is Compose."
+msgstr "Menu is Compose."
+
+#: ../rules/base.xml.in.h:255
+msgid "Menu key changes group."
+msgstr "Menu key changes group."
+
+#: ../rules/base.xml.in.h:256
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta is mapped to the Win-keys."
+
+#: ../rules/base.xml.in.h:257
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta is mapped to the left Win-key."
+
+#: ../rules/base.xml.in.h:258
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
+
+#: ../rules/base.xml.in.h:259
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, Swedish"
+
+#: ../rules/base.xml.in.h:260
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:261
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:262
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: ../rules/base.xml.in.h:263
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:264
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
+
+#: ../rules/base.xml.in.h:265
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+
+#: ../rules/base.xml.in.h:266
+msgid "Miscellaneous compatibility options"
+msgstr "Miscellaneous compatibility options"
+
+#: ../rules/base.xml.in.h:267
+msgid "Mkd"
+msgstr "Mkd"
+
+#: ../rules/base.xml.in.h:268
+msgid "Mlt"
+msgstr "Mlt"
+
+#: ../rules/base.xml.in.h:269
+msgid "Mmr"
+msgstr "Mmr"
+
+#: ../rules/base.xml.in.h:270
+msgid "Mng"
+msgstr "Mng"
+
+#: ../rules/base.xml.in.h:271
+msgid "Mongolia"
+msgstr "Mongolia"
+
+#: ../rules/base.xml.in.h:272
+msgid "Multilingual"
+msgstr "Multilingual"
+
+#: ../rules/base.xml.in.h:273
+msgid "Multilingual, second part"
+msgstr "Multilingual, second part"
+
+#: ../rules/base.xml.in.h:274
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#: ../rules/base.xml.in.h:275
+msgid "Netherlands"
+msgstr "Netherlands"
+
+#: ../rules/base.xml.in.h:276
+msgid "Nld"
+msgstr "Nld"
+
+#: ../rules/base.xml.in.h:277
+msgid "Nor"
+msgstr "Nor"
+
+#: ../rules/base.xml.in.h:278
+msgid "Northern Saami"
+msgstr "Northern Saami"
+
+#: ../rules/base.xml.in.h:279
+#, fuzzy
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Alternative, eliminate dead keys"
+
+#: ../rules/base.xml.in.h:280
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:281
+msgid "Norway"
+msgstr "Norway"
+
+#: ../rules/base.xml.in.h:282
+msgid "NumLock LED shows alternative group."
+msgstr "Num Lock LED shows alternative group."
+
+#: ../rules/base.xml.in.h:283
+msgid "Ogham"
+msgstr "Ogham"
+
+#: ../rules/base.xml.in.h:284
+#, fuzzy
+msgid "Ogham IS434"
+msgstr "IS434"
+
+#: ../rules/base.xml.in.h:285
+msgid "Oretec MCK-800 MM/Internet keyboard"
+msgstr "Oretec MCK-800 MM/Internet keyboard"
+
+#: ../rules/base.xml.in.h:286
+msgid "Oriya"
+msgstr "Oriya"
+
+#: ../rules/base.xml.in.h:287
+msgid "PC-98xx Series"
+msgstr "PC-98xx Series"
+
+#: ../rules/base.xml.in.h:288
+msgid "Pak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:289
+#, fuzzy
+msgid "Pakistan"
+msgstr "Tajikistan"
+
+#: ../rules/base.xml.in.h:290
+msgid "Pattachote"
+msgstr "Pattachote"
+
+#: ../rules/base.xml.in.h:291
+msgid "Phonetic"
+msgstr "Phonetic"
+
+#: ../rules/base.xml.in.h:292
+msgid "Pol"
+msgstr "Pol"
+
+#: ../rules/base.xml.in.h:293
+msgid "Poland"
+msgstr "Poland"
+
+#: ../rules/base.xml.in.h:294
+msgid "Polytonic"
+msgstr "Polytonic"
+
+#: ../rules/base.xml.in.h:295
+msgid "Portugal"
+msgstr "Portugal"
+
+#: ../rules/base.xml.in.h:296
+#, fuzzy
+msgid "Power G5"
+msgstr "PowerPC PS/2"
+
+#: ../rules/base.xml.in.h:297
+msgid "PowerPC PS/2"
+msgstr "PowerPC PS/2"
+
+#: ../rules/base.xml.in.h:298
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Press Left Alt key to choose 3rd level."
+
+#: ../rules/base.xml.in.h:299
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Press Left Win-key to choose 3rd level."
+
+#: ../rules/base.xml.in.h:300
+msgid "Press Menu key to choose 3rd level."
+msgstr "Press Menu key to choose 3rd level."
+
+#: ../rules/base.xml.in.h:301
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Press Right Alt key to choose 3rd level."
+
+#: ../rules/base.xml.in.h:302
+#, fuzzy
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Press Right Control to choose 3rd level."
+
+#: ../rules/base.xml.in.h:303
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Press Right Win-key to choose 3rd level."
+
+#: ../rules/base.xml.in.h:304
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Press any of Alt keys to choose 3rd level."
+
+#: ../rules/base.xml.in.h:305
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Press any of Win-keys to choose 3rd level."
+
+#: ../rules/base.xml.in.h:306
+#, fuzzy
+msgid "Pro"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:307
+msgid "Pro Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:308
+msgid "Probhat"
+msgstr "Probhat"
+
+#: ../rules/base.xml.in.h:309
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:310
+msgid "Prt"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:311
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:312
+msgid "R-Alt switches group while pressed."
+msgstr "R-Alt switches group while pressed."
+
+#: ../rules/base.xml.in.h:313
+msgid "Right Alt is Compose."
+msgstr "Right Alt is Compose."
+
+#: ../rules/base.xml.in.h:314
+msgid "Right Alt key changes group."
+msgstr "Right Alt key changes group."
+
+#: ../rules/base.xml.in.h:315
+msgid "Right Ctrl is Compose."
+msgstr "Right Ctrl is Compose."
+
+#: ../rules/base.xml.in.h:316
+msgid "Right Ctrl key changes group."
+msgstr "Right Ctrl key changes group."
+
+#: ../rules/base.xml.in.h:317
+msgid "Right Ctrl key switches group while pressed."
+msgstr "Right Ctrl key switches group while pressed."
+
+#: ../rules/base.xml.in.h:318
+#, fuzzy
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Right Control key works as Right Alt."
+
+#: ../rules/base.xml.in.h:319
+msgid "Right Shift key changes group."
+msgstr "Right Shift key changes group."
+
+#: ../rules/base.xml.in.h:320
+msgid "Right Win-key changes group."
+msgstr "Right Win-key changes group."
+
+#: ../rules/base.xml.in.h:321
+msgid "Right Win-key is Compose."
+msgstr "Right Win-key is Compose."
+
+#: ../rules/base.xml.in.h:322
+msgid "Right Win-key switches group while pressed."
+msgstr "Right Win-key switches group while pressed."
+
+#: ../rules/base.xml.in.h:323
+msgid "Romania"
+msgstr "Romania"
+
+#: ../rules/base.xml.in.h:324
+msgid "Romanian keyboard with German letters"
+msgstr "Romanian keyboard with German letters"
+
+#: ../rules/base.xml.in.h:325
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Romanian keyboard with German letters, eliminate dead keys"
+
+#: ../rules/base.xml.in.h:326
+msgid "Rou"
+msgstr "Rou"
+
+#: ../rules/base.xml.in.h:327
+msgid "Rus"
+msgstr "Rus"
+
+#: ../rules/base.xml.in.h:328
+msgid "Russia"
+msgstr "Russia"
+
+#: ../rules/base.xml.in.h:329
+msgid "Russian"
+msgstr "Russian"
+
+#: ../rules/base.xml.in.h:330
+#, fuzzy
+msgid "Russian phonetic"
+msgstr "Russian"
+
+#: ../rules/base.xml.in.h:331
+#, fuzzy
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "French, eliminate dead keys"
+
+#: ../rules/base.xml.in.h:332
+msgid "SCG"
+msgstr ""
+
+#: ../rules/base.xml.in.h:333
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:334
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:335
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:336
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:337
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:338
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:339
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:340
+msgid "ScrollLock LED shows alternative group."
+msgstr "Scroll Lock LED shows alternative group."
+
+#: ../rules/base.xml.in.h:341
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:342
+msgid "Shift with numpad keys works as in MS Windows."
+msgstr "Shift with numpad keys works as in MS Windows."
+
+#: ../rules/base.xml.in.h:343
+msgid "Shift+CapsLock changes group."
+msgstr "Shift+Caps Lock changes group."
+
+#: ../rules/base.xml.in.h:344
+msgid "Slovakia"
+msgstr "Slovakia"
+
+#: ../rules/base.xml.in.h:345
+msgid "Slovenia"
+msgstr "Slovenia"
+
+#: ../rules/base.xml.in.h:346
+msgid "Spain"
+msgstr "Spain"
+
+#: ../rules/base.xml.in.h:347
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+
+#: ../rules/base.xml.in.h:348
+#, fuzzy
+msgid "SrL"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:349
+#, fuzzy
+msgid "Sri Lanka"
+msgstr "Serbian"
+
+#: ../rules/base.xml.in.h:350
+msgid "Standard"
+msgstr "Standard"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:352
+#, fuzzy
+msgid "Standard RSTU"
+msgstr "Standard"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:354
+msgid "Standard RSTU on Russian layout"
+msgstr ""
+
+#: ../rules/base.xml.in.h:355
+msgid "Sun dead keys"
+msgstr "Sun dead keys"
+
+#: ../rules/base.xml.in.h:356
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:357
+msgid "Super is mapped to the Win-keys (default)."
+msgstr "Super is mapped to the Win-keys (default)."
+
+#: ../rules/base.xml.in.h:358
+msgid "Svk"
+msgstr "Svk"
+
+#: ../rules/base.xml.in.h:359
+msgid "Svn"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:360
+#, fuzzy
+msgid "Swap Ctrl and CapsLock."
+msgstr "Swap Control and Caps Lock."
+
+#: ../rules/base.xml.in.h:361
+msgid "Swe"
+msgstr "Swe"
+
+#: ../rules/base.xml.in.h:362
+msgid "Sweden"
+msgstr "Sweden"
+
+#: ../rules/base.xml.in.h:363
+msgid "Switzerland"
+msgstr "Switzerland"
+
+#: ../rules/base.xml.in.h:364
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:365
+msgid "Syr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:366
+#, fuzzy
+msgid "Syria"
+msgstr "Syriac"
+
+#: ../rules/base.xml.in.h:367
+msgid "Syriac"
+msgstr "Syriac"
+
+#: ../rules/base.xml.in.h:368
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "Russian"
+
+#: ../rules/base.xml.in.h:369
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:370
+msgid "Tajikistan"
+msgstr "Tajikistan"
+
+#: ../rules/base.xml.in.h:371
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../rules/base.xml.in.h:372
+#, fuzzy
+msgid "Tamil TAB Typewriter"
+msgstr "\"Typewriter\""
+
+#: ../rules/base.xml.in.h:373
+msgid "Tamil TSCII Typewriter"
+msgstr ""
+
+#: ../rules/base.xml.in.h:374
+#, fuzzy
+msgid "Tamil Unicode"
+msgstr "Latin Unicode"
+
+#: ../rules/base.xml.in.h:375
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../rules/base.xml.in.h:376
+msgid "Tha"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:377
+msgid "Thailand"
+msgstr "Thailand"
+
+#: ../rules/base.xml.in.h:378
+msgid "Third level choosers"
+msgstr "Third level choosers"
+
+#: ../rules/base.xml.in.h:379
+msgid "Tilde (~) variant"
+msgstr "Tilde (~) variant"
+
+#: ../rules/base.xml.in.h:380
+msgid "Tjk"
+msgstr "Tjk"
+
+#: ../rules/base.xml.in.h:381
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:382
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: ../rules/base.xml.in.h:383
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: ../rules/base.xml.in.h:384
+msgid "Tur"
+msgstr "Tur"
+
+#: ../rules/base.xml.in.h:385
+msgid "Turkish"
+msgstr "Turkish"
+
+#: ../rules/base.xml.in.h:386
+#, fuzzy
+msgid "Typewriter"
+msgstr "\"Typewriter\""
+
+#: ../rules/base.xml.in.h:387
+msgid "U.S. English"
+msgstr "U.S. English"
+
+#: ../rules/base.xml.in.h:388
+#, fuzzy
+msgid "US keyboard with Bosnian digraphs"
+msgstr "US keyboard with Romanian letters"
+
+#: ../rules/base.xml.in.h:389
+#, fuzzy
+msgid "US keyboard with Bosnian letters"
+msgstr "US keyboard with Romanian letters"
+
+#: ../rules/base.xml.in.h:390
+#, fuzzy
+msgid "US keyboard with Croatian digraphs"
+msgstr "US keyboard with Croatian letters"
+
+#: ../rules/base.xml.in.h:391
+msgid "US keyboard with Croatian letters"
+msgstr "US keyboard with Croatian letters"
+
+#: ../rules/base.xml.in.h:392
+msgid "US keyboard with Lithuanian letters"
+msgstr "US keyboard with Lithuanian letters"
+
+#: ../rules/base.xml.in.h:393
+msgid "US keyboard with Maltian letters"
+msgstr "US keyboard with Maltian letters"
+
+#: ../rules/base.xml.in.h:394
+#, fuzzy
+msgid "US keyboard with Slovenian digraphs"
+msgstr "US keyboard with Romanian letters"
+
+#: ../rules/base.xml.in.h:395
+#, fuzzy
+msgid "US keyboard with Slovenian letters"
+msgstr "US keyboard with Romanian letters"
+
+#: ../rules/base.xml.in.h:396
+msgid "USA"
+msgstr "USA"
+
+#: ../rules/base.xml.in.h:397
+msgid "Ukr"
+msgstr "Ukr"
+
+#: ../rules/base.xml.in.h:398
+msgid "Ukraine"
+msgstr "Ukraine"
+
+#: ../rules/base.xml.in.h:399
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:400
+msgid "United Kingdom"
+msgstr "United Kingdom"
+
+#: ../rules/base.xml.in.h:401
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../rules/base.xml.in.h:402
+msgid "Use Bosnian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:403
+msgid "Use Croatian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:404
+msgid "Use Slovenian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:405
+msgid "Use guillemots for quotes"
+msgstr ""
+
+#: ../rules/base.xml.in.h:406
+msgid "Use keyboard LED to show alternative group."
+msgstr "Use keyboard LED to show alternative group."
+
+#: ../rules/base.xml.in.h:407
+msgid "Uzb"
+msgstr "Uzb"
+
+#: ../rules/base.xml.in.h:408
+msgid "Uzbekistan"
+msgstr "Uzbekistan"
+
+#: ../rules/base.xml.in.h:409
+msgid "Vietnam"
+msgstr "Vietnam"
+
+#: ../rules/base.xml.in.h:410
+msgid "Vnm"
+msgstr "Vnm"
+
+#: ../rules/base.xml.in.h:411
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:412
+msgid "Winkeys"
+msgstr "Winkeys"
+
+#: ../rules/base.xml.in.h:413
+msgid "With &lt;\\|&gt; key"
+msgstr "With &lt;\\|&gt; key"
+
+#: ../rules/base.xml.in.h:414
+msgid "With guillemots"
+msgstr "With guillemots"
+
+#: ../rules/base.xml.in.h:415
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
+
+#: ../rules/base.xml.in.h:416
+msgid "Z and ZHE swapped"
+msgstr "Z and ZHE swapped"
+
+#: ../rules/base.xml.in.h:417
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:418
+msgid "azerty/digits"
+msgstr "azerty/digits"
+
+#: ../rules/base.xml.in.h:419
+msgid "digits"
+msgstr "digits"
+
+#: ../rules/base.xml.in.h:420
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:421
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:422
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, extended Backslash"
+
+#: ../rules/base.xml.in.h:423
+msgid "qwerty/digits"
+msgstr "qwerty/digits"
+
+#: ../rules/base.xml.in.h:424
+msgid "qwertz"
+msgstr "qwertz"
+
+#: ../rules/base.xml.in.h:425
+msgid "si1452"
+msgstr "si1452"
+
+#~ msgid "\"Standard\""
+#~ msgstr "\"Standard\""
+
+#, fuzzy
+#~ msgid "Romanian keyboard with MS layout"
+#~ msgstr "Romanian keyboard with German letters"
+
+#, fuzzy
+#~ msgid "Romanian standard keyboard"
+#~ msgstr "Ukrainian standard RSTU"
+
+#, fuzzy
+#~ msgid "Serbia"
+#~ msgstr "Serbian"
+
+#~ msgid "Srp"
+#~ msgstr "Srp"
+
+#, fuzzy
+#~ msgid "Tamil INSCRIPT"
+#~ msgstr "Bengali"
+
+#~ msgid "US keyboard with Romanian letters"
+#~ msgstr "US keyboard with Romanian letters"
+
+#~ msgid "CloGaelach Laptop"
+#~ msgstr "CloGaelach Laptop"
+
+#~ msgid "Laptop"
+#~ msgstr "Laptop"
+
+#, fuzzy
+#~ msgid "Ogham IS434 laptop"
+#~ msgstr "IS434 laptop"
+
+#, fuzzy
+#~ msgid "Sinhala phonetic"
+#~ msgstr "Russian"
+
+#, fuzzy
+#~ msgid "Malayalam with Malayalam digits"
+#~ msgstr "With Malayalam digits"
+
+#, fuzzy
+#~ msgid "Devanagari INSCRIPT"
+#~ msgstr "Devanagari"
+
+#~ msgid "Dzo"
+#~ msgstr "Dzo"
+
+#~ msgid "Dzongkha"
+#~ msgstr "Dzongkha"
+
+#~ msgid "Finish and Swedish"
+#~ msgstr "Finish and Swedish"
+
+#, fuzzy
+#~ msgid "Gurmukhi INSCRIPT"
+#~ msgstr "Gurmukhi"
+
+#, fuzzy
+#~ msgid "Kannada INSCRIPT"
+#~ msgstr "Kannada"
+
+#~ msgid "Smi"
+#~ msgstr "Smi"
+
+#~ msgid "Ben"
+#~ msgstr "Ben"
+
+#~ msgid "Deva"
+#~ msgstr "Deva"
+
+#~ msgid "Guj"
+#~ msgstr "Guj"
+
+#~ msgid "INSCRIPT layout"
+#~ msgstr "INSCRIPT layout"
+
+#~ msgid "Iku"
+#~ msgstr "Iku"
+
+#~ msgid "Ogam"
+#~ msgstr "Ogam"
+
+#~ msgid "Ori"
+#~ msgstr "Ori"
+
+#~ msgid "Sin"
+#~ msgstr "Sin"
+
+#~ msgid "Sinhala"
+#~ msgstr "Sinhala"
+
+#~ msgid "Tam"
+#~ msgstr "Tam"
+
+#~ msgid "Tel"
+#~ msgstr "Tel"
+
+#~ msgid "Typewrite-style keymap; TAB encoding"
+#~ msgstr "Typewrite-style keymap; TAB encoding"
+
+#, fuzzy
+#~ msgid "Typewrite-style keymap; TSCII encoding"
+#~ msgstr "Typewrite-style keymap; TAB encoding"
+
+#~ msgid "Urd"
+#~ msgstr "Urd"
+
+#~ msgid "Typewrite-style keymap; Unicode encoding"
+#~ msgstr "Typewrite-style keymap; Unicode encoding"
diff --git a/xorg-server/xkeyboard-config/po/ka.po b/xorg-server/xkeyboard-config/po/ka.po
index f1dad4d71..52ea245e2 100644
--- a/xorg-server/xkeyboard-config/po/ka.po
+++ b/xorg-server/xkeyboard-config/po/ka.po
@@ -1,2274 +1,2274 @@
-# translation of xkeyboard-config.po to Georgian
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Vladimer Sichinava <vlsichinava@gmail.com>, 2006.
-msgid ""
-msgstr ""
-"Project-Id-Version: xkeyboard-config\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-17 21:37+0100\n"
-"PO-Revision-Date: 2006-09-20 22:48+0200\n"
-"Last-Translator: Vladimer Sichinava <vlsichinava@gmail.com>\n"
-"Language-Team: Georgian <www.gia.ge>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#: ../rules/base.xml.in.h:1
-msgid "(F)"
-msgstr "(F)"
-
-#: ../rules/base.xml.in.h:2
-msgid "101/104 key Compatible"
-msgstr "101/104 ღილაკიანი თავსებადი"
-
-#: ../rules/base.xml.in.h:3
-msgid "101/qwerty/comma/Dead keys"
-msgstr ""
-"pc101, qwerty, მძიმე, სპეც კლავიშები "
-"(dead keys)"
-
-#: ../rules/base.xml.in.h:4
-msgid "101/qwerty/comma/Eliminate dead keys"
-msgstr ""
-"pc101, qwerty, მძიმე, სპეც კლავიშების "
-"(dead keys) გარეშე"
-
-#: ../rules/base.xml.in.h:5
-msgid "101/qwerty/dot/Dead keys"
-msgstr ""
-"pc101, qwerty, წერტილი, სპეც "
-"კლავიშები (dead keys)"
-
-#: ../rules/base.xml.in.h:6
-msgid "101/qwerty/dot/Eliminate dead keys"
-msgstr ""
-"pc101, qwerty, წერტილი, სპეც "
-"კლავიშები (dead keys) გარეშე"
-
-#: ../rules/base.xml.in.h:7
-msgid "101/qwertz/comma/Dead keys"
-msgstr ""
-"pc101, qwertz, მძიმე, სპეც კლავიშები "
-"(dead keys)"
-
-#: ../rules/base.xml.in.h:8
-msgid "101/qwertz/comma/Eliminate dead keys"
-msgstr ""
-"pc101, qwertz, მძიმე, სპეც კლავიშების "
-"(dead keys) გარეშე"
-
-#: ../rules/base.xml.in.h:9
-msgid "101/qwertz/dot/Dead keys"
-msgstr ""
-"pc101, qwertz, წერტილი, სპეც "
-"კლავიშები (dead keys)"
-
-#: ../rules/base.xml.in.h:10
-msgid "101/qwertz/dot/Eliminate dead keys"
-msgstr ""
-"pc101, qwertz, წერტილი, სპეც "
-"კლავიშების (dead keys) გარეშე"
-
-#: ../rules/base.xml.in.h:11
-msgid "102/qwerty/comma/Dead keys"
-msgstr ""
-"pc102, qwerty, მძიმე, სპეც კლავიშები "
-"(dead keys)"
-
-#: ../rules/base.xml.in.h:12
-msgid "102/qwerty/comma/Eliminate dead keys"
-msgstr ""
-"pc102, qwerty, მძიმე, სპეც კლავიშების "
-"(dead keys) გარეშე"
-
-#: ../rules/base.xml.in.h:13
-msgid "102/qwerty/dot/Dead keys"
-msgstr ""
-"pc102, qwertz, წერტილი, სპეც "
-"კლავიშები (dead keys)"
-
-#: ../rules/base.xml.in.h:14
-msgid "102/qwerty/dot/Eliminate dead keys"
-msgstr ""
-"pc102, qwerty, წერტილი, სპეც "
-"კლავიშების (dead keys) გარეშე"
-
-#: ../rules/base.xml.in.h:15
-msgid "102/qwertz/comma/Dead keys"
-msgstr ""
-"pc102, qwertz, მძიმე, სპეც კლავიშები "
-"(dead keys)"
-
-#: ../rules/base.xml.in.h:16
-msgid "102/qwertz/comma/Eliminate dead keys"
-msgstr ""
-"pc102, qwertz, მძიმე, სპეც კლავიშების "
-"(dead keys) გარეშე"
-
-#: ../rules/base.xml.in.h:17
-msgid "102/qwertz/dot/Dead keys"
-msgstr ""
-"pc102, qwertz, წერტილი, სპეც "
-"კლავიშები (dead keys)"
-
-#: ../rules/base.xml.in.h:18
-msgid "102/qwertz/dot/Eliminate dead keys"
-msgstr ""
-"pc102, qwertz, წერტილი, სპეც "
-"კლავიშების (dead keys) გარეშე"
-
-#: ../rules/base.xml.in.h:19
-msgid "A4Tech KB-21"
-msgstr "A4Tech KB-21"
-
-#: ../rules/base.xml.in.h:20
-msgid "A4Tech KBS-8"
-msgstr "A4Tech KBS-8"
-
-#: ../rules/base.xml.in.h:21
-msgid "A4Tech Wireless Desktop RFKB-23"
-msgstr "A4Tech Wireless Desktop RFKB-23"
-
-#: ../rules/base.xml.in.h:22
-msgid "ACPI Standard"
-msgstr "სტანდარტული ACPI"
-
-#: ../rules/base.xml.in.h:23
-msgid "Acer AirKey V"
-msgstr "Acer AirKey V"
-
-#: ../rules/base.xml.in.h:24
-msgid "Acer C300"
-msgstr "Acer C300"
-
-#: ../rules/base.xml.in.h:25
-msgid "Acer Ferrari 4000"
-msgstr "Acer Ferrari 4000"
-
-#: ../rules/base.xml.in.h:26
-msgid "Acer TravelMate 800"
-msgstr "Acer TravelMate 800"
-
-#: ../rules/base.xml.in.h:27
-msgid "Add the EuroSign to the 2 key."
-msgstr ""
-"ევროს ნიშნის 2იანის კლავიშზე "
-"დამატება."
-
-#: ../rules/base.xml.in.h:28
-msgid "Add the EuroSign to the 5 key."
-msgstr ""
-"ევროს ნიშნის 5იანის კლავიშზე "
-"დამატება."
-
-#: ../rules/base.xml.in.h:29
-msgid "Add the EuroSign to the E key."
-msgstr ""
-"ევროს ნიშნის E ასოს კლავიშზე "
-"დამატება."
-
-#: ../rules/base.xml.in.h:30
-msgid "Add the standard behavior to Menu key."
-msgstr ""
-"მენიუს კლავიშისთვის "
-"სტანდარტული ქცევის "
-"მინიჭება."
-
-#: ../rules/base.xml.in.h:31
-msgid "Adding the EuroSign to certain keys"
-msgstr ""
-"ევროს ნიშნის ზოგიერთ "
-"კლავიშებზე დამატება"
-
-#: ../rules/base.xml.in.h:32
-msgid "Advance Scorpius KI"
-msgstr "Advance Scorpius KI"
-
-#: ../rules/base.xml.in.h:33
-msgid "Afg"
-msgstr "ავღ"
-
-#: ../rules/base.xml.in.h:34
-msgid "Afghanistan"
-msgstr "ავღანეთი"
-
-#: ../rules/base.xml.in.h:35
-msgid "Akan"
-msgstr "აკანი"
-
-#: ../rules/base.xml.in.h:36
-msgid "Alb"
-msgstr "ალბ"
-
-#: ../rules/base.xml.in.h:37
-msgid "Albania"
-msgstr "ალბანეთი"
-
-#: ../rules/base.xml.in.h:38
-msgid "Alt and Meta are on the Alt keys (default)."
-msgstr ""
-"Alt და Meta, Alt ღილაკზე "
-"(ნაგულისხმევია)."
-
-#: ../rules/base.xml.in.h:39
-msgid "Alt is mapped to the right Win-key and Super to Menu."
-msgstr ""
-"Alt შეესაბამება მარჯვენა Win "
-"ღილაკს, Super   კი Menu-ს."
-
-#: ../rules/base.xml.in.h:40
-msgid "Alt+CapsLock changes group."
-msgstr "Alt + CapsLock ცვლის ჯგუფს."
-
-#: ../rules/base.xml.in.h:41
-msgid "Alt+Ctrl changes group."
-msgstr "Alt + Ctrl ცვლის ჯგუფს."
-
-#: ../rules/base.xml.in.h:42
-msgid "Alt+Shift changes group."
-msgstr "Alt + Shift ცვლის ჯგუფს."
-
-#: ../rules/base.xml.in.h:43
-msgid "Alt-Q"
-msgstr "Alt-Q"
-
-#: ../rules/base.xml.in.h:44
-msgid "Alt/Win key behavior"
-msgstr "Alt/Win კლავიშთა ქცევა"
-
-#: ../rules/base.xml.in.h:45
-msgid "Alternative"
-msgstr "ალტერნატიული"
-
-#: ../rules/base.xml.in.h:46
-msgid "Alternative international (former us_intl)"
-msgstr ""
-"ალტერნატიული "
-"ინტერნაციონალური"
-
-#: ../rules/base.xml.in.h:47
-msgid "Alternative, Sun dead keys"
-msgstr ""
-"ალტერნატიული, Sun სპეც "
-"კლავიშებით (dead keys)"
-
-#: ../rules/base.xml.in.h:48
-msgid "Alternative, eliminate dead keys"
-msgstr ""
-"ალტერნატიული, სპეც "
-"კლავიშების (dead keys) გარეშე"
-
-#: ../rules/base.xml.in.h:49
-msgid "And"
-msgstr "ანდ"
-
-#: ../rules/base.xml.in.h:50
-msgid "Andorra"
-msgstr "ანდორა"
-
-#: ../rules/base.xml.in.h:51
-msgid "Apostrophe (') variant"
-msgstr "(') აპოსტროფიანი ვარიანტი"
-
-#: ../rules/base.xml.in.h:52
-msgid "Apple"
-msgstr "Apple"
-
-#: ../rules/base.xml.in.h:53
-msgid "Apple Laptop"
-msgstr "Apple ლეპტოპი"
-
-#: ../rules/base.xml.in.h:54
-msgid "Ara"
-msgstr "არა"
-
-#: ../rules/base.xml.in.h:55
-msgid "Arabic"
-msgstr "არაბული"
-
-#: ../rules/base.xml.in.h:56
-msgid "Arm"
-msgstr "სომხ"
-
-#: ../rules/base.xml.in.h:57
-msgid "Armenia"
-msgstr "სომხეთი"
-
-#: ../rules/base.xml.in.h:58
-msgid "Aze"
-msgstr "აზერ"
-
-#: ../rules/base.xml.in.h:59
-msgid "Azerbaijan"
-msgstr "აზერბაიჯანი"
-
-#: ../rules/base.xml.in.h:60
-msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr "Azona RF2300 wireless Internet Keyboard"
-
-#: ../rules/base.xml.in.h:61
-msgid "BTC 5090"
-msgstr "BTC 5090"
-
-#: ../rules/base.xml.in.h:62
-msgid "BTC 5113RF Multimedia"
-msgstr "BTC 5113RF Multimedia"
-
-#: ../rules/base.xml.in.h:63
-msgid "BTC 5126T"
-msgstr "BTC 5126T"
-
-#: ../rules/base.xml.in.h:64
-msgid "BTC 9000"
-msgstr "BTC 9000"
-
-#: ../rules/base.xml.in.h:65
-msgid "BTC 9000A"
-msgstr "BTC 9000A"
-
-#: ../rules/base.xml.in.h:66
-msgid "BTC 9001AH"
-msgstr "BTC 9001AH"
-
-#: ../rules/base.xml.in.h:67
-msgid "BTC 9019U"
-msgstr "BTC 9019U"
-
-#: ../rules/base.xml.in.h:68
-msgid "Ban"
-msgstr "ბან"
-
-#: ../rules/base.xml.in.h:69
-msgid "Bangladesh"
-msgstr "ბანგლადეში"
-
-#: ../rules/base.xml.in.h:70
-msgid "Bel"
-msgstr "ბელ"
-
-#: ../rules/base.xml.in.h:71
-msgid "Belarus"
-msgstr "ბელორუსია"
-
-#: ../rules/base.xml.in.h:72
-msgid "Belgium"
-msgstr "ბელგია"
-
-#: ../rules/base.xml.in.h:73
-msgid "Bengali"
-msgstr "ბენგალი"
-
-#: ../rules/base.xml.in.h:74
-msgid "Bengali Probhat"
-msgstr "ბენგალის პრობატი"
-
-#: ../rules/base.xml.in.h:75
-msgid "Bgr"
-msgstr "ბოლგ"
-
-#: ../rules/base.xml.in.h:76
-msgid "Bhu"
-msgstr "ბუტ"
-
-#: ../rules/base.xml.in.h:77
-msgid "Bhutan"
-msgstr "ბუტანი"
-
-#: ../rules/base.xml.in.h:78
-msgid "Bih"
-msgstr "ბოსნ"
-
-#: ../rules/base.xml.in.h:79
-msgid "Blr"
-msgstr "ბელ"
-
-#: ../rules/base.xml.in.h:80
-msgid "Bosnia and Herzegovina"
-msgstr "ბოსნია და ჰერცოგოვინა"
-
-#: ../rules/base.xml.in.h:81
-msgid "Both Alt keys together change group."
-msgstr ""
-"ორივე Alt ღილაკი ერთად ცვლის "
-"ჯგუფს."
-
-#: ../rules/base.xml.in.h:82
-msgid "Both Ctrl keys together change group."
-msgstr ""
-"ორივე Ctrl ღილაკი ერთად ცვლის "
-"ჯგუფს."
-
-#: ../rules/base.xml.in.h:83
-msgid "Both Shift keys together change group."
-msgstr ""
-"ორივე Shift ღილაკი ერთად ცვლის "
-"ჯგუფს."
-
-#: ../rules/base.xml.in.h:84
-msgid "Both Win-keys switch group while pressed."
-msgstr ""
-"ორივე Win ღილაკი ერთად ცვლის "
-"ჯგუფს."
-
-#: ../rules/base.xml.in.h:85
-msgid "Bra"
-msgstr "ბრაზ"
-
-#: ../rules/base.xml.in.h:86
-msgid "Brazil"
-msgstr "ბრაზილია"
-
-#: ../rules/base.xml.in.h:87
-msgid "Brazilian ABNT2"
-msgstr "ბრაზილიური ABNT2"
-
-#: ../rules/base.xml.in.h:88
-msgid "Brother Internet Keyboard"
-msgstr "Brother Internet Keyboard"
-
-#: ../rules/base.xml.in.h:89
-msgid "Bulgaria"
-msgstr "ბულგარეთი"
-
-#: ../rules/base.xml.in.h:90
-msgid "Cambodia"
-msgstr "კამბოჯა"
-
-#: ../rules/base.xml.in.h:91
-msgid "Can"
-msgstr "კან"
-
-#: ../rules/base.xml.in.h:92
-msgid "Canada"
-msgstr "კანადა"
-
-#: ../rules/base.xml.in.h:93
-msgid "Caps Lock is Compose."
-msgstr ""
-"ღილაკი 	Caps Lock შეესაბამება Compose-ს."
-
-#: ../rules/base.xml.in.h:94
-msgid "CapsLock LED shows alternative group."
-msgstr ""
-"CapsLock-ის ინდიკატორი აჩვენებს "
-"დამატებით ჯგუფებს."
-
-#: ../rules/base.xml.in.h:95
-msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
-msgstr ""
-"მუშაობს როგორც დაბლოკილი Shift, "
-"ის აყოვნებს CapsLock-ის "
-"მოქმედებას."
-
-#: ../rules/base.xml.in.h:96
-msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
-msgstr ""
-"მუშაობს როგორც დაბლოკილი Shift, "
-"ის არ აყოვნებს CapsLock-ის "
-"მოქმედებას."
-
-#: ../rules/base.xml.in.h:97
-msgid "CapsLock just locks the Shift modifier."
-msgstr ""
-"CapsLock-ი ბლოკავს Shift "
-"მოდიფიკატორს."
-
-#: ../rules/base.xml.in.h:98
-msgid "CapsLock key behavior"
-msgstr "CapsLock ღილაკის ქცევა"
-
-#: ../rules/base.xml.in.h:99
-msgid "CapsLock key changes group."
-msgstr "CapsLock ღილაკი ცვლის ჯგუფს."
-
-#: ../rules/base.xml.in.h:100
-msgid "CapsLock toggles Shift so all keys are affected."
-msgstr ""
-"CapsLock რთავს Shift-ს, ეხება ყველა "
-"ღილაკს."
-
-#: ../rules/base.xml.in.h:101
-msgid "CapsLock toggles normal capitalization of alphabetic characters."
-msgstr ""
-"CapsLock რთავს ალფავიტის "
-"სიმბოლოების უბრალო "
-"კაპიტალიზაციას."
-
-#: ../rules/base.xml.in.h:102
-msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
-msgstr ""
-"რთავს შიდა კაპიტალიზაციას. "
-"Shift აყოვნებს CapsLock-ს. "
-
-#: ../rules/base.xml.in.h:103
-msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
-msgstr ""
-"რთავს შიდა კაპიტალიზაციას. "
-"Shift არ ეხება CapsLock-ს. "
-
-#: ../rules/base.xml.in.h:104
-msgid "Catalan variant with middle-dot L"
-msgstr "კატალანური საშუალო L-ით"
-
-#: ../rules/base.xml.in.h:105
-msgid "Che"
-msgstr "შვეიც"
-
-#: ../rules/base.xml.in.h:106
-msgid "Cherry Blue Line CyBo@rd"
-msgstr "Cherry Blue Line CyBo@rd"
-
-#: ../rules/base.xml.in.h:107
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr ""
-"Cherry Blue Line CyBo@rd (ალტერნატიული "
-"ვარიანტი)"
-
-#: ../rules/base.xml.in.h:108
-msgid "Cherry CyBo@rd USB-Hub"
-msgstr "Cherry CyBo@rd USB-Hub"
-
-#: ../rules/base.xml.in.h:109
-msgid "Cherry CyMotion Master Linux"
-msgstr "Cherry CyMotion Master Linux"
-
-#: ../rules/base.xml.in.h:110
-msgid "Chicony Internet Keyboard"
-msgstr "Chicony Internet Keyboard"
-
-#: ../rules/base.xml.in.h:111
-msgid "Chicony KB-9885"
-msgstr "Chicony KB-9885"
-
-#: ../rules/base.xml.in.h:112
-msgid "Classic Dvorak"
-msgstr "კლასიკური Dvorak"
-
-#: ../rules/base.xml.in.h:113
-msgid "CloGaelach"
-msgstr "CloGaelach"
-
-#: ../rules/base.xml.in.h:114
-msgid "Compaq Easy Access Keyboard"
-msgstr "Compaq Easy Access Keyboard"
-
-#: ../rules/base.xml.in.h:115
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr "Compaq Internet Keyboard (13 ღილაკიანი)"
-
-#: ../rules/base.xml.in.h:116
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr "Compaq Internet Keyboard (18 ღილაკიანი)"
-
-#: ../rules/base.xml.in.h:117
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr "Compaq Internet Keyboard (7 ღილაკიანი)"
-
-#: ../rules/base.xml.in.h:118
-msgid "Compaq iPaq Keyboard"
-msgstr "Compaq iPaq Keyboard"
-
-#: ../rules/base.xml.in.h:119
-msgid "Compose key position"
-msgstr "Compose კლავიშის პოზიცია"
-
-#: ../rules/base.xml.in.h:120
-msgid "Congo, Democratic Republic of the"
-msgstr ""
-"კონგოს დემოკრატიული "
-"რესპუბლიკა"
-
-#: ../rules/base.xml.in.h:121
-msgid "Croatia"
-msgstr "ხორვატია"
-
-#: ../rules/base.xml.in.h:122
-msgid "Ctrl key at bottom left"
-msgstr "Ctrl ღილაკი ქვემოთ მარცხნივ"
-
-#: ../rules/base.xml.in.h:123
-msgid "Ctrl key at left of 'A'"
-msgstr "Ctrl ღილაკი A ასოს მარცხნივ"
-
-#: ../rules/base.xml.in.h:124
-msgid "Ctrl key position"
-msgstr ""
-"Ctrl ღილაკის ადგილმდებარეობა"
-
-#: ../rules/base.xml.in.h:125
-msgid "Ctrl+Shift changes group."
-msgstr "Ctrl Shift ცვლის ჯგუფს."
-
-#: ../rules/base.xml.in.h:126
-msgid "Cyrillic"
-msgstr "კირილიცა"
-
-#: ../rules/base.xml.in.h:127
-msgid "Cze"
-msgstr "ჩეხ"
-
-#: ../rules/base.xml.in.h:128
-msgid "Czechia"
-msgstr "ჩეხეთი"
-
-#: ../rules/base.xml.in.h:129
-msgid "DRC"
-msgstr "DRC"
-
-#: ../rules/base.xml.in.h:130
-msgid "DTK2000"
-msgstr "DTK2000"
-
-#: ../rules/base.xml.in.h:131
-msgid "Dead acute"
-msgstr "სპეც. სიმბოლო Dead acute"
-
-#: ../rules/base.xml.in.h:132
-msgid "Dead grave acute"
-msgstr "სპეც. სიმბოლო Dead grave acute"
-
-#: ../rules/base.xml.in.h:133
-msgid "Default numpad keys."
-msgstr ""
-"სტანდარტული ციფრული "
-"კლავიშები"
-
-#: ../rules/base.xml.in.h:134
-msgid "Dell"
-msgstr "Dell"
-
-#: ../rules/base.xml.in.h:135
-msgid "Dell 101-key PC"
-msgstr "Dell 101-კლავიშიანი PC"
-
-#: ../rules/base.xml.in.h:136
-msgid "Dell Latitude series laptop"
-msgstr "Dell Latitude series laptop"
-
-#: ../rules/base.xml.in.h:137
-msgid "Dell USB Multimedia Keybard"
-msgstr "Dell USB Multimedia Keybard"
-
-#: ../rules/base.xml.in.h:138
-msgid "Denmark"
-msgstr "დანია"
-
-#: ../rules/base.xml.in.h:139
-msgid "Deu"
-msgstr "გერ"
-
-#: ../rules/base.xml.in.h:140
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr "Dexxa Wireless Desktop Keyboard"
-
-#: ../rules/base.xml.in.h:141
-msgid "Diamond 9801 / 9802 series"
-msgstr "მოდელები Diamond 9801 / 9802 series"
-
-#: ../rules/base.xml.in.h:142
-msgid "Dnk"
-msgstr "დან"
-
-#: ../rules/base.xml.in.h:143
-msgid "Dvorak"
-msgstr "დვორაკული"
-
-#: ../rules/base.xml.in.h:144
-msgid "Dvorak, Polish quotes on key \"1/!\""
-msgstr ""
-"Dvorak, პოლონური ფრჩხილები \"1/!\" "
-"ღილაკზეა"
-
-#: ../rules/base.xml.in.h:145
-msgid "Dvorak, Polish quotes on quotemark key"
-msgstr ""
-"Dvorak, პოლონური ფრჩხილები, "
-"ფრჩხილების კლავიშზე"
-
-#: ../rules/base.xml.in.h:146
-msgid "Eliminate dead keys"
-msgstr ""
-"სპეც ღილაკების (dead keys) გამორთვა"
-
-#: ../rules/base.xml.in.h:147
-msgid "Ennyah DKB-1008"
-msgstr "Ennyah DKB-1008"
-
-#: ../rules/base.xml.in.h:148
-msgid "Epo"
-msgstr "ეპო"
-
-#: ../rules/base.xml.in.h:149
-msgid "Esp"
-msgstr "ესპ"
-
-#: ../rules/base.xml.in.h:150
-msgid "Esperanto"
-msgstr "ესპერანტო"
-
-#: ../rules/base.xml.in.h:151
-msgid "Est"
-msgstr "ესტ"
-
-#: ../rules/base.xml.in.h:152
-msgid "Estonia"
-msgstr "ესტონეთი"
-
-#: ../rules/base.xml.in.h:153
-msgid "Evdev-managed keyboard"
-msgstr "Evdev-managed keyboard"
-
-#: ../rules/base.xml.in.h:154
-msgid "Everex STEPnote"
-msgstr "Everex STEPnote"
-
-#: ../rules/base.xml.in.h:155
-msgid "Ewe"
-msgstr "ივი"
-
-#: ../rules/base.xml.in.h:156
-msgid "Extended"
-msgstr "გაფართოებული"
-
-#: ../rules/base.xml.in.h:157
-msgid "Extended Backslash"
-msgstr ""
-"Backslash გაფართოებული ფუნქციები"
-
-#: ../rules/base.xml.in.h:158
-msgid "F-letter (F) variant"
-msgstr "F-ს ვარიანტი"
-
-#: ../rules/base.xml.in.h:159
-msgid "Fao"
-msgstr "ფარ"
-
-#: ../rules/base.xml.in.h:160
-msgid "Faroe Islands"
-msgstr "ფარერის კუნძულები"
-
-#: ../rules/base.xml.in.h:161
-msgid "Fin"
-msgstr "ფინ"
-
-#: ../rules/base.xml.in.h:162
-msgid "Finland"
-msgstr "ფინეთი"
-
-#: ../rules/base.xml.in.h:163
-msgid "Fra"
-msgstr "ფრა"
-
-#: ../rules/base.xml.in.h:164
-msgid "France"
-msgstr "საფრანგეთი"
-
-#: ../rules/base.xml.in.h:165
-msgid "French"
-msgstr "ფრანგული"
-
-#: ../rules/base.xml.in.h:166
-msgid "French (Macintosh)"
-msgstr "ფრანგული (Macintosh)"
-
-#: ../rules/base.xml.in.h:167
-msgid "French (legacy)"
-msgstr "ფრანგული (legacy)"
-
-#: ../rules/base.xml.in.h:168
-msgid "French Dvorak"
-msgstr "ფრანგული Dvorak"
-
-#: ../rules/base.xml.in.h:169
-msgid "French, Sun dead keys"
-msgstr "ფრანგული, Sun dead keys"
-
-#: ../rules/base.xml.in.h:170
-msgid "French, eliminate dead keys"
-msgstr "ფრანგული, dead keys გარეშე"
-
-#: ../rules/base.xml.in.h:171
-msgid "Fula"
-msgstr "ფულა"
-
-#: ../rules/base.xml.in.h:172
-msgid "GBr"
-msgstr "ბრიტ"
-
-#: ../rules/base.xml.in.h:173
-msgid "Ga"
-msgstr "გა"
-
-#: ../rules/base.xml.in.h:174
-msgid "Generic 101-key PC"
-msgstr "სტანდარტული 101-ღილაკიანი PC"
-
-#: ../rules/base.xml.in.h:175
-msgid "Generic 102-key (Intl) PC"
-msgstr ""
-"სტანდარტული 102-ღილაკიანი (Intl) PC"
-
-#: ../rules/base.xml.in.h:176
-msgid "Generic 104-key PC"
-msgstr "სტანდარტული 104-ღილაკიანი PC"
-
-#: ../rules/base.xml.in.h:177
-msgid "Generic 105-key (Intl) PC"
-msgstr ""
-"სტანდარტული 105-ღილაკიანი (Intl) PC"
-
-#: ../rules/base.xml.in.h:178
-msgid "Genius Comfy KB-12e"
-msgstr "Genius Comfy KB-12e"
-
-#: ../rules/base.xml.in.h:179
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-
-#: ../rules/base.xml.in.h:180
-msgid "Genius Comfy KB-21e-Scroll"
-msgstr "Genius Comfy KB-21e-Scroll"
-
-#: ../rules/base.xml.in.h:181
-msgid "Genius KB-19e NB"
-msgstr "Genius KB-19e NB"
-
-#: ../rules/base.xml.in.h:182
-msgid "Geo"
-msgstr "ქართ"
-
-#: ../rules/base.xml.in.h:183
-msgid "Georgia"
-msgstr "საქართველო"
-
-#: ../rules/base.xml.in.h:184
-msgid "German (Macintosh)"
-msgstr "გერმანული (Macintosh)"
-
-#: ../rules/base.xml.in.h:185
-msgid "German, Sun dead keys"
-msgstr "გერმანული, Sun dead keys"
-
-#: ../rules/base.xml.in.h:186
-msgid "German, eliminate dead keys"
-msgstr "გერმანული, სპეც dead keys გარეშე"
-
-#: ../rules/base.xml.in.h:187
-msgid "Germany"
-msgstr "გერმანია"
-
-#: ../rules/base.xml.in.h:188
-msgid "Gha"
-msgstr "გან"
-
-#: ../rules/base.xml.in.h:189
-msgid "Ghana"
-msgstr "განა"
-
-#: ../rules/base.xml.in.h:190
-msgid "Gre"
-msgstr "საბ"
-
-#: ../rules/base.xml.in.h:191
-msgid "Greece"
-msgstr "საბერძნეთი"
-
-#: ../rules/base.xml.in.h:192
-msgid "Group Shift/Lock behavior"
-msgstr ""
-"განლაგების შეცვლის ფუნქცია"
-
-#: ../rules/base.xml.in.h:193
-msgid "Gujarati"
-msgstr "გუჯარათი"
-
-#: ../rules/base.xml.in.h:194
-msgid "Gurmukhi"
-msgstr "გურმუხი"
-
-#: ../rules/base.xml.in.h:195
-msgid "Gyration"
-msgstr "გირაშნ"
-
-#: ../rules/base.xml.in.h:196
-msgid "Hausa"
-msgstr "ჰაუსა"
-
-#: ../rules/base.xml.in.h:197
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr "Hewlett-Packard Internet Keyboard"
-
-#: ../rules/base.xml.in.h:198
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr "Hewlett-Packard Omnibook 500 FA"
-
-#: ../rules/base.xml.in.h:199
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr "Hewlett-Packard Omnibook 5xx"
-
-#: ../rules/base.xml.in.h:200
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr "Hewlett-Packard Omnibook 6000/6100"
-
-#: ../rules/base.xml.in.h:201
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr "Hewlett-Packard Omnibook XE3 GC"
-
-#: ../rules/base.xml.in.h:202
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr "Hewlett-Packard Omnibook XE3 GF"
-
-#: ../rules/base.xml.in.h:203
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr "Hewlett-Packard Omnibook XT1000"
-
-#: ../rules/base.xml.in.h:204
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr "Hewlett-Packard Pavilion ZT11xx"
-
-#: ../rules/base.xml.in.h:205
-msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
-
-#: ../rules/base.xml.in.h:206
-msgid "Hewlett-Packard SK-2505 Internet Keyboard"
-msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
-
-#: ../rules/base.xml.in.h:207
-msgid "Honeywell Euroboard"
-msgstr "Honeywell Euroboard"
-
-#: ../rules/base.xml.in.h:208
-msgid "Hrv"
-msgstr "ხორ"
-
-#: ../rules/base.xml.in.h:209
-msgid "Hun"
-msgstr "უნგ"
-
-#: ../rules/base.xml.in.h:210
-msgid "Hungary"
-msgstr "უნგრეთი"
-
-#: ../rules/base.xml.in.h:211
-msgid "Hyper is mapped to the Win-keys."
-msgstr "Hyper შეესაბამება Win ღილაკებს."
-
-#: ../rules/base.xml.in.h:212
-msgid "IBM (LST 1205-92)"
-msgstr "IBM (LST 1205-92)"
-
-#: ../rules/base.xml.in.h:213
-msgid "IBM Rapid Access"
-msgstr "IBM Rapid Access"
-
-#: ../rules/base.xml.in.h:214
-msgid "IBM Rapid Access II"
-msgstr "IBM Rapid Access II"
-
-#: ../rules/base.xml.in.h:215
-msgid "IBM Rapid Access II (alternate option)"
-msgstr ""
-"IBM Rapid Access II (ალტერნატიული "
-"ვარიანტი)"
-
-#: ../rules/base.xml.in.h:216
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
-
-#: ../rules/base.xml.in.h:217
-msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-
-#: ../rules/base.xml.in.h:218
-msgid "ISO Alternate"
-msgstr "დამატებითი ISO"
-
-#: ../rules/base.xml.in.h:219
-msgid "Iceland"
-msgstr "ისლანდია"
-
-#: ../rules/base.xml.in.h:220
-msgid "Ind"
-msgstr "ინდ"
-
-#: ../rules/base.xml.in.h:221
-msgid "India"
-msgstr "ინდოეთი"
-
-#: ../rules/base.xml.in.h:222
-msgid "International (with dead keys)"
-msgstr ""
-"საერთაშორისო, სპეც "
-"ღილაკებით (dead keys)"
-
-#: ../rules/base.xml.in.h:223
-msgid "Inuktitut"
-msgstr "ინუკტიტუტი"
-
-#: ../rules/base.xml.in.h:224
-msgid "Iran"
-msgstr "ირანი"
-
-#: ../rules/base.xml.in.h:225
-msgid "Iraq"
-msgstr "ერაყი"
-
-#: ../rules/base.xml.in.h:226
-msgid "Ireland"
-msgstr "ირლანდია"
-
-#: ../rules/base.xml.in.h:227
-msgid "Irl"
-msgstr "ირლ"
-
-#: ../rules/base.xml.in.h:228
-msgid "Irn"
-msgstr "ირა"
-
-#: ../rules/base.xml.in.h:229
-msgid "Irq"
-msgstr "ერა"
-
-#: ../rules/base.xml.in.h:230
-msgid "Isl"
-msgstr "ისლ"
-
-#: ../rules/base.xml.in.h:231
-msgid "Isr"
-msgstr "ებრ"
-
-#: ../rules/base.xml.in.h:232
-msgid "Israel"
-msgstr "ისრაელი"
-
-#: ../rules/base.xml.in.h:233
-msgid "Ita"
-msgstr "იტა"
-
-#: ../rules/base.xml.in.h:234
-msgid "Italy"
-msgstr "იტალია"
-
-#: ../rules/base.xml.in.h:235
-msgid "Japan"
-msgstr "იაპონია"
-
-#: ../rules/base.xml.in.h:236
-msgid "Japan (PC-98xx Series)"
-msgstr "Japan (PC-98xx Series)"
-
-#: ../rules/base.xml.in.h:237
-msgid "Japanese 106-key"
-msgstr "იაპონია 106-ღილაკიანი"
-
-#: ../rules/base.xml.in.h:238
-msgid "Jpn"
-msgstr "იაპ"
-
-#: ../rules/base.xml.in.h:239
-msgid "Kannada"
-msgstr "კანნადა"
-
-#: ../rules/base.xml.in.h:240
-msgid "Kashubian"
-msgstr "კაშუბიანი"
-
-#: ../rules/base.xml.in.h:241
-msgid "Kaz"
-msgstr "ყაზ"
-
-#: ../rules/base.xml.in.h:242
-msgid "Kazakh with Russian"
-msgstr "ყაზახური რუსულთან"
-
-#: ../rules/base.xml.in.h:243
-msgid "Kazakhstan"
-msgstr "ყაზახეთი"
-
-#: ../rules/base.xml.in.h:244
-msgid "Keypad"
-msgstr "დამატებითი პანელით"
-
-#: ../rules/base.xml.in.h:245
-msgid "Keytronic FlexPro"
-msgstr "Keytronic FlexPro"
-
-#: ../rules/base.xml.in.h:246
-msgid "Khm"
-msgstr "კხმ"
-
-#: ../rules/base.xml.in.h:247
-msgid "Kor"
-msgstr "კორ"
-
-#: ../rules/base.xml.in.h:248
-msgid "Korea, Republic of"
-msgstr "კორეა, რესპუბლიკა"
-
-#: ../rules/base.xml.in.h:249
-msgid "Korean 106-key"
-msgstr "კორეული 106-ღილაკიანი"
-
-#: ../rules/base.xml.in.h:250
-msgid "Kotoistus"
-msgstr "Kotoistus"
-
-#: ../rules/base.xml.in.h:251
-msgid "Kurdish, (F)"
-msgstr "ქურთული, (F)"
-
-#: ../rules/base.xml.in.h:252
-msgid "Kurdish, Arabic-Latin"
-msgstr "ქურთული, არაბულ-ლათინური"
-
-#: ../rules/base.xml.in.h:253
-msgid "Kurdish, Latin Alt-Q"
-msgstr "ქურთული, ლათინური Alt-Q"
-
-#: ../rules/base.xml.in.h:254
-msgid "Kurdish, Latin Q"
-msgstr "ქურთული, ლათინური Q"
-
-#: ../rules/base.xml.in.h:255
-msgid "Kyr"
-msgstr "ყირ"
-
-#: ../rules/base.xml.in.h:256
-msgid "Kyrgyzstan"
-msgstr "ყირღიზეთი"
-
-#: ../rules/base.xml.in.h:257
-msgid "LAm"
-msgstr "ლათამ"
-
-#: ../rules/base.xml.in.h:258
-msgid "Lao"
-msgstr "ლაოსური"
-
-#: ../rules/base.xml.in.h:259
-msgid "Laos"
-msgstr "ლაოსი"
-
-#: ../rules/base.xml.in.h:260
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr ""
-"Compaq ლეპტოპ/ნოუთბუქის "
-"კლავიატურა (მაგ. Armada)"
-
-#: ../rules/base.xml.in.h:261
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr ""
-"Compaq ლეპტოპ/ნოუთბუქის "
-"კლავიატურა (მაგ. Presario)"
-
-#: ../rules/base.xml.in.h:262
-msgid "Laptop/notebook Dell Inspiron 6xxx/8xxx"
-msgstr "ლეპტოპ/ნოუთბუქი Dell Inspiron 6xxx/8xxx"
-
-#: ../rules/base.xml.in.h:263
-msgid "Laptop/notebook eMachines m68xx"
-msgstr "ლეპტოპ/ნოუთბუქი eMachines m68xx"
-
-#: ../rules/base.xml.in.h:264
-msgid "Latin"
-msgstr "ლათინური"
-
-#: ../rules/base.xml.in.h:265
-msgid "Latin American"
-msgstr "ლათინურ ამერიკული"
-
-#: ../rules/base.xml.in.h:266
-msgid "Latin Unicode"
-msgstr "ლათინური უნიკოდი"
-
-#: ../rules/base.xml.in.h:267
-msgid "Latin Unicode qwerty"
-msgstr "ლათინური უნიკოდი qwerty"
-
-#: ../rules/base.xml.in.h:268
-msgid "Latin qwerty"
-msgstr "ლათინური qwerty"
-
-#: ../rules/base.xml.in.h:269
-msgid "Latin with guillemets"
-msgstr ""
-"ლათინური ფრანგული "
-"ბრჭყალებით"
-
-#: ../rules/base.xml.in.h:270
-msgid "Latvia"
-msgstr "ლატვია"
-
-#: ../rules/base.xml.in.h:271
-msgid "Left Alt is swapped with left Win-key."
-msgstr ""
-"მარცხენა Alt-ი შეცვლილია Win "
-"ღილაკით"
-
-#: ../rules/base.xml.in.h:272
-msgid "Left Alt key changes group."
-msgstr ""
-"მარცხენა Alt ღილაკი ცვლის "
-"ჯგუფს."
-
-#: ../rules/base.xml.in.h:273
-msgid "Left Alt key switches group while pressed."
-msgstr ""
-"მარცხენა Alt ღილაკი ცვლის "
-"ჯგუფს დაჭერის დროს."
-
-#: ../rules/base.xml.in.h:274
-msgid "Left Ctrl key changes group."
-msgstr ""
-"მარცხენა Alt ღილაკი ცვლის "
-"ჯგუფს."
-
-#: ../rules/base.xml.in.h:275
-msgid "Left Shift key changes group."
-msgstr ""
-"მარცხენა Shift ღილაკი ცვლის "
-"ჯგუფს."
-
-#: ../rules/base.xml.in.h:276
-msgid "Left Win-key changes group."
-msgstr ""
-"მარცხენა Win ღილაკი ცვლის "
-"ჯგუფს."
-
-#: ../rules/base.xml.in.h:277
-msgid "Left Win-key is Compose."
-msgstr ""
-"მარცხენა Win ღილაკი "
-"შეესაბამება Compose-ს."
-
-#: ../rules/base.xml.in.h:278
-msgid "Left Win-key switches group while pressed."
-msgstr ""
-"მარცხენა Win ღილაკი ცვლის "
-"ჯგუფს დაჭერის დროს."
-
-#: ../rules/base.xml.in.h:279
-msgid "Left handed Dvorak"
-msgstr "Dvorak ცაციებისთვის"
-
-#: ../rules/base.xml.in.h:280
-msgid "Lithuania"
-msgstr "ლიტვა"
-
-#: ../rules/base.xml.in.h:281
-msgid "Logitech Access Keyboard"
-msgstr "Logitech Access Keyboard"
-
-#: ../rules/base.xml.in.h:282
-msgid "Logitech Cordless Desktop"
-msgstr "Logitech Cordless Desktop"
-
-#: ../rules/base.xml.in.h:283
-msgid "Logitech Cordless Desktop LX-300"
-msgstr "Logitech Cordless Desktop LX-300"
-
-#: ../rules/base.xml.in.h:284
-msgid "Logitech Cordless Desktop Navigator"
-msgstr "Logitech Cordless Desktop Navigator"
-
-#: ../rules/base.xml.in.h:285
-msgid "Logitech Cordless Desktop Optical"
-msgstr "Logitech Cordless Desktop Optical"
-
-#: ../rules/base.xml.in.h:286
-msgid "Logitech Cordless Desktop Pro"
-msgstr "Logitech Cordless Desktop Pro"
-
-#: ../rules/base.xml.in.h:287
-msgid "Logitech Cordless Desktop Pro (alternate option)"
-msgstr ""
-"Logitech Cordless Desktop Pro (ალტერნატიული "
-"ვარიანტი)"
-
-#: ../rules/base.xml.in.h:288
-msgid "Logitech Cordless Desktop Pro (alternate option2)"
-msgstr ""
-"Logitech Cordless Desktop Pro (ალტერნატიული "
-"ვარიანტი2)"
-
-#: ../rules/base.xml.in.h:289
-msgid "Logitech Cordless Desktop iTouch"
-msgstr "Logitech Cordless Desktop iTouch"
-
-#: ../rules/base.xml.in.h:290
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr "Logitech Cordless Freedom/Desktop Navigator"
-
-#: ../rules/base.xml.in.h:291
-msgid "Logitech Internet Keyboard"
-msgstr "Logitech Internet Keyboard"
-
-#: ../rules/base.xml.in.h:292
-msgid "Logitech Internet Navigator Keyboard"
-msgstr "Logitech Internet Navigator Keyboard"
-
-#: ../rules/base.xml.in.h:293
-msgid "Logitech Ultra-X Keyboard"
-msgstr "Logitech Ultra-X Keyboard"
-
-#: ../rules/base.xml.in.h:294
-msgid "Logitech diNovo Keyboard"
-msgstr "Logitech diNovo Keyboard"
-
-#: ../rules/base.xml.in.h:295
-msgid "Logitech iTouch"
-msgstr "Logitech iTouch"
-
-#: ../rules/base.xml.in.h:296
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-
-#: ../rules/base.xml.in.h:297
-msgid "Logitech iTouch Internet Navigator Keyboard SE"
-msgstr "Logitech iTouch Internet Navigator Keyboard SE"
-
-#: ../rules/base.xml.in.h:298
-msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-
-#: ../rules/base.xml.in.h:299
-msgid "Ltu"
-msgstr "ლიტ"
-
-#: ../rules/base.xml.in.h:300
-msgid "Lva"
-msgstr "ლატვ"
-
-#: ../rules/base.xml.in.h:301
-msgid "Macedonia"
-msgstr "მაკედონია"
-
-#: ../rules/base.xml.in.h:302
-msgid "Macintosh"
-msgstr "Macintosh"
-
-#: ../rules/base.xml.in.h:303
-msgid "Macintosh Old"
-msgstr "Macintosh ძველი"
-
-#: ../rules/base.xml.in.h:304
-msgid "Macintosh layout"
-msgstr "Macintosh-ის განლაგება"
-
-#: ../rules/base.xml.in.h:305
-msgid "Macintosh layout, eliminate dead keys"
-msgstr ""
-"Macintosh-ის განლაგება, სპეც "
-"კლავიშების (dead keys) გარეშე"
-
-#: ../rules/base.xml.in.h:306
-msgid "Make CapsLock an additional Ctrl."
-msgstr ""
-"გამოიყენე CapsLock როგორც "
-"დამატებითი Ctrl კლავიში."
-
-#: ../rules/base.xml.in.h:307
-msgid "Mal"
-msgstr "მალ"
-
-#: ../rules/base.xml.in.h:308
-msgid "Malayalam"
-msgstr "მალაური"
-
-#: ../rules/base.xml.in.h:309
-msgid "Maldives"
-msgstr "მალდივები"
-
-#: ../rules/base.xml.in.h:310
-msgid "Malta"
-msgstr "მალტა"
-
-#: ../rules/base.xml.in.h:311
-msgid "Maltese keyboard with US layout"
-msgstr ""
-"მალტის კლავიატურა აშშ-ს "
-"განლაგებით"
-
-#: ../rules/base.xml.in.h:312
-msgid "Mao"
-msgstr "მაო"
-
-#: ../rules/base.xml.in.h:313
-msgid "Maori"
-msgstr "მაორი"
-
-#: ../rules/base.xml.in.h:314
-msgid "Memorex MX1998"
-msgstr "Memorex MX1998"
-
-#: ../rules/base.xml.in.h:315
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr "Memorex MX2500 EZ-Access Keyboard"
-
-#: ../rules/base.xml.in.h:316
-msgid "Memorex MX2750"
-msgstr "Memorex MX2750"
-
-#: ../rules/base.xml.in.h:317
-msgid "Menu is Compose."
-msgstr ""
-"Menu ღილაკი შეესაბამება Compose-ის "
-"ღილაკს."
-
-#: ../rules/base.xml.in.h:318
-msgid "Menu key changes group."
-msgstr "Menu-ს ღილაკი ცვლის ჯგუფს."
-
-#: ../rules/base.xml.in.h:319
-msgid "Meta is mapped to the Win-keys."
-msgstr ""
-"Мета შეესაბამება Win ღილაკებს."
-
-#: ../rules/base.xml.in.h:320
-msgid "Meta is mapped to the left Win-key."
-msgstr ""
-"Мета შეესაბამება მარცხენა Win "
-"ღილაკს."
-
-#: ../rules/base.xml.in.h:321
-msgid "Microsoft Internet Keyboard"
-msgstr "Microsoft Internet Keyboard"
-
-#: ../rules/base.xml.in.h:322
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "Microsoft Internet Keyboard Pro, შვედური"
-
-#: ../rules/base.xml.in.h:323
-msgid "Microsoft Natural"
-msgstr "Microsoft Natural"
-
-#: ../rules/base.xml.in.h:324
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-
-#: ../rules/base.xml.in.h:325
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr "	Microsoft Natural Keyboard Pro OEM"
-
-#: ../rules/base.xml.in.h:326
-msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-
-#: ../rules/base.xml.in.h:327
-msgid "Microsoft Office Keyboard"
-msgstr "Microsoft Office Keyboard"
-
-#: ../rules/base.xml.in.h:328
-msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
-msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
-
-#: ../rules/base.xml.in.h:329
-msgid "Miscellaneous compatibility options"
-msgstr ""
-"თავსებადობის სხვადასხვა "
-"პარამეტრი"
-
-#: ../rules/base.xml.in.h:330
-msgid "Mkd"
-msgstr "მაკ"
-
-#: ../rules/base.xml.in.h:331
-msgid "Mlt"
-msgstr "მალტ"
-
-#: ../rules/base.xml.in.h:332
-msgid "Mmr"
-msgstr "მიან"
-
-#: ../rules/base.xml.in.h:333
-msgid "Mng"
-msgstr "მონღ"
-
-#: ../rules/base.xml.in.h:334
-msgid "Mongolia"
-msgstr "მონღოლეთი"
-
-#: ../rules/base.xml.in.h:335
-msgid "Multilingual"
-msgstr "მრავალენოვანი"
-
-#: ../rules/base.xml.in.h:336
-msgid "Multilingual, first part"
-msgstr ""
-"მრავალენოვანი, პირველი "
-"ნაწილი"
-
-#: ../rules/base.xml.in.h:337
-msgid "Multilingual, second part"
-msgstr ""
-"მრავალენოვანი, მეორე ნაწილი"
-
-#: ../rules/base.xml.in.h:338
-msgid "Myanmar"
-msgstr "მიანმა"
-
-#: ../rules/base.xml.in.h:339
-msgid "Neostyle"
-msgstr "Neostyle"
-
-#: ../rules/base.xml.in.h:340
-msgid "Nep"
-msgstr "ნეპ"
-
-#: ../rules/base.xml.in.h:341
-msgid "Nepal"
-msgstr "ნეპალი"
-
-#: ../rules/base.xml.in.h:342
-msgid "Netherlands"
-msgstr "ნიდერლანდები"
-
-#: ../rules/base.xml.in.h:343
-msgid "Nld"
-msgstr "ჰოლ"
-
-#: ../rules/base.xml.in.h:344
-msgid "Nor"
-msgstr "ნორ"
-
-#: ../rules/base.xml.in.h:345
-msgid "Northern Saami"
-msgstr "ჩრდილოეთ საამური"
-
-#: ../rules/base.xml.in.h:346
-msgid "Northern Saami, eliminate dead keys"
-msgstr ""
-"ჩრდილოეთ საამური, სპეც "
-"ღილაკების (dead keys) გარეშე"
-
-#: ../rules/base.xml.in.h:347
-msgid "Northgate OmniKey 101"
-msgstr "Northgate OmniKey 101"
-
-#: ../rules/base.xml.in.h:348
-msgid "Norway"
-msgstr "ნორვეგია"
-
-#: ../rules/base.xml.in.h:349
-msgid "NumLock LED shows alternative group."
-msgstr ""
-"NumLock-ის ინდიკატორი აჩვენებს "
-"დამატებით ჯგუფს."
-
-#: ../rules/base.xml.in.h:350
-msgid "Numpad keys work as with Mac."
-msgstr ""
-"ციფრული ღილაკები "
-"მოქმედებენ როგორც Mac-ის "
-"კლავიატურაში."
-
-#: ../rules/base.xml.in.h:351
-msgid "Ogham"
-msgstr "ოგხამი"
-
-#: ../rules/base.xml.in.h:352
-msgid "Ogham IS434"
-msgstr "Ogham IS434"
-
-#: ../rules/base.xml.in.h:353
-msgid "Oretec MCK-800 MM/Internet keyboard"
-msgstr "Oretec MCK-800 MM/Internet keyboard"
-
-#: ../rules/base.xml.in.h:354
-msgid "Oriya"
-msgstr "ორია"
-
-#: ../rules/base.xml.in.h:355
-msgid "Ossetian"
-msgstr "ოსური"
-
-#: ../rules/base.xml.in.h:356
-msgid "Ossetian, Winkeys"
-msgstr "ოსური, Windows კლავიატურა"
-
-#: ../rules/base.xml.in.h:357
-msgid "PC-98xx Series"
-msgstr "PC-98xx Series"
-
-#: ../rules/base.xml.in.h:358
-msgid "Pak"
-msgstr "პაკ"
-
-#: ../rules/base.xml.in.h:359
-msgid "Pakistan"
-msgstr "პაკისტანი"
-
-#: ../rules/base.xml.in.h:360
-msgid "Pashto"
-msgstr "პაშტო"
-
-#: ../rules/base.xml.in.h:361
-msgid "Pattachote"
-msgstr "პატაჩოტი"
-
-#: ../rules/base.xml.in.h:362
-msgid "Phonetic"
-msgstr "ფონეტიკური"
-
-#: ../rules/base.xml.in.h:363
-msgid "Pol"
-msgstr "პოლ"
-
-#: ../rules/base.xml.in.h:364
-msgid "Poland"
-msgstr "პოლონეთი"
-
-#: ../rules/base.xml.in.h:365
-msgid "Polytonic"
-msgstr "პოლიფონიური"
-
-#: ../rules/base.xml.in.h:366
-msgid "Portugal"
-msgstr "პორტუგალია"
-
-#: ../rules/base.xml.in.h:367
-msgid "PowerPC PS/2"
-msgstr "PowerPC PS/2"
-
-#: ../rules/base.xml.in.h:368
-msgid "Press Left Alt key to choose 3rd level."
-msgstr ""
-"მე-3 საფეხურის "
-"ამორჩევისთვის, დააჭირეთ "
-"მარცხენა Alt-ს"
-
-#: ../rules/base.xml.in.h:369
-msgid "Press Left Win-key to choose 3rd level."
-msgstr ""
-"მე-3 საფეხურის "
-"ამორჩევისთვის, დააჭირეთ "
-"მარცხენა Win ღილაკს."
-
-#: ../rules/base.xml.in.h:370
-msgid "Press Menu key to choose 3rd level."
-msgstr ""
-"მე-3 საფეხურის "
-"ამორჩევისთვის, დააჭირეთ Menu "
-"ღილაკს."
-
-#: ../rules/base.xml.in.h:371
-msgid ""
-"Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
-msgstr ""
-"მე-3 საფეხურის "
-"ამორჩევისთვის, დააჭირეთ "
-"მარჯვენა Alt ღილაკს. "
-"Shift+მარჯვენა Alt ღილაკი "
-"იმოქმედებენ როგორც Multi_Key."
-
-#: ../rules/base.xml.in.h:372
-msgid "Press Right Alt key to choose 3rd level."
-msgstr ""
-"მე-3 საფეხურის "
-"ამორჩევისთვის, დააჭირეთ "
-"მარჯვენა Alt ღილაკს."
-
-#: ../rules/base.xml.in.h:373
-msgid "Press Right Ctrl to choose 3rd level."
-msgstr ""
-"მე-3 საფეხურის "
-"ამორჩევისთვის, დააჭირეთ "
-"მარჯვენა Ctrl-ს."
-
-#: ../rules/base.xml.in.h:374
-msgid "Press Right Win-key to choose 3rd level."
-msgstr ""
-"მე-3 საფეხურის ამორჩევა "
-"მარჯვენა Win ღილაკის დაჭერით."
-
-#: ../rules/base.xml.in.h:375
-msgid "Press any of Alt keys to choose 3rd level."
-msgstr ""
-"მე-3 საფეხურის ამორჩევა "
-"ნებისმიერი Alt ღილაკის "
-"დაჭერით."
-
-#: ../rules/base.xml.in.h:376
-msgid "Press any of Win-keys to choose 3rd level."
-msgstr ""
-"მე-3 საფეხურის ამორჩევა "
-"ნებისმიერი Win ღილაკის "
-"დაჭერით."
-
-#: ../rules/base.xml.in.h:377
-msgid "Pro"
-msgstr "Pro"
-
-#: ../rules/base.xml.in.h:378
-msgid "Pro Keypad"
-msgstr "Pro დამატებ. პანელით"
-
-#: ../rules/base.xml.in.h:379
-msgid "Probhat"
-msgstr "პრობატი"
-
-#: ../rules/base.xml.in.h:380
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "Propeller Voyager (KTEZ-1000)"
-
-#: ../rules/base.xml.in.h:381
-msgid "Prt"
-msgstr "პორტ"
-
-#: ../rules/base.xml.in.h:382
-msgid "QTronix Scorpius 98N+"
-msgstr "QTronix Scorpius 98N+"
-
-#: ../rules/base.xml.in.h:383
-msgid "R-Alt switches group while pressed."
-msgstr ""
-"მარჯვენა Alt კლავიში ცვლის "
-"ჯგუფს დაჭერილ "
-"მდგომარეობაში."
-
-#: ../rules/base.xml.in.h:384
-msgid "Right Alt is Compose."
-msgstr ""
-"მარჯვენა Alt ღილაკი "
-"შეესაბამება Compose-ს."
-
-#: ../rules/base.xml.in.h:385
-msgid "Right Alt key changes group."
-msgstr ""
-"მარჯვენა Alt ღილაკი ცვლის "
-"ჯგუფს."
-
-#: ../rules/base.xml.in.h:386
-msgid "Right Ctrl is Compose."
-msgstr ""
-"მარჯვენა Ctrl ღილაკი "
-"შეესაბამება Compose-ს."
-
-#: ../rules/base.xml.in.h:387
-msgid "Right Ctrl key changes group."
-msgstr ""
-"მარჯვენა Ctrl ღილაკი ცვლის "
-"ჯგუფს."
-
-#: ../rules/base.xml.in.h:388
-msgid "Right Ctrl key switches group while pressed."
-msgstr ""
-"მარჯვენა Ctrl ღილაკი ცვლის "
-"ჯგუფს დაჭერილ "
-"მდგომარეობაში."
-
-#: ../rules/base.xml.in.h:389
-msgid "Right Ctrl key works as Right Alt."
-msgstr ""
-"მარჯვენა Ctrl ღილაკი მოქმედებს "
-"როგორც მარჯვენა Alt."
-
-#: ../rules/base.xml.in.h:390
-msgid "Right Shift key changes group."
-msgstr ""
-"მარჯვენა Shift ღილაკი ცვლის "
-"ჯგუფს."
-
-#: ../rules/base.xml.in.h:391
-msgid "Right Win-key changes group."
-msgstr ""
-"მარჯვენა Win ღილაკი ცვლის "
-"ჯგუფს."
-
-#: ../rules/base.xml.in.h:392
-msgid "Right Win-key is Compose."
-msgstr ""
-"მარჯვენა Win ღილაკი "
-"შეესაბამება Compose-ს."
-
-#: ../rules/base.xml.in.h:393
-msgid "Right Win-key switches group while pressed."
-msgstr ""
-"მარჯვენა Win ღილაკი ცვლის "
-"ჯგუფს დაჭერილ "
-"მდგომარეობაში."
-
-#: ../rules/base.xml.in.h:394
-msgid "Right handed Dvorak"
-msgstr ""
-"Dvorak კლავიატურა "
-"არა-ცაციებისთვის"
-
-#: ../rules/base.xml.in.h:395
-msgid "Romania"
-msgstr "რუმინეთი"
-
-#: ../rules/base.xml.in.h:396
-msgid "Romanian keyboard with German letters"
-msgstr ""
-"რუმინული კლავიატურა "
-"გერმანული ასოებით"
-
-#: ../rules/base.xml.in.h:397
-msgid "Romanian keyboard with German letters, eliminate dead keys"
-msgstr ""
-"რუმინული კლავიატურა "
-"გერმანული ასოებით, dead keys "
-"გარეშე. "
-
-#: ../rules/base.xml.in.h:398
-msgid "Rou"
-msgstr "რუმ"
-
-#: ../rules/base.xml.in.h:399
-msgid "Rus"
-msgstr "რუს"
-
-#: ../rules/base.xml.in.h:400
-msgid "Russia"
-msgstr "რუსეთი"
-
-#: ../rules/base.xml.in.h:401
-msgid "Russian"
-msgstr "რუსული"
-
-#: ../rules/base.xml.in.h:402
-msgid "Russian phonetic"
-msgstr "რუსული ფონეტიკური"
-
-#: ../rules/base.xml.in.h:403
-msgid "Russian phonetic, eliminate dead keys"
-msgstr ""
-"რუსული ფონეტიკური, სპეც (dead keys) "
-"კლავიშების გარეშე"
-
-#: ../rules/base.xml.in.h:404
-msgid "Russian with Kazakh"
-msgstr "რუსული ყაზახურთან ერთად"
-
-#: ../rules/base.xml.in.h:405
-msgid "SCG"
-msgstr "SCG"
-
-#: ../rules/base.xml.in.h:406
-msgid "SILVERCREST Multimedia Wireless Keyboard"
-msgstr "SILVERCREST Multimedia Wireless Keyboard"
-
-#: ../rules/base.xml.in.h:407
-msgid "SK-1300"
-msgstr "SK-1300"
-
-#: ../rules/base.xml.in.h:408
-msgid "SK-2500"
-msgstr "SK-2500"
-
-#: ../rules/base.xml.in.h:409
-msgid "SK-6200"
-msgstr "SK-6200"
-
-#: ../rules/base.xml.in.h:410
-msgid "SK-7100"
-msgstr "SK-7100"
-
-#: ../rules/base.xml.in.h:411
-msgid "SVEN Ergonomic 2500"
-msgstr "SVEN Ergonomic 2500"
-
-#: ../rules/base.xml.in.h:412
-msgid "Samsung SDM 4500P"
-msgstr "Samsung SDM 4500P"
-
-#: ../rules/base.xml.in.h:413
-msgid "Samsung SDM 4510P"
-msgstr "Samsung SDM 4510P"
-
-#: ../rules/base.xml.in.h:414
-msgid "ScrollLock LED shows alternative group."
-msgstr ""
-"ScrollLock ინდიკატორი ანახებს "
-"ალტერ. ჯგუფს."
-
-#: ../rules/base.xml.in.h:415
-msgid "Serbia and Montenegro"
-msgstr "სერბია და მონტენეგრო"
-
-#: ../rules/base.xml.in.h:416
-msgid "Shift with numpad keys works as in MS Windows."
-msgstr ""
-"Shift ღილაკი ციფრულ "
-"კლავიატურასთან, მუშაობენ "
-"როგორც MS Window-ში."
-
-#: ../rules/base.xml.in.h:417
-msgid "Shift+CapsLock changes group."
-msgstr "Shift+CapsLock ცვლიან ჯგუფს."
-
-#: ../rules/base.xml.in.h:418
-msgid "Slovakia"
-msgstr "სლოვაკეთი"
-
-#: ../rules/base.xml.in.h:419
-msgid "Slovenia"
-msgstr "სლოვენია"
-
-#: ../rules/base.xml.in.h:420
-msgid "South Africa"
-msgstr "სამხრეთ აფრიკა"
-
-#: ../rules/base.xml.in.h:421
-msgid "Southern Uzbek"
-msgstr "სამხრეთ-უზბეკური"
-
-#: ../rules/base.xml.in.h:422
-msgid "Spain"
-msgstr "ესპანეთი"
-
-#: ../rules/base.xml.in.h:423
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
-msgstr ""
-"სპეც კლავიშებს (Ctrl+Alt+&lt;клв&gt;) "
-"სერვერი ამუშავებთ."
-
-#: ../rules/base.xml.in.h:424
-msgid "SrL"
-msgstr "შრლ"
-
-#: ../rules/base.xml.in.h:425
-msgid "Sri Lanka"
-msgstr "შრი-ლანკა"
-
-#: ../rules/base.xml.in.h:426
-msgid "Standard"
-msgstr "სტანდარტული"
-
-#. RSTU 2019-91
-#: ../rules/base.xml.in.h:428
-msgid "Standard RSTU"
-msgstr "სტანდარტული RSTU"
-
-#. RSTU 2019-91
-#: ../rules/base.xml.in.h:430
-msgid "Standard RSTU on Russian layout"
-msgstr ""
-"სტანდარტული RSTU რუსულ "
-"განლაგებაზე"
-
-#: ../rules/base.xml.in.h:431
-msgid "Sun dead keys"
-msgstr "სპეც ღილაკები (dead keys) Sun"
-
-#: ../rules/base.xml.in.h:432
-msgid "Super Power Multimedia Keyboard"
-msgstr "Super Power Multimedia Keyboard"
-
-#: ../rules/base.xml.in.h:433
-msgid "Super is mapped to the Win-keys (default)."
-msgstr ""
-"Super შეესაბამება Win "
-"ღილაკებს.(ნაგულისმევია)"
-
-#: ../rules/base.xml.in.h:434
-msgid "Svk"
-msgstr "სლოვკ"
-
-#: ../rules/base.xml.in.h:435
-msgid "Svn"
-msgstr "სლოვენ"
-
-#: ../rules/base.xml.in.h:436
-msgid "Swap Ctrl and CapsLock."
-msgstr "CapsLock ის Ctrl-ით შეცვლა."
-
-#: ../rules/base.xml.in.h:437
-msgid "Swe"
-msgstr "შვედ"
-
-#: ../rules/base.xml.in.h:438
-msgid "Sweden"
-msgstr "შვედეთი"
-
-#: ../rules/base.xml.in.h:439
-msgid "Switzerland"
-msgstr "შვეიცარია"
-
-#: ../rules/base.xml.in.h:440
-msgid "Symplon PaceBook (tablet PC)"
-msgstr "Symplon PaceBook (tablet PC)"
-
-#: ../rules/base.xml.in.h:441
-msgid "Syr"
-msgstr "სირ"
-
-#: ../rules/base.xml.in.h:442
-msgid "Syria"
-msgstr "სირია"
-
-#: ../rules/base.xml.in.h:443
-msgid "Syriac"
-msgstr "სირიული"
-
-#: ../rules/base.xml.in.h:444
-msgid "Syriac phonetic"
-msgstr "სირიის ფონეტიკური"
-
-#: ../rules/base.xml.in.h:445
-msgid "TIS-820.2538"
-msgstr "TIS-820.2538"
-
-#: ../rules/base.xml.in.h:446
-msgid "Tajikistan"
-msgstr "ტაჯიკეთი"
-
-#: ../rules/base.xml.in.h:447
-msgid "Tamil"
-msgstr "თამილური"
-
-#: ../rules/base.xml.in.h:448
-msgid "Tamil TAB Typewriter"
-msgstr ""
-"თამილური TAB საბეჭდი მანქანა"
-
-#: ../rules/base.xml.in.h:449
-msgid "Tamil TSCII Typewriter"
-msgstr ""
-"თამილური TSCII საბეჭდი მანქანა"
-
-#: ../rules/base.xml.in.h:450
-msgid "Tamil Unicode"
-msgstr "ტამილური უნიკოდი"
-
-#: ../rules/base.xml.in.h:451
-msgid "Tatar"
-msgstr "თათრული"
-
-#: ../rules/base.xml.in.h:452
-msgid "Telugu"
-msgstr "თელუგუ"
-
-#: ../rules/base.xml.in.h:453
-msgid "Tha"
-msgstr "ტაი"
-
-#: ../rules/base.xml.in.h:454
-msgid "Thailand"
-msgstr "ტაილანდი"
-
-#: ../rules/base.xml.in.h:455
-msgid "Third level choosers"
-msgstr "მე-3 საფეხურის ამორჩევა"
-
-#: ../rules/base.xml.in.h:456
-msgid "Tilde (~) variant"
-msgstr "ვარიანტი (~)-ით"
-
-#: ../rules/base.xml.in.h:457
-msgid "Tjk"
-msgstr "ტაჯ"
-
-#: ../rules/base.xml.in.h:458
-msgid "Toshiba Satellite S3000"
-msgstr "Toshiba Satellite S3000"
-
-#: ../rules/base.xml.in.h:459
-msgid "Trust Direct Access Keyboard"
-msgstr "Trust Direct Access Keyboard"
-
-#: ../rules/base.xml.in.h:460
-msgid "Trust Wireless Keyboard Classic"
-msgstr "Trust Wireless Keyboard Classic"
-
-#: ../rules/base.xml.in.h:461
-msgid "Tur"
-msgstr "თურქ"
-
-#: ../rules/base.xml.in.h:462
-msgid "Turkey"
-msgstr "თურქეთი"
-
-#: ../rules/base.xml.in.h:463
-msgid "Typewriter"
-msgstr "საბეჭდი მანქანა"
-
-#: ../rules/base.xml.in.h:464
-msgid "U.S. English"
-msgstr "ინგლისუარი ა.შ.შ"
-
-#: ../rules/base.xml.in.h:465
-msgid "US keyboard with Bosnian digraphs"
-msgstr ""
-"აშშ-ს კლავიატურა ბოსნიური "
-"დიგრაფებით"
-
-#: ../rules/base.xml.in.h:466
-msgid "US keyboard with Bosnian letters"
-msgstr ""
-"აშშ-ს კლავიატურა ბოსნიური "
-"ასოებით"
-
-#: ../rules/base.xml.in.h:467
-msgid "US keyboard with Croatian digraphs"
-msgstr ""
-"აშშ-ს კლავიატურა ხორვატიული "
-"დიგრაფებით"
-
-#: ../rules/base.xml.in.h:468
-msgid "US keyboard with Croatian letters"
-msgstr ""
-"აშშ-ს კლავიატურა ხორვატიული "
-"ასოებით"
-
-#: ../rules/base.xml.in.h:469
-msgid "US keyboard with Lithuanian letters"
-msgstr ""
-"აშშ-ს კლავიატურა ლიტვური "
-"ასოებით"
-
-#: ../rules/base.xml.in.h:470
-msgid "US keyboard with Slovenian digraphs"
-msgstr ""
-"აშშ-ს კლავიატურა სლოვაკური "
-"დიგრაფებით"
-
-#: ../rules/base.xml.in.h:471
-msgid "US keyboard with Slovenian letters"
-msgstr ""
-"აშშ-ს კლავიატურა სლოვაკური "
-"ასოებით"
-
-#: ../rules/base.xml.in.h:472
-msgid "USA"
-msgstr "აშშ"
-
-#: ../rules/base.xml.in.h:473
-msgid "Ukr"
-msgstr "უკრ"
-
-#: ../rules/base.xml.in.h:474
-msgid "Ukraine"
-msgstr "უკრაინა"
-
-#: ../rules/base.xml.in.h:475
-msgid "UnicodeExpert"
-msgstr "UnicodeExpert"
-
-#: ../rules/base.xml.in.h:476
-msgid "United Kingdom"
-msgstr "დიდი ბრიტანეთი"
-
-#: ../rules/base.xml.in.h:477
-msgid "Urdu"
-msgstr "ურდუ"
-
-#: ../rules/base.xml.in.h:478
-msgid "Use Bosnian digraphs"
-msgstr ""
-"ბოსნიური დიგრაფების "
-"გამოყენება"
-
-#: ../rules/base.xml.in.h:479
-msgid "Use Croatian digraphs"
-msgstr ""
-"ხორვატიული დიგრაფების "
-"გამოყენება"
-
-#: ../rules/base.xml.in.h:480
-msgid "Use Slovenian digraphs"
-msgstr ""
-"სლოვენური დიგრაფების "
-"გამოყენება"
-
-#: ../rules/base.xml.in.h:481
-msgid "Use guillemets for quotes"
-msgstr ""
-"ფრანგული ბრჭყალების, "
-"ბრჭყალებად გამოყენება"
-
-#: ../rules/base.xml.in.h:482
-msgid "Use keyboard LED to show alternative group."
-msgstr ""
-"დამატებითი ჯგუფის "
-"საჩვენებლად, კლავიატურის "
-"ინდიკატორის გამოყენება."
-
-#: ../rules/base.xml.in.h:483
-msgid "Uzb"
-msgstr "უზბ"
-
-#: ../rules/base.xml.in.h:484
-msgid "Uzbekistan"
-msgstr "უზბეკეთი"
-
-#: ../rules/base.xml.in.h:485
-msgid "Vietnam"
-msgstr "ვიეტნამი"
-
-#: ../rules/base.xml.in.h:486
-msgid "Vnm"
-msgstr "ვიეტ"
-
-#: ../rules/base.xml.in.h:487
-msgid "Wang model 724 azerty"
-msgstr "Wang model 724 azerty"
-
-#: ../rules/base.xml.in.h:488
-msgid "Winbook Model XP5"
-msgstr "Winbook Model XP5"
-
-#: ../rules/base.xml.in.h:489
-msgid "Winkeys"
-msgstr "Windows კლავიატურა"
-
-#: ../rules/base.xml.in.h:490
-msgid "With &lt;\\|&gt; key"
-msgstr "კლავიშებით &lt;\\|&gt;"
-
-#: ../rules/base.xml.in.h:491
-msgid "With guillemets"
-msgstr "გრანგული ბრჭყალებით"
-
-#: ../rules/base.xml.in.h:492
-msgid "Yahoo! Internet Keyboard"
-msgstr "Yahoo! Internet Keyboard"
-
-#: ../rules/base.xml.in.h:493
-msgid "Z and ZHE swapped"
-msgstr "Z და ZHE გადატანილია"
-
-#: ../rules/base.xml.in.h:494
-msgid "Zar"
-msgstr "უარი"
-
-#: ../rules/base.xml.in.h:495
-msgid "azerty"
-msgstr "azerty"
-
-#: ../rules/base.xml.in.h:496
-msgid "azerty/digits"
-msgstr "zerty/ციფრები"
-
-#: ../rules/base.xml.in.h:497
-msgid "digits"
-msgstr "ციფრები"
-
-#: ../rules/base.xml.in.h:498
-msgid "lyx"
-msgstr "lyx"
-
-#: ../rules/base.xml.in.h:499
-msgid "qwerty"
-msgstr "qwerty"
-
-#: ../rules/base.xml.in.h:500
-msgid "qwerty, extended Backslash"
-msgstr ""
-"qwerty, და Backslash-ის დამატებითი "
-"ფუნქციები"
-
-#: ../rules/base.xml.in.h:501
-msgid "qwerty/digits"
-msgstr "qwerty/ციფრები"
-
-#: ../rules/base.xml.in.h:502
-msgid "qwertz"
-msgstr "qwertz"
-
+# translation of xkeyboard-config.po to Georgian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Vladimer Sichinava <vlsichinava@gmail.com>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-09-17 21:37+0100\n"
+"PO-Revision-Date: 2006-09-20 22:48+0200\n"
+"Last-Translator: Vladimer Sichinava <vlsichinava@gmail.com>\n"
+"Language-Team: Georgian <www.gia.ge>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2
+msgid "101/104 key Compatible"
+msgstr "101/104 ღილაკიანი თავსებადი"
+
+#: ../rules/base.xml.in.h:3
+msgid "101/qwerty/comma/Dead keys"
+msgstr ""
+"pc101, qwerty, მძიმე, სპეც კლავიშები "
+"(dead keys)"
+
+#: ../rules/base.xml.in.h:4
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr ""
+"pc101, qwerty, მძიმე, სპეც კლავიშების "
+"(dead keys) გარეშე"
+
+#: ../rules/base.xml.in.h:5
+msgid "101/qwerty/dot/Dead keys"
+msgstr ""
+"pc101, qwerty, წერტილი, სპეც "
+"კლავიშები (dead keys)"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr ""
+"pc101, qwerty, წერტილი, სპეც "
+"კლავიშები (dead keys) გარეშე"
+
+#: ../rules/base.xml.in.h:7
+msgid "101/qwertz/comma/Dead keys"
+msgstr ""
+"pc101, qwertz, მძიმე, სპეც კლავიშები "
+"(dead keys)"
+
+#: ../rules/base.xml.in.h:8
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr ""
+"pc101, qwertz, მძიმე, სპეც კლავიშების "
+"(dead keys) გარეშე"
+
+#: ../rules/base.xml.in.h:9
+msgid "101/qwertz/dot/Dead keys"
+msgstr ""
+"pc101, qwertz, წერტილი, სპეც "
+"კლავიშები (dead keys)"
+
+#: ../rules/base.xml.in.h:10
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr ""
+"pc101, qwertz, წერტილი, სპეც "
+"კლავიშების (dead keys) გარეშე"
+
+#: ../rules/base.xml.in.h:11
+msgid "102/qwerty/comma/Dead keys"
+msgstr ""
+"pc102, qwerty, მძიმე, სპეც კლავიშები "
+"(dead keys)"
+
+#: ../rules/base.xml.in.h:12
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr ""
+"pc102, qwerty, მძიმე, სპეც კლავიშების "
+"(dead keys) გარეშე"
+
+#: ../rules/base.xml.in.h:13
+msgid "102/qwerty/dot/Dead keys"
+msgstr ""
+"pc102, qwertz, წერტილი, სპეც "
+"კლავიშები (dead keys)"
+
+#: ../rules/base.xml.in.h:14
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr ""
+"pc102, qwerty, წერტილი, სპეც "
+"კლავიშების (dead keys) გარეშე"
+
+#: ../rules/base.xml.in.h:15
+msgid "102/qwertz/comma/Dead keys"
+msgstr ""
+"pc102, qwertz, მძიმე, სპეც კლავიშები "
+"(dead keys)"
+
+#: ../rules/base.xml.in.h:16
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr ""
+"pc102, qwertz, მძიმე, სპეც კლავიშების "
+"(dead keys) გარეშე"
+
+#: ../rules/base.xml.in.h:17
+msgid "102/qwertz/dot/Dead keys"
+msgstr ""
+"pc102, qwertz, წერტილი, სპეც "
+"კლავიშები (dead keys)"
+
+#: ../rules/base.xml.in.h:18
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr ""
+"pc102, qwertz, წერტილი, სპეც "
+"კლავიშების (dead keys) გარეშე"
+
+#: ../rules/base.xml.in.h:19
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:20
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:21
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
+
+#: ../rules/base.xml.in.h:22
+msgid "ACPI Standard"
+msgstr "სტანდარტული ACPI"
+
+#: ../rules/base.xml.in.h:23
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:24
+msgid "Acer C300"
+msgstr "Acer C300"
+
+#: ../rules/base.xml.in.h:25
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
+
+#: ../rules/base.xml.in.h:26
+msgid "Acer TravelMate 800"
+msgstr "Acer TravelMate 800"
+
+#: ../rules/base.xml.in.h:27
+msgid "Add the EuroSign to the 2 key."
+msgstr ""
+"ევროს ნიშნის 2იანის კლავიშზე "
+"დამატება."
+
+#: ../rules/base.xml.in.h:28
+msgid "Add the EuroSign to the 5 key."
+msgstr ""
+"ევროს ნიშნის 5იანის კლავიშზე "
+"დამატება."
+
+#: ../rules/base.xml.in.h:29
+msgid "Add the EuroSign to the E key."
+msgstr ""
+"ევროს ნიშნის E ასოს კლავიშზე "
+"დამატება."
+
+#: ../rules/base.xml.in.h:30
+msgid "Add the standard behavior to Menu key."
+msgstr ""
+"მენიუს კლავიშისთვის "
+"სტანდარტული ქცევის "
+"მინიჭება."
+
+#: ../rules/base.xml.in.h:31
+msgid "Adding the EuroSign to certain keys"
+msgstr ""
+"ევროს ნიშნის ზოგიერთ "
+"კლავიშებზე დამატება"
+
+#: ../rules/base.xml.in.h:32
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../rules/base.xml.in.h:33
+msgid "Afg"
+msgstr "ავღ"
+
+#: ../rules/base.xml.in.h:34
+msgid "Afghanistan"
+msgstr "ავღანეთი"
+
+#: ../rules/base.xml.in.h:35
+msgid "Akan"
+msgstr "აკანი"
+
+#: ../rules/base.xml.in.h:36
+msgid "Alb"
+msgstr "ალბ"
+
+#: ../rules/base.xml.in.h:37
+msgid "Albania"
+msgstr "ალბანეთი"
+
+#: ../rules/base.xml.in.h:38
+msgid "Alt and Meta are on the Alt keys (default)."
+msgstr ""
+"Alt და Meta, Alt ღილაკზე "
+"(ნაგულისხმევია)."
+
+#: ../rules/base.xml.in.h:39
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr ""
+"Alt შეესაბამება მარჯვენა Win "
+"ღილაკს, Super   კი Menu-ს."
+
+#: ../rules/base.xml.in.h:40
+msgid "Alt+CapsLock changes group."
+msgstr "Alt + CapsLock ცვლის ჯგუფს."
+
+#: ../rules/base.xml.in.h:41
+msgid "Alt+Ctrl changes group."
+msgstr "Alt + Ctrl ცვლის ჯგუფს."
+
+#: ../rules/base.xml.in.h:42
+msgid "Alt+Shift changes group."
+msgstr "Alt + Shift ცვლის ჯგუფს."
+
+#: ../rules/base.xml.in.h:43
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:44
+msgid "Alt/Win key behavior"
+msgstr "Alt/Win კლავიშთა ქცევა"
+
+#: ../rules/base.xml.in.h:45
+msgid "Alternative"
+msgstr "ალტერნატიული"
+
+#: ../rules/base.xml.in.h:46
+msgid "Alternative international (former us_intl)"
+msgstr ""
+"ალტერნატიული "
+"ინტერნაციონალური"
+
+#: ../rules/base.xml.in.h:47
+msgid "Alternative, Sun dead keys"
+msgstr ""
+"ალტერნატიული, Sun სპეც "
+"კლავიშებით (dead keys)"
+
+#: ../rules/base.xml.in.h:48
+msgid "Alternative, eliminate dead keys"
+msgstr ""
+"ალტერნატიული, სპეც "
+"კლავიშების (dead keys) გარეშე"
+
+#: ../rules/base.xml.in.h:49
+msgid "And"
+msgstr "ანდ"
+
+#: ../rules/base.xml.in.h:50
+msgid "Andorra"
+msgstr "ანდორა"
+
+#: ../rules/base.xml.in.h:51
+msgid "Apostrophe (') variant"
+msgstr "(') აპოსტროფიანი ვარიანტი"
+
+#: ../rules/base.xml.in.h:52
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:53
+msgid "Apple Laptop"
+msgstr "Apple ლეპტოპი"
+
+#: ../rules/base.xml.in.h:54
+msgid "Ara"
+msgstr "არა"
+
+#: ../rules/base.xml.in.h:55
+msgid "Arabic"
+msgstr "არაბული"
+
+#: ../rules/base.xml.in.h:56
+msgid "Arm"
+msgstr "სომხ"
+
+#: ../rules/base.xml.in.h:57
+msgid "Armenia"
+msgstr "სომხეთი"
+
+#: ../rules/base.xml.in.h:58
+msgid "Aze"
+msgstr "აზერ"
+
+#: ../rules/base.xml.in.h:59
+msgid "Azerbaijan"
+msgstr "აზერბაიჯანი"
+
+#: ../rules/base.xml.in.h:60
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 wireless Internet Keyboard"
+
+#: ../rules/base.xml.in.h:61
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:62
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: ../rules/base.xml.in.h:63
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:64
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:65
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:66
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:67
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
+
+#: ../rules/base.xml.in.h:68
+msgid "Ban"
+msgstr "ბან"
+
+#: ../rules/base.xml.in.h:69
+msgid "Bangladesh"
+msgstr "ბანგლადეში"
+
+#: ../rules/base.xml.in.h:70
+msgid "Bel"
+msgstr "ბელ"
+
+#: ../rules/base.xml.in.h:71
+msgid "Belarus"
+msgstr "ბელორუსია"
+
+#: ../rules/base.xml.in.h:72
+msgid "Belgium"
+msgstr "ბელგია"
+
+#: ../rules/base.xml.in.h:73
+msgid "Bengali"
+msgstr "ბენგალი"
+
+#: ../rules/base.xml.in.h:74
+msgid "Bengali Probhat"
+msgstr "ბენგალის პრობატი"
+
+#: ../rules/base.xml.in.h:75
+msgid "Bgr"
+msgstr "ბოლგ"
+
+#: ../rules/base.xml.in.h:76
+msgid "Bhu"
+msgstr "ბუტ"
+
+#: ../rules/base.xml.in.h:77
+msgid "Bhutan"
+msgstr "ბუტანი"
+
+#: ../rules/base.xml.in.h:78
+msgid "Bih"
+msgstr "ბოსნ"
+
+#: ../rules/base.xml.in.h:79
+msgid "Blr"
+msgstr "ბელ"
+
+#: ../rules/base.xml.in.h:80
+msgid "Bosnia and Herzegovina"
+msgstr "ბოსნია და ჰერცოგოვინა"
+
+#: ../rules/base.xml.in.h:81
+msgid "Both Alt keys together change group."
+msgstr ""
+"ორივე Alt ღილაკი ერთად ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:82
+msgid "Both Ctrl keys together change group."
+msgstr ""
+"ორივე Ctrl ღილაკი ერთად ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:83
+msgid "Both Shift keys together change group."
+msgstr ""
+"ორივე Shift ღილაკი ერთად ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:84
+msgid "Both Win-keys switch group while pressed."
+msgstr ""
+"ორივე Win ღილაკი ერთად ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:85
+msgid "Bra"
+msgstr "ბრაზ"
+
+#: ../rules/base.xml.in.h:86
+msgid "Brazil"
+msgstr "ბრაზილია"
+
+#: ../rules/base.xml.in.h:87
+msgid "Brazilian ABNT2"
+msgstr "ბრაზილიური ABNT2"
+
+#: ../rules/base.xml.in.h:88
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
+
+#: ../rules/base.xml.in.h:89
+msgid "Bulgaria"
+msgstr "ბულგარეთი"
+
+#: ../rules/base.xml.in.h:90
+msgid "Cambodia"
+msgstr "კამბოჯა"
+
+#: ../rules/base.xml.in.h:91
+msgid "Can"
+msgstr "კან"
+
+#: ../rules/base.xml.in.h:92
+msgid "Canada"
+msgstr "კანადა"
+
+#: ../rules/base.xml.in.h:93
+msgid "Caps Lock is Compose."
+msgstr ""
+"ღილაკი 	Caps Lock შეესაბამება Compose-ს."
+
+#: ../rules/base.xml.in.h:94
+msgid "CapsLock LED shows alternative group."
+msgstr ""
+"CapsLock-ის ინდიკატორი აჩვენებს "
+"დამატებით ჯგუფებს."
+
+#: ../rules/base.xml.in.h:95
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+msgstr ""
+"მუშაობს როგორც დაბლოკილი Shift, "
+"ის აყოვნებს CapsLock-ის "
+"მოქმედებას."
+
+#: ../rules/base.xml.in.h:96
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+msgstr ""
+"მუშაობს როგორც დაბლოკილი Shift, "
+"ის არ აყოვნებს CapsLock-ის "
+"მოქმედებას."
+
+#: ../rules/base.xml.in.h:97
+msgid "CapsLock just locks the Shift modifier."
+msgstr ""
+"CapsLock-ი ბლოკავს Shift "
+"მოდიფიკატორს."
+
+#: ../rules/base.xml.in.h:98
+msgid "CapsLock key behavior"
+msgstr "CapsLock ღილაკის ქცევა"
+
+#: ../rules/base.xml.in.h:99
+msgid "CapsLock key changes group."
+msgstr "CapsLock ღილაკი ცვლის ჯგუფს."
+
+#: ../rules/base.xml.in.h:100
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr ""
+"CapsLock რთავს Shift-ს, ეხება ყველა "
+"ღილაკს."
+
+#: ../rules/base.xml.in.h:101
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr ""
+"CapsLock რთავს ალფავიტის "
+"სიმბოლოების უბრალო "
+"კაპიტალიზაციას."
+
+#: ../rules/base.xml.in.h:102
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+msgstr ""
+"რთავს შიდა კაპიტალიზაციას. "
+"Shift აყოვნებს CapsLock-ს. "
+
+#: ../rules/base.xml.in.h:103
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+msgstr ""
+"რთავს შიდა კაპიტალიზაციას. "
+"Shift არ ეხება CapsLock-ს. "
+
+#: ../rules/base.xml.in.h:104
+msgid "Catalan variant with middle-dot L"
+msgstr "კატალანური საშუალო L-ით"
+
+#: ../rules/base.xml.in.h:105
+msgid "Che"
+msgstr "შვეიც"
+
+#: ../rules/base.xml.in.h:106
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:107
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr ""
+"Cherry Blue Line CyBo@rd (ალტერნატიული "
+"ვარიანტი)"
+
+#: ../rules/base.xml.in.h:108
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:109
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:110
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard"
+
+#: ../rules/base.xml.in.h:111
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:112
+msgid "Classic Dvorak"
+msgstr "კლასიკური Dvorak"
+
+#: ../rules/base.xml.in.h:113
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:114
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
+
+#: ../rules/base.xml.in.h:115
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 ღილაკიანი)"
+
+#: ../rules/base.xml.in.h:116
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 ღილაკიანი)"
+
+#: ../rules/base.xml.in.h:117
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 ღილაკიანი)"
+
+#: ../rules/base.xml.in.h:118
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
+
+#: ../rules/base.xml.in.h:119
+msgid "Compose key position"
+msgstr "Compose კლავიშის პოზიცია"
+
+#: ../rules/base.xml.in.h:120
+msgid "Congo, Democratic Republic of the"
+msgstr ""
+"კონგოს დემოკრატიული "
+"რესპუბლიკა"
+
+#: ../rules/base.xml.in.h:121
+msgid "Croatia"
+msgstr "ხორვატია"
+
+#: ../rules/base.xml.in.h:122
+msgid "Ctrl key at bottom left"
+msgstr "Ctrl ღილაკი ქვემოთ მარცხნივ"
+
+#: ../rules/base.xml.in.h:123
+msgid "Ctrl key at left of 'A'"
+msgstr "Ctrl ღილაკი A ასოს მარცხნივ"
+
+#: ../rules/base.xml.in.h:124
+msgid "Ctrl key position"
+msgstr ""
+"Ctrl ღილაკის ადგილმდებარეობა"
+
+#: ../rules/base.xml.in.h:125
+msgid "Ctrl+Shift changes group."
+msgstr "Ctrl Shift ცვლის ჯგუფს."
+
+#: ../rules/base.xml.in.h:126
+msgid "Cyrillic"
+msgstr "კირილიცა"
+
+#: ../rules/base.xml.in.h:127
+msgid "Cze"
+msgstr "ჩეხ"
+
+#: ../rules/base.xml.in.h:128
+msgid "Czechia"
+msgstr "ჩეხეთი"
+
+#: ../rules/base.xml.in.h:129
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:130
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:131
+msgid "Dead acute"
+msgstr "სპეც. სიმბოლო Dead acute"
+
+#: ../rules/base.xml.in.h:132
+msgid "Dead grave acute"
+msgstr "სპეც. სიმბოლო Dead grave acute"
+
+#: ../rules/base.xml.in.h:133
+msgid "Default numpad keys."
+msgstr ""
+"სტანდარტული ციფრული "
+"კლავიშები"
+
+#: ../rules/base.xml.in.h:134
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:135
+msgid "Dell 101-key PC"
+msgstr "Dell 101-კლავიშიანი PC"
+
+#: ../rules/base.xml.in.h:136
+msgid "Dell Latitude series laptop"
+msgstr "Dell Latitude series laptop"
+
+#: ../rules/base.xml.in.h:137
+msgid "Dell USB Multimedia Keybard"
+msgstr "Dell USB Multimedia Keybard"
+
+#: ../rules/base.xml.in.h:138
+msgid "Denmark"
+msgstr "დანია"
+
+#: ../rules/base.xml.in.h:139
+msgid "Deu"
+msgstr "გერ"
+
+#: ../rules/base.xml.in.h:140
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:141
+msgid "Diamond 9801 / 9802 series"
+msgstr "მოდელები Diamond 9801 / 9802 series"
+
+#: ../rules/base.xml.in.h:142
+msgid "Dnk"
+msgstr "დან"
+
+#: ../rules/base.xml.in.h:143
+msgid "Dvorak"
+msgstr "დვორაკული"
+
+#: ../rules/base.xml.in.h:144
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr ""
+"Dvorak, პოლონური ფრჩხილები \"1/!\" "
+"ღილაკზეა"
+
+#: ../rules/base.xml.in.h:145
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr ""
+"Dvorak, პოლონური ფრჩხილები, "
+"ფრჩხილების კლავიშზე"
+
+#: ../rules/base.xml.in.h:146
+msgid "Eliminate dead keys"
+msgstr ""
+"სპეც ღილაკების (dead keys) გამორთვა"
+
+#: ../rules/base.xml.in.h:147
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:148
+msgid "Epo"
+msgstr "ეპო"
+
+#: ../rules/base.xml.in.h:149
+msgid "Esp"
+msgstr "ესპ"
+
+#: ../rules/base.xml.in.h:150
+msgid "Esperanto"
+msgstr "ესპერანტო"
+
+#: ../rules/base.xml.in.h:151
+msgid "Est"
+msgstr "ესტ"
+
+#: ../rules/base.xml.in.h:152
+msgid "Estonia"
+msgstr "ესტონეთი"
+
+#: ../rules/base.xml.in.h:153
+msgid "Evdev-managed keyboard"
+msgstr "Evdev-managed keyboard"
+
+#: ../rules/base.xml.in.h:154
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:155
+msgid "Ewe"
+msgstr "ივი"
+
+#: ../rules/base.xml.in.h:156
+msgid "Extended"
+msgstr "გაფართოებული"
+
+#: ../rules/base.xml.in.h:157
+msgid "Extended Backslash"
+msgstr ""
+"Backslash გაფართოებული ფუნქციები"
+
+#: ../rules/base.xml.in.h:158
+msgid "F-letter (F) variant"
+msgstr "F-ს ვარიანტი"
+
+#: ../rules/base.xml.in.h:159
+msgid "Fao"
+msgstr "ფარ"
+
+#: ../rules/base.xml.in.h:160
+msgid "Faroe Islands"
+msgstr "ფარერის კუნძულები"
+
+#: ../rules/base.xml.in.h:161
+msgid "Fin"
+msgstr "ფინ"
+
+#: ../rules/base.xml.in.h:162
+msgid "Finland"
+msgstr "ფინეთი"
+
+#: ../rules/base.xml.in.h:163
+msgid "Fra"
+msgstr "ფრა"
+
+#: ../rules/base.xml.in.h:164
+msgid "France"
+msgstr "საფრანგეთი"
+
+#: ../rules/base.xml.in.h:165
+msgid "French"
+msgstr "ფრანგული"
+
+#: ../rules/base.xml.in.h:166
+msgid "French (Macintosh)"
+msgstr "ფრანგული (Macintosh)"
+
+#: ../rules/base.xml.in.h:167
+msgid "French (legacy)"
+msgstr "ფრანგული (legacy)"
+
+#: ../rules/base.xml.in.h:168
+msgid "French Dvorak"
+msgstr "ფრანგული Dvorak"
+
+#: ../rules/base.xml.in.h:169
+msgid "French, Sun dead keys"
+msgstr "ფრანგული, Sun dead keys"
+
+#: ../rules/base.xml.in.h:170
+msgid "French, eliminate dead keys"
+msgstr "ფრანგული, dead keys გარეშე"
+
+#: ../rules/base.xml.in.h:171
+msgid "Fula"
+msgstr "ფულა"
+
+#: ../rules/base.xml.in.h:172
+msgid "GBr"
+msgstr "ბრიტ"
+
+#: ../rules/base.xml.in.h:173
+msgid "Ga"
+msgstr "გა"
+
+#: ../rules/base.xml.in.h:174
+msgid "Generic 101-key PC"
+msgstr "სტანდარტული 101-ღილაკიანი PC"
+
+#: ../rules/base.xml.in.h:175
+msgid "Generic 102-key (Intl) PC"
+msgstr ""
+"სტანდარტული 102-ღილაკიანი (Intl) PC"
+
+#: ../rules/base.xml.in.h:176
+msgid "Generic 104-key PC"
+msgstr "სტანდარტული 104-ღილაკიანი PC"
+
+#: ../rules/base.xml.in.h:177
+msgid "Generic 105-key (Intl) PC"
+msgstr ""
+"სტანდარტული 105-ღილაკიანი (Intl) PC"
+
+#: ../rules/base.xml.in.h:178
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:179
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+
+#: ../rules/base.xml.in.h:180
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:181
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:182
+msgid "Geo"
+msgstr "ქართ"
+
+#: ../rules/base.xml.in.h:183
+msgid "Georgia"
+msgstr "საქართველო"
+
+#: ../rules/base.xml.in.h:184
+msgid "German (Macintosh)"
+msgstr "გერმანული (Macintosh)"
+
+#: ../rules/base.xml.in.h:185
+msgid "German, Sun dead keys"
+msgstr "გერმანული, Sun dead keys"
+
+#: ../rules/base.xml.in.h:186
+msgid "German, eliminate dead keys"
+msgstr "გერმანული, სპეც dead keys გარეშე"
+
+#: ../rules/base.xml.in.h:187
+msgid "Germany"
+msgstr "გერმანია"
+
+#: ../rules/base.xml.in.h:188
+msgid "Gha"
+msgstr "გან"
+
+#: ../rules/base.xml.in.h:189
+msgid "Ghana"
+msgstr "განა"
+
+#: ../rules/base.xml.in.h:190
+msgid "Gre"
+msgstr "საბ"
+
+#: ../rules/base.xml.in.h:191
+msgid "Greece"
+msgstr "საბერძნეთი"
+
+#: ../rules/base.xml.in.h:192
+msgid "Group Shift/Lock behavior"
+msgstr ""
+"განლაგების შეცვლის ფუნქცია"
+
+#: ../rules/base.xml.in.h:193
+msgid "Gujarati"
+msgstr "გუჯარათი"
+
+#: ../rules/base.xml.in.h:194
+msgid "Gurmukhi"
+msgstr "გურმუხი"
+
+#: ../rules/base.xml.in.h:195
+msgid "Gyration"
+msgstr "გირაშნ"
+
+#: ../rules/base.xml.in.h:196
+msgid "Hausa"
+msgstr "ჰაუსა"
+
+#: ../rules/base.xml.in.h:197
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
+
+#: ../rules/base.xml.in.h:198
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:199
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:200
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:201
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:202
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:203
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:204
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:205
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:206
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
+
+#: ../rules/base.xml.in.h:207
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:208
+msgid "Hrv"
+msgstr "ხორ"
+
+#: ../rules/base.xml.in.h:209
+msgid "Hun"
+msgstr "უნგ"
+
+#: ../rules/base.xml.in.h:210
+msgid "Hungary"
+msgstr "უნგრეთი"
+
+#: ../rules/base.xml.in.h:211
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper შეესაბამება Win ღილაკებს."
+
+#: ../rules/base.xml.in.h:212
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:213
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:214
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:215
+msgid "IBM Rapid Access II (alternate option)"
+msgstr ""
+"IBM Rapid Access II (ალტერნატიული "
+"ვარიანტი)"
+
+#: ../rules/base.xml.in.h:216
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:217
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+
+#: ../rules/base.xml.in.h:218
+msgid "ISO Alternate"
+msgstr "დამატებითი ISO"
+
+#: ../rules/base.xml.in.h:219
+msgid "Iceland"
+msgstr "ისლანდია"
+
+#: ../rules/base.xml.in.h:220
+msgid "Ind"
+msgstr "ინდ"
+
+#: ../rules/base.xml.in.h:221
+msgid "India"
+msgstr "ინდოეთი"
+
+#: ../rules/base.xml.in.h:222
+msgid "International (with dead keys)"
+msgstr ""
+"საერთაშორისო, სპეც "
+"ღილაკებით (dead keys)"
+
+#: ../rules/base.xml.in.h:223
+msgid "Inuktitut"
+msgstr "ინუკტიტუტი"
+
+#: ../rules/base.xml.in.h:224
+msgid "Iran"
+msgstr "ირანი"
+
+#: ../rules/base.xml.in.h:225
+msgid "Iraq"
+msgstr "ერაყი"
+
+#: ../rules/base.xml.in.h:226
+msgid "Ireland"
+msgstr "ირლანდია"
+
+#: ../rules/base.xml.in.h:227
+msgid "Irl"
+msgstr "ირლ"
+
+#: ../rules/base.xml.in.h:228
+msgid "Irn"
+msgstr "ირა"
+
+#: ../rules/base.xml.in.h:229
+msgid "Irq"
+msgstr "ერა"
+
+#: ../rules/base.xml.in.h:230
+msgid "Isl"
+msgstr "ისლ"
+
+#: ../rules/base.xml.in.h:231
+msgid "Isr"
+msgstr "ებრ"
+
+#: ../rules/base.xml.in.h:232
+msgid "Israel"
+msgstr "ისრაელი"
+
+#: ../rules/base.xml.in.h:233
+msgid "Ita"
+msgstr "იტა"
+
+#: ../rules/base.xml.in.h:234
+msgid "Italy"
+msgstr "იტალია"
+
+#: ../rules/base.xml.in.h:235
+msgid "Japan"
+msgstr "იაპონია"
+
+#: ../rules/base.xml.in.h:236
+msgid "Japan (PC-98xx Series)"
+msgstr "Japan (PC-98xx Series)"
+
+#: ../rules/base.xml.in.h:237
+msgid "Japanese 106-key"
+msgstr "იაპონია 106-ღილაკიანი"
+
+#: ../rules/base.xml.in.h:238
+msgid "Jpn"
+msgstr "იაპ"
+
+#: ../rules/base.xml.in.h:239
+msgid "Kannada"
+msgstr "კანნადა"
+
+#: ../rules/base.xml.in.h:240
+msgid "Kashubian"
+msgstr "კაშუბიანი"
+
+#: ../rules/base.xml.in.h:241
+msgid "Kaz"
+msgstr "ყაზ"
+
+#: ../rules/base.xml.in.h:242
+msgid "Kazakh with Russian"
+msgstr "ყაზახური რუსულთან"
+
+#: ../rules/base.xml.in.h:243
+msgid "Kazakhstan"
+msgstr "ყაზახეთი"
+
+#: ../rules/base.xml.in.h:244
+msgid "Keypad"
+msgstr "დამატებითი პანელით"
+
+#: ../rules/base.xml.in.h:245
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:246
+msgid "Khm"
+msgstr "კხმ"
+
+#: ../rules/base.xml.in.h:247
+msgid "Kor"
+msgstr "კორ"
+
+#: ../rules/base.xml.in.h:248
+msgid "Korea, Republic of"
+msgstr "კორეა, რესპუბლიკა"
+
+#: ../rules/base.xml.in.h:249
+msgid "Korean 106-key"
+msgstr "კორეული 106-ღილაკიანი"
+
+#: ../rules/base.xml.in.h:250
+msgid "Kotoistus"
+msgstr "Kotoistus"
+
+#: ../rules/base.xml.in.h:251
+msgid "Kurdish, (F)"
+msgstr "ქურთული, (F)"
+
+#: ../rules/base.xml.in.h:252
+msgid "Kurdish, Arabic-Latin"
+msgstr "ქურთული, არაბულ-ლათინური"
+
+#: ../rules/base.xml.in.h:253
+msgid "Kurdish, Latin Alt-Q"
+msgstr "ქურთული, ლათინური Alt-Q"
+
+#: ../rules/base.xml.in.h:254
+msgid "Kurdish, Latin Q"
+msgstr "ქურთული, ლათინური Q"
+
+#: ../rules/base.xml.in.h:255
+msgid "Kyr"
+msgstr "ყირ"
+
+#: ../rules/base.xml.in.h:256
+msgid "Kyrgyzstan"
+msgstr "ყირღიზეთი"
+
+#: ../rules/base.xml.in.h:257
+msgid "LAm"
+msgstr "ლათამ"
+
+#: ../rules/base.xml.in.h:258
+msgid "Lao"
+msgstr "ლაოსური"
+
+#: ../rules/base.xml.in.h:259
+msgid "Laos"
+msgstr "ლაოსი"
+
+#: ../rules/base.xml.in.h:260
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr ""
+"Compaq ლეპტოპ/ნოუთბუქის "
+"კლავიატურა (მაგ. Armada)"
+
+#: ../rules/base.xml.in.h:261
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr ""
+"Compaq ლეპტოპ/ნოუთბუქის "
+"კლავიატურა (მაგ. Presario)"
+
+#: ../rules/base.xml.in.h:262
+msgid "Laptop/notebook Dell Inspiron 6xxx/8xxx"
+msgstr "ლეპტოპ/ნოუთბუქი Dell Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:263
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "ლეპტოპ/ნოუთბუქი eMachines m68xx"
+
+#: ../rules/base.xml.in.h:264
+msgid "Latin"
+msgstr "ლათინური"
+
+#: ../rules/base.xml.in.h:265
+msgid "Latin American"
+msgstr "ლათინურ ამერიკული"
+
+#: ../rules/base.xml.in.h:266
+msgid "Latin Unicode"
+msgstr "ლათინური უნიკოდი"
+
+#: ../rules/base.xml.in.h:267
+msgid "Latin Unicode qwerty"
+msgstr "ლათინური უნიკოდი qwerty"
+
+#: ../rules/base.xml.in.h:268
+msgid "Latin qwerty"
+msgstr "ლათინური qwerty"
+
+#: ../rules/base.xml.in.h:269
+msgid "Latin with guillemets"
+msgstr ""
+"ლათინური ფრანგული "
+"ბრჭყალებით"
+
+#: ../rules/base.xml.in.h:270
+msgid "Latvia"
+msgstr "ლატვია"
+
+#: ../rules/base.xml.in.h:271
+msgid "Left Alt is swapped with left Win-key."
+msgstr ""
+"მარცხენა Alt-ი შეცვლილია Win "
+"ღილაკით"
+
+#: ../rules/base.xml.in.h:272
+msgid "Left Alt key changes group."
+msgstr ""
+"მარცხენა Alt ღილაკი ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:273
+msgid "Left Alt key switches group while pressed."
+msgstr ""
+"მარცხენა Alt ღილაკი ცვლის "
+"ჯგუფს დაჭერის დროს."
+
+#: ../rules/base.xml.in.h:274
+msgid "Left Ctrl key changes group."
+msgstr ""
+"მარცხენა Alt ღილაკი ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:275
+msgid "Left Shift key changes group."
+msgstr ""
+"მარცხენა Shift ღილაკი ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:276
+msgid "Left Win-key changes group."
+msgstr ""
+"მარცხენა Win ღილაკი ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:277
+msgid "Left Win-key is Compose."
+msgstr ""
+"მარცხენა Win ღილაკი "
+"შეესაბამება Compose-ს."
+
+#: ../rules/base.xml.in.h:278
+msgid "Left Win-key switches group while pressed."
+msgstr ""
+"მარცხენა Win ღილაკი ცვლის "
+"ჯგუფს დაჭერის დროს."
+
+#: ../rules/base.xml.in.h:279
+msgid "Left handed Dvorak"
+msgstr "Dvorak ცაციებისთვის"
+
+#: ../rules/base.xml.in.h:280
+msgid "Lithuania"
+msgstr "ლიტვა"
+
+#: ../rules/base.xml.in.h:281
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
+
+#: ../rules/base.xml.in.h:282
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:283
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:284
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:285
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:286
+msgid "Logitech Cordless Desktop Pro"
+msgstr "Logitech Cordless Desktop Pro"
+
+#: ../rules/base.xml.in.h:287
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr ""
+"Logitech Cordless Desktop Pro (ალტერნატიული "
+"ვარიანტი)"
+
+#: ../rules/base.xml.in.h:288
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr ""
+"Logitech Cordless Desktop Pro (ალტერნატიული "
+"ვარიანტი2)"
+
+#: ../rules/base.xml.in.h:289
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:290
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:291
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:292
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: ../rules/base.xml.in.h:293
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
+
+#: ../rules/base.xml.in.h:294
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Keyboard"
+
+#: ../rules/base.xml.in.h:295
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:296
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+
+#: ../rules/base.xml.in.h:297
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
+
+#: ../rules/base.xml.in.h:298
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+
+#: ../rules/base.xml.in.h:299
+msgid "Ltu"
+msgstr "ლიტ"
+
+#: ../rules/base.xml.in.h:300
+msgid "Lva"
+msgstr "ლატვ"
+
+#: ../rules/base.xml.in.h:301
+msgid "Macedonia"
+msgstr "მაკედონია"
+
+#: ../rules/base.xml.in.h:302
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:303
+msgid "Macintosh Old"
+msgstr "Macintosh ძველი"
+
+#: ../rules/base.xml.in.h:304
+msgid "Macintosh layout"
+msgstr "Macintosh-ის განლაგება"
+
+#: ../rules/base.xml.in.h:305
+msgid "Macintosh layout, eliminate dead keys"
+msgstr ""
+"Macintosh-ის განლაგება, სპეც "
+"კლავიშების (dead keys) გარეშე"
+
+#: ../rules/base.xml.in.h:306
+msgid "Make CapsLock an additional Ctrl."
+msgstr ""
+"გამოიყენე CapsLock როგორც "
+"დამატებითი Ctrl კლავიში."
+
+#: ../rules/base.xml.in.h:307
+msgid "Mal"
+msgstr "მალ"
+
+#: ../rules/base.xml.in.h:308
+msgid "Malayalam"
+msgstr "მალაური"
+
+#: ../rules/base.xml.in.h:309
+msgid "Maldives"
+msgstr "მალდივები"
+
+#: ../rules/base.xml.in.h:310
+msgid "Malta"
+msgstr "მალტა"
+
+#: ../rules/base.xml.in.h:311
+msgid "Maltese keyboard with US layout"
+msgstr ""
+"მალტის კლავიატურა აშშ-ს "
+"განლაგებით"
+
+#: ../rules/base.xml.in.h:312
+msgid "Mao"
+msgstr "მაო"
+
+#: ../rules/base.xml.in.h:313
+msgid "Maori"
+msgstr "მაორი"
+
+#: ../rules/base.xml.in.h:314
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:315
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
+
+#: ../rules/base.xml.in.h:316
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:317
+msgid "Menu is Compose."
+msgstr ""
+"Menu ღილაკი შეესაბამება Compose-ის "
+"ღილაკს."
+
+#: ../rules/base.xml.in.h:318
+msgid "Menu key changes group."
+msgstr "Menu-ს ღილაკი ცვლის ჯგუფს."
+
+#: ../rules/base.xml.in.h:319
+msgid "Meta is mapped to the Win-keys."
+msgstr ""
+"Мета შეესაბამება Win ღილაკებს."
+
+#: ../rules/base.xml.in.h:320
+msgid "Meta is mapped to the left Win-key."
+msgstr ""
+"Мета შეესაბამება მარცხენა Win "
+"ღილაკს."
+
+#: ../rules/base.xml.in.h:321
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
+
+#: ../rules/base.xml.in.h:322
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, შვედური"
+
+#: ../rules/base.xml.in.h:323
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:324
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:325
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "	Microsoft Natural Keyboard Pro OEM"
+
+#: ../rules/base.xml.in.h:326
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:327
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
+
+#: ../rules/base.xml.in.h:328
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+
+#: ../rules/base.xml.in.h:329
+msgid "Miscellaneous compatibility options"
+msgstr ""
+"თავსებადობის სხვადასხვა "
+"პარამეტრი"
+
+#: ../rules/base.xml.in.h:330
+msgid "Mkd"
+msgstr "მაკ"
+
+#: ../rules/base.xml.in.h:331
+msgid "Mlt"
+msgstr "მალტ"
+
+#: ../rules/base.xml.in.h:332
+msgid "Mmr"
+msgstr "მიან"
+
+#: ../rules/base.xml.in.h:333
+msgid "Mng"
+msgstr "მონღ"
+
+#: ../rules/base.xml.in.h:334
+msgid "Mongolia"
+msgstr "მონღოლეთი"
+
+#: ../rules/base.xml.in.h:335
+msgid "Multilingual"
+msgstr "მრავალენოვანი"
+
+#: ../rules/base.xml.in.h:336
+msgid "Multilingual, first part"
+msgstr ""
+"მრავალენოვანი, პირველი "
+"ნაწილი"
+
+#: ../rules/base.xml.in.h:337
+msgid "Multilingual, second part"
+msgstr ""
+"მრავალენოვანი, მეორე ნაწილი"
+
+#: ../rules/base.xml.in.h:338
+msgid "Myanmar"
+msgstr "მიანმა"
+
+#: ../rules/base.xml.in.h:339
+msgid "Neostyle"
+msgstr "Neostyle"
+
+#: ../rules/base.xml.in.h:340
+msgid "Nep"
+msgstr "ნეპ"
+
+#: ../rules/base.xml.in.h:341
+msgid "Nepal"
+msgstr "ნეპალი"
+
+#: ../rules/base.xml.in.h:342
+msgid "Netherlands"
+msgstr "ნიდერლანდები"
+
+#: ../rules/base.xml.in.h:343
+msgid "Nld"
+msgstr "ჰოლ"
+
+#: ../rules/base.xml.in.h:344
+msgid "Nor"
+msgstr "ნორ"
+
+#: ../rules/base.xml.in.h:345
+msgid "Northern Saami"
+msgstr "ჩრდილოეთ საამური"
+
+#: ../rules/base.xml.in.h:346
+msgid "Northern Saami, eliminate dead keys"
+msgstr ""
+"ჩრდილოეთ საამური, სპეც "
+"ღილაკების (dead keys) გარეშე"
+
+#: ../rules/base.xml.in.h:347
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:348
+msgid "Norway"
+msgstr "ნორვეგია"
+
+#: ../rules/base.xml.in.h:349
+msgid "NumLock LED shows alternative group."
+msgstr ""
+"NumLock-ის ინდიკატორი აჩვენებს "
+"დამატებით ჯგუფს."
+
+#: ../rules/base.xml.in.h:350
+msgid "Numpad keys work as with Mac."
+msgstr ""
+"ციფრული ღილაკები "
+"მოქმედებენ როგორც Mac-ის "
+"კლავიატურაში."
+
+#: ../rules/base.xml.in.h:351
+msgid "Ogham"
+msgstr "ოგხამი"
+
+#: ../rules/base.xml.in.h:352
+msgid "Ogham IS434"
+msgstr "Ogham IS434"
+
+#: ../rules/base.xml.in.h:353
+msgid "Oretec MCK-800 MM/Internet keyboard"
+msgstr "Oretec MCK-800 MM/Internet keyboard"
+
+#: ../rules/base.xml.in.h:354
+msgid "Oriya"
+msgstr "ორია"
+
+#: ../rules/base.xml.in.h:355
+msgid "Ossetian"
+msgstr "ოსური"
+
+#: ../rules/base.xml.in.h:356
+msgid "Ossetian, Winkeys"
+msgstr "ოსური, Windows კლავიატურა"
+
+#: ../rules/base.xml.in.h:357
+msgid "PC-98xx Series"
+msgstr "PC-98xx Series"
+
+#: ../rules/base.xml.in.h:358
+msgid "Pak"
+msgstr "პაკ"
+
+#: ../rules/base.xml.in.h:359
+msgid "Pakistan"
+msgstr "პაკისტანი"
+
+#: ../rules/base.xml.in.h:360
+msgid "Pashto"
+msgstr "პაშტო"
+
+#: ../rules/base.xml.in.h:361
+msgid "Pattachote"
+msgstr "პატაჩოტი"
+
+#: ../rules/base.xml.in.h:362
+msgid "Phonetic"
+msgstr "ფონეტიკური"
+
+#: ../rules/base.xml.in.h:363
+msgid "Pol"
+msgstr "პოლ"
+
+#: ../rules/base.xml.in.h:364
+msgid "Poland"
+msgstr "პოლონეთი"
+
+#: ../rules/base.xml.in.h:365
+msgid "Polytonic"
+msgstr "პოლიფონიური"
+
+#: ../rules/base.xml.in.h:366
+msgid "Portugal"
+msgstr "პორტუგალია"
+
+#: ../rules/base.xml.in.h:367
+msgid "PowerPC PS/2"
+msgstr "PowerPC PS/2"
+
+#: ../rules/base.xml.in.h:368
+msgid "Press Left Alt key to choose 3rd level."
+msgstr ""
+"მე-3 საფეხურის "
+"ამორჩევისთვის, დააჭირეთ "
+"მარცხენა Alt-ს"
+
+#: ../rules/base.xml.in.h:369
+msgid "Press Left Win-key to choose 3rd level."
+msgstr ""
+"მე-3 საფეხურის "
+"ამორჩევისთვის, დააჭირეთ "
+"მარცხენა Win ღილაკს."
+
+#: ../rules/base.xml.in.h:370
+msgid "Press Menu key to choose 3rd level."
+msgstr ""
+"მე-3 საფეხურის "
+"ამორჩევისთვის, დააჭირეთ Menu "
+"ღილაკს."
+
+#: ../rules/base.xml.in.h:371
+msgid ""
+"Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr ""
+"მე-3 საფეხურის "
+"ამორჩევისთვის, დააჭირეთ "
+"მარჯვენა Alt ღილაკს. "
+"Shift+მარჯვენა Alt ღილაკი "
+"იმოქმედებენ როგორც Multi_Key."
+
+#: ../rules/base.xml.in.h:372
+msgid "Press Right Alt key to choose 3rd level."
+msgstr ""
+"მე-3 საფეხურის "
+"ამორჩევისთვის, დააჭირეთ "
+"მარჯვენა Alt ღილაკს."
+
+#: ../rules/base.xml.in.h:373
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr ""
+"მე-3 საფეხურის "
+"ამორჩევისთვის, დააჭირეთ "
+"მარჯვენა Ctrl-ს."
+
+#: ../rules/base.xml.in.h:374
+msgid "Press Right Win-key to choose 3rd level."
+msgstr ""
+"მე-3 საფეხურის ამორჩევა "
+"მარჯვენა Win ღილაკის დაჭერით."
+
+#: ../rules/base.xml.in.h:375
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr ""
+"მე-3 საფეხურის ამორჩევა "
+"ნებისმიერი Alt ღილაკის "
+"დაჭერით."
+
+#: ../rules/base.xml.in.h:376
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr ""
+"მე-3 საფეხურის ამორჩევა "
+"ნებისმიერი Win ღილაკის "
+"დაჭერით."
+
+#: ../rules/base.xml.in.h:377
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:378
+msgid "Pro Keypad"
+msgstr "Pro დამატებ. პანელით"
+
+#: ../rules/base.xml.in.h:379
+msgid "Probhat"
+msgstr "პრობატი"
+
+#: ../rules/base.xml.in.h:380
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:381
+msgid "Prt"
+msgstr "პორტ"
+
+#: ../rules/base.xml.in.h:382
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:383
+msgid "R-Alt switches group while pressed."
+msgstr ""
+"მარჯვენა Alt კლავიში ცვლის "
+"ჯგუფს დაჭერილ "
+"მდგომარეობაში."
+
+#: ../rules/base.xml.in.h:384
+msgid "Right Alt is Compose."
+msgstr ""
+"მარჯვენა Alt ღილაკი "
+"შეესაბამება Compose-ს."
+
+#: ../rules/base.xml.in.h:385
+msgid "Right Alt key changes group."
+msgstr ""
+"მარჯვენა Alt ღილაკი ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:386
+msgid "Right Ctrl is Compose."
+msgstr ""
+"მარჯვენა Ctrl ღილაკი "
+"შეესაბამება Compose-ს."
+
+#: ../rules/base.xml.in.h:387
+msgid "Right Ctrl key changes group."
+msgstr ""
+"მარჯვენა Ctrl ღილაკი ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:388
+msgid "Right Ctrl key switches group while pressed."
+msgstr ""
+"მარჯვენა Ctrl ღილაკი ცვლის "
+"ჯგუფს დაჭერილ "
+"მდგომარეობაში."
+
+#: ../rules/base.xml.in.h:389
+msgid "Right Ctrl key works as Right Alt."
+msgstr ""
+"მარჯვენა Ctrl ღილაკი მოქმედებს "
+"როგორც მარჯვენა Alt."
+
+#: ../rules/base.xml.in.h:390
+msgid "Right Shift key changes group."
+msgstr ""
+"მარჯვენა Shift ღილაკი ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:391
+msgid "Right Win-key changes group."
+msgstr ""
+"მარჯვენა Win ღილაკი ცვლის "
+"ჯგუფს."
+
+#: ../rules/base.xml.in.h:392
+msgid "Right Win-key is Compose."
+msgstr ""
+"მარჯვენა Win ღილაკი "
+"შეესაბამება Compose-ს."
+
+#: ../rules/base.xml.in.h:393
+msgid "Right Win-key switches group while pressed."
+msgstr ""
+"მარჯვენა Win ღილაკი ცვლის "
+"ჯგუფს დაჭერილ "
+"მდგომარეობაში."
+
+#: ../rules/base.xml.in.h:394
+msgid "Right handed Dvorak"
+msgstr ""
+"Dvorak კლავიატურა "
+"არა-ცაციებისთვის"
+
+#: ../rules/base.xml.in.h:395
+msgid "Romania"
+msgstr "რუმინეთი"
+
+#: ../rules/base.xml.in.h:396
+msgid "Romanian keyboard with German letters"
+msgstr ""
+"რუმინული კლავიატურა "
+"გერმანული ასოებით"
+
+#: ../rules/base.xml.in.h:397
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr ""
+"რუმინული კლავიატურა "
+"გერმანული ასოებით, dead keys "
+"გარეშე. "
+
+#: ../rules/base.xml.in.h:398
+msgid "Rou"
+msgstr "რუმ"
+
+#: ../rules/base.xml.in.h:399
+msgid "Rus"
+msgstr "რუს"
+
+#: ../rules/base.xml.in.h:400
+msgid "Russia"
+msgstr "რუსეთი"
+
+#: ../rules/base.xml.in.h:401
+msgid "Russian"
+msgstr "რუსული"
+
+#: ../rules/base.xml.in.h:402
+msgid "Russian phonetic"
+msgstr "რუსული ფონეტიკური"
+
+#: ../rules/base.xml.in.h:403
+msgid "Russian phonetic, eliminate dead keys"
+msgstr ""
+"რუსული ფონეტიკური, სპეც (dead keys) "
+"კლავიშების გარეშე"
+
+#: ../rules/base.xml.in.h:404
+msgid "Russian with Kazakh"
+msgstr "რუსული ყაზახურთან ერთად"
+
+#: ../rules/base.xml.in.h:405
+msgid "SCG"
+msgstr "SCG"
+
+#: ../rules/base.xml.in.h:406
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
+
+#: ../rules/base.xml.in.h:407
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:408
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:409
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:410
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:411
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:412
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:413
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:414
+msgid "ScrollLock LED shows alternative group."
+msgstr ""
+"ScrollLock ინდიკატორი ანახებს "
+"ალტერ. ჯგუფს."
+
+#: ../rules/base.xml.in.h:415
+msgid "Serbia and Montenegro"
+msgstr "სერბია და მონტენეგრო"
+
+#: ../rules/base.xml.in.h:416
+msgid "Shift with numpad keys works as in MS Windows."
+msgstr ""
+"Shift ღილაკი ციფრულ "
+"კლავიატურასთან, მუშაობენ "
+"როგორც MS Window-ში."
+
+#: ../rules/base.xml.in.h:417
+msgid "Shift+CapsLock changes group."
+msgstr "Shift+CapsLock ცვლიან ჯგუფს."
+
+#: ../rules/base.xml.in.h:418
+msgid "Slovakia"
+msgstr "სლოვაკეთი"
+
+#: ../rules/base.xml.in.h:419
+msgid "Slovenia"
+msgstr "სლოვენია"
+
+#: ../rules/base.xml.in.h:420
+msgid "South Africa"
+msgstr "სამხრეთ აფრიკა"
+
+#: ../rules/base.xml.in.h:421
+msgid "Southern Uzbek"
+msgstr "სამხრეთ-უზბეკური"
+
+#: ../rules/base.xml.in.h:422
+msgid "Spain"
+msgstr "ესპანეთი"
+
+#: ../rules/base.xml.in.h:423
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr ""
+"სპეც კლავიშებს (Ctrl+Alt+&lt;клв&gt;) "
+"სერვერი ამუშავებთ."
+
+#: ../rules/base.xml.in.h:424
+msgid "SrL"
+msgstr "შრლ"
+
+#: ../rules/base.xml.in.h:425
+msgid "Sri Lanka"
+msgstr "შრი-ლანკა"
+
+#: ../rules/base.xml.in.h:426
+msgid "Standard"
+msgstr "სტანდარტული"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:428
+msgid "Standard RSTU"
+msgstr "სტანდარტული RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:430
+msgid "Standard RSTU on Russian layout"
+msgstr ""
+"სტანდარტული RSTU რუსულ "
+"განლაგებაზე"
+
+#: ../rules/base.xml.in.h:431
+msgid "Sun dead keys"
+msgstr "სპეც ღილაკები (dead keys) Sun"
+
+#: ../rules/base.xml.in.h:432
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:433
+msgid "Super is mapped to the Win-keys (default)."
+msgstr ""
+"Super შეესაბამება Win "
+"ღილაკებს.(ნაგულისმევია)"
+
+#: ../rules/base.xml.in.h:434
+msgid "Svk"
+msgstr "სლოვკ"
+
+#: ../rules/base.xml.in.h:435
+msgid "Svn"
+msgstr "სლოვენ"
+
+#: ../rules/base.xml.in.h:436
+msgid "Swap Ctrl and CapsLock."
+msgstr "CapsLock ის Ctrl-ით შეცვლა."
+
+#: ../rules/base.xml.in.h:437
+msgid "Swe"
+msgstr "შვედ"
+
+#: ../rules/base.xml.in.h:438
+msgid "Sweden"
+msgstr "შვედეთი"
+
+#: ../rules/base.xml.in.h:439
+msgid "Switzerland"
+msgstr "შვეიცარია"
+
+#: ../rules/base.xml.in.h:440
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:441
+msgid "Syr"
+msgstr "სირ"
+
+#: ../rules/base.xml.in.h:442
+msgid "Syria"
+msgstr "სირია"
+
+#: ../rules/base.xml.in.h:443
+msgid "Syriac"
+msgstr "სირიული"
+
+#: ../rules/base.xml.in.h:444
+msgid "Syriac phonetic"
+msgstr "სირიის ფონეტიკური"
+
+#: ../rules/base.xml.in.h:445
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:446
+msgid "Tajikistan"
+msgstr "ტაჯიკეთი"
+
+#: ../rules/base.xml.in.h:447
+msgid "Tamil"
+msgstr "თამილური"
+
+#: ../rules/base.xml.in.h:448
+msgid "Tamil TAB Typewriter"
+msgstr ""
+"თამილური TAB საბეჭდი მანქანა"
+
+#: ../rules/base.xml.in.h:449
+msgid "Tamil TSCII Typewriter"
+msgstr ""
+"თამილური TSCII საბეჭდი მანქანა"
+
+#: ../rules/base.xml.in.h:450
+msgid "Tamil Unicode"
+msgstr "ტამილური უნიკოდი"
+
+#: ../rules/base.xml.in.h:451
+msgid "Tatar"
+msgstr "თათრული"
+
+#: ../rules/base.xml.in.h:452
+msgid "Telugu"
+msgstr "თელუგუ"
+
+#: ../rules/base.xml.in.h:453
+msgid "Tha"
+msgstr "ტაი"
+
+#: ../rules/base.xml.in.h:454
+msgid "Thailand"
+msgstr "ტაილანდი"
+
+#: ../rules/base.xml.in.h:455
+msgid "Third level choosers"
+msgstr "მე-3 საფეხურის ამორჩევა"
+
+#: ../rules/base.xml.in.h:456
+msgid "Tilde (~) variant"
+msgstr "ვარიანტი (~)-ით"
+
+#: ../rules/base.xml.in.h:457
+msgid "Tjk"
+msgstr "ტაჯ"
+
+#: ../rules/base.xml.in.h:458
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:459
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: ../rules/base.xml.in.h:460
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: ../rules/base.xml.in.h:461
+msgid "Tur"
+msgstr "თურქ"
+
+#: ../rules/base.xml.in.h:462
+msgid "Turkey"
+msgstr "თურქეთი"
+
+#: ../rules/base.xml.in.h:463
+msgid "Typewriter"
+msgstr "საბეჭდი მანქანა"
+
+#: ../rules/base.xml.in.h:464
+msgid "U.S. English"
+msgstr "ინგლისუარი ა.შ.შ"
+
+#: ../rules/base.xml.in.h:465
+msgid "US keyboard with Bosnian digraphs"
+msgstr ""
+"აშშ-ს კლავიატურა ბოსნიური "
+"დიგრაფებით"
+
+#: ../rules/base.xml.in.h:466
+msgid "US keyboard with Bosnian letters"
+msgstr ""
+"აშშ-ს კლავიატურა ბოსნიური "
+"ასოებით"
+
+#: ../rules/base.xml.in.h:467
+msgid "US keyboard with Croatian digraphs"
+msgstr ""
+"აშშ-ს კლავიატურა ხორვატიული "
+"დიგრაფებით"
+
+#: ../rules/base.xml.in.h:468
+msgid "US keyboard with Croatian letters"
+msgstr ""
+"აშშ-ს კლავიატურა ხორვატიული "
+"ასოებით"
+
+#: ../rules/base.xml.in.h:469
+msgid "US keyboard with Lithuanian letters"
+msgstr ""
+"აშშ-ს კლავიატურა ლიტვური "
+"ასოებით"
+
+#: ../rules/base.xml.in.h:470
+msgid "US keyboard with Slovenian digraphs"
+msgstr ""
+"აშშ-ს კლავიატურა სლოვაკური "
+"დიგრაფებით"
+
+#: ../rules/base.xml.in.h:471
+msgid "US keyboard with Slovenian letters"
+msgstr ""
+"აშშ-ს კლავიატურა სლოვაკური "
+"ასოებით"
+
+#: ../rules/base.xml.in.h:472
+msgid "USA"
+msgstr "აშშ"
+
+#: ../rules/base.xml.in.h:473
+msgid "Ukr"
+msgstr "უკრ"
+
+#: ../rules/base.xml.in.h:474
+msgid "Ukraine"
+msgstr "უკრაინა"
+
+#: ../rules/base.xml.in.h:475
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:476
+msgid "United Kingdom"
+msgstr "დიდი ბრიტანეთი"
+
+#: ../rules/base.xml.in.h:477
+msgid "Urdu"
+msgstr "ურდუ"
+
+#: ../rules/base.xml.in.h:478
+msgid "Use Bosnian digraphs"
+msgstr ""
+"ბოსნიური დიგრაფების "
+"გამოყენება"
+
+#: ../rules/base.xml.in.h:479
+msgid "Use Croatian digraphs"
+msgstr ""
+"ხორვატიული დიგრაფების "
+"გამოყენება"
+
+#: ../rules/base.xml.in.h:480
+msgid "Use Slovenian digraphs"
+msgstr ""
+"სლოვენური დიგრაფების "
+"გამოყენება"
+
+#: ../rules/base.xml.in.h:481
+msgid "Use guillemets for quotes"
+msgstr ""
+"ფრანგული ბრჭყალების, "
+"ბრჭყალებად გამოყენება"
+
+#: ../rules/base.xml.in.h:482
+msgid "Use keyboard LED to show alternative group."
+msgstr ""
+"დამატებითი ჯგუფის "
+"საჩვენებლად, კლავიატურის "
+"ინდიკატორის გამოყენება."
+
+#: ../rules/base.xml.in.h:483
+msgid "Uzb"
+msgstr "უზბ"
+
+#: ../rules/base.xml.in.h:484
+msgid "Uzbekistan"
+msgstr "უზბეკეთი"
+
+#: ../rules/base.xml.in.h:485
+msgid "Vietnam"
+msgstr "ვიეტნამი"
+
+#: ../rules/base.xml.in.h:486
+msgid "Vnm"
+msgstr "ვიეტ"
+
+#: ../rules/base.xml.in.h:487
+msgid "Wang model 724 azerty"
+msgstr "Wang model 724 azerty"
+
+#: ../rules/base.xml.in.h:488
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:489
+msgid "Winkeys"
+msgstr "Windows კლავიატურა"
+
+#: ../rules/base.xml.in.h:490
+msgid "With &lt;\\|&gt; key"
+msgstr "კლავიშებით &lt;\\|&gt;"
+
+#: ../rules/base.xml.in.h:491
+msgid "With guillemets"
+msgstr "გრანგული ბრჭყალებით"
+
+#: ../rules/base.xml.in.h:492
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
+
+#: ../rules/base.xml.in.h:493
+msgid "Z and ZHE swapped"
+msgstr "Z და ZHE გადატანილია"
+
+#: ../rules/base.xml.in.h:494
+msgid "Zar"
+msgstr "უარი"
+
+#: ../rules/base.xml.in.h:495
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:496
+msgid "azerty/digits"
+msgstr "zerty/ციფრები"
+
+#: ../rules/base.xml.in.h:497
+msgid "digits"
+msgstr "ციფრები"
+
+#: ../rules/base.xml.in.h:498
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:499
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:500
+msgid "qwerty, extended Backslash"
+msgstr ""
+"qwerty, და Backslash-ის დამატებითი "
+"ფუნქციები"
+
+#: ../rules/base.xml.in.h:501
+msgid "qwerty/digits"
+msgstr "qwerty/ციფრები"
+
+#: ../rules/base.xml.in.h:502
+msgid "qwertz"
+msgstr "qwertz"
+
diff --git a/xorg-server/xkeyboard-config/po/ky.po b/xorg-server/xkeyboard-config/po/ky.po
index b08ebf695..4584c3ea6 100644
--- a/xorg-server/xkeyboard-config/po/ky.po
+++ b/xorg-server/xkeyboard-config/po/ky.po
@@ -1,3017 +1,3017 @@
-# Translation of 'xkeyboard-config' messages to Kirghiz.
-# Copyright (C) 2002 Free Software Foundation, Inc.
-# This file is distributed under the same license as the xkeyboard-config package.
-# Ilyas Bakirov <just_ilyas@yahoo.com>, 2009, 2010
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: xkeyboard-config 1.6.99\n"
-"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2009-09-15 23:31+0100\n"
-"PO-Revision-Date: 2009-09-17 20:10+0600\n"
-"Last-Translator: Ilyas Bakirov <just_ilyas@yahoo.com>\n"
-"Language-Team: Kirghiz <i18n-team-ky-kyrgyz@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Kyrgyz\n"
-"X-Poedit-Country: KYRGYZSTAN\n"
-
-#: ../rules/base.xml.in.h:1
-msgid "(F)"
-msgstr "(F)"
-
-#: ../rules/base.xml.in.h:2
-msgid "(Legacy) Alternative"
-msgstr "(Эскирген) Альтернативдик"
-
-#: ../rules/base.xml.in.h:3
-msgid "(Legacy) Alternative, Sun dead keys"
-msgstr "(Эскирген) Альтернативдик, атайын (dead keys) Sun клавишалары менен"
-
-#: ../rules/base.xml.in.h:4
-msgid "(Legacy) Alternative, eliminate dead keys"
-msgstr "(Эскирген) Альтернативдик, атайын (dead keys) клавишаларсыз"
-
-#: ../rules/base.xml.in.h:5
-msgid "101/104 key Compatible"
-msgstr "101/104 баскычтар менен жарамдуу"
-
-#: ../rules/base.xml.in.h:6
-msgid "101/qwerty/comma/Dead keys"
-msgstr "pc101, qwerty, үтүр, атайын (dead keys) клавишалары менен"
-
-#: ../rules/base.xml.in.h:7
-msgid "101/qwerty/comma/Eliminate dead keys"
-msgstr "pc101, qwerty, үтүр, атайын (dead keys) клавишаларсыз "
-
-#: ../rules/base.xml.in.h:8
-msgid "101/qwerty/dot/Dead keys"
-msgstr "pc101, qwerty, чекит, атайын (dead keys) клавшилары менен"
-
-#: ../rules/base.xml.in.h:9
-msgid "101/qwerty/dot/Eliminate dead keys"
-msgstr "pc101, qwerty, үтур, атайын (dead keys) клавишаларсыз"
-
-#: ../rules/base.xml.in.h:10
-msgid "101/qwertz/comma/Dead keys"
-msgstr "pc101, qwertz, үтур, атайын (dead keys) клавишалары менен"
-
-#: ../rules/base.xml.in.h:11
-msgid "101/qwertz/comma/Eliminate dead keys"
-msgstr "pc101, qwertz, үтүр, атайын (dead keys) клавишаларсыз"
-
-#: ../rules/base.xml.in.h:12
-msgid "101/qwertz/dot/Dead keys"
-msgstr "pc101, qwertz, чекит, атайын (dead keys) клавишалары менен"
-
-#: ../rules/base.xml.in.h:13
-msgid "101/qwertz/dot/Eliminate dead keys"
-msgstr "pc101, qwertz, чекит, атайын (dead keys) клавишаларсыз"
-
-#: ../rules/base.xml.in.h:14
-msgid "102/qwerty/comma/Dead keys"
-msgstr "pc102, qwerty, үтүр, атайын (dead keys) клавишалары менен"
-
-#: ../rules/base.xml.in.h:15
-msgid "102/qwerty/comma/Eliminate dead keys"
-msgstr "pc102, qwerty, үтүр, атаыйн (dead keys) клавишаларсыз"
-
-#: ../rules/base.xml.in.h:16
-msgid "102/qwerty/dot/Dead keys"
-msgstr "pc102, qwerty, чекит, атайын (dead keys) клавишалары менен"
-
-#: ../rules/base.xml.in.h:17
-msgid "102/qwerty/dot/Eliminate dead keys"
-msgstr "pc102, qwerty, чекит, атайын (dead keys) клавишаларсыз"
-
-#: ../rules/base.xml.in.h:18
-msgid "102/qwertz/comma/Dead keys"
-msgstr "pc102, qwertz, үтүр, атайын (dead keys) клавишалары менен"
-
-#: ../rules/base.xml.in.h:19
-msgid "102/qwertz/comma/Eliminate dead keys"
-msgstr "pc102, qwertz, үтур, атайын (dead keys) клавишаларсыз"
-
-#: ../rules/base.xml.in.h:20
-msgid "102/qwertz/dot/Dead keys"
-msgstr "pc102, qwertz, чекит, атайын (dead keys) клавишалары менен"
-
-#: ../rules/base.xml.in.h:21
-msgid "102/qwertz/dot/Eliminate dead keys"
-msgstr "pc102, qwertz, чекит, атайын (dead keys) клавишаларсыз"
-
-#: ../rules/base.xml.in.h:22
-msgid "2"
-msgstr "2"
-
-#: ../rules/base.xml.in.h:23
-msgid "4"
-msgstr "4"
-
-#: ../rules/base.xml.in.h:24
-msgid "5"
-msgstr "5"
-
-#: ../rules/base.xml.in.h:25
-msgid "A4Tech KB-21"
-msgstr "A4Tech KB-21"
-
-#: ../rules/base.xml.in.h:26
-msgid "A4Tech KBS-8"
-msgstr "A4Tech KBS-8"
-
-#: ../rules/base.xml.in.h:27
-msgid "A4Tech Wireless Desktop RFKB-23"
-msgstr "A4Tech Wireless Desktop RFKB-23"
-
-#: ../rules/base.xml.in.h:28
-msgid "ACPI Standard"
-msgstr "ACPI стандарттуу"
-
-#: ../rules/base.xml.in.h:29
-msgid "ATM/phone-style"
-msgstr "Банкомат(ATM)/телефондук стилинде"
-
-#: ../rules/base.xml.in.h:30
-msgid "Acer AirKey V"
-msgstr "Acer AirKey V"
-
-#: ../rules/base.xml.in.h:31
-msgid "Acer C300"
-msgstr "Acer C300"
-
-#: ../rules/base.xml.in.h:32
-msgid "Acer Ferrari 4000"
-msgstr "Acer Ferrari 4000"
-
-#: ../rules/base.xml.in.h:33
-msgid "Acer Laptop"
-msgstr "Acer ноутбугу"
-
-#: ../rules/base.xml.in.h:34
-msgid "Add the standard behavior to Menu key"
-msgstr ""
-
-#: ../rules/base.xml.in.h:35
-msgid "Adding Esperanto circumflexes (supersigno)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:36
-msgid "Adding EuroSign to certain keys"
-msgstr "Белгилүү клавишаларга Евро белгисин кошуу."
-
-#: ../rules/base.xml.in.h:37
-msgid "Advance Scorpius KI"
-msgstr "Advance Scorpius KI"
-
-#: ../rules/base.xml.in.h:38
-msgid "Afg"
-msgstr "Афг"
-
-#: ../rules/base.xml.in.h:39
-msgid "Afghanistan"
-msgstr "Афганистан"
-
-#: ../rules/base.xml.in.h:40
-msgid "Akan"
-msgstr "Акан"
-
-#: ../rules/base.xml.in.h:41
-msgid "Alb"
-msgstr "Алб"
-
-#: ../rules/base.xml.in.h:42
-msgid "Albania"
-msgstr "Албания"
-
-#: ../rules/base.xml.in.h:43
-msgid "Alt and Meta are on Alt keys"
-msgstr "Alt жана Meta Alt клавишаларда"
-
-#: ../rules/base.xml.in.h:44
-msgid "Alt is mapped to Right Win, Super to Menu"
-msgstr "Alt is mapped to Right Win, Super to Menu"
-
-#: ../rules/base.xml.in.h:45
-msgid "Alt+CapsLock"
-msgstr "Alt+CapsLock"
-
-#: ../rules/base.xml.in.h:46
-msgid "Alt+Ctrl"
-msgstr "Alt+Ctrl"
-
-#: ../rules/base.xml.in.h:47
-msgid "Alt+Shift"
-msgstr "Alt+Shift"
-
-#: ../rules/base.xml.in.h:48
-msgid "Alt+Space"
-msgstr "Alt+Боштук"
-
-#: ../rules/base.xml.in.h:49
-msgid "Alt-Q"
-msgstr "Alt-Q"
-
-#: ../rules/base.xml.in.h:50
-msgid "Alt/Win key behavior"
-msgstr "Alt/Win клавишалары"
-
-#: ../rules/base.xml.in.h:51
-msgid "Alternative"
-msgstr "Альтернативдик"
-
-#: ../rules/base.xml.in.h:52
-msgid "Alternative Eastern"
-msgstr "Альтернативдик"
-
-#: ../rules/base.xml.in.h:53
-msgid "Alternative Phonetic"
-msgstr "Альтернативдүү фонетикалык"
-
-#: ../rules/base.xml.in.h:54
-msgid "Alternative international (former us_intl)"
-msgstr "Эларалык Альтернативдик (мурунку us_intl)"
-
-#: ../rules/base.xml.in.h:55
-msgid "Alternative, Sun dead keys"
-msgstr "Альтернативдик, атайын (dead keys) Sun клавишалары менен"
-
-#: ../rules/base.xml.in.h:56
-msgid "Alternative, eliminate dead keys"
-msgstr "Альтернативдик, атайын (dead keys) клавишаларсыз"
-
-#: ../rules/base.xml.in.h:57
-msgid "Alternative, latin-9 only"
-msgstr "Альтернативдик, latin-9 гана"
-
-#: ../rules/base.xml.in.h:58
-msgid "And"
-msgstr "Анд"
-
-#: ../rules/base.xml.in.h:59
-msgid "Andorra"
-msgstr "Андорра"
-
-#: ../rules/base.xml.in.h:60
-msgid "Any Alt key"
-msgstr ""
-
-#: ../rules/base.xml.in.h:61
-msgid "Any Win key"
-msgstr "Каалаган Win клавишасы"
-
-#: ../rules/base.xml.in.h:62
-msgid "Any Win key (while pressed)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:63
-msgid "Apostrophe (') variant"
-msgstr "Вариант апостроф (') менен"
-
-#: ../rules/base.xml.in.h:64
-msgid "Apple"
-msgstr "Apple"
-
-#: ../rules/base.xml.in.h:65
-msgid "Apple Laptop"
-msgstr "Apple Ноутбугу"
-
-#: ../rules/base.xml.in.h:66
-msgid "Ara"
-msgstr "Ара"
-
-#: ../rules/base.xml.in.h:67
-msgid "Arabic"
-msgstr "Араб"
-
-#: ../rules/base.xml.in.h:68
-msgid "Arm"
-msgstr "Арм"
-
-#: ../rules/base.xml.in.h:69
-msgid "Armenia"
-msgstr "Армения"
-
-#: ../rules/base.xml.in.h:70
-msgid "Asturian variant with bottom-dot H and bottom-dot L"
-msgstr ""
-
-#: ../rules/base.xml.in.h:71
-msgid "Asus Laptop"
-msgstr "Asus ноутбугу"
-
-#: ../rules/base.xml.in.h:72
-msgid "At bottom left"
-msgstr "Төмөн сол жакта"
-
-#: ../rules/base.xml.in.h:73
-msgid "At left of 'A'"
-msgstr "'А' клавишанын сол жагында"
-
-#: ../rules/base.xml.in.h:74
-msgid "Aze"
-msgstr "Азр"
-
-#: ../rules/base.xml.in.h:75
-msgid "Azerbaijan"
-msgstr "Азербайджан"
-
-#: ../rules/base.xml.in.h:76
-msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr "Azona RF2300 wireless Internet Keyboard"
-
-#: ../rules/base.xml.in.h:77
-msgid "BTC 5090"
-msgstr "BTC 5090"
-
-#: ../rules/base.xml.in.h:78
-msgid "BTC 5113RF Multimedia"
-msgstr "BTC 5113RF Multimedia"
-
-#: ../rules/base.xml.in.h:79
-msgid "BTC 5126T"
-msgstr "BTC 5126T"
-
-#: ../rules/base.xml.in.h:80
-msgid "BTC 6301URF"
-msgstr "BTC 6301URF"
-
-#: ../rules/base.xml.in.h:81
-msgid "BTC 9000"
-msgstr "BTC 9000"
-
-#: ../rules/base.xml.in.h:82
-msgid "BTC 9000A"
-msgstr "BTC 9000A"
-
-#: ../rules/base.xml.in.h:83
-msgid "BTC 9001AH"
-msgstr "BTC 9001AH"
-
-#: ../rules/base.xml.in.h:84
-msgid "BTC 9019U"
-msgstr "BTC 9019U"
-
-#: ../rules/base.xml.in.h:85
-msgid "BTC 9116U Mini Wireless Internet and Gaming"
-msgstr "BTC 9116U Mini Wireless Internet and Gaming"
-
-#: ../rules/base.xml.in.h:86
-msgid "Baltic+"
-msgstr "Baltic+"
-
-#: ../rules/base.xml.in.h:87
-msgid "Ban"
-msgstr "Бан"
-
-#: ../rules/base.xml.in.h:88
-msgid "Bangladesh"
-msgstr "Бангладеш"
-
-#: ../rules/base.xml.in.h:89
-msgid "Bashkirian"
-msgstr "Башкирдик"
-
-#: ../rules/base.xml.in.h:90
-msgid "Bel"
-msgstr "Бел"
-
-#: ../rules/base.xml.in.h:91
-msgid "Belarus"
-msgstr "Беларусия"
-
-#: ../rules/base.xml.in.h:92
-msgid "Belgium"
-msgstr "Бельгия"
-
-#: ../rules/base.xml.in.h:93
-msgid "BenQ X-Touch"
-msgstr "BenQ X-Touch"
-
-#: ../rules/base.xml.in.h:94
-msgid "BenQ X-Touch 730"
-msgstr "BenQ X-Touch 730"
-
-#: ../rules/base.xml.in.h:95
-msgid "BenQ X-Touch 800"
-msgstr "BenQ X-Touch 800"
-
-#: ../rules/base.xml.in.h:96
-msgid "Bengali"
-msgstr "Бенгальдык"
-
-#: ../rules/base.xml.in.h:97
-msgid "Bengali Probhat"
-msgstr "Бенгальдык Пробат"
-
-#: ../rules/base.xml.in.h:98
-msgid "Bepo, ergonomic, Dvorak way"
-msgstr "Бепо, эргономикалык, Dvorak'ка окшош"
-
-#: ../rules/base.xml.in.h:99
-msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
-msgstr "Бепо, эргономикалык, Dvorak'ка окшош, latin-9 гана"
-
-#: ../rules/base.xml.in.h:100
-msgid "Bgr"
-msgstr "Болг"
-
-#: ../rules/base.xml.in.h:101
-msgid "Bhu"
-msgstr "Бут"
-
-#: ../rules/base.xml.in.h:102
-msgid "Bhutan"
-msgstr "Бутан"
-
-#: ../rules/base.xml.in.h:103
-msgid "Biblical Hebrew (Tiro)"
-msgstr "Библейдик иврит (Tiro)"
-
-#: ../rules/base.xml.in.h:104
-msgid "Bih"
-msgstr "Босн"
-
-#: ../rules/base.xml.in.h:105
-msgid "Blr"
-msgstr "Бел"
-
-#: ../rules/base.xml.in.h:106
-msgid "Bosnia and Herzegovina"
-msgstr "Босния жана Герциговиния"
-
-#: ../rules/base.xml.in.h:107
-msgid "Both Alt keys together"
-msgstr "Эки Alt клавишалары бирге"
-
-#: ../rules/base.xml.in.h:108
-msgid "Both Ctrl keys together"
-msgstr "Эки Ctrl клавишалары бирге"
-
-#: ../rules/base.xml.in.h:109
-msgid "Both Shift keys together"
-msgstr "Эки Shift клавишалары бирге"
-
-#: ../rules/base.xml.in.h:110
-msgid "Bra"
-msgstr "Бра"
-
-#: ../rules/base.xml.in.h:111
-msgid "Braille"
-msgstr "Браиил"
-
-#: ../rules/base.xml.in.h:112
-msgid "Brazil"
-msgstr "Бразилия"
-
-#: ../rules/base.xml.in.h:113
-msgid "Breton"
-msgstr "Бретон"
-
-#: ../rules/base.xml.in.h:114
-msgid "Brl"
-msgstr "Брл"
-
-#: ../rules/base.xml.in.h:115
-msgid "Brother Internet Keyboard"
-msgstr "Brother Internet Keyboard"
-
-#: ../rules/base.xml.in.h:116
-msgid "Buckwalter"
-msgstr "Buckwalter"
-
-#: ../rules/base.xml.in.h:117
-msgid "Bulgaria"
-msgstr "Болгария"
-
-#: ../rules/base.xml.in.h:118
-msgid "CRULP"
-msgstr "CRULP"
-
-#: ../rules/base.xml.in.h:119
-msgid "Cambodia"
-msgstr "Камбоджия"
-
-#: ../rules/base.xml.in.h:120
-msgid "Can"
-msgstr "Кан"
-
-#: ../rules/base.xml.in.h:121
-msgid "Canada"
-msgstr "Канада"
-
-#: ../rules/base.xml.in.h:122
-msgid "Caps Lock"
-msgstr "Caps Lock"
-
-#: ../rules/base.xml.in.h:123
-msgid "CapsLock"
-msgstr "CapsLock"
-
-#: ../rules/base.xml.in.h:124
-msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:125
-msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
-msgstr ""
-
-#: ../rules/base.xml.in.h:126
-msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
-msgstr ""
-
-#: ../rules/base.xml.in.h:127
-msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock"
-msgstr "CapsLock Shift блокировка менен клавишасы катары амал жасайт. Shift CapsLock амалына тоскол болбойт"
-
-#: ../rules/base.xml.in.h:128
-msgid "CapsLock is disabled"
-msgstr "CapsLock иштен чыгарылды"
-
-#: ../rules/base.xml.in.h:129
-msgid "CapsLock key behavior"
-msgstr ""
-
-#: ../rules/base.xml.in.h:130
-msgid "CapsLock toggles Shift so all keys are affected"
-msgstr ""
-
-#: ../rules/base.xml.in.h:131
-msgid "CapsLock toggles normal capitalization of alphabetic characters"
-msgstr ""
-
-#: ../rules/base.xml.in.h:132
-msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
-msgstr "CapsLock ички капитализацыяны ачат. Shift CapsLock амалын токтотот"
-
-#: ../rules/base.xml.in.h:133
-msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
-msgstr "CapsLock ички капитализацыяны ачат. Shift CapsLock амалына таасир тийгизбейт"
-
-#: ../rules/base.xml.in.h:134
-msgid "Catalan variant with middle-dot L"
-msgstr ""
-
-#: ../rules/base.xml.in.h:135
-msgid "Cedilla"
-msgstr "Седиль"
-
-#: ../rules/base.xml.in.h:136
-msgid "Che"
-msgstr "Че"
-
-#: ../rules/base.xml.in.h:137
-msgid "Cherokee"
-msgstr "Чероки"
-
-#: ../rules/base.xml.in.h:138
-msgid "Cherry B.UNLIMITED"
-msgstr "Cherry B.UNLIMITED"
-
-#: ../rules/base.xml.in.h:139
-msgid "Cherry Blue Line CyBo@rd"
-msgstr "Cherry Blue Line CyBo@rd"
-
-#: ../rules/base.xml.in.h:140
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr "Cherry Blue Line CyBo@rd (альтернативдик)"
-
-#: ../rules/base.xml.in.h:141
-msgid "Cherry CyBo@rd USB-Hub"
-msgstr "Cherry CyBo@rd USB-Hub"
-
-#: ../rules/base.xml.in.h:142
-msgid "Cherry CyMotion Expert"
-msgstr "Cherry CyMotion Expert"
-
-#: ../rules/base.xml.in.h:143
-msgid "Cherry CyMotion Master Linux"
-msgstr "Cherry CyMotion Master Linux"
-
-#: ../rules/base.xml.in.h:144
-msgid "Cherry CyMotion Master XPress"
-msgstr "Cherry CyMotion Master XPress"
-
-#: ../rules/base.xml.in.h:145
-msgid "Chicony Internet Keyboard"
-msgstr "Chicony Internet Keyboard"
-
-#: ../rules/base.xml.in.h:146
-msgid "Chicony KB-9885"
-msgstr "Chicony KB-9885"
-
-#: ../rules/base.xml.in.h:147
-msgid "Chicony KU-0108"
-msgstr "Chicony KU-0108"
-
-#: ../rules/base.xml.in.h:148
-msgid "Chicony KU-0420"
-msgstr "Chicony KU-0420"
-
-#: ../rules/base.xml.in.h:149
-msgid "China"
-msgstr "Кытай"
-
-#: ../rules/base.xml.in.h:150
-msgid "Chuvash"
-msgstr "Чуваш"
-
-#: ../rules/base.xml.in.h:151
-msgid "Chuvash Latin"
-msgstr "Чуваш латындык"
-
-#: ../rules/base.xml.in.h:152
-msgid "Classic"
-msgstr "Классикалык"
-
-#: ../rules/base.xml.in.h:153
-msgid "Classic Dvorak"
-msgstr "Классикалык Дровак"
-
-#: ../rules/base.xml.in.h:154
-msgid "Classmate PC"
-msgstr "Classmate PC"
-
-#: ../rules/base.xml.in.h:155
-msgid "CloGaelach"
-msgstr "CloGaelach"
-
-#: ../rules/base.xml.in.h:156
-msgid "Colemak"
-msgstr "Colemak"
-
-#: ../rules/base.xml.in.h:157
-msgid "Compaq Easy Access Keyboard"
-msgstr "Compaq Easy Access Keyboard"
-
-#: ../rules/base.xml.in.h:158
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr "Compaq \"Интернет\" клавиатурасы (13 клавиша менен)"
-
-#: ../rules/base.xml.in.h:159
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr "Compaq \"Интернет\" клавиатурасы (18 клавиша менен)"
-
-#: ../rules/base.xml.in.h:160
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr "Compaq \"Интернет\" клавиатурасы  (7 клавиша менен)"
-
-#: ../rules/base.xml.in.h:161
-msgid "Compaq iPaq Keyboard"
-msgstr "Compaq iPaq Keyboard"
-
-#: ../rules/base.xml.in.h:162
-msgid "Compose key position"
-msgstr ""
-
-#: ../rules/base.xml.in.h:163
-msgid "Congo, Democratic Republic of the"
-msgstr "Конго, Демократикалык республикасы"
-
-#: ../rules/base.xml.in.h:164
-msgid "Control + Alt + Backspace"
-msgstr ""
-
-#: ../rules/base.xml.in.h:165
-msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:166
-msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:167
-msgid "Creative Desktop Wireless 7000"
-msgstr ""
-
-#: ../rules/base.xml.in.h:168
-msgid "Crimean Tatar (Dobruca-1 Q)"
-msgstr "Крым татардык (Dobruca-1 Q)"
-
-#: ../rules/base.xml.in.h:169
-msgid "Crimean Tatar (Dobruca-2 Q)"
-msgstr "Крым татардык (Dobruca-2 Q)"
-
-#: ../rules/base.xml.in.h:170
-msgid "Crimean Tatar (Turkish Alt-Q)"
-msgstr "Крым татардык (түрк Alt-Q)"
-
-#: ../rules/base.xml.in.h:171
-msgid "Crimean Tatar (Turkish F)"
-msgstr "Крым татардык (түрк F)"
-
-#: ../rules/base.xml.in.h:172
-msgid "Crimean Tatar (Turkish Q)"
-msgstr "Крым татардык (түрк Q)"
-
-#: ../rules/base.xml.in.h:173
-msgid "Croatia"
-msgstr "Хорватия"
-
-#: ../rules/base.xml.in.h:174
-msgid "Ctrl key position"
-msgstr "Ctrl клавишанын жайгашуусу"
-
-#: ../rules/base.xml.in.h:175
-msgid "Ctrl+Shift"
-msgstr "Ctrl+Shift"
-
-#: ../rules/base.xml.in.h:176
-msgid "Cyrillic"
-msgstr "Кириллица"
-
-#: ../rules/base.xml.in.h:177
-msgid "Cyrillic with guillemets"
-msgstr ""
-
-#: ../rules/base.xml.in.h:178
-msgid "Cyrillic, Z and ZHE swapped"
-msgstr "Кирилл, З жана Ж орундарын алмаштырган"
-
-#: ../rules/base.xml.in.h:179
-msgid "Cze"
-msgstr "Чех"
-
-#: ../rules/base.xml.in.h:180
-msgid "Czechia"
-msgstr "Чехия"
-
-#: ../rules/base.xml.in.h:181
-msgid "DOS"
-msgstr "DOS"
-
-#: ../rules/base.xml.in.h:182
-msgid "DRC"
-msgstr "DRC"
-
-#: ../rules/base.xml.in.h:183
-msgid "DTK2000"
-msgstr "DTK2000"
-
-#: ../rules/base.xml.in.h:184
-msgid "Dan"
-msgstr "Дан"
-
-#: ../rules/base.xml.in.h:185
-msgid "Dead acute"
-msgstr "Dead acute атайын символу"
-
-#: ../rules/base.xml.in.h:186
-msgid "Dead grave acute"
-msgstr "Dead grave acute атайын символу"
-
-#: ../rules/base.xml.in.h:187
-msgid "Default numeric keypad keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:188
-msgid "Dell"
-msgstr "Dell"
-
-#: ../rules/base.xml.in.h:189
-msgid "Dell 101-key PC"
-msgstr "Dell 101-клавиша менен PC"
-
-#: ../rules/base.xml.in.h:190
-msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
-msgstr "Dell Inspiron 6xxx/8xxx ноутбугу"
-
-#: ../rules/base.xml.in.h:191
-msgid "Dell Laptop/notebook Precision M series"
-msgstr "Dell Precision M сериялуу ноутбугу"
-
-#: ../rules/base.xml.in.h:192
-msgid "Dell Latitude series laptop"
-msgstr "Dell Latitude сериялуу ноутбугу"
-
-#: ../rules/base.xml.in.h:193
-msgid "Dell Precision M65"
-msgstr "Dell Precision M65"
-
-#: ../rules/base.xml.in.h:194
-msgid "Dell SK-8125"
-msgstr "Dell SK-8125"
-
-#: ../rules/base.xml.in.h:195
-msgid "Dell SK-8135"
-msgstr "Dell SK-8135"
-
-#: ../rules/base.xml.in.h:196
-msgid "Dell USB Multimedia Keyboard"
-msgstr "Dell USB Multimedia Keyboard"
-
-#: ../rules/base.xml.in.h:197
-msgid "Denmark"
-msgstr "Дания"
-
-#: ../rules/base.xml.in.h:198
-msgid "Deu"
-msgstr "Нем"
-
-#: ../rules/base.xml.in.h:199
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr "Dexxa Wireless Desktop Keyboard"
-
-#: ../rules/base.xml.in.h:200
-msgid "Diamond 9801 / 9802 series"
-msgstr "Diamond 9801 / 9802 сериялары"
-
-#: ../rules/base.xml.in.h:201
-msgid "Dvorak"
-msgstr "Дровак"
-
-#: ../rules/base.xml.in.h:202
-msgid "Dvorak (UK Punctuation)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:203
-msgid "Dvorak international"
-msgstr ""
-
-#: ../rules/base.xml.in.h:204
-msgid "Dvorak, Polish quotes on key 1"
-msgstr ""
-
-#: ../rules/base.xml.in.h:205
-msgid "Dvorak, Polish quotes on quotemark key"
-msgstr ""
-
-#: ../rules/base.xml.in.h:206
-msgid "E"
-msgstr "E"
-
-#: ../rules/base.xml.in.h:207
-msgid "Eastern"
-msgstr "Чыгыш"
-
-#: ../rules/base.xml.in.h:208
-msgid "Eliminate dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:209
-msgid "Enable extra typographic characters"
-msgstr ""
-
-#: ../rules/base.xml.in.h:210
-msgid "English"
-msgstr "Англис"
-
-#: ../rules/base.xml.in.h:211
-msgid "Ennyah DKB-1008"
-msgstr "Ennyah DKB-1008"
-
-#: ../rules/base.xml.in.h:212
-msgid "Enter on keypad"
-msgstr "Enter сандык клавиатурасында"
-
-#: ../rules/base.xml.in.h:213
-msgid "Epo"
-msgstr "Эсп"
-
-#: ../rules/base.xml.in.h:214
-msgid "Ergonomic"
-msgstr "Ergonomic"
-
-#: ../rules/base.xml.in.h:215
-msgid "Esp"
-msgstr "Исп"
-
-#: ../rules/base.xml.in.h:216
-msgid "Esperanto"
-msgstr "Эсперанто"
-
-#: ../rules/base.xml.in.h:217
-msgid "Est"
-msgstr "Эст"
-
-#: ../rules/base.xml.in.h:218
-msgid "Estonia"
-msgstr "Эстония"
-
-#: ../rules/base.xml.in.h:219
-msgid "Eth"
-msgstr "Эфп"
-
-#: ../rules/base.xml.in.h:220
-msgid "Ethiopia"
-msgstr "Эфиопия"
-
-#: ../rules/base.xml.in.h:221
-msgid "Evdev-managed keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:222
-msgid "Everex STEPnote"
-msgstr "Everex STEPnote"
-
-#: ../rules/base.xml.in.h:223
-msgid "Ewe"
-msgstr "Эве"
-
-#: ../rules/base.xml.in.h:224
-msgid "Extended"
-msgstr "Кеңейтилген"
-
-#: ../rules/base.xml.in.h:225
-msgid "Extended - Winkeys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:226
-msgid "Extended Backslash"
-msgstr ""
-
-#: ../rules/base.xml.in.h:227
-msgid "F-letter (F) variant"
-msgstr ""
-
-#: ../rules/base.xml.in.h:228
-msgid "FL90"
-msgstr "FL90"
-
-#: ../rules/base.xml.in.h:229
-msgid "Fao"
-msgstr "Фар"
-
-#: ../rules/base.xml.in.h:230
-msgid "Faroe Islands"
-msgstr "Фаро аралдары"
-
-#: ../rules/base.xml.in.h:231
-msgid "Fin"
-msgstr "Фин"
-
-#: ../rules/base.xml.in.h:232
-msgid "Finland"
-msgstr "Финляндия"
-
-#. This assumes the KP_ abstract symbols are actually useful for some apps
-#. The description needs to be rewritten
-#: ../rules/base.xml.in.h:235
-msgid "Four-level key with abstract separators"
-msgstr ""
-
-#: ../rules/base.xml.in.h:236
-msgid "Four-level key with comma"
-msgstr ""
-
-#: ../rules/base.xml.in.h:237
-msgid "Four-level key with dot"
-msgstr ""
-
-#: ../rules/base.xml.in.h:238
-msgid "Four-level key with dot, latin-9 restriction"
-msgstr ""
-
-#: ../rules/base.xml.in.h:239
-msgid "Four-level key with momayyez"
-msgstr ""
-
-#: ../rules/base.xml.in.h:240
-msgid "Fra"
-msgstr "Фра"
-
-#: ../rules/base.xml.in.h:241
-msgid "France"
-msgstr "Франция"
-
-#: ../rules/base.xml.in.h:242
-msgid "French"
-msgstr "Француз"
-
-#: ../rules/base.xml.in.h:243
-msgid "French (Macintosh)"
-msgstr "Француз (Macintosh)"
-
-#: ../rules/base.xml.in.h:244
-msgid "French (legacy)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:245
-msgid "French Dvorak"
-msgstr "Француз Dvorak"
-
-#: ../rules/base.xml.in.h:246
-msgid "French, Sun dead keys"
-msgstr "Француз,атайын (dead keys) Sun клавишалары менен"
-
-#: ../rules/base.xml.in.h:247
-msgid "French, eliminate dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:248
-msgid "Fujitsu-Siemens Computers AMILO laptop"
-msgstr "Fujitsu-Siemens Computers AMILO laptop"
-
-#: ../rules/base.xml.in.h:249
-msgid "Fula"
-msgstr "Фула"
-
-#: ../rules/base.xml.in.h:250
-msgid "GBr"
-msgstr "Брит"
-
-#: ../rules/base.xml.in.h:251
-msgid "Ga"
-msgstr "Га"
-
-#: ../rules/base.xml.in.h:252
-msgid "Generic 101-key PC"
-msgstr "Жалпы 101-клавишалары менен PC"
-
-#: ../rules/base.xml.in.h:253
-msgid "Generic 102-key (Intl) PC"
-msgstr "Жалпы 102-клавишалары менен (Инт.) PC"
-
-#: ../rules/base.xml.in.h:254
-msgid "Generic 104-key PC"
-msgstr "Жалпы 104-клавишалары менен PC"
-
-#: ../rules/base.xml.in.h:255
-msgid "Generic 105-key (Intl) PC"
-msgstr "Жалпы 105-клавишалары менен (Инт.) PC"
-
-#: ../rules/base.xml.in.h:256
-msgid "Genius Comfy KB-12e"
-msgstr "Genius Comfy KB-12e"
-
-#: ../rules/base.xml.in.h:257
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-
-#: ../rules/base.xml.in.h:258
-msgid "Genius Comfy KB-21e-Scroll"
-msgstr "Genius Comfy KB-21e-Scroll"
-
-#: ../rules/base.xml.in.h:259
-msgid "Genius KB-19e NB"
-msgstr "Genius KB-19e NB"
-
-#: ../rules/base.xml.in.h:260
-msgid "Genius KKB-2050HS"
-msgstr "Genius KKB-2050HS"
-
-#: ../rules/base.xml.in.h:261
-msgid "Geo"
-msgstr "Груз"
-
-#: ../rules/base.xml.in.h:262
-msgid "Georgia"
-msgstr "Грузия"
-
-#: ../rules/base.xml.in.h:263
-msgid "Georgian"
-msgstr "Грузиндик"
-
-#: ../rules/base.xml.in.h:264
-msgid "Georgian AZERTY Tskapo"
-msgstr "Грузин AZERTY Tskapo"
-
-#: ../rules/base.xml.in.h:265
-msgid "German (Macintosh)"
-msgstr "Немец (Macintosh)"
-
-#: ../rules/base.xml.in.h:266
-msgid "German, Sun dead keys"
-msgstr "Немец, атайын (dead keys) Sun клавишалары менен"
-
-#: ../rules/base.xml.in.h:267
-msgid "German, eliminate dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:268
-msgid "Germany"
-msgstr "Германия"
-
-#: ../rules/base.xml.in.h:269
-msgid "Gha"
-msgstr "Ган"
-
-#: ../rules/base.xml.in.h:270
-msgid "Ghana"
-msgstr "Гана"
-
-#: ../rules/base.xml.in.h:271
-msgid "Gre"
-msgstr "Гре"
-
-#: ../rules/base.xml.in.h:272
-msgid "Greece"
-msgstr "Греция"
-
-#: ../rules/base.xml.in.h:273
-msgid "Group toggle on multiply/divide key"
-msgstr ""
-
-#: ../rules/base.xml.in.h:274
-msgid "Gui"
-msgstr "Гви"
-
-#: ../rules/base.xml.in.h:275
-msgid "Guinea"
-msgstr "Гвинея"
-
-#: ../rules/base.xml.in.h:276
-msgid "Gujarati"
-msgstr "Гуджарати"
-
-#: ../rules/base.xml.in.h:277
-msgid "Gurmukhi"
-msgstr "Гурмукхи"
-
-#: ../rules/base.xml.in.h:278
-msgid "Gurmukhi Jhelum"
-msgstr "Гурмукхи Jhelum"
-
-#: ../rules/base.xml.in.h:279
-msgid "Gyration"
-msgstr "Гирашн"
-
-#: ../rules/base.xml.in.h:280
-msgid "Happy Hacking Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:281
-msgid "Happy Hacking Keyboard for Mac"
-msgstr ""
-
-#: ../rules/base.xml.in.h:282
-msgid "Hausa"
-msgstr "Хауза"
-
-#: ../rules/base.xml.in.h:283
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr "Hewlett-Packard Internet Keyboard"
-
-#: ../rules/base.xml.in.h:284
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr "Hewlett-Packard Omnibook 500 FA"
-
-#: ../rules/base.xml.in.h:285
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr "Hewlett-Packard Omnibook 5xx"
-
-#: ../rules/base.xml.in.h:286
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr "Hewlett-Packard Omnibook 6000/6100"
-
-#: ../rules/base.xml.in.h:287
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr "Hewlett-Packard Omnibook XE3 GC"
-
-#: ../rules/base.xml.in.h:288
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr "Hewlett-Packard Omnibook XE3 GF"
-
-#: ../rules/base.xml.in.h:289
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr "Hewlett-Packard Omnibook XT1000"
-
-#: ../rules/base.xml.in.h:290
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr "Hewlett-Packard Pavilion ZT11xx"
-
-#: ../rules/base.xml.in.h:291
-msgid "Hewlett-Packard Pavilion dv5"
-msgstr "Hewlett-Packard Pavilion dv5"
-
-#: ../rules/base.xml.in.h:292
-msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-250x Multimedia Keyboard"
-
-#: ../rules/base.xml.in.h:293
-msgid "Hewlett-Packard nx9020"
-msgstr "Hewlett-Packard nx9020"
-
-#: ../rules/base.xml.in.h:294
-msgid "Hexadecimal"
-msgstr ""
-
-#: ../rules/base.xml.in.h:295
-msgid "Hindi Bolnagri"
-msgstr "Хинди Болнагри"
-
-#: ../rules/base.xml.in.h:296
-msgid "Hindi Wx"
-msgstr "Хинди Wx"
-
-#: ../rules/base.xml.in.h:297
-msgid "Homophonic"
-msgstr ""
-
-#: ../rules/base.xml.in.h:298
-msgid "Honeywell Euroboard"
-msgstr "Honeywell Euroboard"
-
-#: ../rules/base.xml.in.h:299
-msgid "Hrv"
-msgstr "Хорв"
-
-#: ../rules/base.xml.in.h:300
-msgid "Hun"
-msgstr "Венг"
-
-#: ../rules/base.xml.in.h:301
-msgid "Hungary"
-msgstr "Венгрия"
-
-#: ../rules/base.xml.in.h:302
-msgid "Hyper is mapped to Win-keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:303
-msgid "IBM (LST 1205-92)"
-msgstr "IBM (LST 1205-92)"
-
-#: ../rules/base.xml.in.h:304
-msgid "IBM Rapid Access"
-msgstr "IBM Rapid Access"
-
-#: ../rules/base.xml.in.h:305
-msgid "IBM Rapid Access II"
-msgstr "IBM Rapid Access II"
-
-#: ../rules/base.xml.in.h:306
-msgid "IBM Space Saver"
-msgstr "IBM Space Saver"
-
-#: ../rules/base.xml.in.h:307
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
-
-#: ../rules/base.xml.in.h:308
-msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-
-#: ../rules/base.xml.in.h:309
-msgid "IBM ThinkPad R60/T60/R61/T61"
-msgstr "IBM ThinkPad R60/T60/R61/T61"
-
-#: ../rules/base.xml.in.h:310
-msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
-msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
-
-#: ../rules/base.xml.in.h:311
-msgid "ISO Alternate"
-msgstr "Кошумча ISO"
-
-#: ../rules/base.xml.in.h:312
-msgid "Iceland"
-msgstr "Исландия"
-
-#: ../rules/base.xml.in.h:313
-msgid "Igbo"
-msgstr "Igbo"
-
-#: ../rules/base.xml.in.h:314
-msgid "Include dead tilde"
-msgstr ""
-
-#: ../rules/base.xml.in.h:315
-msgid "Ind"
-msgstr "Инд"
-
-#: ../rules/base.xml.in.h:316
-msgid "India"
-msgstr "Индия"
-
-#: ../rules/base.xml.in.h:317
-msgid "International (AltGr dead keys)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:318
-msgid "International (with dead keys)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:319
-msgid "Inuktitut"
-msgstr "Иннуитская"
-
-#: ../rules/base.xml.in.h:320
-msgid "Iran"
-msgstr "Иран"
-
-#: ../rules/base.xml.in.h:321
-msgid "Iraq"
-msgstr "Ирак"
-
-#: ../rules/base.xml.in.h:322
-msgid "Ireland"
-msgstr "Ирландия"
-
-#: ../rules/base.xml.in.h:323
-msgid "Irl"
-msgstr "Ирл"
-
-#: ../rules/base.xml.in.h:324
-msgid "Irn"
-msgstr "Фарс"
-
-#: ../rules/base.xml.in.h:325
-msgid "Irq"
-msgstr "Ирк"
-
-#: ../rules/base.xml.in.h:326
-msgid "Isl"
-msgstr "Исл"
-
-#: ../rules/base.xml.in.h:327
-msgid "Isr"
-msgstr "Ивр"
-
-#: ../rules/base.xml.in.h:328
-msgid "Israel"
-msgstr "Израиль"
-
-#: ../rules/base.xml.in.h:329
-msgid "Ita"
-msgstr "Ит"
-
-#: ../rules/base.xml.in.h:330
-msgid "Italy"
-msgstr "Италия"
-
-#: ../rules/base.xml.in.h:331
-msgid "Japan"
-msgstr "Япония"
-
-#: ../rules/base.xml.in.h:332
-msgid "Japan (PC-98xx Series)"
-msgstr "Japan (PC-98xx Series)"
-
-#: ../rules/base.xml.in.h:333
-msgid "Japanese keyboard options"
-msgstr ""
-
-#: ../rules/base.xml.in.h:334
-msgid "Jpn"
-msgstr "Яп"
-
-#: ../rules/base.xml.in.h:335
-msgid "Kalmyk"
-msgstr "Калмык"
-
-#: ../rules/base.xml.in.h:336
-msgid "Kana"
-msgstr "Кана"
-
-#: ../rules/base.xml.in.h:337
-msgid "Kana Lock key is locking"
-msgstr ""
-
-#: ../rules/base.xml.in.h:338
-msgid "Kannada"
-msgstr "Каннада"
-
-#: ../rules/base.xml.in.h:339
-msgid "Kashubian"
-msgstr "Кашуб"
-
-#: ../rules/base.xml.in.h:340
-msgid "Kaz"
-msgstr "Каз"
-
-#: ../rules/base.xml.in.h:341
-msgid "Kazakh with Russian"
-msgstr "Казакча Орусча менен"
-
-#: ../rules/base.xml.in.h:342
-msgid "Kazakhstan"
-msgstr "Казахстан"
-
-#: ../rules/base.xml.in.h:343
-msgid "Key sequence to kill the X server"
-msgstr ""
-
-#: ../rules/base.xml.in.h:344
-msgid "Key to choose 3rd level"
-msgstr "3-чү денгээлди тандоо баскычы"
-
-#: ../rules/base.xml.in.h:345
-msgid "Key(s) to change layout"
-msgstr ""
-
-#: ../rules/base.xml.in.h:346
-msgid "Keytronic FlexPro"
-msgstr "Keytronic FlexPro"
-
-#: ../rules/base.xml.in.h:347
-msgid "Kgz"
-msgstr "Кгз"
-
-#: ../rules/base.xml.in.h:348
-msgid "Khm"
-msgstr "Кхм"
-
-#: ../rules/base.xml.in.h:349
-msgid "Komi"
-msgstr "Коми"
-
-#: ../rules/base.xml.in.h:350
-msgid "Kor"
-msgstr "Кор"
-
-#: ../rules/base.xml.in.h:351
-msgid "Korea, Republic of"
-msgstr "Корея Республикасы"
-
-#: ../rules/base.xml.in.h:352
-msgid "Ktunaxa"
-msgstr "Кутенай"
-
-#: ../rules/base.xml.in.h:353
-msgid "Kurdish, (F)"
-msgstr "Курд, (F)"
-
-#: ../rules/base.xml.in.h:354
-msgid "Kurdish, Arabic-Latin"
-msgstr "Курд, араб-латын"
-
-#: ../rules/base.xml.in.h:355
-msgid "Kurdish, Latin Alt-Q"
-msgstr "Курд, латын Alt-Q"
-
-#: ../rules/base.xml.in.h:356
-msgid "Kurdish, Latin Q"
-msgstr "Курд, латын Q"
-
-#: ../rules/base.xml.in.h:357
-msgid "Kyrgyzstan"
-msgstr "Кыргызстан"
-
-#: ../rules/base.xml.in.h:358
-msgid "LAm"
-msgstr "ЛатАм"
-
-#: ../rules/base.xml.in.h:359
-msgid "LEKP"
-msgstr "LEKP"
-
-#: ../rules/base.xml.in.h:360
-msgid "LEKPa"
-msgstr "LEKPa"
-
-#: ../rules/base.xml.in.h:361
-msgid "Lao"
-msgstr "Лао"
-
-#: ../rules/base.xml.in.h:362
-msgid "Laos"
-msgstr "Лаос"
-
-#: ../rules/base.xml.in.h:363
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:364
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:365
-msgid "Laptop/notebook eMachines m68xx"
-msgstr ""
-
-#: ../rules/base.xml.in.h:366
-msgid "Latin"
-msgstr "Латын"
-
-#: ../rules/base.xml.in.h:367
-msgid "Latin American"
-msgstr "Латын американдык"
-
-#: ../rules/base.xml.in.h:368
-msgid "Latin Unicode"
-msgstr "Латын Unicode"
-
-#: ../rules/base.xml.in.h:369
-msgid "Latin Unicode qwerty"
-msgstr "Латын Unicode qwerty"
-
-#: ../rules/base.xml.in.h:370
-msgid "Latin qwerty"
-msgstr "Латын qwerty"
-
-#: ../rules/base.xml.in.h:371
-msgid "Latin unicode"
-msgstr "Латын unicode"
-
-#: ../rules/base.xml.in.h:372
-msgid "Latin unicode qwerty"
-msgstr "Латын unicode qwerty"
-
-#: ../rules/base.xml.in.h:373
-msgid "Latin with guillemets"
-msgstr ""
-
-#: ../rules/base.xml.in.h:374
-msgid "Latvia"
-msgstr "Латвия"
-
-#: ../rules/base.xml.in.h:375
-msgid "Lav"
-msgstr "Лат"
-
-#: ../rules/base.xml.in.h:376
-msgid "Left Alt"
-msgstr "Сол Alt"
-
-#: ../rules/base.xml.in.h:377
-msgid "Left Alt (while pressed)"
-msgstr "Сол Alt клавишасы (басылган учурда)"
-
-#: ../rules/base.xml.in.h:378
-msgid "Left Alt is swapped with Left Win"
-msgstr ""
-
-#: ../rules/base.xml.in.h:379
-msgid "Left Ctrl"
-msgstr "Сол Ctrl"
-
-#: ../rules/base.xml.in.h:380
-msgid "Left Ctrl+Left Shift"
-msgstr ""
-
-#: ../rules/base.xml.in.h:381
-msgid "Left Shift"
-msgstr "Сол Shift"
-
-#: ../rules/base.xml.in.h:382
-msgid "Left Win"
-msgstr "Сол Win"
-
-#: ../rules/base.xml.in.h:383
-msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:384
-msgid "Left Win (while pressed)"
-msgstr "Сол Alt клавишасы (басылган учурда)"
-
-#: ../rules/base.xml.in.h:385
-msgid "Left hand"
-msgstr ""
-
-#: ../rules/base.xml.in.h:386
-msgid "Left handed Dvorak"
-msgstr ""
-
-#: ../rules/base.xml.in.h:387
-msgid "Legacy"
-msgstr "Legacy"
-
-#: ../rules/base.xml.in.h:388
-msgid "Legacy Wang 724"
-msgstr ""
-
-#. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:390
-msgid "Legacy key with comma"
-msgstr ""
-
-#: ../rules/base.xml.in.h:391
-msgid "Legacy key with dot"
-msgstr ""
-
-#: ../rules/base.xml.in.h:392
-msgid "Less-than/Greater-than"
-msgstr ""
-
-#: ../rules/base.xml.in.h:393
-msgid "Lithuania"
-msgstr "Литва"
-
-#: ../rules/base.xml.in.h:394
-msgid "Logitech Access Keyboard"
-msgstr "Logitech Access Keyboard"
-
-#: ../rules/base.xml.in.h:395
-msgid "Logitech Cordless Desktop"
-msgstr "Logitech Cordless Desktop"
-
-#: ../rules/base.xml.in.h:396
-msgid "Logitech Cordless Desktop (alternate option)"
-msgstr "Logitech Cordless Desktop (альтернативдик вариант)"
-
-#: ../rules/base.xml.in.h:397
-msgid "Logitech Cordless Desktop EX110"
-msgstr "Logitech Cordless Desktop EX110"
-
-#: ../rules/base.xml.in.h:398
-msgid "Logitech Cordless Desktop LX-300"
-msgstr "Logitech Cordless Desktop LX-300"
-
-#: ../rules/base.xml.in.h:399
-msgid "Logitech Cordless Desktop Navigator"
-msgstr "Logitech Cordless Desktop Navigator"
-
-#: ../rules/base.xml.in.h:400
-msgid "Logitech Cordless Desktop Optical"
-msgstr "Logitech Cordless Desktop Optical"
-
-#: ../rules/base.xml.in.h:401
-msgid "Logitech Cordless Desktop Pro (alternate option 2)"
-msgstr "Logitech Cordless Desktop Pro (альтернативдик вариант 2)"
-
-#: ../rules/base.xml.in.h:402
-msgid "Logitech Cordless Desktop iTouch"
-msgstr "Logitech Cordless Desktop iTouch"
-
-#: ../rules/base.xml.in.h:403
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr "Logitech Cordless Freedom/Desktop Navigator"
-
-#: ../rules/base.xml.in.h:404
-msgid "Logitech G15 extra keys via G15daemon"
-msgstr "Logitech G15 extra keys via G15daemon"
-
-#: ../rules/base.xml.in.h:405
-msgid "Logitech Generic Keyboard"
-msgstr "Logitech Generic Keyboard"
-
-#: ../rules/base.xml.in.h:406
-msgid "Logitech Internet 350 Keyboard"
-msgstr "Logitech Internet 350 Keyboard"
-
-#: ../rules/base.xml.in.h:407
-msgid "Logitech Internet Keyboard"
-msgstr "Logitech Internet Keyboard"
-
-#: ../rules/base.xml.in.h:408
-msgid "Logitech Internet Navigator Keyboard"
-msgstr "Logitech Internet Navigator Keyboard"
-
-#: ../rules/base.xml.in.h:409
-msgid "Logitech Media Elite Keyboard"
-msgstr "Logitech Media Elite Keyboard"
-
-#: ../rules/base.xml.in.h:410
-msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
-msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
-
-#: ../rules/base.xml.in.h:411
-msgid "Logitech Ultra-X Keyboard"
-msgstr "Logitech Ultra-X Keyboard"
-
-#: ../rules/base.xml.in.h:412
-msgid "Logitech diNovo Edge Keyboard"
-msgstr "Logitech diNovo Edge Keyboard"
-
-#: ../rules/base.xml.in.h:413
-msgid "Logitech diNovo Keyboard"
-msgstr "Logitech diNovo Keyboard"
-
-#: ../rules/base.xml.in.h:414
-msgid "Logitech iTouch"
-msgstr "Logitech iTouch"
-
-#: ../rules/base.xml.in.h:415
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "Logitech iTouch Cordless Keyboard (Y-RB6 модели)"
-
-#: ../rules/base.xml.in.h:416
-msgid "Logitech iTouch Internet Navigator Keyboard SE"
-msgstr "Logitech iTouch Internet Navigator Keyboard SE"
-
-#: ../rules/base.xml.in.h:417
-msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-
-#: ../rules/base.xml.in.h:418
-msgid "Lower Sorbian"
-msgstr ""
-
-#: ../rules/base.xml.in.h:419
-msgid "Lower Sorbian (qwertz)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:420
-msgid "Ltu"
-msgstr "Лит"
-
-#: ../rules/base.xml.in.h:421
-msgid "MESS"
-msgstr "MESS"
-
-#: ../rules/base.xml.in.h:422
-msgid "MNE"
-msgstr "MNE"
-
-#: ../rules/base.xml.in.h:423
-msgid "MacBook/MacBook Pro"
-msgstr "MacBook/MacBook Pro"
-
-#: ../rules/base.xml.in.h:424
-msgid "MacBook/MacBook Pro (Intl)"
-msgstr "MacBook/MacBook Pro (Инт.)"
-
-#: ../rules/base.xml.in.h:425
-msgid "Macedonia"
-msgstr "Македония"
-
-#: ../rules/base.xml.in.h:426
-msgid "Macintosh"
-msgstr "Macintosh"
-
-#: ../rules/base.xml.in.h:427
-msgid "Macintosh Old"
-msgstr "Эски Macintosh"
-
-#: ../rules/base.xml.in.h:428
-msgid "Macintosh, Sun dead keys"
-msgstr "Macintosh, атайын (dead keys) Sun клавишалары менен"
-
-#: ../rules/base.xml.in.h:429
-msgid "Macintosh, eliminate dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:430
-msgid "Make CapsLock an additional Backspace"
-msgstr "CapsLock кошумча Боштук клавиша катары колдонуу"
-
-#: ../rules/base.xml.in.h:431
-msgid "Make CapsLock an additional Ctrl"
-msgstr "CapsLock кошумча Ctrl клавиша катары колдонуу"
-
-#: ../rules/base.xml.in.h:432
-msgid "Make CapsLock an additional ESC"
-msgstr "CapsLock кошумча ESC клавиша катары колдонуу"
-
-#: ../rules/base.xml.in.h:433
-msgid "Make CapsLock an additional Hyper"
-msgstr "CapsLock кошумча Hyper клавиша катары колдонуу"
-
-#: ../rules/base.xml.in.h:434
-msgid "Make CapsLock an additional NumLock"
-msgstr "CapsLock кошумча NumLock клавиша катары колдонуу"
-
-#: ../rules/base.xml.in.h:435
-msgid "Make CapsLock an additional Super"
-msgstr "CapsLock кошумча Super клавиша катары колдонуу"
-
-#: ../rules/base.xml.in.h:436
-msgid "Mal"
-msgstr "Мал"
-
-#: ../rules/base.xml.in.h:437
-msgid "Malayalam"
-msgstr "Малайaлам"
-
-#: ../rules/base.xml.in.h:438
-msgid "Malayalam Lalitha"
-msgstr "Малайaлам (Lalitha)"
-
-#: ../rules/base.xml.in.h:439
-msgid "Maldives"
-msgstr "Мальдивалар"
-
-#: ../rules/base.xml.in.h:440
-msgid "Malta"
-msgstr "Мальта"
-
-#: ../rules/base.xml.in.h:441
-msgid "Maltese keyboard with US layout"
-msgstr ""
-
-#: ../rules/base.xml.in.h:442
-msgid "Mao"
-msgstr "Мао"
-
-#: ../rules/base.xml.in.h:443
-msgid "Maori"
-msgstr "Маори"
-
-#: ../rules/base.xml.in.h:444
-msgid "Memorex MX1998"
-msgstr "Memorex MX1998"
-
-#: ../rules/base.xml.in.h:445
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr "Memorex MX2500 EZ-Access Keyboard"
-
-#: ../rules/base.xml.in.h:446
-msgid "Memorex MX2750"
-msgstr "Memorex MX2750"
-
-#: ../rules/base.xml.in.h:447
-msgid "Menu"
-msgstr "Menu"
-
-#: ../rules/base.xml.in.h:448
-msgid "Meta is mapped to Left Win"
-msgstr ""
-
-#: ../rules/base.xml.in.h:449
-msgid "Meta is mapped to Win keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:450
-msgid "Microsoft Comfort Curve Keyboard 2000"
-msgstr "Microsoft Comfort Curve Keyboard 2000"
-
-#: ../rules/base.xml.in.h:451
-msgid "Microsoft Internet Keyboard"
-msgstr "Microsoft Internet Keyboard"
-
-#: ../rules/base.xml.in.h:452
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "Microsoft Internet Keyboard Pro, швед"
-
-#: ../rules/base.xml.in.h:453
-msgid "Microsoft Natural"
-msgstr "Microsoft Natural"
-
-#: ../rules/base.xml.in.h:454
-msgid "Microsoft Natural Keyboard Elite"
-msgstr "Microsoft Natural Keyboard Elite"
-
-#: ../rules/base.xml.in.h:455
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-
-#: ../rules/base.xml.in.h:456
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr "Microsoft Natural Keyboard Pro OEM"
-
-#: ../rules/base.xml.in.h:457
-msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-
-#: ../rules/base.xml.in.h:458
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
-msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
-
-#: ../rules/base.xml.in.h:459
-msgid "Microsoft Office Keyboard"
-msgstr "Microsoft Office Keyboard"
-
-#: ../rules/base.xml.in.h:460
-msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
-msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
-
-#: ../rules/base.xml.in.h:461
-msgid "Miscellaneous compatibility options"
-msgstr ""
-
-#: ../rules/base.xml.in.h:462
-msgid "Mkd"
-msgstr "Мак"
-
-#: ../rules/base.xml.in.h:463
-msgid "Mlt"
-msgstr "Мальт"
-
-#: ../rules/base.xml.in.h:464
-msgid "Mmr"
-msgstr "Мьянм"
-
-#: ../rules/base.xml.in.h:465
-msgid "Mng"
-msgstr "Монг"
-
-#: ../rules/base.xml.in.h:466
-msgid "Mongolia"
-msgstr "Монголия"
-
-#: ../rules/base.xml.in.h:467
-msgid "Montenegro"
-msgstr "Черногория"
-
-#: ../rules/base.xml.in.h:468
-msgid "Morocco"
-msgstr "Морокко"
-
-#: ../rules/base.xml.in.h:469
-msgid "Multilingual"
-msgstr "Көп тилдүү"
-
-#: ../rules/base.xml.in.h:470
-msgid "Multilingual, first part"
-msgstr "Көп тилдүү, биринчи бөлүк"
-
-#: ../rules/base.xml.in.h:471
-msgid "Multilingual, second part"
-msgstr "Көп тилдүү, экинчи бөлүк"
-
-#: ../rules/base.xml.in.h:472
-msgid "Myanmar"
-msgstr "Мьянмар"
-
-#: ../rules/base.xml.in.h:473
-msgid "NICOLA-F style Backspace"
-msgstr ""
-
-#: ../rules/base.xml.in.h:474
-msgid "NLA"
-msgstr "NLA"
-
-#: ../rules/base.xml.in.h:475
-msgid "Nativo"
-msgstr "Nativo"
-
-#: ../rules/base.xml.in.h:476
-msgid "Nativo for Esperanto"
-msgstr "Nativo эсперанто үчүн"
-
-#: ../rules/base.xml.in.h:477
-msgid "Nativo for USA keyboards"
-msgstr ""
-
-#: ../rules/base.xml.in.h:478
-msgid "Neo 2"
-msgstr "Neo 2"
-
-#: ../rules/base.xml.in.h:479
-msgid "Nep"
-msgstr "Неп"
-
-#: ../rules/base.xml.in.h:480
-msgid "Nepal"
-msgstr "Непал"
-
-#: ../rules/base.xml.in.h:481
-msgid "Netherlands"
-msgstr "Нидерландия"
-
-#: ../rules/base.xml.in.h:482
-msgid "New phonetic"
-msgstr "Жаңы фонетикалык"
-
-#: ../rules/base.xml.in.h:483
-msgid "Nig"
-msgstr "Нгр"
-
-#: ../rules/base.xml.in.h:484
-msgid "Nigeria"
-msgstr "Нигерия"
-
-#: ../rules/base.xml.in.h:485
-msgid "Nld"
-msgstr "Флам"
-
-#: ../rules/base.xml.in.h:486
-msgid "Non-breakable space character at fourth level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:487
-msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:488
-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:489
-msgid "Non-breakable space character at second level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:490
-msgid "Non-breakable space character at third level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:491
-msgid "Non-breakable space character at third level, nothing at fourth level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:492
-msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:493
-msgid "Nor"
-msgstr "Нор"
-
-#: ../rules/base.xml.in.h:494
-msgid "Northern Saami"
-msgstr "Түндүк Саами"
-
-#: ../rules/base.xml.in.h:495
-msgid "Northern Saami, eliminate dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:496
-msgid "Northgate OmniKey 101"
-msgstr "Northgate OmniKey 101"
-
-#: ../rules/base.xml.in.h:497
-msgid "Norway"
-msgstr "Норвегия"
-
-#: ../rules/base.xml.in.h:498
-msgid "NumLock"
-msgstr "NumLock"
-
-#: ../rules/base.xml.in.h:499
-msgid "Numeric keypad delete key behaviour"
-msgstr ""
-
-#: ../rules/base.xml.in.h:500
-msgid "Numeric keypad keys work as with Mac"
-msgstr ""
-
-#: ../rules/base.xml.in.h:501
-msgid "Numeric keypad layout selection"
-msgstr ""
-
-#: ../rules/base.xml.in.h:502
-msgid "OADG 109A"
-msgstr "OADG 109A"
-
-#: ../rules/base.xml.in.h:503
-msgid "OLPC"
-msgstr "OLPC"
-
-#: ../rules/base.xml.in.h:504
-msgid "OLPC Dari"
-msgstr "OLPC Dari"
-
-#: ../rules/base.xml.in.h:505
-msgid "OLPC Pashto"
-msgstr "OLPC Pashto"
-
-#: ../rules/base.xml.in.h:506
-msgid "OLPC Southern Uzbek"
-msgstr "Түштүк-өзбөк OLPC"
-
-#: ../rules/base.xml.in.h:507
-msgid "Occitan"
-msgstr "Окситандык"
-
-#: ../rules/base.xml.in.h:508
-msgid "Ogham"
-msgstr "Огхам"
-
-#: ../rules/base.xml.in.h:509
-msgid "Ogham IS434"
-msgstr "Огхам IS434"
-
-#: ../rules/base.xml.in.h:510
-msgid "Oriya"
-msgstr "Орийя"
-
-#: ../rules/base.xml.in.h:511
-msgid "Ortek MCK-800 MM/Internet keyboard"
-msgstr "Ortek MCK-800 MM/Internet keyboard"
-
-#: ../rules/base.xml.in.h:512
-msgid "Ossetian"
-msgstr "Осетиндик"
-
-#: ../rules/base.xml.in.h:513
-msgid "Ossetian, Winkeys"
-msgstr "Осетиндик Windows клавиатурасы"
-
-#: ../rules/base.xml.in.h:514
-msgid "Ossetian, legacy"
-msgstr "Осетиндик, эскирген"
-
-#: ../rules/base.xml.in.h:515
-msgid "PC-98xx Series"
-msgstr "PC-98xx"
-
-#: ../rules/base.xml.in.h:516
-msgid "Pak"
-msgstr "Пак"
-
-#: ../rules/base.xml.in.h:517
-msgid "Pakistan"
-msgstr "Пакистан"
-
-#: ../rules/base.xml.in.h:518
-msgid "Pashto"
-msgstr "Пуштундук"
-
-#: ../rules/base.xml.in.h:519
-msgid "Pattachote"
-msgstr "Паттачот"
-
-#: ../rules/base.xml.in.h:520
-msgid "Persian, with Persian Keypad"
-msgstr ""
-
-#: ../rules/base.xml.in.h:521
-msgid "Phonetic"
-msgstr "Фонетикалык"
-
-#: ../rules/base.xml.in.h:522
-msgid "Phonetic Winkeys"
-msgstr "Win клавишалары менен фонетикалык"
-
-#: ../rules/base.xml.in.h:523
-msgid "Pol"
-msgstr "Польск"
-
-#: ../rules/base.xml.in.h:524
-msgid "Poland"
-msgstr "Польша"
-
-#: ../rules/base.xml.in.h:525
-msgid "Polytonic"
-msgstr "Полифоникалык"
-
-#: ../rules/base.xml.in.h:526
-msgid "Portugal"
-msgstr "Португалия"
-
-#: ../rules/base.xml.in.h:527
-msgid "Probhat"
-msgstr "Пробат"
-
-#: ../rules/base.xml.in.h:528
-msgid "Programmer Dvorak"
-msgstr ""
-
-#: ../rules/base.xml.in.h:529
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "Propeller Voyager (KTEZ-1000)"
-
-#: ../rules/base.xml.in.h:530
-msgid "Prt"
-msgstr "Порт"
-
-#: ../rules/base.xml.in.h:531
-msgid "QTronix Scorpius 98N+"
-msgstr "QTronix Scorpius 98N+"
-
-#: ../rules/base.xml.in.h:532
-msgid "Right Alt"
-msgstr "Оң Alt"
-
-#: ../rules/base.xml.in.h:533
-msgid "Right Alt (while pressed)"
-msgstr "Оң Alt клавишасы (басылган учурда)"
-
-#: ../rules/base.xml.in.h:534
-msgid "Right Alt key never chooses 3rd level"
-msgstr "Оң Alt клавишасы эч качан 3-чү денгээлди тандабайт"
-
-#: ../rules/base.xml.in.h:535
-msgid "Right Alt, Shift+Right Alt key is Multi_Key"
-msgstr "Оң Alt, Shift жана оң Alt бирге Multi_Key катары амал жасайт"
-
-#: ../rules/base.xml.in.h:536
-msgid "Right Ctrl"
-msgstr "Оң Ctrl"
-
-#: ../rules/base.xml.in.h:537
-msgid "Right Ctrl (while pressed)"
-msgstr "Оң Alt клавишасы (басылган учурда)"
-
-#: ../rules/base.xml.in.h:538
-msgid "Right Ctrl as Right Alt"
-msgstr "Оң Ctrl оң Alt клавишадай амал жасайт"
-
-#: ../rules/base.xml.in.h:539
-msgid "Right Shift"
-msgstr "Оң Shift"
-
-#: ../rules/base.xml.in.h:540
-msgid "Right Win"
-msgstr "Оң Win"
-
-#: ../rules/base.xml.in.h:541
-msgid "Right Win (while pressed)"
-msgstr "Оң Win клавишасы (басылган учурда)"
-
-#: ../rules/base.xml.in.h:542
-msgid "Right hand"
-msgstr ""
-
-#: ../rules/base.xml.in.h:543
-msgid "Right handed Dvorak"
-msgstr "Dvorak оң колдуу адамдар үчүн"
-
-#: ../rules/base.xml.in.h:544
-msgid "Romania"
-msgstr "Румыния"
-
-#: ../rules/base.xml.in.h:545
-msgid "Romanian keyboard with German letters"
-msgstr "Румындык клавиатура немец ариптери менен"
-
-#: ../rules/base.xml.in.h:546
-msgid "Romanian keyboard with German letters, eliminate dead keys"
-msgstr "Румындык клавиатура немец ариптери менен, атайын (dead keys) клавишаларсыз"
-
-#: ../rules/base.xml.in.h:547
-msgid "Rou"
-msgstr "Рум"
-
-#: ../rules/base.xml.in.h:548
-msgid "Rus"
-msgstr "Рус"
-
-#: ../rules/base.xml.in.h:549
-msgid "Russia"
-msgstr "Россия"
-
-#: ../rules/base.xml.in.h:550
-msgid "Russian"
-msgstr "Орусча"
-
-#: ../rules/base.xml.in.h:551
-msgid "Russian phonetic"
-msgstr "Орусча фонетикалык"
-
-#: ../rules/base.xml.in.h:552
-msgid "Russian phonetic Dvorak"
-msgstr "Орусча фонетикалык Dvorak"
-
-#: ../rules/base.xml.in.h:553
-msgid "Russian phonetic, eliminate dead keys"
-msgstr "Орусча фонетикалык, атайын (dead keys) клавишаларсыз"
-
-#: ../rules/base.xml.in.h:554
-msgid "Russian with Kazakh"
-msgstr "Орусча Казакча менен"
-
-#: ../rules/base.xml.in.h:555
-msgid "SILVERCREST Multimedia Wireless Keyboard"
-msgstr "SILVERCREST Multimedia Wireless Keyboard"
-
-#: ../rules/base.xml.in.h:556
-msgid "SK-1300"
-msgstr "SK-1300"
-
-#: ../rules/base.xml.in.h:557
-msgid "SK-2500"
-msgstr "SK-2500"
-
-#: ../rules/base.xml.in.h:558
-msgid "SK-6200"
-msgstr "SK-6200"
-
-#: ../rules/base.xml.in.h:559
-msgid "SK-7100"
-msgstr "SK-7100"
-
-#: ../rules/base.xml.in.h:560 ../rules/base.extras.xml.in.h:7
-msgid "SRB"
-msgstr "SRB"
-
-#: ../rules/base.xml.in.h:561
-msgid "SVEN Ergonomic 2500"
-msgstr "SVEN Ergonomic 2500"
-
-#: ../rules/base.xml.in.h:562
-msgid "SVEN Slim 303"
-msgstr "SVEN Slim 303"
-
-#: ../rules/base.xml.in.h:563
-msgid "Samsung SDM 4500P"
-msgstr "Samsung SDM 4500P"
-
-#: ../rules/base.xml.in.h:564
-msgid "Samsung SDM 4510P"
-msgstr "Samsung SDM 4510P"
-
-#: ../rules/base.xml.in.h:565
-msgid "Scroll Lock"
-msgstr "Scroll Lock"
-
-#: ../rules/base.xml.in.h:566
-msgid "ScrollLock"
-msgstr "ScrollLock"
-
-#: ../rules/base.xml.in.h:567
-msgid "Secwepemctsin"
-msgstr "Secwepemctsin"
-
-#: ../rules/base.xml.in.h:568
-msgid "Semi-colon on third level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:569 ../rules/base.extras.xml.in.h:8
-msgid "Serbia"
-msgstr "Сербия"
-
-#: ../rules/base.xml.in.h:570
-msgid "Shift cancels CapsLock"
-msgstr "Shift CapsLock амалын очүрөт"
-
-#: ../rules/base.xml.in.h:571
-msgid "Shift does not cancel NumLock, chooses 3d level instead"
-msgstr ""
-
-#: ../rules/base.xml.in.h:572
-msgid "Shift with numeric keypad keys works as in MS Windows"
-msgstr "Shift сандык клавиатура клавишалары менен MS Windows'тогу клавишадай амал жасайт"
-
-#: ../rules/base.xml.in.h:573
-msgid "Shift+CapsLock"
-msgstr "Shift+CapsLock"
-
-#: ../rules/base.xml.in.h:574
-msgid "Simple"
-msgstr "Жөнөкөй"
-
-#: ../rules/base.xml.in.h:575
-msgid "Slovakia"
-msgstr "Словакия"
-
-#: ../rules/base.xml.in.h:576
-msgid "Slovenia"
-msgstr "Словения"
-
-#: ../rules/base.xml.in.h:577
-msgid "South Africa"
-msgstr "Түштүк Африка"
-
-#: ../rules/base.xml.in.h:578
-msgid "Southern Uzbek"
-msgstr "Түштүк өзбөкчө"
-
-#: ../rules/base.xml.in.h:579
-msgid "Spain"
-msgstr "Испания"
-
-#: ../rules/base.xml.in.h:580
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
-msgstr "Атайын клавишалар (Ctrl+Alt+&lt;клв&gt;) сервер менен долборлонот"
-
-#: ../rules/base.xml.in.h:581
-msgid "SrL"
-msgstr "ШрЛ"
-
-#: ../rules/base.xml.in.h:582
-msgid "Sri Lanka"
-msgstr "Шри Ланка"
-
-#: ../rules/base.xml.in.h:583
-msgid "Standard"
-msgstr "Стандарттык"
-
-#: ../rules/base.xml.in.h:584
-msgid "Standard (Cedilla)"
-msgstr "Стандарттык (Седиль)"
-
-#. RSTU 2019-91
-#: ../rules/base.xml.in.h:586
-msgid "Standard RSTU"
-msgstr "Стандарттык RSTU"
-
-#. RSTU 2019-91
-#: ../rules/base.xml.in.h:588
-msgid "Standard RSTU on Russian layout"
-msgstr "Стандарттык RSTU, орусча"
-
-#: ../rules/base.xml.in.h:589
-msgid "Sun Type 5/6"
-msgstr "Sun Type 5/6"
-
-#: ../rules/base.xml.in.h:590
-msgid "Sun dead keys"
-msgstr "Атайын (dead keys) Sun клавишалар"
-
-#: ../rules/base.xml.in.h:591
-msgid "Super Power Multimedia Keyboard"
-msgstr "Super Power Multimedia Keyboard"
-
-#: ../rules/base.xml.in.h:592
-msgid "Svdvorak"
-msgstr "Svdvorak"
-
-#: ../rules/base.xml.in.h:593
-msgid "Svk"
-msgstr "Слов"
-
-#: ../rules/base.xml.in.h:594
-msgid "Svn"
-msgstr "Cловен"
-
-#: ../rules/base.xml.in.h:595
-msgid "Swap Ctrl and CapsLock"
-msgstr "Ctrl жана CapsLock клавишаларды алмаштыруу"
-
-#: ../rules/base.xml.in.h:596
-msgid "Swap ESC and CapsLock"
-msgstr "ESC жана CapsLock клавишаларды алмаштыруу"
-
-#: ../rules/base.xml.in.h:597
-msgid "Swe"
-msgstr "Швед"
-
-#: ../rules/base.xml.in.h:598
-msgid "Sweden"
-msgstr "Швеция"
-
-#: ../rules/base.xml.in.h:599
-msgid "Switzerland"
-msgstr "Швейцария"
-
-#: ../rules/base.xml.in.h:600
-msgid "Symplon PaceBook (tablet PC)"
-msgstr "Symplon PaceBook (чөнтөк ПК)"
-
-#: ../rules/base.xml.in.h:601
-msgid "Syr"
-msgstr "Асс"
-
-#: ../rules/base.xml.in.h:602
-msgid "Syria"
-msgstr "Сирийдик"
-
-#: ../rules/base.xml.in.h:603
-msgid "Syriac"
-msgstr "Сирийдик"
-
-#: ../rules/base.xml.in.h:604
-msgid "Syriac phonetic"
-msgstr "Сирийдик фонетикалык"
-
-#: ../rules/base.xml.in.h:605
-msgid "TIS-820.2538"
-msgstr "TIS-820.2538"
-
-#: ../rules/base.xml.in.h:606
-msgid "Tajikistan"
-msgstr "Таджикистан"
-
-#: ../rules/base.xml.in.h:607
-msgid "Tamil"
-msgstr "Тамильдик"
-
-#: ../rules/base.xml.in.h:608
-msgid "Tamil TAB Typewriter"
-msgstr "Тамильдик \"Басма машинасы\" TAB"
-
-#: ../rules/base.xml.in.h:609
-msgid "Tamil TSCII Typewriter"
-msgstr "Тамиль TSCII печать машинасы"
-
-#: ../rules/base.xml.in.h:610
-msgid "Tamil Unicode"
-msgstr "Тамиль Unicode"
-
-#: ../rules/base.xml.in.h:611
-msgid "Targa Visionary 811"
-msgstr "Targa Visionary 811"
-
-#: ../rules/base.xml.in.h:612
-msgid "Tatar"
-msgstr "Татар"
-
-#: ../rules/base.xml.in.h:613
-msgid "Telugu"
-msgstr "Телугу"
-
-#: ../rules/base.xml.in.h:614
-msgid "Tha"
-msgstr "Тай"
-
-#: ../rules/base.xml.in.h:615
-msgid "Thailand"
-msgstr "Тайланд"
-
-#: ../rules/base.xml.in.h:616
-msgid "Tibetan"
-msgstr "Тибет"
-
-#: ../rules/base.xml.in.h:617
-msgid "Tibetan (with ASCII numerals)"
-msgstr "Тибет (ASCII номерлери менен)"
-
-#: ../rules/base.xml.in.h:618
-msgid "Tifinagh"
-msgstr "Тифинагдык"
-
-#: ../rules/base.xml.in.h:619
-msgid "Tifinagh Alternative"
-msgstr "Тифинагдык альтернативдик"
-
-#: ../rules/base.xml.in.h:620
-msgid "Tifinagh Alternative Phonetic"
-msgstr "Тифинагдык альтернативдик фонетикалык"
-
-#: ../rules/base.xml.in.h:621
-msgid "Tifinagh Extended"
-msgstr "Тифинагдык кеңейтилген"
-
-#: ../rules/base.xml.in.h:622
-msgid "Tifinagh Extended Phonetic"
-msgstr "Тифинагдык кеңейтилген фонетикалык"
-
-#: ../rules/base.xml.in.h:623
-msgid "Tifinagh Phonetic"
-msgstr "Тифинагдык фонетикалык"
-
-#: ../rules/base.xml.in.h:624
-msgid "Tilde (~) variant"
-msgstr "Тильда (~) менен вариант"
-
-#: ../rules/base.xml.in.h:625
-msgid "Tjk"
-msgstr "Тадж"
-
-#: ../rules/base.xml.in.h:626
-msgid "To the corresponding key in a Dvorak keyboard."
-msgstr ""
-
-#: ../rules/base.xml.in.h:627
-msgid "To the corresponding key in a Qwerty keyboard."
-msgstr ""
-
-#: ../rules/base.xml.in.h:628
-msgid "Toshiba Satellite S3000"
-msgstr "Toshiba Satellite S3000"
-
-#: ../rules/base.xml.in.h:629
-msgid "Traditional phonetic"
-msgstr "Традициондук фонетикалык"
-
-#: ../rules/base.xml.in.h:630
-msgid "Trust Direct Access Keyboard"
-msgstr "Trust Direct Access Keyboard"
-
-#: ../rules/base.xml.in.h:631
-msgid "Trust Slimline"
-msgstr "Trust Slimline"
-
-#: ../rules/base.xml.in.h:632
-msgid "Trust Wireless Keyboard Classic"
-msgstr "Trust Wireless Keyboard Classic"
-
-#: ../rules/base.xml.in.h:633
-msgid "Tur"
-msgstr "Тур"
-
-#: ../rules/base.xml.in.h:634
-msgid "Turkey"
-msgstr "Турция"
-
-#: ../rules/base.xml.in.h:635
-msgid "Turkmenistan"
-msgstr "Түркменистан"
-
-#: ../rules/base.xml.in.h:636
-msgid "Typewriter"
-msgstr "Басма машинасы"
-
-#: ../rules/base.xml.in.h:637
-msgid "UCW layout (accented letters only)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:638
-msgid "US keyboard with Bosnian digraphs"
-msgstr "АКШ клавиатурасы боснийдик диграфтар менен"
-
-#: ../rules/base.xml.in.h:639
-msgid "US keyboard with Bosnian letters"
-msgstr "АКШ клавиатурасы боснийдик ариптер менен"
-
-#: ../rules/base.xml.in.h:640
-msgid "US keyboard with Croatian digraphs"
-msgstr "АКШ клавиатурасы хорваттык диграфтар менен"
-
-#: ../rules/base.xml.in.h:641
-msgid "US keyboard with Croatian letters"
-msgstr "АКШ клавиатурасы хорваттык ариптер менен"
-
-#: ../rules/base.xml.in.h:642
-msgid "US keyboard with Estonian letters"
-msgstr "АКШ клавиатурасы эстондук ариптер менен"
-
-#: ../rules/base.xml.in.h:643
-msgid "US keyboard with Italian letters"
-msgstr "АКШ клавиатурасы итальяндык ариптер менен"
-
-#: ../rules/base.xml.in.h:644
-msgid "US keyboard with Lithuanian letters"
-msgstr "АКШ клавиатурасы литовдук ариптер менен"
-
-#: ../rules/base.xml.in.h:645
-msgid "US keyboard with Slovenian letters"
-msgstr "АКШ клавиатурасы словендик ариптер менен"
-
-#: ../rules/base.xml.in.h:646 ../rules/base.extras.xml.in.h:9
-msgid "USA"
-msgstr "АКШ"
-
-#: ../rules/base.xml.in.h:647
-msgid "Udmurt"
-msgstr "Удмурттук"
-
-#: ../rules/base.xml.in.h:648
-msgid "Ukr"
-msgstr "Укр"
-
-#: ../rules/base.xml.in.h:649
-msgid "Ukraine"
-msgstr "Украина"
-
-#: ../rules/base.xml.in.h:650
-msgid "Unicode additions (arrows and math operators)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:651
-msgid "Unicode additions (arrows and math operators). Math operators on default level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:652
-msgid "UnicodeExpert"
-msgstr "UnicodeExpert"
-
-#: ../rules/base.xml.in.h:653
-msgid "United Kingdom"
-msgstr "Англис (Улуу Британия)"
-
-#: ../rules/base.xml.in.h:654
-msgid "Unitek KB-1925"
-msgstr "Unitek KB-1925"
-
-#: ../rules/base.xml.in.h:655
-msgid "Urdu, Alternative phonetic"
-msgstr "Урду, альтернативдик фонетикалык"
-
-#: ../rules/base.xml.in.h:656
-msgid "Urdu, Phonetic"
-msgstr "Урду, фонетикалык"
-
-#: ../rules/base.xml.in.h:657
-msgid "Urdu, Winkeys"
-msgstr "Урду, Windows клавишалары менен"
-
-#: ../rules/base.xml.in.h:658
-msgid "Use Bosnian digraphs"
-msgstr "Боснийдик диаграфтарды колдонуу"
-
-#: ../rules/base.xml.in.h:659
-msgid "Use Croatian digraphs"
-msgstr "Хорваттык диаграфтарды колдонуу"
-
-#: ../rules/base.xml.in.h:660
-msgid "Use guillemets for quotes"
-msgstr "Француздук тырмакчаларды тырмакчалардай колдонуу"
-
-#: ../rules/base.xml.in.h:661
-msgid "Use keyboard LED to show alternative layout"
-msgstr "Клавиатура индикаторлорду кошумча группаларды көрсөтүү үчүн колдонуу"
-
-#: ../rules/base.xml.in.h:662
-msgid "Using space key to input non-breakable space character"
-msgstr ""
-
-#: ../rules/base.xml.in.h:663
-msgid "Usual space at any level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:664
-msgid "Uzb"
-msgstr "Өзб"
-
-#: ../rules/base.xml.in.h:665
-msgid "Uzbekistan"
-msgstr "Өзбекистан"
-
-#: ../rules/base.xml.in.h:666
-msgid "Vietnam"
-msgstr "Вьетнам"
-
-#: ../rules/base.xml.in.h:667
-msgid "ViewSonic KU-306 Internet Keyboard"
-msgstr "ViewSonic KU-306 Internet Keyboard"
-
-#: ../rules/base.xml.in.h:668
-msgid "Vnm"
-msgstr "Вьет"
-
-#: ../rules/base.xml.in.h:669
-msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:670
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:671
-msgid "Wang model 724 azerty"
-msgstr "Wang model 724 azerty"
-
-#: ../rules/base.xml.in.h:672
-msgid "Western"
-msgstr "Батыш"
-
-#: ../rules/base.xml.in.h:673
-msgid "Winbook Model XP5"
-msgstr "Winbook Model XP5"
-
-#: ../rules/base.xml.in.h:674
-msgid "Winkeys"
-msgstr "Windows клавиатурасы"
-
-#: ../rules/base.xml.in.h:675
-msgid "With &lt;\\|&gt; key"
-msgstr "&lt;\\|&gt; клавиша менен"
-
-#: ../rules/base.xml.in.h:676
-msgid "With EuroSign on 5"
-msgstr ""
-
-#: ../rules/base.xml.in.h:677
-msgid "With guillemets"
-msgstr "Француздук тырмакчалар менен"
-
-#: ../rules/base.xml.in.h:678
-msgid "Yahoo! Internet Keyboard"
-msgstr "Yahoo! Internet Keyboard"
-
-#: ../rules/base.xml.in.h:679
-msgid "Yakut"
-msgstr "Якуттук"
-
-#: ../rules/base.xml.in.h:680
-msgid "Yoruba"
-msgstr "Йоруба"
-
-#: ../rules/base.xml.in.h:681
-msgid "Z and ZHE swapped"
-msgstr "З жана Ж орундарын алмаштырган"
-
-#: ../rules/base.xml.in.h:682
-msgid "Zar"
-msgstr "ЮАР"
-
-#: ../rules/base.xml.in.h:683
-msgid "azerty"
-msgstr "azerty"
-
-#: ../rules/base.xml.in.h:684
-msgid "azerty/digits"
-msgstr "azerty/цифры"
-
-#: ../rules/base.xml.in.h:685
-msgid "digits"
-msgstr "сандар"
-
-#: ../rules/base.xml.in.h:686
-msgid "displaced semicolon and quote (obsolete)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:687
-msgid "lyx"
-msgstr "lyx"
-
-#: ../rules/base.xml.in.h:688
-msgid "qwerty"
-msgstr "qwerty"
-
-#: ../rules/base.xml.in.h:689
-msgid "qwerty, extended Backslash"
-msgstr "qwerty, Backslash кеңейтилген функциялары"
-
-#: ../rules/base.xml.in.h:690
-msgid "qwerty/digits"
-msgstr "qwerty/сандар"
-
-#: ../rules/base.xml.in.h:691
-msgid "qwertz"
-msgstr "qwertz"
-
-#: ../rules/base.extras.xml.in.h:1
-msgid "APL"
-msgstr "APL"
-
-#: ../rules/base.extras.xml.in.h:2
-msgid "Atsina"
-msgstr "Атсиндик"
-
-#: ../rules/base.extras.xml.in.h:3
-msgid "Combining accents instead of dead keys"
-msgstr ""
-
-#: ../rules/base.extras.xml.in.h:4
-msgid "Couer D'alene Salish"
-msgstr "Салишдик кёр-д’ален"
-
-#: ../rules/base.extras.xml.in.h:5
-msgid "International (AltGr Unicode combining)"
-msgstr ""
-
-#: ../rules/base.extras.xml.in.h:6
-msgid "International (AltGr Unicode combining, alternative)"
-msgstr ""
-
-#~ msgid "Pro"
-#~ msgstr "Pro"
-
-#~ msgid "Pro Keypad"
-#~ msgstr "Pro кошумча панели менен"
-
-#, fuzzy
-#~ msgid "Standard Phonetic"
-#~ msgstr "Альтернативдүү фонетикалык"
-
-#~ msgid "(Legacy) Dvorak"
-#~ msgstr "(Эскирген) Dvorak"
-
-#~ msgid "Add the EuroSign to the 5 key."
-#~ msgstr "5 деген клавишага Евро белгисин кошуу."
-
-#~ msgid "Add the EuroSign to the E key."
-#~ msgstr "E клавишасына Евро белгисин кошуу."
-
-#~ msgid "Alt+Shift change layout."
-#~ msgstr "Alt+Shift раскладканы алмаштырат."
-
-#~ msgid "Brazilian ABNT2"
-#~ msgstr "Бразилдик ABNT2"
-
-#~ msgid "Press Left Alt key to choose 3rd level."
-#~ msgstr "3-чү денгээлди тандоо сол Alt клавишанын басылышы менен."
-
-#~ msgid "Press Left Win-key to choose 3rd level."
-#~ msgstr "3-чү денгээлди тандоо сол Win клавишанын басылышы менен."
-
-#~ msgid "Press Right Alt key to choose 3rd level."
-#~ msgstr "3-чү денгээлди тандоо оң Alt клавишанын басылышы менен."
-
-#~ msgid "Press Right Ctrl to choose 3rd level."
-#~ msgstr "3-чү денгээлди тандоо оң Ctrl клавишанын басылышы менен."
-
-#~ msgid "Press Right Win-key to choose 3rd level."
-#~ msgstr "3-чү денгээлди тандоо оң Win клавишанын басылышы менен."
-
-#~ msgid "Press any of Alt keys to choose 3rd level."
-#~ msgstr "3-чү денгээлди тандоо Alt клавишалардын бирөөсүнүн басылышы менен."
-
-#~ msgid "Press any of Win-keys to choose 3rd level."
-#~ msgstr "3-чү денгээлди тандоо Win клавишалардын бирөөсүнүн басылышы менен."
-
-#~ msgid "Right Win-key is Compose."
-#~ msgstr "Оң Win Compose клавишадай."
-
-#~ msgid "SCG"
-#~ msgstr "СМН"
-
-#~ msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-#~ msgstr "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-
-#~ msgid "US keyboard with Slovenian digraphs"
-#~ msgstr "АКШ клавиатурасы словендик диграфтар менен"
-
-#~ msgid "Urdu"
-#~ msgstr "Урду"
-
-#~ msgid "Use Slovenian digraphs"
-#~ msgstr "Словендик диаграфтарды колдонуу"
-
-#~ msgid "\"Typewriter\""
-#~ msgstr "Басма машинасы"
-
-#~ msgid "Alt+Control changes group"
-#~ msgstr "Alt+Control группаны алмаштырат"
-
-#~ msgid "Alt+Shift changes group"
-#~ msgstr "Alt+Shift группаны алмаштырат"
-
-#~ msgid "Belgian"
-#~ msgstr "Бельгиялык"
-
-#~ msgid "Bulgarian"
-#~ msgstr "Болгардык"
-
-#~ msgid "Canadian"
-#~ msgstr "Канаддык"
-
-#~ msgid "Caps Lock key changes group"
-#~ msgstr "Caps Lock клавишасы группаны алмаштырат"
-
-#~ msgid "Caps_Lock LED shows alternative group"
-#~ msgstr "Caps_Lock индикатору башка группаны көрсөтөт"
-
-#~ msgid "Control Key Position"
-#~ msgstr "Control клавишанын жайгашуусу"
-
-#~ msgid "Control key at bottom left"
-#~ msgstr "Control клавишасы төмөн сол жакта жайгашкан"
-
-#~ msgid "Control key at left of 'A'"
-#~ msgstr "Control клавишасы 'Ф' сол жагында"
-
-#~ msgid "Control+Shift changes group"
-#~ msgstr "Control+Shift группаны алмаштырат"
-
-#~ msgid "Czech"
-#~ msgstr "Чех"
-
-#~ msgid "Danish"
-#~ msgstr "Даттык"
-
-#~ msgid "DeuCH"
-#~ msgstr "НемШВ"
-
-#~ msgid "Dvo"
-#~ msgstr "Dvo"
-
-#~ msgid "Finnish"
-#~ msgstr "Финдик"
-
-#~ msgid "FraCH"
-#~ msgstr "ФраШВ"
-
-#~ msgid "Hungarian"
-#~ msgstr "Венгердик"
-
-#~ msgid "Italian"
-#~ msgstr "Итальяндык"
-
-#~ msgid "Japanese"
-#~ msgstr "Япондук"
-
-#~ msgid "Left Alt key changes group"
-#~ msgstr "Сол Alt клавишасы группаны алмаштырат"
-
-#~ msgid "Left Ctrl key changes group"
-#~ msgstr "Сол Ctrl клавишасы группаны алмаштырат"
-
-#~ msgid "Left Shift key changes group"
-#~ msgstr "Сол Shift клавишасы группаны алмаштырат"
-
-#~ msgid "Norwegian"
-#~ msgstr "Норвеждик"
-
-#~ msgid "Num_Lock LED shows alternative group"
-#~ msgstr "Num_Lock индикатору кошумча группаны көрсөтөт"
-
-#~ msgid "Polish"
-#~ msgstr "Польдук"
-
-#~ msgid "Portuguese"
-#~ msgstr "Португалдык"
-
-#~ msgid "Press Left Alt key to choose 3rd level"
-#~ msgstr "3-чү денгээлди тандоо сол Alt клавишанын басылышы менен."
-
-#~ msgid "Press Right Control to choose 3rd level"
-#~ msgstr "3-чү денгээлди тандоо оң Control клавишанын басылышы менен."
-
-#~ msgid "Press any of Alt keys to choose 3rd level"
-#~ msgstr "3-чү денгээлди тандоо Alt клавишалардан бирөөсүнүн басылышы менен."
-
-#~ msgid "Right Alt key changes group"
-#~ msgstr "Оң Alt клавишасы группаны алмаштырат"
-
-#~ msgid "Right Control key works as Right Alt"
-#~ msgstr "Оң Control оң Alt клавишадай"
-
-#~ msgid "Right Ctrl key changes group"
-#~ msgstr "Оң Ctrl клавишасы группаны алмаштырат"
-
-#~ msgid "Right Shift key changes group"
-#~ msgstr "Оң Shift клавишасы группаны алмаштырат"
-
-#~ msgid "Scroll_Lock LED shows alternative group"
-#~ msgstr "Scroll_Lock индикатору кошумча панелди көрсөтөт"
-
-#~ msgid "Slovak"
-#~ msgstr "Словак"
-
-#~ msgid "Spanish"
-#~ msgstr "Испандык"
-
-#~ msgid "Sun Type 4"
-#~ msgstr "Sun Type 4"
-
-#~ msgid "Sun Type 5 European"
-#~ msgstr "Sun Type 5 Европейдик"
-
-#~ msgid "Sun Type 5 Unix"
-#~ msgstr "Sun Type 5 Unix үчүн"
-
-#~ msgid "Sun Type 6"
-#~ msgstr "Sun Type 6"
-
-#~ msgid "Sun Type 6 Unix"
-#~ msgstr "Sun Type 6 Unix үчүн"
-
-#~ msgid "Sun Type 6 with Euro key"
-#~ msgstr "Sun Type 6 Евро белгиси менен"
-
-#~ msgid "Swap Control and Caps Lock"
-#~ msgstr "Control жана Caps Lock клавишалардын ордун алмаштыруу"
-
-#~ msgid "Swedish"
-#~ msgstr "Шведдик"
-
-#~ msgid "Swiss French"
-#~ msgstr "Швейцариялык французча"
-
-#~ msgid "Swiss German"
-#~ msgstr "Швейцариялык немецче"
-
-#~ msgid "Turkish"
-#~ msgstr "Түркчө"
-
-#~ msgid "Turkish (F)"
-#~ msgstr "Түркчө (F) менен"
-
-#~ msgid "Turkish Alt-Q Layout"
-#~ msgstr "Түрк раскладкасы Alt-Q менен"
-
-#~ msgid "U.S. English w/ ISO9995-3"
-#~ msgstr "Англис (АКШ) ISO9995-3 менен"
-
-#~ msgid "bksl"
-#~ msgstr "bksl"
-
-#~ msgid "type4"
-#~ msgstr "type4"
+# Translation of 'xkeyboard-config' messages to Kirghiz.
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# This file is distributed under the same license as the xkeyboard-config package.
+# Ilyas Bakirov <just_ilyas@yahoo.com>, 2009, 2010
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 1.6.99\n"
+"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
+"POT-Creation-Date: 2009-09-15 23:31+0100\n"
+"PO-Revision-Date: 2009-09-17 20:10+0600\n"
+"Last-Translator: Ilyas Bakirov <just_ilyas@yahoo.com>\n"
+"Language-Team: Kirghiz <i18n-team-ky-kyrgyz@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Kyrgyz\n"
+"X-Poedit-Country: KYRGYZSTAN\n"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2
+msgid "(Legacy) Alternative"
+msgstr "(Эскирген) Альтернативдик"
+
+#: ../rules/base.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "(Эскирген) Альтернативдик, атайын (dead keys) Sun клавишалары менен"
+
+#: ../rules/base.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "(Эскирген) Альтернативдик, атайын (dead keys) клавишаларсыз"
+
+#: ../rules/base.xml.in.h:5
+msgid "101/104 key Compatible"
+msgstr "101/104 баскычтар менен жарамдуу"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/qwerty/comma/Dead keys"
+msgstr "pc101, qwerty, үтүр, атайын (dead keys) клавишалары менен"
+
+#: ../rules/base.xml.in.h:7
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "pc101, qwerty, үтүр, атайын (dead keys) клавишаларсыз "
+
+#: ../rules/base.xml.in.h:8
+msgid "101/qwerty/dot/Dead keys"
+msgstr "pc101, qwerty, чекит, атайын (dead keys) клавшилары менен"
+
+#: ../rules/base.xml.in.h:9
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "pc101, qwerty, үтур, атайын (dead keys) клавишаларсыз"
+
+#: ../rules/base.xml.in.h:10
+msgid "101/qwertz/comma/Dead keys"
+msgstr "pc101, qwertz, үтур, атайын (dead keys) клавишалары менен"
+
+#: ../rules/base.xml.in.h:11
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "pc101, qwertz, үтүр, атайын (dead keys) клавишаларсыз"
+
+#: ../rules/base.xml.in.h:12
+msgid "101/qwertz/dot/Dead keys"
+msgstr "pc101, qwertz, чекит, атайын (dead keys) клавишалары менен"
+
+#: ../rules/base.xml.in.h:13
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "pc101, qwertz, чекит, атайын (dead keys) клавишаларсыз"
+
+#: ../rules/base.xml.in.h:14
+msgid "102/qwerty/comma/Dead keys"
+msgstr "pc102, qwerty, үтүр, атайын (dead keys) клавишалары менен"
+
+#: ../rules/base.xml.in.h:15
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "pc102, qwerty, үтүр, атаыйн (dead keys) клавишаларсыз"
+
+#: ../rules/base.xml.in.h:16
+msgid "102/qwerty/dot/Dead keys"
+msgstr "pc102, qwerty, чекит, атайын (dead keys) клавишалары менен"
+
+#: ../rules/base.xml.in.h:17
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "pc102, qwerty, чекит, атайын (dead keys) клавишаларсыз"
+
+#: ../rules/base.xml.in.h:18
+msgid "102/qwertz/comma/Dead keys"
+msgstr "pc102, qwertz, үтүр, атайын (dead keys) клавишалары менен"
+
+#: ../rules/base.xml.in.h:19
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "pc102, qwertz, үтур, атайын (dead keys) клавишаларсыз"
+
+#: ../rules/base.xml.in.h:20
+msgid "102/qwertz/dot/Dead keys"
+msgstr "pc102, qwertz, чекит, атайын (dead keys) клавишалары менен"
+
+#: ../rules/base.xml.in.h:21
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "pc102, qwertz, чекит, атайын (dead keys) клавишаларсыз"
+
+#: ../rules/base.xml.in.h:22
+msgid "2"
+msgstr "2"
+
+#: ../rules/base.xml.in.h:23
+msgid "4"
+msgstr "4"
+
+#: ../rules/base.xml.in.h:24
+msgid "5"
+msgstr "5"
+
+#: ../rules/base.xml.in.h:25
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:26
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:27
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
+
+#: ../rules/base.xml.in.h:28
+msgid "ACPI Standard"
+msgstr "ACPI стандарттуу"
+
+#: ../rules/base.xml.in.h:29
+msgid "ATM/phone-style"
+msgstr "Банкомат(ATM)/телефондук стилинде"
+
+#: ../rules/base.xml.in.h:30
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:31
+msgid "Acer C300"
+msgstr "Acer C300"
+
+#: ../rules/base.xml.in.h:32
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
+
+#: ../rules/base.xml.in.h:33
+msgid "Acer Laptop"
+msgstr "Acer ноутбугу"
+
+#: ../rules/base.xml.in.h:34
+msgid "Add the standard behavior to Menu key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:35
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:36
+msgid "Adding EuroSign to certain keys"
+msgstr "Белгилүү клавишаларга Евро белгисин кошуу."
+
+#: ../rules/base.xml.in.h:37
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../rules/base.xml.in.h:38
+msgid "Afg"
+msgstr "Афг"
+
+#: ../rules/base.xml.in.h:39
+msgid "Afghanistan"
+msgstr "Афганистан"
+
+#: ../rules/base.xml.in.h:40
+msgid "Akan"
+msgstr "Акан"
+
+#: ../rules/base.xml.in.h:41
+msgid "Alb"
+msgstr "Алб"
+
+#: ../rules/base.xml.in.h:42
+msgid "Albania"
+msgstr "Албания"
+
+#: ../rules/base.xml.in.h:43
+msgid "Alt and Meta are on Alt keys"
+msgstr "Alt жана Meta Alt клавишаларда"
+
+#: ../rules/base.xml.in.h:44
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr "Alt is mapped to Right Win, Super to Menu"
+
+#: ../rules/base.xml.in.h:45
+msgid "Alt+CapsLock"
+msgstr "Alt+CapsLock"
+
+#: ../rules/base.xml.in.h:46
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
+
+#: ../rules/base.xml.in.h:47
+msgid "Alt+Shift"
+msgstr "Alt+Shift"
+
+#: ../rules/base.xml.in.h:48
+msgid "Alt+Space"
+msgstr "Alt+Боштук"
+
+#: ../rules/base.xml.in.h:49
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:50
+msgid "Alt/Win key behavior"
+msgstr "Alt/Win клавишалары"
+
+#: ../rules/base.xml.in.h:51
+msgid "Alternative"
+msgstr "Альтернативдик"
+
+#: ../rules/base.xml.in.h:52
+msgid "Alternative Eastern"
+msgstr "Альтернативдик"
+
+#: ../rules/base.xml.in.h:53
+msgid "Alternative Phonetic"
+msgstr "Альтернативдүү фонетикалык"
+
+#: ../rules/base.xml.in.h:54
+msgid "Alternative international (former us_intl)"
+msgstr "Эларалык Альтернативдик (мурунку us_intl)"
+
+#: ../rules/base.xml.in.h:55
+msgid "Alternative, Sun dead keys"
+msgstr "Альтернативдик, атайын (dead keys) Sun клавишалары менен"
+
+#: ../rules/base.xml.in.h:56
+msgid "Alternative, eliminate dead keys"
+msgstr "Альтернативдик, атайын (dead keys) клавишаларсыз"
+
+#: ../rules/base.xml.in.h:57
+msgid "Alternative, latin-9 only"
+msgstr "Альтернативдик, latin-9 гана"
+
+#: ../rules/base.xml.in.h:58
+msgid "And"
+msgstr "Анд"
+
+#: ../rules/base.xml.in.h:59
+msgid "Andorra"
+msgstr "Андорра"
+
+#: ../rules/base.xml.in.h:60
+msgid "Any Alt key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:61
+msgid "Any Win key"
+msgstr "Каалаган Win клавишасы"
+
+#: ../rules/base.xml.in.h:62
+msgid "Any Win key (while pressed)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:63
+msgid "Apostrophe (') variant"
+msgstr "Вариант апостроф (') менен"
+
+#: ../rules/base.xml.in.h:64
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:65
+msgid "Apple Laptop"
+msgstr "Apple Ноутбугу"
+
+#: ../rules/base.xml.in.h:66
+msgid "Ara"
+msgstr "Ара"
+
+#: ../rules/base.xml.in.h:67
+msgid "Arabic"
+msgstr "Араб"
+
+#: ../rules/base.xml.in.h:68
+msgid "Arm"
+msgstr "Арм"
+
+#: ../rules/base.xml.in.h:69
+msgid "Armenia"
+msgstr "Армения"
+
+#: ../rules/base.xml.in.h:70
+msgid "Asturian variant with bottom-dot H and bottom-dot L"
+msgstr ""
+
+#: ../rules/base.xml.in.h:71
+msgid "Asus Laptop"
+msgstr "Asus ноутбугу"
+
+#: ../rules/base.xml.in.h:72
+msgid "At bottom left"
+msgstr "Төмөн сол жакта"
+
+#: ../rules/base.xml.in.h:73
+msgid "At left of 'A'"
+msgstr "'А' клавишанын сол жагында"
+
+#: ../rules/base.xml.in.h:74
+msgid "Aze"
+msgstr "Азр"
+
+#: ../rules/base.xml.in.h:75
+msgid "Azerbaijan"
+msgstr "Азербайджан"
+
+#: ../rules/base.xml.in.h:76
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 wireless Internet Keyboard"
+
+#: ../rules/base.xml.in.h:77
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:78
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: ../rules/base.xml.in.h:79
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:80
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
+
+#: ../rules/base.xml.in.h:81
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:82
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:83
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:84
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
+
+#: ../rules/base.xml.in.h:85
+msgid "BTC 9116U Mini Wireless Internet and Gaming"
+msgstr "BTC 9116U Mini Wireless Internet and Gaming"
+
+#: ../rules/base.xml.in.h:86
+msgid "Baltic+"
+msgstr "Baltic+"
+
+#: ../rules/base.xml.in.h:87
+msgid "Ban"
+msgstr "Бан"
+
+#: ../rules/base.xml.in.h:88
+msgid "Bangladesh"
+msgstr "Бангладеш"
+
+#: ../rules/base.xml.in.h:89
+msgid "Bashkirian"
+msgstr "Башкирдик"
+
+#: ../rules/base.xml.in.h:90
+msgid "Bel"
+msgstr "Бел"
+
+#: ../rules/base.xml.in.h:91
+msgid "Belarus"
+msgstr "Беларусия"
+
+#: ../rules/base.xml.in.h:92
+msgid "Belgium"
+msgstr "Бельгия"
+
+#: ../rules/base.xml.in.h:93
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
+
+#: ../rules/base.xml.in.h:94
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:95
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
+
+#: ../rules/base.xml.in.h:96
+msgid "Bengali"
+msgstr "Бенгальдык"
+
+#: ../rules/base.xml.in.h:97
+msgid "Bengali Probhat"
+msgstr "Бенгальдык Пробат"
+
+#: ../rules/base.xml.in.h:98
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Бепо, эргономикалык, Dvorak'ка окшош"
+
+#: ../rules/base.xml.in.h:99
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Бепо, эргономикалык, Dvorak'ка окшош, latin-9 гана"
+
+#: ../rules/base.xml.in.h:100
+msgid "Bgr"
+msgstr "Болг"
+
+#: ../rules/base.xml.in.h:101
+msgid "Bhu"
+msgstr "Бут"
+
+#: ../rules/base.xml.in.h:102
+msgid "Bhutan"
+msgstr "Бутан"
+
+#: ../rules/base.xml.in.h:103
+msgid "Biblical Hebrew (Tiro)"
+msgstr "Библейдик иврит (Tiro)"
+
+#: ../rules/base.xml.in.h:104
+msgid "Bih"
+msgstr "Босн"
+
+#: ../rules/base.xml.in.h:105
+msgid "Blr"
+msgstr "Бел"
+
+#: ../rules/base.xml.in.h:106
+msgid "Bosnia and Herzegovina"
+msgstr "Босния жана Герциговиния"
+
+#: ../rules/base.xml.in.h:107
+msgid "Both Alt keys together"
+msgstr "Эки Alt клавишалары бирге"
+
+#: ../rules/base.xml.in.h:108
+msgid "Both Ctrl keys together"
+msgstr "Эки Ctrl клавишалары бирге"
+
+#: ../rules/base.xml.in.h:109
+msgid "Both Shift keys together"
+msgstr "Эки Shift клавишалары бирге"
+
+#: ../rules/base.xml.in.h:110
+msgid "Bra"
+msgstr "Бра"
+
+#: ../rules/base.xml.in.h:111
+msgid "Braille"
+msgstr "Браиил"
+
+#: ../rules/base.xml.in.h:112
+msgid "Brazil"
+msgstr "Бразилия"
+
+#: ../rules/base.xml.in.h:113
+msgid "Breton"
+msgstr "Бретон"
+
+#: ../rules/base.xml.in.h:114
+msgid "Brl"
+msgstr "Брл"
+
+#: ../rules/base.xml.in.h:115
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
+
+#: ../rules/base.xml.in.h:116
+msgid "Buckwalter"
+msgstr "Buckwalter"
+
+#: ../rules/base.xml.in.h:117
+msgid "Bulgaria"
+msgstr "Болгария"
+
+#: ../rules/base.xml.in.h:118
+msgid "CRULP"
+msgstr "CRULP"
+
+#: ../rules/base.xml.in.h:119
+msgid "Cambodia"
+msgstr "Камбоджия"
+
+#: ../rules/base.xml.in.h:120
+msgid "Can"
+msgstr "Кан"
+
+#: ../rules/base.xml.in.h:121
+msgid "Canada"
+msgstr "Канада"
+
+#: ../rules/base.xml.in.h:122
+msgid "Caps Lock"
+msgstr "Caps Lock"
+
+#: ../rules/base.xml.in.h:123
+msgid "CapsLock"
+msgstr "CapsLock"
+
+#: ../rules/base.xml.in.h:124
+msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:125
+msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
+msgstr ""
+
+#: ../rules/base.xml.in.h:126
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:127
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock"
+msgstr "CapsLock Shift блокировка менен клавишасы катары амал жасайт. Shift CapsLock амалына тоскол болбойт"
+
+#: ../rules/base.xml.in.h:128
+msgid "CapsLock is disabled"
+msgstr "CapsLock иштен чыгарылды"
+
+#: ../rules/base.xml.in.h:129
+msgid "CapsLock key behavior"
+msgstr ""
+
+#: ../rules/base.xml.in.h:130
+msgid "CapsLock toggles Shift so all keys are affected"
+msgstr ""
+
+#: ../rules/base.xml.in.h:131
+msgid "CapsLock toggles normal capitalization of alphabetic characters"
+msgstr ""
+
+#: ../rules/base.xml.in.h:132
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
+msgstr "CapsLock ички капитализацыяны ачат. Shift CapsLock амалын токтотот"
+
+#: ../rules/base.xml.in.h:133
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
+msgstr "CapsLock ички капитализацыяны ачат. Shift CapsLock амалына таасир тийгизбейт"
+
+#: ../rules/base.xml.in.h:134
+msgid "Catalan variant with middle-dot L"
+msgstr ""
+
+#: ../rules/base.xml.in.h:135
+msgid "Cedilla"
+msgstr "Седиль"
+
+#: ../rules/base.xml.in.h:136
+msgid "Che"
+msgstr "Че"
+
+#: ../rules/base.xml.in.h:137
+msgid "Cherokee"
+msgstr "Чероки"
+
+#: ../rules/base.xml.in.h:138
+msgid "Cherry B.UNLIMITED"
+msgstr "Cherry B.UNLIMITED"
+
+#: ../rules/base.xml.in.h:139
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:140
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (альтернативдик)"
+
+#: ../rules/base.xml.in.h:141
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:142
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Expert"
+
+#: ../rules/base.xml.in.h:143
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:144
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
+
+#: ../rules/base.xml.in.h:145
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard"
+
+#: ../rules/base.xml.in.h:146
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:147
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
+
+#: ../rules/base.xml.in.h:148
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0420"
+
+#: ../rules/base.xml.in.h:149
+msgid "China"
+msgstr "Кытай"
+
+#: ../rules/base.xml.in.h:150
+msgid "Chuvash"
+msgstr "Чуваш"
+
+#: ../rules/base.xml.in.h:151
+msgid "Chuvash Latin"
+msgstr "Чуваш латындык"
+
+#: ../rules/base.xml.in.h:152
+msgid "Classic"
+msgstr "Классикалык"
+
+#: ../rules/base.xml.in.h:153
+msgid "Classic Dvorak"
+msgstr "Классикалык Дровак"
+
+#: ../rules/base.xml.in.h:154
+msgid "Classmate PC"
+msgstr "Classmate PC"
+
+#: ../rules/base.xml.in.h:155
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:156
+msgid "Colemak"
+msgstr "Colemak"
+
+#: ../rules/base.xml.in.h:157
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
+
+#: ../rules/base.xml.in.h:158
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq \"Интернет\" клавиатурасы (13 клавиша менен)"
+
+#: ../rules/base.xml.in.h:159
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq \"Интернет\" клавиатурасы (18 клавиша менен)"
+
+#: ../rules/base.xml.in.h:160
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq \"Интернет\" клавиатурасы  (7 клавиша менен)"
+
+#: ../rules/base.xml.in.h:161
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
+
+#: ../rules/base.xml.in.h:162
+msgid "Compose key position"
+msgstr ""
+
+#: ../rules/base.xml.in.h:163
+msgid "Congo, Democratic Republic of the"
+msgstr "Конго, Демократикалык республикасы"
+
+#: ../rules/base.xml.in.h:164
+msgid "Control + Alt + Backspace"
+msgstr ""
+
+#: ../rules/base.xml.in.h:165
+msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:166
+msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:167
+msgid "Creative Desktop Wireless 7000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:168
+msgid "Crimean Tatar (Dobruca-1 Q)"
+msgstr "Крым татардык (Dobruca-1 Q)"
+
+#: ../rules/base.xml.in.h:169
+msgid "Crimean Tatar (Dobruca-2 Q)"
+msgstr "Крым татардык (Dobruca-2 Q)"
+
+#: ../rules/base.xml.in.h:170
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Крым татардык (түрк Alt-Q)"
+
+#: ../rules/base.xml.in.h:171
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Крым татардык (түрк F)"
+
+#: ../rules/base.xml.in.h:172
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Крым татардык (түрк Q)"
+
+#: ../rules/base.xml.in.h:173
+msgid "Croatia"
+msgstr "Хорватия"
+
+#: ../rules/base.xml.in.h:174
+msgid "Ctrl key position"
+msgstr "Ctrl клавишанын жайгашуусу"
+
+#: ../rules/base.xml.in.h:175
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
+
+#: ../rules/base.xml.in.h:176
+msgid "Cyrillic"
+msgstr "Кириллица"
+
+#: ../rules/base.xml.in.h:177
+msgid "Cyrillic with guillemets"
+msgstr ""
+
+#: ../rules/base.xml.in.h:178
+msgid "Cyrillic, Z and ZHE swapped"
+msgstr "Кирилл, З жана Ж орундарын алмаштырган"
+
+#: ../rules/base.xml.in.h:179
+msgid "Cze"
+msgstr "Чех"
+
+#: ../rules/base.xml.in.h:180
+msgid "Czechia"
+msgstr "Чехия"
+
+#: ../rules/base.xml.in.h:181
+msgid "DOS"
+msgstr "DOS"
+
+#: ../rules/base.xml.in.h:182
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:183
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:184
+msgid "Dan"
+msgstr "Дан"
+
+#: ../rules/base.xml.in.h:185
+msgid "Dead acute"
+msgstr "Dead acute атайын символу"
+
+#: ../rules/base.xml.in.h:186
+msgid "Dead grave acute"
+msgstr "Dead grave acute атайын символу"
+
+#: ../rules/base.xml.in.h:187
+msgid "Default numeric keypad keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:188
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:189
+msgid "Dell 101-key PC"
+msgstr "Dell 101-клавиша менен PC"
+
+#: ../rules/base.xml.in.h:190
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dell Inspiron 6xxx/8xxx ноутбугу"
+
+#: ../rules/base.xml.in.h:191
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell Precision M сериялуу ноутбугу"
+
+#: ../rules/base.xml.in.h:192
+msgid "Dell Latitude series laptop"
+msgstr "Dell Latitude сериялуу ноутбугу"
+
+#: ../rules/base.xml.in.h:193
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
+
+#: ../rules/base.xml.in.h:194
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
+
+#: ../rules/base.xml.in.h:195
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
+
+#: ../rules/base.xml.in.h:196
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Dell USB Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:197
+msgid "Denmark"
+msgstr "Дания"
+
+#: ../rules/base.xml.in.h:198
+msgid "Deu"
+msgstr "Нем"
+
+#: ../rules/base.xml.in.h:199
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:200
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 сериялары"
+
+#: ../rules/base.xml.in.h:201
+msgid "Dvorak"
+msgstr "Дровак"
+
+#: ../rules/base.xml.in.h:202
+msgid "Dvorak (UK Punctuation)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:203
+msgid "Dvorak international"
+msgstr ""
+
+#: ../rules/base.xml.in.h:204
+msgid "Dvorak, Polish quotes on key 1"
+msgstr ""
+
+#: ../rules/base.xml.in.h:205
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:206
+msgid "E"
+msgstr "E"
+
+#: ../rules/base.xml.in.h:207
+msgid "Eastern"
+msgstr "Чыгыш"
+
+#: ../rules/base.xml.in.h:208
+msgid "Eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:209
+msgid "Enable extra typographic characters"
+msgstr ""
+
+#: ../rules/base.xml.in.h:210
+msgid "English"
+msgstr "Англис"
+
+#: ../rules/base.xml.in.h:211
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:212
+msgid "Enter on keypad"
+msgstr "Enter сандык клавиатурасында"
+
+#: ../rules/base.xml.in.h:213
+msgid "Epo"
+msgstr "Эсп"
+
+#: ../rules/base.xml.in.h:214
+msgid "Ergonomic"
+msgstr "Ergonomic"
+
+#: ../rules/base.xml.in.h:215
+msgid "Esp"
+msgstr "Исп"
+
+#: ../rules/base.xml.in.h:216
+msgid "Esperanto"
+msgstr "Эсперанто"
+
+#: ../rules/base.xml.in.h:217
+msgid "Est"
+msgstr "Эст"
+
+#: ../rules/base.xml.in.h:218
+msgid "Estonia"
+msgstr "Эстония"
+
+#: ../rules/base.xml.in.h:219
+msgid "Eth"
+msgstr "Эфп"
+
+#: ../rules/base.xml.in.h:220
+msgid "Ethiopia"
+msgstr "Эфиопия"
+
+#: ../rules/base.xml.in.h:221
+msgid "Evdev-managed keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:222
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:223
+msgid "Ewe"
+msgstr "Эве"
+
+#: ../rules/base.xml.in.h:224
+msgid "Extended"
+msgstr "Кеңейтилген"
+
+#: ../rules/base.xml.in.h:225
+msgid "Extended - Winkeys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:226
+msgid "Extended Backslash"
+msgstr ""
+
+#: ../rules/base.xml.in.h:227
+msgid "F-letter (F) variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:228
+msgid "FL90"
+msgstr "FL90"
+
+#: ../rules/base.xml.in.h:229
+msgid "Fao"
+msgstr "Фар"
+
+#: ../rules/base.xml.in.h:230
+msgid "Faroe Islands"
+msgstr "Фаро аралдары"
+
+#: ../rules/base.xml.in.h:231
+msgid "Fin"
+msgstr "Фин"
+
+#: ../rules/base.xml.in.h:232
+msgid "Finland"
+msgstr "Финляндия"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:235
+msgid "Four-level key with abstract separators"
+msgstr ""
+
+#: ../rules/base.xml.in.h:236
+msgid "Four-level key with comma"
+msgstr ""
+
+#: ../rules/base.xml.in.h:237
+msgid "Four-level key with dot"
+msgstr ""
+
+#: ../rules/base.xml.in.h:238
+msgid "Four-level key with dot, latin-9 restriction"
+msgstr ""
+
+#: ../rules/base.xml.in.h:239
+msgid "Four-level key with momayyez"
+msgstr ""
+
+#: ../rules/base.xml.in.h:240
+msgid "Fra"
+msgstr "Фра"
+
+#: ../rules/base.xml.in.h:241
+msgid "France"
+msgstr "Франция"
+
+#: ../rules/base.xml.in.h:242
+msgid "French"
+msgstr "Француз"
+
+#: ../rules/base.xml.in.h:243
+msgid "French (Macintosh)"
+msgstr "Француз (Macintosh)"
+
+#: ../rules/base.xml.in.h:244
+msgid "French (legacy)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:245
+msgid "French Dvorak"
+msgstr "Француз Dvorak"
+
+#: ../rules/base.xml.in.h:246
+msgid "French, Sun dead keys"
+msgstr "Француз,атайын (dead keys) Sun клавишалары менен"
+
+#: ../rules/base.xml.in.h:247
+msgid "French, eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:248
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Fujitsu-Siemens Computers AMILO laptop"
+
+#: ../rules/base.xml.in.h:249
+msgid "Fula"
+msgstr "Фула"
+
+#: ../rules/base.xml.in.h:250
+msgid "GBr"
+msgstr "Брит"
+
+#: ../rules/base.xml.in.h:251
+msgid "Ga"
+msgstr "Га"
+
+#: ../rules/base.xml.in.h:252
+msgid "Generic 101-key PC"
+msgstr "Жалпы 101-клавишалары менен PC"
+
+#: ../rules/base.xml.in.h:253
+msgid "Generic 102-key (Intl) PC"
+msgstr "Жалпы 102-клавишалары менен (Инт.) PC"
+
+#: ../rules/base.xml.in.h:254
+msgid "Generic 104-key PC"
+msgstr "Жалпы 104-клавишалары менен PC"
+
+#: ../rules/base.xml.in.h:255
+msgid "Generic 105-key (Intl) PC"
+msgstr "Жалпы 105-клавишалары менен (Инт.) PC"
+
+#: ../rules/base.xml.in.h:256
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:257
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+
+#: ../rules/base.xml.in.h:258
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:259
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:260
+msgid "Genius KKB-2050HS"
+msgstr "Genius KKB-2050HS"
+
+#: ../rules/base.xml.in.h:261
+msgid "Geo"
+msgstr "Груз"
+
+#: ../rules/base.xml.in.h:262
+msgid "Georgia"
+msgstr "Грузия"
+
+#: ../rules/base.xml.in.h:263
+msgid "Georgian"
+msgstr "Грузиндик"
+
+#: ../rules/base.xml.in.h:264
+msgid "Georgian AZERTY Tskapo"
+msgstr "Грузин AZERTY Tskapo"
+
+#: ../rules/base.xml.in.h:265
+msgid "German (Macintosh)"
+msgstr "Немец (Macintosh)"
+
+#: ../rules/base.xml.in.h:266
+msgid "German, Sun dead keys"
+msgstr "Немец, атайын (dead keys) Sun клавишалары менен"
+
+#: ../rules/base.xml.in.h:267
+msgid "German, eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:268
+msgid "Germany"
+msgstr "Германия"
+
+#: ../rules/base.xml.in.h:269
+msgid "Gha"
+msgstr "Ган"
+
+#: ../rules/base.xml.in.h:270
+msgid "Ghana"
+msgstr "Гана"
+
+#: ../rules/base.xml.in.h:271
+msgid "Gre"
+msgstr "Гре"
+
+#: ../rules/base.xml.in.h:272
+msgid "Greece"
+msgstr "Греция"
+
+#: ../rules/base.xml.in.h:273
+msgid "Group toggle on multiply/divide key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:274
+msgid "Gui"
+msgstr "Гви"
+
+#: ../rules/base.xml.in.h:275
+msgid "Guinea"
+msgstr "Гвинея"
+
+#: ../rules/base.xml.in.h:276
+msgid "Gujarati"
+msgstr "Гуджарати"
+
+#: ../rules/base.xml.in.h:277
+msgid "Gurmukhi"
+msgstr "Гурмукхи"
+
+#: ../rules/base.xml.in.h:278
+msgid "Gurmukhi Jhelum"
+msgstr "Гурмукхи Jhelum"
+
+#: ../rules/base.xml.in.h:279
+msgid "Gyration"
+msgstr "Гирашн"
+
+#: ../rules/base.xml.in.h:280
+msgid "Happy Hacking Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:281
+msgid "Happy Hacking Keyboard for Mac"
+msgstr ""
+
+#: ../rules/base.xml.in.h:282
+msgid "Hausa"
+msgstr "Хауза"
+
+#: ../rules/base.xml.in.h:283
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
+
+#: ../rules/base.xml.in.h:284
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:285
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:286
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:287
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:288
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:289
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:290
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:291
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
+
+#: ../rules/base.xml.in.h:292
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-250x Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:293
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
+
+#: ../rules/base.xml.in.h:294
+msgid "Hexadecimal"
+msgstr ""
+
+#: ../rules/base.xml.in.h:295
+msgid "Hindi Bolnagri"
+msgstr "Хинди Болнагри"
+
+#: ../rules/base.xml.in.h:296
+msgid "Hindi Wx"
+msgstr "Хинди Wx"
+
+#: ../rules/base.xml.in.h:297
+msgid "Homophonic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:298
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:299
+msgid "Hrv"
+msgstr "Хорв"
+
+#: ../rules/base.xml.in.h:300
+msgid "Hun"
+msgstr "Венг"
+
+#: ../rules/base.xml.in.h:301
+msgid "Hungary"
+msgstr "Венгрия"
+
+#: ../rules/base.xml.in.h:302
+msgid "Hyper is mapped to Win-keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:303
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:304
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:305
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:306
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
+
+#: ../rules/base.xml.in.h:307
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:308
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+
+#: ../rules/base.xml.in.h:309
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
+
+#: ../rules/base.xml.in.h:310
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+
+#: ../rules/base.xml.in.h:311
+msgid "ISO Alternate"
+msgstr "Кошумча ISO"
+
+#: ../rules/base.xml.in.h:312
+msgid "Iceland"
+msgstr "Исландия"
+
+#: ../rules/base.xml.in.h:313
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../rules/base.xml.in.h:314
+msgid "Include dead tilde"
+msgstr ""
+
+#: ../rules/base.xml.in.h:315
+msgid "Ind"
+msgstr "Инд"
+
+#: ../rules/base.xml.in.h:316
+msgid "India"
+msgstr "Индия"
+
+#: ../rules/base.xml.in.h:317
+msgid "International (AltGr dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:318
+msgid "International (with dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:319
+msgid "Inuktitut"
+msgstr "Иннуитская"
+
+#: ../rules/base.xml.in.h:320
+msgid "Iran"
+msgstr "Иран"
+
+#: ../rules/base.xml.in.h:321
+msgid "Iraq"
+msgstr "Ирак"
+
+#: ../rules/base.xml.in.h:322
+msgid "Ireland"
+msgstr "Ирландия"
+
+#: ../rules/base.xml.in.h:323
+msgid "Irl"
+msgstr "Ирл"
+
+#: ../rules/base.xml.in.h:324
+msgid "Irn"
+msgstr "Фарс"
+
+#: ../rules/base.xml.in.h:325
+msgid "Irq"
+msgstr "Ирк"
+
+#: ../rules/base.xml.in.h:326
+msgid "Isl"
+msgstr "Исл"
+
+#: ../rules/base.xml.in.h:327
+msgid "Isr"
+msgstr "Ивр"
+
+#: ../rules/base.xml.in.h:328
+msgid "Israel"
+msgstr "Израиль"
+
+#: ../rules/base.xml.in.h:329
+msgid "Ita"
+msgstr "Ит"
+
+#: ../rules/base.xml.in.h:330
+msgid "Italy"
+msgstr "Италия"
+
+#: ../rules/base.xml.in.h:331
+msgid "Japan"
+msgstr "Япония"
+
+#: ../rules/base.xml.in.h:332
+msgid "Japan (PC-98xx Series)"
+msgstr "Japan (PC-98xx Series)"
+
+#: ../rules/base.xml.in.h:333
+msgid "Japanese keyboard options"
+msgstr ""
+
+#: ../rules/base.xml.in.h:334
+msgid "Jpn"
+msgstr "Яп"
+
+#: ../rules/base.xml.in.h:335
+msgid "Kalmyk"
+msgstr "Калмык"
+
+#: ../rules/base.xml.in.h:336
+msgid "Kana"
+msgstr "Кана"
+
+#: ../rules/base.xml.in.h:337
+msgid "Kana Lock key is locking"
+msgstr ""
+
+#: ../rules/base.xml.in.h:338
+msgid "Kannada"
+msgstr "Каннада"
+
+#: ../rules/base.xml.in.h:339
+msgid "Kashubian"
+msgstr "Кашуб"
+
+#: ../rules/base.xml.in.h:340
+msgid "Kaz"
+msgstr "Каз"
+
+#: ../rules/base.xml.in.h:341
+msgid "Kazakh with Russian"
+msgstr "Казакча Орусча менен"
+
+#: ../rules/base.xml.in.h:342
+msgid "Kazakhstan"
+msgstr "Казахстан"
+
+#: ../rules/base.xml.in.h:343
+msgid "Key sequence to kill the X server"
+msgstr ""
+
+#: ../rules/base.xml.in.h:344
+msgid "Key to choose 3rd level"
+msgstr "3-чү денгээлди тандоо баскычы"
+
+#: ../rules/base.xml.in.h:345
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../rules/base.xml.in.h:346
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:347
+msgid "Kgz"
+msgstr "Кгз"
+
+#: ../rules/base.xml.in.h:348
+msgid "Khm"
+msgstr "Кхм"
+
+#: ../rules/base.xml.in.h:349
+msgid "Komi"
+msgstr "Коми"
+
+#: ../rules/base.xml.in.h:350
+msgid "Kor"
+msgstr "Кор"
+
+#: ../rules/base.xml.in.h:351
+msgid "Korea, Republic of"
+msgstr "Корея Республикасы"
+
+#: ../rules/base.xml.in.h:352
+msgid "Ktunaxa"
+msgstr "Кутенай"
+
+#: ../rules/base.xml.in.h:353
+msgid "Kurdish, (F)"
+msgstr "Курд, (F)"
+
+#: ../rules/base.xml.in.h:354
+msgid "Kurdish, Arabic-Latin"
+msgstr "Курд, араб-латын"
+
+#: ../rules/base.xml.in.h:355
+msgid "Kurdish, Latin Alt-Q"
+msgstr "Курд, латын Alt-Q"
+
+#: ../rules/base.xml.in.h:356
+msgid "Kurdish, Latin Q"
+msgstr "Курд, латын Q"
+
+#: ../rules/base.xml.in.h:357
+msgid "Kyrgyzstan"
+msgstr "Кыргызстан"
+
+#: ../rules/base.xml.in.h:358
+msgid "LAm"
+msgstr "ЛатАм"
+
+#: ../rules/base.xml.in.h:359
+msgid "LEKP"
+msgstr "LEKP"
+
+#: ../rules/base.xml.in.h:360
+msgid "LEKPa"
+msgstr "LEKPa"
+
+#: ../rules/base.xml.in.h:361
+msgid "Lao"
+msgstr "Лао"
+
+#: ../rules/base.xml.in.h:362
+msgid "Laos"
+msgstr "Лаос"
+
+#: ../rules/base.xml.in.h:363
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:364
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:365
+msgid "Laptop/notebook eMachines m68xx"
+msgstr ""
+
+#: ../rules/base.xml.in.h:366
+msgid "Latin"
+msgstr "Латын"
+
+#: ../rules/base.xml.in.h:367
+msgid "Latin American"
+msgstr "Латын американдык"
+
+#: ../rules/base.xml.in.h:368
+msgid "Latin Unicode"
+msgstr "Латын Unicode"
+
+#: ../rules/base.xml.in.h:369
+msgid "Latin Unicode qwerty"
+msgstr "Латын Unicode qwerty"
+
+#: ../rules/base.xml.in.h:370
+msgid "Latin qwerty"
+msgstr "Латын qwerty"
+
+#: ../rules/base.xml.in.h:371
+msgid "Latin unicode"
+msgstr "Латын unicode"
+
+#: ../rules/base.xml.in.h:372
+msgid "Latin unicode qwerty"
+msgstr "Латын unicode qwerty"
+
+#: ../rules/base.xml.in.h:373
+msgid "Latin with guillemets"
+msgstr ""
+
+#: ../rules/base.xml.in.h:374
+msgid "Latvia"
+msgstr "Латвия"
+
+#: ../rules/base.xml.in.h:375
+msgid "Lav"
+msgstr "Лат"
+
+#: ../rules/base.xml.in.h:376
+msgid "Left Alt"
+msgstr "Сол Alt"
+
+#: ../rules/base.xml.in.h:377
+msgid "Left Alt (while pressed)"
+msgstr "Сол Alt клавишасы (басылган учурда)"
+
+#: ../rules/base.xml.in.h:378
+msgid "Left Alt is swapped with Left Win"
+msgstr ""
+
+#: ../rules/base.xml.in.h:379
+msgid "Left Ctrl"
+msgstr "Сол Ctrl"
+
+#: ../rules/base.xml.in.h:380
+msgid "Left Ctrl+Left Shift"
+msgstr ""
+
+#: ../rules/base.xml.in.h:381
+msgid "Left Shift"
+msgstr "Сол Shift"
+
+#: ../rules/base.xml.in.h:382
+msgid "Left Win"
+msgstr "Сол Win"
+
+#: ../rules/base.xml.in.h:383
+msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:384
+msgid "Left Win (while pressed)"
+msgstr "Сол Alt клавишасы (басылган учурда)"
+
+#: ../rules/base.xml.in.h:385
+msgid "Left hand"
+msgstr ""
+
+#: ../rules/base.xml.in.h:386
+msgid "Left handed Dvorak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:387
+msgid "Legacy"
+msgstr "Legacy"
+
+#: ../rules/base.xml.in.h:388
+msgid "Legacy Wang 724"
+msgstr ""
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:390
+msgid "Legacy key with comma"
+msgstr ""
+
+#: ../rules/base.xml.in.h:391
+msgid "Legacy key with dot"
+msgstr ""
+
+#: ../rules/base.xml.in.h:392
+msgid "Less-than/Greater-than"
+msgstr ""
+
+#: ../rules/base.xml.in.h:393
+msgid "Lithuania"
+msgstr "Литва"
+
+#: ../rules/base.xml.in.h:394
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
+
+#: ../rules/base.xml.in.h:395
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:396
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (альтернативдик вариант)"
+
+#: ../rules/base.xml.in.h:397
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
+
+#: ../rules/base.xml.in.h:398
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:399
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:400
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:401
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgstr "Logitech Cordless Desktop Pro (альтернативдик вариант 2)"
+
+#: ../rules/base.xml.in.h:402
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:403
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:404
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15 extra keys via G15daemon"
+
+#: ../rules/base.xml.in.h:405
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech Generic Keyboard"
+
+#: ../rules/base.xml.in.h:406
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech Internet 350 Keyboard"
+
+#: ../rules/base.xml.in.h:407
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:408
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: ../rules/base.xml.in.h:409
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Media Elite Keyboard"
+
+#: ../rules/base.xml.in.h:410
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:411
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
+
+#: ../rules/base.xml.in.h:412
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge Keyboard"
+
+#: ../rules/base.xml.in.h:413
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Keyboard"
+
+#: ../rules/base.xml.in.h:414
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:415
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (Y-RB6 модели)"
+
+#: ../rules/base.xml.in.h:416
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
+
+#: ../rules/base.xml.in.h:417
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+
+#: ../rules/base.xml.in.h:418
+msgid "Lower Sorbian"
+msgstr ""
+
+#: ../rules/base.xml.in.h:419
+msgid "Lower Sorbian (qwertz)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:420
+msgid "Ltu"
+msgstr "Лит"
+
+#: ../rules/base.xml.in.h:421
+msgid "MESS"
+msgstr "MESS"
+
+#: ../rules/base.xml.in.h:422
+msgid "MNE"
+msgstr "MNE"
+
+#: ../rules/base.xml.in.h:423
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
+
+#: ../rules/base.xml.in.h:424
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (Инт.)"
+
+#: ../rules/base.xml.in.h:425
+msgid "Macedonia"
+msgstr "Македония"
+
+#: ../rules/base.xml.in.h:426
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:427
+msgid "Macintosh Old"
+msgstr "Эски Macintosh"
+
+#: ../rules/base.xml.in.h:428
+msgid "Macintosh, Sun dead keys"
+msgstr "Macintosh, атайын (dead keys) Sun клавишалары менен"
+
+#: ../rules/base.xml.in.h:429
+msgid "Macintosh, eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:430
+msgid "Make CapsLock an additional Backspace"
+msgstr "CapsLock кошумча Боштук клавиша катары колдонуу"
+
+#: ../rules/base.xml.in.h:431
+msgid "Make CapsLock an additional Ctrl"
+msgstr "CapsLock кошумча Ctrl клавиша катары колдонуу"
+
+#: ../rules/base.xml.in.h:432
+msgid "Make CapsLock an additional ESC"
+msgstr "CapsLock кошумча ESC клавиша катары колдонуу"
+
+#: ../rules/base.xml.in.h:433
+msgid "Make CapsLock an additional Hyper"
+msgstr "CapsLock кошумча Hyper клавиша катары колдонуу"
+
+#: ../rules/base.xml.in.h:434
+msgid "Make CapsLock an additional NumLock"
+msgstr "CapsLock кошумча NumLock клавиша катары колдонуу"
+
+#: ../rules/base.xml.in.h:435
+msgid "Make CapsLock an additional Super"
+msgstr "CapsLock кошумча Super клавиша катары колдонуу"
+
+#: ../rules/base.xml.in.h:436
+msgid "Mal"
+msgstr "Мал"
+
+#: ../rules/base.xml.in.h:437
+msgid "Malayalam"
+msgstr "Малайaлам"
+
+#: ../rules/base.xml.in.h:438
+msgid "Malayalam Lalitha"
+msgstr "Малайaлам (Lalitha)"
+
+#: ../rules/base.xml.in.h:439
+msgid "Maldives"
+msgstr "Мальдивалар"
+
+#: ../rules/base.xml.in.h:440
+msgid "Malta"
+msgstr "Мальта"
+
+#: ../rules/base.xml.in.h:441
+msgid "Maltese keyboard with US layout"
+msgstr ""
+
+#: ../rules/base.xml.in.h:442
+msgid "Mao"
+msgstr "Мао"
+
+#: ../rules/base.xml.in.h:443
+msgid "Maori"
+msgstr "Маори"
+
+#: ../rules/base.xml.in.h:444
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:445
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
+
+#: ../rules/base.xml.in.h:446
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:447
+msgid "Menu"
+msgstr "Menu"
+
+#: ../rules/base.xml.in.h:448
+msgid "Meta is mapped to Left Win"
+msgstr ""
+
+#: ../rules/base.xml.in.h:449
+msgid "Meta is mapped to Win keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:450
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Comfort Curve Keyboard 2000"
+
+#: ../rules/base.xml.in.h:451
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
+
+#: ../rules/base.xml.in.h:452
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, швед"
+
+#: ../rules/base.xml.in.h:453
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:454
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural Keyboard Elite"
+
+#: ../rules/base.xml.in.h:455
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:456
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: ../rules/base.xml.in.h:457
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:458
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+
+#: ../rules/base.xml.in.h:459
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
+
+#: ../rules/base.xml.in.h:460
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+
+#: ../rules/base.xml.in.h:461
+msgid "Miscellaneous compatibility options"
+msgstr ""
+
+#: ../rules/base.xml.in.h:462
+msgid "Mkd"
+msgstr "Мак"
+
+#: ../rules/base.xml.in.h:463
+msgid "Mlt"
+msgstr "Мальт"
+
+#: ../rules/base.xml.in.h:464
+msgid "Mmr"
+msgstr "Мьянм"
+
+#: ../rules/base.xml.in.h:465
+msgid "Mng"
+msgstr "Монг"
+
+#: ../rules/base.xml.in.h:466
+msgid "Mongolia"
+msgstr "Монголия"
+
+#: ../rules/base.xml.in.h:467
+msgid "Montenegro"
+msgstr "Черногория"
+
+#: ../rules/base.xml.in.h:468
+msgid "Morocco"
+msgstr "Морокко"
+
+#: ../rules/base.xml.in.h:469
+msgid "Multilingual"
+msgstr "Көп тилдүү"
+
+#: ../rules/base.xml.in.h:470
+msgid "Multilingual, first part"
+msgstr "Көп тилдүү, биринчи бөлүк"
+
+#: ../rules/base.xml.in.h:471
+msgid "Multilingual, second part"
+msgstr "Көп тилдүү, экинчи бөлүк"
+
+#: ../rules/base.xml.in.h:472
+msgid "Myanmar"
+msgstr "Мьянмар"
+
+#: ../rules/base.xml.in.h:473
+msgid "NICOLA-F style Backspace"
+msgstr ""
+
+#: ../rules/base.xml.in.h:474
+msgid "NLA"
+msgstr "NLA"
+
+#: ../rules/base.xml.in.h:475
+msgid "Nativo"
+msgstr "Nativo"
+
+#: ../rules/base.xml.in.h:476
+msgid "Nativo for Esperanto"
+msgstr "Nativo эсперанто үчүн"
+
+#: ../rules/base.xml.in.h:477
+msgid "Nativo for USA keyboards"
+msgstr ""
+
+#: ../rules/base.xml.in.h:478
+msgid "Neo 2"
+msgstr "Neo 2"
+
+#: ../rules/base.xml.in.h:479
+msgid "Nep"
+msgstr "Неп"
+
+#: ../rules/base.xml.in.h:480
+msgid "Nepal"
+msgstr "Непал"
+
+#: ../rules/base.xml.in.h:481
+msgid "Netherlands"
+msgstr "Нидерландия"
+
+#: ../rules/base.xml.in.h:482
+msgid "New phonetic"
+msgstr "Жаңы фонетикалык"
+
+#: ../rules/base.xml.in.h:483
+msgid "Nig"
+msgstr "Нгр"
+
+#: ../rules/base.xml.in.h:484
+msgid "Nigeria"
+msgstr "Нигерия"
+
+#: ../rules/base.xml.in.h:485
+msgid "Nld"
+msgstr "Флам"
+
+#: ../rules/base.xml.in.h:486
+msgid "Non-breakable space character at fourth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:487
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:488
+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:489
+msgid "Non-breakable space character at second level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:490
+msgid "Non-breakable space character at third level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:491
+msgid "Non-breakable space character at third level, nothing at fourth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:492
+msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:493
+msgid "Nor"
+msgstr "Нор"
+
+#: ../rules/base.xml.in.h:494
+msgid "Northern Saami"
+msgstr "Түндүк Саами"
+
+#: ../rules/base.xml.in.h:495
+msgid "Northern Saami, eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:496
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:497
+msgid "Norway"
+msgstr "Норвегия"
+
+#: ../rules/base.xml.in.h:498
+msgid "NumLock"
+msgstr "NumLock"
+
+#: ../rules/base.xml.in.h:499
+msgid "Numeric keypad delete key behaviour"
+msgstr ""
+
+#: ../rules/base.xml.in.h:500
+msgid "Numeric keypad keys work as with Mac"
+msgstr ""
+
+#: ../rules/base.xml.in.h:501
+msgid "Numeric keypad layout selection"
+msgstr ""
+
+#: ../rules/base.xml.in.h:502
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:503
+msgid "OLPC"
+msgstr "OLPC"
+
+#: ../rules/base.xml.in.h:504
+msgid "OLPC Dari"
+msgstr "OLPC Dari"
+
+#: ../rules/base.xml.in.h:505
+msgid "OLPC Pashto"
+msgstr "OLPC Pashto"
+
+#: ../rules/base.xml.in.h:506
+msgid "OLPC Southern Uzbek"
+msgstr "Түштүк-өзбөк OLPC"
+
+#: ../rules/base.xml.in.h:507
+msgid "Occitan"
+msgstr "Окситандык"
+
+#: ../rules/base.xml.in.h:508
+msgid "Ogham"
+msgstr "Огхам"
+
+#: ../rules/base.xml.in.h:509
+msgid "Ogham IS434"
+msgstr "Огхам IS434"
+
+#: ../rules/base.xml.in.h:510
+msgid "Oriya"
+msgstr "Орийя"
+
+#: ../rules/base.xml.in.h:511
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/Internet keyboard"
+
+#: ../rules/base.xml.in.h:512
+msgid "Ossetian"
+msgstr "Осетиндик"
+
+#: ../rules/base.xml.in.h:513
+msgid "Ossetian, Winkeys"
+msgstr "Осетиндик Windows клавиатурасы"
+
+#: ../rules/base.xml.in.h:514
+msgid "Ossetian, legacy"
+msgstr "Осетиндик, эскирген"
+
+#: ../rules/base.xml.in.h:515
+msgid "PC-98xx Series"
+msgstr "PC-98xx"
+
+#: ../rules/base.xml.in.h:516
+msgid "Pak"
+msgstr "Пак"
+
+#: ../rules/base.xml.in.h:517
+msgid "Pakistan"
+msgstr "Пакистан"
+
+#: ../rules/base.xml.in.h:518
+msgid "Pashto"
+msgstr "Пуштундук"
+
+#: ../rules/base.xml.in.h:519
+msgid "Pattachote"
+msgstr "Паттачот"
+
+#: ../rules/base.xml.in.h:520
+msgid "Persian, with Persian Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:521
+msgid "Phonetic"
+msgstr "Фонетикалык"
+
+#: ../rules/base.xml.in.h:522
+msgid "Phonetic Winkeys"
+msgstr "Win клавишалары менен фонетикалык"
+
+#: ../rules/base.xml.in.h:523
+msgid "Pol"
+msgstr "Польск"
+
+#: ../rules/base.xml.in.h:524
+msgid "Poland"
+msgstr "Польша"
+
+#: ../rules/base.xml.in.h:525
+msgid "Polytonic"
+msgstr "Полифоникалык"
+
+#: ../rules/base.xml.in.h:526
+msgid "Portugal"
+msgstr "Португалия"
+
+#: ../rules/base.xml.in.h:527
+msgid "Probhat"
+msgstr "Пробат"
+
+#: ../rules/base.xml.in.h:528
+msgid "Programmer Dvorak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:529
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:530
+msgid "Prt"
+msgstr "Порт"
+
+#: ../rules/base.xml.in.h:531
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:532
+msgid "Right Alt"
+msgstr "Оң Alt"
+
+#: ../rules/base.xml.in.h:533
+msgid "Right Alt (while pressed)"
+msgstr "Оң Alt клавишасы (басылган учурда)"
+
+#: ../rules/base.xml.in.h:534
+msgid "Right Alt key never chooses 3rd level"
+msgstr "Оң Alt клавишасы эч качан 3-чү денгээлди тандабайт"
+
+#: ../rules/base.xml.in.h:535
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr "Оң Alt, Shift жана оң Alt бирге Multi_Key катары амал жасайт"
+
+#: ../rules/base.xml.in.h:536
+msgid "Right Ctrl"
+msgstr "Оң Ctrl"
+
+#: ../rules/base.xml.in.h:537
+msgid "Right Ctrl (while pressed)"
+msgstr "Оң Alt клавишасы (басылган учурда)"
+
+#: ../rules/base.xml.in.h:538
+msgid "Right Ctrl as Right Alt"
+msgstr "Оң Ctrl оң Alt клавишадай амал жасайт"
+
+#: ../rules/base.xml.in.h:539
+msgid "Right Shift"
+msgstr "Оң Shift"
+
+#: ../rules/base.xml.in.h:540
+msgid "Right Win"
+msgstr "Оң Win"
+
+#: ../rules/base.xml.in.h:541
+msgid "Right Win (while pressed)"
+msgstr "Оң Win клавишасы (басылган учурда)"
+
+#: ../rules/base.xml.in.h:542
+msgid "Right hand"
+msgstr ""
+
+#: ../rules/base.xml.in.h:543
+msgid "Right handed Dvorak"
+msgstr "Dvorak оң колдуу адамдар үчүн"
+
+#: ../rules/base.xml.in.h:544
+msgid "Romania"
+msgstr "Румыния"
+
+#: ../rules/base.xml.in.h:545
+msgid "Romanian keyboard with German letters"
+msgstr "Румындык клавиатура немец ариптери менен"
+
+#: ../rules/base.xml.in.h:546
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Румындык клавиатура немец ариптери менен, атайын (dead keys) клавишаларсыз"
+
+#: ../rules/base.xml.in.h:547
+msgid "Rou"
+msgstr "Рум"
+
+#: ../rules/base.xml.in.h:548
+msgid "Rus"
+msgstr "Рус"
+
+#: ../rules/base.xml.in.h:549
+msgid "Russia"
+msgstr "Россия"
+
+#: ../rules/base.xml.in.h:550
+msgid "Russian"
+msgstr "Орусча"
+
+#: ../rules/base.xml.in.h:551
+msgid "Russian phonetic"
+msgstr "Орусча фонетикалык"
+
+#: ../rules/base.xml.in.h:552
+msgid "Russian phonetic Dvorak"
+msgstr "Орусча фонетикалык Dvorak"
+
+#: ../rules/base.xml.in.h:553
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Орусча фонетикалык, атайын (dead keys) клавишаларсыз"
+
+#: ../rules/base.xml.in.h:554
+msgid "Russian with Kazakh"
+msgstr "Орусча Казакча менен"
+
+#: ../rules/base.xml.in.h:555
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
+
+#: ../rules/base.xml.in.h:556
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:557
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:558
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:559
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:560 ../rules/base.extras.xml.in.h:7
+msgid "SRB"
+msgstr "SRB"
+
+#: ../rules/base.xml.in.h:561
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:562
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
+
+#: ../rules/base.xml.in.h:563
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:564
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:565
+msgid "Scroll Lock"
+msgstr "Scroll Lock"
+
+#: ../rules/base.xml.in.h:566
+msgid "ScrollLock"
+msgstr "ScrollLock"
+
+#: ../rules/base.xml.in.h:567
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+#: ../rules/base.xml.in.h:568
+msgid "Semi-colon on third level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:569 ../rules/base.extras.xml.in.h:8
+msgid "Serbia"
+msgstr "Сербия"
+
+#: ../rules/base.xml.in.h:570
+msgid "Shift cancels CapsLock"
+msgstr "Shift CapsLock амалын очүрөт"
+
+#: ../rules/base.xml.in.h:571
+msgid "Shift does not cancel NumLock, chooses 3d level instead"
+msgstr ""
+
+#: ../rules/base.xml.in.h:572
+msgid "Shift with numeric keypad keys works as in MS Windows"
+msgstr "Shift сандык клавиатура клавишалары менен MS Windows'тогу клавишадай амал жасайт"
+
+#: ../rules/base.xml.in.h:573
+msgid "Shift+CapsLock"
+msgstr "Shift+CapsLock"
+
+#: ../rules/base.xml.in.h:574
+msgid "Simple"
+msgstr "Жөнөкөй"
+
+#: ../rules/base.xml.in.h:575
+msgid "Slovakia"
+msgstr "Словакия"
+
+#: ../rules/base.xml.in.h:576
+msgid "Slovenia"
+msgstr "Словения"
+
+#: ../rules/base.xml.in.h:577
+msgid "South Africa"
+msgstr "Түштүк Африка"
+
+#: ../rules/base.xml.in.h:578
+msgid "Southern Uzbek"
+msgstr "Түштүк өзбөкчө"
+
+#: ../rules/base.xml.in.h:579
+msgid "Spain"
+msgstr "Испания"
+
+#: ../rules/base.xml.in.h:580
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
+msgstr "Атайын клавишалар (Ctrl+Alt+&lt;клв&gt;) сервер менен долборлонот"
+
+#: ../rules/base.xml.in.h:581
+msgid "SrL"
+msgstr "ШрЛ"
+
+#: ../rules/base.xml.in.h:582
+msgid "Sri Lanka"
+msgstr "Шри Ланка"
+
+#: ../rules/base.xml.in.h:583
+msgid "Standard"
+msgstr "Стандарттык"
+
+#: ../rules/base.xml.in.h:584
+msgid "Standard (Cedilla)"
+msgstr "Стандарттык (Седиль)"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:586
+msgid "Standard RSTU"
+msgstr "Стандарттык RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:588
+msgid "Standard RSTU on Russian layout"
+msgstr "Стандарттык RSTU, орусча"
+
+#: ../rules/base.xml.in.h:589
+msgid "Sun Type 5/6"
+msgstr "Sun Type 5/6"
+
+#: ../rules/base.xml.in.h:590
+msgid "Sun dead keys"
+msgstr "Атайын (dead keys) Sun клавишалар"
+
+#: ../rules/base.xml.in.h:591
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:592
+msgid "Svdvorak"
+msgstr "Svdvorak"
+
+#: ../rules/base.xml.in.h:593
+msgid "Svk"
+msgstr "Слов"
+
+#: ../rules/base.xml.in.h:594
+msgid "Svn"
+msgstr "Cловен"
+
+#: ../rules/base.xml.in.h:595
+msgid "Swap Ctrl and CapsLock"
+msgstr "Ctrl жана CapsLock клавишаларды алмаштыруу"
+
+#: ../rules/base.xml.in.h:596
+msgid "Swap ESC and CapsLock"
+msgstr "ESC жана CapsLock клавишаларды алмаштыруу"
+
+#: ../rules/base.xml.in.h:597
+msgid "Swe"
+msgstr "Швед"
+
+#: ../rules/base.xml.in.h:598
+msgid "Sweden"
+msgstr "Швеция"
+
+#: ../rules/base.xml.in.h:599
+msgid "Switzerland"
+msgstr "Швейцария"
+
+#: ../rules/base.xml.in.h:600
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (чөнтөк ПК)"
+
+#: ../rules/base.xml.in.h:601
+msgid "Syr"
+msgstr "Асс"
+
+#: ../rules/base.xml.in.h:602
+msgid "Syria"
+msgstr "Сирийдик"
+
+#: ../rules/base.xml.in.h:603
+msgid "Syriac"
+msgstr "Сирийдик"
+
+#: ../rules/base.xml.in.h:604
+msgid "Syriac phonetic"
+msgstr "Сирийдик фонетикалык"
+
+#: ../rules/base.xml.in.h:605
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:606
+msgid "Tajikistan"
+msgstr "Таджикистан"
+
+#: ../rules/base.xml.in.h:607
+msgid "Tamil"
+msgstr "Тамильдик"
+
+#: ../rules/base.xml.in.h:608
+msgid "Tamil TAB Typewriter"
+msgstr "Тамильдик \"Басма машинасы\" TAB"
+
+#: ../rules/base.xml.in.h:609
+msgid "Tamil TSCII Typewriter"
+msgstr "Тамиль TSCII печать машинасы"
+
+#: ../rules/base.xml.in.h:610
+msgid "Tamil Unicode"
+msgstr "Тамиль Unicode"
+
+#: ../rules/base.xml.in.h:611
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
+
+#: ../rules/base.xml.in.h:612
+msgid "Tatar"
+msgstr "Татар"
+
+#: ../rules/base.xml.in.h:613
+msgid "Telugu"
+msgstr "Телугу"
+
+#: ../rules/base.xml.in.h:614
+msgid "Tha"
+msgstr "Тай"
+
+#: ../rules/base.xml.in.h:615
+msgid "Thailand"
+msgstr "Тайланд"
+
+#: ../rules/base.xml.in.h:616
+msgid "Tibetan"
+msgstr "Тибет"
+
+#: ../rules/base.xml.in.h:617
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Тибет (ASCII номерлери менен)"
+
+#: ../rules/base.xml.in.h:618
+msgid "Tifinagh"
+msgstr "Тифинагдык"
+
+#: ../rules/base.xml.in.h:619
+msgid "Tifinagh Alternative"
+msgstr "Тифинагдык альтернативдик"
+
+#: ../rules/base.xml.in.h:620
+msgid "Tifinagh Alternative Phonetic"
+msgstr "Тифинагдык альтернативдик фонетикалык"
+
+#: ../rules/base.xml.in.h:621
+msgid "Tifinagh Extended"
+msgstr "Тифинагдык кеңейтилген"
+
+#: ../rules/base.xml.in.h:622
+msgid "Tifinagh Extended Phonetic"
+msgstr "Тифинагдык кеңейтилген фонетикалык"
+
+#: ../rules/base.xml.in.h:623
+msgid "Tifinagh Phonetic"
+msgstr "Тифинагдык фонетикалык"
+
+#: ../rules/base.xml.in.h:624
+msgid "Tilde (~) variant"
+msgstr "Тильда (~) менен вариант"
+
+#: ../rules/base.xml.in.h:625
+msgid "Tjk"
+msgstr "Тадж"
+
+#: ../rules/base.xml.in.h:626
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr ""
+
+#: ../rules/base.xml.in.h:627
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr ""
+
+#: ../rules/base.xml.in.h:628
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:629
+msgid "Traditional phonetic"
+msgstr "Традициондук фонетикалык"
+
+#: ../rules/base.xml.in.h:630
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: ../rules/base.xml.in.h:631
+msgid "Trust Slimline"
+msgstr "Trust Slimline"
+
+#: ../rules/base.xml.in.h:632
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: ../rules/base.xml.in.h:633
+msgid "Tur"
+msgstr "Тур"
+
+#: ../rules/base.xml.in.h:634
+msgid "Turkey"
+msgstr "Турция"
+
+#: ../rules/base.xml.in.h:635
+msgid "Turkmenistan"
+msgstr "Түркменистан"
+
+#: ../rules/base.xml.in.h:636
+msgid "Typewriter"
+msgstr "Басма машинасы"
+
+#: ../rules/base.xml.in.h:637
+msgid "UCW layout (accented letters only)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:638
+msgid "US keyboard with Bosnian digraphs"
+msgstr "АКШ клавиатурасы боснийдик диграфтар менен"
+
+#: ../rules/base.xml.in.h:639
+msgid "US keyboard with Bosnian letters"
+msgstr "АКШ клавиатурасы боснийдик ариптер менен"
+
+#: ../rules/base.xml.in.h:640
+msgid "US keyboard with Croatian digraphs"
+msgstr "АКШ клавиатурасы хорваттык диграфтар менен"
+
+#: ../rules/base.xml.in.h:641
+msgid "US keyboard with Croatian letters"
+msgstr "АКШ клавиатурасы хорваттык ариптер менен"
+
+#: ../rules/base.xml.in.h:642
+msgid "US keyboard with Estonian letters"
+msgstr "АКШ клавиатурасы эстондук ариптер менен"
+
+#: ../rules/base.xml.in.h:643
+msgid "US keyboard with Italian letters"
+msgstr "АКШ клавиатурасы итальяндык ариптер менен"
+
+#: ../rules/base.xml.in.h:644
+msgid "US keyboard with Lithuanian letters"
+msgstr "АКШ клавиатурасы литовдук ариптер менен"
+
+#: ../rules/base.xml.in.h:645
+msgid "US keyboard with Slovenian letters"
+msgstr "АКШ клавиатурасы словендик ариптер менен"
+
+#: ../rules/base.xml.in.h:646 ../rules/base.extras.xml.in.h:9
+msgid "USA"
+msgstr "АКШ"
+
+#: ../rules/base.xml.in.h:647
+msgid "Udmurt"
+msgstr "Удмурттук"
+
+#: ../rules/base.xml.in.h:648
+msgid "Ukr"
+msgstr "Укр"
+
+#: ../rules/base.xml.in.h:649
+msgid "Ukraine"
+msgstr "Украина"
+
+#: ../rules/base.xml.in.h:650
+msgid "Unicode additions (arrows and math operators)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:651
+msgid "Unicode additions (arrows and math operators). Math operators on default level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:652
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:653
+msgid "United Kingdom"
+msgstr "Англис (Улуу Британия)"
+
+#: ../rules/base.xml.in.h:654
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
+
+#: ../rules/base.xml.in.h:655
+msgid "Urdu, Alternative phonetic"
+msgstr "Урду, альтернативдик фонетикалык"
+
+#: ../rules/base.xml.in.h:656
+msgid "Urdu, Phonetic"
+msgstr "Урду, фонетикалык"
+
+#: ../rules/base.xml.in.h:657
+msgid "Urdu, Winkeys"
+msgstr "Урду, Windows клавишалары менен"
+
+#: ../rules/base.xml.in.h:658
+msgid "Use Bosnian digraphs"
+msgstr "Боснийдик диаграфтарды колдонуу"
+
+#: ../rules/base.xml.in.h:659
+msgid "Use Croatian digraphs"
+msgstr "Хорваттык диаграфтарды колдонуу"
+
+#: ../rules/base.xml.in.h:660
+msgid "Use guillemets for quotes"
+msgstr "Француздук тырмакчаларды тырмакчалардай колдонуу"
+
+#: ../rules/base.xml.in.h:661
+msgid "Use keyboard LED to show alternative layout"
+msgstr "Клавиатура индикаторлорду кошумча группаларды көрсөтүү үчүн колдонуу"
+
+#: ../rules/base.xml.in.h:662
+msgid "Using space key to input non-breakable space character"
+msgstr ""
+
+#: ../rules/base.xml.in.h:663
+msgid "Usual space at any level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:664
+msgid "Uzb"
+msgstr "Өзб"
+
+#: ../rules/base.xml.in.h:665
+msgid "Uzbekistan"
+msgstr "Өзбекистан"
+
+#: ../rules/base.xml.in.h:666
+msgid "Vietnam"
+msgstr "Вьетнам"
+
+#: ../rules/base.xml.in.h:667
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "ViewSonic KU-306 Internet Keyboard"
+
+#: ../rules/base.xml.in.h:668
+msgid "Vnm"
+msgstr "Вьет"
+
+#: ../rules/base.xml.in.h:669
+msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:670
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:671
+msgid "Wang model 724 azerty"
+msgstr "Wang model 724 azerty"
+
+#: ../rules/base.xml.in.h:672
+msgid "Western"
+msgstr "Батыш"
+
+#: ../rules/base.xml.in.h:673
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:674
+msgid "Winkeys"
+msgstr "Windows клавиатурасы"
+
+#: ../rules/base.xml.in.h:675
+msgid "With &lt;\\|&gt; key"
+msgstr "&lt;\\|&gt; клавиша менен"
+
+#: ../rules/base.xml.in.h:676
+msgid "With EuroSign on 5"
+msgstr ""
+
+#: ../rules/base.xml.in.h:677
+msgid "With guillemets"
+msgstr "Француздук тырмакчалар менен"
+
+#: ../rules/base.xml.in.h:678
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
+
+#: ../rules/base.xml.in.h:679
+msgid "Yakut"
+msgstr "Якуттук"
+
+#: ../rules/base.xml.in.h:680
+msgid "Yoruba"
+msgstr "Йоруба"
+
+#: ../rules/base.xml.in.h:681
+msgid "Z and ZHE swapped"
+msgstr "З жана Ж орундарын алмаштырган"
+
+#: ../rules/base.xml.in.h:682
+msgid "Zar"
+msgstr "ЮАР"
+
+#: ../rules/base.xml.in.h:683
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:684
+msgid "azerty/digits"
+msgstr "azerty/цифры"
+
+#: ../rules/base.xml.in.h:685
+msgid "digits"
+msgstr "сандар"
+
+#: ../rules/base.xml.in.h:686
+msgid "displaced semicolon and quote (obsolete)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:687
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:688
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:689
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, Backslash кеңейтилген функциялары"
+
+#: ../rules/base.xml.in.h:690
+msgid "qwerty/digits"
+msgstr "qwerty/сандар"
+
+#: ../rules/base.xml.in.h:691
+msgid "qwertz"
+msgstr "qwertz"
+
+#: ../rules/base.extras.xml.in.h:1
+msgid "APL"
+msgstr "APL"
+
+#: ../rules/base.extras.xml.in.h:2
+msgid "Atsina"
+msgstr "Атсиндик"
+
+#: ../rules/base.extras.xml.in.h:3
+msgid "Combining accents instead of dead keys"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:4
+msgid "Couer D'alene Salish"
+msgstr "Салишдик кёр-д’ален"
+
+#: ../rules/base.extras.xml.in.h:5
+msgid "International (AltGr Unicode combining)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:6
+msgid "International (AltGr Unicode combining, alternative)"
+msgstr ""
+
+#~ msgid "Pro"
+#~ msgstr "Pro"
+
+#~ msgid "Pro Keypad"
+#~ msgstr "Pro кошумча панели менен"
+
+#, fuzzy
+#~ msgid "Standard Phonetic"
+#~ msgstr "Альтернативдүү фонетикалык"
+
+#~ msgid "(Legacy) Dvorak"
+#~ msgstr "(Эскирген) Dvorak"
+
+#~ msgid "Add the EuroSign to the 5 key."
+#~ msgstr "5 деген клавишага Евро белгисин кошуу."
+
+#~ msgid "Add the EuroSign to the E key."
+#~ msgstr "E клавишасына Евро белгисин кошуу."
+
+#~ msgid "Alt+Shift change layout."
+#~ msgstr "Alt+Shift раскладканы алмаштырат."
+
+#~ msgid "Brazilian ABNT2"
+#~ msgstr "Бразилдик ABNT2"
+
+#~ msgid "Press Left Alt key to choose 3rd level."
+#~ msgstr "3-чү денгээлди тандоо сол Alt клавишанын басылышы менен."
+
+#~ msgid "Press Left Win-key to choose 3rd level."
+#~ msgstr "3-чү денгээлди тандоо сол Win клавишанын басылышы менен."
+
+#~ msgid "Press Right Alt key to choose 3rd level."
+#~ msgstr "3-чү денгээлди тандоо оң Alt клавишанын басылышы менен."
+
+#~ msgid "Press Right Ctrl to choose 3rd level."
+#~ msgstr "3-чү денгээлди тандоо оң Ctrl клавишанын басылышы менен."
+
+#~ msgid "Press Right Win-key to choose 3rd level."
+#~ msgstr "3-чү денгээлди тандоо оң Win клавишанын басылышы менен."
+
+#~ msgid "Press any of Alt keys to choose 3rd level."
+#~ msgstr "3-чү денгээлди тандоо Alt клавишалардын бирөөсүнүн басылышы менен."
+
+#~ msgid "Press any of Win-keys to choose 3rd level."
+#~ msgstr "3-чү денгээлди тандоо Win клавишалардын бирөөсүнүн басылышы менен."
+
+#~ msgid "Right Win-key is Compose."
+#~ msgstr "Оң Win Compose клавишадай."
+
+#~ msgid "SCG"
+#~ msgstr "СМН"
+
+#~ msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+#~ msgstr "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+
+#~ msgid "US keyboard with Slovenian digraphs"
+#~ msgstr "АКШ клавиатурасы словендик диграфтар менен"
+
+#~ msgid "Urdu"
+#~ msgstr "Урду"
+
+#~ msgid "Use Slovenian digraphs"
+#~ msgstr "Словендик диаграфтарды колдонуу"
+
+#~ msgid "\"Typewriter\""
+#~ msgstr "Басма машинасы"
+
+#~ msgid "Alt+Control changes group"
+#~ msgstr "Alt+Control группаны алмаштырат"
+
+#~ msgid "Alt+Shift changes group"
+#~ msgstr "Alt+Shift группаны алмаштырат"
+
+#~ msgid "Belgian"
+#~ msgstr "Бельгиялык"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Болгардык"
+
+#~ msgid "Canadian"
+#~ msgstr "Канаддык"
+
+#~ msgid "Caps Lock key changes group"
+#~ msgstr "Caps Lock клавишасы группаны алмаштырат"
+
+#~ msgid "Caps_Lock LED shows alternative group"
+#~ msgstr "Caps_Lock индикатору башка группаны көрсөтөт"
+
+#~ msgid "Control Key Position"
+#~ msgstr "Control клавишанын жайгашуусу"
+
+#~ msgid "Control key at bottom left"
+#~ msgstr "Control клавишасы төмөн сол жакта жайгашкан"
+
+#~ msgid "Control key at left of 'A'"
+#~ msgstr "Control клавишасы 'Ф' сол жагында"
+
+#~ msgid "Control+Shift changes group"
+#~ msgstr "Control+Shift группаны алмаштырат"
+
+#~ msgid "Czech"
+#~ msgstr "Чех"
+
+#~ msgid "Danish"
+#~ msgstr "Даттык"
+
+#~ msgid "DeuCH"
+#~ msgstr "НемШВ"
+
+#~ msgid "Dvo"
+#~ msgstr "Dvo"
+
+#~ msgid "Finnish"
+#~ msgstr "Финдик"
+
+#~ msgid "FraCH"
+#~ msgstr "ФраШВ"
+
+#~ msgid "Hungarian"
+#~ msgstr "Венгердик"
+
+#~ msgid "Italian"
+#~ msgstr "Итальяндык"
+
+#~ msgid "Japanese"
+#~ msgstr "Япондук"
+
+#~ msgid "Left Alt key changes group"
+#~ msgstr "Сол Alt клавишасы группаны алмаштырат"
+
+#~ msgid "Left Ctrl key changes group"
+#~ msgstr "Сол Ctrl клавишасы группаны алмаштырат"
+
+#~ msgid "Left Shift key changes group"
+#~ msgstr "Сол Shift клавишасы группаны алмаштырат"
+
+#~ msgid "Norwegian"
+#~ msgstr "Норвеждик"
+
+#~ msgid "Num_Lock LED shows alternative group"
+#~ msgstr "Num_Lock индикатору кошумча группаны көрсөтөт"
+
+#~ msgid "Polish"
+#~ msgstr "Польдук"
+
+#~ msgid "Portuguese"
+#~ msgstr "Португалдык"
+
+#~ msgid "Press Left Alt key to choose 3rd level"
+#~ msgstr "3-чү денгээлди тандоо сол Alt клавишанын басылышы менен."
+
+#~ msgid "Press Right Control to choose 3rd level"
+#~ msgstr "3-чү денгээлди тандоо оң Control клавишанын басылышы менен."
+
+#~ msgid "Press any of Alt keys to choose 3rd level"
+#~ msgstr "3-чү денгээлди тандоо Alt клавишалардан бирөөсүнүн басылышы менен."
+
+#~ msgid "Right Alt key changes group"
+#~ msgstr "Оң Alt клавишасы группаны алмаштырат"
+
+#~ msgid "Right Control key works as Right Alt"
+#~ msgstr "Оң Control оң Alt клавишадай"
+
+#~ msgid "Right Ctrl key changes group"
+#~ msgstr "Оң Ctrl клавишасы группаны алмаштырат"
+
+#~ msgid "Right Shift key changes group"
+#~ msgstr "Оң Shift клавишасы группаны алмаштырат"
+
+#~ msgid "Scroll_Lock LED shows alternative group"
+#~ msgstr "Scroll_Lock индикатору кошумча панелди көрсөтөт"
+
+#~ msgid "Slovak"
+#~ msgstr "Словак"
+
+#~ msgid "Spanish"
+#~ msgstr "Испандык"
+
+#~ msgid "Sun Type 4"
+#~ msgstr "Sun Type 4"
+
+#~ msgid "Sun Type 5 European"
+#~ msgstr "Sun Type 5 Европейдик"
+
+#~ msgid "Sun Type 5 Unix"
+#~ msgstr "Sun Type 5 Unix үчүн"
+
+#~ msgid "Sun Type 6"
+#~ msgstr "Sun Type 6"
+
+#~ msgid "Sun Type 6 Unix"
+#~ msgstr "Sun Type 6 Unix үчүн"
+
+#~ msgid "Sun Type 6 with Euro key"
+#~ msgstr "Sun Type 6 Евро белгиси менен"
+
+#~ msgid "Swap Control and Caps Lock"
+#~ msgstr "Control жана Caps Lock клавишалардын ордун алмаштыруу"
+
+#~ msgid "Swedish"
+#~ msgstr "Шведдик"
+
+#~ msgid "Swiss French"
+#~ msgstr "Швейцариялык французча"
+
+#~ msgid "Swiss German"
+#~ msgstr "Швейцариялык немецче"
+
+#~ msgid "Turkish"
+#~ msgstr "Түркчө"
+
+#~ msgid "Turkish (F)"
+#~ msgstr "Түркчө (F) менен"
+
+#~ msgid "Turkish Alt-Q Layout"
+#~ msgstr "Түрк раскладкасы Alt-Q менен"
+
+#~ msgid "U.S. English w/ ISO9995-3"
+#~ msgstr "Англис (АКШ) ISO9995-3 менен"
+
+#~ msgid "bksl"
+#~ msgstr "bksl"
+
+#~ msgid "type4"
+#~ msgstr "type4"
diff --git a/xorg-server/xkeyboard-config/po/nb.po b/xorg-server/xkeyboard-config/po/nb.po
index ce3b94416..ffac02c31 100644
--- a/xorg-server/xkeyboard-config/po/nb.po
+++ b/xorg-server/xkeyboard-config/po/nb.po
@@ -1,2689 +1,2689 @@
-# Norwegian bokmaal translation of xkeyboard-config.
-# Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the xkeyboard-config package.
-# Kjartan Maraas <kmaraas@gnome.org>, 2007-2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: xkeyboard-config 1.5\n"
-"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-13 23:12+0000\n"
-"PO-Revision-Date: 2009-04-12 11:33+0200\n"
-"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
-"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../rules/base.xml.in.h:1 ../rules/evdev.xml.in.h:1
-msgid "(F)"
-msgstr "(F)"
-
-#: ../rules/base.xml.in.h:2 ../rules/evdev.xml.in.h:2
-msgid "(Legacy) Alternative"
-msgstr ""
-
-#: ../rules/base.xml.in.h:3 ../rules/evdev.xml.in.h:3
-msgid "(Legacy) Alternative, Sun dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:4 ../rules/evdev.xml.in.h:4
-msgid "(Legacy) Alternative, eliminate dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:5 ../rules/evdev.xml.in.h:5
-msgid "101/104 key Compatible"
-msgstr "101/104-taster kompatibelt"
-
-#: ../rules/base.xml.in.h:6 ../rules/evdev.xml.in.h:6
-msgid "101/qwerty/comma/Dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:7 ../rules/evdev.xml.in.h:7
-msgid "101/qwerty/comma/Eliminate dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:8 ../rules/evdev.xml.in.h:8
-msgid "101/qwerty/dot/Dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:9 ../rules/evdev.xml.in.h:9
-msgid "101/qwerty/dot/Eliminate dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:10 ../rules/evdev.xml.in.h:10
-msgid "101/qwertz/comma/Dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:11 ../rules/evdev.xml.in.h:11
-msgid "101/qwertz/comma/Eliminate dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:12 ../rules/evdev.xml.in.h:12
-msgid "101/qwertz/dot/Dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:13 ../rules/evdev.xml.in.h:13
-msgid "101/qwertz/dot/Eliminate dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:14 ../rules/evdev.xml.in.h:14
-msgid "102/qwerty/comma/Dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:15 ../rules/evdev.xml.in.h:15
-msgid "102/qwerty/comma/Eliminate dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:16 ../rules/evdev.xml.in.h:16
-msgid "102/qwerty/dot/Dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:17 ../rules/evdev.xml.in.h:17
-msgid "102/qwerty/dot/Eliminate dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:18 ../rules/evdev.xml.in.h:18
-msgid "102/qwertz/comma/Dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:19 ../rules/evdev.xml.in.h:19
-msgid "102/qwertz/comma/Eliminate dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:20 ../rules/evdev.xml.in.h:20
-msgid "102/qwertz/dot/Dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:21 ../rules/evdev.xml.in.h:21
-msgid "102/qwertz/dot/Eliminate dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:22 ../rules/evdev.xml.in.h:22
-msgid "2"
-msgstr ""
-
-#: ../rules/base.xml.in.h:23 ../rules/evdev.xml.in.h:23
-msgid "4"
-msgstr ""
-
-#: ../rules/base.xml.in.h:24 ../rules/evdev.xml.in.h:24
-msgid "5"
-msgstr ""
-
-#: ../rules/base.xml.in.h:25 ../rules/evdev.xml.in.h:25
-msgid "A4Tech KB-21"
-msgstr ""
-
-#: ../rules/base.xml.in.h:26 ../rules/evdev.xml.in.h:26
-msgid "A4Tech KBS-8"
-msgstr ""
-
-#: ../rules/base.xml.in.h:27 ../rules/evdev.xml.in.h:27
-msgid "A4Tech Wireless Desktop RFKB-23"
-msgstr ""
-
-#: ../rules/base.xml.in.h:28 ../rules/evdev.xml.in.h:28
-msgid "ACPI Standard"
-msgstr "ACPI-standard"
-
-#: ../rules/base.xml.in.h:29 ../rules/evdev.xml.in.h:29
-msgid "ATM/phone-style"
-msgstr ""
-
-#: ../rules/base.xml.in.h:30 ../rules/evdev.xml.in.h:30
-msgid "Acer AirKey V"
-msgstr ""
-
-#: ../rules/base.xml.in.h:31 ../rules/evdev.xml.in.h:31
-msgid "Acer C300"
-msgstr ""
-
-#: ../rules/base.xml.in.h:32 ../rules/evdev.xml.in.h:32
-msgid "Acer Ferrari 4000"
-msgstr "Acer Ferrari 4000"
-
-#: ../rules/base.xml.in.h:33 ../rules/evdev.xml.in.h:33
-msgid "Acer Laptop"
-msgstr "Acer bærbar"
-
-#: ../rules/base.xml.in.h:34 ../rules/evdev.xml.in.h:34
-msgid "Add the standard behavior to Menu key"
-msgstr ""
-
-#: ../rules/base.xml.in.h:35 ../rules/evdev.xml.in.h:35
-msgid "Adding Esperanto circumflexes (supersigno)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:36 ../rules/evdev.xml.in.h:36
-#, fuzzy
-msgid "Adding EuroSign to certain keys"
-msgstr "Legg til Euro-tegnet på 2-tasten."
-
-#: ../rules/base.xml.in.h:37 ../rules/evdev.xml.in.h:37
-msgid "Advance Scorpius KI"
-msgstr ""
-
-#: ../rules/base.xml.in.h:38 ../rules/evdev.xml.in.h:38
-msgid "Afg"
-msgstr "Afg"
-
-#: ../rules/base.xml.in.h:39 ../rules/evdev.xml.in.h:39
-msgid "Afghanistan"
-msgstr "Afghanistan"
-
-#: ../rules/base.xml.in.h:40 ../rules/evdev.xml.in.h:40
-msgid "Akan"
-msgstr "Akan"
-
-#: ../rules/base.xml.in.h:41 ../rules/evdev.xml.in.h:41
-msgid "Alb"
-msgstr "Alb"
-
-#: ../rules/base.xml.in.h:42 ../rules/evdev.xml.in.h:42
-msgid "Albania"
-msgstr "Albania"
-
-#: ../rules/base.xml.in.h:43 ../rules/evdev.xml.in.h:43
-msgid "Alt and Meta are on Alt keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:44 ../rules/evdev.xml.in.h:44
-msgid "Alt is mapped to Right Win, Super to Menu"
-msgstr ""
-
-#: ../rules/base.xml.in.h:45 ../rules/evdev.xml.in.h:45
-msgid "Alt+CapsLock"
-msgstr ""
-
-#: ../rules/base.xml.in.h:46 ../rules/evdev.xml.in.h:46
-msgid "Alt+Ctrl"
-msgstr ""
-
-#: ../rules/base.xml.in.h:47 ../rules/evdev.xml.in.h:47
-msgid "Alt+Shift"
-msgstr ""
-
-#: ../rules/base.xml.in.h:48 ../rules/evdev.xml.in.h:48
-msgid "Alt+Space"
-msgstr ""
-
-#: ../rules/base.xml.in.h:49 ../rules/evdev.xml.in.h:49
-msgid "Alt-Q"
-msgstr "Alt-Q"
-
-#: ../rules/base.xml.in.h:50 ../rules/evdev.xml.in.h:50
-msgid "Alt/Win key behavior"
-msgstr ""
-
-#: ../rules/base.xml.in.h:51 ../rules/evdev.xml.in.h:51
-msgid "Alternative"
-msgstr "Alternativ"
-
-#: ../rules/base.xml.in.h:52 ../rules/evdev.xml.in.h:52
-msgid "Alternative Eastern"
-msgstr "Alternativ østlig"
-
-#: ../rules/base.xml.in.h:53 ../rules/evdev.xml.in.h:53
-msgid "Alternative Phonetic"
-msgstr "Alternativ fonetisk"
-
-#: ../rules/base.xml.in.h:54 ../rules/evdev.xml.in.h:54
-msgid "Alternative international (former us_intl)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:55 ../rules/evdev.xml.in.h:55
-msgid "Alternative, Sun dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:56 ../rules/evdev.xml.in.h:56
-msgid "Alternative, eliminate dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:57 ../rules/evdev.xml.in.h:57
-msgid "Alternative, latin-9 only"
-msgstr ""
-
-#: ../rules/base.xml.in.h:58 ../rules/evdev.xml.in.h:58
-msgid "And"
-msgstr "And"
-
-#: ../rules/base.xml.in.h:59 ../rules/evdev.xml.in.h:59
-msgid "Andorra"
-msgstr "Andorra"
-
-#: ../rules/base.xml.in.h:60 ../rules/evdev.xml.in.h:60
-msgid "Any Alt key"
-msgstr ""
-
-#: ../rules/base.xml.in.h:61 ../rules/evdev.xml.in.h:61
-msgid "Any Win key"
-msgstr ""
-
-#: ../rules/base.xml.in.h:62 ../rules/evdev.xml.in.h:62
-msgid "Any Win key (while pressed)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:63 ../rules/evdev.xml.in.h:63
-msgid "Apostrophe (') variant"
-msgstr ""
-
-#: ../rules/base.xml.in.h:64 ../rules/evdev.xml.in.h:64
-msgid "Apple"
-msgstr "Apple"
-
-#: ../rules/base.xml.in.h:65 ../rules/evdev.xml.in.h:65
-msgid "Apple Laptop"
-msgstr "Apple bærbar"
-
-#: ../rules/base.xml.in.h:66 ../rules/evdev.xml.in.h:66
-msgid "Ara"
-msgstr "Ara"
-
-#: ../rules/base.xml.in.h:67 ../rules/evdev.xml.in.h:67
-msgid "Arabic"
-msgstr "Arabisk"
-
-#: ../rules/base.xml.in.h:68 ../rules/evdev.xml.in.h:68
-msgid "Arm"
-msgstr "Arm"
-
-#: ../rules/base.xml.in.h:69 ../rules/evdev.xml.in.h:69
-msgid "Armenia"
-msgstr "Armenia"
-
-#: ../rules/base.xml.in.h:70 ../rules/evdev.xml.in.h:70
-msgid "Asturian variant with bottom-dot H and bottom-dot L"
-msgstr ""
-
-#: ../rules/base.xml.in.h:71 ../rules/evdev.xml.in.h:71
-msgid "Asus Laptop"
-msgstr "Asus bærbar"
-
-#: ../rules/base.xml.in.h:72 ../rules/evdev.xml.in.h:72
-msgid "At bottom left"
-msgstr ""
-
-#: ../rules/base.xml.in.h:73 ../rules/evdev.xml.in.h:73
-msgid "At left of 'A'"
-msgstr ""
-
-#: ../rules/base.xml.in.h:74 ../rules/evdev.xml.in.h:74
-msgid "Aze"
-msgstr "Ase"
-
-#: ../rules/base.xml.in.h:75 ../rules/evdev.xml.in.h:75
-msgid "Azerbaijan"
-msgstr "Aserbaijdsjan"
-
-#: ../rules/base.xml.in.h:76 ../rules/evdev.xml.in.h:76
-msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:77 ../rules/evdev.xml.in.h:77
-msgid "BTC 5090"
-msgstr ""
-
-#: ../rules/base.xml.in.h:78 ../rules/evdev.xml.in.h:78
-msgid "BTC 5113RF Multimedia"
-msgstr ""
-
-#: ../rules/base.xml.in.h:79 ../rules/evdev.xml.in.h:79
-msgid "BTC 5126T"
-msgstr ""
-
-#: ../rules/base.xml.in.h:80 ../rules/evdev.xml.in.h:80
-msgid "BTC 6301URF"
-msgstr ""
-
-#: ../rules/base.xml.in.h:81 ../rules/evdev.xml.in.h:81
-msgid "BTC 9000"
-msgstr ""
-
-#: ../rules/base.xml.in.h:82 ../rules/evdev.xml.in.h:82
-msgid "BTC 9000A"
-msgstr ""
-
-#: ../rules/base.xml.in.h:83 ../rules/evdev.xml.in.h:83
-msgid "BTC 9001AH"
-msgstr ""
-
-#: ../rules/base.xml.in.h:84 ../rules/evdev.xml.in.h:84
-msgid "BTC 9019U"
-msgstr ""
-
-#: ../rules/base.xml.in.h:85 ../rules/evdev.xml.in.h:85
-msgid "BTC 9116U Mini Wireless Internet and Gaming"
-msgstr ""
-
-#: ../rules/base.xml.in.h:86 ../rules/evdev.xml.in.h:86
-msgid "Ban"
-msgstr ""
-
-#: ../rules/base.xml.in.h:87 ../rules/evdev.xml.in.h:87
-msgid "Bangladesh"
-msgstr "Bangladesh"
-
-#: ../rules/base.xml.in.h:88 ../rules/evdev.xml.in.h:88
-msgid "Bel"
-msgstr ""
-
-#: ../rules/base.xml.in.h:89 ../rules/evdev.xml.in.h:89
-msgid "Belarus"
-msgstr "Hviterussland"
-
-#: ../rules/base.xml.in.h:90 ../rules/evdev.xml.in.h:90
-msgid "Belgium"
-msgstr "Belgia"
-
-#: ../rules/base.xml.in.h:91 ../rules/evdev.xml.in.h:91
-msgid "BenQ X-Touch"
-msgstr ""
-
-#: ../rules/base.xml.in.h:92 ../rules/evdev.xml.in.h:92
-msgid "BenQ X-Touch 730"
-msgstr ""
-
-#: ../rules/base.xml.in.h:93 ../rules/evdev.xml.in.h:93
-msgid "BenQ X-Touch 800"
-msgstr ""
-
-#: ../rules/base.xml.in.h:94 ../rules/evdev.xml.in.h:94
-msgid "Bengali"
-msgstr ""
-
-#: ../rules/base.xml.in.h:95 ../rules/evdev.xml.in.h:95
-msgid "Bengali Probhat"
-msgstr ""
-
-#: ../rules/base.xml.in.h:96 ../rules/evdev.xml.in.h:96
-msgid "Bepo, ergonomic, Dvorak way"
-msgstr ""
-
-#: ../rules/base.xml.in.h:97 ../rules/evdev.xml.in.h:97
-msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
-msgstr ""
-
-#: ../rules/base.xml.in.h:98 ../rules/evdev.xml.in.h:98
-msgid "Bgr"
-msgstr ""
-
-#: ../rules/base.xml.in.h:99 ../rules/evdev.xml.in.h:99
-msgid "Bhu"
-msgstr ""
-
-#: ../rules/base.xml.in.h:100 ../rules/evdev.xml.in.h:100
-msgid "Bhutan"
-msgstr "Bhutan"
-
-#: ../rules/base.xml.in.h:101 ../rules/evdev.xml.in.h:101
-msgid "Biblical Hebrew (Tiro)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:102 ../rules/evdev.xml.in.h:102
-msgid "Bih"
-msgstr ""
-
-#: ../rules/base.xml.in.h:103 ../rules/evdev.xml.in.h:103
-msgid "Blr"
-msgstr ""
-
-#: ../rules/base.xml.in.h:104 ../rules/evdev.xml.in.h:104
-msgid "Bosnia and Herzegovina"
-msgstr "Bosnia og Herzegovina"
-
-#: ../rules/base.xml.in.h:105 ../rules/evdev.xml.in.h:105
-msgid "Both Alt keys together"
-msgstr ""
-
-#: ../rules/base.xml.in.h:106 ../rules/evdev.xml.in.h:106
-msgid "Both Ctrl keys together"
-msgstr ""
-
-#: ../rules/base.xml.in.h:107 ../rules/evdev.xml.in.h:107
-msgid "Both Shift keys together"
-msgstr ""
-
-#: ../rules/base.xml.in.h:108 ../rules/evdev.xml.in.h:108
-msgid "Bra"
-msgstr ""
-
-#: ../rules/base.xml.in.h:109 ../rules/evdev.xml.in.h:109
-msgid "Braille"
-msgstr ""
-
-#: ../rules/base.xml.in.h:110 ../rules/evdev.xml.in.h:110
-msgid "Brazil"
-msgstr "Brasil"
-
-#: ../rules/base.xml.in.h:111 ../rules/evdev.xml.in.h:111
-msgid "Brazilian ABNT2"
-msgstr ""
-
-#: ../rules/base.xml.in.h:112 ../rules/evdev.xml.in.h:112
-msgid "Breton"
-msgstr ""
-
-#: ../rules/base.xml.in.h:113 ../rules/evdev.xml.in.h:113
-msgid "Brl"
-msgstr ""
-
-#: ../rules/base.xml.in.h:114 ../rules/evdev.xml.in.h:114
-msgid "Brother Internet Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:115 ../rules/evdev.xml.in.h:115
-msgid "Buckwalter"
-msgstr ""
-
-#: ../rules/base.xml.in.h:116 ../rules/evdev.xml.in.h:116
-msgid "Bulgaria"
-msgstr "Bulgaria"
-
-#: ../rules/base.xml.in.h:117 ../rules/evdev.xml.in.h:117
-msgid "CRULP"
-msgstr ""
-
-#: ../rules/base.xml.in.h:118 ../rules/evdev.xml.in.h:118
-msgid "Cambodia"
-msgstr ""
-
-#: ../rules/base.xml.in.h:119 ../rules/evdev.xml.in.h:119
-msgid "Can"
-msgstr ""
-
-#: ../rules/base.xml.in.h:120 ../rules/evdev.xml.in.h:120
-msgid "Canada"
-msgstr ""
-
-#: ../rules/base.xml.in.h:121 ../rules/evdev.xml.in.h:121
-msgid "Caps Lock"
-msgstr ""
-
-#: ../rules/base.xml.in.h:122 ../rules/evdev.xml.in.h:122
-msgid "CapsLock"
-msgstr ""
-
-#: ../rules/base.xml.in.h:123 ../rules/evdev.xml.in.h:123
-msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:124 ../rules/evdev.xml.in.h:124
-msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
-msgstr ""
-
-#: ../rules/base.xml.in.h:125 ../rules/evdev.xml.in.h:125
-msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
-msgstr ""
-
-#: ../rules/base.xml.in.h:126 ../rules/evdev.xml.in.h:126
-msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock"
-msgstr ""
-
-#: ../rules/base.xml.in.h:127 ../rules/evdev.xml.in.h:127
-msgid "CapsLock key behavior"
-msgstr ""
-
-#: ../rules/base.xml.in.h:128 ../rules/evdev.xml.in.h:128
-msgid "CapsLock toggles Shift so all keys are affected"
-msgstr ""
-
-#: ../rules/base.xml.in.h:129 ../rules/evdev.xml.in.h:129
-msgid "CapsLock toggles normal capitalization of alphabetic characters"
-msgstr ""
-
-#: ../rules/base.xml.in.h:130 ../rules/evdev.xml.in.h:130
-msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
-msgstr ""
-
-#: ../rules/base.xml.in.h:131 ../rules/evdev.xml.in.h:131
-msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
-msgstr ""
-
-#: ../rules/base.xml.in.h:132 ../rules/evdev.xml.in.h:132
-msgid "Catalan variant with middle-dot L"
-msgstr ""
-
-#: ../rules/base.xml.in.h:133 ../rules/evdev.xml.in.h:133
-msgid "Cedilla"
-msgstr ""
-
-#: ../rules/base.xml.in.h:134 ../rules/evdev.xml.in.h:134
-msgid "Che"
-msgstr ""
-
-#: ../rules/base.xml.in.h:135 ../rules/evdev.xml.in.h:135
-msgid "Cherokee"
-msgstr ""
-
-#: ../rules/base.xml.in.h:136 ../rules/evdev.xml.in.h:136
-msgid "Cherry Blue Line CyBo@rd"
-msgstr ""
-
-#: ../rules/base.xml.in.h:137 ../rules/evdev.xml.in.h:137
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:138 ../rules/evdev.xml.in.h:138
-msgid "Cherry CyBo@rd USB-Hub"
-msgstr ""
-
-#: ../rules/base.xml.in.h:139 ../rules/evdev.xml.in.h:139
-msgid "Cherry CyMotion Expert"
-msgstr ""
-
-#: ../rules/base.xml.in.h:140 ../rules/evdev.xml.in.h:140
-msgid "Cherry CyMotion Master Linux"
-msgstr ""
-
-#: ../rules/base.xml.in.h:141 ../rules/evdev.xml.in.h:141
-msgid "Cherry CyMotion Master XPress"
-msgstr ""
-
-#: ../rules/base.xml.in.h:142 ../rules/evdev.xml.in.h:142
-msgid "Chicony Internet Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:143 ../rules/evdev.xml.in.h:143
-msgid "Chicony KB-9885"
-msgstr ""
-
-#: ../rules/base.xml.in.h:144 ../rules/evdev.xml.in.h:144
-msgid "Chicony KU-0108"
-msgstr ""
-
-#: ../rules/base.xml.in.h:145 ../rules/evdev.xml.in.h:145
-msgid "Chicony KU-0420"
-msgstr ""
-
-#: ../rules/base.xml.in.h:146 ../rules/evdev.xml.in.h:146
-msgid "China"
-msgstr "Kina"
-
-#: ../rules/base.xml.in.h:147 ../rules/evdev.xml.in.h:147
-msgid "Chuvash"
-msgstr ""
-
-#: ../rules/base.xml.in.h:148 ../rules/evdev.xml.in.h:148
-msgid "Chuvash Latin"
-msgstr ""
-
-#: ../rules/base.xml.in.h:149 ../rules/evdev.xml.in.h:149
-msgid "Classic"
-msgstr "Klassisk"
-
-#: ../rules/base.xml.in.h:150 ../rules/evdev.xml.in.h:150
-msgid "Classic Dvorak"
-msgstr ""
-
-#: ../rules/base.xml.in.h:151 ../rules/evdev.xml.in.h:151
-msgid "Classmate PC"
-msgstr ""
-
-#: ../rules/base.xml.in.h:152 ../rules/evdev.xml.in.h:152
-msgid "CloGaelach"
-msgstr ""
-
-#: ../rules/base.xml.in.h:153 ../rules/evdev.xml.in.h:153
-msgid "Colemak"
-msgstr ""
-
-#: ../rules/base.xml.in.h:154 ../rules/evdev.xml.in.h:154
-msgid "Compaq Easy Access Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:155 ../rules/evdev.xml.in.h:155
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:156 ../rules/evdev.xml.in.h:156
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:157 ../rules/evdev.xml.in.h:157
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:158 ../rules/evdev.xml.in.h:158
-msgid "Compaq iPaq Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:159 ../rules/evdev.xml.in.h:159
-msgid "Compose key position"
-msgstr ""
-
-#: ../rules/base.xml.in.h:160 ../rules/evdev.xml.in.h:160
-msgid "Congo, Democratic Republic of the"
-msgstr ""
-
-#: ../rules/base.xml.in.h:161 ../rules/evdev.xml.in.h:161
-msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:162 ../rules/evdev.xml.in.h:162
-msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:163 ../rules/evdev.xml.in.h:163
-msgid "Croatia"
-msgstr "Kroatia"
-
-#: ../rules/base.xml.in.h:164 ../rules/evdev.xml.in.h:164
-msgid "Ctrl key position"
-msgstr ""
-
-#: ../rules/base.xml.in.h:165 ../rules/evdev.xml.in.h:165
-msgid "Ctrl+Shift"
-msgstr ""
-
-#: ../rules/base.xml.in.h:166 ../rules/evdev.xml.in.h:166
-msgid "Cyrillic"
-msgstr "Kyrillisk"
-
-#: ../rules/base.xml.in.h:167 ../rules/evdev.xml.in.h:167
-msgid "Cyrillic with guillemets"
-msgstr ""
-
-#: ../rules/base.xml.in.h:168 ../rules/evdev.xml.in.h:168
-msgid "Cyrillic, Z and ZHE swapped"
-msgstr ""
-
-#: ../rules/base.xml.in.h:169 ../rules/evdev.xml.in.h:169
-msgid "Cze"
-msgstr ""
-
-#: ../rules/base.xml.in.h:170 ../rules/evdev.xml.in.h:170
-msgid "Czechia"
-msgstr ""
-
-#: ../rules/base.xml.in.h:171 ../rules/evdev.xml.in.h:171
-msgid "DRC"
-msgstr ""
-
-#: ../rules/base.xml.in.h:172 ../rules/evdev.xml.in.h:172
-msgid "DTK2000"
-msgstr ""
-
-#: ../rules/base.xml.in.h:173 ../rules/evdev.xml.in.h:173
-msgid "Dan"
-msgstr ""
-
-#: ../rules/base.xml.in.h:174 ../rules/evdev.xml.in.h:174
-msgid "Dead acute"
-msgstr ""
-
-#: ../rules/base.xml.in.h:175 ../rules/evdev.xml.in.h:175
-msgid "Dead grave acute"
-msgstr ""
-
-#: ../rules/base.xml.in.h:176 ../rules/evdev.xml.in.h:176
-msgid "Default numeric keypad keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:177 ../rules/evdev.xml.in.h:177
-msgid "Dell"
-msgstr "Dell"
-
-#: ../rules/base.xml.in.h:178 ../rules/evdev.xml.in.h:178
-msgid "Dell 101-key PC"
-msgstr ""
-
-#: ../rules/base.xml.in.h:179 ../rules/evdev.xml.in.h:179
-msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
-msgstr ""
-
-#: ../rules/base.xml.in.h:180 ../rules/evdev.xml.in.h:180
-msgid "Dell Laptop/notebook Precision M series"
-msgstr ""
-
-#: ../rules/base.xml.in.h:181 ../rules/evdev.xml.in.h:181
-msgid "Dell Latitude series laptop"
-msgstr ""
-
-#: ../rules/base.xml.in.h:182 ../rules/evdev.xml.in.h:182
-msgid "Dell Precision M65"
-msgstr ""
-
-#: ../rules/base.xml.in.h:183 ../rules/evdev.xml.in.h:183
-msgid "Dell SK-8125"
-msgstr ""
-
-#: ../rules/base.xml.in.h:184 ../rules/evdev.xml.in.h:184
-msgid "Dell SK-8135"
-msgstr ""
-
-#: ../rules/base.xml.in.h:185 ../rules/evdev.xml.in.h:185
-msgid "Dell USB Multimedia Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:186 ../rules/evdev.xml.in.h:186
-msgid "Denmark"
-msgstr "Danmark"
-
-#: ../rules/base.xml.in.h:187 ../rules/evdev.xml.in.h:187
-msgid "Deu"
-msgstr ""
-
-#: ../rules/base.xml.in.h:188 ../rules/evdev.xml.in.h:188
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:189 ../rules/evdev.xml.in.h:189
-msgid "Diamond 9801 / 9802 series"
-msgstr ""
-
-#: ../rules/base.xml.in.h:190 ../rules/evdev.xml.in.h:190
-msgid "Dvorak"
-msgstr "Dvorak"
-
-#: ../rules/base.xml.in.h:191 ../rules/evdev.xml.in.h:191
-msgid "Dvorak (UK Punctuation)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:192 ../rules/evdev.xml.in.h:192
-msgid "Dvorak international"
-msgstr ""
-
-#: ../rules/base.xml.in.h:193 ../rules/evdev.xml.in.h:193
-msgid "Dvorak, Polish quotes on key \"1/!\""
-msgstr ""
-
-#: ../rules/base.xml.in.h:194 ../rules/evdev.xml.in.h:194
-msgid "Dvorak, Polish quotes on quotemark key"
-msgstr ""
-
-#: ../rules/base.xml.in.h:195 ../rules/evdev.xml.in.h:195
-msgid "E"
-msgstr ""
-
-#: ../rules/base.xml.in.h:196 ../rules/evdev.xml.in.h:196
-msgid "Eastern"
-msgstr "Østlig"
-
-#: ../rules/base.xml.in.h:197 ../rules/evdev.xml.in.h:197
-msgid "Eliminate dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:198 ../rules/evdev.xml.in.h:198
-msgid "Enable extra typographic characters"
-msgstr ""
-
-#: ../rules/base.xml.in.h:199 ../rules/evdev.xml.in.h:199
-msgid "Ennyah DKB-1008"
-msgstr ""
-
-#: ../rules/base.xml.in.h:200 ../rules/evdev.xml.in.h:200
-msgid "Epo"
-msgstr ""
-
-#: ../rules/base.xml.in.h:201 ../rules/evdev.xml.in.h:201
-msgid "Ergonomic"
-msgstr "Ergonomisk"
-
-#: ../rules/base.xml.in.h:202 ../rules/evdev.xml.in.h:202
-msgid "Esp"
-msgstr ""
-
-#: ../rules/base.xml.in.h:203 ../rules/evdev.xml.in.h:203
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../rules/base.xml.in.h:204 ../rules/evdev.xml.in.h:204
-msgid "Est"
-msgstr "Est"
-
-#: ../rules/base.xml.in.h:205 ../rules/evdev.xml.in.h:205
-msgid "Estonia"
-msgstr "Estland"
-
-#: ../rules/base.xml.in.h:206 ../rules/evdev.xml.in.h:206
-msgid "Eth"
-msgstr "Eth"
-
-#: ../rules/base.xml.in.h:207 ../rules/evdev.xml.in.h:207
-msgid "Ethiopia"
-msgstr "Etiopia"
-
-#: ../rules/base.xml.in.h:208 ../rules/evdev.xml.in.h:208
-msgid "Evdev-managed keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:209 ../rules/evdev.xml.in.h:209
-msgid "Everex STEPnote"
-msgstr ""
-
-#: ../rules/base.xml.in.h:210 ../rules/evdev.xml.in.h:210
-msgid "Ewe"
-msgstr ""
-
-#: ../rules/base.xml.in.h:211 ../rules/evdev.xml.in.h:211
-msgid "Extended"
-msgstr "Utvidet"
-
-#: ../rules/base.xml.in.h:212 ../rules/evdev.xml.in.h:212
-msgid "Extended Backslash"
-msgstr ""
-
-#: ../rules/base.xml.in.h:213 ../rules/evdev.xml.in.h:213
-msgid "F-letter (F) variant"
-msgstr ""
-
-#: ../rules/base.xml.in.h:214 ../rules/evdev.xml.in.h:214
-msgid "FL90"
-msgstr ""
-
-#: ../rules/base.xml.in.h:215 ../rules/evdev.xml.in.h:215
-msgid "Fao"
-msgstr ""
-
-#: ../rules/base.xml.in.h:216 ../rules/evdev.xml.in.h:216
-msgid "Faroe Islands"
-msgstr "Færøyene"
-
-#: ../rules/base.xml.in.h:217 ../rules/evdev.xml.in.h:217
-msgid "Fin"
-msgstr "Fin"
-
-#: ../rules/base.xml.in.h:218 ../rules/evdev.xml.in.h:218
-msgid "Finland"
-msgstr "Finland"
-
-#. This assumes the KP_ abstract symbols are actually useful for some apps
-#. The description needs to be rewritten
-#: ../rules/base.xml.in.h:221 ../rules/evdev.xml.in.h:221
-msgid "Four-level key with abstract separators"
-msgstr ""
-
-#: ../rules/base.xml.in.h:222 ../rules/evdev.xml.in.h:222
-msgid "Four-level key with comma"
-msgstr ""
-
-#: ../rules/base.xml.in.h:223 ../rules/evdev.xml.in.h:223
-msgid "Four-level key with dot"
-msgstr ""
-
-#: ../rules/base.xml.in.h:224 ../rules/evdev.xml.in.h:224
-msgid "Four-level key with dot, latin-9 restriction"
-msgstr ""
-
-#: ../rules/base.xml.in.h:225 ../rules/evdev.xml.in.h:225
-msgid "Four-level key with momayyez"
-msgstr ""
-
-#: ../rules/base.xml.in.h:226 ../rules/evdev.xml.in.h:226
-msgid "Fra"
-msgstr "Fra"
-
-#: ../rules/base.xml.in.h:227 ../rules/evdev.xml.in.h:227
-msgid "France"
-msgstr "Frankrike"
-
-#: ../rules/base.xml.in.h:228 ../rules/evdev.xml.in.h:228
-msgid "French"
-msgstr "Fransk"
-
-#: ../rules/base.xml.in.h:229 ../rules/evdev.xml.in.h:229
-msgid "French (Macintosh)"
-msgstr "Fransk (Macintosh)"
-
-#: ../rules/base.xml.in.h:230 ../rules/evdev.xml.in.h:230
-msgid "French (legacy)"
-msgstr "Fransk (gammel)"
-
-#: ../rules/base.xml.in.h:231 ../rules/evdev.xml.in.h:231
-msgid "French Dvorak"
-msgstr "Fransk dvorak"
-
-#: ../rules/base.xml.in.h:232 ../rules/evdev.xml.in.h:232
-msgid "French, Sun dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:233 ../rules/evdev.xml.in.h:233
-msgid "French, eliminate dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:234 ../rules/evdev.xml.in.h:234
-msgid "Fujitsu-Siemens Computers AMILO laptop"
-msgstr ""
-
-#: ../rules/base.xml.in.h:235 ../rules/evdev.xml.in.h:235
-msgid "Fula"
-msgstr ""
-
-#: ../rules/base.xml.in.h:236 ../rules/evdev.xml.in.h:236
-msgid "GBr"
-msgstr ""
-
-#: ../rules/base.xml.in.h:237 ../rules/evdev.xml.in.h:237
-msgid "Ga"
-msgstr ""
-
-#: ../rules/base.xml.in.h:238 ../rules/evdev.xml.in.h:238
-msgid "Generic 101-key PC"
-msgstr "Vanlig 101-tasters PC"
-
-#: ../rules/base.xml.in.h:239 ../rules/evdev.xml.in.h:239
-msgid "Generic 102-key (Intl) PC"
-msgstr "Vanlig 102-tasters (Intl) PC"
-
-#: ../rules/base.xml.in.h:240 ../rules/evdev.xml.in.h:240
-msgid "Generic 104-key PC"
-msgstr "Vanlig 104-tasters PC"
-
-#: ../rules/base.xml.in.h:241 ../rules/evdev.xml.in.h:241
-msgid "Generic 105-key (Intl) PC"
-msgstr "Vanlig 105-tasters (Intl) PC"
-
-#: ../rules/base.xml.in.h:242 ../rules/evdev.xml.in.h:242
-msgid "Genius Comfy KB-12e"
-msgstr ""
-
-#: ../rules/base.xml.in.h:243 ../rules/evdev.xml.in.h:243
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr ""
-
-#: ../rules/base.xml.in.h:244 ../rules/evdev.xml.in.h:244
-msgid "Genius Comfy KB-21e-Scroll"
-msgstr ""
-
-#: ../rules/base.xml.in.h:245 ../rules/evdev.xml.in.h:245
-msgid "Genius KB-19e NB"
-msgstr ""
-
-#: ../rules/base.xml.in.h:246 ../rules/evdev.xml.in.h:246
-msgid "Geo"
-msgstr ""
-
-#: ../rules/base.xml.in.h:247 ../rules/evdev.xml.in.h:247
-msgid "Georgia"
-msgstr "Georgia"
-
-#: ../rules/base.xml.in.h:248 ../rules/evdev.xml.in.h:248
-msgid "Georgian"
-msgstr "Georgisk"
-
-#: ../rules/base.xml.in.h:249 ../rules/evdev.xml.in.h:249
-msgid "Georgian AZERTY Tskapo"
-msgstr ""
-
-#: ../rules/base.xml.in.h:250 ../rules/evdev.xml.in.h:250
-msgid "German (Macintosh)"
-msgstr "Tysk (Macintosh)"
-
-#: ../rules/base.xml.in.h:251 ../rules/evdev.xml.in.h:251
-msgid "German, Sun dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:252 ../rules/evdev.xml.in.h:252
-msgid "German, eliminate dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:253 ../rules/evdev.xml.in.h:253
-msgid "Germany"
-msgstr "Tyskland"
-
-#: ../rules/base.xml.in.h:254 ../rules/evdev.xml.in.h:254
-msgid "Gha"
-msgstr ""
-
-#: ../rules/base.xml.in.h:255 ../rules/evdev.xml.in.h:255
-msgid "Ghana"
-msgstr "Ghana"
-
-#: ../rules/base.xml.in.h:256 ../rules/evdev.xml.in.h:256
-msgid "Gre"
-msgstr ""
-
-#: ../rules/base.xml.in.h:257 ../rules/evdev.xml.in.h:257
-msgid "Greece"
-msgstr "Hellas"
-
-#: ../rules/base.xml.in.h:258 ../rules/evdev.xml.in.h:258
-msgid "Group toggle on multiply/divide key"
-msgstr ""
-
-#: ../rules/base.xml.in.h:259 ../rules/evdev.xml.in.h:259
-msgid "Gui"
-msgstr "Gui"
-
-#: ../rules/base.xml.in.h:260 ../rules/evdev.xml.in.h:260
-msgid "Guinea"
-msgstr "Guinea"
-
-#: ../rules/base.xml.in.h:261 ../rules/evdev.xml.in.h:261
-msgid "Gujarati"
-msgstr ""
-
-#: ../rules/base.xml.in.h:262 ../rules/evdev.xml.in.h:262
-msgid "Gurmukhi"
-msgstr ""
-
-#: ../rules/base.xml.in.h:263 ../rules/evdev.xml.in.h:263
-msgid "Gurmukhi Jhelum"
-msgstr ""
-
-#: ../rules/base.xml.in.h:264 ../rules/evdev.xml.in.h:264
-msgid "Gyration"
-msgstr ""
-
-#: ../rules/base.xml.in.h:265 ../rules/evdev.xml.in.h:265
-msgid "Happy Hacking Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:266 ../rules/evdev.xml.in.h:266
-msgid "Happy Hacking Keyboard for Mac"
-msgstr ""
-
-#: ../rules/base.xml.in.h:267 ../rules/evdev.xml.in.h:267
-msgid "Hausa"
-msgstr ""
-
-#: ../rules/base.xml.in.h:268 ../rules/evdev.xml.in.h:268
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:269 ../rules/evdev.xml.in.h:269
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr ""
-
-#: ../rules/base.xml.in.h:270 ../rules/evdev.xml.in.h:270
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr ""
-
-#: ../rules/base.xml.in.h:271 ../rules/evdev.xml.in.h:271
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr ""
-
-#: ../rules/base.xml.in.h:272 ../rules/evdev.xml.in.h:272
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr ""
-
-#: ../rules/base.xml.in.h:273 ../rules/evdev.xml.in.h:273
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr ""
-
-#: ../rules/base.xml.in.h:274 ../rules/evdev.xml.in.h:274
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr ""
-
-#: ../rules/base.xml.in.h:275 ../rules/evdev.xml.in.h:275
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr ""
-
-#: ../rules/base.xml.in.h:276 ../rules/evdev.xml.in.h:276
-msgid "Hewlett-Packard Pavilion dv5"
-msgstr ""
-
-#: ../rules/base.xml.in.h:277 ../rules/evdev.xml.in.h:277
-msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:278 ../rules/evdev.xml.in.h:278
-msgid "Hewlett-Packard nx9020"
-msgstr ""
-
-#: ../rules/base.xml.in.h:279 ../rules/evdev.xml.in.h:279
-msgid "Hexadecimal"
-msgstr ""
-
-#: ../rules/base.xml.in.h:280 ../rules/evdev.xml.in.h:280
-msgid "Hindi Bolnagri"
-msgstr ""
-
-#: ../rules/base.xml.in.h:281 ../rules/evdev.xml.in.h:281
-msgid "Homophonic"
-msgstr ""
-
-#: ../rules/base.xml.in.h:282 ../rules/evdev.xml.in.h:282
-msgid "Honeywell Euroboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:283 ../rules/evdev.xml.in.h:283
-msgid "Hrv"
-msgstr ""
-
-#: ../rules/base.xml.in.h:284 ../rules/evdev.xml.in.h:284
-msgid "Hun"
-msgstr ""
-
-#: ../rules/base.xml.in.h:285 ../rules/evdev.xml.in.h:285
-msgid "Hungary"
-msgstr "Ungarn"
-
-#: ../rules/base.xml.in.h:286 ../rules/evdev.xml.in.h:286
-msgid "Hyper is mapped to Win-keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:287 ../rules/evdev.xml.in.h:287
-msgid "IBM (LST 1205-92)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:288 ../rules/evdev.xml.in.h:288
-msgid "IBM Rapid Access"
-msgstr ""
-
-#: ../rules/base.xml.in.h:289 ../rules/evdev.xml.in.h:289
-msgid "IBM Rapid Access II"
-msgstr ""
-
-#: ../rules/base.xml.in.h:290 ../rules/evdev.xml.in.h:290
-msgid "IBM Space Saver"
-msgstr ""
-
-#: ../rules/base.xml.in.h:291 ../rules/evdev.xml.in.h:291
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr ""
-
-#: ../rules/base.xml.in.h:292 ../rules/evdev.xml.in.h:292
-msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-msgstr ""
-
-#: ../rules/base.xml.in.h:293 ../rules/evdev.xml.in.h:293
-msgid "IBM ThinkPad R60/T60/R61/T61"
-msgstr ""
-
-#: ../rules/base.xml.in.h:294 ../rules/evdev.xml.in.h:294
-msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
-msgstr ""
-
-#: ../rules/base.xml.in.h:295 ../rules/evdev.xml.in.h:295
-msgid "ISO Alternate"
-msgstr ""
-
-#: ../rules/base.xml.in.h:296 ../rules/evdev.xml.in.h:296
-msgid "Iceland"
-msgstr "Island"
-
-#: ../rules/base.xml.in.h:297 ../rules/evdev.xml.in.h:297
-msgid "Igbo"
-msgstr ""
-
-#: ../rules/base.xml.in.h:298 ../rules/evdev.xml.in.h:298
-msgid "Include dead tilde"
-msgstr ""
-
-#: ../rules/base.xml.in.h:299 ../rules/evdev.xml.in.h:299
-msgid "Ind"
-msgstr "Ind"
-
-#: ../rules/base.xml.in.h:300 ../rules/evdev.xml.in.h:300
-msgid "India"
-msgstr "India"
-
-#: ../rules/base.xml.in.h:301 ../rules/evdev.xml.in.h:301
-msgid "International (AltGr dead keys)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:302 ../rules/evdev.xml.in.h:302
-msgid "International (with dead keys)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:303 ../rules/evdev.xml.in.h:303
-msgid "Inuktitut"
-msgstr ""
-
-#: ../rules/base.xml.in.h:304 ../rules/evdev.xml.in.h:304
-msgid "Iran"
-msgstr "Iran"
-
-#: ../rules/base.xml.in.h:305 ../rules/evdev.xml.in.h:305
-msgid "Iraq"
-msgstr "Irak"
-
-#: ../rules/base.xml.in.h:306 ../rules/evdev.xml.in.h:306
-msgid "Ireland"
-msgstr "Irland"
-
-#: ../rules/base.xml.in.h:307 ../rules/evdev.xml.in.h:307
-msgid "Irl"
-msgstr "Irl"
-
-#: ../rules/base.xml.in.h:308 ../rules/evdev.xml.in.h:308
-msgid "Irn"
-msgstr "Irn"
-
-#: ../rules/base.xml.in.h:309 ../rules/evdev.xml.in.h:309
-msgid "Irq"
-msgstr "Irk"
-
-#: ../rules/base.xml.in.h:310 ../rules/evdev.xml.in.h:310
-msgid "Isl"
-msgstr "Isl"
-
-#: ../rules/base.xml.in.h:311 ../rules/evdev.xml.in.h:311
-msgid "Isr"
-msgstr "Isr"
-
-#: ../rules/base.xml.in.h:312 ../rules/evdev.xml.in.h:312
-msgid "Israel"
-msgstr "Irsrael"
-
-#: ../rules/base.xml.in.h:313 ../rules/evdev.xml.in.h:313
-msgid "Ita"
-msgstr "Ita"
-
-#: ../rules/base.xml.in.h:314 ../rules/evdev.xml.in.h:314
-msgid "Italy"
-msgstr "Italia"
-
-#: ../rules/base.xml.in.h:315 ../rules/evdev.xml.in.h:315
-msgid "Japan"
-msgstr "Japan"
-
-#: ../rules/base.xml.in.h:316 ../rules/evdev.xml.in.h:316
-msgid "Japan (PC-98xx Series)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:317 ../rules/evdev.xml.in.h:317
-msgid "Japanese 106-key"
-msgstr ""
-
-#: ../rules/base.xml.in.h:318 ../rules/evdev.xml.in.h:318
-msgid "Japanese keyboard options"
-msgstr ""
-
-#: ../rules/base.xml.in.h:319 ../rules/evdev.xml.in.h:319
-msgid "Jpn"
-msgstr "Jpn"
-
-#: ../rules/base.xml.in.h:320 ../rules/evdev.xml.in.h:320
-msgid "Kalmyk"
-msgstr ""
-
-#: ../rules/base.xml.in.h:321 ../rules/evdev.xml.in.h:321
-msgid "Kana"
-msgstr ""
-
-#: ../rules/base.xml.in.h:322 ../rules/evdev.xml.in.h:322
-msgid "Kana Lock key is locking"
-msgstr ""
-
-#: ../rules/base.xml.in.h:323 ../rules/evdev.xml.in.h:323
-msgid "Kannada"
-msgstr ""
-
-#: ../rules/base.xml.in.h:324 ../rules/evdev.xml.in.h:324
-msgid "Kashubian"
-msgstr ""
-
-#: ../rules/base.xml.in.h:325 ../rules/evdev.xml.in.h:325
-msgid "Kaz"
-msgstr ""
-
-#: ../rules/base.xml.in.h:326 ../rules/evdev.xml.in.h:326
-msgid "Kazakh with Russian"
-msgstr ""
-
-#: ../rules/base.xml.in.h:327 ../rules/evdev.xml.in.h:327
-msgid "Kazakhstan"
-msgstr ""
-
-#: ../rules/base.xml.in.h:328 ../rules/evdev.xml.in.h:328
-msgid "Key to choose 3rd level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:329 ../rules/evdev.xml.in.h:329
-msgid "Key(s) to change layout"
-msgstr ""
-
-#: ../rules/base.xml.in.h:330 ../rules/evdev.xml.in.h:330
-msgid "Keypad"
-msgstr "Nummertastatur"
-
-#: ../rules/base.xml.in.h:331 ../rules/evdev.xml.in.h:331
-msgid "Keytronic FlexPro"
-msgstr ""
-
-#: ../rules/base.xml.in.h:332 ../rules/evdev.xml.in.h:332
-msgid "Khm"
-msgstr ""
-
-#: ../rules/base.xml.in.h:333 ../rules/evdev.xml.in.h:333
-msgid "Kir"
-msgstr "Kir"
-
-#: ../rules/base.xml.in.h:334 ../rules/evdev.xml.in.h:334
-msgid "Komi"
-msgstr "Komi"
-
-#: ../rules/base.xml.in.h:335 ../rules/evdev.xml.in.h:335
-msgid "Kor"
-msgstr "Kor"
-
-#: ../rules/base.xml.in.h:336 ../rules/evdev.xml.in.h:336
-msgid "Korea, Republic of"
-msgstr ""
-
-#: ../rules/base.xml.in.h:337 ../rules/evdev.xml.in.h:337
-msgid "Korean 106-key"
-msgstr ""
-
-#: ../rules/base.xml.in.h:338 ../rules/evdev.xml.in.h:338
-msgid "Ktunaxa"
-msgstr "Ktunaxa"
-
-#: ../rules/base.xml.in.h:339 ../rules/evdev.xml.in.h:339
-msgid "Kurdish, (F)"
-msgstr "Kurdisk, (F)"
-
-#: ../rules/base.xml.in.h:340 ../rules/evdev.xml.in.h:340
-msgid "Kurdish, Arabic-Latin"
-msgstr ""
-
-#: ../rules/base.xml.in.h:341 ../rules/evdev.xml.in.h:341
-msgid "Kurdish, Latin Alt-Q"
-msgstr ""
-
-#: ../rules/base.xml.in.h:342 ../rules/evdev.xml.in.h:342
-msgid "Kurdish, Latin Q"
-msgstr ""
-
-#: ../rules/base.xml.in.h:343 ../rules/evdev.xml.in.h:343
-msgid "Kyrgyzstan"
-msgstr "Kirgistan"
-
-#: ../rules/base.xml.in.h:344 ../rules/evdev.xml.in.h:344
-msgid "LAm"
-msgstr ""
-
-#: ../rules/base.xml.in.h:345 ../rules/evdev.xml.in.h:345
-msgid "LEKP"
-msgstr ""
-
-#: ../rules/base.xml.in.h:346 ../rules/evdev.xml.in.h:346
-msgid "LEKPa"
-msgstr ""
-
-#: ../rules/base.xml.in.h:347 ../rules/evdev.xml.in.h:347
-msgid "Lao"
-msgstr "Lao"
-
-#: ../rules/base.xml.in.h:348 ../rules/evdev.xml.in.h:348
-msgid "Laos"
-msgstr "Laos"
-
-#: ../rules/base.xml.in.h:349 ../rules/evdev.xml.in.h:349
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:350 ../rules/evdev.xml.in.h:350
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:351 ../rules/evdev.xml.in.h:351
-msgid "Laptop/notebook eMachines m68xx"
-msgstr ""
-
-#: ../rules/base.xml.in.h:352 ../rules/evdev.xml.in.h:352
-msgid "Latin"
-msgstr "Latin"
-
-#: ../rules/base.xml.in.h:353 ../rules/evdev.xml.in.h:353
-msgid "Latin American"
-msgstr "Latinamerikansk"
-
-#: ../rules/base.xml.in.h:354 ../rules/evdev.xml.in.h:354
-msgid "Latin Unicode"
-msgstr ""
-
-#: ../rules/base.xml.in.h:355 ../rules/evdev.xml.in.h:355
-msgid "Latin Unicode qwerty"
-msgstr ""
-
-#: ../rules/base.xml.in.h:356 ../rules/evdev.xml.in.h:356
-msgid "Latin qwerty"
-msgstr ""
-
-#: ../rules/base.xml.in.h:357 ../rules/evdev.xml.in.h:357
-msgid "Latin unicode"
-msgstr ""
-
-#: ../rules/base.xml.in.h:358 ../rules/evdev.xml.in.h:358
-msgid "Latin unicode qwerty"
-msgstr ""
-
-#: ../rules/base.xml.in.h:359 ../rules/evdev.xml.in.h:359
-msgid "Latin with guillemets"
-msgstr ""
-
-#: ../rules/base.xml.in.h:360 ../rules/evdev.xml.in.h:360
-msgid "Latvia"
-msgstr "Latvia"
-
-#: ../rules/base.xml.in.h:361 ../rules/evdev.xml.in.h:361
-msgid "Lav"
-msgstr "Lav"
-
-#: ../rules/base.xml.in.h:362 ../rules/evdev.xml.in.h:362
-msgid "Left Alt"
-msgstr "Venstre Alt"
-
-#: ../rules/base.xml.in.h:363 ../rules/evdev.xml.in.h:363
-msgid "Left Alt (while pressed)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:364 ../rules/evdev.xml.in.h:364
-msgid "Left Alt is swapped with Left Win"
-msgstr ""
-
-#: ../rules/base.xml.in.h:365 ../rules/evdev.xml.in.h:365
-msgid "Left Ctrl"
-msgstr "Venstre Ctrl"
-
-#: ../rules/base.xml.in.h:366 ../rules/evdev.xml.in.h:366
-msgid "Left Ctrl+Left Shift"
-msgstr ""
-
-#: ../rules/base.xml.in.h:367 ../rules/evdev.xml.in.h:367
-msgid "Left Shift"
-msgstr "Venstre Shift"
-
-#: ../rules/base.xml.in.h:368 ../rules/evdev.xml.in.h:368
-msgid "Left Win"
-msgstr "Venstre Win"
-
-#: ../rules/base.xml.in.h:369 ../rules/evdev.xml.in.h:369
-msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:370 ../rules/evdev.xml.in.h:370
-msgid "Left Win (while pressed)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:371 ../rules/evdev.xml.in.h:371
-msgid "Left hand"
-msgstr "Venstre hånd"
-
-#: ../rules/base.xml.in.h:372 ../rules/evdev.xml.in.h:372
-msgid "Left handed Dvorak"
-msgstr ""
-
-#: ../rules/base.xml.in.h:373 ../rules/evdev.xml.in.h:373
-msgid "Legacy"
-msgstr ""
-
-#: ../rules/base.xml.in.h:374 ../rules/evdev.xml.in.h:374
-msgid "Legacy Wang 724"
-msgstr ""
-
-#. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:376 ../rules/evdev.xml.in.h:376
-msgid "Legacy key with comma"
-msgstr ""
-
-#: ../rules/base.xml.in.h:377 ../rules/evdev.xml.in.h:377
-msgid "Legacy key with dot"
-msgstr ""
-
-#: ../rules/base.xml.in.h:378 ../rules/evdev.xml.in.h:378
-msgid "Less-than/Greater-than"
-msgstr ""
-
-#: ../rules/base.xml.in.h:379 ../rules/evdev.xml.in.h:379
-msgid "Lithuania"
-msgstr "Litauen"
-
-#: ../rules/base.xml.in.h:380 ../rules/evdev.xml.in.h:380
-msgid "Logitech Access Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:381 ../rules/evdev.xml.in.h:381
-msgid "Logitech Cordless Desktop"
-msgstr ""
-
-#: ../rules/base.xml.in.h:382 ../rules/evdev.xml.in.h:382
-msgid "Logitech Cordless Desktop (alternate option)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:383 ../rules/evdev.xml.in.h:383
-msgid "Logitech Cordless Desktop EX110"
-msgstr ""
-
-#: ../rules/base.xml.in.h:384 ../rules/evdev.xml.in.h:384
-msgid "Logitech Cordless Desktop LX-300"
-msgstr ""
-
-#: ../rules/base.xml.in.h:385 ../rules/evdev.xml.in.h:385
-msgid "Logitech Cordless Desktop Navigator"
-msgstr ""
-
-#: ../rules/base.xml.in.h:386 ../rules/evdev.xml.in.h:386
-msgid "Logitech Cordless Desktop Optical"
-msgstr ""
-
-#: ../rules/base.xml.in.h:387 ../rules/evdev.xml.in.h:387
-msgid "Logitech Cordless Desktop Pro (alternate option2)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:388 ../rules/evdev.xml.in.h:388
-msgid "Logitech Cordless Desktop iTouch"
-msgstr ""
-
-#: ../rules/base.xml.in.h:389 ../rules/evdev.xml.in.h:389
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr ""
-
-#: ../rules/base.xml.in.h:390 ../rules/evdev.xml.in.h:390
-msgid "Logitech G15 extra keys via G15daemon"
-msgstr ""
-
-#: ../rules/base.xml.in.h:391 ../rules/evdev.xml.in.h:391
-msgid "Logitech Generic Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:392 ../rules/evdev.xml.in.h:392
-msgid "Logitech Internet 350 Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:393 ../rules/evdev.xml.in.h:393
-msgid "Logitech Internet Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:394 ../rules/evdev.xml.in.h:394
-msgid "Logitech Internet Navigator Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:395 ../rules/evdev.xml.in.h:395
-msgid "Logitech Media Elite Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:396 ../rules/evdev.xml.in.h:396
-msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:397 ../rules/evdev.xml.in.h:397
-msgid "Logitech Ultra-X Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:398 ../rules/evdev.xml.in.h:398
-msgid "Logitech diNovo Edge Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:399 ../rules/evdev.xml.in.h:399
-msgid "Logitech diNovo Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:400 ../rules/evdev.xml.in.h:400
-msgid "Logitech iTouch"
-msgstr ""
-
-#: ../rules/base.xml.in.h:401 ../rules/evdev.xml.in.h:401
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:402 ../rules/evdev.xml.in.h:402
-msgid "Logitech iTouch Internet Navigator Keyboard SE"
-msgstr ""
-
-#: ../rules/base.xml.in.h:403 ../rules/evdev.xml.in.h:403
-msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:404 ../rules/evdev.xml.in.h:404
-msgid "Lower Sorbian"
-msgstr ""
-
-#: ../rules/base.xml.in.h:405 ../rules/evdev.xml.in.h:405
-msgid "Lower Sorbian (qwertz)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:406 ../rules/evdev.xml.in.h:406
-msgid "Ltu"
-msgstr "Ltu"
-
-#: ../rules/base.xml.in.h:407 ../rules/evdev.xml.in.h:407
-msgid "MESS"
-msgstr "MESS"
-
-#: ../rules/base.xml.in.h:408 ../rules/evdev.xml.in.h:408
-msgid "MNE"
-msgstr ""
-
-#: ../rules/base.xml.in.h:409 ../rules/evdev.xml.in.h:409
-msgid "MacBook/MacBook Pro"
-msgstr ""
-
-#: ../rules/base.xml.in.h:410 ../rules/evdev.xml.in.h:410
-msgid "MacBook/MacBook Pro (Intl)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:411 ../rules/evdev.xml.in.h:411
-msgid "Macedonia"
-msgstr "Makedonia"
-
-#: ../rules/base.xml.in.h:412 ../rules/evdev.xml.in.h:412
-msgid "Macintosh"
-msgstr ""
-
-#: ../rules/base.xml.in.h:413 ../rules/evdev.xml.in.h:413
-msgid "Macintosh Old"
-msgstr ""
-
-#: ../rules/base.xml.in.h:414 ../rules/evdev.xml.in.h:414
-msgid "Macintosh, Sun dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:415 ../rules/evdev.xml.in.h:415
-msgid "Macintosh, eliminate dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:416 ../rules/evdev.xml.in.h:416
-msgid "Make CapsLock an additional Backspace"
-msgstr ""
-
-#: ../rules/base.xml.in.h:417 ../rules/evdev.xml.in.h:417
-msgid "Make CapsLock an additional Ctrl"
-msgstr ""
-
-#: ../rules/base.xml.in.h:418 ../rules/evdev.xml.in.h:418
-msgid "Make CapsLock an additional ESC"
-msgstr ""
-
-#: ../rules/base.xml.in.h:419 ../rules/evdev.xml.in.h:419
-msgid "Mal"
-msgstr ""
-
-#: ../rules/base.xml.in.h:420 ../rules/evdev.xml.in.h:420
-msgid "Malayalam"
-msgstr ""
-
-#: ../rules/base.xml.in.h:421 ../rules/evdev.xml.in.h:421
-msgid "Malayalam Lalitha"
-msgstr ""
-
-#: ../rules/base.xml.in.h:422 ../rules/evdev.xml.in.h:422
-msgid "Maldives"
-msgstr "Maldivene"
-
-#: ../rules/base.xml.in.h:423 ../rules/evdev.xml.in.h:423
-msgid "Malta"
-msgstr "Malta"
-
-#: ../rules/base.xml.in.h:424 ../rules/evdev.xml.in.h:424
-msgid "Maltese keyboard with US layout"
-msgstr ""
-
-#: ../rules/base.xml.in.h:425 ../rules/evdev.xml.in.h:425
-msgid "Mao"
-msgstr "Mao"
-
-#: ../rules/base.xml.in.h:426 ../rules/evdev.xml.in.h:426
-msgid "Maori"
-msgstr "Maori"
-
-#: ../rules/base.xml.in.h:427 ../rules/evdev.xml.in.h:427
-msgid "Memorex MX1998"
-msgstr ""
-
-#: ../rules/base.xml.in.h:428 ../rules/evdev.xml.in.h:428
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:429 ../rules/evdev.xml.in.h:429
-msgid "Memorex MX2750"
-msgstr ""
-
-#: ../rules/base.xml.in.h:430 ../rules/evdev.xml.in.h:430
-msgid "Menu"
-msgstr ""
-
-#: ../rules/base.xml.in.h:431 ../rules/evdev.xml.in.h:431
-msgid "Meta is mapped to Left Win"
-msgstr ""
-
-#: ../rules/base.xml.in.h:432 ../rules/evdev.xml.in.h:432
-msgid "Meta is mapped to Win keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:433 ../rules/evdev.xml.in.h:433
-msgid "Microsoft Comfort Curve Keyboard 2000"
-msgstr ""
-
-#: ../rules/base.xml.in.h:434 ../rules/evdev.xml.in.h:434
-msgid "Microsoft Internet Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:435 ../rules/evdev.xml.in.h:435
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr ""
-
-#: ../rules/base.xml.in.h:436 ../rules/evdev.xml.in.h:436
-msgid "Microsoft Natural"
-msgstr ""
-
-#: ../rules/base.xml.in.h:437 ../rules/evdev.xml.in.h:437
-msgid "Microsoft Natural Keyboard Elite"
-msgstr ""
-
-#: ../rules/base.xml.in.h:438 ../rules/evdev.xml.in.h:438
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr ""
-
-#: ../rules/base.xml.in.h:439 ../rules/evdev.xml.in.h:439
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr ""
-
-#: ../rules/base.xml.in.h:440 ../rules/evdev.xml.in.h:440
-msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr ""
-
-#: ../rules/base.xml.in.h:441 ../rules/evdev.xml.in.h:441
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
-msgstr ""
-
-#: ../rules/base.xml.in.h:442 ../rules/evdev.xml.in.h:442
-msgid "Microsoft Office Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:443 ../rules/evdev.xml.in.h:443
-msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
-msgstr ""
-
-#: ../rules/base.xml.in.h:444 ../rules/evdev.xml.in.h:444
-msgid "Miscellaneous compatibility options"
-msgstr ""
-
-#: ../rules/base.xml.in.h:445 ../rules/evdev.xml.in.h:445
-msgid "Mkd"
-msgstr ""
-
-#: ../rules/base.xml.in.h:446 ../rules/evdev.xml.in.h:446
-msgid "Mlt"
-msgstr ""
-
-#: ../rules/base.xml.in.h:447 ../rules/evdev.xml.in.h:447
-msgid "Mmr"
-msgstr ""
-
-#: ../rules/base.xml.in.h:448 ../rules/evdev.xml.in.h:448
-msgid "Mng"
-msgstr ""
-
-#: ../rules/base.xml.in.h:449 ../rules/evdev.xml.in.h:449
-msgid "Mongolia"
-msgstr ""
-
-#: ../rules/base.xml.in.h:450 ../rules/evdev.xml.in.h:450
-msgid "Montenegro"
-msgstr ""
-
-#: ../rules/base.xml.in.h:451 ../rules/evdev.xml.in.h:451
-msgid "Morocco"
-msgstr ""
-
-#: ../rules/base.xml.in.h:452 ../rules/evdev.xml.in.h:452
-msgid "Multilingual"
-msgstr ""
-
-#: ../rules/base.xml.in.h:453 ../rules/evdev.xml.in.h:453
-msgid "Multilingual, first part"
-msgstr ""
-
-#: ../rules/base.xml.in.h:454 ../rules/evdev.xml.in.h:454
-msgid "Multilingual, second part"
-msgstr ""
-
-#: ../rules/base.xml.in.h:455 ../rules/evdev.xml.in.h:455
-msgid "Myanmar"
-msgstr ""
-
-#: ../rules/base.xml.in.h:456 ../rules/evdev.xml.in.h:456
-msgid "NICOLA-F style Backspace"
-msgstr ""
-
-#: ../rules/base.xml.in.h:457 ../rules/evdev.xml.in.h:457
-msgid "NLA"
-msgstr ""
-
-#: ../rules/base.xml.in.h:458 ../rules/evdev.xml.in.h:458
-msgid "Nativo"
-msgstr ""
-
-#: ../rules/base.xml.in.h:459 ../rules/evdev.xml.in.h:459
-#, fuzzy
-msgid "Nativo for Esperanto"
-msgstr "Esperanto"
-
-#: ../rules/base.xml.in.h:460 ../rules/evdev.xml.in.h:460
-msgid "Nativo for USA keyboards"
-msgstr ""
-
-#: ../rules/base.xml.in.h:461 ../rules/evdev.xml.in.h:461
-msgid "Neo 2"
-msgstr ""
-
-#: ../rules/base.xml.in.h:462 ../rules/evdev.xml.in.h:462
-msgid "Nep"
-msgstr "Nep"
-
-#: ../rules/base.xml.in.h:463 ../rules/evdev.xml.in.h:463
-msgid "Nepal"
-msgstr "Nepal"
-
-#: ../rules/base.xml.in.h:464 ../rules/evdev.xml.in.h:464
-msgid "Netherlands"
-msgstr "Nederland"
-
-#: ../rules/base.xml.in.h:465 ../rules/evdev.xml.in.h:465
-msgid "Nig"
-msgstr "Nig"
-
-#: ../rules/base.xml.in.h:466 ../rules/evdev.xml.in.h:466
-msgid "Nigeria"
-msgstr "Nigeria"
-
-#: ../rules/base.xml.in.h:467 ../rules/evdev.xml.in.h:467
-msgid "Nld"
-msgstr ""
-
-#: ../rules/base.xml.in.h:468 ../rules/evdev.xml.in.h:468
-msgid "Non-breakable space character at fourth level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:469 ../rules/evdev.xml.in.h:469
-msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:470 ../rules/evdev.xml.in.h:470
-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:471 ../rules/evdev.xml.in.h:471
-msgid "Non-breakable space character at second level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:472 ../rules/evdev.xml.in.h:472
-msgid "Non-breakable space character at third level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:473 ../rules/evdev.xml.in.h:473
-msgid "Non-breakable space character at third level, nothing at fourth level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:474 ../rules/evdev.xml.in.h:474
-msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:475 ../rules/evdev.xml.in.h:475
-msgid "Nor"
-msgstr "Nor"
-
-#: ../rules/base.xml.in.h:476 ../rules/evdev.xml.in.h:476
-msgid "Northern Saami"
-msgstr "Nord-samisk"
-
-#: ../rules/base.xml.in.h:477 ../rules/evdev.xml.in.h:477
-msgid "Northern Saami, eliminate dead keys"
-msgstr "Nord-samisk, uten døde taster"
-
-#: ../rules/base.xml.in.h:478 ../rules/evdev.xml.in.h:478
-msgid "Northgate OmniKey 101"
-msgstr ""
-
-#: ../rules/base.xml.in.h:479 ../rules/evdev.xml.in.h:479
-msgid "Norway"
-msgstr "Norge"
-
-#: ../rules/base.xml.in.h:480 ../rules/evdev.xml.in.h:480
-msgid "NumLock"
-msgstr ""
-
-#: ../rules/base.xml.in.h:481 ../rules/evdev.xml.in.h:481
-msgid "Numeric keypad delete key behaviour"
-msgstr ""
-
-#: ../rules/base.xml.in.h:482 ../rules/evdev.xml.in.h:482
-msgid "Numeric keypad keys work as with Mac"
-msgstr ""
-
-#: ../rules/base.xml.in.h:483 ../rules/evdev.xml.in.h:483
-msgid "Numeric keypad layout selection"
-msgstr ""
-
-#: ../rules/base.xml.in.h:484 ../rules/evdev.xml.in.h:484
-msgid "OADG 109A"
-msgstr ""
-
-#: ../rules/base.xml.in.h:485 ../rules/evdev.xml.in.h:485
-msgid "OLPC"
-msgstr ""
-
-#: ../rules/base.xml.in.h:486 ../rules/evdev.xml.in.h:486
-msgid "OLPC Dari"
-msgstr ""
-
-#: ../rules/base.xml.in.h:487 ../rules/evdev.xml.in.h:487
-msgid "OLPC Pashto"
-msgstr ""
-
-#: ../rules/base.xml.in.h:488 ../rules/evdev.xml.in.h:488
-msgid "OLPC Southern Uzbek"
-msgstr ""
-
-#: ../rules/base.xml.in.h:489 ../rules/evdev.xml.in.h:489
-msgid "Ogham"
-msgstr ""
-
-#: ../rules/base.xml.in.h:490 ../rules/evdev.xml.in.h:490
-msgid "Ogham IS434"
-msgstr ""
-
-#: ../rules/base.xml.in.h:491 ../rules/evdev.xml.in.h:491
-msgid "Oriya"
-msgstr ""
-
-#: ../rules/base.xml.in.h:492 ../rules/evdev.xml.in.h:492
-msgid "Ortek MCK-800 MM/Internet keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:493 ../rules/evdev.xml.in.h:493
-msgid "Ossetian"
-msgstr ""
-
-#: ../rules/base.xml.in.h:494 ../rules/evdev.xml.in.h:494
-msgid "Ossetian, Winkeys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:495 ../rules/evdev.xml.in.h:495
-msgid "Ossetian, legacy"
-msgstr ""
-
-#: ../rules/base.xml.in.h:496 ../rules/evdev.xml.in.h:496
-msgid "PC-98xx Series"
-msgstr ""
-
-#: ../rules/base.xml.in.h:497 ../rules/evdev.xml.in.h:497
-msgid "Pak"
-msgstr ""
-
-#: ../rules/base.xml.in.h:498 ../rules/evdev.xml.in.h:498
-msgid "Pakistan"
-msgstr ""
-
-#: ../rules/base.xml.in.h:499 ../rules/evdev.xml.in.h:499
-msgid "Pashto"
-msgstr ""
-
-#: ../rules/base.xml.in.h:500 ../rules/evdev.xml.in.h:500
-msgid "Pattachote"
-msgstr ""
-
-#: ../rules/base.xml.in.h:501 ../rules/evdev.xml.in.h:501
-msgid "Phonetic"
-msgstr ""
-
-#: ../rules/base.xml.in.h:502 ../rules/evdev.xml.in.h:502
-msgid "Pol"
-msgstr ""
-
-#: ../rules/base.xml.in.h:503 ../rules/evdev.xml.in.h:503
-msgid "Poland"
-msgstr ""
-
-#: ../rules/base.xml.in.h:504 ../rules/evdev.xml.in.h:504
-msgid "Polytonic"
-msgstr ""
-
-#: ../rules/base.xml.in.h:505 ../rules/evdev.xml.in.h:505
-msgid "Portugal"
-msgstr "Portugal"
-
-#: ../rules/base.xml.in.h:506 ../rules/evdev.xml.in.h:506
-msgid "Pro"
-msgstr ""
-
-#: ../rules/base.xml.in.h:507 ../rules/evdev.xml.in.h:507
-msgid "Pro Keypad"
-msgstr ""
-
-#: ../rules/base.xml.in.h:508 ../rules/evdev.xml.in.h:508
-msgid "Probhat"
-msgstr ""
-
-#: ../rules/base.xml.in.h:509 ../rules/evdev.xml.in.h:509
-#, fuzzy
-msgid "Programmer Dvorak"
-msgstr "Fransk dvorak"
-
-#: ../rules/base.xml.in.h:510 ../rules/evdev.xml.in.h:510
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:511 ../rules/evdev.xml.in.h:511
-msgid "Prt"
-msgstr ""
-
-#: ../rules/base.xml.in.h:512 ../rules/evdev.xml.in.h:512
-msgid "QTronix Scorpius 98N+"
-msgstr ""
-
-#: ../rules/base.xml.in.h:513 ../rules/evdev.xml.in.h:513
-msgid "Right Alt"
-msgstr "Høyre Alt"
-
-#: ../rules/base.xml.in.h:514 ../rules/evdev.xml.in.h:514
-msgid "Right Alt (while pressed)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:515 ../rules/evdev.xml.in.h:515
-msgid "Right Alt key never chooses 3rd level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:516 ../rules/evdev.xml.in.h:516
-msgid "Right Alt, Shift+Right Alt key is Multi_Key"
-msgstr ""
-
-#: ../rules/base.xml.in.h:517 ../rules/evdev.xml.in.h:517
-msgid "Right Ctrl"
-msgstr "Høyre Ctrl"
-
-#: ../rules/base.xml.in.h:518 ../rules/evdev.xml.in.h:518
-msgid "Right Ctrl (while pressed)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:519 ../rules/evdev.xml.in.h:519
-msgid "Right Ctrl as Right Alt"
-msgstr ""
-
-#: ../rules/base.xml.in.h:520 ../rules/evdev.xml.in.h:520
-msgid "Right Shift"
-msgstr "Høyre Shift"
-
-#: ../rules/base.xml.in.h:521 ../rules/evdev.xml.in.h:521
-msgid "Right Win"
-msgstr "Høyre Win"
-
-#: ../rules/base.xml.in.h:522 ../rules/evdev.xml.in.h:522
-msgid "Right Win (while pressed)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:523 ../rules/evdev.xml.in.h:523
-msgid "Right hand"
-msgstr ""
-
-#: ../rules/base.xml.in.h:524 ../rules/evdev.xml.in.h:524
-msgid "Right handed Dvorak"
-msgstr ""
-
-#: ../rules/base.xml.in.h:525 ../rules/evdev.xml.in.h:525
-msgid "Romania"
-msgstr "Romania"
-
-#: ../rules/base.xml.in.h:526 ../rules/evdev.xml.in.h:526
-msgid "Romanian keyboard with German letters"
-msgstr ""
-
-#: ../rules/base.xml.in.h:527 ../rules/evdev.xml.in.h:527
-msgid "Romanian keyboard with German letters, eliminate dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:528 ../rules/evdev.xml.in.h:528
-msgid "Rou"
-msgstr ""
-
-#: ../rules/base.xml.in.h:529 ../rules/evdev.xml.in.h:529
-msgid "Rus"
-msgstr ""
-
-#: ../rules/base.xml.in.h:530 ../rules/evdev.xml.in.h:530
-msgid "Russia"
-msgstr "Russland"
-
-#: ../rules/base.xml.in.h:531 ../rules/evdev.xml.in.h:531
-msgid "Russian"
-msgstr "Russisk"
-
-#: ../rules/base.xml.in.h:532 ../rules/evdev.xml.in.h:532
-msgid "Russian phonetic"
-msgstr "Russisk fonetisk"
-
-#: ../rules/base.xml.in.h:533 ../rules/evdev.xml.in.h:533
-msgid "Russian phonetic Dvorak"
-msgstr ""
-
-#: ../rules/base.xml.in.h:534 ../rules/evdev.xml.in.h:534
-msgid "Russian phonetic, eliminate dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:535 ../rules/evdev.xml.in.h:535
-msgid "Russian with Kazakh"
-msgstr ""
-
-#: ../rules/base.xml.in.h:536 ../rules/evdev.xml.in.h:536
-msgid "SILVERCREST Multimedia Wireless Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:537 ../rules/evdev.xml.in.h:537
-msgid "SK-1300"
-msgstr ""
-
-#: ../rules/base.xml.in.h:538 ../rules/evdev.xml.in.h:538
-msgid "SK-2500"
-msgstr ""
-
-#: ../rules/base.xml.in.h:539 ../rules/evdev.xml.in.h:539
-msgid "SK-6200"
-msgstr ""
-
-#: ../rules/base.xml.in.h:540 ../rules/evdev.xml.in.h:540
-msgid "SK-7100"
-msgstr ""
-
-#: ../rules/base.xml.in.h:541 ../rules/evdev.xml.in.h:541
-msgid "SRB"
-msgstr ""
-
-#: ../rules/base.xml.in.h:542 ../rules/evdev.xml.in.h:542
-msgid "SVEN Ergonomic 2500"
-msgstr ""
-
-#: ../rules/base.xml.in.h:543 ../rules/evdev.xml.in.h:543
-msgid "SVEN Slim 303"
-msgstr ""
-
-#: ../rules/base.xml.in.h:544 ../rules/evdev.xml.in.h:544
-msgid "Samsung SDM 4500P"
-msgstr ""
-
-#: ../rules/base.xml.in.h:545 ../rules/evdev.xml.in.h:545
-msgid "Samsung SDM 4510P"
-msgstr ""
-
-#: ../rules/base.xml.in.h:546 ../rules/evdev.xml.in.h:546
-msgid "ScrollLock"
-msgstr ""
-
-#: ../rules/base.xml.in.h:547 ../rules/evdev.xml.in.h:547
-msgid "Secwepemctsin"
-msgstr ""
-
-#: ../rules/base.xml.in.h:548 ../rules/evdev.xml.in.h:548
-msgid "Semi-colon on third level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:549 ../rules/evdev.xml.in.h:549
-msgid "Serbia"
-msgstr "Serbia"
-
-#: ../rules/base.xml.in.h:550 ../rules/evdev.xml.in.h:550
-msgid "Shift cancels CapsLock"
-msgstr ""
-
-#: ../rules/base.xml.in.h:551 ../rules/evdev.xml.in.h:551
-msgid "Shift does not cancel NumLock, chooses 3d level instead"
-msgstr ""
-
-#: ../rules/base.xml.in.h:552 ../rules/evdev.xml.in.h:552
-msgid "Shift with numeric keypad keys works as in MS Windows"
-msgstr ""
-
-#: ../rules/base.xml.in.h:553 ../rules/evdev.xml.in.h:553
-msgid "Shift+CapsLock"
-msgstr ""
-
-#: ../rules/base.xml.in.h:554 ../rules/evdev.xml.in.h:554
-msgid "Simple"
-msgstr ""
-
-#: ../rules/base.xml.in.h:555 ../rules/evdev.xml.in.h:555
-msgid "Slovakia"
-msgstr "Slovakia"
-
-#: ../rules/base.xml.in.h:556 ../rules/evdev.xml.in.h:556
-msgid "Slovenia"
-msgstr "Slovenia"
-
-#: ../rules/base.xml.in.h:557 ../rules/evdev.xml.in.h:557
-msgid "South Africa"
-msgstr "Sør-Afrika"
-
-#: ../rules/base.xml.in.h:558 ../rules/evdev.xml.in.h:558
-msgid "Southern Uzbek"
-msgstr ""
-
-#: ../rules/base.xml.in.h:559 ../rules/evdev.xml.in.h:559
-msgid "Spain"
-msgstr "Spania"
-
-#: ../rules/base.xml.in.h:560 ../rules/evdev.xml.in.h:560
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
-msgstr ""
-
-#: ../rules/base.xml.in.h:561 ../rules/evdev.xml.in.h:561
-msgid "SrL"
-msgstr ""
-
-#: ../rules/base.xml.in.h:562 ../rules/evdev.xml.in.h:562
-msgid "Sri Lanka"
-msgstr ""
-
-#: ../rules/base.xml.in.h:563 ../rules/evdev.xml.in.h:563
-msgid "Standard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:564 ../rules/evdev.xml.in.h:564
-msgid "Standard (Cedilla)"
-msgstr ""
-
-#. RSTU 2019-91
-#: ../rules/base.xml.in.h:566 ../rules/evdev.xml.in.h:566
-msgid "Standard RSTU"
-msgstr ""
-
-#. RSTU 2019-91
-#: ../rules/base.xml.in.h:568 ../rules/evdev.xml.in.h:568
-msgid "Standard RSTU on Russian layout"
-msgstr ""
-
-#: ../rules/base.xml.in.h:569 ../rules/evdev.xml.in.h:569
-msgid "Sun Type 5/6"
-msgstr ""
-
-#: ../rules/base.xml.in.h:570 ../rules/evdev.xml.in.h:570
-msgid "Sun dead keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:571 ../rules/evdev.xml.in.h:571
-msgid "Super Power Multimedia Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:572 ../rules/evdev.xml.in.h:572
-msgid "Super is mapped to Win keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:573 ../rules/evdev.xml.in.h:573
-msgid "Svdvorak"
-msgstr ""
-
-#: ../rules/base.xml.in.h:574 ../rules/evdev.xml.in.h:574
-msgid "Svk"
-msgstr ""
-
-#: ../rules/base.xml.in.h:575 ../rules/evdev.xml.in.h:575
-msgid "Svn"
-msgstr ""
-
-#: ../rules/base.xml.in.h:576 ../rules/evdev.xml.in.h:576
-msgid "Swap Ctrl and CapsLock"
-msgstr ""
-
-#: ../rules/base.xml.in.h:577 ../rules/evdev.xml.in.h:577
-msgid "Swap ESC and CapsLock"
-msgstr ""
-
-#: ../rules/base.xml.in.h:578 ../rules/evdev.xml.in.h:578
-msgid "Swe"
-msgstr ""
-
-#: ../rules/base.xml.in.h:579 ../rules/evdev.xml.in.h:579
-msgid "Sweden"
-msgstr ""
-
-#: ../rules/base.xml.in.h:580 ../rules/evdev.xml.in.h:580
-msgid "Switzerland"
-msgstr ""
-
-#: ../rules/base.xml.in.h:581 ../rules/evdev.xml.in.h:581
-msgid "Symplon PaceBook (tablet PC)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:582 ../rules/evdev.xml.in.h:582
-msgid "Syr"
-msgstr ""
-
-#: ../rules/base.xml.in.h:583 ../rules/evdev.xml.in.h:583
-msgid "Syria"
-msgstr ""
-
-#: ../rules/base.xml.in.h:584 ../rules/evdev.xml.in.h:584
-msgid "Syriac"
-msgstr ""
-
-#: ../rules/base.xml.in.h:585 ../rules/evdev.xml.in.h:585
-msgid "Syriac phonetic"
-msgstr ""
-
-#: ../rules/base.xml.in.h:586 ../rules/evdev.xml.in.h:586
-msgid "TIS-820.2538"
-msgstr ""
-
-#: ../rules/base.xml.in.h:587 ../rules/evdev.xml.in.h:587
-msgid "Tajikistan"
-msgstr ""
-
-#: ../rules/base.xml.in.h:588 ../rules/evdev.xml.in.h:588
-msgid "Tamil"
-msgstr ""
-
-#: ../rules/base.xml.in.h:589 ../rules/evdev.xml.in.h:589
-msgid "Tamil TAB Typewriter"
-msgstr ""
-
-#: ../rules/base.xml.in.h:590 ../rules/evdev.xml.in.h:590
-msgid "Tamil TSCII Typewriter"
-msgstr ""
-
-#: ../rules/base.xml.in.h:591 ../rules/evdev.xml.in.h:591
-msgid "Tamil Unicode"
-msgstr ""
-
-#: ../rules/base.xml.in.h:592 ../rules/evdev.xml.in.h:592
-msgid "Targa Visionary 811"
-msgstr ""
-
-#: ../rules/base.xml.in.h:593 ../rules/evdev.xml.in.h:593
-msgid "Tatar"
-msgstr ""
-
-#: ../rules/base.xml.in.h:594 ../rules/evdev.xml.in.h:594
-msgid "Telugu"
-msgstr ""
-
-#: ../rules/base.xml.in.h:595 ../rules/evdev.xml.in.h:595
-msgid "Tha"
-msgstr ""
-
-#: ../rules/base.xml.in.h:596 ../rules/evdev.xml.in.h:596
-msgid "Thailand"
-msgstr ""
-
-#: ../rules/base.xml.in.h:597 ../rules/evdev.xml.in.h:597
-msgid "Tibetan"
-msgstr ""
-
-#: ../rules/base.xml.in.h:598 ../rules/evdev.xml.in.h:598
-msgid "Tibetan (with ASCII numerals)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:599 ../rules/evdev.xml.in.h:599
-msgid "Tifinagh"
-msgstr ""
-
-#: ../rules/base.xml.in.h:600 ../rules/evdev.xml.in.h:600
-msgid "Tifinagh Alternative"
-msgstr ""
-
-#: ../rules/base.xml.in.h:601 ../rules/evdev.xml.in.h:601
-msgid "Tifinagh Alternative Phonetic"
-msgstr ""
-
-#: ../rules/base.xml.in.h:602 ../rules/evdev.xml.in.h:602
-msgid "Tifinagh Extended"
-msgstr ""
-
-#: ../rules/base.xml.in.h:603 ../rules/evdev.xml.in.h:603
-msgid "Tifinagh Extended Phonetic"
-msgstr ""
-
-#: ../rules/base.xml.in.h:604 ../rules/evdev.xml.in.h:604
-msgid "Tifinagh Phonetic"
-msgstr ""
-
-#: ../rules/base.xml.in.h:605 ../rules/evdev.xml.in.h:605
-msgid "Tilde (~) variant"
-msgstr ""
-
-#: ../rules/base.xml.in.h:606 ../rules/evdev.xml.in.h:606
-msgid "Tjk"
-msgstr ""
-
-#: ../rules/base.xml.in.h:607 ../rules/evdev.xml.in.h:607
-msgid "To the corresponding key in a Dvorak keyboard."
-msgstr ""
-
-#: ../rules/base.xml.in.h:608 ../rules/evdev.xml.in.h:608
-msgid "To the corresponding key in a Qwerty keyboard."
-msgstr ""
-
-#: ../rules/base.xml.in.h:609 ../rules/evdev.xml.in.h:609
-msgid "Toshiba Satellite S3000"
-msgstr ""
-
-#: ../rules/base.xml.in.h:610 ../rules/evdev.xml.in.h:610
-msgid "Trust Direct Access Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:611 ../rules/evdev.xml.in.h:611
-msgid "Trust Wireless Keyboard Classic"
-msgstr ""
-
-#: ../rules/base.xml.in.h:612 ../rules/evdev.xml.in.h:612
-msgid "Tur"
-msgstr ""
-
-#: ../rules/base.xml.in.h:613 ../rules/evdev.xml.in.h:613
-msgid "Turkey"
-msgstr ""
-
-#: ../rules/base.xml.in.h:614 ../rules/evdev.xml.in.h:614
-msgid "Typewriter"
-msgstr ""
-
-#: ../rules/base.xml.in.h:615 ../rules/evdev.xml.in.h:615
-msgid "UCW layout (accented letters only)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:616 ../rules/evdev.xml.in.h:616
-msgid "US keyboard with Bosnian digraphs"
-msgstr ""
-
-#: ../rules/base.xml.in.h:617 ../rules/evdev.xml.in.h:617
-msgid "US keyboard with Bosnian letters"
-msgstr ""
-
-#: ../rules/base.xml.in.h:618 ../rules/evdev.xml.in.h:618
-msgid "US keyboard with Croatian digraphs"
-msgstr ""
-
-#: ../rules/base.xml.in.h:619 ../rules/evdev.xml.in.h:619
-msgid "US keyboard with Croatian letters"
-msgstr ""
-
-#: ../rules/base.xml.in.h:620 ../rules/evdev.xml.in.h:620
-msgid "US keyboard with Estonian letters"
-msgstr ""
-
-#: ../rules/base.xml.in.h:621 ../rules/evdev.xml.in.h:621
-msgid "US keyboard with Lithuanian letters"
-msgstr ""
-
-#: ../rules/base.xml.in.h:622 ../rules/evdev.xml.in.h:622
-msgid "US keyboard with Slovenian digraphs"
-msgstr ""
-
-#: ../rules/base.xml.in.h:623 ../rules/evdev.xml.in.h:623
-msgid "US keyboard with Slovenian letters"
-msgstr ""
-
-#: ../rules/base.xml.in.h:624 ../rules/evdev.xml.in.h:624
-msgid "USA"
-msgstr ""
-
-#: ../rules/base.xml.in.h:625 ../rules/evdev.xml.in.h:625
-msgid "Udmurt"
-msgstr ""
-
-#: ../rules/base.xml.in.h:626 ../rules/evdev.xml.in.h:626
-msgid "Ukr"
-msgstr ""
-
-#: ../rules/base.xml.in.h:627 ../rules/evdev.xml.in.h:627
-msgid "Ukraine"
-msgstr ""
-
-#: ../rules/base.xml.in.h:628 ../rules/evdev.xml.in.h:628
-msgid "Unicode"
-msgstr ""
-
-#: ../rules/base.xml.in.h:629 ../rules/evdev.xml.in.h:629
-msgid "Unicode additions (arrows and math operators)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:630 ../rules/evdev.xml.in.h:630
-msgid "Unicode additions (arrows and math operators). Math operators on default level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:631 ../rules/evdev.xml.in.h:631
-msgid "UnicodeExpert"
-msgstr ""
-
-#: ../rules/base.xml.in.h:632 ../rules/evdev.xml.in.h:632
-msgid "United Kingdom"
-msgstr ""
-
-#: ../rules/base.xml.in.h:633 ../rules/evdev.xml.in.h:633
-msgid "Unitek KB-1925"
-msgstr ""
-
-#: ../rules/base.xml.in.h:634 ../rules/evdev.xml.in.h:634
-#, fuzzy
-msgid "Urdu, Alternative phonetic"
-msgstr "Alternativ fonetisk"
-
-#: ../rules/base.xml.in.h:635 ../rules/evdev.xml.in.h:635
-msgid "Urdu, Phonetic"
-msgstr ""
-
-#: ../rules/base.xml.in.h:636 ../rules/evdev.xml.in.h:636
-msgid "Urdu, Winkeys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:637 ../rules/evdev.xml.in.h:637
-msgid "Use Bosnian digraphs"
-msgstr ""
-
-#: ../rules/base.xml.in.h:638 ../rules/evdev.xml.in.h:638
-msgid "Use Croatian digraphs"
-msgstr ""
-
-#: ../rules/base.xml.in.h:639 ../rules/evdev.xml.in.h:639
-msgid "Use Slovenian digraphs"
-msgstr ""
-
-#: ../rules/base.xml.in.h:640 ../rules/evdev.xml.in.h:640
-msgid "Use guillemets for quotes"
-msgstr ""
-
-#: ../rules/base.xml.in.h:641 ../rules/evdev.xml.in.h:641
-msgid "Use keyboard LED to show alternative layout"
-msgstr ""
-
-#: ../rules/base.xml.in.h:642 ../rules/evdev.xml.in.h:642
-msgid "Using space key to input non-breakable space character"
-msgstr ""
-
-#: ../rules/base.xml.in.h:643 ../rules/evdev.xml.in.h:643
-msgid "Usual space at any level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:644 ../rules/evdev.xml.in.h:644
-msgid "Uzb"
-msgstr ""
-
-#: ../rules/base.xml.in.h:645 ../rules/evdev.xml.in.h:645
-msgid "Uzbekistan"
-msgstr ""
-
-#: ../rules/base.xml.in.h:646 ../rules/evdev.xml.in.h:646
-msgid "Vietnam"
-msgstr ""
-
-#: ../rules/base.xml.in.h:647 ../rules/evdev.xml.in.h:647
-msgid "ViewSonic KU-306 Internet Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:648 ../rules/evdev.xml.in.h:648
-msgid "Vnm"
-msgstr ""
-
-#: ../rules/base.xml.in.h:649 ../rules/evdev.xml.in.h:649
-msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:650 ../rules/evdev.xml.in.h:650
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:651 ../rules/evdev.xml.in.h:651
-msgid "Wang model 724 azerty"
-msgstr ""
-
-#: ../rules/base.xml.in.h:652 ../rules/evdev.xml.in.h:652
-msgid "Western"
-msgstr ""
-
-#: ../rules/base.xml.in.h:653 ../rules/evdev.xml.in.h:653
-msgid "Winbook Model XP5"
-msgstr ""
-
-#: ../rules/base.xml.in.h:654 ../rules/evdev.xml.in.h:654
-msgid "Winkeys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:655 ../rules/evdev.xml.in.h:655
-msgid "With &lt;\\|&gt; key"
-msgstr ""
-
-#: ../rules/base.xml.in.h:656 ../rules/evdev.xml.in.h:656
-msgid "With EuroSign on 5"
-msgstr ""
-
-#: ../rules/base.xml.in.h:657 ../rules/evdev.xml.in.h:657
-msgid "With guillemets"
-msgstr ""
-
-#: ../rules/base.xml.in.h:658 ../rules/evdev.xml.in.h:658
-msgid "Yahoo! Internet Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:659 ../rules/evdev.xml.in.h:659
-msgid "Yakut"
-msgstr ""
-
-#: ../rules/base.xml.in.h:660 ../rules/evdev.xml.in.h:660
-msgid "Yoruba"
-msgstr ""
-
-#: ../rules/base.xml.in.h:661 ../rules/evdev.xml.in.h:661
-msgid "Z and ZHE swapped"
-msgstr ""
-
-#: ../rules/base.xml.in.h:662 ../rules/evdev.xml.in.h:662
-msgid "Zar"
-msgstr ""
-
-#: ../rules/base.xml.in.h:663 ../rules/evdev.xml.in.h:663
-msgid "azerty"
-msgstr ""
-
-#: ../rules/base.xml.in.h:664 ../rules/evdev.xml.in.h:664
-msgid "azerty/digits"
-msgstr ""
-
-#: ../rules/base.xml.in.h:665 ../rules/evdev.xml.in.h:665
-msgid "digits"
-msgstr ""
-
-#: ../rules/base.xml.in.h:666 ../rules/evdev.xml.in.h:666
-msgid "displaced semicolon and quote (obsolete)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:667 ../rules/evdev.xml.in.h:667
-msgid "lyx"
-msgstr ""
-
-#: ../rules/base.xml.in.h:668 ../rules/evdev.xml.in.h:668
-msgid "qwerty"
-msgstr ""
-
-#: ../rules/base.xml.in.h:669 ../rules/evdev.xml.in.h:669
-msgid "qwerty, extended Backslash"
-msgstr ""
-
-#: ../rules/base.xml.in.h:670 ../rules/evdev.xml.in.h:670
-msgid "qwerty/digits"
-msgstr ""
-
-#: ../rules/base.xml.in.h:671 ../rules/evdev.xml.in.h:671
-msgid "qwertz"
-msgstr ""
+# Norwegian bokmaal translation of xkeyboard-config.
+# Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the xkeyboard-config package.
+# Kjartan Maraas <kmaraas@gnome.org>, 2007-2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 1.5\n"
+"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-13 23:12+0000\n"
+"PO-Revision-Date: 2009-04-12 11:33+0200\n"
+"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
+"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../rules/base.xml.in.h:1 ../rules/evdev.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2 ../rules/evdev.xml.in.h:2
+msgid "(Legacy) Alternative"
+msgstr ""
+
+#: ../rules/base.xml.in.h:3 ../rules/evdev.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:4 ../rules/evdev.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:5 ../rules/evdev.xml.in.h:5
+msgid "101/104 key Compatible"
+msgstr "101/104-taster kompatibelt"
+
+#: ../rules/base.xml.in.h:6 ../rules/evdev.xml.in.h:6
+msgid "101/qwerty/comma/Dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:7 ../rules/evdev.xml.in.h:7
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:8 ../rules/evdev.xml.in.h:8
+msgid "101/qwerty/dot/Dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:9 ../rules/evdev.xml.in.h:9
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:10 ../rules/evdev.xml.in.h:10
+msgid "101/qwertz/comma/Dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:11 ../rules/evdev.xml.in.h:11
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:12 ../rules/evdev.xml.in.h:12
+msgid "101/qwertz/dot/Dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:13 ../rules/evdev.xml.in.h:13
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:14 ../rules/evdev.xml.in.h:14
+msgid "102/qwerty/comma/Dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:15 ../rules/evdev.xml.in.h:15
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:16 ../rules/evdev.xml.in.h:16
+msgid "102/qwerty/dot/Dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:17 ../rules/evdev.xml.in.h:17
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:18 ../rules/evdev.xml.in.h:18
+msgid "102/qwertz/comma/Dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:19 ../rules/evdev.xml.in.h:19
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:20 ../rules/evdev.xml.in.h:20
+msgid "102/qwertz/dot/Dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:21 ../rules/evdev.xml.in.h:21
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:22 ../rules/evdev.xml.in.h:22
+msgid "2"
+msgstr ""
+
+#: ../rules/base.xml.in.h:23 ../rules/evdev.xml.in.h:23
+msgid "4"
+msgstr ""
+
+#: ../rules/base.xml.in.h:24 ../rules/evdev.xml.in.h:24
+msgid "5"
+msgstr ""
+
+#: ../rules/base.xml.in.h:25 ../rules/evdev.xml.in.h:25
+msgid "A4Tech KB-21"
+msgstr ""
+
+#: ../rules/base.xml.in.h:26 ../rules/evdev.xml.in.h:26
+msgid "A4Tech KBS-8"
+msgstr ""
+
+#: ../rules/base.xml.in.h:27 ../rules/evdev.xml.in.h:27
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr ""
+
+#: ../rules/base.xml.in.h:28 ../rules/evdev.xml.in.h:28
+msgid "ACPI Standard"
+msgstr "ACPI-standard"
+
+#: ../rules/base.xml.in.h:29 ../rules/evdev.xml.in.h:29
+msgid "ATM/phone-style"
+msgstr ""
+
+#: ../rules/base.xml.in.h:30 ../rules/evdev.xml.in.h:30
+msgid "Acer AirKey V"
+msgstr ""
+
+#: ../rules/base.xml.in.h:31 ../rules/evdev.xml.in.h:31
+msgid "Acer C300"
+msgstr ""
+
+#: ../rules/base.xml.in.h:32 ../rules/evdev.xml.in.h:32
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
+
+#: ../rules/base.xml.in.h:33 ../rules/evdev.xml.in.h:33
+msgid "Acer Laptop"
+msgstr "Acer bærbar"
+
+#: ../rules/base.xml.in.h:34 ../rules/evdev.xml.in.h:34
+msgid "Add the standard behavior to Menu key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:35 ../rules/evdev.xml.in.h:35
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:36 ../rules/evdev.xml.in.h:36
+#, fuzzy
+msgid "Adding EuroSign to certain keys"
+msgstr "Legg til Euro-tegnet på 2-tasten."
+
+#: ../rules/base.xml.in.h:37 ../rules/evdev.xml.in.h:37
+msgid "Advance Scorpius KI"
+msgstr ""
+
+#: ../rules/base.xml.in.h:38 ../rules/evdev.xml.in.h:38
+msgid "Afg"
+msgstr "Afg"
+
+#: ../rules/base.xml.in.h:39 ../rules/evdev.xml.in.h:39
+msgid "Afghanistan"
+msgstr "Afghanistan"
+
+#: ../rules/base.xml.in.h:40 ../rules/evdev.xml.in.h:40
+msgid "Akan"
+msgstr "Akan"
+
+#: ../rules/base.xml.in.h:41 ../rules/evdev.xml.in.h:41
+msgid "Alb"
+msgstr "Alb"
+
+#: ../rules/base.xml.in.h:42 ../rules/evdev.xml.in.h:42
+msgid "Albania"
+msgstr "Albania"
+
+#: ../rules/base.xml.in.h:43 ../rules/evdev.xml.in.h:43
+msgid "Alt and Meta are on Alt keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:44 ../rules/evdev.xml.in.h:44
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr ""
+
+#: ../rules/base.xml.in.h:45 ../rules/evdev.xml.in.h:45
+msgid "Alt+CapsLock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:46 ../rules/evdev.xml.in.h:46
+msgid "Alt+Ctrl"
+msgstr ""
+
+#: ../rules/base.xml.in.h:47 ../rules/evdev.xml.in.h:47
+msgid "Alt+Shift"
+msgstr ""
+
+#: ../rules/base.xml.in.h:48 ../rules/evdev.xml.in.h:48
+msgid "Alt+Space"
+msgstr ""
+
+#: ../rules/base.xml.in.h:49 ../rules/evdev.xml.in.h:49
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:50 ../rules/evdev.xml.in.h:50
+msgid "Alt/Win key behavior"
+msgstr ""
+
+#: ../rules/base.xml.in.h:51 ../rules/evdev.xml.in.h:51
+msgid "Alternative"
+msgstr "Alternativ"
+
+#: ../rules/base.xml.in.h:52 ../rules/evdev.xml.in.h:52
+msgid "Alternative Eastern"
+msgstr "Alternativ østlig"
+
+#: ../rules/base.xml.in.h:53 ../rules/evdev.xml.in.h:53
+msgid "Alternative Phonetic"
+msgstr "Alternativ fonetisk"
+
+#: ../rules/base.xml.in.h:54 ../rules/evdev.xml.in.h:54
+msgid "Alternative international (former us_intl)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:55 ../rules/evdev.xml.in.h:55
+msgid "Alternative, Sun dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:56 ../rules/evdev.xml.in.h:56
+msgid "Alternative, eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:57 ../rules/evdev.xml.in.h:57
+msgid "Alternative, latin-9 only"
+msgstr ""
+
+#: ../rules/base.xml.in.h:58 ../rules/evdev.xml.in.h:58
+msgid "And"
+msgstr "And"
+
+#: ../rules/base.xml.in.h:59 ../rules/evdev.xml.in.h:59
+msgid "Andorra"
+msgstr "Andorra"
+
+#: ../rules/base.xml.in.h:60 ../rules/evdev.xml.in.h:60
+msgid "Any Alt key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:61 ../rules/evdev.xml.in.h:61
+msgid "Any Win key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:62 ../rules/evdev.xml.in.h:62
+msgid "Any Win key (while pressed)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:63 ../rules/evdev.xml.in.h:63
+msgid "Apostrophe (') variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:64 ../rules/evdev.xml.in.h:64
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:65 ../rules/evdev.xml.in.h:65
+msgid "Apple Laptop"
+msgstr "Apple bærbar"
+
+#: ../rules/base.xml.in.h:66 ../rules/evdev.xml.in.h:66
+msgid "Ara"
+msgstr "Ara"
+
+#: ../rules/base.xml.in.h:67 ../rules/evdev.xml.in.h:67
+msgid "Arabic"
+msgstr "Arabisk"
+
+#: ../rules/base.xml.in.h:68 ../rules/evdev.xml.in.h:68
+msgid "Arm"
+msgstr "Arm"
+
+#: ../rules/base.xml.in.h:69 ../rules/evdev.xml.in.h:69
+msgid "Armenia"
+msgstr "Armenia"
+
+#: ../rules/base.xml.in.h:70 ../rules/evdev.xml.in.h:70
+msgid "Asturian variant with bottom-dot H and bottom-dot L"
+msgstr ""
+
+#: ../rules/base.xml.in.h:71 ../rules/evdev.xml.in.h:71
+msgid "Asus Laptop"
+msgstr "Asus bærbar"
+
+#: ../rules/base.xml.in.h:72 ../rules/evdev.xml.in.h:72
+msgid "At bottom left"
+msgstr ""
+
+#: ../rules/base.xml.in.h:73 ../rules/evdev.xml.in.h:73
+msgid "At left of 'A'"
+msgstr ""
+
+#: ../rules/base.xml.in.h:74 ../rules/evdev.xml.in.h:74
+msgid "Aze"
+msgstr "Ase"
+
+#: ../rules/base.xml.in.h:75 ../rules/evdev.xml.in.h:75
+msgid "Azerbaijan"
+msgstr "Aserbaijdsjan"
+
+#: ../rules/base.xml.in.h:76 ../rules/evdev.xml.in.h:76
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:77 ../rules/evdev.xml.in.h:77
+msgid "BTC 5090"
+msgstr ""
+
+#: ../rules/base.xml.in.h:78 ../rules/evdev.xml.in.h:78
+msgid "BTC 5113RF Multimedia"
+msgstr ""
+
+#: ../rules/base.xml.in.h:79 ../rules/evdev.xml.in.h:79
+msgid "BTC 5126T"
+msgstr ""
+
+#: ../rules/base.xml.in.h:80 ../rules/evdev.xml.in.h:80
+msgid "BTC 6301URF"
+msgstr ""
+
+#: ../rules/base.xml.in.h:81 ../rules/evdev.xml.in.h:81
+msgid "BTC 9000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:82 ../rules/evdev.xml.in.h:82
+msgid "BTC 9000A"
+msgstr ""
+
+#: ../rules/base.xml.in.h:83 ../rules/evdev.xml.in.h:83
+msgid "BTC 9001AH"
+msgstr ""
+
+#: ../rules/base.xml.in.h:84 ../rules/evdev.xml.in.h:84
+msgid "BTC 9019U"
+msgstr ""
+
+#: ../rules/base.xml.in.h:85 ../rules/evdev.xml.in.h:85
+msgid "BTC 9116U Mini Wireless Internet and Gaming"
+msgstr ""
+
+#: ../rules/base.xml.in.h:86 ../rules/evdev.xml.in.h:86
+msgid "Ban"
+msgstr ""
+
+#: ../rules/base.xml.in.h:87 ../rules/evdev.xml.in.h:87
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+#: ../rules/base.xml.in.h:88 ../rules/evdev.xml.in.h:88
+msgid "Bel"
+msgstr ""
+
+#: ../rules/base.xml.in.h:89 ../rules/evdev.xml.in.h:89
+msgid "Belarus"
+msgstr "Hviterussland"
+
+#: ../rules/base.xml.in.h:90 ../rules/evdev.xml.in.h:90
+msgid "Belgium"
+msgstr "Belgia"
+
+#: ../rules/base.xml.in.h:91 ../rules/evdev.xml.in.h:91
+msgid "BenQ X-Touch"
+msgstr ""
+
+#: ../rules/base.xml.in.h:92 ../rules/evdev.xml.in.h:92
+msgid "BenQ X-Touch 730"
+msgstr ""
+
+#: ../rules/base.xml.in.h:93 ../rules/evdev.xml.in.h:93
+msgid "BenQ X-Touch 800"
+msgstr ""
+
+#: ../rules/base.xml.in.h:94 ../rules/evdev.xml.in.h:94
+msgid "Bengali"
+msgstr ""
+
+#: ../rules/base.xml.in.h:95 ../rules/evdev.xml.in.h:95
+msgid "Bengali Probhat"
+msgstr ""
+
+#: ../rules/base.xml.in.h:96 ../rules/evdev.xml.in.h:96
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr ""
+
+#: ../rules/base.xml.in.h:97 ../rules/evdev.xml.in.h:97
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr ""
+
+#: ../rules/base.xml.in.h:98 ../rules/evdev.xml.in.h:98
+msgid "Bgr"
+msgstr ""
+
+#: ../rules/base.xml.in.h:99 ../rules/evdev.xml.in.h:99
+msgid "Bhu"
+msgstr ""
+
+#: ../rules/base.xml.in.h:100 ../rules/evdev.xml.in.h:100
+msgid "Bhutan"
+msgstr "Bhutan"
+
+#: ../rules/base.xml.in.h:101 ../rules/evdev.xml.in.h:101
+msgid "Biblical Hebrew (Tiro)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:102 ../rules/evdev.xml.in.h:102
+msgid "Bih"
+msgstr ""
+
+#: ../rules/base.xml.in.h:103 ../rules/evdev.xml.in.h:103
+msgid "Blr"
+msgstr ""
+
+#: ../rules/base.xml.in.h:104 ../rules/evdev.xml.in.h:104
+msgid "Bosnia and Herzegovina"
+msgstr "Bosnia og Herzegovina"
+
+#: ../rules/base.xml.in.h:105 ../rules/evdev.xml.in.h:105
+msgid "Both Alt keys together"
+msgstr ""
+
+#: ../rules/base.xml.in.h:106 ../rules/evdev.xml.in.h:106
+msgid "Both Ctrl keys together"
+msgstr ""
+
+#: ../rules/base.xml.in.h:107 ../rules/evdev.xml.in.h:107
+msgid "Both Shift keys together"
+msgstr ""
+
+#: ../rules/base.xml.in.h:108 ../rules/evdev.xml.in.h:108
+msgid "Bra"
+msgstr ""
+
+#: ../rules/base.xml.in.h:109 ../rules/evdev.xml.in.h:109
+msgid "Braille"
+msgstr ""
+
+#: ../rules/base.xml.in.h:110 ../rules/evdev.xml.in.h:110
+msgid "Brazil"
+msgstr "Brasil"
+
+#: ../rules/base.xml.in.h:111 ../rules/evdev.xml.in.h:111
+msgid "Brazilian ABNT2"
+msgstr ""
+
+#: ../rules/base.xml.in.h:112 ../rules/evdev.xml.in.h:112
+msgid "Breton"
+msgstr ""
+
+#: ../rules/base.xml.in.h:113 ../rules/evdev.xml.in.h:113
+msgid "Brl"
+msgstr ""
+
+#: ../rules/base.xml.in.h:114 ../rules/evdev.xml.in.h:114
+msgid "Brother Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:115 ../rules/evdev.xml.in.h:115
+msgid "Buckwalter"
+msgstr ""
+
+#: ../rules/base.xml.in.h:116 ../rules/evdev.xml.in.h:116
+msgid "Bulgaria"
+msgstr "Bulgaria"
+
+#: ../rules/base.xml.in.h:117 ../rules/evdev.xml.in.h:117
+msgid "CRULP"
+msgstr ""
+
+#: ../rules/base.xml.in.h:118 ../rules/evdev.xml.in.h:118
+msgid "Cambodia"
+msgstr ""
+
+#: ../rules/base.xml.in.h:119 ../rules/evdev.xml.in.h:119
+msgid "Can"
+msgstr ""
+
+#: ../rules/base.xml.in.h:120 ../rules/evdev.xml.in.h:120
+msgid "Canada"
+msgstr ""
+
+#: ../rules/base.xml.in.h:121 ../rules/evdev.xml.in.h:121
+msgid "Caps Lock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:122 ../rules/evdev.xml.in.h:122
+msgid "CapsLock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:123 ../rules/evdev.xml.in.h:123
+msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:124 ../rules/evdev.xml.in.h:124
+msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
+msgstr ""
+
+#: ../rules/base.xml.in.h:125 ../rules/evdev.xml.in.h:125
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:126 ../rules/evdev.xml.in.h:126
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:127 ../rules/evdev.xml.in.h:127
+msgid "CapsLock key behavior"
+msgstr ""
+
+#: ../rules/base.xml.in.h:128 ../rules/evdev.xml.in.h:128
+msgid "CapsLock toggles Shift so all keys are affected"
+msgstr ""
+
+#: ../rules/base.xml.in.h:129 ../rules/evdev.xml.in.h:129
+msgid "CapsLock toggles normal capitalization of alphabetic characters"
+msgstr ""
+
+#: ../rules/base.xml.in.h:130 ../rules/evdev.xml.in.h:130
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:131 ../rules/evdev.xml.in.h:131
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:132 ../rules/evdev.xml.in.h:132
+msgid "Catalan variant with middle-dot L"
+msgstr ""
+
+#: ../rules/base.xml.in.h:133 ../rules/evdev.xml.in.h:133
+msgid "Cedilla"
+msgstr ""
+
+#: ../rules/base.xml.in.h:134 ../rules/evdev.xml.in.h:134
+msgid "Che"
+msgstr ""
+
+#: ../rules/base.xml.in.h:135 ../rules/evdev.xml.in.h:135
+msgid "Cherokee"
+msgstr ""
+
+#: ../rules/base.xml.in.h:136 ../rules/evdev.xml.in.h:136
+msgid "Cherry Blue Line CyBo@rd"
+msgstr ""
+
+#: ../rules/base.xml.in.h:137 ../rules/evdev.xml.in.h:137
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:138 ../rules/evdev.xml.in.h:138
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr ""
+
+#: ../rules/base.xml.in.h:139 ../rules/evdev.xml.in.h:139
+msgid "Cherry CyMotion Expert"
+msgstr ""
+
+#: ../rules/base.xml.in.h:140 ../rules/evdev.xml.in.h:140
+msgid "Cherry CyMotion Master Linux"
+msgstr ""
+
+#: ../rules/base.xml.in.h:141 ../rules/evdev.xml.in.h:141
+msgid "Cherry CyMotion Master XPress"
+msgstr ""
+
+#: ../rules/base.xml.in.h:142 ../rules/evdev.xml.in.h:142
+msgid "Chicony Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:143 ../rules/evdev.xml.in.h:143
+msgid "Chicony KB-9885"
+msgstr ""
+
+#: ../rules/base.xml.in.h:144 ../rules/evdev.xml.in.h:144
+msgid "Chicony KU-0108"
+msgstr ""
+
+#: ../rules/base.xml.in.h:145 ../rules/evdev.xml.in.h:145
+msgid "Chicony KU-0420"
+msgstr ""
+
+#: ../rules/base.xml.in.h:146 ../rules/evdev.xml.in.h:146
+msgid "China"
+msgstr "Kina"
+
+#: ../rules/base.xml.in.h:147 ../rules/evdev.xml.in.h:147
+msgid "Chuvash"
+msgstr ""
+
+#: ../rules/base.xml.in.h:148 ../rules/evdev.xml.in.h:148
+msgid "Chuvash Latin"
+msgstr ""
+
+#: ../rules/base.xml.in.h:149 ../rules/evdev.xml.in.h:149
+msgid "Classic"
+msgstr "Klassisk"
+
+#: ../rules/base.xml.in.h:150 ../rules/evdev.xml.in.h:150
+msgid "Classic Dvorak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:151 ../rules/evdev.xml.in.h:151
+msgid "Classmate PC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:152 ../rules/evdev.xml.in.h:152
+msgid "CloGaelach"
+msgstr ""
+
+#: ../rules/base.xml.in.h:153 ../rules/evdev.xml.in.h:153
+msgid "Colemak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:154 ../rules/evdev.xml.in.h:154
+msgid "Compaq Easy Access Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:155 ../rules/evdev.xml.in.h:155
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:156 ../rules/evdev.xml.in.h:156
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:157 ../rules/evdev.xml.in.h:157
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:158 ../rules/evdev.xml.in.h:158
+msgid "Compaq iPaq Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:159 ../rules/evdev.xml.in.h:159
+msgid "Compose key position"
+msgstr ""
+
+#: ../rules/base.xml.in.h:160 ../rules/evdev.xml.in.h:160
+msgid "Congo, Democratic Republic of the"
+msgstr ""
+
+#: ../rules/base.xml.in.h:161 ../rules/evdev.xml.in.h:161
+msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:162 ../rules/evdev.xml.in.h:162
+msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:163 ../rules/evdev.xml.in.h:163
+msgid "Croatia"
+msgstr "Kroatia"
+
+#: ../rules/base.xml.in.h:164 ../rules/evdev.xml.in.h:164
+msgid "Ctrl key position"
+msgstr ""
+
+#: ../rules/base.xml.in.h:165 ../rules/evdev.xml.in.h:165
+msgid "Ctrl+Shift"
+msgstr ""
+
+#: ../rules/base.xml.in.h:166 ../rules/evdev.xml.in.h:166
+msgid "Cyrillic"
+msgstr "Kyrillisk"
+
+#: ../rules/base.xml.in.h:167 ../rules/evdev.xml.in.h:167
+msgid "Cyrillic with guillemets"
+msgstr ""
+
+#: ../rules/base.xml.in.h:168 ../rules/evdev.xml.in.h:168
+msgid "Cyrillic, Z and ZHE swapped"
+msgstr ""
+
+#: ../rules/base.xml.in.h:169 ../rules/evdev.xml.in.h:169
+msgid "Cze"
+msgstr ""
+
+#: ../rules/base.xml.in.h:170 ../rules/evdev.xml.in.h:170
+msgid "Czechia"
+msgstr ""
+
+#: ../rules/base.xml.in.h:171 ../rules/evdev.xml.in.h:171
+msgid "DRC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:172 ../rules/evdev.xml.in.h:172
+msgid "DTK2000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:173 ../rules/evdev.xml.in.h:173
+msgid "Dan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:174 ../rules/evdev.xml.in.h:174
+msgid "Dead acute"
+msgstr ""
+
+#: ../rules/base.xml.in.h:175 ../rules/evdev.xml.in.h:175
+msgid "Dead grave acute"
+msgstr ""
+
+#: ../rules/base.xml.in.h:176 ../rules/evdev.xml.in.h:176
+msgid "Default numeric keypad keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:177 ../rules/evdev.xml.in.h:177
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:178 ../rules/evdev.xml.in.h:178
+msgid "Dell 101-key PC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:179 ../rules/evdev.xml.in.h:179
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr ""
+
+#: ../rules/base.xml.in.h:180 ../rules/evdev.xml.in.h:180
+msgid "Dell Laptop/notebook Precision M series"
+msgstr ""
+
+#: ../rules/base.xml.in.h:181 ../rules/evdev.xml.in.h:181
+msgid "Dell Latitude series laptop"
+msgstr ""
+
+#: ../rules/base.xml.in.h:182 ../rules/evdev.xml.in.h:182
+msgid "Dell Precision M65"
+msgstr ""
+
+#: ../rules/base.xml.in.h:183 ../rules/evdev.xml.in.h:183
+msgid "Dell SK-8125"
+msgstr ""
+
+#: ../rules/base.xml.in.h:184 ../rules/evdev.xml.in.h:184
+msgid "Dell SK-8135"
+msgstr ""
+
+#: ../rules/base.xml.in.h:185 ../rules/evdev.xml.in.h:185
+msgid "Dell USB Multimedia Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:186 ../rules/evdev.xml.in.h:186
+msgid "Denmark"
+msgstr "Danmark"
+
+#: ../rules/base.xml.in.h:187 ../rules/evdev.xml.in.h:187
+msgid "Deu"
+msgstr ""
+
+#: ../rules/base.xml.in.h:188 ../rules/evdev.xml.in.h:188
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:189 ../rules/evdev.xml.in.h:189
+msgid "Diamond 9801 / 9802 series"
+msgstr ""
+
+#: ../rules/base.xml.in.h:190 ../rules/evdev.xml.in.h:190
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:191 ../rules/evdev.xml.in.h:191
+msgid "Dvorak (UK Punctuation)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:192 ../rules/evdev.xml.in.h:192
+msgid "Dvorak international"
+msgstr ""
+
+#: ../rules/base.xml.in.h:193 ../rules/evdev.xml.in.h:193
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr ""
+
+#: ../rules/base.xml.in.h:194 ../rules/evdev.xml.in.h:194
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:195 ../rules/evdev.xml.in.h:195
+msgid "E"
+msgstr ""
+
+#: ../rules/base.xml.in.h:196 ../rules/evdev.xml.in.h:196
+msgid "Eastern"
+msgstr "Østlig"
+
+#: ../rules/base.xml.in.h:197 ../rules/evdev.xml.in.h:197
+msgid "Eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:198 ../rules/evdev.xml.in.h:198
+msgid "Enable extra typographic characters"
+msgstr ""
+
+#: ../rules/base.xml.in.h:199 ../rules/evdev.xml.in.h:199
+msgid "Ennyah DKB-1008"
+msgstr ""
+
+#: ../rules/base.xml.in.h:200 ../rules/evdev.xml.in.h:200
+msgid "Epo"
+msgstr ""
+
+#: ../rules/base.xml.in.h:201 ../rules/evdev.xml.in.h:201
+msgid "Ergonomic"
+msgstr "Ergonomisk"
+
+#: ../rules/base.xml.in.h:202 ../rules/evdev.xml.in.h:202
+msgid "Esp"
+msgstr ""
+
+#: ../rules/base.xml.in.h:203 ../rules/evdev.xml.in.h:203
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../rules/base.xml.in.h:204 ../rules/evdev.xml.in.h:204
+msgid "Est"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:205 ../rules/evdev.xml.in.h:205
+msgid "Estonia"
+msgstr "Estland"
+
+#: ../rules/base.xml.in.h:206 ../rules/evdev.xml.in.h:206
+msgid "Eth"
+msgstr "Eth"
+
+#: ../rules/base.xml.in.h:207 ../rules/evdev.xml.in.h:207
+msgid "Ethiopia"
+msgstr "Etiopia"
+
+#: ../rules/base.xml.in.h:208 ../rules/evdev.xml.in.h:208
+msgid "Evdev-managed keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:209 ../rules/evdev.xml.in.h:209
+msgid "Everex STEPnote"
+msgstr ""
+
+#: ../rules/base.xml.in.h:210 ../rules/evdev.xml.in.h:210
+msgid "Ewe"
+msgstr ""
+
+#: ../rules/base.xml.in.h:211 ../rules/evdev.xml.in.h:211
+msgid "Extended"
+msgstr "Utvidet"
+
+#: ../rules/base.xml.in.h:212 ../rules/evdev.xml.in.h:212
+msgid "Extended Backslash"
+msgstr ""
+
+#: ../rules/base.xml.in.h:213 ../rules/evdev.xml.in.h:213
+msgid "F-letter (F) variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:214 ../rules/evdev.xml.in.h:214
+msgid "FL90"
+msgstr ""
+
+#: ../rules/base.xml.in.h:215 ../rules/evdev.xml.in.h:215
+msgid "Fao"
+msgstr ""
+
+#: ../rules/base.xml.in.h:216 ../rules/evdev.xml.in.h:216
+msgid "Faroe Islands"
+msgstr "Færøyene"
+
+#: ../rules/base.xml.in.h:217 ../rules/evdev.xml.in.h:217
+msgid "Fin"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:218 ../rules/evdev.xml.in.h:218
+msgid "Finland"
+msgstr "Finland"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:221 ../rules/evdev.xml.in.h:221
+msgid "Four-level key with abstract separators"
+msgstr ""
+
+#: ../rules/base.xml.in.h:222 ../rules/evdev.xml.in.h:222
+msgid "Four-level key with comma"
+msgstr ""
+
+#: ../rules/base.xml.in.h:223 ../rules/evdev.xml.in.h:223
+msgid "Four-level key with dot"
+msgstr ""
+
+#: ../rules/base.xml.in.h:224 ../rules/evdev.xml.in.h:224
+msgid "Four-level key with dot, latin-9 restriction"
+msgstr ""
+
+#: ../rules/base.xml.in.h:225 ../rules/evdev.xml.in.h:225
+msgid "Four-level key with momayyez"
+msgstr ""
+
+#: ../rules/base.xml.in.h:226 ../rules/evdev.xml.in.h:226
+msgid "Fra"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:227 ../rules/evdev.xml.in.h:227
+msgid "France"
+msgstr "Frankrike"
+
+#: ../rules/base.xml.in.h:228 ../rules/evdev.xml.in.h:228
+msgid "French"
+msgstr "Fransk"
+
+#: ../rules/base.xml.in.h:229 ../rules/evdev.xml.in.h:229
+msgid "French (Macintosh)"
+msgstr "Fransk (Macintosh)"
+
+#: ../rules/base.xml.in.h:230 ../rules/evdev.xml.in.h:230
+msgid "French (legacy)"
+msgstr "Fransk (gammel)"
+
+#: ../rules/base.xml.in.h:231 ../rules/evdev.xml.in.h:231
+msgid "French Dvorak"
+msgstr "Fransk dvorak"
+
+#: ../rules/base.xml.in.h:232 ../rules/evdev.xml.in.h:232
+msgid "French, Sun dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:233 ../rules/evdev.xml.in.h:233
+msgid "French, eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:234 ../rules/evdev.xml.in.h:234
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr ""
+
+#: ../rules/base.xml.in.h:235 ../rules/evdev.xml.in.h:235
+msgid "Fula"
+msgstr ""
+
+#: ../rules/base.xml.in.h:236 ../rules/evdev.xml.in.h:236
+msgid "GBr"
+msgstr ""
+
+#: ../rules/base.xml.in.h:237 ../rules/evdev.xml.in.h:237
+msgid "Ga"
+msgstr ""
+
+#: ../rules/base.xml.in.h:238 ../rules/evdev.xml.in.h:238
+msgid "Generic 101-key PC"
+msgstr "Vanlig 101-tasters PC"
+
+#: ../rules/base.xml.in.h:239 ../rules/evdev.xml.in.h:239
+msgid "Generic 102-key (Intl) PC"
+msgstr "Vanlig 102-tasters (Intl) PC"
+
+#: ../rules/base.xml.in.h:240 ../rules/evdev.xml.in.h:240
+msgid "Generic 104-key PC"
+msgstr "Vanlig 104-tasters PC"
+
+#: ../rules/base.xml.in.h:241 ../rules/evdev.xml.in.h:241
+msgid "Generic 105-key (Intl) PC"
+msgstr "Vanlig 105-tasters (Intl) PC"
+
+#: ../rules/base.xml.in.h:242 ../rules/evdev.xml.in.h:242
+msgid "Genius Comfy KB-12e"
+msgstr ""
+
+#: ../rules/base.xml.in.h:243 ../rules/evdev.xml.in.h:243
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr ""
+
+#: ../rules/base.xml.in.h:244 ../rules/evdev.xml.in.h:244
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr ""
+
+#: ../rules/base.xml.in.h:245 ../rules/evdev.xml.in.h:245
+msgid "Genius KB-19e NB"
+msgstr ""
+
+#: ../rules/base.xml.in.h:246 ../rules/evdev.xml.in.h:246
+msgid "Geo"
+msgstr ""
+
+#: ../rules/base.xml.in.h:247 ../rules/evdev.xml.in.h:247
+msgid "Georgia"
+msgstr "Georgia"
+
+#: ../rules/base.xml.in.h:248 ../rules/evdev.xml.in.h:248
+msgid "Georgian"
+msgstr "Georgisk"
+
+#: ../rules/base.xml.in.h:249 ../rules/evdev.xml.in.h:249
+msgid "Georgian AZERTY Tskapo"
+msgstr ""
+
+#: ../rules/base.xml.in.h:250 ../rules/evdev.xml.in.h:250
+msgid "German (Macintosh)"
+msgstr "Tysk (Macintosh)"
+
+#: ../rules/base.xml.in.h:251 ../rules/evdev.xml.in.h:251
+msgid "German, Sun dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:252 ../rules/evdev.xml.in.h:252
+msgid "German, eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:253 ../rules/evdev.xml.in.h:253
+msgid "Germany"
+msgstr "Tyskland"
+
+#: ../rules/base.xml.in.h:254 ../rules/evdev.xml.in.h:254
+msgid "Gha"
+msgstr ""
+
+#: ../rules/base.xml.in.h:255 ../rules/evdev.xml.in.h:255
+msgid "Ghana"
+msgstr "Ghana"
+
+#: ../rules/base.xml.in.h:256 ../rules/evdev.xml.in.h:256
+msgid "Gre"
+msgstr ""
+
+#: ../rules/base.xml.in.h:257 ../rules/evdev.xml.in.h:257
+msgid "Greece"
+msgstr "Hellas"
+
+#: ../rules/base.xml.in.h:258 ../rules/evdev.xml.in.h:258
+msgid "Group toggle on multiply/divide key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:259 ../rules/evdev.xml.in.h:259
+msgid "Gui"
+msgstr "Gui"
+
+#: ../rules/base.xml.in.h:260 ../rules/evdev.xml.in.h:260
+msgid "Guinea"
+msgstr "Guinea"
+
+#: ../rules/base.xml.in.h:261 ../rules/evdev.xml.in.h:261
+msgid "Gujarati"
+msgstr ""
+
+#: ../rules/base.xml.in.h:262 ../rules/evdev.xml.in.h:262
+msgid "Gurmukhi"
+msgstr ""
+
+#: ../rules/base.xml.in.h:263 ../rules/evdev.xml.in.h:263
+msgid "Gurmukhi Jhelum"
+msgstr ""
+
+#: ../rules/base.xml.in.h:264 ../rules/evdev.xml.in.h:264
+msgid "Gyration"
+msgstr ""
+
+#: ../rules/base.xml.in.h:265 ../rules/evdev.xml.in.h:265
+msgid "Happy Hacking Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:266 ../rules/evdev.xml.in.h:266
+msgid "Happy Hacking Keyboard for Mac"
+msgstr ""
+
+#: ../rules/base.xml.in.h:267 ../rules/evdev.xml.in.h:267
+msgid "Hausa"
+msgstr ""
+
+#: ../rules/base.xml.in.h:268 ../rules/evdev.xml.in.h:268
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:269 ../rules/evdev.xml.in.h:269
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr ""
+
+#: ../rules/base.xml.in.h:270 ../rules/evdev.xml.in.h:270
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr ""
+
+#: ../rules/base.xml.in.h:271 ../rules/evdev.xml.in.h:271
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr ""
+
+#: ../rules/base.xml.in.h:272 ../rules/evdev.xml.in.h:272
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:273 ../rules/evdev.xml.in.h:273
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr ""
+
+#: ../rules/base.xml.in.h:274 ../rules/evdev.xml.in.h:274
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:275 ../rules/evdev.xml.in.h:275
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr ""
+
+#: ../rules/base.xml.in.h:276 ../rules/evdev.xml.in.h:276
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr ""
+
+#: ../rules/base.xml.in.h:277 ../rules/evdev.xml.in.h:277
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:278 ../rules/evdev.xml.in.h:278
+msgid "Hewlett-Packard nx9020"
+msgstr ""
+
+#: ../rules/base.xml.in.h:279 ../rules/evdev.xml.in.h:279
+msgid "Hexadecimal"
+msgstr ""
+
+#: ../rules/base.xml.in.h:280 ../rules/evdev.xml.in.h:280
+msgid "Hindi Bolnagri"
+msgstr ""
+
+#: ../rules/base.xml.in.h:281 ../rules/evdev.xml.in.h:281
+msgid "Homophonic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:282 ../rules/evdev.xml.in.h:282
+msgid "Honeywell Euroboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:283 ../rules/evdev.xml.in.h:283
+msgid "Hrv"
+msgstr ""
+
+#: ../rules/base.xml.in.h:284 ../rules/evdev.xml.in.h:284
+msgid "Hun"
+msgstr ""
+
+#: ../rules/base.xml.in.h:285 ../rules/evdev.xml.in.h:285
+msgid "Hungary"
+msgstr "Ungarn"
+
+#: ../rules/base.xml.in.h:286 ../rules/evdev.xml.in.h:286
+msgid "Hyper is mapped to Win-keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:287 ../rules/evdev.xml.in.h:287
+msgid "IBM (LST 1205-92)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:288 ../rules/evdev.xml.in.h:288
+msgid "IBM Rapid Access"
+msgstr ""
+
+#: ../rules/base.xml.in.h:289 ../rules/evdev.xml.in.h:289
+msgid "IBM Rapid Access II"
+msgstr ""
+
+#: ../rules/base.xml.in.h:290 ../rules/evdev.xml.in.h:290
+msgid "IBM Space Saver"
+msgstr ""
+
+#: ../rules/base.xml.in.h:291 ../rules/evdev.xml.in.h:291
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr ""
+
+#: ../rules/base.xml.in.h:292 ../rules/evdev.xml.in.h:292
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr ""
+
+#: ../rules/base.xml.in.h:293 ../rules/evdev.xml.in.h:293
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr ""
+
+#: ../rules/base.xml.in.h:294 ../rules/evdev.xml.in.h:294
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr ""
+
+#: ../rules/base.xml.in.h:295 ../rules/evdev.xml.in.h:295
+msgid "ISO Alternate"
+msgstr ""
+
+#: ../rules/base.xml.in.h:296 ../rules/evdev.xml.in.h:296
+msgid "Iceland"
+msgstr "Island"
+
+#: ../rules/base.xml.in.h:297 ../rules/evdev.xml.in.h:297
+msgid "Igbo"
+msgstr ""
+
+#: ../rules/base.xml.in.h:298 ../rules/evdev.xml.in.h:298
+msgid "Include dead tilde"
+msgstr ""
+
+#: ../rules/base.xml.in.h:299 ../rules/evdev.xml.in.h:299
+msgid "Ind"
+msgstr "Ind"
+
+#: ../rules/base.xml.in.h:300 ../rules/evdev.xml.in.h:300
+msgid "India"
+msgstr "India"
+
+#: ../rules/base.xml.in.h:301 ../rules/evdev.xml.in.h:301
+msgid "International (AltGr dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:302 ../rules/evdev.xml.in.h:302
+msgid "International (with dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:303 ../rules/evdev.xml.in.h:303
+msgid "Inuktitut"
+msgstr ""
+
+#: ../rules/base.xml.in.h:304 ../rules/evdev.xml.in.h:304
+msgid "Iran"
+msgstr "Iran"
+
+#: ../rules/base.xml.in.h:305 ../rules/evdev.xml.in.h:305
+msgid "Iraq"
+msgstr "Irak"
+
+#: ../rules/base.xml.in.h:306 ../rules/evdev.xml.in.h:306
+msgid "Ireland"
+msgstr "Irland"
+
+#: ../rules/base.xml.in.h:307 ../rules/evdev.xml.in.h:307
+msgid "Irl"
+msgstr "Irl"
+
+#: ../rules/base.xml.in.h:308 ../rules/evdev.xml.in.h:308
+msgid "Irn"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:309 ../rules/evdev.xml.in.h:309
+msgid "Irq"
+msgstr "Irk"
+
+#: ../rules/base.xml.in.h:310 ../rules/evdev.xml.in.h:310
+msgid "Isl"
+msgstr "Isl"
+
+#: ../rules/base.xml.in.h:311 ../rules/evdev.xml.in.h:311
+msgid "Isr"
+msgstr "Isr"
+
+#: ../rules/base.xml.in.h:312 ../rules/evdev.xml.in.h:312
+msgid "Israel"
+msgstr "Irsrael"
+
+#: ../rules/base.xml.in.h:313 ../rules/evdev.xml.in.h:313
+msgid "Ita"
+msgstr "Ita"
+
+#: ../rules/base.xml.in.h:314 ../rules/evdev.xml.in.h:314
+msgid "Italy"
+msgstr "Italia"
+
+#: ../rules/base.xml.in.h:315 ../rules/evdev.xml.in.h:315
+msgid "Japan"
+msgstr "Japan"
+
+#: ../rules/base.xml.in.h:316 ../rules/evdev.xml.in.h:316
+msgid "Japan (PC-98xx Series)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:317 ../rules/evdev.xml.in.h:317
+msgid "Japanese 106-key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:318 ../rules/evdev.xml.in.h:318
+msgid "Japanese keyboard options"
+msgstr ""
+
+#: ../rules/base.xml.in.h:319 ../rules/evdev.xml.in.h:319
+msgid "Jpn"
+msgstr "Jpn"
+
+#: ../rules/base.xml.in.h:320 ../rules/evdev.xml.in.h:320
+msgid "Kalmyk"
+msgstr ""
+
+#: ../rules/base.xml.in.h:321 ../rules/evdev.xml.in.h:321
+msgid "Kana"
+msgstr ""
+
+#: ../rules/base.xml.in.h:322 ../rules/evdev.xml.in.h:322
+msgid "Kana Lock key is locking"
+msgstr ""
+
+#: ../rules/base.xml.in.h:323 ../rules/evdev.xml.in.h:323
+msgid "Kannada"
+msgstr ""
+
+#: ../rules/base.xml.in.h:324 ../rules/evdev.xml.in.h:324
+msgid "Kashubian"
+msgstr ""
+
+#: ../rules/base.xml.in.h:325 ../rules/evdev.xml.in.h:325
+msgid "Kaz"
+msgstr ""
+
+#: ../rules/base.xml.in.h:326 ../rules/evdev.xml.in.h:326
+msgid "Kazakh with Russian"
+msgstr ""
+
+#: ../rules/base.xml.in.h:327 ../rules/evdev.xml.in.h:327
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:328 ../rules/evdev.xml.in.h:328
+msgid "Key to choose 3rd level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:329 ../rules/evdev.xml.in.h:329
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../rules/base.xml.in.h:330 ../rules/evdev.xml.in.h:330
+msgid "Keypad"
+msgstr "Nummertastatur"
+
+#: ../rules/base.xml.in.h:331 ../rules/evdev.xml.in.h:331
+msgid "Keytronic FlexPro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:332 ../rules/evdev.xml.in.h:332
+msgid "Khm"
+msgstr ""
+
+#: ../rules/base.xml.in.h:333 ../rules/evdev.xml.in.h:333
+msgid "Kir"
+msgstr "Kir"
+
+#: ../rules/base.xml.in.h:334 ../rules/evdev.xml.in.h:334
+msgid "Komi"
+msgstr "Komi"
+
+#: ../rules/base.xml.in.h:335 ../rules/evdev.xml.in.h:335
+msgid "Kor"
+msgstr "Kor"
+
+#: ../rules/base.xml.in.h:336 ../rules/evdev.xml.in.h:336
+msgid "Korea, Republic of"
+msgstr ""
+
+#: ../rules/base.xml.in.h:337 ../rules/evdev.xml.in.h:337
+msgid "Korean 106-key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:338 ../rules/evdev.xml.in.h:338
+msgid "Ktunaxa"
+msgstr "Ktunaxa"
+
+#: ../rules/base.xml.in.h:339 ../rules/evdev.xml.in.h:339
+msgid "Kurdish, (F)"
+msgstr "Kurdisk, (F)"
+
+#: ../rules/base.xml.in.h:340 ../rules/evdev.xml.in.h:340
+msgid "Kurdish, Arabic-Latin"
+msgstr ""
+
+#: ../rules/base.xml.in.h:341 ../rules/evdev.xml.in.h:341
+msgid "Kurdish, Latin Alt-Q"
+msgstr ""
+
+#: ../rules/base.xml.in.h:342 ../rules/evdev.xml.in.h:342
+msgid "Kurdish, Latin Q"
+msgstr ""
+
+#: ../rules/base.xml.in.h:343 ../rules/evdev.xml.in.h:343
+msgid "Kyrgyzstan"
+msgstr "Kirgistan"
+
+#: ../rules/base.xml.in.h:344 ../rules/evdev.xml.in.h:344
+msgid "LAm"
+msgstr ""
+
+#: ../rules/base.xml.in.h:345 ../rules/evdev.xml.in.h:345
+msgid "LEKP"
+msgstr ""
+
+#: ../rules/base.xml.in.h:346 ../rules/evdev.xml.in.h:346
+msgid "LEKPa"
+msgstr ""
+
+#: ../rules/base.xml.in.h:347 ../rules/evdev.xml.in.h:347
+msgid "Lao"
+msgstr "Lao"
+
+#: ../rules/base.xml.in.h:348 ../rules/evdev.xml.in.h:348
+msgid "Laos"
+msgstr "Laos"
+
+#: ../rules/base.xml.in.h:349 ../rules/evdev.xml.in.h:349
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:350 ../rules/evdev.xml.in.h:350
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:351 ../rules/evdev.xml.in.h:351
+msgid "Laptop/notebook eMachines m68xx"
+msgstr ""
+
+#: ../rules/base.xml.in.h:352 ../rules/evdev.xml.in.h:352
+msgid "Latin"
+msgstr "Latin"
+
+#: ../rules/base.xml.in.h:353 ../rules/evdev.xml.in.h:353
+msgid "Latin American"
+msgstr "Latinamerikansk"
+
+#: ../rules/base.xml.in.h:354 ../rules/evdev.xml.in.h:354
+msgid "Latin Unicode"
+msgstr ""
+
+#: ../rules/base.xml.in.h:355 ../rules/evdev.xml.in.h:355
+msgid "Latin Unicode qwerty"
+msgstr ""
+
+#: ../rules/base.xml.in.h:356 ../rules/evdev.xml.in.h:356
+msgid "Latin qwerty"
+msgstr ""
+
+#: ../rules/base.xml.in.h:357 ../rules/evdev.xml.in.h:357
+msgid "Latin unicode"
+msgstr ""
+
+#: ../rules/base.xml.in.h:358 ../rules/evdev.xml.in.h:358
+msgid "Latin unicode qwerty"
+msgstr ""
+
+#: ../rules/base.xml.in.h:359 ../rules/evdev.xml.in.h:359
+msgid "Latin with guillemets"
+msgstr ""
+
+#: ../rules/base.xml.in.h:360 ../rules/evdev.xml.in.h:360
+msgid "Latvia"
+msgstr "Latvia"
+
+#: ../rules/base.xml.in.h:361 ../rules/evdev.xml.in.h:361
+msgid "Lav"
+msgstr "Lav"
+
+#: ../rules/base.xml.in.h:362 ../rules/evdev.xml.in.h:362
+msgid "Left Alt"
+msgstr "Venstre Alt"
+
+#: ../rules/base.xml.in.h:363 ../rules/evdev.xml.in.h:363
+msgid "Left Alt (while pressed)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:364 ../rules/evdev.xml.in.h:364
+msgid "Left Alt is swapped with Left Win"
+msgstr ""
+
+#: ../rules/base.xml.in.h:365 ../rules/evdev.xml.in.h:365
+msgid "Left Ctrl"
+msgstr "Venstre Ctrl"
+
+#: ../rules/base.xml.in.h:366 ../rules/evdev.xml.in.h:366
+msgid "Left Ctrl+Left Shift"
+msgstr ""
+
+#: ../rules/base.xml.in.h:367 ../rules/evdev.xml.in.h:367
+msgid "Left Shift"
+msgstr "Venstre Shift"
+
+#: ../rules/base.xml.in.h:368 ../rules/evdev.xml.in.h:368
+msgid "Left Win"
+msgstr "Venstre Win"
+
+#: ../rules/base.xml.in.h:369 ../rules/evdev.xml.in.h:369
+msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:370 ../rules/evdev.xml.in.h:370
+msgid "Left Win (while pressed)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:371 ../rules/evdev.xml.in.h:371
+msgid "Left hand"
+msgstr "Venstre hånd"
+
+#: ../rules/base.xml.in.h:372 ../rules/evdev.xml.in.h:372
+msgid "Left handed Dvorak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:373 ../rules/evdev.xml.in.h:373
+msgid "Legacy"
+msgstr ""
+
+#: ../rules/base.xml.in.h:374 ../rules/evdev.xml.in.h:374
+msgid "Legacy Wang 724"
+msgstr ""
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:376 ../rules/evdev.xml.in.h:376
+msgid "Legacy key with comma"
+msgstr ""
+
+#: ../rules/base.xml.in.h:377 ../rules/evdev.xml.in.h:377
+msgid "Legacy key with dot"
+msgstr ""
+
+#: ../rules/base.xml.in.h:378 ../rules/evdev.xml.in.h:378
+msgid "Less-than/Greater-than"
+msgstr ""
+
+#: ../rules/base.xml.in.h:379 ../rules/evdev.xml.in.h:379
+msgid "Lithuania"
+msgstr "Litauen"
+
+#: ../rules/base.xml.in.h:380 ../rules/evdev.xml.in.h:380
+msgid "Logitech Access Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:381 ../rules/evdev.xml.in.h:381
+msgid "Logitech Cordless Desktop"
+msgstr ""
+
+#: ../rules/base.xml.in.h:382 ../rules/evdev.xml.in.h:382
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:383 ../rules/evdev.xml.in.h:383
+msgid "Logitech Cordless Desktop EX110"
+msgstr ""
+
+#: ../rules/base.xml.in.h:384 ../rules/evdev.xml.in.h:384
+msgid "Logitech Cordless Desktop LX-300"
+msgstr ""
+
+#: ../rules/base.xml.in.h:385 ../rules/evdev.xml.in.h:385
+msgid "Logitech Cordless Desktop Navigator"
+msgstr ""
+
+#: ../rules/base.xml.in.h:386 ../rules/evdev.xml.in.h:386
+msgid "Logitech Cordless Desktop Optical"
+msgstr ""
+
+#: ../rules/base.xml.in.h:387 ../rules/evdev.xml.in.h:387
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:388 ../rules/evdev.xml.in.h:388
+msgid "Logitech Cordless Desktop iTouch"
+msgstr ""
+
+#: ../rules/base.xml.in.h:389 ../rules/evdev.xml.in.h:389
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr ""
+
+#: ../rules/base.xml.in.h:390 ../rules/evdev.xml.in.h:390
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr ""
+
+#: ../rules/base.xml.in.h:391 ../rules/evdev.xml.in.h:391
+msgid "Logitech Generic Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:392 ../rules/evdev.xml.in.h:392
+msgid "Logitech Internet 350 Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:393 ../rules/evdev.xml.in.h:393
+msgid "Logitech Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:394 ../rules/evdev.xml.in.h:394
+msgid "Logitech Internet Navigator Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:395 ../rules/evdev.xml.in.h:395
+msgid "Logitech Media Elite Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:396 ../rules/evdev.xml.in.h:396
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:397 ../rules/evdev.xml.in.h:397
+msgid "Logitech Ultra-X Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:398 ../rules/evdev.xml.in.h:398
+msgid "Logitech diNovo Edge Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:399 ../rules/evdev.xml.in.h:399
+msgid "Logitech diNovo Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:400 ../rules/evdev.xml.in.h:400
+msgid "Logitech iTouch"
+msgstr ""
+
+#: ../rules/base.xml.in.h:401 ../rules/evdev.xml.in.h:401
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:402 ../rules/evdev.xml.in.h:402
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr ""
+
+#: ../rules/base.xml.in.h:403 ../rules/evdev.xml.in.h:403
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:404 ../rules/evdev.xml.in.h:404
+msgid "Lower Sorbian"
+msgstr ""
+
+#: ../rules/base.xml.in.h:405 ../rules/evdev.xml.in.h:405
+msgid "Lower Sorbian (qwertz)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:406 ../rules/evdev.xml.in.h:406
+msgid "Ltu"
+msgstr "Ltu"
+
+#: ../rules/base.xml.in.h:407 ../rules/evdev.xml.in.h:407
+msgid "MESS"
+msgstr "MESS"
+
+#: ../rules/base.xml.in.h:408 ../rules/evdev.xml.in.h:408
+msgid "MNE"
+msgstr ""
+
+#: ../rules/base.xml.in.h:409 ../rules/evdev.xml.in.h:409
+msgid "MacBook/MacBook Pro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:410 ../rules/evdev.xml.in.h:410
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:411 ../rules/evdev.xml.in.h:411
+msgid "Macedonia"
+msgstr "Makedonia"
+
+#: ../rules/base.xml.in.h:412 ../rules/evdev.xml.in.h:412
+msgid "Macintosh"
+msgstr ""
+
+#: ../rules/base.xml.in.h:413 ../rules/evdev.xml.in.h:413
+msgid "Macintosh Old"
+msgstr ""
+
+#: ../rules/base.xml.in.h:414 ../rules/evdev.xml.in.h:414
+msgid "Macintosh, Sun dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:415 ../rules/evdev.xml.in.h:415
+msgid "Macintosh, eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:416 ../rules/evdev.xml.in.h:416
+msgid "Make CapsLock an additional Backspace"
+msgstr ""
+
+#: ../rules/base.xml.in.h:417 ../rules/evdev.xml.in.h:417
+msgid "Make CapsLock an additional Ctrl"
+msgstr ""
+
+#: ../rules/base.xml.in.h:418 ../rules/evdev.xml.in.h:418
+msgid "Make CapsLock an additional ESC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:419 ../rules/evdev.xml.in.h:419
+msgid "Mal"
+msgstr ""
+
+#: ../rules/base.xml.in.h:420 ../rules/evdev.xml.in.h:420
+msgid "Malayalam"
+msgstr ""
+
+#: ../rules/base.xml.in.h:421 ../rules/evdev.xml.in.h:421
+msgid "Malayalam Lalitha"
+msgstr ""
+
+#: ../rules/base.xml.in.h:422 ../rules/evdev.xml.in.h:422
+msgid "Maldives"
+msgstr "Maldivene"
+
+#: ../rules/base.xml.in.h:423 ../rules/evdev.xml.in.h:423
+msgid "Malta"
+msgstr "Malta"
+
+#: ../rules/base.xml.in.h:424 ../rules/evdev.xml.in.h:424
+msgid "Maltese keyboard with US layout"
+msgstr ""
+
+#: ../rules/base.xml.in.h:425 ../rules/evdev.xml.in.h:425
+msgid "Mao"
+msgstr "Mao"
+
+#: ../rules/base.xml.in.h:426 ../rules/evdev.xml.in.h:426
+msgid "Maori"
+msgstr "Maori"
+
+#: ../rules/base.xml.in.h:427 ../rules/evdev.xml.in.h:427
+msgid "Memorex MX1998"
+msgstr ""
+
+#: ../rules/base.xml.in.h:428 ../rules/evdev.xml.in.h:428
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:429 ../rules/evdev.xml.in.h:429
+msgid "Memorex MX2750"
+msgstr ""
+
+#: ../rules/base.xml.in.h:430 ../rules/evdev.xml.in.h:430
+msgid "Menu"
+msgstr ""
+
+#: ../rules/base.xml.in.h:431 ../rules/evdev.xml.in.h:431
+msgid "Meta is mapped to Left Win"
+msgstr ""
+
+#: ../rules/base.xml.in.h:432 ../rules/evdev.xml.in.h:432
+msgid "Meta is mapped to Win keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:433 ../rules/evdev.xml.in.h:433
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:434 ../rules/evdev.xml.in.h:434
+msgid "Microsoft Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:435 ../rules/evdev.xml.in.h:435
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr ""
+
+#: ../rules/base.xml.in.h:436 ../rules/evdev.xml.in.h:436
+msgid "Microsoft Natural"
+msgstr ""
+
+#: ../rules/base.xml.in.h:437 ../rules/evdev.xml.in.h:437
+msgid "Microsoft Natural Keyboard Elite"
+msgstr ""
+
+#: ../rules/base.xml.in.h:438 ../rules/evdev.xml.in.h:438
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:439 ../rules/evdev.xml.in.h:439
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr ""
+
+#: ../rules/base.xml.in.h:440 ../rules/evdev.xml.in.h:440
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:441 ../rules/evdev.xml.in.h:441
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:442 ../rules/evdev.xml.in.h:442
+msgid "Microsoft Office Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:443 ../rules/evdev.xml.in.h:443
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr ""
+
+#: ../rules/base.xml.in.h:444 ../rules/evdev.xml.in.h:444
+msgid "Miscellaneous compatibility options"
+msgstr ""
+
+#: ../rules/base.xml.in.h:445 ../rules/evdev.xml.in.h:445
+msgid "Mkd"
+msgstr ""
+
+#: ../rules/base.xml.in.h:446 ../rules/evdev.xml.in.h:446
+msgid "Mlt"
+msgstr ""
+
+#: ../rules/base.xml.in.h:447 ../rules/evdev.xml.in.h:447
+msgid "Mmr"
+msgstr ""
+
+#: ../rules/base.xml.in.h:448 ../rules/evdev.xml.in.h:448
+msgid "Mng"
+msgstr ""
+
+#: ../rules/base.xml.in.h:449 ../rules/evdev.xml.in.h:449
+msgid "Mongolia"
+msgstr ""
+
+#: ../rules/base.xml.in.h:450 ../rules/evdev.xml.in.h:450
+msgid "Montenegro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:451 ../rules/evdev.xml.in.h:451
+msgid "Morocco"
+msgstr ""
+
+#: ../rules/base.xml.in.h:452 ../rules/evdev.xml.in.h:452
+msgid "Multilingual"
+msgstr ""
+
+#: ../rules/base.xml.in.h:453 ../rules/evdev.xml.in.h:453
+msgid "Multilingual, first part"
+msgstr ""
+
+#: ../rules/base.xml.in.h:454 ../rules/evdev.xml.in.h:454
+msgid "Multilingual, second part"
+msgstr ""
+
+#: ../rules/base.xml.in.h:455 ../rules/evdev.xml.in.h:455
+msgid "Myanmar"
+msgstr ""
+
+#: ../rules/base.xml.in.h:456 ../rules/evdev.xml.in.h:456
+msgid "NICOLA-F style Backspace"
+msgstr ""
+
+#: ../rules/base.xml.in.h:457 ../rules/evdev.xml.in.h:457
+msgid "NLA"
+msgstr ""
+
+#: ../rules/base.xml.in.h:458 ../rules/evdev.xml.in.h:458
+msgid "Nativo"
+msgstr ""
+
+#: ../rules/base.xml.in.h:459 ../rules/evdev.xml.in.h:459
+#, fuzzy
+msgid "Nativo for Esperanto"
+msgstr "Esperanto"
+
+#: ../rules/base.xml.in.h:460 ../rules/evdev.xml.in.h:460
+msgid "Nativo for USA keyboards"
+msgstr ""
+
+#: ../rules/base.xml.in.h:461 ../rules/evdev.xml.in.h:461
+msgid "Neo 2"
+msgstr ""
+
+#: ../rules/base.xml.in.h:462 ../rules/evdev.xml.in.h:462
+msgid "Nep"
+msgstr "Nep"
+
+#: ../rules/base.xml.in.h:463 ../rules/evdev.xml.in.h:463
+msgid "Nepal"
+msgstr "Nepal"
+
+#: ../rules/base.xml.in.h:464 ../rules/evdev.xml.in.h:464
+msgid "Netherlands"
+msgstr "Nederland"
+
+#: ../rules/base.xml.in.h:465 ../rules/evdev.xml.in.h:465
+msgid "Nig"
+msgstr "Nig"
+
+#: ../rules/base.xml.in.h:466 ../rules/evdev.xml.in.h:466
+msgid "Nigeria"
+msgstr "Nigeria"
+
+#: ../rules/base.xml.in.h:467 ../rules/evdev.xml.in.h:467
+msgid "Nld"
+msgstr ""
+
+#: ../rules/base.xml.in.h:468 ../rules/evdev.xml.in.h:468
+msgid "Non-breakable space character at fourth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:469 ../rules/evdev.xml.in.h:469
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:470 ../rules/evdev.xml.in.h:470
+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:471 ../rules/evdev.xml.in.h:471
+msgid "Non-breakable space character at second level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:472 ../rules/evdev.xml.in.h:472
+msgid "Non-breakable space character at third level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:473 ../rules/evdev.xml.in.h:473
+msgid "Non-breakable space character at third level, nothing at fourth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:474 ../rules/evdev.xml.in.h:474
+msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:475 ../rules/evdev.xml.in.h:475
+msgid "Nor"
+msgstr "Nor"
+
+#: ../rules/base.xml.in.h:476 ../rules/evdev.xml.in.h:476
+msgid "Northern Saami"
+msgstr "Nord-samisk"
+
+#: ../rules/base.xml.in.h:477 ../rules/evdev.xml.in.h:477
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Nord-samisk, uten døde taster"
+
+#: ../rules/base.xml.in.h:478 ../rules/evdev.xml.in.h:478
+msgid "Northgate OmniKey 101"
+msgstr ""
+
+#: ../rules/base.xml.in.h:479 ../rules/evdev.xml.in.h:479
+msgid "Norway"
+msgstr "Norge"
+
+#: ../rules/base.xml.in.h:480 ../rules/evdev.xml.in.h:480
+msgid "NumLock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:481 ../rules/evdev.xml.in.h:481
+msgid "Numeric keypad delete key behaviour"
+msgstr ""
+
+#: ../rules/base.xml.in.h:482 ../rules/evdev.xml.in.h:482
+msgid "Numeric keypad keys work as with Mac"
+msgstr ""
+
+#: ../rules/base.xml.in.h:483 ../rules/evdev.xml.in.h:483
+msgid "Numeric keypad layout selection"
+msgstr ""
+
+#: ../rules/base.xml.in.h:484 ../rules/evdev.xml.in.h:484
+msgid "OADG 109A"
+msgstr ""
+
+#: ../rules/base.xml.in.h:485 ../rules/evdev.xml.in.h:485
+msgid "OLPC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:486 ../rules/evdev.xml.in.h:486
+msgid "OLPC Dari"
+msgstr ""
+
+#: ../rules/base.xml.in.h:487 ../rules/evdev.xml.in.h:487
+msgid "OLPC Pashto"
+msgstr ""
+
+#: ../rules/base.xml.in.h:488 ../rules/evdev.xml.in.h:488
+msgid "OLPC Southern Uzbek"
+msgstr ""
+
+#: ../rules/base.xml.in.h:489 ../rules/evdev.xml.in.h:489
+msgid "Ogham"
+msgstr ""
+
+#: ../rules/base.xml.in.h:490 ../rules/evdev.xml.in.h:490
+msgid "Ogham IS434"
+msgstr ""
+
+#: ../rules/base.xml.in.h:491 ../rules/evdev.xml.in.h:491
+msgid "Oriya"
+msgstr ""
+
+#: ../rules/base.xml.in.h:492 ../rules/evdev.xml.in.h:492
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:493 ../rules/evdev.xml.in.h:493
+msgid "Ossetian"
+msgstr ""
+
+#: ../rules/base.xml.in.h:494 ../rules/evdev.xml.in.h:494
+msgid "Ossetian, Winkeys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:495 ../rules/evdev.xml.in.h:495
+msgid "Ossetian, legacy"
+msgstr ""
+
+#: ../rules/base.xml.in.h:496 ../rules/evdev.xml.in.h:496
+msgid "PC-98xx Series"
+msgstr ""
+
+#: ../rules/base.xml.in.h:497 ../rules/evdev.xml.in.h:497
+msgid "Pak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:498 ../rules/evdev.xml.in.h:498
+msgid "Pakistan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:499 ../rules/evdev.xml.in.h:499
+msgid "Pashto"
+msgstr ""
+
+#: ../rules/base.xml.in.h:500 ../rules/evdev.xml.in.h:500
+msgid "Pattachote"
+msgstr ""
+
+#: ../rules/base.xml.in.h:501 ../rules/evdev.xml.in.h:501
+msgid "Phonetic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:502 ../rules/evdev.xml.in.h:502
+msgid "Pol"
+msgstr ""
+
+#: ../rules/base.xml.in.h:503 ../rules/evdev.xml.in.h:503
+msgid "Poland"
+msgstr ""
+
+#: ../rules/base.xml.in.h:504 ../rules/evdev.xml.in.h:504
+msgid "Polytonic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:505 ../rules/evdev.xml.in.h:505
+msgid "Portugal"
+msgstr "Portugal"
+
+#: ../rules/base.xml.in.h:506 ../rules/evdev.xml.in.h:506
+msgid "Pro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:507 ../rules/evdev.xml.in.h:507
+msgid "Pro Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:508 ../rules/evdev.xml.in.h:508
+msgid "Probhat"
+msgstr ""
+
+#: ../rules/base.xml.in.h:509 ../rules/evdev.xml.in.h:509
+#, fuzzy
+msgid "Programmer Dvorak"
+msgstr "Fransk dvorak"
+
+#: ../rules/base.xml.in.h:510 ../rules/evdev.xml.in.h:510
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:511 ../rules/evdev.xml.in.h:511
+msgid "Prt"
+msgstr ""
+
+#: ../rules/base.xml.in.h:512 ../rules/evdev.xml.in.h:512
+msgid "QTronix Scorpius 98N+"
+msgstr ""
+
+#: ../rules/base.xml.in.h:513 ../rules/evdev.xml.in.h:513
+msgid "Right Alt"
+msgstr "Høyre Alt"
+
+#: ../rules/base.xml.in.h:514 ../rules/evdev.xml.in.h:514
+msgid "Right Alt (while pressed)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:515 ../rules/evdev.xml.in.h:515
+msgid "Right Alt key never chooses 3rd level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:516 ../rules/evdev.xml.in.h:516
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:517 ../rules/evdev.xml.in.h:517
+msgid "Right Ctrl"
+msgstr "Høyre Ctrl"
+
+#: ../rules/base.xml.in.h:518 ../rules/evdev.xml.in.h:518
+msgid "Right Ctrl (while pressed)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:519 ../rules/evdev.xml.in.h:519
+msgid "Right Ctrl as Right Alt"
+msgstr ""
+
+#: ../rules/base.xml.in.h:520 ../rules/evdev.xml.in.h:520
+msgid "Right Shift"
+msgstr "Høyre Shift"
+
+#: ../rules/base.xml.in.h:521 ../rules/evdev.xml.in.h:521
+msgid "Right Win"
+msgstr "Høyre Win"
+
+#: ../rules/base.xml.in.h:522 ../rules/evdev.xml.in.h:522
+msgid "Right Win (while pressed)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:523 ../rules/evdev.xml.in.h:523
+msgid "Right hand"
+msgstr ""
+
+#: ../rules/base.xml.in.h:524 ../rules/evdev.xml.in.h:524
+msgid "Right handed Dvorak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:525 ../rules/evdev.xml.in.h:525
+msgid "Romania"
+msgstr "Romania"
+
+#: ../rules/base.xml.in.h:526 ../rules/evdev.xml.in.h:526
+msgid "Romanian keyboard with German letters"
+msgstr ""
+
+#: ../rules/base.xml.in.h:527 ../rules/evdev.xml.in.h:527
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:528 ../rules/evdev.xml.in.h:528
+msgid "Rou"
+msgstr ""
+
+#: ../rules/base.xml.in.h:529 ../rules/evdev.xml.in.h:529
+msgid "Rus"
+msgstr ""
+
+#: ../rules/base.xml.in.h:530 ../rules/evdev.xml.in.h:530
+msgid "Russia"
+msgstr "Russland"
+
+#: ../rules/base.xml.in.h:531 ../rules/evdev.xml.in.h:531
+msgid "Russian"
+msgstr "Russisk"
+
+#: ../rules/base.xml.in.h:532 ../rules/evdev.xml.in.h:532
+msgid "Russian phonetic"
+msgstr "Russisk fonetisk"
+
+#: ../rules/base.xml.in.h:533 ../rules/evdev.xml.in.h:533
+msgid "Russian phonetic Dvorak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:534 ../rules/evdev.xml.in.h:534
+msgid "Russian phonetic, eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:535 ../rules/evdev.xml.in.h:535
+msgid "Russian with Kazakh"
+msgstr ""
+
+#: ../rules/base.xml.in.h:536 ../rules/evdev.xml.in.h:536
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:537 ../rules/evdev.xml.in.h:537
+msgid "SK-1300"
+msgstr ""
+
+#: ../rules/base.xml.in.h:538 ../rules/evdev.xml.in.h:538
+msgid "SK-2500"
+msgstr ""
+
+#: ../rules/base.xml.in.h:539 ../rules/evdev.xml.in.h:539
+msgid "SK-6200"
+msgstr ""
+
+#: ../rules/base.xml.in.h:540 ../rules/evdev.xml.in.h:540
+msgid "SK-7100"
+msgstr ""
+
+#: ../rules/base.xml.in.h:541 ../rules/evdev.xml.in.h:541
+msgid "SRB"
+msgstr ""
+
+#: ../rules/base.xml.in.h:542 ../rules/evdev.xml.in.h:542
+msgid "SVEN Ergonomic 2500"
+msgstr ""
+
+#: ../rules/base.xml.in.h:543 ../rules/evdev.xml.in.h:543
+msgid "SVEN Slim 303"
+msgstr ""
+
+#: ../rules/base.xml.in.h:544 ../rules/evdev.xml.in.h:544
+msgid "Samsung SDM 4500P"
+msgstr ""
+
+#: ../rules/base.xml.in.h:545 ../rules/evdev.xml.in.h:545
+msgid "Samsung SDM 4510P"
+msgstr ""
+
+#: ../rules/base.xml.in.h:546 ../rules/evdev.xml.in.h:546
+msgid "ScrollLock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:547 ../rules/evdev.xml.in.h:547
+msgid "Secwepemctsin"
+msgstr ""
+
+#: ../rules/base.xml.in.h:548 ../rules/evdev.xml.in.h:548
+msgid "Semi-colon on third level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:549 ../rules/evdev.xml.in.h:549
+msgid "Serbia"
+msgstr "Serbia"
+
+#: ../rules/base.xml.in.h:550 ../rules/evdev.xml.in.h:550
+msgid "Shift cancels CapsLock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:551 ../rules/evdev.xml.in.h:551
+msgid "Shift does not cancel NumLock, chooses 3d level instead"
+msgstr ""
+
+#: ../rules/base.xml.in.h:552 ../rules/evdev.xml.in.h:552
+msgid "Shift with numeric keypad keys works as in MS Windows"
+msgstr ""
+
+#: ../rules/base.xml.in.h:553 ../rules/evdev.xml.in.h:553
+msgid "Shift+CapsLock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:554 ../rules/evdev.xml.in.h:554
+msgid "Simple"
+msgstr ""
+
+#: ../rules/base.xml.in.h:555 ../rules/evdev.xml.in.h:555
+msgid "Slovakia"
+msgstr "Slovakia"
+
+#: ../rules/base.xml.in.h:556 ../rules/evdev.xml.in.h:556
+msgid "Slovenia"
+msgstr "Slovenia"
+
+#: ../rules/base.xml.in.h:557 ../rules/evdev.xml.in.h:557
+msgid "South Africa"
+msgstr "Sør-Afrika"
+
+#: ../rules/base.xml.in.h:558 ../rules/evdev.xml.in.h:558
+msgid "Southern Uzbek"
+msgstr ""
+
+#: ../rules/base.xml.in.h:559 ../rules/evdev.xml.in.h:559
+msgid "Spain"
+msgstr "Spania"
+
+#: ../rules/base.xml.in.h:560 ../rules/evdev.xml.in.h:560
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
+msgstr ""
+
+#: ../rules/base.xml.in.h:561 ../rules/evdev.xml.in.h:561
+msgid "SrL"
+msgstr ""
+
+#: ../rules/base.xml.in.h:562 ../rules/evdev.xml.in.h:562
+msgid "Sri Lanka"
+msgstr ""
+
+#: ../rules/base.xml.in.h:563 ../rules/evdev.xml.in.h:563
+msgid "Standard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:564 ../rules/evdev.xml.in.h:564
+msgid "Standard (Cedilla)"
+msgstr ""
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:566 ../rules/evdev.xml.in.h:566
+msgid "Standard RSTU"
+msgstr ""
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:568 ../rules/evdev.xml.in.h:568
+msgid "Standard RSTU on Russian layout"
+msgstr ""
+
+#: ../rules/base.xml.in.h:569 ../rules/evdev.xml.in.h:569
+msgid "Sun Type 5/6"
+msgstr ""
+
+#: ../rules/base.xml.in.h:570 ../rules/evdev.xml.in.h:570
+msgid "Sun dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:571 ../rules/evdev.xml.in.h:571
+msgid "Super Power Multimedia Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:572 ../rules/evdev.xml.in.h:572
+msgid "Super is mapped to Win keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:573 ../rules/evdev.xml.in.h:573
+msgid "Svdvorak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:574 ../rules/evdev.xml.in.h:574
+msgid "Svk"
+msgstr ""
+
+#: ../rules/base.xml.in.h:575 ../rules/evdev.xml.in.h:575
+msgid "Svn"
+msgstr ""
+
+#: ../rules/base.xml.in.h:576 ../rules/evdev.xml.in.h:576
+msgid "Swap Ctrl and CapsLock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:577 ../rules/evdev.xml.in.h:577
+msgid "Swap ESC and CapsLock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:578 ../rules/evdev.xml.in.h:578
+msgid "Swe"
+msgstr ""
+
+#: ../rules/base.xml.in.h:579 ../rules/evdev.xml.in.h:579
+msgid "Sweden"
+msgstr ""
+
+#: ../rules/base.xml.in.h:580 ../rules/evdev.xml.in.h:580
+msgid "Switzerland"
+msgstr ""
+
+#: ../rules/base.xml.in.h:581 ../rules/evdev.xml.in.h:581
+msgid "Symplon PaceBook (tablet PC)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:582 ../rules/evdev.xml.in.h:582
+msgid "Syr"
+msgstr ""
+
+#: ../rules/base.xml.in.h:583 ../rules/evdev.xml.in.h:583
+msgid "Syria"
+msgstr ""
+
+#: ../rules/base.xml.in.h:584 ../rules/evdev.xml.in.h:584
+msgid "Syriac"
+msgstr ""
+
+#: ../rules/base.xml.in.h:585 ../rules/evdev.xml.in.h:585
+msgid "Syriac phonetic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:586 ../rules/evdev.xml.in.h:586
+msgid "TIS-820.2538"
+msgstr ""
+
+#: ../rules/base.xml.in.h:587 ../rules/evdev.xml.in.h:587
+msgid "Tajikistan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:588 ../rules/evdev.xml.in.h:588
+msgid "Tamil"
+msgstr ""
+
+#: ../rules/base.xml.in.h:589 ../rules/evdev.xml.in.h:589
+msgid "Tamil TAB Typewriter"
+msgstr ""
+
+#: ../rules/base.xml.in.h:590 ../rules/evdev.xml.in.h:590
+msgid "Tamil TSCII Typewriter"
+msgstr ""
+
+#: ../rules/base.xml.in.h:591 ../rules/evdev.xml.in.h:591
+msgid "Tamil Unicode"
+msgstr ""
+
+#: ../rules/base.xml.in.h:592 ../rules/evdev.xml.in.h:592
+msgid "Targa Visionary 811"
+msgstr ""
+
+#: ../rules/base.xml.in.h:593 ../rules/evdev.xml.in.h:593
+msgid "Tatar"
+msgstr ""
+
+#: ../rules/base.xml.in.h:594 ../rules/evdev.xml.in.h:594
+msgid "Telugu"
+msgstr ""
+
+#: ../rules/base.xml.in.h:595 ../rules/evdev.xml.in.h:595
+msgid "Tha"
+msgstr ""
+
+#: ../rules/base.xml.in.h:596 ../rules/evdev.xml.in.h:596
+msgid "Thailand"
+msgstr ""
+
+#: ../rules/base.xml.in.h:597 ../rules/evdev.xml.in.h:597
+msgid "Tibetan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:598 ../rules/evdev.xml.in.h:598
+msgid "Tibetan (with ASCII numerals)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:599 ../rules/evdev.xml.in.h:599
+msgid "Tifinagh"
+msgstr ""
+
+#: ../rules/base.xml.in.h:600 ../rules/evdev.xml.in.h:600
+msgid "Tifinagh Alternative"
+msgstr ""
+
+#: ../rules/base.xml.in.h:601 ../rules/evdev.xml.in.h:601
+msgid "Tifinagh Alternative Phonetic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:602 ../rules/evdev.xml.in.h:602
+msgid "Tifinagh Extended"
+msgstr ""
+
+#: ../rules/base.xml.in.h:603 ../rules/evdev.xml.in.h:603
+msgid "Tifinagh Extended Phonetic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:604 ../rules/evdev.xml.in.h:604
+msgid "Tifinagh Phonetic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:605 ../rules/evdev.xml.in.h:605
+msgid "Tilde (~) variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:606 ../rules/evdev.xml.in.h:606
+msgid "Tjk"
+msgstr ""
+
+#: ../rules/base.xml.in.h:607 ../rules/evdev.xml.in.h:607
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr ""
+
+#: ../rules/base.xml.in.h:608 ../rules/evdev.xml.in.h:608
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr ""
+
+#: ../rules/base.xml.in.h:609 ../rules/evdev.xml.in.h:609
+msgid "Toshiba Satellite S3000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:610 ../rules/evdev.xml.in.h:610
+msgid "Trust Direct Access Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:611 ../rules/evdev.xml.in.h:611
+msgid "Trust Wireless Keyboard Classic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:612 ../rules/evdev.xml.in.h:612
+msgid "Tur"
+msgstr ""
+
+#: ../rules/base.xml.in.h:613 ../rules/evdev.xml.in.h:613
+msgid "Turkey"
+msgstr ""
+
+#: ../rules/base.xml.in.h:614 ../rules/evdev.xml.in.h:614
+msgid "Typewriter"
+msgstr ""
+
+#: ../rules/base.xml.in.h:615 ../rules/evdev.xml.in.h:615
+msgid "UCW layout (accented letters only)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:616 ../rules/evdev.xml.in.h:616
+msgid "US keyboard with Bosnian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:617 ../rules/evdev.xml.in.h:617
+msgid "US keyboard with Bosnian letters"
+msgstr ""
+
+#: ../rules/base.xml.in.h:618 ../rules/evdev.xml.in.h:618
+msgid "US keyboard with Croatian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:619 ../rules/evdev.xml.in.h:619
+msgid "US keyboard with Croatian letters"
+msgstr ""
+
+#: ../rules/base.xml.in.h:620 ../rules/evdev.xml.in.h:620
+msgid "US keyboard with Estonian letters"
+msgstr ""
+
+#: ../rules/base.xml.in.h:621 ../rules/evdev.xml.in.h:621
+msgid "US keyboard with Lithuanian letters"
+msgstr ""
+
+#: ../rules/base.xml.in.h:622 ../rules/evdev.xml.in.h:622
+msgid "US keyboard with Slovenian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:623 ../rules/evdev.xml.in.h:623
+msgid "US keyboard with Slovenian letters"
+msgstr ""
+
+#: ../rules/base.xml.in.h:624 ../rules/evdev.xml.in.h:624
+msgid "USA"
+msgstr ""
+
+#: ../rules/base.xml.in.h:625 ../rules/evdev.xml.in.h:625
+msgid "Udmurt"
+msgstr ""
+
+#: ../rules/base.xml.in.h:626 ../rules/evdev.xml.in.h:626
+msgid "Ukr"
+msgstr ""
+
+#: ../rules/base.xml.in.h:627 ../rules/evdev.xml.in.h:627
+msgid "Ukraine"
+msgstr ""
+
+#: ../rules/base.xml.in.h:628 ../rules/evdev.xml.in.h:628
+msgid "Unicode"
+msgstr ""
+
+#: ../rules/base.xml.in.h:629 ../rules/evdev.xml.in.h:629
+msgid "Unicode additions (arrows and math operators)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:630 ../rules/evdev.xml.in.h:630
+msgid "Unicode additions (arrows and math operators). Math operators on default level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:631 ../rules/evdev.xml.in.h:631
+msgid "UnicodeExpert"
+msgstr ""
+
+#: ../rules/base.xml.in.h:632 ../rules/evdev.xml.in.h:632
+msgid "United Kingdom"
+msgstr ""
+
+#: ../rules/base.xml.in.h:633 ../rules/evdev.xml.in.h:633
+msgid "Unitek KB-1925"
+msgstr ""
+
+#: ../rules/base.xml.in.h:634 ../rules/evdev.xml.in.h:634
+#, fuzzy
+msgid "Urdu, Alternative phonetic"
+msgstr "Alternativ fonetisk"
+
+#: ../rules/base.xml.in.h:635 ../rules/evdev.xml.in.h:635
+msgid "Urdu, Phonetic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:636 ../rules/evdev.xml.in.h:636
+msgid "Urdu, Winkeys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:637 ../rules/evdev.xml.in.h:637
+msgid "Use Bosnian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:638 ../rules/evdev.xml.in.h:638
+msgid "Use Croatian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:639 ../rules/evdev.xml.in.h:639
+msgid "Use Slovenian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:640 ../rules/evdev.xml.in.h:640
+msgid "Use guillemets for quotes"
+msgstr ""
+
+#: ../rules/base.xml.in.h:641 ../rules/evdev.xml.in.h:641
+msgid "Use keyboard LED to show alternative layout"
+msgstr ""
+
+#: ../rules/base.xml.in.h:642 ../rules/evdev.xml.in.h:642
+msgid "Using space key to input non-breakable space character"
+msgstr ""
+
+#: ../rules/base.xml.in.h:643 ../rules/evdev.xml.in.h:643
+msgid "Usual space at any level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:644 ../rules/evdev.xml.in.h:644
+msgid "Uzb"
+msgstr ""
+
+#: ../rules/base.xml.in.h:645 ../rules/evdev.xml.in.h:645
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:646 ../rules/evdev.xml.in.h:646
+msgid "Vietnam"
+msgstr ""
+
+#: ../rules/base.xml.in.h:647 ../rules/evdev.xml.in.h:647
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:648 ../rules/evdev.xml.in.h:648
+msgid "Vnm"
+msgstr ""
+
+#: ../rules/base.xml.in.h:649 ../rules/evdev.xml.in.h:649
+msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:650 ../rules/evdev.xml.in.h:650
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:651 ../rules/evdev.xml.in.h:651
+msgid "Wang model 724 azerty"
+msgstr ""
+
+#: ../rules/base.xml.in.h:652 ../rules/evdev.xml.in.h:652
+msgid "Western"
+msgstr ""
+
+#: ../rules/base.xml.in.h:653 ../rules/evdev.xml.in.h:653
+msgid "Winbook Model XP5"
+msgstr ""
+
+#: ../rules/base.xml.in.h:654 ../rules/evdev.xml.in.h:654
+msgid "Winkeys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:655 ../rules/evdev.xml.in.h:655
+msgid "With &lt;\\|&gt; key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:656 ../rules/evdev.xml.in.h:656
+msgid "With EuroSign on 5"
+msgstr ""
+
+#: ../rules/base.xml.in.h:657 ../rules/evdev.xml.in.h:657
+msgid "With guillemets"
+msgstr ""
+
+#: ../rules/base.xml.in.h:658 ../rules/evdev.xml.in.h:658
+msgid "Yahoo! Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:659 ../rules/evdev.xml.in.h:659
+msgid "Yakut"
+msgstr ""
+
+#: ../rules/base.xml.in.h:660 ../rules/evdev.xml.in.h:660
+msgid "Yoruba"
+msgstr ""
+
+#: ../rules/base.xml.in.h:661 ../rules/evdev.xml.in.h:661
+msgid "Z and ZHE swapped"
+msgstr ""
+
+#: ../rules/base.xml.in.h:662 ../rules/evdev.xml.in.h:662
+msgid "Zar"
+msgstr ""
+
+#: ../rules/base.xml.in.h:663 ../rules/evdev.xml.in.h:663
+msgid "azerty"
+msgstr ""
+
+#: ../rules/base.xml.in.h:664 ../rules/evdev.xml.in.h:664
+msgid "azerty/digits"
+msgstr ""
+
+#: ../rules/base.xml.in.h:665 ../rules/evdev.xml.in.h:665
+msgid "digits"
+msgstr ""
+
+#: ../rules/base.xml.in.h:666 ../rules/evdev.xml.in.h:666
+msgid "displaced semicolon and quote (obsolete)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:667 ../rules/evdev.xml.in.h:667
+msgid "lyx"
+msgstr ""
+
+#: ../rules/base.xml.in.h:668 ../rules/evdev.xml.in.h:668
+msgid "qwerty"
+msgstr ""
+
+#: ../rules/base.xml.in.h:669 ../rules/evdev.xml.in.h:669
+msgid "qwerty, extended Backslash"
+msgstr ""
+
+#: ../rules/base.xml.in.h:670 ../rules/evdev.xml.in.h:670
+msgid "qwerty/digits"
+msgstr ""
+
+#: ../rules/base.xml.in.h:671 ../rules/evdev.xml.in.h:671
+msgid "qwertz"
+msgstr ""
diff --git a/xorg-server/xkeyboard-config/po/rw.po b/xorg-server/xkeyboard-config/po/rw.po
index 935d6c33e..e2c25df90 100644
--- a/xorg-server/xkeyboard-config/po/rw.po
+++ b/xorg-server/xkeyboard-config/po/rw.po
@@ -1,1827 +1,1827 @@
-# Kinyarwanda translations for xkeyboard-config package.
-# Copyright (C) 2005 Free Software Foundation, Inc.
-# This file is distributed under the same license as the xkeyboard-config package.
-# Steve Murphy <murf@e-tools.com>, 2005.
-# Steve performed initial rough translation from compendium built from translations provided by the following translators:
-# Philibert Ndandali  <ndandali@yahoo.fr>, 2005.
-# Viateur MUGENZI <muvia1@yahoo.fr>, 2005.
-# Noëlla Mupole <s24211045@tuks.co.za>, 2005.
-# Carole Karema <karemacarole@hotmail.com>, 2005.
-# JEAN BAPTISTE NGENDAHAYO <ngenda_denis@yahoo.co.uk>, 2005.
-# Augustin KIBERWA  <akiberwa@yahoo.co.uk>, 2005.
-# Donatien NSENGIYUMVA <ndonatienuk@yahoo.co.uk>, 2005.
-# Antoine Bigirimana <antoine@e-tools.com>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: xkeyboard-config 0.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 22:57+0000\n"
-"PO-Revision-Date: 2005-04-04 10:55-0700\n"
-"Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
-"Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-# sc/source\ui\src\scstring.src:SCSTR_STDFILTER.text
-#: rules/base.xml.in.h:1
-#, fuzzy
-msgid "\"Standard\""
-msgstr "\"Bisanzwe-"
-
-#: rules/base.xml.in.h:2
-msgid "\"Typewriter\""
-msgstr ""
-
-#: rules/base.xml.in.h:3
-msgid "(F)"
-msgstr ""
-
-#: rules/base.xml.in.h:4
-#, fuzzy
-msgid "101/qwerty/comma/Dead keys"
-msgstr "Akitso Utubuto"
-
-#: rules/base.xml.in.h:5
-#, fuzzy
-msgid "101/qwerty/comma/Eliminate dead keys"
-msgstr "Akitso Utubuto"
-
-#: rules/base.xml.in.h:6
-#, fuzzy
-msgid "101/qwerty/dot/Dead keys"
-msgstr "Akadomo Utubuto"
-
-#: rules/base.xml.in.h:7
-#, fuzzy
-msgid "101/qwerty/dot/Eliminate dead keys"
-msgstr "Akadomo Utubuto"
-
-#: rules/base.xml.in.h:8
-#, fuzzy
-msgid "101/qwertz/comma/Dead keys"
-msgstr "Akitso Utubuto"
-
-#: rules/base.xml.in.h:9
-#, fuzzy
-msgid "101/qwertz/comma/Eliminate dead keys"
-msgstr "Akitso Utubuto"
-
-#: rules/base.xml.in.h:10
-#, fuzzy
-msgid "101/qwertz/dot/Dead keys"
-msgstr "Akadomo Utubuto"
-
-#: rules/base.xml.in.h:11
-#, fuzzy
-msgid "101/qwertz/dot/Eliminate dead keys"
-msgstr "Akadomo Utubuto"
-
-#: rules/base.xml.in.h:12
-#, fuzzy
-msgid "102/qwerty/comma/Dead keys"
-msgstr "Akitso Utubuto"
-
-#: rules/base.xml.in.h:13
-#, fuzzy
-msgid "102/qwerty/comma/Eliminate dead keys"
-msgstr "Akitso Utubuto"
-
-#: rules/base.xml.in.h:14
-#, fuzzy
-msgid "102/qwerty/dot/Dead keys"
-msgstr "Akadomo Utubuto"
-
-#: rules/base.xml.in.h:15
-#, fuzzy
-msgid "102/qwerty/dot/Eliminate dead keys"
-msgstr "Akadomo Utubuto"
-
-#: rules/base.xml.in.h:16
-#, fuzzy
-msgid "102/qwertz/comma/Dead keys"
-msgstr "Akitso Utubuto"
-
-#: rules/base.xml.in.h:17
-#, fuzzy
-msgid "102/qwertz/comma/Eliminate dead keys"
-msgstr "Akitso Utubuto"
-
-#: rules/base.xml.in.h:18
-#, fuzzy
-msgid "102/qwertz/dot/Dead keys"
-msgstr "Akadomo Utubuto"
-
-#: rules/base.xml.in.h:19
-#, fuzzy
-msgid "102/qwertz/dot/Eliminate dead keys"
-msgstr "Akadomo Utubuto"
-
-#: rules/base.xml.in.h:20
-#, fuzzy
-msgid "A4Tech KB-21"
-msgstr "21"
-
-#: rules/base.xml.in.h:21
-#, fuzzy
-msgid "A4Tech KBS-8"
-msgstr "8"
-
-#: rules/base.xml.in.h:22
-msgid "ACPI Standard"
-msgstr ""
-
-#: rules/base.xml.in.h:23
-#, fuzzy
-msgid "Acer AirKey V"
-msgstr "V"
-
-#: rules/base.xml.in.h:24
-#, fuzzy
-msgid "Add the EuroSign to the 2 key."
-msgstr "i Kuri i 2. Urufunguzo"
-
-#: rules/base.xml.in.h:25
-#, fuzzy
-msgid "Add the EuroSign to the 5 key."
-msgstr "i Kuri i 5 Urufunguzo"
-
-#: rules/base.xml.in.h:26
-#, fuzzy
-msgid "Add the EuroSign to the E key."
-msgstr "i Kuri i E Urufunguzo"
-
-#: rules/base.xml.in.h:27
-#, fuzzy
-msgid "Add the standard behavior to Menu key."
-msgstr "i Bisanzwe imyitwarire Kuri Urufunguzo"
-
-#: rules/base.xml.in.h:28
-#, fuzzy
-msgid "Adding the EuroSign to certain keys"
-msgstr "i Kuri Utubuto"
-
-#: rules/base.xml.in.h:29
-msgid "Advance Scorpius KI"
-msgstr ""
-
-#: rules/base.xml.in.h:30
-msgid "Alb"
-msgstr ""
-
-#: rules/base.xml.in.h:31
-msgid "Albania"
-msgstr "Alubaniya"
-
-#: rules/base.xml.in.h:32
-#, fuzzy
-msgid "Alt and Meta are on the Alt keys (default)."
-msgstr "Na ku i Utubuto Mburabuzi"
-
-#: rules/base.xml.in.h:33
-#, fuzzy
-msgid "Alt is mapped to the right Win-key and Super to Menu."
-msgstr "ni Kuri i Iburyo: Urufunguzo Na Kuri"
-
-#: rules/base.xml.in.h:34
-#, fuzzy
-msgid "Alt+Control changes group."
-msgstr "Amahinduka Itsinda"
-
-#: rules/base.xml.in.h:35
-#, fuzzy
-msgid "Alt+Shift changes group."
-msgstr "Amahinduka Itsinda"
-
-#: rules/base.xml.in.h:36
-msgid "Alt-Q"
-msgstr ""
-
-#: rules/base.xml.in.h:37
-#, fuzzy
-msgid "Alt/Win key behavior"
-msgstr "Urufunguzo imyitwarire"
-
-#: rules/base.xml.in.h:38
-msgid "Alternative"
-msgstr ""
-
-#: rules/base.xml.in.h:39
-#, fuzzy
-msgid "Alternative international (former us_intl)"
-msgstr "Mpuzamahanga"
-
-#: rules/base.xml.in.h:40
-#, fuzzy
-msgid "Alternative, Sun dead keys"
-msgstr "Utubuto"
-
-#: rules/base.xml.in.h:41
-#, fuzzy
-msgid "Alternative, eliminate dead keys"
-msgstr "Utubuto"
-
-#: rules/base.xml.in.h:42
-msgid "Apostrophe (') variant"
-msgstr ""
-
-#: rules/base.xml.in.h:43
-msgid "Ara"
-msgstr ""
-
-#: rules/base.xml.in.h:44
-msgid "Arabic"
-msgstr "Icyarabu"
-
-#: rules/base.xml.in.h:45
-msgid "Arm"
-msgstr ""
-
-#: rules/base.xml.in.h:46
-msgid "Armenia"
-msgstr "Arumeniya"
-
-#: rules/base.xml.in.h:47
-msgid "Aze"
-msgstr ""
-
-#: rules/base.xml.in.h:48
-msgid "Azerbaijan"
-msgstr "Azeribayijani"
-
-#: rules/base.xml.in.h:49
-msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr ""
-
-#: rules/base.xml.in.h:50
-msgid "BTC 5090"
-msgstr ""
-
-#: rules/base.xml.in.h:51
-msgid "BTC 5113RF Multimedia"
-msgstr ""
-
-#: rules/base.xml.in.h:52
-msgid "BTC 5126T"
-msgstr ""
-
-#: rules/base.xml.in.h:53
-msgid "BTC 9000"
-msgstr ""
-
-#: rules/base.xml.in.h:54
-msgid "BTC 9000A"
-msgstr ""
-
-#: rules/base.xml.in.h:55
-msgid "BTC 9001AH"
-msgstr ""
-
-#: rules/base.xml.in.h:56
-msgid "Bel"
-msgstr ""
-
-#: rules/base.xml.in.h:57
-msgid "Belarus"
-msgstr "Belarusi"
-
-#: rules/base.xml.in.h:58
-msgid "Belgium"
-msgstr "Ububiligi"
-
-#: rules/base.xml.in.h:59
-msgid "Ben"
-msgstr ""
-
-#: rules/base.xml.in.h:60
-msgid "Bengali"
-msgstr "Bengali"
-
-#: rules/base.xml.in.h:61
-msgid "Bgr"
-msgstr ""
-
-#: rules/base.xml.in.h:62
-msgid "Bih"
-msgstr ""
-
-#: rules/base.xml.in.h:63
-msgid "Blr"
-msgstr ""
-
-#: rules/base.xml.in.h:64
-msgid "Bosnia and Herzegovina"
-msgstr "Bosiniya na Herizegovina"
-
-#: rules/base.xml.in.h:65
-#, fuzzy
-msgid "Both Alt keys together change group."
-msgstr "Utubuto Guhindura>> Itsinda"
-
-#: rules/base.xml.in.h:66
-#, fuzzy
-msgid "Both Ctrl keys together change group."
-msgstr "Utubuto Guhindura>> Itsinda"
-
-#: rules/base.xml.in.h:67
-#, fuzzy
-msgid "Both Shift keys together change group."
-msgstr "Utubuto Guhindura>> Itsinda"
-
-#: rules/base.xml.in.h:68
-#, fuzzy
-msgid "Both Win-keys switch group while pressed."
-msgstr "Utubuto Hindura Itsinda"
-
-#: rules/base.xml.in.h:69
-msgid "Bra"
-msgstr ""
-
-#: rules/base.xml.in.h:70
-msgid "Brazil"
-msgstr "Burezile"
-
-#: rules/base.xml.in.h:71
-msgid "Brazilian ABNT2"
-msgstr ""
-
-#: rules/base.xml.in.h:72
-msgid "Brother Internet Keyboard"
-msgstr ""
-
-#: rules/base.xml.in.h:73
-msgid "Bulgaria"
-msgstr "Buligariya"
-
-#: rules/base.xml.in.h:74
-msgid "Can"
-msgstr ""
-
-#: rules/base.xml.in.h:75
-msgid "Canada"
-msgstr "Kanada"
-
-#: rules/base.xml.in.h:76
-#, fuzzy
-msgid "CapsLock LED shows alternative group."
-msgstr "Itsinda"
-
-#: rules/base.xml.in.h:77
-#, fuzzy
-msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
-msgstr "Nka Na:"
-
-#: rules/base.xml.in.h:78
-#, fuzzy
-msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
-msgstr "Nka Na: Kureka"
-
-#: rules/base.xml.in.h:79
-#, fuzzy
-msgid "CapsLock just locks the Shift modifier."
-msgstr "i"
-
-#: rules/base.xml.in.h:80
-#, fuzzy
-msgid "CapsLock key behavior"
-msgstr "Urufunguzo imyitwarire"
-
-#: rules/base.xml.in.h:81
-#, fuzzy
-msgid "CapsLock key changes group."
-msgstr "Urufunguzo Amahinduka Itsinda"
-
-#: rules/base.xml.in.h:82
-#, fuzzy
-msgid "CapsLock toggles Shift so all keys are affected."
-msgstr "Byose Utubuto"
-
-#: rules/base.xml.in.h:83
-#, fuzzy
-msgid "CapsLock toggles normal capitalization of alphabetic characters."
-msgstr "Bisanzwe Bya Inyuguti"
-
-#: rules/base.xml.in.h:84
-#, fuzzy
-msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
-msgstr "By'imbere"
-
-#: rules/base.xml.in.h:85
-#, fuzzy
-msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
-msgstr "By'imbere Kureka"
-
-#: rules/base.xml.in.h:86
-msgid "Che"
-msgstr ""
-
-#: rules/base.xml.in.h:87
-msgid "Cherry Blue Line CyBo@rd"
-msgstr ""
-
-#: rules/base.xml.in.h:88
-#, fuzzy
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr "Ihitamo"
-
-#: rules/base.xml.in.h:89
-msgid "Chicony Internet Keyboard"
-msgstr ""
-
-#: rules/base.xml.in.h:90
-msgid "Chicony KB-9885"
-msgstr ""
-
-#: rules/base.xml.in.h:91
-msgid "CloGaelach"
-msgstr ""
-
-#: rules/base.xml.in.h:92
-msgid "CloGaelach Laptop"
-msgstr ""
-
-#: rules/base.xml.in.h:93
-msgid "Compaq Easy Access Keyboard"
-msgstr ""
-
-#: rules/base.xml.in.h:94
-#, fuzzy
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr "Utubuto"
-
-#: rules/base.xml.in.h:95
-#, fuzzy
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr "Utubuto"
-
-#: rules/base.xml.in.h:96
-#, fuzzy
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr "7 Utubuto"
-
-#: rules/base.xml.in.h:97
-msgid "Compaq iPaq Keyboard"
-msgstr ""
-
-#: rules/base.xml.in.h:98
-msgid "Control Key Position"
-msgstr ""
-
-#: rules/base.xml.in.h:99
-#, fuzzy
-msgid "Control key at bottom left"
-msgstr "Urufunguzo ku Hasi: Ibumoso:"
-
-#: rules/base.xml.in.h:100
-#, fuzzy
-msgid "Control key at left of 'A'"
-msgstr "Urufunguzo ku Ibumoso: Bya"
-
-#: rules/base.xml.in.h:101
-#, fuzzy
-msgid "Control+Shift changes group."
-msgstr "Amahinduka Itsinda"
-
-#: rules/base.xml.in.h:102
-msgid "Croatia"
-msgstr "Korowatiya"
-
-#: rules/base.xml.in.h:103
-msgid "Cyrillic"
-msgstr "Nyasilike"
-
-#: rules/base.xml.in.h:104
-msgid "Cze"
-msgstr ""
-
-#: rules/base.xml.in.h:105
-msgid "Czechia"
-msgstr ""
-
-#: rules/base.xml.in.h:106
-msgid "DTK2000"
-msgstr ""
-
-#: rules/base.xml.in.h:107
-msgid "Dead acute"
-msgstr ""
-
-#: rules/base.xml.in.h:108
-msgid "Dead grave acute"
-msgstr ""
-
-#: rules/base.xml.in.h:109
-msgid "Dell"
-msgstr ""
-
-#: rules/base.xml.in.h:110
-#, fuzzy
-msgid "Dell 101-key PC"
-msgstr "Urufunguzo"
-
-#: rules/base.xml.in.h:111
-msgid "Denmark"
-msgstr "Danimarike"
-
-#: rules/base.xml.in.h:112
-msgid "Deu"
-msgstr ""
-
-#: rules/base.xml.in.h:113
-msgid "Deva"
-msgstr ""
-
-#: rules/base.xml.in.h:114
-msgid "Devanagari"
-msgstr "Devanagari"
-
-#: rules/base.xml.in.h:115
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr ""
-
-#: rules/base.xml.in.h:116
-#, fuzzy
-msgid "Diamond 9801 / 9802 series"
-msgstr "Ibyiciro"
-
-#: rules/base.xml.in.h:117
-msgid "Dnk"
-msgstr ""
-
-#: rules/base.xml.in.h:118
-msgid "Dvorak"
-msgstr ""
-
-#: rules/base.xml.in.h:119
-#, fuzzy
-msgid "Dvorak, Polish quotes on key \"1/!\""
-msgstr "ku Urufunguzo 1."
-
-#: rules/base.xml.in.h:120
-#, fuzzy
-msgid "Dvorak, Polish quotes on quotemark key"
-msgstr "ku Urufunguzo"
-
-#: rules/base.xml.in.h:121
-msgid "Dzo"
-msgstr ""
-
-#: rules/base.xml.in.h:122
-msgid "Dzongkha"
-msgstr "Ikinyazongika"
-
-#: rules/base.xml.in.h:123
-#, fuzzy
-msgid "Eliminate dead keys"
-msgstr "Utubuto"
-
-#: rules/base.xml.in.h:124
-msgid "Ennyah DKB-1008"
-msgstr ""
-
-#: rules/base.xml.in.h:125
-msgid "Esp"
-msgstr ""
-
-#: rules/base.xml.in.h:126
-msgid "Est"
-msgstr ""
-
-#: rules/base.xml.in.h:127
-msgid "Estonia"
-msgstr "Esitoniya"
-
-#: rules/base.xml.in.h:128
-msgid "Everex STEPnote"
-msgstr ""
-
-#: rules/base.xml.in.h:129
-msgid "Extended"
-msgstr "cya/byagutse"
-
-#: rules/base.xml.in.h:130
-msgid "Extended Backslash"
-msgstr ""
-
-#: rules/base.xml.in.h:131
-#, fuzzy
-msgid "F-letter (F) variant"
-msgstr "Ibaruwa..."
-
-#: rules/base.xml.in.h:132
-msgid "Fao"
-msgstr ""
-
-#: rules/base.xml.in.h:133
-msgid "Faroe Islands"
-msgstr "Ibirwa bya Farowe"
-
-#: rules/base.xml.in.h:134
-msgid "Fin"
-msgstr ""
-
-#: rules/base.xml.in.h:135
-#, fuzzy
-msgid "Finish and Swedish"
-msgstr "Na"
-
-#: rules/base.xml.in.h:136
-msgid "Finland"
-msgstr "Finilande"
-
-#: rules/base.xml.in.h:137
-msgid "Fra"
-msgstr ""
-
-#: rules/base.xml.in.h:138
-msgid "France"
-msgstr "Ubufaransa"
-
-#: rules/base.xml.in.h:139
-msgid "French"
-msgstr "Igifaransa"
-
-#: rules/base.xml.in.h:140
-msgid "French (legacy)"
-msgstr ""
-
-#: rules/base.xml.in.h:141
-msgid "French Dvorak"
-msgstr ""
-
-#: rules/base.xml.in.h:142
-#, fuzzy
-msgid "French, Sun dead keys"
-msgstr "Utubuto"
-
-#: rules/base.xml.in.h:143
-#, fuzzy
-msgid "French, eliminate dead keys"
-msgstr "Utubuto"
-
-#: rules/base.xml.in.h:144
-msgid "GBr"
-msgstr ""
-
-#: rules/base.xml.in.h:145
-#, fuzzy
-msgid "Generic 101-key PC"
-msgstr "Urufunguzo"
-
-#: rules/base.xml.in.h:146
-#, fuzzy
-msgid "Generic 102-key (Intl) PC"
-msgstr "Urufunguzo"
-
-#: rules/base.xml.in.h:147
-#, fuzzy
-msgid "Generic 104-key PC"
-msgstr "Urufunguzo"
-
-#: rules/base.xml.in.h:148
-#, fuzzy
-msgid "Generic 105-key (Intl) PC"
-msgstr "Urufunguzo"
-
-#: rules/base.xml.in.h:149
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr ""
-
-#: rules/base.xml.in.h:150
-msgid "Genius Comfy KB-21e-Scroll"
-msgstr ""
-
-#: rules/base.xml.in.h:151
-msgid "Geo"
-msgstr ""
-
-#: rules/base.xml.in.h:152
-msgid "Georgia"
-msgstr "Geworigiya"
-
-#: rules/base.xml.in.h:153
-#, fuzzy
-msgid "German, Sun dead keys"
-msgstr "Utubuto"
-
-#: rules/base.xml.in.h:154
-#, fuzzy
-msgid "German, eliminate dead keys"
-msgstr "Utubuto"
-
-#: rules/base.xml.in.h:155
-msgid "Germany"
-msgstr "Ubudage"
-
-#: rules/base.xml.in.h:156
-msgid "Gre"
-msgstr ""
-
-#: rules/base.xml.in.h:157
-msgid "Greece"
-msgstr "Ikigereki"
-
-#: rules/base.xml.in.h:158
-#, fuzzy
-msgid "Group Shift/Lock behavior"
-msgstr "imyitwarire"
-
-#: rules/base.xml.in.h:159
-msgid "Guj"
-msgstr ""
-
-#: rules/base.xml.in.h:160
-msgid "Gujarati"
-msgstr "Gujarati"
-
-#: rules/base.xml.in.h:161
-msgid "Gurmukhi"
-msgstr "Gurumuki"
-
-#: rules/base.xml.in.h:162
-msgid "Guru"
-msgstr ""
-
-#: rules/base.xml.in.h:163
-msgid "Gyration"
-msgstr ""
-
-#: rules/base.xml.in.h:164
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr ""
-
-#: rules/base.xml.in.h:165
-#, fuzzy
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr "500"
-
-#: rules/base.xml.in.h:166
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr ""
-
-#: rules/base.xml.in.h:167
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr ""
-
-#: rules/base.xml.in.h:168
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr ""
-
-#: rules/base.xml.in.h:169
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr ""
-
-#: rules/base.xml.in.h:170
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr ""
-
-#: rules/base.xml.in.h:171
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr ""
-
-#: rules/base.xml.in.h:172
-msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
-msgstr ""
-
-#: rules/base.xml.in.h:173
-msgid "Hewlett-Packard SK-2505 Internet Keyboard"
-msgstr ""
-
-#: rules/base.xml.in.h:174
-msgid "Honeywell Euroboard"
-msgstr ""
-
-#: rules/base.xml.in.h:175
-msgid "Hrv"
-msgstr ""
-
-#: rules/base.xml.in.h:176
-msgid "Hun"
-msgstr ""
-
-#: rules/base.xml.in.h:177
-msgid "Hungary"
-msgstr "Hongiriya"
-
-#: rules/base.xml.in.h:178
-#, fuzzy
-msgid "Hyper is mapped to the Win-keys."
-msgstr "ni Kuri i Utubuto"
-
-#: rules/base.xml.in.h:179
-msgid "IBM Rapid Access"
-msgstr ""
-
-#: rules/base.xml.in.h:180
-msgid "IBM Rapid Access II"
-msgstr ""
-
-#: rules/base.xml.in.h:181
-#, fuzzy
-msgid "IBM Rapid Access II (alternate option)"
-msgstr "Ihitamo"
-
-#: rules/base.xml.in.h:182
-#, fuzzy
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr "600"
-
-#: rules/base.xml.in.h:183
-#, fuzzy
-msgid "INSCRIPT layout"
-msgstr "Imigaragarire"
-
-#: rules/base.xml.in.h:184
-msgid "IS434"
-msgstr ""
-
-#: rules/base.xml.in.h:185
-msgid "IS434 laptop"
-msgstr ""
-
-#: rules/base.xml.in.h:186
-msgid "ISO Alternate"
-msgstr ""
-
-#: rules/base.xml.in.h:187
-msgid "Iceland"
-msgstr "Isilande"
-
-#: rules/base.xml.in.h:188
-msgid "Iku"
-msgstr ""
-
-#: rules/base.xml.in.h:189
-#, fuzzy
-msgid "International (with dead keys)"
-msgstr "Na: Utubuto"
-
-#: rules/base.xml.in.h:190
-msgid "Inuktitut"
-msgstr "Ikinukititutu"
-
-#: rules/base.xml.in.h:191
-msgid "Iran"
-msgstr ""
-
-#: rules/base.xml.in.h:192
-msgid "Ireland"
-msgstr "Irilande"
-
-#: rules/base.xml.in.h:193
-msgid "Irl"
-msgstr ""
-
-#: rules/base.xml.in.h:194
-msgid "Irn"
-msgstr ""
-
-#: rules/base.xml.in.h:195
-msgid "Isl"
-msgstr ""
-
-#: rules/base.xml.in.h:196
-msgid "Isr"
-msgstr ""
-
-#: rules/base.xml.in.h:197
-msgid "Israel"
-msgstr "Isirayeli"
-
-#: rules/base.xml.in.h:198
-msgid "Ita"
-msgstr ""
-
-#: rules/base.xml.in.h:199
-msgid "Italy"
-msgstr "Ubutariyani"
-
-#: rules/base.xml.in.h:200
-msgid "Japan"
-msgstr "Ubuyapani"
-
-#: rules/base.xml.in.h:201
-#, fuzzy
-msgid "Japanese 106-key"
-msgstr "Urufunguzo"
-
-#: rules/base.xml.in.h:202
-msgid "Jpn"
-msgstr ""
-
-#: rules/base.xml.in.h:203
-msgid "Kan"
-msgstr ""
-
-#: rules/base.xml.in.h:204
-msgid "Kannada"
-msgstr "Kannada"
-
-#: rules/base.xml.in.h:205
-msgid "Keytronic FlexPro"
-msgstr ""
-
-#: rules/base.xml.in.h:206
-msgid "Kyr"
-msgstr ""
-
-#: rules/base.xml.in.h:207
-msgid "Kyrgyzstan"
-msgstr "Kirigizasitani"
-
-#: rules/base.xml.in.h:208
-msgid "LAm"
-msgstr ""
-
-#: rules/base.xml.in.h:209
-msgid "Lao"
-msgstr "Lawo"
-
-#: rules/base.xml.in.h:210
-msgid "Laos"
-msgstr ""
-
-#: rules/base.xml.in.h:211
-msgid "Laptop"
-msgstr ""
-
-#: rules/base.xml.in.h:212
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr ""
-
-#: rules/base.xml.in.h:213
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr ""
-
-#: rules/base.xml.in.h:214
-msgid "Laptop/notebook Dell Inspiron 8xxx"
-msgstr ""
-
-#: rules/base.xml.in.h:215
-msgid "Latin"
-msgstr "Ikiratini"
-
-#: rules/base.xml.in.h:216
-msgid "Latin American"
-msgstr ""
-
-#: rules/base.xml.in.h:217
-msgid "Latin Unicode"
-msgstr ""
-
-#: rules/base.xml.in.h:218
-msgid "Latin Unicode qwerty"
-msgstr ""
-
-#: rules/base.xml.in.h:219
-msgid "Latin qwerty"
-msgstr ""
-
-#: rules/base.xml.in.h:220
-#, fuzzy
-msgid "Latin with guillemots"
-msgstr "Na:"
-
-#: rules/base.xml.in.h:221
-msgid "Latvia"
-msgstr "Lativiya"
-
-#: rules/base.xml.in.h:222
-#, fuzzy
-msgid "Left Alt key changes group."
-msgstr "Urufunguzo Amahinduka Itsinda"
-
-#: rules/base.xml.in.h:223
-#, fuzzy
-msgid "Left Alt key switches group while pressed."
-msgstr "Urufunguzo Itsinda"
-
-#: rules/base.xml.in.h:224
-#, fuzzy
-msgid "Left Ctrl key changes group."
-msgstr "Urufunguzo Amahinduka Itsinda"
-
-#: rules/base.xml.in.h:225
-#, fuzzy
-msgid "Left Shift key changes group."
-msgstr "Urufunguzo Amahinduka Itsinda"
-
-#: rules/base.xml.in.h:226
-#, fuzzy
-msgid "Left Win-key changes group."
-msgstr "Urufunguzo Amahinduka Itsinda"
-
-#: rules/base.xml.in.h:227
-#, fuzzy
-msgid "Left Win-key switches group while pressed."
-msgstr "Urufunguzo Itsinda"
-
-#: rules/base.xml.in.h:228
-msgid "Lithuania"
-msgstr "Lituwaniya"
-
-#: rules/base.xml.in.h:229
-msgid "Logitech Access Keyboard"
-msgstr ""
-
-#: rules/base.xml.in.h:230
-msgid "Logitech Cordless Desktop"
-msgstr ""
-
-#: rules/base.xml.in.h:231
-msgid "Logitech Cordless Desktop Navigator"
-msgstr ""
-
-#: rules/base.xml.in.h:232
-msgid "Logitech Cordless Desktop Optical"
-msgstr ""
-
-#: rules/base.xml.in.h:233
-msgid "Logitech Cordless Desktop Pro"
-msgstr ""
-
-#: rules/base.xml.in.h:234
-#, fuzzy
-msgid "Logitech Cordless Desktop Pro (alternate option)"
-msgstr "Ihitamo"
-
-#: rules/base.xml.in.h:235
-msgid "Logitech Cordless Desktop Pro (alternate option2)"
-msgstr ""
-
-#: rules/base.xml.in.h:236
-msgid "Logitech Cordless Desktop iTouch"
-msgstr ""
-
-#: rules/base.xml.in.h:237
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr ""
-
-#: rules/base.xml.in.h:238
-msgid "Logitech Deluxe Access Keyboard"
-msgstr ""
-
-#: rules/base.xml.in.h:239
-msgid "Logitech Internet Keyboard"
-msgstr ""
-
-#: rules/base.xml.in.h:240
-msgid "Logitech Internet Navigator Keyboard"
-msgstr ""
-
-#: rules/base.xml.in.h:241
-msgid "Logitech iTouch"
-msgstr ""
-
-#: rules/base.xml.in.h:242
-#, fuzzy
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "Urugero"
-
-#: rules/base.xml.in.h:243
-#, fuzzy
-msgid "Logitech iTouch keyboard Internet Navigator"
-msgstr "Mwandikisho"
-
-#: rules/base.xml.in.h:244
-msgid "Ltu"
-msgstr ""
-
-#: rules/base.xml.in.h:245
-msgid "Lva"
-msgstr ""
-
-#: rules/base.xml.in.h:246
-msgid "Macedonian"
-msgstr "Nyamasedoniya"
-
-#: rules/base.xml.in.h:247
-msgid "Macintosh"
-msgstr "masinitoshi"
-
-#: rules/base.xml.in.h:248
-msgid "Macintosh Old"
-msgstr ""
-
-#: rules/base.xml.in.h:249
-msgid "Make CapsLock an additional Control."
-msgstr ""
-
-#: rules/base.xml.in.h:250
-msgid "Mal"
-msgstr ""
-
-#: rules/base.xml.in.h:251
-msgid "Malayalam"
-msgstr "Malayalamu"
-
-#: rules/base.xml.in.h:252
-msgid "Malta"
-msgstr "Malita"
-
-#: rules/base.xml.in.h:253
-msgid "Mao"
-msgstr ""
-
-#: rules/base.xml.in.h:254
-msgid "Maori"
-msgstr "Ikimawori"
-
-#: rules/base.xml.in.h:255
-msgid "Memorex MX1998"
-msgstr ""
-
-#: rules/base.xml.in.h:256
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr ""
-
-#: rules/base.xml.in.h:257
-msgid "Memorex MX2750"
-msgstr ""
-
-#: rules/base.xml.in.h:258
-#, fuzzy
-msgid "Menu is Compose."
-msgstr "ni"
-
-#: rules/base.xml.in.h:259
-#, fuzzy
-msgid "Menu key changes group."
-msgstr "Urufunguzo Amahinduka Itsinda"
-
-#: rules/base.xml.in.h:260
-#, fuzzy
-msgid "Meta is mapped to the Win-keys."
-msgstr "ni Kuri i Utubuto"
-
-#: rules/base.xml.in.h:261
-#, fuzzy
-msgid "Meta is mapped to the left Win-key."
-msgstr "ni Kuri i Ibumoso: Urufunguzo"
-
-#: rules/base.xml.in.h:262
-msgid "Microsoft Internet Keyboard"
-msgstr ""
-
-#: rules/base.xml.in.h:263
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr ""
-
-#: rules/base.xml.in.h:264
-msgid "Microsoft Natural"
-msgstr ""
-
-#: rules/base.xml.in.h:265
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr ""
-
-#: rules/base.xml.in.h:266
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr ""
-
-#: rules/base.xml.in.h:267
-msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr ""
-
-#: rules/base.xml.in.h:268
-msgid "Microsoft Office Keyboard"
-msgstr ""
-
-#: rules/base.xml.in.h:269
-#, fuzzy
-msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
-msgstr "1."
-
-#: rules/base.xml.in.h:270
-#, fuzzy
-msgid "Miscellaneous compatibility options"
-msgstr "Bihuye neza Amahitamo"
-
-#: rules/base.xml.in.h:271
-msgid "Mkd"
-msgstr ""
-
-#: rules/base.xml.in.h:272
-msgid "Mlt"
-msgstr ""
-
-#: rules/base.xml.in.h:273
-msgid "Mmr"
-msgstr ""
-
-#: rules/base.xml.in.h:274
-msgid "Mng"
-msgstr ""
-
-#: rules/base.xml.in.h:275
-msgid "Mongolia"
-msgstr "Mongoliya"
-
-#: rules/base.xml.in.h:276
-msgid "Multilingual"
-msgstr ""
-
-#: rules/base.xml.in.h:277
-#, fuzzy
-msgid "Multilingual, second part"
-msgstr "ISEGONDA"
-
-#: rules/base.xml.in.h:278
-msgid "Myanmar"
-msgstr "Myanmar"
-
-#: rules/base.xml.in.h:279
-msgid "Netherlands"
-msgstr "Nederilande"
-
-#: rules/base.xml.in.h:280
-msgid "Nld"
-msgstr ""
-
-#: rules/base.xml.in.h:281
-msgid "Nor"
-msgstr ""
-
-#: rules/base.xml.in.h:282
-msgid "Northern Saami"
-msgstr "Sami y'Amajyaruguru"
-
-#: rules/base.xml.in.h:283
-msgid "Northgate OmniKey 101"
-msgstr ""
-
-#: rules/base.xml.in.h:284
-msgid "Norway"
-msgstr "Noruveje"
-
-#: rules/base.xml.in.h:285
-#, fuzzy
-msgid "NumLock LED shows alternative group."
-msgstr "Itsinda"
-
-#: rules/base.xml.in.h:286
-msgid "Ogam"
-msgstr ""
-
-#: rules/base.xml.in.h:287
-msgid "Ogham"
-msgstr "Ogham"
-
-#: rules/base.xml.in.h:288
-#, fuzzy
-msgid "Oretec MCK-800 MM/Internet keyboard"
-msgstr "Mwandikisho"
-
-#: rules/base.xml.in.h:289
-msgid "Ori"
-msgstr ""
-
-#: rules/base.xml.in.h:290
-msgid "Oriya"
-msgstr "Oriya"
-
-#: rules/base.xml.in.h:291
-msgid "PC-98xx Series"
-msgstr ""
-
-#: rules/base.xml.in.h:292
-msgid "Pattachote"
-msgstr ""
-
-#: rules/base.xml.in.h:293
-#, fuzzy
-msgid "Phonetic"
-msgstr "Nyigamvugo:"
-
-#: rules/base.xml.in.h:294
-msgid "Pol"
-msgstr ""
-
-#: rules/base.xml.in.h:295
-msgid "Poland"
-msgstr "Polonye"
-
-#: rules/base.xml.in.h:296
-msgid "Polytonic"
-msgstr ""
-
-#: rules/base.xml.in.h:297
-msgid "Portugal"
-msgstr "Porutigali"
-
-#: rules/base.xml.in.h:298
-#, fuzzy
-msgid "PowerPC PS/2"
-msgstr "2."
-
-#: rules/base.xml.in.h:299
-#, fuzzy
-msgid "Press Left Alt key to choose 3rd level."
-msgstr "Urufunguzo Kuri Guhitamo urwego"
-
-#: rules/base.xml.in.h:300
-#, fuzzy
-msgid "Press Left Win-key to choose 3rd level."
-msgstr "Urufunguzo Kuri Guhitamo urwego"
-
-#: rules/base.xml.in.h:301
-#, fuzzy
-msgid "Press Menu key to choose 3rd level."
-msgstr "Urufunguzo Kuri Guhitamo urwego"
-
-#: rules/base.xml.in.h:302
-#, fuzzy
-msgid "Press Right Alt key to choose 3rd level."
-msgstr "Urufunguzo Kuri Guhitamo urwego"
-
-#: rules/base.xml.in.h:303
-#, fuzzy
-msgid "Press Right Control to choose 3rd level."
-msgstr "Kuri Guhitamo urwego"
-
-#: rules/base.xml.in.h:304
-#, fuzzy
-msgid "Press Right Win-key to choose 3rd level."
-msgstr "Urufunguzo Kuri Guhitamo urwego"
-
-#: rules/base.xml.in.h:305
-#, fuzzy
-msgid "Press any of Alt keys to choose 3rd level."
-msgstr "Bya Utubuto Kuri Guhitamo urwego"
-
-#: rules/base.xml.in.h:306
-#, fuzzy
-msgid "Press any of Win-keys to choose 3rd level."
-msgstr "Bya Utubuto Kuri Guhitamo urwego"
-
-#: rules/base.xml.in.h:307
-msgid "Probhat"
-msgstr ""
-
-#: rules/base.xml.in.h:308
-#, fuzzy
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "1000"
-
-#: rules/base.xml.in.h:309
-msgid "Prt"
-msgstr ""
-
-#: rules/base.xml.in.h:310
-msgid "QTronix Scorpius 98N+"
-msgstr ""
-
-#: rules/base.xml.in.h:311
-#, fuzzy
-msgid "R-Alt switches group while pressed."
-msgstr "Itsinda"
-
-#: rules/base.xml.in.h:312
-#, fuzzy
-msgid "Right Alt is Compose."
-msgstr "ni"
-
-#: rules/base.xml.in.h:313
-#, fuzzy
-msgid "Right Alt key changes group."
-msgstr "Urufunguzo Amahinduka Itsinda"
-
-#: rules/base.xml.in.h:314
-#, fuzzy
-msgid "Right Control key works as Right Alt."
-msgstr "Urufunguzo Nka"
-
-#: rules/base.xml.in.h:315
-#, fuzzy
-msgid "Right Ctrl is Compose."
-msgstr "ni"
-
-#: rules/base.xml.in.h:316
-#, fuzzy
-msgid "Right Ctrl key changes group."
-msgstr "Urufunguzo Amahinduka Itsinda"
-
-#: rules/base.xml.in.h:317
-#, fuzzy
-msgid "Right Ctrl key switches group while pressed."
-msgstr "Urufunguzo Itsinda"
-
-#: rules/base.xml.in.h:318
-#, fuzzy
-msgid "Right Shift key changes group."
-msgstr "Urufunguzo Amahinduka Itsinda"
-
-#: rules/base.xml.in.h:319
-#, fuzzy
-msgid "Right Win-key changes group."
-msgstr "Urufunguzo Amahinduka Itsinda"
-
-#: rules/base.xml.in.h:320
-#, fuzzy
-msgid "Right Win-key is Compose."
-msgstr "Urufunguzo ni"
-
-#: rules/base.xml.in.h:321
-#, fuzzy
-msgid "Right Win-key switches group while pressed."
-msgstr "Urufunguzo Itsinda"
-
-#: rules/base.xml.in.h:322
-msgid "Romania"
-msgstr "Romaniya"
-
-#: rules/base.xml.in.h:323
-#, fuzzy
-msgid "Romanian keyboard with German letters"
-msgstr "Mwandikisho Na:"
-
-#: rules/base.xml.in.h:324
-#, fuzzy
-msgid "Romanian keyboard with German letters, eliminate dead keys"
-msgstr "Mwandikisho Na: Utubuto"
-
-#: rules/base.xml.in.h:325
-msgid "Rou"
-msgstr ""
-
-#: rules/base.xml.in.h:326
-msgid "Rus"
-msgstr ""
-
-#: rules/base.xml.in.h:327
-msgid "Russia"
-msgstr ""
-
-#: rules/base.xml.in.h:328
-msgid "Russian"
-msgstr "Ikirusiya"
-
-#: rules/base.xml.in.h:329
-msgid "SK-1300"
-msgstr ""
-
-#: rules/base.xml.in.h:330
-msgid "SK-2500"
-msgstr ""
-
-#: rules/base.xml.in.h:331
-msgid "SK-6200"
-msgstr ""
-
-#: rules/base.xml.in.h:332
-msgid "SK-7100"
-msgstr ""
-
-#: rules/base.xml.in.h:333
-msgid "SVEN Ergonomic 2500"
-msgstr ""
-
-#: rules/base.xml.in.h:334
-msgid "Samsung SDM 4500P"
-msgstr ""
-
-#: rules/base.xml.in.h:335
-msgid "Samsung SDM 4510P"
-msgstr ""
-
-#: rules/base.xml.in.h:336
-#, fuzzy
-msgid "ScrollLock LED shows alternative group."
-msgstr "Itsinda"
-
-#: rules/base.xml.in.h:337
-msgid "Serbian"
-msgstr "Ikinyaseribiya"
-
-#: rules/base.xml.in.h:338
-#, fuzzy
-msgid "Shift with numpad keys works as in MS Windows."
-msgstr "Na: Utubuto Nka in"
-
-#: rules/base.xml.in.h:339
-#, fuzzy
-msgid "Shift+CapsLock changes group."
-msgstr "Amahinduka Itsinda"
-
-# sc/source\core\src\compiler.src:RID_SC_FUNCTION_NAMES.SC_OPCODE_SIN.text
-#: rules/base.xml.in.h:340
-#, fuzzy
-msgid "Sin"
-msgstr "SIN"
-
-#: rules/base.xml.in.h:341
-msgid "Sinhala"
-msgstr "Sinhala"
-
-#: rules/base.xml.in.h:342
-msgid "Slovakia"
-msgstr "Silovakiya"
-
-#: rules/base.xml.in.h:343
-msgid "Slovenia"
-msgstr "Siloveniya"
-
-#: rules/base.xml.in.h:344
-msgid "Smi"
-msgstr ""
-
-#: rules/base.xml.in.h:345
-msgid "Spain"
-msgstr "Esipanye"
-
-#: rules/base.xml.in.h:346
-#, fuzzy
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
-msgstr "Utubuto in a Seriveri"
-
-#: rules/base.xml.in.h:347
-msgid "Srp"
-msgstr ""
-
-#: rules/base.xml.in.h:348
-msgid "Standard"
-msgstr "gisanzwe/kimenyerewe"
-
-#: rules/base.xml.in.h:349
-#, fuzzy
-msgid "Sun dead keys"
-msgstr "Utubuto"
-
-#: rules/base.xml.in.h:350
-msgid "Super Power Multimedia Keyboard"
-msgstr ""
-
-#: rules/base.xml.in.h:351
-#, fuzzy
-msgid "Super is mapped to the Win-keys (default)."
-msgstr "ni Kuri i Utubuto Mburabuzi"
-
-#: rules/base.xml.in.h:352
-msgid "Svk"
-msgstr ""
-
-#: rules/base.xml.in.h:353
-msgid "Svn"
-msgstr ""
-
-#: rules/base.xml.in.h:354
-#, fuzzy
-msgid "Swap Control and CapsLock."
-msgstr "Na"
-
-#: rules/base.xml.in.h:355
-msgid "Swe"
-msgstr ""
-
-#: rules/base.xml.in.h:356
-msgid "Sweden"
-msgstr "Suwede"
-
-#: rules/base.xml.in.h:357
-msgid "Switzerland"
-msgstr "Ubusuwisi"
-
-#: rules/base.xml.in.h:358
-msgid "Symplon PaceBook (tablet PC)"
-msgstr ""
-
-#: rules/base.xml.in.h:359
-msgid "Syr"
-msgstr ""
-
-#: rules/base.xml.in.h:360
-msgid "Syriac"
-msgstr "Syriac"
-
-#: rules/base.xml.in.h:361
-msgid "TIS-820.2538"
-msgstr ""
-
-#: rules/base.xml.in.h:362
-msgid "Tajikistan"
-msgstr "Tajikisitani"
-
-#: rules/base.xml.in.h:363
-msgid "Tam"
-msgstr ""
-
-#: rules/base.xml.in.h:364
-msgid "Tamil"
-msgstr "Tamili"
-
-# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
-# sw/source\ui\wizard\wizbmp.src:STR_GoF_AbsTelefon.text
-# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
-# sw/source\ui\wizard\wizbmp.src:STR_GoF_EmpTelefon.text
-# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
-# sw/source\ui\wizard\wizbmp.src:STR_Usr_TelePrivat.text
-# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
-# sw/source\ui\wizard\wizbmp.src:STR_Usr_TeleDienst.text
-#: rules/base.xml.in.h:365
-#, fuzzy
-msgid "Tel"
-msgstr "Telefoni:"
-
-#: rules/base.xml.in.h:366
-msgid "Telugu"
-msgstr "Tegulu"
-
-#: rules/base.xml.in.h:367
-msgid "Tha"
-msgstr ""
-
-#: rules/base.xml.in.h:368
-msgid "Thailand"
-msgstr "Tayilande"
-
-#: rules/base.xml.in.h:369
-#, fuzzy
-msgid "Third level choosers"
-msgstr "urwego"
-
-#: rules/base.xml.in.h:370
-msgid "Tilde (~) variant"
-msgstr ""
-
-#: rules/base.xml.in.h:371
-msgid "Tjk"
-msgstr ""
-
-#: rules/base.xml.in.h:372
-msgid "Toshiba Satellite S3000"
-msgstr ""
-
-#: rules/base.xml.in.h:373
-msgid "Trust Direct Access Keyboard"
-msgstr ""
-
-#: rules/base.xml.in.h:374
-msgid "Trust Wireless Keyboard Classic"
-msgstr ""
-
-#: rules/base.xml.in.h:375
-msgid "Tur"
-msgstr ""
-
-#: rules/base.xml.in.h:376
-msgid "Turkish"
-msgstr "Ikinyaturukiya"
-
-#: rules/base.xml.in.h:377
-#, fuzzy
-msgid "Typewrite-style keymap; TAB encoding"
-msgstr "IMISUSIRE Imisobekere:"
-
-#: rules/base.xml.in.h:378
-#, fuzzy
-msgid "Typewrite-style keymap; Unicode encoding"
-msgstr "IMISUSIRE Imisobekere:"
-
-#: rules/base.xml.in.h:379
-#, fuzzy
-msgid "U.S. English"
-msgstr "U."
-
-#: rules/base.xml.in.h:380
-#, fuzzy
-msgid "US keyboard with Croatian letters"
-msgstr "Mwandikisho Na:"
-
-#: rules/base.xml.in.h:381
-#, fuzzy
-msgid "US keyboard with Lithuanian letters"
-msgstr "Mwandikisho Na:"
-
-#: rules/base.xml.in.h:382
-#, fuzzy
-msgid "US keyboard with Maltian letters"
-msgstr "Mwandikisho Na:"
-
-#: rules/base.xml.in.h:383
-#, fuzzy
-msgid "US keyboard with Romanian letters"
-msgstr "Mwandikisho Na:"
-
-#: rules/base.xml.in.h:384
-msgid "USA"
-msgstr "Amerika"
-
-#: rules/base.xml.in.h:385
-msgid "Ukr"
-msgstr ""
-
-#: rules/base.xml.in.h:386
-msgid "Ukraine"
-msgstr "Ikerene"
-
-#. RSTU 2019-91
-#: rules/base.xml.in.h:388
-#, fuzzy
-msgid "Ukrainian standard RSTU"
-msgstr "Bisanzwe"
-
-#: rules/base.xml.in.h:389
-msgid "UnicodeExpert"
-msgstr ""
-
-#: rules/base.xml.in.h:390
-msgid "United Kingdom"
-msgstr "Ubwongereza (UK)"
-
-#: rules/base.xml.in.h:391
-msgid "Urd"
-msgstr ""
-
-#: rules/base.xml.in.h:392
-msgid "Urdu"
-msgstr "Urudu"
-
-#: rules/base.xml.in.h:393
-#, fuzzy
-msgid "Use keyboard LED to show alternative group."
-msgstr "Mwandikisho Kuri Garagaza Itsinda"
-
-#: rules/base.xml.in.h:394
-msgid "Uzb"
-msgstr ""
-
-#: rules/base.xml.in.h:395
-msgid "Uzbekistan"
-msgstr "Uzubekisitani"
-
-# setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.121.text
-#: rules/base.xml.in.h:396
-msgid "Vietnam"
-msgstr "Viyetinamu"
-
-#: rules/base.xml.in.h:397
-msgid "Vnm"
-msgstr ""
-
-#: rules/base.xml.in.h:398
-msgid "Winbook Model XP5"
-msgstr ""
-
-#: rules/base.xml.in.h:399
-msgid "Winkeys"
-msgstr ""
-
-#: rules/base.xml.in.h:400
-#, fuzzy
-msgid "With &lt;\\|&gt; key"
-msgstr "Urufunguzo"
-
-#: rules/base.xml.in.h:401
-msgid "With Malayalam digits"
-msgstr ""
-
-#: rules/base.xml.in.h:402
-msgid "With guillemots"
-msgstr ""
-
-#: rules/base.xml.in.h:403
-msgid "Yahoo! Internet Keyboard"
-msgstr ""
-
-#: rules/base.xml.in.h:404
-#, fuzzy
-msgid "Z and ZHE swapped"
-msgstr "Na"
-
-#: rules/base.xml.in.h:405
-msgid "azerty"
-msgstr ""
-
-#: rules/base.xml.in.h:406
-msgid "azerty/digits"
-msgstr ""
-
-#: rules/base.xml.in.h:407
-msgid "digits"
-msgstr ""
-
-#: rules/base.xml.in.h:408
-msgid "lyx"
-msgstr ""
-
-#: rules/base.xml.in.h:409
-msgid "qwerty"
-msgstr ""
-
-#: rules/base.xml.in.h:410
-#, fuzzy
-msgid "qwerty, extended Backslash"
-msgstr "Byongerewe..."
-
-#: rules/base.xml.in.h:411
-msgid "qwerty/digits"
-msgstr ""
-
-#: rules/base.xml.in.h:412
-msgid "qwertz"
-msgstr ""
-
-#: rules/base.xml.in.h:413
-msgid "si1452"
-msgstr ""
+# Kinyarwanda translations for xkeyboard-config package.
+# Copyright (C) 2005 Free Software Foundation, Inc.
+# This file is distributed under the same license as the xkeyboard-config package.
+# Steve Murphy <murf@e-tools.com>, 2005.
+# Steve performed initial rough translation from compendium built from translations provided by the following translators:
+# Philibert Ndandali  <ndandali@yahoo.fr>, 2005.
+# Viateur MUGENZI <muvia1@yahoo.fr>, 2005.
+# Noëlla Mupole <s24211045@tuks.co.za>, 2005.
+# Carole Karema <karemacarole@hotmail.com>, 2005.
+# JEAN BAPTISTE NGENDAHAYO <ngenda_denis@yahoo.co.uk>, 2005.
+# Augustin KIBERWA  <akiberwa@yahoo.co.uk>, 2005.
+# Donatien NSENGIYUMVA <ndonatienuk@yahoo.co.uk>, 2005.
+# Antoine Bigirimana <antoine@e-tools.com>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 0.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-01-24 22:57+0000\n"
+"PO-Revision-Date: 2005-04-04 10:55-0700\n"
+"Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
+"Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+# sc/source\ui\src\scstring.src:SCSTR_STDFILTER.text
+#: rules/base.xml.in.h:1
+#, fuzzy
+msgid "\"Standard\""
+msgstr "\"Bisanzwe-"
+
+#: rules/base.xml.in.h:2
+msgid "\"Typewriter\""
+msgstr ""
+
+#: rules/base.xml.in.h:3
+msgid "(F)"
+msgstr ""
+
+#: rules/base.xml.in.h:4
+#, fuzzy
+msgid "101/qwerty/comma/Dead keys"
+msgstr "Akitso Utubuto"
+
+#: rules/base.xml.in.h:5
+#, fuzzy
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "Akitso Utubuto"
+
+#: rules/base.xml.in.h:6
+#, fuzzy
+msgid "101/qwerty/dot/Dead keys"
+msgstr "Akadomo Utubuto"
+
+#: rules/base.xml.in.h:7
+#, fuzzy
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "Akadomo Utubuto"
+
+#: rules/base.xml.in.h:8
+#, fuzzy
+msgid "101/qwertz/comma/Dead keys"
+msgstr "Akitso Utubuto"
+
+#: rules/base.xml.in.h:9
+#, fuzzy
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "Akitso Utubuto"
+
+#: rules/base.xml.in.h:10
+#, fuzzy
+msgid "101/qwertz/dot/Dead keys"
+msgstr "Akadomo Utubuto"
+
+#: rules/base.xml.in.h:11
+#, fuzzy
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "Akadomo Utubuto"
+
+#: rules/base.xml.in.h:12
+#, fuzzy
+msgid "102/qwerty/comma/Dead keys"
+msgstr "Akitso Utubuto"
+
+#: rules/base.xml.in.h:13
+#, fuzzy
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "Akitso Utubuto"
+
+#: rules/base.xml.in.h:14
+#, fuzzy
+msgid "102/qwerty/dot/Dead keys"
+msgstr "Akadomo Utubuto"
+
+#: rules/base.xml.in.h:15
+#, fuzzy
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "Akadomo Utubuto"
+
+#: rules/base.xml.in.h:16
+#, fuzzy
+msgid "102/qwertz/comma/Dead keys"
+msgstr "Akitso Utubuto"
+
+#: rules/base.xml.in.h:17
+#, fuzzy
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "Akitso Utubuto"
+
+#: rules/base.xml.in.h:18
+#, fuzzy
+msgid "102/qwertz/dot/Dead keys"
+msgstr "Akadomo Utubuto"
+
+#: rules/base.xml.in.h:19
+#, fuzzy
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "Akadomo Utubuto"
+
+#: rules/base.xml.in.h:20
+#, fuzzy
+msgid "A4Tech KB-21"
+msgstr "21"
+
+#: rules/base.xml.in.h:21
+#, fuzzy
+msgid "A4Tech KBS-8"
+msgstr "8"
+
+#: rules/base.xml.in.h:22
+msgid "ACPI Standard"
+msgstr ""
+
+#: rules/base.xml.in.h:23
+#, fuzzy
+msgid "Acer AirKey V"
+msgstr "V"
+
+#: rules/base.xml.in.h:24
+#, fuzzy
+msgid "Add the EuroSign to the 2 key."
+msgstr "i Kuri i 2. Urufunguzo"
+
+#: rules/base.xml.in.h:25
+#, fuzzy
+msgid "Add the EuroSign to the 5 key."
+msgstr "i Kuri i 5 Urufunguzo"
+
+#: rules/base.xml.in.h:26
+#, fuzzy
+msgid "Add the EuroSign to the E key."
+msgstr "i Kuri i E Urufunguzo"
+
+#: rules/base.xml.in.h:27
+#, fuzzy
+msgid "Add the standard behavior to Menu key."
+msgstr "i Bisanzwe imyitwarire Kuri Urufunguzo"
+
+#: rules/base.xml.in.h:28
+#, fuzzy
+msgid "Adding the EuroSign to certain keys"
+msgstr "i Kuri Utubuto"
+
+#: rules/base.xml.in.h:29
+msgid "Advance Scorpius KI"
+msgstr ""
+
+#: rules/base.xml.in.h:30
+msgid "Alb"
+msgstr ""
+
+#: rules/base.xml.in.h:31
+msgid "Albania"
+msgstr "Alubaniya"
+
+#: rules/base.xml.in.h:32
+#, fuzzy
+msgid "Alt and Meta are on the Alt keys (default)."
+msgstr "Na ku i Utubuto Mburabuzi"
+
+#: rules/base.xml.in.h:33
+#, fuzzy
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "ni Kuri i Iburyo: Urufunguzo Na Kuri"
+
+#: rules/base.xml.in.h:34
+#, fuzzy
+msgid "Alt+Control changes group."
+msgstr "Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:35
+#, fuzzy
+msgid "Alt+Shift changes group."
+msgstr "Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:36
+msgid "Alt-Q"
+msgstr ""
+
+#: rules/base.xml.in.h:37
+#, fuzzy
+msgid "Alt/Win key behavior"
+msgstr "Urufunguzo imyitwarire"
+
+#: rules/base.xml.in.h:38
+msgid "Alternative"
+msgstr ""
+
+#: rules/base.xml.in.h:39
+#, fuzzy
+msgid "Alternative international (former us_intl)"
+msgstr "Mpuzamahanga"
+
+#: rules/base.xml.in.h:40
+#, fuzzy
+msgid "Alternative, Sun dead keys"
+msgstr "Utubuto"
+
+#: rules/base.xml.in.h:41
+#, fuzzy
+msgid "Alternative, eliminate dead keys"
+msgstr "Utubuto"
+
+#: rules/base.xml.in.h:42
+msgid "Apostrophe (') variant"
+msgstr ""
+
+#: rules/base.xml.in.h:43
+msgid "Ara"
+msgstr ""
+
+#: rules/base.xml.in.h:44
+msgid "Arabic"
+msgstr "Icyarabu"
+
+#: rules/base.xml.in.h:45
+msgid "Arm"
+msgstr ""
+
+#: rules/base.xml.in.h:46
+msgid "Armenia"
+msgstr "Arumeniya"
+
+#: rules/base.xml.in.h:47
+msgid "Aze"
+msgstr ""
+
+#: rules/base.xml.in.h:48
+msgid "Azerbaijan"
+msgstr "Azeribayijani"
+
+#: rules/base.xml.in.h:49
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:50
+msgid "BTC 5090"
+msgstr ""
+
+#: rules/base.xml.in.h:51
+msgid "BTC 5113RF Multimedia"
+msgstr ""
+
+#: rules/base.xml.in.h:52
+msgid "BTC 5126T"
+msgstr ""
+
+#: rules/base.xml.in.h:53
+msgid "BTC 9000"
+msgstr ""
+
+#: rules/base.xml.in.h:54
+msgid "BTC 9000A"
+msgstr ""
+
+#: rules/base.xml.in.h:55
+msgid "BTC 9001AH"
+msgstr ""
+
+#: rules/base.xml.in.h:56
+msgid "Bel"
+msgstr ""
+
+#: rules/base.xml.in.h:57
+msgid "Belarus"
+msgstr "Belarusi"
+
+#: rules/base.xml.in.h:58
+msgid "Belgium"
+msgstr "Ububiligi"
+
+#: rules/base.xml.in.h:59
+msgid "Ben"
+msgstr ""
+
+#: rules/base.xml.in.h:60
+msgid "Bengali"
+msgstr "Bengali"
+
+#: rules/base.xml.in.h:61
+msgid "Bgr"
+msgstr ""
+
+#: rules/base.xml.in.h:62
+msgid "Bih"
+msgstr ""
+
+#: rules/base.xml.in.h:63
+msgid "Blr"
+msgstr ""
+
+#: rules/base.xml.in.h:64
+msgid "Bosnia and Herzegovina"
+msgstr "Bosiniya na Herizegovina"
+
+#: rules/base.xml.in.h:65
+#, fuzzy
+msgid "Both Alt keys together change group."
+msgstr "Utubuto Guhindura>> Itsinda"
+
+#: rules/base.xml.in.h:66
+#, fuzzy
+msgid "Both Ctrl keys together change group."
+msgstr "Utubuto Guhindura>> Itsinda"
+
+#: rules/base.xml.in.h:67
+#, fuzzy
+msgid "Both Shift keys together change group."
+msgstr "Utubuto Guhindura>> Itsinda"
+
+#: rules/base.xml.in.h:68
+#, fuzzy
+msgid "Both Win-keys switch group while pressed."
+msgstr "Utubuto Hindura Itsinda"
+
+#: rules/base.xml.in.h:69
+msgid "Bra"
+msgstr ""
+
+#: rules/base.xml.in.h:70
+msgid "Brazil"
+msgstr "Burezile"
+
+#: rules/base.xml.in.h:71
+msgid "Brazilian ABNT2"
+msgstr ""
+
+#: rules/base.xml.in.h:72
+msgid "Brother Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:73
+msgid "Bulgaria"
+msgstr "Buligariya"
+
+#: rules/base.xml.in.h:74
+msgid "Can"
+msgstr ""
+
+#: rules/base.xml.in.h:75
+msgid "Canada"
+msgstr "Kanada"
+
+#: rules/base.xml.in.h:76
+#, fuzzy
+msgid "CapsLock LED shows alternative group."
+msgstr "Itsinda"
+
+#: rules/base.xml.in.h:77
+#, fuzzy
+msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
+msgstr "Nka Na:"
+
+#: rules/base.xml.in.h:78
+#, fuzzy
+msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
+msgstr "Nka Na: Kureka"
+
+#: rules/base.xml.in.h:79
+#, fuzzy
+msgid "CapsLock just locks the Shift modifier."
+msgstr "i"
+
+#: rules/base.xml.in.h:80
+#, fuzzy
+msgid "CapsLock key behavior"
+msgstr "Urufunguzo imyitwarire"
+
+#: rules/base.xml.in.h:81
+#, fuzzy
+msgid "CapsLock key changes group."
+msgstr "Urufunguzo Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:82
+#, fuzzy
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "Byose Utubuto"
+
+#: rules/base.xml.in.h:83
+#, fuzzy
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "Bisanzwe Bya Inyuguti"
+
+#: rules/base.xml.in.h:84
+#, fuzzy
+msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
+msgstr "By'imbere"
+
+#: rules/base.xml.in.h:85
+#, fuzzy
+msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
+msgstr "By'imbere Kureka"
+
+#: rules/base.xml.in.h:86
+msgid "Che"
+msgstr ""
+
+#: rules/base.xml.in.h:87
+msgid "Cherry Blue Line CyBo@rd"
+msgstr ""
+
+#: rules/base.xml.in.h:88
+#, fuzzy
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Ihitamo"
+
+#: rules/base.xml.in.h:89
+msgid "Chicony Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:90
+msgid "Chicony KB-9885"
+msgstr ""
+
+#: rules/base.xml.in.h:91
+msgid "CloGaelach"
+msgstr ""
+
+#: rules/base.xml.in.h:92
+msgid "CloGaelach Laptop"
+msgstr ""
+
+#: rules/base.xml.in.h:93
+msgid "Compaq Easy Access Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:94
+#, fuzzy
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Utubuto"
+
+#: rules/base.xml.in.h:95
+#, fuzzy
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Utubuto"
+
+#: rules/base.xml.in.h:96
+#, fuzzy
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "7 Utubuto"
+
+#: rules/base.xml.in.h:97
+msgid "Compaq iPaq Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:98
+msgid "Control Key Position"
+msgstr ""
+
+#: rules/base.xml.in.h:99
+#, fuzzy
+msgid "Control key at bottom left"
+msgstr "Urufunguzo ku Hasi: Ibumoso:"
+
+#: rules/base.xml.in.h:100
+#, fuzzy
+msgid "Control key at left of 'A'"
+msgstr "Urufunguzo ku Ibumoso: Bya"
+
+#: rules/base.xml.in.h:101
+#, fuzzy
+msgid "Control+Shift changes group."
+msgstr "Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:102
+msgid "Croatia"
+msgstr "Korowatiya"
+
+#: rules/base.xml.in.h:103
+msgid "Cyrillic"
+msgstr "Nyasilike"
+
+#: rules/base.xml.in.h:104
+msgid "Cze"
+msgstr ""
+
+#: rules/base.xml.in.h:105
+msgid "Czechia"
+msgstr ""
+
+#: rules/base.xml.in.h:106
+msgid "DTK2000"
+msgstr ""
+
+#: rules/base.xml.in.h:107
+msgid "Dead acute"
+msgstr ""
+
+#: rules/base.xml.in.h:108
+msgid "Dead grave acute"
+msgstr ""
+
+#: rules/base.xml.in.h:109
+msgid "Dell"
+msgstr ""
+
+#: rules/base.xml.in.h:110
+#, fuzzy
+msgid "Dell 101-key PC"
+msgstr "Urufunguzo"
+
+#: rules/base.xml.in.h:111
+msgid "Denmark"
+msgstr "Danimarike"
+
+#: rules/base.xml.in.h:112
+msgid "Deu"
+msgstr ""
+
+#: rules/base.xml.in.h:113
+msgid "Deva"
+msgstr ""
+
+#: rules/base.xml.in.h:114
+msgid "Devanagari"
+msgstr "Devanagari"
+
+#: rules/base.xml.in.h:115
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:116
+#, fuzzy
+msgid "Diamond 9801 / 9802 series"
+msgstr "Ibyiciro"
+
+#: rules/base.xml.in.h:117
+msgid "Dnk"
+msgstr ""
+
+#: rules/base.xml.in.h:118
+msgid "Dvorak"
+msgstr ""
+
+#: rules/base.xml.in.h:119
+#, fuzzy
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "ku Urufunguzo 1."
+
+#: rules/base.xml.in.h:120
+#, fuzzy
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "ku Urufunguzo"
+
+#: rules/base.xml.in.h:121
+msgid "Dzo"
+msgstr ""
+
+#: rules/base.xml.in.h:122
+msgid "Dzongkha"
+msgstr "Ikinyazongika"
+
+#: rules/base.xml.in.h:123
+#, fuzzy
+msgid "Eliminate dead keys"
+msgstr "Utubuto"
+
+#: rules/base.xml.in.h:124
+msgid "Ennyah DKB-1008"
+msgstr ""
+
+#: rules/base.xml.in.h:125
+msgid "Esp"
+msgstr ""
+
+#: rules/base.xml.in.h:126
+msgid "Est"
+msgstr ""
+
+#: rules/base.xml.in.h:127
+msgid "Estonia"
+msgstr "Esitoniya"
+
+#: rules/base.xml.in.h:128
+msgid "Everex STEPnote"
+msgstr ""
+
+#: rules/base.xml.in.h:129
+msgid "Extended"
+msgstr "cya/byagutse"
+
+#: rules/base.xml.in.h:130
+msgid "Extended Backslash"
+msgstr ""
+
+#: rules/base.xml.in.h:131
+#, fuzzy
+msgid "F-letter (F) variant"
+msgstr "Ibaruwa..."
+
+#: rules/base.xml.in.h:132
+msgid "Fao"
+msgstr ""
+
+#: rules/base.xml.in.h:133
+msgid "Faroe Islands"
+msgstr "Ibirwa bya Farowe"
+
+#: rules/base.xml.in.h:134
+msgid "Fin"
+msgstr ""
+
+#: rules/base.xml.in.h:135
+#, fuzzy
+msgid "Finish and Swedish"
+msgstr "Na"
+
+#: rules/base.xml.in.h:136
+msgid "Finland"
+msgstr "Finilande"
+
+#: rules/base.xml.in.h:137
+msgid "Fra"
+msgstr ""
+
+#: rules/base.xml.in.h:138
+msgid "France"
+msgstr "Ubufaransa"
+
+#: rules/base.xml.in.h:139
+msgid "French"
+msgstr "Igifaransa"
+
+#: rules/base.xml.in.h:140
+msgid "French (legacy)"
+msgstr ""
+
+#: rules/base.xml.in.h:141
+msgid "French Dvorak"
+msgstr ""
+
+#: rules/base.xml.in.h:142
+#, fuzzy
+msgid "French, Sun dead keys"
+msgstr "Utubuto"
+
+#: rules/base.xml.in.h:143
+#, fuzzy
+msgid "French, eliminate dead keys"
+msgstr "Utubuto"
+
+#: rules/base.xml.in.h:144
+msgid "GBr"
+msgstr ""
+
+#: rules/base.xml.in.h:145
+#, fuzzy
+msgid "Generic 101-key PC"
+msgstr "Urufunguzo"
+
+#: rules/base.xml.in.h:146
+#, fuzzy
+msgid "Generic 102-key (Intl) PC"
+msgstr "Urufunguzo"
+
+#: rules/base.xml.in.h:147
+#, fuzzy
+msgid "Generic 104-key PC"
+msgstr "Urufunguzo"
+
+#: rules/base.xml.in.h:148
+#, fuzzy
+msgid "Generic 105-key (Intl) PC"
+msgstr "Urufunguzo"
+
+#: rules/base.xml.in.h:149
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr ""
+
+#: rules/base.xml.in.h:150
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr ""
+
+#: rules/base.xml.in.h:151
+msgid "Geo"
+msgstr ""
+
+#: rules/base.xml.in.h:152
+msgid "Georgia"
+msgstr "Geworigiya"
+
+#: rules/base.xml.in.h:153
+#, fuzzy
+msgid "German, Sun dead keys"
+msgstr "Utubuto"
+
+#: rules/base.xml.in.h:154
+#, fuzzy
+msgid "German, eliminate dead keys"
+msgstr "Utubuto"
+
+#: rules/base.xml.in.h:155
+msgid "Germany"
+msgstr "Ubudage"
+
+#: rules/base.xml.in.h:156
+msgid "Gre"
+msgstr ""
+
+#: rules/base.xml.in.h:157
+msgid "Greece"
+msgstr "Ikigereki"
+
+#: rules/base.xml.in.h:158
+#, fuzzy
+msgid "Group Shift/Lock behavior"
+msgstr "imyitwarire"
+
+#: rules/base.xml.in.h:159
+msgid "Guj"
+msgstr ""
+
+#: rules/base.xml.in.h:160
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: rules/base.xml.in.h:161
+msgid "Gurmukhi"
+msgstr "Gurumuki"
+
+#: rules/base.xml.in.h:162
+msgid "Guru"
+msgstr ""
+
+#: rules/base.xml.in.h:163
+msgid "Gyration"
+msgstr ""
+
+#: rules/base.xml.in.h:164
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:165
+#, fuzzy
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "500"
+
+#: rules/base.xml.in.h:166
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr ""
+
+#: rules/base.xml.in.h:167
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr ""
+
+#: rules/base.xml.in.h:168
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr ""
+
+#: rules/base.xml.in.h:169
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr ""
+
+#: rules/base.xml.in.h:170
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr ""
+
+#: rules/base.xml.in.h:171
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr ""
+
+#: rules/base.xml.in.h:172
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:173
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:174
+msgid "Honeywell Euroboard"
+msgstr ""
+
+#: rules/base.xml.in.h:175
+msgid "Hrv"
+msgstr ""
+
+#: rules/base.xml.in.h:176
+msgid "Hun"
+msgstr ""
+
+#: rules/base.xml.in.h:177
+msgid "Hungary"
+msgstr "Hongiriya"
+
+#: rules/base.xml.in.h:178
+#, fuzzy
+msgid "Hyper is mapped to the Win-keys."
+msgstr "ni Kuri i Utubuto"
+
+#: rules/base.xml.in.h:179
+msgid "IBM Rapid Access"
+msgstr ""
+
+#: rules/base.xml.in.h:180
+msgid "IBM Rapid Access II"
+msgstr ""
+
+#: rules/base.xml.in.h:181
+#, fuzzy
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "Ihitamo"
+
+#: rules/base.xml.in.h:182
+#, fuzzy
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "600"
+
+#: rules/base.xml.in.h:183
+#, fuzzy
+msgid "INSCRIPT layout"
+msgstr "Imigaragarire"
+
+#: rules/base.xml.in.h:184
+msgid "IS434"
+msgstr ""
+
+#: rules/base.xml.in.h:185
+msgid "IS434 laptop"
+msgstr ""
+
+#: rules/base.xml.in.h:186
+msgid "ISO Alternate"
+msgstr ""
+
+#: rules/base.xml.in.h:187
+msgid "Iceland"
+msgstr "Isilande"
+
+#: rules/base.xml.in.h:188
+msgid "Iku"
+msgstr ""
+
+#: rules/base.xml.in.h:189
+#, fuzzy
+msgid "International (with dead keys)"
+msgstr "Na: Utubuto"
+
+#: rules/base.xml.in.h:190
+msgid "Inuktitut"
+msgstr "Ikinukititutu"
+
+#: rules/base.xml.in.h:191
+msgid "Iran"
+msgstr ""
+
+#: rules/base.xml.in.h:192
+msgid "Ireland"
+msgstr "Irilande"
+
+#: rules/base.xml.in.h:193
+msgid "Irl"
+msgstr ""
+
+#: rules/base.xml.in.h:194
+msgid "Irn"
+msgstr ""
+
+#: rules/base.xml.in.h:195
+msgid "Isl"
+msgstr ""
+
+#: rules/base.xml.in.h:196
+msgid "Isr"
+msgstr ""
+
+#: rules/base.xml.in.h:197
+msgid "Israel"
+msgstr "Isirayeli"
+
+#: rules/base.xml.in.h:198
+msgid "Ita"
+msgstr ""
+
+#: rules/base.xml.in.h:199
+msgid "Italy"
+msgstr "Ubutariyani"
+
+#: rules/base.xml.in.h:200
+msgid "Japan"
+msgstr "Ubuyapani"
+
+#: rules/base.xml.in.h:201
+#, fuzzy
+msgid "Japanese 106-key"
+msgstr "Urufunguzo"
+
+#: rules/base.xml.in.h:202
+msgid "Jpn"
+msgstr ""
+
+#: rules/base.xml.in.h:203
+msgid "Kan"
+msgstr ""
+
+#: rules/base.xml.in.h:204
+msgid "Kannada"
+msgstr "Kannada"
+
+#: rules/base.xml.in.h:205
+msgid "Keytronic FlexPro"
+msgstr ""
+
+#: rules/base.xml.in.h:206
+msgid "Kyr"
+msgstr ""
+
+#: rules/base.xml.in.h:207
+msgid "Kyrgyzstan"
+msgstr "Kirigizasitani"
+
+#: rules/base.xml.in.h:208
+msgid "LAm"
+msgstr ""
+
+#: rules/base.xml.in.h:209
+msgid "Lao"
+msgstr "Lawo"
+
+#: rules/base.xml.in.h:210
+msgid "Laos"
+msgstr ""
+
+#: rules/base.xml.in.h:211
+msgid "Laptop"
+msgstr ""
+
+#: rules/base.xml.in.h:212
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:213
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:214
+msgid "Laptop/notebook Dell Inspiron 8xxx"
+msgstr ""
+
+#: rules/base.xml.in.h:215
+msgid "Latin"
+msgstr "Ikiratini"
+
+#: rules/base.xml.in.h:216
+msgid "Latin American"
+msgstr ""
+
+#: rules/base.xml.in.h:217
+msgid "Latin Unicode"
+msgstr ""
+
+#: rules/base.xml.in.h:218
+msgid "Latin Unicode qwerty"
+msgstr ""
+
+#: rules/base.xml.in.h:219
+msgid "Latin qwerty"
+msgstr ""
+
+#: rules/base.xml.in.h:220
+#, fuzzy
+msgid "Latin with guillemots"
+msgstr "Na:"
+
+#: rules/base.xml.in.h:221
+msgid "Latvia"
+msgstr "Lativiya"
+
+#: rules/base.xml.in.h:222
+#, fuzzy
+msgid "Left Alt key changes group."
+msgstr "Urufunguzo Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:223
+#, fuzzy
+msgid "Left Alt key switches group while pressed."
+msgstr "Urufunguzo Itsinda"
+
+#: rules/base.xml.in.h:224
+#, fuzzy
+msgid "Left Ctrl key changes group."
+msgstr "Urufunguzo Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:225
+#, fuzzy
+msgid "Left Shift key changes group."
+msgstr "Urufunguzo Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:226
+#, fuzzy
+msgid "Left Win-key changes group."
+msgstr "Urufunguzo Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:227
+#, fuzzy
+msgid "Left Win-key switches group while pressed."
+msgstr "Urufunguzo Itsinda"
+
+#: rules/base.xml.in.h:228
+msgid "Lithuania"
+msgstr "Lituwaniya"
+
+#: rules/base.xml.in.h:229
+msgid "Logitech Access Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:230
+msgid "Logitech Cordless Desktop"
+msgstr ""
+
+#: rules/base.xml.in.h:231
+msgid "Logitech Cordless Desktop Navigator"
+msgstr ""
+
+#: rules/base.xml.in.h:232
+msgid "Logitech Cordless Desktop Optical"
+msgstr ""
+
+#: rules/base.xml.in.h:233
+msgid "Logitech Cordless Desktop Pro"
+msgstr ""
+
+#: rules/base.xml.in.h:234
+#, fuzzy
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Ihitamo"
+
+#: rules/base.xml.in.h:235
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr ""
+
+#: rules/base.xml.in.h:236
+msgid "Logitech Cordless Desktop iTouch"
+msgstr ""
+
+#: rules/base.xml.in.h:237
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr ""
+
+#: rules/base.xml.in.h:238
+msgid "Logitech Deluxe Access Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:239
+msgid "Logitech Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:240
+msgid "Logitech Internet Navigator Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:241
+msgid "Logitech iTouch"
+msgstr ""
+
+#: rules/base.xml.in.h:242
+#, fuzzy
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Urugero"
+
+#: rules/base.xml.in.h:243
+#, fuzzy
+msgid "Logitech iTouch keyboard Internet Navigator"
+msgstr "Mwandikisho"
+
+#: rules/base.xml.in.h:244
+msgid "Ltu"
+msgstr ""
+
+#: rules/base.xml.in.h:245
+msgid "Lva"
+msgstr ""
+
+#: rules/base.xml.in.h:246
+msgid "Macedonian"
+msgstr "Nyamasedoniya"
+
+#: rules/base.xml.in.h:247
+msgid "Macintosh"
+msgstr "masinitoshi"
+
+#: rules/base.xml.in.h:248
+msgid "Macintosh Old"
+msgstr ""
+
+#: rules/base.xml.in.h:249
+msgid "Make CapsLock an additional Control."
+msgstr ""
+
+#: rules/base.xml.in.h:250
+msgid "Mal"
+msgstr ""
+
+#: rules/base.xml.in.h:251
+msgid "Malayalam"
+msgstr "Malayalamu"
+
+#: rules/base.xml.in.h:252
+msgid "Malta"
+msgstr "Malita"
+
+#: rules/base.xml.in.h:253
+msgid "Mao"
+msgstr ""
+
+#: rules/base.xml.in.h:254
+msgid "Maori"
+msgstr "Ikimawori"
+
+#: rules/base.xml.in.h:255
+msgid "Memorex MX1998"
+msgstr ""
+
+#: rules/base.xml.in.h:256
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:257
+msgid "Memorex MX2750"
+msgstr ""
+
+#: rules/base.xml.in.h:258
+#, fuzzy
+msgid "Menu is Compose."
+msgstr "ni"
+
+#: rules/base.xml.in.h:259
+#, fuzzy
+msgid "Menu key changes group."
+msgstr "Urufunguzo Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:260
+#, fuzzy
+msgid "Meta is mapped to the Win-keys."
+msgstr "ni Kuri i Utubuto"
+
+#: rules/base.xml.in.h:261
+#, fuzzy
+msgid "Meta is mapped to the left Win-key."
+msgstr "ni Kuri i Ibumoso: Urufunguzo"
+
+#: rules/base.xml.in.h:262
+msgid "Microsoft Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:263
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr ""
+
+#: rules/base.xml.in.h:264
+msgid "Microsoft Natural"
+msgstr ""
+
+#: rules/base.xml.in.h:265
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr ""
+
+#: rules/base.xml.in.h:266
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr ""
+
+#: rules/base.xml.in.h:267
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr ""
+
+#: rules/base.xml.in.h:268
+msgid "Microsoft Office Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:269
+#, fuzzy
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "1."
+
+#: rules/base.xml.in.h:270
+#, fuzzy
+msgid "Miscellaneous compatibility options"
+msgstr "Bihuye neza Amahitamo"
+
+#: rules/base.xml.in.h:271
+msgid "Mkd"
+msgstr ""
+
+#: rules/base.xml.in.h:272
+msgid "Mlt"
+msgstr ""
+
+#: rules/base.xml.in.h:273
+msgid "Mmr"
+msgstr ""
+
+#: rules/base.xml.in.h:274
+msgid "Mng"
+msgstr ""
+
+#: rules/base.xml.in.h:275
+msgid "Mongolia"
+msgstr "Mongoliya"
+
+#: rules/base.xml.in.h:276
+msgid "Multilingual"
+msgstr ""
+
+#: rules/base.xml.in.h:277
+#, fuzzy
+msgid "Multilingual, second part"
+msgstr "ISEGONDA"
+
+#: rules/base.xml.in.h:278
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#: rules/base.xml.in.h:279
+msgid "Netherlands"
+msgstr "Nederilande"
+
+#: rules/base.xml.in.h:280
+msgid "Nld"
+msgstr ""
+
+#: rules/base.xml.in.h:281
+msgid "Nor"
+msgstr ""
+
+#: rules/base.xml.in.h:282
+msgid "Northern Saami"
+msgstr "Sami y'Amajyaruguru"
+
+#: rules/base.xml.in.h:283
+msgid "Northgate OmniKey 101"
+msgstr ""
+
+#: rules/base.xml.in.h:284
+msgid "Norway"
+msgstr "Noruveje"
+
+#: rules/base.xml.in.h:285
+#, fuzzy
+msgid "NumLock LED shows alternative group."
+msgstr "Itsinda"
+
+#: rules/base.xml.in.h:286
+msgid "Ogam"
+msgstr ""
+
+#: rules/base.xml.in.h:287
+msgid "Ogham"
+msgstr "Ogham"
+
+#: rules/base.xml.in.h:288
+#, fuzzy
+msgid "Oretec MCK-800 MM/Internet keyboard"
+msgstr "Mwandikisho"
+
+#: rules/base.xml.in.h:289
+msgid "Ori"
+msgstr ""
+
+#: rules/base.xml.in.h:290
+msgid "Oriya"
+msgstr "Oriya"
+
+#: rules/base.xml.in.h:291
+msgid "PC-98xx Series"
+msgstr ""
+
+#: rules/base.xml.in.h:292
+msgid "Pattachote"
+msgstr ""
+
+#: rules/base.xml.in.h:293
+#, fuzzy
+msgid "Phonetic"
+msgstr "Nyigamvugo:"
+
+#: rules/base.xml.in.h:294
+msgid "Pol"
+msgstr ""
+
+#: rules/base.xml.in.h:295
+msgid "Poland"
+msgstr "Polonye"
+
+#: rules/base.xml.in.h:296
+msgid "Polytonic"
+msgstr ""
+
+#: rules/base.xml.in.h:297
+msgid "Portugal"
+msgstr "Porutigali"
+
+#: rules/base.xml.in.h:298
+#, fuzzy
+msgid "PowerPC PS/2"
+msgstr "2."
+
+#: rules/base.xml.in.h:299
+#, fuzzy
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Urufunguzo Kuri Guhitamo urwego"
+
+#: rules/base.xml.in.h:300
+#, fuzzy
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Urufunguzo Kuri Guhitamo urwego"
+
+#: rules/base.xml.in.h:301
+#, fuzzy
+msgid "Press Menu key to choose 3rd level."
+msgstr "Urufunguzo Kuri Guhitamo urwego"
+
+#: rules/base.xml.in.h:302
+#, fuzzy
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Urufunguzo Kuri Guhitamo urwego"
+
+#: rules/base.xml.in.h:303
+#, fuzzy
+msgid "Press Right Control to choose 3rd level."
+msgstr "Kuri Guhitamo urwego"
+
+#: rules/base.xml.in.h:304
+#, fuzzy
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Urufunguzo Kuri Guhitamo urwego"
+
+#: rules/base.xml.in.h:305
+#, fuzzy
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Bya Utubuto Kuri Guhitamo urwego"
+
+#: rules/base.xml.in.h:306
+#, fuzzy
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Bya Utubuto Kuri Guhitamo urwego"
+
+#: rules/base.xml.in.h:307
+msgid "Probhat"
+msgstr ""
+
+#: rules/base.xml.in.h:308
+#, fuzzy
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "1000"
+
+#: rules/base.xml.in.h:309
+msgid "Prt"
+msgstr ""
+
+#: rules/base.xml.in.h:310
+msgid "QTronix Scorpius 98N+"
+msgstr ""
+
+#: rules/base.xml.in.h:311
+#, fuzzy
+msgid "R-Alt switches group while pressed."
+msgstr "Itsinda"
+
+#: rules/base.xml.in.h:312
+#, fuzzy
+msgid "Right Alt is Compose."
+msgstr "ni"
+
+#: rules/base.xml.in.h:313
+#, fuzzy
+msgid "Right Alt key changes group."
+msgstr "Urufunguzo Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:314
+#, fuzzy
+msgid "Right Control key works as Right Alt."
+msgstr "Urufunguzo Nka"
+
+#: rules/base.xml.in.h:315
+#, fuzzy
+msgid "Right Ctrl is Compose."
+msgstr "ni"
+
+#: rules/base.xml.in.h:316
+#, fuzzy
+msgid "Right Ctrl key changes group."
+msgstr "Urufunguzo Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:317
+#, fuzzy
+msgid "Right Ctrl key switches group while pressed."
+msgstr "Urufunguzo Itsinda"
+
+#: rules/base.xml.in.h:318
+#, fuzzy
+msgid "Right Shift key changes group."
+msgstr "Urufunguzo Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:319
+#, fuzzy
+msgid "Right Win-key changes group."
+msgstr "Urufunguzo Amahinduka Itsinda"
+
+#: rules/base.xml.in.h:320
+#, fuzzy
+msgid "Right Win-key is Compose."
+msgstr "Urufunguzo ni"
+
+#: rules/base.xml.in.h:321
+#, fuzzy
+msgid "Right Win-key switches group while pressed."
+msgstr "Urufunguzo Itsinda"
+
+#: rules/base.xml.in.h:322
+msgid "Romania"
+msgstr "Romaniya"
+
+#: rules/base.xml.in.h:323
+#, fuzzy
+msgid "Romanian keyboard with German letters"
+msgstr "Mwandikisho Na:"
+
+#: rules/base.xml.in.h:324
+#, fuzzy
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Mwandikisho Na: Utubuto"
+
+#: rules/base.xml.in.h:325
+msgid "Rou"
+msgstr ""
+
+#: rules/base.xml.in.h:326
+msgid "Rus"
+msgstr ""
+
+#: rules/base.xml.in.h:327
+msgid "Russia"
+msgstr ""
+
+#: rules/base.xml.in.h:328
+msgid "Russian"
+msgstr "Ikirusiya"
+
+#: rules/base.xml.in.h:329
+msgid "SK-1300"
+msgstr ""
+
+#: rules/base.xml.in.h:330
+msgid "SK-2500"
+msgstr ""
+
+#: rules/base.xml.in.h:331
+msgid "SK-6200"
+msgstr ""
+
+#: rules/base.xml.in.h:332
+msgid "SK-7100"
+msgstr ""
+
+#: rules/base.xml.in.h:333
+msgid "SVEN Ergonomic 2500"
+msgstr ""
+
+#: rules/base.xml.in.h:334
+msgid "Samsung SDM 4500P"
+msgstr ""
+
+#: rules/base.xml.in.h:335
+msgid "Samsung SDM 4510P"
+msgstr ""
+
+#: rules/base.xml.in.h:336
+#, fuzzy
+msgid "ScrollLock LED shows alternative group."
+msgstr "Itsinda"
+
+#: rules/base.xml.in.h:337
+msgid "Serbian"
+msgstr "Ikinyaseribiya"
+
+#: rules/base.xml.in.h:338
+#, fuzzy
+msgid "Shift with numpad keys works as in MS Windows."
+msgstr "Na: Utubuto Nka in"
+
+#: rules/base.xml.in.h:339
+#, fuzzy
+msgid "Shift+CapsLock changes group."
+msgstr "Amahinduka Itsinda"
+
+# sc/source\core\src\compiler.src:RID_SC_FUNCTION_NAMES.SC_OPCODE_SIN.text
+#: rules/base.xml.in.h:340
+#, fuzzy
+msgid "Sin"
+msgstr "SIN"
+
+#: rules/base.xml.in.h:341
+msgid "Sinhala"
+msgstr "Sinhala"
+
+#: rules/base.xml.in.h:342
+msgid "Slovakia"
+msgstr "Silovakiya"
+
+#: rules/base.xml.in.h:343
+msgid "Slovenia"
+msgstr "Siloveniya"
+
+#: rules/base.xml.in.h:344
+msgid "Smi"
+msgstr ""
+
+#: rules/base.xml.in.h:345
+msgid "Spain"
+msgstr "Esipanye"
+
+#: rules/base.xml.in.h:346
+#, fuzzy
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Utubuto in a Seriveri"
+
+#: rules/base.xml.in.h:347
+msgid "Srp"
+msgstr ""
+
+#: rules/base.xml.in.h:348
+msgid "Standard"
+msgstr "gisanzwe/kimenyerewe"
+
+#: rules/base.xml.in.h:349
+#, fuzzy
+msgid "Sun dead keys"
+msgstr "Utubuto"
+
+#: rules/base.xml.in.h:350
+msgid "Super Power Multimedia Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:351
+#, fuzzy
+msgid "Super is mapped to the Win-keys (default)."
+msgstr "ni Kuri i Utubuto Mburabuzi"
+
+#: rules/base.xml.in.h:352
+msgid "Svk"
+msgstr ""
+
+#: rules/base.xml.in.h:353
+msgid "Svn"
+msgstr ""
+
+#: rules/base.xml.in.h:354
+#, fuzzy
+msgid "Swap Control and CapsLock."
+msgstr "Na"
+
+#: rules/base.xml.in.h:355
+msgid "Swe"
+msgstr ""
+
+#: rules/base.xml.in.h:356
+msgid "Sweden"
+msgstr "Suwede"
+
+#: rules/base.xml.in.h:357
+msgid "Switzerland"
+msgstr "Ubusuwisi"
+
+#: rules/base.xml.in.h:358
+msgid "Symplon PaceBook (tablet PC)"
+msgstr ""
+
+#: rules/base.xml.in.h:359
+msgid "Syr"
+msgstr ""
+
+#: rules/base.xml.in.h:360
+msgid "Syriac"
+msgstr "Syriac"
+
+#: rules/base.xml.in.h:361
+msgid "TIS-820.2538"
+msgstr ""
+
+#: rules/base.xml.in.h:362
+msgid "Tajikistan"
+msgstr "Tajikisitani"
+
+#: rules/base.xml.in.h:363
+msgid "Tam"
+msgstr ""
+
+#: rules/base.xml.in.h:364
+msgid "Tamil"
+msgstr "Tamili"
+
+# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
+# sw/source\ui\wizard\wizbmp.src:STR_GoF_AbsTelefon.text
+# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
+# sw/source\ui\wizard\wizbmp.src:STR_GoF_EmpTelefon.text
+# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
+# sw/source\ui\wizard\wizbmp.src:STR_Usr_TelePrivat.text
+# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
+# sw/source\ui\wizard\wizbmp.src:STR_Usr_TeleDienst.text
+#: rules/base.xml.in.h:365
+#, fuzzy
+msgid "Tel"
+msgstr "Telefoni:"
+
+#: rules/base.xml.in.h:366
+msgid "Telugu"
+msgstr "Tegulu"
+
+#: rules/base.xml.in.h:367
+msgid "Tha"
+msgstr ""
+
+#: rules/base.xml.in.h:368
+msgid "Thailand"
+msgstr "Tayilande"
+
+#: rules/base.xml.in.h:369
+#, fuzzy
+msgid "Third level choosers"
+msgstr "urwego"
+
+#: rules/base.xml.in.h:370
+msgid "Tilde (~) variant"
+msgstr ""
+
+#: rules/base.xml.in.h:371
+msgid "Tjk"
+msgstr ""
+
+#: rules/base.xml.in.h:372
+msgid "Toshiba Satellite S3000"
+msgstr ""
+
+#: rules/base.xml.in.h:373
+msgid "Trust Direct Access Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:374
+msgid "Trust Wireless Keyboard Classic"
+msgstr ""
+
+#: rules/base.xml.in.h:375
+msgid "Tur"
+msgstr ""
+
+#: rules/base.xml.in.h:376
+msgid "Turkish"
+msgstr "Ikinyaturukiya"
+
+#: rules/base.xml.in.h:377
+#, fuzzy
+msgid "Typewrite-style keymap; TAB encoding"
+msgstr "IMISUSIRE Imisobekere:"
+
+#: rules/base.xml.in.h:378
+#, fuzzy
+msgid "Typewrite-style keymap; Unicode encoding"
+msgstr "IMISUSIRE Imisobekere:"
+
+#: rules/base.xml.in.h:379
+#, fuzzy
+msgid "U.S. English"
+msgstr "U."
+
+#: rules/base.xml.in.h:380
+#, fuzzy
+msgid "US keyboard with Croatian letters"
+msgstr "Mwandikisho Na:"
+
+#: rules/base.xml.in.h:381
+#, fuzzy
+msgid "US keyboard with Lithuanian letters"
+msgstr "Mwandikisho Na:"
+
+#: rules/base.xml.in.h:382
+#, fuzzy
+msgid "US keyboard with Maltian letters"
+msgstr "Mwandikisho Na:"
+
+#: rules/base.xml.in.h:383
+#, fuzzy
+msgid "US keyboard with Romanian letters"
+msgstr "Mwandikisho Na:"
+
+#: rules/base.xml.in.h:384
+msgid "USA"
+msgstr "Amerika"
+
+#: rules/base.xml.in.h:385
+msgid "Ukr"
+msgstr ""
+
+#: rules/base.xml.in.h:386
+msgid "Ukraine"
+msgstr "Ikerene"
+
+#. RSTU 2019-91
+#: rules/base.xml.in.h:388
+#, fuzzy
+msgid "Ukrainian standard RSTU"
+msgstr "Bisanzwe"
+
+#: rules/base.xml.in.h:389
+msgid "UnicodeExpert"
+msgstr ""
+
+#: rules/base.xml.in.h:390
+msgid "United Kingdom"
+msgstr "Ubwongereza (UK)"
+
+#: rules/base.xml.in.h:391
+msgid "Urd"
+msgstr ""
+
+#: rules/base.xml.in.h:392
+msgid "Urdu"
+msgstr "Urudu"
+
+#: rules/base.xml.in.h:393
+#, fuzzy
+msgid "Use keyboard LED to show alternative group."
+msgstr "Mwandikisho Kuri Garagaza Itsinda"
+
+#: rules/base.xml.in.h:394
+msgid "Uzb"
+msgstr ""
+
+#: rules/base.xml.in.h:395
+msgid "Uzbekistan"
+msgstr "Uzubekisitani"
+
+# setup2/source\ui\pages\paddr.src:RESID_PAGE_PAGEADDRESS.LB_COUNTRY.121.text
+#: rules/base.xml.in.h:396
+msgid "Vietnam"
+msgstr "Viyetinamu"
+
+#: rules/base.xml.in.h:397
+msgid "Vnm"
+msgstr ""
+
+#: rules/base.xml.in.h:398
+msgid "Winbook Model XP5"
+msgstr ""
+
+#: rules/base.xml.in.h:399
+msgid "Winkeys"
+msgstr ""
+
+#: rules/base.xml.in.h:400
+#, fuzzy
+msgid "With &lt;\\|&gt; key"
+msgstr "Urufunguzo"
+
+#: rules/base.xml.in.h:401
+msgid "With Malayalam digits"
+msgstr ""
+
+#: rules/base.xml.in.h:402
+msgid "With guillemots"
+msgstr ""
+
+#: rules/base.xml.in.h:403
+msgid "Yahoo! Internet Keyboard"
+msgstr ""
+
+#: rules/base.xml.in.h:404
+#, fuzzy
+msgid "Z and ZHE swapped"
+msgstr "Na"
+
+#: rules/base.xml.in.h:405
+msgid "azerty"
+msgstr ""
+
+#: rules/base.xml.in.h:406
+msgid "azerty/digits"
+msgstr ""
+
+#: rules/base.xml.in.h:407
+msgid "digits"
+msgstr ""
+
+#: rules/base.xml.in.h:408
+msgid "lyx"
+msgstr ""
+
+#: rules/base.xml.in.h:409
+msgid "qwerty"
+msgstr ""
+
+#: rules/base.xml.in.h:410
+#, fuzzy
+msgid "qwerty, extended Backslash"
+msgstr "Byongerewe..."
+
+#: rules/base.xml.in.h:411
+msgid "qwerty/digits"
+msgstr ""
+
+#: rules/base.xml.in.h:412
+msgid "qwertz"
+msgstr ""
+
+#: rules/base.xml.in.h:413
+msgid "si1452"
+msgstr ""
diff --git a/xorg-server/xkeyboard-config/po/sk.po b/xorg-server/xkeyboard-config/po/sk.po
index fe53d5b61..140a700f9 100644
--- a/xorg-server/xkeyboard-config/po/sk.po
+++ b/xorg-server/xkeyboard-config/po/sk.po
@@ -1,2781 +1,2781 @@
-# Slovak translation of xkeyboard-config
-# Copyright (C) 2003 Free Software Foundation
-# Zdenko Podobný <zdpo@mailbox.sk>, 2003.
-# Ivan Masár <helix84@centrum.sk>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: xkeyboard-config 1.0-pre1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-28 15:21+0100\n"
-"PO-Revision-Date: 2007-09-04 22:49+0100\n"
-"Last-Translator: Zdenko Podobný <zdpo@mailbox.sk>\n"
-"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.2beta3\n"
-
-#: ../rules/base.xml.in.h:1
-msgid "(F)"
-msgstr "(F)"
-
-#: ../rules/base.xml.in.h:2
-msgid "(Legacy) Alternative"
-msgstr "(Zastaralé) alternatívne"
-
-#: ../rules/base.xml.in.h:3
-msgid "(Legacy) Alternative, Sun dead keys"
-msgstr "(Zastaralé) alternatívne, s mŕtvymi klávesmi Sun"
-
-#: ../rules/base.xml.in.h:4
-msgid "(Legacy) Alternative, eliminate dead keys"
-msgstr "(Zastaralé) alternatívne, eliminovať mŕtve klávesy"
-
-#: ../rules/base.xml.in.h:5
-msgid "(Legacy) Dvorak"
-msgstr "(Zastaralé) dvorak"
-
-#: ../rules/base.xml.in.h:6
-msgid "101/104 key Compatible"
-msgstr "Kompatibilná s 101/104 klávesami"
-
-#: ../rules/base.xml.in.h:7 ../rules/sun.xml.in.h:2
-msgid "101/qwerty/comma/Dead keys"
-msgstr "101/qwerty/čiarka/mŕtve klávesy"
-
-#: ../rules/base.xml.in.h:8 ../rules/sun.xml.in.h:3
-msgid "101/qwerty/comma/Eliminate dead keys"
-msgstr "101/qwerty/čiarka/eliminovať mŕtve klávesy"
-
-#: ../rules/base.xml.in.h:9 ../rules/sun.xml.in.h:4
-msgid "101/qwerty/dot/Dead keys"
-msgstr "101/qwerty/bodka/mŕtve klávesy"
-
-#: ../rules/base.xml.in.h:10 ../rules/sun.xml.in.h:5
-msgid "101/qwerty/dot/Eliminate dead keys"
-msgstr "101/qwerty/bodka/eliminovať mŕtve klávesy"
-
-#: ../rules/base.xml.in.h:11 ../rules/sun.xml.in.h:6
-msgid "101/qwertz/comma/Dead keys"
-msgstr "101/qwertz/čiarka/mŕtve klávesy"
-
-#: ../rules/base.xml.in.h:12
-msgid "101/qwertz/comma/Eliminate dead keys"
-msgstr "101/qwertz/čiarka/eliminovať mŕtve klávesy"
-
-#: ../rules/base.xml.in.h:13 ../rules/sun.xml.in.h:7
-msgid "101/qwertz/dot/Dead keys"
-msgstr "101/qwertz/bodka/mŕtve klávesy"
-
-#: ../rules/base.xml.in.h:14 ../rules/sun.xml.in.h:8
-msgid "101/qwertz/dot/Eliminate dead keys"
-msgstr "101/qwertz/bodka/eliminovať mŕtve klávesy"
-
-#: ../rules/base.xml.in.h:15 ../rules/sun.xml.in.h:9
-msgid "102/qwerty/comma/Dead keys"
-msgstr "102/qwerty/čiarka/mŕtve klávesy"
-
-#: ../rules/base.xml.in.h:16 ../rules/sun.xml.in.h:10
-msgid "102/qwerty/comma/Eliminate dead keys"
-msgstr "102/qwerty/čiarka/eliminovať mŕtve klávesy"
-
-#: ../rules/base.xml.in.h:17 ../rules/sun.xml.in.h:11
-msgid "102/qwerty/dot/Dead keys"
-msgstr "102/qwerty/bodka/mŕtve klávesy"
-
-#: ../rules/base.xml.in.h:18 ../rules/sun.xml.in.h:12
-msgid "102/qwerty/dot/Eliminate dead keys"
-msgstr "102/qwerty/bodka/eliminovať mŕtve klávesy"
-
-#: ../rules/base.xml.in.h:19 ../rules/sun.xml.in.h:13
-msgid "102/qwertz/comma/Dead keys"
-msgstr "102/qwertz/čiarka/mŕtve klávesy"
-
-#: ../rules/base.xml.in.h:20 ../rules/sun.xml.in.h:14
-msgid "102/qwertz/comma/Eliminate dead keys"
-msgstr "102/qwertz/čiarka/eliminovať mŕtve klávesy"
-
-#: ../rules/base.xml.in.h:21 ../rules/sun.xml.in.h:15
-msgid "102/qwertz/dot/Dead keys"
-msgstr "102/qwertz/bodka/mŕtve klávesy"
-
-#: ../rules/base.xml.in.h:22 ../rules/sun.xml.in.h:16
-msgid "102/qwertz/dot/Eliminate dead keys"
-msgstr "102/qwertz/bodka/eliminovať mŕtve klávesy"
-
-#: ../rules/base.xml.in.h:23
-msgid "A4Tech KB-21"
-msgstr "A4Tech KB-21"
-
-#: ../rules/base.xml.in.h:24
-msgid "A4Tech KBS-8"
-msgstr "A4Tech KBS-8"
-
-#: ../rules/base.xml.in.h:25
-msgid "A4Tech Wireless Desktop RFKB-23"
-msgstr "A4Tech Wireless Desktop RFKB-23"
-
-#: ../rules/base.xml.in.h:26
-msgid "ACPI Standard"
-msgstr "Štandard ACPI"
-
-# gruzínske rozloženie
-#: ../rules/base.xml.in.h:27
-msgid "AZERTY Tskapo"
-msgstr "AZERTY Tskapo"
-
-#: ../rules/base.xml.in.h:28
-msgid "Acer AirKey V"
-msgstr "Acer AirKey V"
-
-#: ../rules/base.xml.in.h:29
-msgid "Acer C300"
-msgstr "Acer C300"
-
-#: ../rules/base.xml.in.h:30
-msgid "Acer Ferrari 4000"
-msgstr "Acer Ferrari 4000"
-
-#: ../rules/base.xml.in.h:31
-msgid "Acer TravelMate 800"
-msgstr "Acer TravelMate 800"
-
-#: ../rules/base.xml.in.h:32
-msgid "Add the EuroSign to the 2 key."
-msgstr "Pridať znak euro na kláves 2."
-
-#: ../rules/base.xml.in.h:33
-msgid "Add the EuroSign to the 5 key."
-msgstr "Pridať znak euro na kláves 5."
-
-#: ../rules/base.xml.in.h:34
-msgid "Add the EuroSign to the E key."
-msgstr "Pridať znak euro na kláves E."
-
-#: ../rules/base.xml.in.h:35
-msgid "Add the standard behavior to Menu key."
-msgstr "Pridať štandardné chovanie klávesu Ponuka."
-
-#: ../rules/base.xml.in.h:36
-msgid "Adding the EuroSign to certain keys"
-msgstr "Pridať znak euro na isté klávesy."
-
-#: ../rules/base.xml.in.h:37
-msgid "Advance Scorpius KI"
-msgstr "Advance Scorpius KI"
-
-#: ../rules/base.xml.in.h:38
-msgid "Afg"
-msgstr "Afg"
-
-#: ../rules/base.xml.in.h:39
-msgid "Afghanistan"
-msgstr "Afganistan"
-
-#: ../rules/base.xml.in.h:40
-msgid "Akan"
-msgstr "Akan"
-
-#: ../rules/base.xml.in.h:41
-msgid "Alb"
-msgstr "Alb"
-
-#: ../rules/base.xml.in.h:42
-msgid "Albania"
-msgstr "Albánsko"
-
-#: ../rules/base.xml.in.h:43
-msgid "Alt and Meta are on the Alt keys."
-msgstr "Alt a Meta sú na klávesoch Alt."
-
-#: ../rules/base.xml.in.h:44
-msgid "Alt is mapped to the right Win-key and Super to Menu."
-msgstr "Meta je mapovaný na pravý kláves Win a Super na Ponuku."
-
-#: ../rules/base.xml.in.h:45
-msgid "Alt+CapsLock changes layout."
-msgstr "Alt+Caps Lock mení rozloženie."
-
-#: ../rules/base.xml.in.h:46
-msgid "Alt+Ctrl change layout."
-msgstr "Alt+Control mení rozloženie."
-
-#: ../rules/base.xml.in.h:47
-msgid "Alt+Shift change layout."
-msgstr "Alt+Shift mení rozloženie."
-
-#: ../rules/base.xml.in.h:48
-msgid "Alt-Q"
-msgstr "Alt-Q"
-
-#: ../rules/base.xml.in.h:49
-msgid "Alt/Win key behavior"
-msgstr "Chovanie klávesu Alt/Win"
-
-#: ../rules/base.xml.in.h:50
-msgid "Alternative"
-msgstr "alternatívne"
-
-#: ../rules/base.xml.in.h:51
-msgid "Alternative Eastern"
-msgstr "alternatívne východné"
-
-#: ../rules/base.xml.in.h:52
-msgid "Alternative Phonetic"
-msgstr "alternatívne fonetické"
-
-#: ../rules/base.xml.in.h:53
-msgid "Alternative international (former us_intl)"
-msgstr "alternatívne medzinárodné (býv. us_intl)"
-
-#: ../rules/base.xml.in.h:54
-msgid "Alternative, Sun dead keys"
-msgstr "alternatívne, mŕtve klávesy Sun"
-
-#: ../rules/base.xml.in.h:55
-msgid "Alternative, eliminate dead keys"
-msgstr "alternatívne, eliminovať mŕtve klávesy"
-
-#: ../rules/base.xml.in.h:56
-msgid "Alternative, latin-9 only"
-msgstr "alternatívne, iba latin-9"
-
-#: ../rules/base.xml.in.h:57
-msgid "And"
-msgstr "And"
-
-#: ../rules/base.xml.in.h:58
-msgid "Andorra"
-msgstr "Andorra"
-
-#: ../rules/base.xml.in.h:59
-msgid "Apostrophe (') variant"
-msgstr "Variant (') apostrof"
-
-#: ../rules/base.xml.in.h:60
-msgid "Apple"
-msgstr "Apple"
-
-#: ../rules/base.xml.in.h:61
-msgid "Apple Laptop"
-msgstr "Apple laptop"
-
-#: ../rules/base.xml.in.h:62
-msgid "Ara"
-msgstr "Ara"
-
-#: ../rules/base.xml.in.h:63
-msgid "Arabic"
-msgstr "Arabsky"
-
-#: ../rules/base.xml.in.h:64
-msgid "Arm"
-msgstr "Arm"
-
-#: ../rules/base.xml.in.h:65
-msgid "Armenia"
-msgstr "Arménsko"
-
-#: ../rules/base.xml.in.h:66
-msgid "Aze"
-msgstr "Aze"
-
-#: ../rules/base.xml.in.h:67
-msgid "Azerbaijan"
-msgstr "Azerbajdžan"
-
-#: ../rules/base.xml.in.h:68
-msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr "Azona RF2300 bezdrôtová internetová klávesnica"
-
-#: ../rules/base.xml.in.h:69
-msgid "BTC 5090"
-msgstr "BTC 5090"
-
-#: ../rules/base.xml.in.h:70
-msgid "BTC 5113RF Multimedia"
-msgstr "BTC 5113RF Multimedia"
-
-#: ../rules/base.xml.in.h:71
-msgid "BTC 5126T"
-msgstr "BTC 5126T"
-
-#: ../rules/base.xml.in.h:72
-msgid "BTC 9000"
-msgstr "BTC 9000"
-
-#: ../rules/base.xml.in.h:73
-msgid "BTC 9000A"
-msgstr "BTC 9000A"
-
-#: ../rules/base.xml.in.h:74
-msgid "BTC 9001AH"
-msgstr "BTC 9001AH"
-
-#: ../rules/base.xml.in.h:75
-msgid "BTC 9019U"
-msgstr "BTC 9019U"
-
-#: ../rules/base.xml.in.h:76
-msgid "Ban"
-msgstr "Ban"
-
-#: ../rules/base.xml.in.h:77
-msgid "Bangladesh"
-msgstr "Bangladéš"
-
-#: ../rules/base.xml.in.h:78 ../rules/sun.xml.in.h:22
-msgid "Bel"
-msgstr "Bel"
-
-#: ../rules/base.xml.in.h:79
-msgid "Belarus"
-msgstr "Bielorusko"
-
-#: ../rules/base.xml.in.h:80
-msgid "Belgium"
-msgstr "Belgicko"
-
-#: ../rules/base.xml.in.h:81
-msgid "BenQ X-Touch 730"
-msgstr "BenQ X-Touch 730"
-
-#: ../rules/base.xml.in.h:82
-msgid "BenQ X-Touch 800"
-msgstr "BenQ X-Touch 800"
-
-#: ../rules/base.xml.in.h:83
-msgid "Bengali"
-msgstr "Bengálska"
-
-#: ../rules/base.xml.in.h:84
-msgid "Bengali Probhat"
-msgstr "Bengálsky Probhat"
-
-#: ../rules/base.xml.in.h:85
-msgid "Bepo, ergonomic, Dvorak way"
-msgstr "Bepo, ergonomické, na spôsob Dvorak"
-
-#: ../rules/base.xml.in.h:86
-msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
-msgstr "Bepo, ergonomické, na spôsob Dvorak, iba latin-9"
-
-#: ../rules/base.xml.in.h:87 ../rules/sun.xml.in.h:24
-msgid "Bgr"
-msgstr "Bgr"
-
-#: ../rules/base.xml.in.h:88
-msgid "Bhu"
-msgstr "Bhu"
-
-#: ../rules/base.xml.in.h:89
-msgid "Bhutan"
-msgstr "Bhután"
-
-#: ../rules/base.xml.in.h:90
-msgid "Biblical Hebrew (Tiro)"
-msgstr "biblická hebrejčina (Tiro)"
-
-#: ../rules/base.xml.in.h:91
-msgid "Bih"
-msgstr "Bih"
-
-#: ../rules/base.xml.in.h:92
-msgid "Blr"
-msgstr "Blr"
-
-#: ../rules/base.xml.in.h:93
-msgid "Bosnia and Herzegovina"
-msgstr "Bosna a Hercegovina"
-
-#: ../rules/base.xml.in.h:94
-msgid "Both Alt keys together change layout."
-msgstr "Oba klávesy Alt spolu menia rozloženie."
-
-#: ../rules/base.xml.in.h:95
-msgid "Both Ctrl keys together change layout."
-msgstr "Oba klávesy Ctrl spolu menia rozloženie."
-
-#: ../rules/base.xml.in.h:96
-msgid "Both Shift keys together change layout."
-msgstr "Oba klávesy Shift spolu menia rozloženie."
-
-#: ../rules/base.xml.in.h:97
-msgid "Both Win-keys switch layout while pressed."
-msgstr "Oba klávesy Win spolu menia rozloženie."
-
-#: ../rules/base.xml.in.h:98
-msgid "Bra"
-msgstr "Bra"
-
-#: ../rules/base.xml.in.h:99
-msgid "Braille"
-msgstr "Brailleovo"
-
-#: ../rules/base.xml.in.h:100
-msgid "Brazil"
-msgstr "Brazília"
-
-#: ../rules/base.xml.in.h:101
-msgid "Brazilian ABNT2"
-msgstr "Brazílska ABNT2"
-
-#: ../rules/base.xml.in.h:102
-msgid "Brl"
-msgstr "Brl"
-
-#: ../rules/base.xml.in.h:103
-msgid "Brother Internet Keyboard"
-msgstr "Brother Internet Keyboard"
-
-#: ../rules/base.xml.in.h:104
-msgid "Buckwalter"
-msgstr "Buckwalter (transliterácia arabčiny)"
-
-#: ../rules/base.xml.in.h:105
-msgid "Bulgaria"
-msgstr "Bulharsko"
-
-#: ../rules/base.xml.in.h:106
-msgid "Cambodia"
-msgstr "Kambodža"
-
-#: ../rules/base.xml.in.h:107 ../rules/sun.xml.in.h:29
-msgid "Can"
-msgstr "Can"
-
-#: ../rules/base.xml.in.h:108
-msgid "Canada"
-msgstr "Kanada"
-
-#: ../rules/base.xml.in.h:109
-msgid "Caps Lock is Compose."
-msgstr "Caps Lock je Compose."
-
-#: ../rules/base.xml.in.h:110
-msgid "CapsLock LED shows alternative layout."
-msgstr "Caps Lock LED zobrazuje alternatívne rozloženie."
-
-#: ../rules/base.xml.in.h:111
-msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
-msgstr "Caps Lock funguje ako Shift s uzamknutím. Shift „pozastaví“ Caps Lock."
-
-#: ../rules/base.xml.in.h:112
-msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
-msgstr "Caps Lock funguje ako Shift s uzamknutím. Shift neovplyvňuje Caps Lock."
-
-#: ../rules/base.xml.in.h:113
-msgid "CapsLock just locks the Shift modifier."
-msgstr "CapsLock iba zamkne modifikátor Shift."
-
-#: ../rules/base.xml.in.h:114 ../rules/sun.xml.in.h:33
-msgid "CapsLock key behavior"
-msgstr "Správanie klávesu Caps Lock"
-
-#: ../rules/base.xml.in.h:115
-msgid "CapsLock key changes layout."
-msgstr "Kláves Caps Lock mení rozloženie."
-
-#: ../rules/base.xml.in.h:116
-msgid "CapsLock toggles Shift so all keys are affected."
-msgstr "Caps Lock prepne Shift, čím ovplyvní všetky klávesy."
-
-#: ../rules/base.xml.in.h:117
-msgid "CapsLock toggles normal capitalization of alphabetic characters."
-msgstr "Caps Lock prepne nermálnu kapitalizáciu abecedných znakov."
-
-#: ../rules/base.xml.in.h:118
-msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
-msgstr "Caps Lock používa interný prevod na kapitálky. Shift „pozastaví“ Caps Lock."
-
-#: ../rules/base.xml.in.h:119
-msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
-msgstr "Caps Lock používa interný prevod na kapitálky. Shift neovplyvňuje Caps Lock."
-
-#: ../rules/base.xml.in.h:120
-msgid "Catalan variant with middle-dot L"
-msgstr "Katalánsky variant s L s bodkou v strede"
-
-#: ../rules/base.xml.in.h:121
-msgid "Che"
-msgstr "Che"
-
-#: ../rules/base.xml.in.h:122
-msgid "Cherry Blue Line CyBo@rd"
-msgstr "Cherry Blue Line CyBo@rd"
-
-#: ../rules/base.xml.in.h:123
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr "Cherry Blue Line CyBo@rd (alternatívna voľba)"
-
-#: ../rules/base.xml.in.h:124
-msgid "Cherry CyBo@rd USB-Hub"
-msgstr "Cherry CyBo@rd USB-Hub"
-
-#: ../rules/base.xml.in.h:125
-msgid "Cherry CyMotion Master Linux"
-msgstr "Cherry CyMotion Master Linux"
-
-#: ../rules/base.xml.in.h:126
-msgid "Cherry CyMotion Master XPress"
-msgstr "Cherry CyMotion Master XPress"
-
-#: ../rules/base.xml.in.h:127
-msgid "Chicony Internet Keyboard"
-msgstr "Chicony Internet Keyboard"
-
-#: ../rules/base.xml.in.h:128
-msgid "Chicony KB-9885"
-msgstr "Chicony KB-9885"
-
-#: ../rules/base.xml.in.h:129
-msgid "Chuvash"
-msgstr "Čuvašské"
-
-#: ../rules/base.xml.in.h:130
-msgid "Chuvash Latin"
-msgstr "Čuvašské latin"
-
-#: ../rules/base.xml.in.h:131
-msgid "Classic Dvorak"
-msgstr "Klasické dvorak"
-
-#: ../rules/base.xml.in.h:132
-msgid "CloGaelach"
-msgstr "CloGaelach"
-
-#: ../rules/base.xml.in.h:133
-msgid "Compaq Easy Access Keyboard"
-msgstr "Compaq Easy Access Keyboard"
-
-#: ../rules/base.xml.in.h:134
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr "Compaq Internet Keyboard (13 kláves)"
-
-#: ../rules/base.xml.in.h:135
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr "Compaq Internet Keyboard (18 kláves)"
-
-#: ../rules/base.xml.in.h:136
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr "Compaq Internet Keyboard (7 kláves)"
-
-#: ../rules/base.xml.in.h:137
-msgid "Compaq iPaq Keyboard"
-msgstr "Compaq iPaq Keyboard"
-
-#: ../rules/base.xml.in.h:138
-msgid "Compose key position"
-msgstr "Pozícia klávesu Compose"
-
-#: ../rules/base.xml.in.h:139
-msgid "Congo, Democratic Republic of the"
-msgstr "Konžská demokratická republika"
-
-#: ../rules/base.xml.in.h:140
-msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
-msgstr "Control je mapovaný na klávesy Win (a zvyčajné klávesy Ctrl)."
-
-#: ../rules/base.xml.in.h:141
-msgid "Croatia"
-msgstr "Chorvátsko"
-
-#: ../rules/base.xml.in.h:142
-msgid "Ctrl key at bottom left"
-msgstr "Kláves Ctrl vľavo dole"
-
-#: ../rules/base.xml.in.h:143
-msgid "Ctrl key at left of 'A'"
-msgstr "Kláves Ctrl naľavo od „A“"
-
-#: ../rules/base.xml.in.h:144
-msgid "Ctrl key position"
-msgstr "Pozícia klávesu Ctrl"
-
-#: ../rules/base.xml.in.h:145
-msgid "Ctrl+Shift change layout."
-msgstr "Ctrl+Shift mení rozloženie."
-
-#: ../rules/base.xml.in.h:146
-msgid "Cyrillic"
-msgstr "azbuka"
-
-#: ../rules/base.xml.in.h:147 ../rules/sun.xml.in.h:39
-msgid "Cze"
-msgstr "Čes"
-
-#: ../rules/base.xml.in.h:148
-msgid "Czechia"
-msgstr "Česko"
-
-#: ../rules/base.xml.in.h:149
-msgid "DRC"
-msgstr "DRC"
-
-#: ../rules/base.xml.in.h:150
-msgid "DTK2000"
-msgstr "DTK2000"
-
-#: ../rules/base.xml.in.h:151 ../rules/sun.xml.in.h:42
-msgid "Dead acute"
-msgstr "mŕtvy dĺžeň"
-
-#: ../rules/base.xml.in.h:152 ../rules/sun.xml.in.h:43
-msgid "Dead grave acute"
-msgstr "mŕtvy opačný dĺžeň"
-
-#: ../rules/base.xml.in.h:153
-msgid "Default numeric keypad keys."
-msgstr "Štandardné klávesy numerickej klávesnice."
-
-#: ../rules/base.xml.in.h:154
-msgid "Dell"
-msgstr "Dell"
-
-#: ../rules/base.xml.in.h:155
-msgid "Dell 101-key PC"
-msgstr "DELL PC 101 kláves"
-
-#: ../rules/base.xml.in.h:156
-msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
-msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx"
-
-#: ../rules/base.xml.in.h:157
-msgid "Dell Laptop/notebook Precision M series"
-msgstr "Dell Laptop/notebook Precision série M"
-
-#: ../rules/base.xml.in.h:158
-msgid "Dell Latitude series laptop"
-msgstr "Laptop série Dell Latitude"
-
-#: ../rules/base.xml.in.h:159
-msgid "Dell SK-8125 USB Multimedia Keybard"
-msgstr "Dell SK-8125 USB multimediálna klávesnica"
-
-#: ../rules/base.xml.in.h:160
-msgid "Dell SK-8135 USB Multimedia Keybard"
-msgstr "Dell SK-8135 USB multimediálna klávesnica"
-
-#: ../rules/base.xml.in.h:161
-msgid "Dell USB Multimedia Keybard"
-msgstr "Dell USB multimediálna klávesnica"
-
-#: ../rules/base.xml.in.h:162
-msgid "Denmark"
-msgstr "Dánsko"
-
-#: ../rules/base.xml.in.h:163 ../rules/sun.xml.in.h:44
-msgid "Deu"
-msgstr "Nem"
-
-#: ../rules/base.xml.in.h:164
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr "Dexxa Wireless Desktop Keyboard"
-
-#: ../rules/base.xml.in.h:165
-msgid "Diamond 9801 / 9802 series"
-msgstr "Diamond séria 9801 / 9802"
-
-#: ../rules/base.xml.in.h:166 ../rules/sun.xml.in.h:46
-msgid "Dnk"
-msgstr "Dán"
-
-# rozloženie klávesnice
-#: ../rules/base.xml.in.h:167 ../rules/sun.xml.in.h:48
-msgid "Dvorak"
-msgstr "Dvorak"
-
-#: ../rules/base.xml.in.h:168
-msgid "Dvorak, Polish quotes on key \"1/!\""
-msgstr "Dvorak, poľské úvodzovky na klávese „1/!“"
-
-#: ../rules/base.xml.in.h:169
-msgid "Dvorak, Polish quotes on quotemark key"
-msgstr "Dvorak, poľské úvodzovky na klávese úvodzoviek"
-
-#: ../rules/base.xml.in.h:170
-msgid "Eastern"
-msgstr "východné"
-
-#: ../rules/base.xml.in.h:171 ../rules/sun.xml.in.h:49
-msgid "Eliminate dead keys"
-msgstr "Eliminovať mrtvé kláves"
-
-#: ../rules/base.xml.in.h:172
-msgid "Ennyah DKB-1008"
-msgstr "Ennyah DKB-1008"
-
-#: ../rules/base.xml.in.h:173
-msgid "Epo"
-msgstr "Epo"
-
-#: ../rules/base.xml.in.h:174
-msgid "Ergonomic"
-msgstr "ergonomické"
-
-#: ../rules/base.xml.in.h:175 ../rules/sun.xml.in.h:50
-msgid "Esp"
-msgstr "Špa"
-
-#: ../rules/base.xml.in.h:176
-msgid "Esperanto"
-msgstr "esperanto"
-
-#: ../rules/base.xml.in.h:177
-msgid "Est"
-msgstr "Est"
-
-#: ../rules/base.xml.in.h:178
-msgid "Estonia"
-msgstr "Estónsko"
-
-#: ../rules/base.xml.in.h:179
-msgid "Eth"
-msgstr "Eth"
-
-#: ../rules/base.xml.in.h:180
-msgid "Ethiopia"
-msgstr "Etiópia"
-
-#: ../rules/base.xml.in.h:181
-msgid "Evdev-managed keyboard"
-msgstr "Klávesnica spravovaná Evdev"
-
-#: ../rules/base.xml.in.h:182
-msgid "Everex STEPnote"
-msgstr "Everex STEPnote"
-
-#: ../rules/base.xml.in.h:183
-msgid "Ewe"
-msgstr "Ewe"
-
-#: ../rules/base.xml.in.h:184
-msgid "Extended"
-msgstr "rozšírené"
-
-#: ../rules/base.xml.in.h:185
-msgid "Extended Backslash"
-msgstr "Široký backslash"
-
-#: ../rules/base.xml.in.h:186
-msgid "F-letter (F) variant"
-msgstr "variant písmena F"
-
-#: ../rules/base.xml.in.h:187
-msgid "Fao"
-msgstr "Fao"
-
-#: ../rules/base.xml.in.h:188
-msgid "Faroe Islands"
-msgstr "Faerské ostrovy"
-
-#: ../rules/base.xml.in.h:189 ../rules/sun.xml.in.h:51
-msgid "Fin"
-msgstr "Fín"
-
-#: ../rules/base.xml.in.h:190
-msgid "Finland"
-msgstr "Fínsko"
-
-#: ../rules/base.xml.in.h:191
-msgid "Force standard legacy keypad"
-msgstr "Vynútiť štandardnú zastaralú numerickú klávesnicu"
-
-#: ../rules/base.xml.in.h:192 ../rules/sun.xml.in.h:53
-msgid "Fra"
-msgstr "Fra"
-
-#: ../rules/base.xml.in.h:193
-msgid "France"
-msgstr "Francúzsko"
-
-#: ../rules/base.xml.in.h:194 ../rules/sun.xml.in.h:55
-msgid "French"
-msgstr "Francúzske"
-
-#: ../rules/base.xml.in.h:195
-msgid "French (Macintosh)"
-msgstr "Francúzske (Macintosh)"
-
-#: ../rules/base.xml.in.h:196 ../rules/sun.xml.in.h:56
-msgid "French (legacy)"
-msgstr "Francúzske (zastaralé)"
-
-#: ../rules/base.xml.in.h:197
-msgid "French Dvorak"
-msgstr "Francúzske dvorak"
-
-#: ../rules/base.xml.in.h:198
-msgid "French, Sun dead keys"
-msgstr "Francúzske, mŕtve klávesy Sun"
-
-#: ../rules/base.xml.in.h:199
-msgid "French, eliminate dead keys"
-msgstr "Francúzske, eliminovať mŕtve klávesy"
-
-#: ../rules/base.xml.in.h:200
-msgid "Fula"
-msgstr "fulbčina"
-
-#: ../rules/base.xml.in.h:201
-msgid "GBr"
-msgstr "VBr"
-
-#: ../rules/base.xml.in.h:202
-msgid "Ga"
-msgstr "Ga"
-
-#: ../rules/base.xml.in.h:203
-msgid "Generic 101-key PC"
-msgstr "všeobecná PC 101 kláves"
-
-#: ../rules/base.xml.in.h:204
-msgid "Generic 102-key (Intl) PC"
-msgstr "všeobecná PC 102 kláves (medz.)"
-
-#: ../rules/base.xml.in.h:205
-msgid "Generic 104-key PC"
-msgstr "všeobecná PC 104 kláves"
-
-#: ../rules/base.xml.in.h:206
-msgid "Generic 105-key (Intl) PC"
-msgstr "všeobecná 105-kláv. (medzinár.) PC"
-
-#: ../rules/base.xml.in.h:207
-msgid "Genius Comfy KB-12e"
-msgstr "Genius Comfy KB-12e"
-
-#: ../rules/base.xml.in.h:208
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-
-#: ../rules/base.xml.in.h:209
-msgid "Genius Comfy KB-21e-Scroll"
-msgstr "Genius Comfy KB-21e-Scroll"
-
-#: ../rules/base.xml.in.h:210
-msgid "Genius KB-19e NB"
-msgstr "Genius KB-19e NB"
-
-#: ../rules/base.xml.in.h:211
-msgid "Geo"
-msgstr "Gru"
-
-#: ../rules/base.xml.in.h:212
-msgid "Georgia"
-msgstr "Gruzínsko"
-
-#: ../rules/base.xml.in.h:213
-msgid "German (Macintosh)"
-msgstr "Nemecké (Macintosh)"
-
-#: ../rules/base.xml.in.h:214
-msgid "German, Sun dead keys"
-msgstr "Nemecké, mŕtve klávesy Sun"
-
-#: ../rules/base.xml.in.h:215
-msgid "German, eliminate dead keys"
-msgstr "Francúzske, eliminovať mŕtve klávesy"
-
-#: ../rules/base.xml.in.h:216
-msgid "Germany"
-msgstr "Nemecko"
-
-#: ../rules/base.xml.in.h:217
-msgid "Gha"
-msgstr "Gha"
-
-#: ../rules/base.xml.in.h:218
-msgid "Ghana"
-msgstr "Ghana"
-
-#: ../rules/base.xml.in.h:219
-msgid "Gre"
-msgstr "Gre"
-
-#: ../rules/base.xml.in.h:220
-msgid "Greece"
-msgstr "Grécko"
-
-#: ../rules/base.xml.in.h:221
-msgid "Gujarati"
-msgstr "Gudžarátska"
-
-#: ../rules/base.xml.in.h:222
-msgid "Gurmukhi"
-msgstr "Gurmuchské"
-
-# je firma
-#: ../rules/base.xml.in.h:223
-msgid "Gyration"
-msgstr "Gyration"
-
-#: ../rules/base.xml.in.h:224
-msgid "Hausa"
-msgstr "hauské"
-
-#: ../rules/base.xml.in.h:225
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr "Hewlett-Packard Internet Keyboard"
-
-#: ../rules/base.xml.in.h:226
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr "Hewlett-Packard Omnibook 500 FA"
-
-#: ../rules/base.xml.in.h:227
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr "Hewlett-Packard Omnibook 5xx"
-
-#: ../rules/base.xml.in.h:228
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr "Hewlett-Packard Omnibook 6000/6100"
-
-#: ../rules/base.xml.in.h:229
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr "Hewlett-Packard Omnibook XE3 GC"
-
-#: ../rules/base.xml.in.h:230
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr "Hewlett-Packard Omnibook XE3 GF"
-
-#: ../rules/base.xml.in.h:231
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr "Hewlett-Packard Omnibook XT1000"
-
-#: ../rules/base.xml.in.h:232
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr "Hewlett-Packard Pavilion ZT11xx"
-
-#: ../rules/base.xml.in.h:233
-msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
-
-#: ../rules/base.xml.in.h:234
-msgid "Hewlett-Packard SK-2505 Internet Keyboard"
-msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
-
-# bolnagri je vstupná metóda
-#: ../rules/base.xml.in.h:235
-msgid "Hindi Bolnagri"
-msgstr "hindské bolnagri"
-
-#: ../rules/base.xml.in.h:236
-msgid "Honeywell Euroboard"
-msgstr "Honeywell Euroboard"
-
-#: ../rules/base.xml.in.h:237
-msgid "Hrv"
-msgstr "Chor"
-
-#: ../rules/base.xml.in.h:238 ../rules/sun.xml.in.h:59
-msgid "Hun"
-msgstr "Maď"
-
-#: ../rules/base.xml.in.h:239
-msgid "Hungary"
-msgstr "Maďarsko"
-
-#: ../rules/base.xml.in.h:240
-msgid "Hyper is mapped to the Win-keys."
-msgstr "Hyper je mapovaný na Win-klávesy."
-
-#: ../rules/base.xml.in.h:241
-msgid "IBM (LST 1205-92)"
-msgstr "IBM (LST 1205-92)"
-
-#: ../rules/base.xml.in.h:242
-msgid "IBM Rapid Access"
-msgstr "IBM Rapid Access"
-
-#: ../rules/base.xml.in.h:243
-msgid "IBM Rapid Access II"
-msgstr "IBM Rapid Access II"
-
-#: ../rules/base.xml.in.h:244
-msgid "IBM Rapid Access II (alternate option)"
-msgstr "IBM Rapid Access II (alternatívna voľba)"
-
-#: ../rules/base.xml.in.h:245
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
-
-#: ../rules/base.xml.in.h:246
-msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-
-#: ../rules/base.xml.in.h:247 ../rules/sun.xml.in.h:61
-msgid "ISO Alternate"
-msgstr "ISO alternatívne"
-
-#: ../rules/base.xml.in.h:248
-msgid "Iceland"
-msgstr "Island"
-
-#: ../rules/base.xml.in.h:249
-msgid "Igbo"
-msgstr "igbo"
-
-#: ../rules/base.xml.in.h:250
-msgid "Ind"
-msgstr "Ind"
-
-#: ../rules/base.xml.in.h:251
-msgid "India"
-msgstr "India"
-
-#: ../rules/base.xml.in.h:252 ../rules/sun.xml.in.h:62
-msgid "International (with dead keys)"
-msgstr "Medzinárodné (s mŕtvymi klávesmi)"
-
-#: ../rules/base.xml.in.h:253
-msgid "Inuktitut"
-msgstr "inuktitut"
-
-#: ../rules/base.xml.in.h:254
-msgid "Iran"
-msgstr "Irán"
-
-#: ../rules/base.xml.in.h:255
-msgid "Iraq"
-msgstr "Irak"
-
-#: ../rules/base.xml.in.h:256
-msgid "Ireland"
-msgstr "Írsko"
-
-#: ../rules/base.xml.in.h:257
-msgid "Irl"
-msgstr "Irs"
-
-#: ../rules/base.xml.in.h:258
-msgid "Irn"
-msgstr "Irn"
-
-#: ../rules/base.xml.in.h:259
-msgid "Irq"
-msgstr "Irq"
-
-#: ../rules/base.xml.in.h:260
-msgid "Isl"
-msgstr "Isl"
-
-#: ../rules/base.xml.in.h:261
-msgid "Isr"
-msgstr "Izr"
-
-#: ../rules/base.xml.in.h:262
-msgid "Israel"
-msgstr "Izrael"
-
-#: ../rules/base.xml.in.h:263 ../rules/sun.xml.in.h:63
-msgid "Ita"
-msgstr "Tal"
-
-#: ../rules/base.xml.in.h:264
-msgid "Italy"
-msgstr "Taliansko"
-
-#: ../rules/base.xml.in.h:265
-msgid "Japan"
-msgstr "Japonsko"
-
-#: ../rules/base.xml.in.h:266
-msgid "Japan (PC-98xx Series)"
-msgstr "Japonské (séria PC-98xx)"
-
-#: ../rules/base.xml.in.h:267
-msgid "Japanese 106-key"
-msgstr "Japonské 106 kláves"
-
-#: ../rules/base.xml.in.h:268
-msgid "Japanese keyboard options"
-msgstr "Japonské možnosti klávesnice"
-
-#: ../rules/base.xml.in.h:269 ../rules/sun.xml.in.h:66
-msgid "Jpn"
-msgstr "Jpn"
-
-# Kana is a general term for the syllabic Japanese scripts hiragana (ひらがな) and katakana (カタカナ) as well as the old system known as man'yōgana.
-#: ../rules/base.xml.in.h:270
-msgid "Kana"
-msgstr "Kana"
-
-#: ../rules/base.xml.in.h:271
-msgid "Kana Lock key is locking"
-msgstr "Kláves Kana Lock zamyká"
-
-#: ../rules/base.xml.in.h:272
-msgid "Kannada"
-msgstr "Kannadské"
-
-#: ../rules/base.xml.in.h:273
-msgid "Kashubian"
-msgstr "kašubčina"
-
-#: ../rules/base.xml.in.h:274
-msgid "Kaz"
-msgstr "Kaz"
-
-#: ../rules/base.xml.in.h:275
-msgid "Kazakh with Russian"
-msgstr "Kazašské s ruštinou"
-
-#: ../rules/base.xml.in.h:276
-msgid "Kazakhstan"
-msgstr "Kazachstan"
-
-#: ../rules/base.xml.in.h:277
-msgid "Keypad"
-msgstr "Numerická klávesnica"
-
-#: ../rules/base.xml.in.h:278
-msgid "Keytronic FlexPro"
-msgstr "Keytronic FlexPro"
-
-#: ../rules/base.xml.in.h:279
-msgid "Khm"
-msgstr "Khm"
-
-#: ../rules/base.xml.in.h:280
-msgid "Kor"
-msgstr "Kor"
-
-#: ../rules/base.xml.in.h:281
-msgid "Korea, Republic of"
-msgstr "Kórejská republika"
-
-#: ../rules/base.xml.in.h:282
-msgid "Korean 106-key"
-msgstr "Kórejské, 106 kláves"
-
-# fínske rozloženie
-# http://kotoistus.tksoft.com/linux/index-en.html
-#: ../rules/base.xml.in.h:283
-msgid "Kotoistus"
-msgstr "Kotoistus"
-
-#: ../rules/base.xml.in.h:284
-msgid "Kurdish, (F)"
-msgstr "Kurdské, (F)"
-
-#: ../rules/base.xml.in.h:285
-msgid "Kurdish, Arabic-Latin"
-msgstr "kurdčina, arabsko-latinské"
-
-#: ../rules/base.xml.in.h:286
-msgid "Kurdish, Latin Alt-Q"
-msgstr "kurdčina, latinské Alt-Q"
-
-#: ../rules/base.xml.in.h:287
-msgid "Kurdish, Latin Q"
-msgstr "kurdčina, latinské Q"
-
-#: ../rules/base.xml.in.h:288
-msgid "Kyr"
-msgstr "Kyr"
-
-#: ../rules/base.xml.in.h:289
-msgid "Kyrgyzstan"
-msgstr "Kirgizsko"
-
-#: ../rules/base.xml.in.h:290
-msgid "LAm"
-msgstr "LAm"
-
-#: ../rules/base.xml.in.h:291
-msgid "LCtrl+LShift change layout."
-msgstr "ľavý Ctrl+ľavý Shift mení rozloženie."
-
-#: ../rules/base.xml.in.h:292
-msgid "Lao"
-msgstr "Lao"
-
-#: ../rules/base.xml.in.h:293
-msgid "Laos"
-msgstr "Laos"
-
-#: ../rules/base.xml.in.h:294
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr "Laptop/notebook Compaq (napr. Armada) Laptop Keyboard"
-
-#: ../rules/base.xml.in.h:295
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr "Laptop/notebook Compaq (napr. Presario) Internet Keyboard"
-
-#: ../rules/base.xml.in.h:296
-msgid "Laptop/notebook eMachines m68xx"
-msgstr "Laptop/notebook eMachines m68xx"
-
-#: ../rules/base.xml.in.h:297
-msgid "Latin"
-msgstr "Latinské"
-
-#: ../rules/base.xml.in.h:298
-msgid "Latin American"
-msgstr "Latinskoamerické"
-
-#: ../rules/base.xml.in.h:299
-msgid "Latin Unicode"
-msgstr "Latinské Unicode"
-
-#: ../rules/base.xml.in.h:300
-msgid "Latin Unicode qwerty"
-msgstr "Latinské Unicode qwerty"
-
-#: ../rules/base.xml.in.h:301
-msgid "Latin qwerty"
-msgstr "Latinské qwerty"
-
-# « »
-#: ../rules/base.xml.in.h:302
-msgid "Latin with guillemets"
-msgstr "Latinské s uhlovými zátvorkami"
-
-#: ../rules/base.xml.in.h:303
-msgid "Latvia"
-msgstr "Lotyšsko"
-
-#: ../rules/base.xml.in.h:304
-msgid "Layout switching"
-msgstr "Prepínanie rozloženia"
-
-#: ../rules/base.xml.in.h:305
-msgid "Left Alt is swapped with left Win-key."
-msgstr "Ľavý Alt je vymenený s ľavým klávesom Win."
-
-#: ../rules/base.xml.in.h:306
-msgid "Left Alt key changes layout."
-msgstr "Ľavý kláves Alt mení rozloženie."
-
-#: ../rules/base.xml.in.h:307
-msgid "Left Alt key switches layout while pressed."
-msgstr "Ľavý kláves Alt prepína rozloženie pri stlačení."
-
-#: ../rules/base.xml.in.h:308
-msgid "Left Ctrl key changes layout."
-msgstr "Ľavý kláves Ctrl mení rozloženie."
-
-#: ../rules/base.xml.in.h:309
-msgid "Left Shift key changes layout."
-msgstr "Ľavý kláves Shift mení rozloženie."
-
-#: ../rules/base.xml.in.h:310
-msgid "Left Win-key changes layout."
-msgstr "Ľavý kláves Win mení rozloženie."
-
-#: ../rules/base.xml.in.h:311
-msgid "Left Win-key is Compose."
-msgstr "Ľavý kláves Win je Compose."
-
-#: ../rules/base.xml.in.h:312
-msgid "Left Win-key switches layout while pressed."
-msgstr "Ľavý kláves Win prepína rozloženie pri stlačení."
-
-#: ../rules/base.xml.in.h:313
-msgid "Left hand"
-msgstr "ľavá ruka"
-
-#: ../rules/base.xml.in.h:314
-msgid "Left handed Dvorak"
-msgstr "ľavá ruka dvorak"
-
-#: ../rules/base.xml.in.h:315
-msgid "Lithuania"
-msgstr "Litva"
-
-#: ../rules/base.xml.in.h:316
-msgid "Logitech Access Keyboard"
-msgstr "Logitech Access Keyboard"
-
-#: ../rules/base.xml.in.h:317
-msgid "Logitech Cordless Desktop"
-msgstr "Logitech Cordless Desktop"
-
-#: ../rules/base.xml.in.h:318
-msgid "Logitech Cordless Desktop LX-300"
-msgstr "Logitech Cordless Desktop LX-300"
-
-#: ../rules/base.xml.in.h:319
-msgid "Logitech Cordless Desktop Navigator"
-msgstr "Logitech Cordless Desktop Navigator"
-
-#: ../rules/base.xml.in.h:320
-msgid "Logitech Cordless Desktop Optical"
-msgstr "Logitech Cordless Desktop Optical"
-
-#: ../rules/base.xml.in.h:321
-msgid "Logitech Cordless Desktop Pro"
-msgstr "Logitech Cordless Desktop Pro"
-
-#: ../rules/base.xml.in.h:322
-msgid "Logitech Cordless Desktop Pro (alternate option)"
-msgstr "Logitech Cordless Desktop Pro (alternatívna voľba)"
-
-#: ../rules/base.xml.in.h:323
-msgid "Logitech Cordless Desktop Pro (alternate option2)"
-msgstr "Logitech Cordless Desktop Pro (alternatívna voľba2)"
-
-#: ../rules/base.xml.in.h:324
-msgid "Logitech Cordless Desktop iTouch"
-msgstr "Logitech Cordless Desktop iTouch"
-
-#: ../rules/base.xml.in.h:325
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr "Logitech Cordless Freedom/Desktop Navigator"
-
-#: ../rules/base.xml.in.h:326
-msgid "Logitech G15 extra keys via G15daemon"
-msgstr "Logitech G15 extra klávesy pomocou G15daemon"
-
-#: ../rules/base.xml.in.h:327
-msgid "Logitech Internet Keyboard"
-msgstr "Logitech Internet Keyboard"
-
-#: ../rules/base.xml.in.h:328
-msgid "Logitech Internet Navigator Keyboard"
-msgstr "Logitech Internet Navigator Keyboard"
-
-#: ../rules/base.xml.in.h:329
-msgid "Logitech Ultra-X Keyboard"
-msgstr "Logitech Ultra-X Keyboard"
-
-#: ../rules/base.xml.in.h:330
-msgid "Logitech diNovo Keyboard"
-msgstr "Logitech diNovo Keyboard"
-
-#: ../rules/base.xml.in.h:331
-msgid "Logitech iTouch"
-msgstr "Logitech iTouch"
-
-#: ../rules/base.xml.in.h:332
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-
-#: ../rules/base.xml.in.h:333
-msgid "Logitech iTouch Internet Navigator Keyboard SE"
-msgstr "Logitech iTouch Internet Navigator Keyboard SE"
-
-#: ../rules/base.xml.in.h:334
-msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-
-#: ../rules/base.xml.in.h:335
-msgid "Ltu"
-msgstr "Lit"
-
-#: ../rules/base.xml.in.h:336
-msgid "Lva"
-msgstr "Lot"
-
-#: ../rules/base.xml.in.h:337
-msgid "MESS"
-msgstr "MESS"
-
-#: ../rules/base.xml.in.h:338
-msgid "MacBook/MacBook Pro"
-msgstr "MacBook/MacBook Pro"
-
-#: ../rules/base.xml.in.h:339
-msgid "MacBook/MacBook Pro (Intl)"
-msgstr "MacBook/MacBook Pro (medzin)"
-
-#: ../rules/base.xml.in.h:340
-msgid "Macedonia"
-msgstr "Macedónsko"
-
-#: ../rules/base.xml.in.h:341
-msgid "Macintosh"
-msgstr "Macintosh"
-
-#: ../rules/base.xml.in.h:342
-msgid "Macintosh Old"
-msgstr "Macintosh staré"
-
-#: ../rules/base.xml.in.h:343
-msgid "Macintosh, Sun dead keys"
-msgstr "Macintosh, mŕtve klávesy Sun"
-
-#: ../rules/base.xml.in.h:344
-msgid "Macintosh, eliminate dead keys"
-msgstr "Macintosh, eliminovať mŕtve klávesy"
-
-#: ../rules/base.xml.in.h:345
-msgid "Make CapsLock an additional Ctrl."
-msgstr "Urobiť z CapsLock ďalší Ctrl."
-
-#: ../rules/base.xml.in.h:346
-msgid "Mal"
-msgstr "Mal"
-
-#: ../rules/base.xml.in.h:347
-msgid "Malayalam"
-msgstr "Malajalámske"
-
-#: ../rules/base.xml.in.h:348
-msgid "Maldives"
-msgstr "Maldivy"
-
-#: ../rules/base.xml.in.h:349
-msgid "Malta"
-msgstr "Malta"
-
-#: ../rules/base.xml.in.h:350
-msgid "Maltese keyboard with US layout"
-msgstr "Maltézska klávesnica s rozložením USA"
-
-#: ../rules/base.xml.in.h:351
-msgid "Mao"
-msgstr "Mao"
-
-#: ../rules/base.xml.in.h:352
-msgid "Maori"
-msgstr "maorčina"
-
-#: ../rules/base.xml.in.h:353
-msgid "Memorex MX1998"
-msgstr "Memorex MX1998"
-
-#: ../rules/base.xml.in.h:354
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr "Memorex MX2500 EZ-Access Keyboard"
-
-#: ../rules/base.xml.in.h:355
-msgid "Memorex MX2750"
-msgstr "Memorex MX2750"
-
-#: ../rules/base.xml.in.h:356
-msgid "Menu is Compose."
-msgstr "Ponuka je Compose."
-
-#: ../rules/base.xml.in.h:357
-msgid "Menu key changes layout."
-msgstr "Kláves Ponuka mení rozloženie."
-
-#: ../rules/base.xml.in.h:358
-msgid "Meta is mapped to the Win-keys."
-msgstr "Meta je mapovaný na Win-klávesy."
-
-#: ../rules/base.xml.in.h:359
-msgid "Meta is mapped to the left Win-key."
-msgstr "Meta je mapovaný na ľavý Win-kláves."
-
-#: ../rules/base.xml.in.h:360
-msgid "Microsoft Internet Keyboard"
-msgstr "Microsoft Internet Keyboard"
-
-#: ../rules/base.xml.in.h:361
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "Microsoft Internet Keyboard Pro, Švédska"
-
-#: ../rules/base.xml.in.h:362
-msgid "Microsoft Natural"
-msgstr "Microsoft Natural"
-
-#: ../rules/base.xml.in.h:363
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-
-#: ../rules/base.xml.in.h:364
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr "Microsoft Natural Keyboard Pro OEM"
-
-#: ../rules/base.xml.in.h:365
-msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-
-#: ../rules/base.xml.in.h:366
-msgid "Microsoft Office Keyboard"
-msgstr "Microsoft Office Keyboard"
-
-#: ../rules/base.xml.in.h:367
-msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
-msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
-
-#: ../rules/base.xml.in.h:368 ../rules/sun.xml.in.h:72
-msgid "Miscellaneous compatibility options"
-msgstr "Dodatočné voľby pre kompatibilitu"
-
-#: ../rules/base.xml.in.h:369
-msgid "Mkd"
-msgstr "Mak"
-
-#: ../rules/base.xml.in.h:370
-msgid "Mlt"
-msgstr "Mlt"
-
-#: ../rules/base.xml.in.h:371
-msgid "Mmr"
-msgstr "Mmr"
-
-#: ../rules/base.xml.in.h:372
-msgid "Mng"
-msgstr "Mng"
-
-#: ../rules/base.xml.in.h:373
-msgid "Mongolia"
-msgstr "Mongolsko"
-
-#: ../rules/base.xml.in.h:374
-msgid "Morocco"
-msgstr "Maroko"
-
-#: ../rules/base.xml.in.h:375 ../rules/sun.xml.in.h:73
-msgid "Multilingual"
-msgstr "Viacjazyčné"
-
-#: ../rules/base.xml.in.h:376
-msgid "Multilingual, first part"
-msgstr "Viacjazyčné, prvá časť"
-
-#: ../rules/base.xml.in.h:377 ../rules/sun.xml.in.h:74
-msgid "Multilingual, second part"
-msgstr "Viacjazyčné, druhá časť"
-
-#: ../rules/base.xml.in.h:378
-msgid "Myanmar"
-msgstr "Mjanmarsko"
-
-#: ../rules/base.xml.in.h:379
-msgid "NICOLA-F style Backspace"
-msgstr "Backspace v štýle NICOLA-F"
-
-#: ../rules/base.xml.in.h:380
-msgid "Neostyle"
-msgstr "Neoštýl"
-
-#: ../rules/base.xml.in.h:381
-msgid "Nep"
-msgstr "Nep"
-
-#: ../rules/base.xml.in.h:382
-msgid "Nepal"
-msgstr "Nepál"
-
-#: ../rules/base.xml.in.h:383
-msgid "Netherlands"
-msgstr "Holandsko"
-
-#: ../rules/base.xml.in.h:384
-msgid "Nig"
-msgstr "Nig"
-
-#: ../rules/base.xml.in.h:385
-msgid "Nigeria"
-msgstr "Nigéria"
-
-#: ../rules/base.xml.in.h:386
-msgid "Nld"
-msgstr "Nld"
-
-#: ../rules/base.xml.in.h:387 ../rules/sun.xml.in.h:75
-msgid "Nor"
-msgstr "Nor"
-
-#: ../rules/base.xml.in.h:388
-msgid "Northern Saami"
-msgstr "severná saamčina"
-
-#: ../rules/base.xml.in.h:389
-msgid "Northern Saami, eliminate dead keys"
-msgstr "severná saamčina, eliminovať mŕtve klávesy"
-
-#: ../rules/base.xml.in.h:390
-msgid "Northgate OmniKey 101"
-msgstr "Northgate OmniKey 101"
-
-#: ../rules/base.xml.in.h:391
-msgid "Norway"
-msgstr "Nórsko"
-
-#: ../rules/base.xml.in.h:392
-msgid "NumLock LED shows alternative layout."
-msgstr "Num Lock LED zobrazuje alternatívne rozloženie."
-
-#: ../rules/base.xml.in.h:393
-msgid "Numeric keypad keys work as with Mac."
-msgstr "Numerická klávesnica funguje ako na Mac."
-
-#: ../rules/base.xml.in.h:394
-msgid "Numeric keypad layout selection"
-msgstr "Výber rozloženia numerickej klávesnice"
-
-#: ../rules/base.xml.in.h:395
-msgid "OADG 109A"
-msgstr "OADG 109A"
-
-#: ../rules/base.xml.in.h:396
-msgid "Ogham"
-msgstr "Oghamské"
-
-#: ../rules/base.xml.in.h:397
-msgid "Ogham IS434"
-msgstr "Ogham IS434"
-
-#: ../rules/base.xml.in.h:398
-msgid "Oriya"
-msgstr "uríjčina"
-
-#: ../rules/base.xml.in.h:399
-msgid "Ortek MCK-800 MM/Internet keyboard"
-msgstr "Ortek MCK-800 MM/internetová klávesnica"
-
-#: ../rules/base.xml.in.h:400
-msgid "Ossetian"
-msgstr "Osetské"
-
-#: ../rules/base.xml.in.h:401
-msgid "Ossetian, Winkeys"
-msgstr "Osetské, klávesy Win"
-
-#: ../rules/base.xml.in.h:402
-msgid "PC-98xx Series"
-msgstr "Séria PC-98xx"
-
-#: ../rules/base.xml.in.h:403
-msgid "Pak"
-msgstr "Pak"
-
-#: ../rules/base.xml.in.h:404
-msgid "Pakistan"
-msgstr "Pakistan"
-
-#: ../rules/base.xml.in.h:405
-msgid "Pashto"
-msgstr "paštčina"
-
-# thajské rozloženie
-#: ../rules/base.xml.in.h:406
-msgid "Pattachote"
-msgstr "Pattachote"
-
-#: ../rules/base.xml.in.h:407 ../rules/sun.xml.in.h:78
-msgid "Phonetic"
-msgstr "Fonetické"
-
-#: ../rules/base.xml.in.h:408 ../rules/sun.xml.in.h:79
-msgid "Pol"
-msgstr "Pol"
-
-#: ../rules/base.xml.in.h:409
-msgid "Poland"
-msgstr "Poľsko"
-
-#: ../rules/base.xml.in.h:410
-msgid "Polytonic"
-msgstr "Polytónické"
-
-#: ../rules/base.xml.in.h:411
-msgid "Portugal"
-msgstr "Portugalsko"
-
-#: ../rules/base.xml.in.h:412
-msgid "Press Left Alt key to choose 3rd level."
-msgstr "Stlačenie ľavého klávesu Alt vyberá 3. úroveň."
-
-#: ../rules/base.xml.in.h:413
-msgid "Press Left Win-key to choose 3rd level."
-msgstr "Stlačenie ľavého klávesu Win vyberá 3. úroveň."
-
-#: ../rules/base.xml.in.h:414
-msgid "Press Menu key to choose 3rd level."
-msgstr "Stlačenie klávesu Ponuka vyberá 3. úroveň."
-
-#: ../rules/base.xml.in.h:415
-msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
-msgstr "Stlačenie pravého klávesu Alt vyberá 3. úroveň, Shift+pravý kláves Alt key je Multi_Key."
-
-#: ../rules/base.xml.in.h:416
-msgid "Press Right Alt key to choose 3rd level."
-msgstr "Stlačenie pravého klávesu Alt vyberá 3. úroveň."
-
-#: ../rules/base.xml.in.h:417
-msgid "Press Right Ctrl to choose 3rd level."
-msgstr "Stlačenie pravého Ctrl vyberá 3. úroveň."
-
-#: ../rules/base.xml.in.h:418
-msgid "Press Right Win-key to choose 3rd level."
-msgstr "Stlačenie pravého klávesu Win vyberá 3. úroveň."
-
-#: ../rules/base.xml.in.h:419
-msgid "Press any of Alt keys to choose 3rd level."
-msgstr "Stlačenie ľubovoľného klávesu Alt vyberá 3. úroveň."
-
-#: ../rules/base.xml.in.h:420
-msgid "Press any of Win-keys to choose 3rd level."
-msgstr "Stlačenie ľubovoľného klávesu Win vyberá 3. úroveň."
-
-#: ../rules/base.xml.in.h:421
-msgid "Pro"
-msgstr "Pro"
-
-#: ../rules/base.xml.in.h:422
-msgid "Pro Keypad"
-msgstr "Pro Keypad"
-
-#: ../rules/base.xml.in.h:423
-msgid "Probhat"
-msgstr "Probhat"
-
-#: ../rules/base.xml.in.h:424
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "Propeller Voyager (KTEZ-1000)"
-
-#: ../rules/base.xml.in.h:425 ../rules/sun.xml.in.h:88
-msgid "Prt"
-msgstr "Prt"
-
-#: ../rules/base.xml.in.h:426
-msgid "QTronix Scorpius 98N+"
-msgstr "QTronix Scorpius 98N+"
-
-#: ../rules/base.xml.in.h:427
-msgid "R-Alt switches layout while pressed."
-msgstr "Pravý kláves Alt prepína rozloženie pri stlačení."
-
-#: ../rules/base.xml.in.h:428
-msgid "Right Alt is Compose."
-msgstr "Pravý Alt je Compose."
-
-#: ../rules/base.xml.in.h:429
-msgid "Right Alt key changes layout."
-msgstr "Pravý kláves Alt mení rozloženie."
-
-#: ../rules/base.xml.in.h:430 ../rules/sun.xml.in.h:90
-msgid "Right Alt key never chooses 3rd level."
-msgstr "Pravý kláves Alt nikdy nevyberá 3. úroveň."
-
-#: ../rules/base.xml.in.h:431
-msgid "Right Ctrl is Compose."
-msgstr "Pravý Alt je Compose."
-
-#: ../rules/base.xml.in.h:432
-msgid "Right Ctrl key changes layout."
-msgstr "Pravý kláves Ctrl mení rozloženie."
-
-#: ../rules/base.xml.in.h:433
-msgid "Right Ctrl key switches layout while pressed."
-msgstr "Pravý kláves Win prepína rozloženie pri stlačení."
-
-#: ../rules/base.xml.in.h:434
-msgid "Right Ctrl key works as Right Alt."
-msgstr "Pravý kláves Control funguje ako pravý Alt."
-
-#: ../rules/base.xml.in.h:435
-msgid "Right Shift key changes layout."
-msgstr "Pravý kláves Shift mení rozloženie."
-
-#: ../rules/base.xml.in.h:436
-msgid "Right Win-key changes layout."
-msgstr "Pravý kláves Win mení rozloženie."
-
-#: ../rules/base.xml.in.h:437
-msgid "Right Win-key is Compose."
-msgstr "Pravý kláves Win je Compose"
-
-#: ../rules/base.xml.in.h:438
-msgid "Right Win-key switches layout while pressed."
-msgstr "Pravý kláves Win prepína rozloženie pri stlačení."
-
-#: ../rules/base.xml.in.h:439
-msgid "Right hand"
-msgstr "pravá ruka"
-
-#: ../rules/base.xml.in.h:440
-msgid "Right handed Dvorak"
-msgstr "pravá ruka dvorak"
-
-#: ../rules/base.xml.in.h:441
-msgid "Romania"
-msgstr "Rumunsko"
-
-#: ../rules/base.xml.in.h:442
-msgid "Romanian keyboard with German letters"
-msgstr "Rumunská klávesnica s nemeckými písmenmi"
-
-#: ../rules/base.xml.in.h:443
-msgid "Romanian keyboard with German letters, eliminate dead keys"
-msgstr "Rumunská klávesnica s nemeckými písmenami, eliminovať mŕtve klávesy"
-
-#: ../rules/base.xml.in.h:444
-msgid "Rou"
-msgstr "Rum"
-
-#: ../rules/base.xml.in.h:445 ../rules/sun.xml.in.h:95
-msgid "Rus"
-msgstr "Rus"
-
-#: ../rules/base.xml.in.h:446
-msgid "Russia"
-msgstr "Rusko"
-
-#: ../rules/base.xml.in.h:447 ../rules/sun.xml.in.h:96
-msgid "Russian"
-msgstr "Ruské"
-
-#: ../rules/base.xml.in.h:448
-msgid "Russian phonetic"
-msgstr "Ruské fonetické"
-
-#: ../rules/base.xml.in.h:449
-msgid "Russian phonetic, eliminate dead keys"
-msgstr "Ruské fonetické, eliminovať mrtvé klávesy"
-
-#: ../rules/base.xml.in.h:450
-msgid "Russian with Kazakh"
-msgstr "Ruská s kazaštinou"
-
-#: ../rules/base.xml.in.h:451
-msgid "SCG"
-msgstr "SCG"
-
-#: ../rules/base.xml.in.h:452
-msgid "SILVERCREST Multimedia Wireless Keyboard"
-msgstr "SILVERCREST Multimedia Wireless Keyboard"
-
-#: ../rules/base.xml.in.h:453
-msgid "SK-1300"
-msgstr "SK-1300"
-
-#: ../rules/base.xml.in.h:454
-msgid "SK-2500"
-msgstr "SK-2500"
-
-#: ../rules/base.xml.in.h:455
-msgid "SK-6200"
-msgstr "SK-6200"
-
-#: ../rules/base.xml.in.h:456
-msgid "SK-7100"
-msgstr "SK-7100"
-
-#: ../rules/base.xml.in.h:457
-msgid "SVEN Ergonomic 2500"
-msgstr "SVEN Ergonomic 2500"
-
-#: ../rules/base.xml.in.h:458
-msgid "Samsung SDM 4500P"
-msgstr "Samsung SDM 4500P"
-
-#: ../rules/base.xml.in.h:459
-msgid "Samsung SDM 4510P"
-msgstr "Samsung SDM 4510P"
-
-#: ../rules/base.xml.in.h:460
-msgid "ScrollLock LED shows alternative layout."
-msgstr "Scroll Lock LED zobrazuje alternatívne rozloženie."
-
-#: ../rules/base.xml.in.h:461
-msgid "Serbia and Montenegro"
-msgstr "Srbsko a Čierna Hora"
-
-#: ../rules/base.xml.in.h:462
-msgid "Shift with numeric keypad keys works as in MS Windows."
-msgstr "Shift s numerickými klávesmi pracuje ako v MS Windows."
-
-#: ../rules/base.xml.in.h:463
-msgid "Shift+CapsLock changes layout."
-msgstr "Shift+Caps Lock mení rozloženie."
-
-#: ../rules/base.xml.in.h:464
-msgid "Slovakia"
-msgstr "Slovensko"
-
-#: ../rules/base.xml.in.h:465
-msgid "Slovenia"
-msgstr "Slovinsko"
-
-#: ../rules/base.xml.in.h:466
-msgid "South Africa"
-msgstr "Južná Afrika"
-
-#: ../rules/base.xml.in.h:467
-msgid "Southern Uzbek"
-msgstr "južná uzbečtina"
-
-#: ../rules/base.xml.in.h:468
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr "Medzerník dáva znak nezalomiteľná medzera na štvrtej úrovni, tenká nezalomiteľná medzera na šiestej úrovni."
-
-#: ../rules/base.xml.in.h:469
-msgid "Space key outputs non-breakable space character at fourth level."
-msgstr "Medzerník dáva znak nezalomiteľná medzera na štvrtej úrovni."
-
-#: ../rules/base.xml.in.h:470
-msgid "Space key outputs non-breakable space character at second level."
-msgstr "Medzerník dáva znak nezalomiteľná medzera na druhej úrovni."
-
-#: ../rules/base.xml.in.h:471
-msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
-msgstr "Medzerník dáva znak nezalomiteľná medzera na tretej úrovni, nič na štvrtej úrovni."
-
-#: ../rules/base.xml.in.h:472
-msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr "Medzerník dáva znak nezalomiteľná medzera na tretej úrovni, tenká nezalomiteľná medzera na štvrtej úrovni."
-
-#: ../rules/base.xml.in.h:473
-msgid "Space key outputs non-breakable space character at third level."
-msgstr "Medzerník dáva znak nezalomiteľná medzera na tretej úrovni."
-
-#: ../rules/base.xml.in.h:474
-msgid "Space key outputs usual space at any level."
-msgstr "Medzerník dáva obyčajnú medzeru na každej úrovni."
-
-#: ../rules/base.xml.in.h:475
-msgid "Spain"
-msgstr "Španielsko"
-
-#: ../rules/base.xml.in.h:476 ../rules/sun.xml.in.h:103
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
-msgstr "Špeciálne klávesy (Ctrl+Alt+&lt;key&gt;) spracované na serveru."
-
-#: ../rules/base.xml.in.h:477
-msgid "SrL"
-msgstr "SrL"
-
-#: ../rules/base.xml.in.h:478
-msgid "Sri Lanka"
-msgstr "Srí Lanka"
-
-#: ../rules/base.xml.in.h:479 ../rules/sun.xml.in.h:104
-msgid "Standard"
-msgstr "štandardné"
-
-#. RSTU 2019-91
-#: ../rules/base.xml.in.h:481
-msgid "Standard RSTU"
-msgstr "štandardné RSTU"
-
-#. RSTU 2019-91
-#: ../rules/base.xml.in.h:483
-msgid "Standard RSTU on Russian layout"
-msgstr "štandardné RSTU na ruskom rozložení"
-
-#: ../rules/base.xml.in.h:484 ../rules/sun.xml.in.h:112
-msgid "Sun dead keys"
-msgstr "mŕtve klávesy Sun"
-
-#: ../rules/base.xml.in.h:485
-msgid "Super Power Multimedia Keyboard"
-msgstr "Super Power Multimedia Keyboard"
-
-#: ../rules/base.xml.in.h:486
-msgid "Super is mapped to the Win-keys."
-msgstr "Super je mapovaný na klávesy Win."
-
-#: ../rules/base.xml.in.h:487
-msgid "Svdvorak"
-msgstr "Svdvorak"
-
-#: ../rules/base.xml.in.h:488 ../rules/sun.xml.in.h:113
-msgid "Svk"
-msgstr "Svk"
-
-#: ../rules/base.xml.in.h:489
-msgid "Svn"
-msgstr "Svn"
-
-#: ../rules/base.xml.in.h:490
-msgid "Swap Ctrl and CapsLock."
-msgstr "Vymeniť Control a Caps Lock"
-
-#: ../rules/base.xml.in.h:491
-msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-msgstr "Vymeniť kódy dvoch kláves keď jadro chybne detekuje klávesnice Mac."
-
-#: ../rules/base.xml.in.h:492 ../rules/sun.xml.in.h:115
-msgid "Swe"
-msgstr "Swe"
-
-#: ../rules/base.xml.in.h:493
-msgid "Sweden"
-msgstr "Švédsko"
-
-#: ../rules/base.xml.in.h:494
-msgid "Switzerland"
-msgstr "Švajčiarsko"
-
-#: ../rules/base.xml.in.h:495
-msgid "Symplon PaceBook (tablet PC)"
-msgstr "Symplon PaceBook (tablet PC)"
-
-#: ../rules/base.xml.in.h:496
-msgid "Syr"
-msgstr "Syr"
-
-#: ../rules/base.xml.in.h:497
-msgid "Syria"
-msgstr "Sýrske"
-
-#: ../rules/base.xml.in.h:498
-msgid "Syriac"
-msgstr "Syrské"
-
-#: ../rules/base.xml.in.h:499
-msgid "Syriac phonetic"
-msgstr "Sýske fonetické"
-
-#: ../rules/base.xml.in.h:500
-msgid "TIS-820.2538"
-msgstr "TIS-820.2538"
-
-#: ../rules/base.xml.in.h:501
-msgid "Tajikistan"
-msgstr "Tadžické"
-
-#: ../rules/base.xml.in.h:502
-msgid "Tamil"
-msgstr "Tamilské"
-
-#: ../rules/base.xml.in.h:503
-msgid "Tamil TAB Typewriter"
-msgstr "Tamiský TAB písací stroj"
-
-#: ../rules/base.xml.in.h:504
-msgid "Tamil TSCII Typewriter"
-msgstr "Tamilské TSCII písací stroj"
-
-#: ../rules/base.xml.in.h:505
-msgid "Tamil Unicode"
-msgstr "Tamilské Unicode"
-
-#: ../rules/base.xml.in.h:506
-msgid "Tatar"
-msgstr "tatárčina"
-
-#: ../rules/base.xml.in.h:507
-msgid "Telugu"
-msgstr "Telugské"
-
-#: ../rules/base.xml.in.h:508
-msgid "Tha"
-msgstr "Tha"
-
-#: ../rules/base.xml.in.h:509
-msgid "Thailand"
-msgstr "Thajsko"
-
-#: ../rules/base.xml.in.h:510 ../rules/sun.xml.in.h:119
-msgid "Third level choosers"
-msgstr "Výber tretej úrovne"
-
-# berberská latinská abeceda
-#: ../rules/base.xml.in.h:511
-msgid "Tifinagh"
-msgstr "Tifinagh"
-
-# berberská latinská abeceda
-#: ../rules/base.xml.in.h:512
-msgid "Tifinagh Alternative"
-msgstr "Tifinagh alternatívne"
-
-# berberská latinská abeceda
-#: ../rules/base.xml.in.h:513
-msgid "Tifinagh Alternative Phonetic"
-msgstr "Tifinagh alternatívne fonetické"
-
-# berberská latinská abeceda
-#: ../rules/base.xml.in.h:514
-msgid "Tifinagh Extended"
-msgstr "Tifinagh rozšírené"
-
-# berberská latinská abeceda
-#: ../rules/base.xml.in.h:515
-msgid "Tifinagh Extended Phonetic"
-msgstr "Tifinagh rozšírené fonetické"
-
-# berberská latinská abeceda
-#: ../rules/base.xml.in.h:516
-msgid "Tifinagh Phonetic"
-msgstr "Tifinagh fonetické"
-
-#: ../rules/base.xml.in.h:517
-msgid "Tilde (~) variant"
-msgstr "Variant vlnovky (~)"
-
-#: ../rules/base.xml.in.h:518
-msgid "Tjk"
-msgstr "Tjk"
-
-#: ../rules/base.xml.in.h:519
-msgid "Toshiba Satellite S3000"
-msgstr "Toshiba Satellite S3000"
-
-#: ../rules/base.xml.in.h:520
-msgid "Trust Direct Access Keyboard"
-msgstr "Trust Direct Access Keyboard"
-
-#: ../rules/base.xml.in.h:521
-msgid "Trust Wireless Keyboard Classic"
-msgstr "Trust Wireless Keyboard Classic"
-
-#: ../rules/base.xml.in.h:522 ../rules/sun.xml.in.h:120
-msgid "Tur"
-msgstr "Tur"
-
-#: ../rules/base.xml.in.h:523
-msgid "Turkey"
-msgstr "Turecko"
-
-#: ../rules/base.xml.in.h:524
-msgid "Typewriter"
-msgstr "Písací stroj"
-
-#: ../rules/base.xml.in.h:525 ../rules/sun.xml.in.h:124
-msgid "U.S. English"
-msgstr "USA anglické"
-
-#: ../rules/base.xml.in.h:526
-#, fuzzy
-msgid "US keyboard with Bosnian digraphs"
-msgstr "Klávesnica USA s bosniackymi digraphs"
-
-#: ../rules/base.xml.in.h:527
-#, fuzzy
-msgid "US keyboard with Bosnian letters"
-msgstr "Klávesnica USA s bosniackymi písmenami"
-
-#: ../rules/base.xml.in.h:528
-#, fuzzy
-msgid "US keyboard with Croatian digraphs"
-msgstr "Klávesnica USA s chorvátskymi digraphs"
-
-#: ../rules/base.xml.in.h:529
-#, fuzzy
-msgid "US keyboard with Croatian letters"
-msgstr "Klávesnica USA s chorvátskymi písmenami"
-
-#: ../rules/base.xml.in.h:530
-msgid "US keyboard with Lithuanian letters"
-msgstr "Americká klávesnica s litovskými písmenami"
-
-#: ../rules/base.xml.in.h:531
-#, fuzzy
-msgid "US keyboard with Slovenian digraphs"
-msgstr "Klávesnica USA so slovinskými digraphs"
-
-#: ../rules/base.xml.in.h:532
-#, fuzzy
-msgid "US keyboard with Slovenian letters"
-msgstr "Klávesnica USA so slovinskými písmenami"
-
-#: ../rules/base.xml.in.h:533 ../rules/sun.xml.in.h:126
-msgid "USA"
-msgstr "USA"
-
-#: ../rules/base.xml.in.h:534
-msgid "Udmurt"
-msgstr "udmurtčina"
-
-#: ../rules/base.xml.in.h:535
-msgid "Ukr"
-msgstr "Ukr"
-
-#: ../rules/base.xml.in.h:536
-msgid "Ukraine"
-msgstr "Ukrajinské"
-
-#: ../rules/base.xml.in.h:537
-msgid "UnicodeExpert"
-msgstr "UnicodeExpert"
-
-#: ../rules/base.xml.in.h:538 ../rules/sun.xml.in.h:127
-msgid "United Kingdom"
-msgstr "Spojené kráľovstvo"
-
-#: ../rules/base.xml.in.h:539
-msgid "Urdu"
-msgstr "urdčina"
-
-#: ../rules/base.xml.in.h:540
-#, fuzzy
-msgid "Use Bosnian digraphs"
-msgstr "Použiť bosniacke digraphs"
-
-#: ../rules/base.xml.in.h:541
-#, fuzzy
-msgid "Use Croatian digraphs"
-msgstr "Použiť chorvátske digraphs"
-
-#: ../rules/base.xml.in.h:542
-#, fuzzy
-msgid "Use Slovenian digraphs"
-msgstr "Použiť slovinské digraphs"
-
-#: ../rules/base.xml.in.h:543
-msgid "Use guillemets for quotes"
-msgstr "Použiť uhlové zátvorky pre úvodzovky"
-
-#: ../rules/base.xml.in.h:544
-msgid "Use keyboard LED to show alternative layout."
-msgstr "Použiť LED klávesnice pre zobrazenie alternatívneho rozloženia."
-
-#: ../rules/base.xml.in.h:545
-msgid "Use keypad with unicode additions (arrows and math operators)"
-msgstr "Použiť numerickú klávesnicu s doplnkami Unicode (šípky a matematické operátory)"
-
-#: ../rules/base.xml.in.h:546
-msgid "Using space key to input non-breakable space character"
-msgstr "Použiť klávesu medzera na zadanie znaku nezalomiteľná medzera"
-
-#: ../rules/base.xml.in.h:547
-msgid "Uzb"
-msgstr "Uzb"
-
-#: ../rules/base.xml.in.h:548
-msgid "Uzbekistan"
-msgstr "Uzbecké"
-
-#: ../rules/base.xml.in.h:549
-msgid "Vietnam"
-msgstr "Vietnamské"
-
-#: ../rules/base.xml.in.h:550
-msgid "Vnm"
-msgstr "Vnm"
-
-#: ../rules/base.xml.in.h:551
-msgid "Wang model 724 azerty"
-msgstr "Wang model 724 azerty"
-
-#: ../rules/base.xml.in.h:552
-msgid "Western"
-msgstr "západné"
-
-#: ../rules/base.xml.in.h:553
-msgid "Winbook Model XP5"
-msgstr "Winbook Model XP5"
-
-#: ../rules/base.xml.in.h:554
-msgid "Winkeys"
-msgstr "Win klávesy"
-
-#: ../rules/base.xml.in.h:555
-msgid "With &lt;\\|&gt; key"
-msgstr "s klávesmi &lt;\\|&gt;"
-
-#: ../rules/base.xml.in.h:556
-msgid "With EuroSign on 5"
-msgstr "so znakom euro na 5"
-
-#: ../rules/base.xml.in.h:557
-msgid "With guillemets"
-msgstr "s uhlovými zátvorkami"
-
-#: ../rules/base.xml.in.h:558
-msgid "Yahoo! Internet Keyboard"
-msgstr "Yahoo! Internet Keyboard"
-
-#: ../rules/base.xml.in.h:559
-msgid "Yoruba"
-msgstr "jorubčina"
-
-#: ../rules/base.xml.in.h:560
-msgid "Z and ZHE swapped"
-msgstr "Z a ZHE vymenené"
-
-#: ../rules/base.xml.in.h:561
-msgid "Zar"
-msgstr "Zar"
-
-#: ../rules/base.xml.in.h:562
-msgid "azerty"
-msgstr "azerty"
-
-#: ../rules/base.xml.in.h:563
-msgid "azerty/digits"
-msgstr "azerty/číslice"
-
-#: ../rules/base.xml.in.h:564
-msgid "digits"
-msgstr "číslice"
-
-#: ../rules/base.xml.in.h:565
-msgid "displaced semicolon and quote (obsolete)"
-msgstr "posunutá bodkočiarka a dvojbodka (zastaralé)"
-
-#: ../rules/base.xml.in.h:566
-msgid "lyx"
-msgstr "lyx"
-
-#: ../rules/base.xml.in.h:567 ../rules/sun.xml.in.h:132
-msgid "qwerty"
-msgstr "qwerty"
-
-#: ../rules/base.xml.in.h:568
-msgid "qwerty, extended Backslash"
-msgstr "qwerty, rozšírená spätná lomka"
-
-#: ../rules/base.xml.in.h:569
-msgid "qwerty/digits"
-msgstr "qwerty/číslice"
-
-#: ../rules/base.xml.in.h:570
-msgid "qwertz"
-msgstr "qwertz"
-
-#: ../rules/sun.xml.in.h:1
-msgid "\"Typewriter\""
-msgstr "Písací stroj"
-
-#: ../rules/sun.xml.in.h:17
-msgid "Acts as Shift with locking. Shift cancels Caps."
-msgstr "Pracuje ako Shift s uzamknutím. Shift ruší Caps."
-
-#: ../rules/sun.xml.in.h:18
-msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
-msgstr "Pracuje ako Shift s uzamknutím. Shift neruší Caps."
-
-#: ../rules/sun.xml.in.h:19
-msgid "Alt+Control changes group"
-msgstr "Alt+Control mení rozloženie"
-
-#: ../rules/sun.xml.in.h:20
-msgid "Alt+Shift changes group"
-msgstr "Alt+Shift mení rozloženie"
-
-#: ../rules/sun.xml.in.h:21
-msgid "Basic"
-msgstr "základné"
-
-#: ../rules/sun.xml.in.h:23
-msgid "Belgian"
-msgstr "Belgická"
-
-#: ../rules/sun.xml.in.h:25
-msgid "Both Alt keys together change group"
-msgstr "Oba klávesy Alt spolu menia rozloženie"
-
-#: ../rules/sun.xml.in.h:26
-msgid "Both Ctrl keys together change group"
-msgstr "Oba klávesy Ctrl spolu menia rozloženie"
-
-#: ../rules/sun.xml.in.h:27
-msgid "Both Shift keys together change group"
-msgstr "Spoločné stlačenie oboch Shift mení rozloženie"
-
-#: ../rules/sun.xml.in.h:28
-msgid "Bulgarian"
-msgstr "Bulharské"
-
-#: ../rules/sun.xml.in.h:30
-msgid "Canadian"
-msgstr "Kanadské"
-
-#: ../rules/sun.xml.in.h:31
-msgid "Caps Lock is Compose"
-msgstr "Caps Lock je Compose"
-
-#: ../rules/sun.xml.in.h:32
-msgid "Caps Lock key changes group"
-msgstr "Kláves Caps Lock mení rozloženie"
-
-#: ../rules/sun.xml.in.h:34
-msgid "Caps_Lock LED shows alternative group"
-msgstr "Caps Lock LED zobrazuje alternatívne rozloženie"
-
-#: ../rules/sun.xml.in.h:35
-msgid "Control Key Position"
-msgstr "Pozícia klávesu Control"
-
-#: ../rules/sun.xml.in.h:36
-msgid "Control key at bottom left"
-msgstr "Kláves Control vľavo dole"
-
-#: ../rules/sun.xml.in.h:37
-msgid "Control key at left of 'A'"
-msgstr "Kláves Control naľavo od „A“"
-
-#: ../rules/sun.xml.in.h:38
-msgid "Control+Shift changes group"
-msgstr "Control+Shift mení rozloženie"
-
-#: ../rules/sun.xml.in.h:40
-msgid "Czech"
-msgstr "České"
-
-#: ../rules/sun.xml.in.h:41
-msgid "Danish"
-msgstr "Dánske"
-
-#: ../rules/sun.xml.in.h:45
-msgid "DeuCH"
-msgstr "NemŠv"
-
-#: ../rules/sun.xml.in.h:47
-msgid "Dvo"
-msgstr "Dvo"
-
-#: ../rules/sun.xml.in.h:52
-msgid "Finnish"
-msgstr "Fínske"
-
-#: ../rules/sun.xml.in.h:54
-msgid "FraCH"
-msgstr "FraŠv"
-
-#: ../rules/sun.xml.in.h:57
-msgid "German"
-msgstr "Nemecké"
-
-#: ../rules/sun.xml.in.h:58
-msgid "Group Shift/Lock behavior"
-msgstr "Zoskupiť chovanie Shift/Lock"
-
-#: ../rules/sun.xml.in.h:60
-msgid "Hungarian"
-msgstr "Maďarské"
-
-#: ../rules/sun.xml.in.h:64
-msgid "Italian"
-msgstr "Talianske"
-
-#: ../rules/sun.xml.in.h:65
-msgid "Japanese"
-msgstr "Japonské"
-
-#: ../rules/sun.xml.in.h:67
-msgid "Left Alt key changes group"
-msgstr "Ľavý kláves Alt mení rozloženie"
-
-#: ../rules/sun.xml.in.h:68
-msgid "Left Alt key switches group while pressed"
-msgstr "Ľavý kláves Alt prepína rozloženie pri stlačení"
-
-#: ../rules/sun.xml.in.h:69
-msgid "Left Ctrl key changes group"
-msgstr "Ľavý kláves Ctrl mení rozloženie"
-
-#: ../rules/sun.xml.in.h:70
-msgid "Left Shift key changes group"
-msgstr "Ľavý kláves Shift mení rozloženie"
-
-#: ../rules/sun.xml.in.h:71
-msgid "Make CapsLock an additional Control"
-msgstr "Urobiť z CapsLock dodatočný Control"
-
-#: ../rules/sun.xml.in.h:76
-msgid "Norwegian"
-msgstr "Nórske"
-
-#: ../rules/sun.xml.in.h:77
-msgid "Num_Lock LED shows alternative group"
-msgstr "Num Lock LED zobrazuje alternatívne rozloženie"
-
-#: ../rules/sun.xml.in.h:80
-msgid "Polish"
-msgstr "Poľské"
-
-#: ../rules/sun.xml.in.h:81
-msgid "Polish with Polish quotes on key \"1/!\""
-msgstr "Poľské s poľskými úvodzovkami na klávese „1/!“"
-
-#: ../rules/sun.xml.in.h:82
-msgid "Portuguese"
-msgstr "Portugalské"
-
-#: ../rules/sun.xml.in.h:83
-msgid "Press Left Alt key to choose 3rd level"
-msgstr "Stlačením ľavého klávesu Win vyberiete 3. úroveň"
-
-#: ../rules/sun.xml.in.h:84
-msgid "Press Right Alt key to choose 3rd level"
-msgstr "Stlačením pravého klávesu Win vyberiete 3. úroveň"
-
-#: ../rules/sun.xml.in.h:85
-msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
-msgstr "Stlačením pravého klávesu Win vyberiete 3. úroveň, shift+pravý Alt je Multi_Key"
-
-#: ../rules/sun.xml.in.h:86
-msgid "Press Right Control to choose 3rd level"
-msgstr "Stlačenie pravého Control vyberá 3. úroveň"
-
-#: ../rules/sun.xml.in.h:87
-msgid "Press any of Alt keys to choose 3rd level"
-msgstr "Stlačením ľuboboľného klávesu Alt vyberiete 3. úroveň"
-
-#: ../rules/sun.xml.in.h:89
-msgid "Right Alt key changes group"
-msgstr "Pravý Alt mení rozloženie"
-
-#: ../rules/sun.xml.in.h:91
-msgid "Right Alt switches group while pressed"
-msgstr "Pravý kláves Alt prepína rozloženie pri stlačení"
-
-#: ../rules/sun.xml.in.h:92
-msgid "Right Control key works as Right Alt"
-msgstr "Kláves pravý Control funguje ako pravý Alt"
-
-#: ../rules/sun.xml.in.h:93
-msgid "Right Ctrl key changes group"
-msgstr "Kláves pravý Ctrl mení rozloženie"
-
-#: ../rules/sun.xml.in.h:94
-msgid "Right Shift key changes group"
-msgstr "Kláves pravý Shift mení rozloženie"
-
-#: ../rules/sun.xml.in.h:97
-msgid "Scroll Lock changes group"
-msgstr "Kláves Scroll Lock mení rozloženie"
-
-#: ../rules/sun.xml.in.h:98
-msgid "Scroll_Lock LED shows alternative group"
-msgstr "Scroll Lock LED zobrazuje alternatívne rozloženie"
-
-#: ../rules/sun.xml.in.h:99
-msgid "Shift with numpad keys works as in MS Windows"
-msgstr "Shift s numerickými klávesmi pracuje ako v MS Windows"
-
-#: ../rules/sun.xml.in.h:100
-msgid "Shift+CapsLock changes group"
-msgstr "Shift+Caps Lock mení rozloženie"
-
-#: ../rules/sun.xml.in.h:101
-msgid "Slovak"
-msgstr "Slovenské"
-
-#: ../rules/sun.xml.in.h:102
-msgid "Spanish"
-msgstr "Španielske"
-
-#: ../rules/sun.xml.in.h:105
-msgid "Sun Type 4"
-msgstr "Sun Type 4"
-
-#: ../rules/sun.xml.in.h:106
-msgid "Sun Type 5"
-msgstr "Sun Type 5"
-
-#: ../rules/sun.xml.in.h:107
-msgid "Sun Type 5 European"
-msgstr "Sun Type 5 európske"
-
-#: ../rules/sun.xml.in.h:108
-msgid "Sun Type 5 Unix"
-msgstr "Sun Type 5 Unix"
-
-#: ../rules/sun.xml.in.h:109
-msgid "Sun Type 6"
-msgstr "Sun Type 6"
-
-#: ../rules/sun.xml.in.h:110
-msgid "Sun Type 6 Unix"
-msgstr "Sun Type 6 Unix"
-
-#: ../rules/sun.xml.in.h:111
-msgid "Sun Type 6 with Euro key"
-msgstr "Sun Type 6 s klávesom euro"
-
-#: ../rules/sun.xml.in.h:114
-msgid "Swap Control and Caps Lock"
-msgstr "Prehodiť Control a Caps Lock"
-
-#: ../rules/sun.xml.in.h:116
-msgid "Swedish"
-msgstr "Švédske"
-
-#: ../rules/sun.xml.in.h:117
-msgid "Swiss French"
-msgstr "Švajčiarske francúzske"
-
-#: ../rules/sun.xml.in.h:118
-msgid "Swiss German"
-msgstr "Nemecké (Švajčiarsko)"
-
-#: ../rules/sun.xml.in.h:121
-msgid "Turkish"
-msgstr "Turecké"
-
-#: ../rules/sun.xml.in.h:122
-msgid "Turkish (F)"
-msgstr "Turecké (F)"
-
-#: ../rules/sun.xml.in.h:123
-msgid "Turkish Alt-Q Layout"
-msgstr "Turecké rozloženie Alt-Q"
-
-#: ../rules/sun.xml.in.h:125
-msgid "U.S. English w/ ISO9995-3"
-msgstr "U.S.A. anglické s ISO9995-3"
-
-#: ../rules/sun.xml.in.h:128
-msgid "Use keyboard LED to show alternative group"
-msgstr "Použiť LED klávesnice pre zobrazenie alternatívnej skupiny"
-
-#: ../rules/sun.xml.in.h:129
-msgid "Uses internal capitalization. Shift cancels Caps."
-msgstr "Používa interný prevod na kapitálky. Shift ruší Caps."
-
-#: ../rules/sun.xml.in.h:130
-msgid "Uses internal capitalization. Shift doesn't cancel Caps."
-msgstr "Používa interný prevod na kapitálky. Shift neruší Caps."
-
-#: ../rules/sun.xml.in.h:131
-msgid "bksl"
-msgstr "bksl"
-
-#: ../rules/sun.xml.in.h:133
-msgid "type4"
-msgstr "type4"
-
-#~ msgid "A Tamil typewrite-style keymap; TAB encoding"
-#~ msgstr "Tamilská klávesová mapa v štýle písacieho stroja, kódovanie TAB"
-
-#~ msgid "A Tamil typewrite-style keymap; TSCII encoding"
-#~ msgstr "Tamilská klávesová mapa v štýle písacieho stroja, kódovanie TSCII"
-
-#~ msgid "A Tamil typewrite-style keymap; Unicode encoding"
-#~ msgstr "Tamilská klávesová mapa v štýle písacieho stroja, kódovanie Unicode"
-
-#~ msgid "Arb"
-#~ msgstr "Arb"
-
-#~ msgid "Bosnian"
-#~ msgstr "Bosnianske"
-
-#~ msgid "Burmese"
-#~ msgstr "Burmézsky"
-
-#~ msgid "CloGaelach Laptop"
-#~ msgstr "CloGaelach Laptop"
-
-#~ msgid "Czech (qwerty)"
-#~ msgstr "České (qwerty)"
-
-#~ msgid "Dutch"
-#~ msgstr "Holandské"
-
-#~ msgid "French Canadian"
-#~ msgstr "Francúzske kanadské"
-
-#~ msgid "Georgian (latin)"
-#~ msgstr "Gruzínske (latinka)"
-
-#~ msgid "Georgian (russian)"
-#~ msgstr "Gruzínske (azbuka)"
-
-#~ msgid "Grc"
-#~ msgstr "Grc"
-
-#~ msgid "Guj"
-#~ msgstr "Guj"
-
-#~ msgid "Hin"
-#~ msgstr "Hin"
-
-#~ msgid "Hindi"
-#~ msgstr "Hindské"
-
-#~ msgid "INSCRIPT layout"
-#~ msgstr "INSCRIPT rozloženie"
-
-#~ msgid "IS434 laptop"
-#~ msgstr "IS434 laptop"
-
-#~ msgid "Iku"
-#~ msgstr "Inu"
-
-#~ msgid "Irish"
-#~ msgstr "Írske"
-
-#~ msgid "Lithuanian azerty standard"
-#~ msgstr "Litovské azerty štandardné"
-
-#~ msgid "Lithuanian qwerty \"numeric\""
-#~ msgstr "Litovské qwerty \"číselné\""
-
-#~ msgid "Logitech iTouch keyboard Internet Navigator"
-#~ msgstr "Logitech iTouch keyboard Internet Navigator"
-
-#~ msgid "Northern Saami (Finland)"
-#~ msgstr "Severný Saami (Fínsko)"
-
-#~ msgid "Northern Saami (Sweden)"
-#~ msgstr "Severný Saami (Švédsko)"
-
-#~ msgid "Ogh"
-#~ msgstr "Ogh"
-
-#~ msgid "Ori"
-#~ msgstr "Ori"
-
-#~ msgid "PC104"
-#~ msgstr "PC104"
-
-#~ msgid "Polish (qwertz)"
-#~ msgstr "Poľské (qwertz)"
-
-#~ msgid "PowerPC PS/2"
-#~ msgstr "PowerPC PS/2"
-
-#~ msgid "Sapmi"
-#~ msgstr "Sapmi"
-
-#~ msgid "Scg"
-#~ msgstr "Scg"
-
-#~ msgid "Slovak (qwerty)"
-#~ msgstr "Slovenské (qwerty)"
-
-#~ msgid "Sme"
-#~ msgstr "Sme"
-
-#~ msgid "Sv"
-#~ msgstr "Sv"
-
-#~ msgid "Tel"
-#~ msgstr "Tel"
-
-#~ msgid "Thai (Kedmanee)"
-#~ msgstr "Thajské (Kedmanee)"
-
-#~ msgid "Tml"
-#~ msgstr "Tml"
-
-#~ msgid "U.S. English w/ dead keys"
-#~ msgstr "Anglické (US) s mŕtvymi klávesmi"
-
-#~ msgid "US"
-#~ msgstr "US"
-
-#~ msgid "Yug"
-#~ msgstr "Juh"
-
-#~ msgid "Yugoslavian"
-#~ msgstr "Juhoslovanské"
-
-#~ msgid "abnt2"
-#~ msgstr "abnt2"
-
-#~ msgid "laptop"
-#~ msgstr "laptop"
-
-#~ msgid "sefi"
-#~ msgstr "sefi"
-
-#~ msgid "si1452"
-#~ msgstr "si1452"
-
-#~ msgid "uni/101/qwerty/comma"
-#~ msgstr "uni/101/qwerty/čiarka"
-
-#~ msgid "uni/101/qwerty/dot"
-#~ msgstr "uni/101/qwerty/bodka"
-
-#~ msgid "uni/101/qwertz/comma"
-#~ msgstr "uni/101/qwertz/čiarka"
-
-#~ msgid "uni/101/qwertz/dot"
-#~ msgstr "uni/101/qwertz/bodka"
-
-#~ msgid "uni/102/qwerty/comma"
-#~ msgstr "uni/102/qwerty/čiarka"
-
-#~ msgid "uni/102/qwerty/dot"
-#~ msgstr "uni/102/qwerty/bodka"
-
-#~ msgid "uni/102/qwertz/comma"
-#~ msgstr "uni/102/qwertz/čiarka"
-
-#~ msgid "uni/102/qwertz/dot"
-#~ msgstr "uni/102/qwertz/bodka"
+# Slovak translation of xkeyboard-config
+# Copyright (C) 2003 Free Software Foundation
+# Zdenko Podobný <zdpo@mailbox.sk>, 2003.
+# Ivan Masár <helix84@centrum.sk>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 1.0-pre1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-06-28 15:21+0100\n"
+"PO-Revision-Date: 2007-09-04 22:49+0100\n"
+"Last-Translator: Zdenko Podobný <zdpo@mailbox.sk>\n"
+"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.2beta3\n"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2
+msgid "(Legacy) Alternative"
+msgstr "(Zastaralé) alternatívne"
+
+#: ../rules/base.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "(Zastaralé) alternatívne, s mŕtvymi klávesmi Sun"
+
+#: ../rules/base.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "(Zastaralé) alternatívne, eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:5
+msgid "(Legacy) Dvorak"
+msgstr "(Zastaralé) dvorak"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/104 key Compatible"
+msgstr "Kompatibilná s 101/104 klávesami"
+
+#: ../rules/base.xml.in.h:7 ../rules/sun.xml.in.h:2
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/čiarka/mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:8 ../rules/sun.xml.in.h:3
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/čiarka/eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:9 ../rules/sun.xml.in.h:4
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/bodka/mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:10 ../rules/sun.xml.in.h:5
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/bodka/eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:11 ../rules/sun.xml.in.h:6
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/čiarka/mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:12
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/čiarka/eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:13 ../rules/sun.xml.in.h:7
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/bodka/mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:14 ../rules/sun.xml.in.h:8
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/bodka/eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:15 ../rules/sun.xml.in.h:9
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/čiarka/mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:16 ../rules/sun.xml.in.h:10
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/čiarka/eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:17 ../rules/sun.xml.in.h:11
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/bodka/mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:18 ../rules/sun.xml.in.h:12
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/bodka/eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:19 ../rules/sun.xml.in.h:13
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/čiarka/mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:20 ../rules/sun.xml.in.h:14
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/čiarka/eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:21 ../rules/sun.xml.in.h:15
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/bodka/mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:22 ../rules/sun.xml.in.h:16
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/bodka/eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:23
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:24
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:25
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
+
+#: ../rules/base.xml.in.h:26
+msgid "ACPI Standard"
+msgstr "Štandard ACPI"
+
+# gruzínske rozloženie
+#: ../rules/base.xml.in.h:27
+msgid "AZERTY Tskapo"
+msgstr "AZERTY Tskapo"
+
+#: ../rules/base.xml.in.h:28
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:29
+msgid "Acer C300"
+msgstr "Acer C300"
+
+#: ../rules/base.xml.in.h:30
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
+
+#: ../rules/base.xml.in.h:31
+msgid "Acer TravelMate 800"
+msgstr "Acer TravelMate 800"
+
+#: ../rules/base.xml.in.h:32
+msgid "Add the EuroSign to the 2 key."
+msgstr "Pridať znak euro na kláves 2."
+
+#: ../rules/base.xml.in.h:33
+msgid "Add the EuroSign to the 5 key."
+msgstr "Pridať znak euro na kláves 5."
+
+#: ../rules/base.xml.in.h:34
+msgid "Add the EuroSign to the E key."
+msgstr "Pridať znak euro na kláves E."
+
+#: ../rules/base.xml.in.h:35
+msgid "Add the standard behavior to Menu key."
+msgstr "Pridať štandardné chovanie klávesu Ponuka."
+
+#: ../rules/base.xml.in.h:36
+msgid "Adding the EuroSign to certain keys"
+msgstr "Pridať znak euro na isté klávesy."
+
+#: ../rules/base.xml.in.h:37
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../rules/base.xml.in.h:38
+msgid "Afg"
+msgstr "Afg"
+
+#: ../rules/base.xml.in.h:39
+msgid "Afghanistan"
+msgstr "Afganistan"
+
+#: ../rules/base.xml.in.h:40
+msgid "Akan"
+msgstr "Akan"
+
+#: ../rules/base.xml.in.h:41
+msgid "Alb"
+msgstr "Alb"
+
+#: ../rules/base.xml.in.h:42
+msgid "Albania"
+msgstr "Albánsko"
+
+#: ../rules/base.xml.in.h:43
+msgid "Alt and Meta are on the Alt keys."
+msgstr "Alt a Meta sú na klávesoch Alt."
+
+#: ../rules/base.xml.in.h:44
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Meta je mapovaný na pravý kláves Win a Super na Ponuku."
+
+#: ../rules/base.xml.in.h:45
+msgid "Alt+CapsLock changes layout."
+msgstr "Alt+Caps Lock mení rozloženie."
+
+#: ../rules/base.xml.in.h:46
+msgid "Alt+Ctrl change layout."
+msgstr "Alt+Control mení rozloženie."
+
+#: ../rules/base.xml.in.h:47
+msgid "Alt+Shift change layout."
+msgstr "Alt+Shift mení rozloženie."
+
+#: ../rules/base.xml.in.h:48
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:49
+msgid "Alt/Win key behavior"
+msgstr "Chovanie klávesu Alt/Win"
+
+#: ../rules/base.xml.in.h:50
+msgid "Alternative"
+msgstr "alternatívne"
+
+#: ../rules/base.xml.in.h:51
+msgid "Alternative Eastern"
+msgstr "alternatívne východné"
+
+#: ../rules/base.xml.in.h:52
+msgid "Alternative Phonetic"
+msgstr "alternatívne fonetické"
+
+#: ../rules/base.xml.in.h:53
+msgid "Alternative international (former us_intl)"
+msgstr "alternatívne medzinárodné (býv. us_intl)"
+
+#: ../rules/base.xml.in.h:54
+msgid "Alternative, Sun dead keys"
+msgstr "alternatívne, mŕtve klávesy Sun"
+
+#: ../rules/base.xml.in.h:55
+msgid "Alternative, eliminate dead keys"
+msgstr "alternatívne, eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:56
+msgid "Alternative, latin-9 only"
+msgstr "alternatívne, iba latin-9"
+
+#: ../rules/base.xml.in.h:57
+msgid "And"
+msgstr "And"
+
+#: ../rules/base.xml.in.h:58
+msgid "Andorra"
+msgstr "Andorra"
+
+#: ../rules/base.xml.in.h:59
+msgid "Apostrophe (') variant"
+msgstr "Variant (') apostrof"
+
+#: ../rules/base.xml.in.h:60
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:61
+msgid "Apple Laptop"
+msgstr "Apple laptop"
+
+#: ../rules/base.xml.in.h:62
+msgid "Ara"
+msgstr "Ara"
+
+#: ../rules/base.xml.in.h:63
+msgid "Arabic"
+msgstr "Arabsky"
+
+#: ../rules/base.xml.in.h:64
+msgid "Arm"
+msgstr "Arm"
+
+#: ../rules/base.xml.in.h:65
+msgid "Armenia"
+msgstr "Arménsko"
+
+#: ../rules/base.xml.in.h:66
+msgid "Aze"
+msgstr "Aze"
+
+#: ../rules/base.xml.in.h:67
+msgid "Azerbaijan"
+msgstr "Azerbajdžan"
+
+#: ../rules/base.xml.in.h:68
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 bezdrôtová internetová klávesnica"
+
+#: ../rules/base.xml.in.h:69
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:70
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: ../rules/base.xml.in.h:71
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:72
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:73
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:74
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:75
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
+
+#: ../rules/base.xml.in.h:76
+msgid "Ban"
+msgstr "Ban"
+
+#: ../rules/base.xml.in.h:77
+msgid "Bangladesh"
+msgstr "Bangladéš"
+
+#: ../rules/base.xml.in.h:78 ../rules/sun.xml.in.h:22
+msgid "Bel"
+msgstr "Bel"
+
+#: ../rules/base.xml.in.h:79
+msgid "Belarus"
+msgstr "Bielorusko"
+
+#: ../rules/base.xml.in.h:80
+msgid "Belgium"
+msgstr "Belgicko"
+
+#: ../rules/base.xml.in.h:81
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:82
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
+
+#: ../rules/base.xml.in.h:83
+msgid "Bengali"
+msgstr "Bengálska"
+
+#: ../rules/base.xml.in.h:84
+msgid "Bengali Probhat"
+msgstr "Bengálsky Probhat"
+
+#: ../rules/base.xml.in.h:85
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Bepo, ergonomické, na spôsob Dvorak"
+
+#: ../rules/base.xml.in.h:86
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Bepo, ergonomické, na spôsob Dvorak, iba latin-9"
+
+#: ../rules/base.xml.in.h:87 ../rules/sun.xml.in.h:24
+msgid "Bgr"
+msgstr "Bgr"
+
+#: ../rules/base.xml.in.h:88
+msgid "Bhu"
+msgstr "Bhu"
+
+#: ../rules/base.xml.in.h:89
+msgid "Bhutan"
+msgstr "Bhután"
+
+#: ../rules/base.xml.in.h:90
+msgid "Biblical Hebrew (Tiro)"
+msgstr "biblická hebrejčina (Tiro)"
+
+#: ../rules/base.xml.in.h:91
+msgid "Bih"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:92
+msgid "Blr"
+msgstr "Blr"
+
+#: ../rules/base.xml.in.h:93
+msgid "Bosnia and Herzegovina"
+msgstr "Bosna a Hercegovina"
+
+#: ../rules/base.xml.in.h:94
+msgid "Both Alt keys together change layout."
+msgstr "Oba klávesy Alt spolu menia rozloženie."
+
+#: ../rules/base.xml.in.h:95
+msgid "Both Ctrl keys together change layout."
+msgstr "Oba klávesy Ctrl spolu menia rozloženie."
+
+#: ../rules/base.xml.in.h:96
+msgid "Both Shift keys together change layout."
+msgstr "Oba klávesy Shift spolu menia rozloženie."
+
+#: ../rules/base.xml.in.h:97
+msgid "Both Win-keys switch layout while pressed."
+msgstr "Oba klávesy Win spolu menia rozloženie."
+
+#: ../rules/base.xml.in.h:98
+msgid "Bra"
+msgstr "Bra"
+
+#: ../rules/base.xml.in.h:99
+msgid "Braille"
+msgstr "Brailleovo"
+
+#: ../rules/base.xml.in.h:100
+msgid "Brazil"
+msgstr "Brazília"
+
+#: ../rules/base.xml.in.h:101
+msgid "Brazilian ABNT2"
+msgstr "Brazílska ABNT2"
+
+#: ../rules/base.xml.in.h:102
+msgid "Brl"
+msgstr "Brl"
+
+#: ../rules/base.xml.in.h:103
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
+
+#: ../rules/base.xml.in.h:104
+msgid "Buckwalter"
+msgstr "Buckwalter (transliterácia arabčiny)"
+
+#: ../rules/base.xml.in.h:105
+msgid "Bulgaria"
+msgstr "Bulharsko"
+
+#: ../rules/base.xml.in.h:106
+msgid "Cambodia"
+msgstr "Kambodža"
+
+#: ../rules/base.xml.in.h:107 ../rules/sun.xml.in.h:29
+msgid "Can"
+msgstr "Can"
+
+#: ../rules/base.xml.in.h:108
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../rules/base.xml.in.h:109
+msgid "Caps Lock is Compose."
+msgstr "Caps Lock je Compose."
+
+#: ../rules/base.xml.in.h:110
+msgid "CapsLock LED shows alternative layout."
+msgstr "Caps Lock LED zobrazuje alternatívne rozloženie."
+
+#: ../rules/base.xml.in.h:111
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+msgstr "Caps Lock funguje ako Shift s uzamknutím. Shift „pozastaví“ Caps Lock."
+
+#: ../rules/base.xml.in.h:112
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+msgstr "Caps Lock funguje ako Shift s uzamknutím. Shift neovplyvňuje Caps Lock."
+
+#: ../rules/base.xml.in.h:113
+msgid "CapsLock just locks the Shift modifier."
+msgstr "CapsLock iba zamkne modifikátor Shift."
+
+#: ../rules/base.xml.in.h:114 ../rules/sun.xml.in.h:33
+msgid "CapsLock key behavior"
+msgstr "Správanie klávesu Caps Lock"
+
+#: ../rules/base.xml.in.h:115
+msgid "CapsLock key changes layout."
+msgstr "Kláves Caps Lock mení rozloženie."
+
+#: ../rules/base.xml.in.h:116
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "Caps Lock prepne Shift, čím ovplyvní všetky klávesy."
+
+#: ../rules/base.xml.in.h:117
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "Caps Lock prepne nermálnu kapitalizáciu abecedných znakov."
+
+#: ../rules/base.xml.in.h:118
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+msgstr "Caps Lock používa interný prevod na kapitálky. Shift „pozastaví“ Caps Lock."
+
+#: ../rules/base.xml.in.h:119
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+msgstr "Caps Lock používa interný prevod na kapitálky. Shift neovplyvňuje Caps Lock."
+
+#: ../rules/base.xml.in.h:120
+msgid "Catalan variant with middle-dot L"
+msgstr "Katalánsky variant s L s bodkou v strede"
+
+#: ../rules/base.xml.in.h:121
+msgid "Che"
+msgstr "Che"
+
+#: ../rules/base.xml.in.h:122
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:123
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (alternatívna voľba)"
+
+#: ../rules/base.xml.in.h:124
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:125
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:126
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
+
+#: ../rules/base.xml.in.h:127
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard"
+
+#: ../rules/base.xml.in.h:128
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:129
+msgid "Chuvash"
+msgstr "Čuvašské"
+
+#: ../rules/base.xml.in.h:130
+msgid "Chuvash Latin"
+msgstr "Čuvašské latin"
+
+#: ../rules/base.xml.in.h:131
+msgid "Classic Dvorak"
+msgstr "Klasické dvorak"
+
+#: ../rules/base.xml.in.h:132
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:133
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
+
+#: ../rules/base.xml.in.h:134
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 kláves)"
+
+#: ../rules/base.xml.in.h:135
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 kláves)"
+
+#: ../rules/base.xml.in.h:136
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 kláves)"
+
+#: ../rules/base.xml.in.h:137
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
+
+#: ../rules/base.xml.in.h:138
+msgid "Compose key position"
+msgstr "Pozícia klávesu Compose"
+
+#: ../rules/base.xml.in.h:139
+msgid "Congo, Democratic Republic of the"
+msgstr "Konžská demokratická republika"
+
+#: ../rules/base.xml.in.h:140
+msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
+msgstr "Control je mapovaný na klávesy Win (a zvyčajné klávesy Ctrl)."
+
+#: ../rules/base.xml.in.h:141
+msgid "Croatia"
+msgstr "Chorvátsko"
+
+#: ../rules/base.xml.in.h:142
+msgid "Ctrl key at bottom left"
+msgstr "Kláves Ctrl vľavo dole"
+
+#: ../rules/base.xml.in.h:143
+msgid "Ctrl key at left of 'A'"
+msgstr "Kláves Ctrl naľavo od „A“"
+
+#: ../rules/base.xml.in.h:144
+msgid "Ctrl key position"
+msgstr "Pozícia klávesu Ctrl"
+
+#: ../rules/base.xml.in.h:145
+msgid "Ctrl+Shift change layout."
+msgstr "Ctrl+Shift mení rozloženie."
+
+#: ../rules/base.xml.in.h:146
+msgid "Cyrillic"
+msgstr "azbuka"
+
+#: ../rules/base.xml.in.h:147 ../rules/sun.xml.in.h:39
+msgid "Cze"
+msgstr "Čes"
+
+#: ../rules/base.xml.in.h:148
+msgid "Czechia"
+msgstr "Česko"
+
+#: ../rules/base.xml.in.h:149
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:150
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:151 ../rules/sun.xml.in.h:42
+msgid "Dead acute"
+msgstr "mŕtvy dĺžeň"
+
+#: ../rules/base.xml.in.h:152 ../rules/sun.xml.in.h:43
+msgid "Dead grave acute"
+msgstr "mŕtvy opačný dĺžeň"
+
+#: ../rules/base.xml.in.h:153
+msgid "Default numeric keypad keys."
+msgstr "Štandardné klávesy numerickej klávesnice."
+
+#: ../rules/base.xml.in.h:154
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:155
+msgid "Dell 101-key PC"
+msgstr "DELL PC 101 kláves"
+
+#: ../rules/base.xml.in.h:156
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:157
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell Laptop/notebook Precision série M"
+
+#: ../rules/base.xml.in.h:158
+msgid "Dell Latitude series laptop"
+msgstr "Laptop série Dell Latitude"
+
+#: ../rules/base.xml.in.h:159
+msgid "Dell SK-8125 USB Multimedia Keybard"
+msgstr "Dell SK-8125 USB multimediálna klávesnica"
+
+#: ../rules/base.xml.in.h:160
+msgid "Dell SK-8135 USB Multimedia Keybard"
+msgstr "Dell SK-8135 USB multimediálna klávesnica"
+
+#: ../rules/base.xml.in.h:161
+msgid "Dell USB Multimedia Keybard"
+msgstr "Dell USB multimediálna klávesnica"
+
+#: ../rules/base.xml.in.h:162
+msgid "Denmark"
+msgstr "Dánsko"
+
+#: ../rules/base.xml.in.h:163 ../rules/sun.xml.in.h:44
+msgid "Deu"
+msgstr "Nem"
+
+#: ../rules/base.xml.in.h:164
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:165
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond séria 9801 / 9802"
+
+#: ../rules/base.xml.in.h:166 ../rules/sun.xml.in.h:46
+msgid "Dnk"
+msgstr "Dán"
+
+# rozloženie klávesnice
+#: ../rules/base.xml.in.h:167 ../rules/sun.xml.in.h:48
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:168
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "Dvorak, poľské úvodzovky na klávese „1/!“"
+
+#: ../rules/base.xml.in.h:169
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorak, poľské úvodzovky na klávese úvodzoviek"
+
+#: ../rules/base.xml.in.h:170
+msgid "Eastern"
+msgstr "východné"
+
+#: ../rules/base.xml.in.h:171 ../rules/sun.xml.in.h:49
+msgid "Eliminate dead keys"
+msgstr "Eliminovať mrtvé kláves"
+
+#: ../rules/base.xml.in.h:172
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:173
+msgid "Epo"
+msgstr "Epo"
+
+#: ../rules/base.xml.in.h:174
+msgid "Ergonomic"
+msgstr "ergonomické"
+
+#: ../rules/base.xml.in.h:175 ../rules/sun.xml.in.h:50
+msgid "Esp"
+msgstr "Špa"
+
+#: ../rules/base.xml.in.h:176
+msgid "Esperanto"
+msgstr "esperanto"
+
+#: ../rules/base.xml.in.h:177
+msgid "Est"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:178
+msgid "Estonia"
+msgstr "Estónsko"
+
+#: ../rules/base.xml.in.h:179
+msgid "Eth"
+msgstr "Eth"
+
+#: ../rules/base.xml.in.h:180
+msgid "Ethiopia"
+msgstr "Etiópia"
+
+#: ../rules/base.xml.in.h:181
+msgid "Evdev-managed keyboard"
+msgstr "Klávesnica spravovaná Evdev"
+
+#: ../rules/base.xml.in.h:182
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:183
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../rules/base.xml.in.h:184
+msgid "Extended"
+msgstr "rozšírené"
+
+#: ../rules/base.xml.in.h:185
+msgid "Extended Backslash"
+msgstr "Široký backslash"
+
+#: ../rules/base.xml.in.h:186
+msgid "F-letter (F) variant"
+msgstr "variant písmena F"
+
+#: ../rules/base.xml.in.h:187
+msgid "Fao"
+msgstr "Fao"
+
+#: ../rules/base.xml.in.h:188
+msgid "Faroe Islands"
+msgstr "Faerské ostrovy"
+
+#: ../rules/base.xml.in.h:189 ../rules/sun.xml.in.h:51
+msgid "Fin"
+msgstr "Fín"
+
+#: ../rules/base.xml.in.h:190
+msgid "Finland"
+msgstr "Fínsko"
+
+#: ../rules/base.xml.in.h:191
+msgid "Force standard legacy keypad"
+msgstr "Vynútiť štandardnú zastaralú numerickú klávesnicu"
+
+#: ../rules/base.xml.in.h:192 ../rules/sun.xml.in.h:53
+msgid "Fra"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:193
+msgid "France"
+msgstr "Francúzsko"
+
+#: ../rules/base.xml.in.h:194 ../rules/sun.xml.in.h:55
+msgid "French"
+msgstr "Francúzske"
+
+#: ../rules/base.xml.in.h:195
+msgid "French (Macintosh)"
+msgstr "Francúzske (Macintosh)"
+
+#: ../rules/base.xml.in.h:196 ../rules/sun.xml.in.h:56
+msgid "French (legacy)"
+msgstr "Francúzske (zastaralé)"
+
+#: ../rules/base.xml.in.h:197
+msgid "French Dvorak"
+msgstr "Francúzske dvorak"
+
+#: ../rules/base.xml.in.h:198
+msgid "French, Sun dead keys"
+msgstr "Francúzske, mŕtve klávesy Sun"
+
+#: ../rules/base.xml.in.h:199
+msgid "French, eliminate dead keys"
+msgstr "Francúzske, eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:200
+msgid "Fula"
+msgstr "fulbčina"
+
+#: ../rules/base.xml.in.h:201
+msgid "GBr"
+msgstr "VBr"
+
+#: ../rules/base.xml.in.h:202
+msgid "Ga"
+msgstr "Ga"
+
+#: ../rules/base.xml.in.h:203
+msgid "Generic 101-key PC"
+msgstr "všeobecná PC 101 kláves"
+
+#: ../rules/base.xml.in.h:204
+msgid "Generic 102-key (Intl) PC"
+msgstr "všeobecná PC 102 kláves (medz.)"
+
+#: ../rules/base.xml.in.h:205
+msgid "Generic 104-key PC"
+msgstr "všeobecná PC 104 kláves"
+
+#: ../rules/base.xml.in.h:206
+msgid "Generic 105-key (Intl) PC"
+msgstr "všeobecná 105-kláv. (medzinár.) PC"
+
+#: ../rules/base.xml.in.h:207
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:208
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+
+#: ../rules/base.xml.in.h:209
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:210
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:211
+msgid "Geo"
+msgstr "Gru"
+
+#: ../rules/base.xml.in.h:212
+msgid "Georgia"
+msgstr "Gruzínsko"
+
+#: ../rules/base.xml.in.h:213
+msgid "German (Macintosh)"
+msgstr "Nemecké (Macintosh)"
+
+#: ../rules/base.xml.in.h:214
+msgid "German, Sun dead keys"
+msgstr "Nemecké, mŕtve klávesy Sun"
+
+#: ../rules/base.xml.in.h:215
+msgid "German, eliminate dead keys"
+msgstr "Francúzske, eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:216
+msgid "Germany"
+msgstr "Nemecko"
+
+#: ../rules/base.xml.in.h:217
+msgid "Gha"
+msgstr "Gha"
+
+#: ../rules/base.xml.in.h:218
+msgid "Ghana"
+msgstr "Ghana"
+
+#: ../rules/base.xml.in.h:219
+msgid "Gre"
+msgstr "Gre"
+
+#: ../rules/base.xml.in.h:220
+msgid "Greece"
+msgstr "Grécko"
+
+#: ../rules/base.xml.in.h:221
+msgid "Gujarati"
+msgstr "Gudžarátska"
+
+#: ../rules/base.xml.in.h:222
+msgid "Gurmukhi"
+msgstr "Gurmuchské"
+
+# je firma
+#: ../rules/base.xml.in.h:223
+msgid "Gyration"
+msgstr "Gyration"
+
+#: ../rules/base.xml.in.h:224
+msgid "Hausa"
+msgstr "hauské"
+
+#: ../rules/base.xml.in.h:225
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
+
+#: ../rules/base.xml.in.h:226
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:227
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:228
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:229
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:230
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:231
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:232
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:233
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:234
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
+
+# bolnagri je vstupná metóda
+#: ../rules/base.xml.in.h:235
+msgid "Hindi Bolnagri"
+msgstr "hindské bolnagri"
+
+#: ../rules/base.xml.in.h:236
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:237
+msgid "Hrv"
+msgstr "Chor"
+
+#: ../rules/base.xml.in.h:238 ../rules/sun.xml.in.h:59
+msgid "Hun"
+msgstr "Maď"
+
+#: ../rules/base.xml.in.h:239
+msgid "Hungary"
+msgstr "Maďarsko"
+
+#: ../rules/base.xml.in.h:240
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper je mapovaný na Win-klávesy."
+
+#: ../rules/base.xml.in.h:241
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:242
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:243
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:244
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (alternatívna voľba)"
+
+#: ../rules/base.xml.in.h:245
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:246
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+
+#: ../rules/base.xml.in.h:247 ../rules/sun.xml.in.h:61
+msgid "ISO Alternate"
+msgstr "ISO alternatívne"
+
+#: ../rules/base.xml.in.h:248
+msgid "Iceland"
+msgstr "Island"
+
+#: ../rules/base.xml.in.h:249
+msgid "Igbo"
+msgstr "igbo"
+
+#: ../rules/base.xml.in.h:250
+msgid "Ind"
+msgstr "Ind"
+
+#: ../rules/base.xml.in.h:251
+msgid "India"
+msgstr "India"
+
+#: ../rules/base.xml.in.h:252 ../rules/sun.xml.in.h:62
+msgid "International (with dead keys)"
+msgstr "Medzinárodné (s mŕtvymi klávesmi)"
+
+#: ../rules/base.xml.in.h:253
+msgid "Inuktitut"
+msgstr "inuktitut"
+
+#: ../rules/base.xml.in.h:254
+msgid "Iran"
+msgstr "Irán"
+
+#: ../rules/base.xml.in.h:255
+msgid "Iraq"
+msgstr "Irak"
+
+#: ../rules/base.xml.in.h:256
+msgid "Ireland"
+msgstr "Írsko"
+
+#: ../rules/base.xml.in.h:257
+msgid "Irl"
+msgstr "Irs"
+
+#: ../rules/base.xml.in.h:258
+msgid "Irn"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:259
+msgid "Irq"
+msgstr "Irq"
+
+#: ../rules/base.xml.in.h:260
+msgid "Isl"
+msgstr "Isl"
+
+#: ../rules/base.xml.in.h:261
+msgid "Isr"
+msgstr "Izr"
+
+#: ../rules/base.xml.in.h:262
+msgid "Israel"
+msgstr "Izrael"
+
+#: ../rules/base.xml.in.h:263 ../rules/sun.xml.in.h:63
+msgid "Ita"
+msgstr "Tal"
+
+#: ../rules/base.xml.in.h:264
+msgid "Italy"
+msgstr "Taliansko"
+
+#: ../rules/base.xml.in.h:265
+msgid "Japan"
+msgstr "Japonsko"
+
+#: ../rules/base.xml.in.h:266
+msgid "Japan (PC-98xx Series)"
+msgstr "Japonské (séria PC-98xx)"
+
+#: ../rules/base.xml.in.h:267
+msgid "Japanese 106-key"
+msgstr "Japonské 106 kláves"
+
+#: ../rules/base.xml.in.h:268
+msgid "Japanese keyboard options"
+msgstr "Japonské možnosti klávesnice"
+
+#: ../rules/base.xml.in.h:269 ../rules/sun.xml.in.h:66
+msgid "Jpn"
+msgstr "Jpn"
+
+# Kana is a general term for the syllabic Japanese scripts hiragana (ひらがな) and katakana (カタカナ) as well as the old system known as man'yōgana.
+#: ../rules/base.xml.in.h:270
+msgid "Kana"
+msgstr "Kana"
+
+#: ../rules/base.xml.in.h:271
+msgid "Kana Lock key is locking"
+msgstr "Kláves Kana Lock zamyká"
+
+#: ../rules/base.xml.in.h:272
+msgid "Kannada"
+msgstr "Kannadské"
+
+#: ../rules/base.xml.in.h:273
+msgid "Kashubian"
+msgstr "kašubčina"
+
+#: ../rules/base.xml.in.h:274
+msgid "Kaz"
+msgstr "Kaz"
+
+#: ../rules/base.xml.in.h:275
+msgid "Kazakh with Russian"
+msgstr "Kazašské s ruštinou"
+
+#: ../rules/base.xml.in.h:276
+msgid "Kazakhstan"
+msgstr "Kazachstan"
+
+#: ../rules/base.xml.in.h:277
+msgid "Keypad"
+msgstr "Numerická klávesnica"
+
+#: ../rules/base.xml.in.h:278
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:279
+msgid "Khm"
+msgstr "Khm"
+
+#: ../rules/base.xml.in.h:280
+msgid "Kor"
+msgstr "Kor"
+
+#: ../rules/base.xml.in.h:281
+msgid "Korea, Republic of"
+msgstr "Kórejská republika"
+
+#: ../rules/base.xml.in.h:282
+msgid "Korean 106-key"
+msgstr "Kórejské, 106 kláves"
+
+# fínske rozloženie
+# http://kotoistus.tksoft.com/linux/index-en.html
+#: ../rules/base.xml.in.h:283
+msgid "Kotoistus"
+msgstr "Kotoistus"
+
+#: ../rules/base.xml.in.h:284
+msgid "Kurdish, (F)"
+msgstr "Kurdské, (F)"
+
+#: ../rules/base.xml.in.h:285
+msgid "Kurdish, Arabic-Latin"
+msgstr "kurdčina, arabsko-latinské"
+
+#: ../rules/base.xml.in.h:286
+msgid "Kurdish, Latin Alt-Q"
+msgstr "kurdčina, latinské Alt-Q"
+
+#: ../rules/base.xml.in.h:287
+msgid "Kurdish, Latin Q"
+msgstr "kurdčina, latinské Q"
+
+#: ../rules/base.xml.in.h:288
+msgid "Kyr"
+msgstr "Kyr"
+
+#: ../rules/base.xml.in.h:289
+msgid "Kyrgyzstan"
+msgstr "Kirgizsko"
+
+#: ../rules/base.xml.in.h:290
+msgid "LAm"
+msgstr "LAm"
+
+#: ../rules/base.xml.in.h:291
+msgid "LCtrl+LShift change layout."
+msgstr "ľavý Ctrl+ľavý Shift mení rozloženie."
+
+#: ../rules/base.xml.in.h:292
+msgid "Lao"
+msgstr "Lao"
+
+#: ../rules/base.xml.in.h:293
+msgid "Laos"
+msgstr "Laos"
+
+#: ../rules/base.xml.in.h:294
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Laptop/notebook Compaq (napr. Armada) Laptop Keyboard"
+
+#: ../rules/base.xml.in.h:295
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Laptop/notebook Compaq (napr. Presario) Internet Keyboard"
+
+#: ../rules/base.xml.in.h:296
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Laptop/notebook eMachines m68xx"
+
+#: ../rules/base.xml.in.h:297
+msgid "Latin"
+msgstr "Latinské"
+
+#: ../rules/base.xml.in.h:298
+msgid "Latin American"
+msgstr "Latinskoamerické"
+
+#: ../rules/base.xml.in.h:299
+msgid "Latin Unicode"
+msgstr "Latinské Unicode"
+
+#: ../rules/base.xml.in.h:300
+msgid "Latin Unicode qwerty"
+msgstr "Latinské Unicode qwerty"
+
+#: ../rules/base.xml.in.h:301
+msgid "Latin qwerty"
+msgstr "Latinské qwerty"
+
+# « »
+#: ../rules/base.xml.in.h:302
+msgid "Latin with guillemets"
+msgstr "Latinské s uhlovými zátvorkami"
+
+#: ../rules/base.xml.in.h:303
+msgid "Latvia"
+msgstr "Lotyšsko"
+
+#: ../rules/base.xml.in.h:304
+msgid "Layout switching"
+msgstr "Prepínanie rozloženia"
+
+#: ../rules/base.xml.in.h:305
+msgid "Left Alt is swapped with left Win-key."
+msgstr "Ľavý Alt je vymenený s ľavým klávesom Win."
+
+#: ../rules/base.xml.in.h:306
+msgid "Left Alt key changes layout."
+msgstr "Ľavý kláves Alt mení rozloženie."
+
+#: ../rules/base.xml.in.h:307
+msgid "Left Alt key switches layout while pressed."
+msgstr "Ľavý kláves Alt prepína rozloženie pri stlačení."
+
+#: ../rules/base.xml.in.h:308
+msgid "Left Ctrl key changes layout."
+msgstr "Ľavý kláves Ctrl mení rozloženie."
+
+#: ../rules/base.xml.in.h:309
+msgid "Left Shift key changes layout."
+msgstr "Ľavý kláves Shift mení rozloženie."
+
+#: ../rules/base.xml.in.h:310
+msgid "Left Win-key changes layout."
+msgstr "Ľavý kláves Win mení rozloženie."
+
+#: ../rules/base.xml.in.h:311
+msgid "Left Win-key is Compose."
+msgstr "Ľavý kláves Win je Compose."
+
+#: ../rules/base.xml.in.h:312
+msgid "Left Win-key switches layout while pressed."
+msgstr "Ľavý kláves Win prepína rozloženie pri stlačení."
+
+#: ../rules/base.xml.in.h:313
+msgid "Left hand"
+msgstr "ľavá ruka"
+
+#: ../rules/base.xml.in.h:314
+msgid "Left handed Dvorak"
+msgstr "ľavá ruka dvorak"
+
+#: ../rules/base.xml.in.h:315
+msgid "Lithuania"
+msgstr "Litva"
+
+#: ../rules/base.xml.in.h:316
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
+
+#: ../rules/base.xml.in.h:317
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:318
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:319
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:320
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:321
+msgid "Logitech Cordless Desktop Pro"
+msgstr "Logitech Cordless Desktop Pro"
+
+#: ../rules/base.xml.in.h:322
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Logitech Cordless Desktop Pro (alternatívna voľba)"
+
+#: ../rules/base.xml.in.h:323
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (alternatívna voľba2)"
+
+#: ../rules/base.xml.in.h:324
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:325
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:326
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15 extra klávesy pomocou G15daemon"
+
+#: ../rules/base.xml.in.h:327
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:328
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: ../rules/base.xml.in.h:329
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
+
+#: ../rules/base.xml.in.h:330
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Keyboard"
+
+#: ../rules/base.xml.in.h:331
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:332
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+
+#: ../rules/base.xml.in.h:333
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
+
+#: ../rules/base.xml.in.h:334
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+
+#: ../rules/base.xml.in.h:335
+msgid "Ltu"
+msgstr "Lit"
+
+#: ../rules/base.xml.in.h:336
+msgid "Lva"
+msgstr "Lot"
+
+#: ../rules/base.xml.in.h:337
+msgid "MESS"
+msgstr "MESS"
+
+#: ../rules/base.xml.in.h:338
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
+
+#: ../rules/base.xml.in.h:339
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (medzin)"
+
+#: ../rules/base.xml.in.h:340
+msgid "Macedonia"
+msgstr "Macedónsko"
+
+#: ../rules/base.xml.in.h:341
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:342
+msgid "Macintosh Old"
+msgstr "Macintosh staré"
+
+#: ../rules/base.xml.in.h:343
+msgid "Macintosh, Sun dead keys"
+msgstr "Macintosh, mŕtve klávesy Sun"
+
+#: ../rules/base.xml.in.h:344
+msgid "Macintosh, eliminate dead keys"
+msgstr "Macintosh, eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:345
+msgid "Make CapsLock an additional Ctrl."
+msgstr "Urobiť z CapsLock ďalší Ctrl."
+
+#: ../rules/base.xml.in.h:346
+msgid "Mal"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:347
+msgid "Malayalam"
+msgstr "Malajalámske"
+
+#: ../rules/base.xml.in.h:348
+msgid "Maldives"
+msgstr "Maldivy"
+
+#: ../rules/base.xml.in.h:349
+msgid "Malta"
+msgstr "Malta"
+
+#: ../rules/base.xml.in.h:350
+msgid "Maltese keyboard with US layout"
+msgstr "Maltézska klávesnica s rozložením USA"
+
+#: ../rules/base.xml.in.h:351
+msgid "Mao"
+msgstr "Mao"
+
+#: ../rules/base.xml.in.h:352
+msgid "Maori"
+msgstr "maorčina"
+
+#: ../rules/base.xml.in.h:353
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:354
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
+
+#: ../rules/base.xml.in.h:355
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:356
+msgid "Menu is Compose."
+msgstr "Ponuka je Compose."
+
+#: ../rules/base.xml.in.h:357
+msgid "Menu key changes layout."
+msgstr "Kláves Ponuka mení rozloženie."
+
+#: ../rules/base.xml.in.h:358
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta je mapovaný na Win-klávesy."
+
+#: ../rules/base.xml.in.h:359
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta je mapovaný na ľavý Win-kláves."
+
+#: ../rules/base.xml.in.h:360
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
+
+#: ../rules/base.xml.in.h:361
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, Švédska"
+
+#: ../rules/base.xml.in.h:362
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:363
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:364
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: ../rules/base.xml.in.h:365
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:366
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
+
+#: ../rules/base.xml.in.h:367
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+
+#: ../rules/base.xml.in.h:368 ../rules/sun.xml.in.h:72
+msgid "Miscellaneous compatibility options"
+msgstr "Dodatočné voľby pre kompatibilitu"
+
+#: ../rules/base.xml.in.h:369
+msgid "Mkd"
+msgstr "Mak"
+
+#: ../rules/base.xml.in.h:370
+msgid "Mlt"
+msgstr "Mlt"
+
+#: ../rules/base.xml.in.h:371
+msgid "Mmr"
+msgstr "Mmr"
+
+#: ../rules/base.xml.in.h:372
+msgid "Mng"
+msgstr "Mng"
+
+#: ../rules/base.xml.in.h:373
+msgid "Mongolia"
+msgstr "Mongolsko"
+
+#: ../rules/base.xml.in.h:374
+msgid "Morocco"
+msgstr "Maroko"
+
+#: ../rules/base.xml.in.h:375 ../rules/sun.xml.in.h:73
+msgid "Multilingual"
+msgstr "Viacjazyčné"
+
+#: ../rules/base.xml.in.h:376
+msgid "Multilingual, first part"
+msgstr "Viacjazyčné, prvá časť"
+
+#: ../rules/base.xml.in.h:377 ../rules/sun.xml.in.h:74
+msgid "Multilingual, second part"
+msgstr "Viacjazyčné, druhá časť"
+
+#: ../rules/base.xml.in.h:378
+msgid "Myanmar"
+msgstr "Mjanmarsko"
+
+#: ../rules/base.xml.in.h:379
+msgid "NICOLA-F style Backspace"
+msgstr "Backspace v štýle NICOLA-F"
+
+#: ../rules/base.xml.in.h:380
+msgid "Neostyle"
+msgstr "Neoštýl"
+
+#: ../rules/base.xml.in.h:381
+msgid "Nep"
+msgstr "Nep"
+
+#: ../rules/base.xml.in.h:382
+msgid "Nepal"
+msgstr "Nepál"
+
+#: ../rules/base.xml.in.h:383
+msgid "Netherlands"
+msgstr "Holandsko"
+
+#: ../rules/base.xml.in.h:384
+msgid "Nig"
+msgstr "Nig"
+
+#: ../rules/base.xml.in.h:385
+msgid "Nigeria"
+msgstr "Nigéria"
+
+#: ../rules/base.xml.in.h:386
+msgid "Nld"
+msgstr "Nld"
+
+#: ../rules/base.xml.in.h:387 ../rules/sun.xml.in.h:75
+msgid "Nor"
+msgstr "Nor"
+
+#: ../rules/base.xml.in.h:388
+msgid "Northern Saami"
+msgstr "severná saamčina"
+
+#: ../rules/base.xml.in.h:389
+msgid "Northern Saami, eliminate dead keys"
+msgstr "severná saamčina, eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:390
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:391
+msgid "Norway"
+msgstr "Nórsko"
+
+#: ../rules/base.xml.in.h:392
+msgid "NumLock LED shows alternative layout."
+msgstr "Num Lock LED zobrazuje alternatívne rozloženie."
+
+#: ../rules/base.xml.in.h:393
+msgid "Numeric keypad keys work as with Mac."
+msgstr "Numerická klávesnica funguje ako na Mac."
+
+#: ../rules/base.xml.in.h:394
+msgid "Numeric keypad layout selection"
+msgstr "Výber rozloženia numerickej klávesnice"
+
+#: ../rules/base.xml.in.h:395
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:396
+msgid "Ogham"
+msgstr "Oghamské"
+
+#: ../rules/base.xml.in.h:397
+msgid "Ogham IS434"
+msgstr "Ogham IS434"
+
+#: ../rules/base.xml.in.h:398
+msgid "Oriya"
+msgstr "uríjčina"
+
+#: ../rules/base.xml.in.h:399
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/internetová klávesnica"
+
+#: ../rules/base.xml.in.h:400
+msgid "Ossetian"
+msgstr "Osetské"
+
+#: ../rules/base.xml.in.h:401
+msgid "Ossetian, Winkeys"
+msgstr "Osetské, klávesy Win"
+
+#: ../rules/base.xml.in.h:402
+msgid "PC-98xx Series"
+msgstr "Séria PC-98xx"
+
+#: ../rules/base.xml.in.h:403
+msgid "Pak"
+msgstr "Pak"
+
+#: ../rules/base.xml.in.h:404
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: ../rules/base.xml.in.h:405
+msgid "Pashto"
+msgstr "paštčina"
+
+# thajské rozloženie
+#: ../rules/base.xml.in.h:406
+msgid "Pattachote"
+msgstr "Pattachote"
+
+#: ../rules/base.xml.in.h:407 ../rules/sun.xml.in.h:78
+msgid "Phonetic"
+msgstr "Fonetické"
+
+#: ../rules/base.xml.in.h:408 ../rules/sun.xml.in.h:79
+msgid "Pol"
+msgstr "Pol"
+
+#: ../rules/base.xml.in.h:409
+msgid "Poland"
+msgstr "Poľsko"
+
+#: ../rules/base.xml.in.h:410
+msgid "Polytonic"
+msgstr "Polytónické"
+
+#: ../rules/base.xml.in.h:411
+msgid "Portugal"
+msgstr "Portugalsko"
+
+#: ../rules/base.xml.in.h:412
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Stlačenie ľavého klávesu Alt vyberá 3. úroveň."
+
+#: ../rules/base.xml.in.h:413
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Stlačenie ľavého klávesu Win vyberá 3. úroveň."
+
+#: ../rules/base.xml.in.h:414
+msgid "Press Menu key to choose 3rd level."
+msgstr "Stlačenie klávesu Ponuka vyberá 3. úroveň."
+
+#: ../rules/base.xml.in.h:415
+msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr "Stlačenie pravého klávesu Alt vyberá 3. úroveň, Shift+pravý kláves Alt key je Multi_Key."
+
+#: ../rules/base.xml.in.h:416
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Stlačenie pravého klávesu Alt vyberá 3. úroveň."
+
+#: ../rules/base.xml.in.h:417
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Stlačenie pravého Ctrl vyberá 3. úroveň."
+
+#: ../rules/base.xml.in.h:418
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Stlačenie pravého klávesu Win vyberá 3. úroveň."
+
+#: ../rules/base.xml.in.h:419
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Stlačenie ľubovoľného klávesu Alt vyberá 3. úroveň."
+
+#: ../rules/base.xml.in.h:420
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Stlačenie ľubovoľného klávesu Win vyberá 3. úroveň."
+
+#: ../rules/base.xml.in.h:421
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:422
+msgid "Pro Keypad"
+msgstr "Pro Keypad"
+
+#: ../rules/base.xml.in.h:423
+msgid "Probhat"
+msgstr "Probhat"
+
+#: ../rules/base.xml.in.h:424
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:425 ../rules/sun.xml.in.h:88
+msgid "Prt"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:426
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:427
+msgid "R-Alt switches layout while pressed."
+msgstr "Pravý kláves Alt prepína rozloženie pri stlačení."
+
+#: ../rules/base.xml.in.h:428
+msgid "Right Alt is Compose."
+msgstr "Pravý Alt je Compose."
+
+#: ../rules/base.xml.in.h:429
+msgid "Right Alt key changes layout."
+msgstr "Pravý kláves Alt mení rozloženie."
+
+#: ../rules/base.xml.in.h:430 ../rules/sun.xml.in.h:90
+msgid "Right Alt key never chooses 3rd level."
+msgstr "Pravý kláves Alt nikdy nevyberá 3. úroveň."
+
+#: ../rules/base.xml.in.h:431
+msgid "Right Ctrl is Compose."
+msgstr "Pravý Alt je Compose."
+
+#: ../rules/base.xml.in.h:432
+msgid "Right Ctrl key changes layout."
+msgstr "Pravý kláves Ctrl mení rozloženie."
+
+#: ../rules/base.xml.in.h:433
+msgid "Right Ctrl key switches layout while pressed."
+msgstr "Pravý kláves Win prepína rozloženie pri stlačení."
+
+#: ../rules/base.xml.in.h:434
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Pravý kláves Control funguje ako pravý Alt."
+
+#: ../rules/base.xml.in.h:435
+msgid "Right Shift key changes layout."
+msgstr "Pravý kláves Shift mení rozloženie."
+
+#: ../rules/base.xml.in.h:436
+msgid "Right Win-key changes layout."
+msgstr "Pravý kláves Win mení rozloženie."
+
+#: ../rules/base.xml.in.h:437
+msgid "Right Win-key is Compose."
+msgstr "Pravý kláves Win je Compose"
+
+#: ../rules/base.xml.in.h:438
+msgid "Right Win-key switches layout while pressed."
+msgstr "Pravý kláves Win prepína rozloženie pri stlačení."
+
+#: ../rules/base.xml.in.h:439
+msgid "Right hand"
+msgstr "pravá ruka"
+
+#: ../rules/base.xml.in.h:440
+msgid "Right handed Dvorak"
+msgstr "pravá ruka dvorak"
+
+#: ../rules/base.xml.in.h:441
+msgid "Romania"
+msgstr "Rumunsko"
+
+#: ../rules/base.xml.in.h:442
+msgid "Romanian keyboard with German letters"
+msgstr "Rumunská klávesnica s nemeckými písmenmi"
+
+#: ../rules/base.xml.in.h:443
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Rumunská klávesnica s nemeckými písmenami, eliminovať mŕtve klávesy"
+
+#: ../rules/base.xml.in.h:444
+msgid "Rou"
+msgstr "Rum"
+
+#: ../rules/base.xml.in.h:445 ../rules/sun.xml.in.h:95
+msgid "Rus"
+msgstr "Rus"
+
+#: ../rules/base.xml.in.h:446
+msgid "Russia"
+msgstr "Rusko"
+
+#: ../rules/base.xml.in.h:447 ../rules/sun.xml.in.h:96
+msgid "Russian"
+msgstr "Ruské"
+
+#: ../rules/base.xml.in.h:448
+msgid "Russian phonetic"
+msgstr "Ruské fonetické"
+
+#: ../rules/base.xml.in.h:449
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Ruské fonetické, eliminovať mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:450
+msgid "Russian with Kazakh"
+msgstr "Ruská s kazaštinou"
+
+#: ../rules/base.xml.in.h:451
+msgid "SCG"
+msgstr "SCG"
+
+#: ../rules/base.xml.in.h:452
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
+
+#: ../rules/base.xml.in.h:453
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:454
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:455
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:456
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:457
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:458
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:459
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:460
+msgid "ScrollLock LED shows alternative layout."
+msgstr "Scroll Lock LED zobrazuje alternatívne rozloženie."
+
+#: ../rules/base.xml.in.h:461
+msgid "Serbia and Montenegro"
+msgstr "Srbsko a Čierna Hora"
+
+#: ../rules/base.xml.in.h:462
+msgid "Shift with numeric keypad keys works as in MS Windows."
+msgstr "Shift s numerickými klávesmi pracuje ako v MS Windows."
+
+#: ../rules/base.xml.in.h:463
+msgid "Shift+CapsLock changes layout."
+msgstr "Shift+Caps Lock mení rozloženie."
+
+#: ../rules/base.xml.in.h:464
+msgid "Slovakia"
+msgstr "Slovensko"
+
+#: ../rules/base.xml.in.h:465
+msgid "Slovenia"
+msgstr "Slovinsko"
+
+#: ../rules/base.xml.in.h:466
+msgid "South Africa"
+msgstr "Južná Afrika"
+
+#: ../rules/base.xml.in.h:467
+msgid "Southern Uzbek"
+msgstr "južná uzbečtina"
+
+#: ../rules/base.xml.in.h:468
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Medzerník dáva znak nezalomiteľná medzera na štvrtej úrovni, tenká nezalomiteľná medzera na šiestej úrovni."
+
+#: ../rules/base.xml.in.h:469
+msgid "Space key outputs non-breakable space character at fourth level."
+msgstr "Medzerník dáva znak nezalomiteľná medzera na štvrtej úrovni."
+
+#: ../rules/base.xml.in.h:470
+msgid "Space key outputs non-breakable space character at second level."
+msgstr "Medzerník dáva znak nezalomiteľná medzera na druhej úrovni."
+
+#: ../rules/base.xml.in.h:471
+msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
+msgstr "Medzerník dáva znak nezalomiteľná medzera na tretej úrovni, nič na štvrtej úrovni."
+
+#: ../rules/base.xml.in.h:472
+msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Medzerník dáva znak nezalomiteľná medzera na tretej úrovni, tenká nezalomiteľná medzera na štvrtej úrovni."
+
+#: ../rules/base.xml.in.h:473
+msgid "Space key outputs non-breakable space character at third level."
+msgstr "Medzerník dáva znak nezalomiteľná medzera na tretej úrovni."
+
+#: ../rules/base.xml.in.h:474
+msgid "Space key outputs usual space at any level."
+msgstr "Medzerník dáva obyčajnú medzeru na každej úrovni."
+
+#: ../rules/base.xml.in.h:475
+msgid "Spain"
+msgstr "Španielsko"
+
+#: ../rules/base.xml.in.h:476 ../rules/sun.xml.in.h:103
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Špeciálne klávesy (Ctrl+Alt+&lt;key&gt;) spracované na serveru."
+
+#: ../rules/base.xml.in.h:477
+msgid "SrL"
+msgstr "SrL"
+
+#: ../rules/base.xml.in.h:478
+msgid "Sri Lanka"
+msgstr "Srí Lanka"
+
+#: ../rules/base.xml.in.h:479 ../rules/sun.xml.in.h:104
+msgid "Standard"
+msgstr "štandardné"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:481
+msgid "Standard RSTU"
+msgstr "štandardné RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:483
+msgid "Standard RSTU on Russian layout"
+msgstr "štandardné RSTU na ruskom rozložení"
+
+#: ../rules/base.xml.in.h:484 ../rules/sun.xml.in.h:112
+msgid "Sun dead keys"
+msgstr "mŕtve klávesy Sun"
+
+#: ../rules/base.xml.in.h:485
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:486
+msgid "Super is mapped to the Win-keys."
+msgstr "Super je mapovaný na klávesy Win."
+
+#: ../rules/base.xml.in.h:487
+msgid "Svdvorak"
+msgstr "Svdvorak"
+
+#: ../rules/base.xml.in.h:488 ../rules/sun.xml.in.h:113
+msgid "Svk"
+msgstr "Svk"
+
+#: ../rules/base.xml.in.h:489
+msgid "Svn"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:490
+msgid "Swap Ctrl and CapsLock."
+msgstr "Vymeniť Control a Caps Lock"
+
+#: ../rules/base.xml.in.h:491
+msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+msgstr "Vymeniť kódy dvoch kláves keď jadro chybne detekuje klávesnice Mac."
+
+#: ../rules/base.xml.in.h:492 ../rules/sun.xml.in.h:115
+msgid "Swe"
+msgstr "Swe"
+
+#: ../rules/base.xml.in.h:493
+msgid "Sweden"
+msgstr "Švédsko"
+
+#: ../rules/base.xml.in.h:494
+msgid "Switzerland"
+msgstr "Švajčiarsko"
+
+#: ../rules/base.xml.in.h:495
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:496
+msgid "Syr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:497
+msgid "Syria"
+msgstr "Sýrske"
+
+#: ../rules/base.xml.in.h:498
+msgid "Syriac"
+msgstr "Syrské"
+
+#: ../rules/base.xml.in.h:499
+msgid "Syriac phonetic"
+msgstr "Sýske fonetické"
+
+#: ../rules/base.xml.in.h:500
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:501
+msgid "Tajikistan"
+msgstr "Tadžické"
+
+#: ../rules/base.xml.in.h:502
+msgid "Tamil"
+msgstr "Tamilské"
+
+#: ../rules/base.xml.in.h:503
+msgid "Tamil TAB Typewriter"
+msgstr "Tamiský TAB písací stroj"
+
+#: ../rules/base.xml.in.h:504
+msgid "Tamil TSCII Typewriter"
+msgstr "Tamilské TSCII písací stroj"
+
+#: ../rules/base.xml.in.h:505
+msgid "Tamil Unicode"
+msgstr "Tamilské Unicode"
+
+#: ../rules/base.xml.in.h:506
+msgid "Tatar"
+msgstr "tatárčina"
+
+#: ../rules/base.xml.in.h:507
+msgid "Telugu"
+msgstr "Telugské"
+
+#: ../rules/base.xml.in.h:508
+msgid "Tha"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:509
+msgid "Thailand"
+msgstr "Thajsko"
+
+#: ../rules/base.xml.in.h:510 ../rules/sun.xml.in.h:119
+msgid "Third level choosers"
+msgstr "Výber tretej úrovne"
+
+# berberská latinská abeceda
+#: ../rules/base.xml.in.h:511
+msgid "Tifinagh"
+msgstr "Tifinagh"
+
+# berberská latinská abeceda
+#: ../rules/base.xml.in.h:512
+msgid "Tifinagh Alternative"
+msgstr "Tifinagh alternatívne"
+
+# berberská latinská abeceda
+#: ../rules/base.xml.in.h:513
+msgid "Tifinagh Alternative Phonetic"
+msgstr "Tifinagh alternatívne fonetické"
+
+# berberská latinská abeceda
+#: ../rules/base.xml.in.h:514
+msgid "Tifinagh Extended"
+msgstr "Tifinagh rozšírené"
+
+# berberská latinská abeceda
+#: ../rules/base.xml.in.h:515
+msgid "Tifinagh Extended Phonetic"
+msgstr "Tifinagh rozšírené fonetické"
+
+# berberská latinská abeceda
+#: ../rules/base.xml.in.h:516
+msgid "Tifinagh Phonetic"
+msgstr "Tifinagh fonetické"
+
+#: ../rules/base.xml.in.h:517
+msgid "Tilde (~) variant"
+msgstr "Variant vlnovky (~)"
+
+#: ../rules/base.xml.in.h:518
+msgid "Tjk"
+msgstr "Tjk"
+
+#: ../rules/base.xml.in.h:519
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:520
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: ../rules/base.xml.in.h:521
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: ../rules/base.xml.in.h:522 ../rules/sun.xml.in.h:120
+msgid "Tur"
+msgstr "Tur"
+
+#: ../rules/base.xml.in.h:523
+msgid "Turkey"
+msgstr "Turecko"
+
+#: ../rules/base.xml.in.h:524
+msgid "Typewriter"
+msgstr "Písací stroj"
+
+#: ../rules/base.xml.in.h:525 ../rules/sun.xml.in.h:124
+msgid "U.S. English"
+msgstr "USA anglické"
+
+#: ../rules/base.xml.in.h:526
+#, fuzzy
+msgid "US keyboard with Bosnian digraphs"
+msgstr "Klávesnica USA s bosniackymi digraphs"
+
+#: ../rules/base.xml.in.h:527
+#, fuzzy
+msgid "US keyboard with Bosnian letters"
+msgstr "Klávesnica USA s bosniackymi písmenami"
+
+#: ../rules/base.xml.in.h:528
+#, fuzzy
+msgid "US keyboard with Croatian digraphs"
+msgstr "Klávesnica USA s chorvátskymi digraphs"
+
+#: ../rules/base.xml.in.h:529
+#, fuzzy
+msgid "US keyboard with Croatian letters"
+msgstr "Klávesnica USA s chorvátskymi písmenami"
+
+#: ../rules/base.xml.in.h:530
+msgid "US keyboard with Lithuanian letters"
+msgstr "Americká klávesnica s litovskými písmenami"
+
+#: ../rules/base.xml.in.h:531
+#, fuzzy
+msgid "US keyboard with Slovenian digraphs"
+msgstr "Klávesnica USA so slovinskými digraphs"
+
+#: ../rules/base.xml.in.h:532
+#, fuzzy
+msgid "US keyboard with Slovenian letters"
+msgstr "Klávesnica USA so slovinskými písmenami"
+
+#: ../rules/base.xml.in.h:533 ../rules/sun.xml.in.h:126
+msgid "USA"
+msgstr "USA"
+
+#: ../rules/base.xml.in.h:534
+msgid "Udmurt"
+msgstr "udmurtčina"
+
+#: ../rules/base.xml.in.h:535
+msgid "Ukr"
+msgstr "Ukr"
+
+#: ../rules/base.xml.in.h:536
+msgid "Ukraine"
+msgstr "Ukrajinské"
+
+#: ../rules/base.xml.in.h:537
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:538 ../rules/sun.xml.in.h:127
+msgid "United Kingdom"
+msgstr "Spojené kráľovstvo"
+
+#: ../rules/base.xml.in.h:539
+msgid "Urdu"
+msgstr "urdčina"
+
+#: ../rules/base.xml.in.h:540
+#, fuzzy
+msgid "Use Bosnian digraphs"
+msgstr "Použiť bosniacke digraphs"
+
+#: ../rules/base.xml.in.h:541
+#, fuzzy
+msgid "Use Croatian digraphs"
+msgstr "Použiť chorvátske digraphs"
+
+#: ../rules/base.xml.in.h:542
+#, fuzzy
+msgid "Use Slovenian digraphs"
+msgstr "Použiť slovinské digraphs"
+
+#: ../rules/base.xml.in.h:543
+msgid "Use guillemets for quotes"
+msgstr "Použiť uhlové zátvorky pre úvodzovky"
+
+#: ../rules/base.xml.in.h:544
+msgid "Use keyboard LED to show alternative layout."
+msgstr "Použiť LED klávesnice pre zobrazenie alternatívneho rozloženia."
+
+#: ../rules/base.xml.in.h:545
+msgid "Use keypad with unicode additions (arrows and math operators)"
+msgstr "Použiť numerickú klávesnicu s doplnkami Unicode (šípky a matematické operátory)"
+
+#: ../rules/base.xml.in.h:546
+msgid "Using space key to input non-breakable space character"
+msgstr "Použiť klávesu medzera na zadanie znaku nezalomiteľná medzera"
+
+#: ../rules/base.xml.in.h:547
+msgid "Uzb"
+msgstr "Uzb"
+
+#: ../rules/base.xml.in.h:548
+msgid "Uzbekistan"
+msgstr "Uzbecké"
+
+#: ../rules/base.xml.in.h:549
+msgid "Vietnam"
+msgstr "Vietnamské"
+
+#: ../rules/base.xml.in.h:550
+msgid "Vnm"
+msgstr "Vnm"
+
+#: ../rules/base.xml.in.h:551
+msgid "Wang model 724 azerty"
+msgstr "Wang model 724 azerty"
+
+#: ../rules/base.xml.in.h:552
+msgid "Western"
+msgstr "západné"
+
+#: ../rules/base.xml.in.h:553
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:554
+msgid "Winkeys"
+msgstr "Win klávesy"
+
+#: ../rules/base.xml.in.h:555
+msgid "With &lt;\\|&gt; key"
+msgstr "s klávesmi &lt;\\|&gt;"
+
+#: ../rules/base.xml.in.h:556
+msgid "With EuroSign on 5"
+msgstr "so znakom euro na 5"
+
+#: ../rules/base.xml.in.h:557
+msgid "With guillemets"
+msgstr "s uhlovými zátvorkami"
+
+#: ../rules/base.xml.in.h:558
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
+
+#: ../rules/base.xml.in.h:559
+msgid "Yoruba"
+msgstr "jorubčina"
+
+#: ../rules/base.xml.in.h:560
+msgid "Z and ZHE swapped"
+msgstr "Z a ZHE vymenené"
+
+#: ../rules/base.xml.in.h:561
+msgid "Zar"
+msgstr "Zar"
+
+#: ../rules/base.xml.in.h:562
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:563
+msgid "azerty/digits"
+msgstr "azerty/číslice"
+
+#: ../rules/base.xml.in.h:564
+msgid "digits"
+msgstr "číslice"
+
+#: ../rules/base.xml.in.h:565
+msgid "displaced semicolon and quote (obsolete)"
+msgstr "posunutá bodkočiarka a dvojbodka (zastaralé)"
+
+#: ../rules/base.xml.in.h:566
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:567 ../rules/sun.xml.in.h:132
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:568
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, rozšírená spätná lomka"
+
+#: ../rules/base.xml.in.h:569
+msgid "qwerty/digits"
+msgstr "qwerty/číslice"
+
+#: ../rules/base.xml.in.h:570
+msgid "qwertz"
+msgstr "qwertz"
+
+#: ../rules/sun.xml.in.h:1
+msgid "\"Typewriter\""
+msgstr "Písací stroj"
+
+#: ../rules/sun.xml.in.h:17
+msgid "Acts as Shift with locking. Shift cancels Caps."
+msgstr "Pracuje ako Shift s uzamknutím. Shift ruší Caps."
+
+#: ../rules/sun.xml.in.h:18
+msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
+msgstr "Pracuje ako Shift s uzamknutím. Shift neruší Caps."
+
+#: ../rules/sun.xml.in.h:19
+msgid "Alt+Control changes group"
+msgstr "Alt+Control mení rozloženie"
+
+#: ../rules/sun.xml.in.h:20
+msgid "Alt+Shift changes group"
+msgstr "Alt+Shift mení rozloženie"
+
+#: ../rules/sun.xml.in.h:21
+msgid "Basic"
+msgstr "základné"
+
+#: ../rules/sun.xml.in.h:23
+msgid "Belgian"
+msgstr "Belgická"
+
+#: ../rules/sun.xml.in.h:25
+msgid "Both Alt keys together change group"
+msgstr "Oba klávesy Alt spolu menia rozloženie"
+
+#: ../rules/sun.xml.in.h:26
+msgid "Both Ctrl keys together change group"
+msgstr "Oba klávesy Ctrl spolu menia rozloženie"
+
+#: ../rules/sun.xml.in.h:27
+msgid "Both Shift keys together change group"
+msgstr "Spoločné stlačenie oboch Shift mení rozloženie"
+
+#: ../rules/sun.xml.in.h:28
+msgid "Bulgarian"
+msgstr "Bulharské"
+
+#: ../rules/sun.xml.in.h:30
+msgid "Canadian"
+msgstr "Kanadské"
+
+#: ../rules/sun.xml.in.h:31
+msgid "Caps Lock is Compose"
+msgstr "Caps Lock je Compose"
+
+#: ../rules/sun.xml.in.h:32
+msgid "Caps Lock key changes group"
+msgstr "Kláves Caps Lock mení rozloženie"
+
+#: ../rules/sun.xml.in.h:34
+msgid "Caps_Lock LED shows alternative group"
+msgstr "Caps Lock LED zobrazuje alternatívne rozloženie"
+
+#: ../rules/sun.xml.in.h:35
+msgid "Control Key Position"
+msgstr "Pozícia klávesu Control"
+
+#: ../rules/sun.xml.in.h:36
+msgid "Control key at bottom left"
+msgstr "Kláves Control vľavo dole"
+
+#: ../rules/sun.xml.in.h:37
+msgid "Control key at left of 'A'"
+msgstr "Kláves Control naľavo od „A“"
+
+#: ../rules/sun.xml.in.h:38
+msgid "Control+Shift changes group"
+msgstr "Control+Shift mení rozloženie"
+
+#: ../rules/sun.xml.in.h:40
+msgid "Czech"
+msgstr "České"
+
+#: ../rules/sun.xml.in.h:41
+msgid "Danish"
+msgstr "Dánske"
+
+#: ../rules/sun.xml.in.h:45
+msgid "DeuCH"
+msgstr "NemŠv"
+
+#: ../rules/sun.xml.in.h:47
+msgid "Dvo"
+msgstr "Dvo"
+
+#: ../rules/sun.xml.in.h:52
+msgid "Finnish"
+msgstr "Fínske"
+
+#: ../rules/sun.xml.in.h:54
+msgid "FraCH"
+msgstr "FraŠv"
+
+#: ../rules/sun.xml.in.h:57
+msgid "German"
+msgstr "Nemecké"
+
+#: ../rules/sun.xml.in.h:58
+msgid "Group Shift/Lock behavior"
+msgstr "Zoskupiť chovanie Shift/Lock"
+
+#: ../rules/sun.xml.in.h:60
+msgid "Hungarian"
+msgstr "Maďarské"
+
+#: ../rules/sun.xml.in.h:64
+msgid "Italian"
+msgstr "Talianske"
+
+#: ../rules/sun.xml.in.h:65
+msgid "Japanese"
+msgstr "Japonské"
+
+#: ../rules/sun.xml.in.h:67
+msgid "Left Alt key changes group"
+msgstr "Ľavý kláves Alt mení rozloženie"
+
+#: ../rules/sun.xml.in.h:68
+msgid "Left Alt key switches group while pressed"
+msgstr "Ľavý kláves Alt prepína rozloženie pri stlačení"
+
+#: ../rules/sun.xml.in.h:69
+msgid "Left Ctrl key changes group"
+msgstr "Ľavý kláves Ctrl mení rozloženie"
+
+#: ../rules/sun.xml.in.h:70
+msgid "Left Shift key changes group"
+msgstr "Ľavý kláves Shift mení rozloženie"
+
+#: ../rules/sun.xml.in.h:71
+msgid "Make CapsLock an additional Control"
+msgstr "Urobiť z CapsLock dodatočný Control"
+
+#: ../rules/sun.xml.in.h:76
+msgid "Norwegian"
+msgstr "Nórske"
+
+#: ../rules/sun.xml.in.h:77
+msgid "Num_Lock LED shows alternative group"
+msgstr "Num Lock LED zobrazuje alternatívne rozloženie"
+
+#: ../rules/sun.xml.in.h:80
+msgid "Polish"
+msgstr "Poľské"
+
+#: ../rules/sun.xml.in.h:81
+msgid "Polish with Polish quotes on key \"1/!\""
+msgstr "Poľské s poľskými úvodzovkami na klávese „1/!“"
+
+#: ../rules/sun.xml.in.h:82
+msgid "Portuguese"
+msgstr "Portugalské"
+
+#: ../rules/sun.xml.in.h:83
+msgid "Press Left Alt key to choose 3rd level"
+msgstr "Stlačením ľavého klávesu Win vyberiete 3. úroveň"
+
+#: ../rules/sun.xml.in.h:84
+msgid "Press Right Alt key to choose 3rd level"
+msgstr "Stlačením pravého klávesu Win vyberiete 3. úroveň"
+
+#: ../rules/sun.xml.in.h:85
+msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
+msgstr "Stlačením pravého klávesu Win vyberiete 3. úroveň, shift+pravý Alt je Multi_Key"
+
+#: ../rules/sun.xml.in.h:86
+msgid "Press Right Control to choose 3rd level"
+msgstr "Stlačenie pravého Control vyberá 3. úroveň"
+
+#: ../rules/sun.xml.in.h:87
+msgid "Press any of Alt keys to choose 3rd level"
+msgstr "Stlačením ľuboboľného klávesu Alt vyberiete 3. úroveň"
+
+#: ../rules/sun.xml.in.h:89
+msgid "Right Alt key changes group"
+msgstr "Pravý Alt mení rozloženie"
+
+#: ../rules/sun.xml.in.h:91
+msgid "Right Alt switches group while pressed"
+msgstr "Pravý kláves Alt prepína rozloženie pri stlačení"
+
+#: ../rules/sun.xml.in.h:92
+msgid "Right Control key works as Right Alt"
+msgstr "Kláves pravý Control funguje ako pravý Alt"
+
+#: ../rules/sun.xml.in.h:93
+msgid "Right Ctrl key changes group"
+msgstr "Kláves pravý Ctrl mení rozloženie"
+
+#: ../rules/sun.xml.in.h:94
+msgid "Right Shift key changes group"
+msgstr "Kláves pravý Shift mení rozloženie"
+
+#: ../rules/sun.xml.in.h:97
+msgid "Scroll Lock changes group"
+msgstr "Kláves Scroll Lock mení rozloženie"
+
+#: ../rules/sun.xml.in.h:98
+msgid "Scroll_Lock LED shows alternative group"
+msgstr "Scroll Lock LED zobrazuje alternatívne rozloženie"
+
+#: ../rules/sun.xml.in.h:99
+msgid "Shift with numpad keys works as in MS Windows"
+msgstr "Shift s numerickými klávesmi pracuje ako v MS Windows"
+
+#: ../rules/sun.xml.in.h:100
+msgid "Shift+CapsLock changes group"
+msgstr "Shift+Caps Lock mení rozloženie"
+
+#: ../rules/sun.xml.in.h:101
+msgid "Slovak"
+msgstr "Slovenské"
+
+#: ../rules/sun.xml.in.h:102
+msgid "Spanish"
+msgstr "Španielske"
+
+#: ../rules/sun.xml.in.h:105
+msgid "Sun Type 4"
+msgstr "Sun Type 4"
+
+#: ../rules/sun.xml.in.h:106
+msgid "Sun Type 5"
+msgstr "Sun Type 5"
+
+#: ../rules/sun.xml.in.h:107
+msgid "Sun Type 5 European"
+msgstr "Sun Type 5 európske"
+
+#: ../rules/sun.xml.in.h:108
+msgid "Sun Type 5 Unix"
+msgstr "Sun Type 5 Unix"
+
+#: ../rules/sun.xml.in.h:109
+msgid "Sun Type 6"
+msgstr "Sun Type 6"
+
+#: ../rules/sun.xml.in.h:110
+msgid "Sun Type 6 Unix"
+msgstr "Sun Type 6 Unix"
+
+#: ../rules/sun.xml.in.h:111
+msgid "Sun Type 6 with Euro key"
+msgstr "Sun Type 6 s klávesom euro"
+
+#: ../rules/sun.xml.in.h:114
+msgid "Swap Control and Caps Lock"
+msgstr "Prehodiť Control a Caps Lock"
+
+#: ../rules/sun.xml.in.h:116
+msgid "Swedish"
+msgstr "Švédske"
+
+#: ../rules/sun.xml.in.h:117
+msgid "Swiss French"
+msgstr "Švajčiarske francúzske"
+
+#: ../rules/sun.xml.in.h:118
+msgid "Swiss German"
+msgstr "Nemecké (Švajčiarsko)"
+
+#: ../rules/sun.xml.in.h:121
+msgid "Turkish"
+msgstr "Turecké"
+
+#: ../rules/sun.xml.in.h:122
+msgid "Turkish (F)"
+msgstr "Turecké (F)"
+
+#: ../rules/sun.xml.in.h:123
+msgid "Turkish Alt-Q Layout"
+msgstr "Turecké rozloženie Alt-Q"
+
+#: ../rules/sun.xml.in.h:125
+msgid "U.S. English w/ ISO9995-3"
+msgstr "U.S.A. anglické s ISO9995-3"
+
+#: ../rules/sun.xml.in.h:128
+msgid "Use keyboard LED to show alternative group"
+msgstr "Použiť LED klávesnice pre zobrazenie alternatívnej skupiny"
+
+#: ../rules/sun.xml.in.h:129
+msgid "Uses internal capitalization. Shift cancels Caps."
+msgstr "Používa interný prevod na kapitálky. Shift ruší Caps."
+
+#: ../rules/sun.xml.in.h:130
+msgid "Uses internal capitalization. Shift doesn't cancel Caps."
+msgstr "Používa interný prevod na kapitálky. Shift neruší Caps."
+
+#: ../rules/sun.xml.in.h:131
+msgid "bksl"
+msgstr "bksl"
+
+#: ../rules/sun.xml.in.h:133
+msgid "type4"
+msgstr "type4"
+
+#~ msgid "A Tamil typewrite-style keymap; TAB encoding"
+#~ msgstr "Tamilská klávesová mapa v štýle písacieho stroja, kódovanie TAB"
+
+#~ msgid "A Tamil typewrite-style keymap; TSCII encoding"
+#~ msgstr "Tamilská klávesová mapa v štýle písacieho stroja, kódovanie TSCII"
+
+#~ msgid "A Tamil typewrite-style keymap; Unicode encoding"
+#~ msgstr "Tamilská klávesová mapa v štýle písacieho stroja, kódovanie Unicode"
+
+#~ msgid "Arb"
+#~ msgstr "Arb"
+
+#~ msgid "Bosnian"
+#~ msgstr "Bosnianske"
+
+#~ msgid "Burmese"
+#~ msgstr "Burmézsky"
+
+#~ msgid "CloGaelach Laptop"
+#~ msgstr "CloGaelach Laptop"
+
+#~ msgid "Czech (qwerty)"
+#~ msgstr "České (qwerty)"
+
+#~ msgid "Dutch"
+#~ msgstr "Holandské"
+
+#~ msgid "French Canadian"
+#~ msgstr "Francúzske kanadské"
+
+#~ msgid "Georgian (latin)"
+#~ msgstr "Gruzínske (latinka)"
+
+#~ msgid "Georgian (russian)"
+#~ msgstr "Gruzínske (azbuka)"
+
+#~ msgid "Grc"
+#~ msgstr "Grc"
+
+#~ msgid "Guj"
+#~ msgstr "Guj"
+
+#~ msgid "Hin"
+#~ msgstr "Hin"
+
+#~ msgid "Hindi"
+#~ msgstr "Hindské"
+
+#~ msgid "INSCRIPT layout"
+#~ msgstr "INSCRIPT rozloženie"
+
+#~ msgid "IS434 laptop"
+#~ msgstr "IS434 laptop"
+
+#~ msgid "Iku"
+#~ msgstr "Inu"
+
+#~ msgid "Irish"
+#~ msgstr "Írske"
+
+#~ msgid "Lithuanian azerty standard"
+#~ msgstr "Litovské azerty štandardné"
+
+#~ msgid "Lithuanian qwerty \"numeric\""
+#~ msgstr "Litovské qwerty \"číselné\""
+
+#~ msgid "Logitech iTouch keyboard Internet Navigator"
+#~ msgstr "Logitech iTouch keyboard Internet Navigator"
+
+#~ msgid "Northern Saami (Finland)"
+#~ msgstr "Severný Saami (Fínsko)"
+
+#~ msgid "Northern Saami (Sweden)"
+#~ msgstr "Severný Saami (Švédsko)"
+
+#~ msgid "Ogh"
+#~ msgstr "Ogh"
+
+#~ msgid "Ori"
+#~ msgstr "Ori"
+
+#~ msgid "PC104"
+#~ msgstr "PC104"
+
+#~ msgid "Polish (qwertz)"
+#~ msgstr "Poľské (qwertz)"
+
+#~ msgid "PowerPC PS/2"
+#~ msgstr "PowerPC PS/2"
+
+#~ msgid "Sapmi"
+#~ msgstr "Sapmi"
+
+#~ msgid "Scg"
+#~ msgstr "Scg"
+
+#~ msgid "Slovak (qwerty)"
+#~ msgstr "Slovenské (qwerty)"
+
+#~ msgid "Sme"
+#~ msgstr "Sme"
+
+#~ msgid "Sv"
+#~ msgstr "Sv"
+
+#~ msgid "Tel"
+#~ msgstr "Tel"
+
+#~ msgid "Thai (Kedmanee)"
+#~ msgstr "Thajské (Kedmanee)"
+
+#~ msgid "Tml"
+#~ msgstr "Tml"
+
+#~ msgid "U.S. English w/ dead keys"
+#~ msgstr "Anglické (US) s mŕtvymi klávesmi"
+
+#~ msgid "US"
+#~ msgstr "US"
+
+#~ msgid "Yug"
+#~ msgstr "Juh"
+
+#~ msgid "Yugoslavian"
+#~ msgstr "Juhoslovanské"
+
+#~ msgid "abnt2"
+#~ msgstr "abnt2"
+
+#~ msgid "laptop"
+#~ msgstr "laptop"
+
+#~ msgid "sefi"
+#~ msgstr "sefi"
+
+#~ msgid "si1452"
+#~ msgstr "si1452"
+
+#~ msgid "uni/101/qwerty/comma"
+#~ msgstr "uni/101/qwerty/čiarka"
+
+#~ msgid "uni/101/qwerty/dot"
+#~ msgstr "uni/101/qwerty/bodka"
+
+#~ msgid "uni/101/qwertz/comma"
+#~ msgstr "uni/101/qwertz/čiarka"
+
+#~ msgid "uni/101/qwertz/dot"
+#~ msgstr "uni/101/qwertz/bodka"
+
+#~ msgid "uni/102/qwerty/comma"
+#~ msgstr "uni/102/qwerty/čiarka"
+
+#~ msgid "uni/102/qwerty/dot"
+#~ msgstr "uni/102/qwerty/bodka"
+
+#~ msgid "uni/102/qwertz/comma"
+#~ msgstr "uni/102/qwertz/čiarka"
+
+#~ msgid "uni/102/qwertz/dot"
+#~ msgstr "uni/102/qwertz/bodka"
diff --git a/xorg-server/xkeyboard-config/po/sq.po b/xorg-server/xkeyboard-config/po/sq.po
index 4efec73dc..bfac1d6fc 100644
--- a/xorg-server/xkeyboard-config/po/sq.po
+++ b/xorg-server/xkeyboard-config/po/sq.po
@@ -1,1465 +1,1465 @@
-# translation of xfree86_xkb_xml-4.4pre1 to Albanian
-# This file is distributed under the same license as the xfree86_xkb_xml-4.4pre1 package.
-# Laurent Dhima <laurenti@alblinux.net>, 2004.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-25 23:38+0000\n"
-"PO-Revision-Date: 2004-03-03 08:55-0500\n"
-"Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
-"Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3\n"
-
-#: xfree86.xml.in.h:1
-msgid "\"Typewriter\""
-msgstr "\"Makinë shkrimi\""
-
-#: xfree86.xml.in.h:2
-msgid "A Tamil typewrite-style keymap; TAB encoding"
-msgstr "Një tastierë Tamil-ane stil makinë shkrimi; kodifikim TAB"
-
-#: xfree86.xml.in.h:3
-msgid "A Tamil typewrite-style keymap; TSCII encoding"
-msgstr "Një tastierë Tamil-ane stil makinë shkrimi; kodifikim TSCII"
-
-#: xfree86.xml.in.h:4
-msgid "A Tamil typewrite-style keymap; Unicode encoding"
-msgstr "Një tastierë Tamil-ane stil makinë shkrimi; kodifikim Unicode"
-
-#: xfree86.xml.in.h:5
-msgid "ACPI Standard"
-msgstr "ACPI Standart"
-
-#: xfree86.xml.in.h:6
-msgid "Acer AirKey V"
-msgstr "Acer AirKey V"
-
-#: xfree86.xml.in.h:7
-msgid "Acts as Shift with locking. Shift cancels Caps."
-msgstr "Vepron si Shift me bllokues. Shift fshin Caps."
-
-#: xfree86.xml.in.h:8
-msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
-msgstr "Vepron si Shift me bllokues. Shift nuk fshin Caps."
-
-#: xfree86.xml.in.h:9
-msgid "Add the standard behavior to Menu key."
-msgstr "Shto sjelljen standarte tek Menu key."
-
-#: xfree86.xml.in.h:10
-msgid "Advance Scorpius KI"
-msgstr "Advance Scorpius KI"
-
-#: xfree86.xml.in.h:11
-msgid "Alb"
-msgstr "Alb"
-
-#: xfree86.xml.in.h:12
-msgid "Albanian"
-msgstr "Shqip"
-
-#: xfree86.xml.in.h:13
-msgid "Alt and Meta on the Alt keys (default)."
-msgstr "Alt dhe Meta tek pulsanti Alt (e prezgjedhur)."
-
-#: xfree86.xml.in.h:14
-msgid "Alt+Control changes group"
-msgstr "Alt+Control ndryshon grupin"
-
-#: xfree86.xml.in.h:15
-msgid "Alt+Shift changes group"
-msgstr "Alt+Shift ndryshon grupin"
-
-#: xfree86.xml.in.h:16
-msgid "Alt/Win key behavior"
-msgstr "Sjellja e pulsantit Alt/Win"
-
-#: xfree86.xml.in.h:17
-msgid "Alternate"
-msgstr "Alterno"
-
-#: xfree86.xml.in.h:18
-msgid "Arabic"
-msgstr "Arabe"
-
-#: xfree86.xml.in.h:19
-msgid "Arb"
-msgstr "Arb"
-
-#: xfree86.xml.in.h:20
-msgid "Arm"
-msgstr "Arm"
-
-#: xfree86.xml.in.h:21
-msgid "Armenian"
-msgstr "Armenisht"
-
-#: xfree86.xml.in.h:22
-msgid "Aze"
-msgstr "Aze"
-
-#: xfree86.xml.in.h:23
-msgid "Azerbaijani"
-msgstr "Azerbaijani"
-
-#: xfree86.xml.in.h:24
-msgid "BTC 5090"
-msgstr "BTC 5090"
-
-#: xfree86.xml.in.h:25
-msgid "BTC 5113RF Multimedia"
-msgstr "BTC 5113RF Multimedia"
-
-#: xfree86.xml.in.h:26
-msgid "BTC 5126T"
-msgstr "BTC 5126T"
-
-#: xfree86.xml.in.h:27
-msgid "BTC 9000"
-msgstr "BTC 9000"
-
-#: xfree86.xml.in.h:28
-msgid "BTC 9000A"
-msgstr "BTC 9000A"
-
-#: xfree86.xml.in.h:29
-msgid "BTC 9001AH"
-msgstr "BTC 9001AH"
-
-#: xfree86.xml.in.h:30
-msgid "Basic"
-msgstr "Bazë"
-
-#: xfree86.xml.in.h:31
-msgid "Bel"
-msgstr "Bel"
-
-#: xfree86.xml.in.h:32
-msgid "Belarusian"
-msgstr "Bjelloruse"
-
-#: xfree86.xml.in.h:33
-msgid "Belgian"
-msgstr "Belg"
-
-#: xfree86.xml.in.h:34
-msgid "Ben"
-msgstr "Ben"
-
-#: xfree86.xml.in.h:35
-msgid "Bengali"
-msgstr "Bengali"
-
-#: xfree86.xml.in.h:36
-msgid "Bgr"
-msgstr "Bgr"
-
-#: xfree86.xml.in.h:37
-msgid "Bih"
-msgstr "Bih"
-
-#: xfree86.xml.in.h:38
-msgid "Blr"
-msgstr "Blr"
-
-#: xfree86.xml.in.h:39
-msgid "Bosnian"
-msgstr "Bosnjake"
-
-#: xfree86.xml.in.h:40
-msgid "Both Alt keys together change group"
-msgstr "Dy pulsantët Alt së bashku ndryshjnë grupin"
-
-#: xfree86.xml.in.h:41
-msgid "Both Ctrl keys together change group"
-msgstr "Dy pulsantët Ctrl së bashku ndryshojnë grupin"
-
-#: xfree86.xml.in.h:42
-msgid "Both Shift keys together change group"
-msgstr "Dy pulsantët Shift së bashku ndryshojnë grupin"
-
-#: xfree86.xml.in.h:43
-msgid "Both Win-keys switch group while pressed"
-msgstr "Të dy pulsantët Win ndryshojnë gropin kur shtypen"
-
-#: xfree86.xml.in.h:44
-msgid "Bra"
-msgstr "Bra"
-
-#: xfree86.xml.in.h:45
-msgid "Brazilian"
-msgstr "Braziliane"
-
-#: xfree86.xml.in.h:46
-msgid "Brazilian ABNT2"
-msgstr "Braziliane ABNT2"
-
-#: xfree86.xml.in.h:47
-msgid "Brother Internet Keyboard"
-msgstr "Tastiera Internet Brother"
-
-#: xfree86.xml.in.h:48
-msgid "Bulgarian"
-msgstr "Bullgarisht"
-
-#: xfree86.xml.in.h:49
-msgid "Burmese"
-msgstr "Burmese"
-
-#: xfree86.xml.in.h:50
-msgid "Can"
-msgstr "Can"
-
-#: xfree86.xml.in.h:51
-msgid "Canadian"
-msgstr "Kanadeze"
-
-#: xfree86.xml.in.h:52
-msgid "Caps Lock key changes group"
-msgstr "Pulsanti Caps Lock ndryshon grupin"
-
-#: xfree86.xml.in.h:53
-msgid "CapsLock key behavior"
-msgstr "Sjellja e pulsantit CapsLock"
-
-#: xfree86.xml.in.h:54
-msgid "Caps_Lock LED shows alternative group"
-msgstr "Llampa e Caps_Lock tregon grupin alternativ"
-
-#: xfree86.xml.in.h:55
-msgid "Cherry Blue Line CyBo@rd"
-msgstr "Cherry Blue Line CyBo@rd"
-
-#: xfree86.xml.in.h:56
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr "Cherry Blue Line CyBo@rd (opcioni alterno)"
-
-#: xfree86.xml.in.h:57
-msgid "Chicony Internet Keyboard"
-msgstr "Tastiera Internet Chicony"
-
-#: xfree86.xml.in.h:58
-msgid "Chicony KB-9885"
-msgstr "Chicony KB-9885"
-
-#: xfree86.xml.in.h:59
-msgid "CloGaelach"
-msgstr "CloGaelach"
-
-#: xfree86.xml.in.h:60
-msgid "CloGaelach Laptop"
-msgstr "Laptop CloGaelach"
-
-#: xfree86.xml.in.h:61
-msgid "Compaq Easy Access Keyboard"
-msgstr "Tastiera Compaq Easy Access"
-
-#: xfree86.xml.in.h:62
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr "Tatiera Internet Compaq (13 pulsante)"
-
-#: xfree86.xml.in.h:63
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr "Tastiera Internet Compaq (18 pulsante)"
-
-#: xfree86.xml.in.h:64
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr "Tastiera Internet Compaq (7 pulsante)"
-
-#: xfree86.xml.in.h:65
-msgid "Compaq iPaq Keyboard"
-msgstr "Tastiera Compaq iPaq"
-
-#: xfree86.xml.in.h:66
-msgid "Control Key Position"
-msgstr "Pozicioni i pulsantit Control"
-
-#: xfree86.xml.in.h:67
-msgid "Control key at bottom left"
-msgstr "Pulsanti Control sipër majtas"
-
-#: xfree86.xml.in.h:68
-msgid "Control key at left of 'A'"
-msgstr "Pulsanti Control në të majtë të 'A'"
-
-#: xfree86.xml.in.h:69
-msgid "Control+Shift changes group"
-msgstr "Control+Shift ndryshon grupin"
-
-#: xfree86.xml.in.h:70
-msgid "Croatian"
-msgstr "Kroate"
-
-#: xfree86.xml.in.h:71
-msgid "Cyrillic"
-msgstr "Cyrillic"
-
-#: xfree86.xml.in.h:72
-msgid "Cze"
-msgstr "Cze"
-
-#: xfree86.xml.in.h:73
-msgid "Czech"
-msgstr "Çekisht"
-
-#: xfree86.xml.in.h:74
-msgid "Czech (qwerty)"
-msgstr "Czech (qwerty)"
-
-#: xfree86.xml.in.h:75
-msgid "Danish"
-msgstr "Danisht"
-
-#: xfree86.xml.in.h:76
-msgid "Dead acute"
-msgstr "Fund kritik"
-
-#: xfree86.xml.in.h:77
-msgid "Dead grave acute"
-msgstr "Fund kritik serioz"
-
-#: xfree86.xml.in.h:78
-msgid "Dell"
-msgstr "Dell"
-
-#: xfree86.xml.in.h:79
-msgid "Dell 101-key PC"
-msgstr "Dell 101-key PC"
-
-#: xfree86.xml.in.h:80
-msgid "Deu"
-msgstr "Deu"
-
-#: xfree86.xml.in.h:81
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr "Tastierë Dexxa Wireless Desktop"
-
-#: xfree86.xml.in.h:82
-msgid "Diamond 9801 / 9802 series"
-msgstr "Seritë Diamond 9801 / 9802"
-
-#: xfree86.xml.in.h:83
-msgid "Dnk"
-msgstr "Dnk"
-
-#: xfree86.xml.in.h:84
-msgid "Dutch"
-msgstr "Hollandeze"
-
-#: xfree86.xml.in.h:85
-msgid "Dvo"
-msgstr "Dvo"
-
-#: xfree86.xml.in.h:86
-msgid "Dvorak"
-msgstr "Dvorak"
-
-#: xfree86.xml.in.h:87
-msgid "Eliminate dead keys"
-msgstr "Elemino pulsantët e vdekur"
-
-#: xfree86.xml.in.h:88
-msgid "Ennyah DKB-1008"
-msgstr "Ennyah DKB-1008"
-
-#: xfree86.xml.in.h:89
-msgid "Esp"
-msgstr "Esp"
-
-#: xfree86.xml.in.h:90
-msgid "Est"
-msgstr "Est"
-
-#: xfree86.xml.in.h:91
-msgid "Estonian"
-msgstr "Estonisht"
-
-#: xfree86.xml.in.h:92
-msgid "Everex STEPnote"
-msgstr "Everex STEPnote"
-
-#: xfree86.xml.in.h:93
-msgid "Extended"
-msgstr "E zgjeruar"
-
-#: xfree86.xml.in.h:94
-msgid "Fao"
-msgstr "Fao"
-
-#: xfree86.xml.in.h:95
-msgid "Faroese"
-msgstr "Faroese"
-
-#: xfree86.xml.in.h:96
-msgid "Farsi"
-msgstr "Farsi"
-
-#: xfree86.xml.in.h:97
-msgid "Fin"
-msgstr "Fin"
-
-#: xfree86.xml.in.h:98
-msgid "Finnish"
-msgstr "Finlandeze"
-
-#: xfree86.xml.in.h:99
-msgid "Fra"
-msgstr "Fra"
-
-#: xfree86.xml.in.h:100
-msgid "French"
-msgstr "Frengjisht"
-
-#: xfree86.xml.in.h:101
-msgid "French (alternative)"
-msgstr "Franceze (alternativa)"
-
-#: xfree86.xml.in.h:102
-msgid "French Canadian"
-msgstr "Frengjisht e Kanadasë"
-
-#: xfree86.xml.in.h:103
-msgid "GBr"
-msgstr "GBr"
-
-#: xfree86.xml.in.h:104
-msgid "Generic 101-key PC"
-msgstr "Generic 101-key PC"
-
-#: xfree86.xml.in.h:105
-msgid "Generic 102-key (Intl) PC"
-msgstr "Generic 102-key (Intl) PC"
-
-#: xfree86.xml.in.h:106
-msgid "Generic 104-key PC"
-msgstr "Generic 104-key PC"
-
-#: xfree86.xml.in.h:107
-msgid "Generic 105-key (Intl) PC"
-msgstr "Generic 105-key (Intl) PC"
-
-#: xfree86.xml.in.h:108
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-
-#: xfree86.xml.in.h:109
-msgid "Geo"
-msgstr "Geo"
-
-#: xfree86.xml.in.h:110
-msgid "Georgian (latin)"
-msgstr "Georgian (latine)"
-
-#: xfree86.xml.in.h:111
-msgid "Georgian (russian)"
-msgstr "Georgian (rusisht)"
-
-#: xfree86.xml.in.h:112
-msgid "German"
-msgstr "Gjermanisht"
-
-#: xfree86.xml.in.h:113
-msgid "Grc"
-msgstr "Grc"
-
-#: xfree86.xml.in.h:114
-msgid "Greek"
-msgstr "Greqisht"
-
-#: xfree86.xml.in.h:115
-msgid "Group Shift/Lock behavior"
-msgstr "Sjellja e grupit Shift/Lock"
-
-#: xfree86.xml.in.h:116
-msgid "Guj"
-msgstr "Guj"
-
-#: xfree86.xml.in.h:117
-msgid "Gujarati"
-msgstr "Gujarati"
-
-#: xfree86.xml.in.h:118
-msgid "Gurmukhi"
-msgstr "Gurmukhi"
-
-#: xfree86.xml.in.h:119
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr "Tastierë për Internet Hewlett-Packard"
-
-#: xfree86.xml.in.h:120
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr "Hewlett-Packard Omnibook 500 FA"
-
-#: xfree86.xml.in.h:121
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr "Hewlett-Packard Omnibook 5xx"
-
-#: xfree86.xml.in.h:122
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr "Hewlett-Packard Omnibook 6000/6100"
-
-#: xfree86.xml.in.h:123
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr "Hewlett-Packard Omnibook XE3 GC"
-
-#: xfree86.xml.in.h:124
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr "Hewlett-Packard Omnibook XE3 GF"
-
-#: xfree86.xml.in.h:125
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr "Hewlett-Packard Omnibook XT1000"
-
-#: xfree86.xml.in.h:126
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr "Hewlett-Packard Pavilion ZT11xx"
-
-#: xfree86.xml.in.h:127
-msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
-msgstr "Tastierë multimediale Hewlett-Packard SK-2501"
-
-#: xfree86.xml.in.h:128
-msgid "Hewlett-Packard SK-2505 Internet Keyboard"
-msgstr "Tastierë për Internet Hewlett-Packard SK-2505"
-
-#: xfree86.xml.in.h:129
-msgid "Hin"
-msgstr "Hin"
-
-#: xfree86.xml.in.h:130
-msgid "Hindi"
-msgstr "Hindi"
-
-#: xfree86.xml.in.h:131
-msgid "Honeywell Euroboard"
-msgstr "Honeywell Euroboard"
-
-#: xfree86.xml.in.h:132
-msgid "Hrv"
-msgstr "Hrv"
-
-#: xfree86.xml.in.h:133
-msgid "Hun"
-msgstr "Hun"
-
-#: xfree86.xml.in.h:134
-msgid "Hungarian"
-msgstr "Hungarisht"
-
-#: xfree86.xml.in.h:135
-msgid "Hungarian (qwerty)"
-msgstr "Hungareze (qwerty)"
-
-#: xfree86.xml.in.h:136
-msgid "Hyper is mapped to the Win-keys."
-msgstr "Hyper është vendosur tek pulsantët Win."
-
-#: xfree86.xml.in.h:137
-msgid "IBM Rapid Access"
-msgstr "IBM Rapid Access"
-
-#: xfree86.xml.in.h:138
-msgid "IBM Rapid Access II"
-msgstr "IBM Rapid Access II"
-
-#: xfree86.xml.in.h:139
-msgid "IBM Rapid Access II (alternate option)"
-msgstr "IBM Rapid Access II (opcioni alternativ)"
-
-#: xfree86.xml.in.h:140
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
-
-#: xfree86.xml.in.h:141
-msgid "INSCRIPT layout"
-msgstr "Planimetri INSCRIPT"
-
-#: xfree86.xml.in.h:142
-msgid "IS434"
-msgstr "IS434"
-
-#: xfree86.xml.in.h:143
-msgid "IS434 laptop"
-msgstr "Laptop IS434"
-
-#: xfree86.xml.in.h:144
-msgid "ISO Alternate"
-msgstr "ISO Alternative"
-
-#: xfree86.xml.in.h:145
-msgid "Icelandic"
-msgstr "Islandeze"
-
-#: xfree86.xml.in.h:146
-msgid "Iku"
-msgstr "Iku"
-
-#: xfree86.xml.in.h:147
-msgid "Inuktitut"
-msgstr "Inuktitut"
-
-#: xfree86.xml.in.h:148
-msgid "Irish"
-msgstr "Irlandeze"
-
-#: xfree86.xml.in.h:149
-msgid "Irl"
-msgstr "Irl"
-
-#: xfree86.xml.in.h:150
-msgid "Irn"
-msgstr "Irn"
-
-#: xfree86.xml.in.h:151
-msgid "Isl"
-msgstr "Isl"
-
-#: xfree86.xml.in.h:152
-msgid "Isr"
-msgstr "Isr"
-
-#: xfree86.xml.in.h:153
-msgid "Israeli"
-msgstr "Izraeliane"
-
-#: xfree86.xml.in.h:154
-msgid "Ita"
-msgstr "Ita"
-
-#: xfree86.xml.in.h:155
-msgid "Italian"
-msgstr "Italisht"
-
-#: xfree86.xml.in.h:156
-msgid "Japanese"
-msgstr "Japonisht"
-
-#: xfree86.xml.in.h:157
-msgid "Japanese 106-key"
-msgstr "Japoneze 106-pulsantë"
-
-#: xfree86.xml.in.h:158
-msgid "Jpn"
-msgstr "Jpn"
-
-#: xfree86.xml.in.h:159
-msgid "Kan"
-msgstr "Kan"
-
-#: xfree86.xml.in.h:160
-msgid "Kannada"
-msgstr "Kanadeze"
-
-#: xfree86.xml.in.h:161
-msgid "Keytronic FlexPro"
-msgstr "Keytronic FlexPro"
-
-#: xfree86.xml.in.h:162
-msgid "LAm"
-msgstr "LAm"
-
-#: xfree86.xml.in.h:163
-msgid "Laptop"
-msgstr "Laptop"
-
-#: xfree86.xml.in.h:164
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr "Tastierë laptop për Laptop/notebook Compaq (p.sh. Armada)"
-
-#: xfree86.xml.in.h:165
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr "Tastierë për Internet për Laptop/notebook Compaq (p.sh. Presario)"
-
-#: xfree86.xml.in.h:166
-msgid "Laptop/notebook Dell Inspiron 8xxx"
-msgstr "Laptop/notebook Dell Inspiron 8xxx"
-
-#: xfree86.xml.in.h:167
-msgid "Latin"
-msgstr "Latinishte"
-
-#: xfree86.xml.in.h:168
-msgid "Latin America"
-msgstr "Latino amerikane"
-
-#: xfree86.xml.in.h:169
-msgid "Latvian"
-msgstr "Letonisht"
-
-#: xfree86.xml.in.h:170
-msgid "Left Alt key changes group"
-msgstr "Pulsanti i majtë Alt ndryshon grupin"
-
-#: xfree86.xml.in.h:171
-msgid "Left Ctrl key changes group"
-msgstr "Pulsanti i majtë Ctrl ndryshon grupin"
-
-#: xfree86.xml.in.h:172
-msgid "Left Shift key changes group"
-msgstr "Pulsanti i majtë Shift ndryshon grupin"
-
-#: xfree86.xml.in.h:173
-msgid "Left Win-key changes group"
-msgstr "Pulsanti i majtë Win ndryshon grupin"
-
-#: xfree86.xml.in.h:174
-msgid "Left Win-key switches group while pressed"
-msgstr "Pulsanti i majtë Win ndryshon grupin kur është i shtypur"
-
-#: xfree86.xml.in.h:175
-msgid "Lithuanian azerty standard"
-msgstr "Lithuanian azerty standart"
-
-#: xfree86.xml.in.h:176
-msgid "Lithuanian qwerty \"numeric\""
-msgstr "Lithuanian qwerty \"numerike\""
-
-#: xfree86.xml.in.h:177
-msgid "Logitech Cordless Desktop"
-msgstr "Logitech Cordless Desktop"
-
-#: xfree86.xml.in.h:178
-msgid "Logitech Cordless Desktop Navigator"
-msgstr "Logitech Cordless Desktop Navigator"
-
-#: xfree86.xml.in.h:179
-msgid "Logitech Cordless Desktop Optical"
-msgstr "Logitech Cordless Desktop Optical"
-
-#: xfree86.xml.in.h:180
-msgid "Logitech Cordless Desktop Pro"
-msgstr "Logitech Cordless Desktop Pro"
-
-#: xfree86.xml.in.h:181
-msgid "Logitech Cordless Desktop Pro (alternate option)"
-msgstr "Logitech Cordless Desktop Pro (opcioni alternativ)"
-
-#: xfree86.xml.in.h:182
-msgid "Logitech Cordless Desktop Pro (alternate option2)"
-msgstr "Logitech Cordless Desktop Pro (opcioni i dytë alternativ)"
-
-#: xfree86.xml.in.h:183
-msgid "Logitech Cordless Desktop iTouch"
-msgstr "Logitech Cordless Desktop iTouch"
-
-#: xfree86.xml.in.h:184
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr "Logitech Cordless Freedom/Desktop Navigator"
-
-#: xfree86.xml.in.h:185
-msgid "Logitech Deluxe Access Keyboard"
-msgstr "Tastierë Logitech Deluxe Access"
-
-#: xfree86.xml.in.h:186
-msgid "Logitech Internet Keyboard"
-msgstr "Tastierë për Internet Logitech"
-
-#: xfree86.xml.in.h:187
-msgid "Logitech Internet Navigator Keyboard"
-msgstr "Tastierë Logitech Internet Navigator"
-
-#: xfree86.xml.in.h:188
-msgid "Logitech iTouch"
-msgstr "Logitech iTouch"
-
-#: xfree86.xml.in.h:189
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-
-#: xfree86.xml.in.h:190
-msgid "Logitech iTouch keyboard Internet Navigator"
-msgstr "Logitech iTouch keyboard Internet Navigator"
-
-#: xfree86.xml.in.h:191
-msgid "Ltu"
-msgstr "Ltu"
-
-#: xfree86.xml.in.h:192
-msgid "Lva"
-msgstr "Lva"
-
-#: xfree86.xml.in.h:193
-msgid "Macedonian"
-msgstr "Maqedonisht"
-
-#: xfree86.xml.in.h:194
-msgid "Macintosh"
-msgstr "Macintosh"
-
-#: xfree86.xml.in.h:195
-msgid "Macintosh Old"
-msgstr "Macintosh i vjetër"
-
-#: xfree86.xml.in.h:196
-msgid "Make CapsLock an additional Control"
-msgstr "Kthe CapsLock në një Control shtesë"
-
-#: xfree86.xml.in.h:197
-msgid "Mal"
-msgstr "Mal"
-
-#: xfree86.xml.in.h:198
-msgid "Malayalam"
-msgstr "Malayalam"
-
-#: xfree86.xml.in.h:199
-msgid "Maltese"
-msgstr "Malteze"
-
-#: xfree86.xml.in.h:200
-msgid "Maltese (US layout)"
-msgstr "Maltese (harta US)"
-
-#: xfree86.xml.in.h:201
-msgid "Memorex MX1998"
-msgstr "Memorex MX1998"
-
-#: xfree86.xml.in.h:202
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr "Tastierë Memorex MX2500 EZ-Access"
-
-#: xfree86.xml.in.h:203
-msgid "Memorex MX2750"
-msgstr "Memorex MX2750"
-
-#: xfree86.xml.in.h:204
-msgid "Menu is Compose"
-msgstr "Menu është krijuar"
-
-#: xfree86.xml.in.h:205
-msgid "Menu key changes group"
-msgstr "Pulsanti i menu ndryshon grupin"
-
-#: xfree86.xml.in.h:206
-msgid "Meta is mapped to the Win-keys."
-msgstr "Meta është vendosur tek pulsantët Win. "
-
-#: xfree86.xml.in.h:207
-msgid "Meta is mapped to the left Win-key."
-msgstr "Meta është vendosur tek pulsanti i majtë Win."
-
-#: xfree86.xml.in.h:208
-msgid "Microsoft Internet Keyboard"
-msgstr "Tastierë Microsoft Internet"
-
-#: xfree86.xml.in.h:209
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "Microsoft Internet Keyboard Pro, Suedeze"
-
-#: xfree86.xml.in.h:210
-msgid "Microsoft Natural"
-msgstr "Microsoft Natural"
-
-#: xfree86.xml.in.h:211
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-
-#: xfree86.xml.in.h:212
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr "Microsoft Natural Keyboard Pro OEM"
-
-#: xfree86.xml.in.h:213
-msgid "Microsoft Office Keyboard"
-msgstr "Tastierë Microsoft Office"
-
-#: xfree86.xml.in.h:214
-msgid "Miscellaneous compatibility options"
-msgstr "Opcione të ndryshme kompatibiliteti"
-
-#: xfree86.xml.in.h:215
-msgid "Mkd"
-msgstr "Mkd"
-
-#: xfree86.xml.in.h:216
-msgid "Mlt"
-msgstr "Mlt"
-
-#: xfree86.xml.in.h:217
-msgid "Mmr"
-msgstr "Mmr"
-
-#: xfree86.xml.in.h:218
-msgid "Mng"
-msgstr "Mng"
-
-#: xfree86.xml.in.h:219
-msgid "Mongolian"
-msgstr "Mongoliane"
-
-#: xfree86.xml.in.h:220
-msgid "Nld"
-msgstr "Nld"
-
-#: xfree86.xml.in.h:221
-msgid "Nor"
-msgstr "Nor"
-
-#: xfree86.xml.in.h:222
-msgid "Northern Saami (Finland)"
-msgstr "Northern Saami (Finlandeze)"
-
-#: xfree86.xml.in.h:223
-msgid "Northern Saami (Norway)"
-msgstr "Northern Saami (Norvegjeze)"
-
-#: xfree86.xml.in.h:224
-msgid "Northern Saami (Sweden)"
-msgstr "Northern Saami (Suedeze)"
-
-#: xfree86.xml.in.h:225
-msgid "Northgate OmniKey 101"
-msgstr "Northgate OmniKey 101"
-
-#: xfree86.xml.in.h:226
-msgid "Norwegian"
-msgstr "Norvegjeze"
-
-#: xfree86.xml.in.h:227
-msgid "Num_Lock LED shows alternative group"
-msgstr "Llampa e Num_Lock tregon grupin alternativ"
-
-#: xfree86.xml.in.h:228
-msgid "Ogh"
-msgstr "Ogh"
-
-#: xfree86.xml.in.h:229
-msgid "Ogham"
-msgstr "Ogham"
-
-#: xfree86.xml.in.h:230
-msgid "Oretec MCK-800 MM/Internet keyboard"
-msgstr "Tastierë Oretec MCK-800 MM/Internet"
-
-#: xfree86.xml.in.h:231
-msgid "Ori"
-msgstr "Ori"
-
-#: xfree86.xml.in.h:232
-msgid "Oriya"
-msgstr "Oriya"
-
-#: xfree86.xml.in.h:233
-msgid "PC-98xx Series"
-msgstr "Seritë PC-98xx"
-
-#: xfree86.xml.in.h:234
-msgid "PC104"
-msgstr "PC104"
-
-#: xfree86.xml.in.h:235
-msgid "Pan"
-msgstr "Pan"
-
-#: xfree86.xml.in.h:236
-msgid "Phonetic"
-msgstr "Phonetic"
-
-#: xfree86.xml.in.h:237
-msgid "Pol"
-msgstr "Pol"
-
-#: xfree86.xml.in.h:238
-msgid "Polish"
-msgstr "Polonisht"
-
-#: xfree86.xml.in.h:239
-msgid "Polish (qwertz)"
-msgstr "Polake (qwertz)"
-
-#: xfree86.xml.in.h:240
-msgid "Polytonic"
-msgstr "Polytonic"
-
-#: xfree86.xml.in.h:241
-msgid "Portuguese"
-msgstr "Portugeze"
-
-#: xfree86.xml.in.h:242
-msgid "PowerPC PS/2"
-msgstr "PowerPC PS/2"
-
-#: xfree86.xml.in.h:243
-msgid "Press Left Win-key to choose 3rd level"
-msgstr "Shtyp pulsantin e majtë Win për të zgjedhur nivelin e tretë"
-
-#: xfree86.xml.in.h:244
-msgid "Press Menu key to choose 3rd level"
-msgstr "Shtyp pulsantin Menu për të zgjedhur nivelin e tretë"
-
-#: xfree86.xml.in.h:245
-msgid "Press Right Control to choose 3rd level"
-msgstr "Shtyp pulsantin e djathtë Control për të zgjedhur nivelin e tretë"
-
-#: xfree86.xml.in.h:246
-msgid "Press Right Win-key to choose 3rd level"
-msgstr "Shtyp pulsantin e djathtë Win për të zgjedhur nivelin e tretë"
-
-#: xfree86.xml.in.h:247
-msgid "Press any of Win-keys to choose 3rd level"
-msgstr "Shtyp çfarëdo pulsanti Win për të zgjedhur nivelin e tretë"
-
-#: xfree86.xml.in.h:248
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "Propeller Voyager (KTEZ-1000)"
-
-#: xfree86.xml.in.h:249
-msgid "Prt"
-msgstr "Prt"
-
-#: xfree86.xml.in.h:250
-msgid "QTronix Scorpius 98N+"
-msgstr "QTronix Scorpius 98N+"
-
-#: xfree86.xml.in.h:251
-msgid "R-Alt switches group while pressed"
-msgstr "D-Alt ndryshon grupin kur është i shtypur"
-
-#: xfree86.xml.in.h:252
-msgid "Right Alt is Compose"
-msgstr "Alt i djathtë u krijua"
-
-#: xfree86.xml.in.h:253
-msgid "Right Alt key changes group"
-msgstr "Pulsanti i djathtë Alt ndryshon grupin"
-
-#: xfree86.xml.in.h:254
-msgid "Right Control key works as Right Alt"
-msgstr "Pulsanti i djathtë Control punon si Alt i djathtë"
-
-#: xfree86.xml.in.h:255
-msgid "Right Ctrl key changes group"
-msgstr "Pulsanti i djathtë Ctrl ndryshon grupin"
-
-#: xfree86.xml.in.h:256
-msgid "Right Shift key changes group"
-msgstr "Pulsanti i djathtë Shift ndryshon grupin"
-
-#: xfree86.xml.in.h:257
-msgid "Right Win-key changes group"
-msgstr "Pulsanti i djathtë Win ndryshon grupin"
-
-#: xfree86.xml.in.h:258
-msgid "Right Win-key is Compose"
-msgstr "Pulsanti Win i djathtë u krijua"
-
-#: xfree86.xml.in.h:259
-msgid "Right Win-key switches group while pressed"
-msgstr "Pulsanti i djathtë Win ndryshon grupin kur është i shtypur"
-
-#: xfree86.xml.in.h:260
-msgid "Romanian"
-msgstr "Rumanisht"
-
-#: xfree86.xml.in.h:261
-msgid "Rou"
-msgstr "Rou"
-
-#: xfree86.xml.in.h:262
-msgid "Rus"
-msgstr "Rus"
-
-#: xfree86.xml.in.h:263
-msgid "Russian"
-msgstr "Rusisht"
-
-#: xfree86.xml.in.h:264
-msgid "SK-1300"
-msgstr "SK-1300"
-
-#: xfree86.xml.in.h:265
-msgid "SK-2500"
-msgstr "SK-2500"
-
-#: xfree86.xml.in.h:266
-msgid "SK-6200"
-msgstr "SK-6200"
-
-#: xfree86.xml.in.h:267
-msgid "SK-7100"
-msgstr "SK-7100"
-
-#: xfree86.xml.in.h:268
-msgid "SVEN Ergonomic 2500"
-msgstr "SVEN Ergonomic 2500"
-
-#: xfree86.xml.in.h:269
-msgid "Samsung SDM 4500P"
-msgstr "Samsung SDM 4500P"
-
-#: xfree86.xml.in.h:270
-msgid "Samsung SDM 4510P"
-msgstr "Samsung SDM 4510P"
-
-#: xfree86.xml.in.h:271
-msgid "Sapmi"
-msgstr "Sapmi"
-
-#: xfree86.xml.in.h:272
-msgid "Scg"
-msgstr "Scg"
-
-#: xfree86.xml.in.h:273
-msgid "Scroll_Lock LED shows alternative group"
-msgstr "Llampa e Scroll_Lock tregon grupin alternativ"
-
-#: xfree86.xml.in.h:274
-msgid "Serbian"
-msgstr "Sërbisht"
-
-#: xfree86.xml.in.h:275
-msgid "Shift with numpad keys works as in MS Windows"
-msgstr "Shift së bashku me pulsantin numpad funksionon si tek MS Windows"
-
-#: xfree86.xml.in.h:276
-msgid "Slovak"
-msgstr "Sllovake"
-
-#: xfree86.xml.in.h:277
-msgid "Slovak (qwerty)"
-msgstr "Sllovake (qwerty)"
-
-#: xfree86.xml.in.h:278
-msgid "Slovenian"
-msgstr "Sllovene"
-
-#: xfree86.xml.in.h:279
-msgid "Sme"
-msgstr "Sme"
-
-#: xfree86.xml.in.h:280
-msgid "Spanish"
-msgstr "Spanjisht"
-
-#: xfree86.xml.in.h:281
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
-msgstr "Çelsa specialë (Ctrl+Alt+&lt;çelsi&gt;) të manazhuar në një server."
-
-#: xfree86.xml.in.h:282
-msgid "Standard"
-msgstr "Standart"
-
-#: xfree86.xml.in.h:283
-msgid "Sun dead keys"
-msgstr "Pulsantë të vdekur Sun"
-
-#: xfree86.xml.in.h:284
-msgid "Super is mapped to the Win-keys (default)."
-msgstr "Super është vendosur tek pulsantët Win (e prezgjedhur)."
-
-#: xfree86.xml.in.h:285
-msgid "Sv"
-msgstr "Sv"
-
-#: xfree86.xml.in.h:286
-msgid "Svk"
-msgstr "Svk"
-
-#: xfree86.xml.in.h:287
-msgid "Svn"
-msgstr "Svn"
-
-#: xfree86.xml.in.h:288
-msgid "Swap Control and Caps Lock"
-msgstr "Shkëmbyesi Control dhe Caps Lock"
-
-#: xfree86.xml.in.h:289
-msgid "Swe"
-msgstr "Swe"
-
-#: xfree86.xml.in.h:290
-msgid "Swedish"
-msgstr "Suedisht"
-
-#: xfree86.xml.in.h:291
-msgid "Swiss French"
-msgstr "Frengjisht e Zvicrës"
-
-#: xfree86.xml.in.h:292
-msgid "Swiss German"
-msgstr "Gjermenishte e Zvicrës"
-
-#: xfree86.xml.in.h:293
-msgid "Symplon PaceBook (tablet PC)"
-msgstr "Symplon PaceBook (tablet PC)"
-
-#: xfree86.xml.in.h:294
-msgid "Syr"
-msgstr "Syr"
-
-#: xfree86.xml.in.h:295
-msgid "Syriac"
-msgstr "Siriane"
-
-#: xfree86.xml.in.h:296
-msgid "Tajik"
-msgstr "Tajik"
-
-#: xfree86.xml.in.h:297
-msgid "Tamil"
-msgstr "Tamil"
-
-#: xfree86.xml.in.h:298
-msgid "Tel"
-msgstr "Tel"
-
-#: xfree86.xml.in.h:299
-msgid "Telugu"
-msgstr "Telugu"
-
-#: xfree86.xml.in.h:300
-msgid "Tha"
-msgstr "Tha"
-
-#: xfree86.xml.in.h:301
-msgid "Thai (Kedmanee)"
-msgstr "Thai (Kedmanee)"
-
-#: xfree86.xml.in.h:302
-msgid "Thai (Pattachote)"
-msgstr "Thai (Pattachote)"
-
-#: xfree86.xml.in.h:303
-msgid "Thai (TIS-820.2538)"
-msgstr "Thai (TIS-820.2538)"
-
-#: xfree86.xml.in.h:304
-msgid "Third level choosers"
-msgstr "Zgjedhësit e nivelit të tretë"
-
-#: xfree86.xml.in.h:305
-msgid "Tjk"
-msgstr "Tjk"
-
-#: xfree86.xml.in.h:306
-msgid "Tml"
-msgstr "Tml"
-
-#: xfree86.xml.in.h:307
-msgid "Toshiba Satellite S3000"
-msgstr "Toshiba Satellite S3000"
-
-#: xfree86.xml.in.h:308
-msgid "Trust Direct Access Keyboard"
-msgstr "Tastierë Trust Direct Access"
-
-#: xfree86.xml.in.h:309
-msgid "Trust Wireless Keyboard Classic"
-msgstr "Tastierë klasike Trust Wireless"
-
-#: xfree86.xml.in.h:310
-msgid "Tur"
-msgstr "Tur"
-
-#: xfree86.xml.in.h:311
-msgid "Turkish"
-msgstr "Turqisht"
-
-#: xfree86.xml.in.h:312
-msgid "Turkish (F)"
-msgstr "Turke (F)"
-
-#: xfree86.xml.in.h:313
-msgid "Turkish Alt-Q Layout"
-msgstr "Planimetria Alt-Q Turke"
-
-#: xfree86.xml.in.h:314
-msgid "U.S. English"
-msgstr "U.S. Anglisht"
-
-#: xfree86.xml.in.h:315
-msgid "U.S. English w/ ISO9995-3"
-msgstr "U.S. Anglisht w/ ISO9995-3"
-
-#: xfree86.xml.in.h:316
-msgid "U.S. English w/ dead keys"
-msgstr "U.S. Anglisht w/ dead keys"
-
-#: xfree86.xml.in.h:317
-msgid "US"
-msgstr "US"
-
-#: xfree86.xml.in.h:318
-msgid "US keyboard with Romanian letters"
-msgstr "Tastierë US me gërma Romane"
-
-#: xfree86.xml.in.h:319
-msgid "USA"
-msgstr "USA"
-
-#: xfree86.xml.in.h:320
-msgid "Ukr"
-msgstr "Ukr"
-
-#: xfree86.xml.in.h:321
-msgid "Ukrainian"
-msgstr "Ukrahinase"
-
-#: xfree86.xml.in.h:322
-msgid "UnicodeExpert"
-msgstr "EkspertUnicode"
-
-#: xfree86.xml.in.h:323
-msgid "United Kingdom"
-msgstr "Mbretëria e Bashkuar"
-
-#: xfree86.xml.in.h:324
-msgid "Use keyboard LED to show alternative group"
-msgstr "Përdor LED e tastierës për të treguar grupin alternativ"
-
-#: xfree86.xml.in.h:325
-msgid "Uses internal capitalization. Shift cancels Caps."
-msgstr "Përdor gërma të mëdha në brendësi. Shift fshin Caps."
-
-#: xfree86.xml.in.h:326
-msgid "Uses internal capitalization. Shift doesn't cancel Caps."
-msgstr "Përdor gërma të mëdha në brendësi. Shift nuk fshin Caps."
-
-#: xfree86.xml.in.h:327
-msgid "Uzb"
-msgstr "Uzb"
-
-#: xfree86.xml.in.h:328
-msgid "Uzbek"
-msgstr "Uzbek"
-
-#: xfree86.xml.in.h:329
-msgid "Vietnamese"
-msgstr "Vietnamisht"
-
-#: xfree86.xml.in.h:330
-msgid "Vnm"
-msgstr "Vnm"
-
-#: xfree86.xml.in.h:331
-msgid "Winbook Model XP5"
-msgstr "Winbook Model XP5"
-
-#: xfree86.xml.in.h:332
-msgid "Winkeys"
-msgstr "Winkeys"
-
-#: xfree86.xml.in.h:333
-msgid "Yahoo! Internet Keyboard"
-msgstr "Tastierë Yahoo! Internet"
-
-#: xfree86.xml.in.h:334
-msgid "Yug"
-msgstr "Yug"
-
-#: xfree86.xml.in.h:335
-msgid "Yugoslavian"
-msgstr "Yugoslavian"
-
-#: xfree86.xml.in.h:336
-msgid "abnt2"
-msgstr "abnt2"
-
-#: xfree86.xml.in.h:337
-msgid "azerty"
-msgstr "azerty"
-
-#: xfree86.xml.in.h:338
-msgid "azerty/digits"
-msgstr "azerty/digits"
-
-#: xfree86.xml.in.h:339
-msgid "bksl"
-msgstr "bksl"
-
-#: xfree86.xml.in.h:340
-msgid "digits"
-msgstr "numra"
-
-#: xfree86.xml.in.h:341
-msgid "l2/101/qwerty/comma"
-msgstr "l2/101/qwerty/presje"
-
-#: xfree86.xml.in.h:342
-msgid "l2/101/qwerty/dot"
-msgstr "l2/101/qwerty/pikë"
-
-#: xfree86.xml.in.h:343
-msgid "l2/101/qwertz/comma"
-msgstr "l2/101/qwertz/presje"
-
-#: xfree86.xml.in.h:344
-msgid "l2/101/qwertz/dot"
-msgstr "l2/101/qwertz/pikë"
-
-#: xfree86.xml.in.h:345
-msgid "l2/102/qwerty/comma"
-msgstr "l2/102/qwerty/presje"
-
-#: xfree86.xml.in.h:346
-msgid "l2/102/qwerty/dot"
-msgstr "l2/102/qwerty/pikë"
-
-#: xfree86.xml.in.h:347
-msgid "l2/102/qwertz/comma"
-msgstr "l2/102/qwertz/presje"
-
-#: xfree86.xml.in.h:348
-msgid "l2/102/qwertz/dot"
-msgstr "l2/102/qwertz/pikë"
-
-#: xfree86.xml.in.h:349
-msgid "laptop"
-msgstr "laptop"
-
-#: xfree86.xml.in.h:350
-msgid "lyx"
-msgstr "lyx"
-
-#: xfree86.xml.in.h:351
-msgid "qwerty"
-msgstr "qwerty"
-
-#: xfree86.xml.in.h:352
-msgid "qwerty/digits"
-msgstr "qwerty/numra"
-
-#: xfree86.xml.in.h:353
-msgid "sefi"
-msgstr "sefi"
-
-#: xfree86.xml.in.h:354
-msgid "si1452"
-msgstr "si1452"
-
-#: xfree86.xml.in.h:355
-msgid "uni/101/qwerty/comma"
-msgstr "uni/101/qwerty/presje"
-
-#: xfree86.xml.in.h:356
-msgid "uni/101/qwerty/dot"
-msgstr "uni/101/qwerty/pikë"
-
-#: xfree86.xml.in.h:357
-msgid "uni/101/qwertz/comma"
-msgstr "uni/101/qwertz/presje"
-
-#: xfree86.xml.in.h:358
-msgid "uni/101/qwertz/dot"
-msgstr "uni/101/qwertz/pikë"
-
-#: xfree86.xml.in.h:359
-msgid "uni/102/qwerty/comma"
-msgstr "uni/102/qwerty/presje"
-
-#: xfree86.xml.in.h:360
-msgid "uni/102/qwerty/dot"
-msgstr "uni/102/qwerty/pikë"
-
-#: xfree86.xml.in.h:361
-msgid "uni/102/qwertz/comma"
-msgstr "uni/102/qwertz/presje"
-
-#: xfree86.xml.in.h:362
-msgid "uni/102/qwertz/dot"
-msgstr "uni/102/qwertz/pikë"
-
+# translation of xfree86_xkb_xml-4.4pre1 to Albanian
+# This file is distributed under the same license as the xfree86_xkb_xml-4.4pre1 package.
+# Laurent Dhima <laurenti@alblinux.net>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-11-25 23:38+0000\n"
+"PO-Revision-Date: 2004-03-03 08:55-0500\n"
+"Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
+"Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3\n"
+
+#: xfree86.xml.in.h:1
+msgid "\"Typewriter\""
+msgstr "\"Makinë shkrimi\""
+
+#: xfree86.xml.in.h:2
+msgid "A Tamil typewrite-style keymap; TAB encoding"
+msgstr "Një tastierë Tamil-ane stil makinë shkrimi; kodifikim TAB"
+
+#: xfree86.xml.in.h:3
+msgid "A Tamil typewrite-style keymap; TSCII encoding"
+msgstr "Një tastierë Tamil-ane stil makinë shkrimi; kodifikim TSCII"
+
+#: xfree86.xml.in.h:4
+msgid "A Tamil typewrite-style keymap; Unicode encoding"
+msgstr "Një tastierë Tamil-ane stil makinë shkrimi; kodifikim Unicode"
+
+#: xfree86.xml.in.h:5
+msgid "ACPI Standard"
+msgstr "ACPI Standart"
+
+#: xfree86.xml.in.h:6
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: xfree86.xml.in.h:7
+msgid "Acts as Shift with locking. Shift cancels Caps."
+msgstr "Vepron si Shift me bllokues. Shift fshin Caps."
+
+#: xfree86.xml.in.h:8
+msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
+msgstr "Vepron si Shift me bllokues. Shift nuk fshin Caps."
+
+#: xfree86.xml.in.h:9
+msgid "Add the standard behavior to Menu key."
+msgstr "Shto sjelljen standarte tek Menu key."
+
+#: xfree86.xml.in.h:10
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: xfree86.xml.in.h:11
+msgid "Alb"
+msgstr "Alb"
+
+#: xfree86.xml.in.h:12
+msgid "Albanian"
+msgstr "Shqip"
+
+#: xfree86.xml.in.h:13
+msgid "Alt and Meta on the Alt keys (default)."
+msgstr "Alt dhe Meta tek pulsanti Alt (e prezgjedhur)."
+
+#: xfree86.xml.in.h:14
+msgid "Alt+Control changes group"
+msgstr "Alt+Control ndryshon grupin"
+
+#: xfree86.xml.in.h:15
+msgid "Alt+Shift changes group"
+msgstr "Alt+Shift ndryshon grupin"
+
+#: xfree86.xml.in.h:16
+msgid "Alt/Win key behavior"
+msgstr "Sjellja e pulsantit Alt/Win"
+
+#: xfree86.xml.in.h:17
+msgid "Alternate"
+msgstr "Alterno"
+
+#: xfree86.xml.in.h:18
+msgid "Arabic"
+msgstr "Arabe"
+
+#: xfree86.xml.in.h:19
+msgid "Arb"
+msgstr "Arb"
+
+#: xfree86.xml.in.h:20
+msgid "Arm"
+msgstr "Arm"
+
+#: xfree86.xml.in.h:21
+msgid "Armenian"
+msgstr "Armenisht"
+
+#: xfree86.xml.in.h:22
+msgid "Aze"
+msgstr "Aze"
+
+#: xfree86.xml.in.h:23
+msgid "Azerbaijani"
+msgstr "Azerbaijani"
+
+#: xfree86.xml.in.h:24
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: xfree86.xml.in.h:25
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: xfree86.xml.in.h:26
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: xfree86.xml.in.h:27
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: xfree86.xml.in.h:28
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: xfree86.xml.in.h:29
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: xfree86.xml.in.h:30
+msgid "Basic"
+msgstr "Bazë"
+
+#: xfree86.xml.in.h:31
+msgid "Bel"
+msgstr "Bel"
+
+#: xfree86.xml.in.h:32
+msgid "Belarusian"
+msgstr "Bjelloruse"
+
+#: xfree86.xml.in.h:33
+msgid "Belgian"
+msgstr "Belg"
+
+#: xfree86.xml.in.h:34
+msgid "Ben"
+msgstr "Ben"
+
+#: xfree86.xml.in.h:35
+msgid "Bengali"
+msgstr "Bengali"
+
+#: xfree86.xml.in.h:36
+msgid "Bgr"
+msgstr "Bgr"
+
+#: xfree86.xml.in.h:37
+msgid "Bih"
+msgstr "Bih"
+
+#: xfree86.xml.in.h:38
+msgid "Blr"
+msgstr "Blr"
+
+#: xfree86.xml.in.h:39
+msgid "Bosnian"
+msgstr "Bosnjake"
+
+#: xfree86.xml.in.h:40
+msgid "Both Alt keys together change group"
+msgstr "Dy pulsantët Alt së bashku ndryshjnë grupin"
+
+#: xfree86.xml.in.h:41
+msgid "Both Ctrl keys together change group"
+msgstr "Dy pulsantët Ctrl së bashku ndryshojnë grupin"
+
+#: xfree86.xml.in.h:42
+msgid "Both Shift keys together change group"
+msgstr "Dy pulsantët Shift së bashku ndryshojnë grupin"
+
+#: xfree86.xml.in.h:43
+msgid "Both Win-keys switch group while pressed"
+msgstr "Të dy pulsantët Win ndryshojnë gropin kur shtypen"
+
+#: xfree86.xml.in.h:44
+msgid "Bra"
+msgstr "Bra"
+
+#: xfree86.xml.in.h:45
+msgid "Brazilian"
+msgstr "Braziliane"
+
+#: xfree86.xml.in.h:46
+msgid "Brazilian ABNT2"
+msgstr "Braziliane ABNT2"
+
+#: xfree86.xml.in.h:47
+msgid "Brother Internet Keyboard"
+msgstr "Tastiera Internet Brother"
+
+#: xfree86.xml.in.h:48
+msgid "Bulgarian"
+msgstr "Bullgarisht"
+
+#: xfree86.xml.in.h:49
+msgid "Burmese"
+msgstr "Burmese"
+
+#: xfree86.xml.in.h:50
+msgid "Can"
+msgstr "Can"
+
+#: xfree86.xml.in.h:51
+msgid "Canadian"
+msgstr "Kanadeze"
+
+#: xfree86.xml.in.h:52
+msgid "Caps Lock key changes group"
+msgstr "Pulsanti Caps Lock ndryshon grupin"
+
+#: xfree86.xml.in.h:53
+msgid "CapsLock key behavior"
+msgstr "Sjellja e pulsantit CapsLock"
+
+#: xfree86.xml.in.h:54
+msgid "Caps_Lock LED shows alternative group"
+msgstr "Llampa e Caps_Lock tregon grupin alternativ"
+
+#: xfree86.xml.in.h:55
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: xfree86.xml.in.h:56
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (opcioni alterno)"
+
+#: xfree86.xml.in.h:57
+msgid "Chicony Internet Keyboard"
+msgstr "Tastiera Internet Chicony"
+
+#: xfree86.xml.in.h:58
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: xfree86.xml.in.h:59
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: xfree86.xml.in.h:60
+msgid "CloGaelach Laptop"
+msgstr "Laptop CloGaelach"
+
+#: xfree86.xml.in.h:61
+msgid "Compaq Easy Access Keyboard"
+msgstr "Tastiera Compaq Easy Access"
+
+#: xfree86.xml.in.h:62
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Tatiera Internet Compaq (13 pulsante)"
+
+#: xfree86.xml.in.h:63
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Tastiera Internet Compaq (18 pulsante)"
+
+#: xfree86.xml.in.h:64
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Tastiera Internet Compaq (7 pulsante)"
+
+#: xfree86.xml.in.h:65
+msgid "Compaq iPaq Keyboard"
+msgstr "Tastiera Compaq iPaq"
+
+#: xfree86.xml.in.h:66
+msgid "Control Key Position"
+msgstr "Pozicioni i pulsantit Control"
+
+#: xfree86.xml.in.h:67
+msgid "Control key at bottom left"
+msgstr "Pulsanti Control sipër majtas"
+
+#: xfree86.xml.in.h:68
+msgid "Control key at left of 'A'"
+msgstr "Pulsanti Control në të majtë të 'A'"
+
+#: xfree86.xml.in.h:69
+msgid "Control+Shift changes group"
+msgstr "Control+Shift ndryshon grupin"
+
+#: xfree86.xml.in.h:70
+msgid "Croatian"
+msgstr "Kroate"
+
+#: xfree86.xml.in.h:71
+msgid "Cyrillic"
+msgstr "Cyrillic"
+
+#: xfree86.xml.in.h:72
+msgid "Cze"
+msgstr "Cze"
+
+#: xfree86.xml.in.h:73
+msgid "Czech"
+msgstr "Çekisht"
+
+#: xfree86.xml.in.h:74
+msgid "Czech (qwerty)"
+msgstr "Czech (qwerty)"
+
+#: xfree86.xml.in.h:75
+msgid "Danish"
+msgstr "Danisht"
+
+#: xfree86.xml.in.h:76
+msgid "Dead acute"
+msgstr "Fund kritik"
+
+#: xfree86.xml.in.h:77
+msgid "Dead grave acute"
+msgstr "Fund kritik serioz"
+
+#: xfree86.xml.in.h:78
+msgid "Dell"
+msgstr "Dell"
+
+#: xfree86.xml.in.h:79
+msgid "Dell 101-key PC"
+msgstr "Dell 101-key PC"
+
+#: xfree86.xml.in.h:80
+msgid "Deu"
+msgstr "Deu"
+
+#: xfree86.xml.in.h:81
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Tastierë Dexxa Wireless Desktop"
+
+#: xfree86.xml.in.h:82
+msgid "Diamond 9801 / 9802 series"
+msgstr "Seritë Diamond 9801 / 9802"
+
+#: xfree86.xml.in.h:83
+msgid "Dnk"
+msgstr "Dnk"
+
+#: xfree86.xml.in.h:84
+msgid "Dutch"
+msgstr "Hollandeze"
+
+#: xfree86.xml.in.h:85
+msgid "Dvo"
+msgstr "Dvo"
+
+#: xfree86.xml.in.h:86
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: xfree86.xml.in.h:87
+msgid "Eliminate dead keys"
+msgstr "Elemino pulsantët e vdekur"
+
+#: xfree86.xml.in.h:88
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: xfree86.xml.in.h:89
+msgid "Esp"
+msgstr "Esp"
+
+#: xfree86.xml.in.h:90
+msgid "Est"
+msgstr "Est"
+
+#: xfree86.xml.in.h:91
+msgid "Estonian"
+msgstr "Estonisht"
+
+#: xfree86.xml.in.h:92
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: xfree86.xml.in.h:93
+msgid "Extended"
+msgstr "E zgjeruar"
+
+#: xfree86.xml.in.h:94
+msgid "Fao"
+msgstr "Fao"
+
+#: xfree86.xml.in.h:95
+msgid "Faroese"
+msgstr "Faroese"
+
+#: xfree86.xml.in.h:96
+msgid "Farsi"
+msgstr "Farsi"
+
+#: xfree86.xml.in.h:97
+msgid "Fin"
+msgstr "Fin"
+
+#: xfree86.xml.in.h:98
+msgid "Finnish"
+msgstr "Finlandeze"
+
+#: xfree86.xml.in.h:99
+msgid "Fra"
+msgstr "Fra"
+
+#: xfree86.xml.in.h:100
+msgid "French"
+msgstr "Frengjisht"
+
+#: xfree86.xml.in.h:101
+msgid "French (alternative)"
+msgstr "Franceze (alternativa)"
+
+#: xfree86.xml.in.h:102
+msgid "French Canadian"
+msgstr "Frengjisht e Kanadasë"
+
+#: xfree86.xml.in.h:103
+msgid "GBr"
+msgstr "GBr"
+
+#: xfree86.xml.in.h:104
+msgid "Generic 101-key PC"
+msgstr "Generic 101-key PC"
+
+#: xfree86.xml.in.h:105
+msgid "Generic 102-key (Intl) PC"
+msgstr "Generic 102-key (Intl) PC"
+
+#: xfree86.xml.in.h:106
+msgid "Generic 104-key PC"
+msgstr "Generic 104-key PC"
+
+#: xfree86.xml.in.h:107
+msgid "Generic 105-key (Intl) PC"
+msgstr "Generic 105-key (Intl) PC"
+
+#: xfree86.xml.in.h:108
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+
+#: xfree86.xml.in.h:109
+msgid "Geo"
+msgstr "Geo"
+
+#: xfree86.xml.in.h:110
+msgid "Georgian (latin)"
+msgstr "Georgian (latine)"
+
+#: xfree86.xml.in.h:111
+msgid "Georgian (russian)"
+msgstr "Georgian (rusisht)"
+
+#: xfree86.xml.in.h:112
+msgid "German"
+msgstr "Gjermanisht"
+
+#: xfree86.xml.in.h:113
+msgid "Grc"
+msgstr "Grc"
+
+#: xfree86.xml.in.h:114
+msgid "Greek"
+msgstr "Greqisht"
+
+#: xfree86.xml.in.h:115
+msgid "Group Shift/Lock behavior"
+msgstr "Sjellja e grupit Shift/Lock"
+
+#: xfree86.xml.in.h:116
+msgid "Guj"
+msgstr "Guj"
+
+#: xfree86.xml.in.h:117
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: xfree86.xml.in.h:118
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: xfree86.xml.in.h:119
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Tastierë për Internet Hewlett-Packard"
+
+#: xfree86.xml.in.h:120
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: xfree86.xml.in.h:121
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: xfree86.xml.in.h:122
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: xfree86.xml.in.h:123
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: xfree86.xml.in.h:124
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: xfree86.xml.in.h:125
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: xfree86.xml.in.h:126
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: xfree86.xml.in.h:127
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Tastierë multimediale Hewlett-Packard SK-2501"
+
+#: xfree86.xml.in.h:128
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Tastierë për Internet Hewlett-Packard SK-2505"
+
+#: xfree86.xml.in.h:129
+msgid "Hin"
+msgstr "Hin"
+
+#: xfree86.xml.in.h:130
+msgid "Hindi"
+msgstr "Hindi"
+
+#: xfree86.xml.in.h:131
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: xfree86.xml.in.h:132
+msgid "Hrv"
+msgstr "Hrv"
+
+#: xfree86.xml.in.h:133
+msgid "Hun"
+msgstr "Hun"
+
+#: xfree86.xml.in.h:134
+msgid "Hungarian"
+msgstr "Hungarisht"
+
+#: xfree86.xml.in.h:135
+msgid "Hungarian (qwerty)"
+msgstr "Hungareze (qwerty)"
+
+#: xfree86.xml.in.h:136
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper është vendosur tek pulsantët Win."
+
+#: xfree86.xml.in.h:137
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: xfree86.xml.in.h:138
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: xfree86.xml.in.h:139
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (opcioni alternativ)"
+
+#: xfree86.xml.in.h:140
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: xfree86.xml.in.h:141
+msgid "INSCRIPT layout"
+msgstr "Planimetri INSCRIPT"
+
+#: xfree86.xml.in.h:142
+msgid "IS434"
+msgstr "IS434"
+
+#: xfree86.xml.in.h:143
+msgid "IS434 laptop"
+msgstr "Laptop IS434"
+
+#: xfree86.xml.in.h:144
+msgid "ISO Alternate"
+msgstr "ISO Alternative"
+
+#: xfree86.xml.in.h:145
+msgid "Icelandic"
+msgstr "Islandeze"
+
+#: xfree86.xml.in.h:146
+msgid "Iku"
+msgstr "Iku"
+
+#: xfree86.xml.in.h:147
+msgid "Inuktitut"
+msgstr "Inuktitut"
+
+#: xfree86.xml.in.h:148
+msgid "Irish"
+msgstr "Irlandeze"
+
+#: xfree86.xml.in.h:149
+msgid "Irl"
+msgstr "Irl"
+
+#: xfree86.xml.in.h:150
+msgid "Irn"
+msgstr "Irn"
+
+#: xfree86.xml.in.h:151
+msgid "Isl"
+msgstr "Isl"
+
+#: xfree86.xml.in.h:152
+msgid "Isr"
+msgstr "Isr"
+
+#: xfree86.xml.in.h:153
+msgid "Israeli"
+msgstr "Izraeliane"
+
+#: xfree86.xml.in.h:154
+msgid "Ita"
+msgstr "Ita"
+
+#: xfree86.xml.in.h:155
+msgid "Italian"
+msgstr "Italisht"
+
+#: xfree86.xml.in.h:156
+msgid "Japanese"
+msgstr "Japonisht"
+
+#: xfree86.xml.in.h:157
+msgid "Japanese 106-key"
+msgstr "Japoneze 106-pulsantë"
+
+#: xfree86.xml.in.h:158
+msgid "Jpn"
+msgstr "Jpn"
+
+#: xfree86.xml.in.h:159
+msgid "Kan"
+msgstr "Kan"
+
+#: xfree86.xml.in.h:160
+msgid "Kannada"
+msgstr "Kanadeze"
+
+#: xfree86.xml.in.h:161
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: xfree86.xml.in.h:162
+msgid "LAm"
+msgstr "LAm"
+
+#: xfree86.xml.in.h:163
+msgid "Laptop"
+msgstr "Laptop"
+
+#: xfree86.xml.in.h:164
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Tastierë laptop për Laptop/notebook Compaq (p.sh. Armada)"
+
+#: xfree86.xml.in.h:165
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Tastierë për Internet për Laptop/notebook Compaq (p.sh. Presario)"
+
+#: xfree86.xml.in.h:166
+msgid "Laptop/notebook Dell Inspiron 8xxx"
+msgstr "Laptop/notebook Dell Inspiron 8xxx"
+
+#: xfree86.xml.in.h:167
+msgid "Latin"
+msgstr "Latinishte"
+
+#: xfree86.xml.in.h:168
+msgid "Latin America"
+msgstr "Latino amerikane"
+
+#: xfree86.xml.in.h:169
+msgid "Latvian"
+msgstr "Letonisht"
+
+#: xfree86.xml.in.h:170
+msgid "Left Alt key changes group"
+msgstr "Pulsanti i majtë Alt ndryshon grupin"
+
+#: xfree86.xml.in.h:171
+msgid "Left Ctrl key changes group"
+msgstr "Pulsanti i majtë Ctrl ndryshon grupin"
+
+#: xfree86.xml.in.h:172
+msgid "Left Shift key changes group"
+msgstr "Pulsanti i majtë Shift ndryshon grupin"
+
+#: xfree86.xml.in.h:173
+msgid "Left Win-key changes group"
+msgstr "Pulsanti i majtë Win ndryshon grupin"
+
+#: xfree86.xml.in.h:174
+msgid "Left Win-key switches group while pressed"
+msgstr "Pulsanti i majtë Win ndryshon grupin kur është i shtypur"
+
+#: xfree86.xml.in.h:175
+msgid "Lithuanian azerty standard"
+msgstr "Lithuanian azerty standart"
+
+#: xfree86.xml.in.h:176
+msgid "Lithuanian qwerty \"numeric\""
+msgstr "Lithuanian qwerty \"numerike\""
+
+#: xfree86.xml.in.h:177
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: xfree86.xml.in.h:178
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: xfree86.xml.in.h:179
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: xfree86.xml.in.h:180
+msgid "Logitech Cordless Desktop Pro"
+msgstr "Logitech Cordless Desktop Pro"
+
+#: xfree86.xml.in.h:181
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Logitech Cordless Desktop Pro (opcioni alternativ)"
+
+#: xfree86.xml.in.h:182
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (opcioni i dytë alternativ)"
+
+#: xfree86.xml.in.h:183
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: xfree86.xml.in.h:184
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: xfree86.xml.in.h:185
+msgid "Logitech Deluxe Access Keyboard"
+msgstr "Tastierë Logitech Deluxe Access"
+
+#: xfree86.xml.in.h:186
+msgid "Logitech Internet Keyboard"
+msgstr "Tastierë për Internet Logitech"
+
+#: xfree86.xml.in.h:187
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Tastierë Logitech Internet Navigator"
+
+#: xfree86.xml.in.h:188
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: xfree86.xml.in.h:189
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+
+#: xfree86.xml.in.h:190
+msgid "Logitech iTouch keyboard Internet Navigator"
+msgstr "Logitech iTouch keyboard Internet Navigator"
+
+#: xfree86.xml.in.h:191
+msgid "Ltu"
+msgstr "Ltu"
+
+#: xfree86.xml.in.h:192
+msgid "Lva"
+msgstr "Lva"
+
+#: xfree86.xml.in.h:193
+msgid "Macedonian"
+msgstr "Maqedonisht"
+
+#: xfree86.xml.in.h:194
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: xfree86.xml.in.h:195
+msgid "Macintosh Old"
+msgstr "Macintosh i vjetër"
+
+#: xfree86.xml.in.h:196
+msgid "Make CapsLock an additional Control"
+msgstr "Kthe CapsLock në një Control shtesë"
+
+#: xfree86.xml.in.h:197
+msgid "Mal"
+msgstr "Mal"
+
+#: xfree86.xml.in.h:198
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: xfree86.xml.in.h:199
+msgid "Maltese"
+msgstr "Malteze"
+
+#: xfree86.xml.in.h:200
+msgid "Maltese (US layout)"
+msgstr "Maltese (harta US)"
+
+#: xfree86.xml.in.h:201
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: xfree86.xml.in.h:202
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Tastierë Memorex MX2500 EZ-Access"
+
+#: xfree86.xml.in.h:203
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: xfree86.xml.in.h:204
+msgid "Menu is Compose"
+msgstr "Menu është krijuar"
+
+#: xfree86.xml.in.h:205
+msgid "Menu key changes group"
+msgstr "Pulsanti i menu ndryshon grupin"
+
+#: xfree86.xml.in.h:206
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta është vendosur tek pulsantët Win. "
+
+#: xfree86.xml.in.h:207
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta është vendosur tek pulsanti i majtë Win."
+
+#: xfree86.xml.in.h:208
+msgid "Microsoft Internet Keyboard"
+msgstr "Tastierë Microsoft Internet"
+
+#: xfree86.xml.in.h:209
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, Suedeze"
+
+#: xfree86.xml.in.h:210
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: xfree86.xml.in.h:211
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: xfree86.xml.in.h:212
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: xfree86.xml.in.h:213
+msgid "Microsoft Office Keyboard"
+msgstr "Tastierë Microsoft Office"
+
+#: xfree86.xml.in.h:214
+msgid "Miscellaneous compatibility options"
+msgstr "Opcione të ndryshme kompatibiliteti"
+
+#: xfree86.xml.in.h:215
+msgid "Mkd"
+msgstr "Mkd"
+
+#: xfree86.xml.in.h:216
+msgid "Mlt"
+msgstr "Mlt"
+
+#: xfree86.xml.in.h:217
+msgid "Mmr"
+msgstr "Mmr"
+
+#: xfree86.xml.in.h:218
+msgid "Mng"
+msgstr "Mng"
+
+#: xfree86.xml.in.h:219
+msgid "Mongolian"
+msgstr "Mongoliane"
+
+#: xfree86.xml.in.h:220
+msgid "Nld"
+msgstr "Nld"
+
+#: xfree86.xml.in.h:221
+msgid "Nor"
+msgstr "Nor"
+
+#: xfree86.xml.in.h:222
+msgid "Northern Saami (Finland)"
+msgstr "Northern Saami (Finlandeze)"
+
+#: xfree86.xml.in.h:223
+msgid "Northern Saami (Norway)"
+msgstr "Northern Saami (Norvegjeze)"
+
+#: xfree86.xml.in.h:224
+msgid "Northern Saami (Sweden)"
+msgstr "Northern Saami (Suedeze)"
+
+#: xfree86.xml.in.h:225
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: xfree86.xml.in.h:226
+msgid "Norwegian"
+msgstr "Norvegjeze"
+
+#: xfree86.xml.in.h:227
+msgid "Num_Lock LED shows alternative group"
+msgstr "Llampa e Num_Lock tregon grupin alternativ"
+
+#: xfree86.xml.in.h:228
+msgid "Ogh"
+msgstr "Ogh"
+
+#: xfree86.xml.in.h:229
+msgid "Ogham"
+msgstr "Ogham"
+
+#: xfree86.xml.in.h:230
+msgid "Oretec MCK-800 MM/Internet keyboard"
+msgstr "Tastierë Oretec MCK-800 MM/Internet"
+
+#: xfree86.xml.in.h:231
+msgid "Ori"
+msgstr "Ori"
+
+#: xfree86.xml.in.h:232
+msgid "Oriya"
+msgstr "Oriya"
+
+#: xfree86.xml.in.h:233
+msgid "PC-98xx Series"
+msgstr "Seritë PC-98xx"
+
+#: xfree86.xml.in.h:234
+msgid "PC104"
+msgstr "PC104"
+
+#: xfree86.xml.in.h:235
+msgid "Pan"
+msgstr "Pan"
+
+#: xfree86.xml.in.h:236
+msgid "Phonetic"
+msgstr "Phonetic"
+
+#: xfree86.xml.in.h:237
+msgid "Pol"
+msgstr "Pol"
+
+#: xfree86.xml.in.h:238
+msgid "Polish"
+msgstr "Polonisht"
+
+#: xfree86.xml.in.h:239
+msgid "Polish (qwertz)"
+msgstr "Polake (qwertz)"
+
+#: xfree86.xml.in.h:240
+msgid "Polytonic"
+msgstr "Polytonic"
+
+#: xfree86.xml.in.h:241
+msgid "Portuguese"
+msgstr "Portugeze"
+
+#: xfree86.xml.in.h:242
+msgid "PowerPC PS/2"
+msgstr "PowerPC PS/2"
+
+#: xfree86.xml.in.h:243
+msgid "Press Left Win-key to choose 3rd level"
+msgstr "Shtyp pulsantin e majtë Win për të zgjedhur nivelin e tretë"
+
+#: xfree86.xml.in.h:244
+msgid "Press Menu key to choose 3rd level"
+msgstr "Shtyp pulsantin Menu për të zgjedhur nivelin e tretë"
+
+#: xfree86.xml.in.h:245
+msgid "Press Right Control to choose 3rd level"
+msgstr "Shtyp pulsantin e djathtë Control për të zgjedhur nivelin e tretë"
+
+#: xfree86.xml.in.h:246
+msgid "Press Right Win-key to choose 3rd level"
+msgstr "Shtyp pulsantin e djathtë Win për të zgjedhur nivelin e tretë"
+
+#: xfree86.xml.in.h:247
+msgid "Press any of Win-keys to choose 3rd level"
+msgstr "Shtyp çfarëdo pulsanti Win për të zgjedhur nivelin e tretë"
+
+#: xfree86.xml.in.h:248
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: xfree86.xml.in.h:249
+msgid "Prt"
+msgstr "Prt"
+
+#: xfree86.xml.in.h:250
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: xfree86.xml.in.h:251
+msgid "R-Alt switches group while pressed"
+msgstr "D-Alt ndryshon grupin kur është i shtypur"
+
+#: xfree86.xml.in.h:252
+msgid "Right Alt is Compose"
+msgstr "Alt i djathtë u krijua"
+
+#: xfree86.xml.in.h:253
+msgid "Right Alt key changes group"
+msgstr "Pulsanti i djathtë Alt ndryshon grupin"
+
+#: xfree86.xml.in.h:254
+msgid "Right Control key works as Right Alt"
+msgstr "Pulsanti i djathtë Control punon si Alt i djathtë"
+
+#: xfree86.xml.in.h:255
+msgid "Right Ctrl key changes group"
+msgstr "Pulsanti i djathtë Ctrl ndryshon grupin"
+
+#: xfree86.xml.in.h:256
+msgid "Right Shift key changes group"
+msgstr "Pulsanti i djathtë Shift ndryshon grupin"
+
+#: xfree86.xml.in.h:257
+msgid "Right Win-key changes group"
+msgstr "Pulsanti i djathtë Win ndryshon grupin"
+
+#: xfree86.xml.in.h:258
+msgid "Right Win-key is Compose"
+msgstr "Pulsanti Win i djathtë u krijua"
+
+#: xfree86.xml.in.h:259
+msgid "Right Win-key switches group while pressed"
+msgstr "Pulsanti i djathtë Win ndryshon grupin kur është i shtypur"
+
+#: xfree86.xml.in.h:260
+msgid "Romanian"
+msgstr "Rumanisht"
+
+#: xfree86.xml.in.h:261
+msgid "Rou"
+msgstr "Rou"
+
+#: xfree86.xml.in.h:262
+msgid "Rus"
+msgstr "Rus"
+
+#: xfree86.xml.in.h:263
+msgid "Russian"
+msgstr "Rusisht"
+
+#: xfree86.xml.in.h:264
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: xfree86.xml.in.h:265
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: xfree86.xml.in.h:266
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: xfree86.xml.in.h:267
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: xfree86.xml.in.h:268
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: xfree86.xml.in.h:269
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: xfree86.xml.in.h:270
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: xfree86.xml.in.h:271
+msgid "Sapmi"
+msgstr "Sapmi"
+
+#: xfree86.xml.in.h:272
+msgid "Scg"
+msgstr "Scg"
+
+#: xfree86.xml.in.h:273
+msgid "Scroll_Lock LED shows alternative group"
+msgstr "Llampa e Scroll_Lock tregon grupin alternativ"
+
+#: xfree86.xml.in.h:274
+msgid "Serbian"
+msgstr "Sërbisht"
+
+#: xfree86.xml.in.h:275
+msgid "Shift with numpad keys works as in MS Windows"
+msgstr "Shift së bashku me pulsantin numpad funksionon si tek MS Windows"
+
+#: xfree86.xml.in.h:276
+msgid "Slovak"
+msgstr "Sllovake"
+
+#: xfree86.xml.in.h:277
+msgid "Slovak (qwerty)"
+msgstr "Sllovake (qwerty)"
+
+#: xfree86.xml.in.h:278
+msgid "Slovenian"
+msgstr "Sllovene"
+
+#: xfree86.xml.in.h:279
+msgid "Sme"
+msgstr "Sme"
+
+#: xfree86.xml.in.h:280
+msgid "Spanish"
+msgstr "Spanjisht"
+
+#: xfree86.xml.in.h:281
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Çelsa specialë (Ctrl+Alt+&lt;çelsi&gt;) të manazhuar në një server."
+
+#: xfree86.xml.in.h:282
+msgid "Standard"
+msgstr "Standart"
+
+#: xfree86.xml.in.h:283
+msgid "Sun dead keys"
+msgstr "Pulsantë të vdekur Sun"
+
+#: xfree86.xml.in.h:284
+msgid "Super is mapped to the Win-keys (default)."
+msgstr "Super është vendosur tek pulsantët Win (e prezgjedhur)."
+
+#: xfree86.xml.in.h:285
+msgid "Sv"
+msgstr "Sv"
+
+#: xfree86.xml.in.h:286
+msgid "Svk"
+msgstr "Svk"
+
+#: xfree86.xml.in.h:287
+msgid "Svn"
+msgstr "Svn"
+
+#: xfree86.xml.in.h:288
+msgid "Swap Control and Caps Lock"
+msgstr "Shkëmbyesi Control dhe Caps Lock"
+
+#: xfree86.xml.in.h:289
+msgid "Swe"
+msgstr "Swe"
+
+#: xfree86.xml.in.h:290
+msgid "Swedish"
+msgstr "Suedisht"
+
+#: xfree86.xml.in.h:291
+msgid "Swiss French"
+msgstr "Frengjisht e Zvicrës"
+
+#: xfree86.xml.in.h:292
+msgid "Swiss German"
+msgstr "Gjermenishte e Zvicrës"
+
+#: xfree86.xml.in.h:293
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: xfree86.xml.in.h:294
+msgid "Syr"
+msgstr "Syr"
+
+#: xfree86.xml.in.h:295
+msgid "Syriac"
+msgstr "Siriane"
+
+#: xfree86.xml.in.h:296
+msgid "Tajik"
+msgstr "Tajik"
+
+#: xfree86.xml.in.h:297
+msgid "Tamil"
+msgstr "Tamil"
+
+#: xfree86.xml.in.h:298
+msgid "Tel"
+msgstr "Tel"
+
+#: xfree86.xml.in.h:299
+msgid "Telugu"
+msgstr "Telugu"
+
+#: xfree86.xml.in.h:300
+msgid "Tha"
+msgstr "Tha"
+
+#: xfree86.xml.in.h:301
+msgid "Thai (Kedmanee)"
+msgstr "Thai (Kedmanee)"
+
+#: xfree86.xml.in.h:302
+msgid "Thai (Pattachote)"
+msgstr "Thai (Pattachote)"
+
+#: xfree86.xml.in.h:303
+msgid "Thai (TIS-820.2538)"
+msgstr "Thai (TIS-820.2538)"
+
+#: xfree86.xml.in.h:304
+msgid "Third level choosers"
+msgstr "Zgjedhësit e nivelit të tretë"
+
+#: xfree86.xml.in.h:305
+msgid "Tjk"
+msgstr "Tjk"
+
+#: xfree86.xml.in.h:306
+msgid "Tml"
+msgstr "Tml"
+
+#: xfree86.xml.in.h:307
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: xfree86.xml.in.h:308
+msgid "Trust Direct Access Keyboard"
+msgstr "Tastierë Trust Direct Access"
+
+#: xfree86.xml.in.h:309
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Tastierë klasike Trust Wireless"
+
+#: xfree86.xml.in.h:310
+msgid "Tur"
+msgstr "Tur"
+
+#: xfree86.xml.in.h:311
+msgid "Turkish"
+msgstr "Turqisht"
+
+#: xfree86.xml.in.h:312
+msgid "Turkish (F)"
+msgstr "Turke (F)"
+
+#: xfree86.xml.in.h:313
+msgid "Turkish Alt-Q Layout"
+msgstr "Planimetria Alt-Q Turke"
+
+#: xfree86.xml.in.h:314
+msgid "U.S. English"
+msgstr "U.S. Anglisht"
+
+#: xfree86.xml.in.h:315
+msgid "U.S. English w/ ISO9995-3"
+msgstr "U.S. Anglisht w/ ISO9995-3"
+
+#: xfree86.xml.in.h:316
+msgid "U.S. English w/ dead keys"
+msgstr "U.S. Anglisht w/ dead keys"
+
+#: xfree86.xml.in.h:317
+msgid "US"
+msgstr "US"
+
+#: xfree86.xml.in.h:318
+msgid "US keyboard with Romanian letters"
+msgstr "Tastierë US me gërma Romane"
+
+#: xfree86.xml.in.h:319
+msgid "USA"
+msgstr "USA"
+
+#: xfree86.xml.in.h:320
+msgid "Ukr"
+msgstr "Ukr"
+
+#: xfree86.xml.in.h:321
+msgid "Ukrainian"
+msgstr "Ukrahinase"
+
+#: xfree86.xml.in.h:322
+msgid "UnicodeExpert"
+msgstr "EkspertUnicode"
+
+#: xfree86.xml.in.h:323
+msgid "United Kingdom"
+msgstr "Mbretëria e Bashkuar"
+
+#: xfree86.xml.in.h:324
+msgid "Use keyboard LED to show alternative group"
+msgstr "Përdor LED e tastierës për të treguar grupin alternativ"
+
+#: xfree86.xml.in.h:325
+msgid "Uses internal capitalization. Shift cancels Caps."
+msgstr "Përdor gërma të mëdha në brendësi. Shift fshin Caps."
+
+#: xfree86.xml.in.h:326
+msgid "Uses internal capitalization. Shift doesn't cancel Caps."
+msgstr "Përdor gërma të mëdha në brendësi. Shift nuk fshin Caps."
+
+#: xfree86.xml.in.h:327
+msgid "Uzb"
+msgstr "Uzb"
+
+#: xfree86.xml.in.h:328
+msgid "Uzbek"
+msgstr "Uzbek"
+
+#: xfree86.xml.in.h:329
+msgid "Vietnamese"
+msgstr "Vietnamisht"
+
+#: xfree86.xml.in.h:330
+msgid "Vnm"
+msgstr "Vnm"
+
+#: xfree86.xml.in.h:331
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: xfree86.xml.in.h:332
+msgid "Winkeys"
+msgstr "Winkeys"
+
+#: xfree86.xml.in.h:333
+msgid "Yahoo! Internet Keyboard"
+msgstr "Tastierë Yahoo! Internet"
+
+#: xfree86.xml.in.h:334
+msgid "Yug"
+msgstr "Yug"
+
+#: xfree86.xml.in.h:335
+msgid "Yugoslavian"
+msgstr "Yugoslavian"
+
+#: xfree86.xml.in.h:336
+msgid "abnt2"
+msgstr "abnt2"
+
+#: xfree86.xml.in.h:337
+msgid "azerty"
+msgstr "azerty"
+
+#: xfree86.xml.in.h:338
+msgid "azerty/digits"
+msgstr "azerty/digits"
+
+#: xfree86.xml.in.h:339
+msgid "bksl"
+msgstr "bksl"
+
+#: xfree86.xml.in.h:340
+msgid "digits"
+msgstr "numra"
+
+#: xfree86.xml.in.h:341
+msgid "l2/101/qwerty/comma"
+msgstr "l2/101/qwerty/presje"
+
+#: xfree86.xml.in.h:342
+msgid "l2/101/qwerty/dot"
+msgstr "l2/101/qwerty/pikë"
+
+#: xfree86.xml.in.h:343
+msgid "l2/101/qwertz/comma"
+msgstr "l2/101/qwertz/presje"
+
+#: xfree86.xml.in.h:344
+msgid "l2/101/qwertz/dot"
+msgstr "l2/101/qwertz/pikë"
+
+#: xfree86.xml.in.h:345
+msgid "l2/102/qwerty/comma"
+msgstr "l2/102/qwerty/presje"
+
+#: xfree86.xml.in.h:346
+msgid "l2/102/qwerty/dot"
+msgstr "l2/102/qwerty/pikë"
+
+#: xfree86.xml.in.h:347
+msgid "l2/102/qwertz/comma"
+msgstr "l2/102/qwertz/presje"
+
+#: xfree86.xml.in.h:348
+msgid "l2/102/qwertz/dot"
+msgstr "l2/102/qwertz/pikë"
+
+#: xfree86.xml.in.h:349
+msgid "laptop"
+msgstr "laptop"
+
+#: xfree86.xml.in.h:350
+msgid "lyx"
+msgstr "lyx"
+
+#: xfree86.xml.in.h:351
+msgid "qwerty"
+msgstr "qwerty"
+
+#: xfree86.xml.in.h:352
+msgid "qwerty/digits"
+msgstr "qwerty/numra"
+
+#: xfree86.xml.in.h:353
+msgid "sefi"
+msgstr "sefi"
+
+#: xfree86.xml.in.h:354
+msgid "si1452"
+msgstr "si1452"
+
+#: xfree86.xml.in.h:355
+msgid "uni/101/qwerty/comma"
+msgstr "uni/101/qwerty/presje"
+
+#: xfree86.xml.in.h:356
+msgid "uni/101/qwerty/dot"
+msgstr "uni/101/qwerty/pikë"
+
+#: xfree86.xml.in.h:357
+msgid "uni/101/qwertz/comma"
+msgstr "uni/101/qwertz/presje"
+
+#: xfree86.xml.in.h:358
+msgid "uni/101/qwertz/dot"
+msgstr "uni/101/qwertz/pikë"
+
+#: xfree86.xml.in.h:359
+msgid "uni/102/qwerty/comma"
+msgstr "uni/102/qwerty/presje"
+
+#: xfree86.xml.in.h:360
+msgid "uni/102/qwerty/dot"
+msgstr "uni/102/qwerty/pikë"
+
+#: xfree86.xml.in.h:361
+msgid "uni/102/qwertz/comma"
+msgstr "uni/102/qwertz/presje"
+
+#: xfree86.xml.in.h:362
+msgid "uni/102/qwertz/dot"
+msgstr "uni/102/qwertz/pikë"
+
diff --git a/xorg-server/xkeyboard-config/po/sr.po b/xorg-server/xkeyboard-config/po/sr.po
index d4ed4a5f3..2e9b2a874 100644
--- a/xorg-server/xkeyboard-config/po/sr.po
+++ b/xorg-server/xkeyboard-config/po/sr.po
@@ -1,2066 +1,2066 @@
-# Serbian translation of xfree_xkb_xml-4.4pre1
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
-# Danilo Segan <dsegan@gmx.net>, 2003, 2004, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-02 19:07+0100\n"
-"PO-Revision-Date: 2006-03-02 19:14+0100\n"
-"Last-Translator: Danilo Segan <dsegan@gmx.net>\n"
-"Language-Team: Serbian <sr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../rules/base.xml.in.h:1
-msgid "(F)"
-msgstr "(F)"
-
-#: ../rules/base.xml.in.h:2
-msgid "101/qwerty/comma/Dead keys"
-msgstr "101/qwerty/запета/акценти"
-
-#: ../rules/base.xml.in.h:3
-msgid "101/qwerty/comma/Eliminate dead keys"
-msgstr "101/qwerty/запета/без акцената"
-
-#: ../rules/base.xml.in.h:4
-msgid "101/qwerty/dot/Dead keys"
-msgstr "101/qwerty/тачка/акценти"
-
-#: ../rules/base.xml.in.h:5
-msgid "101/qwerty/dot/Eliminate dead keys"
-msgstr "101/qwerty/тачка/без акцената"
-
-#: ../rules/base.xml.in.h:6
-msgid "101/qwertz/comma/Dead keys"
-msgstr "101/qwertz/запета/акценти"
-
-#: ../rules/base.xml.in.h:7
-msgid "101/qwertz/comma/Eliminate dead keys"
-msgstr "101/qwertz/запета/без акцената"
-
-#: ../rules/base.xml.in.h:8
-msgid "101/qwertz/dot/Dead keys"
-msgstr "101/qwertz/тачка/акценти"
-
-#: ../rules/base.xml.in.h:9
-msgid "101/qwertz/dot/Eliminate dead keys"
-msgstr "101/qwertz/тачка/без акцената"
-
-#: ../rules/base.xml.in.h:10
-msgid "102/qwerty/comma/Dead keys"
-msgstr "102/qwerty/запета/акценти"
-
-#: ../rules/base.xml.in.h:11
-msgid "102/qwerty/comma/Eliminate dead keys"
-msgstr "102/qwerty/запета/без акцената"
-
-#: ../rules/base.xml.in.h:12
-msgid "102/qwerty/dot/Dead keys"
-msgstr "102/qwerty/тачка/акценти"
-
-#: ../rules/base.xml.in.h:13
-msgid "102/qwerty/dot/Eliminate dead keys"
-msgstr "102/qwerty/тачка/без акцената"
-
-#: ../rules/base.xml.in.h:14
-msgid "102/qwertz/comma/Dead keys"
-msgstr "102/qwertz/запета/акценти"
-
-#: ../rules/base.xml.in.h:15
-msgid "102/qwertz/comma/Eliminate dead keys"
-msgstr "102/qwertz/запета/без акцената"
-
-#: ../rules/base.xml.in.h:16
-msgid "102/qwertz/dot/Dead keys"
-msgstr "102/qwertz/тачка/акценти"
-
-#: ../rules/base.xml.in.h:17
-msgid "102/qwertz/dot/Eliminate dead keys"
-msgstr "102/qwertz/тачка/без акцената"
-
-#: ../rules/base.xml.in.h:18
-msgid "A4Tech KB-21"
-msgstr "A4Tech KB-21"
-
-#: ../rules/base.xml.in.h:19
-msgid "A4Tech KBS-8"
-msgstr "A4Tech KBS-8"
-
-#: ../rules/base.xml.in.h:20
-msgid "ACPI Standard"
-msgstr "ACPI стандард"
-
-#: ../rules/base.xml.in.h:21
-msgid "Acer AirKey V"
-msgstr "Acer AirKey V"
-
-#: ../rules/base.xml.in.h:22
-msgid "Acer TravelMate 800"
-msgstr "Acer TravelMate 800"
-
-#: ../rules/base.xml.in.h:23
-msgid "Add the EuroSign to the 2 key."
-msgstr "Додај знак за евро на тастер 2."
-
-#: ../rules/base.xml.in.h:24
-msgid "Add the EuroSign to the 5 key."
-msgstr "Додај знак за евро на тастер 5."
-
-#: ../rules/base.xml.in.h:25
-msgid "Add the EuroSign to the E key."
-msgstr "Додај знак за евро на тастер E."
-
-#: ../rules/base.xml.in.h:26
-msgid "Add the standard behavior to Menu key."
-msgstr "Додај обично понашање Menu тастеру."
-
-#: ../rules/base.xml.in.h:27
-msgid "Adding the EuroSign to certain keys"
-msgstr "Додавање знака за евро одређеним тастерима"
-
-#
-#: ../rules/base.xml.in.h:28
-msgid "Advance Scorpius KI"
-msgstr "Напредни Шкорпион КИ"
-
-#: ../rules/base.xml.in.h:29
-msgid "Afg"
-msgstr "афг"
-
-#: ../rules/base.xml.in.h:30
-msgid "Afghanistan"
-msgstr "Афганистан"
-
-#: ../rules/base.xml.in.h:31
-msgid "Akan"
-msgstr "акан"
-
-#: ../rules/base.xml.in.h:32
-msgid "Alb"
-msgstr "алб"
-
-#: ../rules/base.xml.in.h:33
-msgid "Albania"
-msgstr "Албанија"
-
-#: ../rules/base.xml.in.h:34
-msgid "Alt and Meta are on the Alt keys (default)."
-msgstr "Alt и Meta су на Alt тастерима (подразумевано)."
-
-#: ../rules/base.xml.in.h:35
-msgid "Alt is mapped to the right Win-key and Super to Menu."
-msgstr "Alt је мапиран на десни Windows тастер, а Super на Menu."
-
-#: ../rules/base.xml.in.h:36
-msgid "Alt+Ctrl changes group."
-msgstr "Alt+Ctrl мења групу."
-
-#: ../rules/base.xml.in.h:37
-msgid "Alt+Shift changes group."
-msgstr "Alt+Shift мења групу."
-
-#: ../rules/base.xml.in.h:38
-msgid "Alt-Q"
-msgstr "Alt-Q"
-
-#: ../rules/base.xml.in.h:39
-msgid "Alt/Win key behavior"
-msgstr "Понашање Alt/Win тастера"
-
-# Наизменично?
-#: ../rules/base.xml.in.h:40
-msgid "Alternative"
-msgstr "Допунска"
-
-#: ../rules/base.xml.in.h:41
-msgid "Alternative international (former us_intl)"
-msgstr "Допунска међународна (бивша us_intl)"
-
-#: ../rules/base.xml.in.h:42
-msgid "Alternative, Sun dead keys"
-msgstr "Допунска, Sun-ови акценти"
-
-#: ../rules/base.xml.in.h:43
-msgid "Alternative, eliminate dead keys"
-msgstr "Допунска, без акцената"
-
-#: ../rules/base.xml.in.h:44
-msgid "And"
-msgstr "анд"
-
-#: ../rules/base.xml.in.h:45
-msgid "Andorra"
-msgstr "Андора"
-
-#: ../rules/base.xml.in.h:46
-msgid "Apostrophe (') variant"
-msgstr "Варијанта са апострофом (')"
-
-#: ../rules/base.xml.in.h:47
-msgid "Ara"
-msgstr "ара"
-
-#: ../rules/base.xml.in.h:48
-msgid "Arabic"
-msgstr "арапски"
-
-#: ../rules/base.xml.in.h:49
-msgid "Arm"
-msgstr "јрм"
-
-#: ../rules/base.xml.in.h:50
-msgid "Armenia"
-msgstr "Јерменија"
-
-#: ../rules/base.xml.in.h:51
-msgid "Aze"
-msgstr "азб"
-
-#: ../rules/base.xml.in.h:52
-msgid "Azerbaijan"
-msgstr "Азербејџан"
-
-#: ../rules/base.xml.in.h:53
-msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr "Azona RF2300 бежична Интернет тастатура"
-
-#: ../rules/base.xml.in.h:54
-msgid "BTC 5090"
-msgstr "BTC 5090"
-
-#: ../rules/base.xml.in.h:55
-msgid "BTC 5113RF Multimedia"
-msgstr "BTC 5113RF мултимедијална"
-
-#: ../rules/base.xml.in.h:56
-msgid "BTC 5126T"
-msgstr "BTC 5126T"
-
-#: ../rules/base.xml.in.h:57
-msgid "BTC 9000"
-msgstr "BTC 9000"
-
-#: ../rules/base.xml.in.h:58
-msgid "BTC 9000A"
-msgstr "BTC 9000A"
-
-#: ../rules/base.xml.in.h:59
-msgid "BTC 9001AH"
-msgstr "BTC 9001AH"
-
-#: ../rules/base.xml.in.h:60
-msgid "Ban"
-msgstr "бан"
-
-#: ../rules/base.xml.in.h:61
-msgid "Bangladesh"
-msgstr "Бангладеш"
-
-#: ../rules/base.xml.in.h:62
-msgid "Bel"
-msgstr "блг"
-
-#: ../rules/base.xml.in.h:63
-msgid "Belarus"
-msgstr "Белорусија"
-
-#: ../rules/base.xml.in.h:64
-msgid "Belgium"
-msgstr "Белгија"
-
-#: ../rules/base.xml.in.h:65
-msgid "Bengali"
-msgstr "бенгалски"
-
-#: ../rules/base.xml.in.h:66
-msgid "Bengali Probhat"
-msgstr "бенгалски пробат"
-
-#: ../rules/base.xml.in.h:67
-msgid "Bgr"
-msgstr "буг"
-
-#: ../rules/base.xml.in.h:68
-msgid "Bhu"
-msgstr "бут"
-
-#: ../rules/base.xml.in.h:69
-msgid "Bhutan"
-msgstr "Бутан"
-
-#: ../rules/base.xml.in.h:70
-msgid "Bih"
-msgstr "бих"
-
-#: ../rules/base.xml.in.h:71
-msgid "Blr"
-msgstr "блр"
-
-#: ../rules/base.xml.in.h:72
-msgid "Bosnia and Herzegovina"
-msgstr "Босна и Херцеговина"
-
-#: ../rules/base.xml.in.h:73
-msgid "Both Alt keys together change group."
-msgstr "Оба Alt тастера мењају групу."
-
-#: ../rules/base.xml.in.h:74
-msgid "Both Ctrl keys together change group."
-msgstr "Оба Ctrl тастера мењају групу."
-
-#: ../rules/base.xml.in.h:75
-msgid "Both Shift keys together change group."
-msgstr "Оба Shift тастера мењају групу."
-
-#: ../rules/base.xml.in.h:76
-msgid "Both Win-keys switch group while pressed."
-msgstr "Оба Win-тастера мењају групу када су притиснути."
-
-#: ../rules/base.xml.in.h:77
-msgid "Bra"
-msgstr "бра"
-
-#: ../rules/base.xml.in.h:78
-msgid "Brazil"
-msgstr "Бразил"
-
-#: ../rules/base.xml.in.h:79
-msgid "Brazilian ABNT2"
-msgstr "бразилска ABNT2"
-
-#: ../rules/base.xml.in.h:80
-msgid "Brother Internet Keyboard"
-msgstr "Brother Интернет тастатура"
-
-#: ../rules/base.xml.in.h:81
-msgid "Bulgaria"
-msgstr "Бугарска"
-
-#: ../rules/base.xml.in.h:82
-msgid "Cambodia"
-msgstr "Камбоџа"
-
-#: ../rules/base.xml.in.h:83
-msgid "Can"
-msgstr "кан"
-
-#: ../rules/base.xml.in.h:84
-msgid "Canada"
-msgstr "Канада"
-
-#: ../rules/base.xml.in.h:85
-msgid "Caps Lock is Compose."
-msgstr "Caps Lock је комбинујући тастер."
-
-#: ../rules/base.xml.in.h:86
-msgid "CapsLock LED shows alternative group."
-msgstr "Лампица за Caps Lock показује измењивање групе."
-
-#: ../rules/base.xml.in.h:87
-msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
-msgstr "CapsLock се понаша као трајни Shift. Shift укида Caps."
-
-#: ../rules/base.xml.in.h:88
-msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
-msgstr "CapsLock се понаша као трајни Shift. Shift не укида Caps."
-
-#: ../rules/base.xml.in.h:89
-msgid "CapsLock just locks the Shift modifier."
-msgstr "CapsLock просто трајно укључује Shift."
-
-#: ../rules/base.xml.in.h:90
-msgid "CapsLock key behavior"
-msgstr "Понашање Caps Lock тастера"
-
-#: ../rules/base.xml.in.h:91
-msgid "CapsLock key changes group."
-msgstr "Caps Lock тастер мења групу."
-
-#: ../rules/base.xml.in.h:92
-msgid "CapsLock toggles Shift so all keys are affected."
-msgstr "CapsLock мења Shift стање па делује на све тастере."
-
-#: ../rules/base.xml.in.h:93
-msgid "CapsLock toggles normal capitalization of alphabetic characters."
-msgstr "CapsLock мења обичну величину слова."
-
-#: ../rules/base.xml.in.h:94
-msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
-msgstr "CapsLock користи унутрашњу величину слова. Shift укида Caps Lock."
-
-#: ../rules/base.xml.in.h:95
-msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
-msgstr "CapsLock користи унутрашњу величину слова. Shift не укида Caps Lock."
-
-#: ../rules/base.xml.in.h:96
-msgid "Catalan variant with middle-dot L"
-msgstr "каталонска варијанта са L и средњом тачком"
-
-#: ../rules/base.xml.in.h:97
-msgid "Che"
-msgstr "швц"
-
-#: ../rules/base.xml.in.h:98
-msgid "Cherry Blue Line CyBo@rd"
-msgstr "Cherry Blue Line CyBo@rd"
-
-#: ../rules/base.xml.in.h:99
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr "Cherry Blue Line CyBo@rd (друга могућност)"
-
-#: ../rules/base.xml.in.h:100
-msgid "Cherry CyBo@rd USB-Hub"
-msgstr "Cherry CyBo@rd USB-Hub"
-
-#: ../rules/base.xml.in.h:101
-msgid "Cherry CyMotion Master Linux"
-msgstr "Cherry CyMotion Master Linux"
-
-#: ../rules/base.xml.in.h:102
-msgid "Chicony Internet Keyboard"
-msgstr "Chicony Интернет тастатура"
-
-#: ../rules/base.xml.in.h:103
-msgid "Chicony KB-9885"
-msgstr "Chicony KB-9885"
-
-#: ../rules/base.xml.in.h:104
-msgid "CloGaelach"
-msgstr "CloGaelach"
-
-#: ../rules/base.xml.in.h:105
-msgid "Compaq Easy Access Keyboard"
-msgstr "Compaq тастатура за лак приступ"
-
-#: ../rules/base.xml.in.h:106
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr "Compaq Интернет тастатура (13 тастера)"
-
-#: ../rules/base.xml.in.h:107
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr "Compaq Интернет тастатура (18 тастера)"
-
-#: ../rules/base.xml.in.h:108
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr "Compaq Интернет тастатура (7 тастера)"
-
-#: ../rules/base.xml.in.h:109
-msgid "Compaq iPaq Keyboard"
-msgstr "Compaq iPaq тастатура"
-
-#: ../rules/base.xml.in.h:110
-msgid "Compose key position"
-msgstr "Положај тастера Compose"
-
-#: ../rules/base.xml.in.h:111
-msgid "Croatia"
-msgstr "Хрватска"
-
-#: ../rules/base.xml.in.h:112
-msgid "Ctrl key at bottom left"
-msgstr "Тастер Ctrl је у дну лево"
-
-#: ../rules/base.xml.in.h:113
-msgid "Ctrl key at left of 'A'"
-msgstr "Тастер Ctrl је у лево од „А“"
-
-#: ../rules/base.xml.in.h:114
-msgid "Ctrl key position"
-msgstr "Положај тастера Ctrl"
-
-#: ../rules/base.xml.in.h:115
-msgid "Ctrl+Shift changes group."
-msgstr "Ctrl+Shift мења групу."
-
-#: ../rules/base.xml.in.h:116
-msgid "Cyrillic"
-msgstr "ћирилични"
-
-#: ../rules/base.xml.in.h:117
-msgid "Cze"
-msgstr "чеш"
-
-#: ../rules/base.xml.in.h:118
-msgid "Czechia"
-msgstr "Чешка"
-
-#: ../rules/base.xml.in.h:119
-msgid "DTK2000"
-msgstr "DTK2000"
-
-#: ../rules/base.xml.in.h:120
-msgid "Dead acute"
-msgstr "Акутски акценат"
-
-#: ../rules/base.xml.in.h:121
-msgid "Dead grave acute"
-msgstr "Гравис акутски акценат"
-
-#: ../rules/base.xml.in.h:122
-msgid "Dell"
-msgstr "Dell"
-
-#: ../rules/base.xml.in.h:123
-msgid "Dell 101-key PC"
-msgstr "Dell 101-тастер PC"
-
-#: ../rules/base.xml.in.h:124
-msgid "Dell USB Multimedia Keybard"
-msgstr "Dell USB мултимедијална тастатура"
-
-#: ../rules/base.xml.in.h:125
-msgid "Denmark"
-msgstr "Данска"
-
-#: ../rules/base.xml.in.h:126
-msgid "Deu"
-msgstr "нем"
-
-#: ../rules/base.xml.in.h:127
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr "Dexxa бежична тастатура"
-
-#: ../rules/base.xml.in.h:128
-msgid "Diamond 9801 / 9802 series"
-msgstr "Diamond 9801 / 9802 серија"
-
-#: ../rules/base.xml.in.h:129
-msgid "Dnk"
-msgstr "дан"
-
-#: ../rules/base.xml.in.h:130
-msgid "Dvorak"
-msgstr "дворак"
-
-#: ../rules/base.xml.in.h:131
-msgid "Dvorak, Polish quotes on key \"1/!\""
-msgstr "дворак, пољски наводници на тастеру „1/!“"
-
-#: ../rules/base.xml.in.h:132
-msgid "Dvorak, Polish quotes on quotemark key"
-msgstr "дворак, пољски наводници на тастеру наводника"
-
-#: ../rules/base.xml.in.h:133
-msgid "Eliminate dead keys"
-msgstr "Уклони акценте"
-
-#: ../rules/base.xml.in.h:134
-msgid "Ennyah DKB-1008"
-msgstr "Ennyah DKB-1008"
-
-#: ../rules/base.xml.in.h:135
-msgid "Epo"
-msgstr "есп"
-
-#: ../rules/base.xml.in.h:136
-msgid "Esp"
-msgstr "шпа"
-
-#: ../rules/base.xml.in.h:137
-msgid "Esperanto"
-msgstr "есперанто"
-
-#: ../rules/base.xml.in.h:138
-msgid "Est"
-msgstr "ест"
-
-#: ../rules/base.xml.in.h:139
-msgid "Estonia"
-msgstr "Естонија"
-
-#: ../rules/base.xml.in.h:140
-msgid "Everex STEPnote"
-msgstr "Everex STEPnote"
-
-#: ../rules/base.xml.in.h:141
-msgid "Ewe"
-msgstr "Еве"
-
-#: ../rules/base.xml.in.h:142
-msgid "Extended"
-msgstr "Проширено"
-
-#: ../rules/base.xml.in.h:143
-msgid "Extended Backslash"
-msgstr "Проширено уз обрнуту косу црту"
-
-#: ../rules/base.xml.in.h:144
-msgid "F-letter (F) variant"
-msgstr "Варијанта са F-словом (F)"
-
-#: ../rules/base.xml.in.h:145
-msgid "Fao"
-msgstr "фар"
-
-#: ../rules/base.xml.in.h:146
-msgid "Faroe Islands"
-msgstr "Фарска острва"
-
-#: ../rules/base.xml.in.h:147
-msgid "Fin"
-msgstr "фин"
-
-#: ../rules/base.xml.in.h:148
-msgid "Finland"
-msgstr "Финска"
-
-#: ../rules/base.xml.in.h:149
-msgid "Fra"
-msgstr "фра"
-
-#: ../rules/base.xml.in.h:150
-msgid "France"
-msgstr "Француска"
-
-#: ../rules/base.xml.in.h:151
-msgid "French"
-msgstr "француски"
-
-#: ../rules/base.xml.in.h:152
-msgid "French (legacy)"
-msgstr "француски (класични)"
-
-#: ../rules/base.xml.in.h:153
-msgid "French Dvorak"
-msgstr "француски дворак"
-
-#: ../rules/base.xml.in.h:154
-msgid "French, Sun dead keys"
-msgstr "француски, Sun-ови акценти"
-
-#: ../rules/base.xml.in.h:155
-msgid "French, eliminate dead keys"
-msgstr "Француски, без акцената"
-
-#: ../rules/base.xml.in.h:156
-msgid "Fula"
-msgstr "Фула"
-
-#: ../rules/base.xml.in.h:157
-msgid "GBr"
-msgstr "вбр"
-
-#: ../rules/base.xml.in.h:158
-msgid "Ga"
-msgstr "Га"
-
-#: ../rules/base.xml.in.h:159
-msgid "Generic 101-key PC"
-msgstr "Обична са 101 тастером"
-
-#: ../rules/base.xml.in.h:160
-msgid "Generic 102-key (Intl) PC"
-msgstr "Обична са 102 тастера (међунар.)"
-
-#: ../rules/base.xml.in.h:161
-msgid "Generic 104-key PC"
-msgstr "Обична са 104 тастера"
-
-#: ../rules/base.xml.in.h:162
-msgid "Generic 105-key (Intl) PC"
-msgstr "Обична са 105 тастера (међунар.)"
-
-#: ../rules/base.xml.in.h:163
-msgid "Genius Comfy KB-12e"
-msgstr "Genius Comfy KB-12e"
-
-#: ../rules/base.xml.in.h:164
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr "Genius Comfy KB-16M / Genius ММ тастатура KWD-910"
-
-#: ../rules/base.xml.in.h:165
-msgid "Genius Comfy KB-21e-Scroll"
-msgstr "Genius Comfy KB-21e-Scroll"
-
-#: ../rules/base.xml.in.h:166
-msgid "Geo"
-msgstr "гру"
-
-#: ../rules/base.xml.in.h:167
-msgid "Georgia"
-msgstr "Грузија"
-
-#: ../rules/base.xml.in.h:168
-msgid "German, Sun dead keys"
-msgstr "немачки, Sun-ови акценти"
-
-#: ../rules/base.xml.in.h:169
-msgid "German, eliminate dead keys"
-msgstr "немачки, без акцената"
-
-#: ../rules/base.xml.in.h:170
-msgid "Germany"
-msgstr "Немачка"
-
-#: ../rules/base.xml.in.h:171
-msgid "Gha"
-msgstr "га"
-
-#: ../rules/base.xml.in.h:172
-msgid "Ghana"
-msgstr "Гана"
-
-#: ../rules/base.xml.in.h:173
-msgid "Gre"
-msgstr "грк"
-
-#: ../rules/base.xml.in.h:174
-msgid "Greece"
-msgstr "Грчка"
-
-#: ../rules/base.xml.in.h:175
-msgid "Group Shift/Lock behavior"
-msgstr "Понашање измене/избора групе"
-
-#: ../rules/base.xml.in.h:176
-msgid "Gujarati"
-msgstr "гујарати"
-
-#: ../rules/base.xml.in.h:177
-msgid "Gurmukhi"
-msgstr "гурмуки"
-
-#: ../rules/base.xml.in.h:178
-msgid "Gyration"
-msgstr "Gyration"
-
-#: ../rules/base.xml.in.h:179
-msgid "Hausa"
-msgstr "Хауса"
-
-#: ../rules/base.xml.in.h:180
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr "Hewlett-Packard Интернет тастатура"
-
-#: ../rules/base.xml.in.h:181
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr "Hewlett-Packard Omnibook 500 FA"
-
-#: ../rules/base.xml.in.h:182
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr "Hewlett-Packard Omnibook 5xx"
-
-#: ../rules/base.xml.in.h:183
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr "Hewlett-Packard Omnibook 6000/6100"
-
-#: ../rules/base.xml.in.h:184
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr "Hewlett-Packard Omnibook XE3 GC"
-
-#: ../rules/base.xml.in.h:185
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr "Hewlett-Packard Omnibook XE3 GF"
-
-#: ../rules/base.xml.in.h:186
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr "Hewlett-Packard Omnibook XT1000"
-
-#: ../rules/base.xml.in.h:187
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr "Hewlett-Packard Pavilion ZT11xx"
-
-#: ../rules/base.xml.in.h:188
-msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-2501 мултимедијална тастатура"
-
-#: ../rules/base.xml.in.h:189
-msgid "Hewlett-Packard SK-2505 Internet Keyboard"
-msgstr "Hewlett-Packard SK-2505 Интернет тастатура"
-
-#: ../rules/base.xml.in.h:190
-msgid "Honeywell Euroboard"
-msgstr "Honeywell Euroboard"
-
-#: ../rules/base.xml.in.h:191
-msgid "Hrv"
-msgstr "хрв"
-
-#: ../rules/base.xml.in.h:192
-msgid "Hun"
-msgstr "мађ"
-
-#: ../rules/base.xml.in.h:193
-msgid "Hungary"
-msgstr "Мађарска"
-
-#: ../rules/base.xml.in.h:194
-msgid "Hyper is mapped to the Win-keys."
-msgstr "Hyper је мапиран на Win тастере."
-
-#: ../rules/base.xml.in.h:195
-msgid "IBM Rapid Access"
-msgstr "IBM Rapid Access"
-
-#: ../rules/base.xml.in.h:196
-msgid "IBM Rapid Access II"
-msgstr "IBM Rapid Access II"
-
-#: ../rules/base.xml.in.h:197
-msgid "IBM Rapid Access II (alternate option)"
-msgstr "IBM Rapid Access II (друга могућност)"
-
-#: ../rules/base.xml.in.h:198
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
-
-#: ../rules/base.xml.in.h:199
-msgid "ISO Alternate"
-msgstr "Додатни ИСО"
-
-#: ../rules/base.xml.in.h:200
-msgid "Iceland"
-msgstr "Исланд"
-
-#: ../rules/base.xml.in.h:201
-msgid "Ind"
-msgstr "инд"
-
-#: ../rules/base.xml.in.h:202
-msgid "India"
-msgstr "Индија"
-
-#: ../rules/base.xml.in.h:203
-msgid "International (with dead keys)"
-msgstr "Међународна (са акцентима)"
-
-#: ../rules/base.xml.in.h:204
-msgid "Inuktitut"
-msgstr "инуктитут"
-
-#: ../rules/base.xml.in.h:205
-msgid "Iran"
-msgstr "Иран"
-
-#: ../rules/base.xml.in.h:206
-msgid "Ireland"
-msgstr "Ирска"
-
-#: ../rules/base.xml.in.h:207
-msgid "Irl"
-msgstr "ирс"
-
-#: ../rules/base.xml.in.h:208
-msgid "Irn"
-msgstr "ирн"
-
-#: ../rules/base.xml.in.h:209
-msgid "Isl"
-msgstr "исл"
-
-#: ../rules/base.xml.in.h:210
-msgid "Isr"
-msgstr "изр"
-
-#: ../rules/base.xml.in.h:211
-msgid "Israel"
-msgstr "Израел"
-
-#: ../rules/base.xml.in.h:212
-msgid "Ita"
-msgstr "ита"
-
-#: ../rules/base.xml.in.h:213
-msgid "Italy"
-msgstr "Италија"
-
-#: ../rules/base.xml.in.h:214
-msgid "Japan"
-msgstr "Јапан"
-
-#: ../rules/base.xml.in.h:215
-msgid "Japanese 106-key"
-msgstr "јапански са 106 тастера"
-
-#: ../rules/base.xml.in.h:216
-msgid "Jpn"
-msgstr "јпн"
-
-#: ../rules/base.xml.in.h:217
-msgid "Kannada"
-msgstr "канада (јужна индија)"
-
-#: ../rules/base.xml.in.h:218
-msgid "Kaz"
-msgstr "каз"
-
-#: ../rules/base.xml.in.h:219
-msgid "Kazakh with Russian"
-msgstr "казахстански са руским"
-
-#: ../rules/base.xml.in.h:220
-msgid "Kazakhstan"
-msgstr "Казахстан"
-
-#: ../rules/base.xml.in.h:221
-msgid "Keypad"
-msgstr "Нумеричка тастатура"
-
-#: ../rules/base.xml.in.h:222
-msgid "Keytronic FlexPro"
-msgstr "Keytronic FlexPro"
-
-#: ../rules/base.xml.in.h:223
-msgid "Khm"
-msgstr "кмб"
-
-#: ../rules/base.xml.in.h:224
-msgid "Kyr"
-msgstr "кир"
-
-#: ../rules/base.xml.in.h:225
-msgid "Kyrgyzstan"
-msgstr "Киргистан"
-
-#: ../rules/base.xml.in.h:226
-msgid "LAm"
-msgstr "ЈАм"
-
-#: ../rules/base.xml.in.h:227
-msgid "Lao"
-msgstr "лао"
-
-#: ../rules/base.xml.in.h:228
-msgid "Laos"
-msgstr "Лаос"
-
-#: ../rules/base.xml.in.h:229
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr "Тастатуре преносних рачунара из Compaq-а (нпр. Armada)"
-
-#: ../rules/base.xml.in.h:230
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr "Тастатуре преносних рачунара из Compaq-а (нпр. Presario)"
-
-#: ../rules/base.xml.in.h:231
-msgid "Laptop/notebook Dell Inspiron 6xxx/8xxx"
-msgstr "Тастатуре преносних рачунара Dell Inspiron 6xxx/8xxx"
-
-#: ../rules/base.xml.in.h:232
-msgid "Laptop/notebook eMachines m68xx"
-msgstr "Преносне eMachines m68xx"
-
-#: ../rules/base.xml.in.h:233
-msgid "Latin"
-msgstr "латинични"
-
-#: ../rules/base.xml.in.h:234
-msgid "Latin American"
-msgstr "јужноамерички"
-
-#: ../rules/base.xml.in.h:235
-msgid "Latin Unicode"
-msgstr "латинични Уникод"
-
-#: ../rules/base.xml.in.h:236
-msgid "Latin Unicode qwerty"
-msgstr "латинични Уникод qwerty"
-
-#: ../rules/base.xml.in.h:237
-msgid "Latin qwerty"
-msgstr "латинични qwerty"
-
-#: ../rules/base.xml.in.h:238
-msgid "Latin with guillemots"
-msgstr "латинични са гиљемотима"
-
-#: ../rules/base.xml.in.h:239
-msgid "Latvia"
-msgstr "Летонија"
-
-#: ../rules/base.xml.in.h:240
-msgid "Left Alt key changes group."
-msgstr "Леви Alt тастер мења групу."
-
-#: ../rules/base.xml.in.h:241
-msgid "Left Alt key switches group while pressed."
-msgstr "Леви Alt тастер мења групу док је притиснут."
-
-#: ../rules/base.xml.in.h:242
-msgid "Left Ctrl key changes group."
-msgstr "Леви Ctrl тастер мења групу."
-
-#: ../rules/base.xml.in.h:243
-msgid "Left Shift key changes group."
-msgstr "Леви Shift тастер мења групу."
-
-#: ../rules/base.xml.in.h:244
-msgid "Left Win-key changes group."
-msgstr "Леви Windows тастер мења групу."
-
-#: ../rules/base.xml.in.h:245
-msgid "Left Win-key switches group while pressed."
-msgstr "Леви Windows тастер мења групу док је притиснут."
-
-#: ../rules/base.xml.in.h:246
-msgid "Left handed Dvorak"
-msgstr "Леворучни Дворак"
-
-#: ../rules/base.xml.in.h:247
-msgid "Lithuania"
-msgstr "Литванија"
-
-#: ../rules/base.xml.in.h:248
-msgid "Logitech Access Keyboard"
-msgstr "Logitech Access тастатура"
-
-#: ../rules/base.xml.in.h:249
-msgid "Logitech Cordless Desktop"
-msgstr "Logitech Cordless Desktop"
-
-#: ../rules/base.xml.in.h:250
-msgid "Logitech Cordless Desktop Navigator"
-msgstr "Logitech Cordless Desktop Navigator"
-
-#: ../rules/base.xml.in.h:251
-msgid "Logitech Cordless Desktop Optical"
-msgstr "Logitech Cordless Desktop Optical"
-
-#: ../rules/base.xml.in.h:252
-msgid "Logitech Cordless Desktop Pro"
-msgstr "Logitech Cordless Desktop Pro"
-
-#: ../rules/base.xml.in.h:253
-msgid "Logitech Cordless Desktop Pro (alternate option)"
-msgstr "Logitech Cordless Desktop Pro (додатна могућност)"
-
-#: ../rules/base.xml.in.h:254
-msgid "Logitech Cordless Desktop Pro (alternate option2)"
-msgstr "Logitech Cordless Desktop Pro (додатна могућност 2)"
-
-#: ../rules/base.xml.in.h:255
-msgid "Logitech Cordless Desktop iTouch"
-msgstr "Logitech Cordless Desktop iTouch"
-
-#: ../rules/base.xml.in.h:256
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr "Logitech Cordless Freedom/Desktop Navigator"
-
-#: ../rules/base.xml.in.h:257
-msgid "Logitech Deluxe Access Keyboard"
-msgstr "Logitech Deluxe Access тастатура"
-
-#: ../rules/base.xml.in.h:258
-msgid "Logitech Internet Keyboard"
-msgstr "Logitech Интернет тастатура"
-
-#: ../rules/base.xml.in.h:259
-msgid "Logitech Internet Navigator Keyboard"
-msgstr "Logitech Интернет навигатор тастатура"
-
-#: ../rules/base.xml.in.h:260
-msgid "Logitech Ultra-X Keyboard"
-msgstr "Logitech Ultra-X тастатура"
-
-#: ../rules/base.xml.in.h:261
-msgid "Logitech iTouch"
-msgstr "Logitech iTouch"
-
-#: ../rules/base.xml.in.h:262
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "Logitech iTouch Cordless тастатура (модел Y-RB6)"
-
-#: ../rules/base.xml.in.h:263
-msgid "Logitech iTouch keyboard Internet Navigator"
-msgstr "Logitech iTouch тастатура Интернет навигатор"
-
-#: ../rules/base.xml.in.h:264
-msgid "Ltu"
-msgstr "лит"
-
-#: ../rules/base.xml.in.h:265
-msgid "Lva"
-msgstr "лет"
-
-#: ../rules/base.xml.in.h:266
-msgid "Macedonia"
-msgstr "Македонија"
-
-#: ../rules/base.xml.in.h:267
-msgid "Macintosh"
-msgstr "Мекинтош"
-
-#: ../rules/base.xml.in.h:268
-msgid "Macintosh Old"
-msgstr "Стари Мекинтош"
-
-#: ../rules/base.xml.in.h:269
-msgid "Make CapsLock an additional Ctrl."
-msgstr "Учини Caps Lock додатним Ctrl тастером."
-
-#: ../rules/base.xml.in.h:270
-msgid "Mal"
-msgstr "мал"
-
-#: ../rules/base.xml.in.h:271
-msgid "Malayalam"
-msgstr "малајамски"
-
-#: ../rules/base.xml.in.h:272
-msgid "Maldives"
-msgstr "Малдиви"
-
-#: ../rules/base.xml.in.h:273
-msgid "Malta"
-msgstr "Малта"
-
-#: ../rules/base.xml.in.h:274
-msgid "Mao"
-msgstr "мао"
-
-#: ../rules/base.xml.in.h:275
-msgid "Maori"
-msgstr "Маори"
-
-#: ../rules/base.xml.in.h:276
-msgid "Memorex MX1998"
-msgstr "Memorex MX1998"
-
-#: ../rules/base.xml.in.h:277
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr "Memorex MX2500 EZ-Access тастатура"
-
-#: ../rules/base.xml.in.h:278
-msgid "Memorex MX2750"
-msgstr "Memorex MX2750"
-
-#: ../rules/base.xml.in.h:279
-msgid "Menu is Compose."
-msgstr "Menu је комбинујући тастер."
-
-#: ../rules/base.xml.in.h:280
-msgid "Menu key changes group."
-msgstr "Menu тастер мења групу."
-
-#: ../rules/base.xml.in.h:281
-msgid "Meta is mapped to the Win-keys."
-msgstr "Meta је мапиран на Windows тастере."
-
-#: ../rules/base.xml.in.h:282
-msgid "Meta is mapped to the left Win-key."
-msgstr "Meta је мапиран на леви Windows тастер."
-
-#: ../rules/base.xml.in.h:283
-msgid "Microsoft Internet Keyboard"
-msgstr "Микрософтова Интернет тастатура"
-
-#: ../rules/base.xml.in.h:284
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "Микрософтова Интернет Про тастатура, шведски"
-
-#: ../rules/base.xml.in.h:285
-msgid "Microsoft Natural"
-msgstr "Микрософт Натурал"
-
-#: ../rules/base.xml.in.h:286
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr "Микрософт Натурал тастатура Про / Микрософт Интернет тастатура Про "
-
-#: ../rules/base.xml.in.h:287
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr "Микрософт Натурал тастатура Про ОЕМ"
-
-#: ../rules/base.xml.in.h:288
-msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr ""
-"Микрософтова Натурал тастатура Про УСБ / Микрософт Интернет тастатура Про "
-
-#: ../rules/base.xml.in.h:289
-msgid "Microsoft Office Keyboard"
-msgstr "Микрософтова канцеларијска тастатура"
-
-#: ../rules/base.xml.in.h:290
-msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
-msgstr "Микрософтова бежична мултимедијална тастатура 1.0А"
-
-#: ../rules/base.xml.in.h:291
-msgid "Miscellaneous compatibility options"
-msgstr "Разне могућности за сагласност"
-
-#: ../rules/base.xml.in.h:292
-msgid "Mkd"
-msgstr "мак"
-
-#: ../rules/base.xml.in.h:293
-msgid "Mlt"
-msgstr "мал"
-
-#: ../rules/base.xml.in.h:294
-msgid "Mmr"
-msgstr "ммр"
-
-#: ../rules/base.xml.in.h:295
-msgid "Mng"
-msgstr "мнг"
-
-#: ../rules/base.xml.in.h:296
-msgid "Mongolia"
-msgstr "Монголија"
-
-#: ../rules/base.xml.in.h:297
-msgid "Multilingual"
-msgstr "Вишејезична"
-
-#: ../rules/base.xml.in.h:298
-msgid "Multilingual, first part"
-msgstr "Вишејезична, први део"
-
-#: ../rules/base.xml.in.h:299
-msgid "Multilingual, second part"
-msgstr "Вишејезична, други део"
-
-#: ../rules/base.xml.in.h:300
-msgid "Myanmar"
-msgstr "Мијанмар"
-
-#: ../rules/base.xml.in.h:301
-msgid "Netherlands"
-msgstr "Холандија"
-
-#: ../rules/base.xml.in.h:302
-msgid "Nld"
-msgstr "хол"
-
-#: ../rules/base.xml.in.h:303
-msgid "Nor"
-msgstr "нор"
-
-#: ../rules/base.xml.in.h:304
-msgid "Northern Saami"
-msgstr "северносаамски"
-
-#: ../rules/base.xml.in.h:305
-msgid "Northern Saami, eliminate dead keys"
-msgstr "северносаамски, без акцената"
-
-#: ../rules/base.xml.in.h:306
-msgid "Northgate OmniKey 101"
-msgstr "Northgate OmniKey 101"
-
-#: ../rules/base.xml.in.h:307
-msgid "Norway"
-msgstr "Норвешка"
-
-#: ../rules/base.xml.in.h:308
-msgid "NumLock LED shows alternative group."
-msgstr "NumLock лампица приказује измене група."
-
-#: ../rules/base.xml.in.h:309
-msgid "Ogham"
-msgstr "огам"
-
-#: ../rules/base.xml.in.h:310
-msgid "Ogham IS434"
-msgstr "огам IS434"
-
-#: ../rules/base.xml.in.h:311
-msgid "Oretec MCK-800 MM/Internet keyboard"
-msgstr "Oretec MCK-800 ММ/Интернет тастатура"
-
-#: ../rules/base.xml.in.h:312
-msgid "Oriya"
-msgstr "орија"
-
-#: ../rules/base.xml.in.h:313
-msgid "PC-98xx Series"
-msgstr "PC-98xx серија"
-
-#: ../rules/base.xml.in.h:314
-msgid "Pak"
-msgstr "пак"
-
-#: ../rules/base.xml.in.h:315
-msgid "Pakistan"
-msgstr "Пакистан"
-
-#: ../rules/base.xml.in.h:316
-msgid "Pashto"
-msgstr "пашто"
-
-#: ../rules/base.xml.in.h:317
-msgid "Pattachote"
-msgstr "Паташоте"
-
-#: ../rules/base.xml.in.h:318
-msgid "Phonetic"
-msgstr "фонетски"
-
-#: ../rules/base.xml.in.h:319
-msgid "Pol"
-msgstr "пољ"
-
-#: ../rules/base.xml.in.h:320
-msgid "Poland"
-msgstr "Пољска"
-
-# не ваља, можда вишезвучни?
-#: ../rules/base.xml.in.h:321
-msgid "Polytonic"
-msgstr "вишезвучни"
-
-#: ../rules/base.xml.in.h:322
-msgid "Portugal"
-msgstr "Португалија"
-
-#: ../rules/base.xml.in.h:323
-msgid "Power G5"
-msgstr "Power G5"
-
-#: ../rules/base.xml.in.h:324
-msgid "PowerPC PS/2"
-msgstr "PowerPC PS/2"
-
-#: ../rules/base.xml.in.h:325
-msgid "Press Left Alt key to choose 3rd level."
-msgstr "Притискање левог Alt тастера за избор 3. нивоа."
-
-#: ../rules/base.xml.in.h:326
-msgid "Press Left Win-key to choose 3rd level."
-msgstr "Притискање левог Windows тастера за избор 3. нивоа."
-
-#: ../rules/base.xml.in.h:327
-msgid "Press Menu key to choose 3rd level."
-msgstr "Притискање Menu тастера за избор 3. нивоа."
-
-#: ../rules/base.xml.in.h:328
-msgid "Press Right Alt key to choose 3rd level."
-msgstr "Притискање десног Alt тастера за избор 3. нивоа."
-
-#: ../rules/base.xml.in.h:329
-msgid "Press Right Ctrl to choose 3rd level."
-msgstr "Притискање десног Ctrl тастера за избор 3. нивоа."
-
-#: ../rules/base.xml.in.h:330
-msgid "Press Right Win-key to choose 3rd level."
-msgstr "Притискање десног Windows тастера за избор 3. нивоа."
-
-#: ../rules/base.xml.in.h:331
-msgid "Press any of Alt keys to choose 3rd level."
-msgstr "Притискање било ког Alt тастера за избор 3. нивоа."
-
-#: ../rules/base.xml.in.h:332
-msgid "Press any of Win-keys to choose 3rd level."
-msgstr "Притискање било ког Windows тастера за избор 3. нивоа."
-
-#: ../rules/base.xml.in.h:333
-msgid "Pro"
-msgstr "про"
-
-#: ../rules/base.xml.in.h:334
-msgid "Pro Keypad"
-msgstr "Про тастатура"
-
-#: ../rules/base.xml.in.h:335
-msgid "Probhat"
-msgstr "пробат"
-
-#: ../rules/base.xml.in.h:336
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "Propeller Voyager (KTEZ-1000)"
-
-#: ../rules/base.xml.in.h:337
-msgid "Prt"
-msgstr "прт"
-
-#: ../rules/base.xml.in.h:338
-msgid "QTronix Scorpius 98N+"
-msgstr "QTronix Scorpius 98N+"
-
-#: ../rules/base.xml.in.h:339
-msgid "R-Alt switches group while pressed."
-msgstr "Десни Alt мења групу док је притиснут."
-
-#: ../rules/base.xml.in.h:340
-msgid "Right Alt is Compose."
-msgstr "Десни Alt је комбинујући."
-
-#: ../rules/base.xml.in.h:341
-msgid "Right Alt key changes group."
-msgstr "Десни Alt је мења групу."
-
-#: ../rules/base.xml.in.h:342
-msgid "Right Ctrl is Compose."
-msgstr "Десни Ctrl је комбинујући."
-
-#: ../rules/base.xml.in.h:343
-msgid "Right Ctrl key changes group."
-msgstr "Десни Ctrl мења групу."
-
-#: ../rules/base.xml.in.h:344
-msgid "Right Ctrl key switches group while pressed."
-msgstr "Десни Ctrl тастер мења групу док је притиснут."
-
-#: ../rules/base.xml.in.h:345
-msgid "Right Ctrl key works as Right Alt."
-msgstr "Десни Ctrl тастер се понаша као десни Alt."
-
-#: ../rules/base.xml.in.h:346
-msgid "Right Shift key changes group."
-msgstr "Десни Shift мења групу."
-
-#: ../rules/base.xml.in.h:347
-msgid "Right Win-key changes group."
-msgstr "Десни Windows тастер мења групу."
-
-#: ../rules/base.xml.in.h:348
-msgid "Right Win-key is Compose."
-msgstr "Десни Windows тастер је комбинујући."
-
-#: ../rules/base.xml.in.h:349
-msgid "Right Win-key switches group while pressed."
-msgstr "Десни Windows тастер мења групу док је притиснут."
-
-#: ../rules/base.xml.in.h:350
-msgid "Right handed Dvorak"
-msgstr "Десноручни Дворак"
-
-#: ../rules/base.xml.in.h:351
-msgid "Romania"
-msgstr "Румунија"
-
-#: ../rules/base.xml.in.h:352
-msgid "Romanian keyboard with German letters"
-msgstr "румунска тастатура са немачким словима"
-
-#: ../rules/base.xml.in.h:353
-msgid "Romanian keyboard with German letters, eliminate dead keys"
-msgstr "румунска тастатура са немачким словима, без акцената"
-
-#: ../rules/base.xml.in.h:354
-msgid "Rou"
-msgstr "рум"
-
-#: ../rules/base.xml.in.h:355
-msgid "Rus"
-msgstr "рус"
-
-#: ../rules/base.xml.in.h:356
-msgid "Russia"
-msgstr "Русија"
-
-#: ../rules/base.xml.in.h:357
-msgid "Russian"
-msgstr "руски"
-
-#: ../rules/base.xml.in.h:358
-msgid "Russian phonetic"
-msgstr "руски фонетски"
-
-#: ../rules/base.xml.in.h:359
-msgid "Russian phonetic, eliminate dead keys"
-msgstr "руски фонетски, без акцената"
-
-#: ../rules/base.xml.in.h:360
-msgid "Russian with Kazakh"
-msgstr "руски са казахстанским"
-
-#: ../rules/base.xml.in.h:361
-msgid "SCG"
-msgstr "СЦГ"
-
-#: ../rules/base.xml.in.h:362
-msgid "SILVERCREST Multimedia Wireless Keyboard"
-msgstr "SILVERCREST мултимедијална бежична тастатура"
-
-#: ../rules/base.xml.in.h:363
-msgid "SK-1300"
-msgstr "SK-1300"
-
-#: ../rules/base.xml.in.h:364
-msgid "SK-2500"
-msgstr "SK-2500"
-
-#: ../rules/base.xml.in.h:365
-msgid "SK-6200"
-msgstr "SK-6200"
-
-#: ../rules/base.xml.in.h:366
-msgid "SK-7100"
-msgstr "SK-7100"
-
-#: ../rules/base.xml.in.h:367
-msgid "SVEN Ergonomic 2500"
-msgstr "SVEN ергономска 2500"
-
-#: ../rules/base.xml.in.h:368
-msgid "Samsung SDM 4500P"
-msgstr "Samsung SDM 4500P"
-
-#: ../rules/base.xml.in.h:369
-msgid "Samsung SDM 4510P"
-msgstr "Samsung SDM 4510P"
-
-#: ../rules/base.xml.in.h:370
-msgid "ScrollLock LED shows alternative group."
-msgstr "ScrollLock лампица приказује измене група."
-
-#: ../rules/base.xml.in.h:371
-msgid "Serbia and Montenegro"
-msgstr "Србија и Црна Гора"
-
-#: ../rules/base.xml.in.h:372
-msgid "Shift with numpad keys works as in MS Windows."
-msgstr "Shift уз нумеричку тасатуру ради као у MS Windows-у."
-
-#: ../rules/base.xml.in.h:373
-msgid "Shift+CapsLock changes group."
-msgstr "Shift+CapsLock тастер мења групу."
-
-#: ../rules/base.xml.in.h:374
-msgid "Slovakia"
-msgstr "Словачка"
-
-#: ../rules/base.xml.in.h:375
-msgid "Slovenia"
-msgstr "Словенија"
-
-#: ../rules/base.xml.in.h:376
-msgid "South Africa"
-msgstr "Јужна Африка"
-
-#: ../rules/base.xml.in.h:377
-msgid "Southern Uzbek"
-msgstr "Јужни Узбекистан"
-
-#: ../rules/base.xml.in.h:378
-msgid "Spain"
-msgstr "Шпанија"
-
-#: ../rules/base.xml.in.h:379
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
-msgstr "Нарочити тастери (Ctrl+Alt+&lt;тастер&gt;) које обрађује сервер."
-
-#: ../rules/base.xml.in.h:380
-msgid "SrL"
-msgstr "шрл"
-
-#: ../rules/base.xml.in.h:381
-msgid "Sri Lanka"
-msgstr "Шри Ланка"
-
-#: ../rules/base.xml.in.h:382
-msgid "Standard"
-msgstr "стандардна"
-
-#. RSTU 2019-91
-#: ../rules/base.xml.in.h:384
-msgid "Standard RSTU"
-msgstr "стандардна RSTU"
-
-#. RSTU 2019-91
-#: ../rules/base.xml.in.h:386
-msgid "Standard RSTU on Russian layout"
-msgstr "стандардна RSTU на руском распореду"
-
-#: ../rules/base.xml.in.h:387
-msgid "Sun dead keys"
-msgstr "Sun-ови акценти"
-
-#: ../rules/base.xml.in.h:388
-msgid "Super Power Multimedia Keyboard"
-msgstr "Супер моћна мултимедијална тастатура"
-
-#: ../rules/base.xml.in.h:389
-msgid "Super is mapped to the Win-keys (default)."
-msgstr "Super је мапиран на Windows тастере (подразумевано)."
-
-#: ../rules/base.xml.in.h:390
-msgid "Svk"
-msgstr "слк"
-
-#: ../rules/base.xml.in.h:391
-msgid "Svn"
-msgstr "сло"
-
-#: ../rules/base.xml.in.h:392
-msgid "Swap Ctrl and CapsLock."
-msgstr "Размени Ctrl и Caps Lock."
-
-#: ../rules/base.xml.in.h:393
-msgid "Swe"
-msgstr "шве"
-
-#: ../rules/base.xml.in.h:394
-msgid "Sweden"
-msgstr "Шведска"
-
-#: ../rules/base.xml.in.h:395
-msgid "Switzerland"
-msgstr "Швајцарска"
-
-#: ../rules/base.xml.in.h:396
-msgid "Symplon PaceBook (tablet PC)"
-msgstr "Symplon PaceBook (tablet PC)"
-
-#: ../rules/base.xml.in.h:397
-msgid "Syr"
-msgstr "сир"
-
-#: ../rules/base.xml.in.h:398
-msgid "Syria"
-msgstr "Сирија"
-
-#: ../rules/base.xml.in.h:399
-msgid "Syriac"
-msgstr "сиријски"
-
-#: ../rules/base.xml.in.h:400
-msgid "Syriac phonetic"
-msgstr "сиријски фонетски"
-
-#: ../rules/base.xml.in.h:401
-msgid "TIS-820.2538"
-msgstr "TIS-820.2538"
-
-#: ../rules/base.xml.in.h:402
-msgid "Tajikistan"
-msgstr "Таџикистан"
-
-#: ../rules/base.xml.in.h:403
-msgid "Tamil"
-msgstr "тамил"
-
-#: ../rules/base.xml.in.h:404
-msgid "Tamil TAB Typewriter"
-msgstr "тамил TAB куцаћа машина"
-
-#: ../rules/base.xml.in.h:405
-msgid "Tamil TSCII Typewriter"
-msgstr "тамил TSCII куцаћа машина"
-
-#: ../rules/base.xml.in.h:406
-msgid "Tamil Unicode"
-msgstr "тамил Уникод"
-
-#: ../rules/base.xml.in.h:407
-msgid "Tatar"
-msgstr "татарски"
-
-#: ../rules/base.xml.in.h:408
-msgid "Telugu"
-msgstr "телугу"
-
-#: ../rules/base.xml.in.h:409
-msgid "Tha"
-msgstr "тај"
-
-#: ../rules/base.xml.in.h:410
-msgid "Thailand"
-msgstr "Тајланд"
-
-#: ../rules/base.xml.in.h:411
-msgid "Third level choosers"
-msgstr "Избор трећег нивоа"
-
-#: ../rules/base.xml.in.h:412
-msgid "Tilde (~) variant"
-msgstr "Варијанта са тилдом (~)"
-
-#: ../rules/base.xml.in.h:413
-msgid "Tjk"
-msgstr "тџк"
-
-#: ../rules/base.xml.in.h:414
-msgid "Toshiba Satellite S3000"
-msgstr "Toshiba Satellite S3000"
-
-#: ../rules/base.xml.in.h:415
-msgid "Trust Direct Access Keyboard"
-msgstr "Trust Direct Access тастатура"
-
-#: ../rules/base.xml.in.h:416
-msgid "Trust Wireless Keyboard Classic"
-msgstr "Trust класична бежична тастатура"
-
-#: ../rules/base.xml.in.h:417
-msgid "Tur"
-msgstr "тур"
-
-#: ../rules/base.xml.in.h:418
-msgid "Turkey"
-msgstr "Турска"
-
-#: ../rules/base.xml.in.h:419
-msgid "Typewriter"
-msgstr "„Куцаћа машина“"
-
-#: ../rules/base.xml.in.h:420
-msgid "U.S. English"
-msgstr "амерички енглески"
-
-#: ../rules/base.xml.in.h:421
-msgid "US keyboard with Bosnian digraphs"
-msgstr "Америчка тастатура са босанским диграфима"
-
-#: ../rules/base.xml.in.h:422
-msgid "US keyboard with Bosnian letters"
-msgstr "Америчка тастатура са босанским словима"
-
-#: ../rules/base.xml.in.h:423
-msgid "US keyboard with Croatian digraphs"
-msgstr "Америчка тастатура са хрватским диграфима"
-
-#: ../rules/base.xml.in.h:424
-msgid "US keyboard with Croatian letters"
-msgstr "Америчка тастатура са хрватским словима"
-
-#: ../rules/base.xml.in.h:425
-msgid "US keyboard with Lithuanian letters"
-msgstr "Америчка тастатура са литванским словима"
-
-#: ../rules/base.xml.in.h:426
-msgid "US keyboard with Maltian letters"
-msgstr "Америчка тастатура са малтешким словима"
-
-#: ../rules/base.xml.in.h:427
-msgid "US keyboard with Slovenian digraphs"
-msgstr "Америчка тастатура са словеначким диграфима"
-
-#: ../rules/base.xml.in.h:428
-msgid "US keyboard with Slovenian letters"
-msgstr "Америчка тастатура са словеначким словима"
-
-#: ../rules/base.xml.in.h:429
-msgid "USA"
-msgstr "САД"
-
-#: ../rules/base.xml.in.h:430
-msgid "Ukr"
-msgstr "укр"
-
-#: ../rules/base.xml.in.h:431
-msgid "Ukraine"
-msgstr "Украјина"
-
-#: ../rules/base.xml.in.h:432
-msgid "UnicodeExpert"
-msgstr "Стручна за Уникод"
-
-#: ../rules/base.xml.in.h:433
-msgid "United Kingdom"
-msgstr "Велика Британија"
-
-#: ../rules/base.xml.in.h:434
-msgid "Urdu"
-msgstr "Урду"
-
-#: ../rules/base.xml.in.h:435
-msgid "Use Bosnian digraphs"
-msgstr "Користи босанске диграфе"
-
-#: ../rules/base.xml.in.h:436
-msgid "Use Croatian digraphs"
-msgstr "Користи хрватске диграфе"
-
-#: ../rules/base.xml.in.h:437
-msgid "Use Slovenian digraphs"
-msgstr "Користи словеначке диграфе"
-
-#: ../rules/base.xml.in.h:438
-msgid "Use guillemots for quotes"
-msgstr "Користи гиљемоте за наводнике"
-
-#: ../rules/base.xml.in.h:439
-msgid "Use keyboard LED to show alternative group."
-msgstr "Користи лампицу тастатуре за приказ измене група."
-
-#: ../rules/base.xml.in.h:440
-msgid "Uzb"
-msgstr "узб"
-
-#: ../rules/base.xml.in.h:441
-msgid "Uzbekistan"
-msgstr "Узбекистан"
-
-#: ../rules/base.xml.in.h:442
-msgid "Vietnam"
-msgstr "Вијетнам"
-
-#: ../rules/base.xml.in.h:443
-msgid "Vnm"
-msgstr "вјт"
-
-#: ../rules/base.xml.in.h:444
-msgid "Winbook Model XP5"
-msgstr "Winbook Model XP5"
-
-#: ../rules/base.xml.in.h:445
-msgid "Winkeys"
-msgstr "Windows тастери"
-
-#: ../rules/base.xml.in.h:446
-msgid "With &lt;\\|&gt; key"
-msgstr "Уз тастер &lt;\\|&gt;"
-
-#: ../rules/base.xml.in.h:447
-msgid "With guillemots"
-msgstr "Са гиљемотима"
-
-#: ../rules/base.xml.in.h:448
-msgid "Yahoo! Internet Keyboard"
-msgstr "Yahoo! Интернет тастатура"
-
-#: ../rules/base.xml.in.h:449
-msgid "Z and ZHE swapped"
-msgstr "Размењено З и Ж"
-
-#: ../rules/base.xml.in.h:450
-msgid "Zar"
-msgstr "Зар"
-
-#: ../rules/base.xml.in.h:451
-msgid "azerty"
-msgstr "azerty"
-
-#: ../rules/base.xml.in.h:452
-msgid "azerty/digits"
-msgstr "azerty/цифре"
-
-#: ../rules/base.xml.in.h:453
-msgid "digits"
-msgstr "цифре"
-
-#: ../rules/base.xml.in.h:454
-msgid "lyx"
-msgstr "lyx"
-
-#: ../rules/base.xml.in.h:455
-msgid "qwerty"
-msgstr "qwerty"
-
-#: ../rules/base.xml.in.h:456
-msgid "qwerty, extended Backslash"
-msgstr "qwerty, проширено са обрнутом косом цртом"
-
-#: ../rules/base.xml.in.h:457
-msgid "qwerty/digits"
-msgstr "qwerty/цифре"
-
-#: ../rules/base.xml.in.h:458
-msgid "qwertz"
-msgstr "qwertz"
-
-#: ../rules/base.xml.in.h:459
-msgid "si1452"
-msgstr "si1452"
-
-#~ msgid "Turkish"
-#~ msgstr "турски"
-
-#~ msgid "\"Standard\""
-#~ msgstr "„Стандардна“"
-
-# bug: Serbia and Montenegro
-#~ msgid "Serbia"
-#~ msgstr "Србија"
-
-#~ msgid "Srp"
-#~ msgstr "срп"
-
-#~ msgid "Tamil INSCRIPT"
-#~ msgstr "тамил инскрипт"
-
-#~ msgid "US keyboard with Romanian letters"
-#~ msgstr "Америчка тастатура са румунским словима"
-
-#~ msgid "A Tamil typewrite-style keymap; TAB encoding"
-#~ msgstr "Тамил распоред налик куцаћој машини; TAB кодирање"
-
-#~ msgid "A Tamil typewrite-style keymap; TSCII encoding"
-#~ msgstr "Тамил распоред налик куцаћој машини; TSCII кодирање"
-
-#~ msgid "A Tamil typewrite-style keymap; Unicode encoding"
-#~ msgstr "Тамил распоред налик куцаћој машини; Уникод кодирање"
-
-#~ msgid "Arb"
-#~ msgstr "арп"
-
-#~ msgid "Basic"
-#~ msgstr "Основно"
-
-#~ msgid "Ben"
-#~ msgstr "бнг"
-
-#~ msgid "Bosnian"
-#~ msgstr "бошњачки"
-
-#~ msgid "Burmese"
-#~ msgstr "бурмиски"
-
-#~ msgid "CloGaelach Laptop"
-#~ msgstr "CloGaelach за преносне рачунаре"
-
-#~ msgid "Czech (qwerty)"
-#~ msgstr "Чешки (qwerty)"
-
-#~ msgid "Danish"
-#~ msgstr "дански"
-
-#~ msgid "Dutch"
-#~ msgstr "холандски"
-
-#~ msgid "Dvo"
-#~ msgstr "дво"
-
-#~ msgid "Finnish"
-#~ msgstr "фински"
-
-#~ msgid "French Canadian"
-#~ msgstr "француски канадски"
-
-#~ msgid "Georgian (latin)"
-#~ msgstr "грузијски (латиница)"
-
-#~ msgid "Georgian (russian)"
-#~ msgstr "грузијски (руски)"
-
-#~ msgid "Grc"
-#~ msgstr "грк"
-
-#~ msgid "Guj"
-#~ msgstr "гуј"
-
-#~ msgid "Hin"
-#~ msgstr "инд"
-
-#~ msgid "Hindi"
-#~ msgstr "индијски"
-
-#~ msgid "Hungarian (qwerty)"
-#~ msgstr "Мађарски (qwerty)"
-
-#~ msgid "INSCRIPT layout"
-#~ msgstr "INSCRIPT распоред"
-
-#~ msgid "IS434 laptop"
-#~ msgstr "IS434 преносни"
-
-#~ msgid "Iku"
-#~ msgstr "ику"
-
-#~ msgid "Irish"
-#~ msgstr "ирски"
-
-#~ msgid "Italian"
-#~ msgstr "италијански"
-
-#~ msgid "Lithuanian azerty standard"
-#~ msgstr "литвански azerty распоред"
-
-#~ msgid "Lithuanian qwerty \"numeric\""
-#~ msgstr "литвански qwerty „бројевни“"
-
-#~ msgid "Maltese (US layout)"
-#~ msgstr "малтски (амерички распоред)"
-
-#~ msgid "Northern Saami (Finland)"
-#~ msgstr "северносаамски (Финска)"
-
-#~ msgid "Northern Saami (Sweden)"
-#~ msgstr "северносаамски (Шведска)"
-
-#~ msgid "Ogh"
-#~ msgstr "огм"
-
-#~ msgid "Ori"
-#~ msgstr "ори"
-
-#~ msgid "PC104"
-#~ msgstr "PC104"
-
-#~ msgid "Polish"
-#~ msgstr "пољски"
-
-#~ msgid "Polish (qwertz)"
-#~ msgstr "пољски (qwertz)"
-
-#~ msgid "Sapmi"
-#~ msgstr "Sapmi"
-
-#~ msgid "Scg"
-#~ msgstr "срп"
-
-#~ msgid "Slovak (qwerty)"
-#~ msgstr "словачки (qwerty)"
-
-#~ msgid "Sme"
-#~ msgstr "сме"
-
-#~ msgid "Sv"
-#~ msgstr "св"
-
-#~ msgid "Swedish"
-#~ msgstr "шведски"
-
-#~ msgid "Swiss French"
-#~ msgstr "швајцарски француски"
-
-#~ msgid "Tel"
-#~ msgstr "тел"
-
-#~ msgid "Thai (Kedmanee)"
-#~ msgstr "тајландски (Кедмани)"
-
-#~ msgid "Tml"
-#~ msgstr "тмл"
-
-#~ msgid "Turkish (F)"
-#~ msgstr "турски (F)"
-
-#~ msgid "Turkish Alt-Q Layout"
-#~ msgstr "турски Alt-Q распоред"
-
-#~ msgid "U.S. English w/ ISO9995-3"
-#~ msgstr "амерички енглески са ИСО9995-3"
-
-#~ msgid "U.S. English w/ dead keys"
-#~ msgstr "амерички енглески са акцентима"
-
-#~ msgid "US"
-#~ msgstr "САД"
-
-#~ msgid "Yug"
-#~ msgstr "сцг"
-
-#~ msgid "Yugoslavian"
-#~ msgstr "латинични српски"
-
-#~ msgid "abnt2"
-#~ msgstr "абнт2"
-
-#~ msgid "bksl"
-#~ msgstr "бксл"
-
-#~ msgid "laptop"
-#~ msgstr "преносни"
-
-#~ msgid "sefi"
-#~ msgstr "sefi"
-
-#~ msgid "uni/101/qwerty/comma"
-#~ msgstr "уни/101/qwerty/запета"
-
-#~ msgid "uni/101/qwerty/dot"
-#~ msgstr "уни/101/qwerty/тачка"
-
-#~ msgid "uni/101/qwertz/comma"
-#~ msgstr "уни/101/qwertz/запета"
-
-#~ msgid "uni/101/qwertz/dot"
-#~ msgstr "уни/101/qwertz/тачка"
-
-#~ msgid "uni/102/qwerty/comma"
-#~ msgstr "уни/102/qwerty/запета"
-
-#~ msgid "uni/102/qwerty/dot"
-#~ msgstr "уни/102/qwerty/тачка"
-
-#~ msgid "uni/102/qwertz/comma"
-#~ msgstr "уни/102/qwertz/запета"
-
-#~ msgid "uni/102/qwertz/dot"
-#~ msgstr "уни/102/qwertz/тачка"
+# Serbian translation of xfree_xkb_xml-4.4pre1
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+# Danilo Segan <dsegan@gmx.net>, 2003, 2004, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-02 19:07+0100\n"
+"PO-Revision-Date: 2006-03-02 19:14+0100\n"
+"Last-Translator: Danilo Segan <dsegan@gmx.net>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/запета/акценти"
+
+#: ../rules/base.xml.in.h:3
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/запета/без акцената"
+
+#: ../rules/base.xml.in.h:4
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/тачка/акценти"
+
+#: ../rules/base.xml.in.h:5
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/тачка/без акцената"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/запета/акценти"
+
+#: ../rules/base.xml.in.h:7
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/запета/без акцената"
+
+#: ../rules/base.xml.in.h:8
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/тачка/акценти"
+
+#: ../rules/base.xml.in.h:9
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/тачка/без акцената"
+
+#: ../rules/base.xml.in.h:10
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/запета/акценти"
+
+#: ../rules/base.xml.in.h:11
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/запета/без акцената"
+
+#: ../rules/base.xml.in.h:12
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/тачка/акценти"
+
+#: ../rules/base.xml.in.h:13
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/тачка/без акцената"
+
+#: ../rules/base.xml.in.h:14
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/запета/акценти"
+
+#: ../rules/base.xml.in.h:15
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/запета/без акцената"
+
+#: ../rules/base.xml.in.h:16
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/тачка/акценти"
+
+#: ../rules/base.xml.in.h:17
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/тачка/без акцената"
+
+#: ../rules/base.xml.in.h:18
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:19
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:20
+msgid "ACPI Standard"
+msgstr "ACPI стандард"
+
+#: ../rules/base.xml.in.h:21
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:22
+msgid "Acer TravelMate 800"
+msgstr "Acer TravelMate 800"
+
+#: ../rules/base.xml.in.h:23
+msgid "Add the EuroSign to the 2 key."
+msgstr "Додај знак за евро на тастер 2."
+
+#: ../rules/base.xml.in.h:24
+msgid "Add the EuroSign to the 5 key."
+msgstr "Додај знак за евро на тастер 5."
+
+#: ../rules/base.xml.in.h:25
+msgid "Add the EuroSign to the E key."
+msgstr "Додај знак за евро на тастер E."
+
+#: ../rules/base.xml.in.h:26
+msgid "Add the standard behavior to Menu key."
+msgstr "Додај обично понашање Menu тастеру."
+
+#: ../rules/base.xml.in.h:27
+msgid "Adding the EuroSign to certain keys"
+msgstr "Додавање знака за евро одређеним тастерима"
+
+#
+#: ../rules/base.xml.in.h:28
+msgid "Advance Scorpius KI"
+msgstr "Напредни Шкорпион КИ"
+
+#: ../rules/base.xml.in.h:29
+msgid "Afg"
+msgstr "афг"
+
+#: ../rules/base.xml.in.h:30
+msgid "Afghanistan"
+msgstr "Афганистан"
+
+#: ../rules/base.xml.in.h:31
+msgid "Akan"
+msgstr "акан"
+
+#: ../rules/base.xml.in.h:32
+msgid "Alb"
+msgstr "алб"
+
+#: ../rules/base.xml.in.h:33
+msgid "Albania"
+msgstr "Албанија"
+
+#: ../rules/base.xml.in.h:34
+msgid "Alt and Meta are on the Alt keys (default)."
+msgstr "Alt и Meta су на Alt тастерима (подразумевано)."
+
+#: ../rules/base.xml.in.h:35
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Alt је мапиран на десни Windows тастер, а Super на Menu."
+
+#: ../rules/base.xml.in.h:36
+msgid "Alt+Ctrl changes group."
+msgstr "Alt+Ctrl мења групу."
+
+#: ../rules/base.xml.in.h:37
+msgid "Alt+Shift changes group."
+msgstr "Alt+Shift мења групу."
+
+#: ../rules/base.xml.in.h:38
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:39
+msgid "Alt/Win key behavior"
+msgstr "Понашање Alt/Win тастера"
+
+# Наизменично?
+#: ../rules/base.xml.in.h:40
+msgid "Alternative"
+msgstr "Допунска"
+
+#: ../rules/base.xml.in.h:41
+msgid "Alternative international (former us_intl)"
+msgstr "Допунска међународна (бивша us_intl)"
+
+#: ../rules/base.xml.in.h:42
+msgid "Alternative, Sun dead keys"
+msgstr "Допунска, Sun-ови акценти"
+
+#: ../rules/base.xml.in.h:43
+msgid "Alternative, eliminate dead keys"
+msgstr "Допунска, без акцената"
+
+#: ../rules/base.xml.in.h:44
+msgid "And"
+msgstr "анд"
+
+#: ../rules/base.xml.in.h:45
+msgid "Andorra"
+msgstr "Андора"
+
+#: ../rules/base.xml.in.h:46
+msgid "Apostrophe (') variant"
+msgstr "Варијанта са апострофом (')"
+
+#: ../rules/base.xml.in.h:47
+msgid "Ara"
+msgstr "ара"
+
+#: ../rules/base.xml.in.h:48
+msgid "Arabic"
+msgstr "арапски"
+
+#: ../rules/base.xml.in.h:49
+msgid "Arm"
+msgstr "јрм"
+
+#: ../rules/base.xml.in.h:50
+msgid "Armenia"
+msgstr "Јерменија"
+
+#: ../rules/base.xml.in.h:51
+msgid "Aze"
+msgstr "азб"
+
+#: ../rules/base.xml.in.h:52
+msgid "Azerbaijan"
+msgstr "Азербејџан"
+
+#: ../rules/base.xml.in.h:53
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 бежична Интернет тастатура"
+
+#: ../rules/base.xml.in.h:54
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:55
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF мултимедијална"
+
+#: ../rules/base.xml.in.h:56
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:57
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:58
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:59
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:60
+msgid "Ban"
+msgstr "бан"
+
+#: ../rules/base.xml.in.h:61
+msgid "Bangladesh"
+msgstr "Бангладеш"
+
+#: ../rules/base.xml.in.h:62
+msgid "Bel"
+msgstr "блг"
+
+#: ../rules/base.xml.in.h:63
+msgid "Belarus"
+msgstr "Белорусија"
+
+#: ../rules/base.xml.in.h:64
+msgid "Belgium"
+msgstr "Белгија"
+
+#: ../rules/base.xml.in.h:65
+msgid "Bengali"
+msgstr "бенгалски"
+
+#: ../rules/base.xml.in.h:66
+msgid "Bengali Probhat"
+msgstr "бенгалски пробат"
+
+#: ../rules/base.xml.in.h:67
+msgid "Bgr"
+msgstr "буг"
+
+#: ../rules/base.xml.in.h:68
+msgid "Bhu"
+msgstr "бут"
+
+#: ../rules/base.xml.in.h:69
+msgid "Bhutan"
+msgstr "Бутан"
+
+#: ../rules/base.xml.in.h:70
+msgid "Bih"
+msgstr "бих"
+
+#: ../rules/base.xml.in.h:71
+msgid "Blr"
+msgstr "блр"
+
+#: ../rules/base.xml.in.h:72
+msgid "Bosnia and Herzegovina"
+msgstr "Босна и Херцеговина"
+
+#: ../rules/base.xml.in.h:73
+msgid "Both Alt keys together change group."
+msgstr "Оба Alt тастера мењају групу."
+
+#: ../rules/base.xml.in.h:74
+msgid "Both Ctrl keys together change group."
+msgstr "Оба Ctrl тастера мењају групу."
+
+#: ../rules/base.xml.in.h:75
+msgid "Both Shift keys together change group."
+msgstr "Оба Shift тастера мењају групу."
+
+#: ../rules/base.xml.in.h:76
+msgid "Both Win-keys switch group while pressed."
+msgstr "Оба Win-тастера мењају групу када су притиснути."
+
+#: ../rules/base.xml.in.h:77
+msgid "Bra"
+msgstr "бра"
+
+#: ../rules/base.xml.in.h:78
+msgid "Brazil"
+msgstr "Бразил"
+
+#: ../rules/base.xml.in.h:79
+msgid "Brazilian ABNT2"
+msgstr "бразилска ABNT2"
+
+#: ../rules/base.xml.in.h:80
+msgid "Brother Internet Keyboard"
+msgstr "Brother Интернет тастатура"
+
+#: ../rules/base.xml.in.h:81
+msgid "Bulgaria"
+msgstr "Бугарска"
+
+#: ../rules/base.xml.in.h:82
+msgid "Cambodia"
+msgstr "Камбоџа"
+
+#: ../rules/base.xml.in.h:83
+msgid "Can"
+msgstr "кан"
+
+#: ../rules/base.xml.in.h:84
+msgid "Canada"
+msgstr "Канада"
+
+#: ../rules/base.xml.in.h:85
+msgid "Caps Lock is Compose."
+msgstr "Caps Lock је комбинујући тастер."
+
+#: ../rules/base.xml.in.h:86
+msgid "CapsLock LED shows alternative group."
+msgstr "Лампица за Caps Lock показује измењивање групе."
+
+#: ../rules/base.xml.in.h:87
+msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
+msgstr "CapsLock се понаша као трајни Shift. Shift укида Caps."
+
+#: ../rules/base.xml.in.h:88
+msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
+msgstr "CapsLock се понаша као трајни Shift. Shift не укида Caps."
+
+#: ../rules/base.xml.in.h:89
+msgid "CapsLock just locks the Shift modifier."
+msgstr "CapsLock просто трајно укључује Shift."
+
+#: ../rules/base.xml.in.h:90
+msgid "CapsLock key behavior"
+msgstr "Понашање Caps Lock тастера"
+
+#: ../rules/base.xml.in.h:91
+msgid "CapsLock key changes group."
+msgstr "Caps Lock тастер мења групу."
+
+#: ../rules/base.xml.in.h:92
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "CapsLock мења Shift стање па делује на све тастере."
+
+#: ../rules/base.xml.in.h:93
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "CapsLock мења обичну величину слова."
+
+#: ../rules/base.xml.in.h:94
+msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
+msgstr "CapsLock користи унутрашњу величину слова. Shift укида Caps Lock."
+
+#: ../rules/base.xml.in.h:95
+msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
+msgstr "CapsLock користи унутрашњу величину слова. Shift не укида Caps Lock."
+
+#: ../rules/base.xml.in.h:96
+msgid "Catalan variant with middle-dot L"
+msgstr "каталонска варијанта са L и средњом тачком"
+
+#: ../rules/base.xml.in.h:97
+msgid "Che"
+msgstr "швц"
+
+#: ../rules/base.xml.in.h:98
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:99
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (друга могућност)"
+
+#: ../rules/base.xml.in.h:100
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:101
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:102
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Интернет тастатура"
+
+#: ../rules/base.xml.in.h:103
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:104
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:105
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq тастатура за лак приступ"
+
+#: ../rules/base.xml.in.h:106
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Интернет тастатура (13 тастера)"
+
+#: ../rules/base.xml.in.h:107
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Интернет тастатура (18 тастера)"
+
+#: ../rules/base.xml.in.h:108
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Интернет тастатура (7 тастера)"
+
+#: ../rules/base.xml.in.h:109
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq тастатура"
+
+#: ../rules/base.xml.in.h:110
+msgid "Compose key position"
+msgstr "Положај тастера Compose"
+
+#: ../rules/base.xml.in.h:111
+msgid "Croatia"
+msgstr "Хрватска"
+
+#: ../rules/base.xml.in.h:112
+msgid "Ctrl key at bottom left"
+msgstr "Тастер Ctrl је у дну лево"
+
+#: ../rules/base.xml.in.h:113
+msgid "Ctrl key at left of 'A'"
+msgstr "Тастер Ctrl је у лево од „А“"
+
+#: ../rules/base.xml.in.h:114
+msgid "Ctrl key position"
+msgstr "Положај тастера Ctrl"
+
+#: ../rules/base.xml.in.h:115
+msgid "Ctrl+Shift changes group."
+msgstr "Ctrl+Shift мења групу."
+
+#: ../rules/base.xml.in.h:116
+msgid "Cyrillic"
+msgstr "ћирилични"
+
+#: ../rules/base.xml.in.h:117
+msgid "Cze"
+msgstr "чеш"
+
+#: ../rules/base.xml.in.h:118
+msgid "Czechia"
+msgstr "Чешка"
+
+#: ../rules/base.xml.in.h:119
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:120
+msgid "Dead acute"
+msgstr "Акутски акценат"
+
+#: ../rules/base.xml.in.h:121
+msgid "Dead grave acute"
+msgstr "Гравис акутски акценат"
+
+#: ../rules/base.xml.in.h:122
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:123
+msgid "Dell 101-key PC"
+msgstr "Dell 101-тастер PC"
+
+#: ../rules/base.xml.in.h:124
+msgid "Dell USB Multimedia Keybard"
+msgstr "Dell USB мултимедијална тастатура"
+
+#: ../rules/base.xml.in.h:125
+msgid "Denmark"
+msgstr "Данска"
+
+#: ../rules/base.xml.in.h:126
+msgid "Deu"
+msgstr "нем"
+
+#: ../rules/base.xml.in.h:127
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa бежична тастатура"
+
+#: ../rules/base.xml.in.h:128
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 серија"
+
+#: ../rules/base.xml.in.h:129
+msgid "Dnk"
+msgstr "дан"
+
+#: ../rules/base.xml.in.h:130
+msgid "Dvorak"
+msgstr "дворак"
+
+#: ../rules/base.xml.in.h:131
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "дворак, пољски наводници на тастеру „1/!“"
+
+#: ../rules/base.xml.in.h:132
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "дворак, пољски наводници на тастеру наводника"
+
+#: ../rules/base.xml.in.h:133
+msgid "Eliminate dead keys"
+msgstr "Уклони акценте"
+
+#: ../rules/base.xml.in.h:134
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:135
+msgid "Epo"
+msgstr "есп"
+
+#: ../rules/base.xml.in.h:136
+msgid "Esp"
+msgstr "шпа"
+
+#: ../rules/base.xml.in.h:137
+msgid "Esperanto"
+msgstr "есперанто"
+
+#: ../rules/base.xml.in.h:138
+msgid "Est"
+msgstr "ест"
+
+#: ../rules/base.xml.in.h:139
+msgid "Estonia"
+msgstr "Естонија"
+
+#: ../rules/base.xml.in.h:140
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:141
+msgid "Ewe"
+msgstr "Еве"
+
+#: ../rules/base.xml.in.h:142
+msgid "Extended"
+msgstr "Проширено"
+
+#: ../rules/base.xml.in.h:143
+msgid "Extended Backslash"
+msgstr "Проширено уз обрнуту косу црту"
+
+#: ../rules/base.xml.in.h:144
+msgid "F-letter (F) variant"
+msgstr "Варијанта са F-словом (F)"
+
+#: ../rules/base.xml.in.h:145
+msgid "Fao"
+msgstr "фар"
+
+#: ../rules/base.xml.in.h:146
+msgid "Faroe Islands"
+msgstr "Фарска острва"
+
+#: ../rules/base.xml.in.h:147
+msgid "Fin"
+msgstr "фин"
+
+#: ../rules/base.xml.in.h:148
+msgid "Finland"
+msgstr "Финска"
+
+#: ../rules/base.xml.in.h:149
+msgid "Fra"
+msgstr "фра"
+
+#: ../rules/base.xml.in.h:150
+msgid "France"
+msgstr "Француска"
+
+#: ../rules/base.xml.in.h:151
+msgid "French"
+msgstr "француски"
+
+#: ../rules/base.xml.in.h:152
+msgid "French (legacy)"
+msgstr "француски (класични)"
+
+#: ../rules/base.xml.in.h:153
+msgid "French Dvorak"
+msgstr "француски дворак"
+
+#: ../rules/base.xml.in.h:154
+msgid "French, Sun dead keys"
+msgstr "француски, Sun-ови акценти"
+
+#: ../rules/base.xml.in.h:155
+msgid "French, eliminate dead keys"
+msgstr "Француски, без акцената"
+
+#: ../rules/base.xml.in.h:156
+msgid "Fula"
+msgstr "Фула"
+
+#: ../rules/base.xml.in.h:157
+msgid "GBr"
+msgstr "вбр"
+
+#: ../rules/base.xml.in.h:158
+msgid "Ga"
+msgstr "Га"
+
+#: ../rules/base.xml.in.h:159
+msgid "Generic 101-key PC"
+msgstr "Обична са 101 тастером"
+
+#: ../rules/base.xml.in.h:160
+msgid "Generic 102-key (Intl) PC"
+msgstr "Обична са 102 тастера (међунар.)"
+
+#: ../rules/base.xml.in.h:161
+msgid "Generic 104-key PC"
+msgstr "Обична са 104 тастера"
+
+#: ../rules/base.xml.in.h:162
+msgid "Generic 105-key (Intl) PC"
+msgstr "Обична са 105 тастера (међунар.)"
+
+#: ../rules/base.xml.in.h:163
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:164
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius ММ тастатура KWD-910"
+
+#: ../rules/base.xml.in.h:165
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:166
+msgid "Geo"
+msgstr "гру"
+
+#: ../rules/base.xml.in.h:167
+msgid "Georgia"
+msgstr "Грузија"
+
+#: ../rules/base.xml.in.h:168
+msgid "German, Sun dead keys"
+msgstr "немачки, Sun-ови акценти"
+
+#: ../rules/base.xml.in.h:169
+msgid "German, eliminate dead keys"
+msgstr "немачки, без акцената"
+
+#: ../rules/base.xml.in.h:170
+msgid "Germany"
+msgstr "Немачка"
+
+#: ../rules/base.xml.in.h:171
+msgid "Gha"
+msgstr "га"
+
+#: ../rules/base.xml.in.h:172
+msgid "Ghana"
+msgstr "Гана"
+
+#: ../rules/base.xml.in.h:173
+msgid "Gre"
+msgstr "грк"
+
+#: ../rules/base.xml.in.h:174
+msgid "Greece"
+msgstr "Грчка"
+
+#: ../rules/base.xml.in.h:175
+msgid "Group Shift/Lock behavior"
+msgstr "Понашање измене/избора групе"
+
+#: ../rules/base.xml.in.h:176
+msgid "Gujarati"
+msgstr "гујарати"
+
+#: ../rules/base.xml.in.h:177
+msgid "Gurmukhi"
+msgstr "гурмуки"
+
+#: ../rules/base.xml.in.h:178
+msgid "Gyration"
+msgstr "Gyration"
+
+#: ../rules/base.xml.in.h:179
+msgid "Hausa"
+msgstr "Хауса"
+
+#: ../rules/base.xml.in.h:180
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Интернет тастатура"
+
+#: ../rules/base.xml.in.h:181
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:182
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:183
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:184
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:185
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:186
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:187
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:188
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 мултимедијална тастатура"
+
+#: ../rules/base.xml.in.h:189
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Интернет тастатура"
+
+#: ../rules/base.xml.in.h:190
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:191
+msgid "Hrv"
+msgstr "хрв"
+
+#: ../rules/base.xml.in.h:192
+msgid "Hun"
+msgstr "мађ"
+
+#: ../rules/base.xml.in.h:193
+msgid "Hungary"
+msgstr "Мађарска"
+
+#: ../rules/base.xml.in.h:194
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper је мапиран на Win тастере."
+
+#: ../rules/base.xml.in.h:195
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:196
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:197
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II (друга могућност)"
+
+#: ../rules/base.xml.in.h:198
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:199
+msgid "ISO Alternate"
+msgstr "Додатни ИСО"
+
+#: ../rules/base.xml.in.h:200
+msgid "Iceland"
+msgstr "Исланд"
+
+#: ../rules/base.xml.in.h:201
+msgid "Ind"
+msgstr "инд"
+
+#: ../rules/base.xml.in.h:202
+msgid "India"
+msgstr "Индија"
+
+#: ../rules/base.xml.in.h:203
+msgid "International (with dead keys)"
+msgstr "Међународна (са акцентима)"
+
+#: ../rules/base.xml.in.h:204
+msgid "Inuktitut"
+msgstr "инуктитут"
+
+#: ../rules/base.xml.in.h:205
+msgid "Iran"
+msgstr "Иран"
+
+#: ../rules/base.xml.in.h:206
+msgid "Ireland"
+msgstr "Ирска"
+
+#: ../rules/base.xml.in.h:207
+msgid "Irl"
+msgstr "ирс"
+
+#: ../rules/base.xml.in.h:208
+msgid "Irn"
+msgstr "ирн"
+
+#: ../rules/base.xml.in.h:209
+msgid "Isl"
+msgstr "исл"
+
+#: ../rules/base.xml.in.h:210
+msgid "Isr"
+msgstr "изр"
+
+#: ../rules/base.xml.in.h:211
+msgid "Israel"
+msgstr "Израел"
+
+#: ../rules/base.xml.in.h:212
+msgid "Ita"
+msgstr "ита"
+
+#: ../rules/base.xml.in.h:213
+msgid "Italy"
+msgstr "Италија"
+
+#: ../rules/base.xml.in.h:214
+msgid "Japan"
+msgstr "Јапан"
+
+#: ../rules/base.xml.in.h:215
+msgid "Japanese 106-key"
+msgstr "јапански са 106 тастера"
+
+#: ../rules/base.xml.in.h:216
+msgid "Jpn"
+msgstr "јпн"
+
+#: ../rules/base.xml.in.h:217
+msgid "Kannada"
+msgstr "канада (јужна индија)"
+
+#: ../rules/base.xml.in.h:218
+msgid "Kaz"
+msgstr "каз"
+
+#: ../rules/base.xml.in.h:219
+msgid "Kazakh with Russian"
+msgstr "казахстански са руским"
+
+#: ../rules/base.xml.in.h:220
+msgid "Kazakhstan"
+msgstr "Казахстан"
+
+#: ../rules/base.xml.in.h:221
+msgid "Keypad"
+msgstr "Нумеричка тастатура"
+
+#: ../rules/base.xml.in.h:222
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:223
+msgid "Khm"
+msgstr "кмб"
+
+#: ../rules/base.xml.in.h:224
+msgid "Kyr"
+msgstr "кир"
+
+#: ../rules/base.xml.in.h:225
+msgid "Kyrgyzstan"
+msgstr "Киргистан"
+
+#: ../rules/base.xml.in.h:226
+msgid "LAm"
+msgstr "ЈАм"
+
+#: ../rules/base.xml.in.h:227
+msgid "Lao"
+msgstr "лао"
+
+#: ../rules/base.xml.in.h:228
+msgid "Laos"
+msgstr "Лаос"
+
+#: ../rules/base.xml.in.h:229
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Тастатуре преносних рачунара из Compaq-а (нпр. Armada)"
+
+#: ../rules/base.xml.in.h:230
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Тастатуре преносних рачунара из Compaq-а (нпр. Presario)"
+
+#: ../rules/base.xml.in.h:231
+msgid "Laptop/notebook Dell Inspiron 6xxx/8xxx"
+msgstr "Тастатуре преносних рачунара Dell Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:232
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Преносне eMachines m68xx"
+
+#: ../rules/base.xml.in.h:233
+msgid "Latin"
+msgstr "латинични"
+
+#: ../rules/base.xml.in.h:234
+msgid "Latin American"
+msgstr "јужноамерички"
+
+#: ../rules/base.xml.in.h:235
+msgid "Latin Unicode"
+msgstr "латинични Уникод"
+
+#: ../rules/base.xml.in.h:236
+msgid "Latin Unicode qwerty"
+msgstr "латинични Уникод qwerty"
+
+#: ../rules/base.xml.in.h:237
+msgid "Latin qwerty"
+msgstr "латинични qwerty"
+
+#: ../rules/base.xml.in.h:238
+msgid "Latin with guillemots"
+msgstr "латинични са гиљемотима"
+
+#: ../rules/base.xml.in.h:239
+msgid "Latvia"
+msgstr "Летонија"
+
+#: ../rules/base.xml.in.h:240
+msgid "Left Alt key changes group."
+msgstr "Леви Alt тастер мења групу."
+
+#: ../rules/base.xml.in.h:241
+msgid "Left Alt key switches group while pressed."
+msgstr "Леви Alt тастер мења групу док је притиснут."
+
+#: ../rules/base.xml.in.h:242
+msgid "Left Ctrl key changes group."
+msgstr "Леви Ctrl тастер мења групу."
+
+#: ../rules/base.xml.in.h:243
+msgid "Left Shift key changes group."
+msgstr "Леви Shift тастер мења групу."
+
+#: ../rules/base.xml.in.h:244
+msgid "Left Win-key changes group."
+msgstr "Леви Windows тастер мења групу."
+
+#: ../rules/base.xml.in.h:245
+msgid "Left Win-key switches group while pressed."
+msgstr "Леви Windows тастер мења групу док је притиснут."
+
+#: ../rules/base.xml.in.h:246
+msgid "Left handed Dvorak"
+msgstr "Леворучни Дворак"
+
+#: ../rules/base.xml.in.h:247
+msgid "Lithuania"
+msgstr "Литванија"
+
+#: ../rules/base.xml.in.h:248
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access тастатура"
+
+#: ../rules/base.xml.in.h:249
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:250
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:251
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:252
+msgid "Logitech Cordless Desktop Pro"
+msgstr "Logitech Cordless Desktop Pro"
+
+#: ../rules/base.xml.in.h:253
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Logitech Cordless Desktop Pro (додатна могућност)"
+
+#: ../rules/base.xml.in.h:254
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (додатна могућност 2)"
+
+#: ../rules/base.xml.in.h:255
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:256
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:257
+msgid "Logitech Deluxe Access Keyboard"
+msgstr "Logitech Deluxe Access тастатура"
+
+#: ../rules/base.xml.in.h:258
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Интернет тастатура"
+
+#: ../rules/base.xml.in.h:259
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Интернет навигатор тастатура"
+
+#: ../rules/base.xml.in.h:260
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X тастатура"
+
+#: ../rules/base.xml.in.h:261
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:262
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless тастатура (модел Y-RB6)"
+
+#: ../rules/base.xml.in.h:263
+msgid "Logitech iTouch keyboard Internet Navigator"
+msgstr "Logitech iTouch тастатура Интернет навигатор"
+
+#: ../rules/base.xml.in.h:264
+msgid "Ltu"
+msgstr "лит"
+
+#: ../rules/base.xml.in.h:265
+msgid "Lva"
+msgstr "лет"
+
+#: ../rules/base.xml.in.h:266
+msgid "Macedonia"
+msgstr "Македонија"
+
+#: ../rules/base.xml.in.h:267
+msgid "Macintosh"
+msgstr "Мекинтош"
+
+#: ../rules/base.xml.in.h:268
+msgid "Macintosh Old"
+msgstr "Стари Мекинтош"
+
+#: ../rules/base.xml.in.h:269
+msgid "Make CapsLock an additional Ctrl."
+msgstr "Учини Caps Lock додатним Ctrl тастером."
+
+#: ../rules/base.xml.in.h:270
+msgid "Mal"
+msgstr "мал"
+
+#: ../rules/base.xml.in.h:271
+msgid "Malayalam"
+msgstr "малајамски"
+
+#: ../rules/base.xml.in.h:272
+msgid "Maldives"
+msgstr "Малдиви"
+
+#: ../rules/base.xml.in.h:273
+msgid "Malta"
+msgstr "Малта"
+
+#: ../rules/base.xml.in.h:274
+msgid "Mao"
+msgstr "мао"
+
+#: ../rules/base.xml.in.h:275
+msgid "Maori"
+msgstr "Маори"
+
+#: ../rules/base.xml.in.h:276
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:277
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access тастатура"
+
+#: ../rules/base.xml.in.h:278
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:279
+msgid "Menu is Compose."
+msgstr "Menu је комбинујући тастер."
+
+#: ../rules/base.xml.in.h:280
+msgid "Menu key changes group."
+msgstr "Menu тастер мења групу."
+
+#: ../rules/base.xml.in.h:281
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta је мапиран на Windows тастере."
+
+#: ../rules/base.xml.in.h:282
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta је мапиран на леви Windows тастер."
+
+#: ../rules/base.xml.in.h:283
+msgid "Microsoft Internet Keyboard"
+msgstr "Микрософтова Интернет тастатура"
+
+#: ../rules/base.xml.in.h:284
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Микрософтова Интернет Про тастатура, шведски"
+
+#: ../rules/base.xml.in.h:285
+msgid "Microsoft Natural"
+msgstr "Микрософт Натурал"
+
+#: ../rules/base.xml.in.h:286
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Микрософт Натурал тастатура Про / Микрософт Интернет тастатура Про "
+
+#: ../rules/base.xml.in.h:287
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Микрософт Натурал тастатура Про ОЕМ"
+
+#: ../rules/base.xml.in.h:288
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr ""
+"Микрософтова Натурал тастатура Про УСБ / Микрософт Интернет тастатура Про "
+
+#: ../rules/base.xml.in.h:289
+msgid "Microsoft Office Keyboard"
+msgstr "Микрософтова канцеларијска тастатура"
+
+#: ../rules/base.xml.in.h:290
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Микрософтова бежична мултимедијална тастатура 1.0А"
+
+#: ../rules/base.xml.in.h:291
+msgid "Miscellaneous compatibility options"
+msgstr "Разне могућности за сагласност"
+
+#: ../rules/base.xml.in.h:292
+msgid "Mkd"
+msgstr "мак"
+
+#: ../rules/base.xml.in.h:293
+msgid "Mlt"
+msgstr "мал"
+
+#: ../rules/base.xml.in.h:294
+msgid "Mmr"
+msgstr "ммр"
+
+#: ../rules/base.xml.in.h:295
+msgid "Mng"
+msgstr "мнг"
+
+#: ../rules/base.xml.in.h:296
+msgid "Mongolia"
+msgstr "Монголија"
+
+#: ../rules/base.xml.in.h:297
+msgid "Multilingual"
+msgstr "Вишејезична"
+
+#: ../rules/base.xml.in.h:298
+msgid "Multilingual, first part"
+msgstr "Вишејезична, први део"
+
+#: ../rules/base.xml.in.h:299
+msgid "Multilingual, second part"
+msgstr "Вишејезична, други део"
+
+#: ../rules/base.xml.in.h:300
+msgid "Myanmar"
+msgstr "Мијанмар"
+
+#: ../rules/base.xml.in.h:301
+msgid "Netherlands"
+msgstr "Холандија"
+
+#: ../rules/base.xml.in.h:302
+msgid "Nld"
+msgstr "хол"
+
+#: ../rules/base.xml.in.h:303
+msgid "Nor"
+msgstr "нор"
+
+#: ../rules/base.xml.in.h:304
+msgid "Northern Saami"
+msgstr "северносаамски"
+
+#: ../rules/base.xml.in.h:305
+msgid "Northern Saami, eliminate dead keys"
+msgstr "северносаамски, без акцената"
+
+#: ../rules/base.xml.in.h:306
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:307
+msgid "Norway"
+msgstr "Норвешка"
+
+#: ../rules/base.xml.in.h:308
+msgid "NumLock LED shows alternative group."
+msgstr "NumLock лампица приказује измене група."
+
+#: ../rules/base.xml.in.h:309
+msgid "Ogham"
+msgstr "огам"
+
+#: ../rules/base.xml.in.h:310
+msgid "Ogham IS434"
+msgstr "огам IS434"
+
+#: ../rules/base.xml.in.h:311
+msgid "Oretec MCK-800 MM/Internet keyboard"
+msgstr "Oretec MCK-800 ММ/Интернет тастатура"
+
+#: ../rules/base.xml.in.h:312
+msgid "Oriya"
+msgstr "орија"
+
+#: ../rules/base.xml.in.h:313
+msgid "PC-98xx Series"
+msgstr "PC-98xx серија"
+
+#: ../rules/base.xml.in.h:314
+msgid "Pak"
+msgstr "пак"
+
+#: ../rules/base.xml.in.h:315
+msgid "Pakistan"
+msgstr "Пакистан"
+
+#: ../rules/base.xml.in.h:316
+msgid "Pashto"
+msgstr "пашто"
+
+#: ../rules/base.xml.in.h:317
+msgid "Pattachote"
+msgstr "Паташоте"
+
+#: ../rules/base.xml.in.h:318
+msgid "Phonetic"
+msgstr "фонетски"
+
+#: ../rules/base.xml.in.h:319
+msgid "Pol"
+msgstr "пољ"
+
+#: ../rules/base.xml.in.h:320
+msgid "Poland"
+msgstr "Пољска"
+
+# не ваља, можда вишезвучни?
+#: ../rules/base.xml.in.h:321
+msgid "Polytonic"
+msgstr "вишезвучни"
+
+#: ../rules/base.xml.in.h:322
+msgid "Portugal"
+msgstr "Португалија"
+
+#: ../rules/base.xml.in.h:323
+msgid "Power G5"
+msgstr "Power G5"
+
+#: ../rules/base.xml.in.h:324
+msgid "PowerPC PS/2"
+msgstr "PowerPC PS/2"
+
+#: ../rules/base.xml.in.h:325
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Притискање левог Alt тастера за избор 3. нивоа."
+
+#: ../rules/base.xml.in.h:326
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Притискање левог Windows тастера за избор 3. нивоа."
+
+#: ../rules/base.xml.in.h:327
+msgid "Press Menu key to choose 3rd level."
+msgstr "Притискање Menu тастера за избор 3. нивоа."
+
+#: ../rules/base.xml.in.h:328
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Притискање десног Alt тастера за избор 3. нивоа."
+
+#: ../rules/base.xml.in.h:329
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Притискање десног Ctrl тастера за избор 3. нивоа."
+
+#: ../rules/base.xml.in.h:330
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Притискање десног Windows тастера за избор 3. нивоа."
+
+#: ../rules/base.xml.in.h:331
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Притискање било ког Alt тастера за избор 3. нивоа."
+
+#: ../rules/base.xml.in.h:332
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Притискање било ког Windows тастера за избор 3. нивоа."
+
+#: ../rules/base.xml.in.h:333
+msgid "Pro"
+msgstr "про"
+
+#: ../rules/base.xml.in.h:334
+msgid "Pro Keypad"
+msgstr "Про тастатура"
+
+#: ../rules/base.xml.in.h:335
+msgid "Probhat"
+msgstr "пробат"
+
+#: ../rules/base.xml.in.h:336
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:337
+msgid "Prt"
+msgstr "прт"
+
+#: ../rules/base.xml.in.h:338
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:339
+msgid "R-Alt switches group while pressed."
+msgstr "Десни Alt мења групу док је притиснут."
+
+#: ../rules/base.xml.in.h:340
+msgid "Right Alt is Compose."
+msgstr "Десни Alt је комбинујући."
+
+#: ../rules/base.xml.in.h:341
+msgid "Right Alt key changes group."
+msgstr "Десни Alt је мења групу."
+
+#: ../rules/base.xml.in.h:342
+msgid "Right Ctrl is Compose."
+msgstr "Десни Ctrl је комбинујући."
+
+#: ../rules/base.xml.in.h:343
+msgid "Right Ctrl key changes group."
+msgstr "Десни Ctrl мења групу."
+
+#: ../rules/base.xml.in.h:344
+msgid "Right Ctrl key switches group while pressed."
+msgstr "Десни Ctrl тастер мења групу док је притиснут."
+
+#: ../rules/base.xml.in.h:345
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Десни Ctrl тастер се понаша као десни Alt."
+
+#: ../rules/base.xml.in.h:346
+msgid "Right Shift key changes group."
+msgstr "Десни Shift мења групу."
+
+#: ../rules/base.xml.in.h:347
+msgid "Right Win-key changes group."
+msgstr "Десни Windows тастер мења групу."
+
+#: ../rules/base.xml.in.h:348
+msgid "Right Win-key is Compose."
+msgstr "Десни Windows тастер је комбинујући."
+
+#: ../rules/base.xml.in.h:349
+msgid "Right Win-key switches group while pressed."
+msgstr "Десни Windows тастер мења групу док је притиснут."
+
+#: ../rules/base.xml.in.h:350
+msgid "Right handed Dvorak"
+msgstr "Десноручни Дворак"
+
+#: ../rules/base.xml.in.h:351
+msgid "Romania"
+msgstr "Румунија"
+
+#: ../rules/base.xml.in.h:352
+msgid "Romanian keyboard with German letters"
+msgstr "румунска тастатура са немачким словима"
+
+#: ../rules/base.xml.in.h:353
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "румунска тастатура са немачким словима, без акцената"
+
+#: ../rules/base.xml.in.h:354
+msgid "Rou"
+msgstr "рум"
+
+#: ../rules/base.xml.in.h:355
+msgid "Rus"
+msgstr "рус"
+
+#: ../rules/base.xml.in.h:356
+msgid "Russia"
+msgstr "Русија"
+
+#: ../rules/base.xml.in.h:357
+msgid "Russian"
+msgstr "руски"
+
+#: ../rules/base.xml.in.h:358
+msgid "Russian phonetic"
+msgstr "руски фонетски"
+
+#: ../rules/base.xml.in.h:359
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "руски фонетски, без акцената"
+
+#: ../rules/base.xml.in.h:360
+msgid "Russian with Kazakh"
+msgstr "руски са казахстанским"
+
+#: ../rules/base.xml.in.h:361
+msgid "SCG"
+msgstr "СЦГ"
+
+#: ../rules/base.xml.in.h:362
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST мултимедијална бежична тастатура"
+
+#: ../rules/base.xml.in.h:363
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:364
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:365
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:366
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:367
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN ергономска 2500"
+
+#: ../rules/base.xml.in.h:368
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:369
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:370
+msgid "ScrollLock LED shows alternative group."
+msgstr "ScrollLock лампица приказује измене група."
+
+#: ../rules/base.xml.in.h:371
+msgid "Serbia and Montenegro"
+msgstr "Србија и Црна Гора"
+
+#: ../rules/base.xml.in.h:372
+msgid "Shift with numpad keys works as in MS Windows."
+msgstr "Shift уз нумеричку тасатуру ради као у MS Windows-у."
+
+#: ../rules/base.xml.in.h:373
+msgid "Shift+CapsLock changes group."
+msgstr "Shift+CapsLock тастер мења групу."
+
+#: ../rules/base.xml.in.h:374
+msgid "Slovakia"
+msgstr "Словачка"
+
+#: ../rules/base.xml.in.h:375
+msgid "Slovenia"
+msgstr "Словенија"
+
+#: ../rules/base.xml.in.h:376
+msgid "South Africa"
+msgstr "Јужна Африка"
+
+#: ../rules/base.xml.in.h:377
+msgid "Southern Uzbek"
+msgstr "Јужни Узбекистан"
+
+#: ../rules/base.xml.in.h:378
+msgid "Spain"
+msgstr "Шпанија"
+
+#: ../rules/base.xml.in.h:379
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Нарочити тастери (Ctrl+Alt+&lt;тастер&gt;) које обрађује сервер."
+
+#: ../rules/base.xml.in.h:380
+msgid "SrL"
+msgstr "шрл"
+
+#: ../rules/base.xml.in.h:381
+msgid "Sri Lanka"
+msgstr "Шри Ланка"
+
+#: ../rules/base.xml.in.h:382
+msgid "Standard"
+msgstr "стандардна"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:384
+msgid "Standard RSTU"
+msgstr "стандардна RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:386
+msgid "Standard RSTU on Russian layout"
+msgstr "стандардна RSTU на руском распореду"
+
+#: ../rules/base.xml.in.h:387
+msgid "Sun dead keys"
+msgstr "Sun-ови акценти"
+
+#: ../rules/base.xml.in.h:388
+msgid "Super Power Multimedia Keyboard"
+msgstr "Супер моћна мултимедијална тастатура"
+
+#: ../rules/base.xml.in.h:389
+msgid "Super is mapped to the Win-keys (default)."
+msgstr "Super је мапиран на Windows тастере (подразумевано)."
+
+#: ../rules/base.xml.in.h:390
+msgid "Svk"
+msgstr "слк"
+
+#: ../rules/base.xml.in.h:391
+msgid "Svn"
+msgstr "сло"
+
+#: ../rules/base.xml.in.h:392
+msgid "Swap Ctrl and CapsLock."
+msgstr "Размени Ctrl и Caps Lock."
+
+#: ../rules/base.xml.in.h:393
+msgid "Swe"
+msgstr "шве"
+
+#: ../rules/base.xml.in.h:394
+msgid "Sweden"
+msgstr "Шведска"
+
+#: ../rules/base.xml.in.h:395
+msgid "Switzerland"
+msgstr "Швајцарска"
+
+#: ../rules/base.xml.in.h:396
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:397
+msgid "Syr"
+msgstr "сир"
+
+#: ../rules/base.xml.in.h:398
+msgid "Syria"
+msgstr "Сирија"
+
+#: ../rules/base.xml.in.h:399
+msgid "Syriac"
+msgstr "сиријски"
+
+#: ../rules/base.xml.in.h:400
+msgid "Syriac phonetic"
+msgstr "сиријски фонетски"
+
+#: ../rules/base.xml.in.h:401
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:402
+msgid "Tajikistan"
+msgstr "Таџикистан"
+
+#: ../rules/base.xml.in.h:403
+msgid "Tamil"
+msgstr "тамил"
+
+#: ../rules/base.xml.in.h:404
+msgid "Tamil TAB Typewriter"
+msgstr "тамил TAB куцаћа машина"
+
+#: ../rules/base.xml.in.h:405
+msgid "Tamil TSCII Typewriter"
+msgstr "тамил TSCII куцаћа машина"
+
+#: ../rules/base.xml.in.h:406
+msgid "Tamil Unicode"
+msgstr "тамил Уникод"
+
+#: ../rules/base.xml.in.h:407
+msgid "Tatar"
+msgstr "татарски"
+
+#: ../rules/base.xml.in.h:408
+msgid "Telugu"
+msgstr "телугу"
+
+#: ../rules/base.xml.in.h:409
+msgid "Tha"
+msgstr "тај"
+
+#: ../rules/base.xml.in.h:410
+msgid "Thailand"
+msgstr "Тајланд"
+
+#: ../rules/base.xml.in.h:411
+msgid "Third level choosers"
+msgstr "Избор трећег нивоа"
+
+#: ../rules/base.xml.in.h:412
+msgid "Tilde (~) variant"
+msgstr "Варијанта са тилдом (~)"
+
+#: ../rules/base.xml.in.h:413
+msgid "Tjk"
+msgstr "тџк"
+
+#: ../rules/base.xml.in.h:414
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:415
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access тастатура"
+
+#: ../rules/base.xml.in.h:416
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust класична бежична тастатура"
+
+#: ../rules/base.xml.in.h:417
+msgid "Tur"
+msgstr "тур"
+
+#: ../rules/base.xml.in.h:418
+msgid "Turkey"
+msgstr "Турска"
+
+#: ../rules/base.xml.in.h:419
+msgid "Typewriter"
+msgstr "„Куцаћа машина“"
+
+#: ../rules/base.xml.in.h:420
+msgid "U.S. English"
+msgstr "амерички енглески"
+
+#: ../rules/base.xml.in.h:421
+msgid "US keyboard with Bosnian digraphs"
+msgstr "Америчка тастатура са босанским диграфима"
+
+#: ../rules/base.xml.in.h:422
+msgid "US keyboard with Bosnian letters"
+msgstr "Америчка тастатура са босанским словима"
+
+#: ../rules/base.xml.in.h:423
+msgid "US keyboard with Croatian digraphs"
+msgstr "Америчка тастатура са хрватским диграфима"
+
+#: ../rules/base.xml.in.h:424
+msgid "US keyboard with Croatian letters"
+msgstr "Америчка тастатура са хрватским словима"
+
+#: ../rules/base.xml.in.h:425
+msgid "US keyboard with Lithuanian letters"
+msgstr "Америчка тастатура са литванским словима"
+
+#: ../rules/base.xml.in.h:426
+msgid "US keyboard with Maltian letters"
+msgstr "Америчка тастатура са малтешким словима"
+
+#: ../rules/base.xml.in.h:427
+msgid "US keyboard with Slovenian digraphs"
+msgstr "Америчка тастатура са словеначким диграфима"
+
+#: ../rules/base.xml.in.h:428
+msgid "US keyboard with Slovenian letters"
+msgstr "Америчка тастатура са словеначким словима"
+
+#: ../rules/base.xml.in.h:429
+msgid "USA"
+msgstr "САД"
+
+#: ../rules/base.xml.in.h:430
+msgid "Ukr"
+msgstr "укр"
+
+#: ../rules/base.xml.in.h:431
+msgid "Ukraine"
+msgstr "Украјина"
+
+#: ../rules/base.xml.in.h:432
+msgid "UnicodeExpert"
+msgstr "Стручна за Уникод"
+
+#: ../rules/base.xml.in.h:433
+msgid "United Kingdom"
+msgstr "Велика Британија"
+
+#: ../rules/base.xml.in.h:434
+msgid "Urdu"
+msgstr "Урду"
+
+#: ../rules/base.xml.in.h:435
+msgid "Use Bosnian digraphs"
+msgstr "Користи босанске диграфе"
+
+#: ../rules/base.xml.in.h:436
+msgid "Use Croatian digraphs"
+msgstr "Користи хрватске диграфе"
+
+#: ../rules/base.xml.in.h:437
+msgid "Use Slovenian digraphs"
+msgstr "Користи словеначке диграфе"
+
+#: ../rules/base.xml.in.h:438
+msgid "Use guillemots for quotes"
+msgstr "Користи гиљемоте за наводнике"
+
+#: ../rules/base.xml.in.h:439
+msgid "Use keyboard LED to show alternative group."
+msgstr "Користи лампицу тастатуре за приказ измене група."
+
+#: ../rules/base.xml.in.h:440
+msgid "Uzb"
+msgstr "узб"
+
+#: ../rules/base.xml.in.h:441
+msgid "Uzbekistan"
+msgstr "Узбекистан"
+
+#: ../rules/base.xml.in.h:442
+msgid "Vietnam"
+msgstr "Вијетнам"
+
+#: ../rules/base.xml.in.h:443
+msgid "Vnm"
+msgstr "вјт"
+
+#: ../rules/base.xml.in.h:444
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:445
+msgid "Winkeys"
+msgstr "Windows тастери"
+
+#: ../rules/base.xml.in.h:446
+msgid "With &lt;\\|&gt; key"
+msgstr "Уз тастер &lt;\\|&gt;"
+
+#: ../rules/base.xml.in.h:447
+msgid "With guillemots"
+msgstr "Са гиљемотима"
+
+#: ../rules/base.xml.in.h:448
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Интернет тастатура"
+
+#: ../rules/base.xml.in.h:449
+msgid "Z and ZHE swapped"
+msgstr "Размењено З и Ж"
+
+#: ../rules/base.xml.in.h:450
+msgid "Zar"
+msgstr "Зар"
+
+#: ../rules/base.xml.in.h:451
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:452
+msgid "azerty/digits"
+msgstr "azerty/цифре"
+
+#: ../rules/base.xml.in.h:453
+msgid "digits"
+msgstr "цифре"
+
+#: ../rules/base.xml.in.h:454
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:455
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:456
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, проширено са обрнутом косом цртом"
+
+#: ../rules/base.xml.in.h:457
+msgid "qwerty/digits"
+msgstr "qwerty/цифре"
+
+#: ../rules/base.xml.in.h:458
+msgid "qwertz"
+msgstr "qwertz"
+
+#: ../rules/base.xml.in.h:459
+msgid "si1452"
+msgstr "si1452"
+
+#~ msgid "Turkish"
+#~ msgstr "турски"
+
+#~ msgid "\"Standard\""
+#~ msgstr "„Стандардна“"
+
+# bug: Serbia and Montenegro
+#~ msgid "Serbia"
+#~ msgstr "Србија"
+
+#~ msgid "Srp"
+#~ msgstr "срп"
+
+#~ msgid "Tamil INSCRIPT"
+#~ msgstr "тамил инскрипт"
+
+#~ msgid "US keyboard with Romanian letters"
+#~ msgstr "Америчка тастатура са румунским словима"
+
+#~ msgid "A Tamil typewrite-style keymap; TAB encoding"
+#~ msgstr "Тамил распоред налик куцаћој машини; TAB кодирање"
+
+#~ msgid "A Tamil typewrite-style keymap; TSCII encoding"
+#~ msgstr "Тамил распоред налик куцаћој машини; TSCII кодирање"
+
+#~ msgid "A Tamil typewrite-style keymap; Unicode encoding"
+#~ msgstr "Тамил распоред налик куцаћој машини; Уникод кодирање"
+
+#~ msgid "Arb"
+#~ msgstr "арп"
+
+#~ msgid "Basic"
+#~ msgstr "Основно"
+
+#~ msgid "Ben"
+#~ msgstr "бнг"
+
+#~ msgid "Bosnian"
+#~ msgstr "бошњачки"
+
+#~ msgid "Burmese"
+#~ msgstr "бурмиски"
+
+#~ msgid "CloGaelach Laptop"
+#~ msgstr "CloGaelach за преносне рачунаре"
+
+#~ msgid "Czech (qwerty)"
+#~ msgstr "Чешки (qwerty)"
+
+#~ msgid "Danish"
+#~ msgstr "дански"
+
+#~ msgid "Dutch"
+#~ msgstr "холандски"
+
+#~ msgid "Dvo"
+#~ msgstr "дво"
+
+#~ msgid "Finnish"
+#~ msgstr "фински"
+
+#~ msgid "French Canadian"
+#~ msgstr "француски канадски"
+
+#~ msgid "Georgian (latin)"
+#~ msgstr "грузијски (латиница)"
+
+#~ msgid "Georgian (russian)"
+#~ msgstr "грузијски (руски)"
+
+#~ msgid "Grc"
+#~ msgstr "грк"
+
+#~ msgid "Guj"
+#~ msgstr "гуј"
+
+#~ msgid "Hin"
+#~ msgstr "инд"
+
+#~ msgid "Hindi"
+#~ msgstr "индијски"
+
+#~ msgid "Hungarian (qwerty)"
+#~ msgstr "Мађарски (qwerty)"
+
+#~ msgid "INSCRIPT layout"
+#~ msgstr "INSCRIPT распоред"
+
+#~ msgid "IS434 laptop"
+#~ msgstr "IS434 преносни"
+
+#~ msgid "Iku"
+#~ msgstr "ику"
+
+#~ msgid "Irish"
+#~ msgstr "ирски"
+
+#~ msgid "Italian"
+#~ msgstr "италијански"
+
+#~ msgid "Lithuanian azerty standard"
+#~ msgstr "литвански azerty распоред"
+
+#~ msgid "Lithuanian qwerty \"numeric\""
+#~ msgstr "литвански qwerty „бројевни“"
+
+#~ msgid "Maltese (US layout)"
+#~ msgstr "малтски (амерички распоред)"
+
+#~ msgid "Northern Saami (Finland)"
+#~ msgstr "северносаамски (Финска)"
+
+#~ msgid "Northern Saami (Sweden)"
+#~ msgstr "северносаамски (Шведска)"
+
+#~ msgid "Ogh"
+#~ msgstr "огм"
+
+#~ msgid "Ori"
+#~ msgstr "ори"
+
+#~ msgid "PC104"
+#~ msgstr "PC104"
+
+#~ msgid "Polish"
+#~ msgstr "пољски"
+
+#~ msgid "Polish (qwertz)"
+#~ msgstr "пољски (qwertz)"
+
+#~ msgid "Sapmi"
+#~ msgstr "Sapmi"
+
+#~ msgid "Scg"
+#~ msgstr "срп"
+
+#~ msgid "Slovak (qwerty)"
+#~ msgstr "словачки (qwerty)"
+
+#~ msgid "Sme"
+#~ msgstr "сме"
+
+#~ msgid "Sv"
+#~ msgstr "св"
+
+#~ msgid "Swedish"
+#~ msgstr "шведски"
+
+#~ msgid "Swiss French"
+#~ msgstr "швајцарски француски"
+
+#~ msgid "Tel"
+#~ msgstr "тел"
+
+#~ msgid "Thai (Kedmanee)"
+#~ msgstr "тајландски (Кедмани)"
+
+#~ msgid "Tml"
+#~ msgstr "тмл"
+
+#~ msgid "Turkish (F)"
+#~ msgstr "турски (F)"
+
+#~ msgid "Turkish Alt-Q Layout"
+#~ msgstr "турски Alt-Q распоред"
+
+#~ msgid "U.S. English w/ ISO9995-3"
+#~ msgstr "амерички енглески са ИСО9995-3"
+
+#~ msgid "U.S. English w/ dead keys"
+#~ msgstr "амерички енглески са акцентима"
+
+#~ msgid "US"
+#~ msgstr "САД"
+
+#~ msgid "Yug"
+#~ msgstr "сцг"
+
+#~ msgid "Yugoslavian"
+#~ msgstr "латинични српски"
+
+#~ msgid "abnt2"
+#~ msgstr "абнт2"
+
+#~ msgid "bksl"
+#~ msgstr "бксл"
+
+#~ msgid "laptop"
+#~ msgstr "преносни"
+
+#~ msgid "sefi"
+#~ msgstr "sefi"
+
+#~ msgid "uni/101/qwerty/comma"
+#~ msgstr "уни/101/qwerty/запета"
+
+#~ msgid "uni/101/qwerty/dot"
+#~ msgstr "уни/101/qwerty/тачка"
+
+#~ msgid "uni/101/qwertz/comma"
+#~ msgstr "уни/101/qwertz/запета"
+
+#~ msgid "uni/101/qwertz/dot"
+#~ msgstr "уни/101/qwertz/тачка"
+
+#~ msgid "uni/102/qwerty/comma"
+#~ msgstr "уни/102/qwerty/запета"
+
+#~ msgid "uni/102/qwerty/dot"
+#~ msgstr "уни/102/qwerty/тачка"
+
+#~ msgid "uni/102/qwertz/comma"
+#~ msgstr "уни/102/qwertz/запета"
+
+#~ msgid "uni/102/qwertz/dot"
+#~ msgstr "уни/102/qwertz/тачка"
diff --git a/xorg-server/xkeyboard-config/po/tr.po b/xorg-server/xkeyboard-config/po/tr.po
index 8f68328b8..122e1da0f 100644
--- a/xorg-server/xkeyboard-config/po/tr.po
+++ b/xorg-server/xkeyboard-config/po/tr.po
@@ -1,2595 +1,2595 @@
-# Turkish translations for xkeyboard-config.
-# Copyright (C) 2007 Free Software Foundation, Inc.
-#
-# Nilgün Belma Bugüner <nilgun@buguner.name.tr>, 2003, ..., 2007.
-msgid ""
-msgstr ""
-"Project-Id-Version: xkeyboard-config 1.0-pre1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-28 15:21+0100\n"
-"PO-Revision-Date: 2007-07-09 10:09+0300\n"
-"Last-Translator: Nilgün Belma Bugüner <nilgun@buguner.name.tr>\n"
-"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../rules/base.xml.in.h:1
-msgid "(F)"
-msgstr "F Klavye"
-
-#: ../rules/base.xml.in.h:2
-msgid "(Legacy) Alternative"
-msgstr "(Eski) Diğer"
-
-#: ../rules/base.xml.in.h:3
-msgid "(Legacy) Alternative, Sun dead keys"
-msgstr "(Eski) Diğer, Sun ölü tuşlar"
-
-#: ../rules/base.xml.in.h:4
-msgid "(Legacy) Alternative, eliminate dead keys"
-msgstr "(Eski) Diğer, ölü tuşsuz"
-
-#: ../rules/base.xml.in.h:5
-msgid "(Legacy) Dvorak"
-msgstr "(Kadim) Dvorak"
-
-#: ../rules/base.xml.in.h:6
-msgid "101/104 key Compatible"
-msgstr "101/104 tuş Uyumlu"
-
-#: ../rules/base.xml.in.h:7 ../rules/sun.xml.in.h:2
-msgid "101/qwerty/comma/Dead keys"
-msgstr "101/qwerty/virgül/Ölü tuşlar"
-
-#: ../rules/base.xml.in.h:8 ../rules/sun.xml.in.h:3
-msgid "101/qwerty/comma/Eliminate dead keys"
-msgstr "101/qwerty/virgül/Ölü tuşları normal yapar"
-
-#: ../rules/base.xml.in.h:9 ../rules/sun.xml.in.h:4
-msgid "101/qwerty/dot/Dead keys"
-msgstr "101/qwerty/nokta/Ölü tuşlar"
-
-#: ../rules/base.xml.in.h:10 ../rules/sun.xml.in.h:5
-msgid "101/qwerty/dot/Eliminate dead keys"
-msgstr "101/qwerty/nokta/Ölü tuşsuz"
-
-#: ../rules/base.xml.in.h:11 ../rules/sun.xml.in.h:6
-msgid "101/qwertz/comma/Dead keys"
-msgstr "101/qwertz/virgül/Ölü tuşlar"
-
-#: ../rules/base.xml.in.h:12
-msgid "101/qwertz/comma/Eliminate dead keys"
-msgstr "101/qwertz/virgül/Ölü tuşsuz"
-
-#: ../rules/base.xml.in.h:13 ../rules/sun.xml.in.h:7
-msgid "101/qwertz/dot/Dead keys"
-msgstr "101/qwertz/nokta/Ölü tuşlar"
-
-#: ../rules/base.xml.in.h:14 ../rules/sun.xml.in.h:8
-msgid "101/qwertz/dot/Eliminate dead keys"
-msgstr "101/qwertz/nokta/Ölü tuşsuz"
-
-#: ../rules/base.xml.in.h:15 ../rules/sun.xml.in.h:9
-msgid "102/qwerty/comma/Dead keys"
-msgstr "102/qwerty/virgül/Ölü tuşlar"
-
-#: ../rules/base.xml.in.h:16 ../rules/sun.xml.in.h:10
-msgid "102/qwerty/comma/Eliminate dead keys"
-msgstr "102/qwerty/virgül/Ölü tuşsuz"
-
-#: ../rules/base.xml.in.h:17 ../rules/sun.xml.in.h:11
-msgid "102/qwerty/dot/Dead keys"
-msgstr "102/qwerty/nokta/Ölü tuşlar"
-
-#: ../rules/base.xml.in.h:18 ../rules/sun.xml.in.h:12
-msgid "102/qwerty/dot/Eliminate dead keys"
-msgstr "102/qwerty/nokta/Ölü tuşsuz"
-
-#: ../rules/base.xml.in.h:19 ../rules/sun.xml.in.h:13
-msgid "102/qwertz/comma/Dead keys"
-msgstr "102/qwertz/virgül/Ölü tuşlar"
-
-#: ../rules/base.xml.in.h:20 ../rules/sun.xml.in.h:14
-msgid "102/qwertz/comma/Eliminate dead keys"
-msgstr "102/qwertz/virgül/Ölü tuşsuz"
-
-#: ../rules/base.xml.in.h:21 ../rules/sun.xml.in.h:15
-msgid "102/qwertz/dot/Dead keys"
-msgstr "102/qwertz/nokta/Ölü tuşlar"
-
-#: ../rules/base.xml.in.h:22 ../rules/sun.xml.in.h:16
-msgid "102/qwertz/dot/Eliminate dead keys"
-msgstr "102/qwertz/nokta/Ölü tuşsuz"
-
-#: ../rules/base.xml.in.h:23
-msgid "A4Tech KB-21"
-msgstr "A4Tech KB-21"
-
-#: ../rules/base.xml.in.h:24
-msgid "A4Tech KBS-8"
-msgstr "A4Tech KBS-8"
-
-#: ../rules/base.xml.in.h:25
-msgid "A4Tech Wireless Desktop RFKB-23"
-msgstr "A4Tech Wireless Desktop RFKB-23"
-
-#: ../rules/base.xml.in.h:26
-msgid "ACPI Standard"
-msgstr "ACPI Standardı"
-
-#: ../rules/base.xml.in.h:27
-msgid "AZERTY Tskapo"
-msgstr "AZERTY Tskapo"
-
-#: ../rules/base.xml.in.h:28
-msgid "Acer AirKey V"
-msgstr "Acer AirKey V"
-
-#: ../rules/base.xml.in.h:29
-msgid "Acer C300"
-msgstr "Acer C300"
-
-#: ../rules/base.xml.in.h:30
-msgid "Acer Ferrari 4000"
-msgstr "Acer Ferrari 4000"
-
-#: ../rules/base.xml.in.h:31
-msgid "Acer TravelMate 800"
-msgstr "Acer TravelMate 800"
-
-#: ../rules/base.xml.in.h:32
-msgid "Add the EuroSign to the 2 key."
-msgstr "2 tuşuna € sembolünü ekler"
-
-#: ../rules/base.xml.in.h:33
-msgid "Add the EuroSign to the 5 key."
-msgstr "5 tuşuna € sembolünü ekler"
-
-#: ../rules/base.xml.in.h:34
-msgid "Add the EuroSign to the E key."
-msgstr "E tuşuna € sembolünü ekler"
-
-#: ../rules/base.xml.in.h:35
-msgid "Add the standard behavior to Menu key."
-msgstr "Menü tuşuna standart işlevini ekler."
-
-#: ../rules/base.xml.in.h:36
-msgid "Adding the EuroSign to certain keys"
-msgstr "Belli tuşlara € sembolünün eklenmesi"
-
-#: ../rules/base.xml.in.h:37
-msgid "Advance Scorpius KI"
-msgstr "Advance Scorpius KI"
-
-#: ../rules/base.xml.in.h:38
-msgid "Afg"
-msgstr "Afg"
-
-#: ../rules/base.xml.in.h:39
-msgid "Afghanistan"
-msgstr "Afganistan"
-
-#: ../rules/base.xml.in.h:40
-msgid "Akan"
-msgstr "Akan"
-
-#: ../rules/base.xml.in.h:41
-msgid "Alb"
-msgstr "Arn"
-
-#: ../rules/base.xml.in.h:42
-msgid "Albania"
-msgstr "Arnavutluk"
-
-#: ../rules/base.xml.in.h:43
-msgid "Alt and Meta are on the Alt keys."
-msgstr "Alt ve Meta, Alt tuşlarındadır."
-
-#: ../rules/base.xml.in.h:44
-msgid "Alt is mapped to the right Win-key and Super to Menu."
-msgstr "Alt, sağdaki Pencere tuşu ile Süper ise Menü tuşu ile eşleştirilir."
-
-#: ../rules/base.xml.in.h:45
-msgid "Alt+CapsLock changes layout."
-msgstr "Alt+CapsLock yerleşimi değiştirir."
-
-#: ../rules/base.xml.in.h:46
-msgid "Alt+Ctrl change layout."
-msgstr "Alt+Ctrlyerleşimi değiştirir."
-
-#: ../rules/base.xml.in.h:47
-msgid "Alt+Shift change layout."
-msgstr "Alt+Shift yerleşimi değiştirir."
-
-#: ../rules/base.xml.in.h:48
-msgid "Alt-Q"
-msgstr "Yazılımcı klavyesi (Q)"
-
-#: ../rules/base.xml.in.h:49
-msgid "Alt/Win key behavior"
-msgstr "Alt/Pencere tuşu davranışı"
-
-#: ../rules/base.xml.in.h:50
-msgid "Alternative"
-msgstr "Diğer"
-
-#: ../rules/base.xml.in.h:51
-msgid "Alternative Eastern"
-msgstr "Diğer Doğu"
-
-#: ../rules/base.xml.in.h:52
-msgid "Alternative Phonetic"
-msgstr "Diğer Fonetik"
-
-#: ../rules/base.xml.in.h:53
-msgid "Alternative international (former us_intl)"
-msgstr "Uluslararası Q klavle (nam-ı diğer us_intl)"
-
-#: ../rules/base.xml.in.h:54
-msgid "Alternative, Sun dead keys"
-msgstr "Diğer, Sun ölü tuşlar"
-
-#: ../rules/base.xml.in.h:55
-msgid "Alternative, eliminate dead keys"
-msgstr "Diğer, ölü tuşsuz"
-
-#: ../rules/base.xml.in.h:56
-msgid "Alternative, latin-9 only"
-msgstr "Diğer, sadece latin-9"
-
-#: ../rules/base.xml.in.h:57
-msgid "And"
-msgstr "And"
-
-#: ../rules/base.xml.in.h:58
-msgid "Andorra"
-msgstr "Andora"
-
-#: ../rules/base.xml.in.h:59
-msgid "Apostrophe (') variant"
-msgstr "Tek tırnaklı (')"
-
-#: ../rules/base.xml.in.h:60
-msgid "Apple"
-msgstr "Apple"
-
-#: ../rules/base.xml.in.h:61
-msgid "Apple Laptop"
-msgstr "Apple Dizüstü"
-
-#: ../rules/base.xml.in.h:62
-msgid "Ara"
-msgstr "Ara"
-
-#: ../rules/base.xml.in.h:63
-msgid "Arabic"
-msgstr "Arapça"
-
-#: ../rules/base.xml.in.h:64
-msgid "Arm"
-msgstr "Erm"
-
-#: ../rules/base.xml.in.h:65
-msgid "Armenia"
-msgstr "Ermenistan"
-
-#: ../rules/base.xml.in.h:66
-msgid "Aze"
-msgstr "Aze"
-
-#: ../rules/base.xml.in.h:67
-msgid "Azerbaijan"
-msgstr "Azerbaycan"
-
-#: ../rules/base.xml.in.h:68
-msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr "Azona RF2300 wireless Internet Keyboard"
-
-#: ../rules/base.xml.in.h:69
-msgid "BTC 5090"
-msgstr "BTC 5090"
-
-#: ../rules/base.xml.in.h:70
-msgid "BTC 5113RF Multimedia"
-msgstr "BTC 5113RF Çokluortam"
-
-#: ../rules/base.xml.in.h:71
-msgid "BTC 5126T"
-msgstr "BTC 5126T"
-
-#: ../rules/base.xml.in.h:72
-msgid "BTC 9000"
-msgstr "BTC 9000"
-
-#: ../rules/base.xml.in.h:73
-msgid "BTC 9000A"
-msgstr "BTC 9000A"
-
-#: ../rules/base.xml.in.h:74
-msgid "BTC 9001AH"
-msgstr "BTC 9001AH"
-
-#: ../rules/base.xml.in.h:75
-msgid "BTC 9019U"
-msgstr "BTC 9019U"
-
-#: ../rules/base.xml.in.h:76
-msgid "Ban"
-msgstr "Ban"
-
-#: ../rules/base.xml.in.h:77
-msgid "Bangladesh"
-msgstr "Bangladeş"
-
-#: ../rules/base.xml.in.h:78 ../rules/sun.xml.in.h:22
-msgid "Bel"
-msgstr "Bel"
-
-#: ../rules/base.xml.in.h:79
-msgid "Belarus"
-msgstr "Belarus"
-
-#: ../rules/base.xml.in.h:80
-msgid "Belgium"
-msgstr "Belçika"
-
-#: ../rules/base.xml.in.h:81
-msgid "BenQ X-Touch 730"
-msgstr "BenQ X-Touch 730"
-
-#: ../rules/base.xml.in.h:82
-msgid "BenQ X-Touch 800"
-msgstr "BenQ X-Touch 800"
-
-#: ../rules/base.xml.in.h:83
-msgid "Bengali"
-msgstr "Bengalce"
-
-#: ../rules/base.xml.in.h:84
-msgid "Bengali Probhat"
-msgstr "Bengali Probhat"
-
-#: ../rules/base.xml.in.h:85
-msgid "Bepo, ergonomic, Dvorak way"
-msgstr "Bepo, ergonomik, Dvorak yolu"
-
-#: ../rules/base.xml.in.h:86
-msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
-msgstr "Bepo, ergonomik, Dvorak yolu, sadece latin-9"
-
-#: ../rules/base.xml.in.h:87 ../rules/sun.xml.in.h:24
-msgid "Bgr"
-msgstr "Bgr"
-
-#: ../rules/base.xml.in.h:88
-msgid "Bhu"
-msgstr "Bhu"
-
-#: ../rules/base.xml.in.h:89
-msgid "Bhutan"
-msgstr "Butan"
-
-#: ../rules/base.xml.in.h:90
-msgid "Biblical Hebrew (Tiro)"
-msgstr "Dini İbranice (Tiro)"
-
-#: ../rules/base.xml.in.h:91
-msgid "Bih"
-msgstr "Bih"
-
-#: ../rules/base.xml.in.h:92
-msgid "Blr"
-msgstr "Blr"
-
-#: ../rules/base.xml.in.h:93
-msgid "Bosnia and Herzegovina"
-msgstr "Bosna Hersek"
-
-#: ../rules/base.xml.in.h:94
-msgid "Both Alt keys together change layout."
-msgstr "Alt tuşları birlikte yerleşimi değiştirir."
-
-#: ../rules/base.xml.in.h:95
-msgid "Both Ctrl keys together change layout."
-msgstr "Ctrl tuşları birlikte yerleşimi değiştirir."
-
-#: ../rules/base.xml.in.h:96
-msgid "Both Shift keys together change layout."
-msgstr "Shift tuşları birlikte yerleşimi değiştirir."
-
-#: ../rules/base.xml.in.h:97
-msgid "Both Win-keys switch layout while pressed."
-msgstr "Pencere tuşları birlikte yerleşimi değiştirir."
-
-#: ../rules/base.xml.in.h:98
-msgid "Bra"
-msgstr "Bra"
-
-#: ../rules/base.xml.in.h:99
-msgid "Braille"
-msgstr "Üç noktalı"
-
-#: ../rules/base.xml.in.h:100
-msgid "Brazil"
-msgstr "Brezilya"
-
-#: ../rules/base.xml.in.h:101
-msgid "Brazilian ABNT2"
-msgstr "Brazilya dili ABNT2"
-
-#: ../rules/base.xml.in.h:102
-msgid "Brl"
-msgstr "Brl"
-
-#: ../rules/base.xml.in.h:103
-msgid "Brother Internet Keyboard"
-msgstr "Brother Genel Ağ Klavyesi"
-
-#: ../rules/base.xml.in.h:104
-msgid "Buckwalter"
-msgstr "Bükvalter"
-
-#: ../rules/base.xml.in.h:105
-msgid "Bulgaria"
-msgstr "Bulgaristan"
-
-#: ../rules/base.xml.in.h:106
-msgid "Cambodia"
-msgstr "Kamboçya"
-
-#: ../rules/base.xml.in.h:107 ../rules/sun.xml.in.h:29
-msgid "Can"
-msgstr "Kan"
-
-#: ../rules/base.xml.in.h:108
-msgid "Canada"
-msgstr "Kanada"
-
-#: ../rules/base.xml.in.h:109
-msgid "Caps Lock is Compose."
-msgstr "CapsLock tuşu karakter birleşimi yapar."
-
-#: ../rules/base.xml.in.h:110
-msgid "CapsLock LED shows alternative layout."
-msgstr "Caps Lock LED'i diğer yerleşimi gösterir."
-
-#: ../rules/base.xml.in.h:111
-msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
-msgstr "Caps Lock kilitlemeli Shift tuşu gibi çalışır. Shift tuşu ise Caps Lock tuşunu \"bekletir\"."
-
-#: ../rules/base.xml.in.h:112
-msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
-msgstr "Caps Lock kilitlemeli Shift tuşu gibi çalışır. Shift tuşu Caps Lock davranışını etkilemez."
-
-#: ../rules/base.xml.in.h:113
-msgid "CapsLock just locks the Shift modifier."
-msgstr "Caps Lock sadece kilitlemeli Shift tuşu gibi çalışır."
-
-#: ../rules/base.xml.in.h:114 ../rules/sun.xml.in.h:33
-msgid "CapsLock key behavior"
-msgstr "CapsLock tuşunun davranışı"
-
-#: ../rules/base.xml.in.h:115
-msgid "CapsLock key changes layout."
-msgstr "Caps Lock tuşu yerleşimi değiştirir"
-
-#: ../rules/base.xml.in.h:116
-msgid "CapsLock toggles Shift so all keys are affected."
-msgstr "Caps Lock tuşu Shift davranışını ters çevirir; bundan alfabetik olmayan tuşlar da etkilenir."
-
-#: ../rules/base.xml.in.h:117
-msgid "CapsLock toggles normal capitalization of alphabetic characters."
-msgstr "Caps Lock tuşu büyük/küçük harf geçişi yapar."
-
-#: ../rules/base.xml.in.h:118
-msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
-msgstr "CapsLock dahili dönüşümü kullanılır, Shift tuşu Caps Lock tuşunu \"bekletir\"."
-
-#: ../rules/base.xml.in.h:119
-msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
-msgstr "CapsLock dahili dönüşümü kullanır. Shift tuşu Caps Lock davranışını etkilemez."
-
-#: ../rules/base.xml.in.h:120
-msgid "Catalan variant with middle-dot L"
-msgstr "Ortası noktalı L'li Katalan yerleşimi"
-
-#: ../rules/base.xml.in.h:121
-msgid "Che"
-msgstr "Che"
-
-#: ../rules/base.xml.in.h:122
-msgid "Cherry Blue Line CyBo@rd"
-msgstr "Cherry Blue Line CyBo@rd"
-
-#: ../rules/base.xml.in.h:123
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr "Cherry Blue Line CyBo@rd (diğer seçenek)"
-
-#: ../rules/base.xml.in.h:124
-msgid "Cherry CyBo@rd USB-Hub"
-msgstr "Cherry CyBo@rd USB-Hub"
-
-#: ../rules/base.xml.in.h:125
-msgid "Cherry CyMotion Master Linux"
-msgstr "Cherry CyMotion Master Linux"
-
-#: ../rules/base.xml.in.h:126
-msgid "Cherry CyMotion Master XPress"
-msgstr "Cherry CyMotion Master XPress"
-
-#: ../rules/base.xml.in.h:127
-msgid "Chicony Internet Keyboard"
-msgstr "Chicony Genel Ağ Klavyesi"
-
-#: ../rules/base.xml.in.h:128
-msgid "Chicony KB-9885"
-msgstr "Chicony KB-9885"
-
-#: ../rules/base.xml.in.h:129
-msgid "Chuvash"
-msgstr "Çuvaş"
-
-#: ../rules/base.xml.in.h:130
-msgid "Chuvash Latin"
-msgstr "Çuvaş Latin"
-
-#: ../rules/base.xml.in.h:131
-msgid "Classic Dvorak"
-msgstr "Klasik Dvorak"
-
-#: ../rules/base.xml.in.h:132
-msgid "CloGaelach"
-msgstr "CloGaelach"
-
-#: ../rules/base.xml.in.h:133
-msgid "Compaq Easy Access Keyboard"
-msgstr "Compaq Kolay Erişim Klavyesi"
-
-#: ../rules/base.xml.in.h:134
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr "Compaq Genel Ağ Klavyesi (13 tuşlu)"
-
-#: ../rules/base.xml.in.h:135
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr "Compaq Genel Ağ Klavyesi (18 tuşlu)"
-
-#: ../rules/base.xml.in.h:136
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr "Genel Ağ Klavyesi (7 tuşlu)"
-
-#: ../rules/base.xml.in.h:137
-msgid "Compaq iPaq Keyboard"
-msgstr "Compaq iPaq Klavyesi"
-
-#: ../rules/base.xml.in.h:138
-msgid "Compose key position"
-msgstr "Karakter oluşturma (compose) tuşu konumu"
-
-#: ../rules/base.xml.in.h:139
-msgid "Congo, Democratic Republic of the"
-msgstr "Kongo Demokratik Cumhuriyeti"
-
-#: ../rules/base.xml.in.h:140
-msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
-msgstr "Ctrl, Win tuşlarına eşlenir."
-
-#: ../rules/base.xml.in.h:141
-msgid "Croatia"
-msgstr "Hırvatistan"
-
-#: ../rules/base.xml.in.h:142
-msgid "Ctrl key at bottom left"
-msgstr "Sol alttaki Ctrl tuşu"
-
-#: ../rules/base.xml.in.h:143
-msgid "Ctrl key at left of 'A'"
-msgstr "'A'nın solundaki Ctrl Tuşu"
-
-#: ../rules/base.xml.in.h:144
-msgid "Ctrl key position"
-msgstr "Ctrl tuşunun yeri"
-
-#: ../rules/base.xml.in.h:145
-msgid "Ctrl+Shift change layout."
-msgstr "Ctrl+Shift tuşları yerleşimi değiştirir."
-
-#: ../rules/base.xml.in.h:146
-msgid "Cyrillic"
-msgstr "Kril"
-
-#: ../rules/base.xml.in.h:147 ../rules/sun.xml.in.h:39
-msgid "Cze"
-msgstr "Çek"
-
-#: ../rules/base.xml.in.h:148
-msgid "Czechia"
-msgstr "Çek Cumhuriyeti"
-
-#: ../rules/base.xml.in.h:149
-msgid "DRC"
-msgstr "DRC"
-
-#: ../rules/base.xml.in.h:150
-msgid "DTK2000"
-msgstr "DTK2000"
-
-#: ../rules/base.xml.in.h:151 ../rules/sun.xml.in.h:42
-msgid "Dead acute"
-msgstr "Ölü acute (´)"
-
-#: ../rules/base.xml.in.h:152 ../rules/sun.xml.in.h:43
-msgid "Dead grave acute"
-msgstr "Ölü grave acute (`)"
-
-#: ../rules/base.xml.in.h:153
-msgid "Default numeric keypad keys."
-msgstr "Öntanımlı tuştakımı tuşları."
-
-#: ../rules/base.xml.in.h:154
-msgid "Dell"
-msgstr "Dell"
-
-#: ../rules/base.xml.in.h:155
-msgid "Dell 101-key PC"
-msgstr "Dell 101 tuşlu PC"
-
-#: ../rules/base.xml.in.h:156
-msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
-msgstr "Dizüstü/defter Dell Inspiron 6xxx/8xxx"
-
-#: ../rules/base.xml.in.h:157
-msgid "Dell Laptop/notebook Precision M series"
-msgstr "Dell Dizüstü/defter Precision M series"
-
-#: ../rules/base.xml.in.h:158
-msgid "Dell Latitude series laptop"
-msgstr "Dell Latitude serisi Dizüstü"
-
-#: ../rules/base.xml.in.h:159
-msgid "Dell SK-8125 USB Multimedia Keybard"
-msgstr "Dell SK-8125 USB Çokluortam Klavyesi"
-
-#: ../rules/base.xml.in.h:160
-msgid "Dell SK-8135 USB Multimedia Keybard"
-msgstr "Dell SK-8135 USB Çokluortam Klavyesi"
-
-#: ../rules/base.xml.in.h:161
-msgid "Dell USB Multimedia Keybard"
-msgstr "Dell USB Çokluortam Klavyesi"
-
-#: ../rules/base.xml.in.h:162
-msgid "Denmark"
-msgstr "Danimarka"
-
-#: ../rules/base.xml.in.h:163 ../rules/sun.xml.in.h:44
-msgid "Deu"
-msgstr "Alm"
-
-#: ../rules/base.xml.in.h:164
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr "Dexxa Kablosuz Masaüstü Klavyesi"
-
-#: ../rules/base.xml.in.h:165
-msgid "Diamond 9801 / 9802 series"
-msgstr "Diamond 9801 / 9802 serileri"
-
-#: ../rules/base.xml.in.h:166 ../rules/sun.xml.in.h:46
-msgid "Dnk"
-msgstr "Dnk"
-
-#: ../rules/base.xml.in.h:167 ../rules/sun.xml.in.h:48
-msgid "Dvorak"
-msgstr "Dvorak"
-
-#: ../rules/base.xml.in.h:168
-msgid "Dvorak, Polish quotes on key \"1/!\""
-msgstr "Dvorak, \"1/!\" tuşunda Lehçe tırnaklar"
-
-#: ../rules/base.xml.in.h:169
-msgid "Dvorak, Polish quotes on quotemark key"
-msgstr "Dvorak, çift tırnak tuşunda Lehçe tırnaklar"
-
-#: ../rules/base.xml.in.h:170
-msgid "Eastern"
-msgstr "Doğu"
-
-#: ../rules/base.xml.in.h:171 ../rules/sun.xml.in.h:49
-msgid "Eliminate dead keys"
-msgstr "Ölü tuşları normal yapar"
-
-#: ../rules/base.xml.in.h:172
-msgid "Ennyah DKB-1008"
-msgstr "Ennyah DKB-1008"
-
-#: ../rules/base.xml.in.h:173
-msgid "Epo"
-msgstr "Epo"
-
-#: ../rules/base.xml.in.h:174
-msgid "Ergonomic"
-msgstr "Ergonomik"
-
-#: ../rules/base.xml.in.h:175 ../rules/sun.xml.in.h:50
-msgid "Esp"
-msgstr "Esp"
-
-#: ../rules/base.xml.in.h:176
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../rules/base.xml.in.h:177
-msgid "Est"
-msgstr "Est"
-
-#: ../rules/base.xml.in.h:178
-msgid "Estonia"
-msgstr "Estonya"
-
-#: ../rules/base.xml.in.h:179
-msgid "Eth"
-msgstr "Ety"
-
-#: ../rules/base.xml.in.h:180
-msgid "Ethiopia"
-msgstr "Etyopya"
-
-#: ../rules/base.xml.in.h:181
-msgid "Evdev-managed keyboard"
-msgstr "Evdev yönetimli klavye"
-
-#: ../rules/base.xml.in.h:182
-msgid "Everex STEPnote"
-msgstr "Everex STEPnote"
-
-#: ../rules/base.xml.in.h:183
-msgid "Ewe"
-msgstr "Eve"
-
-#: ../rules/base.xml.in.h:184
-msgid "Extended"
-msgstr "Gelişmiş"
-
-#: ../rules/base.xml.in.h:185
-msgid "Extended Backslash"
-msgstr "Gelişmiş Gerisilme"
-
-#: ../rules/base.xml.in.h:186
-msgid "F-letter (F) variant"
-msgstr "F harfli (F) türü"
-
-#: ../rules/base.xml.in.h:187
-msgid "Fao"
-msgstr "Fao"
-
-#: ../rules/base.xml.in.h:188
-msgid "Faroe Islands"
-msgstr "Faroe Adaları"
-
-#: ../rules/base.xml.in.h:189 ../rules/sun.xml.in.h:51
-msgid "Fin"
-msgstr "Fin"
-
-#: ../rules/base.xml.in.h:190
-msgid "Finland"
-msgstr "Finlandiya"
-
-#: ../rules/base.xml.in.h:191
-msgid "Force standard legacy keypad"
-msgstr "Standart kadim tuştakımını etkin kılar"
-
-#: ../rules/base.xml.in.h:192 ../rules/sun.xml.in.h:53
-msgid "Fra"
-msgstr "Fra"
-
-#: ../rules/base.xml.in.h:193
-msgid "France"
-msgstr "Fransa"
-
-#: ../rules/base.xml.in.h:194 ../rules/sun.xml.in.h:55
-msgid "French"
-msgstr "Fransızca"
-
-#: ../rules/base.xml.in.h:195
-msgid "French (Macintosh)"
-msgstr "Fransız (Makintoş)"
-
-#: ../rules/base.xml.in.h:196 ../rules/sun.xml.in.h:56
-msgid "French (legacy)"
-msgstr "Fransızca (eski)"
-
-#: ../rules/base.xml.in.h:197
-msgid "French Dvorak"
-msgstr "Fransızca Dvorak"
-
-#: ../rules/base.xml.in.h:198
-msgid "French, Sun dead keys"
-msgstr "Fransızca, Sun ölü tuşlar"
-
-#: ../rules/base.xml.in.h:199
-msgid "French, eliminate dead keys"
-msgstr "Fransızca, ölü tuşsuz"
-
-#: ../rules/base.xml.in.h:200
-msgid "Fula"
-msgstr "Fula"
-
-#: ../rules/base.xml.in.h:201
-msgid "GBr"
-msgstr "GBr"
-
-#: ../rules/base.xml.in.h:202
-msgid "Ga"
-msgstr "Ga"
-
-#: ../rules/base.xml.in.h:203
-msgid "Generic 101-key PC"
-msgstr "Soysal 101 tuşlu PC"
-
-#: ../rules/base.xml.in.h:204
-msgid "Generic 102-key (Intl) PC"
-msgstr "Soysal 102 tuşlu (Uluslararası) PC"
-
-#: ../rules/base.xml.in.h:205
-msgid "Generic 104-key PC"
-msgstr "Soysal 104 tuşlu PC"
-
-#: ../rules/base.xml.in.h:206
-msgid "Generic 105-key (Intl) PC"
-msgstr "Soysal 105 tuşlu (uluslararası) PC"
-
-#: ../rules/base.xml.in.h:207
-msgid "Genius Comfy KB-12e"
-msgstr "Genius Comfy KB-12e"
-
-#: ../rules/base.xml.in.h:208
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-
-#: ../rules/base.xml.in.h:209
-msgid "Genius Comfy KB-21e-Scroll"
-msgstr "Genius Comfy KB-21e-Scroll"
-
-#: ../rules/base.xml.in.h:210
-msgid "Genius KB-19e NB"
-msgstr "Genius KB-19e NB"
-
-#: ../rules/base.xml.in.h:211
-msgid "Geo"
-msgstr "Geo"
-
-#: ../rules/base.xml.in.h:212
-msgid "Georgia"
-msgstr "Gürcistan"
-
-#: ../rules/base.xml.in.h:213
-msgid "German (Macintosh)"
-msgstr "Alman (Makintoş)"
-
-#: ../rules/base.xml.in.h:214
-msgid "German, Sun dead keys"
-msgstr "Almanca, Sun ölü tuşlar"
-
-#: ../rules/base.xml.in.h:215
-msgid "German, eliminate dead keys"
-msgstr "Almanca, ölü tuşsuz"
-
-#: ../rules/base.xml.in.h:216
-msgid "Germany"
-msgstr "Almanya"
-
-#: ../rules/base.xml.in.h:217
-msgid "Gha"
-msgstr "Gha"
-
-#: ../rules/base.xml.in.h:218
-msgid "Ghana"
-msgstr "Gana"
-
-#: ../rules/base.xml.in.h:219
-msgid "Gre"
-msgstr "Gre"
-
-#: ../rules/base.xml.in.h:220
-msgid "Greece"
-msgstr "Yunanistan"
-
-#: ../rules/base.xml.in.h:221
-msgid "Gujarati"
-msgstr "Batı Hint dili"
-
-#: ../rules/base.xml.in.h:222
-msgid "Gurmukhi"
-msgstr "Gurmukhi"
-
-#: ../rules/base.xml.in.h:223
-msgid "Gyration"
-msgstr "Çekimsel"
-
-#: ../rules/base.xml.in.h:224
-msgid "Hausa"
-msgstr "Havza"
-
-#: ../rules/base.xml.in.h:225
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr "Hewlett-Packard Genel Ağ Klavyesi"
-
-#: ../rules/base.xml.in.h:226
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr "Hewlett-Packard Omnibook 500 FA"
-
-#: ../rules/base.xml.in.h:227
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr "Hewlett-Packard Omnibook 5xx"
-
-#: ../rules/base.xml.in.h:228
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr "Hewlett-Packard Omnibook 6000/6100"
-
-#: ../rules/base.xml.in.h:229
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr "Hewlett-Packard Omnibook XE3 GC"
-
-#: ../rules/base.xml.in.h:230
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr "Hewlett-Packard Omnibook XE3 GF"
-
-#: ../rules/base.xml.in.h:231
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr "Hewlett-Packard Omnibook XT1000"
-
-#: ../rules/base.xml.in.h:232
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr "Hewlett-Packard Pavilion ZT11xx"
-
-#: ../rules/base.xml.in.h:233
-msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-2501 Çokluortam Klavyesi"
-
-#: ../rules/base.xml.in.h:234
-msgid "Hewlett-Packard SK-2505 Internet Keyboard"
-msgstr "Hewlett-Packard SK-2505 Genel Ağ Klavyesi"
-
-#: ../rules/base.xml.in.h:235
-msgid "Hindi Bolnagri"
-msgstr "Hindi Bolnagri"
-
-#: ../rules/base.xml.in.h:236
-msgid "Honeywell Euroboard"
-msgstr "Honeywell Euroboard"
-
-#: ../rules/base.xml.in.h:237
-msgid "Hrv"
-msgstr "Hrv"
-
-#: ../rules/base.xml.in.h:238 ../rules/sun.xml.in.h:59
-msgid "Hun"
-msgstr "Mcr"
-
-#: ../rules/base.xml.in.h:239
-msgid "Hungary"
-msgstr "Macaristan"
-
-#: ../rules/base.xml.in.h:240
-msgid "Hyper is mapped to the Win-keys."
-msgstr "Hyper, Pencere tuşlarına eşlenir."
-
-#: ../rules/base.xml.in.h:241
-msgid "IBM (LST 1205-92)"
-msgstr "IBM (LST 1205-92)"
-
-#: ../rules/base.xml.in.h:242
-msgid "IBM Rapid Access"
-msgstr "IBM Hızlı Erişim"
-
-#: ../rules/base.xml.in.h:243
-msgid "IBM Rapid Access II"
-msgstr "IBM Hızlı Erişim II"
-
-#: ../rules/base.xml.in.h:244
-msgid "IBM Rapid Access II (alternate option)"
-msgstr "IBM Hızlı Erişim II (diğer seçenek)"
-
-#: ../rules/base.xml.in.h:245
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
-
-#: ../rules/base.xml.in.h:246
-msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-
-#: ../rules/base.xml.in.h:247 ../rules/sun.xml.in.h:61
-msgid "ISO Alternate"
-msgstr "ISO diğer"
-
-#: ../rules/base.xml.in.h:248
-msgid "Iceland"
-msgstr "İzlanda"
-
-#: ../rules/base.xml.in.h:249
-msgid "Igbo"
-msgstr "Igbo"
-
-#: ../rules/base.xml.in.h:250
-msgid "Ind"
-msgstr "Ind"
-
-#: ../rules/base.xml.in.h:251
-msgid "India"
-msgstr "Hindistan"
-
-#: ../rules/base.xml.in.h:252 ../rules/sun.xml.in.h:62
-msgid "International (with dead keys)"
-msgstr "Uluslararası (ölü tuşlarla)"
-
-#: ../rules/base.xml.in.h:253
-msgid "Inuktitut"
-msgstr "Inuktitut"
-
-#: ../rules/base.xml.in.h:254
-msgid "Iran"
-msgstr "İran"
-
-#: ../rules/base.xml.in.h:255
-msgid "Iraq"
-msgstr "Irak"
-
-#: ../rules/base.xml.in.h:256
-msgid "Ireland"
-msgstr "İrlanda"
-
-#: ../rules/base.xml.in.h:257
-msgid "Irl"
-msgstr "İrl"
-
-#: ../rules/base.xml.in.h:258
-msgid "Irn"
-msgstr "Irn"
-
-#: ../rules/base.xml.in.h:259
-msgid "Irq"
-msgstr "Irk"
-
-#: ../rules/base.xml.in.h:260
-msgid "Isl"
-msgstr "Izl"
-
-#: ../rules/base.xml.in.h:261
-msgid "Isr"
-msgstr "İbr"
-
-#: ../rules/base.xml.in.h:262
-msgid "Israel"
-msgstr "İsrail"
-
-#: ../rules/base.xml.in.h:263 ../rules/sun.xml.in.h:63
-msgid "Ita"
-msgstr "İta"
-
-#: ../rules/base.xml.in.h:264
-msgid "Italy"
-msgstr "İtalya"
-
-#: ../rules/base.xml.in.h:265
-msgid "Japan"
-msgstr "Japonya"
-
-#: ../rules/base.xml.in.h:266
-msgid "Japan (PC-98xx Series)"
-msgstr "Japon (PC-98xx Series)"
-
-#: ../rules/base.xml.in.h:267
-msgid "Japanese 106-key"
-msgstr "Japonca 106 tuşlu"
-
-#: ../rules/base.xml.in.h:268
-msgid "Japanese keyboard options"
-msgstr "Japonca klavye seçenekleri"
-
-#: ../rules/base.xml.in.h:269 ../rules/sun.xml.in.h:66
-msgid "Jpn"
-msgstr "Jpn"
-
-#: ../rules/base.xml.in.h:270
-msgid "Kana"
-msgstr "Kana"
-
-#: ../rules/base.xml.in.h:271
-msgid "Kana Lock key is locking"
-msgstr "Kana Lock tuşu kilitler"
-
-#: ../rules/base.xml.in.h:272
-msgid "Kannada"
-msgstr "Güney Hint dili"
-
-#: ../rules/base.xml.in.h:273
-msgid "Kashubian"
-msgstr "Kaşubyalı"
-
-#: ../rules/base.xml.in.h:274
-msgid "Kaz"
-msgstr "Kaz"
-
-#: ../rules/base.xml.in.h:275
-msgid "Kazakh with Russian"
-msgstr "Kazak (rus)"
-
-#: ../rules/base.xml.in.h:276
-msgid "Kazakhstan"
-msgstr "Kazakistan"
-
-#: ../rules/base.xml.in.h:277
-msgid "Keypad"
-msgstr "Tuştakımı"
-
-#: ../rules/base.xml.in.h:278
-msgid "Keytronic FlexPro"
-msgstr "Keytronic FlexPro"
-
-#: ../rules/base.xml.in.h:279
-msgid "Khm"
-msgstr "Kım"
-
-#: ../rules/base.xml.in.h:280
-msgid "Kor"
-msgstr "Kor"
-
-#: ../rules/base.xml.in.h:281
-msgid "Korea, Republic of"
-msgstr "Kore Cumhuriyeti"
-
-#: ../rules/base.xml.in.h:282
-msgid "Korean 106-key"
-msgstr "Korece 106 tuşlu"
-
-#: ../rules/base.xml.in.h:283
-msgid "Kotoistus"
-msgstr "Kotüstus"
-
-#: ../rules/base.xml.in.h:284
-msgid "Kurdish, (F)"
-msgstr "Kürtçe (Türkçe F klavye)"
-
-#: ../rules/base.xml.in.h:285
-msgid "Kurdish, Arabic-Latin"
-msgstr "Kürtçe (Arapça-Latin)"
-
-#: ../rules/base.xml.in.h:286
-msgid "Kurdish, Latin Alt-Q"
-msgstr "Kürtçe (Türkçe Alt-Q klavye)"
-
-#: ../rules/base.xml.in.h:287
-msgid "Kurdish, Latin Q"
-msgstr "Kürtçe (Türkçe Q klavye)"
-
-#: ../rules/base.xml.in.h:288
-msgid "Kyr"
-msgstr "Kır"
-
-#: ../rules/base.xml.in.h:289
-msgid "Kyrgyzstan"
-msgstr "Kırgızistan"
-
-#: ../rules/base.xml.in.h:290
-msgid "LAm"
-msgstr "LAm"
-
-#: ../rules/base.xml.in.h:291
-msgid "LCtrl+LShift change layout."
-msgstr "Ctrl+Shift tuşları yerleşimi değiştirir."
-
-#: ../rules/base.xml.in.h:292
-msgid "Lao"
-msgstr "Lao"
-
-#: ../rules/base.xml.in.h:293
-msgid "Laos"
-msgstr "Laos"
-
-#: ../rules/base.xml.in.h:294
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr "Dizüstü/defter Compaq (örn. Armada) Dizüstü Klavyesi"
-
-#: ../rules/base.xml.in.h:295
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr "Dizüstü/defter Compaq (örn. Presario) Genel Ağ Klavyesi"
-
-#: ../rules/base.xml.in.h:296
-msgid "Laptop/notebook eMachines m68xx"
-msgstr "Dizüstü/defter eMachines m68xx"
-
-#: ../rules/base.xml.in.h:297
-msgid "Latin"
-msgstr "Latin"
-
-#: ../rules/base.xml.in.h:298
-msgid "Latin American"
-msgstr "Latin Amerikanca"
-
-#: ../rules/base.xml.in.h:299
-msgid "Latin Unicode"
-msgstr "Latin Unicode"
-
-#: ../rules/base.xml.in.h:300
-msgid "Latin Unicode qwerty"
-msgstr "Latin Unicode qwerty"
-
-#: ../rules/base.xml.in.h:301
-msgid "Latin qwerty"
-msgstr "Latin qwerty"
-
-#: ../rules/base.xml.in.h:302
-msgid "Latin with guillemets"
-msgstr "Açılı ayraçlarla Latin"
-
-#: ../rules/base.xml.in.h:303
-msgid "Latvia"
-msgstr "Letonya"
-
-#: ../rules/base.xml.in.h:304
-msgid "Layout switching"
-msgstr "Yerleşim değiştirme "
-
-#: ../rules/base.xml.in.h:305
-msgid "Left Alt is swapped with left Win-key."
-msgstr "Soydaki Alt tuşu ile soldaki Pencere tuşu yerdeğiştirir."
-
-#: ../rules/base.xml.in.h:306
-msgid "Left Alt key changes layout."
-msgstr "Soldaki Alt tuşu yerleşimi değiştirir."
-
-#: ../rules/base.xml.in.h:307
-msgid "Left Alt key switches layout while pressed."
-msgstr "Soldaki Alt tuşu basılıyken diğer yerleşimi etkin olur."
-
-#: ../rules/base.xml.in.h:308
-msgid "Left Ctrl key changes layout."
-msgstr "Soldaki Ctrl tuşu yerleşimi değiştirir."
-
-#: ../rules/base.xml.in.h:309
-msgid "Left Shift key changes layout."
-msgstr "Soldaki Shift tuşu yerleşimi değiştirir."
-
-#: ../rules/base.xml.in.h:310
-msgid "Left Win-key changes layout."
-msgstr "Soldaki Pencere tuşu yerleşimi değiştirir."
-
-#: ../rules/base.xml.in.h:311
-msgid "Left Win-key is Compose."
-msgstr "Soldaki Pencere tuşu karakter birleşimi yapar."
-
-#: ../rules/base.xml.in.h:312
-msgid "Left Win-key switches layout while pressed."
-msgstr "Soldaki Win tuşu basılıyken diğer yerleşim etkin olur."
-
-#: ../rules/base.xml.in.h:313
-msgid "Left hand"
-msgstr "Solak"
-
-#: ../rules/base.xml.in.h:314
-msgid "Left handed Dvorak"
-msgstr "Solak Dvorak"
-
-#: ../rules/base.xml.in.h:315
-msgid "Lithuania"
-msgstr "Litvanya"
-
-#: ../rules/base.xml.in.h:316
-msgid "Logitech Access Keyboard"
-msgstr "Logitech Access Keyboard"
-
-#: ../rules/base.xml.in.h:317
-msgid "Logitech Cordless Desktop"
-msgstr "Logitech Kablosuz Masaüstü"
-
-#: ../rules/base.xml.in.h:318
-msgid "Logitech Cordless Desktop LX-300"
-msgstr "Logitech Kablosuz Masaüstü LX-300"
-
-#: ../rules/base.xml.in.h:319
-msgid "Logitech Cordless Desktop Navigator"
-msgstr "Logitech Kablosuz Masaüstü Tarayıcı"
-
-#: ../rules/base.xml.in.h:320
-msgid "Logitech Cordless Desktop Optical"
-msgstr "Logitech Kablosuz Masaüstü Optik"
-
-#: ../rules/base.xml.in.h:321
-msgid "Logitech Cordless Desktop Pro"
-msgstr "Logitech Kablosuz Masaüstü Pro"
-
-#: ../rules/base.xml.in.h:322
-msgid "Logitech Cordless Desktop Pro (alternate option)"
-msgstr "Logitech Kablosuz Masaüstü Pro (diğer seçenek)"
-
-#: ../rules/base.xml.in.h:323
-msgid "Logitech Cordless Desktop Pro (alternate option2)"
-msgstr "Logitech Kablosuz Masaüstü Pro (diğer 2. seçenek)"
-
-#: ../rules/base.xml.in.h:324
-msgid "Logitech Cordless Desktop iTouch"
-msgstr "Logitech Kablosuz Masaüstü iTouch"
-
-#: ../rules/base.xml.in.h:325
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr "Logitech Kablosuz Özgür/Masaüstü Tarayıcı"
-
-#: ../rules/base.xml.in.h:326
-msgid "Logitech G15 extra keys via G15daemon"
-msgstr "Logitech G15, G15daemon üzerinden ek tuşlu"
-
-#: ../rules/base.xml.in.h:327
-msgid "Logitech Internet Keyboard"
-msgstr "Logitech Genel Ağ Klavyesi"
-
-#: ../rules/base.xml.in.h:328
-msgid "Logitech Internet Navigator Keyboard"
-msgstr "Logitech Genel Ağ Tarayıcı Klavyesi"
-
-#: ../rules/base.xml.in.h:329
-msgid "Logitech Ultra-X Keyboard"
-msgstr "Logitech Ultra-X Keyboard"
-
-#: ../rules/base.xml.in.h:330
-msgid "Logitech diNovo Keyboard"
-msgstr "Logitech Access Klavye"
-
-#: ../rules/base.xml.in.h:331
-msgid "Logitech iTouch"
-msgstr "Logitech iTouch"
-
-#: ../rules/base.xml.in.h:332
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "Logitech iTouch Kablosuz Klavyesi (model Y-RB6)"
-
-#: ../rules/base.xml.in.h:333
-msgid "Logitech iTouch Internet Navigator Keyboard SE"
-msgstr "Logitech iTouch Genel Ağ Tarayıcı Klavyesi SE"
-
-#: ../rules/base.xml.in.h:334
-msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-msgstr "Logitech iTouch Genel Ağ Tarayıcı Klavyesi SE (USB)"
-
-#: ../rules/base.xml.in.h:335
-msgid "Ltu"
-msgstr "Ltu"
-
-#: ../rules/base.xml.in.h:336
-msgid "Lva"
-msgstr "Lva"
-
-#: ../rules/base.xml.in.h:337
-msgid "MESS"
-msgstr "MESS"
-
-#: ../rules/base.xml.in.h:338
-msgid "MacBook/MacBook Pro"
-msgstr "MacBook/MacBook Pro"
-
-#: ../rules/base.xml.in.h:339
-msgid "MacBook/MacBook Pro (Intl)"
-msgstr "MacBook/MacBook Pro (Uluslararası)"
-
-#: ../rules/base.xml.in.h:340
-msgid "Macedonia"
-msgstr "Makedonya"
-
-#: ../rules/base.xml.in.h:341
-msgid "Macintosh"
-msgstr "Macintosh"
-
-#: ../rules/base.xml.in.h:342
-msgid "Macintosh Old"
-msgstr "Eski Macintosh"
-
-#: ../rules/base.xml.in.h:343
-msgid "Macintosh, Sun dead keys"
-msgstr "Makintoş, Sun ölü tuşlar"
-
-#: ../rules/base.xml.in.h:344
-msgid "Macintosh, eliminate dead keys"
-msgstr "Makintoş, ölü tuşsuz"
-
-#: ../rules/base.xml.in.h:345
-msgid "Make CapsLock an additional Ctrl."
-msgstr "CapsLock tuşunu ek bir Ctrl tuşu yapar."
-
-#: ../rules/base.xml.in.h:346
-msgid "Mal"
-msgstr "Mal"
-
-#: ../rules/base.xml.in.h:347
-msgid "Malayalam"
-msgstr "Malayalam dili"
-
-#: ../rules/base.xml.in.h:348
-msgid "Maldives"
-msgstr "Maldivler"
-
-#: ../rules/base.xml.in.h:349
-msgid "Malta"
-msgstr "Malta"
-
-#: ../rules/base.xml.in.h:350
-msgid "Maltese keyboard with US layout"
-msgstr "Ameriken yerleşimli Maltız klavyesi"
-
-#: ../rules/base.xml.in.h:351
-msgid "Mao"
-msgstr "Mao"
-
-#: ../rules/base.xml.in.h:352
-msgid "Maori"
-msgstr "Mayorka"
-
-#: ../rules/base.xml.in.h:353
-msgid "Memorex MX1998"
-msgstr "Memorex MX1998"
-
-#: ../rules/base.xml.in.h:354
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr "Memorex MX2500 EZ Erişim Klavyesi"
-
-#: ../rules/base.xml.in.h:355
-msgid "Memorex MX2750"
-msgstr "Memorex MX2750"
-
-#: ../rules/base.xml.in.h:356
-msgid "Menu is Compose."
-msgstr "Menü tuşu karakter birleşimi yapar."
-
-#: ../rules/base.xml.in.h:357
-msgid "Menu key changes layout."
-msgstr "Menü tuşu yerleşimi değiştirir."
-
-#: ../rules/base.xml.in.h:358
-msgid "Meta is mapped to the Win-keys."
-msgstr "Meta, Win tuşları ile eşleştirilir."
-
-#: ../rules/base.xml.in.h:359
-msgid "Meta is mapped to the left Win-key."
-msgstr "Meta, soldaki Win tuşu ile eşleştirilir."
-
-#: ../rules/base.xml.in.h:360
-msgid "Microsoft Internet Keyboard"
-msgstr "Microsoft Genel Ağ Klavyesi"
-
-#: ../rules/base.xml.in.h:361
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "Microsoft Genel Ağ Klavyesi Pro, İsveçce"
-
-#: ../rules/base.xml.in.h:362
-msgid "Microsoft Natural"
-msgstr "Microsoft Basit"
-
-#: ../rules/base.xml.in.h:363
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Basit Klavye Pro / Microsoft Genel Ağ Klavyesi Pro"
-
-#: ../rules/base.xml.in.h:364
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr "Microsoft Basit Klavye Pro OEM"
-
-#: ../rules/base.xml.in.h:365
-msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-
-#: ../rules/base.xml.in.h:366
-msgid "Microsoft Office Keyboard"
-msgstr "Microsoft Ofis Klavyesi"
-
-#: ../rules/base.xml.in.h:367
-msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
-msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
-
-#: ../rules/base.xml.in.h:368 ../rules/sun.xml.in.h:72
-msgid "Miscellaneous compatibility options"
-msgstr "Çeşitli uyumluluk seçenekleri"
-
-#: ../rules/base.xml.in.h:369
-msgid "Mkd"
-msgstr "Mkd"
-
-#: ../rules/base.xml.in.h:370
-msgid "Mlt"
-msgstr "Mlt"
-
-#: ../rules/base.xml.in.h:371
-msgid "Mmr"
-msgstr "Mmr"
-
-#: ../rules/base.xml.in.h:372
-msgid "Mng"
-msgstr "Moğ"
-
-#: ../rules/base.xml.in.h:373
-msgid "Mongolia"
-msgstr "Moğolistan"
-
-#: ../rules/base.xml.in.h:374
-msgid "Morocco"
-msgstr "Fas"
-
-#: ../rules/base.xml.in.h:375 ../rules/sun.xml.in.h:73
-msgid "Multilingual"
-msgstr "Çokdilli"
-
-#: ../rules/base.xml.in.h:376
-msgid "Multilingual, first part"
-msgstr "Çokdilli, ilk bölüm"
-
-#: ../rules/base.xml.in.h:377 ../rules/sun.xml.in.h:74
-msgid "Multilingual, second part"
-msgstr "Çokdilli, ikinci bölüm"
-
-#: ../rules/base.xml.in.h:378
-msgid "Myanmar"
-msgstr "Miyanmar"
-
-#: ../rules/base.xml.in.h:379
-msgid "NICOLA-F style Backspace"
-msgstr "NICOLA-F tarzı Gerisilme"
-
-#: ../rules/base.xml.in.h:380
-msgid "Neostyle"
-msgstr "Yenitarz"
-
-#: ../rules/base.xml.in.h:381
-msgid "Nep"
-msgstr "Nep"
-
-#: ../rules/base.xml.in.h:382
-msgid "Nepal"
-msgstr "Nepal"
-
-#: ../rules/base.xml.in.h:383
-msgid "Netherlands"
-msgstr "Hollanda"
-
-#: ../rules/base.xml.in.h:384
-msgid "Nig"
-msgstr "Nij"
-
-#: ../rules/base.xml.in.h:385
-msgid "Nigeria"
-msgstr "Nijerya"
-
-#: ../rules/base.xml.in.h:386
-msgid "Nld"
-msgstr "Hol"
-
-#: ../rules/base.xml.in.h:387 ../rules/sun.xml.in.h:75
-msgid "Nor"
-msgstr "Nor"
-
-#: ../rules/base.xml.in.h:388
-msgid "Northern Saami"
-msgstr "Kuzey Sami"
-
-#: ../rules/base.xml.in.h:389
-msgid "Northern Saami, eliminate dead keys"
-msgstr "Kuzey Sami, ölü tuşsuz"
-
-#: ../rules/base.xml.in.h:390
-msgid "Northgate OmniKey 101"
-msgstr "Northgate OmniKey 101"
-
-#: ../rules/base.xml.in.h:391
-msgid "Norway"
-msgstr "Norveç"
-
-#: ../rules/base.xml.in.h:392
-msgid "NumLock LED shows alternative layout."
-msgstr "Num_Lock LED'i diğer yerleşimi gösterir."
-
-#: ../rules/base.xml.in.h:393
-msgid "Numeric keypad keys work as with Mac."
-msgstr "Tuştakımı Mac gibi çalışır."
-
-#: ../rules/base.xml.in.h:394
-msgid "Numeric keypad layout selection"
-msgstr "Sayısal tuştakımı yerleşimi seçimi"
-
-#: ../rules/base.xml.in.h:395
-msgid "OADG 109A"
-msgstr "OADG 109A"
-
-#: ../rules/base.xml.in.h:396
-msgid "Ogham"
-msgstr "Ogham"
-
-#: ../rules/base.xml.in.h:397
-msgid "Ogham IS434"
-msgstr "Ogham IS434"
-
-#: ../rules/base.xml.in.h:398
-msgid "Oriya"
-msgstr "Orissa dili"
-
-#: ../rules/base.xml.in.h:399
-msgid "Ortek MCK-800 MM/Internet keyboard"
-msgstr "Oretec MCK-800 MM/Genel Ağ Klavyesi"
-
-#: ../rules/base.xml.in.h:400
-msgid "Ossetian"
-msgstr "Osetya"
-
-#: ../rules/base.xml.in.h:401
-msgid "Ossetian, Winkeys"
-msgstr "Osetya, Pencere tuşları"
-
-#: ../rules/base.xml.in.h:402
-msgid "PC-98xx Series"
-msgstr "PC-98xx Serisi"
-
-#: ../rules/base.xml.in.h:403
-msgid "Pak"
-msgstr "Pak"
-
-#: ../rules/base.xml.in.h:404
-msgid "Pakistan"
-msgstr "Pakistan"
-
-#: ../rules/base.xml.in.h:405
-msgid "Pashto"
-msgstr "Paşto"
-
-#: ../rules/base.xml.in.h:406
-msgid "Pattachote"
-msgstr "Pataküte"
-
-#: ../rules/base.xml.in.h:407 ../rules/sun.xml.in.h:78
-msgid "Phonetic"
-msgstr "Fonetik"
-
-#: ../rules/base.xml.in.h:408 ../rules/sun.xml.in.h:79
-msgid "Pol"
-msgstr "Pol"
-
-#: ../rules/base.xml.in.h:409
-msgid "Poland"
-msgstr "Polonya"
-
-#: ../rules/base.xml.in.h:410
-msgid "Polytonic"
-msgstr "Politonik"
-
-#: ../rules/base.xml.in.h:411
-msgid "Portugal"
-msgstr "Portekiz"
-
-#: ../rules/base.xml.in.h:412
-msgid "Press Left Alt key to choose 3rd level."
-msgstr "3. seviyeyi seçmek için soldaki Alt tuşuna basın."
-
-#: ../rules/base.xml.in.h:413
-msgid "Press Left Win-key to choose 3rd level."
-msgstr "3. seviyeyi seçmek için soldaki Win tuşuna basın."
-
-#: ../rules/base.xml.in.h:414
-msgid "Press Menu key to choose 3rd level."
-msgstr "3. seviyeyi seçmek için Menü tuşuna basın."
-
-#: ../rules/base.xml.in.h:415
-msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
-msgstr "3. seviyeyi seçmek için sağdaki Alt tuşuna basın, Sağdaki Alt tuşuyla birlikte Shift tuşu AltGr gibi davranır."
-
-#: ../rules/base.xml.in.h:416
-msgid "Press Right Alt key to choose 3rd level."
-msgstr "3. seviyeyi seçmek için sağdaki Alt tuşuna basın."
-
-#: ../rules/base.xml.in.h:417
-msgid "Press Right Ctrl to choose 3rd level."
-msgstr "3. seviyeyi seçmek için sağdaki Ctrl tuşuna basın."
-
-#: ../rules/base.xml.in.h:418
-msgid "Press Right Win-key to choose 3rd level."
-msgstr "3. seviyeyi seçmek için sağdaki Win tuşuna basın."
-
-#: ../rules/base.xml.in.h:419
-msgid "Press any of Alt keys to choose 3rd level."
-msgstr "3. seviyeyi seçmek için Alt tuşlarından birine basın."
-
-#: ../rules/base.xml.in.h:420
-msgid "Press any of Win-keys to choose 3rd level."
-msgstr "3. seviyeyi seçmek için Win tuşlarından birine basın."
-
-#: ../rules/base.xml.in.h:421
-msgid "Pro"
-msgstr "Pro"
-
-#: ../rules/base.xml.in.h:422
-msgid "Pro Keypad"
-msgstr "Pro Klavye"
-
-#: ../rules/base.xml.in.h:423
-msgid "Probhat"
-msgstr "Probat"
-
-#: ../rules/base.xml.in.h:424
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "Propeller Voyager (KTEZ-1000)"
-
-#: ../rules/base.xml.in.h:425 ../rules/sun.xml.in.h:88
-msgid "Prt"
-msgstr "Prt"
-
-#: ../rules/base.xml.in.h:426
-msgid "QTronix Scorpius 98N+"
-msgstr "QTronix Scorpius 98N+"
-
-#: ../rules/base.xml.in.h:427
-msgid "R-Alt switches layout while pressed."
-msgstr "Sağdaki Alt tuşu basılıyken diğer yerleşim etkin olur."
-
-#: ../rules/base.xml.in.h:428
-msgid "Right Alt is Compose."
-msgstr "Sağdaki Alt tuşu karakter birleşimi yapar."
-
-#: ../rules/base.xml.in.h:429
-msgid "Right Alt key changes layout."
-msgstr "Sağdaki Alt tuşu yerleşimi değiştirir."
-
-#: ../rules/base.xml.in.h:430 ../rules/sun.xml.in.h:90
-msgid "Right Alt key never chooses 3rd level."
-msgstr "Sağdaki Alt tuşu 3. seviyeyi asla seçmez."
-
-#: ../rules/base.xml.in.h:431
-msgid "Right Ctrl is Compose."
-msgstr "Sağdaki Ctrl tuşu karakter birleşimi yapar."
-
-#: ../rules/base.xml.in.h:432
-msgid "Right Ctrl key changes layout."
-msgstr "Sağdaki Ctrl tuşu yerleşimi değiştirir."
-
-#: ../rules/base.xml.in.h:433
-msgid "Right Ctrl key switches layout while pressed."
-msgstr "Sağdaki Ctrl tuşu basılıyken diğer yerleşim etkin olur."
-
-#: ../rules/base.xml.in.h:434
-msgid "Right Ctrl key works as Right Alt."
-msgstr "Sağdaki Ctrl tuşu sağdaki Alt tuşu gibi çalışır."
-
-#: ../rules/base.xml.in.h:435
-msgid "Right Shift key changes layout."
-msgstr "Sağdaki Shift tuşu yerleşimi değiştirir."
-
-#: ../rules/base.xml.in.h:436
-msgid "Right Win-key changes layout."
-msgstr "Sağdaki Win tuşu yerleşimi değiştirir."
-
-#: ../rules/base.xml.in.h:437
-msgid "Right Win-key is Compose."
-msgstr "Sağdaki Win tuşu karakter birleşimi yapar."
-
-#: ../rules/base.xml.in.h:438
-msgid "Right Win-key switches layout while pressed."
-msgstr "Sağdaki Win tuşu basılıyken diğer yerleşim etkin olur."
-
-#: ../rules/base.xml.in.h:439
-msgid "Right hand"
-msgstr "Sağ el"
-
-#: ../rules/base.xml.in.h:440
-msgid "Right handed Dvorak"
-msgstr "Sağ elle Dvorak"
-
-#: ../rules/base.xml.in.h:441
-msgid "Romania"
-msgstr "Romenya"
-
-#: ../rules/base.xml.in.h:442
-msgid "Romanian keyboard with German letters"
-msgstr "Alman harfleriyle Romanya klavyesi"
-
-#: ../rules/base.xml.in.h:443
-msgid "Romanian keyboard with German letters, eliminate dead keys"
-msgstr "Alman harfleriyle Romanya klavyesi, ölü tuşsuz"
-
-#: ../rules/base.xml.in.h:444
-msgid "Rou"
-msgstr "Rou"
-
-#: ../rules/base.xml.in.h:445 ../rules/sun.xml.in.h:95
-msgid "Rus"
-msgstr "Rus"
-
-#: ../rules/base.xml.in.h:446
-msgid "Russia"
-msgstr "Rusya"
-
-#: ../rules/base.xml.in.h:447 ../rules/sun.xml.in.h:96
-msgid "Russian"
-msgstr "Rusça"
-
-#: ../rules/base.xml.in.h:448
-msgid "Russian phonetic"
-msgstr "Rusça fonetik"
-
-#: ../rules/base.xml.in.h:449
-msgid "Russian phonetic, eliminate dead keys"
-msgstr "Rusça fonetik, ölü tuşsuz"
-
-#: ../rules/base.xml.in.h:450
-msgid "Russian with Kazakh"
-msgstr "Rusça (kazak)"
-
-#: ../rules/base.xml.in.h:451
-msgid "SCG"
-msgstr "SCG"
-
-#: ../rules/base.xml.in.h:452
-msgid "SILVERCREST Multimedia Wireless Keyboard"
-msgstr "SILVERCREST Çokluortam Kablosuz Klavyesi"
-
-#: ../rules/base.xml.in.h:453
-msgid "SK-1300"
-msgstr "SK-1300"
-
-#: ../rules/base.xml.in.h:454
-msgid "SK-2500"
-msgstr "SK-2500"
-
-#: ../rules/base.xml.in.h:455
-msgid "SK-6200"
-msgstr "SK-6200"
-
-#: ../rules/base.xml.in.h:456
-msgid "SK-7100"
-msgstr "SK-7100"
-
-#: ../rules/base.xml.in.h:457
-msgid "SVEN Ergonomic 2500"
-msgstr "SVEN Ergonomik 2500"
-
-#: ../rules/base.xml.in.h:458
-msgid "Samsung SDM 4500P"
-msgstr "Samsung SDM 4500P"
-
-#: ../rules/base.xml.in.h:459
-msgid "Samsung SDM 4510P"
-msgstr "Samsung SDM 4510P"
-
-#: ../rules/base.xml.in.h:460
-msgid "ScrollLock LED shows alternative layout."
-msgstr "Scroll_Lock LED'i diğer yerleşimi gösterir."
-
-#: ../rules/base.xml.in.h:461
-msgid "Serbia and Montenegro"
-msgstr "Sırbistan ve Karadağ"
-
-#: ../rules/base.xml.in.h:462
-msgid "Shift with numeric keypad keys works as in MS Windows."
-msgstr "Sayısal tuştakımı Shift ile  MS Windows'daki gibi çalışır."
-
-#: ../rules/base.xml.in.h:463
-msgid "Shift+CapsLock changes layout."
-msgstr "Shift+CapsLock tuşları yerleşimi değiştirir."
-
-#: ../rules/base.xml.in.h:464
-msgid "Slovakia"
-msgstr "Slovakya"
-
-#: ../rules/base.xml.in.h:465
-msgid "Slovenia"
-msgstr "Slovenya"
-
-#: ../rules/base.xml.in.h:466
-msgid "South Africa"
-msgstr "Güney Afrika"
-
-#: ../rules/base.xml.in.h:467
-msgid "Southern Uzbek"
-msgstr "Güney Özbekistan"
-
-#: ../rules/base.xml.in.h:468
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr "Boşluk tuşu nobreakspace'i dördüncü seviyede çıktılar, altıncı seviyede incesini basar"
-
-#: ../rules/base.xml.in.h:469
-msgid "Space key outputs non-breakable space character at fourth level."
-msgstr "Boşluk tuşu nobreakspace'i dördüncü seviyede çıktılar."
-
-#: ../rules/base.xml.in.h:470
-msgid "Space key outputs non-breakable space character at second level."
-msgstr "Boşluk tuşu nobreakspace'i ikinci seviyede çıktılar."
-
-#: ../rules/base.xml.in.h:471
-msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
-msgstr "Boşluk tuşu nobreakspace'i dördüncü seviyede çıktılar, üçüncü işlevsizdir."
-
-#: ../rules/base.xml.in.h:472
-msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr "Boşluk tuşu üçüncü seviyede nobreakspace basar, dördüncü seviyede incesini basar"
-
-#: ../rules/base.xml.in.h:473
-msgid "Space key outputs non-breakable space character at third level."
-msgstr "Boşluk tuşu nobreakspace'i üçüncü seviyede çıktılar."
-
-#: ../rules/base.xml.in.h:474
-msgid "Space key outputs usual space at any level."
-msgstr "Boşluk tuşu her seviyede boşluk basar (nobreakspace basmaz)."
-
-#: ../rules/base.xml.in.h:475
-msgid "Spain"
-msgstr "İspanya"
-
-#: ../rules/base.xml.in.h:476 ../rules/sun.xml.in.h:103
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
-msgstr "Bir sunucuda elde edilen özel tuşlar (Ctrl+Alt+&lt;tuş&gt;)"
-
-#: ../rules/base.xml.in.h:477
-msgid "SrL"
-msgstr "SrL"
-
-#: ../rules/base.xml.in.h:478
-msgid "Sri Lanka"
-msgstr "Sri Lanka"
-
-#: ../rules/base.xml.in.h:479 ../rules/sun.xml.in.h:104
-msgid "Standard"
-msgstr "Standart"
-
-#. RSTU 2019-91
-#: ../rules/base.xml.in.h:481
-msgid "Standard RSTU"
-msgstr "Standart RSTU"
-
-#. RSTU 2019-91
-#: ../rules/base.xml.in.h:483
-msgid "Standard RSTU on Russian layout"
-msgstr "Rusça yerleşimde standart RSTU"
-
-#: ../rules/base.xml.in.h:484 ../rules/sun.xml.in.h:112
-msgid "Sun dead keys"
-msgstr "Sun ölü tuşlar"
-
-#: ../rules/base.xml.in.h:485
-msgid "Super Power Multimedia Keyboard"
-msgstr "Super Power Multimedia Keyboard"
-
-#: ../rules/base.xml.in.h:486
-msgid "Super is mapped to the Win-keys."
-msgstr "Super, Pencere tuşlarına eşlenir."
-
-#: ../rules/base.xml.in.h:487
-msgid "Svdvorak"
-msgstr "Svdvorak"
-
-#: ../rules/base.xml.in.h:488 ../rules/sun.xml.in.h:113
-msgid "Svk"
-msgstr "Svk"
-
-#: ../rules/base.xml.in.h:489
-msgid "Svn"
-msgstr "Svn"
-
-#: ../rules/base.xml.in.h:490
-msgid "Swap Ctrl and CapsLock."
-msgstr "Ctrl ile Caps Lock yer değiştirir."
-
-#: ../rules/base.xml.in.h:491
-msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-msgstr "Makintoş klavyeler çekirdek tarafından algılanamadığında iki seviyeli tuş kodlarına geçilir."
-
-#: ../rules/base.xml.in.h:492 ../rules/sun.xml.in.h:115
-msgid "Swe"
-msgstr "İsve"
-
-#: ../rules/base.xml.in.h:493
-msgid "Sweden"
-msgstr "İsveç"
-
-#: ../rules/base.xml.in.h:494
-msgid "Switzerland"
-msgstr "İsviçre"
-
-#: ../rules/base.xml.in.h:495
-msgid "Symplon PaceBook (tablet PC)"
-msgstr "Symplon PaceBook (tablet PC)"
-
-#: ../rules/base.xml.in.h:496
-msgid "Syr"
-msgstr "Sur"
-
-#: ../rules/base.xml.in.h:497
-msgid "Syria"
-msgstr "Suriye"
-
-#: ../rules/base.xml.in.h:498
-msgid "Syriac"
-msgstr "Suriye"
-
-#: ../rules/base.xml.in.h:499
-msgid "Syriac phonetic"
-msgstr "Suriye fonetik"
-
-#: ../rules/base.xml.in.h:500
-msgid "TIS-820.2538"
-msgstr "TIS-820.2538"
-
-#: ../rules/base.xml.in.h:501
-msgid "Tajikistan"
-msgstr "Tacikistan"
-
-#: ../rules/base.xml.in.h:502
-msgid "Tamil"
-msgstr "Tamil dili"
-
-#: ../rules/base.xml.in.h:503
-msgid "Tamil TAB Typewriter"
-msgstr "Tamil TAB Daktilo"
-
-#: ../rules/base.xml.in.h:504
-msgid "Tamil TSCII Typewriter"
-msgstr "Tamil TSCII Daktilo"
-
-#: ../rules/base.xml.in.h:505
-msgid "Tamil Unicode"
-msgstr "Tamil Unicode"
-
-#: ../rules/base.xml.in.h:506
-msgid "Tatar"
-msgstr "Tatar"
-
-#: ../rules/base.xml.in.h:507
-msgid "Telugu"
-msgstr "Telugu dili"
-
-#: ../rules/base.xml.in.h:508
-msgid "Tha"
-msgstr "Tha"
-
-#: ../rules/base.xml.in.h:509
-msgid "Thailand"
-msgstr "Tayland"
-
-#: ../rules/base.xml.in.h:510 ../rules/sun.xml.in.h:119
-msgid "Third level choosers"
-msgstr "3. seviye seçiciler"
-
-#: ../rules/base.xml.in.h:511
-msgid "Tifinagh"
-msgstr "Tifinagh"
-
-#: ../rules/base.xml.in.h:512
-msgid "Tifinagh Alternative"
-msgstr "Tifinagh Diğer"
-
-#: ../rules/base.xml.in.h:513
-msgid "Tifinagh Alternative Phonetic"
-msgstr "Tifinagh Diğer Fonetik"
-
-#: ../rules/base.xml.in.h:514
-msgid "Tifinagh Extended"
-msgstr "Tifinagh Gelişkin"
-
-#: ../rules/base.xml.in.h:515
-msgid "Tifinagh Extended Phonetic"
-msgstr "Tifinagh Gelişmiş Fonetik"
-
-#: ../rules/base.xml.in.h:516
-msgid "Tifinagh Phonetic"
-msgstr "Tifinagh Fonetik"
-
-#: ../rules/base.xml.in.h:517
-msgid "Tilde (~) variant"
-msgstr "Tilde (~) tuşlu"
-
-#: ../rules/base.xml.in.h:518
-msgid "Tjk"
-msgstr "Tck"
-
-#: ../rules/base.xml.in.h:519
-msgid "Toshiba Satellite S3000"
-msgstr "Toshiba Satellite S3000"
-
-#: ../rules/base.xml.in.h:520
-msgid "Trust Direct Access Keyboard"
-msgstr "Trust Doğrudan Erişimli Klavye"
-
-#: ../rules/base.xml.in.h:521
-msgid "Trust Wireless Keyboard Classic"
-msgstr "Trust Kablosuz Klasik Klavye"
-
-#: ../rules/base.xml.in.h:522 ../rules/sun.xml.in.h:120
-msgid "Tur"
-msgstr "Trk"
-
-#: ../rules/base.xml.in.h:523
-msgid "Turkey"
-msgstr "Türkiye"
-
-#: ../rules/base.xml.in.h:524
-msgid "Typewriter"
-msgstr "Daktilo"
-
-#: ../rules/base.xml.in.h:525 ../rules/sun.xml.in.h:124
-msgid "U.S. English"
-msgstr "Amerikan ingilizcesi"
-
-#: ../rules/base.xml.in.h:526
-msgid "US keyboard with Bosnian digraphs"
-msgstr "Bosna ikil harfleriyle amerikan klavyesi"
-
-#: ../rules/base.xml.in.h:527
-msgid "US keyboard with Bosnian letters"
-msgstr "Bosna harfleriyle amerikan klavyesi"
-
-#: ../rules/base.xml.in.h:528
-msgid "US keyboard with Croatian digraphs"
-msgstr "Hırvat ikil harfleriyle amerikan klavyesi"
-
-#: ../rules/base.xml.in.h:529
-msgid "US keyboard with Croatian letters"
-msgstr "Hırvat harfleriyle amerikan klavyesi"
-
-#: ../rules/base.xml.in.h:530
-msgid "US keyboard with Lithuanian letters"
-msgstr "Litvanya harfleriyle amerikan klavyesi"
-
-#: ../rules/base.xml.in.h:531
-msgid "US keyboard with Slovenian digraphs"
-msgstr "Sloven ikil harfleriyle amerikan klavyesi"
-
-#: ../rules/base.xml.in.h:532
-msgid "US keyboard with Slovenian letters"
-msgstr "Sloven harfleriyle amerikan klavyesi"
-
-#: ../rules/base.xml.in.h:533 ../rules/sun.xml.in.h:126
-msgid "USA"
-msgstr "ABD"
-
-#: ../rules/base.xml.in.h:534
-msgid "Udmurt"
-msgstr "Udmurt"
-
-#: ../rules/base.xml.in.h:535
-msgid "Ukr"
-msgstr "Ukr"
-
-#: ../rules/base.xml.in.h:536
-msgid "Ukraine"
-msgstr "Ukrayna"
-
-#: ../rules/base.xml.in.h:537
-msgid "UnicodeExpert"
-msgstr "Unicode Uzman"
-
-#: ../rules/base.xml.in.h:538 ../rules/sun.xml.in.h:127
-msgid "United Kingdom"
-msgstr "İngiltere"
-
-#: ../rules/base.xml.in.h:539
-msgid "Urdu"
-msgstr "Urdu"
-
-#: ../rules/base.xml.in.h:540
-msgid "Use Bosnian digraphs"
-msgstr "Bosna ikil harflerini kullanır"
-
-#: ../rules/base.xml.in.h:541
-msgid "Use Croatian digraphs"
-msgstr "Hırvat ikil harflerini kullanır"
-
-#: ../rules/base.xml.in.h:542
-msgid "Use Slovenian digraphs"
-msgstr "Sloven ikil harflerini kullanır"
-
-#: ../rules/base.xml.in.h:543
-msgid "Use guillemets for quotes"
-msgstr "Tırnakların yerine açılı ayraçlar kullanılır"
-
-#: ../rules/base.xml.in.h:544
-msgid "Use keyboard LED to show alternative layout."
-msgstr "Diğer yerleşimi göstermek için klavye LED'i kullanılır."
-
-#: ../rules/base.xml.in.h:545
-msgid "Use keypad with unicode additions (arrows and math operators)"
-msgstr "Tuştakımı Unicode eklentileri ile kullanılır (ok ve aritmetik tuşları)"
-
-#: ../rules/base.xml.in.h:546
-msgid "Using space key to input non-breakable space character"
-msgstr "nobreakspace'i yazmak için boşluk tuşu kullanımı"
-
-#: ../rules/base.xml.in.h:547
-msgid "Uzb"
-msgstr "Özb"
-
-#: ../rules/base.xml.in.h:548
-msgid "Uzbekistan"
-msgstr "Özbekistan"
-
-#: ../rules/base.xml.in.h:549
-msgid "Vietnam"
-msgstr "Vietnam"
-
-#: ../rules/base.xml.in.h:550
-msgid "Vnm"
-msgstr "Vnm"
-
-#: ../rules/base.xml.in.h:551
-msgid "Wang model 724 azerty"
-msgstr "Wang model 724 azerty"
-
-#: ../rules/base.xml.in.h:552
-msgid "Western"
-msgstr "Batı"
-
-#: ../rules/base.xml.in.h:553
-msgid "Winbook Model XP5"
-msgstr "Winbook Model XP5"
-
-#: ../rules/base.xml.in.h:554
-msgid "Winkeys"
-msgstr "Win tuşları"
-
-#: ../rules/base.xml.in.h:555
-msgid "With &lt;\\|&gt; key"
-msgstr "&lt;\\|&gt; tuşuyla"
-
-#: ../rules/base.xml.in.h:556
-msgid "With EuroSign on 5"
-msgstr "€ sembolü ile 5 tuşu"
-
-#: ../rules/base.xml.in.h:557
-msgid "With guillemets"
-msgstr "Açılı ayraçlarla"
-
-#: ../rules/base.xml.in.h:558
-msgid "Yahoo! Internet Keyboard"
-msgstr "Yahoo! Genel Ağ Klavyesi"
-
-#: ../rules/base.xml.in.h:559
-msgid "Yoruba"
-msgstr "Yoruba"
-
-#: ../rules/base.xml.in.h:560
-msgid "Z and ZHE swapped"
-msgstr "Z ile ZHE yer değiştirir"
-
-#: ../rules/base.xml.in.h:561
-msgid "Zar"
-msgstr "Zar"
-
-#: ../rules/base.xml.in.h:562
-msgid "azerty"
-msgstr "azerty"
-
-#: ../rules/base.xml.in.h:563
-msgid "azerty/digits"
-msgstr "azerty/rakamlar"
-
-#: ../rules/base.xml.in.h:564
-msgid "digits"
-msgstr "rakamlar"
-
-#: ../rules/base.xml.in.h:565
-msgid "displaced semicolon and quote (obsolete)"
-msgstr "noktalı virgül ve çift tırnak kalkar (atıl)"
-
-#: ../rules/base.xml.in.h:566
-msgid "lyx"
-msgstr "lyx"
-
-#: ../rules/base.xml.in.h:567 ../rules/sun.xml.in.h:132
-msgid "qwerty"
-msgstr "qwerty"
-
-#: ../rules/base.xml.in.h:568
-msgid "qwerty, extended Backslash"
-msgstr "qwerty, galişmiş Gerisilme"
-
-#: ../rules/base.xml.in.h:569
-msgid "qwerty/digits"
-msgstr "qwerty/rakamlar"
-
-#: ../rules/base.xml.in.h:570
-msgid "qwertz"
-msgstr "qwertz"
-
-#: ../rules/sun.xml.in.h:1
-msgid "\"Typewriter\""
-msgstr "\"Daktilo\""
-
-#: ../rules/sun.xml.in.h:17
-msgid "Acts as Shift with locking. Shift cancels Caps."
-msgstr "Caps Lock kilitlemeli Shift tuşu gibi çalışır. Shift tuşu ise Caps Lock tuşunu keser."
-
-#: ../rules/sun.xml.in.h:18
-msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
-msgstr "Caps Lock kilitlemeli Shift tuşu gibi çalışır. Shift tuşu Caps Lock'u kesmez"
-
-#: ../rules/sun.xml.in.h:19
-msgid "Alt+Control changes group"
-msgstr "Alt+Ctrl grubu değiştirir."
-
-#: ../rules/sun.xml.in.h:20
-msgid "Alt+Shift changes group"
-msgstr "Alt+Shift  grubu değiştirir."
-
-#: ../rules/sun.xml.in.h:21
-msgid "Basic"
-msgstr "Temel"
-
-#: ../rules/sun.xml.in.h:23
-msgid "Belgian"
-msgstr "Belçikaca"
-
-#: ../rules/sun.xml.in.h:25
-msgid "Both Alt keys together change group"
-msgstr "Alt tuşları birlikte grubu değiştirir"
-
-#: ../rules/sun.xml.in.h:26
-msgid "Both Ctrl keys together change group"
-msgstr "Ctrl tuşları birlikte grubu değiştirir"
-
-#: ../rules/sun.xml.in.h:27
-msgid "Both Shift keys together change group"
-msgstr "Shift tuşları birlikte grubu değiştirir"
-
-#: ../rules/sun.xml.in.h:28
-msgid "Bulgarian"
-msgstr "Bulgarca"
-
-#: ../rules/sun.xml.in.h:30
-msgid "Canadian"
-msgstr "Kanadaca"
-
-#: ../rules/sun.xml.in.h:31
-msgid "Caps Lock is Compose"
-msgstr "CapsLock tuşu karakter birleşimi yapar"
-
-#: ../rules/sun.xml.in.h:32
-msgid "Caps Lock key changes group"
-msgstr "Caps Lock tuşu grubu değiştirir"
-
-#: ../rules/sun.xml.in.h:34
-msgid "Caps_Lock LED shows alternative group"
-msgstr "Caps Lock LED'i diğer grubu gösterir"
-
-#: ../rules/sun.xml.in.h:35
-msgid "Control Key Position"
-msgstr "Ctrl tuşunun yeri"
-
-#: ../rules/sun.xml.in.h:36
-msgid "Control key at bottom left"
-msgstr "Sol alttaki Ctrl tuşu"
-
-#: ../rules/sun.xml.in.h:37
-msgid "Control key at left of 'A'"
-msgstr "'A'nın solundaki Ctrl Tuşu"
-
-#: ../rules/sun.xml.in.h:38
-msgid "Control+Shift changes group"
-msgstr "Ctrl+Shift tuşları grubu değiştirir"
-
-#: ../rules/sun.xml.in.h:40
-msgid "Czech"
-msgstr "Çekçe"
-
-#: ../rules/sun.xml.in.h:41
-msgid "Danish"
-msgstr "Danca"
-
-#: ../rules/sun.xml.in.h:45
-msgid "DeuCH"
-msgstr "DeuCH"
-
-#: ../rules/sun.xml.in.h:47
-msgid "Dvo"
-msgstr "Dvo"
-
-#: ../rules/sun.xml.in.h:52
-msgid "Finnish"
-msgstr "Fince"
-
-#: ../rules/sun.xml.in.h:54
-msgid "FraCH"
-msgstr "FraCH"
-
-#: ../rules/sun.xml.in.h:57
-msgid "German"
-msgstr "Almanca"
-
-#: ../rules/sun.xml.in.h:58
-msgid "Group Shift/Lock behavior"
-msgstr "Shift/Lock Grubu davranışı"
-
-#: ../rules/sun.xml.in.h:60
-msgid "Hungarian"
-msgstr "Macarca"
-
-#: ../rules/sun.xml.in.h:64
-msgid "Italian"
-msgstr "İtalyanca"
-
-#: ../rules/sun.xml.in.h:65
-msgid "Japanese"
-msgstr "Japonca"
-
-#: ../rules/sun.xml.in.h:67
-msgid "Left Alt key changes group"
-msgstr "Soldaki Alt tuşu grubu değiştirir"
-
-#: ../rules/sun.xml.in.h:68
-msgid "Left Alt key switches group while pressed"
-msgstr "Soldaki Alt tuşu basılıyken diğer grup etkin olur"
-
-#: ../rules/sun.xml.in.h:69
-msgid "Left Ctrl key changes group"
-msgstr "Soldaki Ctrl tuşu grubu değiştirir"
-
-#: ../rules/sun.xml.in.h:70
-msgid "Left Shift key changes group"
-msgstr "Soldaki Shift tuşu grubu değiştirir"
-
-#: ../rules/sun.xml.in.h:71
-msgid "Make CapsLock an additional Control"
-msgstr "CapsLock tuşunu ek bir Ctrl tuşu yapar"
-
-#: ../rules/sun.xml.in.h:76
-msgid "Norwegian"
-msgstr "Norveçce"
-
-#: ../rules/sun.xml.in.h:77
-msgid "Num_Lock LED shows alternative group"
-msgstr "Num_Lock LED'i diğer grubu gösterir"
-
-#: ../rules/sun.xml.in.h:80
-msgid "Polish"
-msgstr "Polonez"
-
-#: ../rules/sun.xml.in.h:81
-msgid "Polish with Polish quotes on key \"1/!\""
-msgstr "Lehçe, \"1/!\" tuşunda Lehçe tırnaklar"
-
-#: ../rules/sun.xml.in.h:82
-msgid "Portuguese"
-msgstr "Portekizce"
-
-#: ../rules/sun.xml.in.h:83
-msgid "Press Left Alt key to choose 3rd level"
-msgstr "3. seviyeyi seçmek için soldaki Alt tuşuna basın"
-
-#: ../rules/sun.xml.in.h:84
-msgid "Press Right Alt key to choose 3rd level"
-msgstr "3. seviyeyi seçmek için sağdaki Alt tuşuna basın"
-
-#: ../rules/sun.xml.in.h:85
-msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
-msgstr "3. seviyeyi seçmek için sağdaki Alt tuşuna basın, Sağdaki Alt tuşuyla birlikte Shift tuşu AltGr gibi davranır"
-
-#: ../rules/sun.xml.in.h:86
-msgid "Press Right Control to choose 3rd level"
-msgstr "3. seviyeyi seçmek için sağdaki Ctrl tuşuna basın"
-
-#: ../rules/sun.xml.in.h:87
-msgid "Press any of Alt keys to choose 3rd level"
-msgstr "3. seviyeyi seçmek için Alt tuşlarından birine basın"
-
-#: ../rules/sun.xml.in.h:89
-msgid "Right Alt key changes group"
-msgstr "Sağdaki Alt tuşu grubu değiştirir"
-
-#: ../rules/sun.xml.in.h:91
-msgid "Right Alt switches group while pressed"
-msgstr "Sağdaki Alt tuşu basılıyken diğer grup etkin olur"
-
-#: ../rules/sun.xml.in.h:92
-msgid "Right Control key works as Right Alt"
-msgstr "Sağdaki Ctrl tuşu sağdaki Alt tuşu gibi çalışır"
-
-#: ../rules/sun.xml.in.h:93
-msgid "Right Ctrl key changes group"
-msgstr "Sağdaki Ctrl tuşu grubu değiştirir"
-
-#: ../rules/sun.xml.in.h:94
-msgid "Right Shift key changes group"
-msgstr "Sağdaki Shift tuşu grubu değiştirir"
-
-#: ../rules/sun.xml.in.h:97
-msgid "Scroll Lock changes group"
-msgstr "Scroll Lock grubu değiştirir"
-
-#: ../rules/sun.xml.in.h:98
-msgid "Scroll_Lock LED shows alternative group"
-msgstr "Scroll_Lock LED'i diğer grubu gösterir"
-
-#: ../rules/sun.xml.in.h:99
-msgid "Shift with numpad keys works as in MS Windows"
-msgstr "Sayısal tuştakımı Shift ile  MS Windows'daki gibi çalışır"
-
-#: ../rules/sun.xml.in.h:100
-msgid "Shift+CapsLock changes group"
-msgstr "Shift+CapsLock tuşları grubu değiştirir"
-
-#: ../rules/sun.xml.in.h:101
-msgid "Slovak"
-msgstr "Slovakça"
-
-#: ../rules/sun.xml.in.h:102
-msgid "Spanish"
-msgstr "İspanyolca"
-
-#: ../rules/sun.xml.in.h:105
-msgid "Sun Type 4"
-msgstr "Sun 4. tür"
-
-#: ../rules/sun.xml.in.h:106
-msgid "Sun Type 5"
-msgstr "Sun 5. Tür"
-
-#: ../rules/sun.xml.in.h:107
-msgid "Sun Type 5 European"
-msgstr "Sun 5. tür Avrupa"
-
-#: ../rules/sun.xml.in.h:108
-msgid "Sun Type 5 Unix"
-msgstr "Sun 5. tür, Unix"
-
-#: ../rules/sun.xml.in.h:109
-msgid "Sun Type 6"
-msgstr "Sun 6. tür"
-
-#: ../rules/sun.xml.in.h:110
-msgid "Sun Type 6 Unix"
-msgstr "Sun 6. tür, Unix"
-
-#: ../rules/sun.xml.in.h:111
-msgid "Sun Type 6 with Euro key"
-msgstr "Sun 6. Tür, € tuşlu"
-
-#: ../rules/sun.xml.in.h:114
-msgid "Swap Control and Caps Lock"
-msgstr "Ctrl ile Caps Lock yer değiştirir"
-
-#: ../rules/sun.xml.in.h:116
-msgid "Swedish"
-msgstr "İsveçce"
-
-#: ../rules/sun.xml.in.h:117
-msgid "Swiss French"
-msgstr "İsviçre Fransızcası"
-
-#: ../rules/sun.xml.in.h:118
-msgid "Swiss German"
-msgstr "İsviçre Almancası"
-
-#: ../rules/sun.xml.in.h:121
-msgid "Turkish"
-msgstr "Türkçe Q Klavye"
-
-#: ../rules/sun.xml.in.h:122
-msgid "Turkish (F)"
-msgstr "Türkçe F klavye"
-
-#: ../rules/sun.xml.in.h:123
-msgid "Turkish Alt-Q Layout"
-msgstr "Türkçe Alt-Q (yazılımcılar ve dizüstü) klavye"
-
-#: ../rules/sun.xml.in.h:125
-msgid "U.S. English w/ ISO9995-3"
-msgstr "Amerikan ingilizcesi (ISO9995-3 ile)"
-
-#: ../rules/sun.xml.in.h:128
-msgid "Use keyboard LED to show alternative group"
-msgstr "Diğer grubu göstermek içim klavye LED'i kullanılır"
-
-#: ../rules/sun.xml.in.h:129
-msgid "Uses internal capitalization. Shift cancels Caps."
-msgstr "CapsLock dahili dönüşümü kullanılır, Shift tuşu Caps Lock tuşunu keser."
-
-#: ../rules/sun.xml.in.h:130
-msgid "Uses internal capitalization. Shift doesn't cancel Caps."
-msgstr "CapsLock dahili dönüşümü kullanır. Shift tuşu Caps Lock'u kesmez."
-
-#: ../rules/sun.xml.in.h:131
-msgid "bksl"
-msgstr "bksl"
-
-#: ../rules/sun.xml.in.h:133
-msgid "type4"
-msgstr "4. tür"
+# Turkish translations for xkeyboard-config.
+# Copyright (C) 2007 Free Software Foundation, Inc.
+#
+# Nilgün Belma Bugüner <nilgun@buguner.name.tr>, 2003, ..., 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 1.0-pre1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-06-28 15:21+0100\n"
+"PO-Revision-Date: 2007-07-09 10:09+0300\n"
+"Last-Translator: Nilgün Belma Bugüner <nilgun@buguner.name.tr>\n"
+"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr "F Klavye"
+
+#: ../rules/base.xml.in.h:2
+msgid "(Legacy) Alternative"
+msgstr "(Eski) Diğer"
+
+#: ../rules/base.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "(Eski) Diğer, Sun ölü tuşlar"
+
+#: ../rules/base.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "(Eski) Diğer, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:5
+msgid "(Legacy) Dvorak"
+msgstr "(Kadim) Dvorak"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/104 key Compatible"
+msgstr "101/104 tuş Uyumlu"
+
+#: ../rules/base.xml.in.h:7 ../rules/sun.xml.in.h:2
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/virgül/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:8 ../rules/sun.xml.in.h:3
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/virgül/Ölü tuşları normal yapar"
+
+#: ../rules/base.xml.in.h:9 ../rules/sun.xml.in.h:4
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/nokta/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:10 ../rules/sun.xml.in.h:5
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/nokta/Ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:11 ../rules/sun.xml.in.h:6
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/virgül/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:12
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/virgül/Ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:13 ../rules/sun.xml.in.h:7
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/nokta/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:14 ../rules/sun.xml.in.h:8
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/nokta/Ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:15 ../rules/sun.xml.in.h:9
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/virgül/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:16 ../rules/sun.xml.in.h:10
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/virgül/Ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:17 ../rules/sun.xml.in.h:11
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/nokta/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:18 ../rules/sun.xml.in.h:12
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/nokta/Ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:19 ../rules/sun.xml.in.h:13
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/virgül/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:20 ../rules/sun.xml.in.h:14
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/virgül/Ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:21 ../rules/sun.xml.in.h:15
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/nokta/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:22 ../rules/sun.xml.in.h:16
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/nokta/Ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:23
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:24
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:25
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
+
+#: ../rules/base.xml.in.h:26
+msgid "ACPI Standard"
+msgstr "ACPI Standardı"
+
+#: ../rules/base.xml.in.h:27
+msgid "AZERTY Tskapo"
+msgstr "AZERTY Tskapo"
+
+#: ../rules/base.xml.in.h:28
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:29
+msgid "Acer C300"
+msgstr "Acer C300"
+
+#: ../rules/base.xml.in.h:30
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
+
+#: ../rules/base.xml.in.h:31
+msgid "Acer TravelMate 800"
+msgstr "Acer TravelMate 800"
+
+#: ../rules/base.xml.in.h:32
+msgid "Add the EuroSign to the 2 key."
+msgstr "2 tuşuna € sembolünü ekler"
+
+#: ../rules/base.xml.in.h:33
+msgid "Add the EuroSign to the 5 key."
+msgstr "5 tuşuna € sembolünü ekler"
+
+#: ../rules/base.xml.in.h:34
+msgid "Add the EuroSign to the E key."
+msgstr "E tuşuna € sembolünü ekler"
+
+#: ../rules/base.xml.in.h:35
+msgid "Add the standard behavior to Menu key."
+msgstr "Menü tuşuna standart işlevini ekler."
+
+#: ../rules/base.xml.in.h:36
+msgid "Adding the EuroSign to certain keys"
+msgstr "Belli tuşlara € sembolünün eklenmesi"
+
+#: ../rules/base.xml.in.h:37
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../rules/base.xml.in.h:38
+msgid "Afg"
+msgstr "Afg"
+
+#: ../rules/base.xml.in.h:39
+msgid "Afghanistan"
+msgstr "Afganistan"
+
+#: ../rules/base.xml.in.h:40
+msgid "Akan"
+msgstr "Akan"
+
+#: ../rules/base.xml.in.h:41
+msgid "Alb"
+msgstr "Arn"
+
+#: ../rules/base.xml.in.h:42
+msgid "Albania"
+msgstr "Arnavutluk"
+
+#: ../rules/base.xml.in.h:43
+msgid "Alt and Meta are on the Alt keys."
+msgstr "Alt ve Meta, Alt tuşlarındadır."
+
+#: ../rules/base.xml.in.h:44
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Alt, sağdaki Pencere tuşu ile Süper ise Menü tuşu ile eşleştirilir."
+
+#: ../rules/base.xml.in.h:45
+msgid "Alt+CapsLock changes layout."
+msgstr "Alt+CapsLock yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:46
+msgid "Alt+Ctrl change layout."
+msgstr "Alt+Ctrlyerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:47
+msgid "Alt+Shift change layout."
+msgstr "Alt+Shift yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:48
+msgid "Alt-Q"
+msgstr "Yazılımcı klavyesi (Q)"
+
+#: ../rules/base.xml.in.h:49
+msgid "Alt/Win key behavior"
+msgstr "Alt/Pencere tuşu davranışı"
+
+#: ../rules/base.xml.in.h:50
+msgid "Alternative"
+msgstr "Diğer"
+
+#: ../rules/base.xml.in.h:51
+msgid "Alternative Eastern"
+msgstr "Diğer Doğu"
+
+#: ../rules/base.xml.in.h:52
+msgid "Alternative Phonetic"
+msgstr "Diğer Fonetik"
+
+#: ../rules/base.xml.in.h:53
+msgid "Alternative international (former us_intl)"
+msgstr "Uluslararası Q klavle (nam-ı diğer us_intl)"
+
+#: ../rules/base.xml.in.h:54
+msgid "Alternative, Sun dead keys"
+msgstr "Diğer, Sun ölü tuşlar"
+
+#: ../rules/base.xml.in.h:55
+msgid "Alternative, eliminate dead keys"
+msgstr "Diğer, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:56
+msgid "Alternative, latin-9 only"
+msgstr "Diğer, sadece latin-9"
+
+#: ../rules/base.xml.in.h:57
+msgid "And"
+msgstr "And"
+
+#: ../rules/base.xml.in.h:58
+msgid "Andorra"
+msgstr "Andora"
+
+#: ../rules/base.xml.in.h:59
+msgid "Apostrophe (') variant"
+msgstr "Tek tırnaklı (')"
+
+#: ../rules/base.xml.in.h:60
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:61
+msgid "Apple Laptop"
+msgstr "Apple Dizüstü"
+
+#: ../rules/base.xml.in.h:62
+msgid "Ara"
+msgstr "Ara"
+
+#: ../rules/base.xml.in.h:63
+msgid "Arabic"
+msgstr "Arapça"
+
+#: ../rules/base.xml.in.h:64
+msgid "Arm"
+msgstr "Erm"
+
+#: ../rules/base.xml.in.h:65
+msgid "Armenia"
+msgstr "Ermenistan"
+
+#: ../rules/base.xml.in.h:66
+msgid "Aze"
+msgstr "Aze"
+
+#: ../rules/base.xml.in.h:67
+msgid "Azerbaijan"
+msgstr "Azerbaycan"
+
+#: ../rules/base.xml.in.h:68
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 wireless Internet Keyboard"
+
+#: ../rules/base.xml.in.h:69
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:70
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Çokluortam"
+
+#: ../rules/base.xml.in.h:71
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:72
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:73
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:74
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:75
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
+
+#: ../rules/base.xml.in.h:76
+msgid "Ban"
+msgstr "Ban"
+
+#: ../rules/base.xml.in.h:77
+msgid "Bangladesh"
+msgstr "Bangladeş"
+
+#: ../rules/base.xml.in.h:78 ../rules/sun.xml.in.h:22
+msgid "Bel"
+msgstr "Bel"
+
+#: ../rules/base.xml.in.h:79
+msgid "Belarus"
+msgstr "Belarus"
+
+#: ../rules/base.xml.in.h:80
+msgid "Belgium"
+msgstr "Belçika"
+
+#: ../rules/base.xml.in.h:81
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:82
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
+
+#: ../rules/base.xml.in.h:83
+msgid "Bengali"
+msgstr "Bengalce"
+
+#: ../rules/base.xml.in.h:84
+msgid "Bengali Probhat"
+msgstr "Bengali Probhat"
+
+#: ../rules/base.xml.in.h:85
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Bepo, ergonomik, Dvorak yolu"
+
+#: ../rules/base.xml.in.h:86
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Bepo, ergonomik, Dvorak yolu, sadece latin-9"
+
+#: ../rules/base.xml.in.h:87 ../rules/sun.xml.in.h:24
+msgid "Bgr"
+msgstr "Bgr"
+
+#: ../rules/base.xml.in.h:88
+msgid "Bhu"
+msgstr "Bhu"
+
+#: ../rules/base.xml.in.h:89
+msgid "Bhutan"
+msgstr "Butan"
+
+#: ../rules/base.xml.in.h:90
+msgid "Biblical Hebrew (Tiro)"
+msgstr "Dini İbranice (Tiro)"
+
+#: ../rules/base.xml.in.h:91
+msgid "Bih"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:92
+msgid "Blr"
+msgstr "Blr"
+
+#: ../rules/base.xml.in.h:93
+msgid "Bosnia and Herzegovina"
+msgstr "Bosna Hersek"
+
+#: ../rules/base.xml.in.h:94
+msgid "Both Alt keys together change layout."
+msgstr "Alt tuşları birlikte yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:95
+msgid "Both Ctrl keys together change layout."
+msgstr "Ctrl tuşları birlikte yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:96
+msgid "Both Shift keys together change layout."
+msgstr "Shift tuşları birlikte yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:97
+msgid "Both Win-keys switch layout while pressed."
+msgstr "Pencere tuşları birlikte yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:98
+msgid "Bra"
+msgstr "Bra"
+
+#: ../rules/base.xml.in.h:99
+msgid "Braille"
+msgstr "Üç noktalı"
+
+#: ../rules/base.xml.in.h:100
+msgid "Brazil"
+msgstr "Brezilya"
+
+#: ../rules/base.xml.in.h:101
+msgid "Brazilian ABNT2"
+msgstr "Brazilya dili ABNT2"
+
+#: ../rules/base.xml.in.h:102
+msgid "Brl"
+msgstr "Brl"
+
+#: ../rules/base.xml.in.h:103
+msgid "Brother Internet Keyboard"
+msgstr "Brother Genel Ağ Klavyesi"
+
+#: ../rules/base.xml.in.h:104
+msgid "Buckwalter"
+msgstr "Bükvalter"
+
+#: ../rules/base.xml.in.h:105
+msgid "Bulgaria"
+msgstr "Bulgaristan"
+
+#: ../rules/base.xml.in.h:106
+msgid "Cambodia"
+msgstr "Kamboçya"
+
+#: ../rules/base.xml.in.h:107 ../rules/sun.xml.in.h:29
+msgid "Can"
+msgstr "Kan"
+
+#: ../rules/base.xml.in.h:108
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../rules/base.xml.in.h:109
+msgid "Caps Lock is Compose."
+msgstr "CapsLock tuşu karakter birleşimi yapar."
+
+#: ../rules/base.xml.in.h:110
+msgid "CapsLock LED shows alternative layout."
+msgstr "Caps Lock LED'i diğer yerleşimi gösterir."
+
+#: ../rules/base.xml.in.h:111
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+msgstr "Caps Lock kilitlemeli Shift tuşu gibi çalışır. Shift tuşu ise Caps Lock tuşunu \"bekletir\"."
+
+#: ../rules/base.xml.in.h:112
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+msgstr "Caps Lock kilitlemeli Shift tuşu gibi çalışır. Shift tuşu Caps Lock davranışını etkilemez."
+
+#: ../rules/base.xml.in.h:113
+msgid "CapsLock just locks the Shift modifier."
+msgstr "Caps Lock sadece kilitlemeli Shift tuşu gibi çalışır."
+
+#: ../rules/base.xml.in.h:114 ../rules/sun.xml.in.h:33
+msgid "CapsLock key behavior"
+msgstr "CapsLock tuşunun davranışı"
+
+#: ../rules/base.xml.in.h:115
+msgid "CapsLock key changes layout."
+msgstr "Caps Lock tuşu yerleşimi değiştirir"
+
+#: ../rules/base.xml.in.h:116
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "Caps Lock tuşu Shift davranışını ters çevirir; bundan alfabetik olmayan tuşlar da etkilenir."
+
+#: ../rules/base.xml.in.h:117
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "Caps Lock tuşu büyük/küçük harf geçişi yapar."
+
+#: ../rules/base.xml.in.h:118
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+msgstr "CapsLock dahili dönüşümü kullanılır, Shift tuşu Caps Lock tuşunu \"bekletir\"."
+
+#: ../rules/base.xml.in.h:119
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+msgstr "CapsLock dahili dönüşümü kullanır. Shift tuşu Caps Lock davranışını etkilemez."
+
+#: ../rules/base.xml.in.h:120
+msgid "Catalan variant with middle-dot L"
+msgstr "Ortası noktalı L'li Katalan yerleşimi"
+
+#: ../rules/base.xml.in.h:121
+msgid "Che"
+msgstr "Che"
+
+#: ../rules/base.xml.in.h:122
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:123
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (diğer seçenek)"
+
+#: ../rules/base.xml.in.h:124
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:125
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:126
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
+
+#: ../rules/base.xml.in.h:127
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Genel Ağ Klavyesi"
+
+#: ../rules/base.xml.in.h:128
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:129
+msgid "Chuvash"
+msgstr "Çuvaş"
+
+#: ../rules/base.xml.in.h:130
+msgid "Chuvash Latin"
+msgstr "Çuvaş Latin"
+
+#: ../rules/base.xml.in.h:131
+msgid "Classic Dvorak"
+msgstr "Klasik Dvorak"
+
+#: ../rules/base.xml.in.h:132
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:133
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Kolay Erişim Klavyesi"
+
+#: ../rules/base.xml.in.h:134
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Genel Ağ Klavyesi (13 tuşlu)"
+
+#: ../rules/base.xml.in.h:135
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Genel Ağ Klavyesi (18 tuşlu)"
+
+#: ../rules/base.xml.in.h:136
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Genel Ağ Klavyesi (7 tuşlu)"
+
+#: ../rules/base.xml.in.h:137
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Klavyesi"
+
+#: ../rules/base.xml.in.h:138
+msgid "Compose key position"
+msgstr "Karakter oluşturma (compose) tuşu konumu"
+
+#: ../rules/base.xml.in.h:139
+msgid "Congo, Democratic Republic of the"
+msgstr "Kongo Demokratik Cumhuriyeti"
+
+#: ../rules/base.xml.in.h:140
+msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
+msgstr "Ctrl, Win tuşlarına eşlenir."
+
+#: ../rules/base.xml.in.h:141
+msgid "Croatia"
+msgstr "Hırvatistan"
+
+#: ../rules/base.xml.in.h:142
+msgid "Ctrl key at bottom left"
+msgstr "Sol alttaki Ctrl tuşu"
+
+#: ../rules/base.xml.in.h:143
+msgid "Ctrl key at left of 'A'"
+msgstr "'A'nın solundaki Ctrl Tuşu"
+
+#: ../rules/base.xml.in.h:144
+msgid "Ctrl key position"
+msgstr "Ctrl tuşunun yeri"
+
+#: ../rules/base.xml.in.h:145
+msgid "Ctrl+Shift change layout."
+msgstr "Ctrl+Shift tuşları yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:146
+msgid "Cyrillic"
+msgstr "Kril"
+
+#: ../rules/base.xml.in.h:147 ../rules/sun.xml.in.h:39
+msgid "Cze"
+msgstr "Çek"
+
+#: ../rules/base.xml.in.h:148
+msgid "Czechia"
+msgstr "Çek Cumhuriyeti"
+
+#: ../rules/base.xml.in.h:149
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:150
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:151 ../rules/sun.xml.in.h:42
+msgid "Dead acute"
+msgstr "Ölü acute (´)"
+
+#: ../rules/base.xml.in.h:152 ../rules/sun.xml.in.h:43
+msgid "Dead grave acute"
+msgstr "Ölü grave acute (`)"
+
+#: ../rules/base.xml.in.h:153
+msgid "Default numeric keypad keys."
+msgstr "Öntanımlı tuştakımı tuşları."
+
+#: ../rules/base.xml.in.h:154
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:155
+msgid "Dell 101-key PC"
+msgstr "Dell 101 tuşlu PC"
+
+#: ../rules/base.xml.in.h:156
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dizüstü/defter Dell Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:157
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell Dizüstü/defter Precision M series"
+
+#: ../rules/base.xml.in.h:158
+msgid "Dell Latitude series laptop"
+msgstr "Dell Latitude serisi Dizüstü"
+
+#: ../rules/base.xml.in.h:159
+msgid "Dell SK-8125 USB Multimedia Keybard"
+msgstr "Dell SK-8125 USB Çokluortam Klavyesi"
+
+#: ../rules/base.xml.in.h:160
+msgid "Dell SK-8135 USB Multimedia Keybard"
+msgstr "Dell SK-8135 USB Çokluortam Klavyesi"
+
+#: ../rules/base.xml.in.h:161
+msgid "Dell USB Multimedia Keybard"
+msgstr "Dell USB Çokluortam Klavyesi"
+
+#: ../rules/base.xml.in.h:162
+msgid "Denmark"
+msgstr "Danimarka"
+
+#: ../rules/base.xml.in.h:163 ../rules/sun.xml.in.h:44
+msgid "Deu"
+msgstr "Alm"
+
+#: ../rules/base.xml.in.h:164
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Kablosuz Masaüstü Klavyesi"
+
+#: ../rules/base.xml.in.h:165
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 serileri"
+
+#: ../rules/base.xml.in.h:166 ../rules/sun.xml.in.h:46
+msgid "Dnk"
+msgstr "Dnk"
+
+#: ../rules/base.xml.in.h:167 ../rules/sun.xml.in.h:48
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:168
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "Dvorak, \"1/!\" tuşunda Lehçe tırnaklar"
+
+#: ../rules/base.xml.in.h:169
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorak, çift tırnak tuşunda Lehçe tırnaklar"
+
+#: ../rules/base.xml.in.h:170
+msgid "Eastern"
+msgstr "Doğu"
+
+#: ../rules/base.xml.in.h:171 ../rules/sun.xml.in.h:49
+msgid "Eliminate dead keys"
+msgstr "Ölü tuşları normal yapar"
+
+#: ../rules/base.xml.in.h:172
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:173
+msgid "Epo"
+msgstr "Epo"
+
+#: ../rules/base.xml.in.h:174
+msgid "Ergonomic"
+msgstr "Ergonomik"
+
+#: ../rules/base.xml.in.h:175 ../rules/sun.xml.in.h:50
+msgid "Esp"
+msgstr "Esp"
+
+#: ../rules/base.xml.in.h:176
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../rules/base.xml.in.h:177
+msgid "Est"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:178
+msgid "Estonia"
+msgstr "Estonya"
+
+#: ../rules/base.xml.in.h:179
+msgid "Eth"
+msgstr "Ety"
+
+#: ../rules/base.xml.in.h:180
+msgid "Ethiopia"
+msgstr "Etyopya"
+
+#: ../rules/base.xml.in.h:181
+msgid "Evdev-managed keyboard"
+msgstr "Evdev yönetimli klavye"
+
+#: ../rules/base.xml.in.h:182
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:183
+msgid "Ewe"
+msgstr "Eve"
+
+#: ../rules/base.xml.in.h:184
+msgid "Extended"
+msgstr "Gelişmiş"
+
+#: ../rules/base.xml.in.h:185
+msgid "Extended Backslash"
+msgstr "Gelişmiş Gerisilme"
+
+#: ../rules/base.xml.in.h:186
+msgid "F-letter (F) variant"
+msgstr "F harfli (F) türü"
+
+#: ../rules/base.xml.in.h:187
+msgid "Fao"
+msgstr "Fao"
+
+#: ../rules/base.xml.in.h:188
+msgid "Faroe Islands"
+msgstr "Faroe Adaları"
+
+#: ../rules/base.xml.in.h:189 ../rules/sun.xml.in.h:51
+msgid "Fin"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:190
+msgid "Finland"
+msgstr "Finlandiya"
+
+#: ../rules/base.xml.in.h:191
+msgid "Force standard legacy keypad"
+msgstr "Standart kadim tuştakımını etkin kılar"
+
+#: ../rules/base.xml.in.h:192 ../rules/sun.xml.in.h:53
+msgid "Fra"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:193
+msgid "France"
+msgstr "Fransa"
+
+#: ../rules/base.xml.in.h:194 ../rules/sun.xml.in.h:55
+msgid "French"
+msgstr "Fransızca"
+
+#: ../rules/base.xml.in.h:195
+msgid "French (Macintosh)"
+msgstr "Fransız (Makintoş)"
+
+#: ../rules/base.xml.in.h:196 ../rules/sun.xml.in.h:56
+msgid "French (legacy)"
+msgstr "Fransızca (eski)"
+
+#: ../rules/base.xml.in.h:197
+msgid "French Dvorak"
+msgstr "Fransızca Dvorak"
+
+#: ../rules/base.xml.in.h:198
+msgid "French, Sun dead keys"
+msgstr "Fransızca, Sun ölü tuşlar"
+
+#: ../rules/base.xml.in.h:199
+msgid "French, eliminate dead keys"
+msgstr "Fransızca, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:200
+msgid "Fula"
+msgstr "Fula"
+
+#: ../rules/base.xml.in.h:201
+msgid "GBr"
+msgstr "GBr"
+
+#: ../rules/base.xml.in.h:202
+msgid "Ga"
+msgstr "Ga"
+
+#: ../rules/base.xml.in.h:203
+msgid "Generic 101-key PC"
+msgstr "Soysal 101 tuşlu PC"
+
+#: ../rules/base.xml.in.h:204
+msgid "Generic 102-key (Intl) PC"
+msgstr "Soysal 102 tuşlu (Uluslararası) PC"
+
+#: ../rules/base.xml.in.h:205
+msgid "Generic 104-key PC"
+msgstr "Soysal 104 tuşlu PC"
+
+#: ../rules/base.xml.in.h:206
+msgid "Generic 105-key (Intl) PC"
+msgstr "Soysal 105 tuşlu (uluslararası) PC"
+
+#: ../rules/base.xml.in.h:207
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:208
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+
+#: ../rules/base.xml.in.h:209
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:210
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:211
+msgid "Geo"
+msgstr "Geo"
+
+#: ../rules/base.xml.in.h:212
+msgid "Georgia"
+msgstr "Gürcistan"
+
+#: ../rules/base.xml.in.h:213
+msgid "German (Macintosh)"
+msgstr "Alman (Makintoş)"
+
+#: ../rules/base.xml.in.h:214
+msgid "German, Sun dead keys"
+msgstr "Almanca, Sun ölü tuşlar"
+
+#: ../rules/base.xml.in.h:215
+msgid "German, eliminate dead keys"
+msgstr "Almanca, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:216
+msgid "Germany"
+msgstr "Almanya"
+
+#: ../rules/base.xml.in.h:217
+msgid "Gha"
+msgstr "Gha"
+
+#: ../rules/base.xml.in.h:218
+msgid "Ghana"
+msgstr "Gana"
+
+#: ../rules/base.xml.in.h:219
+msgid "Gre"
+msgstr "Gre"
+
+#: ../rules/base.xml.in.h:220
+msgid "Greece"
+msgstr "Yunanistan"
+
+#: ../rules/base.xml.in.h:221
+msgid "Gujarati"
+msgstr "Batı Hint dili"
+
+#: ../rules/base.xml.in.h:222
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../rules/base.xml.in.h:223
+msgid "Gyration"
+msgstr "Çekimsel"
+
+#: ../rules/base.xml.in.h:224
+msgid "Hausa"
+msgstr "Havza"
+
+#: ../rules/base.xml.in.h:225
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Genel Ağ Klavyesi"
+
+#: ../rules/base.xml.in.h:226
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:227
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:228
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:229
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:230
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:231
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:232
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:233
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Çokluortam Klavyesi"
+
+#: ../rules/base.xml.in.h:234
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "Hewlett-Packard SK-2505 Genel Ağ Klavyesi"
+
+#: ../rules/base.xml.in.h:235
+msgid "Hindi Bolnagri"
+msgstr "Hindi Bolnagri"
+
+#: ../rules/base.xml.in.h:236
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:237
+msgid "Hrv"
+msgstr "Hrv"
+
+#: ../rules/base.xml.in.h:238 ../rules/sun.xml.in.h:59
+msgid "Hun"
+msgstr "Mcr"
+
+#: ../rules/base.xml.in.h:239
+msgid "Hungary"
+msgstr "Macaristan"
+
+#: ../rules/base.xml.in.h:240
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper, Pencere tuşlarına eşlenir."
+
+#: ../rules/base.xml.in.h:241
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:242
+msgid "IBM Rapid Access"
+msgstr "IBM Hızlı Erişim"
+
+#: ../rules/base.xml.in.h:243
+msgid "IBM Rapid Access II"
+msgstr "IBM Hızlı Erişim II"
+
+#: ../rules/base.xml.in.h:244
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Hızlı Erişim II (diğer seçenek)"
+
+#: ../rules/base.xml.in.h:245
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:246
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+
+#: ../rules/base.xml.in.h:247 ../rules/sun.xml.in.h:61
+msgid "ISO Alternate"
+msgstr "ISO diğer"
+
+#: ../rules/base.xml.in.h:248
+msgid "Iceland"
+msgstr "İzlanda"
+
+#: ../rules/base.xml.in.h:249
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../rules/base.xml.in.h:250
+msgid "Ind"
+msgstr "Ind"
+
+#: ../rules/base.xml.in.h:251
+msgid "India"
+msgstr "Hindistan"
+
+#: ../rules/base.xml.in.h:252 ../rules/sun.xml.in.h:62
+msgid "International (with dead keys)"
+msgstr "Uluslararası (ölü tuşlarla)"
+
+#: ../rules/base.xml.in.h:253
+msgid "Inuktitut"
+msgstr "Inuktitut"
+
+#: ../rules/base.xml.in.h:254
+msgid "Iran"
+msgstr "İran"
+
+#: ../rules/base.xml.in.h:255
+msgid "Iraq"
+msgstr "Irak"
+
+#: ../rules/base.xml.in.h:256
+msgid "Ireland"
+msgstr "İrlanda"
+
+#: ../rules/base.xml.in.h:257
+msgid "Irl"
+msgstr "İrl"
+
+#: ../rules/base.xml.in.h:258
+msgid "Irn"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:259
+msgid "Irq"
+msgstr "Irk"
+
+#: ../rules/base.xml.in.h:260
+msgid "Isl"
+msgstr "Izl"
+
+#: ../rules/base.xml.in.h:261
+msgid "Isr"
+msgstr "İbr"
+
+#: ../rules/base.xml.in.h:262
+msgid "Israel"
+msgstr "İsrail"
+
+#: ../rules/base.xml.in.h:263 ../rules/sun.xml.in.h:63
+msgid "Ita"
+msgstr "İta"
+
+#: ../rules/base.xml.in.h:264
+msgid "Italy"
+msgstr "İtalya"
+
+#: ../rules/base.xml.in.h:265
+msgid "Japan"
+msgstr "Japonya"
+
+#: ../rules/base.xml.in.h:266
+msgid "Japan (PC-98xx Series)"
+msgstr "Japon (PC-98xx Series)"
+
+#: ../rules/base.xml.in.h:267
+msgid "Japanese 106-key"
+msgstr "Japonca 106 tuşlu"
+
+#: ../rules/base.xml.in.h:268
+msgid "Japanese keyboard options"
+msgstr "Japonca klavye seçenekleri"
+
+#: ../rules/base.xml.in.h:269 ../rules/sun.xml.in.h:66
+msgid "Jpn"
+msgstr "Jpn"
+
+#: ../rules/base.xml.in.h:270
+msgid "Kana"
+msgstr "Kana"
+
+#: ../rules/base.xml.in.h:271
+msgid "Kana Lock key is locking"
+msgstr "Kana Lock tuşu kilitler"
+
+#: ../rules/base.xml.in.h:272
+msgid "Kannada"
+msgstr "Güney Hint dili"
+
+#: ../rules/base.xml.in.h:273
+msgid "Kashubian"
+msgstr "Kaşubyalı"
+
+#: ../rules/base.xml.in.h:274
+msgid "Kaz"
+msgstr "Kaz"
+
+#: ../rules/base.xml.in.h:275
+msgid "Kazakh with Russian"
+msgstr "Kazak (rus)"
+
+#: ../rules/base.xml.in.h:276
+msgid "Kazakhstan"
+msgstr "Kazakistan"
+
+#: ../rules/base.xml.in.h:277
+msgid "Keypad"
+msgstr "Tuştakımı"
+
+#: ../rules/base.xml.in.h:278
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:279
+msgid "Khm"
+msgstr "Kım"
+
+#: ../rules/base.xml.in.h:280
+msgid "Kor"
+msgstr "Kor"
+
+#: ../rules/base.xml.in.h:281
+msgid "Korea, Republic of"
+msgstr "Kore Cumhuriyeti"
+
+#: ../rules/base.xml.in.h:282
+msgid "Korean 106-key"
+msgstr "Korece 106 tuşlu"
+
+#: ../rules/base.xml.in.h:283
+msgid "Kotoistus"
+msgstr "Kotüstus"
+
+#: ../rules/base.xml.in.h:284
+msgid "Kurdish, (F)"
+msgstr "Kürtçe (Türkçe F klavye)"
+
+#: ../rules/base.xml.in.h:285
+msgid "Kurdish, Arabic-Latin"
+msgstr "Kürtçe (Arapça-Latin)"
+
+#: ../rules/base.xml.in.h:286
+msgid "Kurdish, Latin Alt-Q"
+msgstr "Kürtçe (Türkçe Alt-Q klavye)"
+
+#: ../rules/base.xml.in.h:287
+msgid "Kurdish, Latin Q"
+msgstr "Kürtçe (Türkçe Q klavye)"
+
+#: ../rules/base.xml.in.h:288
+msgid "Kyr"
+msgstr "Kır"
+
+#: ../rules/base.xml.in.h:289
+msgid "Kyrgyzstan"
+msgstr "Kırgızistan"
+
+#: ../rules/base.xml.in.h:290
+msgid "LAm"
+msgstr "LAm"
+
+#: ../rules/base.xml.in.h:291
+msgid "LCtrl+LShift change layout."
+msgstr "Ctrl+Shift tuşları yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:292
+msgid "Lao"
+msgstr "Lao"
+
+#: ../rules/base.xml.in.h:293
+msgid "Laos"
+msgstr "Laos"
+
+#: ../rules/base.xml.in.h:294
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Dizüstü/defter Compaq (örn. Armada) Dizüstü Klavyesi"
+
+#: ../rules/base.xml.in.h:295
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Dizüstü/defter Compaq (örn. Presario) Genel Ağ Klavyesi"
+
+#: ../rules/base.xml.in.h:296
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Dizüstü/defter eMachines m68xx"
+
+#: ../rules/base.xml.in.h:297
+msgid "Latin"
+msgstr "Latin"
+
+#: ../rules/base.xml.in.h:298
+msgid "Latin American"
+msgstr "Latin Amerikanca"
+
+#: ../rules/base.xml.in.h:299
+msgid "Latin Unicode"
+msgstr "Latin Unicode"
+
+#: ../rules/base.xml.in.h:300
+msgid "Latin Unicode qwerty"
+msgstr "Latin Unicode qwerty"
+
+#: ../rules/base.xml.in.h:301
+msgid "Latin qwerty"
+msgstr "Latin qwerty"
+
+#: ../rules/base.xml.in.h:302
+msgid "Latin with guillemets"
+msgstr "Açılı ayraçlarla Latin"
+
+#: ../rules/base.xml.in.h:303
+msgid "Latvia"
+msgstr "Letonya"
+
+#: ../rules/base.xml.in.h:304
+msgid "Layout switching"
+msgstr "Yerleşim değiştirme "
+
+#: ../rules/base.xml.in.h:305
+msgid "Left Alt is swapped with left Win-key."
+msgstr "Soydaki Alt tuşu ile soldaki Pencere tuşu yerdeğiştirir."
+
+#: ../rules/base.xml.in.h:306
+msgid "Left Alt key changes layout."
+msgstr "Soldaki Alt tuşu yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:307
+msgid "Left Alt key switches layout while pressed."
+msgstr "Soldaki Alt tuşu basılıyken diğer yerleşimi etkin olur."
+
+#: ../rules/base.xml.in.h:308
+msgid "Left Ctrl key changes layout."
+msgstr "Soldaki Ctrl tuşu yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:309
+msgid "Left Shift key changes layout."
+msgstr "Soldaki Shift tuşu yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:310
+msgid "Left Win-key changes layout."
+msgstr "Soldaki Pencere tuşu yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:311
+msgid "Left Win-key is Compose."
+msgstr "Soldaki Pencere tuşu karakter birleşimi yapar."
+
+#: ../rules/base.xml.in.h:312
+msgid "Left Win-key switches layout while pressed."
+msgstr "Soldaki Win tuşu basılıyken diğer yerleşim etkin olur."
+
+#: ../rules/base.xml.in.h:313
+msgid "Left hand"
+msgstr "Solak"
+
+#: ../rules/base.xml.in.h:314
+msgid "Left handed Dvorak"
+msgstr "Solak Dvorak"
+
+#: ../rules/base.xml.in.h:315
+msgid "Lithuania"
+msgstr "Litvanya"
+
+#: ../rules/base.xml.in.h:316
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
+
+#: ../rules/base.xml.in.h:317
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Kablosuz Masaüstü"
+
+#: ../rules/base.xml.in.h:318
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Kablosuz Masaüstü LX-300"
+
+#: ../rules/base.xml.in.h:319
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Kablosuz Masaüstü Tarayıcı"
+
+#: ../rules/base.xml.in.h:320
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Kablosuz Masaüstü Optik"
+
+#: ../rules/base.xml.in.h:321
+msgid "Logitech Cordless Desktop Pro"
+msgstr "Logitech Kablosuz Masaüstü Pro"
+
+#: ../rules/base.xml.in.h:322
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Logitech Kablosuz Masaüstü Pro (diğer seçenek)"
+
+#: ../rules/base.xml.in.h:323
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Kablosuz Masaüstü Pro (diğer 2. seçenek)"
+
+#: ../rules/base.xml.in.h:324
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Kablosuz Masaüstü iTouch"
+
+#: ../rules/base.xml.in.h:325
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Kablosuz Özgür/Masaüstü Tarayıcı"
+
+#: ../rules/base.xml.in.h:326
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15, G15daemon üzerinden ek tuşlu"
+
+#: ../rules/base.xml.in.h:327
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Genel Ağ Klavyesi"
+
+#: ../rules/base.xml.in.h:328
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Genel Ağ Tarayıcı Klavyesi"
+
+#: ../rules/base.xml.in.h:329
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
+
+#: ../rules/base.xml.in.h:330
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech Access Klavye"
+
+#: ../rules/base.xml.in.h:331
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:332
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Kablosuz Klavyesi (model Y-RB6)"
+
+#: ../rules/base.xml.in.h:333
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Genel Ağ Tarayıcı Klavyesi SE"
+
+#: ../rules/base.xml.in.h:334
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Genel Ağ Tarayıcı Klavyesi SE (USB)"
+
+#: ../rules/base.xml.in.h:335
+msgid "Ltu"
+msgstr "Ltu"
+
+#: ../rules/base.xml.in.h:336
+msgid "Lva"
+msgstr "Lva"
+
+#: ../rules/base.xml.in.h:337
+msgid "MESS"
+msgstr "MESS"
+
+#: ../rules/base.xml.in.h:338
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
+
+#: ../rules/base.xml.in.h:339
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (Uluslararası)"
+
+#: ../rules/base.xml.in.h:340
+msgid "Macedonia"
+msgstr "Makedonya"
+
+#: ../rules/base.xml.in.h:341
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:342
+msgid "Macintosh Old"
+msgstr "Eski Macintosh"
+
+#: ../rules/base.xml.in.h:343
+msgid "Macintosh, Sun dead keys"
+msgstr "Makintoş, Sun ölü tuşlar"
+
+#: ../rules/base.xml.in.h:344
+msgid "Macintosh, eliminate dead keys"
+msgstr "Makintoş, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:345
+msgid "Make CapsLock an additional Ctrl."
+msgstr "CapsLock tuşunu ek bir Ctrl tuşu yapar."
+
+#: ../rules/base.xml.in.h:346
+msgid "Mal"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:347
+msgid "Malayalam"
+msgstr "Malayalam dili"
+
+#: ../rules/base.xml.in.h:348
+msgid "Maldives"
+msgstr "Maldivler"
+
+#: ../rules/base.xml.in.h:349
+msgid "Malta"
+msgstr "Malta"
+
+#: ../rules/base.xml.in.h:350
+msgid "Maltese keyboard with US layout"
+msgstr "Ameriken yerleşimli Maltız klavyesi"
+
+#: ../rules/base.xml.in.h:351
+msgid "Mao"
+msgstr "Mao"
+
+#: ../rules/base.xml.in.h:352
+msgid "Maori"
+msgstr "Mayorka"
+
+#: ../rules/base.xml.in.h:353
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:354
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ Erişim Klavyesi"
+
+#: ../rules/base.xml.in.h:355
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:356
+msgid "Menu is Compose."
+msgstr "Menü tuşu karakter birleşimi yapar."
+
+#: ../rules/base.xml.in.h:357
+msgid "Menu key changes layout."
+msgstr "Menü tuşu yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:358
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta, Win tuşları ile eşleştirilir."
+
+#: ../rules/base.xml.in.h:359
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta, soldaki Win tuşu ile eşleştirilir."
+
+#: ../rules/base.xml.in.h:360
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Genel Ağ Klavyesi"
+
+#: ../rules/base.xml.in.h:361
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Genel Ağ Klavyesi Pro, İsveçce"
+
+#: ../rules/base.xml.in.h:362
+msgid "Microsoft Natural"
+msgstr "Microsoft Basit"
+
+#: ../rules/base.xml.in.h:363
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Basit Klavye Pro / Microsoft Genel Ağ Klavyesi Pro"
+
+#: ../rules/base.xml.in.h:364
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Basit Klavye Pro OEM"
+
+#: ../rules/base.xml.in.h:365
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:366
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Ofis Klavyesi"
+
+#: ../rules/base.xml.in.h:367
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+
+#: ../rules/base.xml.in.h:368 ../rules/sun.xml.in.h:72
+msgid "Miscellaneous compatibility options"
+msgstr "Çeşitli uyumluluk seçenekleri"
+
+#: ../rules/base.xml.in.h:369
+msgid "Mkd"
+msgstr "Mkd"
+
+#: ../rules/base.xml.in.h:370
+msgid "Mlt"
+msgstr "Mlt"
+
+#: ../rules/base.xml.in.h:371
+msgid "Mmr"
+msgstr "Mmr"
+
+#: ../rules/base.xml.in.h:372
+msgid "Mng"
+msgstr "Moğ"
+
+#: ../rules/base.xml.in.h:373
+msgid "Mongolia"
+msgstr "Moğolistan"
+
+#: ../rules/base.xml.in.h:374
+msgid "Morocco"
+msgstr "Fas"
+
+#: ../rules/base.xml.in.h:375 ../rules/sun.xml.in.h:73
+msgid "Multilingual"
+msgstr "Çokdilli"
+
+#: ../rules/base.xml.in.h:376
+msgid "Multilingual, first part"
+msgstr "Çokdilli, ilk bölüm"
+
+#: ../rules/base.xml.in.h:377 ../rules/sun.xml.in.h:74
+msgid "Multilingual, second part"
+msgstr "Çokdilli, ikinci bölüm"
+
+#: ../rules/base.xml.in.h:378
+msgid "Myanmar"
+msgstr "Miyanmar"
+
+#: ../rules/base.xml.in.h:379
+msgid "NICOLA-F style Backspace"
+msgstr "NICOLA-F tarzı Gerisilme"
+
+#: ../rules/base.xml.in.h:380
+msgid "Neostyle"
+msgstr "Yenitarz"
+
+#: ../rules/base.xml.in.h:381
+msgid "Nep"
+msgstr "Nep"
+
+#: ../rules/base.xml.in.h:382
+msgid "Nepal"
+msgstr "Nepal"
+
+#: ../rules/base.xml.in.h:383
+msgid "Netherlands"
+msgstr "Hollanda"
+
+#: ../rules/base.xml.in.h:384
+msgid "Nig"
+msgstr "Nij"
+
+#: ../rules/base.xml.in.h:385
+msgid "Nigeria"
+msgstr "Nijerya"
+
+#: ../rules/base.xml.in.h:386
+msgid "Nld"
+msgstr "Hol"
+
+#: ../rules/base.xml.in.h:387 ../rules/sun.xml.in.h:75
+msgid "Nor"
+msgstr "Nor"
+
+#: ../rules/base.xml.in.h:388
+msgid "Northern Saami"
+msgstr "Kuzey Sami"
+
+#: ../rules/base.xml.in.h:389
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Kuzey Sami, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:390
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:391
+msgid "Norway"
+msgstr "Norveç"
+
+#: ../rules/base.xml.in.h:392
+msgid "NumLock LED shows alternative layout."
+msgstr "Num_Lock LED'i diğer yerleşimi gösterir."
+
+#: ../rules/base.xml.in.h:393
+msgid "Numeric keypad keys work as with Mac."
+msgstr "Tuştakımı Mac gibi çalışır."
+
+#: ../rules/base.xml.in.h:394
+msgid "Numeric keypad layout selection"
+msgstr "Sayısal tuştakımı yerleşimi seçimi"
+
+#: ../rules/base.xml.in.h:395
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:396
+msgid "Ogham"
+msgstr "Ogham"
+
+#: ../rules/base.xml.in.h:397
+msgid "Ogham IS434"
+msgstr "Ogham IS434"
+
+#: ../rules/base.xml.in.h:398
+msgid "Oriya"
+msgstr "Orissa dili"
+
+#: ../rules/base.xml.in.h:399
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Oretec MCK-800 MM/Genel Ağ Klavyesi"
+
+#: ../rules/base.xml.in.h:400
+msgid "Ossetian"
+msgstr "Osetya"
+
+#: ../rules/base.xml.in.h:401
+msgid "Ossetian, Winkeys"
+msgstr "Osetya, Pencere tuşları"
+
+#: ../rules/base.xml.in.h:402
+msgid "PC-98xx Series"
+msgstr "PC-98xx Serisi"
+
+#: ../rules/base.xml.in.h:403
+msgid "Pak"
+msgstr "Pak"
+
+#: ../rules/base.xml.in.h:404
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: ../rules/base.xml.in.h:405
+msgid "Pashto"
+msgstr "Paşto"
+
+#: ../rules/base.xml.in.h:406
+msgid "Pattachote"
+msgstr "Pataküte"
+
+#: ../rules/base.xml.in.h:407 ../rules/sun.xml.in.h:78
+msgid "Phonetic"
+msgstr "Fonetik"
+
+#: ../rules/base.xml.in.h:408 ../rules/sun.xml.in.h:79
+msgid "Pol"
+msgstr "Pol"
+
+#: ../rules/base.xml.in.h:409
+msgid "Poland"
+msgstr "Polonya"
+
+#: ../rules/base.xml.in.h:410
+msgid "Polytonic"
+msgstr "Politonik"
+
+#: ../rules/base.xml.in.h:411
+msgid "Portugal"
+msgstr "Portekiz"
+
+#: ../rules/base.xml.in.h:412
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "3. seviyeyi seçmek için soldaki Alt tuşuna basın."
+
+#: ../rules/base.xml.in.h:413
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "3. seviyeyi seçmek için soldaki Win tuşuna basın."
+
+#: ../rules/base.xml.in.h:414
+msgid "Press Menu key to choose 3rd level."
+msgstr "3. seviyeyi seçmek için Menü tuşuna basın."
+
+#: ../rules/base.xml.in.h:415
+msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr "3. seviyeyi seçmek için sağdaki Alt tuşuna basın, Sağdaki Alt tuşuyla birlikte Shift tuşu AltGr gibi davranır."
+
+#: ../rules/base.xml.in.h:416
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "3. seviyeyi seçmek için sağdaki Alt tuşuna basın."
+
+#: ../rules/base.xml.in.h:417
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "3. seviyeyi seçmek için sağdaki Ctrl tuşuna basın."
+
+#: ../rules/base.xml.in.h:418
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "3. seviyeyi seçmek için sağdaki Win tuşuna basın."
+
+#: ../rules/base.xml.in.h:419
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "3. seviyeyi seçmek için Alt tuşlarından birine basın."
+
+#: ../rules/base.xml.in.h:420
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "3. seviyeyi seçmek için Win tuşlarından birine basın."
+
+#: ../rules/base.xml.in.h:421
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:422
+msgid "Pro Keypad"
+msgstr "Pro Klavye"
+
+#: ../rules/base.xml.in.h:423
+msgid "Probhat"
+msgstr "Probat"
+
+#: ../rules/base.xml.in.h:424
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:425 ../rules/sun.xml.in.h:88
+msgid "Prt"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:426
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:427
+msgid "R-Alt switches layout while pressed."
+msgstr "Sağdaki Alt tuşu basılıyken diğer yerleşim etkin olur."
+
+#: ../rules/base.xml.in.h:428
+msgid "Right Alt is Compose."
+msgstr "Sağdaki Alt tuşu karakter birleşimi yapar."
+
+#: ../rules/base.xml.in.h:429
+msgid "Right Alt key changes layout."
+msgstr "Sağdaki Alt tuşu yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:430 ../rules/sun.xml.in.h:90
+msgid "Right Alt key never chooses 3rd level."
+msgstr "Sağdaki Alt tuşu 3. seviyeyi asla seçmez."
+
+#: ../rules/base.xml.in.h:431
+msgid "Right Ctrl is Compose."
+msgstr "Sağdaki Ctrl tuşu karakter birleşimi yapar."
+
+#: ../rules/base.xml.in.h:432
+msgid "Right Ctrl key changes layout."
+msgstr "Sağdaki Ctrl tuşu yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:433
+msgid "Right Ctrl key switches layout while pressed."
+msgstr "Sağdaki Ctrl tuşu basılıyken diğer yerleşim etkin olur."
+
+#: ../rules/base.xml.in.h:434
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Sağdaki Ctrl tuşu sağdaki Alt tuşu gibi çalışır."
+
+#: ../rules/base.xml.in.h:435
+msgid "Right Shift key changes layout."
+msgstr "Sağdaki Shift tuşu yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:436
+msgid "Right Win-key changes layout."
+msgstr "Sağdaki Win tuşu yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:437
+msgid "Right Win-key is Compose."
+msgstr "Sağdaki Win tuşu karakter birleşimi yapar."
+
+#: ../rules/base.xml.in.h:438
+msgid "Right Win-key switches layout while pressed."
+msgstr "Sağdaki Win tuşu basılıyken diğer yerleşim etkin olur."
+
+#: ../rules/base.xml.in.h:439
+msgid "Right hand"
+msgstr "Sağ el"
+
+#: ../rules/base.xml.in.h:440
+msgid "Right handed Dvorak"
+msgstr "Sağ elle Dvorak"
+
+#: ../rules/base.xml.in.h:441
+msgid "Romania"
+msgstr "Romenya"
+
+#: ../rules/base.xml.in.h:442
+msgid "Romanian keyboard with German letters"
+msgstr "Alman harfleriyle Romanya klavyesi"
+
+#: ../rules/base.xml.in.h:443
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Alman harfleriyle Romanya klavyesi, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:444
+msgid "Rou"
+msgstr "Rou"
+
+#: ../rules/base.xml.in.h:445 ../rules/sun.xml.in.h:95
+msgid "Rus"
+msgstr "Rus"
+
+#: ../rules/base.xml.in.h:446
+msgid "Russia"
+msgstr "Rusya"
+
+#: ../rules/base.xml.in.h:447 ../rules/sun.xml.in.h:96
+msgid "Russian"
+msgstr "Rusça"
+
+#: ../rules/base.xml.in.h:448
+msgid "Russian phonetic"
+msgstr "Rusça fonetik"
+
+#: ../rules/base.xml.in.h:449
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Rusça fonetik, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:450
+msgid "Russian with Kazakh"
+msgstr "Rusça (kazak)"
+
+#: ../rules/base.xml.in.h:451
+msgid "SCG"
+msgstr "SCG"
+
+#: ../rules/base.xml.in.h:452
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Çokluortam Kablosuz Klavyesi"
+
+#: ../rules/base.xml.in.h:453
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:454
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:455
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:456
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:457
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomik 2500"
+
+#: ../rules/base.xml.in.h:458
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:459
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:460
+msgid "ScrollLock LED shows alternative layout."
+msgstr "Scroll_Lock LED'i diğer yerleşimi gösterir."
+
+#: ../rules/base.xml.in.h:461
+msgid "Serbia and Montenegro"
+msgstr "Sırbistan ve Karadağ"
+
+#: ../rules/base.xml.in.h:462
+msgid "Shift with numeric keypad keys works as in MS Windows."
+msgstr "Sayısal tuştakımı Shift ile  MS Windows'daki gibi çalışır."
+
+#: ../rules/base.xml.in.h:463
+msgid "Shift+CapsLock changes layout."
+msgstr "Shift+CapsLock tuşları yerleşimi değiştirir."
+
+#: ../rules/base.xml.in.h:464
+msgid "Slovakia"
+msgstr "Slovakya"
+
+#: ../rules/base.xml.in.h:465
+msgid "Slovenia"
+msgstr "Slovenya"
+
+#: ../rules/base.xml.in.h:466
+msgid "South Africa"
+msgstr "Güney Afrika"
+
+#: ../rules/base.xml.in.h:467
+msgid "Southern Uzbek"
+msgstr "Güney Özbekistan"
+
+#: ../rules/base.xml.in.h:468
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Boşluk tuşu nobreakspace'i dördüncü seviyede çıktılar, altıncı seviyede incesini basar"
+
+#: ../rules/base.xml.in.h:469
+msgid "Space key outputs non-breakable space character at fourth level."
+msgstr "Boşluk tuşu nobreakspace'i dördüncü seviyede çıktılar."
+
+#: ../rules/base.xml.in.h:470
+msgid "Space key outputs non-breakable space character at second level."
+msgstr "Boşluk tuşu nobreakspace'i ikinci seviyede çıktılar."
+
+#: ../rules/base.xml.in.h:471
+msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
+msgstr "Boşluk tuşu nobreakspace'i dördüncü seviyede çıktılar, üçüncü işlevsizdir."
+
+#: ../rules/base.xml.in.h:472
+msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Boşluk tuşu üçüncü seviyede nobreakspace basar, dördüncü seviyede incesini basar"
+
+#: ../rules/base.xml.in.h:473
+msgid "Space key outputs non-breakable space character at third level."
+msgstr "Boşluk tuşu nobreakspace'i üçüncü seviyede çıktılar."
+
+#: ../rules/base.xml.in.h:474
+msgid "Space key outputs usual space at any level."
+msgstr "Boşluk tuşu her seviyede boşluk basar (nobreakspace basmaz)."
+
+#: ../rules/base.xml.in.h:475
+msgid "Spain"
+msgstr "İspanya"
+
+#: ../rules/base.xml.in.h:476 ../rules/sun.xml.in.h:103
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Bir sunucuda elde edilen özel tuşlar (Ctrl+Alt+&lt;tuş&gt;)"
+
+#: ../rules/base.xml.in.h:477
+msgid "SrL"
+msgstr "SrL"
+
+#: ../rules/base.xml.in.h:478
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#: ../rules/base.xml.in.h:479 ../rules/sun.xml.in.h:104
+msgid "Standard"
+msgstr "Standart"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:481
+msgid "Standard RSTU"
+msgstr "Standart RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:483
+msgid "Standard RSTU on Russian layout"
+msgstr "Rusça yerleşimde standart RSTU"
+
+#: ../rules/base.xml.in.h:484 ../rules/sun.xml.in.h:112
+msgid "Sun dead keys"
+msgstr "Sun ölü tuşlar"
+
+#: ../rules/base.xml.in.h:485
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:486
+msgid "Super is mapped to the Win-keys."
+msgstr "Super, Pencere tuşlarına eşlenir."
+
+#: ../rules/base.xml.in.h:487
+msgid "Svdvorak"
+msgstr "Svdvorak"
+
+#: ../rules/base.xml.in.h:488 ../rules/sun.xml.in.h:113
+msgid "Svk"
+msgstr "Svk"
+
+#: ../rules/base.xml.in.h:489
+msgid "Svn"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:490
+msgid "Swap Ctrl and CapsLock."
+msgstr "Ctrl ile Caps Lock yer değiştirir."
+
+#: ../rules/base.xml.in.h:491
+msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+msgstr "Makintoş klavyeler çekirdek tarafından algılanamadığında iki seviyeli tuş kodlarına geçilir."
+
+#: ../rules/base.xml.in.h:492 ../rules/sun.xml.in.h:115
+msgid "Swe"
+msgstr "İsve"
+
+#: ../rules/base.xml.in.h:493
+msgid "Sweden"
+msgstr "İsveç"
+
+#: ../rules/base.xml.in.h:494
+msgid "Switzerland"
+msgstr "İsviçre"
+
+#: ../rules/base.xml.in.h:495
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:496
+msgid "Syr"
+msgstr "Sur"
+
+#: ../rules/base.xml.in.h:497
+msgid "Syria"
+msgstr "Suriye"
+
+#: ../rules/base.xml.in.h:498
+msgid "Syriac"
+msgstr "Suriye"
+
+#: ../rules/base.xml.in.h:499
+msgid "Syriac phonetic"
+msgstr "Suriye fonetik"
+
+#: ../rules/base.xml.in.h:500
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:501
+msgid "Tajikistan"
+msgstr "Tacikistan"
+
+#: ../rules/base.xml.in.h:502
+msgid "Tamil"
+msgstr "Tamil dili"
+
+#: ../rules/base.xml.in.h:503
+msgid "Tamil TAB Typewriter"
+msgstr "Tamil TAB Daktilo"
+
+#: ../rules/base.xml.in.h:504
+msgid "Tamil TSCII Typewriter"
+msgstr "Tamil TSCII Daktilo"
+
+#: ../rules/base.xml.in.h:505
+msgid "Tamil Unicode"
+msgstr "Tamil Unicode"
+
+#: ../rules/base.xml.in.h:506
+msgid "Tatar"
+msgstr "Tatar"
+
+#: ../rules/base.xml.in.h:507
+msgid "Telugu"
+msgstr "Telugu dili"
+
+#: ../rules/base.xml.in.h:508
+msgid "Tha"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:509
+msgid "Thailand"
+msgstr "Tayland"
+
+#: ../rules/base.xml.in.h:510 ../rules/sun.xml.in.h:119
+msgid "Third level choosers"
+msgstr "3. seviye seçiciler"
+
+#: ../rules/base.xml.in.h:511
+msgid "Tifinagh"
+msgstr "Tifinagh"
+
+#: ../rules/base.xml.in.h:512
+msgid "Tifinagh Alternative"
+msgstr "Tifinagh Diğer"
+
+#: ../rules/base.xml.in.h:513
+msgid "Tifinagh Alternative Phonetic"
+msgstr "Tifinagh Diğer Fonetik"
+
+#: ../rules/base.xml.in.h:514
+msgid "Tifinagh Extended"
+msgstr "Tifinagh Gelişkin"
+
+#: ../rules/base.xml.in.h:515
+msgid "Tifinagh Extended Phonetic"
+msgstr "Tifinagh Gelişmiş Fonetik"
+
+#: ../rules/base.xml.in.h:516
+msgid "Tifinagh Phonetic"
+msgstr "Tifinagh Fonetik"
+
+#: ../rules/base.xml.in.h:517
+msgid "Tilde (~) variant"
+msgstr "Tilde (~) tuşlu"
+
+#: ../rules/base.xml.in.h:518
+msgid "Tjk"
+msgstr "Tck"
+
+#: ../rules/base.xml.in.h:519
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:520
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Doğrudan Erişimli Klavye"
+
+#: ../rules/base.xml.in.h:521
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Kablosuz Klasik Klavye"
+
+#: ../rules/base.xml.in.h:522 ../rules/sun.xml.in.h:120
+msgid "Tur"
+msgstr "Trk"
+
+#: ../rules/base.xml.in.h:523
+msgid "Turkey"
+msgstr "Türkiye"
+
+#: ../rules/base.xml.in.h:524
+msgid "Typewriter"
+msgstr "Daktilo"
+
+#: ../rules/base.xml.in.h:525 ../rules/sun.xml.in.h:124
+msgid "U.S. English"
+msgstr "Amerikan ingilizcesi"
+
+#: ../rules/base.xml.in.h:526
+msgid "US keyboard with Bosnian digraphs"
+msgstr "Bosna ikil harfleriyle amerikan klavyesi"
+
+#: ../rules/base.xml.in.h:527
+msgid "US keyboard with Bosnian letters"
+msgstr "Bosna harfleriyle amerikan klavyesi"
+
+#: ../rules/base.xml.in.h:528
+msgid "US keyboard with Croatian digraphs"
+msgstr "Hırvat ikil harfleriyle amerikan klavyesi"
+
+#: ../rules/base.xml.in.h:529
+msgid "US keyboard with Croatian letters"
+msgstr "Hırvat harfleriyle amerikan klavyesi"
+
+#: ../rules/base.xml.in.h:530
+msgid "US keyboard with Lithuanian letters"
+msgstr "Litvanya harfleriyle amerikan klavyesi"
+
+#: ../rules/base.xml.in.h:531
+msgid "US keyboard with Slovenian digraphs"
+msgstr "Sloven ikil harfleriyle amerikan klavyesi"
+
+#: ../rules/base.xml.in.h:532
+msgid "US keyboard with Slovenian letters"
+msgstr "Sloven harfleriyle amerikan klavyesi"
+
+#: ../rules/base.xml.in.h:533 ../rules/sun.xml.in.h:126
+msgid "USA"
+msgstr "ABD"
+
+#: ../rules/base.xml.in.h:534
+msgid "Udmurt"
+msgstr "Udmurt"
+
+#: ../rules/base.xml.in.h:535
+msgid "Ukr"
+msgstr "Ukr"
+
+#: ../rules/base.xml.in.h:536
+msgid "Ukraine"
+msgstr "Ukrayna"
+
+#: ../rules/base.xml.in.h:537
+msgid "UnicodeExpert"
+msgstr "Unicode Uzman"
+
+#: ../rules/base.xml.in.h:538 ../rules/sun.xml.in.h:127
+msgid "United Kingdom"
+msgstr "İngiltere"
+
+#: ../rules/base.xml.in.h:539
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../rules/base.xml.in.h:540
+msgid "Use Bosnian digraphs"
+msgstr "Bosna ikil harflerini kullanır"
+
+#: ../rules/base.xml.in.h:541
+msgid "Use Croatian digraphs"
+msgstr "Hırvat ikil harflerini kullanır"
+
+#: ../rules/base.xml.in.h:542
+msgid "Use Slovenian digraphs"
+msgstr "Sloven ikil harflerini kullanır"
+
+#: ../rules/base.xml.in.h:543
+msgid "Use guillemets for quotes"
+msgstr "Tırnakların yerine açılı ayraçlar kullanılır"
+
+#: ../rules/base.xml.in.h:544
+msgid "Use keyboard LED to show alternative layout."
+msgstr "Diğer yerleşimi göstermek için klavye LED'i kullanılır."
+
+#: ../rules/base.xml.in.h:545
+msgid "Use keypad with unicode additions (arrows and math operators)"
+msgstr "Tuştakımı Unicode eklentileri ile kullanılır (ok ve aritmetik tuşları)"
+
+#: ../rules/base.xml.in.h:546
+msgid "Using space key to input non-breakable space character"
+msgstr "nobreakspace'i yazmak için boşluk tuşu kullanımı"
+
+#: ../rules/base.xml.in.h:547
+msgid "Uzb"
+msgstr "Özb"
+
+#: ../rules/base.xml.in.h:548
+msgid "Uzbekistan"
+msgstr "Özbekistan"
+
+#: ../rules/base.xml.in.h:549
+msgid "Vietnam"
+msgstr "Vietnam"
+
+#: ../rules/base.xml.in.h:550
+msgid "Vnm"
+msgstr "Vnm"
+
+#: ../rules/base.xml.in.h:551
+msgid "Wang model 724 azerty"
+msgstr "Wang model 724 azerty"
+
+#: ../rules/base.xml.in.h:552
+msgid "Western"
+msgstr "Batı"
+
+#: ../rules/base.xml.in.h:553
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:554
+msgid "Winkeys"
+msgstr "Win tuşları"
+
+#: ../rules/base.xml.in.h:555
+msgid "With &lt;\\|&gt; key"
+msgstr "&lt;\\|&gt; tuşuyla"
+
+#: ../rules/base.xml.in.h:556
+msgid "With EuroSign on 5"
+msgstr "€ sembolü ile 5 tuşu"
+
+#: ../rules/base.xml.in.h:557
+msgid "With guillemets"
+msgstr "Açılı ayraçlarla"
+
+#: ../rules/base.xml.in.h:558
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Genel Ağ Klavyesi"
+
+#: ../rules/base.xml.in.h:559
+msgid "Yoruba"
+msgstr "Yoruba"
+
+#: ../rules/base.xml.in.h:560
+msgid "Z and ZHE swapped"
+msgstr "Z ile ZHE yer değiştirir"
+
+#: ../rules/base.xml.in.h:561
+msgid "Zar"
+msgstr "Zar"
+
+#: ../rules/base.xml.in.h:562
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:563
+msgid "azerty/digits"
+msgstr "azerty/rakamlar"
+
+#: ../rules/base.xml.in.h:564
+msgid "digits"
+msgstr "rakamlar"
+
+#: ../rules/base.xml.in.h:565
+msgid "displaced semicolon and quote (obsolete)"
+msgstr "noktalı virgül ve çift tırnak kalkar (atıl)"
+
+#: ../rules/base.xml.in.h:566
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:567 ../rules/sun.xml.in.h:132
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:568
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, galişmiş Gerisilme"
+
+#: ../rules/base.xml.in.h:569
+msgid "qwerty/digits"
+msgstr "qwerty/rakamlar"
+
+#: ../rules/base.xml.in.h:570
+msgid "qwertz"
+msgstr "qwertz"
+
+#: ../rules/sun.xml.in.h:1
+msgid "\"Typewriter\""
+msgstr "\"Daktilo\""
+
+#: ../rules/sun.xml.in.h:17
+msgid "Acts as Shift with locking. Shift cancels Caps."
+msgstr "Caps Lock kilitlemeli Shift tuşu gibi çalışır. Shift tuşu ise Caps Lock tuşunu keser."
+
+#: ../rules/sun.xml.in.h:18
+msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
+msgstr "Caps Lock kilitlemeli Shift tuşu gibi çalışır. Shift tuşu Caps Lock'u kesmez"
+
+#: ../rules/sun.xml.in.h:19
+msgid "Alt+Control changes group"
+msgstr "Alt+Ctrl grubu değiştirir."
+
+#: ../rules/sun.xml.in.h:20
+msgid "Alt+Shift changes group"
+msgstr "Alt+Shift  grubu değiştirir."
+
+#: ../rules/sun.xml.in.h:21
+msgid "Basic"
+msgstr "Temel"
+
+#: ../rules/sun.xml.in.h:23
+msgid "Belgian"
+msgstr "Belçikaca"
+
+#: ../rules/sun.xml.in.h:25
+msgid "Both Alt keys together change group"
+msgstr "Alt tuşları birlikte grubu değiştirir"
+
+#: ../rules/sun.xml.in.h:26
+msgid "Both Ctrl keys together change group"
+msgstr "Ctrl tuşları birlikte grubu değiştirir"
+
+#: ../rules/sun.xml.in.h:27
+msgid "Both Shift keys together change group"
+msgstr "Shift tuşları birlikte grubu değiştirir"
+
+#: ../rules/sun.xml.in.h:28
+msgid "Bulgarian"
+msgstr "Bulgarca"
+
+#: ../rules/sun.xml.in.h:30
+msgid "Canadian"
+msgstr "Kanadaca"
+
+#: ../rules/sun.xml.in.h:31
+msgid "Caps Lock is Compose"
+msgstr "CapsLock tuşu karakter birleşimi yapar"
+
+#: ../rules/sun.xml.in.h:32
+msgid "Caps Lock key changes group"
+msgstr "Caps Lock tuşu grubu değiştirir"
+
+#: ../rules/sun.xml.in.h:34
+msgid "Caps_Lock LED shows alternative group"
+msgstr "Caps Lock LED'i diğer grubu gösterir"
+
+#: ../rules/sun.xml.in.h:35
+msgid "Control Key Position"
+msgstr "Ctrl tuşunun yeri"
+
+#: ../rules/sun.xml.in.h:36
+msgid "Control key at bottom left"
+msgstr "Sol alttaki Ctrl tuşu"
+
+#: ../rules/sun.xml.in.h:37
+msgid "Control key at left of 'A'"
+msgstr "'A'nın solundaki Ctrl Tuşu"
+
+#: ../rules/sun.xml.in.h:38
+msgid "Control+Shift changes group"
+msgstr "Ctrl+Shift tuşları grubu değiştirir"
+
+#: ../rules/sun.xml.in.h:40
+msgid "Czech"
+msgstr "Çekçe"
+
+#: ../rules/sun.xml.in.h:41
+msgid "Danish"
+msgstr "Danca"
+
+#: ../rules/sun.xml.in.h:45
+msgid "DeuCH"
+msgstr "DeuCH"
+
+#: ../rules/sun.xml.in.h:47
+msgid "Dvo"
+msgstr "Dvo"
+
+#: ../rules/sun.xml.in.h:52
+msgid "Finnish"
+msgstr "Fince"
+
+#: ../rules/sun.xml.in.h:54
+msgid "FraCH"
+msgstr "FraCH"
+
+#: ../rules/sun.xml.in.h:57
+msgid "German"
+msgstr "Almanca"
+
+#: ../rules/sun.xml.in.h:58
+msgid "Group Shift/Lock behavior"
+msgstr "Shift/Lock Grubu davranışı"
+
+#: ../rules/sun.xml.in.h:60
+msgid "Hungarian"
+msgstr "Macarca"
+
+#: ../rules/sun.xml.in.h:64
+msgid "Italian"
+msgstr "İtalyanca"
+
+#: ../rules/sun.xml.in.h:65
+msgid "Japanese"
+msgstr "Japonca"
+
+#: ../rules/sun.xml.in.h:67
+msgid "Left Alt key changes group"
+msgstr "Soldaki Alt tuşu grubu değiştirir"
+
+#: ../rules/sun.xml.in.h:68
+msgid "Left Alt key switches group while pressed"
+msgstr "Soldaki Alt tuşu basılıyken diğer grup etkin olur"
+
+#: ../rules/sun.xml.in.h:69
+msgid "Left Ctrl key changes group"
+msgstr "Soldaki Ctrl tuşu grubu değiştirir"
+
+#: ../rules/sun.xml.in.h:70
+msgid "Left Shift key changes group"
+msgstr "Soldaki Shift tuşu grubu değiştirir"
+
+#: ../rules/sun.xml.in.h:71
+msgid "Make CapsLock an additional Control"
+msgstr "CapsLock tuşunu ek bir Ctrl tuşu yapar"
+
+#: ../rules/sun.xml.in.h:76
+msgid "Norwegian"
+msgstr "Norveçce"
+
+#: ../rules/sun.xml.in.h:77
+msgid "Num_Lock LED shows alternative group"
+msgstr "Num_Lock LED'i diğer grubu gösterir"
+
+#: ../rules/sun.xml.in.h:80
+msgid "Polish"
+msgstr "Polonez"
+
+#: ../rules/sun.xml.in.h:81
+msgid "Polish with Polish quotes on key \"1/!\""
+msgstr "Lehçe, \"1/!\" tuşunda Lehçe tırnaklar"
+
+#: ../rules/sun.xml.in.h:82
+msgid "Portuguese"
+msgstr "Portekizce"
+
+#: ../rules/sun.xml.in.h:83
+msgid "Press Left Alt key to choose 3rd level"
+msgstr "3. seviyeyi seçmek için soldaki Alt tuşuna basın"
+
+#: ../rules/sun.xml.in.h:84
+msgid "Press Right Alt key to choose 3rd level"
+msgstr "3. seviyeyi seçmek için sağdaki Alt tuşuna basın"
+
+#: ../rules/sun.xml.in.h:85
+msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
+msgstr "3. seviyeyi seçmek için sağdaki Alt tuşuna basın, Sağdaki Alt tuşuyla birlikte Shift tuşu AltGr gibi davranır"
+
+#: ../rules/sun.xml.in.h:86
+msgid "Press Right Control to choose 3rd level"
+msgstr "3. seviyeyi seçmek için sağdaki Ctrl tuşuna basın"
+
+#: ../rules/sun.xml.in.h:87
+msgid "Press any of Alt keys to choose 3rd level"
+msgstr "3. seviyeyi seçmek için Alt tuşlarından birine basın"
+
+#: ../rules/sun.xml.in.h:89
+msgid "Right Alt key changes group"
+msgstr "Sağdaki Alt tuşu grubu değiştirir"
+
+#: ../rules/sun.xml.in.h:91
+msgid "Right Alt switches group while pressed"
+msgstr "Sağdaki Alt tuşu basılıyken diğer grup etkin olur"
+
+#: ../rules/sun.xml.in.h:92
+msgid "Right Control key works as Right Alt"
+msgstr "Sağdaki Ctrl tuşu sağdaki Alt tuşu gibi çalışır"
+
+#: ../rules/sun.xml.in.h:93
+msgid "Right Ctrl key changes group"
+msgstr "Sağdaki Ctrl tuşu grubu değiştirir"
+
+#: ../rules/sun.xml.in.h:94
+msgid "Right Shift key changes group"
+msgstr "Sağdaki Shift tuşu grubu değiştirir"
+
+#: ../rules/sun.xml.in.h:97
+msgid "Scroll Lock changes group"
+msgstr "Scroll Lock grubu değiştirir"
+
+#: ../rules/sun.xml.in.h:98
+msgid "Scroll_Lock LED shows alternative group"
+msgstr "Scroll_Lock LED'i diğer grubu gösterir"
+
+#: ../rules/sun.xml.in.h:99
+msgid "Shift with numpad keys works as in MS Windows"
+msgstr "Sayısal tuştakımı Shift ile  MS Windows'daki gibi çalışır"
+
+#: ../rules/sun.xml.in.h:100
+msgid "Shift+CapsLock changes group"
+msgstr "Shift+CapsLock tuşları grubu değiştirir"
+
+#: ../rules/sun.xml.in.h:101
+msgid "Slovak"
+msgstr "Slovakça"
+
+#: ../rules/sun.xml.in.h:102
+msgid "Spanish"
+msgstr "İspanyolca"
+
+#: ../rules/sun.xml.in.h:105
+msgid "Sun Type 4"
+msgstr "Sun 4. tür"
+
+#: ../rules/sun.xml.in.h:106
+msgid "Sun Type 5"
+msgstr "Sun 5. Tür"
+
+#: ../rules/sun.xml.in.h:107
+msgid "Sun Type 5 European"
+msgstr "Sun 5. tür Avrupa"
+
+#: ../rules/sun.xml.in.h:108
+msgid "Sun Type 5 Unix"
+msgstr "Sun 5. tür, Unix"
+
+#: ../rules/sun.xml.in.h:109
+msgid "Sun Type 6"
+msgstr "Sun 6. tür"
+
+#: ../rules/sun.xml.in.h:110
+msgid "Sun Type 6 Unix"
+msgstr "Sun 6. tür, Unix"
+
+#: ../rules/sun.xml.in.h:111
+msgid "Sun Type 6 with Euro key"
+msgstr "Sun 6. Tür, € tuşlu"
+
+#: ../rules/sun.xml.in.h:114
+msgid "Swap Control and Caps Lock"
+msgstr "Ctrl ile Caps Lock yer değiştirir"
+
+#: ../rules/sun.xml.in.h:116
+msgid "Swedish"
+msgstr "İsveçce"
+
+#: ../rules/sun.xml.in.h:117
+msgid "Swiss French"
+msgstr "İsviçre Fransızcası"
+
+#: ../rules/sun.xml.in.h:118
+msgid "Swiss German"
+msgstr "İsviçre Almancası"
+
+#: ../rules/sun.xml.in.h:121
+msgid "Turkish"
+msgstr "Türkçe Q Klavye"
+
+#: ../rules/sun.xml.in.h:122
+msgid "Turkish (F)"
+msgstr "Türkçe F klavye"
+
+#: ../rules/sun.xml.in.h:123
+msgid "Turkish Alt-Q Layout"
+msgstr "Türkçe Alt-Q (yazılımcılar ve dizüstü) klavye"
+
+#: ../rules/sun.xml.in.h:125
+msgid "U.S. English w/ ISO9995-3"
+msgstr "Amerikan ingilizcesi (ISO9995-3 ile)"
+
+#: ../rules/sun.xml.in.h:128
+msgid "Use keyboard LED to show alternative group"
+msgstr "Diğer grubu göstermek içim klavye LED'i kullanılır"
+
+#: ../rules/sun.xml.in.h:129
+msgid "Uses internal capitalization. Shift cancels Caps."
+msgstr "CapsLock dahili dönüşümü kullanılır, Shift tuşu Caps Lock tuşunu keser."
+
+#: ../rules/sun.xml.in.h:130
+msgid "Uses internal capitalization. Shift doesn't cancel Caps."
+msgstr "CapsLock dahili dönüşümü kullanır. Shift tuşu Caps Lock'u kesmez."
+
+#: ../rules/sun.xml.in.h:131
+msgid "bksl"
+msgstr "bksl"
+
+#: ../rules/sun.xml.in.h:133
+msgid "type4"
+msgstr "4. tür"
diff --git a/xorg-server/xkeyboard-config/po/zh_TW.po b/xorg-server/xkeyboard-config/po/zh_TW.po
index 383e01e3f..9cc90fb5b 100644
--- a/xorg-server/xkeyboard-config/po/zh_TW.po
+++ b/xorg-server/xkeyboard-config/po/zh_TW.po
@@ -1,1671 +1,1671 @@
-# Traditional Chinese Messages for xkeyboard-config
-# Copyright (C) 2003, 05 Free Software Foundation, Inc.
-# Funda Wang <fundawang@linux.net.cn>, 2003
-# Wei-Lun Chao <chaoweilun@pcmail.com.tw>, 2005
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: xkeyboard-config 0.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-14 00:39+0100\n"
-"PO-Revision-Date: 2005-09-19 17:19+0800\n"
-"Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
-"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: ../rules/base.xml.in.h:1
-msgid "\"Standard\""
-msgstr "「標準」"
-
-#: ../rules/base.xml.in.h:2
-msgid "(F)"
-msgstr "(F)"
-
-#: ../rules/base.xml.in.h:3
-msgid "101/qwerty/comma/Dead keys"
-msgstr "101/qwerty/逗點/無用按鍵"
-
-#: ../rules/base.xml.in.h:4
-msgid "101/qwerty/comma/Eliminate dead keys"
-msgstr "101/qwerty/逗點/除去無用按鍵"
-
-#: ../rules/base.xml.in.h:5
-msgid "101/qwerty/dot/Dead keys"
-msgstr "101/qwerty/句點/無用按鍵"
-
-#: ../rules/base.xml.in.h:6
-msgid "101/qwerty/dot/Eliminate dead keys"
-msgstr "101/qwerty/句點/除去無用按鍵"
-
-#: ../rules/base.xml.in.h:7
-msgid "101/qwertz/comma/Dead keys"
-msgstr "101/qwertz/逗點/無用按鍵"
-
-#: ../rules/base.xml.in.h:8
-msgid "101/qwertz/comma/Eliminate dead keys"
-msgstr "101/qwerty/逗點/除去無用按鍵"
-
-#: ../rules/base.xml.in.h:9
-msgid "101/qwertz/dot/Dead keys"
-msgstr "101/qwertz/句點/無用按鍵"
-
-#: ../rules/base.xml.in.h:10
-msgid "101/qwertz/dot/Eliminate dead keys"
-msgstr "101/qwertz/句點/除去無用按鍵"
-
-#: ../rules/base.xml.in.h:11
-msgid "102/qwerty/comma/Dead keys"
-msgstr "102/qwerty/逗點/無用按鍵"
-
-#: ../rules/base.xml.in.h:12
-msgid "102/qwerty/comma/Eliminate dead keys"
-msgstr "102/qwerty/逗點/除去無用按鍵"
-
-#: ../rules/base.xml.in.h:13
-msgid "102/qwerty/dot/Dead keys"
-msgstr "102/qwerty/句點/無用按鍵"
-
-#: ../rules/base.xml.in.h:14
-msgid "102/qwerty/dot/Eliminate dead keys"
-msgstr "102/qwerty/句點/除去無用按鍵"
-
-#: ../rules/base.xml.in.h:15
-msgid "102/qwertz/comma/Dead keys"
-msgstr "102/qwertz/逗點/無用按鍵"
-
-#: ../rules/base.xml.in.h:16
-msgid "102/qwertz/comma/Eliminate dead keys"
-msgstr "102/qwertz/逗點/除去無用按鍵"
-
-#: ../rules/base.xml.in.h:17
-msgid "102/qwertz/dot/Dead keys"
-msgstr "102/qwertz/句點/無用按鍵"
-
-#: ../rules/base.xml.in.h:18
-msgid "102/qwertz/dot/Eliminate dead keys"
-msgstr "102/qwertz/句點/除去無用按鍵"
-
-#: ../rules/base.xml.in.h:19
-msgid "A4Tech KB-21"
-msgstr "A4Tech KB-21"
-
-#: ../rules/base.xml.in.h:20
-msgid "A4Tech KBS-8"
-msgstr "A4Tech KBS-8"
-
-#: ../rules/base.xml.in.h:21
-msgid "ACPI Standard"
-msgstr "ACPI 標準"
-
-#: ../rules/base.xml.in.h:22
-msgid "Acer AirKey V"
-msgstr "Acer AirKey V"
-
-#: ../rules/base.xml.in.h:23
-msgid "Acer TravelMate 800"
-msgstr "Acer TravelMate 800"
-
-#: ../rules/base.xml.in.h:24
-msgid "Add the EuroSign to the 2 key."
-msgstr "將歐元符號加到 2 鍵之上"
-
-#: ../rules/base.xml.in.h:25
-msgid "Add the EuroSign to the 5 key."
-msgstr "將歐元符號加到 5 鍵之上"
-
-#: ../rules/base.xml.in.h:26
-msgid "Add the EuroSign to the E key."
-msgstr "將歐元符號加到 E 鍵之上"
-
-#: ../rules/base.xml.in.h:27
-msgid "Add the standard behavior to Menu key."
-msgstr "增加標準功能至 Menu 鍵。"
-
-#: ../rules/base.xml.in.h:28
-msgid "Adding the EuroSign to certain keys"
-msgstr "將歐元符號加到特定鍵之上"
-
-#: ../rules/base.xml.in.h:29
-msgid "Advance Scorpius KI"
-msgstr "進階 Scorpius KI"
-
-#: ../rules/base.xml.in.h:30
-msgid "Alb"
-msgstr "Alb"
-
-#: ../rules/base.xml.in.h:31
-msgid "Albania"
-msgstr "阿爾巴尼亞"
-
-#: ../rules/base.xml.in.h:32
-msgid "Alt and Meta are on the Alt keys (default)."
-msgstr "Alt 與 Meta 配置於 Alt 鍵（預設值）。"
-
-#: ../rules/base.xml.in.h:33
-msgid "Alt is mapped to the right Win-key and Super to Menu."
-msgstr "Alt 配置到右邊的 Win-key 並優先於 Menu。"
-
-#: ../rules/base.xml.in.h:34
-msgid "Alt+Control changes group."
-msgstr "以 Alt+Control 改變群組。"
-
-#: ../rules/base.xml.in.h:35
-msgid "Alt+Shift changes group."
-msgstr "以 Alt+Shift 改變群組。"
-
-#: ../rules/base.xml.in.h:36
-msgid "Alt-Q"
-msgstr "Alt-Q"
-
-#: ../rules/base.xml.in.h:37
-msgid "Alt/Win key behavior"
-msgstr "Alt/Win 鍵功能"
-
-#: ../rules/base.xml.in.h:38
-msgid "Alternative"
-msgstr "替代選擇"
-
-#: ../rules/base.xml.in.h:39
-msgid "Alternative international (former us_intl)"
-msgstr "替代國際化 (之前為 us_intl)"
-
-#: ../rules/base.xml.in.h:40
-msgid "Alternative, Sun dead keys"
-msgstr "替代選擇，Sun 的無用按鍵"
-
-#: ../rules/base.xml.in.h:41
-msgid "Alternative, eliminate dead keys"
-msgstr "替代選擇，除去無用按鍵"
-
-#: ../rules/base.xml.in.h:42
-msgid "Apostrophe (') variant"
-msgstr "撇號 (') 變型"
-
-#: ../rules/base.xml.in.h:43
-msgid "Ara"
-msgstr "Ara"
-
-#: ../rules/base.xml.in.h:44
-msgid "Arabic"
-msgstr "阿拉伯文"
-
-#: ../rules/base.xml.in.h:45
-msgid "Arm"
-msgstr "Arm"
-
-#: ../rules/base.xml.in.h:46
-msgid "Armenia"
-msgstr "亞美尼亞"
-
-#: ../rules/base.xml.in.h:47
-msgid "Aze"
-msgstr "Aze"
-
-#: ../rules/base.xml.in.h:48
-msgid "Azerbaijan"
-msgstr "亞塞拜然"
-
-#: ../rules/base.xml.in.h:49
-msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr "Azona RF2300 無線網際鍵盤"
-
-#: ../rules/base.xml.in.h:50
-msgid "BTC 5090"
-msgstr "BTC 5090"
-
-#: ../rules/base.xml.in.h:51
-msgid "BTC 5113RF Multimedia"
-msgstr "BTC 5113RF 多媒體"
-
-#: ../rules/base.xml.in.h:52
-msgid "BTC 5126T"
-msgstr "BTC 5126T"
-
-#: ../rules/base.xml.in.h:53
-msgid "BTC 9000"
-msgstr "BTC 9000"
-
-#: ../rules/base.xml.in.h:54
-msgid "BTC 9000A"
-msgstr "BTC 9000A"
-
-#: ../rules/base.xml.in.h:55
-msgid "BTC 9001AH"
-msgstr "BTC 9001AH"
-
-#: ../rules/base.xml.in.h:56
-msgid "Ban"
-msgstr "Ban"
-
-#: ../rules/base.xml.in.h:57
-msgid "Bangladesh"
-msgstr "孟加拉"
-
-#: ../rules/base.xml.in.h:58
-msgid "Bel"
-msgstr "Bel"
-
-#: ../rules/base.xml.in.h:59
-msgid "Belarus"
-msgstr "白俄"
-
-#: ../rules/base.xml.in.h:60
-msgid "Belgium"
-msgstr "比利時"
-
-#: ../rules/base.xml.in.h:61
-msgid "Bengali"
-msgstr "孟加拉文"
-
-#: ../rules/base.xml.in.h:62
-msgid "Bengali Probhat"
-msgstr "孟加拉 Probhat 文"
-
-#: ../rules/base.xml.in.h:63
-msgid "Bgr"
-msgstr "Bgr"
-
-#: ../rules/base.xml.in.h:64
-msgid "Bhu"
-msgstr "Bhu"
-
-#: ../rules/base.xml.in.h:65
-msgid "Bhutan"
-msgstr "不丹"
-
-#: ../rules/base.xml.in.h:66
-msgid "Bih"
-msgstr "Bih"
-
-#: ../rules/base.xml.in.h:67
-msgid "Blr"
-msgstr "Blr"
-
-#: ../rules/base.xml.in.h:68
-msgid "Bosnia and Herzegovina"
-msgstr "波士尼亞及赫塞哥維那"
-
-#: ../rules/base.xml.in.h:69
-msgid "Both Alt keys together change group."
-msgstr "同時以兩個 Alt 鍵改變群組。"
-
-#: ../rules/base.xml.in.h:70
-msgid "Both Ctrl keys together change group."
-msgstr "同時以兩個 Ctrl 鍵改變群組。"
-
-#: ../rules/base.xml.in.h:71
-msgid "Both Shift keys together change group."
-msgstr "同時以兩個 Shift 鍵改變群組。"
-
-#: ../rules/base.xml.in.h:72
-msgid "Both Win-keys switch group while pressed."
-msgstr "當按下兩個 Win-key 時切換群組。"
-
-#: ../rules/base.xml.in.h:73
-msgid "Bra"
-msgstr "Bra"
-
-#: ../rules/base.xml.in.h:74
-msgid "Brazil"
-msgstr "巴西"
-
-#: ../rules/base.xml.in.h:75
-msgid "Brazilian ABNT2"
-msgstr "巴西 ABNT2 鍵盤"
-
-#: ../rules/base.xml.in.h:76
-msgid "Brother Internet Keyboard"
-msgstr "Brother 網際鍵盤"
-
-#: ../rules/base.xml.in.h:77
-msgid "Bulgaria"
-msgstr "保加利亞"
-
-#: ../rules/base.xml.in.h:78
-msgid "Can"
-msgstr "Can"
-
-#: ../rules/base.xml.in.h:79
-msgid "Canada"
-msgstr "加拿大"
-
-#: ../rules/base.xml.in.h:80
-msgid "CapsLock LED shows alternative group."
-msgstr "以 CapsLock 燈號來顯示替代的群組。"
-
-#: ../rules/base.xml.in.h:81
-msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
-msgstr "Caps Lock 充當鎖定的 Shift。可以按 Shift 取消之。"
-
-#: ../rules/base.xml.in.h:82
-msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
-msgstr "Caps Lock 充當鎖定的 Shift。無法以按 Shift 取消之。"
-
-#: ../rules/base.xml.in.h:83
-msgid "CapsLock just locks the Shift modifier."
-msgstr "Caps Lock 只用於鎖定 Shift 變更鍵。"
-
-#: ../rules/base.xml.in.h:84
-msgid "CapsLock key behavior"
-msgstr "Caps Lock 鍵功能"
-
-#: ../rules/base.xml.in.h:85
-msgid "CapsLock key changes group."
-msgstr "以 Caps Lock 鍵改變群組"
-
-#: ../rules/base.xml.in.h:86
-msgid "CapsLock toggles Shift so all keys are affected."
-msgstr "以 Caps Lock 切換 Shift 狀態而影響到所有按鍵。"
-
-#: ../rules/base.xml.in.h:87
-msgid "CapsLock toggles normal capitalization of alphabetic characters."
-msgstr "以 Caps Lock 切換正常的字母字元大寫功能。"
-
-#: ../rules/base.xml.in.h:88
-msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
-msgstr "Caps Lock 使用內建的大寫功能。可以 Shift 取消之。"
-
-#: ../rules/base.xml.in.h:89
-msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
-msgstr "Caps Lock 使用內建的大寫功能。無法以 Shift 取消之。"
-
-#: ../rules/base.xml.in.h:90
-msgid "Che"
-msgstr "Che"
-
-#: ../rules/base.xml.in.h:91
-msgid "Cherry Blue Line CyBo@rd"
-msgstr "Cherry Blue Line CyBo@rd"
-
-#: ../rules/base.xml.in.h:92
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr "Cherry Blue Line CyBo@rd (替代選項)"
-
-#: ../rules/base.xml.in.h:93
-msgid "Cherry CyMotion Master Linux"
-msgstr "Cherry CyMotion Master Linux"
-
-#: ../rules/base.xml.in.h:94
-msgid "Chicony Internet Keyboard"
-msgstr "Chicony 網際網路鍵盤"
-
-#: ../rules/base.xml.in.h:95
-msgid "Chicony KB-9885"
-msgstr "Chicony KB-9885"
-
-#: ../rules/base.xml.in.h:96
-msgid "CloGaelach"
-msgstr "CloGaelach"
-
-#: ../rules/base.xml.in.h:97
-msgid "Compaq Easy Access Keyboard"
-msgstr "康柏輕鬆存取鍵盤"
-
-#: ../rules/base.xml.in.h:98
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr "康柏網際鍵盤(13鍵)"
-
-#: ../rules/base.xml.in.h:99
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr "康柏網際鍵盤(18鍵)"
-
-#: ../rules/base.xml.in.h:100
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr "康柏網際鍵盤(7鍵)"
-
-#: ../rules/base.xml.in.h:101
-msgid "Compaq iPaq Keyboard"
-msgstr "康柏 iPaq 鍵盤"
-
-#: ../rules/base.xml.in.h:102
-msgid "Compose key position"
-msgstr "Compose 鍵的位置"
-
-#: ../rules/base.xml.in.h:103
-msgid "Control key at bottom left"
-msgstr "Control 鍵在左下方"
-
-#: ../rules/base.xml.in.h:104
-msgid "Control key at left of 'A'"
-msgstr "Control 鍵在“A”的左邊"
-
-#: ../rules/base.xml.in.h:105
-msgid "Control key position"
-msgstr "Control 鍵的位置"
-
-#: ../rules/base.xml.in.h:106
-msgid "Control+Shift changes group."
-msgstr "以 Control+Shift 鍵改變群組。"
-
-#: ../rules/base.xml.in.h:107
-msgid "Croatia"
-msgstr "克羅埃西亞"
-
-#: ../rules/base.xml.in.h:108
-msgid "Cyrillic"
-msgstr "斯拉夫文"
-
-#: ../rules/base.xml.in.h:109
-msgid "Cze"
-msgstr "Cze"
-
-#: ../rules/base.xml.in.h:110
-msgid "Czechia"
-msgstr "捷克文"
-
-#: ../rules/base.xml.in.h:111
-msgid "DTK2000"
-msgstr "DTK2000"
-
-#: ../rules/base.xml.in.h:112
-msgid "Dead acute"
-msgstr "Dead acute"
-
-#: ../rules/base.xml.in.h:113
-msgid "Dead grave acute"
-msgstr "Dead grave acute"
-
-#: ../rules/base.xml.in.h:114
-msgid "Dell"
-msgstr "戴爾"
-
-#: ../rules/base.xml.in.h:115
-msgid "Dell 101-key PC"
-msgstr "戴爾 101 鍵 鍵盤"
-
-#: ../rules/base.xml.in.h:116
-msgid "Denmark"
-msgstr "丹麥"
-
-#: ../rules/base.xml.in.h:117
-msgid "Deu"
-msgstr "Deu"
-
-#: ../rules/base.xml.in.h:118
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr "Dexxa 無線桌面鍵盤"
-
-#: ../rules/base.xml.in.h:119
-msgid "Dhivehi"
-msgstr "迪貝喜文"
-
-#: ../rules/base.xml.in.h:120
-msgid "Diamond 9801 / 9802 series"
-msgstr "Diamond 9801 / 9802 系列"
-
-#: ../rules/base.xml.in.h:121
-msgid "Div"
-msgstr "Div"
-
-#: ../rules/base.xml.in.h:122
-msgid "Dnk"
-msgstr "Dnk"
-
-#: ../rules/base.xml.in.h:123
-msgid "Dvorak"
-msgstr "Dvorak"
-
-#: ../rules/base.xml.in.h:124
-msgid "Dvorak, Polish quotes on key \"1/!\""
-msgstr "Dvorak，波蘭式引號置於「1/!」按鍵"
-
-#: ../rules/base.xml.in.h:125
-msgid "Dvorak, Polish quotes on quotemark key"
-msgstr "Dvorak，波蘭式引號置於「1/!」按鍵"
-
-#: ../rules/base.xml.in.h:126
-msgid "Eliminate dead keys"
-msgstr "除去無用按鍵"
-
-#: ../rules/base.xml.in.h:127
-msgid "Ennyah DKB-1008"
-msgstr "Ennyah DKB-1008"
-
-#: ../rules/base.xml.in.h:128
-msgid "Esp"
-msgstr "Esp"
-
-#: ../rules/base.xml.in.h:129
-msgid "Est"
-msgstr "Est"
-
-#: ../rules/base.xml.in.h:130
-msgid "Estonia"
-msgstr "愛沙尼亞"
-
-#: ../rules/base.xml.in.h:131
-msgid "Everex STEPnote"
-msgstr "Everex STEPnote"
-
-#: ../rules/base.xml.in.h:132
-msgid "Extended"
-msgstr "延伸的"
-
-#: ../rules/base.xml.in.h:133
-msgid "Extended Backslash"
-msgstr "延伸的反斜線"
-
-#: ../rules/base.xml.in.h:134
-msgid "F-letter (F) variant"
-msgstr "F 字母變化"
-
-#: ../rules/base.xml.in.h:135
-msgid "Fao"
-msgstr "Fao"
-
-#: ../rules/base.xml.in.h:136
-msgid "Faroe Islands"
-msgstr "法羅群島"
-
-#: ../rules/base.xml.in.h:137
-msgid "Fin"
-msgstr "Fin"
-
-#: ../rules/base.xml.in.h:138
-msgid "Finland"
-msgstr "芬蘭"
-
-#: ../rules/base.xml.in.h:139
-msgid "Fra"
-msgstr "Fra"
-
-#: ../rules/base.xml.in.h:140
-msgid "France"
-msgstr "法國"
-
-#: ../rules/base.xml.in.h:141
-msgid "French"
-msgstr "法文"
-
-#: ../rules/base.xml.in.h:142
-msgid "French (legacy)"
-msgstr "法文 (傳統)"
-
-#: ../rules/base.xml.in.h:143
-msgid "French Dvorak"
-msgstr "法文 Dvorak"
-
-#: ../rules/base.xml.in.h:144
-msgid "French, Sun dead keys"
-msgstr "法文，Sun 的無用按鍵"
-
-#: ../rules/base.xml.in.h:145
-msgid "French, eliminate dead keys"
-msgstr "法文，除去無用按鍵"
-
-#: ../rules/base.xml.in.h:146
-msgid "GBr"
-msgstr "GBr"
-
-#: ../rules/base.xml.in.h:147
-msgid "Generic 101-key PC"
-msgstr "一般 101鍵 鍵盤"
-
-#: ../rules/base.xml.in.h:148
-msgid "Generic 102-key (Intl) PC"
-msgstr "一般 102鍵 (國際) 鍵盤"
-
-#: ../rules/base.xml.in.h:149
-msgid "Generic 104-key PC"
-msgstr "一般 104鍵 鍵盤"
-
-#: ../rules/base.xml.in.h:150
-msgid "Generic 105-key (Intl) PC"
-msgstr "一般 105 鍵 (國際) 鍵盤"
-
-#: ../rules/base.xml.in.h:151
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr "昆盈 Comfy KB-16M / 昆盈 MM 鍵盤 KWD-910"
-
-#: ../rules/base.xml.in.h:152
-msgid "Genius Comfy KB-21e-Scroll"
-msgstr "昆盈 Comfy KB-21e-Scroll"
-
-#: ../rules/base.xml.in.h:153
-msgid "Geo"
-msgstr "Geo"
-
-#: ../rules/base.xml.in.h:154
-msgid "Georgia"
-msgstr "喬治亞"
-
-#: ../rules/base.xml.in.h:155
-msgid "German, Sun dead keys"
-msgstr "德文，Sun 的無用按鍵"
-
-#: ../rules/base.xml.in.h:156
-msgid "German, eliminate dead keys"
-msgstr "德文，除去無用按鍵"
-
-#: ../rules/base.xml.in.h:157
-msgid "Germany"
-msgstr "德國"
-
-#: ../rules/base.xml.in.h:158
-msgid "Gre"
-msgstr "Gre"
-
-#: ../rules/base.xml.in.h:159
-msgid "Greece"
-msgstr "希臘"
-
-#: ../rules/base.xml.in.h:160
-msgid "Group Shift/Lock behavior"
-msgstr "群組 Shift/Lock 功能"
-
-#: ../rules/base.xml.in.h:161
-msgid "Gujarati"
-msgstr "古吉拉特文(印度)"
-
-#: ../rules/base.xml.in.h:162
-msgid "Gurmukhi"
-msgstr "古爾穆希文"
-
-#: ../rules/base.xml.in.h:163
-msgid "Gyration"
-msgstr "回轉"
-
-#: ../rules/base.xml.in.h:164
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr "惠普網際鍵盤"
-
-#: ../rules/base.xml.in.h:165
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr "惠普 Omnibook 500 FA"
-
-#: ../rules/base.xml.in.h:166
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr "惠普 Omnibook 5xx"
-
-#: ../rules/base.xml.in.h:167
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr "惠普 Omnibook 6000/6100"
-
-#: ../rules/base.xml.in.h:168
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr "惠普 Omnibook XE3 GC"
-
-#: ../rules/base.xml.in.h:169
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr "惠普 Omnibook XE3 CF"
-
-#: ../rules/base.xml.in.h:170
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr "惠普 Omnibook XT1000"
-
-#: ../rules/base.xml.in.h:171
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr "惠普 Pavilion ZT11xx"
-
-#: ../rules/base.xml.in.h:172
-msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
-msgstr "惠普 SK-2501 多媒體鍵盤"
-
-#: ../rules/base.xml.in.h:173
-msgid "Hewlett-Packard SK-2505 Internet Keyboard"
-msgstr "惠普 SK-2505 網際鍵盤"
-
-#: ../rules/base.xml.in.h:174
-msgid "Honeywell Euroboard"
-msgstr "Honeywell 歐洲鍵盤"
-
-#: ../rules/base.xml.in.h:175
-msgid "Hrv"
-msgstr "Hrv"
-
-#: ../rules/base.xml.in.h:176
-msgid "Hun"
-msgstr "Hun"
-
-#: ../rules/base.xml.in.h:177
-msgid "Hungary"
-msgstr "匈牙利"
-
-#: ../rules/base.xml.in.h:178
-msgid "Hyper is mapped to the Win-keys."
-msgstr "Hyper 配置到兩個 Win-key。"
-
-#: ../rules/base.xml.in.h:179
-msgid "IBM Rapid Access"
-msgstr "IBM Rapid Access"
-
-#: ../rules/base.xml.in.h:180
-msgid "IBM Rapid Access II"
-msgstr "IBM Rapid Access II"
-
-#: ../rules/base.xml.in.h:181
-msgid "IBM Rapid Access II (alternate option)"
-msgstr "IBM Rapid Access II(替代選項)"
-
-#: ../rules/base.xml.in.h:182
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
-
-#: ../rules/base.xml.in.h:183
-msgid "ISO Alternate"
-msgstr "ISO 替代"
-
-#: ../rules/base.xml.in.h:184
-msgid "Iceland"
-msgstr "冰島"
-
-#: ../rules/base.xml.in.h:185
-msgid "Ind"
-msgstr "Ind"
-
-#: ../rules/base.xml.in.h:186
-msgid "India"
-msgstr "印度"
-
-#: ../rules/base.xml.in.h:187
-msgid "International (with dead keys)"
-msgstr "國際鍵盤 (附無用按鍵)"
-
-#: ../rules/base.xml.in.h:188
-msgid "Inuktitut"
-msgstr "伊努伊特鍵盤"
-
-#: ../rules/base.xml.in.h:189
-msgid "Iran"
-msgstr "伊朗"
-
-#: ../rules/base.xml.in.h:190
-msgid "Ireland"
-msgstr "愛爾蘭"
-
-#: ../rules/base.xml.in.h:191
-msgid "Irl"
-msgstr "Irl"
-
-#: ../rules/base.xml.in.h:192
-msgid "Irn"
-msgstr "Irn"
-
-#: ../rules/base.xml.in.h:193
-msgid "Isl"
-msgstr "Isl"
-
-#: ../rules/base.xml.in.h:194
-msgid "Isr"
-msgstr "Isr"
-
-#: ../rules/base.xml.in.h:195
-msgid "Israel"
-msgstr "以色列"
-
-#: ../rules/base.xml.in.h:196
-msgid "Ita"
-msgstr "Ita"
-
-#: ../rules/base.xml.in.h:197
-msgid "Italy"
-msgstr "意大利"
-
-#: ../rules/base.xml.in.h:198
-msgid "Japan"
-msgstr "日本"
-
-#: ../rules/base.xml.in.h:199
-msgid "Japanese 106-key"
-msgstr "日文 106鍵 鍵盤"
-
-#: ../rules/base.xml.in.h:200
-msgid "Jpn"
-msgstr "Jpn"
-
-#: ../rules/base.xml.in.h:201
-msgid "Kannada"
-msgstr "印度卡納達文"
-
-#: ../rules/base.xml.in.h:202
-msgid "Keytronic FlexPro"
-msgstr "Keytronic FlexPro"
-
-#: ../rules/base.xml.in.h:203
-msgid "Kyr"
-msgstr "Kyr"
-
-#: ../rules/base.xml.in.h:204
-msgid "Kyrgyzstan"
-msgstr "吉爾吉斯"
-
-#: ../rules/base.xml.in.h:205
-msgid "LAm"
-msgstr "LAm"
-
-#: ../rules/base.xml.in.h:206
-msgid "Lao"
-msgstr "Lao"
-
-#: ../rules/base.xml.in.h:207
-msgid "Laos"
-msgstr "寮國"
-
-#: ../rules/base.xml.in.h:208
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr "可攜式/筆記型 康柏 (如 Armada) 可攜式鍵盤"
-
-#: ../rules/base.xml.in.h:209
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr "可攜式/筆記型 康柏 (如 Presario) 網際鍵盤"
-
-#: ../rules/base.xml.in.h:210
-msgid "Laptop/notebook Dell Inspiron 8xxx"
-msgstr "可攜式/筆記型 戴爾 Inspiron 8xxx"
-
-#: ../rules/base.xml.in.h:211
-msgid "Latin"
-msgstr "拉丁文"
-
-#: ../rules/base.xml.in.h:212
-msgid "Latin American"
-msgstr "拉丁美洲"
-
-#: ../rules/base.xml.in.h:213
-msgid "Latin Unicode"
-msgstr "拉丁文統一碼"
-
-#: ../rules/base.xml.in.h:214
-msgid "Latin Unicode qwerty"
-msgstr "拉丁文統一碼 qwerty"
-
-#: ../rules/base.xml.in.h:215
-msgid "Latin qwerty"
-msgstr "拉丁文 qwerty"
-
-#: ../rules/base.xml.in.h:216
-msgid "Latin with guillemots"
-msgstr "拉丁文附海鳩符號"
-
-#: ../rules/base.xml.in.h:217
-msgid "Latvia"
-msgstr "拉脫維亞"
-
-#: ../rules/base.xml.in.h:218
-msgid "Left Alt key changes group."
-msgstr "以左邊的 Alt 鍵改變群組。"
-
-#: ../rules/base.xml.in.h:219
-msgid "Left Alt key switches group while pressed."
-msgstr "當按下左邊的 Alt 鍵時切換群組。"
-
-#: ../rules/base.xml.in.h:220
-msgid "Left Ctrl key changes group."
-msgstr "以左邊的 Ctrl 鍵改變群組。"
-
-#: ../rules/base.xml.in.h:221
-msgid "Left Shift key changes group."
-msgstr "以左邊的 Shift 鍵改變群組。"
-
-#: ../rules/base.xml.in.h:222
-msgid "Left Win-key changes group."
-msgstr "以左邊的 Win-key 改變群組。"
-
-#: ../rules/base.xml.in.h:223
-msgid "Left Win-key switches group while pressed."
-msgstr "當按下左邊的 Win-key 時切換群組。"
-
-#: ../rules/base.xml.in.h:224
-msgid "Lithuania"
-msgstr "立陶宛"
-
-#: ../rules/base.xml.in.h:225
-msgid "Logitech Access Keyboard"
-msgstr "羅技 Access 鍵盤"
-
-#: ../rules/base.xml.in.h:226
-msgid "Logitech Cordless Desktop"
-msgstr "羅技無影手"
-
-#: ../rules/base.xml.in.h:227
-msgid "Logitech Cordless Desktop Navigator"
-msgstr "羅技無影手桌面導航器"
-
-#: ../rules/base.xml.in.h:228
-msgid "Logitech Cordless Desktop Optical"
-msgstr "羅技無影手光學組合"
-
-#: ../rules/base.xml.in.h:229
-msgid "Logitech Cordless Desktop Pro"
-msgstr "羅技無影手進階版"
-
-#: ../rules/base.xml.in.h:230
-msgid "Logitech Cordless Desktop Pro (alternate option)"
-msgstr "羅技無影手進階版(替代選項)"
-
-#: ../rules/base.xml.in.h:231
-msgid "Logitech Cordless Desktop Pro (alternate option2)"
-msgstr "羅技無影手進階版(替代選項)"
-
-#: ../rules/base.xml.in.h:232
-msgid "Logitech Cordless Desktop iTouch"
-msgstr "羅技網際無影手"
-
-#: ../rules/base.xml.in.h:233
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr "羅技極光無影手組合/桌面導航器"
-
-#: ../rules/base.xml.in.h:234
-msgid "Logitech Deluxe Access Keyboard"
-msgstr "羅技強手鍵盤"
-
-#: ../rules/base.xml.in.h:235
-msgid "Logitech Internet Keyboard"
-msgstr "羅技網際鍵盤"
-
-#: ../rules/base.xml.in.h:236
-msgid "Logitech Internet Navigator Keyboard"
-msgstr "羅技網際導航鍵盤"
-
-#: ../rules/base.xml.in.h:237
-msgid "Logitech Ultra-X Keyboard"
-msgstr "羅技銀幻手鍵盤"
-
-#: ../rules/base.xml.in.h:238
-msgid "Logitech iTouch"
-msgstr "羅技 iTouch"
-
-#: ../rules/base.xml.in.h:239
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "羅技 iTouch 無影手鍵盤(型號 Y-RB6)"
-
-#: ../rules/base.xml.in.h:240
-msgid "Logitech iTouch keyboard Internet Navigator"
-msgstr "羅技 iTouch 鍵盤網際導航器"
-
-#: ../rules/base.xml.in.h:241
-msgid "Ltu"
-msgstr "Ltu"
-
-#: ../rules/base.xml.in.h:242
-msgid "Lva"
-msgstr "Lva"
-
-#: ../rules/base.xml.in.h:243
-msgid "Macedonian"
-msgstr "馬其頓文"
-
-#: ../rules/base.xml.in.h:244
-msgid "Macintosh"
-msgstr "Macintosh"
-
-#: ../rules/base.xml.in.h:245
-msgid "Macintosh Old"
-msgstr "Macintosh 舊產品"
-
-#: ../rules/base.xml.in.h:246
-msgid "Make CapsLock an additional Control."
-msgstr "以 Caps Lock 做為附加的控制鍵。"
-
-#: ../rules/base.xml.in.h:247
-msgid "Malayalam"
-msgstr "(印度)馬來雅拉姆文字"
-
-#: ../rules/base.xml.in.h:248
-msgid "Malta"
-msgstr "馬爾它"
-
-#: ../rules/base.xml.in.h:249
-msgid "Mao"
-msgstr "Mao"
-
-#: ../rules/base.xml.in.h:250
-msgid "Maori"
-msgstr "毛利"
-
-#: ../rules/base.xml.in.h:251
-msgid "Memorex MX1998"
-msgstr "Memorex MX1998"
-
-#: ../rules/base.xml.in.h:252
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr "Memorex MX2500 EZ-Access 鍵盤"
-
-#: ../rules/base.xml.in.h:253
-msgid "Memorex MX2750"
-msgstr "Memorex MX2750"
-
-#: ../rules/base.xml.in.h:254
-msgid "Menu is Compose."
-msgstr "Menu 為組合鍵。"
-
-#: ../rules/base.xml.in.h:255
-msgid "Menu key changes group."
-msgstr "以 Menu 鍵改變群組。"
-
-#: ../rules/base.xml.in.h:256
-msgid "Meta is mapped to the Win-keys."
-msgstr "Meta 配置到兩個 Win-key。"
-
-#: ../rules/base.xml.in.h:257
-msgid "Meta is mapped to the left Win-key."
-msgstr "Meta 配置到左邊的 Win-key。"
-
-#: ../rules/base.xml.in.h:258
-msgid "Microsoft Internet Keyboard"
-msgstr "微軟網際鍵盤"
-
-#: ../rules/base.xml.in.h:259
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "微軟網際鍵盤增強版，瑞典"
-
-#: ../rules/base.xml.in.h:260
-msgid "Microsoft Natural"
-msgstr "微軟自然鍵盤"
-
-#: ../rules/base.xml.in.h:261
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr "微軟原生鍵盤增強版/微軟網際鍵盤增強版"
-
-#: ../rules/base.xml.in.h:262
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr "微軟原生鍵盤增強版 OEM"
-
-#: ../rules/base.xml.in.h:263
-msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr "微軟自然鍵盤增強版 USB/微軟網際鍵盤增強版"
-
-#: ../rules/base.xml.in.h:264
-msgid "Microsoft Office Keyboard"
-msgstr "微軟 Office 鍵盤"
-
-#: ../rules/base.xml.in.h:265
-msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
-msgstr "微軟無線多媒體鍵盤 1.0A"
-
-#: ../rules/base.xml.in.h:266
-msgid "Miscellaneous compatibility options"
-msgstr "其它相容選項"
-
-#: ../rules/base.xml.in.h:267
-msgid "Mkd"
-msgstr "Mkd"
-
-#: ../rules/base.xml.in.h:268
-msgid "Mlt"
-msgstr "Mlt"
-
-#: ../rules/base.xml.in.h:269
-msgid "Mmr"
-msgstr "Mmr"
-
-#: ../rules/base.xml.in.h:270
-msgid "Mng"
-msgstr "Mng"
-
-#: ../rules/base.xml.in.h:271
-msgid "Mongolia"
-msgstr "蒙古"
-
-#: ../rules/base.xml.in.h:272
-msgid "Multilingual"
-msgstr "多語言"
-
-#: ../rules/base.xml.in.h:273
-msgid "Multilingual, second part"
-msgstr "多語言，第二部份"
-
-#: ../rules/base.xml.in.h:274
-msgid "Myanmar"
-msgstr "緬甸"
-
-#: ../rules/base.xml.in.h:275
-msgid "Netherlands"
-msgstr "荷蘭"
-
-#: ../rules/base.xml.in.h:276
-msgid "Nld"
-msgstr "Nld"
-
-#: ../rules/base.xml.in.h:277
-msgid "Nor"
-msgstr "Nor"
-
-#: ../rules/base.xml.in.h:278
-msgid "Northern Saami"
-msgstr "北部沙米文"
-
-#: ../rules/base.xml.in.h:279
-msgid "Northern Saami, eliminate dead keys"
-msgstr "北部沙米文，除去無用按鍵"
-
-#: ../rules/base.xml.in.h:280
-msgid "Northgate OmniKey 101"
-msgstr "Northgate Omnikey 101"
-
-#: ../rules/base.xml.in.h:281
-msgid "Norway"
-msgstr "挪威"
-
-#: ../rules/base.xml.in.h:282
-msgid "NumLock LED shows alternative group."
-msgstr "以 Num Lock 燈號來顯示替代的群組。"
-
-#: ../rules/base.xml.in.h:283
-msgid "Ogham"
-msgstr "(古愛爾蘭)歐甘文字"
-
-#: ../rules/base.xml.in.h:284
-msgid "Ogham IS434"
-msgstr "歐甘文字 IS434"
-
-#: ../rules/base.xml.in.h:285
-msgid "Oretec MCK-800 MM/Internet keyboard"
-msgstr "Oretec MCK-800 MM/網際鍵盤"
-
-#: ../rules/base.xml.in.h:286
-msgid "Oriya"
-msgstr "(印度)奧里雅族文字"
-
-#: ../rules/base.xml.in.h:287
-msgid "PC-98xx Series"
-msgstr "PC-98xx 系列"
-
-#: ../rules/base.xml.in.h:288
-msgid "Pak"
-msgstr "Pak"
-
-#: ../rules/base.xml.in.h:289
-msgid "Pakistan"
-msgstr "巴基斯坦"
-
-#: ../rules/base.xml.in.h:290
-msgid "Pattachote"
-msgstr "泰文"
-
-#: ../rules/base.xml.in.h:291
-msgid "Phonetic"
-msgstr "音標"
-
-#: ../rules/base.xml.in.h:292
-msgid "Pol"
-msgstr "Pol"
-
-#: ../rules/base.xml.in.h:293
-msgid "Poland"
-msgstr "波蘭"
-
-#: ../rules/base.xml.in.h:294
-msgid "Polytonic"
-msgstr "多音字母"
-
-#: ../rules/base.xml.in.h:295
-msgid "Portugal"
-msgstr "葡萄牙"
-
-#: ../rules/base.xml.in.h:296
-msgid "PowerPC PS/2"
-msgstr "PowerPC PS/2"
-
-#: ../rules/base.xml.in.h:297
-msgid "Press Left Alt key to choose 3rd level."
-msgstr "按下左邊的 Alt 鍵以選擇第三級。"
-
-#: ../rules/base.xml.in.h:298
-msgid "Press Left Win-key to choose 3rd level."
-msgstr "按下左邊的 Win-key 以選擇第三級。"
-
-#: ../rules/base.xml.in.h:299
-msgid "Press Menu key to choose 3rd level."
-msgstr "按下 Menu 鍵以選擇第三級。"
-
-#: ../rules/base.xml.in.h:300
-msgid "Press Right Alt key to choose 3rd level."
-msgstr "按下右邊的 Alt 鍵以選擇第三級。"
-
-#: ../rules/base.xml.in.h:301
-msgid "Press Right Control to choose 3rd level."
-msgstr "按下右邊的 Control 以選擇第三級。"
-
-#: ../rules/base.xml.in.h:302
-msgid "Press Right Win-key to choose 3rd level."
-msgstr "按下右邊的 Win-key 以選擇第三級。"
-
-#: ../rules/base.xml.in.h:303
-msgid "Press any of Alt keys to choose 3rd level."
-msgstr "按下任一 Alt 鍵以選擇第三級。"
-
-#: ../rules/base.xml.in.h:304
-msgid "Press any of Win-keys to choose 3rd level."
-msgstr "按下任一 Win-key 以選擇第三級。"
-
-#: ../rules/base.xml.in.h:305
-msgid "Probhat"
-msgstr "孟加拉 Probhat"
-
-#: ../rules/base.xml.in.h:306
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "Propeller Voyager (KTEZ-1000)"
-
-#: ../rules/base.xml.in.h:307
-msgid "Prt"
-msgstr "Prt"
-
-#: ../rules/base.xml.in.h:308
-msgid "QTronix Scorpius 98N+"
-msgstr "QTronix Scorpius 98N+"
-
-#: ../rules/base.xml.in.h:309
-msgid "R-Alt switches group while pressed."
-msgstr "當按下右邊 Alt 時切換群組。"
-
-#: ../rules/base.xml.in.h:310
-msgid "Right Alt is Compose."
-msgstr "右邊的 Alt 為組合鍵。"
-
-#: ../rules/base.xml.in.h:311
-msgid "Right Alt key changes group."
-msgstr "以右邊的 Alt 鍵改變群組。"
-
-#: ../rules/base.xml.in.h:312
-msgid "Right Control key works as Right Alt."
-msgstr "右邊 Ctrl 鍵等同於右邊 Alt。"
-
-#: ../rules/base.xml.in.h:313
-msgid "Right Ctrl is Compose."
-msgstr "右邊的 Ctrl 為組合鍵。"
-
-#: ../rules/base.xml.in.h:314
-msgid "Right Ctrl key changes group."
-msgstr "以右邊的 Ctrl 鍵改變群組。"
-
-#: ../rules/base.xml.in.h:315
-msgid "Right Ctrl key switches group while pressed."
-msgstr "當按下右邊的 Ctrl 鍵時切換群組。"
-
-#: ../rules/base.xml.in.h:316
-msgid "Right Shift key changes group."
-msgstr "以右邊的 Shift 鍵改變群組。"
-
-#: ../rules/base.xml.in.h:317
-msgid "Right Win-key changes group."
-msgstr "以右邊的 Win-key 改變群組。"
-
-#: ../rules/base.xml.in.h:318
-msgid "Right Win-key is Compose."
-msgstr "右邊的 Win-key 為組合鍵。"
-
-#: ../rules/base.xml.in.h:319
-msgid "Right Win-key switches group while pressed."
-msgstr "當按下右邊的 Win-key 時切換群組。"
-
-#: ../rules/base.xml.in.h:320
-msgid "Romania"
-msgstr "羅馬尼亞"
-
-#: ../rules/base.xml.in.h:321
-msgid "Romanian keyboard with German letters"
-msgstr "羅馬尼亞鍵盤附德文字母"
-
-#: ../rules/base.xml.in.h:322
-msgid "Romanian keyboard with German letters, eliminate dead keys"
-msgstr "羅馬尼亞鍵盤附德文字母，除去無用按鍵"
-
-#: ../rules/base.xml.in.h:323
-msgid "Rou"
-msgstr "Rou"
-
-#: ../rules/base.xml.in.h:324
-msgid "Rus"
-msgstr "Rus"
-
-#: ../rules/base.xml.in.h:325
-msgid "Russia"
-msgstr "俄羅斯"
-
-#: ../rules/base.xml.in.h:326
-msgid "Russian"
-msgstr "俄文"
-
-#: ../rules/base.xml.in.h:327
-msgid "Russian phonetic"
-msgstr "俄文音標"
-
-#: ../rules/base.xml.in.h:328
-msgid "Russian phonetic, eliminate dead keys"
-msgstr "俄文音標，除去無用按鍵"
-
-#: ../rules/base.xml.in.h:329
-msgid "SK-1300"
-msgstr "SK-1300"
-
-#: ../rules/base.xml.in.h:330
-msgid "SK-2500"
-msgstr "SK-2500"
-
-#: ../rules/base.xml.in.h:331
-msgid "SK-6200"
-msgstr "SK-6200"
-
-#: ../rules/base.xml.in.h:332
-msgid "SK-7100"
-msgstr "SK-7100"
-
-#: ../rules/base.xml.in.h:333
-msgid "SVEN Ergonomic 2500"
-msgstr "SVEN Ergonomic 2500"
-
-#: ../rules/base.xml.in.h:334
-msgid "Samsung SDM 4500P"
-msgstr "三星 SDM 4500P"
-
-#: ../rules/base.xml.in.h:335
-msgid "Samsung SDM 4510P"
-msgstr "三星 SDM 4510P"
-
-#: ../rules/base.xml.in.h:336
-msgid "ScrollLock LED shows alternative group."
-msgstr "以 Scroll Lock 燈號來顯示替代的群組。"
-
-#: ../rules/base.xml.in.h:337
-msgid "Serbian"
-msgstr "塞爾維亞文"
-
-#: ../rules/base.xml.in.h:338
-msgid "Shift with numpad keys works as in MS Windows."
-msgstr "Shift+數字鍵盤的功能等同於在 MS Windows 之中。"
-
-#: ../rules/base.xml.in.h:339
-msgid "Shift+CapsLock changes group."
-msgstr "以 Shift+Caps Lock 鍵改變群組。"
-
-#: ../rules/base.xml.in.h:340
-msgid "Slovakia"
-msgstr "斯洛伐克"
-
-#: ../rules/base.xml.in.h:341
-msgid "Slovenia"
-msgstr "斯洛凡尼亞"
-
-#: ../rules/base.xml.in.h:342
-msgid "Spain"
-msgstr "西班牙"
-
-#: ../rules/base.xml.in.h:343
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
-msgstr "伺服器處理的特殊鍵 (Ctrl+Alt+&lt;key&gt;)。"
-
-#: ../rules/base.xml.in.h:344
-msgid "SrL"
-msgstr "SrL"
-
-#: ../rules/base.xml.in.h:345
-msgid "Sri Lanka"
-msgstr "斯里蘭卡"
-
-#: ../rules/base.xml.in.h:346
-msgid "Srp"
-msgstr "Srp"
-
-#: ../rules/base.xml.in.h:347
-msgid "Standard"
-msgstr "標準"
-
-#. RSTU 2019-91
-#: ../rules/base.xml.in.h:349
-msgid "Standard RSTU"
-msgstr "標準 RSTU"
-
-#. RSTU 2019-91
-#: ../rules/base.xml.in.h:351
-msgid "Standard RSTU on Russian layout"
-msgstr "俄文排列上的標準 RSTU"
-
-#: ../rules/base.xml.in.h:352
-msgid "Sun dead keys"
-msgstr "Sun 無用按鍵"
-
-#: ../rules/base.xml.in.h:353
-msgid "Super Power Multimedia Keyboard"
-msgstr "Super Power 多媒體鍵盤"
-
-#: ../rules/base.xml.in.h:354
-msgid "Super is mapped to the Win-keys (default)."
-msgstr "Super 配置到兩個 Win-key （預設值）。"
-
-#: ../rules/base.xml.in.h:355
-msgid "Svk"
-msgstr "Svk"
-
-#: ../rules/base.xml.in.h:356
-msgid "Svn"
-msgstr "Svn"
-
-#: ../rules/base.xml.in.h:357
-msgid "Swap Control and CapsLock."
-msgstr "Control 與 Caps Lock 鍵互換。"
-
-#: ../rules/base.xml.in.h:358
-msgid "Swe"
-msgstr "Swe"
-
-#: ../rules/base.xml.in.h:359
-msgid "Sweden"
-msgstr "瑞典"
-
-#: ../rules/base.xml.in.h:360
-msgid "Switzerland"
-msgstr "瑞士"
-
-#: ../rules/base.xml.in.h:361
-msgid "Symplon PaceBook (tablet PC)"
-msgstr "Symplon PaceBook (平板電腦)"
-
-#: ../rules/base.xml.in.h:362
-msgid "Syr"
-msgstr "Syr"
-
-#: ../rules/base.xml.in.h:363
-msgid "Syria"
-msgstr "敘利亞"
-
-#: ../rules/base.xml.in.h:364
-msgid "Syriac"
-msgstr "敘利亞語"
-
-#: ../rules/base.xml.in.h:365
-msgid "Syriac phonetic"
-msgstr "敘利亞音標"
-
-#: ../rules/base.xml.in.h:366
-msgid "TIS-820.2538"
-msgstr "泰語(TIS-820.2538)"
-
-#: ../rules/base.xml.in.h:367
-msgid "Tajikistan"
-msgstr "塔吉克"
-
-#: ../rules/base.xml.in.h:368
-msgid "Tamil"
-msgstr "坦米爾文"
-
-#: ../rules/base.xml.in.h:369
-msgid "Tamil INSCRIPT"
-msgstr "坦米爾文 INSCRIPT"
-
-#: ../rules/base.xml.in.h:370
-msgid "Tamil TAB Typewriter"
-msgstr "坦米爾文 TAB 打字機"
-
-#: ../rules/base.xml.in.h:371
-msgid "Tamil TSCII Typewriter"
-msgstr "坦米爾文 TSCII 打字機"
-
-#: ../rules/base.xml.in.h:372
-msgid "Tamil Unicode"
-msgstr "坦米爾文統一碼"
-
-#: ../rules/base.xml.in.h:373
-msgid "Telugu"
-msgstr "泰盧固語"
-
-#: ../rules/base.xml.in.h:374
-msgid "Tha"
-msgstr "Tha"
-
-#: ../rules/base.xml.in.h:375
-msgid "Thailand"
-msgstr "泰國"
-
-#: ../rules/base.xml.in.h:376
-msgid "Third level choosers"
-msgstr "第三級選擇器"
-
-#: ../rules/base.xml.in.h:377
-msgid "Tilde (~) variant"
-msgstr "波折號 (~) 變化"
-
-#: ../rules/base.xml.in.h:378
-msgid "Tjk"
-msgstr "Tjk"
-
-#: ../rules/base.xml.in.h:379
-msgid "Toshiba Satellite S3000"
-msgstr "東芝 Satellite S3000"
-
-#: ../rules/base.xml.in.h:380
-msgid "Trust Direct Access Keyboard"
-msgstr "Trust Direct Access 鍵盤"
-
-#: ../rules/base.xml.in.h:381
-msgid "Trust Wireless Keyboard Classic"
-msgstr "Trust 無線經典鍵盤"
-
-#: ../rules/base.xml.in.h:382
-msgid "Tur"
-msgstr "Tur"
-
-#: ../rules/base.xml.in.h:383
-msgid "Turkish"
-msgstr "土耳其文"
-
-#: ../rules/base.xml.in.h:384
-msgid "Typewriter"
-msgstr "打字機"
-
-#: ../rules/base.xml.in.h:385
-msgid "U.S. English"
-msgstr "美式英文"
-
-#: ../rules/base.xml.in.h:386
-msgid "US keyboard with Croatian letters"
-msgstr "美國鍵盤附克羅埃西亞字母"
-
-#: ../rules/base.xml.in.h:387
-msgid "US keyboard with Lithuanian letters"
-msgstr "美國鍵盤附立陶宛字母"
-
-#: ../rules/base.xml.in.h:388
-msgid "US keyboard with Maltian letters"
-msgstr "美國鍵盤附馬爾它字母"
-
-#: ../rules/base.xml.in.h:389
-msgid "US keyboard with Romanian letters"
-msgstr "美國鍵盤附羅馬尼亞字母"
-
-#: ../rules/base.xml.in.h:390
-msgid "USA"
-msgstr "USA"
-
-#: ../rules/base.xml.in.h:391
-msgid "Ukr"
-msgstr "Ukr"
-
-#: ../rules/base.xml.in.h:392
-msgid "Ukraine"
-msgstr "烏克蘭"
-
-#: ../rules/base.xml.in.h:393
-msgid "UnicodeExpert"
-msgstr "UnicodeExpert"
-
-#: ../rules/base.xml.in.h:394
-msgid "United Kingdom"
-msgstr "英國"
-
-#: ../rules/base.xml.in.h:395
-msgid "Urdu"
-msgstr "烏都文"
-
-#: ../rules/base.xml.in.h:396
-msgid "Use keyboard LED to show alternative group."
-msgstr "使用鍵盤燈號來顯示替代的群組。"
-
-#: ../rules/base.xml.in.h:397
-msgid "Uzb"
-msgstr "Uzb"
-
-#: ../rules/base.xml.in.h:398
-msgid "Uzbekistan"
-msgstr "烏茲別克"
-
-#: ../rules/base.xml.in.h:399
-msgid "Vietnam"
-msgstr "越南"
-
-#: ../rules/base.xml.in.h:400
-msgid "Vnm"
-msgstr "Vnm"
-
-#: ../rules/base.xml.in.h:401
-msgid "Winbook Model XP5"
-msgstr "Winbook XP5 鍵盤"
-
-#: ../rules/base.xml.in.h:402
-msgid "Winkeys"
-msgstr "Winkeys"
-
-#: ../rules/base.xml.in.h:403
-msgid "With &lt;\\|&gt; key"
-msgstr "附帶 &lt;\\|&gt; 鍵"
-
-#: ../rules/base.xml.in.h:404
-msgid "With guillemots"
-msgstr "附帶海鳩符號"
-
-#: ../rules/base.xml.in.h:405
-msgid "Yahoo! Internet Keyboard"
-msgstr "雅虎網際鍵盤"
-
-#: ../rules/base.xml.in.h:406
-msgid "Z and ZHE swapped"
-msgstr "已交換 Z 與 ZHE"
-
-#: ../rules/base.xml.in.h:407
-msgid "azerty"
-msgstr "azerty"
-
-#: ../rules/base.xml.in.h:408
-msgid "azerty/digits"
-msgstr "azerty/數字"
-
-#: ../rules/base.xml.in.h:409
-msgid "digits"
-msgstr "數字"
-
-#: ../rules/base.xml.in.h:410
-msgid "lyx"
-msgstr "lyx"
-
-#: ../rules/base.xml.in.h:411
-msgid "qwerty"
-msgstr "qwerty"
-
-#: ../rules/base.xml.in.h:412
-msgid "qwerty, extended Backslash"
-msgstr "qwerty，延伸的反斜線"
-
-#: ../rules/base.xml.in.h:413
-msgid "qwerty/digits"
-msgstr "qwerty/數字"
-
-#: ../rules/base.xml.in.h:414
-msgid "qwertz"
-msgstr "qwertz"
-
-#: ../rules/base.xml.in.h:415
-msgid "si1452"
-msgstr "si1452"
+# Traditional Chinese Messages for xkeyboard-config
+# Copyright (C) 2003, 05 Free Software Foundation, Inc.
+# Funda Wang <fundawang@linux.net.cn>, 2003
+# Wei-Lun Chao <chaoweilun@pcmail.com.tw>, 2005
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 0.6\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-08-14 00:39+0100\n"
+"PO-Revision-Date: 2005-09-19 17:19+0800\n"
+"Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
+"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../rules/base.xml.in.h:1
+msgid "\"Standard\""
+msgstr "「標準」"
+
+#: ../rules/base.xml.in.h:2
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:3
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/逗點/無用按鍵"
+
+#: ../rules/base.xml.in.h:4
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/逗點/除去無用按鍵"
+
+#: ../rules/base.xml.in.h:5
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/句點/無用按鍵"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/句點/除去無用按鍵"
+
+#: ../rules/base.xml.in.h:7
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/逗點/無用按鍵"
+
+#: ../rules/base.xml.in.h:8
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwerty/逗點/除去無用按鍵"
+
+#: ../rules/base.xml.in.h:9
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/句點/無用按鍵"
+
+#: ../rules/base.xml.in.h:10
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/句點/除去無用按鍵"
+
+#: ../rules/base.xml.in.h:11
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/逗點/無用按鍵"
+
+#: ../rules/base.xml.in.h:12
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/逗點/除去無用按鍵"
+
+#: ../rules/base.xml.in.h:13
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/句點/無用按鍵"
+
+#: ../rules/base.xml.in.h:14
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/句點/除去無用按鍵"
+
+#: ../rules/base.xml.in.h:15
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/逗點/無用按鍵"
+
+#: ../rules/base.xml.in.h:16
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/逗點/除去無用按鍵"
+
+#: ../rules/base.xml.in.h:17
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/句點/無用按鍵"
+
+#: ../rules/base.xml.in.h:18
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/句點/除去無用按鍵"
+
+#: ../rules/base.xml.in.h:19
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:20
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:21
+msgid "ACPI Standard"
+msgstr "ACPI 標準"
+
+#: ../rules/base.xml.in.h:22
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:23
+msgid "Acer TravelMate 800"
+msgstr "Acer TravelMate 800"
+
+#: ../rules/base.xml.in.h:24
+msgid "Add the EuroSign to the 2 key."
+msgstr "將歐元符號加到 2 鍵之上"
+
+#: ../rules/base.xml.in.h:25
+msgid "Add the EuroSign to the 5 key."
+msgstr "將歐元符號加到 5 鍵之上"
+
+#: ../rules/base.xml.in.h:26
+msgid "Add the EuroSign to the E key."
+msgstr "將歐元符號加到 E 鍵之上"
+
+#: ../rules/base.xml.in.h:27
+msgid "Add the standard behavior to Menu key."
+msgstr "增加標準功能至 Menu 鍵。"
+
+#: ../rules/base.xml.in.h:28
+msgid "Adding the EuroSign to certain keys"
+msgstr "將歐元符號加到特定鍵之上"
+
+#: ../rules/base.xml.in.h:29
+msgid "Advance Scorpius KI"
+msgstr "進階 Scorpius KI"
+
+#: ../rules/base.xml.in.h:30
+msgid "Alb"
+msgstr "Alb"
+
+#: ../rules/base.xml.in.h:31
+msgid "Albania"
+msgstr "阿爾巴尼亞"
+
+#: ../rules/base.xml.in.h:32
+msgid "Alt and Meta are on the Alt keys (default)."
+msgstr "Alt 與 Meta 配置於 Alt 鍵（預設值）。"
+
+#: ../rules/base.xml.in.h:33
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Alt 配置到右邊的 Win-key 並優先於 Menu。"
+
+#: ../rules/base.xml.in.h:34
+msgid "Alt+Control changes group."
+msgstr "以 Alt+Control 改變群組。"
+
+#: ../rules/base.xml.in.h:35
+msgid "Alt+Shift changes group."
+msgstr "以 Alt+Shift 改變群組。"
+
+#: ../rules/base.xml.in.h:36
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:37
+msgid "Alt/Win key behavior"
+msgstr "Alt/Win 鍵功能"
+
+#: ../rules/base.xml.in.h:38
+msgid "Alternative"
+msgstr "替代選擇"
+
+#: ../rules/base.xml.in.h:39
+msgid "Alternative international (former us_intl)"
+msgstr "替代國際化 (之前為 us_intl)"
+
+#: ../rules/base.xml.in.h:40
+msgid "Alternative, Sun dead keys"
+msgstr "替代選擇，Sun 的無用按鍵"
+
+#: ../rules/base.xml.in.h:41
+msgid "Alternative, eliminate dead keys"
+msgstr "替代選擇，除去無用按鍵"
+
+#: ../rules/base.xml.in.h:42
+msgid "Apostrophe (') variant"
+msgstr "撇號 (') 變型"
+
+#: ../rules/base.xml.in.h:43
+msgid "Ara"
+msgstr "Ara"
+
+#: ../rules/base.xml.in.h:44
+msgid "Arabic"
+msgstr "阿拉伯文"
+
+#: ../rules/base.xml.in.h:45
+msgid "Arm"
+msgstr "Arm"
+
+#: ../rules/base.xml.in.h:46
+msgid "Armenia"
+msgstr "亞美尼亞"
+
+#: ../rules/base.xml.in.h:47
+msgid "Aze"
+msgstr "Aze"
+
+#: ../rules/base.xml.in.h:48
+msgid "Azerbaijan"
+msgstr "亞塞拜然"
+
+#: ../rules/base.xml.in.h:49
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 無線網際鍵盤"
+
+#: ../rules/base.xml.in.h:50
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:51
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF 多媒體"
+
+#: ../rules/base.xml.in.h:52
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:53
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:54
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:55
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:56
+msgid "Ban"
+msgstr "Ban"
+
+#: ../rules/base.xml.in.h:57
+msgid "Bangladesh"
+msgstr "孟加拉"
+
+#: ../rules/base.xml.in.h:58
+msgid "Bel"
+msgstr "Bel"
+
+#: ../rules/base.xml.in.h:59
+msgid "Belarus"
+msgstr "白俄"
+
+#: ../rules/base.xml.in.h:60
+msgid "Belgium"
+msgstr "比利時"
+
+#: ../rules/base.xml.in.h:61
+msgid "Bengali"
+msgstr "孟加拉文"
+
+#: ../rules/base.xml.in.h:62
+msgid "Bengali Probhat"
+msgstr "孟加拉 Probhat 文"
+
+#: ../rules/base.xml.in.h:63
+msgid "Bgr"
+msgstr "Bgr"
+
+#: ../rules/base.xml.in.h:64
+msgid "Bhu"
+msgstr "Bhu"
+
+#: ../rules/base.xml.in.h:65
+msgid "Bhutan"
+msgstr "不丹"
+
+#: ../rules/base.xml.in.h:66
+msgid "Bih"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:67
+msgid "Blr"
+msgstr "Blr"
+
+#: ../rules/base.xml.in.h:68
+msgid "Bosnia and Herzegovina"
+msgstr "波士尼亞及赫塞哥維那"
+
+#: ../rules/base.xml.in.h:69
+msgid "Both Alt keys together change group."
+msgstr "同時以兩個 Alt 鍵改變群組。"
+
+#: ../rules/base.xml.in.h:70
+msgid "Both Ctrl keys together change group."
+msgstr "同時以兩個 Ctrl 鍵改變群組。"
+
+#: ../rules/base.xml.in.h:71
+msgid "Both Shift keys together change group."
+msgstr "同時以兩個 Shift 鍵改變群組。"
+
+#: ../rules/base.xml.in.h:72
+msgid "Both Win-keys switch group while pressed."
+msgstr "當按下兩個 Win-key 時切換群組。"
+
+#: ../rules/base.xml.in.h:73
+msgid "Bra"
+msgstr "Bra"
+
+#: ../rules/base.xml.in.h:74
+msgid "Brazil"
+msgstr "巴西"
+
+#: ../rules/base.xml.in.h:75
+msgid "Brazilian ABNT2"
+msgstr "巴西 ABNT2 鍵盤"
+
+#: ../rules/base.xml.in.h:76
+msgid "Brother Internet Keyboard"
+msgstr "Brother 網際鍵盤"
+
+#: ../rules/base.xml.in.h:77
+msgid "Bulgaria"
+msgstr "保加利亞"
+
+#: ../rules/base.xml.in.h:78
+msgid "Can"
+msgstr "Can"
+
+#: ../rules/base.xml.in.h:79
+msgid "Canada"
+msgstr "加拿大"
+
+#: ../rules/base.xml.in.h:80
+msgid "CapsLock LED shows alternative group."
+msgstr "以 CapsLock 燈號來顯示替代的群組。"
+
+#: ../rules/base.xml.in.h:81
+msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
+msgstr "Caps Lock 充當鎖定的 Shift。可以按 Shift 取消之。"
+
+#: ../rules/base.xml.in.h:82
+msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
+msgstr "Caps Lock 充當鎖定的 Shift。無法以按 Shift 取消之。"
+
+#: ../rules/base.xml.in.h:83
+msgid "CapsLock just locks the Shift modifier."
+msgstr "Caps Lock 只用於鎖定 Shift 變更鍵。"
+
+#: ../rules/base.xml.in.h:84
+msgid "CapsLock key behavior"
+msgstr "Caps Lock 鍵功能"
+
+#: ../rules/base.xml.in.h:85
+msgid "CapsLock key changes group."
+msgstr "以 Caps Lock 鍵改變群組"
+
+#: ../rules/base.xml.in.h:86
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr "以 Caps Lock 切換 Shift 狀態而影響到所有按鍵。"
+
+#: ../rules/base.xml.in.h:87
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr "以 Caps Lock 切換正常的字母字元大寫功能。"
+
+#: ../rules/base.xml.in.h:88
+msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
+msgstr "Caps Lock 使用內建的大寫功能。可以 Shift 取消之。"
+
+#: ../rules/base.xml.in.h:89
+msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
+msgstr "Caps Lock 使用內建的大寫功能。無法以 Shift 取消之。"
+
+#: ../rules/base.xml.in.h:90
+msgid "Che"
+msgstr "Che"
+
+#: ../rules/base.xml.in.h:91
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:92
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (替代選項)"
+
+#: ../rules/base.xml.in.h:93
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:94
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony 網際網路鍵盤"
+
+#: ../rules/base.xml.in.h:95
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:96
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:97
+msgid "Compaq Easy Access Keyboard"
+msgstr "康柏輕鬆存取鍵盤"
+
+#: ../rules/base.xml.in.h:98
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "康柏網際鍵盤(13鍵)"
+
+#: ../rules/base.xml.in.h:99
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "康柏網際鍵盤(18鍵)"
+
+#: ../rules/base.xml.in.h:100
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "康柏網際鍵盤(7鍵)"
+
+#: ../rules/base.xml.in.h:101
+msgid "Compaq iPaq Keyboard"
+msgstr "康柏 iPaq 鍵盤"
+
+#: ../rules/base.xml.in.h:102
+msgid "Compose key position"
+msgstr "Compose 鍵的位置"
+
+#: ../rules/base.xml.in.h:103
+msgid "Control key at bottom left"
+msgstr "Control 鍵在左下方"
+
+#: ../rules/base.xml.in.h:104
+msgid "Control key at left of 'A'"
+msgstr "Control 鍵在“A”的左邊"
+
+#: ../rules/base.xml.in.h:105
+msgid "Control key position"
+msgstr "Control 鍵的位置"
+
+#: ../rules/base.xml.in.h:106
+msgid "Control+Shift changes group."
+msgstr "以 Control+Shift 鍵改變群組。"
+
+#: ../rules/base.xml.in.h:107
+msgid "Croatia"
+msgstr "克羅埃西亞"
+
+#: ../rules/base.xml.in.h:108
+msgid "Cyrillic"
+msgstr "斯拉夫文"
+
+#: ../rules/base.xml.in.h:109
+msgid "Cze"
+msgstr "Cze"
+
+#: ../rules/base.xml.in.h:110
+msgid "Czechia"
+msgstr "捷克文"
+
+#: ../rules/base.xml.in.h:111
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:112
+msgid "Dead acute"
+msgstr "Dead acute"
+
+#: ../rules/base.xml.in.h:113
+msgid "Dead grave acute"
+msgstr "Dead grave acute"
+
+#: ../rules/base.xml.in.h:114
+msgid "Dell"
+msgstr "戴爾"
+
+#: ../rules/base.xml.in.h:115
+msgid "Dell 101-key PC"
+msgstr "戴爾 101 鍵 鍵盤"
+
+#: ../rules/base.xml.in.h:116
+msgid "Denmark"
+msgstr "丹麥"
+
+#: ../rules/base.xml.in.h:117
+msgid "Deu"
+msgstr "Deu"
+
+#: ../rules/base.xml.in.h:118
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa 無線桌面鍵盤"
+
+#: ../rules/base.xml.in.h:119
+msgid "Dhivehi"
+msgstr "迪貝喜文"
+
+#: ../rules/base.xml.in.h:120
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 系列"
+
+#: ../rules/base.xml.in.h:121
+msgid "Div"
+msgstr "Div"
+
+#: ../rules/base.xml.in.h:122
+msgid "Dnk"
+msgstr "Dnk"
+
+#: ../rules/base.xml.in.h:123
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:124
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "Dvorak，波蘭式引號置於「1/!」按鍵"
+
+#: ../rules/base.xml.in.h:125
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorak，波蘭式引號置於「1/!」按鍵"
+
+#: ../rules/base.xml.in.h:126
+msgid "Eliminate dead keys"
+msgstr "除去無用按鍵"
+
+#: ../rules/base.xml.in.h:127
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:128
+msgid "Esp"
+msgstr "Esp"
+
+#: ../rules/base.xml.in.h:129
+msgid "Est"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:130
+msgid "Estonia"
+msgstr "愛沙尼亞"
+
+#: ../rules/base.xml.in.h:131
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:132
+msgid "Extended"
+msgstr "延伸的"
+
+#: ../rules/base.xml.in.h:133
+msgid "Extended Backslash"
+msgstr "延伸的反斜線"
+
+#: ../rules/base.xml.in.h:134
+msgid "F-letter (F) variant"
+msgstr "F 字母變化"
+
+#: ../rules/base.xml.in.h:135
+msgid "Fao"
+msgstr "Fao"
+
+#: ../rules/base.xml.in.h:136
+msgid "Faroe Islands"
+msgstr "法羅群島"
+
+#: ../rules/base.xml.in.h:137
+msgid "Fin"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:138
+msgid "Finland"
+msgstr "芬蘭"
+
+#: ../rules/base.xml.in.h:139
+msgid "Fra"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:140
+msgid "France"
+msgstr "法國"
+
+#: ../rules/base.xml.in.h:141
+msgid "French"
+msgstr "法文"
+
+#: ../rules/base.xml.in.h:142
+msgid "French (legacy)"
+msgstr "法文 (傳統)"
+
+#: ../rules/base.xml.in.h:143
+msgid "French Dvorak"
+msgstr "法文 Dvorak"
+
+#: ../rules/base.xml.in.h:144
+msgid "French, Sun dead keys"
+msgstr "法文，Sun 的無用按鍵"
+
+#: ../rules/base.xml.in.h:145
+msgid "French, eliminate dead keys"
+msgstr "法文，除去無用按鍵"
+
+#: ../rules/base.xml.in.h:146
+msgid "GBr"
+msgstr "GBr"
+
+#: ../rules/base.xml.in.h:147
+msgid "Generic 101-key PC"
+msgstr "一般 101鍵 鍵盤"
+
+#: ../rules/base.xml.in.h:148
+msgid "Generic 102-key (Intl) PC"
+msgstr "一般 102鍵 (國際) 鍵盤"
+
+#: ../rules/base.xml.in.h:149
+msgid "Generic 104-key PC"
+msgstr "一般 104鍵 鍵盤"
+
+#: ../rules/base.xml.in.h:150
+msgid "Generic 105-key (Intl) PC"
+msgstr "一般 105 鍵 (國際) 鍵盤"
+
+#: ../rules/base.xml.in.h:151
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "昆盈 Comfy KB-16M / 昆盈 MM 鍵盤 KWD-910"
+
+#: ../rules/base.xml.in.h:152
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "昆盈 Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:153
+msgid "Geo"
+msgstr "Geo"
+
+#: ../rules/base.xml.in.h:154
+msgid "Georgia"
+msgstr "喬治亞"
+
+#: ../rules/base.xml.in.h:155
+msgid "German, Sun dead keys"
+msgstr "德文，Sun 的無用按鍵"
+
+#: ../rules/base.xml.in.h:156
+msgid "German, eliminate dead keys"
+msgstr "德文，除去無用按鍵"
+
+#: ../rules/base.xml.in.h:157
+msgid "Germany"
+msgstr "德國"
+
+#: ../rules/base.xml.in.h:158
+msgid "Gre"
+msgstr "Gre"
+
+#: ../rules/base.xml.in.h:159
+msgid "Greece"
+msgstr "希臘"
+
+#: ../rules/base.xml.in.h:160
+msgid "Group Shift/Lock behavior"
+msgstr "群組 Shift/Lock 功能"
+
+#: ../rules/base.xml.in.h:161
+msgid "Gujarati"
+msgstr "古吉拉特文(印度)"
+
+#: ../rules/base.xml.in.h:162
+msgid "Gurmukhi"
+msgstr "古爾穆希文"
+
+#: ../rules/base.xml.in.h:163
+msgid "Gyration"
+msgstr "回轉"
+
+#: ../rules/base.xml.in.h:164
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "惠普網際鍵盤"
+
+#: ../rules/base.xml.in.h:165
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "惠普 Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:166
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "惠普 Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:167
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "惠普 Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:168
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "惠普 Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:169
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "惠普 Omnibook XE3 CF"
+
+#: ../rules/base.xml.in.h:170
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "惠普 Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:171
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "惠普 Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:172
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr "惠普 SK-2501 多媒體鍵盤"
+
+#: ../rules/base.xml.in.h:173
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr "惠普 SK-2505 網際鍵盤"
+
+#: ../rules/base.xml.in.h:174
+msgid "Honeywell Euroboard"
+msgstr "Honeywell 歐洲鍵盤"
+
+#: ../rules/base.xml.in.h:175
+msgid "Hrv"
+msgstr "Hrv"
+
+#: ../rules/base.xml.in.h:176
+msgid "Hun"
+msgstr "Hun"
+
+#: ../rules/base.xml.in.h:177
+msgid "Hungary"
+msgstr "匈牙利"
+
+#: ../rules/base.xml.in.h:178
+msgid "Hyper is mapped to the Win-keys."
+msgstr "Hyper 配置到兩個 Win-key。"
+
+#: ../rules/base.xml.in.h:179
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:180
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:181
+msgid "IBM Rapid Access II (alternate option)"
+msgstr "IBM Rapid Access II(替代選項)"
+
+#: ../rules/base.xml.in.h:182
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:183
+msgid "ISO Alternate"
+msgstr "ISO 替代"
+
+#: ../rules/base.xml.in.h:184
+msgid "Iceland"
+msgstr "冰島"
+
+#: ../rules/base.xml.in.h:185
+msgid "Ind"
+msgstr "Ind"
+
+#: ../rules/base.xml.in.h:186
+msgid "India"
+msgstr "印度"
+
+#: ../rules/base.xml.in.h:187
+msgid "International (with dead keys)"
+msgstr "國際鍵盤 (附無用按鍵)"
+
+#: ../rules/base.xml.in.h:188
+msgid "Inuktitut"
+msgstr "伊努伊特鍵盤"
+
+#: ../rules/base.xml.in.h:189
+msgid "Iran"
+msgstr "伊朗"
+
+#: ../rules/base.xml.in.h:190
+msgid "Ireland"
+msgstr "愛爾蘭"
+
+#: ../rules/base.xml.in.h:191
+msgid "Irl"
+msgstr "Irl"
+
+#: ../rules/base.xml.in.h:192
+msgid "Irn"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:193
+msgid "Isl"
+msgstr "Isl"
+
+#: ../rules/base.xml.in.h:194
+msgid "Isr"
+msgstr "Isr"
+
+#: ../rules/base.xml.in.h:195
+msgid "Israel"
+msgstr "以色列"
+
+#: ../rules/base.xml.in.h:196
+msgid "Ita"
+msgstr "Ita"
+
+#: ../rules/base.xml.in.h:197
+msgid "Italy"
+msgstr "意大利"
+
+#: ../rules/base.xml.in.h:198
+msgid "Japan"
+msgstr "日本"
+
+#: ../rules/base.xml.in.h:199
+msgid "Japanese 106-key"
+msgstr "日文 106鍵 鍵盤"
+
+#: ../rules/base.xml.in.h:200
+msgid "Jpn"
+msgstr "Jpn"
+
+#: ../rules/base.xml.in.h:201
+msgid "Kannada"
+msgstr "印度卡納達文"
+
+#: ../rules/base.xml.in.h:202
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:203
+msgid "Kyr"
+msgstr "Kyr"
+
+#: ../rules/base.xml.in.h:204
+msgid "Kyrgyzstan"
+msgstr "吉爾吉斯"
+
+#: ../rules/base.xml.in.h:205
+msgid "LAm"
+msgstr "LAm"
+
+#: ../rules/base.xml.in.h:206
+msgid "Lao"
+msgstr "Lao"
+
+#: ../rules/base.xml.in.h:207
+msgid "Laos"
+msgstr "寮國"
+
+#: ../rules/base.xml.in.h:208
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "可攜式/筆記型 康柏 (如 Armada) 可攜式鍵盤"
+
+#: ../rules/base.xml.in.h:209
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "可攜式/筆記型 康柏 (如 Presario) 網際鍵盤"
+
+#: ../rules/base.xml.in.h:210
+msgid "Laptop/notebook Dell Inspiron 8xxx"
+msgstr "可攜式/筆記型 戴爾 Inspiron 8xxx"
+
+#: ../rules/base.xml.in.h:211
+msgid "Latin"
+msgstr "拉丁文"
+
+#: ../rules/base.xml.in.h:212
+msgid "Latin American"
+msgstr "拉丁美洲"
+
+#: ../rules/base.xml.in.h:213
+msgid "Latin Unicode"
+msgstr "拉丁文統一碼"
+
+#: ../rules/base.xml.in.h:214
+msgid "Latin Unicode qwerty"
+msgstr "拉丁文統一碼 qwerty"
+
+#: ../rules/base.xml.in.h:215
+msgid "Latin qwerty"
+msgstr "拉丁文 qwerty"
+
+#: ../rules/base.xml.in.h:216
+msgid "Latin with guillemots"
+msgstr "拉丁文附海鳩符號"
+
+#: ../rules/base.xml.in.h:217
+msgid "Latvia"
+msgstr "拉脫維亞"
+
+#: ../rules/base.xml.in.h:218
+msgid "Left Alt key changes group."
+msgstr "以左邊的 Alt 鍵改變群組。"
+
+#: ../rules/base.xml.in.h:219
+msgid "Left Alt key switches group while pressed."
+msgstr "當按下左邊的 Alt 鍵時切換群組。"
+
+#: ../rules/base.xml.in.h:220
+msgid "Left Ctrl key changes group."
+msgstr "以左邊的 Ctrl 鍵改變群組。"
+
+#: ../rules/base.xml.in.h:221
+msgid "Left Shift key changes group."
+msgstr "以左邊的 Shift 鍵改變群組。"
+
+#: ../rules/base.xml.in.h:222
+msgid "Left Win-key changes group."
+msgstr "以左邊的 Win-key 改變群組。"
+
+#: ../rules/base.xml.in.h:223
+msgid "Left Win-key switches group while pressed."
+msgstr "當按下左邊的 Win-key 時切換群組。"
+
+#: ../rules/base.xml.in.h:224
+msgid "Lithuania"
+msgstr "立陶宛"
+
+#: ../rules/base.xml.in.h:225
+msgid "Logitech Access Keyboard"
+msgstr "羅技 Access 鍵盤"
+
+#: ../rules/base.xml.in.h:226
+msgid "Logitech Cordless Desktop"
+msgstr "羅技無影手"
+
+#: ../rules/base.xml.in.h:227
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "羅技無影手桌面導航器"
+
+#: ../rules/base.xml.in.h:228
+msgid "Logitech Cordless Desktop Optical"
+msgstr "羅技無影手光學組合"
+
+#: ../rules/base.xml.in.h:229
+msgid "Logitech Cordless Desktop Pro"
+msgstr "羅技無影手進階版"
+
+#: ../rules/base.xml.in.h:230
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "羅技無影手進階版(替代選項)"
+
+#: ../rules/base.xml.in.h:231
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "羅技無影手進階版(替代選項)"
+
+#: ../rules/base.xml.in.h:232
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "羅技網際無影手"
+
+#: ../rules/base.xml.in.h:233
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "羅技極光無影手組合/桌面導航器"
+
+#: ../rules/base.xml.in.h:234
+msgid "Logitech Deluxe Access Keyboard"
+msgstr "羅技強手鍵盤"
+
+#: ../rules/base.xml.in.h:235
+msgid "Logitech Internet Keyboard"
+msgstr "羅技網際鍵盤"
+
+#: ../rules/base.xml.in.h:236
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "羅技網際導航鍵盤"
+
+#: ../rules/base.xml.in.h:237
+msgid "Logitech Ultra-X Keyboard"
+msgstr "羅技銀幻手鍵盤"
+
+#: ../rules/base.xml.in.h:238
+msgid "Logitech iTouch"
+msgstr "羅技 iTouch"
+
+#: ../rules/base.xml.in.h:239
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "羅技 iTouch 無影手鍵盤(型號 Y-RB6)"
+
+#: ../rules/base.xml.in.h:240
+msgid "Logitech iTouch keyboard Internet Navigator"
+msgstr "羅技 iTouch 鍵盤網際導航器"
+
+#: ../rules/base.xml.in.h:241
+msgid "Ltu"
+msgstr "Ltu"
+
+#: ../rules/base.xml.in.h:242
+msgid "Lva"
+msgstr "Lva"
+
+#: ../rules/base.xml.in.h:243
+msgid "Macedonian"
+msgstr "馬其頓文"
+
+#: ../rules/base.xml.in.h:244
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:245
+msgid "Macintosh Old"
+msgstr "Macintosh 舊產品"
+
+#: ../rules/base.xml.in.h:246
+msgid "Make CapsLock an additional Control."
+msgstr "以 Caps Lock 做為附加的控制鍵。"
+
+#: ../rules/base.xml.in.h:247
+msgid "Malayalam"
+msgstr "(印度)馬來雅拉姆文字"
+
+#: ../rules/base.xml.in.h:248
+msgid "Malta"
+msgstr "馬爾它"
+
+#: ../rules/base.xml.in.h:249
+msgid "Mao"
+msgstr "Mao"
+
+#: ../rules/base.xml.in.h:250
+msgid "Maori"
+msgstr "毛利"
+
+#: ../rules/base.xml.in.h:251
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:252
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access 鍵盤"
+
+#: ../rules/base.xml.in.h:253
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:254
+msgid "Menu is Compose."
+msgstr "Menu 為組合鍵。"
+
+#: ../rules/base.xml.in.h:255
+msgid "Menu key changes group."
+msgstr "以 Menu 鍵改變群組。"
+
+#: ../rules/base.xml.in.h:256
+msgid "Meta is mapped to the Win-keys."
+msgstr "Meta 配置到兩個 Win-key。"
+
+#: ../rules/base.xml.in.h:257
+msgid "Meta is mapped to the left Win-key."
+msgstr "Meta 配置到左邊的 Win-key。"
+
+#: ../rules/base.xml.in.h:258
+msgid "Microsoft Internet Keyboard"
+msgstr "微軟網際鍵盤"
+
+#: ../rules/base.xml.in.h:259
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "微軟網際鍵盤增強版，瑞典"
+
+#: ../rules/base.xml.in.h:260
+msgid "Microsoft Natural"
+msgstr "微軟自然鍵盤"
+
+#: ../rules/base.xml.in.h:261
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "微軟原生鍵盤增強版/微軟網際鍵盤增強版"
+
+#: ../rules/base.xml.in.h:262
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "微軟原生鍵盤增強版 OEM"
+
+#: ../rules/base.xml.in.h:263
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "微軟自然鍵盤增強版 USB/微軟網際鍵盤增強版"
+
+#: ../rules/base.xml.in.h:264
+msgid "Microsoft Office Keyboard"
+msgstr "微軟 Office 鍵盤"
+
+#: ../rules/base.xml.in.h:265
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "微軟無線多媒體鍵盤 1.0A"
+
+#: ../rules/base.xml.in.h:266
+msgid "Miscellaneous compatibility options"
+msgstr "其它相容選項"
+
+#: ../rules/base.xml.in.h:267
+msgid "Mkd"
+msgstr "Mkd"
+
+#: ../rules/base.xml.in.h:268
+msgid "Mlt"
+msgstr "Mlt"
+
+#: ../rules/base.xml.in.h:269
+msgid "Mmr"
+msgstr "Mmr"
+
+#: ../rules/base.xml.in.h:270
+msgid "Mng"
+msgstr "Mng"
+
+#: ../rules/base.xml.in.h:271
+msgid "Mongolia"
+msgstr "蒙古"
+
+#: ../rules/base.xml.in.h:272
+msgid "Multilingual"
+msgstr "多語言"
+
+#: ../rules/base.xml.in.h:273
+msgid "Multilingual, second part"
+msgstr "多語言，第二部份"
+
+#: ../rules/base.xml.in.h:274
+msgid "Myanmar"
+msgstr "緬甸"
+
+#: ../rules/base.xml.in.h:275
+msgid "Netherlands"
+msgstr "荷蘭"
+
+#: ../rules/base.xml.in.h:276
+msgid "Nld"
+msgstr "Nld"
+
+#: ../rules/base.xml.in.h:277
+msgid "Nor"
+msgstr "Nor"
+
+#: ../rules/base.xml.in.h:278
+msgid "Northern Saami"
+msgstr "北部沙米文"
+
+#: ../rules/base.xml.in.h:279
+msgid "Northern Saami, eliminate dead keys"
+msgstr "北部沙米文，除去無用按鍵"
+
+#: ../rules/base.xml.in.h:280
+msgid "Northgate OmniKey 101"
+msgstr "Northgate Omnikey 101"
+
+#: ../rules/base.xml.in.h:281
+msgid "Norway"
+msgstr "挪威"
+
+#: ../rules/base.xml.in.h:282
+msgid "NumLock LED shows alternative group."
+msgstr "以 Num Lock 燈號來顯示替代的群組。"
+
+#: ../rules/base.xml.in.h:283
+msgid "Ogham"
+msgstr "(古愛爾蘭)歐甘文字"
+
+#: ../rules/base.xml.in.h:284
+msgid "Ogham IS434"
+msgstr "歐甘文字 IS434"
+
+#: ../rules/base.xml.in.h:285
+msgid "Oretec MCK-800 MM/Internet keyboard"
+msgstr "Oretec MCK-800 MM/網際鍵盤"
+
+#: ../rules/base.xml.in.h:286
+msgid "Oriya"
+msgstr "(印度)奧里雅族文字"
+
+#: ../rules/base.xml.in.h:287
+msgid "PC-98xx Series"
+msgstr "PC-98xx 系列"
+
+#: ../rules/base.xml.in.h:288
+msgid "Pak"
+msgstr "Pak"
+
+#: ../rules/base.xml.in.h:289
+msgid "Pakistan"
+msgstr "巴基斯坦"
+
+#: ../rules/base.xml.in.h:290
+msgid "Pattachote"
+msgstr "泰文"
+
+#: ../rules/base.xml.in.h:291
+msgid "Phonetic"
+msgstr "音標"
+
+#: ../rules/base.xml.in.h:292
+msgid "Pol"
+msgstr "Pol"
+
+#: ../rules/base.xml.in.h:293
+msgid "Poland"
+msgstr "波蘭"
+
+#: ../rules/base.xml.in.h:294
+msgid "Polytonic"
+msgstr "多音字母"
+
+#: ../rules/base.xml.in.h:295
+msgid "Portugal"
+msgstr "葡萄牙"
+
+#: ../rules/base.xml.in.h:296
+msgid "PowerPC PS/2"
+msgstr "PowerPC PS/2"
+
+#: ../rules/base.xml.in.h:297
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "按下左邊的 Alt 鍵以選擇第三級。"
+
+#: ../rules/base.xml.in.h:298
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "按下左邊的 Win-key 以選擇第三級。"
+
+#: ../rules/base.xml.in.h:299
+msgid "Press Menu key to choose 3rd level."
+msgstr "按下 Menu 鍵以選擇第三級。"
+
+#: ../rules/base.xml.in.h:300
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "按下右邊的 Alt 鍵以選擇第三級。"
+
+#: ../rules/base.xml.in.h:301
+msgid "Press Right Control to choose 3rd level."
+msgstr "按下右邊的 Control 以選擇第三級。"
+
+#: ../rules/base.xml.in.h:302
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "按下右邊的 Win-key 以選擇第三級。"
+
+#: ../rules/base.xml.in.h:303
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "按下任一 Alt 鍵以選擇第三級。"
+
+#: ../rules/base.xml.in.h:304
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "按下任一 Win-key 以選擇第三級。"
+
+#: ../rules/base.xml.in.h:305
+msgid "Probhat"
+msgstr "孟加拉 Probhat"
+
+#: ../rules/base.xml.in.h:306
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:307
+msgid "Prt"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:308
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:309
+msgid "R-Alt switches group while pressed."
+msgstr "當按下右邊 Alt 時切換群組。"
+
+#: ../rules/base.xml.in.h:310
+msgid "Right Alt is Compose."
+msgstr "右邊的 Alt 為組合鍵。"
+
+#: ../rules/base.xml.in.h:311
+msgid "Right Alt key changes group."
+msgstr "以右邊的 Alt 鍵改變群組。"
+
+#: ../rules/base.xml.in.h:312
+msgid "Right Control key works as Right Alt."
+msgstr "右邊 Ctrl 鍵等同於右邊 Alt。"
+
+#: ../rules/base.xml.in.h:313
+msgid "Right Ctrl is Compose."
+msgstr "右邊的 Ctrl 為組合鍵。"
+
+#: ../rules/base.xml.in.h:314
+msgid "Right Ctrl key changes group."
+msgstr "以右邊的 Ctrl 鍵改變群組。"
+
+#: ../rules/base.xml.in.h:315
+msgid "Right Ctrl key switches group while pressed."
+msgstr "當按下右邊的 Ctrl 鍵時切換群組。"
+
+#: ../rules/base.xml.in.h:316
+msgid "Right Shift key changes group."
+msgstr "以右邊的 Shift 鍵改變群組。"
+
+#: ../rules/base.xml.in.h:317
+msgid "Right Win-key changes group."
+msgstr "以右邊的 Win-key 改變群組。"
+
+#: ../rules/base.xml.in.h:318
+msgid "Right Win-key is Compose."
+msgstr "右邊的 Win-key 為組合鍵。"
+
+#: ../rules/base.xml.in.h:319
+msgid "Right Win-key switches group while pressed."
+msgstr "當按下右邊的 Win-key 時切換群組。"
+
+#: ../rules/base.xml.in.h:320
+msgid "Romania"
+msgstr "羅馬尼亞"
+
+#: ../rules/base.xml.in.h:321
+msgid "Romanian keyboard with German letters"
+msgstr "羅馬尼亞鍵盤附德文字母"
+
+#: ../rules/base.xml.in.h:322
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "羅馬尼亞鍵盤附德文字母，除去無用按鍵"
+
+#: ../rules/base.xml.in.h:323
+msgid "Rou"
+msgstr "Rou"
+
+#: ../rules/base.xml.in.h:324
+msgid "Rus"
+msgstr "Rus"
+
+#: ../rules/base.xml.in.h:325
+msgid "Russia"
+msgstr "俄羅斯"
+
+#: ../rules/base.xml.in.h:326
+msgid "Russian"
+msgstr "俄文"
+
+#: ../rules/base.xml.in.h:327
+msgid "Russian phonetic"
+msgstr "俄文音標"
+
+#: ../rules/base.xml.in.h:328
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "俄文音標，除去無用按鍵"
+
+#: ../rules/base.xml.in.h:329
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:330
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:331
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:332
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:333
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:334
+msgid "Samsung SDM 4500P"
+msgstr "三星 SDM 4500P"
+
+#: ../rules/base.xml.in.h:335
+msgid "Samsung SDM 4510P"
+msgstr "三星 SDM 4510P"
+
+#: ../rules/base.xml.in.h:336
+msgid "ScrollLock LED shows alternative group."
+msgstr "以 Scroll Lock 燈號來顯示替代的群組。"
+
+#: ../rules/base.xml.in.h:337
+msgid "Serbian"
+msgstr "塞爾維亞文"
+
+#: ../rules/base.xml.in.h:338
+msgid "Shift with numpad keys works as in MS Windows."
+msgstr "Shift+數字鍵盤的功能等同於在 MS Windows 之中。"
+
+#: ../rules/base.xml.in.h:339
+msgid "Shift+CapsLock changes group."
+msgstr "以 Shift+Caps Lock 鍵改變群組。"
+
+#: ../rules/base.xml.in.h:340
+msgid "Slovakia"
+msgstr "斯洛伐克"
+
+#: ../rules/base.xml.in.h:341
+msgid "Slovenia"
+msgstr "斯洛凡尼亞"
+
+#: ../rules/base.xml.in.h:342
+msgid "Spain"
+msgstr "西班牙"
+
+#: ../rules/base.xml.in.h:343
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "伺服器處理的特殊鍵 (Ctrl+Alt+&lt;key&gt;)。"
+
+#: ../rules/base.xml.in.h:344
+msgid "SrL"
+msgstr "SrL"
+
+#: ../rules/base.xml.in.h:345
+msgid "Sri Lanka"
+msgstr "斯里蘭卡"
+
+#: ../rules/base.xml.in.h:346
+msgid "Srp"
+msgstr "Srp"
+
+#: ../rules/base.xml.in.h:347
+msgid "Standard"
+msgstr "標準"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:349
+msgid "Standard RSTU"
+msgstr "標準 RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:351
+msgid "Standard RSTU on Russian layout"
+msgstr "俄文排列上的標準 RSTU"
+
+#: ../rules/base.xml.in.h:352
+msgid "Sun dead keys"
+msgstr "Sun 無用按鍵"
+
+#: ../rules/base.xml.in.h:353
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power 多媒體鍵盤"
+
+#: ../rules/base.xml.in.h:354
+msgid "Super is mapped to the Win-keys (default)."
+msgstr "Super 配置到兩個 Win-key （預設值）。"
+
+#: ../rules/base.xml.in.h:355
+msgid "Svk"
+msgstr "Svk"
+
+#: ../rules/base.xml.in.h:356
+msgid "Svn"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:357
+msgid "Swap Control and CapsLock."
+msgstr "Control 與 Caps Lock 鍵互換。"
+
+#: ../rules/base.xml.in.h:358
+msgid "Swe"
+msgstr "Swe"
+
+#: ../rules/base.xml.in.h:359
+msgid "Sweden"
+msgstr "瑞典"
+
+#: ../rules/base.xml.in.h:360
+msgid "Switzerland"
+msgstr "瑞士"
+
+#: ../rules/base.xml.in.h:361
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (平板電腦)"
+
+#: ../rules/base.xml.in.h:362
+msgid "Syr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:363
+msgid "Syria"
+msgstr "敘利亞"
+
+#: ../rules/base.xml.in.h:364
+msgid "Syriac"
+msgstr "敘利亞語"
+
+#: ../rules/base.xml.in.h:365
+msgid "Syriac phonetic"
+msgstr "敘利亞音標"
+
+#: ../rules/base.xml.in.h:366
+msgid "TIS-820.2538"
+msgstr "泰語(TIS-820.2538)"
+
+#: ../rules/base.xml.in.h:367
+msgid "Tajikistan"
+msgstr "塔吉克"
+
+#: ../rules/base.xml.in.h:368
+msgid "Tamil"
+msgstr "坦米爾文"
+
+#: ../rules/base.xml.in.h:369
+msgid "Tamil INSCRIPT"
+msgstr "坦米爾文 INSCRIPT"
+
+#: ../rules/base.xml.in.h:370
+msgid "Tamil TAB Typewriter"
+msgstr "坦米爾文 TAB 打字機"
+
+#: ../rules/base.xml.in.h:371
+msgid "Tamil TSCII Typewriter"
+msgstr "坦米爾文 TSCII 打字機"
+
+#: ../rules/base.xml.in.h:372
+msgid "Tamil Unicode"
+msgstr "坦米爾文統一碼"
+
+#: ../rules/base.xml.in.h:373
+msgid "Telugu"
+msgstr "泰盧固語"
+
+#: ../rules/base.xml.in.h:374
+msgid "Tha"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:375
+msgid "Thailand"
+msgstr "泰國"
+
+#: ../rules/base.xml.in.h:376
+msgid "Third level choosers"
+msgstr "第三級選擇器"
+
+#: ../rules/base.xml.in.h:377
+msgid "Tilde (~) variant"
+msgstr "波折號 (~) 變化"
+
+#: ../rules/base.xml.in.h:378
+msgid "Tjk"
+msgstr "Tjk"
+
+#: ../rules/base.xml.in.h:379
+msgid "Toshiba Satellite S3000"
+msgstr "東芝 Satellite S3000"
+
+#: ../rules/base.xml.in.h:380
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access 鍵盤"
+
+#: ../rules/base.xml.in.h:381
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust 無線經典鍵盤"
+
+#: ../rules/base.xml.in.h:382
+msgid "Tur"
+msgstr "Tur"
+
+#: ../rules/base.xml.in.h:383
+msgid "Turkish"
+msgstr "土耳其文"
+
+#: ../rules/base.xml.in.h:384
+msgid "Typewriter"
+msgstr "打字機"
+
+#: ../rules/base.xml.in.h:385
+msgid "U.S. English"
+msgstr "美式英文"
+
+#: ../rules/base.xml.in.h:386
+msgid "US keyboard with Croatian letters"
+msgstr "美國鍵盤附克羅埃西亞字母"
+
+#: ../rules/base.xml.in.h:387
+msgid "US keyboard with Lithuanian letters"
+msgstr "美國鍵盤附立陶宛字母"
+
+#: ../rules/base.xml.in.h:388
+msgid "US keyboard with Maltian letters"
+msgstr "美國鍵盤附馬爾它字母"
+
+#: ../rules/base.xml.in.h:389
+msgid "US keyboard with Romanian letters"
+msgstr "美國鍵盤附羅馬尼亞字母"
+
+#: ../rules/base.xml.in.h:390
+msgid "USA"
+msgstr "USA"
+
+#: ../rules/base.xml.in.h:391
+msgid "Ukr"
+msgstr "Ukr"
+
+#: ../rules/base.xml.in.h:392
+msgid "Ukraine"
+msgstr "烏克蘭"
+
+#: ../rules/base.xml.in.h:393
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:394
+msgid "United Kingdom"
+msgstr "英國"
+
+#: ../rules/base.xml.in.h:395
+msgid "Urdu"
+msgstr "烏都文"
+
+#: ../rules/base.xml.in.h:396
+msgid "Use keyboard LED to show alternative group."
+msgstr "使用鍵盤燈號來顯示替代的群組。"
+
+#: ../rules/base.xml.in.h:397
+msgid "Uzb"
+msgstr "Uzb"
+
+#: ../rules/base.xml.in.h:398
+msgid "Uzbekistan"
+msgstr "烏茲別克"
+
+#: ../rules/base.xml.in.h:399
+msgid "Vietnam"
+msgstr "越南"
+
+#: ../rules/base.xml.in.h:400
+msgid "Vnm"
+msgstr "Vnm"
+
+#: ../rules/base.xml.in.h:401
+msgid "Winbook Model XP5"
+msgstr "Winbook XP5 鍵盤"
+
+#: ../rules/base.xml.in.h:402
+msgid "Winkeys"
+msgstr "Winkeys"
+
+#: ../rules/base.xml.in.h:403
+msgid "With &lt;\\|&gt; key"
+msgstr "附帶 &lt;\\|&gt; 鍵"
+
+#: ../rules/base.xml.in.h:404
+msgid "With guillemots"
+msgstr "附帶海鳩符號"
+
+#: ../rules/base.xml.in.h:405
+msgid "Yahoo! Internet Keyboard"
+msgstr "雅虎網際鍵盤"
+
+#: ../rules/base.xml.in.h:406
+msgid "Z and ZHE swapped"
+msgstr "已交換 Z 與 ZHE"
+
+#: ../rules/base.xml.in.h:407
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:408
+msgid "azerty/digits"
+msgstr "azerty/數字"
+
+#: ../rules/base.xml.in.h:409
+msgid "digits"
+msgstr "數字"
+
+#: ../rules/base.xml.in.h:410
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:411
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:412
+msgid "qwerty, extended Backslash"
+msgstr "qwerty，延伸的反斜線"
+
+#: ../rules/base.xml.in.h:413
+msgid "qwerty/digits"
+msgstr "qwerty/數字"
+
+#: ../rules/base.xml.in.h:414
+msgid "qwertz"
+msgstr "qwertz"
+
+#: ../rules/base.xml.in.h:415
+msgid "si1452"
+msgstr "si1452"
diff --git a/xorg-server/xkeyboard-config/rules/HDR b/xorg-server/xkeyboard-config/rules/HDR
index 769b8fc7f..664d48ef2 100644
--- a/xorg-server/xkeyboard-config/rules/HDR
+++ b/xorg-server/xkeyboard-config/rules/HDR
@@ -1,33 +1,33 @@
-! model		=	keycodes
-! layout[1]	=	keycodes
-! layout	=	keycodes
-! option	=	keycodes
-! model		layout	=	geometry
-! model		=	geometry
-! model		layout		variant		=	symbols
-! model		layout				=	symbols
-! model		layout[1]			=	symbols
-! model		layout[1]	variant[1]	=	symbols
-! model		layout[2]	=	symbols
-! model		layout[3]	=	symbols
-! model		layout[4]	=	symbols
-! model		layout[2]	variant[2]	=	symbols
-! model		layout[3]	variant[3]	=	symbols
-! model		layout[4]	variant[4]	=	symbols
-! model		=	symbols
-! layout	variant		=	compat
-! layout[1]	variant[1]	=	compat
-! layout[2]	variant[2]	=	compat
-! layout[3]	variant[3]	=	compat
-! layout[4]	variant[4]	=	compat
-! model		layout		=	compat
-! model		layout[1]	=	compat
-! model		=	types
-! layout	option	=	symbols
-! layout[1]	option	=	symbols
-! layout[2]	option	=	symbols
-! layout[3]	option	=	symbols
-! layout[4]	option	=	symbols
-! option	=	symbols
-! option	=	compat
-! option	=	types
+! model		=	keycodes
+! layout[1]	=	keycodes
+! layout	=	keycodes
+! option	=	keycodes
+! model		layout	=	geometry
+! model		=	geometry
+! model		layout		variant		=	symbols
+! model		layout				=	symbols
+! model		layout[1]			=	symbols
+! model		layout[1]	variant[1]	=	symbols
+! model		layout[2]	=	symbols
+! model		layout[3]	=	symbols
+! model		layout[4]	=	symbols
+! model		layout[2]	variant[2]	=	symbols
+! model		layout[3]	variant[3]	=	symbols
+! model		layout[4]	variant[4]	=	symbols
+! model		=	symbols
+! layout	variant		=	compat
+! layout[1]	variant[1]	=	compat
+! layout[2]	variant[2]	=	compat
+! layout[3]	variant[3]	=	compat
+! layout[4]	variant[4]	=	compat
+! model		layout		=	compat
+! model		layout[1]	=	compat
+! model		=	types
+! layout	option	=	symbols
+! layout[1]	option	=	symbols
+! layout[2]	option	=	symbols
+! layout[3]	option	=	symbols
+! layout[4]	option	=	symbols
+! option	=	symbols
+! option	=	compat
+! option	=	types
diff --git a/xorg-server/xkeyboard-config/rules/README b/xorg-server/xkeyboard-config/rules/README
index bcf19ce0c..cd73bca8f 100644
--- a/xorg-server/xkeyboard-config/rules/README
+++ b/xorg-server/xkeyboard-config/rules/README
@@ -1,2 +1,2 @@
-This directory lists sets of rules which can be used to obtain an exact XKB
-configuration.
+This directory lists sets of rules which can be used to obtain an exact XKB
+configuration.
diff --git a/xorg-server/xkeyboard-config/rules/base.hdr.part b/xorg-server/xkeyboard-config/rules/base.hdr.part
index 6550f864d..8c90c2f29 100644
--- a/xorg-server/xkeyboard-config/rules/base.hdr.part
+++ b/xorg-server/xkeyboard-config/rules/base.hdr.part
@@ -1,6 +1,6 @@
-//
-//  Rules for resolving XKB components for use with XFree86
-//  Copyright 1996 by Joseph Moss
-//
-//  2002 Modifier: Ivan Pascal      The XFree86 Project
-//
+//
+//  Rules for resolving XKB components for use with XFree86
+//  Copyright 1996 by Joseph Moss
+//
+//  2002 Modifier: Ivan Pascal      The XFree86 Project
+//
diff --git a/xorg-server/xkeyboard-config/rules/base.l1_k.part b/xorg-server/xkeyboard-config/rules/base.l1_k.part
index 91b775396..032ca5331 100644
--- a/xorg-server/xkeyboard-config/rules/base.l1_k.part
+++ b/xorg-server/xkeyboard-config/rules/base.l1_k.part
@@ -1,3 +1,3 @@
-  $azerty       =       +aliases(azerty)
-  $qwertz       =       +aliases(qwertz)
-  *             =       +aliases(qwerty)
+  $azerty       =       +aliases(azerty)
+  $qwertz       =       +aliases(qwertz)
+  *             =       +aliases(qwerty)
diff --git a/xorg-server/xkeyboard-config/rules/base.l1o_s.part b/xorg-server/xkeyboard-config/rules/base.l1o_s.part
index 592fab272..098539443 100644
--- a/xorg-server/xkeyboard-config/rules/base.l1o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.l1o_s.part
@@ -1,2 +1,2 @@
-  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1
-  *			misc:typo 	= +typo(base):1
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1
+  *			misc:typo 	= +typo(base):1
diff --git a/xorg-server/xkeyboard-config/rules/base.l2o_s.part b/xorg-server/xkeyboard-config/rules/base.l2o_s.part
index aac680e9d..5f4a5e60f 100644
--- a/xorg-server/xkeyboard-config/rules/base.l2o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.l2o_s.part
@@ -1,2 +1,2 @@
-  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2
-  *			misc:typo 	= +typo(base):2
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2
+  *			misc:typo 	= +typo(base):2
diff --git a/xorg-server/xkeyboard-config/rules/base.l3o_s.part b/xorg-server/xkeyboard-config/rules/base.l3o_s.part
index 1010e2e03..270af2bdc 100644
--- a/xorg-server/xkeyboard-config/rules/base.l3o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.l3o_s.part
@@ -1,2 +1,2 @@
-  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3
-  *			misc:typo 	= +typo(base):3
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3
+  *			misc:typo 	= +typo(base):3
diff --git a/xorg-server/xkeyboard-config/rules/base.l4o_s.part b/xorg-server/xkeyboard-config/rules/base.l4o_s.part
index 49650ad9c..7e6175637 100644
--- a/xorg-server/xkeyboard-config/rules/base.l4o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.l4o_s.part
@@ -1,2 +1,2 @@
-  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4
-  *			misc:typo 	= +typo(base):4
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4
+  *			misc:typo 	= +typo(base):4
diff --git a/xorg-server/xkeyboard-config/rules/base.l_k.part b/xorg-server/xkeyboard-config/rules/base.l_k.part
index 91b775396..032ca5331 100644
--- a/xorg-server/xkeyboard-config/rules/base.l_k.part
+++ b/xorg-server/xkeyboard-config/rules/base.l_k.part
@@ -1,3 +1,3 @@
-  $azerty       =       +aliases(azerty)
-  $qwertz       =       +aliases(qwertz)
-  *             =       +aliases(qwerty)
+  $azerty       =       +aliases(azerty)
+  $qwertz       =       +aliases(qwertz)
+  *             =       +aliases(qwerty)
diff --git a/xorg-server/xkeyboard-config/rules/base.lists.part b/xorg-server/xkeyboard-config/rules/base.lists.part
index 64319d376..c7983df87 100644
--- a/xorg-server/xkeyboard-config/rules/base.lists.part
+++ b/xorg-server/xkeyboard-config/rules/base.lists.part
@@ -1,107 +1,107 @@
-
-// If you want non-latin layouts implicitly include the en_US layout
-// uncomment lines below
-//! $nonlatin = am ara ben bd bg bt by cs deva ge gh gr guj guru il \
-//              in ir iku jp kan kh kr la lao lk mk mm mn mv mal ori pk \
-//              ru scc sy syr tel th tj tam ua uz
-
-// PC models
-! $pcmodels = pc101 pc102 pc104 pc105
-
-// Microsoft models (using MS geometry)
-! $msmodels = microsoft microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose
-
-// Nokia devices and keyboards
-! $nokiamodels = nokiasu8w nokiarx44 nokiarx51
-
-// PC geometries - they have special geometry but symbols are mostly pc105
-! $pcgeometries = latitude
-
-// TypeMatrix geometries
-! $tmgeometries = tm2020 tm2030PS2 tm2030USB tm2030USB-102 tm2030USB-106
-
-// Layouts that provide further specializations for the OLPC
-! $olpclayouts = af am ara br ca es et fr it kh kz in mn np ru th tr us 
-
-! $macbooks = macbook78 macbook79
-! $maclaptop = ibook powerbook macbook78 macbook79
-! $applealu = applealu_ansi applealu_iso applealu_jis
-! $macs = macintosh macintosh_old ibook powerbook macbook78 macbook79
-
-! $macvendorlayouts = ch de dk fi fr gb is it latam nl no pt se us
-
-! $azerty = be fr
-! $qwertz = al cz de hr hu ro si sk 
-
-! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \
-              airkey \
-              apple armada azonaRF2300 \
-              benqx brother \
-              btc5113rf btc9000 btc9000a btc9001ah btc5090 btc9019u \
-              cherryblue cherrybluea cherryblueb \
-              cherrycyboard cherrycmexpert \
-              chicony chicony0108 chicony0420 chicony9885 \
-              compalfl90 \
-              compaqeak8 compaqik7 compaqik13 compaqik18 \
-              creativedw7000 \
-              cymotionlinux \
-              dell dellm65 inspiron dellusbmm \
-              emachines ennyah_dkb1008 evdev \
-              genius geniuscomfy2 \
-              gyration honeywell_euroboard \
-              hp250x hp5xx hp500fa hpdv5 \
-              hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \
-              ibm_spacesaver ipaq inspiron intel \
-              logiaccess logicda logicink \
-              logiex110 logiclx300 \
-              logiinkse logiinkseusb logiitc logiik \
-              logitech_base itouch logiultrax \
-              logitech_g15 \
-              logidinovo logidinovoedge \
-              microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \
-              microsoftoffice microsoftmult \
-              mx1998 mx2500 mx2750 \
-              oretec \
-              pc105 \
-              presario propeller \
-              qtronix \
-              rapidaccess rapidaccess2 thinkpad60 \
-              samsung4500 samsung4510 \
-              silvercrest \
-              sk1300 sk2500 sk6200 sk7100 \
-              sven sven303 symplon \
-              toshiba_s3000 trust trustda \
-              unitekkb1925 yahoo
-
-// all layouts with 3rd and 4th groups
-! $threelevellayouts = al az \
-              be br bt \
-              ca ch cs cz \
-              de dk \
-              ee es \
-              fi fo fr \
-              gb gr \
-              hu \
-              ie ir is it \
-              latam \
-              lk lt \
-              mn mt \
-              nl no \
-              pl pt \
-              ro \
-              se sk \
-              tr \
-              us \
-              vn \
-              za
-
-! $evdevkbds = ibm_spacesaver
-
-! $thinkpads = thinkpad thinkpad60 thinkpadz60
-
-! $sun_t6_custom = ara be br ca ch cz de dk \
-                   ee es fi fr gb gr it kr \
-                   lt lv nl no pl pt ro ru \
-                   se sk tr tw ua
-
-! $htcdreamlayouts = us it de
+
+// If you want non-latin layouts implicitly include the en_US layout
+// uncomment lines below
+//! $nonlatin = am ara ben bd bg bt by cs deva ge gh gr guj guru il \
+//              in ir iku jp kan kh kr la lao lk mk mm mn mv mal ori pk \
+//              ru scc sy syr tel th tj tam ua uz
+
+// PC models
+! $pcmodels = pc101 pc102 pc104 pc105
+
+// Microsoft models (using MS geometry)
+! $msmodels = microsoft microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose
+
+// Nokia devices and keyboards
+! $nokiamodels = nokiasu8w nokiarx44 nokiarx51
+
+// PC geometries - they have special geometry but symbols are mostly pc105
+! $pcgeometries = latitude
+
+// TypeMatrix geometries
+! $tmgeometries = tm2020 tm2030PS2 tm2030USB tm2030USB-102 tm2030USB-106
+
+// Layouts that provide further specializations for the OLPC
+! $olpclayouts = af am ara br ca es et fr it kh kz in mn np ru th tr us 
+
+! $macbooks = macbook78 macbook79
+! $maclaptop = ibook powerbook macbook78 macbook79
+! $applealu = applealu_ansi applealu_iso applealu_jis
+! $macs = macintosh macintosh_old ibook powerbook macbook78 macbook79
+
+! $macvendorlayouts = ch de dk fi fr gb is it latam nl no pt se us
+
+! $azerty = be fr
+! $qwertz = al cz de hr hu ro si sk 
+
+! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \
+              airkey \
+              apple armada azonaRF2300 \
+              benqx brother \
+              btc5113rf btc9000 btc9000a btc9001ah btc5090 btc9019u \
+              cherryblue cherrybluea cherryblueb \
+              cherrycyboard cherrycmexpert \
+              chicony chicony0108 chicony0420 chicony9885 \
+              compalfl90 \
+              compaqeak8 compaqik7 compaqik13 compaqik18 \
+              creativedw7000 \
+              cymotionlinux \
+              dell dellm65 inspiron dellusbmm \
+              emachines ennyah_dkb1008 evdev \
+              genius geniuscomfy2 \
+              gyration honeywell_euroboard \
+              hp250x hp5xx hp500fa hpdv5 \
+              hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \
+              ibm_spacesaver ipaq inspiron intel \
+              logiaccess logicda logicink \
+              logiex110 logiclx300 \
+              logiinkse logiinkseusb logiitc logiik \
+              logitech_base itouch logiultrax \
+              logitech_g15 \
+              logidinovo logidinovoedge \
+              microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \
+              microsoftoffice microsoftmult \
+              mx1998 mx2500 mx2750 \
+              oretec \
+              pc105 \
+              presario propeller \
+              qtronix \
+              rapidaccess rapidaccess2 thinkpad60 \
+              samsung4500 samsung4510 \
+              silvercrest \
+              sk1300 sk2500 sk6200 sk7100 \
+              sven sven303 symplon \
+              toshiba_s3000 trust trustda \
+              unitekkb1925 yahoo
+
+// all layouts with 3rd and 4th groups
+! $threelevellayouts = al az \
+              be br bt \
+              ca ch cs cz \
+              de dk \
+              ee es \
+              fi fo fr \
+              gb gr \
+              hu \
+              ie ir is it \
+              latam \
+              lk lt \
+              mn mt \
+              nl no \
+              pl pt \
+              ro \
+              se sk \
+              tr \
+              us \
+              vn \
+              za
+
+! $evdevkbds = ibm_spacesaver
+
+! $thinkpads = thinkpad thinkpad60 thinkpadz60
+
+! $sun_t6_custom = ara be br ca ch cz de dk \
+                   ee es fi fr gb gr it kr \
+                   lt lv nl no pl pt ro ru \
+                   se sk tr tw ua
+
+! $htcdreamlayouts = us it de
diff --git a/xorg-server/xkeyboard-config/rules/base.lo_s.part b/xorg-server/xkeyboard-config/rules/base.lo_s.part
index dee7b6daa..1a37c3d48 100644
--- a/xorg-server/xkeyboard-config/rules/base.lo_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.lo_s.part
@@ -1,2 +1,2 @@
-  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle)
-  *			misc:typo 	= +typo(base)
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle)
+  *			misc:typo 	= +typo(base)
diff --git a/xorg-server/xkeyboard-config/rules/base.m_k.part b/xorg-server/xkeyboard-config/rules/base.m_k.part
index 2c621208f..bae06c55d 100644
--- a/xorg-server/xkeyboard-config/rules/base.m_k.part
+++ b/xorg-server/xkeyboard-config/rules/base.m_k.part
@@ -1,14 +1,14 @@
-  amiga		=	amiga(de)
-  ataritt	=	ataritt(de)
-  empty         =       empty
-  sun4		=	sun(type4_euro)
-  sun5		=	sun(type5_euro)
-  sun6		=	sun(type6_usb)
-  sun6euro	=	sun(type6tuv_usb)
-  pc98		=	xfree98(pc98)
- $applealu	=	macintosh(alukbd)
-  macintosh_hhk	=	macintosh(hhk)
-  macintosh_old	=	macintosh(old)
- $macs   	=	macintosh
-  thinkpadz60	=	xfree86(thinkpadz60)
-  *		=	xfree86
+  amiga		=	amiga(de)
+  ataritt	=	ataritt(de)
+  empty         =       empty
+  sun4		=	sun(type4_euro)
+  sun5		=	sun(type5_euro)
+  sun6		=	sun(type6_usb)
+  sun6euro	=	sun(type6tuv_usb)
+  pc98		=	xfree98(pc98)
+ $applealu	=	macintosh(alukbd)
+  macintosh_hhk	=	macintosh(hhk)
+  macintosh_old	=	macintosh(old)
+ $macs   	=	macintosh
+  thinkpadz60	=	xfree86(thinkpadz60)
+  *		=	xfree86
diff --git a/xorg-server/xkeyboard-config/rules/base.m_s.part b/xorg-server/xkeyboard-config/rules/base.m_s.part
index 4bbbcce31..0eee0456d 100644
--- a/xorg-server/xkeyboard-config/rules/base.m_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.m_s.part
@@ -1,51 +1,51 @@
-  a4techKB21    =       +inet(media_nav_common)
-  a4techKBS8    =       +inet(media_nav_acpi_common)
-  a4_rfkb23     =       +inet(media_nav_acpi_common)
-  asus_laptop   =       +inet(media_common)
-  acer_tm_800   =       +inet(acer_laptop)
-  benqx730      =       +inet(benqx)
-  benqx800      =       +inet(benqx)
-  btc5126t      =       +inet(nav_acpi_common)
-  btc9116u      =       +inet(btc9019u)
-  btc6301urf    =       +inet(media_nav_acpi_common)
-  dellsk8125    =       +inet(dell)
-  dellsk8135    =       +inet(dell)
-  cherrybunlim  =       +inet(nav_common)
-  dexxa         =       +inet(media_nav_common)
-  dtk2000       =       +inet(media_nav_acpi_common)
-  fscaa1667g    =       +inet(media_nav_common)
-  geniuskb19e   =       +inet(media_nav_acpi_common)
-  geniuscomfy   =       +inet(media_nav_acpi_common)
-  geniuskkb2050hs =     +inet(dellusbmm)
-  hpnx9020      =       +inet(hpi6)
-  latitude      =       +inet(media_common)
-  logicd        =       +inet(logitech_base)
-  logicd_it     =       +inet(logitech_base)
-  logicd_nav    =       +inet(logitech_base)
-  logicd_opt    =       +inet(logitech_base)
-  logiultrax    =       +inet(logitech_base)
-  logiclx300    =       +inet(logiex110)
-  logii350      =       +inet(logiex110)
-  logimel       =       +inet(logiex110)
-  logicdit      =       +inet(logicd)
-  logicdo       =       +inet(logicd)
-  logicdp       =       +inet(logicd)
-  logicdpa      =       +inet(logicda)
-  logiciink     =       +inet(logicink)
-  ltcd          =       +inet(logicda)
-  microsoftccurve2k =   +inet(microsoftprooem)
-  microsoftpro  =       +inet(media_nav_acpi_common)
-  precision_m   =       +inet(media_nav_common)
-  scorpius      =       +inet(media_nav_acpi_common)
-  sp_inet       =       +inet(media_nav_acpi_common)
-  targa_v811    =       +inet(media_nav_acpi_common)
-  thinkpad      =       +inet(media_nav_common)
-  thinkpadz60   =       +inet(thinkpad60)
-  tm2030USB-102 =       +inet(media_nav_acpi_common)
-  tm2030USB-106 =       +inet(media_nav_acpi_common)
-  trust_slimline =      +inet(media_nav_acpi_common)
-  vsonku306     =       +inet(microsoftprooem)
-  $inetkbds     =       +inet(%m)
-  $maclaptop    =       +inet(apple)+level3(enter_switch)
-  $applealu     =       +inet(apple)
-  $macs	        =       +inet(apple)
+  a4techKB21    =       +inet(media_nav_common)
+  a4techKBS8    =       +inet(media_nav_acpi_common)
+  a4_rfkb23     =       +inet(media_nav_acpi_common)
+  asus_laptop   =       +inet(media_common)
+  acer_tm_800   =       +inet(acer_laptop)
+  benqx730      =       +inet(benqx)
+  benqx800      =       +inet(benqx)
+  btc5126t      =       +inet(nav_acpi_common)
+  btc9116u      =       +inet(btc9019u)
+  btc6301urf    =       +inet(media_nav_acpi_common)
+  dellsk8125    =       +inet(dell)
+  dellsk8135    =       +inet(dell)
+  cherrybunlim  =       +inet(nav_common)
+  dexxa         =       +inet(media_nav_common)
+  dtk2000       =       +inet(media_nav_acpi_common)
+  fscaa1667g    =       +inet(media_nav_common)
+  geniuskb19e   =       +inet(media_nav_acpi_common)
+  geniuscomfy   =       +inet(media_nav_acpi_common)
+  geniuskkb2050hs =     +inet(dellusbmm)
+  hpnx9020      =       +inet(hpi6)
+  latitude      =       +inet(media_common)
+  logicd        =       +inet(logitech_base)
+  logicd_it     =       +inet(logitech_base)
+  logicd_nav    =       +inet(logitech_base)
+  logicd_opt    =       +inet(logitech_base)
+  logiultrax    =       +inet(logitech_base)
+  logiclx300    =       +inet(logiex110)
+  logii350      =       +inet(logiex110)
+  logimel       =       +inet(logiex110)
+  logicdit      =       +inet(logicd)
+  logicdo       =       +inet(logicd)
+  logicdp       =       +inet(logicd)
+  logicdpa      =       +inet(logicda)
+  logiciink     =       +inet(logicink)
+  ltcd          =       +inet(logicda)
+  microsoftccurve2k =   +inet(microsoftprooem)
+  microsoftpro  =       +inet(media_nav_acpi_common)
+  precision_m   =       +inet(media_nav_common)
+  scorpius      =       +inet(media_nav_acpi_common)
+  sp_inet       =       +inet(media_nav_acpi_common)
+  targa_v811    =       +inet(media_nav_acpi_common)
+  thinkpad      =       +inet(media_nav_common)
+  thinkpadz60   =       +inet(thinkpad60)
+  tm2030USB-102 =       +inet(media_nav_acpi_common)
+  tm2030USB-106 =       +inet(media_nav_acpi_common)
+  trust_slimline =      +inet(media_nav_acpi_common)
+  vsonku306     =       +inet(microsoftprooem)
+  $inetkbds     =       +inet(%m)
+  $maclaptop    =       +inet(apple)+level3(enter_switch)
+  $applealu     =       +inet(apple)
+  $macs	        =       +inet(apple)
diff --git a/xorg-server/xkeyboard-config/rules/base.ml1_c.part b/xorg-server/xkeyboard-config/rules/base.ml1_c.part
index f59e596d5..0e6147b23 100644
--- a/xorg-server/xkeyboard-config/rules/base.ml1_c.part
+++ b/xorg-server/xkeyboard-config/rules/base.ml1_c.part
@@ -1 +1 @@
-  *		*		=	complete
+  *		*		=	complete
diff --git a/xorg-server/xkeyboard-config/rules/base.ml_c.part b/xorg-server/xkeyboard-config/rules/base.ml_c.part
index ec8f02291..f71278ff1 100644
--- a/xorg-server/xkeyboard-config/rules/base.ml_c.part
+++ b/xorg-server/xkeyboard-config/rules/base.ml_c.part
@@ -1,4 +1,4 @@
-  pc98		nec_vndr/jp	=	pc98(basic)
-  *		jp		=	complete+japan
-  olpc         *               =       olpc
-  *		*		=	complete
+  pc98		nec_vndr/jp	=	pc98(basic)
+  *		jp		=	complete+japan
+  olpc         *               =       olpc
+  *		*		=	complete
diff --git a/xorg-server/xkeyboard-config/rules/base.ml_g.part b/xorg-server/xkeyboard-config/rules/base.ml_g.part
index e66bb0b50..353bdae23 100644
--- a/xorg-server/xkeyboard-config/rules/base.ml_g.part
+++ b/xorg-server/xkeyboard-config/rules/base.ml_g.part
@@ -1 +1 @@
-  thinkpad     us              =       thinkpad(us)
+  thinkpad     us              =       thinkpad(us)
diff --git a/xorg-server/xkeyboard-config/rules/base.mlv_s.part b/xorg-server/xkeyboard-config/rules/base.mlv_s.part
index 1eecc55c0..2bdd8612b 100644
--- a/xorg-server/xkeyboard-config/rules/base.mlv_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.mlv_s.part
@@ -1,4 +1,4 @@
-  classmate	us		intl		=	pc+us(classmate-intl)
-  classmate	us		alt-intl	=	pc+us(classmate-alt-intl)
-  classmate	us		altgr-intl	=	pc+us(classmate-altgr-intl)
-  nokiarx51	cz		qwerty		=	nokia_vndr/rx-51(cz_qwerty)
+  classmate	us		intl		=	pc+us(classmate-intl)
+  classmate	us		alt-intl	=	pc+us(classmate-alt-intl)
+  classmate	us		altgr-intl	=	pc+us(classmate-altgr-intl)
+  nokiarx51	cz		qwerty		=	nokia_vndr/rx-51(cz_qwerty)
diff --git a/xorg-server/xkeyboard-config/rules/base.o_t.part b/xorg-server/xkeyboard-config/rules/base.o_t.part
index e0d4b15ed..9b3155e74 100644
--- a/xorg-server/xkeyboard-config/rules/base.o_t.part
+++ b/xorg-server/xkeyboard-config/rules/base.o_t.part
@@ -1,8 +1,8 @@
-  caps:internal			=	+caps(internal)
-  caps:internal_nocancel	=	+caps(internal_nocancel)
-  caps:shift			=	+caps(shift)
-  caps:shift_nocancel		=	+caps(shift_nocancel)
-  numpad:pc			=	+numpad(pc)
-  numpad:mac			=	+numpad(mac)
-  numpad:microsoft		=	+numpad(microsoft)
-  numpad:shift3       		=	+numpad(shift3)
+  caps:internal			=	+caps(internal)
+  caps:internal_nocancel	=	+caps(internal_nocancel)
+  caps:shift			=	+caps(shift)
+  caps:shift_nocancel		=	+caps(shift_nocancel)
+  numpad:pc			=	+numpad(pc)
+  numpad:mac			=	+numpad(mac)
+  numpad:microsoft		=	+numpad(microsoft)
+  numpad:shift3       		=	+numpad(shift3)
diff --git a/xorg-server/xkeyboard-config/rules/bin/ml1_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
index b09459a5d..449874909 100644
--- a/xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
@@ -1,9 +1,9 @@
-@echo off
-
-set OUTFILE=base.ml1_s.part
-
-if exist %OUTFILE% del %OUTFILE%
-
-gawk "{   if (index($2, """(""") == 0) {    printf """  *		%%s			=	pc+%%s%%%%(v[1])\n""", $1, $2;   } else {    printf """  *		%%s			=	pc+%%s\n""", $1, $2;   }}" < layoutsMapping.lst >> %OUTFILE%
-
-gawk "{   printf """  *		%%s(%%s)			=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
+@echo off
+
+set OUTFILE=base.ml1_s.part
+
+if exist %OUTFILE% del %OUTFILE%
+
+gawk "{   if (index($2, """(""") == 0) {    printf """  *		%%s			=	pc+%%s%%%%(v[1])\n""", $1, $2;   } else {    printf """  *		%%s			=	pc+%%s\n""", $1, $2;   }}" < layoutsMapping.lst >> %OUTFILE%
+
+gawk "{   printf """  *		%%s(%%s)			=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
index 4d492e02b..68696c9e2 100644
--- a/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
@@ -1,7 +1,7 @@
-@echo off
-
-set OUTFILE=base.ml1v1_s.part
-
-if exist %OUTFILE% del %OUTFILE%
-
-gawk "{   printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
+@echo off
+
+set OUTFILE=base.ml1v1_s.part
+
+if exist %OUTFILE% del %OUTFILE%
+
+gawk "{   printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
index cec1334c0..cae53259c 100644
--- a/xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
@@ -1,7 +1,7 @@
-@echo off
-
-set OUTFILE=base.ml1v_s.part
-
-if exist %OUTFILE% del %OUTFILE%
-
-gawk "{   printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
+@echo off
+
+set OUTFILE=base.ml1v_s.part
+
+if exist %OUTFILE% del %OUTFILE%
+
+gawk "{   printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/bin/ml_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml_s.sh
index b7f0d9c46..d15355918 100644
--- a/xorg-server/xkeyboard-config/rules/bin/ml_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/ml_s.sh
@@ -1,9 +1,9 @@
-@echo off
-
-set OUTFILE=base.ml_s.part
-
-if exist %OUTFILE% del %OUTFILE%
-
-gawk "{   printf """  *		%%s			=	pc+%%s\n""", $1, $2; }" < layoutsMapping.lst >> %OUTFILE%
-
-gawk "{   printf """  *		%%s(%%s)			=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
+@echo off
+
+set OUTFILE=base.ml_s.part
+
+if exist %OUTFILE% del %OUTFILE%
+
+gawk "{   printf """  *		%%s			=	pc+%%s\n""", $1, $2; }" < layoutsMapping.lst >> %OUTFILE%
+
+gawk "{   printf """  *		%%s(%%s)			=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/bin/mlv_s.sh b/xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
index 573cb930f..21205ef97 100644
--- a/xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
+++ b/xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
@@ -1,7 +1,7 @@
-@echo off
-
-set OUTFILE=base.mlv_s.part
-
-if exist %OUTFILE% del %OUTFILE%
-
-gawk "{   printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
+@echo off
+
+set OUTFILE=base.mlv_s.part
+
+if exist %OUTFILE% del %OUTFILE%
+
+gawk "{   printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part
index 64ff0f2f5..d85efe4e7 100644
--- a/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part
+++ b/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part
@@ -1 +1 @@
-  de		neo			=	+caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+  de		neo			=	+caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part
index fea61be76..fd80f998d 100644
--- a/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part
+++ b/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part
@@ -1 +1 @@
-  de		neo			=	+caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+  de		neo			=	+caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part
index 5a1fb2f8a..0fc152316 100644
--- a/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part
+++ b/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part
@@ -1 +1 @@
-  de		neo			=	+caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+  de		neo			=	+caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part
index ac8a91102..8954744ea 100644
--- a/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part
+++ b/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part
@@ -1 +1 @@
-  de		neo			=	+caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+  de		neo			=	+caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
diff --git a/xorg-server/xkeyboard-config/rules/compat/base.lists.part b/xorg-server/xkeyboard-config/rules/compat/base.lists.part
index f1cf7ee22..98c54127a 100644
--- a/xorg-server/xkeyboard-config/rules/compat/base.lists.part
+++ b/xorg-server/xkeyboard-config/rules/compat/base.lists.part
@@ -1,2 +1,2 @@
-
-! $dvoraklayouts = br ca de ee es fr gb no pl se us
+
+! $dvoraklayouts = br ca de ee es fr gb no pl se us
diff --git a/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part b/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part
index 64ff0f2f5..d85efe4e7 100644
--- a/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part
+++ b/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part
@@ -1 +1 @@
-  de		neo			=	+caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+  de		neo			=	+caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
diff --git a/xorg-server/xkeyboard-config/rules/compat/base.o_s.part b/xorg-server/xkeyboard-config/rules/compat/base.o_s.part
index 8f1e9e452..8a3cecf3a 100644
--- a/xorg-server/xkeyboard-config/rules/compat/base.o_s.part
+++ b/xorg-server/xkeyboard-config/rules/compat/base.o_s.part
@@ -1 +1 @@
-  grp:shift_toggle	=	+group(shifts_toggle)
+  grp:shift_toggle	=	+group(shifts_toggle)
diff --git a/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst b/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst
index cecda6d8a..2318de247 100644
--- a/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst
+++ b/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst
@@ -1,27 +1,27 @@
-ar	ara
-ben	in(ben)
-bs	ba
-cs	rs
-cz_qwerty cz(qwerty)
-dev	in(deva)
-dvorak	us(dvorak)
-dzdwi	bt
-el	gr
-en_US	latin
-guj	in(guj)
-gur	in(guru)
-iu	ca(ike)
-lo	la
-kan	in(kan)
-mi	mao
-ml	in(mal)
-ogham	ie(ogam)
-ori	ie(ori)
-sapmi	no(smi)
-sr	srp
-syr	sy(syc)
-tel	in(tel)
-tml	in(tam)
-yu	srp
-fr-latin9 fr(latin9)
-us_intl	us(alt-intl)
+ar	ara
+ben	in(ben)
+bs	ba
+cs	rs
+cz_qwerty cz(qwerty)
+dev	in(deva)
+dvorak	us(dvorak)
+dzdwi	bt
+el	gr
+en_US	latin
+guj	in(guj)
+gur	in(guru)
+iu	ca(ike)
+lo	la
+kan	in(kan)
+mi	mao
+ml	in(mal)
+ogham	ie(ogam)
+ori	ie(ori)
+sapmi	no(smi)
+sr	srp
+syr	sy(syc)
+tel	in(tel)
+tml	in(tam)
+yu	srp
+fr-latin9 fr(latin9)
+us_intl	us(alt-intl)
diff --git a/xorg-server/xkeyboard-config/rules/merge.sh b/xorg-server/xkeyboard-config/rules/merge.sh
index b18af7c3d..be06dfc71 100644
--- a/xorg-server/xkeyboard-config/rules/merge.sh
+++ b/xorg-server/xkeyboard-config/rules/merge.sh
@@ -1,25 +1,25 @@
-#!/bin/sh
-
-INDIR=`dirname $0`
-DEST=$1
-shift
-
-if [ -z "$HDR" ]; then
-    HDR="HDR"
-fi
-
-basename=`basename $0`
-echo "// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY $basename FROM rules/*.part" >$DEST
-
-for i in $*; do
-  if [ "$i" = "$HDR" ] || [ "$i" = "HDR" ]; then
-    echo >> $DEST;
-    read hdr
-    echo "$hdr" >> $DEST
-  elif test -f $i; then
-    cat $i >> $DEST || exit 1
-  else
-    cat $INDIR/$i >> $DEST || exit 1
-  fi
-done < $HDR
-
+#!/bin/sh
+
+INDIR=`dirname $0`
+DEST=$1
+shift
+
+if [ -z "$HDR" ]; then
+    HDR="HDR"
+fi
+
+basename=`basename $0`
+echo "// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY $basename FROM rules/*.part" >$DEST
+
+for i in $*; do
+  if [ "$i" = "$HDR" ] || [ "$i" = "HDR" ]; then
+    echo >> $DEST;
+    read hdr
+    echo "$hdr" >> $DEST
+  elif test -f $i; then
+    cat $i >> $DEST || exit 1
+  else
+    cat $INDIR/$i >> $DEST || exit 1
+  fi
+done < $HDR
+
diff --git a/xorg-server/xkeyboard-config/rules/xfree98 b/xorg-server/xkeyboard-config/rules/xfree98
index 1196f7488..88189a7fe 100644
--- a/xorg-server/xkeyboard-config/rules/xfree98
+++ b/xorg-server/xkeyboard-config/rules/xfree98
@@ -1,28 +1,28 @@
-//
-//  Rules for resolving XKB components for use with XFree86
-//  Copyright 1996 by Joseph Moss
-//
-
-! model 	=	keycodes	geometry
-  pc98		=	xfree98(pc98)	nec(pc98)
-  jp106		=	xfree98(jp106)	pc(jp106)
-
-! model		layout		=	symbols
-  pc98		nec_vndr/jp	=	nec_vndr/jp(pc98)
-  jp106		jp		=	jp
-
-! model		layout	=	compat		types
-  *		*	=	complete	complete
-
-! option		=	symbols
-  grp:switch		=	+group(switch)
-  grp:toggle		=	+group(toggle)
-  grp:shift_toggle	=	+group(shifts_toggle)
-  grp:ctrl_shift_toggle	=	+group(ctrl_shift_toggle)
-  grp:ctrl_alt_toggle	=	+group(ctrl_alt_toggle)
-  ctrl:nocaps		=	+ctrl(nocaps)
-  ctrl:lctrl_meta	=	+ctrl(lctrl_meta)
-  ctrl:swapcaps		=	+ctrl(swapcaps)
-  ctrl:ctrl_ac		=	+ctrl(ctrl_ac)
-  ctrl:ctrl_aa		=	+ctrl(ctrl_aa)
-
+//
+//  Rules for resolving XKB components for use with XFree86
+//  Copyright 1996 by Joseph Moss
+//
+
+! model 	=	keycodes	geometry
+  pc98		=	xfree98(pc98)	nec(pc98)
+  jp106		=	xfree98(jp106)	pc(jp106)
+
+! model		layout		=	symbols
+  pc98		nec_vndr/jp	=	nec_vndr/jp(pc98)
+  jp106		jp		=	jp
+
+! model		layout	=	compat		types
+  *		*	=	complete	complete
+
+! option		=	symbols
+  grp:switch		=	+group(switch)
+  grp:toggle		=	+group(toggle)
+  grp:shift_toggle	=	+group(shifts_toggle)
+  grp:ctrl_shift_toggle	=	+group(ctrl_shift_toggle)
+  grp:ctrl_alt_toggle	=	+group(ctrl_alt_toggle)
+  ctrl:nocaps		=	+ctrl(nocaps)
+  ctrl:lctrl_meta	=	+ctrl(lctrl_meta)
+  ctrl:swapcaps		=	+ctrl(swapcaps)
+  ctrl:ctrl_ac		=	+ctrl(ctrl_ac)
+  ctrl:ctrl_aa		=	+ctrl(ctrl_aa)
+
diff --git a/xorg-server/xkeyboard-config/symbols/altwin b/xorg-server/xkeyboard-config/symbols/altwin
index 597b3fb92..92599128f 100644
--- a/xorg-server/xkeyboard-config/symbols/altwin
+++ b/xorg-server/xkeyboard-config/symbols/altwin
@@ -1,79 +1,79 @@
-partial modifier_keys 
-xkb_symbols "meta_alt" {
-    key <LALT> {	[ 	Alt_L,	Meta_L		]	};
-    key <RALT> { type[Group1] = "TWO_LEVEL",
-                 symbols[Group1] = [ Alt_R, Meta_R ] };
-    modifier_map Mod1	{ Alt_L, Alt_R, Meta_L, Meta_R };
-//  modifier_map Mod4	{};
-};
-
-// Control is mapped to the Win-keys (and the usual Ctrl keys).
-partial modifier_keys 
-xkb_symbols "ctrl_win" {
-    key <LWIN> {	[ 	Control_L		]	};
-    key <RWIN> {	[ 	Control_R		]	};
-    modifier_map Control { <LWIN>, <RWIN> };
-};
-
-// Ctrl is mapped to the Alt-keys, Alt is mapped to the Win-keys,  Win is mapped to the Ctrl-keys.
-partial modifier_keys 
-xkb_symbols "ctrl_alt_win" {
-    key <LALT> {	[ 	Control_L, Control_L		]	};
-    key <RALT> { type[Group1] = "TWO_LEVEL",
-                 symbols[Group1] = [ Control_R, Control_R ] };
-    key <LWIN> {	[	Alt_L, Meta_L    	]	};
-    key <RWIN> {	[	Alt_R, Meta_R		]	};
-    modifier_map Control { <RALT>, <LALT> };
-    modifier_map  Mod1 { <LWIN>, <RWIN> };
-};
-
-
-partial modifier_keys 
-xkb_symbols "meta_win" {
-    key <LALT> {	[ 	Alt_L,	Alt_L		]	};
-    key <RALT> { type[Group1] = "TWO_LEVEL",
-                 symbols[Group1] = [ Alt_R, Alt_R ] };
-    key <LWIN> {	[ 	Meta_L			]	};
-    key <RWIN> {	[ 	Meta_R			]	};
-    modifier_map Mod1	{ Alt_L, Alt_R };
-    modifier_map Mod4	{ <META>, Meta_L, Meta_R };
-};
-
-partial modifier_keys 
-xkb_symbols "left_meta_win" {
-    key <LALT> {	[ 	Alt_L,	Alt_L		]	};
-    key <LWIN> {	[ 	Meta_L			]	};
-    modifier_map Mod1	{ Alt_L };
-    modifier_map Mod4	{ <META>, Meta_L };
-};
-
-partial modifier_keys 
-xkb_symbols "hyper_win" {
-    key <LWIN> {	[ 	Hyper_L			]	};
-    key <RWIN> {	[ 	Hyper_R			]	};
-    modifier_map Mod4	{ Hyper_L, Hyper_R };
-};
-
-// Use Menu for the menu key
-partial modifier_keys 
-xkb_symbols "menu" {
-    key <MENU> {	[ 	Menu		]	};
-};
-
-// Layout for Tux key caps with additional right Alt key
-partial modifier_keys 
-xkb_symbols "alt_super_win" {
-    key <LALT> {        [       Alt_L,  Meta_L          ]       };
-    key <RWIN> {        [       Alt_R,  Meta_R          ]       };
-    key <LWIN> {        [       Super_L                 ]       };
-    key <MENU> {        [       Super_R                 ]       };
-    modifier_map Mod1   { Alt_L, Alt_R, Meta_L, Meta_R };
-    modifier_map Mod4   { Super_L, Super_R };
-};
-
-partial modifier_keys 
-xkb_symbols "swap_lalt_lwin" {
-    key <LALT> { type[Group1] = "ONE_LEVEL",
-                 symbols[Group1] = [ Super_L ] };
-    key <LWIN> {	[	Alt_L,	Meta_L		]	};
-};
+partial modifier_keys 
+xkb_symbols "meta_alt" {
+    key <LALT> {	[ 	Alt_L,	Meta_L		]	};
+    key <RALT> { type[Group1] = "TWO_LEVEL",
+                 symbols[Group1] = [ Alt_R, Meta_R ] };
+    modifier_map Mod1	{ Alt_L, Alt_R, Meta_L, Meta_R };
+//  modifier_map Mod4	{};
+};
+
+// Control is mapped to the Win-keys (and the usual Ctrl keys).
+partial modifier_keys 
+xkb_symbols "ctrl_win" {
+    key <LWIN> {	[ 	Control_L		]	};
+    key <RWIN> {	[ 	Control_R		]	};
+    modifier_map Control { <LWIN>, <RWIN> };
+};
+
+// Ctrl is mapped to the Alt-keys, Alt is mapped to the Win-keys,  Win is mapped to the Ctrl-keys.
+partial modifier_keys 
+xkb_symbols "ctrl_alt_win" {
+    key <LALT> {	[ 	Control_L, Control_L		]	};
+    key <RALT> { type[Group1] = "TWO_LEVEL",
+                 symbols[Group1] = [ Control_R, Control_R ] };
+    key <LWIN> {	[	Alt_L, Meta_L    	]	};
+    key <RWIN> {	[	Alt_R, Meta_R		]	};
+    modifier_map Control { <RALT>, <LALT> };
+    modifier_map  Mod1 { <LWIN>, <RWIN> };
+};
+
+
+partial modifier_keys 
+xkb_symbols "meta_win" {
+    key <LALT> {	[ 	Alt_L,	Alt_L		]	};
+    key <RALT> { type[Group1] = "TWO_LEVEL",
+                 symbols[Group1] = [ Alt_R, Alt_R ] };
+    key <LWIN> {	[ 	Meta_L			]	};
+    key <RWIN> {	[ 	Meta_R			]	};
+    modifier_map Mod1	{ Alt_L, Alt_R };
+    modifier_map Mod4	{ <META>, Meta_L, Meta_R };
+};
+
+partial modifier_keys 
+xkb_symbols "left_meta_win" {
+    key <LALT> {	[ 	Alt_L,	Alt_L		]	};
+    key <LWIN> {	[ 	Meta_L			]	};
+    modifier_map Mod1	{ Alt_L };
+    modifier_map Mod4	{ <META>, Meta_L };
+};
+
+partial modifier_keys 
+xkb_symbols "hyper_win" {
+    key <LWIN> {	[ 	Hyper_L			]	};
+    key <RWIN> {	[ 	Hyper_R			]	};
+    modifier_map Mod4	{ Hyper_L, Hyper_R };
+};
+
+// Use Menu for the menu key
+partial modifier_keys 
+xkb_symbols "menu" {
+    key <MENU> {	[ 	Menu		]	};
+};
+
+// Layout for Tux key caps with additional right Alt key
+partial modifier_keys 
+xkb_symbols "alt_super_win" {
+    key <LALT> {        [       Alt_L,  Meta_L          ]       };
+    key <RWIN> {        [       Alt_R,  Meta_R          ]       };
+    key <LWIN> {        [       Super_L                 ]       };
+    key <MENU> {        [       Super_R                 ]       };
+    modifier_map Mod1   { Alt_L, Alt_R, Meta_L, Meta_R };
+    modifier_map Mod4   { Super_L, Super_R };
+};
+
+partial modifier_keys 
+xkb_symbols "swap_lalt_lwin" {
+    key <LALT> { type[Group1] = "ONE_LEVEL",
+                 symbols[Group1] = [ Super_L ] };
+    key <LWIN> {	[	Alt_L,	Meta_L		]	};
+};
diff --git a/xorg-server/xkeyboard-config/symbols/compose b/xorg-server/xkeyboard-config/symbols/compose
index 520d44aaf..d7257329e 100644
--- a/xorg-server/xkeyboard-config/symbols/compose
+++ b/xorg-server/xkeyboard-config/symbols/compose
@@ -1,54 +1,54 @@
-partial modifier_keys
-xkb_symbols "ralt" {
-    key <RALT>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
-};
-
-partial modifier_keys
-xkb_symbols "lwin" {
-    key <LWIN>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
-};
-
-partial modifier_keys
-xkb_symbols "rwin" {
-    key <RWIN>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
-};
-
-partial modifier_keys
-xkb_symbols "menu" {
-    key <MENU>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
-};
-
-partial modifier_keys
-xkb_symbols "rctrl" {
-    key <RCTL> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
-};
-
-partial modifier_keys
-xkb_symbols "lctrl" {
-    key <LCTL> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
-};
-
-partial modifier_keys
-xkb_symbols "caps" {
-    key <CAPS> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
-};
-
-partial modifier_keys
-xkb_symbols "102" {
-    key <LSGT> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
-};
-
-partial modifier_keys
-xkb_symbols "paus" {
-    key <PAUS> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
-};
-
-partial modifier_keys
-xkb_symbols "prsc" {
-    key <PRSC> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
-};
-
-partial modifier_keys
-xkb_symbols "sclk" {
-    key <SCLK> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
-};
+partial modifier_keys
+xkb_symbols "ralt" {
+    key <RALT>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "lwin" {
+    key <LWIN>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "rwin" {
+    key <RWIN>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "menu" {
+    key <MENU>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "rctrl" {
+    key <RCTL> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "lctrl" {
+    key <LCTL> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "caps" {
+    key <CAPS> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "102" {
+    key <LSGT> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "paus" {
+    key <PAUS> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "prsc" {
+    key <PRSC> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
+
+partial modifier_keys
+xkb_symbols "sclk" {
+    key <SCLK> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am
index 063fc8d57..69184024b 100644
--- a/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am
@@ -1,5 +1,5 @@
-symbolsdir = $(xkb_base)/symbols/digital_vndr
-
-dist_symbols_DATA = \
-lk pc us \
-vt
+symbolsdir = $(xkb_base)/symbols/digital_vndr
+
+dist_symbols_DATA = \
+lk pc us \
+vt
diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/lk b/xorg-server/xkeyboard-config/symbols/digital_vndr/lk
index 82a8c90c6..243086581 100644
--- a/xorg-server/xkeyboard-config/symbols/digital_vndr/lk
+++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/lk
@@ -1,130 +1,130 @@
-//
-//Copyright (c) 1996  Digital Equipment Corporation
-//
-//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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment 
-//Corporation shall not be used in advertising or otherwise to promote
-//the sale, use or other dealings in this Software without prior written
-//authorization from Digital Equipment Corporation.
-//
-// HISTORY
-// Log: lk,v 
-// Revision 1.2  1996/06/18  09:10:09  erik
-// use flags correctly, assorted cleanups and consortium fixes
-//
-// Revision 1.1.2.2  1995/03/10  17:16:52  William_Walker
-// 	Rename to avoid name conflicts with XKB stuff
-// 	[1995/03/10  17:10:33  William_Walker]
-//
-// Revision 1.1.2.2  1994/10/31  15:22:00  William_Walker
-// 	New experimental version.
-// 	[1994/10/31  14:48:37  William_Walker]
-// 
-// EndLog
-// 
-// @(#)RCSfile: lk,v  Revision: 1.2  (DEC) Date: 1996/01/24 12:14:58
-// 
-// Symbols common to all the LK-style keyboards.
-//
-default xkb_symbols "common" {
-
-    // Modifier mappings
-    modifier_map Shift  	{ Shift_L, 	Shift_R	  };
-    modifier_map Lock   	{ Caps_Lock };
-    modifier_map Control	{ Control_L, Control_R };
-    modifier_map Mod1		{ Alt_L, Alt_R, Meta_L, Meta_R };
-    modifier_map Mod2		{ Num_Lock };
-    modifier_map Mod3   	{ Scroll_Lock };
-
-    // Additional alphanumeric keys
-    key <LSGT>		{ [ less,	greater		] };
-    key <LALT>		{ [ Alt_L,	Meta_L		] };
-
-    // "Function" keys
-    key <FK01>		{ [ F1				] };
-    key <FK02>		{ [ F2				] };
-    key <FK03>		{ [ F3				] };
-    key <FK04>		{ [ F4				] };
-    key <FK05>		{ [ F5				] };
-    key <FK06>		{ [ F6				] };
-    key <FK07>		{ [ F7				] };
-    key <FK08>		{ [ F8				] };
-    key <FK09>		{ [ F9				] };
-    key <FK10>		{ [ F10				] };
-    key <FK11>		{ [ Escape,	F11		] };
-    key <FK12>		{ [ F12				] };
-    key <FK13>		{ [ F13				] };
-    key <FK14>		{ [ F14				] };
-    key <FK17>		{ [ F17				] };
-    key <FK18>		{ [ F18				] };
-    key <FK19>		{ [ F19				] };
-    key <FK20>		{ [ F20				] };
-
-    // "Editing" keys
-    key <HELP>		{ [ Help			] };
-    key <DO>		{ [ Menu			] };
-    key <FIND>		{ [ Find			] };
-    key <INS>		{ [ Insert			] };
-    key <DELE>		{ [ Delete			] };
-    key <SELE>		{ [ Select			] };
-    key <PGUP>		{ [ Prior			] };
-    key <PGDN>		{ [ Next			] };
-
-    key <UP>		{ [ Up				] };
-    key <LEFT>		{ [ Left			] };
-    key <DOWN>		{ [ Down			] };
-    key <RGHT>		{ [ Right			] };
-
-    // "Keypad" keys
-    key <KPF1>		{
-				type= "SHIFT+ALT",
-				symbols[Group1]=[ KP_F1,Pointer_EnableKeys ]
-			};
-    key <KPF2>		{ [ KP_F2			] };
-    key <KPF3>		{ [ KP_F3			] };
-    key <KPF4>		{ [ KP_F4			] };
-
-    key <KPCO>		{ [ KP_Separator		] };
-    key <KPSU>		{ [ KP_Subtract			] };
-
-    key <KP7>		{ [ KP_7			] };
-    key <KP8>		{ [ KP_8			] };
-    key <KP9>		{ [ KP_9			] };
-
-    key <KP4>		{ [ KP_4			] };
-    key <KP5>		{ [ KP_5			] };
-    key <KP6>		{ [ KP_6			] };
-
-    key <KP1>		{ [ KP_1			] };
-    key <KP2>		{ [ KP_2			] };
-    key <KP3>		{ [ KP_3			] };
-    key <KPEN>		{ [ KP_Enter			] };
-
-    key <KP0>		{ [ KP_0			] };
-    key <KPDL>		{ [ KP_Decimal			] };
-};
-
-xkb_symbols "lk401" {
-    include "symbols/digital_vndr/lk(common)"
-    key <RALT>              { [ Alt_R,      Meta_R          ] };
-    key <LCMP>              { [ Multi_key                   ] };
-    key <RCMP>              { [ Multi_key                   ] };
-};
+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log: lk,v 
+// Revision 1.2  1996/06/18  09:10:09  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.2.2  1995/03/10  17:16:52  William_Walker
+// 	Rename to avoid name conflicts with XKB stuff
+// 	[1995/03/10  17:10:33  William_Walker]
+//
+// Revision 1.1.2.2  1994/10/31  15:22:00  William_Walker
+// 	New experimental version.
+// 	[1994/10/31  14:48:37  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: lk,v  Revision: 1.2  (DEC) Date: 1996/01/24 12:14:58
+// 
+// Symbols common to all the LK-style keyboards.
+//
+default xkb_symbols "common" {
+
+    // Modifier mappings
+    modifier_map Shift  	{ Shift_L, 	Shift_R	  };
+    modifier_map Lock   	{ Caps_Lock };
+    modifier_map Control	{ Control_L, Control_R };
+    modifier_map Mod1		{ Alt_L, Alt_R, Meta_L, Meta_R };
+    modifier_map Mod2		{ Num_Lock };
+    modifier_map Mod3   	{ Scroll_Lock };
+
+    // Additional alphanumeric keys
+    key <LSGT>		{ [ less,	greater		] };
+    key <LALT>		{ [ Alt_L,	Meta_L		] };
+
+    // "Function" keys
+    key <FK01>		{ [ F1				] };
+    key <FK02>		{ [ F2				] };
+    key <FK03>		{ [ F3				] };
+    key <FK04>		{ [ F4				] };
+    key <FK05>		{ [ F5				] };
+    key <FK06>		{ [ F6				] };
+    key <FK07>		{ [ F7				] };
+    key <FK08>		{ [ F8				] };
+    key <FK09>		{ [ F9				] };
+    key <FK10>		{ [ F10				] };
+    key <FK11>		{ [ Escape,	F11		] };
+    key <FK12>		{ [ F12				] };
+    key <FK13>		{ [ F13				] };
+    key <FK14>		{ [ F14				] };
+    key <FK17>		{ [ F17				] };
+    key <FK18>		{ [ F18				] };
+    key <FK19>		{ [ F19				] };
+    key <FK20>		{ [ F20				] };
+
+    // "Editing" keys
+    key <HELP>		{ [ Help			] };
+    key <DO>		{ [ Menu			] };
+    key <FIND>		{ [ Find			] };
+    key <INS>		{ [ Insert			] };
+    key <DELE>		{ [ Delete			] };
+    key <SELE>		{ [ Select			] };
+    key <PGUP>		{ [ Prior			] };
+    key <PGDN>		{ [ Next			] };
+
+    key <UP>		{ [ Up				] };
+    key <LEFT>		{ [ Left			] };
+    key <DOWN>		{ [ Down			] };
+    key <RGHT>		{ [ Right			] };
+
+    // "Keypad" keys
+    key <KPF1>		{
+				type= "SHIFT+ALT",
+				symbols[Group1]=[ KP_F1,Pointer_EnableKeys ]
+			};
+    key <KPF2>		{ [ KP_F2			] };
+    key <KPF3>		{ [ KP_F3			] };
+    key <KPF4>		{ [ KP_F4			] };
+
+    key <KPCO>		{ [ KP_Separator		] };
+    key <KPSU>		{ [ KP_Subtract			] };
+
+    key <KP7>		{ [ KP_7			] };
+    key <KP8>		{ [ KP_8			] };
+    key <KP9>		{ [ KP_9			] };
+
+    key <KP4>		{ [ KP_4			] };
+    key <KP5>		{ [ KP_5			] };
+    key <KP6>		{ [ KP_6			] };
+
+    key <KP1>		{ [ KP_1			] };
+    key <KP2>		{ [ KP_2			] };
+    key <KP3>		{ [ KP_3			] };
+    key <KPEN>		{ [ KP_Enter			] };
+
+    key <KP0>		{ [ KP_0			] };
+    key <KPDL>		{ [ KP_Decimal			] };
+};
+
+xkb_symbols "lk401" {
+    include "symbols/digital_vndr/lk(common)"
+    key <RALT>              { [ Alt_R,      Meta_R          ] };
+    key <LCMP>              { [ Multi_key                   ] };
+    key <RCMP>              { [ Multi_key                   ] };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/pc b/xorg-server/xkeyboard-config/symbols/digital_vndr/pc
index b8d1fb2bb..f50d4cde4 100644
--- a/xorg-server/xkeyboard-config/symbols/digital_vndr/pc
+++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/pc
@@ -1,175 +1,175 @@
-//
-//Copyright (c) 1996  Digital Equipment Corporation
-//
-//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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment 
-//Corporation shall not be used in advertising or otherwise to promote
-//the sale, use or other dealings in this Software without prior written
-//authorization from Digital Equipment Corporation.
-//
-// HISTORY
-// Log
-// Revision 1.2  1996/06/18  09:10:12  erik
-// use flags correctly, assorted cleanups and consortium fixes
-//
-// Revision 1.1.6.4  1995/12/19  19:55:58  William_Walker
-// 	Update to XKB 0.65
-// 	[1995/12/17  02:37:07  William_Walker]
-//
-// Revision 1.1.6.3  1995/10/25  21:01:09  William_Walker
-// 	Make sure we use DIN 2137 and VT510 Spec for Group Semantics
-// 	[1995/10/23  15:49:03  William_Walker]
-// 
-// Revision 1.1.6.2  1995/08/07  17:40:40  William_Walker
-// 	Upgrade XKB to protocol 0.62 (dual submit from decx11)
-// 	[1995/08/06  14:06:32  William_Walker]
-// 
-// Revision 1.1.2.7  1995/08/05  15:25:57  William_Walker
-// 	Sync up with Erik's pool.
-// 	[1995/08/03  20:17:15  William_Walker]
-// 
-// Revision 1.1.2.6  1995/06/27  12:18:25  William_Walker
-// 	Add LK201 and LK450 support as well as TW and DP variants.
-// 	[1995/06/26  20:29:52  William_Walker]
-// 
-// Revision 1.1.2.5  1995/06/08	 17:10:28  William_Walker
-// 	Make RALT default to Mode_switch
-// 	[1995/06/08  17:08:50  William_Walker]
-// 
-// Revision 1.1.2.4  1995/06/05	 19:24:14  William_Walker
-// 	New file.  I love keymaps.
-// 	[1995/06/05  18:17:03  William_Walker]
-// 
-// EndLog
-// 
-// @(#)RCSfile: pc  Revision: /main/4  (DEC) Date: 1996/01/24 12:15:02 
-// 
-
-// **************************************************************
-// *								*
-// * The symbols common to all Extended PC layouts.		*
-// *								*
-// **************************************************************
-xkb_symbols "pc" {
-
-    // Modifier mappings
-    //
-    modifier_map Shift		{ Shift_L, Shift_R		};
-    modifier_map Lock		{ Caps_Lock			};
-    modifier_map Control	{ Control_L, Control_R		};
-    modifier_map Mod1		{ Alt_L, Alt_R, Meta_L, Meta_R	};
-    modifier_map Mod3		{ Mode_switch			};
-    modifier_map Mod4		{ Num_Lock			};
-    modifier_map Mod5		{ Scroll_Lock			};
-
-    // Common keys
-    //
-    key <BKSP> {       [       BackSpace,	   Delete ] };
-    key	 <TAB> {       [	     Tab,    ISO_Left_Tab ] };
-    key <CAPS> {       [       Caps_Lock ] };
-    key <RTRN> {       [	  Return ] };
-    key <LFSH> {       [	 Shift_L ] };
-    key <RTSH> {       [	 Shift_R ] };
-    key <LCTL> {       [       Control_L ] };
-    key <LALT> {       [	   Alt_L,	   Meta_L ] };
-    key <SPCE> {       [	   space ] };
-    key <RALT> {       [     Mode_switch ] };
-    key <RCTL> {       [       Control_R ] };
-
-    // "Function" keys
-    //
-    key	 <ESC> {       [	  Escape ] };
-    key <FK01> {       [	      F1 ] };
-    key <FK02> {       [	      F2 ] };
-    key <FK03> {       [	      F3 ] };
-    key <FK04> {       [	      F4 ] };
-    key <FK05> {       [	      F5 ] };
-    key <FK06> {       [	      F6 ] };
-    key <FK07> {       [	      F7 ] };
-    key <FK08> {       [	      F8 ] };
-    key <FK09> {       [	      F9 ] };
-    key <FK10> {       [	     F10 ] };
-    key <FK11> {       [	     F11 ] };
-    key <FK12> {       [	     F12 ] };
-    key <PRSC> {
-	type= "PC_ALT_LEVEL2",
-	symbols[Group1]= [	     Print,	    Sys_Req ]
-    };
-    key <SCLK> {       [     Scroll_Lock ] };
-    key <PAUS> {
-	type= "PC_CONTROL_LEVEL2",
-	symbols[Group1]= [	     Pause,	      Break ]
-    };
-
-    // "Editing" keys
-    //
-    key	 <INS> {       [	  Insert ] };
-    key <HOME> {       [	    Home ] };
-    key <PGUP> {       [	   Prior ] };
-    key <DELE> {       [	  Delete ] };
-    key	 <END> {       [	     End ] };
-    key <PGDN> {       [	    Next ] };
-
-    key	  <UP> {       [	      Up ] };
-    key <LEFT> {       [	    Left ] };
-    key <DOWN> {       [	    Down ] };
-    key <RGHT> {       [	   Right ] };
-
-    // "Keypad" keys
-    //
-    key <NMLK> {
-	type= "SHIFT+ALT",
-	symbols[Group1]= [	  Num_Lock,Pointer_EnableKeys]
-    };
-    key <KPDV> {       [       KP_Divide ] };
-    key <KPMU> {       [     KP_Multiply ] };
-    key <KPSU> {       [     KP_Subtract ] };
-
-    key	 <KP7> {       [	 KP_Home,	     KP_7 ] };
-    key	 <KP8> {       [	   KP_Up,	     KP_8 ] };
-    key	 <KP9> {       [	KP_Prior,	     KP_9 ] };
-    key <KPAD> {       [	  KP_Add ] };
-
-    key	 <KP4> {       [	 KP_Left,	     KP_4 ] };
-    key	 <KP5> {       [	    KP_5 ] };
-    key	 <KP6> {       [	KP_Right,	     KP_6 ] };
-
-    key	 <KP1> {       [	  KP_End,	     KP_1 ] };
-    key	 <KP2> {       [	 KP_Down,	     KP_2 ] };
-    key	 <KP3> {       [	 KP_Next,	     KP_3 ] };
-    key <KPEN> {       [	KP_Enter ] };
-
-    key	 <KP0> {       [       KP_Insert,	     KP_0 ] };
-    key <KPDL> {       [       KP_Delete,      KP_Decimal ] };
-
-    // Key to support Lock-Down Modifier descriptions for R5
-    //
-    key	 <LDM> {       [	NoSymbol ] };
-};
-
-xkb_symbols "pc104" {
-    include "digital_vndr/pc(pc)"
-
-    replace key <LALT> {       [       Alt_L ] };
-    key	<LWIN> {       [	 Meta_L ] };
-    key	<RWIN> {       [	 Meta_R ] };
-    key	<MENU> {       [	 Menu   ] };
-};
+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log
+// Revision 1.2  1996/06/18  09:10:12  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.6.4  1995/12/19  19:55:58  William_Walker
+// 	Update to XKB 0.65
+// 	[1995/12/17  02:37:07  William_Walker]
+//
+// Revision 1.1.6.3  1995/10/25  21:01:09  William_Walker
+// 	Make sure we use DIN 2137 and VT510 Spec for Group Semantics
+// 	[1995/10/23  15:49:03  William_Walker]
+// 
+// Revision 1.1.6.2  1995/08/07  17:40:40  William_Walker
+// 	Upgrade XKB to protocol 0.62 (dual submit from decx11)
+// 	[1995/08/06  14:06:32  William_Walker]
+// 
+// Revision 1.1.2.7  1995/08/05  15:25:57  William_Walker
+// 	Sync up with Erik's pool.
+// 	[1995/08/03  20:17:15  William_Walker]
+// 
+// Revision 1.1.2.6  1995/06/27  12:18:25  William_Walker
+// 	Add LK201 and LK450 support as well as TW and DP variants.
+// 	[1995/06/26  20:29:52  William_Walker]
+// 
+// Revision 1.1.2.5  1995/06/08	 17:10:28  William_Walker
+// 	Make RALT default to Mode_switch
+// 	[1995/06/08  17:08:50  William_Walker]
+// 
+// Revision 1.1.2.4  1995/06/05	 19:24:14  William_Walker
+// 	New file.  I love keymaps.
+// 	[1995/06/05  18:17:03  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: pc  Revision: /main/4  (DEC) Date: 1996/01/24 12:15:02 
+// 
+
+// **************************************************************
+// *								*
+// * The symbols common to all Extended PC layouts.		*
+// *								*
+// **************************************************************
+xkb_symbols "pc" {
+
+    // Modifier mappings
+    //
+    modifier_map Shift		{ Shift_L, Shift_R		};
+    modifier_map Lock		{ Caps_Lock			};
+    modifier_map Control	{ Control_L, Control_R		};
+    modifier_map Mod1		{ Alt_L, Alt_R, Meta_L, Meta_R	};
+    modifier_map Mod3		{ Mode_switch			};
+    modifier_map Mod4		{ Num_Lock			};
+    modifier_map Mod5		{ Scroll_Lock			};
+
+    // Common keys
+    //
+    key <BKSP> {       [       BackSpace,	   Delete ] };
+    key	 <TAB> {       [	     Tab,    ISO_Left_Tab ] };
+    key <CAPS> {       [       Caps_Lock ] };
+    key <RTRN> {       [	  Return ] };
+    key <LFSH> {       [	 Shift_L ] };
+    key <RTSH> {       [	 Shift_R ] };
+    key <LCTL> {       [       Control_L ] };
+    key <LALT> {       [	   Alt_L,	   Meta_L ] };
+    key <SPCE> {       [	   space ] };
+    key <RALT> {       [     Mode_switch ] };
+    key <RCTL> {       [       Control_R ] };
+
+    // "Function" keys
+    //
+    key	 <ESC> {       [	  Escape ] };
+    key <FK01> {       [	      F1 ] };
+    key <FK02> {       [	      F2 ] };
+    key <FK03> {       [	      F3 ] };
+    key <FK04> {       [	      F4 ] };
+    key <FK05> {       [	      F5 ] };
+    key <FK06> {       [	      F6 ] };
+    key <FK07> {       [	      F7 ] };
+    key <FK08> {       [	      F8 ] };
+    key <FK09> {       [	      F9 ] };
+    key <FK10> {       [	     F10 ] };
+    key <FK11> {       [	     F11 ] };
+    key <FK12> {       [	     F12 ] };
+    key <PRSC> {
+	type= "PC_ALT_LEVEL2",
+	symbols[Group1]= [	     Print,	    Sys_Req ]
+    };
+    key <SCLK> {       [     Scroll_Lock ] };
+    key <PAUS> {
+	type= "PC_CONTROL_LEVEL2",
+	symbols[Group1]= [	     Pause,	      Break ]
+    };
+
+    // "Editing" keys
+    //
+    key	 <INS> {       [	  Insert ] };
+    key <HOME> {       [	    Home ] };
+    key <PGUP> {       [	   Prior ] };
+    key <DELE> {       [	  Delete ] };
+    key	 <END> {       [	     End ] };
+    key <PGDN> {       [	    Next ] };
+
+    key	  <UP> {       [	      Up ] };
+    key <LEFT> {       [	    Left ] };
+    key <DOWN> {       [	    Down ] };
+    key <RGHT> {       [	   Right ] };
+
+    // "Keypad" keys
+    //
+    key <NMLK> {
+	type= "SHIFT+ALT",
+	symbols[Group1]= [	  Num_Lock,Pointer_EnableKeys]
+    };
+    key <KPDV> {       [       KP_Divide ] };
+    key <KPMU> {       [     KP_Multiply ] };
+    key <KPSU> {       [     KP_Subtract ] };
+
+    key	 <KP7> {       [	 KP_Home,	     KP_7 ] };
+    key	 <KP8> {       [	   KP_Up,	     KP_8 ] };
+    key	 <KP9> {       [	KP_Prior,	     KP_9 ] };
+    key <KPAD> {       [	  KP_Add ] };
+
+    key	 <KP4> {       [	 KP_Left,	     KP_4 ] };
+    key	 <KP5> {       [	    KP_5 ] };
+    key	 <KP6> {       [	KP_Right,	     KP_6 ] };
+
+    key	 <KP1> {       [	  KP_End,	     KP_1 ] };
+    key	 <KP2> {       [	 KP_Down,	     KP_2 ] };
+    key	 <KP3> {       [	 KP_Next,	     KP_3 ] };
+    key <KPEN> {       [	KP_Enter ] };
+
+    key	 <KP0> {       [       KP_Insert,	     KP_0 ] };
+    key <KPDL> {       [       KP_Delete,      KP_Decimal ] };
+
+    // Key to support Lock-Down Modifier descriptions for R5
+    //
+    key	 <LDM> {       [	NoSymbol ] };
+};
+
+xkb_symbols "pc104" {
+    include "digital_vndr/pc(pc)"
+
+    replace key <LALT> {       [       Alt_L ] };
+    key	<LWIN> {       [	 Meta_L ] };
+    key	<RWIN> {       [	 Meta_R ] };
+    key	<MENU> {       [	 Menu   ] };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/us b/xorg-server/xkeyboard-config/symbols/digital_vndr/us
index 95d7301e7..e737e4e3f 100644
--- a/xorg-server/xkeyboard-config/symbols/digital_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/us
@@ -1,211 +1,211 @@
-//
-//Copyright (c) 1996  Digital Equipment Corporation
-//
-//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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment 
-//Corporation shall not be used in advertising or otherwise to promote
-//the sale, use or other dealings in this Software without prior written
-//authorization from Digital Equipment Corporation.
-//
-// HISTORY
-// Log
-// Revision 1.2  1996/06/18  09:10:16  erik
-// use flags correctly, assorted cleanups and consortium fixes
-//
-// Revision 1.1.6.3  1995/12/19  19:56:37  William_Walker
-// 	Update to XKB 0.65
-// 	[1995/12/17  02:37:44  William_Walker]
-//
-// Revision 1.1.6.2  1995/10/25  21:01:25  William_Walker
-// 	Add pc104-key support
-// 	[1995/10/23  15:46:27  William_Walker]
-// 
-// Revision 1.1.2.7  1995/06/27  12:18:40  William_Walker
-// 	Add LK201 and LK450 support as well as TW and DP variants.
-// 	[1995/06/26  20:30:33  William_Walker]
-// 
-// Revision 1.1.2.6  1995/06/09	 20:55:20  William_Walker
-// 	Add VT105 layout support and ISO group support
-// 	[1995/06/09  20:43:05  William_Walker]
-// 
-// Revision 1.1.2.5  1995/06/08	 21:05:49  William_Walker
-// 	Use ISO_Next_Group instead of grouplock
-// 	[1995/06/08  21:03:56  William_Walker]
-// 
-// Revision 1.1.2.4  1995/06/05	 19:25:00  William_Walker
-// 	New file.  I love keymaps.
-// 	[1995/06/05  18:17:54  William_Walker]
-// 
-// EndLog
-// 
-// @(#)RCSfile: us  Revision: /main/4  (DEC) Date: 1996/01/24 12:15:05 
-// 
-
-// **************************************************************
-// *								*
-// * Symbols for en_US.ISO8859-1 - English for U.S.		*
-// *								*
-// **************************************************************
-
-xkb_symbols "us" {
-
-    key <AE00> {       [	    grave,     asciitilde ] };
-    key <AE01> {       [		1,	   exclam ] };
-    key <AE02> {       [		2,	       at ] };
-    key <AE03> {       [		3,     numbersign ] };
-    key <AE04> {       [		4,	   dollar ] };
-    key <AE05> {       [		5,	  percent ] };
-    key <AE06> {       [		6,    asciicircum ] };
-    key <AE07> {       [		7,	ampersand ] };
-    key <AE08> {       [		8,	 asterisk ] };
-    key <AE09> {       [		9,	parenleft ] };
-    key <AE10> {       [		0,     parenright ] };
-    key <AE11> {       [	    minus,     underscore ] };
-    key <AE12> {       [	    equal,	     plus ] };
-
-    key <AD01> {       [		q,		Q ] };
-    key <AD02> {       [		w,		W ] };
-    key <AD03> {       [		e,		E ] };
-    key <AD04> {       [		r,		R ] };
-    key <AD05> {       [		t,		T ] };
-    key <AD06> {       [		y,		Y ] };
-    key <AD07> {       [		u,		U ] };
-    key <AD08> {       [		i,		I ] };
-    key <AD09> {       [		o,		O ] };
-    key <AD10> {       [		p,		P ] };
-    key <AD11> {       [      bracketleft,	braceleft ] };
-    key <AD12> {       [     bracketright,     braceright ] };
-
-    key <AC01> {       [		a,		A ] };
-    key <AC02> {       [		s,		S ] };
-    key <AC03> {       [		d,		D ] };
-    key <AC04> {       [		f,		F ] };
-    key <AC05> {       [		g,		G ] };
-    key <AC06> {       [		h,		H ] };
-    key <AC07> {       [		j,		J ] };
-    key <AC08> {       [		k,		K ] };
-    key <AC09> {       [		l,		L ] };
-    key <AC10> {       [	semicolon,	    colon ] };
-    key <AC11> {       [       apostrophe,	 quotedbl ] };
-    key <BKSL> {       [	backslash,	      bar ] };
-
-    key <AB01> {       [		z,		Z ] };
-    key <AB02> {       [		x,		X ] };
-    key <AB03> {       [		c,		C ] };
-    key <AB04> {       [		v,		V ] };
-    key <AB05> {       [		b,		B ] };
-    key <AB06> {       [		n,		N ] };
-    key <AB07> {       [		m,		M ] };
-    key <AB08> {       [	    comma,	     less ] };
-    key <AB09> {       [	   period,	  greater ] };
-    key <AB10> {       [	    slash,	 question ] };
-};
-
-// **************************************************************
-// *								*
-// * The VT105 layouts						*
-// *								*
-// * NOTES: The typewriter (TW) and dataprocessing (DP) keys	*
-// *	    for the VT108 layout are identical for the US.	*
-// *								*
-// **************************************************************
-xkb_symbols "vt105-tw" {
-    include "digital_vndr/us(us)"
-    include "digital_vndr/vt(vt105)"
-    override key <AE03> { 
-	symbols[Group1]= [ 3, numbersign ],
-	symbols[Group2]= [ sterling ]
-    };
-    key <AB00> {       [	     less,	  greater ] };
-};
-
-xkb_symbols "vt105-dp" { include "digital_vndr/us(vt105-tw)" };
-xkb_symbols "vt105"    { include "digital_vndr/us(vt105-tw)" };
-
-// **************************************************************
-// *								*
-// * The VT108 layouts - based upon the LK401-AA		*
-// *								*
-// * NOTES: The typewriter (TW) and dataprocessing (DP) keys	*
-// *	    for the VT108 layout are identical for the US.	*
-// *								*
-// **************************************************************
-xkb_symbols "vt108-tw" {
-    include "digital_vndr/us(us)"
-    include "digital_vndr/vt(vt108)"
-    replace key <LCMP> { [ Multi_key ] };
-    override key <AE03> { 
-	symbols[Group1]= [ 3, numbersign ],
-	symbols[Group2]= [ sterling ]
-    };
-    key <AB00> {       [	     less,	  greater ] };
-};
-
-xkb_symbols "vt108-dp" { include "digital_vndr/us(vt108-tw)" };
-xkb_symbols "vt108"    { include "digital_vndr/us(vt108-tw)" };
-
-// **************************************************************
-// *								*
-// * The "unix" layouts	- based upon the LK421-AA		*
-// *								*
-// * NOTES: The "unix" keyboard emits the same keycodes as the	*
-// *	    LK401, but is a shorter keyboard that uses an	*
-// *	    "extend" key.  To make life easier, we map <AE00>	*
-// *	    to Escape so users do not have to press Extend+F11	*
-// *	    to get Escape.					*
-// *								*
-// **************************************************************
-xkb_symbols "unix" {
-    include "digital_vndr/us(vt108)"
-    override key <AE00>	{ [ Escape ] };
-    override key <AB00>	{ [ grave, asciitilde ] };
-};
-
-// **************************************************************
-// *								*
-// * The "pcxal" layouts					*
-// *								*
-// * NOTES: The pcxal layouts are pretty much standardized for	*
-// *	    the US and use a 101-key keyboard.			*
-// *								*
-// **************************************************************
-xkb_symbols "pcxalga" {
-    include "digital_vndr/pc(pc)"
-    include "digital_vndr/us(us)"
-    replace key <RALT> { [ Alt_R, Meta_R ] };
-};
-
-xkb_symbols "pcxal"   { include "digital_vndr/us(pcxalga)" };
-xkb_symbols "pcxalaa" { include "digital_vndr/us(pcxalga)" };
-xkb_symbols "pcxalfa" { include "digital_vndr/us(pcxalga)" };
-xkb_symbols "pcxalka" { include "digital_vndr/us(pcxalga)" };
-xkb_symbols "lk44x"   { include "digital_vndr/us(pcxalga)" };
-
-// **************************************************************
-// *								*
-// * The "pc104" layouts.					*
-// *								*
-// **************************************************************
-xkb_symbols "pc104" {
-    include "digital_vndr/pc(pc104)"
-    include "digital_vndr/us(us)"
-    replace key <RALT> { [ Alt_R ] };
-};
+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log
+// Revision 1.2  1996/06/18  09:10:16  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.6.3  1995/12/19  19:56:37  William_Walker
+// 	Update to XKB 0.65
+// 	[1995/12/17  02:37:44  William_Walker]
+//
+// Revision 1.1.6.2  1995/10/25  21:01:25  William_Walker
+// 	Add pc104-key support
+// 	[1995/10/23  15:46:27  William_Walker]
+// 
+// Revision 1.1.2.7  1995/06/27  12:18:40  William_Walker
+// 	Add LK201 and LK450 support as well as TW and DP variants.
+// 	[1995/06/26  20:30:33  William_Walker]
+// 
+// Revision 1.1.2.6  1995/06/09	 20:55:20  William_Walker
+// 	Add VT105 layout support and ISO group support
+// 	[1995/06/09  20:43:05  William_Walker]
+// 
+// Revision 1.1.2.5  1995/06/08	 21:05:49  William_Walker
+// 	Use ISO_Next_Group instead of grouplock
+// 	[1995/06/08  21:03:56  William_Walker]
+// 
+// Revision 1.1.2.4  1995/06/05	 19:25:00  William_Walker
+// 	New file.  I love keymaps.
+// 	[1995/06/05  18:17:54  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: us  Revision: /main/4  (DEC) Date: 1996/01/24 12:15:05 
+// 
+
+// **************************************************************
+// *								*
+// * Symbols for en_US.ISO8859-1 - English for U.S.		*
+// *								*
+// **************************************************************
+
+xkb_symbols "us" {
+
+    key <AE00> {       [	    grave,     asciitilde ] };
+    key <AE01> {       [		1,	   exclam ] };
+    key <AE02> {       [		2,	       at ] };
+    key <AE03> {       [		3,     numbersign ] };
+    key <AE04> {       [		4,	   dollar ] };
+    key <AE05> {       [		5,	  percent ] };
+    key <AE06> {       [		6,    asciicircum ] };
+    key <AE07> {       [		7,	ampersand ] };
+    key <AE08> {       [		8,	 asterisk ] };
+    key <AE09> {       [		9,	parenleft ] };
+    key <AE10> {       [		0,     parenright ] };
+    key <AE11> {       [	    minus,     underscore ] };
+    key <AE12> {       [	    equal,	     plus ] };
+
+    key <AD01> {       [		q,		Q ] };
+    key <AD02> {       [		w,		W ] };
+    key <AD03> {       [		e,		E ] };
+    key <AD04> {       [		r,		R ] };
+    key <AD05> {       [		t,		T ] };
+    key <AD06> {       [		y,		Y ] };
+    key <AD07> {       [		u,		U ] };
+    key <AD08> {       [		i,		I ] };
+    key <AD09> {       [		o,		O ] };
+    key <AD10> {       [		p,		P ] };
+    key <AD11> {       [      bracketleft,	braceleft ] };
+    key <AD12> {       [     bracketright,     braceright ] };
+
+    key <AC01> {       [		a,		A ] };
+    key <AC02> {       [		s,		S ] };
+    key <AC03> {       [		d,		D ] };
+    key <AC04> {       [		f,		F ] };
+    key <AC05> {       [		g,		G ] };
+    key <AC06> {       [		h,		H ] };
+    key <AC07> {       [		j,		J ] };
+    key <AC08> {       [		k,		K ] };
+    key <AC09> {       [		l,		L ] };
+    key <AC10> {       [	semicolon,	    colon ] };
+    key <AC11> {       [       apostrophe,	 quotedbl ] };
+    key <BKSL> {       [	backslash,	      bar ] };
+
+    key <AB01> {       [		z,		Z ] };
+    key <AB02> {       [		x,		X ] };
+    key <AB03> {       [		c,		C ] };
+    key <AB04> {       [		v,		V ] };
+    key <AB05> {       [		b,		B ] };
+    key <AB06> {       [		n,		N ] };
+    key <AB07> {       [		m,		M ] };
+    key <AB08> {       [	    comma,	     less ] };
+    key <AB09> {       [	   period,	  greater ] };
+    key <AB10> {       [	    slash,	 question ] };
+};
+
+// **************************************************************
+// *								*
+// * The VT105 layouts						*
+// *								*
+// * NOTES: The typewriter (TW) and dataprocessing (DP) keys	*
+// *	    for the VT108 layout are identical for the US.	*
+// *								*
+// **************************************************************
+xkb_symbols "vt105-tw" {
+    include "digital_vndr/us(us)"
+    include "digital_vndr/vt(vt105)"
+    override key <AE03> { 
+	symbols[Group1]= [ 3, numbersign ],
+	symbols[Group2]= [ sterling ]
+    };
+    key <AB00> {       [	     less,	  greater ] };
+};
+
+xkb_symbols "vt105-dp" { include "digital_vndr/us(vt105-tw)" };
+xkb_symbols "vt105"    { include "digital_vndr/us(vt105-tw)" };
+
+// **************************************************************
+// *								*
+// * The VT108 layouts - based upon the LK401-AA		*
+// *								*
+// * NOTES: The typewriter (TW) and dataprocessing (DP) keys	*
+// *	    for the VT108 layout are identical for the US.	*
+// *								*
+// **************************************************************
+xkb_symbols "vt108-tw" {
+    include "digital_vndr/us(us)"
+    include "digital_vndr/vt(vt108)"
+    replace key <LCMP> { [ Multi_key ] };
+    override key <AE03> { 
+	symbols[Group1]= [ 3, numbersign ],
+	symbols[Group2]= [ sterling ]
+    };
+    key <AB00> {       [	     less,	  greater ] };
+};
+
+xkb_symbols "vt108-dp" { include "digital_vndr/us(vt108-tw)" };
+xkb_symbols "vt108"    { include "digital_vndr/us(vt108-tw)" };
+
+// **************************************************************
+// *								*
+// * The "unix" layouts	- based upon the LK421-AA		*
+// *								*
+// * NOTES: The "unix" keyboard emits the same keycodes as the	*
+// *	    LK401, but is a shorter keyboard that uses an	*
+// *	    "extend" key.  To make life easier, we map <AE00>	*
+// *	    to Escape so users do not have to press Extend+F11	*
+// *	    to get Escape.					*
+// *								*
+// **************************************************************
+xkb_symbols "unix" {
+    include "digital_vndr/us(vt108)"
+    override key <AE00>	{ [ Escape ] };
+    override key <AB00>	{ [ grave, asciitilde ] };
+};
+
+// **************************************************************
+// *								*
+// * The "pcxal" layouts					*
+// *								*
+// * NOTES: The pcxal layouts are pretty much standardized for	*
+// *	    the US and use a 101-key keyboard.			*
+// *								*
+// **************************************************************
+xkb_symbols "pcxalga" {
+    include "digital_vndr/pc(pc)"
+    include "digital_vndr/us(us)"
+    replace key <RALT> { [ Alt_R, Meta_R ] };
+};
+
+xkb_symbols "pcxal"   { include "digital_vndr/us(pcxalga)" };
+xkb_symbols "pcxalaa" { include "digital_vndr/us(pcxalga)" };
+xkb_symbols "pcxalfa" { include "digital_vndr/us(pcxalga)" };
+xkb_symbols "pcxalka" { include "digital_vndr/us(pcxalga)" };
+xkb_symbols "lk44x"   { include "digital_vndr/us(pcxalga)" };
+
+// **************************************************************
+// *								*
+// * The "pc104" layouts.					*
+// *								*
+// **************************************************************
+xkb_symbols "pc104" {
+    include "digital_vndr/pc(pc104)"
+    include "digital_vndr/us(us)"
+    replace key <RALT> { [ Alt_R ] };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/vt b/xorg-server/xkeyboard-config/symbols/digital_vndr/vt
index 5d3680db4..13f7941c6 100644
--- a/xorg-server/xkeyboard-config/symbols/digital_vndr/vt
+++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/vt
@@ -1,158 +1,158 @@
-//
-//Copyright (c) 1996  Digital Equipment Corporation
-//
-//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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment 
-//Corporation shall not be used in advertising or otherwise to promote
-//the sale, use or other dealings in this Software without prior written
-//authorization from Digital Equipment Corporation.
-//
-// HISTORY
-// Log
-// Revision 1.2  1996/06/18  09:10:19  erik
-// use flags correctly, assorted cleanups and consortium fixes
-//
-// Revision 1.1.6.2  1995/12/19  19:56:39  William_Walker
-// 	Update to XKB 0.65
-// 	[1995/12/17  02:37:47  William_Walker]
-//
-// Revision 1.1.2.5  1995/07/11  21:20:50  William_Walker
-// 	Make RALT act as RALT
-// 	[1995/07/11  21:18:28  William_Walker]
-// 
-// Revision 1.1.2.4  1995/06/27  12:18:41  William_Walker
-// 	Add LK201 and LK450 support as well as TW and DP variants.
-// 	[1995/06/26  20:30:37  William_Walker]
-// 
-// Revision 1.1.2.3  1995/06/09	 20:55:21  William_Walker
-// 	Add VT105 layout support and ISO group support
-// 	[1995/06/09  20:43:09  William_Walker]
-// 
-// Revision 1.1.2.2  1995/06/05	 19:25:04  William_Walker
-// 	New file.  I love keymaps.
-// 	[1995/06/05  18:17:58  William_Walker]
-// 
-// EndLog
-// 
-// @(#)RCSfile: vt  Revision: /main/3  (DEC) Date: 1996/01/24 12:15:08 
-// 
-xkb_symbols "vt105" {
-
-    // Modifier mappings
-    //
-    modifier_map Shift		{ Shift_L, Shift_R		};
-    modifier_map Lock		{ Caps_Lock			};
-    modifier_map Control	{ Control_L, Control_R		};
-    modifier_map Mod1		{ Alt_L, Alt_R, Meta_L, Meta_R	};
-    modifier_map Mod3		{ Mode_switch			};
-
-    // Common keys
-    //
-    key <BKSP> {       [	  Delete ] };
-    key	 <TAB> {       [	     Tab ] };
-    key <RTRN> {       [	  Return ] };
-    key <LCTL> {       [       Control_L ] };
-    key <CAPS> {       [       Caps_Lock ] };
-    key <LFSH> {       [	 Shift_L ] };
-    key <RTSH> {       [	 Shift_R ] };
-    key <LCMP> {       [   Alt_L, Meta_L ] };
-    key <SPCE> {       [	   space ] };
-
-    // "Function" keys
-    //
-    key <FK01> {       [	       F1 ] };
-    key <FK02> {       [	       F2 ] };
-    key <FK03> {       [	       F3 ] };
-    key <FK04> {       [	       F4 ] };
-    key <FK05> {       [	       F5 ] };
-    key <FK06> {       [	       F6 ] };
-    key <FK07> {       [	       F7 ] };
-    key <FK08> {       [	       F8 ] };
-    key <FK09> {       [	       F9 ] };
-    key <FK10> {       [	      F10 ] };
-    key <FK11> {       [	   Escape,	      F11 ] };
-    key <FK12> {       [	      F12 ] };
-    key <FK13> {       [	      F13 ] };
-    key <FK14> {       [	      F14 ] };
-    key <FK17> {       [	      F17 ] };
-    key <FK18> {       [	      F18 ] };
-    key <FK19> {       [	      F19 ] };
-    key <FK20> {       [	      F20 ] };
-
-    // "Editing" keys
-    //
-    key <HELP> {       [	    Help ] };
-    key	  <DO> {       [	    Menu ] };
-    key <FIND> {       [	    Find ] };
-    key	 <INS> {       [	  Insert ] };
-    key <DELE> {       [       apLineDel ] };
-    key <SELE> {       [	  Select ] };
-    key <PGUP> {       [	   Prior ] };
-    key <PGDN> {       [	    Next ] };
-
-    key	  <UP> {       [	      Up ] };
-    key <LEFT> {       [	    Left ] };
-    key <DOWN> {       [	    Down ] };
-    key <RGHT> {       [	   Right ] };
-
-    // "Keypad" keys
-    //
-    key <KPF1> {
-	type= "SHIFT+ALT",
-	symbols[Group1]= [	     KP_F1,Pointer_EnableKeys ]
-    };
-    key <KPF2> {       [	   KP_F2 ] };
-    key <KPF3> {       [	   KP_F3 ] };
-    key <KPF4> {       [	   KP_F4 ] };
-
-    key	 <KP7> {       [	    KP_7 ] };
-    key	 <KP8> {       [	    KP_8 ] };
-    key	 <KP9> {       [	    KP_9 ] };
-    key <KPSU> {       [     KP_Subtract ] };
-
-    key	 <KP4> {       [	    KP_4 ] };
-    key	 <KP5> {       [	    KP_5 ] };
-    key	 <KP6> {       [	    KP_6 ] };
-    key <KPCO> {       [    KP_Separator ] };
-
-    key	 <KP1> {       [	    KP_1 ] };
-    key	 <KP2> {       [	    KP_2 ] };
-    key	 <KP3> {       [	    KP_3 ] };
-    key <KPEN> {       [	KP_Enter ] };
-
-    key	 <KP0> {       [	    KP_0 ] };
-    key <KPDL> {       [      KP_Decimal ] };
-
-    // Key to support Lock-Down Modifier descriptions for R5
-    //
-    key	 <LDM> {       [	NoSymbol ] };
-};
-
-xkb_symbols "vt108" {
-
-    include "digital_vndr/vt(vt105)"
-
-    replace key <LCMP> { [ Mode_switch ] };
-
-    key <LALT> {       [	   Alt_L,	   Meta_L ] };
-    key <RALT> {       [	   Alt_R,	   Meta_R ] };
-    key <RCMP> {       [       Multi_key ] };
-};
+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//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 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 DIGITAL EQUIPMENT CORPORATION 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 Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log
+// Revision 1.2  1996/06/18  09:10:19  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.6.2  1995/12/19  19:56:39  William_Walker
+// 	Update to XKB 0.65
+// 	[1995/12/17  02:37:47  William_Walker]
+//
+// Revision 1.1.2.5  1995/07/11  21:20:50  William_Walker
+// 	Make RALT act as RALT
+// 	[1995/07/11  21:18:28  William_Walker]
+// 
+// Revision 1.1.2.4  1995/06/27  12:18:41  William_Walker
+// 	Add LK201 and LK450 support as well as TW and DP variants.
+// 	[1995/06/26  20:30:37  William_Walker]
+// 
+// Revision 1.1.2.3  1995/06/09	 20:55:21  William_Walker
+// 	Add VT105 layout support and ISO group support
+// 	[1995/06/09  20:43:09  William_Walker]
+// 
+// Revision 1.1.2.2  1995/06/05	 19:25:04  William_Walker
+// 	New file.  I love keymaps.
+// 	[1995/06/05  18:17:58  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: vt  Revision: /main/3  (DEC) Date: 1996/01/24 12:15:08 
+// 
+xkb_symbols "vt105" {
+
+    // Modifier mappings
+    //
+    modifier_map Shift		{ Shift_L, Shift_R		};
+    modifier_map Lock		{ Caps_Lock			};
+    modifier_map Control	{ Control_L, Control_R		};
+    modifier_map Mod1		{ Alt_L, Alt_R, Meta_L, Meta_R	};
+    modifier_map Mod3		{ Mode_switch			};
+
+    // Common keys
+    //
+    key <BKSP> {       [	  Delete ] };
+    key	 <TAB> {       [	     Tab ] };
+    key <RTRN> {       [	  Return ] };
+    key <LCTL> {       [       Control_L ] };
+    key <CAPS> {       [       Caps_Lock ] };
+    key <LFSH> {       [	 Shift_L ] };
+    key <RTSH> {       [	 Shift_R ] };
+    key <LCMP> {       [   Alt_L, Meta_L ] };
+    key <SPCE> {       [	   space ] };
+
+    // "Function" keys
+    //
+    key <FK01> {       [	       F1 ] };
+    key <FK02> {       [	       F2 ] };
+    key <FK03> {       [	       F3 ] };
+    key <FK04> {       [	       F4 ] };
+    key <FK05> {       [	       F5 ] };
+    key <FK06> {       [	       F6 ] };
+    key <FK07> {       [	       F7 ] };
+    key <FK08> {       [	       F8 ] };
+    key <FK09> {       [	       F9 ] };
+    key <FK10> {       [	      F10 ] };
+    key <FK11> {       [	   Escape,	      F11 ] };
+    key <FK12> {       [	      F12 ] };
+    key <FK13> {       [	      F13 ] };
+    key <FK14> {       [	      F14 ] };
+    key <FK17> {       [	      F17 ] };
+    key <FK18> {       [	      F18 ] };
+    key <FK19> {       [	      F19 ] };
+    key <FK20> {       [	      F20 ] };
+
+    // "Editing" keys
+    //
+    key <HELP> {       [	    Help ] };
+    key	  <DO> {       [	    Menu ] };
+    key <FIND> {       [	    Find ] };
+    key	 <INS> {       [	  Insert ] };
+    key <DELE> {       [       apLineDel ] };
+    key <SELE> {       [	  Select ] };
+    key <PGUP> {       [	   Prior ] };
+    key <PGDN> {       [	    Next ] };
+
+    key	  <UP> {       [	      Up ] };
+    key <LEFT> {       [	    Left ] };
+    key <DOWN> {       [	    Down ] };
+    key <RGHT> {       [	   Right ] };
+
+    // "Keypad" keys
+    //
+    key <KPF1> {
+	type= "SHIFT+ALT",
+	symbols[Group1]= [	     KP_F1,Pointer_EnableKeys ]
+    };
+    key <KPF2> {       [	   KP_F2 ] };
+    key <KPF3> {       [	   KP_F3 ] };
+    key <KPF4> {       [	   KP_F4 ] };
+
+    key	 <KP7> {       [	    KP_7 ] };
+    key	 <KP8> {       [	    KP_8 ] };
+    key	 <KP9> {       [	    KP_9 ] };
+    key <KPSU> {       [     KP_Subtract ] };
+
+    key	 <KP4> {       [	    KP_4 ] };
+    key	 <KP5> {       [	    KP_5 ] };
+    key	 <KP6> {       [	    KP_6 ] };
+    key <KPCO> {       [    KP_Separator ] };
+
+    key	 <KP1> {       [	    KP_1 ] };
+    key	 <KP2> {       [	    KP_2 ] };
+    key	 <KP3> {       [	    KP_3 ] };
+    key <KPEN> {       [	KP_Enter ] };
+
+    key	 <KP0> {       [	    KP_0 ] };
+    key <KPDL> {       [      KP_Decimal ] };
+
+    // Key to support Lock-Down Modifier descriptions for R5
+    //
+    key	 <LDM> {       [	NoSymbol ] };
+};
+
+xkb_symbols "vt108" {
+
+    include "digital_vndr/vt(vt105)"
+
+    replace key <LCMP> { [ Mode_switch ] };
+
+    key <LALT> {       [	   Alt_L,	   Meta_L ] };
+    key <RALT> {       [	   Alt_R,	   Meta_R ] };
+    key <RCMP> {       [       Multi_key ] };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/empty b/xorg-server/xkeyboard-config/symbols/empty
index 16443b28c..cae330310 100644
--- a/xorg-server/xkeyboard-config/symbols/empty
+++ b/xorg-server/xkeyboard-config/symbols/empty
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys modifier_keys
-xkb_symbols "basic" {
-    name[Group1]= "Empty";
-};
+default partial alphanumeric_keys modifier_keys
+xkb_symbols "basic" {
+    name[Group1]= "Empty";
+};
diff --git a/xorg-server/xkeyboard-config/symbols/eurosign b/xorg-server/xkeyboard-config/symbols/eurosign
index 380350174..0d95a900f 100644
--- a/xorg-server/xkeyboard-config/symbols/eurosign
+++ b/xorg-server/xkeyboard-config/symbols/eurosign
@@ -1,23 +1,23 @@
-// Most keyboards have the EuroSign engraved on the E key
-partial
-xkb_symbols "e" {
-    key <AD03>	{ [  NoSymbol,   NoSymbol,   EuroSign,	NoSymbol ]	};
-};
-
-// Many Apple keyboards have the EuroSign engraved on the 2 key
-partial
-xkb_symbols "2" {
-    key <AE02>	{ [  NoSymbol,   NoSymbol,   EuroSign,	NoSymbol ]	};
-};
-
-// Some keyboards have the EuroSign engraved on the 4 key
-partial
-xkb_symbols "4" {
-    key <AE04>	{ [  NoSymbol,   NoSymbol,   EuroSign,	NoSymbol ]	};
-};
-
-// Many keyboards have the EuroSign engraved on the 5 key
-partial
-xkb_symbols "5" {
-    key <AE05>	{ [  NoSymbol,   NoSymbol,   EuroSign,	NoSymbol ]	};
-};
+// Most keyboards have the EuroSign engraved on the E key
+partial
+xkb_symbols "e" {
+    key <AD03>	{ [  NoSymbol,   NoSymbol,   EuroSign,	NoSymbol ]	};
+};
+
+// Many Apple keyboards have the EuroSign engraved on the 2 key
+partial
+xkb_symbols "2" {
+    key <AE02>	{ [  NoSymbol,   NoSymbol,   EuroSign,	NoSymbol ]	};
+};
+
+// Some keyboards have the EuroSign engraved on the 4 key
+partial
+xkb_symbols "4" {
+    key <AE04>	{ [  NoSymbol,   NoSymbol,   EuroSign,	NoSymbol ]	};
+};
+
+// Many keyboards have the EuroSign engraved on the 5 key
+partial
+xkb_symbols "5" {
+    key <AE05>	{ [  NoSymbol,   NoSymbol,   EuroSign,	NoSymbol ]	};
+};
diff --git a/xorg-server/xkeyboard-config/symbols/extractGroupNames.sh b/xorg-server/xkeyboard-config/symbols/extractGroupNames.sh
index fb128fd19..bbcd6d58d 100644
--- a/xorg-server/xkeyboard-config/symbols/extractGroupNames.sh
+++ b/xorg-server/xkeyboard-config/symbols/extractGroupNames.sh
@@ -1,3 +1,3 @@
-#!/bin/sh
-
-grep 'name\[Group1\]' * | sed 's/[[:space:]]*name\[Group1\].*=[[:space:]]*//;s/;[[:space:]]*$//' | sort
+#!/bin/sh
+
+grep 'name\[Group1\]' * | sed 's/[[:space:]]*name\[Group1\].*=[[:space:]]*//;s/;[[:space:]]*$//' | sort
diff --git a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/Makefile.am
index 4e3a96ee1..5c9b0b833 100644
--- a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/Makefile.am
@@ -1,4 +1,4 @@
-symbolsdir = $(xkb_base)/symbols/fujitsu_vndr
-
-dist_symbols_DATA = \
-jp us
+symbolsdir = $(xkb_base)/symbols/fujitsu_vndr
+
+dist_symbols_DATA = \
+jp us
diff --git a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp
index 0eb277712..63bf56aca 100644
--- a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp
+++ b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/jp
@@ -1,87 +1,87 @@
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//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 OPEN GROUP 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 Open Group 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 Open Group.
-//
-// Japanese layout for a Fujitsu 140 key keyboard
-
-xkb_symbols {
-    override "fujitsu_vndr/us"
-    augment key <AE01> { [],			[ kana_NU	] 	};
-	    key <AE02> { [ 2, quotedbl	],	[ kana_FU	]	};
-	    key <AE03> { [ 3, numbersign ],	[ kana_A, kana_a ]	};
-	    key <AE04> { [ 4, dollar	],	[ kana_U, kana_u ]	};
-    augment key <AE05> { [],		[ kana_E, kana_e ]	};
-	    key <AE06> { [ 6, ampersand	],	[ kana_O, kana_o ]	};
-	    key <AE07> { [ 7, apostrophe ],	[ kana_YA, kana_ya ]	};
-	    key <AE08> { [ 8, parenleft	],	[ kana_YU, kana_yu ]	};
-	    key <AE09> { [ 9, parenright ],	[ kana_YO, kana_yo ]	};
-    replace key <AE10> { [ 0	],		[ kana_WA, kana_WO ]	};
-	    key <AE11> { [ minus, equal	],	[ kana_HO	]	};
-	    key <AE12> { [ asciicircum, asciitilde ], [ kana_HE ]	};
-	    key <BKSL> { [ backslash, bar ],	[ prolongedsound]	};
-    augment key <AD01> { [],			[ kana_TA	]	};
-    augment key <AD02> { [],			[ kana_TE	]	};
-    augment key <AD03> { [],			[ kana_I, kana_i ]	};
-    augment key <AD04> { [],			[ kana_SU	]	};
-    augment key <AD05> { [],			[ kana_KA	]	};
-    augment key <AD06> { [],			[ kana_N	]	};
-    augment key <AD07> { [],			[ kana_NA	]	};
-    augment key <AD08> { [],			[ kana_NI	]	};
-    augment key <AD09> { [],			[ kana_RA	]	};
-    augment key <AD10> { [],			[ kana_SE	]	};
-	    key <AD11> { [ at, grave	],	[ voicedsound	]	};
-	    key <AD12> { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ]	};
-    augment key <AC01> { [],			[ kana_CHI	]	};
-    augment key <AC02> { [],			[ kana_TO	]	};
-    augment key <AC03> { [],			[ kana_SHI	]	};
-    augment key <AC04> { [],			[ kana_HA	]	};
-    augment key <AC05> { [],			[ kana_KI	]	};
-    augment key <AC06> { [],			[ kana_KU	]	};
-    augment key <AC07> { [],			[ kana_MA	]	};
-    augment key <AC08> { [],			[ kana_NO	]	};
-    augment key <AC09> { [],			[ kana_RI	]	};
-	    key <AC10> { [ semicolon, plus ],	[ kana_RE	]	};
-	    key <AC11> { [ colon, asterisk ],	[ kana_KE	]	};
-	    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
-    augment key <AB01> { [],			[ kana_TSU, kana_tsu ]	};
-    augment key <AB02> { [],			[ kana_SA	]	};
-    augment key <AB03> { [],			[ kana_SO	]	};
-    augment key <AB04> { [],			[ kana_HI	]	};
-    augment key <AB05> { [],			[ kana_KO	]	};
-    augment key <AB06> { [],			[ kana_MI	]	};
-    augment key <AB07> { [],			[ kana_MO	]	};
-    augment key <AB08> { [],			[ kana_NE, kana_comma ]	};
-    augment key <AB09> { [],			[ kana_RU, kana_fullstop ] };
-    augment key <AB10> { [],			[ kana_ME, kana_conjunctive ] };
-	    key <AB11> { [ underscore	],	[ kana_RO	]	};
-	    key <UNK0> { [ Select	]	}; 
-	    key <UNK1> { [ Massyo	]	}; 
-	    key <UNK2> { [ Touroku	]	}; 
-	    key <UNK3> { [ Zenkaku_Hankaku ]	}; 
-	    key <UNK4> { [ Eisu_Shift	]	};
-	    key <UNK5> { [ Mode_switch	]	};
-	    key <UNK6> { [ Cancel	]	};
-	    key <UNK7> { [ Muhenkan	]	};
-	    key <UNK8> { [ Henkan	]	};
-};
+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//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 OPEN GROUP 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 Open Group 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 Open Group.
+//
+// Japanese layout for a Fujitsu 140 key keyboard
+
+xkb_symbols {
+    override "fujitsu_vndr/us"
+    augment key <AE01> { [],			[ kana_NU	] 	};
+	    key <AE02> { [ 2, quotedbl	],	[ kana_FU	]	};
+	    key <AE03> { [ 3, numbersign ],	[ kana_A, kana_a ]	};
+	    key <AE04> { [ 4, dollar	],	[ kana_U, kana_u ]	};
+    augment key <AE05> { [],		[ kana_E, kana_e ]	};
+	    key <AE06> { [ 6, ampersand	],	[ kana_O, kana_o ]	};
+	    key <AE07> { [ 7, apostrophe ],	[ kana_YA, kana_ya ]	};
+	    key <AE08> { [ 8, parenleft	],	[ kana_YU, kana_yu ]	};
+	    key <AE09> { [ 9, parenright ],	[ kana_YO, kana_yo ]	};
+    replace key <AE10> { [ 0	],		[ kana_WA, kana_WO ]	};
+	    key <AE11> { [ minus, equal	],	[ kana_HO	]	};
+	    key <AE12> { [ asciicircum, asciitilde ], [ kana_HE ]	};
+	    key <BKSL> { [ backslash, bar ],	[ prolongedsound]	};
+    augment key <AD01> { [],			[ kana_TA	]	};
+    augment key <AD02> { [],			[ kana_TE	]	};
+    augment key <AD03> { [],			[ kana_I, kana_i ]	};
+    augment key <AD04> { [],			[ kana_SU	]	};
+    augment key <AD05> { [],			[ kana_KA	]	};
+    augment key <AD06> { [],			[ kana_N	]	};
+    augment key <AD07> { [],			[ kana_NA	]	};
+    augment key <AD08> { [],			[ kana_NI	]	};
+    augment key <AD09> { [],			[ kana_RA	]	};
+    augment key <AD10> { [],			[ kana_SE	]	};
+	    key <AD11> { [ at, grave	],	[ voicedsound	]	};
+	    key <AD12> { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ]	};
+    augment key <AC01> { [],			[ kana_CHI	]	};
+    augment key <AC02> { [],			[ kana_TO	]	};
+    augment key <AC03> { [],			[ kana_SHI	]	};
+    augment key <AC04> { [],			[ kana_HA	]	};
+    augment key <AC05> { [],			[ kana_KI	]	};
+    augment key <AC06> { [],			[ kana_KU	]	};
+    augment key <AC07> { [],			[ kana_MA	]	};
+    augment key <AC08> { [],			[ kana_NO	]	};
+    augment key <AC09> { [],			[ kana_RI	]	};
+	    key <AC10> { [ semicolon, plus ],	[ kana_RE	]	};
+	    key <AC11> { [ colon, asterisk ],	[ kana_KE	]	};
+	    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+    augment key <AB01> { [],			[ kana_TSU, kana_tsu ]	};
+    augment key <AB02> { [],			[ kana_SA	]	};
+    augment key <AB03> { [],			[ kana_SO	]	};
+    augment key <AB04> { [],			[ kana_HI	]	};
+    augment key <AB05> { [],			[ kana_KO	]	};
+    augment key <AB06> { [],			[ kana_MI	]	};
+    augment key <AB07> { [],			[ kana_MO	]	};
+    augment key <AB08> { [],			[ kana_NE, kana_comma ]	};
+    augment key <AB09> { [],			[ kana_RU, kana_fullstop ] };
+    augment key <AB10> { [],			[ kana_ME, kana_conjunctive ] };
+	    key <AB11> { [ underscore	],	[ kana_RO	]	};
+	    key <UNK0> { [ Select	]	}; 
+	    key <UNK1> { [ Massyo	]	}; 
+	    key <UNK2> { [ Touroku	]	}; 
+	    key <UNK3> { [ Zenkaku_Hankaku ]	}; 
+	    key <UNK4> { [ Eisu_Shift	]	};
+	    key <UNK5> { [ Mode_switch	]	};
+	    key <UNK6> { [ Cancel	]	};
+	    key <UNK7> { [ Muhenkan	]	};
+	    key <UNK8> { [ Henkan	]	};
+};
diff --git a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us
index 73dde7612..b856393fd 100644
--- a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us
@@ -1,143 +1,143 @@
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//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 OPEN GROUP 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 Open Group 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 Open Group.
-//
-// US/ASCII layout for a Fujitsu 138 key keyboard
-xkb_symbols {
-    include "us(basic)"
-
-    // A few alphanumeric keys are different
-    key <TLDE> { [ grave, asciitilde ]	};
-    key <BKSP> { [ BackSpace	]	};
-    key <BKSL> { [ backslash, bar ]	};
-    key <AB11> { [		]	};
-
-    key <RTSH> { [ Shift_R	]	};
-
-    key <LALT> { [ Alt_L	]	};
-    key <RALT> { [ Alt_R	]	};
-    key <LMTA> { [ Meta_L	]	};
-    key <RMTA> { [ Meta_R	]	};
-    key <LNFD> { [ Linefeed	]	};
-    key <COMP> { [ Multi_key	]	};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <BREA> { [ Break	]	};
-    key <PRSC> { [ Print	]	};
-    key <KNJI> { [ Kanji	]	};
-    key <PAUS> { [ Pause	]	};
-
-    key <FK01> { [ F1		]	};
-    key <FK02> { [ F2		]	};
-    key <FK03> { [ F3		]	};
-    key <FK04> { [ F4		]	};
-    key <FK05> { [ F5		]	};
-    key <FK06> { [ F6		]	};
-    key <FK07> { [ F7		]	};
-    key <FK08> { [ F8		]	};
-    key <FK09> { [ F9		]	};
-    key <FK10> { [ F10		]	};
-    key <FK11> { [ F11		]	};
-    key <FK12> { [ F12		]	};
-    key <FK13> { [ F13		]	};
-    key <FK14> { [ F14		]	};
-    key <FK15> { [ F15		]	};
-    key <FK16> { [ F16		]	};
-    key <FK17> { [ F17		]	};
-    key <FK18> { [ F18		]	};
-    key <FK19> { [ F19		]	};
-    key <FK20> { [ F20		]	};
-    key <FK21> { [ F21		]	};
-    key <FK22> { [ F22		]	};
-    key <FK23> { [ F23		]	};
-    key <FK24> { [ F24		]	};
-    key <FK25> { [ F25		]	};
-    key <FK26> { [ F26		]	};
-    key <FK27> { [ F27		]	};
-    key <FK28> { [ F28		]	};
-    key <FK29> { [ F29		]	};
-    key <FK30> { [ F30		]	};
-    key <FK31> { [ F31		]	};
-    key <FK32> { [ F32		]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <UNDO> { [ Undo		]	};
-    key <COPY> { [ F33		]	};
-    key <PAST> { [ F34		]	};
-    key <CUT>  { [ F35		]	};
-    key <HELP> { [ Help		]	};
-    // End "Editing" section
-
-    // Begin "Cursor" section
-    key <UNK0> { [ 		]	}; 
-    key <UNK1> { [ 		]	}; 
-    key <UNK2> { [ 		]	}; 
-    key <PGUP> { [ Prior	]	}; 
-    key <HOME> { [ Home		]	};
-    key <PGDN> { [ Next		]	}; 
-    key <UNK3> { [ 		]	}; 
-    key <DEL>  { [ Delete	]	}; 
-    key <INS>  { [ Insert	]	}; 
-    key <LEFT> { [ Left		]	};
-    key <RGHT> { [ Right	]	};
-    key <UP>   { [ Up		]	};
-    key <DOWN> { [ Down		]	};
-    key <EXEC> { [ Execute	]	};
-    // End "Cursor" section
-
-    // Begin "Keypad" section
-    key <KPMU> { [ KP_Multiply	]	};
-    key <KPDV> { [ KP_Divide	]	};
-    key <KPAD> { [ KP_Add	]	};
-    key <KPSU> { [ KP_Subtract	]	};
-
-    key  <KP7> { [  KP_7	]	};
-    key  <KP8> { [  KP_8	]	};
-    key  <KP9> { [  KP_9	]	};
-    key <KPEQ> { [ KP_Equal 	]	};
-
-    key  <KP4> { [  KP_4	]	};
-    key  <KP5> { [  KP_5	]	};
-    key  <KP6> { [  KP_6	]	};
-    key <KPDC> { [  KP_Decimal	]	};
-
-    key  <KP1> { [  KP_1	]	};
-    key  <KP2> { [  KP_2	]	};
-    key  <KP3> { [  KP_3	]	};
-    key <KPEN> { [  KP_Enter	]	}; 
-
-    key  <KP0> { [  KP_0	]	};
-    key <KP00> { [  KP_0	]	};
-    // End "Keypad" section
-
-    // begin modifier mappings
-    modifier_map Shift  	{ Shift_R };
-    modifier_map Mod1   	{ Meta_L, Meta_R };
-    modifier_map Mod2   	{ Mode_switch };
-    modifier_map Mod3   	{ Alt_L };
-    modifier_map Mod4   	{ Num_Lock };
-    modifier_map Mod5   	{ F13, F18, F20 };
-};
+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//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 OPEN GROUP 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 Open Group 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 Open Group.
+//
+// US/ASCII layout for a Fujitsu 138 key keyboard
+xkb_symbols {
+    include "us(basic)"
+
+    // A few alphanumeric keys are different
+    key <TLDE> { [ grave, asciitilde ]	};
+    key <BKSP> { [ BackSpace	]	};
+    key <BKSL> { [ backslash, bar ]	};
+    key <AB11> { [		]	};
+
+    key <RTSH> { [ Shift_R	]	};
+
+    key <LALT> { [ Alt_L	]	};
+    key <RALT> { [ Alt_R	]	};
+    key <LMTA> { [ Meta_L	]	};
+    key <RMTA> { [ Meta_R	]	};
+    key <LNFD> { [ Linefeed	]	};
+    key <COMP> { [ Multi_key	]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <BREA> { [ Break	]	};
+    key <PRSC> { [ Print	]	};
+    key <KNJI> { [ Kanji	]	};
+    key <PAUS> { [ Pause	]	};
+
+    key <FK01> { [ F1		]	};
+    key <FK02> { [ F2		]	};
+    key <FK03> { [ F3		]	};
+    key <FK04> { [ F4		]	};
+    key <FK05> { [ F5		]	};
+    key <FK06> { [ F6		]	};
+    key <FK07> { [ F7		]	};
+    key <FK08> { [ F8		]	};
+    key <FK09> { [ F9		]	};
+    key <FK10> { [ F10		]	};
+    key <FK11> { [ F11		]	};
+    key <FK12> { [ F12		]	};
+    key <FK13> { [ F13		]	};
+    key <FK14> { [ F14		]	};
+    key <FK15> { [ F15		]	};
+    key <FK16> { [ F16		]	};
+    key <FK17> { [ F17		]	};
+    key <FK18> { [ F18		]	};
+    key <FK19> { [ F19		]	};
+    key <FK20> { [ F20		]	};
+    key <FK21> { [ F21		]	};
+    key <FK22> { [ F22		]	};
+    key <FK23> { [ F23		]	};
+    key <FK24> { [ F24		]	};
+    key <FK25> { [ F25		]	};
+    key <FK26> { [ F26		]	};
+    key <FK27> { [ F27		]	};
+    key <FK28> { [ F28		]	};
+    key <FK29> { [ F29		]	};
+    key <FK30> { [ F30		]	};
+    key <FK31> { [ F31		]	};
+    key <FK32> { [ F32		]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <UNDO> { [ Undo		]	};
+    key <COPY> { [ F33		]	};
+    key <PAST> { [ F34		]	};
+    key <CUT>  { [ F35		]	};
+    key <HELP> { [ Help		]	};
+    // End "Editing" section
+
+    // Begin "Cursor" section
+    key <UNK0> { [ 		]	}; 
+    key <UNK1> { [ 		]	}; 
+    key <UNK2> { [ 		]	}; 
+    key <PGUP> { [ Prior	]	}; 
+    key <HOME> { [ Home		]	};
+    key <PGDN> { [ Next		]	}; 
+    key <UNK3> { [ 		]	}; 
+    key <DEL>  { [ Delete	]	}; 
+    key <INS>  { [ Insert	]	}; 
+    key <LEFT> { [ Left		]	};
+    key <RGHT> { [ Right	]	};
+    key <UP>   { [ Up		]	};
+    key <DOWN> { [ Down		]	};
+    key <EXEC> { [ Execute	]	};
+    // End "Cursor" section
+
+    // Begin "Keypad" section
+    key <KPMU> { [ KP_Multiply	]	};
+    key <KPDV> { [ KP_Divide	]	};
+    key <KPAD> { [ KP_Add	]	};
+    key <KPSU> { [ KP_Subtract	]	};
+
+    key  <KP7> { [  KP_7	]	};
+    key  <KP8> { [  KP_8	]	};
+    key  <KP9> { [  KP_9	]	};
+    key <KPEQ> { [ KP_Equal 	]	};
+
+    key  <KP4> { [  KP_4	]	};
+    key  <KP5> { [  KP_5	]	};
+    key  <KP6> { [  KP_6	]	};
+    key <KPDC> { [  KP_Decimal	]	};
+
+    key  <KP1> { [  KP_1	]	};
+    key  <KP2> { [  KP_2	]	};
+    key  <KP3> { [  KP_3	]	};
+    key <KPEN> { [  KP_Enter	]	}; 
+
+    key  <KP0> { [  KP_0	]	};
+    key <KP00> { [  KP_0	]	};
+    // End "Keypad" section
+
+    // begin modifier mappings
+    modifier_map Shift  	{ Shift_R };
+    modifier_map Mod1   	{ Meta_L, Meta_R };
+    modifier_map Mod2   	{ Mode_switch };
+    modifier_map Mod3   	{ Alt_L };
+    modifier_map Mod4   	{ Num_Lock };
+    modifier_map Mod5   	{ F13, F18, F20 };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/hp_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/hp_vndr/Makefile.am
index 6bcd4da3e..25e8fa44f 100644
--- a/xorg-server/xkeyboard-config/symbols/hp_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/hp_vndr/Makefile.am
@@ -1,4 +1,4 @@
-symbolsdir = $(xkb_base)/symbols/hp_vndr
-
-dist_symbols_DATA = \
-us
+symbolsdir = $(xkb_base)/symbols/hp_vndr
+
+dist_symbols_DATA = \
+us
diff --git a/xorg-server/xkeyboard-config/symbols/hp_vndr/us b/xorg-server/xkeyboard-config/symbols/hp_vndr/us
index 7e07198d6..aedda92d2 100644
--- a/xorg-server/xkeyboard-config/symbols/hp_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/hp_vndr/us
@@ -1,104 +1,104 @@
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//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 OPEN GROUP 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 Open Group 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 Open Group.
-//
-// US/ASCII layout for a HP non-PC keyboard
-xkb_symbols "hil" {
-    include "us(basic)"
-
-    // A few alphanumeric keys are different
-    key <TLDE> { [ grave,	asciitilde	]};
-    key <RTSH> { [ Shift_R	]};
-    key <LALT> { [ Meta_L	]};
-    key <RALT> { [ Meta_R	]};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <BRK>  { [ Break	]};
-    key <STOP> { [ Cancel	]};
-    key <FK01> { [ F1	]	};
-    key <FK02> { [ F2	]	};
-    key <FK03> { [ F3	]	};
-    key <FK04> { [ F4	]	};
-    key <MENU> { [ Menu	]	};
-    key <SYST> { [ hpSystem	]};
-    key <FK05> { [ F5	]	};
-    key <FK06> { [ F6	]	};
-    key <FK07> { [ F7	]	};
-    key <FK08> { [ F8	]	};
-    key <CLRL> { [ hpClearLine	]};
-    key <CLR>  { [ Clear	]};
-    key <FK09> { [ F9	]	};
-    key <FK10> { [ F10	]	};
-    key <FK11> { [ F11	]	};
-    key <FK12> { [ F12	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ Execute, Print	]};
-    key <INSL> { [ hpInsertLine	]};
-    key <DELL> { [ hpDeleteLine	]};
-    key <INSC> { [ hpInsertChar	]};
-    key <DELC> { [ hpDeleteChar	]};
-    key <HOME> { [ Home	]	};
-    key <PGUP> { [ Prior ]	};
-    key <PGDN> { [ Next ]	};
-    key <SELE> { [ Select ]	};
-    key <LEFT> { [ Left	]	};
-    key <DOWN> { [ Down	]	};
-    key <UP>   { [ Up	]	};
-    key <RGHT> { [ Right	]};
-
-    // End "Editing" section, begin "Keypad"
-    key <KPMU> { [ KP_Multiply	]};
-    key <KPDV> { [ KP_Divide	]};
-    key <KPAD> { [ KP_Add	]};
-    key <KPSU> { [ KP_Subtract	]};
-
-    key  <KP7> { [ KP_7	]	};
-    key  <KP8> { [ KP_8	]	};
-    key  <KP9> { [ KP_9	]	};
-    key <KPEN> { [ KP_Enter	]}; 
-
-    key  <KP4> { [ KP_4	]	};
-    key  <KP5> { [ KP_5	]	};
-    key  <KP6> { [ KP_6	]	};
-    key <KPSP> { [ KP_Separator	]};
-
-    key  <KP1> { [ KP_1	]	};
-    key  <KP2> { [ KP_2	]	};
-    key  <KP3> { [ KP_3	]	};
-    key <KPTB> { [ KP_Tab	]}; 
-
-    key  <KP0> { [ KP_0	]	};
-    key <KPDL> { [ KP_Decimal ]	};
-    // End "Keypad" section
-
-
-    // begin modifier mappings
-    modifier_map Shift  	{ Shift_R };
-    modifier_map Mod1   	{ Meta_L, Meta_R };
-    modifier_map Mod2   	{ Alt_L };
-    modifier_map Mod3   	{ Mode_switch };
-};
+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//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 OPEN GROUP 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 Open Group 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 Open Group.
+//
+// US/ASCII layout for a HP non-PC keyboard
+xkb_symbols "hil" {
+    include "us(basic)"
+
+    // A few alphanumeric keys are different
+    key <TLDE> { [ grave,	asciitilde	]};
+    key <RTSH> { [ Shift_R	]};
+    key <LALT> { [ Meta_L	]};
+    key <RALT> { [ Meta_R	]};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <BRK>  { [ Break	]};
+    key <STOP> { [ Cancel	]};
+    key <FK01> { [ F1	]	};
+    key <FK02> { [ F2	]	};
+    key <FK03> { [ F3	]	};
+    key <FK04> { [ F4	]	};
+    key <MENU> { [ Menu	]	};
+    key <SYST> { [ hpSystem	]};
+    key <FK05> { [ F5	]	};
+    key <FK06> { [ F6	]	};
+    key <FK07> { [ F7	]	};
+    key <FK08> { [ F8	]	};
+    key <CLRL> { [ hpClearLine	]};
+    key <CLR>  { [ Clear	]};
+    key <FK09> { [ F9	]	};
+    key <FK10> { [ F10	]	};
+    key <FK11> { [ F11	]	};
+    key <FK12> { [ F12	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ Execute, Print	]};
+    key <INSL> { [ hpInsertLine	]};
+    key <DELL> { [ hpDeleteLine	]};
+    key <INSC> { [ hpInsertChar	]};
+    key <DELC> { [ hpDeleteChar	]};
+    key <HOME> { [ Home	]	};
+    key <PGUP> { [ Prior ]	};
+    key <PGDN> { [ Next ]	};
+    key <SELE> { [ Select ]	};
+    key <LEFT> { [ Left	]	};
+    key <DOWN> { [ Down	]	};
+    key <UP>   { [ Up	]	};
+    key <RGHT> { [ Right	]};
+
+    // End "Editing" section, begin "Keypad"
+    key <KPMU> { [ KP_Multiply	]};
+    key <KPDV> { [ KP_Divide	]};
+    key <KPAD> { [ KP_Add	]};
+    key <KPSU> { [ KP_Subtract	]};
+
+    key  <KP7> { [ KP_7	]	};
+    key  <KP8> { [ KP_8	]	};
+    key  <KP9> { [ KP_9	]	};
+    key <KPEN> { [ KP_Enter	]}; 
+
+    key  <KP4> { [ KP_4	]	};
+    key  <KP5> { [ KP_5	]	};
+    key  <KP6> { [ KP_6	]	};
+    key <KPSP> { [ KP_Separator	]};
+
+    key  <KP1> { [ KP_1	]	};
+    key  <KP2> { [ KP_2	]	};
+    key  <KP3> { [ KP_3	]	};
+    key <KPTB> { [ KP_Tab	]}; 
+
+    key  <KP0> { [ KP_0	]	};
+    key <KPDL> { [ KP_Decimal ]	};
+    // End "Keypad" section
+
+
+    // begin modifier mappings
+    modifier_map Shift  	{ Shift_R };
+    modifier_map Mod1   	{ Meta_L, Meta_R };
+    modifier_map Mod2   	{ Alt_L };
+    modifier_map Mod3   	{ Mode_switch };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/kpdl b/xorg-server/xkeyboard-config/symbols/kpdl
index 1e4a537a9..968dbd2d9 100644
--- a/xorg-server/xkeyboard-config/symbols/kpdl
+++ b/xorg-server/xkeyboard-config/symbols/kpdl
@@ -1,102 +1,102 @@
-// The <KPDL> key is a mess.
-// It was probably originally meant to be a decimal separator.
-// Except since it was declared by USA people it didn't use the original
-// SI separator "," but a "." (since then the USA managed to f-up the SI
-// by making "." an accepted alternative, but standards still use "," as
-// default)
-// As a result users of SI-abiding countries expect either a "." or a ","
-// or a "decimal_separator" which may or may not be translated in one of the
-// above depending on applications.
-// It's not possible to define a default per-country since user expectations
-// depend on the conflicting choices of their most-used applications,
-// operating system, etc. Therefore it needs to be a configuration setting
-// Copyright © 2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
-
-
-// Legacy <KPDL> #1
-// This assumes KP_Decimal will be translated in a dot
-partial keypad_keys
-xkb_symbols "dot" {
-
-    key.type[Group1]="KEYPAD" ;
-
-    key <KPDL> { [ KP_Delete, KP_Decimal ] }; // <delete> <separator>
-};
-
-
-// Legacy <KPDL> #2
-// This assumes KP_Separator will be translated in a comma
-partial keypad_keys
-xkb_symbols "comma" {
-
-    key.type[Group1]="KEYPAD" ;
-
-    key <KPDL> { [ KP_Delete, KP_Separator ] }; // <delete> <separator>
-};
-
-
-// Period <KPDL>, usual keyboard serigraphy in most countries
-partial keypad_keys
-xkb_symbols "dotoss" {
-
-    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
-
-    key <KPDL> { [ KP_Delete, period, comma, 0x100202F ] }; // <delete> . , ⍽ (narrow no-break space)
-};
-
-
-// Period <KPDL>, usual keyboard serigraphy in most countries, latin-9 restriction
-partial keypad_keys
-xkb_symbols "dotoss_latin9" {
-
-    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
-
-    key <KPDL> { [ KP_Delete, period, comma, nobreakspace ] }; // <delete> . , ⍽ (no-break space)
-};
-
-
-// Comma <KPDL>, what most non anglo-saxon people consider the real separator
-partial keypad_keys
-xkb_symbols "commaoss" {
-
-    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
-
-    key <KPDL> { [ KP_Delete, comma, period, 0x100202F ] }; // <delete> , . ⍽ (narrow no-break space)
-};
-
-
-// Momayyez <KPDL>: Bahrain, Iran, Iraq, Kuwait, Oman, Qatar, Saudi Arabia, Syria, UAE
-partial keypad_keys
-xkb_symbols "momayyezoss" {
-
-    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
-
-    key <KPDL> { [ KP_Delete, 0x100066B, comma, 0x100202F ] }; // <delete> ? , ⍽ (narrow no-break space)
-};
-
-
-// Abstracted <KPDL>, pray everything will work out (it usually does not)
-partial keypad_keys
-xkb_symbols "kposs" {
-
-    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
-
-    key <KPDL> { [ KP_Delete, KP_Decimal, KP_Separator, 0x100202F ] }; // <delete> ? ? ⍽ (narrow no-break space)
-};
-
-// Spreadsheets may be configured to use the dot as decimal
-// punctuation, comma as a thousands separator and then semi-colon as
-// the list separator. Of these, dot and semi-colon is most important
-// when entering data by the keyboard; the comma can then be inferred
-// and added to the presentation afterwards. Using semi-colon as a
-// general separator may in fact be preferred to avoid ambiguities
-// in data files. Most times a decimal separator is hard-coded, it
-// seems to be period, probably since this is the syntax used in
-// (most) programming languages.
-partial keypad_keys
-xkb_symbols "semi" {
-
-    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
-
-    key <KPDL> { [ NoSymbol, NoSymbol, semicolon ] };
-};
+// The <KPDL> key is a mess.
+// It was probably originally meant to be a decimal separator.
+// Except since it was declared by USA people it didn't use the original
+// SI separator "," but a "." (since then the USA managed to f-up the SI
+// by making "." an accepted alternative, but standards still use "," as
+// default)
+// As a result users of SI-abiding countries expect either a "." or a ","
+// or a "decimal_separator" which may or may not be translated in one of the
+// above depending on applications.
+// It's not possible to define a default per-country since user expectations
+// depend on the conflicting choices of their most-used applications,
+// operating system, etc. Therefore it needs to be a configuration setting
+// Copyright © 2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+
+
+// Legacy <KPDL> #1
+// This assumes KP_Decimal will be translated in a dot
+partial keypad_keys
+xkb_symbols "dot" {
+
+    key.type[Group1]="KEYPAD" ;
+
+    key <KPDL> { [ KP_Delete, KP_Decimal ] }; // <delete> <separator>
+};
+
+
+// Legacy <KPDL> #2
+// This assumes KP_Separator will be translated in a comma
+partial keypad_keys
+xkb_symbols "comma" {
+
+    key.type[Group1]="KEYPAD" ;
+
+    key <KPDL> { [ KP_Delete, KP_Separator ] }; // <delete> <separator>
+};
+
+
+// Period <KPDL>, usual keyboard serigraphy in most countries
+partial keypad_keys
+xkb_symbols "dotoss" {
+
+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    key <KPDL> { [ KP_Delete, period, comma, 0x100202F ] }; // <delete> . , ⍽ (narrow no-break space)
+};
+
+
+// Period <KPDL>, usual keyboard serigraphy in most countries, latin-9 restriction
+partial keypad_keys
+xkb_symbols "dotoss_latin9" {
+
+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    key <KPDL> { [ KP_Delete, period, comma, nobreakspace ] }; // <delete> . , ⍽ (no-break space)
+};
+
+
+// Comma <KPDL>, what most non anglo-saxon people consider the real separator
+partial keypad_keys
+xkb_symbols "commaoss" {
+
+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    key <KPDL> { [ KP_Delete, comma, period, 0x100202F ] }; // <delete> , . ⍽ (narrow no-break space)
+};
+
+
+// Momayyez <KPDL>: Bahrain, Iran, Iraq, Kuwait, Oman, Qatar, Saudi Arabia, Syria, UAE
+partial keypad_keys
+xkb_symbols "momayyezoss" {
+
+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    key <KPDL> { [ KP_Delete, 0x100066B, comma, 0x100202F ] }; // <delete> ? , ⍽ (narrow no-break space)
+};
+
+
+// Abstracted <KPDL>, pray everything will work out (it usually does not)
+partial keypad_keys
+xkb_symbols "kposs" {
+
+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    key <KPDL> { [ KP_Delete, KP_Decimal, KP_Separator, 0x100202F ] }; // <delete> ? ? ⍽ (narrow no-break space)
+};
+
+// Spreadsheets may be configured to use the dot as decimal
+// punctuation, comma as a thousands separator and then semi-colon as
+// the list separator. Of these, dot and semi-colon is most important
+// when entering data by the keyboard; the comma can then be inferred
+// and added to the presentation afterwards. Using semi-colon as a
+// general separator may in fact be preferred to avoid ambiguities
+// in data files. Most times a decimal separator is hard-coded, it
+// seems to be period, probably since this is the syntax used in
+// (most) programming languages.
+partial keypad_keys
+xkb_symbols "semi" {
+
+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    key <KPDL> { [ NoSymbol, NoSymbol, semicolon ] };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/level3 b/xorg-server/xkeyboard-config/symbols/level3
index 599443002..9d495550a 100644
--- a/xorg-server/xkeyboard-config/symbols/level3
+++ b/xorg-server/xkeyboard-config/symbols/level3
@@ -1,196 +1,196 @@
-// these variants assign various XKB keycodes to ISO_Level3_Shift so that
-// the third shift level can be reached
-//
-
-// the default behavior is for the right Alt key (AltGr) to generate the
-// third engraved symbol
-default partial modifier_keys
-xkb_symbols "ralt_switch" {
-  key <RALT> {
-    type[Group1]="ONE_LEVEL",
-    symbols[Group1] = [ ISO_Level3_Shift ]
-    };
-  modifier_map Mod5   { ISO_Level3_Shift };
-};
-
-// Right Alt key never chooses 3rd level.
-// This option attempts to undo the effect of a layout's
-// including ralt_switch.  You may also want to select another
-// level3 option that maps the level3 shift to some other key.
-partial modifier_keys
-xkb_symbols "ralt_alt" {
-  key <RALT> { 
-    type[Group1]="TWO_LEVEL",
-    type[Group2]="TWO_LEVEL",
-    type[Group3]="TWO_LEVEL",
-    type[Group4]="TWO_LEVEL",
-    symbols[Group1] = [ Alt_R, Meta_R ], 
-    symbols[Group2] = [ Alt_R, Meta_R ], 
-    symbols[Group3] = [ Alt_R, Meta_R ], 
-    symbols[Group4] = [ Alt_R, Meta_R ]
-    };
-  modifier_map Mod1    { <RALT> };
-};
-
-partial modifier_keys
-xkb_symbols "ralt_switch_multikey" {
-  key <RALT> {
-    type[Group1]="TWO_LEVEL",
-    symbols[Group1] = [ ISO_Level3_Shift, Multi_key ]
-    };
-};
-
-// special case or right Alt switch - for use with grp:alts_toggle
-//
-partial hidden modifier_keys
-xkb_symbols "ralt_switch_for_alts_toggle" {
- virtual_modifiers LAlt, AlGr;
-  key <LALT> {
-    type[Group1]="PC_RALT_LEVEL2",
-    symbols[Group1] = [ Alt_L,  ISO_Prev_Group,  ISO_Prev_Group ],
-    virtualMods= LAlt
-  };
-  key <RALT> {
-    type[Group1]="PC_ALT_LEVEL2",
-    symbols[Group1] = [ ISO_Level3_Shift, ISO_Next_Group ],
-    virtualMods= AltGr
-  };
-  modifier_map Mod5   { ISO_Level3_Shift };
-};
-
-// using the level(alt_switch) map, either Alt key temporarily chooses
-// the third shift level.  (Mostly be used to imitate Mac OS functionality.)
-partial modifier_keys
-xkb_symbols "alt_switch" {
-  include "level3(lalt_switch)"
-  include "level3(ralt_switch)"
-};
-
-partial modifier_keys
-xkb_symbols "lalt_switch" {
-  key <LALT> {
-    type[Group1]="ONE_LEVEL",
-    symbols[Group1] = [ ISO_Level3_Shift ]
-    };
-  modifier_map Mod5   { <LALT> };
-};
-
-// using the level(switch) map, the right Control key temporarily
-// chooses the third shift level (until it is released).
-partial modifier_keys
-xkb_symbols "switch" {
-  key <RCTL> {
-    type[Group1]="ONE_LEVEL",
-    symbols[Group1] = [ ISO_Level3_Shift ]
-    };
-  modifier_map Mod5   { ISO_Level3_Shift };
-};
-
-// using the level(menu_switch) map, the Menu key temporarily
-// chooses the third shift level (until it is released).
-partial modifier_keys
-xkb_symbols "menu_switch" {
-  key <MENU> {
-    type[Group1]="ONE_LEVEL",
-    symbols[Group1] = [ ISO_Level3_Shift ]
-    };
-  modifier_map Mod5   { ISO_Level3_Shift };
-};
-
-// using the level3(win_switch) map, the either Windows' logo key
-// temporarily chooses the third shift level.
-partial modifier_keys
-xkb_symbols "win_switch" {
-  include "level3(lwin_switch)"
-  include "level3(rwin_switch)"
-};
-
-// using the level3(lwin_switch) map, the left Windows' logo key
-// temporarily chooses the third shift level.
-partial modifier_keys
-xkb_symbols "lwin_switch" {
-  key <LWIN> {
-    type[Group1]="ONE_LEVEL",
-    symbols[Group1] = [ ISO_Level3_Shift ]
-    };
-  modifier_map Mod5   { ISO_Level3_Shift };
-};
-
-// using the level(rwin_switch) map, the right Windows' logo key
-// temporarily chooses the third shift level.  If you use this map,
-// you should define your keyboard as pc101 or pc102 instead of pc104
-// or pc105.
-partial modifier_keys
-xkb_symbols "rwin_switch" {
-  key <RWIN> {
-    type[Group1]="ONE_LEVEL",
-    symbols[Group1] = [ ISO_Level3_Shift ]
-    };
-  modifier_map Mod5   { ISO_Level3_Shift };
-};
-
-// using the level3(enter_switch) map, the Enter key on the keypad
-// temporarily chooses the third shift level.  This is especially
-// useful for Mac laptops which miss the right Alt key.
-partial modifier_keys
-xkb_symbols "enter_switch" {
-  key <KPEN> {
-    type[Group1]="ONE_LEVEL",
-    symbols[Group1] = [ ISO_Level3_Shift ]
-    };
-  modifier_map Mod5   { ISO_Level3_Shift };
-};
-
-partial modifier_keys
-xkb_symbols "caps_switch" {
-  key <CAPS> {
-    type[Group1]="ONE_LEVEL",
-    symbols[Group1] = [ ISO_Level3_Shift ]
-  };
-  modifier_map Mod5   { ISO_Level3_Shift };
-};
-
-partial modifier_keys
-xkb_symbols "bksl_switch" {
-  key <BKSL> {
-    type[Group1]="ONE_LEVEL",
-    symbols[Group1] = [ ISO_Level3_Shift ]
-  };
-  modifier_map Mod5   { ISO_Level3_Shift };
-};
-
-partial modifier_keys
-xkb_symbols "lsgt_switch" {
-  key <LSGT> {
-    type[Group1]="ONE_LEVEL",
-    symbols[Group1] = [ ISO_Level3_Shift ]
-  };
-  modifier_map Mod5   { ISO_Level3_Shift };
-};
-
-partial modifier_keys
-xkb_symbols "caps_switch_latch" {
-  key <CAPS> {
-    type[Group1]="THREE_LEVEL",
-    symbols[Group1] = [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Latch ]
-  };
-  modifier_map Mod5   { ISO_Level3_Shift };
-};
-
-partial modifier_keys
-xkb_symbols "bksl_switch_latch" {
-  key <BKSL> {
-    type[Group1]="THREE_LEVEL",
-    symbols[Group1] = [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Latch ]
-  };
-  modifier_map Mod5   { ISO_Level3_Shift };
-};
-
-partial modifier_keys
-xkb_symbols "lsgt_switch_latch" {
-  key <LSGT> {
-    type[Group1]="THREE_LEVEL",
-    symbols[Group1] = [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Latch ]
-  };
-  modifier_map Mod5   { ISO_Level3_Shift };
-};
+// these variants assign various XKB keycodes to ISO_Level3_Shift so that
+// the third shift level can be reached
+//
+
+// the default behavior is for the right Alt key (AltGr) to generate the
+// third engraved symbol
+default partial modifier_keys
+xkb_symbols "ralt_switch" {
+  key <RALT> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+    };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+// Right Alt key never chooses 3rd level.
+// This option attempts to undo the effect of a layout's
+// including ralt_switch.  You may also want to select another
+// level3 option that maps the level3 shift to some other key.
+partial modifier_keys
+xkb_symbols "ralt_alt" {
+  key <RALT> { 
+    type[Group1]="TWO_LEVEL",
+    type[Group2]="TWO_LEVEL",
+    type[Group3]="TWO_LEVEL",
+    type[Group4]="TWO_LEVEL",
+    symbols[Group1] = [ Alt_R, Meta_R ], 
+    symbols[Group2] = [ Alt_R, Meta_R ], 
+    symbols[Group3] = [ Alt_R, Meta_R ], 
+    symbols[Group4] = [ Alt_R, Meta_R ]
+    };
+  modifier_map Mod1    { <RALT> };
+};
+
+partial modifier_keys
+xkb_symbols "ralt_switch_multikey" {
+  key <RALT> {
+    type[Group1]="TWO_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift, Multi_key ]
+    };
+};
+
+// special case or right Alt switch - for use with grp:alts_toggle
+//
+partial hidden modifier_keys
+xkb_symbols "ralt_switch_for_alts_toggle" {
+ virtual_modifiers LAlt, AlGr;
+  key <LALT> {
+    type[Group1]="PC_RALT_LEVEL2",
+    symbols[Group1] = [ Alt_L,  ISO_Prev_Group,  ISO_Prev_Group ],
+    virtualMods= LAlt
+  };
+  key <RALT> {
+    type[Group1]="PC_ALT_LEVEL2",
+    symbols[Group1] = [ ISO_Level3_Shift, ISO_Next_Group ],
+    virtualMods= AltGr
+  };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+// using the level(alt_switch) map, either Alt key temporarily chooses
+// the third shift level.  (Mostly be used to imitate Mac OS functionality.)
+partial modifier_keys
+xkb_symbols "alt_switch" {
+  include "level3(lalt_switch)"
+  include "level3(ralt_switch)"
+};
+
+partial modifier_keys
+xkb_symbols "lalt_switch" {
+  key <LALT> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+    };
+  modifier_map Mod5   { <LALT> };
+};
+
+// using the level(switch) map, the right Control key temporarily
+// chooses the third shift level (until it is released).
+partial modifier_keys
+xkb_symbols "switch" {
+  key <RCTL> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+    };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+// using the level(menu_switch) map, the Menu key temporarily
+// chooses the third shift level (until it is released).
+partial modifier_keys
+xkb_symbols "menu_switch" {
+  key <MENU> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+    };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+// using the level3(win_switch) map, the either Windows' logo key
+// temporarily chooses the third shift level.
+partial modifier_keys
+xkb_symbols "win_switch" {
+  include "level3(lwin_switch)"
+  include "level3(rwin_switch)"
+};
+
+// using the level3(lwin_switch) map, the left Windows' logo key
+// temporarily chooses the third shift level.
+partial modifier_keys
+xkb_symbols "lwin_switch" {
+  key <LWIN> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+    };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+// using the level(rwin_switch) map, the right Windows' logo key
+// temporarily chooses the third shift level.  If you use this map,
+// you should define your keyboard as pc101 or pc102 instead of pc104
+// or pc105.
+partial modifier_keys
+xkb_symbols "rwin_switch" {
+  key <RWIN> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+    };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+// using the level3(enter_switch) map, the Enter key on the keypad
+// temporarily chooses the third shift level.  This is especially
+// useful for Mac laptops which miss the right Alt key.
+partial modifier_keys
+xkb_symbols "enter_switch" {
+  key <KPEN> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+    };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+partial modifier_keys
+xkb_symbols "caps_switch" {
+  key <CAPS> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+  };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+partial modifier_keys
+xkb_symbols "bksl_switch" {
+  key <BKSL> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+  };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+partial modifier_keys
+xkb_symbols "lsgt_switch" {
+  key <LSGT> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+  };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+partial modifier_keys
+xkb_symbols "caps_switch_latch" {
+  key <CAPS> {
+    type[Group1]="THREE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Latch ]
+  };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+partial modifier_keys
+xkb_symbols "bksl_switch_latch" {
+  key <BKSL> {
+    type[Group1]="THREE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Latch ]
+  };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+partial modifier_keys
+xkb_symbols "lsgt_switch_latch" {
+  key <LSGT> {
+    type[Group1]="THREE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Latch ]
+  };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/level5 b/xorg-server/xkeyboard-config/symbols/level5
index 6e9a693cc..ce219b5bf 100644
--- a/xorg-server/xkeyboard-config/symbols/level5
+++ b/xorg-server/xkeyboard-config/symbols/level5
@@ -1,147 +1,147 @@
-// these variants assign various XKB keycodes to ISO_Level5_Shift so that
-// the third shift level can be reached
-//
-
-// using the level(switch) map, the right Control key temporarily
-// chooses the fifth shift level (until it is released).
-partial modifier_keys
-xkb_symbols "rctrl_switch" {
-  key <RCTL> {
-    type[Group1]="ONE_LEVEL",
-    symbols[Group1] = [ ISO_Level5_Shift ]
-    };
-  modifier_map Mod3   { ISO_Level5_Shift };
-};
-
-partial modifier_keys
-xkb_symbols "lsgt_switch" {
-  key <LSGT> {
-    type[Group1]="ONE_LEVEL",
-    symbols[Group1] = [ ISO_Level5_Shift ]
-    };
-  modifier_map Mod3   { ISO_Level5_Shift };
-};
-
-partial modifier_keys
-xkb_symbols "ralt_switch" {
-  key <RALT> {
-    type[Group1]="ONE_LEVEL",
-    symbols[Group1] = [ ISO_Level5_Shift ]
-    };
-  modifier_map Mod3   { ISO_Level5_Shift };
-};
-
-
-// The following modifier keys are used to switch to the third shift and to set a
-// corresponding lock, implemented as NumLock.
-
-partial modifier_keys
-xkb_symbols "lock" {
-  // This adds the definitions needed to create a level5-lock behaviour, using
-  // the real modifier NumLock as a lock indicator.
-  // See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK
-  // See also: compat/level5(level5_lock)
-  key.type[Group1] = "ONE_LEVEL";
-
-  replace key <MDSW> {
-    vmods = LevelFive,
-    symbols[Group1] = [ ISO_Level5_Shift ],
-    actions[Group1] = [ SetMods(modifiers=LevelFive) ]
-  };
-  modifier_map Mod3 { <MDSW> };
-
-  replace key <HYPR> {
-    vmods = NumLock,
-    symbols[Group1] = [ NoSymbol ],
-    actions[Group1] = [ SetMods(modifiers=NumLock) ]
-  };
-  modifier_map Mod2 { <HYPR> };
-};
-
-partial modifier_keys
-xkb_symbols "lsgt_switch_lock" {
-
-  include "level5(lock)"
-
-  key <LSGT> {
-    type[Group1] = "EIGHT_LEVEL",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
-
-partial modifier_keys
-xkb_symbols "lwin_switch_lock" {
-
-  include "level5(lock)"
-
-  key <LWIN> {
-    type[Group1] = "EIGHT_LEVEL",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
-
-partial modifier_keys
-xkb_symbols "ralt_switch_lock" {
-
-  include "level5(lock)"
-
-  key <RALT> {
-    type[Group1] = "EIGHT_LEVEL",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
-
-partial modifier_keys
-xkb_symbols "rwin_switch_lock" {
-
-  include "level5(lock)"
-
-  key <RWIN> {
-    type[Group1] = "EIGHT_LEVEL",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
-
-partial modifier_keys
-xkb_symbols "lsgt_switch_lock_cancel" {
-
-  include "level5(lock)"
-
-  key <LSGT> {
-    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
-
-partial modifier_keys
-xkb_symbols "lwin_switch_lock_cancel" {
-
-  include "level5(lock)"
-
-  key <LWIN> {
-    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
-
-partial modifier_keys
-xkb_symbols "ralt_switch_lock_cancel" {
-
-  include "level5(lock)"
-
-  key <RALT> {
-    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
-
-partial modifier_keys
-xkb_symbols "rwin_switch_lock_cancel" {
-
-  include "level5(lock)"
-
-  key <RWIN> {
-    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
+// these variants assign various XKB keycodes to ISO_Level5_Shift so that
+// the third shift level can be reached
+//
+
+// using the level(switch) map, the right Control key temporarily
+// chooses the fifth shift level (until it is released).
+partial modifier_keys
+xkb_symbols "rctrl_switch" {
+  key <RCTL> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level5_Shift ]
+    };
+  modifier_map Mod3   { ISO_Level5_Shift };
+};
+
+partial modifier_keys
+xkb_symbols "lsgt_switch" {
+  key <LSGT> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level5_Shift ]
+    };
+  modifier_map Mod3   { ISO_Level5_Shift };
+};
+
+partial modifier_keys
+xkb_symbols "ralt_switch" {
+  key <RALT> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level5_Shift ]
+    };
+  modifier_map Mod3   { ISO_Level5_Shift };
+};
+
+
+// The following modifier keys are used to switch to the third shift and to set a
+// corresponding lock, implemented as NumLock.
+
+partial modifier_keys
+xkb_symbols "lock" {
+  // This adds the definitions needed to create a level5-lock behaviour, using
+  // the real modifier NumLock as a lock indicator.
+  // See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK
+  // See also: compat/level5(level5_lock)
+  key.type[Group1] = "ONE_LEVEL";
+
+  replace key <MDSW> {
+    vmods = LevelFive,
+    symbols[Group1] = [ ISO_Level5_Shift ],
+    actions[Group1] = [ SetMods(modifiers=LevelFive) ]
+  };
+  modifier_map Mod3 { <MDSW> };
+
+  replace key <HYPR> {
+    vmods = NumLock,
+    symbols[Group1] = [ NoSymbol ],
+    actions[Group1] = [ SetMods(modifiers=NumLock) ]
+  };
+  modifier_map Mod2 { <HYPR> };
+};
+
+partial modifier_keys
+xkb_symbols "lsgt_switch_lock" {
+
+  include "level5(lock)"
+
+  key <LSGT> {
+    type[Group1] = "EIGHT_LEVEL",
+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
+  };
+};
+
+partial modifier_keys
+xkb_symbols "lwin_switch_lock" {
+
+  include "level5(lock)"
+
+  key <LWIN> {
+    type[Group1] = "EIGHT_LEVEL",
+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
+  };
+};
+
+partial modifier_keys
+xkb_symbols "ralt_switch_lock" {
+
+  include "level5(lock)"
+
+  key <RALT> {
+    type[Group1] = "EIGHT_LEVEL",
+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
+  };
+};
+
+partial modifier_keys
+xkb_symbols "rwin_switch_lock" {
+
+  include "level5(lock)"
+
+  key <RWIN> {
+    type[Group1] = "EIGHT_LEVEL",
+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
+  };
+};
+
+partial modifier_keys
+xkb_symbols "lsgt_switch_lock_cancel" {
+
+  include "level5(lock)"
+
+  key <LSGT> {
+    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",
+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
+  };
+};
+
+partial modifier_keys
+xkb_symbols "lwin_switch_lock_cancel" {
+
+  include "level5(lock)"
+
+  key <LWIN> {
+    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",
+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
+  };
+};
+
+partial modifier_keys
+xkb_symbols "ralt_switch_lock_cancel" {
+
+  include "level5(lock)"
+
+  key <RALT> {
+    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",
+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
+  };
+};
+
+partial modifier_keys
+xkb_symbols "rwin_switch_lock_cancel" {
+
+  include "level5(lock)"
+
+  key <RWIN> {
+    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",
+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
+  };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch
index 09c2fb32f..54b61d215 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch
@@ -1,101 +1,101 @@
-//
-// 03.01.2003
-// Andreas Tobler <a.tobler@schweiz.ch>
-// modified for Swiss German Apple Extended Keyboard II
-
-partial alphanumeric_keys
-xkb_symbols "extended" {
-    
-    name[Group1]= "Switzerland - German, Mac";
-
-    // Alphanumeric section
-
-    key <AE01> { [	1,	plus, 	plusminus,	infinity		]	};
-    key <AE02> { [	2,	quotedbl, leftdoublequotemark, rightdoublequotemark 	]	};
-    key <AE03> { [	3,	asterisk, 	numbersign,	leftcaret	]	};
-					// not displayed here
-    key <AE04> { [	4,	ccedilla, 	Ccedilla,	slash		]	};
-    key <AE05> { [	5,	percent, 	bracketleft			]	};
-    key <AE06> { [	6,	ampersand, 	bracketright			]	};
-    key <AE07> { [	7,	slash, 	bar,		backslash		]	};
-    key <AE08> { [	8,	parenleft, 	braceleft,	Ograve		]	};
-    key <AE09> { [	9,	parenright, 	braceright,	Ocircumflex	]	};
-    key <AE10> { [	0,	equal, 	notequal,	Uacute			]	};
-    key <AE11> { [	apostrophe,	question, 	questiondown, 	NoSymbol		]	};
-    key <AE12> { [	dead_circumflex,dead_grave, 	dead_acute,	asciicircum		]	};
-    key <AD01> { [	q,	Q, 	oe,		OE			]	};
-    key <AD02> { [	w,	W, 	Greek_SIGMA,	Aacute			]	};
-    key <AD03> { [ 	e,	E, 	EuroSign,	Ediaeresis		]	};
-    key <AD04> { [ 	r,	R, 	registered,	Egrave			]	};
-    key <AD05> { [ 	t,	T, 	dagger,		Icircumflex		]	}; 
-    key <AD06> { [	z,	Z, 	Greek_OMEGA,	Iacute			]	};
-    key <AD07> { [ 	u,	U, 	degree,		Ugrave			]	};
-    key <AD08> { [ 	i,	I, 	exclamdown,	idotless		]	};
-    key <AD09> { [ 	o,	O, 	oslash,		Ooblique		]	};
-    key <AD10> { [ 	p,	P, 	Greek_pi,	Greek_PI		]	};
-    key <AD11> { [	udiaeresis,	egrave, 	section,	ydiaeresis		]	};
-    key <AD12> { [	dead_diaeresis,	exclam, 	grave,		apostrophe		]	};
-    key <AC01> { [ 	a,	A, 	aring,		Aring			]	};
-    key <AC02> { [ 	s,	S, 	ssharp, 	NoSymbol		]	}; 
-					// ligature fl
-    key <AC03> { [ 	d,	D, 	Greek_sigma,	NoSymbol		]	};
-			// partialderivative is not available here att
-    key <AC04> { [ 	f,	F, 	function,	doubledagger		]	};
-    key <AC05> { [ 	g,	G, 	at,		comma			]	};
-    key <AC06> { [ 	h,	H, 	ordfeminine,	periodcentered		]	};
-    key <AC07> { [ 	j,	J,  	masculine,	eth	 		]	};
-    key <AC08> { [ 	k,	K, 	Greek_DELTA,	macron			]	};
-    key <AC09> { [ 	l,	L, 	notsign,	caret			]	};
-    key <AC10> { [	odiaeresis,	eacute, 	cent,		breve	]	};
-    key <AC11> { [	adiaeresis,	agrave, 	ae,		AE	]	};
-    key <AB01> { [	y,	Y, 	yen,		Ydiaeresis		]	};
-    key <AB02> { [ 	x,	X, 	similarequal,	trademark		]	};
-    key <AB03> { [ 	c,	C, 	copyright,	NoSymbol		]	};
-    key <AB04> { [ 	v,	V, 	radical,	diamond			]	};
-    key <AB05> { [ 	b,	B, 	integral,	NoSymbol		]	};  
-    key <AB06> { [ 	n,	N, 	dead_tilde, 	enopencircbullet	]       };
-					// to be fixed att
-    key <AB07> { [ 	m,	M, 	mu,		dead_abovering		]       };
-					// not sure att
-    key <AB08> { [	comma,	semicolon, 	guillemotleft,	guillemotright	]	};
-    key <AB09> { [	period,	colon, 	ellipsis,	division		]	};
-    key <AB10> { [	minus,	underscore, 	hyphen,		emdash		]	};
-    key <TLDE> { [	section,	degree,   	NoSymbol, 	NoSymbol		]	};
-			// ligature fi	// per mille
-    key <SPCE> { [	space, 	nobreakspace,	nobreakspace		]	};
-    key <LSGT> { [	less,	greater, 	lessthanequal,	greaterthanequal	]  	};
-    key <BKSL> { [	dollar,	sterling, 	paragraph,	enfilledcircbullet	]	};
-
-    include "kpdl(comma)"
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "de" {
-    include "macintosh_vndr/ch(extended)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "fr" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Swiss/French keybaord
-
-    include "macintosh_vndr/ch(extended)"
-    name[Group1]= "Switzerland - French, Mac";
-
-    override key <AD11> {
-	[ egrave,	udiaeresis,  bracketleft	]
-    };
-    override key <AC10> {
-	[ eacute,	odiaeresis	]
-    };
-    override key <AC11> {
-	[ agrave,	adiaeresis,   braceleft		]
-    };
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-    include "macintosh_vndr/ch(fr)" // for consistent naming
-};
+//
+// 03.01.2003
+// Andreas Tobler <a.tobler@schweiz.ch>
+// modified for Swiss German Apple Extended Keyboard II
+
+partial alphanumeric_keys
+xkb_symbols "extended" {
+    
+    name[Group1]= "Switzerland - German, Mac";
+
+    // Alphanumeric section
+
+    key <AE01> { [	1,	plus, 	plusminus,	infinity		]	};
+    key <AE02> { [	2,	quotedbl, leftdoublequotemark, rightdoublequotemark 	]	};
+    key <AE03> { [	3,	asterisk, 	numbersign,	leftcaret	]	};
+					// not displayed here
+    key <AE04> { [	4,	ccedilla, 	Ccedilla,	slash		]	};
+    key <AE05> { [	5,	percent, 	bracketleft			]	};
+    key <AE06> { [	6,	ampersand, 	bracketright			]	};
+    key <AE07> { [	7,	slash, 	bar,		backslash		]	};
+    key <AE08> { [	8,	parenleft, 	braceleft,	Ograve		]	};
+    key <AE09> { [	9,	parenright, 	braceright,	Ocircumflex	]	};
+    key <AE10> { [	0,	equal, 	notequal,	Uacute			]	};
+    key <AE11> { [	apostrophe,	question, 	questiondown, 	NoSymbol		]	};
+    key <AE12> { [	dead_circumflex,dead_grave, 	dead_acute,	asciicircum		]	};
+    key <AD01> { [	q,	Q, 	oe,		OE			]	};
+    key <AD02> { [	w,	W, 	Greek_SIGMA,	Aacute			]	};
+    key <AD03> { [ 	e,	E, 	EuroSign,	Ediaeresis		]	};
+    key <AD04> { [ 	r,	R, 	registered,	Egrave			]	};
+    key <AD05> { [ 	t,	T, 	dagger,		Icircumflex		]	}; 
+    key <AD06> { [	z,	Z, 	Greek_OMEGA,	Iacute			]	};
+    key <AD07> { [ 	u,	U, 	degree,		Ugrave			]	};
+    key <AD08> { [ 	i,	I, 	exclamdown,	idotless		]	};
+    key <AD09> { [ 	o,	O, 	oslash,		Ooblique		]	};
+    key <AD10> { [ 	p,	P, 	Greek_pi,	Greek_PI		]	};
+    key <AD11> { [	udiaeresis,	egrave, 	section,	ydiaeresis		]	};
+    key <AD12> { [	dead_diaeresis,	exclam, 	grave,		apostrophe		]	};
+    key <AC01> { [ 	a,	A, 	aring,		Aring			]	};
+    key <AC02> { [ 	s,	S, 	ssharp, 	NoSymbol		]	}; 
+					// ligature fl
+    key <AC03> { [ 	d,	D, 	Greek_sigma,	NoSymbol		]	};
+			// partialderivative is not available here att
+    key <AC04> { [ 	f,	F, 	function,	doubledagger		]	};
+    key <AC05> { [ 	g,	G, 	at,		comma			]	};
+    key <AC06> { [ 	h,	H, 	ordfeminine,	periodcentered		]	};
+    key <AC07> { [ 	j,	J,  	masculine,	eth	 		]	};
+    key <AC08> { [ 	k,	K, 	Greek_DELTA,	macron			]	};
+    key <AC09> { [ 	l,	L, 	notsign,	caret			]	};
+    key <AC10> { [	odiaeresis,	eacute, 	cent,		breve	]	};
+    key <AC11> { [	adiaeresis,	agrave, 	ae,		AE	]	};
+    key <AB01> { [	y,	Y, 	yen,		Ydiaeresis		]	};
+    key <AB02> { [ 	x,	X, 	similarequal,	trademark		]	};
+    key <AB03> { [ 	c,	C, 	copyright,	NoSymbol		]	};
+    key <AB04> { [ 	v,	V, 	radical,	diamond			]	};
+    key <AB05> { [ 	b,	B, 	integral,	NoSymbol		]	};  
+    key <AB06> { [ 	n,	N, 	dead_tilde, 	enopencircbullet	]       };
+					// to be fixed att
+    key <AB07> { [ 	m,	M, 	mu,		dead_abovering		]       };
+					// not sure att
+    key <AB08> { [	comma,	semicolon, 	guillemotleft,	guillemotright	]	};
+    key <AB09> { [	period,	colon, 	ellipsis,	division		]	};
+    key <AB10> { [	minus,	underscore, 	hyphen,		emdash		]	};
+    key <TLDE> { [	section,	degree,   	NoSymbol, 	NoSymbol		]	};
+			// ligature fi	// per mille
+    key <SPCE> { [	space, 	nobreakspace,	nobreakspace		]	};
+    key <LSGT> { [	less,	greater, 	lessthanequal,	greaterthanequal	]  	};
+    key <BKSL> { [	dollar,	sterling, 	paragraph,	enfilledcircbullet	]	};
+
+    include "kpdl(comma)"
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "de" {
+    include "macintosh_vndr/ch(extended)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "fr" {
+
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and a very simple Swiss/French keybaord
+
+    include "macintosh_vndr/ch(extended)"
+    name[Group1]= "Switzerland - French, Mac";
+
+    override key <AD11> {
+	[ egrave,	udiaeresis,  bracketleft	]
+    };
+    override key <AC10> {
+	[ eacute,	odiaeresis	]
+    };
+    override key <AC11> {
+	[ agrave,	adiaeresis,   braceleft		]
+    };
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+    include "macintosh_vndr/ch(fr)" // for consistent naming
+};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de
index 4c8bebdf4..da5bc7772 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de
@@ -1,94 +1,94 @@
-// olh@suse.de   very close to MacOS map
-
-default partial alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple German keybaord
-
-    include "latin"
-    name[Group1]= "Germany - Mac";
-
-    // Alphanumeric section
-    key <TLDE> {	[ dead_circumflex,	degree,    notsign 		]	};
-    key <AE01> {	[         1,    exclam,  exclamdown,   at		]	};
-    key <AE02> {	[	  2,	quotedbl,  twosuperior			]	};
-    key <AE03> {	[	  3,	section,  threesuperior,sterling	]	};
-    key <AE04> {	[	  4,	dollar,  onequarter,	currency	]	};
-    key <AE05> {	[	  5,	percent,  bracketleft			]	};
-    key <AE06> {	[	  6,	ampersand,  bracketright		]	};
-    key <AE07> {	[	  7,	slash,        bar,    backslash		]	};
-    key <AE08> {	[	  8,	parenleft,  braceleft,    asciitilde	]	};
-    key <AE09> {	[	  9,	parenright, braceright			]	};
-    key <AE10> {	[	  0,	equal,  braceright,	degree		]	};
-    key <AE11> {	[    ssharp,	question,  backslash,	questiondown	]	};
-    key <AE12> {	[ dead_acute,	dead_grave,  dead_cedilla		]	};
-
-    key <AD01> {	[	  q,	Q, guillemotleft,guillemotright	]	};
-    key <AD03> {	[	  e,	E,   EuroSign			]	};
-    key <AD04> {	[         r,    R,  registered			]	};
-    key <AD05> {	[	  t,	T		]	};
-    key <AD06> {	[	  z,	Z		]	};
-    key <AD07> {	[	  u,	U, diaeresis,    Aacute		]	};
-    key <AD08> {	[	  i,	I,      slash,    Ucircumflex	]	};
-    key <AD09> {	[         o,    O,      oslash,   Ooblique	]	};
-    key <AD11> {	[ udiaeresis,	Udiaeresis,  periodcentered, degree	]	};
-    key <AD12> {	[      plus,	asterisk,  asciitilde			]	}; 
-    key <AC01> {	[         a,    A,      aring,    Aring		]	};
-    key <AC04> {	[	  f,	F		]	};
-    key <AC05> {	[	  g,	G,  copyright			]	};
-    key <AC06> {	[         h,    H,  ordfeminine			]	};
-    key <AC09> {	[	  l,    L, 	at			]	};
-    key <AC10> {	[ odiaeresis,	Odiaeresis,  dead_acute			]	};
-    key <AC11> {	[ adiaeresis,	Adiaeresis,  dead_circumflex		]	};
-
-    key <LSGT> {	[      less,	greater,        bar			]	};
-    key <AB01> {	[	  y,	Y,  guillemotleft,less		]	};
-    key <AB06> {	[         n,    N, asciitilde			]	};
-    key <AB07> {	[	  m,	M, 	 mu			]	};
-    key <AB08> {	[     comma,	semicolon	]	};
-    key <AB09> {	[    period,	colon,  periodcentered, division	]	};
-    key <AB10> {	[     minus,	underscore	]	};
-    key <BKSL> {	[ numbersign,	apostrophe,  dead_grave			]	};
-
-    include "kpdl(comma)"
-    include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys 
-xkb_symbols "Sundeadkeys" {
-    // modify the default German layout to use Sun dead keys
-    include "macintosh_vndr/de(basic)"
-    name[Group1]= "Germany - Mac, Sun dead keys";
-
-    key <TLDE> {	[ SunFA_Circum,	degree,    notsign 			]	};
-    key <AE12> {	[ SunFA_Acute,	SunFA_Grave,  SunFA_Cedilla			]	};
-    key <AD11> {	[ udiaeresis,	Udiaeresis,  SunFA_Diaeresis		]	};
-    key <AD12> {	[      plus,	asterisk,  SunFA_Tilde,	dead_macron	]	};
-    key <AC10> {	[ odiaeresis,	Odiaeresis,  SunFA_Acute			]	};
-    key <AC11> {	[ adiaeresis,	Adiaeresis,  SunFA_Circum			]	};
-
-    key <BKSL> {	[ numbersign,	acute,  SunFA_Grave			]	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sundeadkeys" {
-    include "macintosh_vndr/de(Sundeadkeys)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-    // modify the default German layout to not have any dead keys
-    include "macintosh_vndr/de(basic)"
-    name[Group1]= "Germany - Mac, eliminate dead keys";
-
-    key <TLDE> {	[ asciicircum,	degree,    notsign 			]	};
-    key <AE12> {	[ acute,	grave,  cedilla				]	};
-    key <AD11> {	[ udiaeresis,	Udiaeresis,  diaeresis 			]	};
-    key <AD12> {	[      plus,	asterisk,  asciitilde,	macron		]	};
-    key <AC10> {	[ odiaeresis,	Odiaeresis,  acute			]	};
-    key <AC11> {	[ adiaeresis,	Adiaeresis,  asciicircum		]	};
-
-    key <BKSL> {	[ numbersign,	apostrophe,  grave			]	};
-};
+// olh@suse.de   very close to MacOS map
+
+default partial alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and a very simple German keybaord
+
+    include "latin"
+    name[Group1]= "Germany - Mac";
+
+    // Alphanumeric section
+    key <TLDE> {	[ dead_circumflex,	degree,    notsign 		]	};
+    key <AE01> {	[         1,    exclam,  exclamdown,   at		]	};
+    key <AE02> {	[	  2,	quotedbl,  twosuperior			]	};
+    key <AE03> {	[	  3,	section,  threesuperior,sterling	]	};
+    key <AE04> {	[	  4,	dollar,  onequarter,	currency	]	};
+    key <AE05> {	[	  5,	percent,  bracketleft			]	};
+    key <AE06> {	[	  6,	ampersand,  bracketright		]	};
+    key <AE07> {	[	  7,	slash,        bar,    backslash		]	};
+    key <AE08> {	[	  8,	parenleft,  braceleft,    asciitilde	]	};
+    key <AE09> {	[	  9,	parenright, braceright			]	};
+    key <AE10> {	[	  0,	equal,  braceright,	degree		]	};
+    key <AE11> {	[    ssharp,	question,  backslash,	questiondown	]	};
+    key <AE12> {	[ dead_acute,	dead_grave,  dead_cedilla		]	};
+
+    key <AD01> {	[	  q,	Q, guillemotleft,guillemotright	]	};
+    key <AD03> {	[	  e,	E,   EuroSign			]	};
+    key <AD04> {	[         r,    R,  registered			]	};
+    key <AD05> {	[	  t,	T		]	};
+    key <AD06> {	[	  z,	Z		]	};
+    key <AD07> {	[	  u,	U, diaeresis,    Aacute		]	};
+    key <AD08> {	[	  i,	I,      slash,    Ucircumflex	]	};
+    key <AD09> {	[         o,    O,      oslash,   Ooblique	]	};
+    key <AD11> {	[ udiaeresis,	Udiaeresis,  periodcentered, degree	]	};
+    key <AD12> {	[      plus,	asterisk,  asciitilde			]	}; 
+    key <AC01> {	[         a,    A,      aring,    Aring		]	};
+    key <AC04> {	[	  f,	F		]	};
+    key <AC05> {	[	  g,	G,  copyright			]	};
+    key <AC06> {	[         h,    H,  ordfeminine			]	};
+    key <AC09> {	[	  l,    L, 	at			]	};
+    key <AC10> {	[ odiaeresis,	Odiaeresis,  dead_acute			]	};
+    key <AC11> {	[ adiaeresis,	Adiaeresis,  dead_circumflex		]	};
+
+    key <LSGT> {	[      less,	greater,        bar			]	};
+    key <AB01> {	[	  y,	Y,  guillemotleft,less		]	};
+    key <AB06> {	[         n,    N, asciitilde			]	};
+    key <AB07> {	[	  m,	M, 	 mu			]	};
+    key <AB08> {	[     comma,	semicolon	]	};
+    key <AB09> {	[    period,	colon,  periodcentered, division	]	};
+    key <AB10> {	[     minus,	underscore	]	};
+    key <BKSL> {	[ numbersign,	apostrophe,  dead_grave			]	};
+
+    include "kpdl(comma)"
+    include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys 
+xkb_symbols "Sundeadkeys" {
+    // modify the default German layout to use Sun dead keys
+    include "macintosh_vndr/de(basic)"
+    name[Group1]= "Germany - Mac, Sun dead keys";
+
+    key <TLDE> {	[ SunFA_Circum,	degree,    notsign 			]	};
+    key <AE12> {	[ SunFA_Acute,	SunFA_Grave,  SunFA_Cedilla			]	};
+    key <AD11> {	[ udiaeresis,	Udiaeresis,  SunFA_Diaeresis		]	};
+    key <AD12> {	[      plus,	asterisk,  SunFA_Tilde,	dead_macron	]	};
+    key <AC10> {	[ odiaeresis,	Odiaeresis,  SunFA_Acute			]	};
+    key <AC11> {	[ adiaeresis,	Adiaeresis,  SunFA_Circum			]	};
+
+    key <BKSL> {	[ numbersign,	acute,  SunFA_Grave			]	};
+};
+
+partial alphanumeric_keys 
+xkb_symbols "sundeadkeys" {
+    include "macintosh_vndr/de(Sundeadkeys)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+    // modify the default German layout to not have any dead keys
+    include "macintosh_vndr/de(basic)"
+    name[Group1]= "Germany - Mac, eliminate dead keys";
+
+    key <TLDE> {	[ asciicircum,	degree,    notsign 			]	};
+    key <AE12> {	[ acute,	grave,  cedilla				]	};
+    key <AD11> {	[ udiaeresis,	Udiaeresis,  diaeresis 			]	};
+    key <AD12> {	[      plus,	asterisk,  asciitilde,	macron		]	};
+    key <AC10> {	[ odiaeresis,	Odiaeresis,  acute			]	};
+    key <AC11> {	[ adiaeresis,	Adiaeresis,  asciicircum		]	};
+
+    key <BKSL> {	[ numbersign,	apostrophe,  grave			]	};
+};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi
index 177913737..7a865d2bc 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi
@@ -1,17 +1,17 @@
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple mac_US
-    // keyboard and a very simple Swedish(Finland) keybaord
-
-    include "macintosh_vndr/se(basic)" // for consistent naming
-    name[Group1]= "Finland - Mac";
-
-};
-
-
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-    include "macintosh_vndr/se(basic)"	// for consistent naming
-    name[Group1]= "Finland - Mac, eliminate dead keys";
-};
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple mac_US
+    // keyboard and a very simple Swedish(Finland) keybaord
+
+    include "macintosh_vndr/se(basic)" // for consistent naming
+    name[Group1]= "Finland - Mac";
+
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+    include "macintosh_vndr/se(basic)"	// for consistent naming
+    name[Group1]= "Finland - Mac, eliminate dead keys";
+};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr
index 9a8f8de23..c76551d30 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr
@@ -1,110 +1,110 @@
-// Marc.Shapiro@inria.fr 19-sep-1998
-// modifications : Etienne Herlent <eherlent@linux-france.org> june 2000
-// adapted to the new input layer :
-//        Martin Costabel <costabel@wanadoo.fr> 3-jan-2001
-//////////////////////////////////////////////////////////////////
-// Petites Modification le juillet 2005 par Bin Zhang <bb.zhang@free.fr> : 
-// 1) La ligne 83 : remplacer les deux "VoidSymbol" par oe et OE 
-// 2) La ligne 89 : remplacer "VoidSymbol" par "EuroSign"
-// ( 1) et 2) fonctionnent sous UTF-8, mais pas sous iso-8859-1. )
-// 3) Remplacer la ligne 148 par la ligne 149 pour que la touche Alt_L
-// (la touche Apple-Pomme) fonctionne correctement sous Xorg, une id�e
-// motiv�e par http://www.linux-france.org/macintosh/clavier_gentoo.html
-//////////////////////////////////////////////////////////////////
-// This map is an almost-complete mapping of the standard French
-// MacIntosh keyboard under Xwindows.  I tried to remain as faithful
-// as possible to the Mac meaning of each key.	I did this entirely by
-// hand and by intuition, relying on the Clavier (Keyboard?) Desktop
-// Accessory for the Mac meaning of keys, and on reading keysymdef.h
-// to intuit the corresponding X names.	 Lacking proper documentation,
-// I may have made some mistakes.
-
-// Entries marked CHECK are particularly uncertain
-
-// Entries marked MISSING mark Mac characters for which I was unable
-// to find a corresponding keysym.  (Some for sure don't: e.g. the
-// Apple mark and the oe/OE character; others I may have simply not
-// found.)
-
-default
-xkb_symbols "extended" {
-
-    name[Group1]= "France - Mac";
-
-    key <ESC>  {	[ Escape			]	};
-
-    // Alphanumeric section
-    key <TLDE> {	[	   at,	  numbersign,	periodcentered,  	Ydiaeresis	]	};
-    key <ENTR> {        [    KP_Enter                   ]       };
-    key <AE01> {	[   ampersand,	  1,	  	VoidSymbol,	  	dead_acute	]	}; // MISSING: Apple
-    key <AE02> {	[      eacute,	  2,		ediaeresis,	  	Eacute	]	};
-    key <AE03> {	[    quotedbl,	  3,		leftdoublequotemark, 	rightdoublequotemark	] 	};
-    key <AE04> {	[  apostrophe,	  4,		leftsinglequotemark, 	rightsinglequotemark	] 	};
-    key <AE05> {	[   parenleft,	  5,		braceleft,	  	bracketleft	]	};
-    key <AE06> {	[     section,	  6,		paragraph,	  	aring		]	};
-    key <AE07> {	[      egrave,	  7,		guillemotleft,	  	guillemotright]	};
-    key <AE08> {	[      exclam,	  8,		exclamdown,	  	Ucircumflex	]	};
-    key <AE09> {	[    ccedilla,	  9,		Ccedilla,	  	Aacute	]	};
-    key <AE10> {	[      agrave,	  0,		oslash,	  		Oslash	]	};
-    key <AE11> {	[  parenright,	  degree,	braceright,	  	bracketright	]	};
-    key <AE12> {	[	minus,	  underscore,	emdash,	  		endash	]	};
-    key <BKSP> {	[   BackSpace,    VoidSymbol,	Delete,	  		VoidSymbol	]	};
-
-    key	 <TAB> {	[	  Tab,	ISO_Left_Tab	]	};
-    key <AD01> {	[	    a,	A,		ae,			AE		]	};
-    key <AD02> {	[	    z,	Z,		Acircumflex,		Aring		]	};
-    key <AD03> {	[	    e,	E,		ecircumflex,		Ecircumflex	]	};
-    key <AD04> {	[	    r,	R,		registered,		currency	]	};
-    key <AD05> {	[	    t,	T,		dagger,			trademark	]	};
-    key <AD06> {	[	    y,	Y,		Uacute,  		Ydiaeresis	]	};
-    key <AD07> {	[	    u,	U,		masculine,		ordfeminine	]	};
-    key <AD08> {	[	    i,	I,		icircumflex,		idiaeresis	]	};
-    key <AD09> {	[	    o,	O,		oe,			OE		]	};
-    key <AD10> {	[	    p,	P,		Greek_pi,  		Greek_PI	]	};
-    key <AD11> {	[dead_circumflex,dead_diaeresis,ocircumflex, 		Ocircumflex	]	};
-    key <AD12> {	[      dollar,	asterisk,	EuroSign,  		yen   	        ]	};
-    key <CAPS> {	[	Caps_Lock		]	};
-    key <AC01> {	[	  q,	Q,		doubledagger,		Greek_OMEGA	]	};
-    key <AC02> {	[	  s,	S,		Ograve,			Greek_SIGMA	]	};
-    key <AC03> {	[         d,	D,		Greek_delta,		Greek_DELTA	]	};
-    key <AC04> {	[	  f,	F,		VoidSymbol,		periodcentered	]	};
-    key <AC05> {	[	  g,	G,		VoidSymbol,		VoidSymbol	]	}; // MISSING: ligature fi,fl
-    key <AC06> {	[	  h,	H,		Igrave,			Icircumflex	]	};
-    key <AC07> {	[	  j,	J,		Idiaeresis,		Iacute		]	};
-    key <AC08> {	[	  k,	K,		Egrave,			Ediaeresis	]	};
-    key <AC09> {	[	  l,	L,		notsign,		bar		]	};
-    key <AC10> {	[	  m,	M,		mu,			Oacute		]	};
-    key <AC11> {	[    ugrave,	percent,	Ugrave,			0x1002030	]	};
-    key <BKSL> {	[ dead_grave,	sterling,	at,			numbersign	]	};
-    key <RTRN> {	[    Return			]	};
-
-    key <LSGT> {	[	 less,	  greater,	lessthanequal,		greaterthanequal	]	};
-    key <AB01> {	[	  w,	W,		guilsinglleft,		guilsinglright	]	}; // MISSING: half-guillemot (single angle bracket)
-    key <AB02> {	[	  x,	X,		VoidSymbol,		VoidSymbol	]	}; // CHECK: similarequal; MISSING: extra-slanted slash
-    key <AB03> {	[	  c,	C,		copyright,		cent		]	};
-    key <AB04> {	[	  v,	V,		diamond,		radical		]	}; // CHECK diamond
-    key <AB05> {	[	  b,	B,		ssharp,    		integral	]	};
-    key <AB06> {	[	  n,	N,		dead_tilde,		asciitilde	]	};
-    key <AB07> {	[     comma,	question,	infinity,		questiondown	]	};
-    key <AB08> {	[ semicolon,	period,		ellipsis,		periodcentered	]	};
-    key <AB09> {	[     colon,	slash,		division,		backslash	]	};
-    key <AB10> {	[     equal,	plus,		notequal,		plusminus	]	};
-
-    key <SPCE> {	[     space,	space,		nobreakspace,		nobreakspace	]	};
-    // End alphanumeric section
-
-    include "level3(ralt_switch)"
-};
-
-
-
-xkb_symbols "nodeadkeys" {
-include "macintosh_vndr/fr(extended)"
-    name[Group1]= "France - Mac, eliminate dead keys";
-    
-    key <AE01> {	[   ampersand,	  1,	  	VoidSymbol,	  	acute	]	}; // MISSING: Apple
-    key <AD11> {	[asciicircum,diaeresis,ocircumflex, 		Ocircumflex	]	};
-    key <BKSL> {	[ grave,	sterling,	at,			numbersign	]	};
-
-    key <AB06> {	[	  n,	N,		asciitilde,		dead_tilde	]	};
-};
+// Marc.Shapiro@inria.fr 19-sep-1998
+// modifications : Etienne Herlent <eherlent@linux-france.org> june 2000
+// adapted to the new input layer :
+//        Martin Costabel <costabel@wanadoo.fr> 3-jan-2001
+//////////////////////////////////////////////////////////////////
+// Petites Modification le juillet 2005 par Bin Zhang <bb.zhang@free.fr> : 
+// 1) La ligne 83 : remplacer les deux "VoidSymbol" par oe et OE 
+// 2) La ligne 89 : remplacer "VoidSymbol" par "EuroSign"
+// ( 1) et 2) fonctionnent sous UTF-8, mais pas sous iso-8859-1. )
+// 3) Remplacer la ligne 148 par la ligne 149 pour que la touche Alt_L
+// (la touche Apple-Pomme) fonctionne correctement sous Xorg, une id�e
+// motiv�e par http://www.linux-france.org/macintosh/clavier_gentoo.html
+//////////////////////////////////////////////////////////////////
+// This map is an almost-complete mapping of the standard French
+// MacIntosh keyboard under Xwindows.  I tried to remain as faithful
+// as possible to the Mac meaning of each key.	I did this entirely by
+// hand and by intuition, relying on the Clavier (Keyboard?) Desktop
+// Accessory for the Mac meaning of keys, and on reading keysymdef.h
+// to intuit the corresponding X names.	 Lacking proper documentation,
+// I may have made some mistakes.
+
+// Entries marked CHECK are particularly uncertain
+
+// Entries marked MISSING mark Mac characters for which I was unable
+// to find a corresponding keysym.  (Some for sure don't: e.g. the
+// Apple mark and the oe/OE character; others I may have simply not
+// found.)
+
+default
+xkb_symbols "extended" {
+
+    name[Group1]= "France - Mac";
+
+    key <ESC>  {	[ Escape			]	};
+
+    // Alphanumeric section
+    key <TLDE> {	[	   at,	  numbersign,	periodcentered,  	Ydiaeresis	]	};
+    key <ENTR> {        [    KP_Enter                   ]       };
+    key <AE01> {	[   ampersand,	  1,	  	VoidSymbol,	  	dead_acute	]	}; // MISSING: Apple
+    key <AE02> {	[      eacute,	  2,		ediaeresis,	  	Eacute	]	};
+    key <AE03> {	[    quotedbl,	  3,		leftdoublequotemark, 	rightdoublequotemark	] 	};
+    key <AE04> {	[  apostrophe,	  4,		leftsinglequotemark, 	rightsinglequotemark	] 	};
+    key <AE05> {	[   parenleft,	  5,		braceleft,	  	bracketleft	]	};
+    key <AE06> {	[     section,	  6,		paragraph,	  	aring		]	};
+    key <AE07> {	[      egrave,	  7,		guillemotleft,	  	guillemotright]	};
+    key <AE08> {	[      exclam,	  8,		exclamdown,	  	Ucircumflex	]	};
+    key <AE09> {	[    ccedilla,	  9,		Ccedilla,	  	Aacute	]	};
+    key <AE10> {	[      agrave,	  0,		oslash,	  		Oslash	]	};
+    key <AE11> {	[  parenright,	  degree,	braceright,	  	bracketright	]	};
+    key <AE12> {	[	minus,	  underscore,	emdash,	  		endash	]	};
+    key <BKSP> {	[   BackSpace,    VoidSymbol,	Delete,	  		VoidSymbol	]	};
+
+    key	 <TAB> {	[	  Tab,	ISO_Left_Tab	]	};
+    key <AD01> {	[	    a,	A,		ae,			AE		]	};
+    key <AD02> {	[	    z,	Z,		Acircumflex,		Aring		]	};
+    key <AD03> {	[	    e,	E,		ecircumflex,		Ecircumflex	]	};
+    key <AD04> {	[	    r,	R,		registered,		currency	]	};
+    key <AD05> {	[	    t,	T,		dagger,			trademark	]	};
+    key <AD06> {	[	    y,	Y,		Uacute,  		Ydiaeresis	]	};
+    key <AD07> {	[	    u,	U,		masculine,		ordfeminine	]	};
+    key <AD08> {	[	    i,	I,		icircumflex,		idiaeresis	]	};
+    key <AD09> {	[	    o,	O,		oe,			OE		]	};
+    key <AD10> {	[	    p,	P,		Greek_pi,  		Greek_PI	]	};
+    key <AD11> {	[dead_circumflex,dead_diaeresis,ocircumflex, 		Ocircumflex	]	};
+    key <AD12> {	[      dollar,	asterisk,	EuroSign,  		yen   	        ]	};
+    key <CAPS> {	[	Caps_Lock		]	};
+    key <AC01> {	[	  q,	Q,		doubledagger,		Greek_OMEGA	]	};
+    key <AC02> {	[	  s,	S,		Ograve,			Greek_SIGMA	]	};
+    key <AC03> {	[         d,	D,		Greek_delta,		Greek_DELTA	]	};
+    key <AC04> {	[	  f,	F,		VoidSymbol,		periodcentered	]	};
+    key <AC05> {	[	  g,	G,		VoidSymbol,		VoidSymbol	]	}; // MISSING: ligature fi,fl
+    key <AC06> {	[	  h,	H,		Igrave,			Icircumflex	]	};
+    key <AC07> {	[	  j,	J,		Idiaeresis,		Iacute		]	};
+    key <AC08> {	[	  k,	K,		Egrave,			Ediaeresis	]	};
+    key <AC09> {	[	  l,	L,		notsign,		bar		]	};
+    key <AC10> {	[	  m,	M,		mu,			Oacute		]	};
+    key <AC11> {	[    ugrave,	percent,	Ugrave,			0x1002030	]	};
+    key <BKSL> {	[ dead_grave,	sterling,	at,			numbersign	]	};
+    key <RTRN> {	[    Return			]	};
+
+    key <LSGT> {	[	 less,	  greater,	lessthanequal,		greaterthanequal	]	};
+    key <AB01> {	[	  w,	W,		guilsinglleft,		guilsinglright	]	}; // MISSING: half-guillemot (single angle bracket)
+    key <AB02> {	[	  x,	X,		VoidSymbol,		VoidSymbol	]	}; // CHECK: similarequal; MISSING: extra-slanted slash
+    key <AB03> {	[	  c,	C,		copyright,		cent		]	};
+    key <AB04> {	[	  v,	V,		diamond,		radical		]	}; // CHECK diamond
+    key <AB05> {	[	  b,	B,		ssharp,    		integral	]	};
+    key <AB06> {	[	  n,	N,		dead_tilde,		asciitilde	]	};
+    key <AB07> {	[     comma,	question,	infinity,		questiondown	]	};
+    key <AB08> {	[ semicolon,	period,		ellipsis,		periodcentered	]	};
+    key <AB09> {	[     colon,	slash,		division,		backslash	]	};
+    key <AB10> {	[     equal,	plus,		notequal,		plusminus	]	};
+
+    key <SPCE> {	[     space,	space,		nobreakspace,		nobreakspace	]	};
+    // End alphanumeric section
+
+    include "level3(ralt_switch)"
+};
+
+
+
+xkb_symbols "nodeadkeys" {
+include "macintosh_vndr/fr(extended)"
+    name[Group1]= "France - Mac, eliminate dead keys";
+    
+    key <AE01> {	[   ampersand,	  1,	  	VoidSymbol,	  	acute	]	}; // MISSING: Apple
+    key <AD11> {	[asciicircum,diaeresis,ocircumflex, 		Ocircumflex	]	};
+    key <BKSL> {	[ grave,	sterling,	at,			numbersign	]	};
+
+    key <AB06> {	[	  n,	N,		asciitilde,		dead_tilde	]	};
+};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb
index 5343673c1..a6bc48e8c 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb
@@ -1,17 +1,17 @@
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple U.K. keyboard layout
-
-    include "latin"
-
-    name[Group1]= "United Kingdom - Mac";
-
-    key <AE02> {	[               2,              at,         EuroSign	]	};
-    key <AE03> {	[               3,        sterling,       numbersign	]	};
-
-    // End alphanumeric section
-    
-    include "level3(ralt_switch)"
-};
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a very simple U.K. keyboard layout
+
+    include "latin"
+
+    name[Group1]= "United Kingdom - Mac";
+
+    key <AE02> {	[               2,              at,         EuroSign	]	};
+    key <AE03> {	[               3,        sterling,       numbersign	]	};
+
+    // End alphanumeric section
+    
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/is b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/is
index d16d92f61..b9870ffe8 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/is
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/is
@@ -1,127 +1,127 @@
-//
-// This file describes the differences between a Macintosh US Extended
-// keymap and an Icelandic keyboard layout in the style of Mac OS and Mac OS X
-//
-// Copyright (C) 2004, 2006 Ævar Arnfjörð Bjarmason <avarab@gmail.com>
-//
-// Permission to use, copy, modify, distribute, and sell this software and its
-// documentation for any purpose is hereby granted without fee, provided that
-// the above copyright notice appear in all copies and that both that
-// copyright notice and this permission notice appear in supporting
-// documentation.
-//
-// 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 OPEN GROUP 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 a copyright holder shall
-// not be used in advertising or otherwise to promote the sale, use or
-// other dealings in this Software without prior written authorization of
-// the copyright holder.
-//
-// = HISTORY
-// * 2004-09-28:
-//   Initial cleanroom writing of the keymap, I just booted Mac OS X, opened
-//   TextEdit.app and wrote down what the value produced by each key was when I
-//   pressed it, a for a, A for shift + a, å for lalt + a etc and made the
-//   keymap from that information
-//
-// * 2006-01-14:
-//   Revised the comments in the file
-//
-// = NOTES
-// * 20 characters in this keymap have no named character defined in
-//   include/keysymdef.h and as a result their Unicode code points in
-//   hexadecimal are listed here, these can be generated with the following
-//   perl command:
-//     $ perl -CA -e 'printf "U%x\n", ord shift' Æ
-//   and converted back like:
-//     $ perl -CO -le '$_=shift;s/[^a-f0-9]//ig;print chr hex' Uc6
-// * The Apple logo appears twice on this keymap like the Mac OS and Mac OS X
-//   keymaps. In the MacRoman encoding it has the code point 0xF0 (240) but it
-//   has no assigned code point in Unicode, the code point Apple uses for it is
-//   U+F8FF (63743) which is in the BMP's Private Use Area (U+E000–U+F8FF)
-// * This keymap has only been tested on a PowerBook6,5 (iBook G4) but it
-//   should work on other Apple laptop models which use the same keyboard
-//   layout. It will probably work on standard sized keyboards with little or
-//   no modification but it might not support them fully, please report if
-//   you're able to get it running with such a keyboard
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-    name[Group1]= "Iceland - Mac";
-
-	//-- Row 5 (E) --//
-	key <TLDE> {	[	sterling,	section, 	UF8FF,		apostrophe	]	};
-	key <AE01> {	[	1,		exclam, 	exclamdown,	VoidSymbol	]	};
-	key <AE02> {	[	2,		quotedbl, 	at,		VoidSymbol	]	};
-	key <AE03> {	[	3,		numbersign, 	U2122,		sterling	]	};
-	key <AE04> {	[	4,		dollar, 	U00A2,		EuroSign	]	};
-	key <AE05> {	[	5,		percent, 	U2030,		infinity	]	};
-	key <AE06> {	[	6,		ampersand, 	asciicircum,	U2044		]	};
-	key <AE07> {	[	7,		slash, 	backslash,	U00F7		]	};
-	key <AE08> {	[	8,		parenleft, 	bracketleft,	braceleft	]	};
-	key <AE09> {	[	9,		parenright, 	bracketright,	braceright	]	};
-	key <AE10> {	[	0,		equal, 	U2260,		U2248		]	};
-	key <AE11> {	[	odiaeresis,	Odiaeresis, 	oslash,		Ooblique	]	};
-	key <AE12> {	[	minus,		underscore, 	endash,		emdash		]	};
-
-	
-	//-- Row 4 (D) --//
-	key <AD01> {	[	q,		Q, 	paragraph,	VoidSymbol	]	};
-	key <AD02> {	[	w,		W, 	U2211,		VoidSymbol	]	};
-	key <AD03> {	[	e,		E, 	dead_grave,	VoidSymbol	]	};
-	key <AD04> {	[	r,		R, 	registered,	VoidSymbol	]	};
-	key <AD05> {	[	t,		T, 	degree,		VoidSymbol	]	};
-	key <AD06> {	[	y,		Y, 	yen,		VoidSymbol	]	};
-	key <AD07> {	[	u,		U, 	dead_diaeresis,	VoidSymbol	]	};
-	key <AD08> {	[	i,		I, 	U0131,		U00AA		]	};
-	key <AD09> {	[	o,		O, 	dead_circumflex,U00BA		]	};
-	key <AD10> {	[	p,		P, 	Greek_pi,	Greek_PI	]	};
-	key <AD11> {	[	eth,		Eth, 	U201e,		U201c		]	};
-	key <AD12> {	[	apostrophe,	question, 	questiondown,	U00B7		]	};
-	
-	
-	//-- Row 3 (C) --//
-	key <AC01> {	[	a,		A, 	aring,		Aring		]	};
-	key <AC02> {	[	s,		S, 	ssharp,		abovedot	]	};
-	key <AC03> {	[	d,		D, 	U2202,		U2DA		]	};
-	key <AC04> {	[	f,		F, 	U192,		macron		]	};
-	key <AC05> {	[	g,		G, 	copyright,	breve		]	};
-	key <AC06> {	[	h,		H, 	bar,		VoidSymbol	]	};
-	key <AC07> {	[	j,		J, 	U2206,		U2dd		]	};
-	key <AC08> {	[	k,		K, 	U00AC,		VoidSymbol	]	};
-	key <AC09> {	[	l,		L, 	U2026,		caron		]	};
-	key <AC10> {	[	ae,		AE, 	oe,		OE		]	};
-	key <AC11> {	[	dead_acute,	dead_diaeresis, 	U201A,		U2018		]	};
-	key <BKSL> {	[	plus,		asterisk, 	U2022,		plusminus	]	};
-	
-	
-	//-- Row 2  (B) --//
-	key <LSGT> {	[	less,		greater, 	section,	UF8FF		]	};
-	key <AB01> {	[	z,		Z, 	U3A9,		VoidSymbol	]	};
-	key <AB02> {	[	x,		X, 	asciitilde,	VoidSymbol	]	};
-	key <AB03> {	[	c,		C, 	ccedilla,	Ccedilla	]	};
-	key <AB04> {	[	v,		V, 	U221A,		U25CA		]	};
-	key <AB05> {	[	b,		B, 	U222B,		VoidSymbol	]	};
-	key <AB06> {	[	n,		N, 	dead_tilde,	VoidSymbol	]	};
-	key <AB07> {	[	m,		M, 	U00B5,		VoidSymbol	]	};
-	key <AB08> {	[	comma,		semicolon, 	lessthanequal,	guillemotleft	]	};
-	key <AB09> {	[	period,		colon, 	greaterthanequal,guillemotright	]	};
-	key <AB10> {	[	thorn,		Thorn, 	U2019,		U201d		]	};
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-    include	"macintosh_vndr/is(basic)" // for consistent naming
-    name[Group1]= "Iceland - Mac, eliminate dead keys";
-};
+//
+// This file describes the differences between a Macintosh US Extended
+// keymap and an Icelandic keyboard layout in the style of Mac OS and Mac OS X
+//
+// Copyright (C) 2004, 2006 Ævar Arnfjörð Bjarmason <avarab@gmail.com>
+//
+// Permission to use, copy, modify, distribute, and sell this software and its
+// documentation for any purpose is hereby granted without fee, provided that
+// the above copyright notice appear in all copies and that both that
+// copyright notice and this permission notice appear in supporting
+// documentation.
+//
+// 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 OPEN GROUP 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 a copyright holder shall
+// not be used in advertising or otherwise to promote the sale, use or
+// other dealings in this Software without prior written authorization of
+// the copyright holder.
+//
+// = HISTORY
+// * 2004-09-28:
+//   Initial cleanroom writing of the keymap, I just booted Mac OS X, opened
+//   TextEdit.app and wrote down what the value produced by each key was when I
+//   pressed it, a for a, A for shift + a, å for lalt + a etc and made the
+//   keymap from that information
+//
+// * 2006-01-14:
+//   Revised the comments in the file
+//
+// = NOTES
+// * 20 characters in this keymap have no named character defined in
+//   include/keysymdef.h and as a result their Unicode code points in
+//   hexadecimal are listed here, these can be generated with the following
+//   perl command:
+//     $ perl -CA -e 'printf "U%x\n", ord shift' Æ
+//   and converted back like:
+//     $ perl -CO -le '$_=shift;s/[^a-f0-9]//ig;print chr hex' Uc6
+// * The Apple logo appears twice on this keymap like the Mac OS and Mac OS X
+//   keymaps. In the MacRoman encoding it has the code point 0xF0 (240) but it
+//   has no assigned code point in Unicode, the code point Apple uses for it is
+//   U+F8FF (63743) which is in the BMP's Private Use Area (U+E000–U+F8FF)
+// * This keymap has only been tested on a PowerBook6,5 (iBook G4) but it
+//   should work on other Apple laptop models which use the same keyboard
+//   layout. It will probably work on standard sized keyboards with little or
+//   no modification but it might not support them fully, please report if
+//   you're able to get it running with such a keyboard
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+    name[Group1]= "Iceland - Mac";
+
+	//-- Row 5 (E) --//
+	key <TLDE> {	[	sterling,	section, 	UF8FF,		apostrophe	]	};
+	key <AE01> {	[	1,		exclam, 	exclamdown,	VoidSymbol	]	};
+	key <AE02> {	[	2,		quotedbl, 	at,		VoidSymbol	]	};
+	key <AE03> {	[	3,		numbersign, 	U2122,		sterling	]	};
+	key <AE04> {	[	4,		dollar, 	U00A2,		EuroSign	]	};
+	key <AE05> {	[	5,		percent, 	U2030,		infinity	]	};
+	key <AE06> {	[	6,		ampersand, 	asciicircum,	U2044		]	};
+	key <AE07> {	[	7,		slash, 	backslash,	U00F7		]	};
+	key <AE08> {	[	8,		parenleft, 	bracketleft,	braceleft	]	};
+	key <AE09> {	[	9,		parenright, 	bracketright,	braceright	]	};
+	key <AE10> {	[	0,		equal, 	U2260,		U2248		]	};
+	key <AE11> {	[	odiaeresis,	Odiaeresis, 	oslash,		Ooblique	]	};
+	key <AE12> {	[	minus,		underscore, 	endash,		emdash		]	};
+
+	
+	//-- Row 4 (D) --//
+	key <AD01> {	[	q,		Q, 	paragraph,	VoidSymbol	]	};
+	key <AD02> {	[	w,		W, 	U2211,		VoidSymbol	]	};
+	key <AD03> {	[	e,		E, 	dead_grave,	VoidSymbol	]	};
+	key <AD04> {	[	r,		R, 	registered,	VoidSymbol	]	};
+	key <AD05> {	[	t,		T, 	degree,		VoidSymbol	]	};
+	key <AD06> {	[	y,		Y, 	yen,		VoidSymbol	]	};
+	key <AD07> {	[	u,		U, 	dead_diaeresis,	VoidSymbol	]	};
+	key <AD08> {	[	i,		I, 	U0131,		U00AA		]	};
+	key <AD09> {	[	o,		O, 	dead_circumflex,U00BA		]	};
+	key <AD10> {	[	p,		P, 	Greek_pi,	Greek_PI	]	};
+	key <AD11> {	[	eth,		Eth, 	U201e,		U201c		]	};
+	key <AD12> {	[	apostrophe,	question, 	questiondown,	U00B7		]	};
+	
+	
+	//-- Row 3 (C) --//
+	key <AC01> {	[	a,		A, 	aring,		Aring		]	};
+	key <AC02> {	[	s,		S, 	ssharp,		abovedot	]	};
+	key <AC03> {	[	d,		D, 	U2202,		U2DA		]	};
+	key <AC04> {	[	f,		F, 	U192,		macron		]	};
+	key <AC05> {	[	g,		G, 	copyright,	breve		]	};
+	key <AC06> {	[	h,		H, 	bar,		VoidSymbol	]	};
+	key <AC07> {	[	j,		J, 	U2206,		U2dd		]	};
+	key <AC08> {	[	k,		K, 	U00AC,		VoidSymbol	]	};
+	key <AC09> {	[	l,		L, 	U2026,		caron		]	};
+	key <AC10> {	[	ae,		AE, 	oe,		OE		]	};
+	key <AC11> {	[	dead_acute,	dead_diaeresis, 	U201A,		U2018		]	};
+	key <BKSL> {	[	plus,		asterisk, 	U2022,		plusminus	]	};
+	
+	
+	//-- Row 2  (B) --//
+	key <LSGT> {	[	less,		greater, 	section,	UF8FF		]	};
+	key <AB01> {	[	z,		Z, 	U3A9,		VoidSymbol	]	};
+	key <AB02> {	[	x,		X, 	asciitilde,	VoidSymbol	]	};
+	key <AB03> {	[	c,		C, 	ccedilla,	Ccedilla	]	};
+	key <AB04> {	[	v,		V, 	U221A,		U25CA		]	};
+	key <AB05> {	[	b,		B, 	U222B,		VoidSymbol	]	};
+	key <AB06> {	[	n,		N, 	dead_tilde,	VoidSymbol	]	};
+	key <AB07> {	[	m,		M, 	U00B5,		VoidSymbol	]	};
+	key <AB08> {	[	comma,		semicolon, 	lessthanequal,	guillemotleft	]	};
+	key <AB09> {	[	period,		colon, 	greaterthanequal,guillemotright	]	};
+	key <AB10> {	[	thorn,		Thorn, 	U2019,		U201d		]	};
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+    include	"macintosh_vndr/is(basic)" // for consistent naming
+    name[Group1]= "Iceland - Mac, eliminate dead keys";
+};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it
index 889653f8e..2438231cd 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it
@@ -1,62 +1,62 @@
-xkb_symbols "extended" {
-
-    name[Group1]= "Italy - Mac";
-
-    // Alphanumeric section
-    key <LSGT> {	[        less,  greater   	]	};
-    key <TLDE> {        [        at,    numbersign,    periodcentered              ]	};
-    key <AE01> {	[   ampersand,    1, guillemotleft,guillemotright	]	};
-    key <AE02> {	[    quotedbl,    2 		]	};
-    key <AE03> {	[  apostrophe,    3         	]	};
-    key <AE04> {	[   parenleft,    4,    braceleft,    bracketleft	]	};
-    key <AE05> {	[    ccedilla,    5,     Ccedilla,    Iacute	]	};
-    key <AE06> {	[      egrave,    6,    paragraph,    periodcentered]	};
-    key <AE07> {	[  parenright,    7,   braceright,	  bracketright	]	};
-    key <AE08> {	[    sterling,    8,   infinity			]	};
-    key <AE09> {	[      agrave,    9,        acute,    Ocircumflex	]	};
-    key <AE10> {	[      eacute,    0,        grave,    Oacute	]	};
-    key <AE11> {	[       minus,    underscore	]	};
-    key <AE12> {	[       equal, 	  plus,     notequal,    plusminus	]	};
-
-    key <AD01> {	[           q,  Q 		]	};
-    key <AD02> {	[	    z,  Z		]	};
-    key <AD03> {	[	    e,  E,     EuroSign		]	};
-    key <AD04> {	[	    r,  R,   registered			] 	};
-    key <AD05> {	[	    t,  T		]	};
-    key <AD06> {	[	    y,  Y,       Uacute,	ydiaeresis      ] 	};
-    key <AD07> {	[	    u,  U		]	};
-    key <AD08> {	[	    i,  I,  icircumflex,	idiaeresis      ] 	};
-    key <AD09> {	[	    o,  O		]	};
-    key <AD10> {	[	    p,  P		]	};
-    key <AD11> {	[      igrave,  asciicircum     ]	};
-    key <AD12> {	[      dollar,	asterisk        ]	};
-    key <BKSL> {	[     section,  degree,           at,  numbersign      ]	};
-
-    key <AC01> {	[	  a,	A,      aring,   Aring		] 	};
-    key <AC02> {	[	  s,	S,     ssharp			]	};
-    key <AC03> {	[	  d,	D		]	};
-    key <AC04> {	[	  f,	F		]	};
-    key <AC05> {	[	  g,	G		]	};
-    key <AC06> {	[	  h,	H,     Igrave,    Icircumflex     ]	};
-    key <AC07> {	[	  j,	J,  Idiaeresis,   Iacute          ]	};
-    key <AC08> {	[	  k,	K,     Egrave,    Ediaeresis      ]	};
-    key <AC09> {	[	  l,	L,     ssharp,    bar		]	};
-    key <AC10> {	[         m,	M,         mu,    Oacute		]	};
-    key <AC11> {	[    ugrave,	percent,         ae,    AE		]	};
-
-    key <AB01> {	[	  w,	W 		]	};
-    key <AB02> {	[	  x,	X		]	};
-    key <AB03> {	[	  c,	C,  copyright,    copyright	]	};
-    key <AB04> {	[	  v,	V		]	};
-    key <AB05> {	[	  b,	B		]	};
-    key <AB06> {	[	  n,	N,  dead_tilde                    ]       };
-    key <AB07> {	[     comma,	question,          questiondown		]	};
-    key <AB08> {	[ semicolon,	period          ]	};
-    key <AB09> {	[     colon,	slash,        bar,    backslash	]	};
-    key <AB10> {	[    ograve,	exclam,     exclamdown			]	};
-
-    // End alphanumeric section
-
-    include "kpdl(dot)"
-    include "level3(ralt_switch)"
-};
+xkb_symbols "extended" {
+
+    name[Group1]= "Italy - Mac";
+
+    // Alphanumeric section
+    key <LSGT> {	[        less,  greater   	]	};
+    key <TLDE> {        [        at,    numbersign,    periodcentered              ]	};
+    key <AE01> {	[   ampersand,    1, guillemotleft,guillemotright	]	};
+    key <AE02> {	[    quotedbl,    2 		]	};
+    key <AE03> {	[  apostrophe,    3         	]	};
+    key <AE04> {	[   parenleft,    4,    braceleft,    bracketleft	]	};
+    key <AE05> {	[    ccedilla,    5,     Ccedilla,    Iacute	]	};
+    key <AE06> {	[      egrave,    6,    paragraph,    periodcentered]	};
+    key <AE07> {	[  parenright,    7,   braceright,	  bracketright	]	};
+    key <AE08> {	[    sterling,    8,   infinity			]	};
+    key <AE09> {	[      agrave,    9,        acute,    Ocircumflex	]	};
+    key <AE10> {	[      eacute,    0,        grave,    Oacute	]	};
+    key <AE11> {	[       minus,    underscore	]	};
+    key <AE12> {	[       equal, 	  plus,     notequal,    plusminus	]	};
+
+    key <AD01> {	[           q,  Q 		]	};
+    key <AD02> {	[	    z,  Z		]	};
+    key <AD03> {	[	    e,  E,     EuroSign		]	};
+    key <AD04> {	[	    r,  R,   registered			] 	};
+    key <AD05> {	[	    t,  T		]	};
+    key <AD06> {	[	    y,  Y,       Uacute,	ydiaeresis      ] 	};
+    key <AD07> {	[	    u,  U		]	};
+    key <AD08> {	[	    i,  I,  icircumflex,	idiaeresis      ] 	};
+    key <AD09> {	[	    o,  O		]	};
+    key <AD10> {	[	    p,  P		]	};
+    key <AD11> {	[      igrave,  asciicircum     ]	};
+    key <AD12> {	[      dollar,	asterisk        ]	};
+    key <BKSL> {	[     section,  degree,           at,  numbersign      ]	};
+
+    key <AC01> {	[	  a,	A,      aring,   Aring		] 	};
+    key <AC02> {	[	  s,	S,     ssharp			]	};
+    key <AC03> {	[	  d,	D		]	};
+    key <AC04> {	[	  f,	F		]	};
+    key <AC05> {	[	  g,	G		]	};
+    key <AC06> {	[	  h,	H,     Igrave,    Icircumflex     ]	};
+    key <AC07> {	[	  j,	J,  Idiaeresis,   Iacute          ]	};
+    key <AC08> {	[	  k,	K,     Egrave,    Ediaeresis      ]	};
+    key <AC09> {	[	  l,	L,     ssharp,    bar		]	};
+    key <AC10> {	[         m,	M,         mu,    Oacute		]	};
+    key <AC11> {	[    ugrave,	percent,         ae,    AE		]	};
+
+    key <AB01> {	[	  w,	W 		]	};
+    key <AB02> {	[	  x,	X		]	};
+    key <AB03> {	[	  c,	C,  copyright,    copyright	]	};
+    key <AB04> {	[	  v,	V		]	};
+    key <AB05> {	[	  b,	B		]	};
+    key <AB06> {	[	  n,	N,  dead_tilde                    ]       };
+    key <AB07> {	[     comma,	question,          questiondown		]	};
+    key <AB08> {	[ semicolon,	period          ]	};
+    key <AB09> {	[     colon,	slash,        bar,    backslash	]	};
+    key <AB10> {	[    ograve,	exclam,     exclamdown			]	};
+
+    // End alphanumeric section
+
+    include "kpdl(dot)"
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam
index a588ab27c..dcb9db624 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam
@@ -1,37 +1,37 @@
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple mac_US
-    // keyboard and a very simple Spanish keybaord
-
-    include "latin"
-    name[Group1]= "Latin American - Mac";
-
-    key <TLDE> {	[     bracketleft,    bracketright,        braceleft,      braceright	]	};
-    key <LSGT> {	[            less,         greater,      bracketleft,       braceleft	]	};
-    key <AE01> {	[               1,      exclamdown 	]	};
-    key <AE02> {	[               2,          exclam,               at,       oneeighth	]	};
-    key <AE03> {	[               3,      numbersign,    guillemotleft,  guillemotright	]	};
-    key <AE04> {	[               4,          dollar,              yen,     Icircumflex	]	};
-    key <AE05> {	[               5,         percent	]	};
-    key <AE06> {	[               6,           slash,        backslash,      Idiaeresis	]	};
-    key <AE07> {	[               7,       ampersand,              bar,          Iacute	]	};
-    key <AE08> {	[               8,        asterisk,           degree	]	};
-    key <AE09> {	[               9,       parenleft,         sterling,     Ocircumflex	]	};
-    key <AE10> {	[               0,      parenright     	]	};
-    key <AE11> {	[           minus,      underscore	]	};
-    key <AE12> {	[           equal,            plus,        plusminus	]	};
-    key <AD11> {	[      dead_grave,          degree 	]	};
-    key <AD12> {	[      dead_acute,  dead_diaeresis,              bar	]	};
-
-    key <AB08> {	[           comma,    questiondown   	]	};
-    key <AB09> {	[          period,        question     	]	};
-    key <AB10> {	[        ccedilla,        Ccedilla     	]	};
-    key	<AC10> {	[	   ntilde,          Ntilde,       asciitilde, dead_doubleacute	]	};
-    key <AC11> {	[       semicolon,    	     colon 	]	};
-    key <BKSL> {	[      apostrophe,        quotedbl	]	};
-
-    // End alphanumeric section
-
-    include "level3(ralt_switch)"
-};
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple mac_US
+    // keyboard and a very simple Spanish keybaord
+
+    include "latin"
+    name[Group1]= "Latin American - Mac";
+
+    key <TLDE> {	[     bracketleft,    bracketright,        braceleft,      braceright	]	};
+    key <LSGT> {	[            less,         greater,      bracketleft,       braceleft	]	};
+    key <AE01> {	[               1,      exclamdown 	]	};
+    key <AE02> {	[               2,          exclam,               at,       oneeighth	]	};
+    key <AE03> {	[               3,      numbersign,    guillemotleft,  guillemotright	]	};
+    key <AE04> {	[               4,          dollar,              yen,     Icircumflex	]	};
+    key <AE05> {	[               5,         percent	]	};
+    key <AE06> {	[               6,           slash,        backslash,      Idiaeresis	]	};
+    key <AE07> {	[               7,       ampersand,              bar,          Iacute	]	};
+    key <AE08> {	[               8,        asterisk,           degree	]	};
+    key <AE09> {	[               9,       parenleft,         sterling,     Ocircumflex	]	};
+    key <AE10> {	[               0,      parenright     	]	};
+    key <AE11> {	[           minus,      underscore	]	};
+    key <AE12> {	[           equal,            plus,        plusminus	]	};
+    key <AD11> {	[      dead_grave,          degree 	]	};
+    key <AD12> {	[      dead_acute,  dead_diaeresis,              bar	]	};
+
+    key <AB08> {	[           comma,    questiondown   	]	};
+    key <AB09> {	[          period,        question     	]	};
+    key <AB10> {	[        ccedilla,        Ccedilla     	]	};
+    key	<AC10> {	[	   ntilde,          Ntilde,       asciitilde, dead_doubleacute	]	};
+    key <AC11> {	[       semicolon,    	     colon 	]	};
+    key <BKSL> {	[      apostrophe,        quotedbl	]	};
+
+    // End alphanumeric section
+
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl
index 05034701e..5eb66c444 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl
@@ -1,15 +1,15 @@
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple mac_US
-    // keyboard and a very simple netherland keybaord
-
-    include "latin"
-
-    name[Group1]= "Netherlands - Mac";
-
-    include "level3(ralt_switch)"
-
-// do just nothing
-
-};
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple mac_US
+    // keyboard and a very simple netherland keybaord
+
+    include "latin"
+
+    name[Group1]= "Netherlands - Mac";
+
+    include "level3(ralt_switch)"
+
+// do just nothing
+
+};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no
index 442aee9af..fb0cb74a2 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no
@@ -1,50 +1,50 @@
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Norwegian keybaord
-
-    include "latin"
-
-    name[Group1]= "Norway - Mac";
-
-    key <TLDE> {	[             bar,         section      ]	};
-    key <AE02> {	[               2,        quotedbl, 	       at,	 oneeighth	]	};
-    key <AE04> {	[	        4,        currency, 	   dollar,	    dollar	]	};
-    key <AE03> {	[               3,	numbersign,         sterling,        sterling	]	};
-    key <AE06> {	[               6,       ampersand     	]	};
-    key <AE07> {	[               7,           slash, 	      bar,       backslash	]  	};
-    key <AE08> {	[               8,       parenleft,      bracketleft,	 braceleft	]	};
-    key <AE09> {	[               9,      parenright,     bracketright,      braceright	]	};
-    key <AE10> {	[               0,           equal     	]	};
-
-    key <AB08> {	[           comma,       semicolon     	]	};
-    key <AB09> {	[          period,           colon     	]	};
-    key <AB10> {	[           minus,      underscore     	]	};
-    key	<AC10> {	[	   oslash,        Ooblique,       odiaeresis,     Odiaeresis	]	};
-    key <AE11> {	[            plus,        question      ]	};
-    key <AC11> {	[              ae,              AE 	]	};
-    key <AD11> {	[	    aring,           Aring     	]	};
-    key <AE12> {	[      dead_grave,      dead_acute, 	    acute,     dead_ogonek 	]	};
-    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,     dead_macron     	]      	};
-    key <BKSL> {	[              at,        asterisk	]	};
-    key <LSGT> {	[            less,         greater	]	};
-
-    // End alphanumeric section
-
-    include "eurosign(e)"
-    include "level3(ralt_switch)"
-};
-
-
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-
-    // Modifies the basic Norwegian layout to eliminate dead keys
-    include "macintosh_vndr/no(basic)"
-    name[Group1]= "Norway - Mac, eliminate dead keys";
-
-    key <AE12> {	[           grave,           acute, 	    acute,          ogonek 	]	};
-    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,          macron     	]      	};
-
-};
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a very simple Norwegian keybaord
+
+    include "latin"
+
+    name[Group1]= "Norway - Mac";
+
+    key <TLDE> {	[             bar,         section      ]	};
+    key <AE02> {	[               2,        quotedbl, 	       at,	 oneeighth	]	};
+    key <AE04> {	[	        4,        currency, 	   dollar,	    dollar	]	};
+    key <AE03> {	[               3,	numbersign,         sterling,        sterling	]	};
+    key <AE06> {	[               6,       ampersand     	]	};
+    key <AE07> {	[               7,           slash, 	      bar,       backslash	]  	};
+    key <AE08> {	[               8,       parenleft,      bracketleft,	 braceleft	]	};
+    key <AE09> {	[               9,      parenright,     bracketright,      braceright	]	};
+    key <AE10> {	[               0,           equal     	]	};
+
+    key <AB08> {	[           comma,       semicolon     	]	};
+    key <AB09> {	[          period,           colon     	]	};
+    key <AB10> {	[           minus,      underscore     	]	};
+    key	<AC10> {	[	   oslash,        Ooblique,       odiaeresis,     Odiaeresis	]	};
+    key <AE11> {	[            plus,        question      ]	};
+    key <AC11> {	[              ae,              AE 	]	};
+    key <AD11> {	[	    aring,           Aring     	]	};
+    key <AE12> {	[      dead_grave,      dead_acute, 	    acute,     dead_ogonek 	]	};
+    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,     dead_macron     	]      	};
+    key <BKSL> {	[              at,        asterisk	]	};
+    key <LSGT> {	[            less,         greater	]	};
+
+    // End alphanumeric section
+
+    include "eurosign(e)"
+    include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+
+    // Modifies the basic Norwegian layout to eliminate dead keys
+    include "macintosh_vndr/no(basic)"
+    name[Group1]= "Norway - Mac, eliminate dead keys";
+
+    key <AE12> {	[           grave,           acute, 	    acute,          ogonek 	]	};
+    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,          macron     	]      	};
+
+};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt
index 8c3b7173c..01ac86d85 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt
@@ -1,61 +1,61 @@
-// mac version from Ricardo Cabral <bfe00991@mail.telepac.pt>
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Portuguese keybaord
-
-    include "latin"
-
-    name[Group1]= "Portugal - Mac";
-
-    key <LSGT> {	[	     less,	   greater, 	      bar,       brokenbar	]	};
-    key <AE02> {	[               2,	  quotedbl, 	       at,       oneeighth	]	};
-    key <AE04> {	[               4,	    dollar,          section,          dollar	]	};
-    key <AE03> {	[               3,	numbersign,         sterling,        sterling     	]	};
-    key <AE06> {	[               6,       ampersand     	]	};
-    key <AE07> {	[               7,           slash     	]	};
-    key <AE08> {	[               8,       parenleft,      bracketleft,       braceleft     	]	};
-    key <AE09> {	[               9,      parenright,     bracketright,      braceright     	]	};
-    key <AE10> {	[               0,           equal      ]	};
-    key <AE11> {	[      apostrophe,        question      ]	};
-    key <AE12> {	[	     plus,        asterisk,             dead_diaeresis             ]	};
-    key <AB08> {	[           comma,       semicolon     	]	};
-    key <AB09> {	[          period,           colon      ]	};
-    key <AB10> {	[           minus,      underscore      ]	};
-    key <AC10> {	[        ccedilla,        Ccedilla      ]	};
-    key <AC11> {	[      dead_tilde, dead_circumflex	]	};
-    key <AC12> {	[       backslash,	       bar     	]	};
-    key <AD11> {	[       masculine,     ordfeminine      ]	};
-    key <AD12> {	[      dead_acute,      dead_grave 	]	};
-    // End alphanumeric section
-
-    include "eurosign(e)"
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "Sundeadkeys" {
-    include "macintosh_vndr/pt(basic)" // for consistent naming
-    name[Group1]= "Portugal - Mac, Sun dead keys";
-    
-    key <AE12> {	[	     plus,        asterisk,  SunFA_Diaeresis, SunFA_Diaeresis      ]	};
-    key <AC11> {	[     SunFA_Tilde,    SunFA_Circum	]	};
-    key <AD12> {	[     SunFA_Acute,     SunFA_Grave 	]	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sundeadkeys" {
-    include "macintosh_vndr/pt(Sundeadkeys)" // for consistent naming
-};
-
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-    include "macintosh_vndr/pt(basic)" // for consistent naming
-    name[Group1]= "Portugal - Mac, eliminate dead keys";
-
-    key <AE12> {	[	     plus,        asterisk, 	 quotedbl,        quotedbl      ]	};
-    key <AC11> {	[      asciitilde,     asciicircum	]	};
-    key <AD12> {	[	    acute,           grave 	]	};
-};
+// mac version from Ricardo Cabral <bfe00991@mail.telepac.pt>
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a very simple Portuguese keybaord
+
+    include "latin"
+
+    name[Group1]= "Portugal - Mac";
+
+    key <LSGT> {	[	     less,	   greater, 	      bar,       brokenbar	]	};
+    key <AE02> {	[               2,	  quotedbl, 	       at,       oneeighth	]	};
+    key <AE04> {	[               4,	    dollar,          section,          dollar	]	};
+    key <AE03> {	[               3,	numbersign,         sterling,        sterling     	]	};
+    key <AE06> {	[               6,       ampersand     	]	};
+    key <AE07> {	[               7,           slash     	]	};
+    key <AE08> {	[               8,       parenleft,      bracketleft,       braceleft     	]	};
+    key <AE09> {	[               9,      parenright,     bracketright,      braceright     	]	};
+    key <AE10> {	[               0,           equal      ]	};
+    key <AE11> {	[      apostrophe,        question      ]	};
+    key <AE12> {	[	     plus,        asterisk,             dead_diaeresis             ]	};
+    key <AB08> {	[           comma,       semicolon     	]	};
+    key <AB09> {	[          period,           colon      ]	};
+    key <AB10> {	[           minus,      underscore      ]	};
+    key <AC10> {	[        ccedilla,        Ccedilla      ]	};
+    key <AC11> {	[      dead_tilde, dead_circumflex	]	};
+    key <AC12> {	[       backslash,	       bar     	]	};
+    key <AD11> {	[       masculine,     ordfeminine      ]	};
+    key <AD12> {	[      dead_acute,      dead_grave 	]	};
+    // End alphanumeric section
+
+    include "eurosign(e)"
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "Sundeadkeys" {
+    include "macintosh_vndr/pt(basic)" // for consistent naming
+    name[Group1]= "Portugal - Mac, Sun dead keys";
+    
+    key <AE12> {	[	     plus,        asterisk,  SunFA_Diaeresis, SunFA_Diaeresis      ]	};
+    key <AC11> {	[     SunFA_Tilde,    SunFA_Circum	]	};
+    key <AD12> {	[     SunFA_Acute,     SunFA_Grave 	]	};
+};
+
+partial alphanumeric_keys 
+xkb_symbols "sundeadkeys" {
+    include "macintosh_vndr/pt(Sundeadkeys)" // for consistent naming
+};
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+    include "macintosh_vndr/pt(basic)" // for consistent naming
+    name[Group1]= "Portugal - Mac, eliminate dead keys";
+
+    key <AE12> {	[	     plus,        asterisk, 	 quotedbl,        quotedbl      ]	};
+    key <AC11> {	[      asciitilde,     asciicircum	]	};
+    key <AD12> {	[	    acute,           grave 	]	};
+};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se
index 56d77bd0f..d2d05f248 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se
@@ -1,44 +1,44 @@
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Swedish(Sweden) keybaord
-
-    include "latin"
-
-    name[Group1]= "Sweden - Mac";
-
-    key <TLDE> {	[         section,         degree	]	};
-
-    key <AE01> {	[               1,          exclam,        copyright,      exclamdown	]	};
-    key <AE02> {	[               2,        quotedbl, 	       at,	 oneeighth	]	};
-    key <AE03> {	[               3,      numbersign,         sterling,             yen	]	};
-    key <AE04> {	[               4,        currency, 	   dollar,	      cent	]	};
-    key <AE06> {	[               6,       ampersand     	]	};
-    key <AE07> {	[               7,           slash, 	      bar,       backslash	]	};
-    key <AE08> {	[               8,       parenleft,      bracketleft,       braceleft	]	};
-    key <AE09> {	[               9,      parenright,     bracketright,      braceright	]	};
-    key <AB08> {	[           comma,       semicolon     	]	};
-    key <AE10> {	[               0,           equal     	]	};
-    key <AB09> {	[          period,           colon     	]	};
-    key <AB10> {	[           minus,      underscore     	]	};
-    key	<AC10> {	[      odiaeresis,      Odiaeresis, 	   oslash,	    Ooblique	]	};
-    key <AE11> {	[            plus,        question      ]	};
-    key <AC11> {	[      adiaeresis,      Adiaeresis,               ae,		AE	]	};
-    key <AD11> {	[	    aring,           Aring     	]	};
-    key <AE12> {	[           acute,           grave	]	};
-    key <AD12> {	[       diaeresis,     asciicircum, 	asciitilde			]	};
-    key <BKSL> {	[      apostrophe,        asterisk,               at			]	};
-    key <LSGT> {        [            less,         greater,              bar,       brokenbar      ]       };
-
-    include "kpdl(comma)"
-    include "eurosign(e)"
-    include "level3(ralt_switch)"
-};
-
-
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-    include "macintosh_vndr/se(basic)" // for consistent naming
-    name[Group1]= "Sweden - Mac, eliminate dead keys";
-};
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a very simple Swedish(Sweden) keybaord
+
+    include "latin"
+
+    name[Group1]= "Sweden - Mac";
+
+    key <TLDE> {	[         section,         degree	]	};
+
+    key <AE01> {	[               1,          exclam,        copyright,      exclamdown	]	};
+    key <AE02> {	[               2,        quotedbl, 	       at,	 oneeighth	]	};
+    key <AE03> {	[               3,      numbersign,         sterling,             yen	]	};
+    key <AE04> {	[               4,        currency, 	   dollar,	      cent	]	};
+    key <AE06> {	[               6,       ampersand     	]	};
+    key <AE07> {	[               7,           slash, 	      bar,       backslash	]	};
+    key <AE08> {	[               8,       parenleft,      bracketleft,       braceleft	]	};
+    key <AE09> {	[               9,      parenright,     bracketright,      braceright	]	};
+    key <AB08> {	[           comma,       semicolon     	]	};
+    key <AE10> {	[               0,           equal     	]	};
+    key <AB09> {	[          period,           colon     	]	};
+    key <AB10> {	[           minus,      underscore     	]	};
+    key	<AC10> {	[      odiaeresis,      Odiaeresis, 	   oslash,	    Ooblique	]	};
+    key <AE11> {	[            plus,        question      ]	};
+    key <AC11> {	[      adiaeresis,      Adiaeresis,               ae,		AE	]	};
+    key <AD11> {	[	    aring,           Aring     	]	};
+    key <AE12> {	[           acute,           grave	]	};
+    key <AD12> {	[       diaeresis,     asciicircum, 	asciitilde			]	};
+    key <BKSL> {	[      apostrophe,        asterisk,               at			]	};
+    key <LSGT> {        [            less,         greater,              bar,       brokenbar      ]       };
+
+    include "kpdl(comma)"
+    include "eurosign(e)"
+    include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+    include "macintosh_vndr/se(basic)" // for consistent naming
+    name[Group1]= "Sweden - Mac, eliminate dead keys";
+};
diff --git a/xorg-server/xkeyboard-config/symbols/mao b/xorg-server/xkeyboard-config/symbols/mao
index b62994b2c..ce1b2ea3c 100644
--- a/xorg-server/xkeyboard-config/symbols/mao
+++ b/xorg-server/xkeyboard-config/symbols/mao
@@ -1,21 +1,21 @@
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
-    // Adds the macrons needed for the Maori language to
-    // a simple us keyboard layout.
-
-    include "latin"
-
-    name[Group1]="Maori";
-
-    key <AC01>  { [ a,   A,  amacron, Amacron ] };
-    key <AD03>  { [ e,   E,  emacron, Emacron ] };
-    key <AD08>  { [ i,   I,  imacron, Imacron ] };
-
-    key <AD09>  { [ o,   O,  omacron, Omacron ] };
-    key <AD07>  { [ u,   U,  umacron, Umacron ] };
-
-    key <RALT>  { type[Group1]="TWO_LEVEL",
-                  [ ISO_Level3_Shift, Multi_key ]   };
-    modifier_map Mod5   { <RALT> };
-};
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    // Adds the macrons needed for the Maori language to
+    // a simple us keyboard layout.
+
+    include "latin"
+
+    name[Group1]="Maori";
+
+    key <AC01>  { [ a,   A,  amacron, Amacron ] };
+    key <AD03>  { [ e,   E,  emacron, Emacron ] };
+    key <AD08>  { [ i,   I,  imacron, Imacron ] };
+
+    key <AD09>  { [ o,   O,  omacron, Omacron ] };
+    key <AD07>  { [ u,   U,  umacron, Umacron ] };
+
+    key <RALT>  { type[Group1]="TWO_LEVEL",
+                  [ ISO_Level3_Shift, Multi_key ]   };
+    modifier_map Mod5   { <RALT> };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/nec_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/nec_vndr/Makefile.am
index ff070065a..ac1de6ec9 100644
--- a/xorg-server/xkeyboard-config/symbols/nec_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/nec_vndr/Makefile.am
@@ -1,4 +1,4 @@
-symbolsdir = $(xkb_base)/symbols/nec_vndr
-
-dist_symbols_DATA = \
-jp
+symbolsdir = $(xkb_base)/symbols/nec_vndr
+
+dist_symbols_DATA = \
+jp
diff --git a/xorg-server/xkeyboard-config/symbols/nec_vndr/jp b/xorg-server/xkeyboard-config/symbols/nec_vndr/jp
index 10477a43c..29b279c9f 100644
--- a/xorg-server/xkeyboard-config/symbols/nec_vndr/jp
+++ b/xorg-server/xkeyboard-config/symbols/nec_vndr/jp
@@ -1,163 +1,163 @@
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//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 OPEN GROUP 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 Open Group 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 Open Group.
-//
-// symbols for a NEC PC98 keyboard
-default xkb_symbols "pc98" {
-
-    key <ESC>  { [ Escape		]	};
-
-    // Alphanumeric section
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
-    key <AE10> { [ 0 			], [ kana_WA, kana_WO	]	};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	quoteleft ], [ kana_HE		]	};
-    key <BKSL> { [ backslash, bar 	], [ prolongedsound	]	};
-    key <BKSP> { [ BackSpace		]	};
-
-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U			], [ kana_NA		]	};
-    key <AD08> { [ i, I			], [ kana_NI		]	};
-    key <AD09> { [ o, O			], [ kana_RA		]	};
-    key <AD10> { [ p, P			], [ kana_SE		]	};
-    key <AD11> { [ at, asciitilde	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-    key <RTRN> { [ Return		]	};
-
-    key <LCTL> { [ Control_L		]	};
-    key <CAPS> { [ Caps_Lock		]	};
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J			], [ kana_MA		]	};
-    key <AC08> { [ k, K			], [ kana_NO		]	};
-    key <AC09> { [ l, L			], [ kana_RI		]	};
-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <AC12> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
-
-    key <LFSH> { [ Shift_L		]	};
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		]	};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_middledot ]	};
-    key <AB11> { [ NoSymbol, underscore	], [ kana_RO		]	};
-//    key <RTSH> { [ Shift_R		]	};
-
-    key <ALGR> { [ Mode_switch		]	};
-    key <LALT> { [ Alt_L		]	};
-    key <NFER> { [ Muhenkan		]	};
-    key <SPCE> { [ space		]	};
-    key <XFER> { [ Henkan, Kanji	]	};
-
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <BRK>  { [ Break		]	};
-    key <PRSC> { [ Print		]	};
-    key <FK01> { [ F1			]	};
-    key <FK02> { [ F2			]	};
-    key <FK03> { [ F3			]	};
-    key <FK04> { [ F4			]	};
-    key <FK05> { [ F5			]	};
-    key <FK06> { [ F6			]	};
-    key <FK07> { [ F7			]	};
-    key <FK08> { [ F8			]	};
-    key <FK09> { [ F9			]	};
-    key <FK10> { [ F10			]	};
-    key <FK11> { [ F11			]	};
-    key <FK12> { [ F12			]	};
-    key <FK13> { [ F13			]	};
-    key <FK14> { [ F14			]	};
-    key <FK15> { [ F15			]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <INS>  { [ Insert		]	};
-    key <DELE> { [ Delete		]	};
-    key <PGUP> { [ Prior		]	};
-    key <PGDN> { [ Next			]	};
-    key <UP>   { [ Up			]	};
-    key <LEFT> { [ Left			]	};
-    key <RGHT> { [ Right		]	};
-    key <DOWN> { [ Down			]	};
-    // End "Editing" section
-
-    // Begin "Keypad" section
-    key <HOME> { [ Clear, Home		]	 };
-    key <HELP> { [ Help			]	};
-    key <KPSU> { [ KP_Subtract		]	};
-    key <KPDV> { [ KP_Divide		]	};
-
-    key  <KP7> { [ KP_7			]	};
-    key  <KP8> { [ KP_8			]	};
-    key  <KP9> { [ KP_9			]	};
-    key <KPMU> { [ KP_Multiply		]	};
-
-    key  <KP4> { [ KP_4			]	};
-    key  <KP5> { [ KP_5			]	};
-    key  <KP6> { [ KP_6			]	};
-    key <KPAD> { [ KP_Add		]	};
-
-    key  <KP1> { [ KP_1			]	};
-    key  <KP2> { [ KP_2			]	};
-    key  <KP3> { [ KP_3			]	};
-    key <KPEQ> { [ KP_Equal 		]	};
-
-    key  <KP0> { [ KP_0			]	};
-    key <KPSP> { [ KP_Separator		]	};
-    key <KPDC> { [ KP_Decimal		]	};
-//    key <KPEN> { [ KP_Enter		]	}; 
-    // End "Keypad" section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod1   { Alt_L };
-    modifier_map Mod2   { Mode_switch };
-};
+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//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 OPEN GROUP 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 Open Group 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 Open Group.
+//
+// symbols for a NEC PC98 keyboard
+default xkb_symbols "pc98" {
+
+    key <ESC>  { [ Escape		]	};
+
+    // Alphanumeric section
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0 			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	quoteleft ], [ kana_HE		]	};
+    key <BKSL> { [ backslash, bar 	], [ prolongedsound	]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, asciitilde	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return		]	};
+
+    key <LCTL> { [ Control_L		]	};
+    key <CAPS> { [ Caps_Lock		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <AC12> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <LFSH> { [ Shift_L		]	};
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_middledot ]	};
+    key <AB11> { [ NoSymbol, underscore	], [ kana_RO		]	};
+//    key <RTSH> { [ Shift_R		]	};
+
+    key <ALGR> { [ Mode_switch		]	};
+    key <LALT> { [ Alt_L		]	};
+    key <NFER> { [ Muhenkan		]	};
+    key <SPCE> { [ space		]	};
+    key <XFER> { [ Henkan, Kanji	]	};
+
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <BRK>  { [ Break		]	};
+    key <PRSC> { [ Print		]	};
+    key <FK01> { [ F1			]	};
+    key <FK02> { [ F2			]	};
+    key <FK03> { [ F3			]	};
+    key <FK04> { [ F4			]	};
+    key <FK05> { [ F5			]	};
+    key <FK06> { [ F6			]	};
+    key <FK07> { [ F7			]	};
+    key <FK08> { [ F8			]	};
+    key <FK09> { [ F9			]	};
+    key <FK10> { [ F10			]	};
+    key <FK11> { [ F11			]	};
+    key <FK12> { [ F12			]	};
+    key <FK13> { [ F13			]	};
+    key <FK14> { [ F14			]	};
+    key <FK15> { [ F15			]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <INS>  { [ Insert		]	};
+    key <DELE> { [ Delete		]	};
+    key <PGUP> { [ Prior		]	};
+    key <PGDN> { [ Next			]	};
+    key <UP>   { [ Up			]	};
+    key <LEFT> { [ Left			]	};
+    key <RGHT> { [ Right		]	};
+    key <DOWN> { [ Down			]	};
+    // End "Editing" section
+
+    // Begin "Keypad" section
+    key <HOME> { [ Clear, Home		]	 };
+    key <HELP> { [ Help			]	};
+    key <KPSU> { [ KP_Subtract		]	};
+    key <KPDV> { [ KP_Divide		]	};
+
+    key  <KP7> { [ KP_7			]	};
+    key  <KP8> { [ KP_8			]	};
+    key  <KP9> { [ KP_9			]	};
+    key <KPMU> { [ KP_Multiply		]	};
+
+    key  <KP4> { [ KP_4			]	};
+    key  <KP5> { [ KP_5			]	};
+    key  <KP6> { [ KP_6			]	};
+    key <KPAD> { [ KP_Add		]	};
+
+    key  <KP1> { [ KP_1			]	};
+    key  <KP2> { [ KP_2			]	};
+    key  <KP3> { [ KP_3			]	};
+    key <KPEQ> { [ KP_Equal 		]	};
+
+    key  <KP0> { [ KP_0			]	};
+    key <KPSP> { [ KP_Separator		]	};
+    key <KPDC> { [ KP_Decimal		]	};
+//    key <KPEN> { [ KP_Enter		]	}; 
+    // End "Keypad" section
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L };
+    modifier_map Lock   { Caps_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod1   { Alt_L };
+    modifier_map Mod2   { Mode_switch };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/nokia_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/nokia_vndr/Makefile.am
index 71200ec4d..63dc5db6e 100644
--- a/xorg-server/xkeyboard-config/symbols/nokia_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/nokia_vndr/Makefile.am
@@ -1,6 +1,6 @@
-symbolsdir = $(xkb_base)/symbols/nokia_vndr
-
-dist_symbols_DATA = \
-rx-44 \
-rx-51 \
-su-8w
+symbolsdir = $(xkb_base)/symbols/nokia_vndr
+
+dist_symbols_DATA = \
+rx-44 \
+rx-51 \
+su-8w
diff --git a/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-44 b/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-44
index 515b69eef..7d91d6db3 100644
--- a/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-44
+++ b/xorg-server/xkeyboard-config/symbols/nokia_vndr/rx-44
@@ -1,303 +1,303 @@
-partial alphanumeric_keys
-xkb_symbols "us" {
-    name[Group1] = "U.S. English";
-    
-    include "nokia_vndr/rx-44(base)"
-
-    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
-    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
-    key <AC03>	{	[	d,		D,		at,		at		]	};
-    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
-    key <AC05>	{	[	g,		G,		backslash,	backslash	]	};
-    key <AC06>	{	[	h,		H,		slash,		slash		]	};
-    key <AC07>	{	[	j,		J,		parenleft,	parenleft	]	};
-    key <AC08>	{	[	k,		K,		parenright,	parenright	]	};
-    key <AC09>	{	[	l,		L,		asterisk,	asterisk	]	};
-    key <AC11>  {       [       apostrophe,     question,       question,	question	]	};
-
-    key <AB01>	{	[	z,		Z,		yen,		yen		]	};
-    key <AB02>	{	[	x,		X,		asciicircum,	asciicircum	]	};
-    key <AB03>	{	[	c,		C,		asciitilde,	asciitilde	]	};
-    key <AB04>	{	[	v,		V,		percent,	percent		]	};
-    key <AB05>	{	[	b,		B,		ampersand,	ampersand	]	};
-    key <AB06>	{	[	n,		N,		dollar,		dollar		]	};
-    key <AB07>	{	[	m,		M,		EuroSign,	EuroSign	]	};
-    key <AC10>  {       [       semicolon,      colon,          sterling,	sterling	]	};
-    key <AE11>  {       [       minus,          underscore,     underscore,	underscore	]	};
-    key <AE12>  {       [       plus,           equal,          equal,		equal		]	};
-
-    key <AB08>  {       [       comma,          less,           comma,		less		]	};
-    key <AB09>  {       [       period,         greater,        period,		greater		]	};
-};
-
-
-
-partial alphanumeric_keys
-xkb_symbols "fisenoda" {
-    name[Group1] = "Finnish/Swedish/Norwegian/Danish";
-
-    include "nokia_vndr/rx-44(base)"
-
-    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
-    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
-    key <AC03>	{	[	d,		D,		at,		at		]	};
-    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
-    key <AC05>	{	[	g,		G,		asterisk,	asterisk	]	};
-    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};
-    key <AC07>	{	[	j,		J,		slash,		slash		]	};
-    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};
-    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};
-    key <AC11>  {       [       aring,          Aring,          question,	question	]	};
-
-    key <AB01>	{	[	z,		Z,		EuroSign,	EuroSign	]	};
-    key <AB02>	{	[	x,		X,		asciitilde,	asciitilde	]	};
-    key <AB03>	{	[	c,		C,		percent,	percent		]	};
-    key <AB04>	{	[	v,		V,		ampersand,	ampersand	]	};
-    key <AB05>	{	[	b,		B,		plus,		plus		]	};
-    key <AB06>	{	[	n,		N,		less,		less		]	};
-    key <AB07>	{	[	m,		M,		greater,	greater		]	};
-    key <AC10>  {       type="EIGHT_LEVEL", [       oslash,     Oslash,		equal,		equal,		odiaeresis,		Odiaeresis,	equal,		equal		]       };
-    key <AE11>  {       type="EIGHT_LEVEL", [       ae,		AE,		apostrophe,	apostrophe,	adiaeresis,		Adiaeresis,	apostrophe,	apostrophe	]       };
-    key <AE12>  {       [       minus,          underscore,     underscore,	underscore	]       };
-
-    key <AB08>  {       [       comma,          semicolon,      comma,		semicolon	]       };
-    key <AB09>  {       [       period,         colon,          period,		colon		]       };
-};
-
-
-
-partial alphanumeric_keys
-xkb_symbols "ptes" {
-    name[Group1] = "Portuguese/Spanish";
-
-    include "nokia_vndr/rx-44(base)"
-
-    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
-    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
-    key <AC03>	{	[	d,		D,		at,		at		]	};
-    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
-    key <AC05>	{	[	g,		G,		asterisk,	asterisk	]	};
-    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};
-    key <AC07>	{	[	j,		J,		slash,		slash		]	};
-    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};
-    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};
-    key <AC11>  {       [       dead_acute,     dead_grave,     dead_diaeresis,	dead_diaeresis	]	};
-
-    key <AB01>	{	[	z,		Z,		EuroSign,	EuroSign	]	};
-    key <AB02>	{	[	x,		X,		percent,	percent 	]	};
-    key <AB03>	{	[	c,		C,		ampersand,	ampersand	]	};
-    key <AB04>	{	[	v,		V,		exclamdown,	exclamdown	]	};
-    key <AB05>	{	[	b,		B,		apostrophe,	apostrophe	]	};
-    key <AB06>	{	[	n,		N,		plus,		plus		]	};
-    key <AB07>	{	[	m,		M,		equal,		equal		]	};
-    key <AC10>  {       [       ccedilla,       Ccedilla,       questiondown,	questiondown	]	};
-    key <AE11>  {       [       ntilde,         Ntilde,         question,	question	]	};
-    key <AE12>  {       [       dead_tilde,     dead_circumflex, dead_circumflex, dead_circumflex ]	};
-
-    key <AB08>  {       [	comma,		semicolon,	minus,		minus		]	};
-    key <AB09>  {       [	period,		colon,		underscore,	underscore	]	};
-};
-
-
-
-partial alphanumeric_keys
-xkb_symbols "fr" {
-    name[Group1] = "French";
-
-    include "nokia_vndr/rx-44(base)"
-
-    key <AD01>	{	[	a,		A,		1,              1               ]	};
-    key <AD02>	{	[	z,		Z,		2,              2               ]	};
-
-    key <AC01>	{	[	q,		Q,		at,             at              ]	};
-    key <AC02>	{	[	s,		S,		percent,        percent         ]	};
-    key <AC03>	{	[	d,		D,		ecircumflex,    Ecircumflex	]	};
-    key <AC04>	{	[	f,		F,		eacute,  	Eacute          ]	};
-    key <AC05>	{	[	g,		G,		egrave,    	Egrave          ]	};
-    key <AC06>	{	[	h,		H,		oe,             OE      	]	};
-    key <AC07>	{	[	j,		J,		parenleft,      parenleft   	]	};
-    key <AC08>	{	[	k,		K,		parenright,     parenright	]	};
-    key <AC09>	{	[	l,		L,		agrave,         Agrave      	]	};
-    key <AC11>  {       [       m,              M,              ugrave,         Ugrave          ]       };
-
-    key <AB01>	{	[	w,		w,		EuroSign,       EuroSign	]	};
-    key <AB02>	{	[	x,		X,		numbersign,     numbersign 	]	};
-    key <AB03>	{	[	c,		C,		ccedilla,       Ccedilla	]	};
-    key <AB04>	{	[	v,		V,		plus,           plus	        ]	};
-    key <AB05>	{	[	b,		B,		equal,          equal   	]	};
-    key <AB06>	{	[	n,		N,		quotedbl,       quotedbl	]	};
-    key <AB07>	{	[	comma,		question,       backslash,      backslash	]	};
-    key <AC10>  {       [       semicolon,      period,         minus,          minus           ]       };
-    key <AE11>  {       [       colon,          slash,          underscore,     underscore      ]       };
-    key <AE12>  {       [       apostrophe,     apostrophe,     mu,             mu              ]       };
-
-    key <AB08>  {       [       less,		greater,	less,		greater		]	};
-    key <AB09>  {       [       exclam,		section,	asterisk,	asterisk        ]       };
-};
-
-
-
-partial alphanumeric_keys
-xkb_symbols "de" {
-    name[Group1] = "German";
-
-    include "nokia_vndr/rx-44(base)"
-
-    key <AD06>	{	[	z,		Z,		6,		6		]	};
-
-    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
-    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
-    key <AC03>	{	[	d,		D,		at,		at		]	};
-    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
-    key <AC05>	{	[	g,		G,		percent,	percent    	]	};
-    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};
-    key <AC07>	{	[	j,		J,		slash,		slash	  	]	};
-    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};
-    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};
-    key <AC11>  {	[       udiaeresis,     Udiaeresis,     question,	question	]       };
-
-    key <AB01>	{	[	y,		Y,		EuroSign,	EuroSign	]	};
-    key <AB02>	{	[	x,		X,		asciitilde,	asciitilde	]	};
-    key <AB03>	{	[	c,		C,		asterisk,	asterisk	]	};
-    key <AB04>	{	[	v,		V,		ampersand,	ampersand	]	};
-    key <AB05>	{	[	b,		B,		plus,		plus		]	};
-    key <AB06>	{	[	n,		N,		less,		less		]	};
-    key <AB07>	{	[	m,		M,		greater,	greater		]	};
-    key <AC10>  {	[       odiaeresis,     Odiaeresis,     equal,		equal		]       };
-    key <AE11>  {	[       adiaeresis,     Adiaeresis,     apostrophe,	apostrophe	]       };
-    key <AE12>  {	[       minus,          underscore,     ssharp,		ssharp		]       };
-
-    key <AB08>  {       [       comma,          semicolon,      comma,		semicolon	]	};
-    key <AB09>  {       [       period,         colon,          period,		colon		]	};
-};
-
-
-// Levels 5-8 are Russian, levels 1-4 US English, for shortcut reasons.
-partial alphanumeric_keys
-xkb_symbols "ru" {
-    name[Group1] = "Russian";
-
-    include "nokia_vndr/rx-44(base)"
-
-    key <AD01>	{	type="EIGHT_LEVEL", [	q,			Q,			1,			1,			Cyrillic_shorti,	Cyrillic_SHORTI,	1,			1			]	};
-    key <AD02>	{	type="EIGHT_LEVEL", [	w,			W,			2,			2,			Cyrillic_tse,	Cyrillic_TSE,	2,			2			]	};
-    key <AD03>	{	type="EIGHT_LEVEL", [	e,			E,			3,			3,			Cyrillic_u,	Cyrillic_U,	3,			3			]	};
-    key <AD04>	{	type="EIGHT_LEVEL", [	r,			R,			4,			4,			Cyrillic_ka,	Cyrillic_KA,	4,			4			]	};
-    key <AD05>	{	type="EIGHT_LEVEL", [	t,			T,			5,			5,			Cyrillic_ie,	Cyrillic_IE,	5,			5			]	};
-    key <AD06>	{	type="EIGHT_LEVEL", [	y,			Y,			6,			6,			Cyrillic_en,	Cyrillic_EN,	6,			6			]	};
-    key <AD07>	{	type="EIGHT_LEVEL", [	u,			U,			7,			7,			Cyrillic_ghe,	Cyrillic_GHE,	7,			7			]	};
-    key <AD08>	{	type="EIGHT_LEVEL", [	i,			I,			8,			8,			Cyrillic_sha,	Cyrillic_SHA,	8,			8			]	};
-    key <AD09>	{	type="EIGHT_LEVEL", [	o,			O,			9,			9,			Cyrillic_shcha,	Cyrillic_SHCHA,	9,			9			]	};
-    key <AD10>	{	type="EIGHT_LEVEL", [	p,			P,			0,			0,			Cyrillic_ze,	Cyrillic_ZE,	0,			0			]	};
-
-    key <AC01>	{	type="EIGHT_LEVEL", [	a,			A,			exclam,			exclam,			Cyrillic_ef,	Cyrillic_EF,	exclam,			exclam			]	};
-    key <AC02>	{	type="EIGHT_LEVEL", [	s,			S,			quotedbl,		quotedbl,		Cyrillic_yeru,	Cyrillic_YERU,	quotedbl,		quotedbl		]	};
-    key <AC03>	{	type="EIGHT_LEVEL", [	d,			D,			at,			at,			Cyrillic_ve,	Cyrillic_VE,	at,			at			]	};
-    key <AC04>	{	type="EIGHT_LEVEL", [	f,			F,			numbersign,		numbersign,		Cyrillic_a,	Cyrillic_A,	numbersign,		numbersign		]	};
-    key <AC05>	{	type="EIGHT_LEVEL", [	g,			G,			backslash,		backslash,		Cyrillic_pe,	Cyrillic_PE,	backslash,		backslash		]	};
-    key <AC06>	{	type="EIGHT_LEVEL", [	h,			H,			slash,			slash,			Cyrillic_er,	Cyrillic_ER,	slash,			slash			]	};
-    key <AC07>	{	type="EIGHT_LEVEL", [	j,			J,			parenleft,		parenleft,		Cyrillic_o,	Cyrillic_O,	parenleft,		parenleft		]	};
-    key <AC08>	{	type="EIGHT_LEVEL", [	k,			K,			parenright,		parenright,		Cyrillic_el,	Cyrillic_EL,	parenright,		parenright		]	};
-    key <AC09>	{	type="EIGHT_LEVEL", [	l,			L,			colon,			colon,			Cyrillic_de,	Cyrillic_DE,	colon,			colon			]	};
-    key <AC11>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		semicolon,		semicolon,		Cyrillic_zhe,	Cyrillic_ZHE,	semicolon,		semicolon		]	};
-
-    key <AB01>	{	type="EIGHT_LEVEL", [	z,			Z,			underscore,		underscore,		Cyrillic_ya,	Cyrillic_YA,	minus,			minus			]	};
-    key <AB02>	{	type="EIGHT_LEVEL", [	x,			X,			percent,		percent,		Cyrillic_che,	Cyrillic_CHE,	percent,		percent			]	};
-    key <AB03>	{	type="EIGHT_LEVEL", [	c,			C,			0x1002116,		0x1002116,		Cyrillic_es,	Cyrillic_ES,	0x1002116,		0x1002116		]	};
-    key <AB04>	{	type="EIGHT_LEVEL", [	v,			V,			equal,			equal,			Cyrillic_em,	Cyrillic_EM,	equal,			equal			]	};
-    key <AB05>	{	type="EIGHT_LEVEL", [	b,			B,			ampersand,		ampersand,		Cyrillic_i,	Cyrillic_I,	ampersand,		ampersand		]	};
-    key <AB06>	{	type="EIGHT_LEVEL", [	n,			N,			asterisk,		asterisk,		Cyrillic_te,	Cyrillic_TE,	asterisk,		asterisk		]	};
-    key <AB07>	{	type="EIGHT_LEVEL", [	m,			M,			apostrophe,		apostrophe,		Cyrillic_softsign,	Cyrillic_SOFTSIGN,	apostrophe,		apostrophe		]	};
-    key <AC10>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		minus,			minus,			Cyrillic_be,	Cyrillic_BE,	minus,			minus			]	};
-    key <AE11>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		question,		question,		Cyrillic_yu,	Cyrillic_YU,	question,		question		]	};
-    key <AE12>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		Cyrillic_hardsign,	Cyrillic_HARDSIGN,	Cyrillic_ha,	Cyrillic_HA,	Cyrillic_hardsign,	Cyrillic_HARDSIGN	]	};
-
-    key <AB08>	{	type="EIGHT_LEVEL", [	period,			comma,			period,			comma,			period,		comma,		period,			comma			]	};
-    key <AB09>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		Cyrillic_io,		Cyrillic_IO,		Cyrillic_e,	Cyrillic_E,	Cyrillic_io,		Cyrillic_IO		]	};
-};
-
-
-
-partial alphanumeric_keys
-xkb_symbols "it" {
-    name[Group1] = "Italian";
-
-    include "nokia_vndr/rx-44(base)"
-
-    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
-    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
-    key <AC03>	{	[	d,		D,		at,		at		]	};
-    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
-    key <AC05>	{	[	g,		G,		asterisk,	asterisk	]	};
-    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};
-    key <AC07>	{	[	j,		J,		slash,		slash		]	};
-    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};
-    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};
-    key <AC11>  {       [       apostrophe,     question,       igrave,         Igrave		]       };
-
-    key <AB01>	{	[	z,		Z,		EuroSign,	EuroSign	]	};
-    key <AB02>	{	[	x,		X,		asciitilde,	asciitilde	]	};
-    key <AB03>	{	[	c,		C,		ampersand,	ampersand	]	};
-    key <AB04>	{	[	v,		V,		equal,		equal		]	};
-    key <AB05>	{	[	b,		B,		less,		less		]	};
-    key <AB06>	{	[	n,		N,		greater,	greater		]	};
-    key <AB07>	{	[	m,		M,		plus,		plus		]	};
-    key <AC10>  {       [       eacute,         Eacute,         ograve,         Ograve          ]       };
-    key <AE11>  {       [       egrave,         Egrave,         agrave,         Agrave          ]       };
-    key <AE12>  {       [       minus,          underscore,     ugrave,         Ugrave          ]       };
-
-    key <AB08>  {       [       comma,          semicolon,      comma,		semicolon	]       };
-    key <AB09>  {       [       period,         colon,          period,		colon		]       };
-};
-
-partial default alphanumeric_keys
-xkb_symbols "base" {
-    key <AD01>	{	[	q,			Q,			1,			1			]	};
-    key <AD02>	{	[	w,			W,			2,			2			]	};
-    key <AD03>	{	[	e,			E,			3,			3			]	};
-    key <AD04>	{	[	r,			R,			4,			4			]	};
-    key <AD05>	{	[	t,			T,			5,			5			]	};
-    key <AD06>	{	[	y,			Y,			6,			6			]	};
-    key <AD07>	{	[	u,			U,			7,			7			]	};
-    key <AD08>	{	[	i,			I,			8,			8			]	};
-    key <AD09>	{	[	o,			O,			9,			9			]	};
-    key <AD10>	{	[	p,			P,			0,			0			]	};
-    key <BKSP>	{	[	BackSpace,		BackSpace,		BackSpace,		BackSpace		]	};
-
-    // broken UI spec.
-    key <RTRN>	{	[	KP_Enter,		KP_Enter,		KP_Enter,		KP_Enter		]	};
-
-    key <COMP>	{	[	Multi_key,		Multi_key,		Multi_key,		Multi_key		]	};
-    key <LFSH>	{	[	Shift_L,		Shift_L,		Shift_L,		Shift_L			]	};
-    key <FN>	{	[	ISO_Level3_Shift,	ISO_Level3_Shift,	ISO_Level3_Shift,	ISO_Level3_Shift	]	};
-    key <SPCE>	{	[	space,			space,			space,			space			]	};
-    key <RCTL>	{	[	Control_R,		Control_R,		Control_R,		Control_R		]	};
-    key <TAB>	{	[	Tab,			Tab,			Tab,			Tab			]	};
-
-    modifier_map Shift { Shift_L };
-    modifier_map Mod5 { ISO_Level3_Shift };
-    modifier_map Control { Control_R };
-
-    key <KPEN>	{	[	Return		]	};
-    key <UP>	{	[	Up		]	};
-    key <DOWN>	{	[	Down		]	};
-    key <LEFT>	{	[	Left		]	};
-    key <RGHT>	{	[	Right		]	};
-
-    key <ESC>	{	[	Escape		]	};
-    key <FK01>	{	[	F1		]	};
-    key <FK02>	{	[	F2		]	};
-    key <FK03>	{	[	F3		]	};
-    key <FK04>	{	[	F4		]	};
-    key <FK05>	{	[	F5		]	};
-    key <FK06>	{	[	F6		]	};
-    key <FK07>	{	[	F7		]	};
-    key <FK08>	{	[	F8		]	};
-    key <FK09>	{	[	F9		]	};
-    key <FK10>	{	[	F10		]	};
-    key <FK11>	{	[	F11		]	};
-    key <FK12>	{	[	F12		]	};
-
-    // generated from the headset, must always be in the map.
-    key <I29>  {	[	XF86Phone	]	};
-};
+partial alphanumeric_keys
+xkb_symbols "us" {
+    name[Group1] = "U.S. English";
+    
+    include "nokia_vndr/rx-44(base)"
+
+    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
+    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
+    key <AC03>	{	[	d,		D,		at,		at		]	};
+    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
+    key <AC05>	{	[	g,		G,		backslash,	backslash	]	};
+    key <AC06>	{	[	h,		H,		slash,		slash		]	};
+    key <AC07>	{	[	j,		J,		parenleft,	parenleft	]	};
+    key <AC08>	{	[	k,		K,		parenright,	parenright	]	};
+    key <AC09>	{	[	l,		L,		asterisk,	asterisk	]	};
+    key <AC11>  {       [       apostrophe,     question,       question,	question	]	};
+
+    key <AB01>	{	[	z,		Z,		yen,		yen		]	};
+    key <AB02>	{	[	x,		X,		asciicircum,	asciicircum	]	};
+    key <AB03>	{	[	c,		C,		asciitilde,	asciitilde	]	};
+    key <AB04>	{	[	v,		V,		percent,	percent		]	};
+    key <AB05>	{	[	b,		B,		ampersand,	ampersand	]	};
+    key <AB06>	{	[	n,		N,		dollar,		dollar		]	};
+    key <AB07>	{	[	m,		M,		EuroSign,	EuroSign	]	};
+    key <AC10>  {       [       semicolon,      colon,          sterling,	sterling	]	};
+    key <AE11>  {       [       minus,          underscore,     underscore,	underscore	]	};
+    key <AE12>  {       [       plus,           equal,          equal,		equal		]	};
+
+    key <AB08>  {       [       comma,          less,           comma,		less		]	};
+    key <AB09>  {       [       period,         greater,        period,		greater		]	};
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "fisenoda" {
+    name[Group1] = "Finnish/Swedish/Norwegian/Danish";
+
+    include "nokia_vndr/rx-44(base)"
+
+    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
+    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
+    key <AC03>	{	[	d,		D,		at,		at		]	};
+    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
+    key <AC05>	{	[	g,		G,		asterisk,	asterisk	]	};
+    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};
+    key <AC07>	{	[	j,		J,		slash,		slash		]	};
+    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};
+    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};
+    key <AC11>  {       [       aring,          Aring,          question,	question	]	};
+
+    key <AB01>	{	[	z,		Z,		EuroSign,	EuroSign	]	};
+    key <AB02>	{	[	x,		X,		asciitilde,	asciitilde	]	};
+    key <AB03>	{	[	c,		C,		percent,	percent		]	};
+    key <AB04>	{	[	v,		V,		ampersand,	ampersand	]	};
+    key <AB05>	{	[	b,		B,		plus,		plus		]	};
+    key <AB06>	{	[	n,		N,		less,		less		]	};
+    key <AB07>	{	[	m,		M,		greater,	greater		]	};
+    key <AC10>  {       type="EIGHT_LEVEL", [       oslash,     Oslash,		equal,		equal,		odiaeresis,		Odiaeresis,	equal,		equal		]       };
+    key <AE11>  {       type="EIGHT_LEVEL", [       ae,		AE,		apostrophe,	apostrophe,	adiaeresis,		Adiaeresis,	apostrophe,	apostrophe	]       };
+    key <AE12>  {       [       minus,          underscore,     underscore,	underscore	]       };
+
+    key <AB08>  {       [       comma,          semicolon,      comma,		semicolon	]       };
+    key <AB09>  {       [       period,         colon,          period,		colon		]       };
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "ptes" {
+    name[Group1] = "Portuguese/Spanish";
+
+    include "nokia_vndr/rx-44(base)"
+
+    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
+    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
+    key <AC03>	{	[	d,		D,		at,		at		]	};
+    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
+    key <AC05>	{	[	g,		G,		asterisk,	asterisk	]	};
+    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};
+    key <AC07>	{	[	j,		J,		slash,		slash		]	};
+    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};
+    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};
+    key <AC11>  {       [       dead_acute,     dead_grave,     dead_diaeresis,	dead_diaeresis	]	};
+
+    key <AB01>	{	[	z,		Z,		EuroSign,	EuroSign	]	};
+    key <AB02>	{	[	x,		X,		percent,	percent 	]	};
+    key <AB03>	{	[	c,		C,		ampersand,	ampersand	]	};
+    key <AB04>	{	[	v,		V,		exclamdown,	exclamdown	]	};
+    key <AB05>	{	[	b,		B,		apostrophe,	apostrophe	]	};
+    key <AB06>	{	[	n,		N,		plus,		plus		]	};
+    key <AB07>	{	[	m,		M,		equal,		equal		]	};
+    key <AC10>  {       [       ccedilla,       Ccedilla,       questiondown,	questiondown	]	};
+    key <AE11>  {       [       ntilde,         Ntilde,         question,	question	]	};
+    key <AE12>  {       [       dead_tilde,     dead_circumflex, dead_circumflex, dead_circumflex ]	};
+
+    key <AB08>  {       [	comma,		semicolon,	minus,		minus		]	};
+    key <AB09>  {       [	period,		colon,		underscore,	underscore	]	};
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "fr" {
+    name[Group1] = "French";
+
+    include "nokia_vndr/rx-44(base)"
+
+    key <AD01>	{	[	a,		A,		1,              1               ]	};
+    key <AD02>	{	[	z,		Z,		2,              2               ]	};
+
+    key <AC01>	{	[	q,		Q,		at,             at              ]	};
+    key <AC02>	{	[	s,		S,		percent,        percent         ]	};
+    key <AC03>	{	[	d,		D,		ecircumflex,    Ecircumflex	]	};
+    key <AC04>	{	[	f,		F,		eacute,  	Eacute          ]	};
+    key <AC05>	{	[	g,		G,		egrave,    	Egrave          ]	};
+    key <AC06>	{	[	h,		H,		oe,             OE      	]	};
+    key <AC07>	{	[	j,		J,		parenleft,      parenleft   	]	};
+    key <AC08>	{	[	k,		K,		parenright,     parenright	]	};
+    key <AC09>	{	[	l,		L,		agrave,         Agrave      	]	};
+    key <AC11>  {       [       m,              M,              ugrave,         Ugrave          ]       };
+
+    key <AB01>	{	[	w,		w,		EuroSign,       EuroSign	]	};
+    key <AB02>	{	[	x,		X,		numbersign,     numbersign 	]	};
+    key <AB03>	{	[	c,		C,		ccedilla,       Ccedilla	]	};
+    key <AB04>	{	[	v,		V,		plus,           plus	        ]	};
+    key <AB05>	{	[	b,		B,		equal,          equal   	]	};
+    key <AB06>	{	[	n,		N,		quotedbl,       quotedbl	]	};
+    key <AB07>	{	[	comma,		question,       backslash,      backslash	]	};
+    key <AC10>  {       [       semicolon,      period,         minus,          minus           ]       };
+    key <AE11>  {       [       colon,          slash,          underscore,     underscore      ]       };
+    key <AE12>  {       [       apostrophe,     apostrophe,     mu,             mu              ]       };
+
+    key <AB08>  {       [       less,		greater,	less,		greater		]	};
+    key <AB09>  {       [       exclam,		section,	asterisk,	asterisk        ]       };
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "de" {
+    name[Group1] = "German";
+
+    include "nokia_vndr/rx-44(base)"
+
+    key <AD06>	{	[	z,		Z,		6,		6		]	};
+
+    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
+    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
+    key <AC03>	{	[	d,		D,		at,		at		]	};
+    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
+    key <AC05>	{	[	g,		G,		percent,	percent    	]	};
+    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};
+    key <AC07>	{	[	j,		J,		slash,		slash	  	]	};
+    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};
+    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};
+    key <AC11>  {	[       udiaeresis,     Udiaeresis,     question,	question	]       };
+
+    key <AB01>	{	[	y,		Y,		EuroSign,	EuroSign	]	};
+    key <AB02>	{	[	x,		X,		asciitilde,	asciitilde	]	};
+    key <AB03>	{	[	c,		C,		asterisk,	asterisk	]	};
+    key <AB04>	{	[	v,		V,		ampersand,	ampersand	]	};
+    key <AB05>	{	[	b,		B,		plus,		plus		]	};
+    key <AB06>	{	[	n,		N,		less,		less		]	};
+    key <AB07>	{	[	m,		M,		greater,	greater		]	};
+    key <AC10>  {	[       odiaeresis,     Odiaeresis,     equal,		equal		]       };
+    key <AE11>  {	[       adiaeresis,     Adiaeresis,     apostrophe,	apostrophe	]       };
+    key <AE12>  {	[       minus,          underscore,     ssharp,		ssharp		]       };
+
+    key <AB08>  {       [       comma,          semicolon,      comma,		semicolon	]	};
+    key <AB09>  {       [       period,         colon,          period,		colon		]	};
+};
+
+
+// Levels 5-8 are Russian, levels 1-4 US English, for shortcut reasons.
+partial alphanumeric_keys
+xkb_symbols "ru" {
+    name[Group1] = "Russian";
+
+    include "nokia_vndr/rx-44(base)"
+
+    key <AD01>	{	type="EIGHT_LEVEL", [	q,			Q,			1,			1,			Cyrillic_shorti,	Cyrillic_SHORTI,	1,			1			]	};
+    key <AD02>	{	type="EIGHT_LEVEL", [	w,			W,			2,			2,			Cyrillic_tse,	Cyrillic_TSE,	2,			2			]	};
+    key <AD03>	{	type="EIGHT_LEVEL", [	e,			E,			3,			3,			Cyrillic_u,	Cyrillic_U,	3,			3			]	};
+    key <AD04>	{	type="EIGHT_LEVEL", [	r,			R,			4,			4,			Cyrillic_ka,	Cyrillic_KA,	4,			4			]	};
+    key <AD05>	{	type="EIGHT_LEVEL", [	t,			T,			5,			5,			Cyrillic_ie,	Cyrillic_IE,	5,			5			]	};
+    key <AD06>	{	type="EIGHT_LEVEL", [	y,			Y,			6,			6,			Cyrillic_en,	Cyrillic_EN,	6,			6			]	};
+    key <AD07>	{	type="EIGHT_LEVEL", [	u,			U,			7,			7,			Cyrillic_ghe,	Cyrillic_GHE,	7,			7			]	};
+    key <AD08>	{	type="EIGHT_LEVEL", [	i,			I,			8,			8,			Cyrillic_sha,	Cyrillic_SHA,	8,			8			]	};
+    key <AD09>	{	type="EIGHT_LEVEL", [	o,			O,			9,			9,			Cyrillic_shcha,	Cyrillic_SHCHA,	9,			9			]	};
+    key <AD10>	{	type="EIGHT_LEVEL", [	p,			P,			0,			0,			Cyrillic_ze,	Cyrillic_ZE,	0,			0			]	};
+
+    key <AC01>	{	type="EIGHT_LEVEL", [	a,			A,			exclam,			exclam,			Cyrillic_ef,	Cyrillic_EF,	exclam,			exclam			]	};
+    key <AC02>	{	type="EIGHT_LEVEL", [	s,			S,			quotedbl,		quotedbl,		Cyrillic_yeru,	Cyrillic_YERU,	quotedbl,		quotedbl		]	};
+    key <AC03>	{	type="EIGHT_LEVEL", [	d,			D,			at,			at,			Cyrillic_ve,	Cyrillic_VE,	at,			at			]	};
+    key <AC04>	{	type="EIGHT_LEVEL", [	f,			F,			numbersign,		numbersign,		Cyrillic_a,	Cyrillic_A,	numbersign,		numbersign		]	};
+    key <AC05>	{	type="EIGHT_LEVEL", [	g,			G,			backslash,		backslash,		Cyrillic_pe,	Cyrillic_PE,	backslash,		backslash		]	};
+    key <AC06>	{	type="EIGHT_LEVEL", [	h,			H,			slash,			slash,			Cyrillic_er,	Cyrillic_ER,	slash,			slash			]	};
+    key <AC07>	{	type="EIGHT_LEVEL", [	j,			J,			parenleft,		parenleft,		Cyrillic_o,	Cyrillic_O,	parenleft,		parenleft		]	};
+    key <AC08>	{	type="EIGHT_LEVEL", [	k,			K,			parenright,		parenright,		Cyrillic_el,	Cyrillic_EL,	parenright,		parenright		]	};
+    key <AC09>	{	type="EIGHT_LEVEL", [	l,			L,			colon,			colon,			Cyrillic_de,	Cyrillic_DE,	colon,			colon			]	};
+    key <AC11>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		semicolon,		semicolon,		Cyrillic_zhe,	Cyrillic_ZHE,	semicolon,		semicolon		]	};
+
+    key <AB01>	{	type="EIGHT_LEVEL", [	z,			Z,			underscore,		underscore,		Cyrillic_ya,	Cyrillic_YA,	minus,			minus			]	};
+    key <AB02>	{	type="EIGHT_LEVEL", [	x,			X,			percent,		percent,		Cyrillic_che,	Cyrillic_CHE,	percent,		percent			]	};
+    key <AB03>	{	type="EIGHT_LEVEL", [	c,			C,			0x1002116,		0x1002116,		Cyrillic_es,	Cyrillic_ES,	0x1002116,		0x1002116		]	};
+    key <AB04>	{	type="EIGHT_LEVEL", [	v,			V,			equal,			equal,			Cyrillic_em,	Cyrillic_EM,	equal,			equal			]	};
+    key <AB05>	{	type="EIGHT_LEVEL", [	b,			B,			ampersand,		ampersand,		Cyrillic_i,	Cyrillic_I,	ampersand,		ampersand		]	};
+    key <AB06>	{	type="EIGHT_LEVEL", [	n,			N,			asterisk,		asterisk,		Cyrillic_te,	Cyrillic_TE,	asterisk,		asterisk		]	};
+    key <AB07>	{	type="EIGHT_LEVEL", [	m,			M,			apostrophe,		apostrophe,		Cyrillic_softsign,	Cyrillic_SOFTSIGN,	apostrophe,		apostrophe		]	};
+    key <AC10>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		minus,			minus,			Cyrillic_be,	Cyrillic_BE,	minus,			minus			]	};
+    key <AE11>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		question,		question,		Cyrillic_yu,	Cyrillic_YU,	question,		question		]	};
+    key <AE12>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		Cyrillic_hardsign,	Cyrillic_HARDSIGN,	Cyrillic_ha,	Cyrillic_HA,	Cyrillic_hardsign,	Cyrillic_HARDSIGN	]	};
+
+    key <AB08>	{	type="EIGHT_LEVEL", [	period,			comma,			period,			comma,			period,		comma,		period,			comma			]	};
+    key <AB09>	{	type="EIGHT_LEVEL", [	NoSymbol,		NoSymbol,		Cyrillic_io,		Cyrillic_IO,		Cyrillic_e,	Cyrillic_E,	Cyrillic_io,		Cyrillic_IO		]	};
+};
+
+
+
+partial alphanumeric_keys
+xkb_symbols "it" {
+    name[Group1] = "Italian";
+
+    include "nokia_vndr/rx-44(base)"
+
+    key <AC01>	{	[	a,		A,		exclam,		exclam		]	};
+    key <AC02>	{	[	s,		S,		quotedbl,	quotedbl	]	};
+    key <AC03>	{	[	d,		D,		at,		at		]	};
+    key <AC04>	{	[	f,		F,		numbersign,	numbersign	]	};
+    key <AC05>	{	[	g,		G,		asterisk,	asterisk	]	};
+    key <AC06>	{	[	h,		H,		backslash,	backslash	]	};
+    key <AC07>	{	[	j,		J,		slash,		slash		]	};
+    key <AC08>	{	[	k,		K,		parenleft,	parenleft	]	};
+    key <AC09>	{	[	l,		L,		parenright,	parenright	]	};
+    key <AC11>  {       [       apostrophe,     question,       igrave,         Igrave		]       };
+
+    key <AB01>	{	[	z,		Z,		EuroSign,	EuroSign	]	};
+    key <AB02>	{	[	x,		X,		asciitilde,	asciitilde	]	};
+    key <AB03>	{	[	c,		C,		ampersand,	ampersand	]	};
+    key <AB04>	{	[	v,		V,		equal,		equal		]	};
+    key <AB05>	{	[	b,		B,		less,		less		]	};
+    key <AB06>	{	[	n,		N,		greater,	greater		]	};
+    key <AB07>	{	[	m,		M,		plus,		plus		]	};
+    key <AC10>  {       [       eacute,         Eacute,         ograve,         Ograve          ]       };
+    key <AE11>  {       [       egrave,         Egrave,         agrave,         Agrave          ]       };
+    key <AE12>  {       [       minus,          underscore,     ugrave,         Ugrave          ]       };
+
+    key <AB08>  {       [       comma,          semicolon,      comma,		semicolon	]       };
+    key <AB09>  {       [       period,         colon,          period,		colon		]       };
+};
+
+partial default alphanumeric_keys
+xkb_symbols "base" {
+    key <AD01>	{	[	q,			Q,			1,			1			]	};
+    key <AD02>	{	[	w,			W,			2,			2			]	};
+    key <AD03>	{	[	e,			E,			3,			3			]	};
+    key <AD04>	{	[	r,			R,			4,			4			]	};
+    key <AD05>	{	[	t,			T,			5,			5			]	};
+    key <AD06>	{	[	y,			Y,			6,			6			]	};
+    key <AD07>	{	[	u,			U,			7,			7			]	};
+    key <AD08>	{	[	i,			I,			8,			8			]	};
+    key <AD09>	{	[	o,			O,			9,			9			]	};
+    key <AD10>	{	[	p,			P,			0,			0			]	};
+    key <BKSP>	{	[	BackSpace,		BackSpace,		BackSpace,		BackSpace		]	};
+
+    // broken UI spec.
+    key <RTRN>	{	[	KP_Enter,		KP_Enter,		KP_Enter,		KP_Enter		]	};
+
+    key <COMP>	{	[	Multi_key,		Multi_key,		Multi_key,		Multi_key		]	};
+    key <LFSH>	{	[	Shift_L,		Shift_L,		Shift_L,		Shift_L			]	};
+    key <FN>	{	[	ISO_Level3_Shift,	ISO_Level3_Shift,	ISO_Level3_Shift,	ISO_Level3_Shift	]	};
+    key <SPCE>	{	[	space,			space,			space,			space			]	};
+    key <RCTL>	{	[	Control_R,		Control_R,		Control_R,		Control_R		]	};
+    key <TAB>	{	[	Tab,			Tab,			Tab,			Tab			]	};
+
+    modifier_map Shift { Shift_L };
+    modifier_map Mod5 { ISO_Level3_Shift };
+    modifier_map Control { Control_R };
+
+    key <KPEN>	{	[	Return		]	};
+    key <UP>	{	[	Up		]	};
+    key <DOWN>	{	[	Down		]	};
+    key <LEFT>	{	[	Left		]	};
+    key <RGHT>	{	[	Right		]	};
+
+    key <ESC>	{	[	Escape		]	};
+    key <FK01>	{	[	F1		]	};
+    key <FK02>	{	[	F2		]	};
+    key <FK03>	{	[	F3		]	};
+    key <FK04>	{	[	F4		]	};
+    key <FK05>	{	[	F5		]	};
+    key <FK06>	{	[	F6		]	};
+    key <FK07>	{	[	F7		]	};
+    key <FK08>	{	[	F8		]	};
+    key <FK09>	{	[	F9		]	};
+    key <FK10>	{	[	F10		]	};
+    key <FK11>	{	[	F11		]	};
+    key <FK12>	{	[	F12		]	};
+
+    // generated from the headset, must always be in the map.
+    key <I29>  {	[	XF86Phone	]	};
+};
diff --git a/xorg-server/xkeyboard-config/symbols/olpc b/xorg-server/xkeyboard-config/symbols/olpc
index 9e74e47b8..e9e950b1e 100644
--- a/xorg-server/xkeyboard-config/symbols/olpc
+++ b/xorg-server/xkeyboard-config/symbols/olpc
@@ -1,21 +1,21 @@
-//
-// Created by Bernardo Innocenti <bernie@codewiz.org>
-//
-// Additional symbol definitions for the OLPC keyboards
-//
-
-alphanumeric_keys modifier_keys
-xkb_symbols "olpc" {
-    include "pc(pc105)"
-
-    modifier_map Mod1 { KP_Home   }; // KP_Home  is the "square" game key
-    modifier_map Mod3 { KP_End    }; // KP_End   is the "tick" game key
-    modifier_map Mod4 { KP_Prior  }; // KP_Prior is the "O" game key
-    modifier_map Mod5 { KP_Next   }; // KP_Next  is the "X" game key
-
-    key <I220> { [ XF86Search    ] }; // search key
-    key <I221> { [ XF86Meeting   ] }; // fn+search key
-    key <I236> { [ XF86Start     ] }; // gear key (fn+space)
-    key <I147> { [ XF86TaskPane  ] }; // frame key (the top-right key)
-    key <I224> { [ XF86Messenger ] }; // overlay key (next to frame key)
-};
+//
+// Created by Bernardo Innocenti <bernie@codewiz.org>
+//
+// Additional symbol definitions for the OLPC keyboards
+//
+
+alphanumeric_keys modifier_keys
+xkb_symbols "olpc" {
+    include "pc(pc105)"
+
+    modifier_map Mod1 { KP_Home   }; // KP_Home  is the "square" game key
+    modifier_map Mod3 { KP_End    }; // KP_End   is the "tick" game key
+    modifier_map Mod4 { KP_Prior  }; // KP_Prior is the "O" game key
+    modifier_map Mod5 { KP_Next   }; // KP_Next  is the "X" game key
+
+    key <I220> { [ XF86Search    ] }; // search key
+    key <I221> { [ XF86Meeting   ] }; // fn+search key
+    key <I236> { [ XF86Start     ] }; // gear key (fn+space)
+    key <I147> { [ XF86TaskPane  ] }; // frame key (the top-right key)
+    key <I224> { [ XF86Messenger ] }; // overlay key (next to frame key)
+};
diff --git a/xorg-server/xkeyboard-config/symbols/rupeesign b/xorg-server/xkeyboard-config/symbols/rupeesign
index 605060af7..efde69cb3 100644
--- a/xorg-server/xkeyboard-config/symbols/rupeesign
+++ b/xorg-server/xkeyboard-config/symbols/rupeesign
@@ -1,5 +1,5 @@
-// keyboards having the RupeeSign on the 4 key
-partial
-xkb_symbols "4" {
-    key <AE04>	{ [  NoSymbol,   NoSymbol,   U20B9 ]	};
-};
+// keyboards having the RupeeSign on the 4 key
+partial
+xkb_symbols "4" {
+    key <AE04>	{ [  NoSymbol,   NoSymbol,   U20B9 ]	};
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sgi_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/sgi_vndr/Makefile.am
index b1123e70e..0133ca001 100644
--- a/xorg-server/xkeyboard-config/symbols/sgi_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/sgi_vndr/Makefile.am
@@ -1,4 +1,4 @@
-symbolsdir = $(xkb_base)/symbols/sgi_vndr
-
-dist_symbols_DATA = \
-jp
+symbolsdir = $(xkb_base)/symbols/sgi_vndr
+
+dist_symbols_DATA = \
+jp
diff --git a/xorg-server/xkeyboard-config/symbols/sgi_vndr/jp b/xorg-server/xkeyboard-config/symbols/sgi_vndr/jp
index 00f9ede0f..f60c80290 100644
--- a/xorg-server/xkeyboard-config/symbols/sgi_vndr/jp
+++ b/xorg-server/xkeyboard-config/symbols/sgi_vndr/jp
@@ -1,44 +1,44 @@
-xkb_symbols "jp106" {
-
-    name[group1]="Japan/ASCII";
-
-    key <HZTG> {         [ Zenkaku_Hankaku 		    ] };
-    key <AE01> {         [               1,          exclam ] };
-    key <AE02> {         [               2,        quotedbl ] };
-    key <AE03> {         [               3,      numbersign ] };
-    key <AE04> {         [               4,          dollar ] };
-    key <AE05> {         [               5,         percent ] };
-    key <AE06> {         [               6,       ampersand ] };
-    key <AE07> {         [               7,      apostrophe ] };
-    key <AE08> {         [               8,       parenleft ] };
-    key <AE09> {         [               9,      parenright ] };
-    key <AE10> {         [               0,      asciitilde ] };
-    key <AE11> {         [           minus,           equal ] };
-    key <AE12> {         [     asciicircum,         overbar ] };
-    key <AE13> {         [             yen,             bar ] };
-
-    // keys <TAB> and <AD01> - <AD10> are identical to US/ASCII keyboard
-    key <AD11> {         [              at,           grave ] };
-    key <AD12> {         [     bracketleft,       braceleft ] };
-
-    key <CAPS> {         [      Eisu_Shift,       Caps_Lock ] };
-    // keys <AC01> - <AC09> are identical to US/ASCII keyboard
-    key <AC10> {         [       semicolon,            plus ] };
-    key <AC11> {         [           colon,        asterisk ] };
-    key <AC12> {         [    bracketright,      braceright ] };
-
-    // keys <LFSH> and <AB01> - <AB10> are identical to US/ASCII keyboard
-    key <AB11> {         [       backslash,      underscore ] };
-
-    key <NFER> {         [        Muhenkan ] };
-    key <XFER> {         [           Kanji ] };
-    key <HKTG> {         [ Hiragana_Katakana ] };
-};
-
-xkb_symbols "alternate106" {
-    key <AE10> {         [               0,      overbar ] };
-    key <AE12> {         [     asciicircum,      asciitilde] };
-    key <AE13> {         [       backslash,             bar ] };
-    key <AB11> {         [        underbar,      underscore ] };
-    augment "sgi/jp(jp106)"
-};
+xkb_symbols "jp106" {
+
+    name[group1]="Japan/ASCII";
+
+    key <HZTG> {         [ Zenkaku_Hankaku 		    ] };
+    key <AE01> {         [               1,          exclam ] };
+    key <AE02> {         [               2,        quotedbl ] };
+    key <AE03> {         [               3,      numbersign ] };
+    key <AE04> {         [               4,          dollar ] };
+    key <AE05> {         [               5,         percent ] };
+    key <AE06> {         [               6,       ampersand ] };
+    key <AE07> {         [               7,      apostrophe ] };
+    key <AE08> {         [               8,       parenleft ] };
+    key <AE09> {         [               9,      parenright ] };
+    key <AE10> {         [               0,      asciitilde ] };
+    key <AE11> {         [           minus,           equal ] };
+    key <AE12> {         [     asciicircum,         overbar ] };
+    key <AE13> {         [             yen,             bar ] };
+
+    // keys <TAB> and <AD01> - <AD10> are identical to US/ASCII keyboard
+    key <AD11> {         [              at,           grave ] };
+    key <AD12> {         [     bracketleft,       braceleft ] };
+
+    key <CAPS> {         [      Eisu_Shift,       Caps_Lock ] };
+    // keys <AC01> - <AC09> are identical to US/ASCII keyboard
+    key <AC10> {         [       semicolon,            plus ] };
+    key <AC11> {         [           colon,        asterisk ] };
+    key <AC12> {         [    bracketright,      braceright ] };
+
+    // keys <LFSH> and <AB01> - <AB10> are identical to US/ASCII keyboard
+    key <AB11> {         [       backslash,      underscore ] };
+
+    key <NFER> {         [        Muhenkan ] };
+    key <XFER> {         [           Kanji ] };
+    key <HKTG> {         [ Hiragana_Katakana ] };
+};
+
+xkb_symbols "alternate106" {
+    key <AE10> {         [               0,      overbar ] };
+    key <AE12> {         [     asciicircum,      asciitilde] };
+    key <AE13> {         [       backslash,             bar ] };
+    key <AB11> {         [        underbar,      underscore ] };
+    augment "sgi/jp(jp106)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/shift b/xorg-server/xkeyboard-config/symbols/shift
index 64dae8e43..6fbec5b2a 100644
--- a/xorg-server/xkeyboard-config/symbols/shift
+++ b/xorg-server/xkeyboard-config/symbols/shift
@@ -1,84 +1,84 @@
-partial modifier_keys 
-xkb_symbols "breaks_caps" {
-    key <LFSH> {
-	type = "ALPHABETIC",
-    	actions [Group1] = [
-	    SetMods(modifiers=Shift),
-	    SetMods(modifiers=Shift+Lock,clearLocks)
-	]
-    };
-    key <RTSH> {
-	type = "ALPHABETIC",
-	actions [Group1] = [
-	    SetMods(modifiers=Shift),
-	    SetMods(modifiers=Shift+Lock,clearLocks)
-	]
-    };
-};
-
-// When pressed together with another Shift key, set/release Lock.
-partial modifier_keys
-xkb_symbols "lshift_both_capslock" {
-  key <LFSH> {
-    type[Group1]="TWO_LEVEL",
-    symbols[Group1] = [ Shift_L,                       Caps_Lock                ]
-  };
-};
-// When pressed together with another Shift key, set or unset Lock.
-partial modifier_keys
-xkb_symbols "rshift_both_capslock" {
-  key <RTSH> {
-    type[Group1]="TWO_LEVEL",
-    symbols[Group1] = [ Shift_R,                       Caps_Lock                ]
-  };
-};
-partial modifier_keys
-xkb_symbols "both_capslock" {
-  include "shift(lshift_both_capslock)"
-  include "shift(rshift_both_capslock)"
-};
-
-// Release Lock when pressed alone and set Lock when pressed with another Shift key.
-partial modifier_keys
-xkb_symbols "lshift_both_capslock_cancel" {
-  key <LFSH> {
-    type[Group1]="ALPHABETIC",
-    symbols[Group1] = [ Shift_L,                       Caps_Lock                ]
-  };
-};
-// Release Lock when pressed alone and set Lock when pressed with another Shift key.
-partial modifier_keys
-xkb_symbols "rshift_both_capslock_cancel" {
-  key <RTSH> {
-    type[Group1]="ALPHABETIC",
-    symbols[Group1] = [ Shift_R,                       Caps_Lock                ]
-  };
-};
-partial modifier_keys
-xkb_symbols "both_capslock_cancel" {
-  include "shift(lshift_both_capslock_cancel)"
-  include "shift(rshift_both_capslock_cancel)"
-};
-
-
-// When pressed together with another Shift key, lock/unlock Shift.
-partial modifier_keys
-xkb_symbols "lshift_both_shiftlock" {
-  key <LFSH> {
-    type[Group1]="TWO_LEVEL",
-    symbols[Group1] = [ Shift_L,                       Shift_Lock ]
-  };
-};
-// When pressed together with another Shift key, lock/unlock Shift.
-partial modifier_keys
-xkb_symbols "rshift_both_shiftlock" {
-  key <RTSH> {
-    type[Group1]="TWO_LEVEL",
-    symbols[Group1] = [ Shift_R,                       Shift_Lock ]
-  };
-};
-partial modifier_keys
-xkb_symbols "both_shiftlock" {
-  include "shift(lshift_both_shiftlock)"
-  include "shift(rshift_both_shiftlock)"
-};
+partial modifier_keys 
+xkb_symbols "breaks_caps" {
+    key <LFSH> {
+	type = "ALPHABETIC",
+    	actions [Group1] = [
+	    SetMods(modifiers=Shift),
+	    SetMods(modifiers=Shift+Lock,clearLocks)
+	]
+    };
+    key <RTSH> {
+	type = "ALPHABETIC",
+	actions [Group1] = [
+	    SetMods(modifiers=Shift),
+	    SetMods(modifiers=Shift+Lock,clearLocks)
+	]
+    };
+};
+
+// When pressed together with another Shift key, set/release Lock.
+partial modifier_keys
+xkb_symbols "lshift_both_capslock" {
+  key <LFSH> {
+    type[Group1]="TWO_LEVEL",
+    symbols[Group1] = [ Shift_L,                       Caps_Lock                ]
+  };
+};
+// When pressed together with another Shift key, set or unset Lock.
+partial modifier_keys
+xkb_symbols "rshift_both_capslock" {
+  key <RTSH> {
+    type[Group1]="TWO_LEVEL",
+    symbols[Group1] = [ Shift_R,                       Caps_Lock                ]
+  };
+};
+partial modifier_keys
+xkb_symbols "both_capslock" {
+  include "shift(lshift_both_capslock)"
+  include "shift(rshift_both_capslock)"
+};
+
+// Release Lock when pressed alone and set Lock when pressed with another Shift key.
+partial modifier_keys
+xkb_symbols "lshift_both_capslock_cancel" {
+  key <LFSH> {
+    type[Group1]="ALPHABETIC",
+    symbols[Group1] = [ Shift_L,                       Caps_Lock                ]
+  };
+};
+// Release Lock when pressed alone and set Lock when pressed with another Shift key.
+partial modifier_keys
+xkb_symbols "rshift_both_capslock_cancel" {
+  key <RTSH> {
+    type[Group1]="ALPHABETIC",
+    symbols[Group1] = [ Shift_R,                       Caps_Lock                ]
+  };
+};
+partial modifier_keys
+xkb_symbols "both_capslock_cancel" {
+  include "shift(lshift_both_capslock_cancel)"
+  include "shift(rshift_both_capslock_cancel)"
+};
+
+
+// When pressed together with another Shift key, lock/unlock Shift.
+partial modifier_keys
+xkb_symbols "lshift_both_shiftlock" {
+  key <LFSH> {
+    type[Group1]="TWO_LEVEL",
+    symbols[Group1] = [ Shift_L,                       Shift_Lock ]
+  };
+};
+// When pressed together with another Shift key, lock/unlock Shift.
+partial modifier_keys
+xkb_symbols "rshift_both_shiftlock" {
+  key <RTSH> {
+    type[Group1]="TWO_LEVEL",
+    symbols[Group1] = [ Shift_R,                       Shift_Lock ]
+  };
+};
+partial modifier_keys
+xkb_symbols "both_shiftlock" {
+  include "shift(lshift_both_shiftlock)"
+  include "shift(rshift_both_shiftlock)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sony_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/sony_vndr/Makefile.am
index e1a77d957..5577f7c7c 100644
--- a/xorg-server/xkeyboard-config/symbols/sony_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/sony_vndr/Makefile.am
@@ -1,4 +1,4 @@
-symbolsdir = $(xkb_base)/symbols/sony_vndr
-
-dist_symbols_DATA = \
-us
+symbolsdir = $(xkb_base)/symbols/sony_vndr
+
+dist_symbols_DATA = \
+us
diff --git a/xorg-server/xkeyboard-config/symbols/sony_vndr/us b/xorg-server/xkeyboard-config/symbols/sony_vndr/us
index a34d7b931..e91ca11b2 100644
--- a/xorg-server/xkeyboard-config/symbols/sony_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/sony_vndr/us
@@ -1,91 +1,91 @@
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//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 OPEN GROUP 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 Open Group 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 Open Group.
-//
-// US/ASCII layout for a nwp5461 keyboard
-xkb_symbols "nwp5461" {
-    include "us(basic)"
-
-    key <LALT> { [ Alt_L, Meta_L	]	};
-    key <RTSH> { [ Shift_R	]	};
-    key <AB11> { [ NoSymbol	]	};
-
-    // Begin "Function" section
-    key <FK01> { [ F1		]	};
-    key <FK02> { [ F2		]	};
-    key <FK03> { [ F3		]	};
-    key <FK04> { [ F4		]	};
-    key <FK05> { [ F5		]	};
-    key <FK06> { [ F6		]	};
-    key <FK07> { [ F7		]	};
-    key <FK08> { [ F8		]	};
-    key <FK09> { [ F9		]	};
-    key <FK10> { [ F10		]	};
-    key <FK11> { [ F11		]	};
-    key <FK12> { [ F12		]	};
-    key <HELP> { [ Help		]	};
-    key <STOP> { [ Cancel	]	};
-    key <CUT>  { [ Select	]	};
-    key <EXEC> { [ Execute	]	};
-    key <DELE> { [ Delete	]	};
-    key <LEFT> { [ Left		]	};
-    key <RGHT> { [ Right	]	};
-    key <UP>   { [ Up		]	};
-    key <DOWN> { [ Down		]	};
-    key <PGUP> { [ Prior	]	};
-    key <PGDN> { [ Next		]	};
-    key <INS>  { [ Insert	]	};
-    key <CLR>  { [ Clear	]	};
-    // End "Function" section
-
-    // Begin "Keypad" section
-    key <KPMU> { [ KP_Multiply	]	};
-    key <KPDV> { [ KP_Divide	]	};
-    key <KPAD> { [ KP_Add	]	};
-
-    key  <KP7> { [ KP_7		]	};
-    key  <KP8> { [ KP_8		]	};
-    key  <KP9> { [ KP_9		]	};
-    key <KPSU> { [ KP_Subtract	]	};
-
-    key  <KP4> { [ KP_4		]	};
-    key  <KP5> { [ KP_5		]	};
-    key  <KP6> { [ KP_6		]	};
-    key <KPSP> { [ KP_Separator ]	};
-
-    key  <KP1> { [ KP_1		]	};
-    key  <KP2> { [ KP_2		]	};
-    key  <KP3> { [ KP_3		]	};
-    key <KPEN> { [ KP_Enter	]	}; 
-
-    key  <KP0> { [ KP_0		]	};
-    key <KPDC> { [ KP_Decimal	]	};
-    key <KPTB> { [ KP_Tab	]	};
-    // End "Keypad" section
-
-
-    // begin modifier mappings
-    modifier_map Shift  	{ Shift_R };
-    modifier_map Mod3   	{ Alt_L };
-};
+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//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 OPEN GROUP 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 Open Group 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 Open Group.
+//
+// US/ASCII layout for a nwp5461 keyboard
+xkb_symbols "nwp5461" {
+    include "us(basic)"
+
+    key <LALT> { [ Alt_L, Meta_L	]	};
+    key <RTSH> { [ Shift_R	]	};
+    key <AB11> { [ NoSymbol	]	};
+
+    // Begin "Function" section
+    key <FK01> { [ F1		]	};
+    key <FK02> { [ F2		]	};
+    key <FK03> { [ F3		]	};
+    key <FK04> { [ F4		]	};
+    key <FK05> { [ F5		]	};
+    key <FK06> { [ F6		]	};
+    key <FK07> { [ F7		]	};
+    key <FK08> { [ F8		]	};
+    key <FK09> { [ F9		]	};
+    key <FK10> { [ F10		]	};
+    key <FK11> { [ F11		]	};
+    key <FK12> { [ F12		]	};
+    key <HELP> { [ Help		]	};
+    key <STOP> { [ Cancel	]	};
+    key <CUT>  { [ Select	]	};
+    key <EXEC> { [ Execute	]	};
+    key <DELE> { [ Delete	]	};
+    key <LEFT> { [ Left		]	};
+    key <RGHT> { [ Right	]	};
+    key <UP>   { [ Up		]	};
+    key <DOWN> { [ Down		]	};
+    key <PGUP> { [ Prior	]	};
+    key <PGDN> { [ Next		]	};
+    key <INS>  { [ Insert	]	};
+    key <CLR>  { [ Clear	]	};
+    // End "Function" section
+
+    // Begin "Keypad" section
+    key <KPMU> { [ KP_Multiply	]	};
+    key <KPDV> { [ KP_Divide	]	};
+    key <KPAD> { [ KP_Add	]	};
+
+    key  <KP7> { [ KP_7		]	};
+    key  <KP8> { [ KP_8		]	};
+    key  <KP9> { [ KP_9		]	};
+    key <KPSU> { [ KP_Subtract	]	};
+
+    key  <KP4> { [ KP_4		]	};
+    key  <KP5> { [ KP_5		]	};
+    key  <KP6> { [ KP_6		]	};
+    key <KPSP> { [ KP_Separator ]	};
+
+    key  <KP1> { [ KP_1		]	};
+    key  <KP2> { [ KP_2		]	};
+    key  <KP3> { [ KP_3		]	};
+    key <KPEN> { [ KP_Enter	]	}; 
+
+    key  <KP0> { [ KP_0		]	};
+    key <KPDC> { [ KP_Decimal	]	};
+    key <KPTB> { [ KP_Tab	]	};
+    // End "Keypad" section
+
+
+    // begin modifier mappings
+    modifier_map Shift  	{ Shift_R };
+    modifier_map Mod3   	{ Alt_L };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ara b/xorg-server/xkeyboard-config/symbols/sun_vndr/ara
index d62bb6da9..70e1b9b90 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ara
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ara
@@ -1,116 +1,116 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys 
-xkb_symbols "type6" {
-
-    name[Group1]= "Arabic";
-
-    key <TLDE> {  [   Arabic_thal,      Arabic_shadda, grave,    asciitilde   ]	};
-    key <AE01> {  [               1,          exclam, 1,          exclam      ] };
-    key <AE02> {  [               2,              at, 2,              at      ] };
-    key <AE03> {  [               3,      numbersign, 3,      numbersign      ] };
-    key <AE04> {  [               4,          dollar, 4,          dollar      ] };
-    key <AE05> {  [               5,         percent, 5,         percent      ] };
-    key <AE06> {  [               6,     asciicircum, 6,     asciicircum      ] };
-    key <AE07> {  [               7,       ampersand, 7,       ampersand      ] };
-    key <AE08> {  [               8,        asterisk, 8,        asterisk      ] };
-    key <AE09> {  [               9,      parenright, 9,      parenright      ] };
-    key <AE10> {  [               0,       parenleft, 0,       parenleft      ] };
-    key <AE11> {  [       minus,      underscore, minus,      underscore      ] };
-    key <AE12> {  [       equal,            plus, equal,            plus      ] };
-						
-    key <AD01> {  [      Arabic_dad,     Arabic_fatha, q,    Q     ]     };
-    key <AD02> {  [      Arabic_sad,     Arabic_fathatan, w,    W  ]     };
-    key <AD03> {  [     Arabic_theh,     Arabic_damma, e,    E     ]     };
-    key <AD04> {  [      Arabic_qaf,     Arabic_dammatan, r,    R  ]     };
-    key <AD05> {  [      Arabic_feh,     0x100fef9, t,    T        ]     };
-    key <AD06> {  [   Arabic_ghain, Arabic_hamzaunderalef, y,    Y ]     };
-    key <AD07> {  [      Arabic_ain,         grave, u,    U        ]     };
-    key <AD08> {  [       Arabic_ha,        division, i,    I      ]     };
-    key <AD09> {  [     Arabic_khah,       multiply, o,    O       ]     };
-    key <AD10> {  [      Arabic_hah,   Arabic_semicolon, p,    P  ]     };
-    key <AD11> {  [     Arabic_jeem,        greater, bracketleft,  braceleft       ]     };
-    key <AD12> {  [      Arabic_dal,        less,    bracketright, braceright      ]     };
-
-    key <AC01> {  [    Arabic_sheen,   Arabic_kasra, a,    A       ]     };
-    key <AC02> {  [     Arabic_seen,   Arabic_kasratan, s,    S    ]     };
-    key <AC03> {  [      Arabic_yeh,       bracketright, d,    D   ]     };
-    key <AC04> {  [      Arabic_beh,       bracketleft, f,    F    ]     };
-    key <AC05> {  [      Arabic_lam,       0x100fef7, g,    G      ]     };
-    key <AC06> {  [     Arabic_alef,   Arabic_hamzaonalef, h,    H ]     };
-    key <AC07> {  [      Arabic_teh,      Arabic_tatweel, j,    J  ]     };
-    key <AC08> {  [     Arabic_noon,      Arabic_comma, k,    K    ]     };
-    key <AC09> {  [     Arabic_meem,         slash, l,    L        ]     };
-    key <AC10> {  [      Arabic_kaf,           colon, semicolon,    colon      ]     };
-    key <AC11> {  [      Arabic_tah,        quotedbl, apostrophe,   quotedbl      ]     };
-    key <BKSL> {  [       backslash,             bar, backslash,             bar      ]     };
-
-    key <LSGT> {  [             bar,      brokenbar, bar,      brokenbar	  ]     };
-    key <AB01> {  [Arabic_hamzaonyeh,    asciitilde, z,    Z       ]     };
-    key <AB02> {  [    Arabic_hamza,      Arabic_sukun, x,    X    ]     };
-    key <AB03> {  [Arabic_hamzaonwaw,      braceright, c,    C     ]     };
-    key <AB04> {  [       Arabic_ra,       braceleft, v,    V      ]     };
-    key <AB05> {  [       0x100fefb,       0x100fef5, b,    B      ]     };
-    key <AB06> {  [Arabic_alefmaksura, Arabic_maddaonalef, n,    N ]     };
-    key <AB07> {  [Arabic_tehmarbuta,    apostrophe, m,    M       ]     };
-    key <AB08> {  [      Arabic_waw,         comma,  comma,    less        ]     };
-    key <AB09> {  [     Arabic_zain,         period, period,    greater       ]     };
-    key <AB10> {  [      Arabic_zah, Arabic_question_mark, slash,    question ]     };
-
-	include "level3(ralt_switch)"
-
-};
-
-
-partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/ara(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys 
+xkb_symbols "type6" {
+
+    name[Group1]= "Arabic";
+
+    key <TLDE> {  [   Arabic_thal,      Arabic_shadda, grave,    asciitilde   ]	};
+    key <AE01> {  [               1,          exclam, 1,          exclam      ] };
+    key <AE02> {  [               2,              at, 2,              at      ] };
+    key <AE03> {  [               3,      numbersign, 3,      numbersign      ] };
+    key <AE04> {  [               4,          dollar, 4,          dollar      ] };
+    key <AE05> {  [               5,         percent, 5,         percent      ] };
+    key <AE06> {  [               6,     asciicircum, 6,     asciicircum      ] };
+    key <AE07> {  [               7,       ampersand, 7,       ampersand      ] };
+    key <AE08> {  [               8,        asterisk, 8,        asterisk      ] };
+    key <AE09> {  [               9,      parenright, 9,      parenright      ] };
+    key <AE10> {  [               0,       parenleft, 0,       parenleft      ] };
+    key <AE11> {  [       minus,      underscore, minus,      underscore      ] };
+    key <AE12> {  [       equal,            plus, equal,            plus      ] };
+						
+    key <AD01> {  [      Arabic_dad,     Arabic_fatha, q,    Q     ]     };
+    key <AD02> {  [      Arabic_sad,     Arabic_fathatan, w,    W  ]     };
+    key <AD03> {  [     Arabic_theh,     Arabic_damma, e,    E     ]     };
+    key <AD04> {  [      Arabic_qaf,     Arabic_dammatan, r,    R  ]     };
+    key <AD05> {  [      Arabic_feh,     0x100fef9, t,    T        ]     };
+    key <AD06> {  [   Arabic_ghain, Arabic_hamzaunderalef, y,    Y ]     };
+    key <AD07> {  [      Arabic_ain,         grave, u,    U        ]     };
+    key <AD08> {  [       Arabic_ha,        division, i,    I      ]     };
+    key <AD09> {  [     Arabic_khah,       multiply, o,    O       ]     };
+    key <AD10> {  [      Arabic_hah,   Arabic_semicolon, p,    P  ]     };
+    key <AD11> {  [     Arabic_jeem,        greater, bracketleft,  braceleft       ]     };
+    key <AD12> {  [      Arabic_dal,        less,    bracketright, braceright      ]     };
+
+    key <AC01> {  [    Arabic_sheen,   Arabic_kasra, a,    A       ]     };
+    key <AC02> {  [     Arabic_seen,   Arabic_kasratan, s,    S    ]     };
+    key <AC03> {  [      Arabic_yeh,       bracketright, d,    D   ]     };
+    key <AC04> {  [      Arabic_beh,       bracketleft, f,    F    ]     };
+    key <AC05> {  [      Arabic_lam,       0x100fef7, g,    G      ]     };
+    key <AC06> {  [     Arabic_alef,   Arabic_hamzaonalef, h,    H ]     };
+    key <AC07> {  [      Arabic_teh,      Arabic_tatweel, j,    J  ]     };
+    key <AC08> {  [     Arabic_noon,      Arabic_comma, k,    K    ]     };
+    key <AC09> {  [     Arabic_meem,         slash, l,    L        ]     };
+    key <AC10> {  [      Arabic_kaf,           colon, semicolon,    colon      ]     };
+    key <AC11> {  [      Arabic_tah,        quotedbl, apostrophe,   quotedbl      ]     };
+    key <BKSL> {  [       backslash,             bar, backslash,             bar      ]     };
+
+    key <LSGT> {  [             bar,      brokenbar, bar,      brokenbar	  ]     };
+    key <AB01> {  [Arabic_hamzaonyeh,    asciitilde, z,    Z       ]     };
+    key <AB02> {  [    Arabic_hamza,      Arabic_sukun, x,    X    ]     };
+    key <AB03> {  [Arabic_hamzaonwaw,      braceright, c,    C     ]     };
+    key <AB04> {  [       Arabic_ra,       braceleft, v,    V      ]     };
+    key <AB05> {  [       0x100fefb,       0x100fef5, b,    B      ]     };
+    key <AB06> {  [Arabic_alefmaksura, Arabic_maddaonalef, n,    N ]     };
+    key <AB07> {  [Arabic_tehmarbuta,    apostrophe, m,    M       ]     };
+    key <AB08> {  [      Arabic_waw,         comma,  comma,    less        ]     };
+    key <AB09> {  [     Arabic_zain,         period, period,    greater       ]     };
+    key <AB10> {  [      Arabic_zah, Arabic_question_mark, slash,    question ]     };
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ara(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/be b/xorg-server/xkeyboard-config/symbols/sun_vndr/be
index 58abfd6e6..202e8a4c1 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/be
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/be
@@ -1,98 +1,98 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Belgium";
-
-    key <TLDE>  { [twosuperior, threesuperior                         ] };
-    key <AE01>  { [ ampersand,          1,          bar               ] };
-    key <AE02>  { [    eacute,          2,           at               ] };
-    key <AE03>  { [  quotedbl,          3,   numbersign               ] };
-    key <AE04>  { [apostrophe,          4                             ] };
-    key <AE05>  { [ parenleft,          5                             ] };
-    key <AE06>  { [   section,          6,  asciicircum               ] };
-    key <AE07>  { [    egrave,          7                             ] };
-    key <AE08>  { [    exclam,          8                             ] };
-    key <AE09>  { [  ccedilla,          9,    braceleft               ] };
-    key <AE10>  { [    agrave,          0,   braceright               ] };
-    key <AE11>  { [parenright,     degree                             ] };
-    key <AE12>  { [     minus, underscore                             ] };
-
-    key <AD01>  { [         a,          A                             ] };
-    key <AD02>  { [         z,          Z                             ] };
-    key <AD03>  { [         e,          E,     EuroSign               ] };
-    key <AD09>  { [         o,          O                             ] };
-    key <AD11>  { [dead_circumflex, dead_diaeresis,  bracketleft      ] };
-    key <AD12>  { [    dollar,   asterisk, bracketright               ] };
-
-    key <AC01>  { [         q,          Q                             ] };
-    key <AC10>  { [         m,          M                             ] };
-    key <AC11>  { [    ugrave,    percent,   dead_acute               ] };
-    key <BKSL>  { [        mu,   sterling,   dead_grave               ] };
-
-    key <LSGT>  { [      less,    greater,    backslash               ] };
-    key <AB01>  { [         w,          W                             ] };
-    key <AB07>  { [     comma,   question                             ] };
-    key <AB08>  { [ semicolon,     period                             ] };
-    key <AB09>  { [     colon,      slash                             ] };
-    key <AB10>  { [     equal,       plus,   dead_tilde               ] };
-
-	include "level3(ralt_switch)"
-
-};
-
-
-partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/be(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Belgium";
+
+    key <TLDE>  { [twosuperior, threesuperior                         ] };
+    key <AE01>  { [ ampersand,          1,          bar               ] };
+    key <AE02>  { [    eacute,          2,           at               ] };
+    key <AE03>  { [  quotedbl,          3,   numbersign               ] };
+    key <AE04>  { [apostrophe,          4                             ] };
+    key <AE05>  { [ parenleft,          5                             ] };
+    key <AE06>  { [   section,          6,  asciicircum               ] };
+    key <AE07>  { [    egrave,          7                             ] };
+    key <AE08>  { [    exclam,          8                             ] };
+    key <AE09>  { [  ccedilla,          9,    braceleft               ] };
+    key <AE10>  { [    agrave,          0,   braceright               ] };
+    key <AE11>  { [parenright,     degree                             ] };
+    key <AE12>  { [     minus, underscore                             ] };
+
+    key <AD01>  { [         a,          A                             ] };
+    key <AD02>  { [         z,          Z                             ] };
+    key <AD03>  { [         e,          E,     EuroSign               ] };
+    key <AD09>  { [         o,          O                             ] };
+    key <AD11>  { [dead_circumflex, dead_diaeresis,  bracketleft      ] };
+    key <AD12>  { [    dollar,   asterisk, bracketright               ] };
+
+    key <AC01>  { [         q,          Q                             ] };
+    key <AC10>  { [         m,          M                             ] };
+    key <AC11>  { [    ugrave,    percent,   dead_acute               ] };
+    key <BKSL>  { [        mu,   sterling,   dead_grave               ] };
+
+    key <LSGT>  { [      less,    greater,    backslash               ] };
+    key <AB01>  { [         w,          W                             ] };
+    key <AB07>  { [     comma,   question                             ] };
+    key <AB08>  { [ semicolon,     period                             ] };
+    key <AB09>  { [     colon,      slash                             ] };
+    key <AB10>  { [     equal,       plus,   dead_tilde               ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/be(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/br b/xorg-server/xkeyboard-config/symbols/sun_vndr/br
index 3cea0bf9c..7ad2dd1cf 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/br
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/br
@@ -1,101 +1,101 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Brazil";
-
-    key <TLDE> { [      apostrophe,        quotedbl,	notsign		               ] };
-    key <AE01> { [               1,          exclam,	onesuperior,        exclamdown ] };
-    key <AE02> { [               2,              at,	twosuperior,           onehalf ] };
-    key <AE03> { [               3,      numbersign,	threesuperior,   threequarters ] };
-    key <AE04> { [               4,          dollar,	sterling,           onequarter ] };
-    key <AE05> { [               5,         percent,	cent                           ] };
-    key <AE06> { [               6,  dead_diaeresis,	notsign,             diaeresis ] };
-    key <AE07> { [               7,       ampersand,	braceleft                      ] };
-    key <AE08> { [               8,        asterisk,	bracketleft                    ] };
-    key <AE09> { [               9,       parenleft,	bracketright                   ] };
-    key <AE10> { [               0,      parenright,	braceright                     ] };
-    key <AE11> { [           minus,      underscore,	backslash                      ] };
-    key <AE12> { [           equal,            plus,	section                        ] };
-
-    key <AD03> { [               e,               E,	EuroSign                       ] };
-    key <AD04> { [               r,               R,	registered                     ] };
-    key <AD11> { [      dead_acute,      dead_grave,	acute,                   grave ] };
-    key <AD12> { [     bracketleft,       braceleft,	ordfeminine                    ] };
-
-    key <AC10> { [        ccedilla,        Ccedilla,	exclamdown		       ] };
-    key <AC11> { [      dead_tilde, dead_circumflex,	asciitilde,        asciicircum ] };
-    key <AC12> { [    bracketright,      braceright,	masculine                      ] };
-    key <BKSL> { [   bracketright,       braceright,    masculine                      ] };
-
-    key <LSGT> { [          slash,              bar,    degree                         ] };
-    key <AB01> { [               z,               Z,	guillemotleft 		       ] };
-    key <AB02> { [               x,               X,	guillemotright                 ] };
-    key <AB03> { [               c,               C,	copyright                      ] };
-    key <AB07> { [               m,               M,	mu                             ] };
-    key <AB08> { [           comma,            less,	question                       ] };
-    key <AB09> { [          period,         greater,	questiondown                   ] };
-    key <AB10> { [       semicolon,           colon                                    ] };
-    key <AB11> { [           slash,        question,	degree,           questiondown ] };
-
-    key <KPPT> { [      KP_Decimal                                                     ] };
-    key <KPDL> { [       KP_Delete,           comma                                    ] };
-
-	include "level3(ralt_switch)"
-
-};
-
-
-partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/br(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Brazil";
+
+    key <TLDE> { [      apostrophe,        quotedbl,	notsign		               ] };
+    key <AE01> { [               1,          exclam,	onesuperior,        exclamdown ] };
+    key <AE02> { [               2,              at,	twosuperior,           onehalf ] };
+    key <AE03> { [               3,      numbersign,	threesuperior,   threequarters ] };
+    key <AE04> { [               4,          dollar,	sterling,           onequarter ] };
+    key <AE05> { [               5,         percent,	cent                           ] };
+    key <AE06> { [               6,  dead_diaeresis,	notsign,             diaeresis ] };
+    key <AE07> { [               7,       ampersand,	braceleft                      ] };
+    key <AE08> { [               8,        asterisk,	bracketleft                    ] };
+    key <AE09> { [               9,       parenleft,	bracketright                   ] };
+    key <AE10> { [               0,      parenright,	braceright                     ] };
+    key <AE11> { [           minus,      underscore,	backslash                      ] };
+    key <AE12> { [           equal,            plus,	section                        ] };
+
+    key <AD03> { [               e,               E,	EuroSign                       ] };
+    key <AD04> { [               r,               R,	registered                     ] };
+    key <AD11> { [      dead_acute,      dead_grave,	acute,                   grave ] };
+    key <AD12> { [     bracketleft,       braceleft,	ordfeminine                    ] };
+
+    key <AC10> { [        ccedilla,        Ccedilla,	exclamdown		       ] };
+    key <AC11> { [      dead_tilde, dead_circumflex,	asciitilde,        asciicircum ] };
+    key <AC12> { [    bracketright,      braceright,	masculine                      ] };
+    key <BKSL> { [   bracketright,       braceright,    masculine                      ] };
+
+    key <LSGT> { [          slash,              bar,    degree                         ] };
+    key <AB01> { [               z,               Z,	guillemotleft 		       ] };
+    key <AB02> { [               x,               X,	guillemotright                 ] };
+    key <AB03> { [               c,               C,	copyright                      ] };
+    key <AB07> { [               m,               M,	mu                             ] };
+    key <AB08> { [           comma,            less,	question                       ] };
+    key <AB09> { [          period,         greater,	questiondown                   ] };
+    key <AB10> { [       semicolon,           colon                                    ] };
+    key <AB11> { [           slash,        question,	degree,           questiondown ] };
+
+    key <KPPT> { [      KP_Decimal                                                     ] };
+    key <KPDL> { [       KP_Delete,           comma                                    ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/br(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
index 6fb72c462..4705123dc 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
@@ -1,97 +1,97 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-   name[Group1]="Canada Bilingual";
-
-   key <TLDE> { [           slash, bar,             backslash                  ]};
-   key <AE01> { [               1, exclam,          plusminus                  ]};
-   key <AE02> { [               2, at                                          ]};
-   key <AE03> { [               3, numbersign,      sterling                   ]};
-   key <AE04> { [               4, dollar,          cent                       ]};
-   key <AE05> { [               5, percent,         currency                   ]};
-   key <AE06> { [               6, question,        notsign	               ]};
-   key <AE07> { [               7, ampersand,       braceleft                  ]};
-   key <AE08> { [               8, asterisk,        braceright                 ]};
-   key <AE09> { [               9, parenleft,       bracketleft                ]};
-   key <AE10> { [               0, parenright,      bracketright               ]};
-   key <AE11> { [           minus, underscore,      onehalf	               ]};
-   key <AE12> { [           equal, plus,            notsign                    ]};
-  
-   key <AD03> { [               e, E,               EuroSign		       ]};
-   key <AD09> { [               o, O,               section		       ]};
-   key <AD10> { [               p, P,               paragraph                  ]};
-   key <AD11> { [ dead_circumflex, dead_diaeresis,  dead_grave                 ]};
-   key <AD12> { [        ccedilla, Ccedilla,        asciitilde                 ]};
-
-   key <AC10> { [       semicolon, colon,           degree                     ]};
-   key <AC11> { [          egrave, Egrave,          braceleft                  ]};
-   key <AC12> { [          agrave, Agrave,          braceright                 ]};
-   key <BKSL> { [          agrave, Agrave,          braceright                 ]};
-
-   key <LSGT> { [          uacute, Uacute                                      ]};
-   key <AB01> { [               z, Z,               guillemotleft              ]};
-   key <AB02> { [               x, X,               guillemotright             ]};
-   key <AB07> { [               m, M,               mu                         ]};
-   key <AB08> { [           comma, quoteright,      less                       ]};
-   key <AB09> { [          period, quotedbl,        greater                    ]};
-   key <AB10> { [          eacute, Eacute,          quoteleft                  ]};
-   
-	include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/ca(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+   name[Group1]="Canada Bilingual";
+
+   key <TLDE> { [           slash, bar,             backslash                  ]};
+   key <AE01> { [               1, exclam,          plusminus                  ]};
+   key <AE02> { [               2, at                                          ]};
+   key <AE03> { [               3, numbersign,      sterling                   ]};
+   key <AE04> { [               4, dollar,          cent                       ]};
+   key <AE05> { [               5, percent,         currency                   ]};
+   key <AE06> { [               6, question,        notsign	               ]};
+   key <AE07> { [               7, ampersand,       braceleft                  ]};
+   key <AE08> { [               8, asterisk,        braceright                 ]};
+   key <AE09> { [               9, parenleft,       bracketleft                ]};
+   key <AE10> { [               0, parenright,      bracketright               ]};
+   key <AE11> { [           minus, underscore,      onehalf	               ]};
+   key <AE12> { [           equal, plus,            notsign                    ]};
+  
+   key <AD03> { [               e, E,               EuroSign		       ]};
+   key <AD09> { [               o, O,               section		       ]};
+   key <AD10> { [               p, P,               paragraph                  ]};
+   key <AD11> { [ dead_circumflex, dead_diaeresis,  dead_grave                 ]};
+   key <AD12> { [        ccedilla, Ccedilla,        asciitilde                 ]};
+
+   key <AC10> { [       semicolon, colon,           degree                     ]};
+   key <AC11> { [          egrave, Egrave,          braceleft                  ]};
+   key <AC12> { [          agrave, Agrave,          braceright                 ]};
+   key <BKSL> { [          agrave, Agrave,          braceright                 ]};
+
+   key <LSGT> { [          uacute, Uacute                                      ]};
+   key <AB01> { [               z, Z,               guillemotleft              ]};
+   key <AB02> { [               x, X,               guillemotright             ]};
+   key <AB07> { [               m, M,               mu                         ]};
+   key <AB08> { [           comma, quoteright,      less                       ]};
+   key <AB09> { [          period, quotedbl,        greater                    ]};
+   key <AB10> { [          eacute, Eacute,          quoteleft                  ]};
+   
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ca(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ch b/xorg-server/xkeyboard-config/symbols/sun_vndr/ch
index 82c0681cc..8a41ea303 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ch
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ch
@@ -1,133 +1,133 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys 
-xkb_symbols "de_type6" {
-
-    name[Group1]= "Switzerland - German";
-
-    key <TLDE> { [    section,     degree                           ] };
-    key <AE01> { [          1,       plus,          bar             ] };
-    key <AE02> { [          2,   quotedbl,           at             ] };
-    key <AE03> { [          3,   asterisk,   numbersign             ] };
-    key <AE04> { [          4,   ccedilla,  asciicircum             ] };
-    key <AE05> { [          5,    percent,   asciitilde             ] };
-    key <AE06> { [          6,  ampersand,      notsign             ] };
-    key <AE07> { [          7,      slash,    brokenbar             ] };
-    key <AE08> { [          8,  parenleft,         cent             ] };
-    key <AE09> { [          9, parenright                           ] };
-    key <AE10> { [          0,      equal,    quoteleft             ] };
-    key <AE11> { [ quoteright,   question,   dead_acute             ] };
-    key <AE12> { [ dead_circumflex, dead_grave, dead_tilde          ] };
-
-    key <AD03> { [          e,          E,     EuroSign             ] };
-    key <AD06> { [          z,          Z                           ] };
-    key <AD11> { [ udiaeresis,     egrave,  bracketleft             ] };
-    key <AD12> { [ dead_diaeresis, exclam, bracketright             ] };
-
-    key <AC10> { [ odiaeresis,     eacute                           ] };
-    key <AC11> { [ adiaeresis,     agrave,    braceleft             ] };
-    key <BKSL> { [     dollar,   sterling,   braceright             ] };
-
-    key <LSGT> { [       less,    greater,    backslash             ] };
-    key <AB01> { [          y,          Y                           ] };
-    key <AB08> { [      comma,  semicolon                           ] };
-    key <AB09> { [     period,      colon                           ] };
-    key <AB10> { [      minus, underscore                           ] };
-
-	include "level3(ralt_switch)"
-
-};
-
-
-
-partial alphanumeric_keys 
-xkb_symbols "fr_type6" {
-
-    name[Group1]= "Switzerland - French, Sun type 6";
-
-    key <TLDE> { [    section,     degree                           ] };
-    key <AE01> { [          1,       plus,          bar             ] };
-    key <AE02> { [          2,   quotedbl,           at             ] };
-    key <AE03> { [          3,   asterisk,   numbersign             ] };
-    key <AE04> { [          4,   ccedilla,  asciicircum             ] };
-    key <AE05> { [          5,    percent,   asciitilde             ] };
-    key <AE06> { [          6,  ampersand,      notsign             ] };
-    key <AE07> { [          7,      slash,    brokenbar             ] };
-    key <AE08> { [          8,  parenleft,         cent             ] };
-    key <AE09> { [          9, parenright                           ] };
-    key <AE10> { [          0,      equal,    quoteleft             ] };
-    key <AE11> { [ quoteright,   question,   dead_acute             ] };
-    key <AE12> { [ dead_circumflex, dead_grave, dead_tilde          ] };
-
-    key <AD03> { [          e,          E,     EuroSign             ] };
-    key <AD06> { [          z,          Z                           ] };
-    key <AD11> { [     egrave, udiaeresis,  bracketleft             ] };
-    key <AD12> { [ dead_diaeresis, exclam, bracketright             ] };
-
-    key <AC10> { [     eacute, odiaeresis                           ] };
-    key <AC11> { [     agrave, adiaeresis,    braceleft             ] };
-    key <BKSL> { [     dollar,   sterling,   braceright             ] };
-
-    key <LSGT> { [       less,    greater,    backslash             ] };
-    key <AB01> { [          y,          Y                           ] };
-    key <AB08> { [      comma,  semicolon                           ] };
-    key <AB09> { [     period,      colon                           ] };
-    key <AB10> { [      minus, underscore                           ] };
-	
-	include "level3(ralt_switch)"
-
-};
-
-
-partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/ch(de_type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys 
+xkb_symbols "de_type6" {
+
+    name[Group1]= "Switzerland - German";
+
+    key <TLDE> { [    section,     degree                           ] };
+    key <AE01> { [          1,       plus,          bar             ] };
+    key <AE02> { [          2,   quotedbl,           at             ] };
+    key <AE03> { [          3,   asterisk,   numbersign             ] };
+    key <AE04> { [          4,   ccedilla,  asciicircum             ] };
+    key <AE05> { [          5,    percent,   asciitilde             ] };
+    key <AE06> { [          6,  ampersand,      notsign             ] };
+    key <AE07> { [          7,      slash,    brokenbar             ] };
+    key <AE08> { [          8,  parenleft,         cent             ] };
+    key <AE09> { [          9, parenright                           ] };
+    key <AE10> { [          0,      equal,    quoteleft             ] };
+    key <AE11> { [ quoteright,   question,   dead_acute             ] };
+    key <AE12> { [ dead_circumflex, dead_grave, dead_tilde          ] };
+
+    key <AD03> { [          e,          E,     EuroSign             ] };
+    key <AD06> { [          z,          Z                           ] };
+    key <AD11> { [ udiaeresis,     egrave,  bracketleft             ] };
+    key <AD12> { [ dead_diaeresis, exclam, bracketright             ] };
+
+    key <AC10> { [ odiaeresis,     eacute                           ] };
+    key <AC11> { [ adiaeresis,     agrave,    braceleft             ] };
+    key <BKSL> { [     dollar,   sterling,   braceright             ] };
+
+    key <LSGT> { [       less,    greater,    backslash             ] };
+    key <AB01> { [          y,          Y                           ] };
+    key <AB08> { [      comma,  semicolon                           ] };
+    key <AB09> { [     period,      colon                           ] };
+    key <AB10> { [      minus, underscore                           ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+
+
+partial alphanumeric_keys 
+xkb_symbols "fr_type6" {
+
+    name[Group1]= "Switzerland - French, Sun type 6";
+
+    key <TLDE> { [    section,     degree                           ] };
+    key <AE01> { [          1,       plus,          bar             ] };
+    key <AE02> { [          2,   quotedbl,           at             ] };
+    key <AE03> { [          3,   asterisk,   numbersign             ] };
+    key <AE04> { [          4,   ccedilla,  asciicircum             ] };
+    key <AE05> { [          5,    percent,   asciitilde             ] };
+    key <AE06> { [          6,  ampersand,      notsign             ] };
+    key <AE07> { [          7,      slash,    brokenbar             ] };
+    key <AE08> { [          8,  parenleft,         cent             ] };
+    key <AE09> { [          9, parenright                           ] };
+    key <AE10> { [          0,      equal,    quoteleft             ] };
+    key <AE11> { [ quoteright,   question,   dead_acute             ] };
+    key <AE12> { [ dead_circumflex, dead_grave, dead_tilde          ] };
+
+    key <AD03> { [          e,          E,     EuroSign             ] };
+    key <AD06> { [          z,          Z                           ] };
+    key <AD11> { [     egrave, udiaeresis,  bracketleft             ] };
+    key <AD12> { [ dead_diaeresis, exclam, bracketright             ] };
+
+    key <AC10> { [     eacute, odiaeresis                           ] };
+    key <AC11> { [     agrave, adiaeresis,    braceleft             ] };
+    key <BKSL> { [     dollar,   sterling,   braceright             ] };
+
+    key <LSGT> { [       less,    greater,    backslash             ] };
+    key <AB01> { [          y,          Y                           ] };
+    key <AB08> { [      comma,  semicolon                           ] };
+    key <AB09> { [     period,      colon                           ] };
+    key <AB10> { [      minus, underscore                           ] };
+	
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ch(de_type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/cz b/xorg-server/xkeyboard-config/symbols/sun_vndr/cz
index 55859db9a..b46f01c2b 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/cz
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/cz
@@ -1,105 +1,105 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Czech";
-
-    key <TLDE>	{ [ semicolon, dead_abovering,	quoteleft,     asciitilde 	]	};
-    key <AE01>	{ [      plus,          1,	exclam,     asciitilde	 	]	};
-    key <AE02>	{ [    ecaron,          2,	at,     dead_caron 		]	};
-    key <AE03>	{ [    scaron,          3,	numbersign,  dead_circumflex 	] 	};
-    key <AE04>	{ [    ccaron,          4,	dollar,     dead_breve 		]	};
-    key <AE05>	{ [    rcaron,          5,	percent, dead_abovering 	] 	};
-    key <AE06>	{ [    zcaron,          6,	asciicircum,  dead_ogonek 	]	};
-    key <AE07>	{ [    yacute,          7,	ampersand,          grave 	]	};
-    key <AE08>	{ [    aacute,          8,	asterisk,  dead_abovedot	]	};
-    key <AE09>	{ [    iacute,          9,	parenleft,    dead_acute    	]	};
-    key <AE10>	{ [    eacute,          0,	parenright, dead_doubleacute	]	};
-    key <AE11>	{ [     equal,    percent,	dead_diaeresis, backslash 	]	};
-    key <AE12>	{ [ dead_acute, dead_caron,	dead_cedilla, minus 		]	};
-
-    key <AD01>	{ [         q,          Q,	backslash 		]	};
-    key <AD02>	{ [         w,          W,	bar 			]	};
-    key <AD03>	{ [         e,          E,	EuroSign 		]	};
-    key <AD06>	{ [         z,          Z 				]	};
-    key <AD11>	{ [    uacute,      slash,	division 		]	};
-    key <AD12>	{ [parenright,  parenleft,	multiply 		]	};
-
-    key <AC02>	{ [         s,          S,	dstroke			]	};
-    key <AC03>	{ [         d,          D,	Dstroke 		]	};
-    key <AC04>	{ [         f,          F,	bracketleft 		]	};
-    key <AC05>	{ [         g,          G,	bracketright 		]	};
-    key <AC08>	{ [         k,          K,	lstroke 		]	};
-    key <AC09>	{ [         l,          L,	Lstroke 		]	};              
-    key <AC10>	{ [      uring,       quotedbl,	dollar 			]	};
-    key <AC11>	{ [    section,         exclam,	ssharp,       currency	]	};
-    key <BKSL>	{ [ dead_diaeresis, apostrophe,	backslash,         bar	]	};
-
-    key <LSGT>	{ [  backslash,       asterisk,	slash,	     brokenbar	]	};
-    key <AB01>	{ [          y,          Y,	less	 		]	};
-    key <AB02>	{ [          x,          X,	greater,    numbersign  ]	};
-    key <AB04>	{ [          v,          V,	at 			]	};
-    key <AB05>	{ [          b,          B,	braceleft 		]	};
-    key <AB06>	{ [          n,          N,	braceright	 	]	};
-    key <AB08>	{ [      comma,       question,	less			]	};
-    key <AB09>	{ [     period,          colon,	greater			]	};
-    key <AB10>	{ [      minus,     underscore                   	]	};
-
-	include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/cz(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Czech";
+
+    key <TLDE>	{ [ semicolon, dead_abovering,	quoteleft,     asciitilde 	]	};
+    key <AE01>	{ [      plus,          1,	exclam,     asciitilde	 	]	};
+    key <AE02>	{ [    ecaron,          2,	at,     dead_caron 		]	};
+    key <AE03>	{ [    scaron,          3,	numbersign,  dead_circumflex 	] 	};
+    key <AE04>	{ [    ccaron,          4,	dollar,     dead_breve 		]	};
+    key <AE05>	{ [    rcaron,          5,	percent, dead_abovering 	] 	};
+    key <AE06>	{ [    zcaron,          6,	asciicircum,  dead_ogonek 	]	};
+    key <AE07>	{ [    yacute,          7,	ampersand,          grave 	]	};
+    key <AE08>	{ [    aacute,          8,	asterisk,  dead_abovedot	]	};
+    key <AE09>	{ [    iacute,          9,	parenleft,    dead_acute    	]	};
+    key <AE10>	{ [    eacute,          0,	parenright, dead_doubleacute	]	};
+    key <AE11>	{ [     equal,    percent,	dead_diaeresis, backslash 	]	};
+    key <AE12>	{ [ dead_acute, dead_caron,	dead_cedilla, minus 		]	};
+
+    key <AD01>	{ [         q,          Q,	backslash 		]	};
+    key <AD02>	{ [         w,          W,	bar 			]	};
+    key <AD03>	{ [         e,          E,	EuroSign 		]	};
+    key <AD06>	{ [         z,          Z 				]	};
+    key <AD11>	{ [    uacute,      slash,	division 		]	};
+    key <AD12>	{ [parenright,  parenleft,	multiply 		]	};
+
+    key <AC02>	{ [         s,          S,	dstroke			]	};
+    key <AC03>	{ [         d,          D,	Dstroke 		]	};
+    key <AC04>	{ [         f,          F,	bracketleft 		]	};
+    key <AC05>	{ [         g,          G,	bracketright 		]	};
+    key <AC08>	{ [         k,          K,	lstroke 		]	};
+    key <AC09>	{ [         l,          L,	Lstroke 		]	};              
+    key <AC10>	{ [      uring,       quotedbl,	dollar 			]	};
+    key <AC11>	{ [    section,         exclam,	ssharp,       currency	]	};
+    key <BKSL>	{ [ dead_diaeresis, apostrophe,	backslash,         bar	]	};
+
+    key <LSGT>	{ [  backslash,       asterisk,	slash,	     brokenbar	]	};
+    key <AB01>	{ [          y,          Y,	less	 		]	};
+    key <AB02>	{ [          x,          X,	greater,    numbersign  ]	};
+    key <AB04>	{ [          v,          V,	at 			]	};
+    key <AB05>	{ [          b,          B,	braceleft 		]	};
+    key <AB06>	{ [          n,          N,	braceright	 	]	};
+    key <AB08>	{ [      comma,       question,	less			]	};
+    key <AB09>	{ [     period,          colon,	greater			]	};
+    key <AB10>	{ [      minus,     underscore                   	]	};
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/cz(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/de b/xorg-server/xkeyboard-config/symbols/sun_vndr/de
index 2c46ea941..5177b989a 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/de
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/de
@@ -1,140 +1,140 @@
-//
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Germany";
-
-    key <TLDE> { [     asciicircum,           degree                   ] };
-    key <AE02> { [               2,         quotedbl,     twosuperior  ] }; 
-    key <AE03> { [               3,          section,   threesuperior  ] };
-    key <AE04> { [               4,           dollar                   ] };
-    key <AE06> { [               6,        ampersand,         section  ] };
-    key <AE07> { [               7,            slash,       braceleft  ] };
-    key <AE08> { [               8,        parenleft,     bracketleft  ] };
-    key <AE09> { [               9,       parenright,    bracketright  ] };
-    key <AE10> { [               0,            equal,      braceright  ] };
-    key <AE11> { [          ssharp,         question,       backslash  ] };
-    key <AE12> { [      dead_acute,       dead_grave                   ] };
-    key <AD01> { [               q,                Q,              at  ] };
-    key <AD03> { [               e,                E,        EuroSign  ] };
-    key <AD06> { [               z,                Z                   ] };
-    key <AD11> { [      udiaeresis,       Udiaeresis                   ] };
-    key <AD12> { [            plus,         asterisk,      asciitilde  ] };
-    key <AC10> { [      odiaeresis,       Odiaeresis                   ] };
-    key <AC11> { [      adiaeresis,       Adiaeresis                   ] };
-    key <AB01> { [               y,                Y                   ] };
-    key <AB07> { [               m,                M,              mu  ] };
-    key <AB08> { [           comma,        semicolon                   ] };
-    key <AB09> { [          period,            colon                   ] };
-    key <AB10> { [           minus,       underscore                   ] };
-    key <BKSL> { [      numbersign,       apostrophe,           grave  ] };
-    key <LSGT> { [            less,          greater,             bar  ] };
-
-        include "level3(ralt_switch)"
-        include "kpdl(comma)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "type4" {
-
-    name[Group1]="Germany - Sun type 4";
-
-    key <BKSL>  { [           less,     braceleft     					      ] };
-    key <BRCR>  { [        greater,    braceright     					      ] };
-    key <DELE>  { [         Delete                                                            ] };
-
-    key <AE01> { [               1,          plus,               exclam                       ] };
-    key <AE02> { [               2,      quotedbl,                   at,            oneeighth ]	};
-    key <AE03> { [               3,      asterisk,           numbersign,             sterling ]	};
-    key <AE04> { [               4,      ccedilla,                 cent                       ]	};
-    key <AE05> { [               5,       percent,           asciitilde                       ] };
-    key <AE06> { [               6,     ampersand,              section                       ] };
-    key <AE07> { [               7,         slash,                  bar                       ] };
-    key <AE08> { [               8,     parenleft,               degree                       ] };
-    key <AE09> { [               9,    parenright,            backslash                       ] };
-    key <AE10> { [               0,         equal,          asciicircum                       ] };
-    Key <AE11> { [      quoteright,      question,            quoteleft                       ] };
-    key <AE12> { [ dead_circumflex,    dead_grave                                             ] };
-
-    key <AD03>	{ [              e,             E,             EuroSign,             EuroSign ]	};
-    key <AD06>	{ [              z,             Z,            leftarrow,                  yen ]	};
-    key <AD11>	{ [     udiaeresis,        egrave,       dead_diaeresis,       dead_abovering ] };
-    key <AD12>	{ [ dead_diaeresis,    dead_acute                                             ] };
-
-    key <AC02>  { [              s,             S                                             ] };
-    key <AC07>  { [              j,             J,        dead_belowdot,        dead_abovedot ] };
-    key <AC10>	{ [     odiaeresis,        eacute,     dead_doubleacute,        dead_belowdot ] };
-    key <AC11>	{ [     adiaeresis,        agrave,      dead_circumflex,           dead_caron ] };
-    key <TLDE>	{ [         dollar,    dead_tilde,             sterling                       ] };
-
-    key <AB01>	{ [              y,             Y,       guillemotright                       ] };
-    key <AB02>	{ [              x,             X,        guillemotleft 	              ] };
-    key <AB04>	{ [              v,             V,   doublelowquotemark,   singlelowquotemark ]	};
-    key <AB05>	{ [              b,             B,  leftdoublequotemark,  leftsinglequotemark ] };
-    key <AB06>	{ [              n,             N, rightdoublequotemark, rightsinglequotemark ]	};    
-    key <AB07>  { [              m,             M,                   mu                       ] };
-    key <AB08>  { [          comma,     semicolon,       periodcentered,             multiply ] };
-    key <AB09>	{ [         period,         colon                                             ] };
-    key <AB10>	{ [          minus,    underscore                                             ] };
-
-	include "level3(ralt_switch)"
-	include "kpdl(comma)"
-
-};
-
-
-partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/de(type6)"
-};
+//
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Germany";
+
+    key <TLDE> { [     asciicircum,           degree                   ] };
+    key <AE02> { [               2,         quotedbl,     twosuperior  ] }; 
+    key <AE03> { [               3,          section,   threesuperior  ] };
+    key <AE04> { [               4,           dollar                   ] };
+    key <AE06> { [               6,        ampersand,         section  ] };
+    key <AE07> { [               7,            slash,       braceleft  ] };
+    key <AE08> { [               8,        parenleft,     bracketleft  ] };
+    key <AE09> { [               9,       parenright,    bracketright  ] };
+    key <AE10> { [               0,            equal,      braceright  ] };
+    key <AE11> { [          ssharp,         question,       backslash  ] };
+    key <AE12> { [      dead_acute,       dead_grave                   ] };
+    key <AD01> { [               q,                Q,              at  ] };
+    key <AD03> { [               e,                E,        EuroSign  ] };
+    key <AD06> { [               z,                Z                   ] };
+    key <AD11> { [      udiaeresis,       Udiaeresis                   ] };
+    key <AD12> { [            plus,         asterisk,      asciitilde  ] };
+    key <AC10> { [      odiaeresis,       Odiaeresis                   ] };
+    key <AC11> { [      adiaeresis,       Adiaeresis                   ] };
+    key <AB01> { [               y,                Y                   ] };
+    key <AB07> { [               m,                M,              mu  ] };
+    key <AB08> { [           comma,        semicolon                   ] };
+    key <AB09> { [          period,            colon                   ] };
+    key <AB10> { [           minus,       underscore                   ] };
+    key <BKSL> { [      numbersign,       apostrophe,           grave  ] };
+    key <LSGT> { [            less,          greater,             bar  ] };
+
+        include "level3(ralt_switch)"
+        include "kpdl(comma)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "type4" {
+
+    name[Group1]="Germany - Sun type 4";
+
+    key <BKSL>  { [           less,     braceleft     					      ] };
+    key <BRCR>  { [        greater,    braceright     					      ] };
+    key <DELE>  { [         Delete                                                            ] };
+
+    key <AE01> { [               1,          plus,               exclam                       ] };
+    key <AE02> { [               2,      quotedbl,                   at,            oneeighth ]	};
+    key <AE03> { [               3,      asterisk,           numbersign,             sterling ]	};
+    key <AE04> { [               4,      ccedilla,                 cent                       ]	};
+    key <AE05> { [               5,       percent,           asciitilde                       ] };
+    key <AE06> { [               6,     ampersand,              section                       ] };
+    key <AE07> { [               7,         slash,                  bar                       ] };
+    key <AE08> { [               8,     parenleft,               degree                       ] };
+    key <AE09> { [               9,    parenright,            backslash                       ] };
+    key <AE10> { [               0,         equal,          asciicircum                       ] };
+    Key <AE11> { [      quoteright,      question,            quoteleft                       ] };
+    key <AE12> { [ dead_circumflex,    dead_grave                                             ] };
+
+    key <AD03>	{ [              e,             E,             EuroSign,             EuroSign ]	};
+    key <AD06>	{ [              z,             Z,            leftarrow,                  yen ]	};
+    key <AD11>	{ [     udiaeresis,        egrave,       dead_diaeresis,       dead_abovering ] };
+    key <AD12>	{ [ dead_diaeresis,    dead_acute                                             ] };
+
+    key <AC02>  { [              s,             S                                             ] };
+    key <AC07>  { [              j,             J,        dead_belowdot,        dead_abovedot ] };
+    key <AC10>	{ [     odiaeresis,        eacute,     dead_doubleacute,        dead_belowdot ] };
+    key <AC11>	{ [     adiaeresis,        agrave,      dead_circumflex,           dead_caron ] };
+    key <TLDE>	{ [         dollar,    dead_tilde,             sterling                       ] };
+
+    key <AB01>	{ [              y,             Y,       guillemotright                       ] };
+    key <AB02>	{ [              x,             X,        guillemotleft 	              ] };
+    key <AB04>	{ [              v,             V,   doublelowquotemark,   singlelowquotemark ]	};
+    key <AB05>	{ [              b,             B,  leftdoublequotemark,  leftsinglequotemark ] };
+    key <AB06>	{ [              n,             N, rightdoublequotemark, rightsinglequotemark ]	};    
+    key <AB07>  { [              m,             M,                   mu                       ] };
+    key <AB08>  { [          comma,     semicolon,       periodcentered,             multiply ] };
+    key <AB09>	{ [         period,         colon                                             ] };
+    key <AB10>	{ [          minus,    underscore                                             ] };
+
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/de(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/dk b/xorg-server/xkeyboard-config/symbols/sun_vndr/dk
index 0cc81153d..e5db30e7f 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/dk
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/dk
@@ -1,147 +1,147 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Denmark";
-
-    key <TLDE> { [         onehalf,         section                ] };
-    key <AE02> { [               2,        quotedbl,            at ] };
-    key <AE03> { [               3,      numbersign,      sterling ] };
-    key <AE04> { [               4,        currency,        dollar ] };
-    key <AE05> { [               5,         percent,    asciitilde ] };
-    key <AE06> { [               6,       ampersand,   asciicircum ] };
-    key <AE07> { [               7,           slash,     braceleft ] };
-    key <AE08> { [               8,       parenleft,   bracketleft ] };
-    key <AE09> { [               9,      parenright,  bracketright ] };
-    key <AE10> { [               0,           equal,    braceright ] };
-    key <AE11> { [            plus,        question                ] };
-    key <AE12> { [      dead_acute,      dead_grave,           bar ] }; 
-    key <AD03> { [               e,               E,      EuroSign ] }; 
-    key <AD11> { [           aring,           Aring                ] };
-    key <AD12> { [  dead_diaeresis, dead_circumflex,    dead_tilde ] };
-    key <BKSL> { [      apostrophe,        asterisk,         grave ] };
-    key <AC10> { [              ae,              AE                ] };
-    key <AC11> { [          oslash,        Ooblique                ] };
-    key <AB08> { [           comma,       semicolon                ] };
-    key <AB09> { [          period,           colon                ] };
-    key <AB10> { [           minus,      underscore                ] };
-    key <LSGT> { [            less,         greater,     backslash ] };
-
-        include "level3(ralt_switch)"
-        include "kpdl(comma)"
-
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "type4" {
-
-   name[Group1]="Denmark - Sun type 4";
-
-   key <BKSL> { [ onehalf,        section                        ] };
-   key <BRCR> { [ asciitilde,     asciicircum                    ] };
-   key <AE02> { [ 2,              quotedbl,       at             ] };
-   key <AE03> { [ 3,              numbersign,     sterling       ] };
-   key <AE04> { [ 4,              currency,       dollar         ] };
-   key <AE06> { [ 6,              ampersand                      ] };
-   key <AE07> { [ 7,              slash,          braceleft      ] };
-   key <AE08> { [ 8,              parenleft,      bracketleft    ] };
-   key <AE09> { [ 9,              parenright,     bracketright   ] };
-   key <AE10> { [ 0,              equal,          braceright     ] };
-   key <AE11> { [ plus,           question                       ] };
-   key <AE12> { [ dead_acute,     dead_grave,     bar            ] };
-   key <AD03> { [ e,              E,              EuroSign       ] };
-   key <AD11> { [ aring,          Aring                          ] };
-   key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde    ] };
-   key <LCTL> { [ Caps_Lock                                      ] };
-   key <AC10> { [ ae,             AE                             ] };
-   key <AC11> { [ ooblique,       Ooblique                       ] };
-   key <TLDE> { [ quoteright,     asterisk,       quoteleft      ] };
-   key <LSGT> { [ less,           greater,         backslash     ] };
-   key <AB08> { [ comma,          semicolon                      ] };
-   key <AB09> { [ period,         colon                          ] };
-   key <AB10> { [ minus,          underscore                     ] };
-   key <CAPS> { [ Control_L                                      ] };
-   key <COMP> { [ SunAltGraph                                    ] };
-   key <ALGR> { [ SunCompose                                     ] };
-
-	include "level3(ralt_switch)"
-	include "kpdl(comma)"
-
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "type5" {
-
-   include "sun_vndr/dk(type4)"
-
-    name[Group1]="Denmark - Sun type 5";
-
-    key <AE05> { [ 5,           percent,     asciitilde                 ] };
-    key <AE06> { [ 6,           ampersand,   asciicircum                ] };
-    key <AE07> { [ 7,           slash,       braceleft                  ] };
-    key <AE08> { [ 8,           parenleft,   bracketleft                ] };
-    key <AE09> { [ 9,           parenright,  bracketright               ] };
-    key <AE10> { [ 0,           equal,       braceright                 ] };
-    key <BKSL> { [ quoteright,  asterisk,    quoteleft                  ] };
-    
-	include "level3(ralt_switch)"
-	include "kpdl(comma)"
-
-};
-
-
-partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/dk(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Denmark";
+
+    key <TLDE> { [         onehalf,         section                ] };
+    key <AE02> { [               2,        quotedbl,            at ] };
+    key <AE03> { [               3,      numbersign,      sterling ] };
+    key <AE04> { [               4,        currency,        dollar ] };
+    key <AE05> { [               5,         percent,    asciitilde ] };
+    key <AE06> { [               6,       ampersand,   asciicircum ] };
+    key <AE07> { [               7,           slash,     braceleft ] };
+    key <AE08> { [               8,       parenleft,   bracketleft ] };
+    key <AE09> { [               9,      parenright,  bracketright ] };
+    key <AE10> { [               0,           equal,    braceright ] };
+    key <AE11> { [            plus,        question                ] };
+    key <AE12> { [      dead_acute,      dead_grave,           bar ] }; 
+    key <AD03> { [               e,               E,      EuroSign ] }; 
+    key <AD11> { [           aring,           Aring                ] };
+    key <AD12> { [  dead_diaeresis, dead_circumflex,    dead_tilde ] };
+    key <BKSL> { [      apostrophe,        asterisk,         grave ] };
+    key <AC10> { [              ae,              AE                ] };
+    key <AC11> { [          oslash,        Ooblique                ] };
+    key <AB08> { [           comma,       semicolon                ] };
+    key <AB09> { [          period,           colon                ] };
+    key <AB10> { [           minus,      underscore                ] };
+    key <LSGT> { [            less,         greater,     backslash ] };
+
+        include "level3(ralt_switch)"
+        include "kpdl(comma)"
+
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "type4" {
+
+   name[Group1]="Denmark - Sun type 4";
+
+   key <BKSL> { [ onehalf,        section                        ] };
+   key <BRCR> { [ asciitilde,     asciicircum                    ] };
+   key <AE02> { [ 2,              quotedbl,       at             ] };
+   key <AE03> { [ 3,              numbersign,     sterling       ] };
+   key <AE04> { [ 4,              currency,       dollar         ] };
+   key <AE06> { [ 6,              ampersand                      ] };
+   key <AE07> { [ 7,              slash,          braceleft      ] };
+   key <AE08> { [ 8,              parenleft,      bracketleft    ] };
+   key <AE09> { [ 9,              parenright,     bracketright   ] };
+   key <AE10> { [ 0,              equal,          braceright     ] };
+   key <AE11> { [ plus,           question                       ] };
+   key <AE12> { [ dead_acute,     dead_grave,     bar            ] };
+   key <AD03> { [ e,              E,              EuroSign       ] };
+   key <AD11> { [ aring,          Aring                          ] };
+   key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde    ] };
+   key <LCTL> { [ Caps_Lock                                      ] };
+   key <AC10> { [ ae,             AE                             ] };
+   key <AC11> { [ ooblique,       Ooblique                       ] };
+   key <TLDE> { [ quoteright,     asterisk,       quoteleft      ] };
+   key <LSGT> { [ less,           greater,         backslash     ] };
+   key <AB08> { [ comma,          semicolon                      ] };
+   key <AB09> { [ period,         colon                          ] };
+   key <AB10> { [ minus,          underscore                     ] };
+   key <CAPS> { [ Control_L                                      ] };
+   key <COMP> { [ SunAltGraph                                    ] };
+   key <ALGR> { [ SunCompose                                     ] };
+
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
+
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "type5" {
+
+   include "sun_vndr/dk(type4)"
+
+    name[Group1]="Denmark - Sun type 5";
+
+    key <AE05> { [ 5,           percent,     asciitilde                 ] };
+    key <AE06> { [ 6,           ampersand,   asciicircum                ] };
+    key <AE07> { [ 7,           slash,       braceleft                  ] };
+    key <AE08> { [ 8,           parenleft,   bracketleft                ] };
+    key <AE09> { [ 9,           parenright,  bracketright               ] };
+    key <AE10> { [ 0,           equal,       braceright                 ] };
+    key <BKSL> { [ quoteright,  asterisk,    quoteleft                  ] };
+    
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/dk(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ee b/xorg-server/xkeyboard-config/symbols/sun_vndr/ee
index 914a80dde..0530f9e2f 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ee
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ee
@@ -1,117 +1,117 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Estonia";
-
-
-   key <TLDE> { [     dead_caron,    dead_tilde,	notsign,       notsign ] };
-   key <AE01> { [              1,        exclam,	onesuperior,    exclamdown ] };
-   key <AE02> { [              2,      quotedbl,	at,     oneeighth ] };
-   key <AE03> { [              3,    numbersign,	sterling,      sterling ] };
-   key <AE04> { [              4,      currency,	dollar,        dollar ] };
-   key <AE05> { [              5,       percent,	onehalf,  threeeighths ] };
-   key <AE06> { [              6,     ampersand,	notsign,   fiveeighths ] };
-   key <AE07> { [              7,         slash,	braceleft,  seveneighths ] };
-   key <AE08> { [              8,     parenleft,	bracketleft,     trademark ] };
-   key <AE09> { [              9,    parenright,	bracketright,     plusminus ] };
-   key <AE10> { [              0,         equal,	braceright,        degree ] };
-   key <AE11> { [           plus,      question,	backslash,  questiondown ] };
-   key <AE12> { [     dead_acute,    dead_grave,	grave,    apostrophe ] };
-
-   key <AD01> { [              q,             Q,	at,   Greek_OMEGA ] };
-   key <AD02> { [              w,             W,	lstroke,       Lstroke ] };
-   key <AD03> { [              e,             E,	EuroSign,          cent ] };
-   key <AD04> { [              r,             R,	paragraph,    registered ] };
-   key <AD05> { [              t,             T,	tslash,        Tslash ] };
-   key <AD06> { [              y,             Y,	leftarrow,           yen ] };
-   key <AD07> { [              u,             U,	downarrow,       uparrow ] };
-   key <AD08> { [              i,             I,	rightarrow,      idotless ] };
-   key <AD09> { [              o,             O,	oslash,      Ooblique ] };
-   key <AD10> { [              p,             P,	thorn,         THORN ] };
-   key <AD11> { [     udiaeresis,    Udiaeresis,	dead_diaeresis,dead_abovering ] };
-   key <AD12> { [         otilde,        Otilde,	section,   dead_macron ] };
-
-   key <AC01> { [              a,             A,	ae,            AE ] };
-   key <AC02> { [              s,             S,	ssharp,       section ] };
-   key <AC03> { [              d,             D,	eth,           ETH ] };
-   key <AC04> { [              f,             F,	dstroke,   ordfeminine ] };
-   key <AC05> { [              g,             G,	eng,           ENG ] };
-   key <AC06> { [              h,             H,	hstroke,       Hstroke ] };
-   key <AC07> { [              j,             J,	j,             J ] };
-   key <AC08> { [              k,             K,	kra,     ampersand ] };
-   key <AC09> { [              l,             L,	lstroke,       Lstroke ] };
-   key <AC10> { [     odiaeresis,    Odiaeresis,	dead_acute, dead_doubleacute ] };
-   key <AC11> { [     adiaeresis,    Adiaeresis,	asciicircum,    dead_caron ] };
-   key <LSGT> { [      backslash,           bar,	degree,     brokenbar ] };
-
-   key <BKSL> { [     apostrophe,      asterisk,	onehalf,    dead_breve ] };
-   key <AB01> { [              z,             Z,	zcaron,        Zcaron ] };
-   key <AB02> { [              x,             X,	guillemotright,       greater ] };
-   key <AB03> { [              c,             C,	cent,     copyright ] };
-   key <AB04> { [              v,             V,	leftdoublequotemark, leftsinglequotemark ] };
-   key <AB05> { [              b,             B,	rightdoublequotemark, rightsinglequotemark ] };
-   key <AB06> { [              n,             N,	ncedilla,      Ncedilla ] };
-   key <AB07> { [              m,             M,	mu,     masculine ] };
-   key <AB08> { [          comma,     semicolon,	less,      multiply ] };
-   key <AB09> { [         period,         colon,	greater,      division ] };
-   key <AB10> { [          minus,    underscore,	dead_belowdot, dead_abovedot ] };
-
-	include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/ee(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Estonia";
+
+
+   key <TLDE> { [     dead_caron,    dead_tilde,	notsign,       notsign ] };
+   key <AE01> { [              1,        exclam,	onesuperior,    exclamdown ] };
+   key <AE02> { [              2,      quotedbl,	at,     oneeighth ] };
+   key <AE03> { [              3,    numbersign,	sterling,      sterling ] };
+   key <AE04> { [              4,      currency,	dollar,        dollar ] };
+   key <AE05> { [              5,       percent,	onehalf,  threeeighths ] };
+   key <AE06> { [              6,     ampersand,	notsign,   fiveeighths ] };
+   key <AE07> { [              7,         slash,	braceleft,  seveneighths ] };
+   key <AE08> { [              8,     parenleft,	bracketleft,     trademark ] };
+   key <AE09> { [              9,    parenright,	bracketright,     plusminus ] };
+   key <AE10> { [              0,         equal,	braceright,        degree ] };
+   key <AE11> { [           plus,      question,	backslash,  questiondown ] };
+   key <AE12> { [     dead_acute,    dead_grave,	grave,    apostrophe ] };
+
+   key <AD01> { [              q,             Q,	at,   Greek_OMEGA ] };
+   key <AD02> { [              w,             W,	lstroke,       Lstroke ] };
+   key <AD03> { [              e,             E,	EuroSign,          cent ] };
+   key <AD04> { [              r,             R,	paragraph,    registered ] };
+   key <AD05> { [              t,             T,	tslash,        Tslash ] };
+   key <AD06> { [              y,             Y,	leftarrow,           yen ] };
+   key <AD07> { [              u,             U,	downarrow,       uparrow ] };
+   key <AD08> { [              i,             I,	rightarrow,      idotless ] };
+   key <AD09> { [              o,             O,	oslash,      Ooblique ] };
+   key <AD10> { [              p,             P,	thorn,         THORN ] };
+   key <AD11> { [     udiaeresis,    Udiaeresis,	dead_diaeresis,dead_abovering ] };
+   key <AD12> { [         otilde,        Otilde,	section,   dead_macron ] };
+
+   key <AC01> { [              a,             A,	ae,            AE ] };
+   key <AC02> { [              s,             S,	ssharp,       section ] };
+   key <AC03> { [              d,             D,	eth,           ETH ] };
+   key <AC04> { [              f,             F,	dstroke,   ordfeminine ] };
+   key <AC05> { [              g,             G,	eng,           ENG ] };
+   key <AC06> { [              h,             H,	hstroke,       Hstroke ] };
+   key <AC07> { [              j,             J,	j,             J ] };
+   key <AC08> { [              k,             K,	kra,     ampersand ] };
+   key <AC09> { [              l,             L,	lstroke,       Lstroke ] };
+   key <AC10> { [     odiaeresis,    Odiaeresis,	dead_acute, dead_doubleacute ] };
+   key <AC11> { [     adiaeresis,    Adiaeresis,	asciicircum,    dead_caron ] };
+   key <LSGT> { [      backslash,           bar,	degree,     brokenbar ] };
+
+   key <BKSL> { [     apostrophe,      asterisk,	onehalf,    dead_breve ] };
+   key <AB01> { [              z,             Z,	zcaron,        Zcaron ] };
+   key <AB02> { [              x,             X,	guillemotright,       greater ] };
+   key <AB03> { [              c,             C,	cent,     copyright ] };
+   key <AB04> { [              v,             V,	leftdoublequotemark, leftsinglequotemark ] };
+   key <AB05> { [              b,             B,	rightdoublequotemark, rightsinglequotemark ] };
+   key <AB06> { [              n,             N,	ncedilla,      Ncedilla ] };
+   key <AB07> { [              m,             M,	mu,     masculine ] };
+   key <AB08> { [          comma,     semicolon,	less,      multiply ] };
+   key <AB09> { [         period,         colon,	greater,      division ] };
+   key <AB10> { [          minus,    underscore,	dead_belowdot, dead_abovedot ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ee(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/es b/xorg-server/xkeyboard-config/symbols/sun_vndr/es
index 9cb25f382..6d28bc541 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/es
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/es
@@ -1,145 +1,145 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-//
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
- 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Spain";
-
-    key <TLDE> { [       masculine,     ordfeminine,     backslash ] };
-    key <LSGT> { [            less,         greater                ] };
-    key <AE01> { [               1,          exclam,           bar ] };
-    key <AE02> { [               2,        quotedbl,            at ] };
-    key <AE03> { [               3,  periodcentered,    numbersign ] };
-    key <AE04> { [               4,          dollar,   asciicircum ] };
-    key <AE05> { [               5,         percent,    asciitilde ] };
-    key <AE06> { [               6,       ampersand,       notsign ] };
-    key <AE07> { [               7,           slash                ] };
-    key <AE08> { [               8,       parenleft                ] };
-    key <AE09> { [               9,      parenright                ] }; 
-    key <AE10> { [               0,           equal                ] };
-    key <AE11> { [      apostrophe,        question,         grave ] };
-    key <AE12> { [      exclamdown,    questiondown                ] };
-    key <AD03> { [               e,               E,      EuroSign ] };
-    key <AD11> { [      dead_grave, dead_circumflex,   bracketleft ] };
-    key <AD12> { [            plus,        asterisk,  bracketright ] };
-    key <AC10> { [          ntilde,          Ntilde                ] };
-    key <AC11> { [      dead_acute,  dead_diaeresis,     braceleft ] };
-    key <BKSL> { [        ccedilla,        Ccedilla,    braceright ] };
-    key <AB08> { [           comma,       semicolon                ] };
-    key <AB09> { [          period,           colon                ] };
-    key <AB10> { [           minus,      underscore                ] };
-   
-        include "level3(ralt_switch)"
-
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "type4" {
-    
-    name[Group1]="Spain - Sun type 4";
-
-    key <BKSL> { [ bracketleft, braceleft,  guillemotleft    ] };
-    key <BRCR> { [ bracketright, braceright,  guillemotright ] };
-    key <AE02> { [ 2, quotedbl,  at                 ] };
-    key <AE03> { [ 3, periodcentered,  numbersign       ] };
-    key <AE05> { [ 5, percent,  degree           ] };
-    key <AE06> { [ 6, ampersand,  notsign          ] };
-    key <AE07> { [ 7, slash             ]                       };
-    key <AE08> { [ 8, parenleft         ]                       };
-    key <AE09> { [ 9, parenright, backslash        ] };
-    key <AE10> { [ 0, equal,  bar              ] };
-    key <AE11> { [ quoteright, question,  quoteleft        ] };
-    key <AE12> { [ exclamdown, questiondown ] };
-    key <AD03> { [ e, E,  EuroSign         ] };
-    key <AD09> { [ o, O,  masculine        ] };
-    key <AD11> { [ dead_grave, dead_circumflex,  asciicircum ] };
-    key <AD12> { [ plus, asterisk,  asciitilde       ] };
-    key <AC01> { [ a, A,  ordfeminine      ] };
-    key <AC10> { [ ntilde, Ntilde               ]                       };
-    key <AC11> { [ dead_acute, dead_diaeresis ]                       };
-    key <TLDE> { [ ccedilla, Ccedilla             ]                       };
-    key <RALT> { [ Alt_R                ]                       };
-    key <LCTL> { [ Caps_Lock ] };
-    key <CAPS> { [ Control_L ] };
-    key <LSGT> { [ less, greater        ]                       };
-    key <AB08> { [ comma, semicolon     ]                       };
-    key <AB09> { [ period, colon        ]                       };
-    key <AB10> { [ minus, underscore    ]                       };
-    
-};
- 
-
-partial alphanumeric_keys
-xkb_symbols "type5" {
-    include "sun_vndr/es(type4)"
-
-    name[Group1]="Spain - Sun type 5";
- 
-    key <AE03> { [ 3, periodcentered,  numbersign                 ] };
-    key <AE04> { [ 4, dollar,  asciicircum                ] };
-    key <AE05> { [ 5, percent,  asciitilde                 ] };
-    key <AE07> { [ 7, slash,  braceleft                  ]};
-    key <AE08> { [ 8, parenleft,  bracketleft                ]};
-    key <AE09> { [ 9, parenright,  bracketright               ]};
-    key <AE10> { [ 0, equal,  braceright                 ]};
-    key <AE11> { [ quoteright, question,  quoteleft                  ] };
-    key <AD11> { [ dead_grave, dead_circumflex,  bracketleft ] };
-    key <AD12> { [ dead_acute, dead_diaeresis, braceleft      ] };
- 
-	include "level3(ralt_switch)"
-};
-
-
-partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/es(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+//
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+ 
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Spain";
+
+    key <TLDE> { [       masculine,     ordfeminine,     backslash ] };
+    key <LSGT> { [            less,         greater                ] };
+    key <AE01> { [               1,          exclam,           bar ] };
+    key <AE02> { [               2,        quotedbl,            at ] };
+    key <AE03> { [               3,  periodcentered,    numbersign ] };
+    key <AE04> { [               4,          dollar,   asciicircum ] };
+    key <AE05> { [               5,         percent,    asciitilde ] };
+    key <AE06> { [               6,       ampersand,       notsign ] };
+    key <AE07> { [               7,           slash                ] };
+    key <AE08> { [               8,       parenleft                ] };
+    key <AE09> { [               9,      parenright                ] }; 
+    key <AE10> { [               0,           equal                ] };
+    key <AE11> { [      apostrophe,        question,         grave ] };
+    key <AE12> { [      exclamdown,    questiondown                ] };
+    key <AD03> { [               e,               E,      EuroSign ] };
+    key <AD11> { [      dead_grave, dead_circumflex,   bracketleft ] };
+    key <AD12> { [            plus,        asterisk,  bracketright ] };
+    key <AC10> { [          ntilde,          Ntilde                ] };
+    key <AC11> { [      dead_acute,  dead_diaeresis,     braceleft ] };
+    key <BKSL> { [        ccedilla,        Ccedilla,    braceright ] };
+    key <AB08> { [           comma,       semicolon                ] };
+    key <AB09> { [          period,           colon                ] };
+    key <AB10> { [           minus,      underscore                ] };
+   
+        include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "type4" {
+    
+    name[Group1]="Spain - Sun type 4";
+
+    key <BKSL> { [ bracketleft, braceleft,  guillemotleft    ] };
+    key <BRCR> { [ bracketright, braceright,  guillemotright ] };
+    key <AE02> { [ 2, quotedbl,  at                 ] };
+    key <AE03> { [ 3, periodcentered,  numbersign       ] };
+    key <AE05> { [ 5, percent,  degree           ] };
+    key <AE06> { [ 6, ampersand,  notsign          ] };
+    key <AE07> { [ 7, slash             ]                       };
+    key <AE08> { [ 8, parenleft         ]                       };
+    key <AE09> { [ 9, parenright, backslash        ] };
+    key <AE10> { [ 0, equal,  bar              ] };
+    key <AE11> { [ quoteright, question,  quoteleft        ] };
+    key <AE12> { [ exclamdown, questiondown ] };
+    key <AD03> { [ e, E,  EuroSign         ] };
+    key <AD09> { [ o, O,  masculine        ] };
+    key <AD11> { [ dead_grave, dead_circumflex,  asciicircum ] };
+    key <AD12> { [ plus, asterisk,  asciitilde       ] };
+    key <AC01> { [ a, A,  ordfeminine      ] };
+    key <AC10> { [ ntilde, Ntilde               ]                       };
+    key <AC11> { [ dead_acute, dead_diaeresis ]                       };
+    key <TLDE> { [ ccedilla, Ccedilla             ]                       };
+    key <RALT> { [ Alt_R                ]                       };
+    key <LCTL> { [ Caps_Lock ] };
+    key <CAPS> { [ Control_L ] };
+    key <LSGT> { [ less, greater        ]                       };
+    key <AB08> { [ comma, semicolon     ]                       };
+    key <AB09> { [ period, colon        ]                       };
+    key <AB10> { [ minus, underscore    ]                       };
+    
+};
+ 
+
+partial alphanumeric_keys
+xkb_symbols "type5" {
+    include "sun_vndr/es(type4)"
+
+    name[Group1]="Spain - Sun type 5";
+ 
+    key <AE03> { [ 3, periodcentered,  numbersign                 ] };
+    key <AE04> { [ 4, dollar,  asciicircum                ] };
+    key <AE05> { [ 5, percent,  asciitilde                 ] };
+    key <AE07> { [ 7, slash,  braceleft                  ]};
+    key <AE08> { [ 8, parenleft,  bracketleft                ]};
+    key <AE09> { [ 9, parenright,  bracketright               ]};
+    key <AE10> { [ 0, equal,  braceright                 ]};
+    key <AE11> { [ quoteright, question,  quoteleft                  ] };
+    key <AD11> { [ dead_grave, dead_circumflex,  bracketleft ] };
+    key <AD12> { [ dead_acute, dead_diaeresis, braceleft      ] };
+ 
+	include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/es(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/fi b/xorg-server/xkeyboard-config/symbols/sun_vndr/fi
index a2f8cd8f4..eaa19e848 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/fi
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/fi
@@ -1,89 +1,89 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-//
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
- 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Finland";
-
-    key <TLDE> { [  section,         onehalf                                  ] };
-    key <AE01> { [  1,               exclam                                   ] };
-    key <AE02> { [  2,               quotedbl,         at                     ] };
-    key <AE03> { [  3,               numbersign,       sterling               ] };
-    key <AE04> { [  4,               currency,         dollar                 ] };
-    key <AE05> { [  5,               percent                                  ] };
-    key <AE06> { [  6,               ampersand                                ] };
-    key <AE07> { [  7,               slash,            braceleft              ] };
-    key <AE08> { [  8,               parenleft,        bracketleft            ] };
-    key <AE09> { [  9,               parenright,       bracketright           ] };
-    key <AE10> { [  0,               equal,            braceright             ] };
-    key <AE11> { [  plus,            question,         backslash              ] };
-    key <AE12> { [  dead_acute,      dead_grave                               ] };
-    key <AD03> { [  e,               E,                EuroSign               ] };
-    key <AD11> { [  aring,           Aring                                    ] };
-    key <AD12> { [  dead_diaeresis,  asciicircum,      asciitilde             ] };
-    key <AC10> { [  odiaeresis,      Odiaeresis                               ] };
-    key <AC11> { [  adiaeresis,      Adiaeresis                               ] };
-    key <BKSL> { [  apostrophe,      asterisk,         quoteleft              ] };
-    key <LSGT> { [  less,            greater,          bar                    ] };
-    key <AB08> { [  comma,           semicolon                                ] };
-    key <AB09> { [  period,          colon                                    ] };
-    key <AB10> { [  minus,           underscore                               ] };
-
-	include "level3(ralt_switch)"
-	include "kpdl(comma)"
-
-};
-
-
-partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/fi(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+//
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+ 
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Finland";
+
+    key <TLDE> { [  section,         onehalf                                  ] };
+    key <AE01> { [  1,               exclam                                   ] };
+    key <AE02> { [  2,               quotedbl,         at                     ] };
+    key <AE03> { [  3,               numbersign,       sterling               ] };
+    key <AE04> { [  4,               currency,         dollar                 ] };
+    key <AE05> { [  5,               percent                                  ] };
+    key <AE06> { [  6,               ampersand                                ] };
+    key <AE07> { [  7,               slash,            braceleft              ] };
+    key <AE08> { [  8,               parenleft,        bracketleft            ] };
+    key <AE09> { [  9,               parenright,       bracketright           ] };
+    key <AE10> { [  0,               equal,            braceright             ] };
+    key <AE11> { [  plus,            question,         backslash              ] };
+    key <AE12> { [  dead_acute,      dead_grave                               ] };
+    key <AD03> { [  e,               E,                EuroSign               ] };
+    key <AD11> { [  aring,           Aring                                    ] };
+    key <AD12> { [  dead_diaeresis,  asciicircum,      asciitilde             ] };
+    key <AC10> { [  odiaeresis,      Odiaeresis                               ] };
+    key <AC11> { [  adiaeresis,      Adiaeresis                               ] };
+    key <BKSL> { [  apostrophe,      asterisk,         quoteleft              ] };
+    key <LSGT> { [  less,            greater,          bar                    ] };
+    key <AB08> { [  comma,           semicolon                                ] };
+    key <AB09> { [  period,          colon                                    ] };
+    key <AB10> { [  minus,           underscore                               ] };
+
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/fi(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/fr b/xorg-server/xkeyboard-config/symbols/sun_vndr/fr
index e3e6828ef..a3850ba5f 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/fr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/fr
@@ -1,96 +1,96 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="France";
-
-    key <TLDE>  { [     twosuperior                              ] };
-    key <AE01>	{ [       ampersand,          1                  ] };
-    key <AE02>	{ [          eacute,          2,   asciitilde    ] };
-    key <AE03>	{ [        quotedbl,          3,   numbersign    ] };
-    key <AE04>	{ [      apostrophe,          4,    braceleft    ] };
-    key <AE05>	{ [       parenleft,          5,  bracketleft    ] };
-    key <AE06>	{ [           minus,          6,          bar    ] };
-    key <AE07>	{ [          egrave,          7,        grave    ] };
-    key <AE08>	{ [      underscore,          8,    backslash    ] };
-    key <AE09>	{ [        ccedilla,          9,  asciicircum    ] };
-    key <AE10>	{ [          agrave,          0,           at    ] };
-    key <AE11>	{ [      parenright,     degree, bracketright    ] };
-    key <AE12>	{ [           equal,       plus,   braceright    ] };
-
-    key <AD01>	{ [               a,          A                  ] };
-    key <AD02>	{ [               z,          Z                  ] };
-    key <AD03>	{ [               e,          E,     EuroSign    ] };
-    key <AD11>	{ [ dead_circumflex, dead_diaeresis              ] };
-    key <AD12>	{ [          dollar,   sterling,     currency    ] };
-
-    key <AC01>	{ [               q,          Q                  ] };
-    key <AC10>	{ [               m,          M                  ] };
-    key <AC11>	{ [          ugrave,    percent                  ] };
-    key <BKSL>	{ [        asterisk,         mu                  ] };
-
-    key <LSGT>  { [            less,    greater                  ] };
-    key <AB01>	{ [               w,          W                  ] };
-    key <AB07>	{ [           comma,   question                  ] };
-    key <AB08>	{ [       semicolon,     period                  ] };
-    key <AB09>	{ [           colon,      slash                  ] };
-    key <AB10>	{ [          exclam,    section                  ] };
-
-	include "level3(ralt_switch)"
-
-};
-
-
-partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/fr(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="France";
+
+    key <TLDE>  { [     twosuperior                              ] };
+    key <AE01>	{ [       ampersand,          1                  ] };
+    key <AE02>	{ [          eacute,          2,   asciitilde    ] };
+    key <AE03>	{ [        quotedbl,          3,   numbersign    ] };
+    key <AE04>	{ [      apostrophe,          4,    braceleft    ] };
+    key <AE05>	{ [       parenleft,          5,  bracketleft    ] };
+    key <AE06>	{ [           minus,          6,          bar    ] };
+    key <AE07>	{ [          egrave,          7,        grave    ] };
+    key <AE08>	{ [      underscore,          8,    backslash    ] };
+    key <AE09>	{ [        ccedilla,          9,  asciicircum    ] };
+    key <AE10>	{ [          agrave,          0,           at    ] };
+    key <AE11>	{ [      parenright,     degree, bracketright    ] };
+    key <AE12>	{ [           equal,       plus,   braceright    ] };
+
+    key <AD01>	{ [               a,          A                  ] };
+    key <AD02>	{ [               z,          Z                  ] };
+    key <AD03>	{ [               e,          E,     EuroSign    ] };
+    key <AD11>	{ [ dead_circumflex, dead_diaeresis              ] };
+    key <AD12>	{ [          dollar,   sterling,     currency    ] };
+
+    key <AC01>	{ [               q,          Q                  ] };
+    key <AC10>	{ [               m,          M                  ] };
+    key <AC11>	{ [          ugrave,    percent                  ] };
+    key <BKSL>	{ [        asterisk,         mu                  ] };
+
+    key <LSGT>  { [            less,    greater                  ] };
+    key <AB01>	{ [               w,          W                  ] };
+    key <AB07>	{ [           comma,   question                  ] };
+    key <AB08>	{ [       semicolon,     period                  ] };
+    key <AB09>	{ [           colon,      slash                  ] };
+    key <AB10>	{ [          exclam,    section                  ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/fr(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/gb b/xorg-server/xkeyboard-config/symbols/sun_vndr/gb
index fc775cd98..78287ec06 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/gb
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/gb
@@ -1,102 +1,102 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="United Kingdom";
-
-    key <TLDE> { [  quoteleft,    notsign,  brokenbar ] };
-
-    key <AE02> { [          2,   quotedbl             ] };
-    key <AE03> { [          3,   sterling             ] };
-    key <AE04> { [          4,     dollar,   EuroSign ] };
-    key <BKSL> { [ numbersign, asciitilde             ] };
-    key <AC11> { [ apostrophe,         at             ] };
-    key <LSGT> { [  backslash,        bar             ] };
-
-	include "level3(ralt_switch)"
-
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "type5" {
-
-    name[Group1]="United Kingdom - Sun type 5";
-
-    key <TLDE> {        [       quoteleft,      notsign,    brokenbar         ] };
-    key <AD03> {        [               e,      E,          EuroSign          ] };
-
-	include "level3(ralt_switch)"
-
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "type4" {
-
-    name[Group1]="United Kingdom - Sun type 4";
-
-    key <AE01> { [      1,     exclam,   brokenbar ] };
-    key <AE03> { [      3,   sterling,  numbersign ] };
-    key <AE04> { [      4,     dollar,    EuroSign ] };
-    key <AE11> { [  minus, underscore,     notsign ] };
-    key <AD03> { [      e,          E,    EuroSign ] };
-
-	include "level3(ralt_switch)"
-
-};
-
-
-partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/gb(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="United Kingdom";
+
+    key <TLDE> { [  quoteleft,    notsign,  brokenbar ] };
+
+    key <AE02> { [          2,   quotedbl             ] };
+    key <AE03> { [          3,   sterling             ] };
+    key <AE04> { [          4,     dollar,   EuroSign ] };
+    key <BKSL> { [ numbersign, asciitilde             ] };
+    key <AC11> { [ apostrophe,         at             ] };
+    key <LSGT> { [  backslash,        bar             ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "type5" {
+
+    name[Group1]="United Kingdom - Sun type 5";
+
+    key <TLDE> {        [       quoteleft,      notsign,    brokenbar         ] };
+    key <AD03> {        [               e,      E,          EuroSign          ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "type4" {
+
+    name[Group1]="United Kingdom - Sun type 4";
+
+    key <AE01> { [      1,     exclam,   brokenbar ] };
+    key <AE03> { [      3,   sterling,  numbersign ] };
+    key <AE04> { [      4,     dollar,    EuroSign ] };
+    key <AE11> { [  minus, underscore,     notsign ] };
+    key <AD03> { [      e,          E,    EuroSign ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/gb(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/gr b/xorg-server/xkeyboard-config/symbols/sun_vndr/gr
index c3a83dad0..1f3fac799 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/gr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/gr
@@ -1,117 +1,117 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Greece";
-
-
-	key <TLDE> { [                 grave,     asciitilde,	onehalf ] };
-	key <AE01> { [                     1,         exclam ] };
-	key <AE02> { [                     2,             at ] };
-	key <AE03> { [                     3,     numbersign,	sterling ] };
-	key <AE04> { [                     4,         dollar,	EuroSign ] };
-	key <AE05> { [                     5,        percent,	EuroSign ] };
-	key <AE06> { [                     6,    asciicircum,	notsign ] };
-	key <AE07> { [                     7,      ampersand ] };
-	key <AE08> { [                     8,       asterisk ] };
-	key <AE09> { [                     9,      parenleft ] };
-	key <AE10> { [                     0,     parenright,	degree ] };
-	key <AE11> { [                 minus,     underscore,	plusminus ] };
-	key <AE12> { [                 equal,           plus ] };
-
-	key <AD01> { [             semicolon,          colon,	periodcentered ] };
-	key <AD02> { [ Greek_finalsmallsigma, periodcentered,	Greek_SIGMA ] };
-	key <AD03> { [         Greek_epsilon,  Greek_EPSILON,	EuroSign ] };
-	key <AD04> { [             Greek_rho,      Greek_RHO,	registered ] };
-	key <AD05> { [             Greek_tau,      Greek_TAU ] };
-	key <AD06> { [         Greek_upsilon,  Greek_UPSILON ] };
-	key <AD07> { [           Greek_theta,    Greek_THETA ] };
-	key <AD08> { [            Greek_iota,     Greek_IOTA ] };
-	key <AD09> { [         Greek_omicron,  Greek_OMICRON ] };
-	key <AD10> { [              Greek_pi,       Greek_PI ] };
-	key <AD11> { [           bracketleft,      braceleft,	guillemotleft ] };
-	key <AD12> { [          bracketright,     braceright,	guillemotright ] };
-
-	key <AC01> { [           Greek_alpha,    Greek_ALPHA ] };
-	key <AC02> { [           Greek_sigma,    Greek_SIGMA ] };
-	key <AC03> { [           Greek_delta,    Greek_DELTA ] };
-	key <AC04> { [             Greek_phi,      Greek_PHI ] };
-	key <AC05> { [           Greek_gamma,    Greek_GAMMA ] };
-	key <AC06> { [             Greek_eta,      Greek_ETA ] };
-	key <AC07> { [              Greek_xi,       Greek_XI ] };
-	key <AC08> { [           Greek_kappa,    Greek_KAPPA ] };
-	key <AC09> { [           Greek_lamda,    Greek_LAMDA ] };
-	key <AC10> { [            dead_acute, dead_diaeresis ] };
-	key <AC11> { [            apostrophe,       quotedbl ] };
-	key <BKSL> { [             backslash,            bar,	brokenbar ] };
-
-	key <LSGT> { [         guillemotleft, guillemotright,	brokenbar ] };
-        key <AB01> { [            Greek_zeta,     Greek_ZETA ] };
-        key <AB02> { [             Greek_chi,      Greek_CHI ] };
-        key <AB03> { [             Greek_psi,      Greek_PSI,	copyright ] };
-        key <AB04> { [           Greek_omega,    Greek_OMEGA ] };
-        key <AB05> { [            Greek_beta,     Greek_BETA ] };
-        key <AB06> { [              Greek_nu,       Greek_NU ] };
-        key <AB07> { [              Greek_mu,       Greek_MU ] };
-	key <AB08> { [                 comma,           less,	guillemotleft ] };
-	key <AB09> { [                period,        greater,	guillemotright ] };
-	key <AB10> { [                 slash,       question ] };
-
-	include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/gr(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Greece";
+
+
+	key <TLDE> { [                 grave,     asciitilde,	onehalf ] };
+	key <AE01> { [                     1,         exclam ] };
+	key <AE02> { [                     2,             at ] };
+	key <AE03> { [                     3,     numbersign,	sterling ] };
+	key <AE04> { [                     4,         dollar,	EuroSign ] };
+	key <AE05> { [                     5,        percent,	EuroSign ] };
+	key <AE06> { [                     6,    asciicircum,	notsign ] };
+	key <AE07> { [                     7,      ampersand ] };
+	key <AE08> { [                     8,       asterisk ] };
+	key <AE09> { [                     9,      parenleft ] };
+	key <AE10> { [                     0,     parenright,	degree ] };
+	key <AE11> { [                 minus,     underscore,	plusminus ] };
+	key <AE12> { [                 equal,           plus ] };
+
+	key <AD01> { [             semicolon,          colon,	periodcentered ] };
+	key <AD02> { [ Greek_finalsmallsigma, periodcentered,	Greek_SIGMA ] };
+	key <AD03> { [         Greek_epsilon,  Greek_EPSILON,	EuroSign ] };
+	key <AD04> { [             Greek_rho,      Greek_RHO,	registered ] };
+	key <AD05> { [             Greek_tau,      Greek_TAU ] };
+	key <AD06> { [         Greek_upsilon,  Greek_UPSILON ] };
+	key <AD07> { [           Greek_theta,    Greek_THETA ] };
+	key <AD08> { [            Greek_iota,     Greek_IOTA ] };
+	key <AD09> { [         Greek_omicron,  Greek_OMICRON ] };
+	key <AD10> { [              Greek_pi,       Greek_PI ] };
+	key <AD11> { [           bracketleft,      braceleft,	guillemotleft ] };
+	key <AD12> { [          bracketright,     braceright,	guillemotright ] };
+
+	key <AC01> { [           Greek_alpha,    Greek_ALPHA ] };
+	key <AC02> { [           Greek_sigma,    Greek_SIGMA ] };
+	key <AC03> { [           Greek_delta,    Greek_DELTA ] };
+	key <AC04> { [             Greek_phi,      Greek_PHI ] };
+	key <AC05> { [           Greek_gamma,    Greek_GAMMA ] };
+	key <AC06> { [             Greek_eta,      Greek_ETA ] };
+	key <AC07> { [              Greek_xi,       Greek_XI ] };
+	key <AC08> { [           Greek_kappa,    Greek_KAPPA ] };
+	key <AC09> { [           Greek_lamda,    Greek_LAMDA ] };
+	key <AC10> { [            dead_acute, dead_diaeresis ] };
+	key <AC11> { [            apostrophe,       quotedbl ] };
+	key <BKSL> { [             backslash,            bar,	brokenbar ] };
+
+	key <LSGT> { [         guillemotleft, guillemotright,	brokenbar ] };
+        key <AB01> { [            Greek_zeta,     Greek_ZETA ] };
+        key <AB02> { [             Greek_chi,      Greek_CHI ] };
+        key <AB03> { [             Greek_psi,      Greek_PSI,	copyright ] };
+        key <AB04> { [           Greek_omega,    Greek_OMEGA ] };
+        key <AB05> { [            Greek_beta,     Greek_BETA ] };
+        key <AB06> { [              Greek_nu,       Greek_NU ] };
+        key <AB07> { [              Greek_mu,       Greek_MU ] };
+	key <AB08> { [                 comma,           less,	guillemotleft ] };
+	key <AB09> { [                period,        greater,	guillemotright ] };
+	key <AB10> { [                 slash,       question ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/gr(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/it b/xorg-server/xkeyboard-config/symbols/sun_vndr/it
index 7149b0996..acd94a2fb 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/it
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/it
@@ -1,140 +1,140 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Italy";
-
-    key <LSGT> { [            less,         greater                                ] };
-    key <TLDE> { [       backslash,             bar                                ] };
-    key <AE02> { [               2,        quotedbl                                ] };
-    key <AE03> { [               3,        sterling                                ] };
-    key <AE06> { [               6,       ampersand                                ] };
-    key <AE07> { [               7,           slash                                ] };
-    key <AE08> { [               8,       parenleft,    braceleft                  ] };     
-    key <AE09> { [               9,      parenright,   braceright                  ] };     
-    key <AE10> { [               0,           equal                                ] };
-    key <AE11> { [      apostrophe,        question,        grave                  ] };     
-    key <AE12> { [          igrave,     asciicircum                                ] };
-    key <AD03> { [               e,               E,     EuroSign                  ] };
-    key <AD11> { [          egrave,          eacute,  bracketleft,  dead_abovering ] };
-    key <AD12> { [            plus,        asterisk, bracketright                  ] };      
-    key <BKSL> { [          ugrave,         section,   asciitilde                  ] };
-    key <AC10> { [          ograve,        ccedilla,           at                  ] };      
-    key <AC11> { [          agrave,          degree,   numbersign                  ] };
-    key <AB08> { [           comma,       semicolon                                ] };
-    key <AB09> { [          period,           colon                                ] };
-    key <AB10> { [           minus,      underscore                                ] };
-
-        include "level3(ralt_switch)"
-
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "type4" {
-
-    name[Group1]="Italy - Sun type 4";
- 
-    key <BKSL> { [ bracketleft,  braceleft,    guillemotleft    ] };
-    key <BRCR> { [ bracketright, braceright,   guillemotright   ] };
-    key <AE02> { [ 2,            quotedbl,     twosuperior      ] };
-    key <AE03> { [ 3,            sterling,     threesuperior    ] };
-    key <AE06> { [ 6,            ampersand,    notsign          ] };
-    key <AE06> { [ 7,            slash                          ] };
-    key <AE06> { [ 8,            parenleft                      ] };
-    key <AE09> { [ 9,            parenright,   backslash        ] };
-    key <AE10> { [ 0,            equal,        bar              ] };
-    key <AE11> { [ quoteright,   question,     quoteleft        ] };
-    key <AE12> { [ igrave,       asciicircum                    ] };
- 
-    key <AD11> { [ egrave,       eacute                         ] };
-    key <AD12> { [ plus,         asterisk,     asciitilde       ] };
- 
-    key <AC10> { [ ograve,       ccedilla,     at               ] };
-    key <AC11> { [ agrave,       degree,       numbersign       ] };
-    key <TLDE> { [ ugrave,       section                        ] };
- 
-    key <LSGT> { [ less, greater        ] };
-    key <AB08> { [ comma, semicolon     ] };
-    key <AB09> { [ period, colon        ] };
-    key <AB10> { [ minus, underscore    ] };
-     
- 
-    key <LALT> { [ Alt_L                ] };
-    key <COMP> { [ SunCompose           ] };
-    key <RALT> { [ SunAltGraph          ] };
-    key <LCTL> { [ Caps_Lock            ] };
-    key <CAPS> { [ Control_L            ] };
- 
-	include "level3(ralt_switch)"
-
-};
-
- 
-partial alphanumeric_keys
-xkb_symbols "type5" {
-
-    name[Group1]="Italy - Sun type 5";
-
-    key <AE08> { [ 8,      parenleft,   braceleft                  ] };
-    key <AE09> { [ 9,      parenright,  braceright                 ] };
-    key <BKSL> { [ ugrave, section,     asciitilde                 ] };
-
-	include "level3(ralt_switch)"
-
-};
- 
-
-partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/it(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Italy";
+
+    key <LSGT> { [            less,         greater                                ] };
+    key <TLDE> { [       backslash,             bar                                ] };
+    key <AE02> { [               2,        quotedbl                                ] };
+    key <AE03> { [               3,        sterling                                ] };
+    key <AE06> { [               6,       ampersand                                ] };
+    key <AE07> { [               7,           slash                                ] };
+    key <AE08> { [               8,       parenleft,    braceleft                  ] };     
+    key <AE09> { [               9,      parenright,   braceright                  ] };     
+    key <AE10> { [               0,           equal                                ] };
+    key <AE11> { [      apostrophe,        question,        grave                  ] };     
+    key <AE12> { [          igrave,     asciicircum                                ] };
+    key <AD03> { [               e,               E,     EuroSign                  ] };
+    key <AD11> { [          egrave,          eacute,  bracketleft,  dead_abovering ] };
+    key <AD12> { [            plus,        asterisk, bracketright                  ] };      
+    key <BKSL> { [          ugrave,         section,   asciitilde                  ] };
+    key <AC10> { [          ograve,        ccedilla,           at                  ] };      
+    key <AC11> { [          agrave,          degree,   numbersign                  ] };
+    key <AB08> { [           comma,       semicolon                                ] };
+    key <AB09> { [          period,           colon                                ] };
+    key <AB10> { [           minus,      underscore                                ] };
+
+        include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "type4" {
+
+    name[Group1]="Italy - Sun type 4";
+ 
+    key <BKSL> { [ bracketleft,  braceleft,    guillemotleft    ] };
+    key <BRCR> { [ bracketright, braceright,   guillemotright   ] };
+    key <AE02> { [ 2,            quotedbl,     twosuperior      ] };
+    key <AE03> { [ 3,            sterling,     threesuperior    ] };
+    key <AE06> { [ 6,            ampersand,    notsign          ] };
+    key <AE06> { [ 7,            slash                          ] };
+    key <AE06> { [ 8,            parenleft                      ] };
+    key <AE09> { [ 9,            parenright,   backslash        ] };
+    key <AE10> { [ 0,            equal,        bar              ] };
+    key <AE11> { [ quoteright,   question,     quoteleft        ] };
+    key <AE12> { [ igrave,       asciicircum                    ] };
+ 
+    key <AD11> { [ egrave,       eacute                         ] };
+    key <AD12> { [ plus,         asterisk,     asciitilde       ] };
+ 
+    key <AC10> { [ ograve,       ccedilla,     at               ] };
+    key <AC11> { [ agrave,       degree,       numbersign       ] };
+    key <TLDE> { [ ugrave,       section                        ] };
+ 
+    key <LSGT> { [ less, greater        ] };
+    key <AB08> { [ comma, semicolon     ] };
+    key <AB09> { [ period, colon        ] };
+    key <AB10> { [ minus, underscore    ] };
+     
+ 
+    key <LALT> { [ Alt_L                ] };
+    key <COMP> { [ SunCompose           ] };
+    key <RALT> { [ SunAltGraph          ] };
+    key <LCTL> { [ Caps_Lock            ] };
+    key <CAPS> { [ Control_L            ] };
+ 
+	include "level3(ralt_switch)"
+
+};
+
+ 
+partial alphanumeric_keys
+xkb_symbols "type5" {
+
+    name[Group1]="Italy - Sun type 5";
+
+    key <AE08> { [ 8,      parenleft,   braceleft                  ] };
+    key <AE09> { [ 9,      parenright,  braceright                 ] };
+    key <BKSL> { [ ugrave, section,     asciitilde                 ] };
+
+	include "level3(ralt_switch)"
+
+};
+ 
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/it(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/jp b/xorg-server/xkeyboard-config/symbols/sun_vndr/jp
index 9b6579e2a..26911494a 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/jp
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/jp
@@ -1,816 +1,816 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-//
-//Copyright 1996, 1998  The Open Group
-//
-//All Rights Reserved.
-//
-//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 OPEN GROUP 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 Open Group 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 Open Group.
-//
-// US/ASCII layout for a Type 4 Sun keyboard
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-xkb_symbols "basic" {
-    // Alphanumeric section
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-    key <BKSP> { [ BackSpace		]	};
-
-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U			], [ kana_NA		]	};
-    key <AD08> { [ i, I			], [ kana_NI		]	};
-    key <AD09> { [ o, O			], [ kana_RA		]	};
-    key <AD10> { [ p, P			], [ kana_SE		]	};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-    key <RTRN> { [ Return		]	};
-
-    key <CAPS> { [ Caps_Lock		]	};
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J			], [ kana_MA		]	};
-    key <AC08> { [ k, K			], [ kana_NO		]	};
-    key <AC09> { [ l, L			], [ kana_RI		]	};
-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
-
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		]	};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-
-    key <SPCE> { [ space		]			};
-    key <KANJ> { [ Kanji		]			};
-    key <HENK> { [ Henkan_Mode		]			};
-//    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <ESC>  { [ Escape		]			};
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
-//    key <BRCR> { [ Linefeed		]			};
-    key <EXEC> { [ Execute		]			};
-};
-xkb_symbols "type4" {
-
-    // Alphanumeric section
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-    key <BKSP> { [ BackSpace		]	};
-
-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U			], [ kana_NA		]	};
-    key <AD08> { [ i, I			], [ kana_NI		]	};
-    key <AD09> { [ o, O			], [ kana_RA		]	};
-    key <AD10> { [ p, P			], [ kana_SE		]	};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-    key <RTRN> { [ Return		]	};
-
-    key <CAPS> { [ Caps_Lock		]	};
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J			], [ kana_MA		]	};
-    key <AC08> { [ k, K			], [ kana_NO		]	};
-    key <AC09> { [ l, L			], [ kana_RI		]	};
-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
-
-    key <LFSH> { [ Shift_L		]	};
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		]	};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-    key <RTSH> { [ Shift_R		]	};
-
-    key <LCTL> { [ Control_L		]			};
-    key <SPCE> { [ space		]			};
-    key <KANJ> { [ Kanji		]			};
-    key <HENK> { [ Henkan_Mode		]			};
-    key <LALT> { [ Alt_L		]			};
-    key <ALGR> { [ Mode_switch		]			};
-    key <LMTA> { [ Meta_L		]			};
-    key <RMTA> { [ Meta_R		]			};
-    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
-    key <COMP> { [ Multi_key		]			};
-    key <EXEC> { [ Execute		]			};
-//    key <TLFD> { [ Linefeed		]			};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <ESC>  { [ Escape		]			};
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
-    key <BRCR> { [ Linefeed		]			};
-
-    key <STOP> { [ L1,	L1		], [ SunStop	]	};
-    key <AGAI> { [ L2,	L2		], [ SunAgain	]	};
-    key <PROP> { [ L3,	L3		], [ SunProps	]	};
-    key <UNDO> { [ L4,	L4		], [ SunUndo	]	};
-    key <FRNT> { [ L5,	L5		], [ SunFront	]	};
-    key <COPY> { [ L6,	L6		], [ SunCopy	]	};
-    key <OPEN> { [ L7,	L7		], [ SunOpen	]	};
-    key <PAST> { [ L8,	L8		], [ SunPaste	]	};
-    key <FIND> { [ L9,	L9		], [ SunFind	]	};
-    key <CUT>  { [ L10,	L10		], [ SunCut	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2,	R2		], [ Print		] };
-    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };
-    key <PAUS> { [ R1,	R1		], [ Pause		] };
-    key <DELE> { [ Delete		]			};
-    key <HELP> { [ Help			]			};
-
-    // End "Editing" section, begin "Keypad"
-    key <NMLK> { [ Num_Lock 		]			};
-    key <KPEQ> { [ R4,	R4 		], [ KP_Equal		] };
-    key <KPDV> { [ R5,	R5		], [ KP_Divide		] };
-    key <KPMU> { [ R6,	R6		], [ KP_Multiply	] };
-    key <KPSU> { [ KP_Subtract		]			};
-
-    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };
-    key  <KP8> { [ Up,	R8		], [ KP_8		] };
-    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };
-    key <KPAD> { [ KP_Add		]			};
-
-    key  <KP4> { [ Left, R10		], [ KP_4		] };
-    key  <KP5> { [ R11,	R11		], [ KP_5		] };
-    key  <KP6> { [ Right, R12		], [ KP_6		] };
-
-    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };
-    key  <KP2> { [ Down, R14		], [ KP_2		] };
-    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };
-    key <KPEN> { [ KP_Enter		]			}; 
-    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};
-    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};
-    // End "Keypad" section
-
-
-    // begin modifier mappings
-    modifier_map Shift  	{ Shift_R, Shift_L };
-    modifier_map Mod1   	{ Meta_L, Meta_R };
-    modifier_map Mod2   	{ Mode_switch };
-    modifier_map Mod3   	{ Num_Lock };
-    modifier_map Mod4		{ Alt_L };
-};
-
-// US/ASCII layout for a Type 5 Sun keyboard
-xkb_symbols "type5" {
-
-    // Alphanumeric section
-    key <TLDE> { [ backslash, bar	], [ prolongedsound	]	};
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-    key <BKSP> { [ BackSpace		]	};
-
-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U			], [ kana_NA		]	};
-    key <AD08> { [ i, I			], [ kana_NI		]	};
-    key <AD09> { [ o, O			], [ kana_RA		]	};
-    key <AD10> { [ p, P			], [ kana_SE		]	};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-    key <RTRN> { [ Return		]	};
-
-    key <CAPS> { [ Caps_Lock		]	};
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J			], [ kana_MA		]	};
-    key <AC08> { [ k, K			], [ kana_NO		]	};
-    key <AC09> { [ l, L			], [ kana_RI		]	};
-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
-
-    key <LFSH> { [ Shift_L		]	};
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		]	};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-    key <RTSH> { [ Shift_R		]	};
-
-    key <LCTL> { [ Control_L		]			};
-//    key <RCTL> { [ Control_R		]			};
-    key <EXEC> { [ Execute		]			};
-    key <SPCE> { [ space		]			};
-    key <KANJ> { [ Kanji		]			};
-    key <HENK> { [ Henkan_Mode		]			};
-    key <LALT> { [ Alt_L		]	};
-    key <ALGR> { [ Mode_switch		]	};
-    key <LMTA> { [ Meta_L		]	};
-    key <RMTA> { [ Meta_R		]	};
-    key <COMP> { [ Multi_key		]	};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <ESC>  { [ Escape		]			};
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <STOP> { [ L1, L1		], [ SunStop	]	};
-    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
-    key <PROP> { [ L3, L3		], [ SunProps	]	};
-    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
-    key <FRNT> { [ L5, L5		], [ SunFront	]	};
-    key <COPY> { [ L6, L6		], [ SunCopy	]	};
-    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
-    key <PAST> { [ L8, L8		], [ SunPaste	]	};
-    key <FIND> { [ L9, L9		], [ SunFind	]	};
-    key <CUT>  { [ L10, L10		], [ SunCut	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
-    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
-    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
-    key <LEFT> { [ Left			]			};
-    key <RGHT> { [ Right		]			};
-    key <UP>   { [ Up			]			};
-    key <DOWN> { [ Down			]			};
-
-    key <DELE> { [ Delete		]			};
-    key <INS>  { [ Insert		]			};
-    key <PGUP> { [ Prior		]			};
-    key <PGDN> { [ Next			]			};
-    key <HOME> { [ Home			]			};
-    key <END>  { [ End			]			};
-    key <HELP> { [ Help			]			};
-
-    // End "Editing" section, begin "Keypad"
-    key <NMLK> { [ Num_Lock 		]				};
-    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
-    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
-    key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
-
-    key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
-    key  <KP8> { [ Up, R8		], [ KP_8		]	};
-    key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
-    key <KPAD> { [ KP_Add		]				};
-
-    key  <KP4> { [ Left, R10		], [ KP_4		]	};
-    key  <KP5> { [ R11,	R11		], [ KP_5		]	};
-    key  <KP6> { [ Right, R12		], [ KP_6		]	};
-
-    key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
-    key  <KP2> { [ Down, R14		], [ KP_2		]	};
-    key  <KP3> { [ R15,	R15		], [ KP_3		]	};
-    key <KPEN> { [ KP_Enter		]				};
-
-    key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
-    key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
-    // End "Keypad" section, 
-    // begin "four keys up on the right"
-
-    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
-    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
-    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_R };
-    modifier_map Mod1	{ Meta_L, Meta_R };
-    modifier_map Mod2	{ Alt_R };
-    modifier_map Mod3	{ Num_Lock };
-    modifier_map Mod4	{ Alt_L };
-};
-
-xkb_symbols "type5hobo" {
-
-    // Alphanumeric section
-    key <TLDE> { [ backslash, bar	], [ prolongedsound	]	};
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	], [ KP_7 ]};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	], [ KP_8 ]};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	], [ KP_9 ]};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	], [ KP_Multiply]};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-    key <BKSP> { [ BackSpace		]	};
-
-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U		], [ kana_NA		], [ KP_4 ]	};
-    key <AD08> { [ i, I		], [ kana_NI		], [ KP_5 ]	};
-    key <AD09> { [ o, O		], [ kana_RA		], [ KP_6 ]	};
-    key <AD10> { [ p, P		], [ kana_SE		], [ KP_Subtract]};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-    key <RTRN> { [ Return	], [ NoSymbol, NoSymbol], [ KP_Enter	] };
-
-    key <CAPS> { [ Caps_Lock		]	};
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J		], [ kana_MA		], [ KP_1 ]};
-    key <AC08> { [ k, K		], [ kana_NO		], [ KP_2 ]};
-    key <AC09> { [ l, L		], [ kana_RI		], [ KP_3 ]};
-    key <AC10> { [ semicolon, plus], [ kana_RE		], [ KP_Add ]};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
-
-    key <LFSH> { [ Shift_L		]	};
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		], [ KP_0 ]};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ], [ KP_Decimal ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ], [ KP_Divide ]};
-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-    key <RTSH> { [ Shift_R		]	};
-
-    key <LCTL> { [ Control_L		]			};
-    key <EXEC> { [ Execute		]			};
-    key <SPCE> { [ space		]			};
-    key <KANJ> { [ Kanji		]			};
-    key <HENK> { [ Henkan_Mode		]			};
-    key <LALT> { [ Alt_L		]	};
-    key <ALGR> { [ Mode_switch		]	};
-    key <LMTA> { [ Meta_L		]	};
-    key <RMTA> { [ Meta_R		]	};
-    key <COMP> { [ Multi_key		]	};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <ESC>  { [ Escape		]			};
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <STOP> { [ L1, L1		], [ SunStop	]	};
-    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
-    key <PROP> { [ L3, L3		], [ SunProps	]	};
-    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
-    key <FRNT> { [ L5, L5		], [ SunFront	]	};
-    key <COPY> { [ L6, L6		], [ SunCopy	]	};
-    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
-    key <PAST> { [ L8, L8		], [ SunPaste	]	};
-    key <FIND> { [ L9, L9		], [ SunFind	]	};
-    key <CUT>  { [ L10, L10		], [ SunCut	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
-    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
-    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
-    key <LEFT> { [ Left			]			};
-    key <RGHT> { [ Right		]			};
-    key <UP>   { [ Up			]			};
-    key <DOWN> { [ Down			]			};
-
-    key <DELE> { [ Delete		]			};
-    key <INS>  { [ Insert		]			};
-    key <PGUP> { [ Prior		]			};
-    key <PGDN> { [ Next			]			};
-    key <HOME> { [ Home			]			};
-    key <END>  { [ End			]			};
-    key <HELP> { [ Help			]			};
-
-    // End "Editing" section, begin "Keypad"
-     key <NMLK> { [ Num_Lock 		]				};
-//     key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
-//     key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
-//     key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
-
-//     key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
-//     key  <KP8> { [ Up, R8		], [ KP_8		]	};
-//     key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
-//     key <KPAD> { [ KP_Add		]				};
-
-//     key  <KP4> { [ Left, R10		], [ KP_4		]	};
-//     key  <KP5> { [ R11,	R11		], [ KP_5		]	};
-//     key  <KP6> { [ Right, R12		], [ KP_6		]	};
-
-//     key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
-//     key  <KP2> { [ Down, R14		], [ KP_2		]	};
-//     key  <KP3> { [ R15,	R15		], [ KP_3		]	};
-//     key <KPEN> { [ KP_Enter		]				};
-
-//     key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
-//     key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
-    // End "Keypad" section, 
-    // begin "four keys up on the right"
-
-    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
-    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
-    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_R };
-    modifier_map Mod1	{ Meta_L, Meta_R };
-    modifier_map Mod2	{ Alt_R };
-    modifier_map Mod3	{ Num_Lock };
-    modifier_map Mod4	{ Alt_L };
-};
-
-// layout for a Japanese Type 6 Sun keyboard
-// Just shows differences from Type 6 US layout 
-partial
-xkb_symbols "type6" {
-
-    // Alphanumeric section
-    // Though Yen symbol is engraved on key AE13, JA L10N folks want backslash.
-    key <AE13> { [ backslash, bar       ], [ prolongedsound     ]       };
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U			], [ kana_NA		]	};
-    key <AD08> { [ i, I			], [ kana_NI		]	};
-    key <AD09> { [ o, O			], [ kana_RA		]	};
-    key <AD10> { [ p, P			], [ kana_SE		]	};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J			], [ kana_MA		]	};
-    key <AC08> { [ k, K			], [ kana_NO		]	};
-    key <AC09> { [ l, L			], [ kana_RI		]	};
-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
-
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		]	};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
-    key <AB11> { [ backslash, underscore], [ kana_RO		]	};
-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-
-    key <EXEC> { [ Execute		]			};
-    key <KANJ> { [ Kanji		]			};
-    key <HENK> { [ Henkan_Mode		]			};
-    key <ALGR> { [ Kana_Lock, Mode_switch ]	};
-    // End alphanumeric section
-};
-
-xkb_symbols "x86" {
-    include "sun_vndr/us(pc101)"
-    include "sun_vndr/jp(basic)"
-    key <TLDE> { [ Henkan_Mode, Henkan_Mode ], [ Henkan_Mode ] };
-
-    key <AE10> { [ 0, asciitilde	    ], [ kana_WA, kana_WO	]};
-    key <AE13> { [ backslash, bar	    ], [ prolongedsound		]};
-
-    
-    key <AC12> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket	]};
-
-    key <ALGR> { [ Mode_switch ]	       };
-    key <RALT> { [ Alt_R ]	       };
-
-};
-
-xkb_symbols "J3100" {
-    include "sun_vndr/us(pc101)"
-
-    // Alphanumeric section
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-    key <BKSP> { [ BackSpace		]	};
-
-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U			], [ kana_NA		]	};
-    key <AD08> { [ i, I			], [ kana_NI		]	};
-    key <AD09> { [ o, O			], [ kana_RA		]	};
-    key <AD10> { [ p, P			], [ kana_SE		]	};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-    key <RTRN> { [ Return		]	};
-
-    key <CAPS> { [ Caps_Lock		]	};
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J			], [ kana_MA		]	};
-    key <AC08> { [ k, K			], [ kana_NO		]	};
-    key <AC09> { [ l, L			], [ kana_RI		]	};
-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
-
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		]	};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
-//    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-
-    key <SPCE> { [ space		]			};
-//    key <KANJ> { [ Kanji		]			};
-//    key <HENK> { [ Henkan_Mode		]			};
-//    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <ESC>  { [ Escape		]			};
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
-//    key <BRCR> { [ Linefeed		]			};
-//    key <EXEC> { [ Execute		]			};
-
-    key <ESC>  { [ Escape, 3 ] };
-
-    key <AE02> { [ 2, at		], [ kana_FU			]};
-    key <AE06> { [ 6, asciicircum	], [ kana_O, kana_o		]};
-    key <AE07> { [ 7, ampersand		], [ kana_YA, kana_ya		]};
-    key <AE08> { [ 8, asterisk		], [ kana_YU, kana_yu		]};
-    key <AE09> { [ 9, parenleft		], [ kana_YO, kana_yo		]};
-    key <AE10> { [ 0, parenright	], [ kana_WA, kana_WO		]};
-    key <AE11> { [ minus, underscore	], [ kana_HO			]};
-    key <AE12> { [ equal, plus		], [ kana_HE			]};
-
-    key <BKSL> { [ backslash, bar	    ], [ prolongedsound		]};
-    key <AE12> { [ equal, plus		], [ kana_HE			]};
-
-    key <AD11> { [ bracketleft, braceleft  ], [ voicedsound		]};    
-    key <AD12> { [ bracketright, braceright  ], [ semivoicedsound, kana_openingbracket	]};    
-
-    key <AC10> { [ semicolon, colon	     ], [ kana_RE		]};    
-    key <AC11> { [ quoteright, quotedbl	     ], [ kana_KE		]};    
-
-    key <TLDE> { [ quoteleft, asciitilde ], [ kana_MU, kana_closingbracket	]};
-    key <LSGT> { [ backslash, bar	 ], [ kana_RO			]};
-//    key <ALGR> { [ Mode_switch ]	       };
-    key <RALT> { [ Henkan_Mode ]	       };
-    key <RCTL> { [ Mode_switch ]	       };
-
-};
-
-xkb_symbols "Muhenkan_x86" {
-    include "sun_vndr/jp(x86)"
-
-    key <EXEC> { [ Muhenkan ] };
-};
-
-
-
-partial
-xkb_symbols "type7" {
-    include "sun_vndr/jp(type6)"
-    key <AE10> { [ 0, asciitilde       ], [ kana_WA, kana_WO   ]       };
-    key <TLDE> { [ Henkan_Mode ] };
-    key <HENK> { [ Kana_Lock, Mode_switch ] };
-    key <ALGR> { [ Alt_R, Alt_R ] };
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+//
+//Copyright 1996, 1998  The Open Group
+//
+//All Rights Reserved.
+//
+//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 OPEN GROUP 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 Open Group 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 Open Group.
+//
+// US/ASCII layout for a Type 4 Sun keyboard
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+xkb_symbols "basic" {
+    // Alphanumeric section
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return		]	};
+
+    key <CAPS> { [ Caps_Lock		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+
+    key <SPCE> { [ space		]			};
+    key <KANJ> { [ Kanji		]			};
+    key <HENK> { [ Henkan_Mode		]			};
+//    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <ESC>  { [ Escape		]			};
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
+//    key <BRCR> { [ Linefeed		]			};
+    key <EXEC> { [ Execute		]			};
+};
+xkb_symbols "type4" {
+
+    // Alphanumeric section
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return		]	};
+
+    key <CAPS> { [ Caps_Lock		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <LFSH> { [ Shift_L		]	};
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+    key <RTSH> { [ Shift_R		]	};
+
+    key <LCTL> { [ Control_L		]			};
+    key <SPCE> { [ space		]			};
+    key <KANJ> { [ Kanji		]			};
+    key <HENK> { [ Henkan_Mode		]			};
+    key <LALT> { [ Alt_L		]			};
+    key <ALGR> { [ Mode_switch		]			};
+    key <LMTA> { [ Meta_L		]			};
+    key <RMTA> { [ Meta_R		]			};
+    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
+    key <COMP> { [ Multi_key		]			};
+    key <EXEC> { [ Execute		]			};
+//    key <TLFD> { [ Linefeed		]			};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <ESC>  { [ Escape		]			};
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
+    key <BRCR> { [ Linefeed		]			};
+
+    key <STOP> { [ L1,	L1		], [ SunStop	]	};
+    key <AGAI> { [ L2,	L2		], [ SunAgain	]	};
+    key <PROP> { [ L3,	L3		], [ SunProps	]	};
+    key <UNDO> { [ L4,	L4		], [ SunUndo	]	};
+    key <FRNT> { [ L5,	L5		], [ SunFront	]	};
+    key <COPY> { [ L6,	L6		], [ SunCopy	]	};
+    key <OPEN> { [ L7,	L7		], [ SunOpen	]	};
+    key <PAST> { [ L8,	L8		], [ SunPaste	]	};
+    key <FIND> { [ L9,	L9		], [ SunFind	]	};
+    key <CUT>  { [ L10,	L10		], [ SunCut	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2,	R2		], [ Print		] };
+    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };
+    key <PAUS> { [ R1,	R1		], [ Pause		] };
+    key <DELE> { [ Delete		]			};
+    key <HELP> { [ Help			]			};
+
+    // End "Editing" section, begin "Keypad"
+    key <NMLK> { [ Num_Lock 		]			};
+    key <KPEQ> { [ R4,	R4 		], [ KP_Equal		] };
+    key <KPDV> { [ R5,	R5		], [ KP_Divide		] };
+    key <KPMU> { [ R6,	R6		], [ KP_Multiply	] };
+    key <KPSU> { [ KP_Subtract		]			};
+
+    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };
+    key  <KP8> { [ Up,	R8		], [ KP_8		] };
+    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };
+    key <KPAD> { [ KP_Add		]			};
+
+    key  <KP4> { [ Left, R10		], [ KP_4		] };
+    key  <KP5> { [ R11,	R11		], [ KP_5		] };
+    key  <KP6> { [ Right, R12		], [ KP_6		] };
+
+    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };
+    key  <KP2> { [ Down, R14		], [ KP_2		] };
+    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };
+    key <KPEN> { [ KP_Enter		]			}; 
+    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};
+    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};
+    // End "Keypad" section
+
+
+    // begin modifier mappings
+    modifier_map Shift  	{ Shift_R, Shift_L };
+    modifier_map Mod1   	{ Meta_L, Meta_R };
+    modifier_map Mod2   	{ Mode_switch };
+    modifier_map Mod3   	{ Num_Lock };
+    modifier_map Mod4		{ Alt_L };
+};
+
+// US/ASCII layout for a Type 5 Sun keyboard
+xkb_symbols "type5" {
+
+    // Alphanumeric section
+    key <TLDE> { [ backslash, bar	], [ prolongedsound	]	};
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return		]	};
+
+    key <CAPS> { [ Caps_Lock		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <LFSH> { [ Shift_L		]	};
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+    key <RTSH> { [ Shift_R		]	};
+
+    key <LCTL> { [ Control_L		]			};
+//    key <RCTL> { [ Control_R		]			};
+    key <EXEC> { [ Execute		]			};
+    key <SPCE> { [ space		]			};
+    key <KANJ> { [ Kanji		]			};
+    key <HENK> { [ Henkan_Mode		]			};
+    key <LALT> { [ Alt_L		]	};
+    key <ALGR> { [ Mode_switch		]	};
+    key <LMTA> { [ Meta_L		]	};
+    key <RMTA> { [ Meta_R		]	};
+    key <COMP> { [ Multi_key		]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <ESC>  { [ Escape		]			};
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <STOP> { [ L1, L1		], [ SunStop	]	};
+    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
+    key <PROP> { [ L3, L3		], [ SunProps	]	};
+    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
+    key <FRNT> { [ L5, L5		], [ SunFront	]	};
+    key <COPY> { [ L6, L6		], [ SunCopy	]	};
+    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
+    key <PAST> { [ L8, L8		], [ SunPaste	]	};
+    key <FIND> { [ L9, L9		], [ SunFind	]	};
+    key <CUT>  { [ L10, L10		], [ SunCut	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
+    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
+    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
+    key <LEFT> { [ Left			]			};
+    key <RGHT> { [ Right		]			};
+    key <UP>   { [ Up			]			};
+    key <DOWN> { [ Down			]			};
+
+    key <DELE> { [ Delete		]			};
+    key <INS>  { [ Insert		]			};
+    key <PGUP> { [ Prior		]			};
+    key <PGDN> { [ Next			]			};
+    key <HOME> { [ Home			]			};
+    key <END>  { [ End			]			};
+    key <HELP> { [ Help			]			};
+
+    // End "Editing" section, begin "Keypad"
+    key <NMLK> { [ Num_Lock 		]				};
+    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
+    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
+    key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
+
+    key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
+    key  <KP8> { [ Up, R8		], [ KP_8		]	};
+    key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
+    key <KPAD> { [ KP_Add		]				};
+
+    key  <KP4> { [ Left, R10		], [ KP_4		]	};
+    key  <KP5> { [ R11,	R11		], [ KP_5		]	};
+    key  <KP6> { [ Right, R12		], [ KP_6		]	};
+
+    key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
+    key  <KP2> { [ Down, R14		], [ KP_2		]	};
+    key  <KP3> { [ R15,	R15		], [ KP_3		]	};
+    key <KPEN> { [ KP_Enter		]				};
+
+    key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
+    key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
+    // End "Keypad" section, 
+    // begin "four keys up on the right"
+
+    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
+    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
+    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_R };
+    modifier_map Mod1	{ Meta_L, Meta_R };
+    modifier_map Mod2	{ Alt_R };
+    modifier_map Mod3	{ Num_Lock };
+    modifier_map Mod4	{ Alt_L };
+};
+
+xkb_symbols "type5hobo" {
+
+    // Alphanumeric section
+    key <TLDE> { [ backslash, bar	], [ prolongedsound	]	};
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	], [ KP_7 ]};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	], [ KP_8 ]};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	], [ KP_9 ]};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	], [ KP_Multiply]};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U		], [ kana_NA		], [ KP_4 ]	};
+    key <AD08> { [ i, I		], [ kana_NI		], [ KP_5 ]	};
+    key <AD09> { [ o, O		], [ kana_RA		], [ KP_6 ]	};
+    key <AD10> { [ p, P		], [ kana_SE		], [ KP_Subtract]};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return	], [ NoSymbol, NoSymbol], [ KP_Enter	] };
+
+    key <CAPS> { [ Caps_Lock		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J		], [ kana_MA		], [ KP_1 ]};
+    key <AC08> { [ k, K		], [ kana_NO		], [ KP_2 ]};
+    key <AC09> { [ l, L		], [ kana_RI		], [ KP_3 ]};
+    key <AC10> { [ semicolon, plus], [ kana_RE		], [ KP_Add ]};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <LFSH> { [ Shift_L		]	};
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		], [ KP_0 ]};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ], [ KP_Decimal ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ], [ KP_Divide ]};
+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+    key <RTSH> { [ Shift_R		]	};
+
+    key <LCTL> { [ Control_L		]			};
+    key <EXEC> { [ Execute		]			};
+    key <SPCE> { [ space		]			};
+    key <KANJ> { [ Kanji		]			};
+    key <HENK> { [ Henkan_Mode		]			};
+    key <LALT> { [ Alt_L		]	};
+    key <ALGR> { [ Mode_switch		]	};
+    key <LMTA> { [ Meta_L		]	};
+    key <RMTA> { [ Meta_R		]	};
+    key <COMP> { [ Multi_key		]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <ESC>  { [ Escape		]			};
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <STOP> { [ L1, L1		], [ SunStop	]	};
+    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
+    key <PROP> { [ L3, L3		], [ SunProps	]	};
+    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
+    key <FRNT> { [ L5, L5		], [ SunFront	]	};
+    key <COPY> { [ L6, L6		], [ SunCopy	]	};
+    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
+    key <PAST> { [ L8, L8		], [ SunPaste	]	};
+    key <FIND> { [ L9, L9		], [ SunFind	]	};
+    key <CUT>  { [ L10, L10		], [ SunCut	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
+    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
+    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
+    key <LEFT> { [ Left			]			};
+    key <RGHT> { [ Right		]			};
+    key <UP>   { [ Up			]			};
+    key <DOWN> { [ Down			]			};
+
+    key <DELE> { [ Delete		]			};
+    key <INS>  { [ Insert		]			};
+    key <PGUP> { [ Prior		]			};
+    key <PGDN> { [ Next			]			};
+    key <HOME> { [ Home			]			};
+    key <END>  { [ End			]			};
+    key <HELP> { [ Help			]			};
+
+    // End "Editing" section, begin "Keypad"
+     key <NMLK> { [ Num_Lock 		]				};
+//     key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
+//     key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
+//     key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
+
+//     key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
+//     key  <KP8> { [ Up, R8		], [ KP_8		]	};
+//     key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
+//     key <KPAD> { [ KP_Add		]				};
+
+//     key  <KP4> { [ Left, R10		], [ KP_4		]	};
+//     key  <KP5> { [ R11,	R11		], [ KP_5		]	};
+//     key  <KP6> { [ Right, R12		], [ KP_6		]	};
+
+//     key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
+//     key  <KP2> { [ Down, R14		], [ KP_2		]	};
+//     key  <KP3> { [ R15,	R15		], [ KP_3		]	};
+//     key <KPEN> { [ KP_Enter		]				};
+
+//     key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
+//     key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
+    // End "Keypad" section, 
+    // begin "four keys up on the right"
+
+    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
+    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
+    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_R };
+    modifier_map Mod1	{ Meta_L, Meta_R };
+    modifier_map Mod2	{ Alt_R };
+    modifier_map Mod3	{ Num_Lock };
+    modifier_map Mod4	{ Alt_L };
+};
+
+// layout for a Japanese Type 6 Sun keyboard
+// Just shows differences from Type 6 US layout 
+partial
+xkb_symbols "type6" {
+
+    // Alphanumeric section
+    // Though Yen symbol is engraved on key AE13, JA L10N folks want backslash.
+    key <AE13> { [ backslash, bar       ], [ prolongedsound     ]       };
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
+    key <AB11> { [ backslash, underscore], [ kana_RO		]	};
+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+
+    key <EXEC> { [ Execute		]			};
+    key <KANJ> { [ Kanji		]			};
+    key <HENK> { [ Henkan_Mode		]			};
+    key <ALGR> { [ Kana_Lock, Mode_switch ]	};
+    // End alphanumeric section
+};
+
+xkb_symbols "x86" {
+    include "sun_vndr/us(pc101)"
+    include "sun_vndr/jp(basic)"
+    key <TLDE> { [ Henkan_Mode, Henkan_Mode ], [ Henkan_Mode ] };
+
+    key <AE10> { [ 0, asciitilde	    ], [ kana_WA, kana_WO	]};
+    key <AE13> { [ backslash, bar	    ], [ prolongedsound		]};
+
+    
+    key <AC12> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket	]};
+
+    key <ALGR> { [ Mode_switch ]	       };
+    key <RALT> { [ Alt_R ]	       };
+
+};
+
+xkb_symbols "J3100" {
+    include "sun_vndr/us(pc101)"
+
+    // Alphanumeric section
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return		]	};
+
+    key <CAPS> { [ Caps_Lock		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
+//    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+
+    key <SPCE> { [ space		]			};
+//    key <KANJ> { [ Kanji		]			};
+//    key <HENK> { [ Henkan_Mode		]			};
+//    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <ESC>  { [ Escape		]			};
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
+//    key <BRCR> { [ Linefeed		]			};
+//    key <EXEC> { [ Execute		]			};
+
+    key <ESC>  { [ Escape, 3 ] };
+
+    key <AE02> { [ 2, at		], [ kana_FU			]};
+    key <AE06> { [ 6, asciicircum	], [ kana_O, kana_o		]};
+    key <AE07> { [ 7, ampersand		], [ kana_YA, kana_ya		]};
+    key <AE08> { [ 8, asterisk		], [ kana_YU, kana_yu		]};
+    key <AE09> { [ 9, parenleft		], [ kana_YO, kana_yo		]};
+    key <AE10> { [ 0, parenright	], [ kana_WA, kana_WO		]};
+    key <AE11> { [ minus, underscore	], [ kana_HO			]};
+    key <AE12> { [ equal, plus		], [ kana_HE			]};
+
+    key <BKSL> { [ backslash, bar	    ], [ prolongedsound		]};
+    key <AE12> { [ equal, plus		], [ kana_HE			]};
+
+    key <AD11> { [ bracketleft, braceleft  ], [ voicedsound		]};    
+    key <AD12> { [ bracketright, braceright  ], [ semivoicedsound, kana_openingbracket	]};    
+
+    key <AC10> { [ semicolon, colon	     ], [ kana_RE		]};    
+    key <AC11> { [ quoteright, quotedbl	     ], [ kana_KE		]};    
+
+    key <TLDE> { [ quoteleft, asciitilde ], [ kana_MU, kana_closingbracket	]};
+    key <LSGT> { [ backslash, bar	 ], [ kana_RO			]};
+//    key <ALGR> { [ Mode_switch ]	       };
+    key <RALT> { [ Henkan_Mode ]	       };
+    key <RCTL> { [ Mode_switch ]	       };
+
+};
+
+xkb_symbols "Muhenkan_x86" {
+    include "sun_vndr/jp(x86)"
+
+    key <EXEC> { [ Muhenkan ] };
+};
+
+
+
+partial
+xkb_symbols "type7" {
+    include "sun_vndr/jp(type6)"
+    key <AE10> { [ 0, asciitilde       ], [ kana_WA, kana_WO   ]       };
+    key <TLDE> { [ Henkan_Mode ] };
+    key <HENK> { [ Kana_Lock, Mode_switch ] };
+    key <ALGR> { [ Alt_R, Alt_R ] };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/kr b/xorg-server/xkeyboard-config/symbols/sun_vndr/kr
index 0973943bf..62cf63d71 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/kr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/kr
@@ -1,97 +1,97 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-// Korean layout for a Type 6 Sun keyboard
-partial
-xkb_symbols "type6" {
-
-    // A few keys are different
-    key <ALGR> { [ Hangul                       ]       };
-    key <COMP> { [ Hangul_Hanja                 ]       };
-    key <KANA> { [ Hangul                       ]       };
-    key <EISU> { [ Hangul_Hanja                 ]       };
-    key <BKSL> { [ backslash, bar,  brokenbar   ]       };
-
-        include "level3(ralt_switch)"
-
-};
-
-
-// Korean layout for a Type 4 Sun keyboard
-xkb_symbols "type4" {
-
-    key <BKSL> { [ backslash, bar,  brokenbar	]		};
-
-    key <LNFD> { [ Hangul		]			};
-    key <RALT> { [ Linefeed		]			};
-    key <COMP> { [ Hangul_Hanja		]			};
-
-	include "level3(ralt_switch)"
-
-};
-
-// Korean layout for a Type 5 Sun keyboard
-xkb_symbols "type5" {
-
-    // A few keys are different
-    key <ALGR> { [ Hangul		]				  };
-    key <COMP> { [ Hangul_Hanja		]				  };
-    key <BKSL> { [ backslash, bar,  brokenbar			] };
-
-	include "level3(ralt_switch)"
-
-};
-
-
-partial default alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/kr(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+// Korean layout for a Type 6 Sun keyboard
+partial
+xkb_symbols "type6" {
+
+    // A few keys are different
+    key <ALGR> { [ Hangul                       ]       };
+    key <COMP> { [ Hangul_Hanja                 ]       };
+    key <KANA> { [ Hangul                       ]       };
+    key <EISU> { [ Hangul_Hanja                 ]       };
+    key <BKSL> { [ backslash, bar,  brokenbar   ]       };
+
+        include "level3(ralt_switch)"
+
+};
+
+
+// Korean layout for a Type 4 Sun keyboard
+xkb_symbols "type4" {
+
+    key <BKSL> { [ backslash, bar,  brokenbar	]		};
+
+    key <LNFD> { [ Hangul		]			};
+    key <RALT> { [ Linefeed		]			};
+    key <COMP> { [ Hangul_Hanja		]			};
+
+	include "level3(ralt_switch)"
+
+};
+
+// Korean layout for a Type 5 Sun keyboard
+xkb_symbols "type5" {
+
+    // A few keys are different
+    key <ALGR> { [ Hangul		]				  };
+    key <COMP> { [ Hangul_Hanja		]				  };
+    key <BKSL> { [ backslash, bar,  brokenbar			] };
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/kr(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/lt b/xorg-server/xkeyboard-config/symbols/sun_vndr/lt
index b82ebcfb9..8e8bee0f8 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/lt
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/lt
@@ -1,118 +1,118 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Lithuania";
-
-
-
-    key <TLDE>  { [ quoteleft,   asciitilde,	notsign,   brokenbar ]    };
-    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 <AE11>  { [     minus,   underscore,	backslash, questiondown ]  };
-    key <AE12>  { [    zcaron,       Zcaron,	equal,         plus ]  };
-
-    key <AD01>  { [         q,          Q,	at,  Greek_OMEGA ] };
-    key <AD02>  { [         w,          W,	lstroke,      Lstroke ] };
-    key <AD03>  { [         e,          E,	EuroSign               ] };
-    key <AD04>  { [         r,          R,	paragraph,   registered ] };
-    key <AD05>  { [         t,          T,	tslash,       Tslash ] };
-    key <AD06>  { [         y,          Y,	leftarrow,          yen ] };
-    key <AD07>  { [         u,          U,	downarrow,      uparrow ] };
-    key <AD08>  { [         i,          I,	rightarrow,     idotless ] };
-    key <AD09>  { [         o,          O,	oslash,     Ooblique ] };
-    key <AD10>  { [         p,          P,	thorn,        THORN ] };
-    key <AD11>  { [  bracketleft,  braceleft,	dead_diaeresis, dead_abovering ] };
-    key <AD12>  { [ bracketright, braceright,	dead_tilde,    dead_macron ] };
-
-    key <AC01>  { [         a,          A,	ae,           AE ] };
-    key <AC02>  { [         s,          S,	ssharp,      section ] };
-    key <AC03>  { [         d,          D,	eth,          ETH ] };
-    key <AC04>  { [         f,          F,	dstroke,  ordfeminine ] };
-    key <AC05>  { [         g,          G,	eng,          ENG ] };
-    key <AC06>  { [         h,          H,	hstroke,      Hstroke ] };
-    key <AC07>  { [         j,          J ] 				    };
-    key <AC08>  { [         k,          K,	kra,    ampersand ] };
-    key <AC09>  { [         l,          L,	lstroke,      Lstroke ] };
-    key <AC10>  { [  semicolon,     colon,	dead_acute, dead_doubleacute ] };
-    key <AC11>  { [ apostrophe,  quotedbl,	dead_circumflex,  dead_caron ] };
-    key <LSGT>  { [  backslash,       bar,	dead_grave,   dead_breve ] };
-
-    key <BKSL>  { [ backslash,        bar,	dead_grave,   dead_breve ] };
-    key <AB01>  { [         z,          Z,	guillemotleft,        less ] };
-    key <AB02>  { [         x,          X,	guillemotright,    greater ] };
-    key <AB03>  { [         c,          C,	cent,    copyright ] };
-    key <AB04>  { [         v,          V,	leftdoublequotemark, leftsinglequotemark ]   };
-    key <AB05>  { [         b,          B,	rightdoublequotemark, rightsinglequotemark ] };
-    key <AB06>  { [         n,          N ]     };
-    key <AB07>  { [         m,          M,	mu,    masculine ] };
-    key <AB08>  { [     comma,       less,	ampersand,     multiply ] };
-    key <AB09>  { [    period,    greater,	periodcentered,   division ] };
-    key <AB10>  { [     slash,   question,	dead_belowdot, dead_abovedot ] };
-
-	include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/lt(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Lithuania";
+
+
+
+    key <TLDE>  { [ quoteleft,   asciitilde,	notsign,   brokenbar ]    };
+    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 <AE11>  { [     minus,   underscore,	backslash, questiondown ]  };
+    key <AE12>  { [    zcaron,       Zcaron,	equal,         plus ]  };
+
+    key <AD01>  { [         q,          Q,	at,  Greek_OMEGA ] };
+    key <AD02>  { [         w,          W,	lstroke,      Lstroke ] };
+    key <AD03>  { [         e,          E,	EuroSign               ] };
+    key <AD04>  { [         r,          R,	paragraph,   registered ] };
+    key <AD05>  { [         t,          T,	tslash,       Tslash ] };
+    key <AD06>  { [         y,          Y,	leftarrow,          yen ] };
+    key <AD07>  { [         u,          U,	downarrow,      uparrow ] };
+    key <AD08>  { [         i,          I,	rightarrow,     idotless ] };
+    key <AD09>  { [         o,          O,	oslash,     Ooblique ] };
+    key <AD10>  { [         p,          P,	thorn,        THORN ] };
+    key <AD11>  { [  bracketleft,  braceleft,	dead_diaeresis, dead_abovering ] };
+    key <AD12>  { [ bracketright, braceright,	dead_tilde,    dead_macron ] };
+
+    key <AC01>  { [         a,          A,	ae,           AE ] };
+    key <AC02>  { [         s,          S,	ssharp,      section ] };
+    key <AC03>  { [         d,          D,	eth,          ETH ] };
+    key <AC04>  { [         f,          F,	dstroke,  ordfeminine ] };
+    key <AC05>  { [         g,          G,	eng,          ENG ] };
+    key <AC06>  { [         h,          H,	hstroke,      Hstroke ] };
+    key <AC07>  { [         j,          J ] 				    };
+    key <AC08>  { [         k,          K,	kra,    ampersand ] };
+    key <AC09>  { [         l,          L,	lstroke,      Lstroke ] };
+    key <AC10>  { [  semicolon,     colon,	dead_acute, dead_doubleacute ] };
+    key <AC11>  { [ apostrophe,  quotedbl,	dead_circumflex,  dead_caron ] };
+    key <LSGT>  { [  backslash,       bar,	dead_grave,   dead_breve ] };
+
+    key <BKSL>  { [ backslash,        bar,	dead_grave,   dead_breve ] };
+    key <AB01>  { [         z,          Z,	guillemotleft,        less ] };
+    key <AB02>  { [         x,          X,	guillemotright,    greater ] };
+    key <AB03>  { [         c,          C,	cent,    copyright ] };
+    key <AB04>  { [         v,          V,	leftdoublequotemark, leftsinglequotemark ]   };
+    key <AB05>  { [         b,          B,	rightdoublequotemark, rightsinglequotemark ] };
+    key <AB06>  { [         n,          N ]     };
+    key <AB07>  { [         m,          M,	mu,    masculine ] };
+    key <AB08>  { [     comma,       less,	ampersand,     multiply ] };
+    key <AB09>  { [    period,    greater,	periodcentered,   division ] };
+    key <AB10>  { [     slash,   question,	dead_belowdot, dead_abovedot ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/lt(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/lv b/xorg-server/xkeyboard-config/symbols/sun_vndr/lv
index d1573868b..befcfc679 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/lv
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/lv
@@ -1,117 +1,117 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Latvia";
-
-
-   key <TLDE> { [          grave,    asciitilde,	acute,    asciitilde ] };
-   key <AE01> { [              1,        exclam,	onesuperior,    exclamdown ] };
-   key <AE02> { [              2,            at,	twosuperior,     oneeighth ] };
-   key <AE03> { [              3,    numbersign,	threesuperior,      sterling ] };
-   key <AE04> { [              4,        dollar,	EuroSign,          cent ] };
-   key <AE05> { [              5,       percent,	onehalf,  threeeighths ] };
-   key <AE06> { [              6,   asciicircum,	threequarters,   fiveeighths ] };
-   key <AE07> { [              7,     ampersand,	braceleft,  seveneighths ] };
-   key <AE08> { [              8,      asterisk,	bracketleft,     trademark ] };
-   key <AE09> { [              9,     parenleft,	bracketright,     plusminus ] };
-   key <AE10> { [              0,    parenright,	braceright,        degree ] };
-   key <AE11> { [          minus,    underscore,	backslash,  questiondown ] };
-   key <AE12> { [          equal,          plus,	endash,        emdash ] };
-
-   key <AD01> { [              q,             Q,	q,             Q ] };
-   key <AD02> { [              w,             W,	w,             W ] };
-   key <AD03> { [              e,             E,	emacron,       Emacron ] };
-   key <AD04> { [              r,             R,	rcedilla,      Rcedilla ] };
-   key <AD05> { [              t,             T,	t,             T ] };
-   key <AD06> { [              y,             Y,	y,             Y ] };
-   key <AD07> { [              u,             U,	umacron,       Umacron ] };
-   key <AD08> { [              i,             I,	imacron,       Imacron ] };
-   key <AD09> { [              o,             O,	omacron,       Omacron ] };
-   key <AD10> { [              p,             P,	p,             P ] };
-   key <AD11> { [    bracketleft,     braceleft,	guillemotleft, leftdoublequotemark ] };
-   key <AD12> { [   bracketright,    braceright,	guillemotright, rightdoublequotemark ] };
-
-   key <AC01> { [              a,             A,	amacron,       Amacron ] };
-   key <AC02> { [              s,             S,	scaron,        Scaron ] };
-   key <AC03> { [              d,             D,	d,             D ] };
-   key <AC04> { [              f,             F,	f,             F ] };
-   key <AC05> { [              g,             G,	gcedilla,      Gcedilla ] };
-   key <AC06> { [              h,             H,	h,             H ] };
-   key <AC07> { [              j,             J,	j,             J ] };
-   key <AC08> { [              k,             K,	kcedilla,      Kcedilla ] };
-   key <AC09> { [              l,             L,	lcedilla,      Lcedilla ] };
-   key <AC10> { [      semicolon,         colon,	semicolon,         colon ] };
-   key <AC11> { [     apostrophe,      quotedbl,	leftdoublequotemark, doublelowquotemark ] };
-   key <LSGT> { [      backslash,           bar,	degree,     brokenbar ] };
-
-   key <BKSL> { [      backslash,           bar,	grave,         breve ] };
-   key <AB01> { [              z,             Z,	zcaron,        Zcaron ] };
-   key <AB02> { [              x,             X,	x,             X ] };
-   key <AB03> { [              c,             C,	ccaron,        Ccaron ] };
-   key <AB04> { [              v,             V,	v,             V ] };
-   key <AB05> { [              b,             B,	b,             B ] };
-   key <AB06> { [              n,             N,	ncedilla,      Ncedilla ] };
-   key <AB07> { [              m,             M,	m,             M ] };
-   key <AB08> { [          comma,          less,	horizconnector,      multiply ] };
-   key <AB09> { [         period,       greater,	periodcentered,      division ] };
-   key <AB10> { [          slash,      question,	slash,      abovedot ] };
-
-	include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/lv(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Latvia";
+
+
+   key <TLDE> { [          grave,    asciitilde,	acute,    asciitilde ] };
+   key <AE01> { [              1,        exclam,	onesuperior,    exclamdown ] };
+   key <AE02> { [              2,            at,	twosuperior,     oneeighth ] };
+   key <AE03> { [              3,    numbersign,	threesuperior,      sterling ] };
+   key <AE04> { [              4,        dollar,	EuroSign,          cent ] };
+   key <AE05> { [              5,       percent,	onehalf,  threeeighths ] };
+   key <AE06> { [              6,   asciicircum,	threequarters,   fiveeighths ] };
+   key <AE07> { [              7,     ampersand,	braceleft,  seveneighths ] };
+   key <AE08> { [              8,      asterisk,	bracketleft,     trademark ] };
+   key <AE09> { [              9,     parenleft,	bracketright,     plusminus ] };
+   key <AE10> { [              0,    parenright,	braceright,        degree ] };
+   key <AE11> { [          minus,    underscore,	backslash,  questiondown ] };
+   key <AE12> { [          equal,          plus,	endash,        emdash ] };
+
+   key <AD01> { [              q,             Q,	q,             Q ] };
+   key <AD02> { [              w,             W,	w,             W ] };
+   key <AD03> { [              e,             E,	emacron,       Emacron ] };
+   key <AD04> { [              r,             R,	rcedilla,      Rcedilla ] };
+   key <AD05> { [              t,             T,	t,             T ] };
+   key <AD06> { [              y,             Y,	y,             Y ] };
+   key <AD07> { [              u,             U,	umacron,       Umacron ] };
+   key <AD08> { [              i,             I,	imacron,       Imacron ] };
+   key <AD09> { [              o,             O,	omacron,       Omacron ] };
+   key <AD10> { [              p,             P,	p,             P ] };
+   key <AD11> { [    bracketleft,     braceleft,	guillemotleft, leftdoublequotemark ] };
+   key <AD12> { [   bracketright,    braceright,	guillemotright, rightdoublequotemark ] };
+
+   key <AC01> { [              a,             A,	amacron,       Amacron ] };
+   key <AC02> { [              s,             S,	scaron,        Scaron ] };
+   key <AC03> { [              d,             D,	d,             D ] };
+   key <AC04> { [              f,             F,	f,             F ] };
+   key <AC05> { [              g,             G,	gcedilla,      Gcedilla ] };
+   key <AC06> { [              h,             H,	h,             H ] };
+   key <AC07> { [              j,             J,	j,             J ] };
+   key <AC08> { [              k,             K,	kcedilla,      Kcedilla ] };
+   key <AC09> { [              l,             L,	lcedilla,      Lcedilla ] };
+   key <AC10> { [      semicolon,         colon,	semicolon,         colon ] };
+   key <AC11> { [     apostrophe,      quotedbl,	leftdoublequotemark, doublelowquotemark ] };
+   key <LSGT> { [      backslash,           bar,	degree,     brokenbar ] };
+
+   key <BKSL> { [      backslash,           bar,	grave,         breve ] };
+   key <AB01> { [              z,             Z,	zcaron,        Zcaron ] };
+   key <AB02> { [              x,             X,	x,             X ] };
+   key <AB03> { [              c,             C,	ccaron,        Ccaron ] };
+   key <AB04> { [              v,             V,	v,             V ] };
+   key <AB05> { [              b,             B,	b,             B ] };
+   key <AB06> { [              n,             N,	ncedilla,      Ncedilla ] };
+   key <AB07> { [              m,             M,	m,             M ] };
+   key <AB08> { [          comma,          less,	horizconnector,      multiply ] };
+   key <AB09> { [         period,       greater,	periodcentered,      division ] };
+   key <AB10> { [          slash,      question,	slash,      abovedot ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/lv(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/nl b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl
index 8469039f7..3e0ba2011 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/nl
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl
@@ -1,148 +1,148 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-default partial alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Netherlands";
-
-    key <TLDE>  { [        at,    section,      notsign ] };
-    key <AE01>  { [         1,     exclam,  onesuperior ] };
-    key <AE02>  { [         2,   quotedbl,  twosuperior ] };
-    key <AE03>  { [         3,    numbersign, threesuperior ] };
-    key <AE04>  { [         4,    dollar,  onequarter ] };
-    key <AE05>  { [         5,    percent,   onehalf ] };
-    key <AE06>  { [         6,  ampersand, threequarters ] };
-    key <AE07>  { [         7, underscore,     sterling ] };
-    key <AE08>  { [         8,  parenleft,    braceleft ] };
-    key <AE09>  { [         9, parenright,   braceright ] };
-    key <AE10>  { [         0, quoteright,   quoteleft ] };
-    key <AE11>  { [     slash,   question,    backslash ] };
-    key <AE12>  { [    degree, dead_tilde, dead_cedilla ] };
-
-    key <AD03>  { [         e,          E,     EuroSign ] };
-    key <AD05>  { [         t,          T ] };
-    key <AD06>  { [         y,          Y ] };
-    key <AD07>  { [         u,          U ] };
-    key <AD08>  { [         i,          I ] };
-    key <AD09>  { [         o,          O ] };
-    key <AD10>  { [         p,          P ] };
-    key <AD11>  { [dead_diaeresis, dead_circumflex ]    };
-    key <AD12>  { [  asterisk,        bar,  asciitilde ] };
-
-    key <AC01>  { [         a,          A ] };
-    key <AC02>  { [         s,    S, ssharp ] };
-    key <AC04>  { [         f,          F ] };
-    key <AC10>  { [      plus,  plusminus ] };
-    key <AC11>  { [dead_acute, dead_grave ] };
-    key <BKSL>  { [      less,    greater,   asciicircum ] };
-
-    key <LSGT>  { [bracketright, bracketleft,       brokenbar ] };
-    key <AB01>  { [         z,    Z, guillemotleft ] };
-    key <AB02>  { [         x,    X, guillemotright ] };
-    key <AB03>  { [         c,    C, cent                     ] };
-    key <AB06>  { [         n,          N ] };
-    key <AB07>  { [         m,          M,     mu ] };
-    key <AB08>  { [     comma,  semicolon ] };
-    key <AB09>  { [    period,      colon ] };
-    key <AB10>  { [     minus,      equal ] };
-
-        include "level3(ralt_switch)"
-
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "type4" {
-
-    name[Group1]="Netherlands - Sun type 4";
-
-    key <BKSL> { [ at, section, notsign ]           };
-    key <BRCR> { [ backslash, bar       ]                       };
-    key <AE01> { [ 1, exclam, onesuperior ]       };
-    key <AE02> { [ 2, quotedbl, twosuperior ]       };
-    key <AE03> { [ 3, numbersign, threesuperior]      };
-    key <AE04> { [ 4, dollar, onequarter  ]       };
-    key <AE05> { [ 5, percent, onehalf     ]       };
-    key <AE06> { [ 6, ampersand, threequarters]      };
-    key <AE07> { [ 7, underscore, sterling    ]       };
-    key <AE08> { [ 8, parenleft, braceleft   ]       };
-    key <AE09> { [ 9, parenright, braceright  ]       };
-    key <AE10> { [ 0, quoteright, quoteleft   ]       };
-    key <AE11> { [ slash, question, backslash  ]        };
-    key <AE12> { [ degree, dead_tilde, dead_cedilla]      };
-    key <AD03> { [ e, E, EuroSign, Eacute    ]};
-    key <AD11> { [ dead_diaeresis, dead_circumflex, asciitilde, asciicircum]};
-    key <AD12> { [ asterisk, bar, asciitilde  ]       };
-    key <AC02> { [ S, S, ssharp      ]               };
-    key <AC10> { [ plus, plusminus      ]                       };
-    key <AC11> { [ dead_acute, dead_grave ]                    };
-    key <TLDE> { [ less, greater, asciicircum ]       };
-    key <LSGT> { [ bracketleft, bracketright, brokenbar ]     };
-    key <AB01> { [ z, Z, guillemotleft]      };
-    key <AB02> { [ x, X, guillemotright]     };
-    key <AB03> { [ c, C, cent        ]       };
-    key <AB07> { [ m, M, Greek_mu, masculine ]       };
-    key <AB08> { [ comma, semicolon, cedilla, guillemotleft]     };
-    key <AB09> { [ period, colon, periodcentered, guillemotright ] };
-    key <AB10> { [ minus, equal, hyphen ]            };
-    key <CAPS> { [ SunAltGraph          ]                       };
-//    key <COMP> { [ SunCompose         ]                       };
-    key <ALGR> { [ Caps_Lock            ]                       }; 
-
-	include "level3(ralt_switch)"
-
-};
-
-
-partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/nl(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+default partial alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Netherlands";
+
+    key <TLDE>  { [        at,    section,      notsign ] };
+    key <AE01>  { [         1,     exclam,  onesuperior ] };
+    key <AE02>  { [         2,   quotedbl,  twosuperior ] };
+    key <AE03>  { [         3,    numbersign, threesuperior ] };
+    key <AE04>  { [         4,    dollar,  onequarter ] };
+    key <AE05>  { [         5,    percent,   onehalf ] };
+    key <AE06>  { [         6,  ampersand, threequarters ] };
+    key <AE07>  { [         7, underscore,     sterling ] };
+    key <AE08>  { [         8,  parenleft,    braceleft ] };
+    key <AE09>  { [         9, parenright,   braceright ] };
+    key <AE10>  { [         0, quoteright,   quoteleft ] };
+    key <AE11>  { [     slash,   question,    backslash ] };
+    key <AE12>  { [    degree, dead_tilde, dead_cedilla ] };
+
+    key <AD03>  { [         e,          E,     EuroSign ] };
+    key <AD05>  { [         t,          T ] };
+    key <AD06>  { [         y,          Y ] };
+    key <AD07>  { [         u,          U ] };
+    key <AD08>  { [         i,          I ] };
+    key <AD09>  { [         o,          O ] };
+    key <AD10>  { [         p,          P ] };
+    key <AD11>  { [dead_diaeresis, dead_circumflex ]    };
+    key <AD12>  { [  asterisk,        bar,  asciitilde ] };
+
+    key <AC01>  { [         a,          A ] };
+    key <AC02>  { [         s,    S, ssharp ] };
+    key <AC04>  { [         f,          F ] };
+    key <AC10>  { [      plus,  plusminus ] };
+    key <AC11>  { [dead_acute, dead_grave ] };
+    key <BKSL>  { [      less,    greater,   asciicircum ] };
+
+    key <LSGT>  { [bracketright, bracketleft,       brokenbar ] };
+    key <AB01>  { [         z,    Z, guillemotleft ] };
+    key <AB02>  { [         x,    X, guillemotright ] };
+    key <AB03>  { [         c,    C, cent                     ] };
+    key <AB06>  { [         n,          N ] };
+    key <AB07>  { [         m,          M,     mu ] };
+    key <AB08>  { [     comma,  semicolon ] };
+    key <AB09>  { [    period,      colon ] };
+    key <AB10>  { [     minus,      equal ] };
+
+        include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "type4" {
+
+    name[Group1]="Netherlands - Sun type 4";
+
+    key <BKSL> { [ at, section, notsign ]           };
+    key <BRCR> { [ backslash, bar       ]                       };
+    key <AE01> { [ 1, exclam, onesuperior ]       };
+    key <AE02> { [ 2, quotedbl, twosuperior ]       };
+    key <AE03> { [ 3, numbersign, threesuperior]      };
+    key <AE04> { [ 4, dollar, onequarter  ]       };
+    key <AE05> { [ 5, percent, onehalf     ]       };
+    key <AE06> { [ 6, ampersand, threequarters]      };
+    key <AE07> { [ 7, underscore, sterling    ]       };
+    key <AE08> { [ 8, parenleft, braceleft   ]       };
+    key <AE09> { [ 9, parenright, braceright  ]       };
+    key <AE10> { [ 0, quoteright, quoteleft   ]       };
+    key <AE11> { [ slash, question, backslash  ]        };
+    key <AE12> { [ degree, dead_tilde, dead_cedilla]      };
+    key <AD03> { [ e, E, EuroSign, Eacute    ]};
+    key <AD11> { [ dead_diaeresis, dead_circumflex, asciitilde, asciicircum]};
+    key <AD12> { [ asterisk, bar, asciitilde  ]       };
+    key <AC02> { [ S, S, ssharp      ]               };
+    key <AC10> { [ plus, plusminus      ]                       };
+    key <AC11> { [ dead_acute, dead_grave ]                    };
+    key <TLDE> { [ less, greater, asciicircum ]       };
+    key <LSGT> { [ bracketleft, bracketright, brokenbar ]     };
+    key <AB01> { [ z, Z, guillemotleft]      };
+    key <AB02> { [ x, X, guillemotright]     };
+    key <AB03> { [ c, C, cent        ]       };
+    key <AB07> { [ m, M, Greek_mu, masculine ]       };
+    key <AB08> { [ comma, semicolon, cedilla, guillemotleft]     };
+    key <AB09> { [ period, colon, periodcentered, guillemotright ] };
+    key <AB10> { [ minus, equal, hyphen ]            };
+    key <CAPS> { [ SunAltGraph          ]                       };
+//    key <COMP> { [ SunCompose         ]                       };
+    key <ALGR> { [ Caps_Lock            ]                       }; 
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/nl(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/no b/xorg-server/xkeyboard-config/symbols/sun_vndr/no
index bbb414da7..bcc8c30cc 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/no
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/no
@@ -1,144 +1,144 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Norway";
-
-    key <TLDE> { [             bar,         section                ] };
-    key <LSGT> { [            less,         greater                ] };
-    key <BKSL> { [      apostrophe,        asterisk,  grave        ] };
-    key <AE02> { [               2,        quotedbl,  at           ] };
-    key <AE03> { [               3,      numbersign,  sterling     ] };
-    key <AE04> { [               4,        currency,  dollar       ] };
-    key <AE05> { [               5,         percent,  asciitilde   ] };
-    key <AE06> { [               6,       ampersand,  asciicircum  ] };
-    key <AE07> { [               7,           slash,  braceleft    ] };
-    key <AE08> { [               8,       parenleft,  bracketleft  ] };
-    key <AE09> { [               9,      parenright,  bracketright ] };
-    key <AE10> { [               0,           equal,  braceright   ] };
-    key <AE11> { [            plus,        question                ] };
-    key <AE12> { [       backslash,      dead_grave,  dead_acute   ] };
-    key <AD03> { [               e,               E,  EuroSign     ] };
-    key <AD11> { [           aring,           Aring                ] };
-    key <AD12> { [  dead_diaeresis, dead_circumflex,  dead_tilde   ] };
-    key <AC10> { [          oslash,          Oslash                ] }; 
-    key <AC11> { [              ae,              AE                ] };
-    key <AB08> { [           comma,       semicolon                ] };
-    key <AB09> { [          period,           colon                ] };
-    key <AB10> { [           minus,      underscore                ] };
-
-        include "level3(ralt_switch)"
-        include "kpdl(comma)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "type4" {
-
-     name[Group1]="Norway - Sun type 4";
-
-    key <BKSL> { [ bar, section         ]                       };
-    key <BRCR> { [ asciitilde, asciicircum]                     };
-    key <AE02> { [ 2, quotedbl, at          ]       };
-    key <AE03> { [ 3, numbersign, sterling    ]       };
-    key <AE04> { [ 4, currency, dollar      ]       };
-    key <AE06> { [ 6, ampersand         ]                       };
-    key <AE07> { [ 7, slash, braceleft   ]       };
-    key <AE08> { [ 8, parenleft, bracketleft ]       };
-    key <AE09> { [ 9, parenright, bracketright]       };
-    key <AE10> { [ 0, equal, braceright  ]       };
-    key <AE11> { [ plus, question       ]                       };
-    key <AE12> { [ backslash, dead_grave,  dead_acute ]       };
-    key <AD03> { [ e, E, EuroSign    ]       };
-    key <AD11> { [ aring, Aring                ]                       };
-    key <AD12> { [ dead_diaeresis, dead_circumflex,  dead_tilde ] };
-    key <LCTL> { [ Caps_Lock            ]                       };
-    key <AC10> { [ Ooblique             ]                       };
-    key <AC11> { [ ae, AE                   ]                       };
-    key <TLDE> { [ quoteright, asterisk, quoteleft   ]       };
-    key <LSGT> { [ less, greater        ]                       };
-    key <AB08> { [ comma, semicolon     ]                       };
-    key <AB09> { [ period, colon        ]                       };
-    key <AB10> { [ minus, underscore    ]                       };
-    key <CAPS> { [ Control_L            ]                       };
-
-	include "level3(ralt_switch)"
-	include "kpdl(comma)"
-
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "type5" {
-    
-    name[Group1]="Norway - Sun type 5";
-
-    key <AE05> { [ 5, percent, asciitilde               ] };
-    key <AE06> { [ 6, ampersand, asciicircum            ] };
-    key <AE07> { [ 7, slash,  braceleft                 ] };
-    key <AE08> { [ 8, parenleft,  bracketright          ] };
-    key <AE09> { [ 9, parenright,  bracketright         ] };
-    key <AE10> { [ 0, equal,  braceright                ] };
-
-    key <BKSL> { [ quoteright, asterisk,  quoteleft     ] };
-    key <LSGT> { [ less, greater                        ] };
-
-	include "level3(ralt_switch)"
-	include "kpdl(comma)"
-
-};
-
-
-partial default alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/no(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Norway";
+
+    key <TLDE> { [             bar,         section                ] };
+    key <LSGT> { [            less,         greater                ] };
+    key <BKSL> { [      apostrophe,        asterisk,  grave        ] };
+    key <AE02> { [               2,        quotedbl,  at           ] };
+    key <AE03> { [               3,      numbersign,  sterling     ] };
+    key <AE04> { [               4,        currency,  dollar       ] };
+    key <AE05> { [               5,         percent,  asciitilde   ] };
+    key <AE06> { [               6,       ampersand,  asciicircum  ] };
+    key <AE07> { [               7,           slash,  braceleft    ] };
+    key <AE08> { [               8,       parenleft,  bracketleft  ] };
+    key <AE09> { [               9,      parenright,  bracketright ] };
+    key <AE10> { [               0,           equal,  braceright   ] };
+    key <AE11> { [            plus,        question                ] };
+    key <AE12> { [       backslash,      dead_grave,  dead_acute   ] };
+    key <AD03> { [               e,               E,  EuroSign     ] };
+    key <AD11> { [           aring,           Aring                ] };
+    key <AD12> { [  dead_diaeresis, dead_circumflex,  dead_tilde   ] };
+    key <AC10> { [          oslash,          Oslash                ] }; 
+    key <AC11> { [              ae,              AE                ] };
+    key <AB08> { [           comma,       semicolon                ] };
+    key <AB09> { [          period,           colon                ] };
+    key <AB10> { [           minus,      underscore                ] };
+
+        include "level3(ralt_switch)"
+        include "kpdl(comma)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "type4" {
+
+     name[Group1]="Norway - Sun type 4";
+
+    key <BKSL> { [ bar, section         ]                       };
+    key <BRCR> { [ asciitilde, asciicircum]                     };
+    key <AE02> { [ 2, quotedbl, at          ]       };
+    key <AE03> { [ 3, numbersign, sterling    ]       };
+    key <AE04> { [ 4, currency, dollar      ]       };
+    key <AE06> { [ 6, ampersand         ]                       };
+    key <AE07> { [ 7, slash, braceleft   ]       };
+    key <AE08> { [ 8, parenleft, bracketleft ]       };
+    key <AE09> { [ 9, parenright, bracketright]       };
+    key <AE10> { [ 0, equal, braceright  ]       };
+    key <AE11> { [ plus, question       ]                       };
+    key <AE12> { [ backslash, dead_grave,  dead_acute ]       };
+    key <AD03> { [ e, E, EuroSign    ]       };
+    key <AD11> { [ aring, Aring                ]                       };
+    key <AD12> { [ dead_diaeresis, dead_circumflex,  dead_tilde ] };
+    key <LCTL> { [ Caps_Lock            ]                       };
+    key <AC10> { [ Ooblique             ]                       };
+    key <AC11> { [ ae, AE                   ]                       };
+    key <TLDE> { [ quoteright, asterisk, quoteleft   ]       };
+    key <LSGT> { [ less, greater        ]                       };
+    key <AB08> { [ comma, semicolon     ]                       };
+    key <AB09> { [ period, colon        ]                       };
+    key <AB10> { [ minus, underscore    ]                       };
+    key <CAPS> { [ Control_L            ]                       };
+
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
+
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "type5" {
+    
+    name[Group1]="Norway - Sun type 5";
+
+    key <AE05> { [ 5, percent, asciitilde               ] };
+    key <AE06> { [ 6, ampersand, asciicircum            ] };
+    key <AE07> { [ 7, slash,  braceleft                 ] };
+    key <AE08> { [ 8, parenleft,  bracketright          ] };
+    key <AE09> { [ 9, parenright,  bracketright         ] };
+    key <AE10> { [ 0, equal,  braceright                ] };
+
+    key <BKSL> { [ quoteright, asterisk,  quoteleft     ] };
+    key <LSGT> { [ less, greater                        ] };
+
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
+
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/no(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/pl b/xorg-server/xkeyboard-config/symbols/sun_vndr/pl
index 6295c3206..2fdf1fe06 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/pl
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/pl
@@ -1,101 +1,101 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Polish Developers";
-
-    key <TLDE> { [ grave, 	 asciitilde					] };
-    key <AE01> { [ 1,		 exclam						] };
-    key <AE02> { [ 2,		 at						] };
-    key <AE03> { [ 3,		 numbersign 					] };
-    key <AE04> { [ 4,		 dollar	 					] };
-    key <AE05> { [ 5,		 percent 					] };
-    key <AE06> { [ 6,		 asciicirum					] };
-    key <AE07> { [ 7,		 ampersand					] };
-    key <AE08> { [ 8,		 asterisk					] };
-    key <AE09> { [ 9,		 parenleft					] };
-    key <AE10> { [ 0,		 parenright					] };
-    key <AE11> { [ minus,	 underscore 					] };
-    key <AE12> { [ equal,	 plus	 					] };
-
-    key <AD03> { [ e,		 E,		eogonek,	Eogonek		] };       
-    key <AD07> { [ u,		 U,		EuroSign			] };
-    key <AD09> { [ o,		 O,		oacute,		Oacute		] };
-    key <AD11> { [ bracketleft,  braceleft					] };
-    key <AD12> { [ bracketright, braceright					] };
-
-    key <AC01> { [ a,		 A,		aogonek,	Aogonek		] };
-    key <AC02> { [ s,		 S,		sacute,		Sacute		] };
-    key <AC09> { [ l,		 L,		lstroke,        Lstroke		] };
-    key <AC10> { [ semicolon,	 colon						] };
-    key <AC11> { [ apostrophe,	 quotedbl 					] };
-    key <BKSL> { [ backslash,	 bar,		brokenbar			] };
-
-    key <LSGT> { [ less,         greater,       bar,            brokenbar	] };
-    key <AB01> { [ z, 		 Z,		zabovedot,	Zabovedot	] };
-    key <AB02> { [ x,		 X,		zacute,		Zacute		] };
-    key <AB03> { [ c,		 C,		cacute,		Cacute		] };
-    key <AB06> { [ n,		 N,		nacute,		Nacute		] };
-    key <AB08> { [ comma,	 less 						] };
-    key <AB09> { [ period,	 greater				 	] };
-    key <AB10> { [ slash,	 question					] };
-
-	include "level3(ralt_switch)"
-
-};
-
-
-partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/pl(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Polish Developers";
+
+    key <TLDE> { [ grave, 	 asciitilde					] };
+    key <AE01> { [ 1,		 exclam						] };
+    key <AE02> { [ 2,		 at						] };
+    key <AE03> { [ 3,		 numbersign 					] };
+    key <AE04> { [ 4,		 dollar	 					] };
+    key <AE05> { [ 5,		 percent 					] };
+    key <AE06> { [ 6,		 asciicirum					] };
+    key <AE07> { [ 7,		 ampersand					] };
+    key <AE08> { [ 8,		 asterisk					] };
+    key <AE09> { [ 9,		 parenleft					] };
+    key <AE10> { [ 0,		 parenright					] };
+    key <AE11> { [ minus,	 underscore 					] };
+    key <AE12> { [ equal,	 plus	 					] };
+
+    key <AD03> { [ e,		 E,		eogonek,	Eogonek		] };       
+    key <AD07> { [ u,		 U,		EuroSign			] };
+    key <AD09> { [ o,		 O,		oacute,		Oacute		] };
+    key <AD11> { [ bracketleft,  braceleft					] };
+    key <AD12> { [ bracketright, braceright					] };
+
+    key <AC01> { [ a,		 A,		aogonek,	Aogonek		] };
+    key <AC02> { [ s,		 S,		sacute,		Sacute		] };
+    key <AC09> { [ l,		 L,		lstroke,        Lstroke		] };
+    key <AC10> { [ semicolon,	 colon						] };
+    key <AC11> { [ apostrophe,	 quotedbl 					] };
+    key <BKSL> { [ backslash,	 bar,		brokenbar			] };
+
+    key <LSGT> { [ less,         greater,       bar,            brokenbar	] };
+    key <AB01> { [ z, 		 Z,		zabovedot,	Zabovedot	] };
+    key <AB02> { [ x,		 X,		zacute,		Zacute		] };
+    key <AB03> { [ c,		 C,		cacute,		Cacute		] };
+    key <AB06> { [ n,		 N,		nacute,		Nacute		] };
+    key <AB08> { [ comma,	 less 						] };
+    key <AB09> { [ period,	 greater				 	] };
+    key <AB10> { [ slash,	 question					] };
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/pl(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/pt b/xorg-server/xkeyboard-config/symbols/sun_vndr/pt
index b5b108632..9e0ec9502 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/pt
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/pt
@@ -1,142 +1,142 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Portugal";
-
-    key <LSGT> { [            less,          greater                  ] };
-    key <TLDE> { [       backslash,              bar                  ] };
-    key <AE02> { [               2,         quotedbl,              at ] };
-    key <AE03> { [               3,       numbersign,        sterling ] };
-    key <AE04> { [               4,           dollar,         section ] };
-    key <AE05> { [               5,          percent,      asciitilde ] };
-    key <AE06> { [               6,        ampersand,     asciicircum ] };
-    key <AE07> { [               7,            slash,       braceleft ] };
-    key <AE08> { [               8,        parenleft,     bracketleft ] };
-    key <AE09> { [               9,       parenright,    bracketright ] };
-    key <AE10> { [               0,            equal,      braceright ] };
-    key <AE11> { [      quoteright,         question,       quoteleft ] };
-    key <AE12> { [   guillemotleft,   guillemotright                  ] };
-    key <AD03> { [               e,                E,        EuroSign ] };
-    key <AD11> { [            plus,         asterisk,  dead_diaeresis ] }; 
-    key <AD12> { [      dead_acute,       dead_grave                  ] };
-    key <BKSL> { [      dead_tilde,  dead_circumflex                  ] };
-    key <AC10> { [        ccedilla,         Ccedilla                  ] };
-    key <AC11> { [       masculine,      ordfeminine                  ] };
-    key <AB08> { [           comma,        semicolon                  ] };
-    key <AB09> { [          period,            colon                  ] };
-    key <AB10> { [           minus,       underscore                  ] };
-
-        include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "type4" {
-
-     name[Group1]="Portugal - Sun type 4";
-
-    key <BKSL> { [ bracketleft, braceleft, guillemotleft]     };
-    key <BRCR> { [ bracketright, braceright, guillemotright]  };
-    key <AE02> { [ 2, quotedbl, at          ]       };
-    key <AE03> { [ 3, numbersign, sterling    ]       };
-    key <AE04> { [ 4, dollar, section     ]       };
-    key <AE06> { [ 6, ampersand, notsign     ]       };
-    key <AE07> { [ 7, slash             ]                       };
-    key <AE08> { [ 8, parenleft         ]                       };
-    key <AE09> { [ 9, parenright, backslash   ]       };
-    key <AE10> { [ 0, equal, bar         ]       };
-    key <AE11> { [ quoteright, question, quoteleft   ]       };
-    key <AE12> { [ exclamdown, questiondown ]                    };
-    key <AD03> { [ e, E, EuroSign    ]       };
-    key <AD11> { [ dead_diaeresis, asterisk, plus    ]       };
-    key <AD12> { [ dead_acute, dead_grave, asciitilde ]      };
-    key <LCTL> { [ Caps_Lock            ]                       };
-    key <AC10> { [ ccedilla, Ccedilla             ]                       };
-    key <AC11> { [ masculine, ordfeminine]                      };
-    key <TLDE> { [ dead_tilde, dead_circumflex, asciicircum ]    };
-    key <LSGT> { [ less, greater        ]                       };
-    key <AB08> { [ comma, semicolon     ]                       };
-    key <AB09> { [ period, colon        ]                       };
-    key <AB10> { [ minus, underscore    ]                       };
-    key <CAPS> { [ Control_L            ]                       };
-
-	include "level3(ralt_switch)"
-
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "type5" {
-    
-    name[Group1]="Portugal - Sun type 5";
-
-    key <TLDE> { [ backslash, bar       ]                               };
-    key <AE05> { [ 5, percent, asciitilde                  ]};
-    key <AE06> { [ 6, ampersand, asciicircum                 ]};
-    key <AE07> { [ 7, slash,  braceleft                  ]};
-    key <AE08> { [ 8, parenleft,  bracketleft                ]};
-    key <AE09> { [ 9, parenright,  bracketright               ]};
-    key <AE10> { [ 0, equal,  braceright                 ]};
-    key <AE11> { [ quoteright, question, quoteleft                   ]};
-
-    key <AD11> { [ plus, asterisk, dead_diaeresis         ]};
-
-	include "level3(ralt_switch)"
-
-};
-
-
-partial default alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/pt(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Portugal";
+
+    key <LSGT> { [            less,          greater                  ] };
+    key <TLDE> { [       backslash,              bar                  ] };
+    key <AE02> { [               2,         quotedbl,              at ] };
+    key <AE03> { [               3,       numbersign,        sterling ] };
+    key <AE04> { [               4,           dollar,         section ] };
+    key <AE05> { [               5,          percent,      asciitilde ] };
+    key <AE06> { [               6,        ampersand,     asciicircum ] };
+    key <AE07> { [               7,            slash,       braceleft ] };
+    key <AE08> { [               8,        parenleft,     bracketleft ] };
+    key <AE09> { [               9,       parenright,    bracketright ] };
+    key <AE10> { [               0,            equal,      braceright ] };
+    key <AE11> { [      quoteright,         question,       quoteleft ] };
+    key <AE12> { [   guillemotleft,   guillemotright                  ] };
+    key <AD03> { [               e,                E,        EuroSign ] };
+    key <AD11> { [            plus,         asterisk,  dead_diaeresis ] }; 
+    key <AD12> { [      dead_acute,       dead_grave                  ] };
+    key <BKSL> { [      dead_tilde,  dead_circumflex                  ] };
+    key <AC10> { [        ccedilla,         Ccedilla                  ] };
+    key <AC11> { [       masculine,      ordfeminine                  ] };
+    key <AB08> { [           comma,        semicolon                  ] };
+    key <AB09> { [          period,            colon                  ] };
+    key <AB10> { [           minus,       underscore                  ] };
+
+        include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "type4" {
+
+     name[Group1]="Portugal - Sun type 4";
+
+    key <BKSL> { [ bracketleft, braceleft, guillemotleft]     };
+    key <BRCR> { [ bracketright, braceright, guillemotright]  };
+    key <AE02> { [ 2, quotedbl, at          ]       };
+    key <AE03> { [ 3, numbersign, sterling    ]       };
+    key <AE04> { [ 4, dollar, section     ]       };
+    key <AE06> { [ 6, ampersand, notsign     ]       };
+    key <AE07> { [ 7, slash             ]                       };
+    key <AE08> { [ 8, parenleft         ]                       };
+    key <AE09> { [ 9, parenright, backslash   ]       };
+    key <AE10> { [ 0, equal, bar         ]       };
+    key <AE11> { [ quoteright, question, quoteleft   ]       };
+    key <AE12> { [ exclamdown, questiondown ]                    };
+    key <AD03> { [ e, E, EuroSign    ]       };
+    key <AD11> { [ dead_diaeresis, asterisk, plus    ]       };
+    key <AD12> { [ dead_acute, dead_grave, asciitilde ]      };
+    key <LCTL> { [ Caps_Lock            ]                       };
+    key <AC10> { [ ccedilla, Ccedilla             ]                       };
+    key <AC11> { [ masculine, ordfeminine]                      };
+    key <TLDE> { [ dead_tilde, dead_circumflex, asciicircum ]    };
+    key <LSGT> { [ less, greater        ]                       };
+    key <AB08> { [ comma, semicolon     ]                       };
+    key <AB09> { [ period, colon        ]                       };
+    key <AB10> { [ minus, underscore    ]                       };
+    key <CAPS> { [ Control_L            ]                       };
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "type5" {
+    
+    name[Group1]="Portugal - Sun type 5";
+
+    key <TLDE> { [ backslash, bar       ]                               };
+    key <AE05> { [ 5, percent, asciitilde                  ]};
+    key <AE06> { [ 6, ampersand, asciicircum                 ]};
+    key <AE07> { [ 7, slash,  braceleft                  ]};
+    key <AE08> { [ 8, parenleft,  bracketleft                ]};
+    key <AE09> { [ 9, parenright,  bracketright               ]};
+    key <AE10> { [ 0, equal,  braceright                 ]};
+    key <AE11> { [ quoteright, question, quoteleft                   ]};
+
+    key <AD11> { [ plus, asterisk, dead_diaeresis         ]};
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/pt(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ro b/xorg-server/xkeyboard-config/symbols/sun_vndr/ro
index f21f9f624..07241a3ee 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ro
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ro
@@ -1,117 +1,117 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Romania";
-
-
-   key <TLDE> { [          grave,    asciitilde,	grave,    asciitilde ] };
-   key <AE01> { [              1,        exclam,	dead_tilde                ] };
-   key <AE02> { [              2,            at,	dead_caron                ] };
-   key <AE03> { [              3,    numbersign,	dead_circumflex                ] };
-   key <AE04> { [              4,        dollar,	dead_breve                ] };
-   key <AE05> { [              5,       percent,	dead_abovering                ] };
-   key <AE06> { [              6,   asciicircum,	dead_ogonek                ] };
-   key <AE07> { [              7,     ampersand,	dead_grave                ] };
-   key <AE08> { [              8,      asterisk,	dead_abovedot                ] };
-   key <AE09> { [              9,     parenleft,	dead_acute                ] };
-   key <AE10> { [              0,    parenright,	dead_doubleacute                ] };
-   key <AE11> { [          minus,    underscore,	dead_diaeresis,        endash ] };
-   key <AE12> { [          equal,          plus,	dead_cedilla,     plusminus ] };
-
-   key <AD01> { [              q,             Q,	acircumflex,   Acircumflex ] };
-   key <AD02> { [              w,             W,	ssharp                ] };
-   key <AD03> { [              e,             E,	EuroSign                ] };
-   key <AD04> { [              r,             R,	r,             R ] };
-   key <AD05> { [              t,             T,	0x100021b,     0x100021a ] };
-   key <AD06> { [              y,             Y,	y,             Y ] };
-   key <AD07> { [              u,             U,	u,             U ] };
-   key <AD08> { [              i,             I,	icircumflex,   Icircumflex ] };
-   key <AD09> { [              o,             O,	o,             O ] };
-   key <AD10> { [              p,             P,	section                ] };
-   key <AD11> { [    bracketleft,     braceleft,	doublelowquotemark              ] };
-   key <AD12> { [   bracketright,    braceright,	rightdoublequotemark            ] };
-
-   key <AC01> { [              a,             A,	abreve,        Abreve ] };
-   key <AC02> { [              s,             S,	0x1000219,     0x1000218 ] };
-   key <AC03> { [              d,             D,	dstroke,       Dstroke ] };
-   key <AC04> { [              f,             F,	f,             F ] };
-   key <AC05> { [              g,             G,	g,             G ] };
-   key <AC06> { [              h,             H,	h,             H ] };
-   key <AC07> { [              j,             J,	j,             J ] };
-   key <AC08> { [              k,             K,	k,             K ] };
-   key <AC09> { [              l,             L,	lstroke,       Lstroke ] };
-   key <AC10> { [      semicolon,         colon,	semicolon,         colon ] };
-   key <AC11> { [     apostrophe,      quotedbl,	apostrophe,      quotedbl ] };
-   key <LSGT> { [      backslash,           bar,	backslash,     brokenbar ] };
-
-   key <BKSL> { [      backslash,           bar,	backslash,     brokenbar ] };
-   key <AB01> { [              z,             Z,	z,             Z ] };
-   key <AB02> { [              x,             X,	x,             X ] };
-   key <AB03> { [              c,             C,	copyright                ] };
-   key <AB04> { [              v,             V,	v,             V ] };
-   key <AB05> { [              b,             B,	b,             B ] };
-   key <AB06> { [              n,             N,	n,             N ] };
-   key <AB07> { [              m,             M,	m,             M ] };
-   key <AB08> { [          comma,          less,	guillemotleft,      multiply ] };
-   key <AB09> { [         period,       greater,	guillemotright,      division ] };
-   key <AB10> { [          slash,      question,	slash,      question ] };
-
-	include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/ro(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Romania";
+
+
+   key <TLDE> { [          grave,    asciitilde,	grave,    asciitilde ] };
+   key <AE01> { [              1,        exclam,	dead_tilde                ] };
+   key <AE02> { [              2,            at,	dead_caron                ] };
+   key <AE03> { [              3,    numbersign,	dead_circumflex                ] };
+   key <AE04> { [              4,        dollar,	dead_breve                ] };
+   key <AE05> { [              5,       percent,	dead_abovering                ] };
+   key <AE06> { [              6,   asciicircum,	dead_ogonek                ] };
+   key <AE07> { [              7,     ampersand,	dead_grave                ] };
+   key <AE08> { [              8,      asterisk,	dead_abovedot                ] };
+   key <AE09> { [              9,     parenleft,	dead_acute                ] };
+   key <AE10> { [              0,    parenright,	dead_doubleacute                ] };
+   key <AE11> { [          minus,    underscore,	dead_diaeresis,        endash ] };
+   key <AE12> { [          equal,          plus,	dead_cedilla,     plusminus ] };
+
+   key <AD01> { [              q,             Q,	acircumflex,   Acircumflex ] };
+   key <AD02> { [              w,             W,	ssharp                ] };
+   key <AD03> { [              e,             E,	EuroSign                ] };
+   key <AD04> { [              r,             R,	r,             R ] };
+   key <AD05> { [              t,             T,	0x100021b,     0x100021a ] };
+   key <AD06> { [              y,             Y,	y,             Y ] };
+   key <AD07> { [              u,             U,	u,             U ] };
+   key <AD08> { [              i,             I,	icircumflex,   Icircumflex ] };
+   key <AD09> { [              o,             O,	o,             O ] };
+   key <AD10> { [              p,             P,	section                ] };
+   key <AD11> { [    bracketleft,     braceleft,	doublelowquotemark              ] };
+   key <AD12> { [   bracketright,    braceright,	rightdoublequotemark            ] };
+
+   key <AC01> { [              a,             A,	abreve,        Abreve ] };
+   key <AC02> { [              s,             S,	0x1000219,     0x1000218 ] };
+   key <AC03> { [              d,             D,	dstroke,       Dstroke ] };
+   key <AC04> { [              f,             F,	f,             F ] };
+   key <AC05> { [              g,             G,	g,             G ] };
+   key <AC06> { [              h,             H,	h,             H ] };
+   key <AC07> { [              j,             J,	j,             J ] };
+   key <AC08> { [              k,             K,	k,             K ] };
+   key <AC09> { [              l,             L,	lstroke,       Lstroke ] };
+   key <AC10> { [      semicolon,         colon,	semicolon,         colon ] };
+   key <AC11> { [     apostrophe,      quotedbl,	apostrophe,      quotedbl ] };
+   key <LSGT> { [      backslash,           bar,	backslash,     brokenbar ] };
+
+   key <BKSL> { [      backslash,           bar,	backslash,     brokenbar ] };
+   key <AB01> { [              z,             Z,	z,             Z ] };
+   key <AB02> { [              x,             X,	x,             X ] };
+   key <AB03> { [              c,             C,	copyright                ] };
+   key <AB04> { [              v,             V,	v,             V ] };
+   key <AB05> { [              b,             B,	b,             B ] };
+   key <AB06> { [              n,             N,	n,             N ] };
+   key <AB07> { [              m,             M,	m,             M ] };
+   key <AB08> { [          comma,          less,	guillemotleft,      multiply ] };
+   key <AB09> { [         period,       greater,	guillemotright,      division ] };
+   key <AB10> { [          slash,      question,	slash,      question ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ro(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ru b/xorg-server/xkeyboard-config/symbols/sun_vndr/ru
index ec19c9ba3..cfa27d08a 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ru
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ru
@@ -1,111 +1,111 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial alphanumeric_keys
-xkb_symbols "type6" {
-
-     name[Group1]= "Russia";
-
-     key.type[group1]="FOUR_LEVEL";
-
-
-    key	<AE01> { [		1,	    exclam 	] };
-    key	<AE02> { [		2,        quotedbl, 2, at	] };
-    key	<AE03> { [		3,      numerosign, 3,  numbersign	] };
-    key	<AE04> { [		4,       percent, 4,      dollar 	] };
-    key	<AE05> { [		5,	     colon, 5, percent	] };
-    key	<AE07> { [		7,	    period, 7, ampersand	] };
-    key	<AE08> { [		8,	 semicolon, 8, asterisk 	] };
-    key	<BKSL> { [           slash,        question, backslash,             bar	] };
-    key	<AB10> { [      ediaeresis,      Ediaeresis,	    slash,	  question 	] };
-    key <LSGT> { [       backslash,             bar      ] };
-
-    key	<AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI, q, Q	] };
-    key	<AD02> { [    Cyrillic_tse,    Cyrillic_TSE, w, W	] };
-    key	<AD03> { [      Cyrillic_u,	Cyrillic_U, e, E	] };
-    key	<AD04> { [     Cyrillic_ka,     Cyrillic_KA, r, R	] };
-    key	<AD05> { [     Cyrillic_ie,     Cyrillic_IE, t, T	] };
-    key	<AD06> { [     Cyrillic_en,     Cyrillic_EN, y, Y	] };
-    key	<AD07> { [    Cyrillic_ghe,    Cyrillic_GHE, u, U	] };
-    key	<AD08> { [    Cyrillic_sha,    Cyrillic_SHA, i, I	] };
-    key	<AD09> { [  Cyrillic_shcha,  Cyrillic_SHCHA, o, O	] };
-    key	<AD10> { [     Cyrillic_ze,     Cyrillic_ZE, p, P	] };
-    key	<AD11> { [     Cyrillic_ha,     Cyrillic_HA, bracketleft,       braceleft	] };
-    key	<AD12> { [Cyrillic_hardsign,Cyrillic_HARDSIGN, bracketright,      braceright	] };
-    key	<AC01> { [     Cyrillic_ef,     Cyrillic_EF, a, A	] };
-    key	<AC02> { [   Cyrillic_yeru,   Cyrillic_YERU, s, S	] };
-    key	<AC03> { [     Cyrillic_ve,     Cyrillic_VE, d, D	] };
-    key	<AC04> { [      Cyrillic_a,	Cyrillic_A, f, F	] };
-    key	<AC05> { [     Cyrillic_pe,     Cyrillic_PE, g, G	] };
-    key	<AC06> { [     Cyrillic_er,     Cyrillic_ER, h, H	] };
-    key	<AC07> { [      Cyrillic_o,	Cyrillic_O, j, J	] };
-    key	<AC08> { [     Cyrillic_el,     Cyrillic_EL, k, K	] };
-    key	<AC09> { [     Cyrillic_de,     Cyrillic_DE, l, L	] };
-    key	<AC10> { [    Cyrillic_zhe,    Cyrillic_ZHE, semicolon,           colon	] };
-    key	<AC11> { [      Cyrillic_e,	Cyrillic_E, apostrophe,        quotedbl	] };
-    key	<AB01> { [     Cyrillic_ya,     Cyrillic_YA, z, Z	] };
-    key	<AB02> { [    Cyrillic_che,    Cyrillic_CHE, x, X	] };
-    key	<AB03> { [     Cyrillic_es,     Cyrillic_ES, c, C	] };
-    key	<AB04> { [     Cyrillic_em,     Cyrillic_EM, v, V	] };
-    key	<AB05> { [      Cyrillic_i,	Cyrillic_I, b, B	] };
-    key	<AB06> { [     Cyrillic_te,     Cyrillic_TE, n, N	] };
-    key	<AB07> { [Cyrillic_softsign,Cyrillic_SOFTSIGN, m, M	] };
-    key	<AB08> { [     Cyrillic_be,     Cyrillic_BE, comma,            less	] };
-    key	<AB09> { [     Cyrillic_yu,     Cyrillic_YU, period,         greater	] };
-
-    include "level3(ralt_switch)"
-
-};
-
-
-partial default alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/ru(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial alphanumeric_keys
+xkb_symbols "type6" {
+
+     name[Group1]= "Russia";
+
+     key.type[group1]="FOUR_LEVEL";
+
+
+    key	<AE01> { [		1,	    exclam 	] };
+    key	<AE02> { [		2,        quotedbl, 2, at	] };
+    key	<AE03> { [		3,      numerosign, 3,  numbersign	] };
+    key	<AE04> { [		4,       percent, 4,      dollar 	] };
+    key	<AE05> { [		5,	     colon, 5, percent	] };
+    key	<AE07> { [		7,	    period, 7, ampersand	] };
+    key	<AE08> { [		8,	 semicolon, 8, asterisk 	] };
+    key	<BKSL> { [           slash,        question, backslash,             bar	] };
+    key	<AB10> { [      ediaeresis,      Ediaeresis,	    slash,	  question 	] };
+    key <LSGT> { [       backslash,             bar      ] };
+
+    key	<AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI, q, Q	] };
+    key	<AD02> { [    Cyrillic_tse,    Cyrillic_TSE, w, W	] };
+    key	<AD03> { [      Cyrillic_u,	Cyrillic_U, e, E	] };
+    key	<AD04> { [     Cyrillic_ka,     Cyrillic_KA, r, R	] };
+    key	<AD05> { [     Cyrillic_ie,     Cyrillic_IE, t, T	] };
+    key	<AD06> { [     Cyrillic_en,     Cyrillic_EN, y, Y	] };
+    key	<AD07> { [    Cyrillic_ghe,    Cyrillic_GHE, u, U	] };
+    key	<AD08> { [    Cyrillic_sha,    Cyrillic_SHA, i, I	] };
+    key	<AD09> { [  Cyrillic_shcha,  Cyrillic_SHCHA, o, O	] };
+    key	<AD10> { [     Cyrillic_ze,     Cyrillic_ZE, p, P	] };
+    key	<AD11> { [     Cyrillic_ha,     Cyrillic_HA, bracketleft,       braceleft	] };
+    key	<AD12> { [Cyrillic_hardsign,Cyrillic_HARDSIGN, bracketright,      braceright	] };
+    key	<AC01> { [     Cyrillic_ef,     Cyrillic_EF, a, A	] };
+    key	<AC02> { [   Cyrillic_yeru,   Cyrillic_YERU, s, S	] };
+    key	<AC03> { [     Cyrillic_ve,     Cyrillic_VE, d, D	] };
+    key	<AC04> { [      Cyrillic_a,	Cyrillic_A, f, F	] };
+    key	<AC05> { [     Cyrillic_pe,     Cyrillic_PE, g, G	] };
+    key	<AC06> { [     Cyrillic_er,     Cyrillic_ER, h, H	] };
+    key	<AC07> { [      Cyrillic_o,	Cyrillic_O, j, J	] };
+    key	<AC08> { [     Cyrillic_el,     Cyrillic_EL, k, K	] };
+    key	<AC09> { [     Cyrillic_de,     Cyrillic_DE, l, L	] };
+    key	<AC10> { [    Cyrillic_zhe,    Cyrillic_ZHE, semicolon,           colon	] };
+    key	<AC11> { [      Cyrillic_e,	Cyrillic_E, apostrophe,        quotedbl	] };
+    key	<AB01> { [     Cyrillic_ya,     Cyrillic_YA, z, Z	] };
+    key	<AB02> { [    Cyrillic_che,    Cyrillic_CHE, x, X	] };
+    key	<AB03> { [     Cyrillic_es,     Cyrillic_ES, c, C	] };
+    key	<AB04> { [     Cyrillic_em,     Cyrillic_EM, v, V	] };
+    key	<AB05> { [      Cyrillic_i,	Cyrillic_I, b, B	] };
+    key	<AB06> { [     Cyrillic_te,     Cyrillic_TE, n, N	] };
+    key	<AB07> { [Cyrillic_softsign,Cyrillic_SOFTSIGN, m, M	] };
+    key	<AB08> { [     Cyrillic_be,     Cyrillic_BE, comma,            less	] };
+    key	<AB09> { [     Cyrillic_yu,     Cyrillic_YU, period,         greater	] };
+
+    include "level3(ralt_switch)"
+
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ru(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/se b/xorg-server/xkeyboard-config/symbols/sun_vndr/se
index 4efaf85fa..d27001466 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/se
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/se
@@ -1,279 +1,279 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Sweden";
-
-    key <TLDE> { [         section,         onehalf                ] };
-    key <LSGT> { [            less,         greater,           bar ] };
-    key <AE02> { [               2,        quotedbl,            at ] };
-    key <AE03> { [               3,      numbersign,      sterling ] };
-    key <AE04> { [               4,        currency,        dollar ] };
-    key <AE06> { [               6,       ampersand                ] };
-    key <AE07> { [               7,           slash,     braceleft ] };
-    key <AE08> { [               8,       parenleft,   bracketleft ] };
-    key <AE09> { [               9,      parenright,  bracketright ] };
-    key <AE10> { [               0,           equal,    braceright ] };
-    key <AE11> { [            plus,        question,     backslash ] };
-    key <AE12> { [      dead_acute,      dead_grave                ] };
-    key <AD03> { [               e,               E,      EuroSign ] };
-    key <AD11> { [           aring,           Aring                ] };
-    key <AD12> { [  dead_diaeresis,     asciicircum,    asciitilde ] };
-    key <AC10> { [      odiaeresis,      Odiaeresis                ] };
-    key <AC11> { [      adiaeresis,      Adiaeresis                ] };
-    key <BKSL> { [      apostrophe,        asterisk,         grave ] };
-    key <AB08> { [           comma,       semicolon                ] };
-    key <AB09> { [          period,           colon                ] };
-    key <AB10> { [           minus,      underscore                ] };
-
-        include "level3(ralt_switch)"
-        include "kpdl(comma)"
-
-};
-
-// Swedish layout for a Type 5/5c Sun keyboard
-xkb_symbols "type5" {
-    include "sun_vndr/us(type5)+se(basic)"
-
-    // Begin alphanumeric section
-    // These two are not supposed to be dead.
-    // A few others supposedly ARE dead, but don't care for now.
-    key <AC12> { [ apostrophe, asterisk ],      [       grave ] };
-    key <AD12> { [                      ],      [  asciitilde ] };
-
-    key <RTSH> { [      Shift_R         ]       };
-
-    key <LALT> { [      Alt_L           ]       };
-    key <ALGR> { [      Mode_switch     ]       };
-    key <LMTA> { [      Meta_L          ]       };
-    key <RMTA> { [      Meta_R          ]       };
-    key <COMP> { [      Multi_key       ]       };
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <FK01> { [ F1           ]                       };
-    key <FK02> { [ F2           ]                       };
-    key <FK03> { [ F3           ]                       };
-    key <FK04> { [ F4           ]                       };
-    key <FK05> { [ F5           ]                       };
-    key <FK06> { [ F6           ]                       };
-    key <FK07> { [ F7           ]                       };
-    key <FK08> { [ F8           ]                       };
-    key <FK09> { [ F9           ]                       };
-    key <FK10> { [ F10          ]                       };
-    key <FK11> { [ F11          ],      [ SunF36]       };
-    key <FK12> { [ F12          ],      [ SunF37]       };
-    key <STOP> { [ Cancel       ],      [ F11   ]       };
-    key <AGAI> { [ Redo         ],      [ F12   ]       };
-    key <PROP> { [ SunProps     ],      [ F13   ]       };
-    key <UNDO> { [ Undo         ],      [ F14   ]       };
-    key <FRNT> { [ SunFront     ],      [ F15   ]       };
-    key <COPY> { [ SunCopy      ],      [ F16   ]       };
-    key <OPEN> { [ SunOpen      ],      [ F17   ]       };
-    key <PAST> { [ SunPaste     ],      [ F18   ]       };
-    key <FIND> { [ Find         ],      [ F19   ]       };
-    key <CUT>  { [ SunCut       ],      [ F20   ]       };
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ Print        ],      [ Sys_Req, SunSys_Req ] };
-    key <SCLK> { [ Scroll_Lock  ]                       };
-    key <PAUS> { [ Pause        ],      [ Break ]       };
-    key <LEFT> { [ Left         ]                       };
-    key <RGHT> { [ Right        ]                       };
-    key <UP>   { [ Up           ]                       };
-    key <DOWN> { [ Down         ]                       };
-
-    key <DELE> { [ Delete       ]                       };
-    key <INS>  { [ Insert       ]                       };
-    key <PGUP> { [ Prior        ]                       };
-    key <PGDN> { [ Next         ]                       };
-    key <HOME> { [ Home         ]                       };
-    key <END>  { [ End          ]                       };
-    key <HELP> { [ Help         ]                       };
-    // End "Editing" section
-    
-    // Begin "Keypad" section
-    key <NMLK> { [ Num_Lock             ]                               };
-    key <KPDV> { [ KP_Divide            ],      [       F25     ]       };
-    key <KPMU> { [ KP_Multiply          ],      [       F26     ]       };
-    key <KPSU> { [ KP_Subtract          ]                               };
-
-    key  <KP7> { [  KP_Home,    KP_7    ],      [       F27     ]       };
-    key  <KP8> { [  KP_Up,      KP_8    ],      [       F28     ]       };
-    key  <KP9> { [  KP_Prior,   KP_9    ],      [       F29     ]       };
-    key <KPAD> { [      KP_Add          ]                               };
-
-    key  <KP4> { [  KP_Left,    KP_4    ],      [       F30     ]       };
-    key  <KP5> { [  KP_Begin,   KP_5    ],      [       F31     ]       };
-    key  <KP6> { [  KP_Right,   KP_6    ],      [       F32     ]       };
-
-    key  <KP1> { [  KP_End,     KP_1    ],      [       F33     ]       };
-    key  <KP2> { [  KP_Down,    KP_2    ],      [       F34     ]       };
-    key  <KP3> { [  KP_Next,    KP_3    ],      [       F35     ]       };
-    key <KPEN> { [      KP_Enter        ]                               };
-
-    key  <KP0> { [  KP_Insert,  KP_0    ]                               };
-    key <KPDL> { [  KP_Delete,  KP_Decimal ]                            };
-    // End "Keypad" section, 
-
-    // Begin "four keys up on the right"
-    key <MUTE> { [  SunAudioMute,       SunVideoDegauss         ]       };
-    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]       };
-    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness ]       };
-    key <POWR> { [  SunPowerSwitch,     SunPowerSwitchShift     ]       };
-    // End "four keys up on the right"
-
-    // Begin modifier mappings
-    modifier_map Shift  { Shift_R };
-    modifier_map Mod1   { Meta_L, Meta_R };
-    modifier_map Mod2   { Num_Lock };
-    modifier_map Mod3   { Mode_switch };
-    modifier_map Mod4   { Alt_L };
-    // End modifier mappings
-};
-
-// Swedish layout for a Type 4 Sun keyboard
-xkb_symbols "type4" {
-    include "sun_vndr/us(type4basic)+se(basic)"
-
-    // Begin alphanumeric section
-    // These two are not supposed to be dead.
-    // A few others supposedly ARE dead, but don't care for now.
-    key <AC12> { [ apostrophe, asterisk ],      [       grave ] };
-    key <AD12> { [                      ],      [  asciitilde ] };
-
-    key <AF14> { [      asciitilde,     asciicircum     ] };
-
-    key <RTSH> { [      Shift_R         ]       };
-
-    key <LALT> { [      Alt_L           ]       };
-    key <ALGR> { [      Mode_switch     ]       };
-    key <LMTA> { [      Meta_L          ]       };
-    key <RMTA> { [      Meta_R          ]       };
-    key <COMP> { [      Multi_key       ]       };
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <FK01> { [ F1           ]                       };
-    key <FK02> { [ F2           ]                       };
-    key <FK03> { [ F3           ]                       };
-    key <FK04> { [ F4           ]                       };
-    key <FK05> { [ F5           ]                       };
-    key <FK06> { [ F6           ]                       };
-    key <FK07> { [ F7           ]                       };
-    key <FK08> { [ F8           ]                       };
-    key <FK09> { [ F9           ]                       };
-    key <FK10> { [ F10          ]                       };
-    key <FK11> { [ F11          ],      [ SunF36]       };
-    key <FK12> { [ F12          ],      [ SunF37]       };
-    key <STOP> { [ Cancel       ],      [ F11   ]       };
-    key <AGAI> { [ Redo         ],      [ F12   ]       };
-    key <PROP> { [ SunProps     ],      [ F13   ]       };
-    key <UNDO> { [ Undo         ],      [ F14   ]       };
-    key <FRNT> { [ SunFront     ],      [ F15   ]       };
-    key <COPY> { [ SunCopy      ],      [ F16   ]       };
-    key <OPEN> { [ SunOpen      ],      [ F17   ]       };
-    key <PAST> { [ SunPaste     ],      [ F18   ]       };
-    key <FIND> { [ Find         ],      [ F19   ]       };
-    key <CUT>  { [ SunCut       ],      [ F20   ]       };
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <LNFD> { [ Linefeed     ]       };
-    key <DELE> { [ Delete       ]                       };
-    key <PRSC> { [ Print        ],      [ Sys_Req, SunSys_Req ] };
-    key <SCLK> { [ Scroll_Lock  ]                       };
-    key <PAUS> { [ Pause        ],      [ Break ]       };
-    key <HELP> { [ Help         ]                       };
-    // End "Editing" section
-    
-   // Begin "Keypad" section
-    key <NMLK> { [ Num_Lock             ]                               };
-    key <KPEQ> { [ KP_Equal             ]                               };
-    key <KPDV> { [ KP_Divide            ],      [       F25     ]       };
-    key <KPMU> { [ KP_Multiply          ],      [       F26     ]       };
-    key <KPSU> { [ KP_Subtract          ]                               };
-
-    key  <KP7> { [  KP_Home,    KP_7    ],      [       F27     ]       };
-    key  <KP8> { [  KP_Up,      KP_8    ],      [       F28     ]       };
-    key  <KP9> { [  KP_Prior,   KP_9    ],      [       F29     ]       };
-    key <KPAD> { [      KP_Add          ]                               };
-
-    key  <KP4> { [  KP_Left,    KP_4    ],      [       F30     ]       };
-    key  <KP5> { [  KP_Begin,   KP_5    ],      [       F31     ]       };
-    key  <KP6> { [  KP_Right,   KP_6    ],      [       F32     ]       };
-
-    key  <KP1> { [  KP_End,     KP_1    ],      [       F33     ]       };
-    key  <KP2> { [  KP_Down,    KP_2    ],      [       F34     ]       };
-    key  <KP3> { [  KP_Next,    KP_3    ],      [       F35     ]       };
-    key <KPEN> { [      KP_Enter        ]                               };
-
-    key  <KP0> { [  KP_Insert,  KP_0    ]                               };
-    key <KPDL> { [  KP_Delete,  KP_Decimal ]                            };
-    // End "Keypad" section, 
-
-    // Begin modifier mappings
-    modifier_map Shift  { Shift_R };
-    modifier_map Mod1   { Alt_L };
-    modifier_map Mod2   { Num_Lock };
-    modifier_map Mod3   { Mode_switch };
-    modifier_map Mod4   { Meta_L };
-    modifier_map Mod5   { Meta_R };
-    // End modifier mappings
-};
-
-
-partial default alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/se(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Sweden";
+
+    key <TLDE> { [         section,         onehalf                ] };
+    key <LSGT> { [            less,         greater,           bar ] };
+    key <AE02> { [               2,        quotedbl,            at ] };
+    key <AE03> { [               3,      numbersign,      sterling ] };
+    key <AE04> { [               4,        currency,        dollar ] };
+    key <AE06> { [               6,       ampersand                ] };
+    key <AE07> { [               7,           slash,     braceleft ] };
+    key <AE08> { [               8,       parenleft,   bracketleft ] };
+    key <AE09> { [               9,      parenright,  bracketright ] };
+    key <AE10> { [               0,           equal,    braceright ] };
+    key <AE11> { [            plus,        question,     backslash ] };
+    key <AE12> { [      dead_acute,      dead_grave                ] };
+    key <AD03> { [               e,               E,      EuroSign ] };
+    key <AD11> { [           aring,           Aring                ] };
+    key <AD12> { [  dead_diaeresis,     asciicircum,    asciitilde ] };
+    key <AC10> { [      odiaeresis,      Odiaeresis                ] };
+    key <AC11> { [      adiaeresis,      Adiaeresis                ] };
+    key <BKSL> { [      apostrophe,        asterisk,         grave ] };
+    key <AB08> { [           comma,       semicolon                ] };
+    key <AB09> { [          period,           colon                ] };
+    key <AB10> { [           minus,      underscore                ] };
+
+        include "level3(ralt_switch)"
+        include "kpdl(comma)"
+
+};
+
+// Swedish layout for a Type 5/5c Sun keyboard
+xkb_symbols "type5" {
+    include "sun_vndr/us(type5)+se(basic)"
+
+    // Begin alphanumeric section
+    // These two are not supposed to be dead.
+    // A few others supposedly ARE dead, but don't care for now.
+    key <AC12> { [ apostrophe, asterisk ],      [       grave ] };
+    key <AD12> { [                      ],      [  asciitilde ] };
+
+    key <RTSH> { [      Shift_R         ]       };
+
+    key <LALT> { [      Alt_L           ]       };
+    key <ALGR> { [      Mode_switch     ]       };
+    key <LMTA> { [      Meta_L          ]       };
+    key <RMTA> { [      Meta_R          ]       };
+    key <COMP> { [      Multi_key       ]       };
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> { [ F1           ]                       };
+    key <FK02> { [ F2           ]                       };
+    key <FK03> { [ F3           ]                       };
+    key <FK04> { [ F4           ]                       };
+    key <FK05> { [ F5           ]                       };
+    key <FK06> { [ F6           ]                       };
+    key <FK07> { [ F7           ]                       };
+    key <FK08> { [ F8           ]                       };
+    key <FK09> { [ F9           ]                       };
+    key <FK10> { [ F10          ]                       };
+    key <FK11> { [ F11          ],      [ SunF36]       };
+    key <FK12> { [ F12          ],      [ SunF37]       };
+    key <STOP> { [ Cancel       ],      [ F11   ]       };
+    key <AGAI> { [ Redo         ],      [ F12   ]       };
+    key <PROP> { [ SunProps     ],      [ F13   ]       };
+    key <UNDO> { [ Undo         ],      [ F14   ]       };
+    key <FRNT> { [ SunFront     ],      [ F15   ]       };
+    key <COPY> { [ SunCopy      ],      [ F16   ]       };
+    key <OPEN> { [ SunOpen      ],      [ F17   ]       };
+    key <PAST> { [ SunPaste     ],      [ F18   ]       };
+    key <FIND> { [ Find         ],      [ F19   ]       };
+    key <CUT>  { [ SunCut       ],      [ F20   ]       };
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ Print        ],      [ Sys_Req, SunSys_Req ] };
+    key <SCLK> { [ Scroll_Lock  ]                       };
+    key <PAUS> { [ Pause        ],      [ Break ]       };
+    key <LEFT> { [ Left         ]                       };
+    key <RGHT> { [ Right        ]                       };
+    key <UP>   { [ Up           ]                       };
+    key <DOWN> { [ Down         ]                       };
+
+    key <DELE> { [ Delete       ]                       };
+    key <INS>  { [ Insert       ]                       };
+    key <PGUP> { [ Prior        ]                       };
+    key <PGDN> { [ Next         ]                       };
+    key <HOME> { [ Home         ]                       };
+    key <END>  { [ End          ]                       };
+    key <HELP> { [ Help         ]                       };
+    // End "Editing" section
+    
+    // Begin "Keypad" section
+    key <NMLK> { [ Num_Lock             ]                               };
+    key <KPDV> { [ KP_Divide            ],      [       F25     ]       };
+    key <KPMU> { [ KP_Multiply          ],      [       F26     ]       };
+    key <KPSU> { [ KP_Subtract          ]                               };
+
+    key  <KP7> { [  KP_Home,    KP_7    ],      [       F27     ]       };
+    key  <KP8> { [  KP_Up,      KP_8    ],      [       F28     ]       };
+    key  <KP9> { [  KP_Prior,   KP_9    ],      [       F29     ]       };
+    key <KPAD> { [      KP_Add          ]                               };
+
+    key  <KP4> { [  KP_Left,    KP_4    ],      [       F30     ]       };
+    key  <KP5> { [  KP_Begin,   KP_5    ],      [       F31     ]       };
+    key  <KP6> { [  KP_Right,   KP_6    ],      [       F32     ]       };
+
+    key  <KP1> { [  KP_End,     KP_1    ],      [       F33     ]       };
+    key  <KP2> { [  KP_Down,    KP_2    ],      [       F34     ]       };
+    key  <KP3> { [  KP_Next,    KP_3    ],      [       F35     ]       };
+    key <KPEN> { [      KP_Enter        ]                               };
+
+    key  <KP0> { [  KP_Insert,  KP_0    ]                               };
+    key <KPDL> { [  KP_Delete,  KP_Decimal ]                            };
+    // End "Keypad" section, 
+
+    // Begin "four keys up on the right"
+    key <MUTE> { [  SunAudioMute,       SunVideoDegauss         ]       };
+    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]       };
+    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness ]       };
+    key <POWR> { [  SunPowerSwitch,     SunPowerSwitchShift     ]       };
+    // End "four keys up on the right"
+
+    // Begin modifier mappings
+    modifier_map Shift  { Shift_R };
+    modifier_map Mod1   { Meta_L, Meta_R };
+    modifier_map Mod2   { Num_Lock };
+    modifier_map Mod3   { Mode_switch };
+    modifier_map Mod4   { Alt_L };
+    // End modifier mappings
+};
+
+// Swedish layout for a Type 4 Sun keyboard
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)+se(basic)"
+
+    // Begin alphanumeric section
+    // These two are not supposed to be dead.
+    // A few others supposedly ARE dead, but don't care for now.
+    key <AC12> { [ apostrophe, asterisk ],      [       grave ] };
+    key <AD12> { [                      ],      [  asciitilde ] };
+
+    key <AF14> { [      asciitilde,     asciicircum     ] };
+
+    key <RTSH> { [      Shift_R         ]       };
+
+    key <LALT> { [      Alt_L           ]       };
+    key <ALGR> { [      Mode_switch     ]       };
+    key <LMTA> { [      Meta_L          ]       };
+    key <RMTA> { [      Meta_R          ]       };
+    key <COMP> { [      Multi_key       ]       };
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> { [ F1           ]                       };
+    key <FK02> { [ F2           ]                       };
+    key <FK03> { [ F3           ]                       };
+    key <FK04> { [ F4           ]                       };
+    key <FK05> { [ F5           ]                       };
+    key <FK06> { [ F6           ]                       };
+    key <FK07> { [ F7           ]                       };
+    key <FK08> { [ F8           ]                       };
+    key <FK09> { [ F9           ]                       };
+    key <FK10> { [ F10          ]                       };
+    key <FK11> { [ F11          ],      [ SunF36]       };
+    key <FK12> { [ F12          ],      [ SunF37]       };
+    key <STOP> { [ Cancel       ],      [ F11   ]       };
+    key <AGAI> { [ Redo         ],      [ F12   ]       };
+    key <PROP> { [ SunProps     ],      [ F13   ]       };
+    key <UNDO> { [ Undo         ],      [ F14   ]       };
+    key <FRNT> { [ SunFront     ],      [ F15   ]       };
+    key <COPY> { [ SunCopy      ],      [ F16   ]       };
+    key <OPEN> { [ SunOpen      ],      [ F17   ]       };
+    key <PAST> { [ SunPaste     ],      [ F18   ]       };
+    key <FIND> { [ Find         ],      [ F19   ]       };
+    key <CUT>  { [ SunCut       ],      [ F20   ]       };
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <LNFD> { [ Linefeed     ]       };
+    key <DELE> { [ Delete       ]                       };
+    key <PRSC> { [ Print        ],      [ Sys_Req, SunSys_Req ] };
+    key <SCLK> { [ Scroll_Lock  ]                       };
+    key <PAUS> { [ Pause        ],      [ Break ]       };
+    key <HELP> { [ Help         ]                       };
+    // End "Editing" section
+    
+   // Begin "Keypad" section
+    key <NMLK> { [ Num_Lock             ]                               };
+    key <KPEQ> { [ KP_Equal             ]                               };
+    key <KPDV> { [ KP_Divide            ],      [       F25     ]       };
+    key <KPMU> { [ KP_Multiply          ],      [       F26     ]       };
+    key <KPSU> { [ KP_Subtract          ]                               };
+
+    key  <KP7> { [  KP_Home,    KP_7    ],      [       F27     ]       };
+    key  <KP8> { [  KP_Up,      KP_8    ],      [       F28     ]       };
+    key  <KP9> { [  KP_Prior,   KP_9    ],      [       F29     ]       };
+    key <KPAD> { [      KP_Add          ]                               };
+
+    key  <KP4> { [  KP_Left,    KP_4    ],      [       F30     ]       };
+    key  <KP5> { [  KP_Begin,   KP_5    ],      [       F31     ]       };
+    key  <KP6> { [  KP_Right,   KP_6    ],      [       F32     ]       };
+
+    key  <KP1> { [  KP_End,     KP_1    ],      [       F33     ]       };
+    key  <KP2> { [  KP_Down,    KP_2    ],      [       F34     ]       };
+    key  <KP3> { [  KP_Next,    KP_3    ],      [       F35     ]       };
+    key <KPEN> { [      KP_Enter        ]                               };
+
+    key  <KP0> { [  KP_Insert,  KP_0    ]                               };
+    key <KPDL> { [  KP_Delete,  KP_Decimal ]                            };
+    // End "Keypad" section, 
+
+    // Begin modifier mappings
+    modifier_map Shift  { Shift_R };
+    modifier_map Mod1   { Alt_L };
+    modifier_map Mod2   { Num_Lock };
+    modifier_map Mod3   { Mode_switch };
+    modifier_map Mod4   { Meta_L };
+    modifier_map Mod5   { Meta_R };
+    // End modifier mappings
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/se(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/sk b/xorg-server/xkeyboard-config/symbols/sun_vndr/sk
index ee49a7008..9c909763f 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/sk
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/sk
@@ -1,109 +1,109 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Slovakia";
-
-
-    key <TLDE>  { 	[       semicolon, dead_abovering, quoteleft,         asciitilde  ]	};
-    key <AE01>  { 	[	     plus,         1,	exclam,               asciitilde  ]	};
-    key <AE02>  {	[	   lcaron,         2,	at,                   dead_caron  ]	};
-    key <AE03>  {	[	   scaron,         3,	numbersign,      dead_circumflex  ]	};
-    key <AE04>  {	[          ccaron,         4,	dollar,               dead_breve  ]	};
-    key <AE05>  {	[	   tcaron,         5,	percent,          dead_abovering  ]	};
-    key <AE06>  {	[	   zcaron,         6,	asciicircum,         dead_ogonek  ]	};
-    key <AE07>  {	[	   yacute,         7,	ampersand,                 grave  ]	};
-    key <AE08>  {	[	   aacute,         8,	asterisk,          dead_abovedot  ]	};
-    key <AE09>  {	[	   iacute,         9,	parenleft,            apostrophe  ]	};
-    key <AE10>  {	[	   eacute,         0,	parenright,     dead_doubleacute  ]	};
-    key <AE11>  {	[	    equal,   percent,	dead_diaeresis,        backslash  ]	};
-    key <AE12>  {	[      dead_acute, dead_caron,	dead_cedilla,              minus  ]	};
-
-    key <AD01>  {	[ 		q,         Q,	backslash		          ]	};
-    key <AD02>  {	[	        w,         W,	bar	                          ]	};
-    key <AD03>  {	[	        e,         E,	EuroSign 		          ]	};
-    key <AD06>  {       [               z,         Z                                      ]     };
-    key <AD10>  {       [               p,         P,	apostrophe   		          ]	};
-    key <AD11>  {	[	   uacute,     slash,	division		          ]	};
-    key <AD12>  {	[      adiaeresis, parenleft,	multiply      		          ]	};
-
-    key <AC02>  {	[	        s,         S,	dstroke		       		  ]	};
-    key <AC03>  {	[	        d,         D,	Dstroke			          ]	};
-    key <AC04>  {	[	        f,         F,	bracketleft		          ]	};
-    key <AC05>  {	[	        g,         G,	bracketright		          ]	};
-    key <AC08>  {	[		k,         K,	lstroke 		       	  ]	};
-    key <AC09>  {	[	        l,         L,	Lstroke		                  ]	};
-    key <AC10>  {	[     ocircumflex,  quotedbl,	dollar		                  ]	};
-    key <AC11>  {	[         section,    exclam,	ssharp   		          ]	};
-    key <AC12>  {	[          ncaron, parenright,	currency,               currency  ]	};
-    key <BKSL>  {	[          ncaron, parenright,	backslash,                   bar  ]	};
-
-    key <LSGT>  { 	[       backslash,       bar,	slash,                 brokenbar  ]     };
-    key <AB01>  {       [               y,        Y,	less  	                          ]	};
-    key <AB02>  {	[	        x,        X,	greater,              numbersign  ]	};
-    key <AB03>  {	[		c,        C,	ampersand	 	          ]	};
-    key <AB04>  {	[	        v,        V,	at 		                  ]	};
-    key <AB05>  {	[	        b,        B,	braceleft              	          ]	};
-    key <AB06>  {	[        	n,        N,	braceright              	  ]	};
-    key <AB08>  {	[  	    comma, question,	less 		                  ]	};
-    key <AB09>  {	[	   period,    colon,	greater		                  ]	};
-    key <AB10>  {	[ 	    minus, underscore,	asterisk 			  ]	};
-
-	include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/sk(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Slovakia";
+
+
+    key <TLDE>  { 	[       semicolon, dead_abovering, quoteleft,         asciitilde  ]	};
+    key <AE01>  { 	[	     plus,         1,	exclam,               asciitilde  ]	};
+    key <AE02>  {	[	   lcaron,         2,	at,                   dead_caron  ]	};
+    key <AE03>  {	[	   scaron,         3,	numbersign,      dead_circumflex  ]	};
+    key <AE04>  {	[          ccaron,         4,	dollar,               dead_breve  ]	};
+    key <AE05>  {	[	   tcaron,         5,	percent,          dead_abovering  ]	};
+    key <AE06>  {	[	   zcaron,         6,	asciicircum,         dead_ogonek  ]	};
+    key <AE07>  {	[	   yacute,         7,	ampersand,                 grave  ]	};
+    key <AE08>  {	[	   aacute,         8,	asterisk,          dead_abovedot  ]	};
+    key <AE09>  {	[	   iacute,         9,	parenleft,            apostrophe  ]	};
+    key <AE10>  {	[	   eacute,         0,	parenright,     dead_doubleacute  ]	};
+    key <AE11>  {	[	    equal,   percent,	dead_diaeresis,        backslash  ]	};
+    key <AE12>  {	[      dead_acute, dead_caron,	dead_cedilla,              minus  ]	};
+
+    key <AD01>  {	[ 		q,         Q,	backslash		          ]	};
+    key <AD02>  {	[	        w,         W,	bar	                          ]	};
+    key <AD03>  {	[	        e,         E,	EuroSign 		          ]	};
+    key <AD06>  {       [               z,         Z                                      ]     };
+    key <AD10>  {       [               p,         P,	apostrophe   		          ]	};
+    key <AD11>  {	[	   uacute,     slash,	division		          ]	};
+    key <AD12>  {	[      adiaeresis, parenleft,	multiply      		          ]	};
+
+    key <AC02>  {	[	        s,         S,	dstroke		       		  ]	};
+    key <AC03>  {	[	        d,         D,	Dstroke			          ]	};
+    key <AC04>  {	[	        f,         F,	bracketleft		          ]	};
+    key <AC05>  {	[	        g,         G,	bracketright		          ]	};
+    key <AC08>  {	[		k,         K,	lstroke 		       	  ]	};
+    key <AC09>  {	[	        l,         L,	Lstroke		                  ]	};
+    key <AC10>  {	[     ocircumflex,  quotedbl,	dollar		                  ]	};
+    key <AC11>  {	[         section,    exclam,	ssharp   		          ]	};
+    key <AC12>  {	[          ncaron, parenright,	currency,               currency  ]	};
+    key <BKSL>  {	[          ncaron, parenright,	backslash,                   bar  ]	};
+
+    key <LSGT>  { 	[       backslash,       bar,	slash,                 brokenbar  ]     };
+    key <AB01>  {       [               y,        Y,	less  	                          ]	};
+    key <AB02>  {	[	        x,        X,	greater,              numbersign  ]	};
+    key <AB03>  {	[		c,        C,	ampersand	 	          ]	};
+    key <AB04>  {	[	        v,        V,	at 		                  ]	};
+    key <AB05>  {	[	        b,        B,	braceleft              	          ]	};
+    key <AB06>  {	[        	n,        N,	braceright              	  ]	};
+    key <AB08>  {	[  	    comma, question,	less 		                  ]	};
+    key <AB09>  {	[	   period,    colon,	greater		                  ]	};
+    key <AB10>  {	[ 	    minus, underscore,	asterisk 			  ]	};
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/sk(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/tr b/xorg-server/xkeyboard-config/symbols/sun_vndr/tr
index 4eb8d6511..18ff4f0b1 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/tr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/tr
@@ -1,92 +1,92 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Turkey - (Q)";
-
-    key <TLDE>  { [  quotedbl,     eacute                ] };
-    key <AE01>	{ [         1,     exclam                ] };
-    key <AE02>	{ [         2, apostrophe                ] };
-    key <AE03>	{ [        3, asciicircum,    numbersign ] };
-    key <AE04>	{ [         4,       plus,        dollar ] };
-    key <AE06>	{ [         6,  ampersand                ] };
-    key <AE07>	{ [         7,      slash,     braceleft ] };
-    key <AE08>	{ [         8,  parenleft,   bracketleft ] };
-    key <AE09>	{ [         9, parenright,  bracketright ] };
-    key <AE10>	{ [         0,      equal,    braceright ] };
-    key <AE11>	{ [  asterisk,   question,     backslash ] };
-    key <AE12>	{ [     minus, underscore                ] };
-
-    key <AD01>  { [         q,          Q,           at ] };
-    key <AD03>	{ [         e,          E,     EuroSign ] };
-    key <AD08>	{ [  idotless,          I               ] };
-    key <AD11>	{ [    gbreve,     Gbreve               ] };
-    key <AD12>	{ [udiaeresis, Udiaeresis,   asciitilde ] };
-
-    key <AC10>	{ [  scedilla,   Scedilla,        acute ] };
-    key <AC11>	{ [         i,  Iabovedot               ] }; 
-    key <BKSL>	{ [     comma,  semicolon,        grave ] };
-
-    key <LSGT>	{ [      less,    greater,          bar ] };
-    key <AB08>	{ [odiaeresis, Odiaeresis               ] };
-    key <AB09>	{ [  ccedilla,   Ccedilla               ] };
-    key <AB10>	{ [    period,      colon               ] };
-
-	include "level3(ralt_switch)"
-
-};
-
-partial default alphanumeric_keys
-        xkb_symbols "basic" {
-        include "sun_vndr/tr(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Turkey - (Q)";
+
+    key <TLDE>  { [  quotedbl,     eacute                ] };
+    key <AE01>	{ [         1,     exclam                ] };
+    key <AE02>	{ [         2, apostrophe                ] };
+    key <AE03>	{ [        3, asciicircum,    numbersign ] };
+    key <AE04>	{ [         4,       plus,        dollar ] };
+    key <AE06>	{ [         6,  ampersand                ] };
+    key <AE07>	{ [         7,      slash,     braceleft ] };
+    key <AE08>	{ [         8,  parenleft,   bracketleft ] };
+    key <AE09>	{ [         9, parenright,  bracketright ] };
+    key <AE10>	{ [         0,      equal,    braceright ] };
+    key <AE11>	{ [  asterisk,   question,     backslash ] };
+    key <AE12>	{ [     minus, underscore                ] };
+
+    key <AD01>  { [         q,          Q,           at ] };
+    key <AD03>	{ [         e,          E,     EuroSign ] };
+    key <AD08>	{ [  idotless,          I               ] };
+    key <AD11>	{ [    gbreve,     Gbreve               ] };
+    key <AD12>	{ [udiaeresis, Udiaeresis,   asciitilde ] };
+
+    key <AC10>	{ [  scedilla,   Scedilla,        acute ] };
+    key <AC11>	{ [         i,  Iabovedot               ] }; 
+    key <BKSL>	{ [     comma,  semicolon,        grave ] };
+
+    key <LSGT>	{ [      less,    greater,          bar ] };
+    key <AB08>	{ [odiaeresis, Odiaeresis               ] };
+    key <AB09>	{ [  ccedilla,   Ccedilla               ] };
+    key <AB10>	{ [    period,      colon               ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+partial default alphanumeric_keys
+        xkb_symbols "basic" {
+        include "sun_vndr/tr(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv b/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv
index 64037ac42..f098f9f27 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv
@@ -1,261 +1,261 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-//
-//Copyright 1996, 1998  The Open Group
-//
-//All Rights Reserved.
-//
-//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 OPEN GROUP 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 Open Group 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 Open Group.
-//
-// US/ASCII layout for a Type 4 Sun keyboard
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-xkb_symbols "type4basic" {
-    include "us(basic)"
-
-    key <RTSH> { [ Shift_R		]			};
-    key <LALT> { [ Alt_L		]			};
-    key <ALGR> { [ Mode_switch		]			};
-    key <LMTA> { [ Meta_L		]			};
-    key <RMTA> { [ Meta_R		]			};
-    key <LNFD> { [ Linefeed		]			};
-    key <COMP> { [ Multi_key		]			};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <STOP> { [ L1,	L1		], [ SunStop	]	};
-    key <AGAI> { [ L2,	L2		], [ SunAgain	]	};
-    key <PROP> { [ L3,	L3		], [ SunProps	]	};
-    key <UNDO> { [ L4,	L4		], [ SunUndo	]	};
-    key <FRNT> { [ L5,	L5		], [ SunFront	]	};
-    key <COPY> { [ L6,	L6		], [ SunCopy	]	};
-    key <OPEN> { [ L7,	L7		], [ SunOpen	]	};
-    key <PAST> { [ L8,	L8		], [ SunPaste	]	};
-    key <FIND> { [ L9,	L9		], [ SunFind	]	};
-    key <CUT>  { [ L10,	L10		], [ SunCut	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2,	R2		], [ Print		] };
-    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };
-    key <PAUS> { [ R1,	R1		], [ Pause		] };
-    key <DELE> { [ Delete		]			};
-    key <HELP> { [ Help			]			};
-
-    // End "Editing" section, begin "Keypad"
-    key <NMLK> { [ Num_Lock 		]			};
-    key <KPEQ> { [ R4,	R4 		], [ KP_Equal		] };
-    key <KPDV> { [ R5,	R5		], [ KP_Divide		] };
-    key <KPMU> { [ R6,	R6		], [ KP_Multiply	] };
-    key <KPSU> { [ KP_Subtract		]			};
-
-    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };
-    key  <KP8> { [ Up, R8               ], [ KP_8               ] };
-//    key  <KP8> { [ R8,	R8		], [ KP_8		] };
-    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };
-    key <KPAD> { [ KP_Add		]			};
-
-    key  <KP4> { [ Left, R10		], [ KP_4		] };
-    key  <KP5> { [ R11,	R11		], [ KP_5		] };
-    key  <KP6> { [ Right, R12		], [ KP_6		] };
-
-    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };
-    key  <KP2> { [ Down, R14		], [ KP_2		] };
-    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };
-    key <KPEN> { [ KP_Enter		]			}; 
-    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};
-    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};
-    // End "Keypad" section
-
-
-    // begin modifier mappings
-    modifier_map Shift  	{ Shift_R, Shift_L };
-    modifier_map Mod1   	{ Meta_L, Meta_R };
-    modifier_map Mod2           { Num_Lock };
-    modifier_map Mod3   	{ Mode_switch };
-    modifier_map Mod4		{ Alt_L };
-};
-
-xkb_symbols "type4" {
-    include "sun_vndr/us(type4basic)"
-
-    // A few alphanumeric keys are different
-    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
-    key <AE05> { [ 5, percent		], [ EuroSign	]	};
-    key <AD03> { [ e, E			], [ EuroSign	]	};
-};
-
-// US/ASCII layout for a Type 5 Sun keyboard
-xkb_symbols "type5basic" {
-    include "us(basic)"
-
-    key <RTSH> { [ Shift_R		]	};
-    key <LALT> { [ Alt_L		]	};
-    key <ALGR> { [ Mode_switch		]	};
-    key <LMTA> { [ Meta_L		]	};
-    key <RMTA> { [ Meta_R		]	};
-    key <COMP> { [ Multi_key		]	};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <STOP> { [ L1, L1		], [ SunStop	]	};
-    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
-    key <PROP> { [ L3, L3		], [ SunProps	]	};
-    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
-    key <FRNT> { [ L5, L5		], [ SunFront	]	};
-    key <COPY> { [ L6, L6		], [ SunCopy	]	};
-    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
-    key <PAST> { [ L8, L8		], [ SunPaste	]	};
-    key <FIND> { [ L9, L9		], [ SunFind	]	};
-    key <CUT>  { [ L10, L10		], [ SunCut	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
-    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
-    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
-    key <LEFT> { [ Left			]			};
-    key <RGHT> { [ Right		]			};
-    key <UP>   { [ Up			]			};
-    key <DOWN> { [ Down			]			};
-
-    key <DELE> { [ Delete		]			};
-    key <INS>  { [ Insert		]			};
-    key <PGUP> { [ Prior		]			};
-    key <PGDN> { [ Next			]			};
-    key <HOME> { [ Home			]			};
-    key <END>  { [ End			]			};
-    key <HELP> { [ Help			]			};
-
-    // End "Editing" section, begin "Keypad"
-    key <NMLK> { [ Num_Lock 		]				};
-    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
-    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
-    key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
-
-    key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
-    key  <KP8> { [ Up, R8		], [ KP_8		]	};
-    key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
-    key <KPAD> { [ KP_Add		]				};
-
-    key  <KP4> { [ Left, R10		], [ KP_4		]	};
-    key  <KP5> { [ R11,	R11		], [ KP_5		]	};
-    key  <KP6> { [ Right, R12		], [ KP_6		]	};
-
-    key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
-    key  <KP2> { [ Down, R14		], [ KP_2		]	};
-    key  <KP3> { [ R15,	R15		], [ KP_3		]	};
-    key <KPEN> { [ KP_Enter		]				};
-
-    key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
-    key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
-    // End "Keypad" section, 
-    // begin "four keys up on the right"
-
-    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
-    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
-    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_R };
-    modifier_map Mod1	{ Meta_L, Meta_R };
-    modifier_map Mod2   { Num_Lock };
-    modifier_map Mod3	{ Alt_R };
-    modifier_map Mod4	{ Alt_L };
-};
-
-xkb_symbols "type5" {
-    include "sun_vndr/us(type5basic)"
-
-    // A few alphanumeric keys are different
-    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
-    key <AE05> { [ 5, percent		], [ EuroSign	]	};
-    key <AD03> { [ e, E			], [ EuroSign	]	};
-    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+//
+//Copyright 1996, 1998  The Open Group
+//
+//All Rights Reserved.
+//
+//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 OPEN GROUP 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 Open Group 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 Open Group.
+//
+// US/ASCII layout for a Type 4 Sun keyboard
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+xkb_symbols "type4basic" {
+    include "us(basic)"
+
+    key <RTSH> { [ Shift_R		]			};
+    key <LALT> { [ Alt_L		]			};
+    key <ALGR> { [ Mode_switch		]			};
+    key <LMTA> { [ Meta_L		]			};
+    key <RMTA> { [ Meta_R		]			};
+    key <LNFD> { [ Linefeed		]			};
+    key <COMP> { [ Multi_key		]			};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <STOP> { [ L1,	L1		], [ SunStop	]	};
+    key <AGAI> { [ L2,	L2		], [ SunAgain	]	};
+    key <PROP> { [ L3,	L3		], [ SunProps	]	};
+    key <UNDO> { [ L4,	L4		], [ SunUndo	]	};
+    key <FRNT> { [ L5,	L5		], [ SunFront	]	};
+    key <COPY> { [ L6,	L6		], [ SunCopy	]	};
+    key <OPEN> { [ L7,	L7		], [ SunOpen	]	};
+    key <PAST> { [ L8,	L8		], [ SunPaste	]	};
+    key <FIND> { [ L9,	L9		], [ SunFind	]	};
+    key <CUT>  { [ L10,	L10		], [ SunCut	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2,	R2		], [ Print		] };
+    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };
+    key <PAUS> { [ R1,	R1		], [ Pause		] };
+    key <DELE> { [ Delete		]			};
+    key <HELP> { [ Help			]			};
+
+    // End "Editing" section, begin "Keypad"
+    key <NMLK> { [ Num_Lock 		]			};
+    key <KPEQ> { [ R4,	R4 		], [ KP_Equal		] };
+    key <KPDV> { [ R5,	R5		], [ KP_Divide		] };
+    key <KPMU> { [ R6,	R6		], [ KP_Multiply	] };
+    key <KPSU> { [ KP_Subtract		]			};
+
+    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };
+    key  <KP8> { [ Up, R8               ], [ KP_8               ] };
+//    key  <KP8> { [ R8,	R8		], [ KP_8		] };
+    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };
+    key <KPAD> { [ KP_Add		]			};
+
+    key  <KP4> { [ Left, R10		], [ KP_4		] };
+    key  <KP5> { [ R11,	R11		], [ KP_5		] };
+    key  <KP6> { [ Right, R12		], [ KP_6		] };
+
+    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };
+    key  <KP2> { [ Down, R14		], [ KP_2		] };
+    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };
+    key <KPEN> { [ KP_Enter		]			}; 
+    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};
+    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};
+    // End "Keypad" section
+
+
+    // begin modifier mappings
+    modifier_map Shift  	{ Shift_R, Shift_L };
+    modifier_map Mod1   	{ Meta_L, Meta_R };
+    modifier_map Mod2           { Num_Lock };
+    modifier_map Mod3   	{ Mode_switch };
+    modifier_map Mod4		{ Alt_L };
+};
+
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+
+    // A few alphanumeric keys are different
+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
+    key <AE05> { [ 5, percent		], [ EuroSign	]	};
+    key <AD03> { [ e, E			], [ EuroSign	]	};
+};
+
+// US/ASCII layout for a Type 5 Sun keyboard
+xkb_symbols "type5basic" {
+    include "us(basic)"
+
+    key <RTSH> { [ Shift_R		]	};
+    key <LALT> { [ Alt_L		]	};
+    key <ALGR> { [ Mode_switch		]	};
+    key <LMTA> { [ Meta_L		]	};
+    key <RMTA> { [ Meta_R		]	};
+    key <COMP> { [ Multi_key		]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <STOP> { [ L1, L1		], [ SunStop	]	};
+    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
+    key <PROP> { [ L3, L3		], [ SunProps	]	};
+    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
+    key <FRNT> { [ L5, L5		], [ SunFront	]	};
+    key <COPY> { [ L6, L6		], [ SunCopy	]	};
+    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
+    key <PAST> { [ L8, L8		], [ SunPaste	]	};
+    key <FIND> { [ L9, L9		], [ SunFind	]	};
+    key <CUT>  { [ L10, L10		], [ SunCut	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
+    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
+    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
+    key <LEFT> { [ Left			]			};
+    key <RGHT> { [ Right		]			};
+    key <UP>   { [ Up			]			};
+    key <DOWN> { [ Down			]			};
+
+    key <DELE> { [ Delete		]			};
+    key <INS>  { [ Insert		]			};
+    key <PGUP> { [ Prior		]			};
+    key <PGDN> { [ Next			]			};
+    key <HOME> { [ Home			]			};
+    key <END>  { [ End			]			};
+    key <HELP> { [ Help			]			};
+
+    // End "Editing" section, begin "Keypad"
+    key <NMLK> { [ Num_Lock 		]				};
+    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
+    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
+    key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
+
+    key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
+    key  <KP8> { [ Up, R8		], [ KP_8		]	};
+    key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
+    key <KPAD> { [ KP_Add		]				};
+
+    key  <KP4> { [ Left, R10		], [ KP_4		]	};
+    key  <KP5> { [ R11,	R11		], [ KP_5		]	};
+    key  <KP6> { [ Right, R12		], [ KP_6		]	};
+
+    key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
+    key  <KP2> { [ Down, R14		], [ KP_2		]	};
+    key  <KP3> { [ R15,	R15		], [ KP_3		]	};
+    key <KPEN> { [ KP_Enter		]				};
+
+    key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
+    key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
+    // End "Keypad" section, 
+    // begin "four keys up on the right"
+
+    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
+    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
+    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_R };
+    modifier_map Mod1	{ Meta_L, Meta_R };
+    modifier_map Mod2   { Num_Lock };
+    modifier_map Mod3	{ Alt_R };
+    modifier_map Mod4	{ Alt_L };
+};
+
+xkb_symbols "type5" {
+    include "sun_vndr/us(type5basic)"
+
+    // A few alphanumeric keys are different
+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
+    key <AE05> { [ 5, percent		], [ EuroSign	]	};
+    key <AD03> { [ e, E			], [ EuroSign	]	};
+    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/tw b/xorg-server/xkeyboard-config/symbols/sun_vndr/tw
index 3f6569d2a..d2d3952e4 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/tw
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/tw
@@ -1,78 +1,78 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-// Taiwanese layout for a Type 6 Sun keyboard
-partial
-xkb_symbols "type6" {
-    // A few keys are different from US layout - only those are shown here
-    key <ALGR> { [ Henkan_Mode          ]                       };
-    key <BKSL> { [ backslash, bar,  brokenbar   ]               };
-
-};
-
-
-// Taiwanese layout for a Type 4 Sun keyboard
-
-xkb_symbols "type4" {
-
-    key <BKSL> { [ backslash, bar,  brokenbar	]		};
-
-    key <COMP> { [ Henkan_Mode		]			};
-
-};
-
-// Taiwanese layout for a Type 5 Sun keyboard
-xkb_symbols "type5" {
-
-    // A few keys are different
-    key <ALGR> { [ Henkan_Mode		]			};
-    key <BKSL> { [ backslash, bar,  brokenbar	]		};
-
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+// Taiwanese layout for a Type 6 Sun keyboard
+partial
+xkb_symbols "type6" {
+    // A few keys are different from US layout - only those are shown here
+    key <ALGR> { [ Henkan_Mode          ]                       };
+    key <BKSL> { [ backslash, bar,  brokenbar   ]               };
+
+};
+
+
+// Taiwanese layout for a Type 4 Sun keyboard
+
+xkb_symbols "type4" {
+
+    key <BKSL> { [ backslash, bar,  brokenbar	]		};
+
+    key <COMP> { [ Henkan_Mode		]			};
+
+};
+
+// Taiwanese layout for a Type 5 Sun keyboard
+xkb_symbols "type5" {
+
+    // A few keys are different
+    key <ALGR> { [ Henkan_Mode		]			};
+    key <BKSL> { [ backslash, bar,  brokenbar	]		};
+
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ua b/xorg-server/xkeyboard-config/symbols/sun_vndr/ua
index b18fad4d7..98d39ecde 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ua
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ua
@@ -1,117 +1,117 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// 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, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// 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
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Ukraine";
-
-
-    key	<TLDE> {	[	    grave,	asciitilde,	apostrophe,	asciitilde	]	};
-    key	<AE01> {	[		1,	    exclam,	1,	    exclam 	]	};
-    key	<AE02> {	[		2,		at,	2,        quotedbl	]	};
-    key	<AE03> {	[		3,	numbersign,	3,      numbersign	]	};
-    key	<AE04> {	[		4,	    dollar,	4,        asterisk	]	};
-    key	<AE05> {	[		5,	   percent,	5,	     colon	]	};
-    key	<AE06> {	[		6,     asciicircum,	6,	     comma	]	};
-    key	<AE07> {	[		7,	 ampersand,	7,	    period	]	};
-    key	<AE08> {	[		8,	  asterisk,	8,	 semicolon	]	};
-    key	<AE09> {	[		9,	 parenleft,	9,	 parenleft	]	};
-    key	<AE10> {	[		0,	parenright,	0,	parenright	]	};
-    key	<AE11> {	[	    minus,	underscore,	minus,	underscore	]	};
-    key	<AE12> {	[	    equal,	      plus,	equal,	      plus	]	};
-
-    key	<AD01> {	[		q,		 Q,	Cyrillic_shorti, Cyrillic_SHORTI	]	};
-    key	<AD02> {	[		w,		 W,	Cyrillic_tse,    Cyrillic_TSE	]	};
-    key	<AD03> {	[		e,		 E,	Cyrillic_u,	Cyrillic_U	]	};
-    key	<AD04> {	[		r,		 R,	Cyrillic_ka,     Cyrillic_KA	]	};
-    key	<AD05> {	[		t,		 T,	Cyrillic_ie,     Cyrillic_IE	]	};
-    key	<AD06> {	[		y,		 Y,	Cyrillic_en,     Cyrillic_EN	]	};
-    key	<AD07> {	[		u,		 U,	Cyrillic_ghe,    Cyrillic_GHE	]	};
-    key	<AD08> {	[		i,		 I,	Cyrillic_sha,    Cyrillic_SHA	]	};
-    key	<AD09> {	[		o,		 O,	Cyrillic_shcha,  Cyrillic_SHCHA	]	};
-    key	<AD10> {	[		p,		 P,	Cyrillic_ze,     Cyrillic_ZE	]	};
-    key	<AD11> {	[     bracketleft,	 braceleft,	Cyrillic_ha,     Cyrillic_HA	]	};
-    key	<AD12> {	[    bracketright,	braceright,	Ukrainian_yi,    Ukrainian_YI	]	};
-
-    key	<AC01> {	[		a,		 A,	Cyrillic_ef,     Cyrillic_EF	]	};
-    key	<AC02> {	[		s,		 S,	Ukrainian_i,     Ukrainian_I	]	};
-    key	<AC03> {	[		d,		 D,	Cyrillic_ve,     Cyrillic_VE	]	};
-    key	<AC04> {	[		f,		 F,	Cyrillic_a,	Cyrillic_A	]	};
-    key	<AC05> {	[		g,		 G,	Cyrillic_pe,     Cyrillic_PE	]	};
-    key	<AC06> {	[		h,		 H,	Cyrillic_er,     Cyrillic_ER	]	};
-    key	<AC07> {	[		j,		 J,	Cyrillic_o,	Cyrillic_O	]	};
-    key	<AC08> {	[		k,		 K,	Cyrillic_el,     Cyrillic_EL	]	};
-    key	<AC09> {	[		l,		 L,	Cyrillic_de,     Cyrillic_DE	]	};
-    key	<AC10> {	[	semicolon,	     colon,	Cyrillic_zhe,    Cyrillic_ZHE	]	};
-    key	<AC11> {	[      apostrophe,	  quotedbl,	Ukrainian_ie,    Ukrainian_IE	]	};
-    key <BKSL> {        [       backslash,             bar,     Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
-
-    key <LSGT> {        [            less,         greater,     slash,           bar            ]       };
-    key	<AB01> {	[		z,		 Z,	Cyrillic_ya,     Cyrillic_YA	]	};
-    key	<AB02> {	[		x,		 X,	Cyrillic_che,    Cyrillic_CHE	]	};
-    key	<AB03> {	[		c,		 C,	Cyrillic_es,     Cyrillic_ES	]	};
-    key	<AB04> {	[		v,		 V,	Cyrillic_em,     Cyrillic_EM	]	};
-    key	<AB06> {	[		n,		 N,	Cyrillic_te,     Cyrillic_TE	]	};
-    key	<AB05> {	[		b,		 B,	Cyrillic_i,	Cyrillic_I	]	};
-    key	<AB07> {	[		m,		 M,	Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
-    key	<AB08> {	[	    comma,	      less,	Cyrillic_be,     Cyrillic_BE	]	};
-    key	<AB09> {	[	   period,	   greater,	Cyrillic_yu,     Cyrillic_YU	]	};
-    key	<AB10> {	[	    slash,	  question,	slash,	  question	        ]	};
-
-	include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/ua(type6)"
-};
+//
+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+//
+// 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, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// 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
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Ukraine";
+
+
+    key	<TLDE> {	[	    grave,	asciitilde,	apostrophe,	asciitilde	]	};
+    key	<AE01> {	[		1,	    exclam,	1,	    exclam 	]	};
+    key	<AE02> {	[		2,		at,	2,        quotedbl	]	};
+    key	<AE03> {	[		3,	numbersign,	3,      numbersign	]	};
+    key	<AE04> {	[		4,	    dollar,	4,        asterisk	]	};
+    key	<AE05> {	[		5,	   percent,	5,	     colon	]	};
+    key	<AE06> {	[		6,     asciicircum,	6,	     comma	]	};
+    key	<AE07> {	[		7,	 ampersand,	7,	    period	]	};
+    key	<AE08> {	[		8,	  asterisk,	8,	 semicolon	]	};
+    key	<AE09> {	[		9,	 parenleft,	9,	 parenleft	]	};
+    key	<AE10> {	[		0,	parenright,	0,	parenright	]	};
+    key	<AE11> {	[	    minus,	underscore,	minus,	underscore	]	};
+    key	<AE12> {	[	    equal,	      plus,	equal,	      plus	]	};
+
+    key	<AD01> {	[		q,		 Q,	Cyrillic_shorti, Cyrillic_SHORTI	]	};
+    key	<AD02> {	[		w,		 W,	Cyrillic_tse,    Cyrillic_TSE	]	};
+    key	<AD03> {	[		e,		 E,	Cyrillic_u,	Cyrillic_U	]	};
+    key	<AD04> {	[		r,		 R,	Cyrillic_ka,     Cyrillic_KA	]	};
+    key	<AD05> {	[		t,		 T,	Cyrillic_ie,     Cyrillic_IE	]	};
+    key	<AD06> {	[		y,		 Y,	Cyrillic_en,     Cyrillic_EN	]	};
+    key	<AD07> {	[		u,		 U,	Cyrillic_ghe,    Cyrillic_GHE	]	};
+    key	<AD08> {	[		i,		 I,	Cyrillic_sha,    Cyrillic_SHA	]	};
+    key	<AD09> {	[		o,		 O,	Cyrillic_shcha,  Cyrillic_SHCHA	]	};
+    key	<AD10> {	[		p,		 P,	Cyrillic_ze,     Cyrillic_ZE	]	};
+    key	<AD11> {	[     bracketleft,	 braceleft,	Cyrillic_ha,     Cyrillic_HA	]	};
+    key	<AD12> {	[    bracketright,	braceright,	Ukrainian_yi,    Ukrainian_YI	]	};
+
+    key	<AC01> {	[		a,		 A,	Cyrillic_ef,     Cyrillic_EF	]	};
+    key	<AC02> {	[		s,		 S,	Ukrainian_i,     Ukrainian_I	]	};
+    key	<AC03> {	[		d,		 D,	Cyrillic_ve,     Cyrillic_VE	]	};
+    key	<AC04> {	[		f,		 F,	Cyrillic_a,	Cyrillic_A	]	};
+    key	<AC05> {	[		g,		 G,	Cyrillic_pe,     Cyrillic_PE	]	};
+    key	<AC06> {	[		h,		 H,	Cyrillic_er,     Cyrillic_ER	]	};
+    key	<AC07> {	[		j,		 J,	Cyrillic_o,	Cyrillic_O	]	};
+    key	<AC08> {	[		k,		 K,	Cyrillic_el,     Cyrillic_EL	]	};
+    key	<AC09> {	[		l,		 L,	Cyrillic_de,     Cyrillic_DE	]	};
+    key	<AC10> {	[	semicolon,	     colon,	Cyrillic_zhe,    Cyrillic_ZHE	]	};
+    key	<AC11> {	[      apostrophe,	  quotedbl,	Ukrainian_ie,    Ukrainian_IE	]	};
+    key <BKSL> {        [       backslash,             bar,     Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
+
+    key <LSGT> {        [            less,         greater,     slash,           bar            ]       };
+    key	<AB01> {	[		z,		 Z,	Cyrillic_ya,     Cyrillic_YA	]	};
+    key	<AB02> {	[		x,		 X,	Cyrillic_che,    Cyrillic_CHE	]	};
+    key	<AB03> {	[		c,		 C,	Cyrillic_es,     Cyrillic_ES	]	};
+    key	<AB04> {	[		v,		 V,	Cyrillic_em,     Cyrillic_EM	]	};
+    key	<AB06> {	[		n,		 N,	Cyrillic_te,     Cyrillic_TE	]	};
+    key	<AB05> {	[		b,		 B,	Cyrillic_i,	Cyrillic_I	]	};
+    key	<AB07> {	[		m,		 M,	Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
+    key	<AB08> {	[	    comma,	      less,	Cyrillic_be,     Cyrillic_BE	]	};
+    key	<AB09> {	[	   period,	   greater,	Cyrillic_yu,     Cyrillic_YU	]	};
+    key	<AB10> {	[	    slash,	  question,	slash,	  question	        ]	};
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ua(type6)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/typo b/xorg-server/xkeyboard-config/symbols/typo
index 5cbf6be3e..ed4a2774b 100644
--- a/xorg-server/xkeyboard-config/symbols/typo
+++ b/xorg-server/xkeyboard-config/symbols/typo
@@ -1,51 +1,51 @@
-// typographic keyboard
-// Sergei Stolyarov <sergei@regolit.com>
-//
-// Initial contribution by Alexey Ten <alexeyten+deb@gmail.com>
-//
-// Based on the layout proposed by Ilya Birman, 
-// http://ilyabirman.ru/typography-layout/
-//
-
-// default layout
-default partial
-xkb_symbols "base" {
-// 1st keyboard row
-    key <TLDE> { [NoSymbol, NoSymbol, NoSymbol, approxeq] };
-    key <AE01> { [NoSymbol, NoSymbol, onesuperior] };
-    key <AE02> { [NoSymbol, NoSymbol, twosuperior, onehalf] };
-    key <AE03> { [NoSymbol, NoSymbol, threesuperior, onethird] };
-    key <AE04> { [NoSymbol, NoSymbol, dollar, onequarter] };
-    key <AE05> { [NoSymbol, NoSymbol, U2030] };
-    key <AE07> { [NoSymbol, NoSymbol, ampersand] };
-    key <AE08> { [NoSymbol, NoSymbol, enfilledcircbullet, oneeighth] };
-    key <AE11> { [NoSymbol, NoSymbol, emdash, hyphen] };
-    key <AE12> { [NoSymbol, NoSymbol, notequal, plusminus] };
-
-// 2nd keyboard row
-    key <AD03> { [NoSymbol, NoSymbol, EuroSign] }; // "e"
-    key <AD04> { [NoSymbol, NoSymbol, registered] }; // "r"
-    key <AD05> { [NoSymbol, NoSymbol, trademark] }; // "t"
-    key <AD06> { [NoSymbol, NoSymbol, yen] }; // "y"
-    key <AD10> { [NoSymbol, NoSymbol, acute, doubleacute] }; // "p"
-    key <AD11> { [NoSymbol, NoSymbol, bracketleft, braceleft ] }; // [
-    key <AD12> { [NoSymbol, NoSymbol, bracketright, braceright ] }; // ]
-
-// 3rd keyboard row
-    key <AC01> { [NoSymbol, NoSymbol, U0301, NoSymbol] }; // "a"
-    key <AC02> { [NoSymbol, NoSymbol, section]}; // "s"
-    key <AC03> { [NoSymbol, NoSymbol, degree, division] }; // "d"
-    key <AC04> { [NoSymbol, NoSymbol, sterling, NoSymbol] }; // "f"
-    key <AC07> { [NoSymbol, NoSymbol, doublelowquotemark, singlelowquotemark] }; // "j"
-    key <AC08> { [NoSymbol, NoSymbol, leftdoublequotemark, leftsinglequotemark] }; // "k"
-    key <AC09> { [NoSymbol, NoSymbol, rightdoublequotemark, rightsinglequotemark] }; // "l"
-    key <AC10> { [NoSymbol, NoSymbol, leftsinglequotemark, minutes] }; // ";"
-    key <AC11> { [NoSymbol, NoSymbol, rightsinglequotemark, seconds] }; // "'"
-
-// 4th keyboard row
-    key <AB02> { [NoSymbol, NoSymbol, multiply, U22C5] }; // "x"
-    key <AB03> { [NoSymbol, NoSymbol, copyright, cent] }; // "c"
-    key <AB08> { [NoSymbol, NoSymbol, guillemotleft, less] }; // ","
-    key <AB09> { [NoSymbol, NoSymbol, guillemotright, greater] }; // "."
-    key <AB10> { [NoSymbol, NoSymbol, ellipsis] }; // "/"
-};
+// typographic keyboard
+// Sergei Stolyarov <sergei@regolit.com>
+//
+// Initial contribution by Alexey Ten <alexeyten+deb@gmail.com>
+//
+// Based on the layout proposed by Ilya Birman, 
+// http://ilyabirman.ru/typography-layout/
+//
+
+// default layout
+default partial
+xkb_symbols "base" {
+// 1st keyboard row
+    key <TLDE> { [NoSymbol, NoSymbol, NoSymbol, approxeq] };
+    key <AE01> { [NoSymbol, NoSymbol, onesuperior] };
+    key <AE02> { [NoSymbol, NoSymbol, twosuperior, onehalf] };
+    key <AE03> { [NoSymbol, NoSymbol, threesuperior, onethird] };
+    key <AE04> { [NoSymbol, NoSymbol, dollar, onequarter] };
+    key <AE05> { [NoSymbol, NoSymbol, U2030] };
+    key <AE07> { [NoSymbol, NoSymbol, ampersand] };
+    key <AE08> { [NoSymbol, NoSymbol, enfilledcircbullet, oneeighth] };
+    key <AE11> { [NoSymbol, NoSymbol, emdash, hyphen] };
+    key <AE12> { [NoSymbol, NoSymbol, notequal, plusminus] };
+
+// 2nd keyboard row
+    key <AD03> { [NoSymbol, NoSymbol, EuroSign] }; // "e"
+    key <AD04> { [NoSymbol, NoSymbol, registered] }; // "r"
+    key <AD05> { [NoSymbol, NoSymbol, trademark] }; // "t"
+    key <AD06> { [NoSymbol, NoSymbol, yen] }; // "y"
+    key <AD10> { [NoSymbol, NoSymbol, acute, doubleacute] }; // "p"
+    key <AD11> { [NoSymbol, NoSymbol, bracketleft, braceleft ] }; // [
+    key <AD12> { [NoSymbol, NoSymbol, bracketright, braceright ] }; // ]
+
+// 3rd keyboard row
+    key <AC01> { [NoSymbol, NoSymbol, U0301, NoSymbol] }; // "a"
+    key <AC02> { [NoSymbol, NoSymbol, section]}; // "s"
+    key <AC03> { [NoSymbol, NoSymbol, degree, division] }; // "d"
+    key <AC04> { [NoSymbol, NoSymbol, sterling, NoSymbol] }; // "f"
+    key <AC07> { [NoSymbol, NoSymbol, doublelowquotemark, singlelowquotemark] }; // "j"
+    key <AC08> { [NoSymbol, NoSymbol, leftdoublequotemark, leftsinglequotemark] }; // "k"
+    key <AC09> { [NoSymbol, NoSymbol, rightdoublequotemark, rightsinglequotemark] }; // "l"
+    key <AC10> { [NoSymbol, NoSymbol, leftsinglequotemark, minutes] }; // ";"
+    key <AC11> { [NoSymbol, NoSymbol, rightsinglequotemark, seconds] }; // "'"
+
+// 4th keyboard row
+    key <AB02> { [NoSymbol, NoSymbol, multiply, U22C5] }; // "x"
+    key <AB03> { [NoSymbol, NoSymbol, copyright, cent] }; // "c"
+    key <AB08> { [NoSymbol, NoSymbol, guillemotleft, less] }; // ","
+    key <AB09> { [NoSymbol, NoSymbol, guillemotright, greater] }; // "."
+    key <AB10> { [NoSymbol, NoSymbol, ellipsis] }; // "/"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/Makefile.am
index 50be49bb4..e7b931bf0 100644
--- a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/Makefile.am
@@ -1,4 +1,4 @@
-symbolsdir = $(xkb_base)/symbols/xfree68_vndr
-
-dist_symbols_DATA = \
-amiga ataritt
+symbolsdir = $(xkb_base)/symbols/xfree68_vndr
+
+dist_symbols_DATA = \
+amiga ataritt
diff --git a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga
index 48ea37ca4..e9d43ff60 100644
--- a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga
+++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga
@@ -1,126 +1,126 @@
-default xkb_symbols "usa1" {
-
-    name[Group1]= "usa1";
-    key <ESC>  {	[	 Escape			]	};
-
-    // Begin "Function" section
-    key <FK01> {	[	 F1			]	};
-    key <FK02> {	[	 F2			]	};
-    key <FK03> {	[	 F3			]	};
-    key <FK04> {	[	 F4			]	};
-    key <FK05> {	[	 F5			]	};
-    key <FK06> {	[	 F6			]	};
-    key <FK07> {	[	 F7			]	};
-    key <FK08> {	[	 F8			]	};
-    key <FK09> {	[	 F9			]	};
-    key <FK10> {	[	 F10			]	};
-    // End "Function" section
-
-    // Alphanumeric section
-    key <TLDE> {	[ quoteleft,	asciitilde	]	};
-    key <AE01> {	[	  1,	exclam 		]	};
-    key <AE02> {	[	  2,	at		]	};
-    key <AE03> {	[	  3,	numbersign	]	};
-    key <AE04> {	[	  4,	dollar		]	};
-    key <AE05> {	[	  5,	percent		]	};
-    key <AE06> {	[	  6,	asciicircum	]	};
-    key <AE07> {	[	  7,	ampersand	]	};
-    key <AE08> {	[	  8,	asterisk	]	};
-    key <AE09> {	[	  9,	parenleft	]	};
-    key <AE10> {	[	  0,	parenright	]	};
-    key <AE11> {	[ minus,	underscore	]	};
-    key <AE12> {	[ equal,	plus		]	};
-    key <BKSL> {	[ backslash,	bar		]	};
-    key <BKSP> {	[	BackSpace		]	};
-
-    key  <TAB> {	[	Tab,	ISO_Left_Tab	]	};
-    key <AD01> {	[	  q,	Q 		]	};
-    key <AD02> {	[	  w,	W		]	};
-    key <AD03> {	[	  e,	E		]	};
-    key <AD04> {	[	  r,	R		]	};
-    key <AD05> {	[	  t,	T		]	};
-    key <AD06> {	[	  y,	Y		]	};
-    key <AD07> {	[	  u,	U		]	};
-    key <AD08> {	[	  i,	I		]	};
-    key <AD09> {	[	  o,	O		]	};
-    key <AD10> {	[	  p,	P		]	};
-    key <AD11> {	[ bracketleft,	braceleft	]	};
-    key <AD12> {	[ bracketright,	braceright	]	};
-    key <RTRN> {	[	 Return			]	};
-
-    key <LCTL> {	[	 Control_L		]	};
-    key <CAPS> {	[	 Caps_Lock		]	};
-    key <AC01> {	[	  a,	A 		]	};
-    key <AC02> {	[	  s,	S		]	};
-    key <AC03> {	[	  d,	D		]	};
-    key <AC04> {	[	  f,	F		]	};
-    key <AC05> {	[	  g,	G		]	};
-    key <AC06> {	[	  h,	H		]	};
-    key <AC07> {	[	  j,	J		]	};
-    key <AC08> {	[	  k,	K		]	};
-    key <AC09> {	[	  l,	L		]	};
-    key <AC10> {	[ semicolon,	colon		]	};
-    key <AC11> {	[ quoteright,	quotedbl	]	};
-
-    key <LFSH> {	[ 	 Shift_L		]	};
-    key <AB01> {	[	  z,	Z 		]	};
-    key <AB02> {	[	  x,	X		]	};
-    key <AB03> {	[	  c,	C		]	};
-    key <AB04> {	[	  v,	V		]	};
-    key <AB05> {	[	  b,	B		]	};
-    key <AB06> {	[	  n,	N		]	};
-    key <AB07> {	[	  m,	M		]	};
-    key <AB08> {	[ comma,	less		]	};
-    key <AB09> {	[ period,	greater		]	};
-    key <AB10> {	[ slash,	question	]	};
-    key <RTSH> {	[	 Shift_R		]	};
-
-    key <LALT> {	[ Alt_L,	Meta_L 		]	};
-    key <LAMI>  {	[	 Mode_switch		]	};
-    key <SPCE> {	[	 space			]	};
-    key <RAMI>  {	[	 Multi_key		]	};
-    key <RALT> {	[ Alt_R,	Meta_R		]	};
-    // End alphanumeric section
-
-    // Begin "Editing" section
-    key <DELE> {	[	 Delete		]	};
-    key <HELP> {	[	 Help		]	};
-    key <UP>   {	[	 Up		]	};
-    key <LEFT> {	[	 Left		]	};
-    key <DOWN> {	[	 Down		]	};
-    key <RGHT> {	[	 Right		]	};
-    // End "Editing" section
-
-    // Begin "Keypad" section
-    key <KPLP> {	[	 Num_Lock		]	};
-    key <KPRP> {	[	 Scroll_Lock		]	};
-    key <KPDV> {	[	 KP_Divide		]	};
-    key <KPMU> {	[ KP_Multiply,	Print		]	};
-
-    key <KP7>  {	[ KP_7,		KP_Home		]	};
-    key <KP8>  {	[ KP_8,		KP_Up		]	};
-    key <KP9>  {	[ KP_9,		KP_Prior	]	};
-    key <KPSU> {	[	 KP_Subtract		]	};
-
-    key <KP4>  {	[ KP_4,		KP_Left		]	};
-    key <KP5>  {	[	 KP_5			]	};
-    key <KP6>  {	[ KP_6,		KP_Right	]	};
-    key <KPAD> {	[	 KP_Add			]	};
-
-    key <KP1>  {	[ KP_1,		KP_End		]	};
-    key <KP2>  {	[ KP_2,		KP_Down		]	};
-    key <KP3>  {	[ KP_3,		KP_Next		]	};
-
-    key <KP0>  {	[ KP_0,		KP_Insert	]	};
-    key <KPDC> {	[ KP_Decimal,	KP_Delete	]	};
-    key <KPEN> {	[	 KP_Enter	]	};
-    // End "Keypad" section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L, Shift_R };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod1	{ Alt_L, Alt_R };
-    modifier_map Mod2	{ Mode_switch };
-    modifier_map Mod3	{ Meta_L, Meta_R };
-};
+default xkb_symbols "usa1" {
+
+    name[Group1]= "usa1";
+    key <ESC>  {	[	 Escape			]	};
+
+    // Begin "Function" section
+    key <FK01> {	[	 F1			]	};
+    key <FK02> {	[	 F2			]	};
+    key <FK03> {	[	 F3			]	};
+    key <FK04> {	[	 F4			]	};
+    key <FK05> {	[	 F5			]	};
+    key <FK06> {	[	 F6			]	};
+    key <FK07> {	[	 F7			]	};
+    key <FK08> {	[	 F8			]	};
+    key <FK09> {	[	 F9			]	};
+    key <FK10> {	[	 F10			]	};
+    // End "Function" section
+
+    // Alphanumeric section
+    key <TLDE> {	[ quoteleft,	asciitilde	]	};
+    key <AE01> {	[	  1,	exclam 		]	};
+    key <AE02> {	[	  2,	at		]	};
+    key <AE03> {	[	  3,	numbersign	]	};
+    key <AE04> {	[	  4,	dollar		]	};
+    key <AE05> {	[	  5,	percent		]	};
+    key <AE06> {	[	  6,	asciicircum	]	};
+    key <AE07> {	[	  7,	ampersand	]	};
+    key <AE08> {	[	  8,	asterisk	]	};
+    key <AE09> {	[	  9,	parenleft	]	};
+    key <AE10> {	[	  0,	parenright	]	};
+    key <AE11> {	[ minus,	underscore	]	};
+    key <AE12> {	[ equal,	plus		]	};
+    key <BKSL> {	[ backslash,	bar		]	};
+    key <BKSP> {	[	BackSpace		]	};
+
+    key  <TAB> {	[	Tab,	ISO_Left_Tab	]	};
+    key <AD01> {	[	  q,	Q 		]	};
+    key <AD02> {	[	  w,	W		]	};
+    key <AD03> {	[	  e,	E		]	};
+    key <AD04> {	[	  r,	R		]	};
+    key <AD05> {	[	  t,	T		]	};
+    key <AD06> {	[	  y,	Y		]	};
+    key <AD07> {	[	  u,	U		]	};
+    key <AD08> {	[	  i,	I		]	};
+    key <AD09> {	[	  o,	O		]	};
+    key <AD10> {	[	  p,	P		]	};
+    key <AD11> {	[ bracketleft,	braceleft	]	};
+    key <AD12> {	[ bracketright,	braceright	]	};
+    key <RTRN> {	[	 Return			]	};
+
+    key <LCTL> {	[	 Control_L		]	};
+    key <CAPS> {	[	 Caps_Lock		]	};
+    key <AC01> {	[	  a,	A 		]	};
+    key <AC02> {	[	  s,	S		]	};
+    key <AC03> {	[	  d,	D		]	};
+    key <AC04> {	[	  f,	F		]	};
+    key <AC05> {	[	  g,	G		]	};
+    key <AC06> {	[	  h,	H		]	};
+    key <AC07> {	[	  j,	J		]	};
+    key <AC08> {	[	  k,	K		]	};
+    key <AC09> {	[	  l,	L		]	};
+    key <AC10> {	[ semicolon,	colon		]	};
+    key <AC11> {	[ quoteright,	quotedbl	]	};
+
+    key <LFSH> {	[ 	 Shift_L		]	};
+    key <AB01> {	[	  z,	Z 		]	};
+    key <AB02> {	[	  x,	X		]	};
+    key <AB03> {	[	  c,	C		]	};
+    key <AB04> {	[	  v,	V		]	};
+    key <AB05> {	[	  b,	B		]	};
+    key <AB06> {	[	  n,	N		]	};
+    key <AB07> {	[	  m,	M		]	};
+    key <AB08> {	[ comma,	less		]	};
+    key <AB09> {	[ period,	greater		]	};
+    key <AB10> {	[ slash,	question	]	};
+    key <RTSH> {	[	 Shift_R		]	};
+
+    key <LALT> {	[ Alt_L,	Meta_L 		]	};
+    key <LAMI>  {	[	 Mode_switch		]	};
+    key <SPCE> {	[	 space			]	};
+    key <RAMI>  {	[	 Multi_key		]	};
+    key <RALT> {	[ Alt_R,	Meta_R		]	};
+    // End alphanumeric section
+
+    // Begin "Editing" section
+    key <DELE> {	[	 Delete		]	};
+    key <HELP> {	[	 Help		]	};
+    key <UP>   {	[	 Up		]	};
+    key <LEFT> {	[	 Left		]	};
+    key <DOWN> {	[	 Down		]	};
+    key <RGHT> {	[	 Right		]	};
+    // End "Editing" section
+
+    // Begin "Keypad" section
+    key <KPLP> {	[	 Num_Lock		]	};
+    key <KPRP> {	[	 Scroll_Lock		]	};
+    key <KPDV> {	[	 KP_Divide		]	};
+    key <KPMU> {	[ KP_Multiply,	Print		]	};
+
+    key <KP7>  {	[ KP_7,		KP_Home		]	};
+    key <KP8>  {	[ KP_8,		KP_Up		]	};
+    key <KP9>  {	[ KP_9,		KP_Prior	]	};
+    key <KPSU> {	[	 KP_Subtract		]	};
+
+    key <KP4>  {	[ KP_4,		KP_Left		]	};
+    key <KP5>  {	[	 KP_5			]	};
+    key <KP6>  {	[ KP_6,		KP_Right	]	};
+    key <KPAD> {	[	 KP_Add			]	};
+
+    key <KP1>  {	[ KP_1,		KP_End		]	};
+    key <KP2>  {	[ KP_2,		KP_Down		]	};
+    key <KP3>  {	[ KP_3,		KP_Next		]	};
+
+    key <KP0>  {	[ KP_0,		KP_Insert	]	};
+    key <KPDC> {	[ KP_Decimal,	KP_Delete	]	};
+    key <KPEN> {	[	 KP_Enter	]	};
+    // End "Keypad" section
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L, Shift_R };
+    modifier_map Lock   { Caps_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod1	{ Alt_L, Alt_R };
+    modifier_map Mod2	{ Mode_switch };
+    modifier_map Mod3	{ Meta_L, Meta_R };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt
index 8c6277fb1..813311dcf 100644
--- a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt
+++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt
@@ -1,155 +1,155 @@
-default xkb_symbols "us" {
-
-    name[Group1]= "US/ASCII";
-    key <ESC>  {	[	Escape			]	};
-
-    // Alphanumeric section
-    key <AE01> {	[	  1,	exclam 		]	};
-    key <AE02> {	[	  2,	at		]	};
-    key <AE03> {	[	  3,	numbersign	]	};
-    key <AE04> {	[	  4,	dollar		]	};
-    key <AE05> {	[	  5,	percent		]	};
-    key <AE06> {	[	  6,	asciicircum	]	};
-    key <AE07> {	[	  7,	ampersand	]	};
-    key <AE08> {	[	  8,	asterisk	]	};
-    key <AE09> {	[	  9,	parenleft	]	};
-    key <AE10> {	[	  0,	parenright	]	};
-    key <AE11> {	[ minus,	underscore	]	};
-    key <AE12> {	[ equal,	plus		]	};
-    key <TLDE> {	[ quoteleft,	asciitilde	]	};
-    key <BKSP> {	[	BackSpace		]	};
-
-    key  <TAB> {	[	Tab,	ISO_Left_Tab	]	};
-    key <AD01> {	[	  q,	Q 		]	};
-    key <AD02> {	[	  w,	W		]	};
-    key <AD03> {	[	  e,	E		]	};
-    key <AD04> {	[	  r,	R		]	};
-    key <AD05> {	[	  t,	T		]	};
-    key <AD06> {	[	  y,	Y		]	};
-    key <AD07> {	[	  u,	U		]	};
-    key <AD08> {	[	  i,	I		]	};
-    key <AD09> {	[	  o,	O		]	};
-    key <AD10> {	[	  p,	P		]	};
-    key <AD11> {	[ bracketleft,	braceleft	]	};
-    key <AD12> {	[ bracketright,	braceright	]	};
-    key <RTRN> {	[	Return			]	};
-    key <DELE> {	[	Delete			]	};
-
-    key <LCTL> {	[	Control_L		]	};
-    key <AC01> {	[	  a,	A 		]	};
-    key <AC02> {	[	  s,	S		]	};
-    key <AC03> {	[	  d,	D		]	};
-    key <AC04> {	[	  f,	F		]	};
-    key <AC05> {	[	  g,	G		]	};
-    key <AC06> {	[	  h,	H		]	};
-    key <AC07> {	[	  j,	J		]	};
-    key <AC08> {	[	  k,	K		]	};
-    key <AC09> {	[	  l,	L		]	};
-    key <AC10> {	[ semicolon,	colon		]	};
-    key <AC11> {	[ quoteright,	quotedbl	]	};
-    key <BKSL> {	[ backslash,	bar		]	};
-
-    key <LFSH> {	[ 	 Shift_L		]	};
-    key <AB01> {	[	  z,	Z 		]	};
-    key <AB02> {	[	  x,	X		]	};
-    key <AB03> {	[	  c,	C		]	};
-    key <AB04> {	[	  v,	V		]	};
-    key <AB05> {	[	  b,	B		]	};
-    key <AB06> {	[	  n,	N		]	};
-    key <AB07> {	[	  m,	M		]	};
-    key <AB08> {	[ comma,	less		]	};
-    key <AB09> {	[ period,	greater		]	};
-    key <AB10> {	[ slash,	question	]	};
-    key <RTSH> {	[	 Shift_R		]	};
-
-    key <ALT>  {	[	 Meta_L			]	};
-    key <SPCE> {	[	 space			]	};
-    key <CAPS> {	[	 Caps_Lock		]	};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <FK01> {	[	F1		]	};
-    key <FK02> {	[	F2		]	};
-    key <FK03> {	[	F3		]	};
-    key <FK04> {	[	F4		]	};
-    key <FK05> {	[	F5		]	};
-    key <FK06> {	[	F6		]	};
-    key <FK07> {	[	F7		]	};
-    key <FK08> {	[	F8		]	};
-    key <FK09> {	[	F9		]	};
-    key <FK10> {	[	F10		]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <HELP> {	[	Help		]	};
-    key <UNDO> {	[	Undo		]	};
-    key <INS>  {	[	Insert		]	};
-    key <UP>   {	[	Up		]	};
-    key <HOME> {	[	Home,	Clear	]	};
-    key <LEFT> {	[	Left		]	};
-    key <DOWN> {	[	Down		]	};
-    key <RGHT> {	[	Right		]	};
-    // End "Editing" section
-
-    // Begin "Keypad" section
-    key <KPLP> {	[	KP_F1		]	};
-    key <KPRP> {	[	KP_F2		]	};
-    key <KPDV> {	[	KP_Divide	]	};
-    key <KPMU> {	[	KP_Multiply	]	};
-    key <KP7>  {	[	KP_7		]	};
-    key <KP8>  {	[	KP_8		]	};
-    key <KP9>  {	[	KP_9		]	};
-    key <KPSU> {	[	KP_Subtract	]	};
-    key <KP4>  {	[	KP_4		]	};
-    key <KP5>  {	[	KP_5		]	};
-    key <KP6>  {	[	KP_6		]	};
-    key <KPAD> {	[	KP_Add		]	};
-    key <KP1>  {	[	KP_1		]	};
-    key <KP2>  {	[	KP_2		]	};
-    key <KP3>  {	[	KP_3		]	};
-    key <KP0>  {	[	KP_0		]	};
-    key <KPDC> {	[	KP_Decimal	]	};
-    key <KPEN> {	[	KP_Enter	]	};
-    // End "Keypad" section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L, Shift_R };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod1	{ Meta_L };
-};
-
-xkb_symbols "de" {
-    include "ataritt(us)"
-
-    name[Group1]= "German";
-
-    // Alphanumeric section
-    key <AE02> {	[	  2,	quotedbl	]	};
-    key <AE03> {	[	  3,	section		]	};
-    key <AE06> {	[	  6,	ampersand	]	};
-    key <AE07> {	[	  7,	slash		]	};
-    key <AE08> {	[	  8,	parenleft	]	};
-    key <AE09> {	[	  9,	parenright	]	};
-    key <AE10> {	[	  0,	equal		]	};
-    key <AE11> {	[    ssharp,	question	]	};
-    key <AE12> {	[ quoteright,	quoteleft	]	};
-    key <TLDE> {	[ numbersign,	asciicircum	]	};
-
-    key <AD06> {	[	  z,	Z		]	};
-    key <AD11> {	[ udiaeresis,	Udiaeresis	],
-			[        at,	backslash	]	};
-    key <AD12> {	[      plus,	asterisk	]	};
-
-    key <AC10> {	[ odiaeresis,	Odiaeresis	],
-			[ bracketleft,	braceleft	]	};
-    key <AC11> {	[ adiaeresis,	Adiaeresis	],
-			[ bracketright,	braceright	]	};
-    key <BKSL> {	[ asciitilde,	bar		]	};
-
-    key <LSGT> {	[      less,	greater		]	};
-    key <AB01> {	[	  y,	Y 		]	};
-    key <AB08> {	[     comma,	semicolon	]	};
-    key <AB09> {	[    period,	colon		]	};
-    key <AB10> {	[     minus,	underscore	]	};
-};
+default xkb_symbols "us" {
+
+    name[Group1]= "US/ASCII";
+    key <ESC>  {	[	Escape			]	};
+
+    // Alphanumeric section
+    key <AE01> {	[	  1,	exclam 		]	};
+    key <AE02> {	[	  2,	at		]	};
+    key <AE03> {	[	  3,	numbersign	]	};
+    key <AE04> {	[	  4,	dollar		]	};
+    key <AE05> {	[	  5,	percent		]	};
+    key <AE06> {	[	  6,	asciicircum	]	};
+    key <AE07> {	[	  7,	ampersand	]	};
+    key <AE08> {	[	  8,	asterisk	]	};
+    key <AE09> {	[	  9,	parenleft	]	};
+    key <AE10> {	[	  0,	parenright	]	};
+    key <AE11> {	[ minus,	underscore	]	};
+    key <AE12> {	[ equal,	plus		]	};
+    key <TLDE> {	[ quoteleft,	asciitilde	]	};
+    key <BKSP> {	[	BackSpace		]	};
+
+    key  <TAB> {	[	Tab,	ISO_Left_Tab	]	};
+    key <AD01> {	[	  q,	Q 		]	};
+    key <AD02> {	[	  w,	W		]	};
+    key <AD03> {	[	  e,	E		]	};
+    key <AD04> {	[	  r,	R		]	};
+    key <AD05> {	[	  t,	T		]	};
+    key <AD06> {	[	  y,	Y		]	};
+    key <AD07> {	[	  u,	U		]	};
+    key <AD08> {	[	  i,	I		]	};
+    key <AD09> {	[	  o,	O		]	};
+    key <AD10> {	[	  p,	P		]	};
+    key <AD11> {	[ bracketleft,	braceleft	]	};
+    key <AD12> {	[ bracketright,	braceright	]	};
+    key <RTRN> {	[	Return			]	};
+    key <DELE> {	[	Delete			]	};
+
+    key <LCTL> {	[	Control_L		]	};
+    key <AC01> {	[	  a,	A 		]	};
+    key <AC02> {	[	  s,	S		]	};
+    key <AC03> {	[	  d,	D		]	};
+    key <AC04> {	[	  f,	F		]	};
+    key <AC05> {	[	  g,	G		]	};
+    key <AC06> {	[	  h,	H		]	};
+    key <AC07> {	[	  j,	J		]	};
+    key <AC08> {	[	  k,	K		]	};
+    key <AC09> {	[	  l,	L		]	};
+    key <AC10> {	[ semicolon,	colon		]	};
+    key <AC11> {	[ quoteright,	quotedbl	]	};
+    key <BKSL> {	[ backslash,	bar		]	};
+
+    key <LFSH> {	[ 	 Shift_L		]	};
+    key <AB01> {	[	  z,	Z 		]	};
+    key <AB02> {	[	  x,	X		]	};
+    key <AB03> {	[	  c,	C		]	};
+    key <AB04> {	[	  v,	V		]	};
+    key <AB05> {	[	  b,	B		]	};
+    key <AB06> {	[	  n,	N		]	};
+    key <AB07> {	[	  m,	M		]	};
+    key <AB08> {	[ comma,	less		]	};
+    key <AB09> {	[ period,	greater		]	};
+    key <AB10> {	[ slash,	question	]	};
+    key <RTSH> {	[	 Shift_R		]	};
+
+    key <ALT>  {	[	 Meta_L			]	};
+    key <SPCE> {	[	 space			]	};
+    key <CAPS> {	[	 Caps_Lock		]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> {	[	F1		]	};
+    key <FK02> {	[	F2		]	};
+    key <FK03> {	[	F3		]	};
+    key <FK04> {	[	F4		]	};
+    key <FK05> {	[	F5		]	};
+    key <FK06> {	[	F6		]	};
+    key <FK07> {	[	F7		]	};
+    key <FK08> {	[	F8		]	};
+    key <FK09> {	[	F9		]	};
+    key <FK10> {	[	F10		]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <HELP> {	[	Help		]	};
+    key <UNDO> {	[	Undo		]	};
+    key <INS>  {	[	Insert		]	};
+    key <UP>   {	[	Up		]	};
+    key <HOME> {	[	Home,	Clear	]	};
+    key <LEFT> {	[	Left		]	};
+    key <DOWN> {	[	Down		]	};
+    key <RGHT> {	[	Right		]	};
+    // End "Editing" section
+
+    // Begin "Keypad" section
+    key <KPLP> {	[	KP_F1		]	};
+    key <KPRP> {	[	KP_F2		]	};
+    key <KPDV> {	[	KP_Divide	]	};
+    key <KPMU> {	[	KP_Multiply	]	};
+    key <KP7>  {	[	KP_7		]	};
+    key <KP8>  {	[	KP_8		]	};
+    key <KP9>  {	[	KP_9		]	};
+    key <KPSU> {	[	KP_Subtract	]	};
+    key <KP4>  {	[	KP_4		]	};
+    key <KP5>  {	[	KP_5		]	};
+    key <KP6>  {	[	KP_6		]	};
+    key <KPAD> {	[	KP_Add		]	};
+    key <KP1>  {	[	KP_1		]	};
+    key <KP2>  {	[	KP_2		]	};
+    key <KP3>  {	[	KP_3		]	};
+    key <KP0>  {	[	KP_0		]	};
+    key <KPDC> {	[	KP_Decimal	]	};
+    key <KPEN> {	[	KP_Enter	]	};
+    // End "Keypad" section
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L, Shift_R };
+    modifier_map Lock   { Caps_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod1	{ Meta_L };
+};
+
+xkb_symbols "de" {
+    include "ataritt(us)"
+
+    name[Group1]= "German";
+
+    // Alphanumeric section
+    key <AE02> {	[	  2,	quotedbl	]	};
+    key <AE03> {	[	  3,	section		]	};
+    key <AE06> {	[	  6,	ampersand	]	};
+    key <AE07> {	[	  7,	slash		]	};
+    key <AE08> {	[	  8,	parenleft	]	};
+    key <AE09> {	[	  9,	parenright	]	};
+    key <AE10> {	[	  0,	equal		]	};
+    key <AE11> {	[    ssharp,	question	]	};
+    key <AE12> {	[ quoteright,	quoteleft	]	};
+    key <TLDE> {	[ numbersign,	asciicircum	]	};
+
+    key <AD06> {	[	  z,	Z		]	};
+    key <AD11> {	[ udiaeresis,	Udiaeresis	],
+			[        at,	backslash	]	};
+    key <AD12> {	[      plus,	asterisk	]	};
+
+    key <AC10> {	[ odiaeresis,	Odiaeresis	],
+			[ bracketleft,	braceleft	]	};
+    key <AC11> {	[ adiaeresis,	Adiaeresis	],
+			[ bracketright,	braceright	]	};
+    key <BKSL> {	[ asciitilde,	bar		]	};
+
+    key <LSGT> {	[      less,	greater		]	};
+    key <AB01> {	[	  y,	Y 		]	};
+    key <AB08> {	[     comma,	semicolon	]	};
+    key <AB09> {	[    period,	colon		]	};
+    key <AB10> {	[     minus,	underscore	]	};
+};
diff --git a/xorg-server/xkeyboard-config/types/Makefile.am b/xorg-server/xkeyboard-config/types/Makefile.am
index 6da3ccb78..afc5acb58 100644
--- a/xorg-server/xkeyboard-config/types/Makefile.am
+++ b/xorg-server/xkeyboard-config/types/Makefile.am
@@ -1,11 +1,11 @@
-typesdir = $(xkb_base)/types
-
-dist_types_DATA = \
-basic cancel caps \
-complete default extra \
-iso9995 level5 mousekeys nokia numpad \
-pc README
-
-dir_data = $(dist_types_DATA)
-
-include $(top_srcdir)/xkbrules.am
+typesdir = $(xkb_base)/types
+
+dist_types_DATA = \
+basic cancel caps \
+complete default extra \
+iso9995 level5 mousekeys nokia numpad \
+pc README
+
+dir_data = $(dist_types_DATA)
+
+include $(top_srcdir)/xkbrules.am
diff --git a/xorg-server/xkeyboard-config/types/README b/xorg-server/xkeyboard-config/types/README
index 1a1e2c01e..8165c7bd8 100644
--- a/xorg-server/xkeyboard-config/types/README
+++ b/xorg-server/xkeyboard-config/types/README
@@ -1,4 +1,4 @@
-The types component of a keyboard mapping specifies the key types that can be
-associated with the various keyboard keys. The types component can also
-optionally contain real modifiers binding and symbolic names for one
-or more virtual modifiers.
+The types component of a keyboard mapping specifies the key types that can be
+associated with the various keyboard keys. The types component can also
+optionally contain real modifiers binding and symbolic names for one
+or more virtual modifiers.
diff --git a/xorg-server/xkeyboard-config/types/basic b/xorg-server/xkeyboard-config/types/basic
index 70292ea38..552b83400 100644
--- a/xorg-server/xkeyboard-config/types/basic
+++ b/xorg-server/xkeyboard-config/types/basic
@@ -1,29 +1,29 @@
-default xkb_types "basic" {
-
-    // Fairly standard definitions for
-    // the four required key types
-
-    virtual_modifiers NumLock;
-
-    type "ONE_LEVEL" {
-	modifiers = None;
-	map[None] = Level1;
-	level_name[Level1]= "Any";
-    };
-
-    type "TWO_LEVEL" {
-	modifiers = Shift;
-	map[Shift] = Level2;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-    };
-
-    type "ALPHABETIC" {
-        modifiers = Shift+Lock;
-        map[Shift] = Level2;
-        map[Lock] = Level2;
-        level_name[Level1] = "Base";
-        level_name[Level2] = "Caps";
-    };
-
-};
+default xkb_types "basic" {
+
+    // Fairly standard definitions for
+    // the four required key types
+
+    virtual_modifiers NumLock;
+
+    type "ONE_LEVEL" {
+	modifiers = None;
+	map[None] = Level1;
+	level_name[Level1]= "Any";
+    };
+
+    type "TWO_LEVEL" {
+	modifiers = Shift;
+	map[Shift] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+    };
+
+    type "ALPHABETIC" {
+        modifiers = Shift+Lock;
+        map[Shift] = Level2;
+        map[Lock] = Level2;
+        level_name[Level1] = "Base";
+        level_name[Level2] = "Caps";
+    };
+
+};
diff --git a/xorg-server/xkeyboard-config/types/cancel b/xorg-server/xkeyboard-config/types/cancel
index ec5d7191d..f738f0649 100644
--- a/xorg-server/xkeyboard-config/types/cancel
+++ b/xorg-server/xkeyboard-config/types/cancel
@@ -1,11 +1,11 @@
-partial default xkb_types "Shift_Cancels_Caps" {
-
-override type "TWO_LEVEL" {
-    modifiers = Shift+Lock;
-    map[Shift] = Level2;
-    preserve[Lock]= Lock;
-    level_name[Level1] = "Base";
-    level_name[Level2] = "Shift";
-};
-
-};
+partial default xkb_types "Shift_Cancels_Caps" {
+
+override type "TWO_LEVEL" {
+    modifiers = Shift+Lock;
+    map[Shift] = Level2;
+    preserve[Lock]= Lock;
+    level_name[Level1] = "Base";
+    level_name[Level2] = "Shift";
+};
+
+};
diff --git a/xorg-server/xkeyboard-config/types/caps b/xorg-server/xkeyboard-config/types/caps
index 08a7211b9..dd7fa2eaf 100644
--- a/xorg-server/xkeyboard-config/types/caps
+++ b/xorg-server/xkeyboard-config/types/caps
@@ -1,168 +1,168 @@
-// CapsLock uses internal capitalization rules
-// Shift "pauses" CapsLock
-partial xkb_types "internal" {
-    type "ALPHABETIC" {
-	modifiers = Shift+Lock;
-	map[Shift] = Level2;
-	preserve[Lock] = Lock;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Caps";
-    };
-
-    type "FOUR_LEVEL_ALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	preserve[Lock] = Lock;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level3;
-        map[Lock+Shift+LevelThree] = Level3;
-	preserve[Lock+LevelThree] = Lock;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Alt Base";
-	level_name[Level4] = "Shift Alt";
-    };
-
-    type "FOUR_LEVEL_SEMIALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	preserve[Lock] = Lock;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level3;
-        map[Lock+Shift+LevelThree] = Level4;
-	preserve[Lock+LevelThree] = Lock;
-	preserve[Lock+Shift+LevelThree] = Lock;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Alt Base";
-	level_name[Level4] = "Shift Alt";
-    };
-};
-// CapsLock uses internal capitalization rules
-// Shift doesn't cancel CapsLock
-partial xkb_types "internal_nocancel" {
-    type "ALPHABETIC" {
-	modifiers = Shift;
-	map[Shift] = Level2;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Caps";
-    };
-
-    type "FOUR_LEVEL_ALPHABETIC" {
-	modifiers = Shift+LevelThree;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Alt Base";
-	level_name[Level4] = "Shift Alt";
-    };
-
-    type "FOUR_LEVEL_SEMIALPHABETIC" {
-        // the same as FOUR_LEVEL_ALPHABETIC
-	modifiers = Shift+LevelThree;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Alt Base";
-	level_name[Level4] = "Shift Alt";
-    };
-};
-// CapsLock acts as Shift with locking
-// Shift "pauses" CapsLock
-partial xkb_types "shift" {
-    type "ALPHABETIC" {
-	modifiers = Shift+Lock;
-	map[Shift] = Level2;
-	map[Lock] = Level2;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Caps";
-    };
-
-    type "FOUR_LEVEL_ALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	map[Lock]  = Level2;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level4;
-	map[Shift+Lock+LevelThree] =  Level3;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Alt Base";
-	level_name[Level4] = "Shift Alt";
-    };
-
-    type "FOUR_LEVEL_SEMIALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	map[Lock]  = Level2;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level3;
-        map[Lock+Shift+LevelThree] = Level4;
-	preserve[Lock+LevelThree] = Lock;
-	preserve[Lock+Shift+LevelThree] = Lock;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Alt Base";
-	level_name[Level4] = "Shift Alt";
-    };
-};
-// CapsLock acts as Shift with locking
-// Shift doesn't cancel CapsLock
-partial xkb_types "shift_nocancel" {
-    type "ALPHABETIC" {
-	modifiers = Shift+Lock;
-	map[Shift] = Level2;
-	map[Lock] = Level2;
-	map[Shift+Lock] = Level2;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Caps";
-    };
-
-    type "FOUR_LEVEL_ALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree;
-	map[None] =  Level1;
-	map[Shift] = Level2;
-	map[Lock] =  Level2;
-	map[Shift+Lock] = Level2;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level4;
-	map[Shift+Lock+LevelThree] = Level4;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Alt Base";
-	level_name[Level4] = "Shift Alt";
-    };
-
-    type "FOUR_LEVEL_SEMIALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree;
-	map[None] =  Level1;
-	map[Shift] = Level2;
-	map[Lock] =  Level2;
-	map[Shift+Lock] = Level2;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level3;
-        map[Lock+Shift+LevelThree] = Level4;
-	preserve[Lock+LevelThree] = Lock;
-	preserve[Lock+Shift+LevelThree] = Lock;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Alt Base";
-	level_name[Level4] = "Shift Alt";
-    };
-};
+// CapsLock uses internal capitalization rules
+// Shift "pauses" CapsLock
+partial xkb_types "internal" {
+    type "ALPHABETIC" {
+	modifiers = Shift+Lock;
+	map[Shift] = Level2;
+	preserve[Lock] = Lock;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Caps";
+    };
+
+    type "FOUR_LEVEL_ALPHABETIC" {
+	modifiers = Shift+Lock+LevelThree;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	preserve[Lock] = Lock;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] =  Level3;
+        map[Lock+Shift+LevelThree] = Level3;
+	preserve[Lock+LevelThree] = Lock;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+    };
+
+    type "FOUR_LEVEL_SEMIALPHABETIC" {
+	modifiers = Shift+Lock+LevelThree;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	preserve[Lock] = Lock;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] =  Level3;
+        map[Lock+Shift+LevelThree] = Level4;
+	preserve[Lock+LevelThree] = Lock;
+	preserve[Lock+Shift+LevelThree] = Lock;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+    };
+};
+// CapsLock uses internal capitalization rules
+// Shift doesn't cancel CapsLock
+partial xkb_types "internal_nocancel" {
+    type "ALPHABETIC" {
+	modifiers = Shift;
+	map[Shift] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Caps";
+    };
+
+    type "FOUR_LEVEL_ALPHABETIC" {
+	modifiers = Shift+LevelThree;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+    };
+
+    type "FOUR_LEVEL_SEMIALPHABETIC" {
+        // the same as FOUR_LEVEL_ALPHABETIC
+	modifiers = Shift+LevelThree;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+    };
+};
+// CapsLock acts as Shift with locking
+// Shift "pauses" CapsLock
+partial xkb_types "shift" {
+    type "ALPHABETIC" {
+	modifiers = Shift+Lock;
+	map[Shift] = Level2;
+	map[Lock] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Caps";
+    };
+
+    type "FOUR_LEVEL_ALPHABETIC" {
+	modifiers = Shift+Lock+LevelThree;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[Lock]  = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] =  Level4;
+	map[Shift+Lock+LevelThree] =  Level3;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+    };
+
+    type "FOUR_LEVEL_SEMIALPHABETIC" {
+	modifiers = Shift+Lock+LevelThree;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[Lock]  = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] =  Level3;
+        map[Lock+Shift+LevelThree] = Level4;
+	preserve[Lock+LevelThree] = Lock;
+	preserve[Lock+Shift+LevelThree] = Lock;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+    };
+};
+// CapsLock acts as Shift with locking
+// Shift doesn't cancel CapsLock
+partial xkb_types "shift_nocancel" {
+    type "ALPHABETIC" {
+	modifiers = Shift+Lock;
+	map[Shift] = Level2;
+	map[Lock] = Level2;
+	map[Shift+Lock] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Caps";
+    };
+
+    type "FOUR_LEVEL_ALPHABETIC" {
+	modifiers = Shift+Lock+LevelThree;
+	map[None] =  Level1;
+	map[Shift] = Level2;
+	map[Lock] =  Level2;
+	map[Shift+Lock] = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] =  Level4;
+	map[Shift+Lock+LevelThree] = Level4;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+    };
+
+    type "FOUR_LEVEL_SEMIALPHABETIC" {
+	modifiers = Shift+Lock+LevelThree;
+	map[None] =  Level1;
+	map[Shift] = Level2;
+	map[Lock] =  Level2;
+	map[Shift+Lock] = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] =  Level3;
+        map[Lock+Shift+LevelThree] = Level4;
+	preserve[Lock+LevelThree] = Lock;
+	preserve[Lock+Shift+LevelThree] = Lock;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+    };
+};
diff --git a/xorg-server/xkeyboard-config/types/complete b/xorg-server/xkeyboard-config/types/complete
index 2ac68082e..3b59ca233 100644
--- a/xorg-server/xkeyboard-config/types/complete
+++ b/xorg-server/xkeyboard-config/types/complete
@@ -1,9 +1,9 @@
-default xkb_types "complete" {
-    include "basic"
-    include "mousekeys"
-    include "pc"
-    include "iso9995"
-    include "level5"
-    include "extra"
-    include "numpad"
-};
+default xkb_types "complete" {
+    include "basic"
+    include "mousekeys"
+    include "pc"
+    include "iso9995"
+    include "level5"
+    include "extra"
+    include "numpad"
+};
diff --git a/xorg-server/xkeyboard-config/types/iso9995 b/xorg-server/xkeyboard-config/types/iso9995
index 893a6b341..0cf34203c 100644
--- a/xorg-server/xkeyboard-config/types/iso9995
+++ b/xorg-server/xkeyboard-config/types/iso9995
@@ -1,18 +1,18 @@
-partial default xkb_types "default" {
-
-    // Definition for a key type which 
-    // can be used to implement ISO9995
-    // style level three shift
-    virtual_modifiers LevelThree;
-
-    type "THREE_LEVEL" {
-	modifiers = Shift+LevelThree;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level3;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Level3";
-    };
-};
+partial default xkb_types "default" {
+
+    // Definition for a key type which 
+    // can be used to implement ISO9995
+    // style level three shift
+    virtual_modifiers LevelThree;
+
+    type "THREE_LEVEL" {
+	modifiers = Shift+LevelThree;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level3;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Level3";
+    };
+};
diff --git a/xorg-server/xkeyboard-config/types/level5 b/xorg-server/xkeyboard-config/types/level5
index 671f4b3e8..f9ba5b28a 100644
--- a/xorg-server/xkeyboard-config/types/level5
+++ b/xorg-server/xkeyboard-config/types/level5
@@ -1,213 +1,213 @@
-partial default xkb_types "default" {
-    // Definition for a key type used for the czech keymap, for instance.
-    // Defines style a with four level shift. It is similar to three_level
-    // type used for iso9995 but it lets the shift key behave "normally".
-
-    virtual_modifiers LevelThree,ScrollLock,LevelFive;
-
-    type "EIGHT_LEVEL" {
-        modifiers = Shift+LevelThree+LevelFive;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	map[LevelFive] = Level5;
-	map[Shift+LevelFive] = Level6;
-	map[LevelThree+LevelFive] = Level7;
-	map[Shift+LevelThree+LevelFive] = Level8;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Alt Base";  
-	level_name[Level4] = "Shift Alt";  
-	level_name[Level5] = "X";
-	level_name[Level6] = "X Shift";
-	level_name[Level7] = "X Alt Base";
-	level_name[Level8] = "X Shift Alt";
-    };
-
-    type "EIGHT_LEVEL_ALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree+LevelFive;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	map[Lock]  = Level2;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level4;
-        map[Lock+Shift+LevelThree] = Level3;
-
-	map[LevelFive] = Level5;
-	map[Shift+LevelFive] = Level6;
-	map[Lock+LevelFive]  = Level6;
-	map[LevelThree+LevelFive] = Level7;
-	map[Shift+LevelThree+LevelFive] = Level8;
-	map[Lock+LevelThree+LevelFive] =  Level8;
-        map[Lock+Shift+LevelThree+LevelFive] = Level7;
-
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Alt Base";
-	level_name[Level4] = "Shift Alt";
-	level_name[Level5] = "X";
-	level_name[Level6] = "X Shift";
-	level_name[Level7] = "X Alt Base";
-	level_name[Level8] = "X Shift Alt";
-    };
-
-//    type "EIGHT_LEVEL_LEVEL_FIVE_LOCK" {
-//    	// Level5-Lock is implemented by using NumLock, because a real modifier
-//    	// is required.
-//    	
-//        modifiers = Shift + Lock + LevelThree + NumLock + LevelFive;
-//
-//        map[None]                                    = Level1;
-//        map[Shift]                                   = Level2;
-//        map[LevelThree]                              = Level3;
-//        map[LevelThree+Shift]                        = Level4;
-//
-//        map[LevelFive]                               = Level5;
-//        map[LevelFive+Shift]                         = Level6;
-//        map[LevelFive+LevelThree]                    = Level7;
-//        map[LevelFive+LevelThree+Shift]              = Level8;
-//
-//        map[NumLock]                                 = Level5;
-//        map[NumLock+Shift]                           = Level6;
-//        map[NumLock+LevelThree]                      = Level7;
-//        map[NumLock+LevelThree+Shift]                = Level8;
-//
-//        map[NumLock+LevelFive]                       = Level1;
-//        map[NumLock+LevelFive+Shift]                 = Level2;
-//        map[NumLock+LevelFive+LevelThree]            = Level3;
-//        map[NumLock+LevelFive+LevelThree+Shift]      = Level4;
-//
-//        // Lock has no effect
-//        map[Lock]                                    = Level1;
-//        map[Lock+Shift]                              = Level2;
-//        map[Lock+LevelThree]                         = Level3;
-//        map[Lock+LevelThree+Shift]                   = Level4;
-//
-//        map[Lock+LevelFive]                          = Level5;
-//        map[Lock+LevelFive+Shift]                    = Level6;
-//        map[Lock+LevelFive+LevelThree]               = Level7;
-//        map[Lock+LevelFive+LevelThree+Shift]         = Level8;
-//
-//        map[Lock+NumLock]                            = Level5;
-//        map[Lock+NumLock+Shift]                      = Level6;
-//        map[Lock+NumLock+LevelThree]                 = Level7;
-//        map[Lock+NumLock+LevelThree+Shift]           = Level8;
-//
-//        map[Lock+NumLock+LevelFive]                  = Level1;
-//        map[Lock+NumLock+LevelFive+Shift]            = Level2;
-//        map[Lock+NumLock+LevelFive+LevelThree]       = Level3;
-//        map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level4;
-//
-//        preserve[LevelFive+Shift] = Shift;
-//        preserve[NumLock+Shift] = Shift;
-//        preserve[Lock+LevelFive+Shift] = Shift;
-//        preserve[Lock+NumLock+Shift] = Shift;
-//
-//        level_name[Level1] = "Base";
-//        level_name[Level2] = "Shift";
-//        level_name[Level3] = "Alt Base";
-//        level_name[Level4] = "Shift Alt";
-//        level_name[Level5] = "X";
-//        level_name[Level6] = "X Shift";
-//        level_name[Level7] = "X Alt Base";
-//        level_name[Level8] = "X Shift Alt";
-//    };
-//
-//    type "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK" {
-//    	// Level5-Lock is implemented by using NumLock, because a real modifier
-//    	// is required.
-//    	
-//        modifiers = Shift + Lock + LevelThree + NumLock + LevelFive;
-//    
-//        map[None]                                    = Level1;
-//        map[Shift]                                   = Level2;
-//        map[LevelThree]                              = Level3;
-//        map[LevelThree+Shift]                        = Level4;
-//
-//        map[LevelFive]                               = Level5;
-//        map[LevelFive+Shift]                         = Level6;
-//        map[LevelFive+LevelThree]                    = Level7;
-//        map[LevelFive+LevelThree+Shift]              = Level8;
-//
-//        map[NumLock]                                 = Level5;
-//        map[NumLock+Shift]                           = Level6;
-//        map[NumLock+LevelThree]                      = Level7;
-//        map[NumLock+LevelThree+Shift]                = Level8;
-//
-//        map[NumLock+LevelFive]                       = Level1;
-//        map[NumLock+LevelFive+Shift]                 = Level2;
-//        map[NumLock+LevelFive+LevelThree]            = Level3;
-//        map[NumLock+LevelFive+LevelThree+Shift]      = Level4;
-//
-//        // Lock interchanges Level1 and Level2
-//        map[Lock]                                    = Level2;
-//        map[Lock+Shift]                              = Level1;
-//        map[Lock+LevelThree]                         = Level3;
-//        map[Lock+LevelThree+Shift]                   = Level4;
-//
-//        map[Lock+LevelFive]                          = Level5;
-//        map[Lock+LevelFive+Shift]                    = Level6;
-//        map[Lock+LevelFive+LevelThree]               = Level7;
-//        map[Lock+LevelFive+LevelThree+Shift]         = Level8;
-//
-//        map[Lock+NumLock]                            = Level5;
-//        map[Lock+NumLock+Shift]                      = Level6;
-//        map[Lock+NumLock+LevelThree]                 = Level7;
-//        map[Lock+NumLock+LevelThree+Shift]           = Level8;
-//
-//        map[Lock+NumLock+LevelFive]                  = Level2;
-//        map[Lock+NumLock+LevelFive+Shift]            = Level1;
-//        map[Lock+NumLock+LevelFive+LevelThree]       = Level4;
-//        map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level3;
-//
-//        preserve[LevelFive+Shift] = Shift;
-//        preserve[NumLock+Shift] = Shift;
-//
-//        level_name[Level1] = "Base";
-//        level_name[Level2] = "Shift";
-//        level_name[Level3] = "Alt Base";
-//        level_name[Level4] = "Shift Alt";
-//        level_name[Level5] = "X";
-//        level_name[Level6] = "X Shift";
-//        level_name[Level7] = "X Alt Base";
-//        level_name[Level8] = "X Shift Alt";
-//    };
-
-    type "EIGHT_LEVEL_SEMIALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree+LevelFive;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	map[Lock]  = Level2;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level3;
-        map[Lock+Shift+LevelThree] = Level4;
-
-	map[LevelFive] = Level5;
-	map[Shift+LevelFive] = Level6;
-	map[Lock+LevelFive]  = Level6;
-	map[LevelThree+LevelFive] = Level7;
-	map[Shift+LevelThree+LevelFive] = Level8;
-	map[Lock+LevelThree+LevelFive] =  Level7;
-        map[Lock+Shift+LevelThree+LevelFive] = Level8;
-
-	preserve[Lock+LevelThree] = Lock;
-	preserve[Lock+Shift+LevelThree] = Lock;
-	preserve[Lock+LevelFive] = Lock;
-	preserve[Lock+Shift+LevelFive] = Lock;
-	preserve[Lock+LevelThree+LevelFive] = Lock;
-	preserve[Lock+Shift+LevelThree+LevelFive] = Lock;
-
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift";
-	level_name[Level3] = "Alt Base";
-	level_name[Level4] = "Shift Alt";
-	level_name[Level5] = "X";
-	level_name[Level6] = "X Shift";
-	level_name[Level7] = "X Alt Base";
-	level_name[Level8] = "X Shift Alt";
-    };
-
-};
+partial default xkb_types "default" {
+    // Definition for a key type used for the czech keymap, for instance.
+    // Defines style a with four level shift. It is similar to three_level
+    // type used for iso9995 but it lets the shift key behave "normally".
+
+    virtual_modifiers LevelThree,ScrollLock,LevelFive;
+
+    type "EIGHT_LEVEL" {
+        modifiers = Shift+LevelThree+LevelFive;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[LevelFive] = Level5;
+	map[Shift+LevelFive] = Level6;
+	map[LevelThree+LevelFive] = Level7;
+	map[Shift+LevelThree+LevelFive] = Level8;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";  
+	level_name[Level4] = "Shift Alt";  
+	level_name[Level5] = "X";
+	level_name[Level6] = "X Shift";
+	level_name[Level7] = "X Alt Base";
+	level_name[Level8] = "X Shift Alt";
+    };
+
+    type "EIGHT_LEVEL_ALPHABETIC" {
+	modifiers = Shift+Lock+LevelThree+LevelFive;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[Lock]  = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] =  Level4;
+        map[Lock+Shift+LevelThree] = Level3;
+
+	map[LevelFive] = Level5;
+	map[Shift+LevelFive] = Level6;
+	map[Lock+LevelFive]  = Level6;
+	map[LevelThree+LevelFive] = Level7;
+	map[Shift+LevelThree+LevelFive] = Level8;
+	map[Lock+LevelThree+LevelFive] =  Level8;
+        map[Lock+Shift+LevelThree+LevelFive] = Level7;
+
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+	level_name[Level5] = "X";
+	level_name[Level6] = "X Shift";
+	level_name[Level7] = "X Alt Base";
+	level_name[Level8] = "X Shift Alt";
+    };
+
+//    type "EIGHT_LEVEL_LEVEL_FIVE_LOCK" {
+//    	// Level5-Lock is implemented by using NumLock, because a real modifier
+//    	// is required.
+//    	
+//        modifiers = Shift + Lock + LevelThree + NumLock + LevelFive;
+//
+//        map[None]                                    = Level1;
+//        map[Shift]                                   = Level2;
+//        map[LevelThree]                              = Level3;
+//        map[LevelThree+Shift]                        = Level4;
+//
+//        map[LevelFive]                               = Level5;
+//        map[LevelFive+Shift]                         = Level6;
+//        map[LevelFive+LevelThree]                    = Level7;
+//        map[LevelFive+LevelThree+Shift]              = Level8;
+//
+//        map[NumLock]                                 = Level5;
+//        map[NumLock+Shift]                           = Level6;
+//        map[NumLock+LevelThree]                      = Level7;
+//        map[NumLock+LevelThree+Shift]                = Level8;
+//
+//        map[NumLock+LevelFive]                       = Level1;
+//        map[NumLock+LevelFive+Shift]                 = Level2;
+//        map[NumLock+LevelFive+LevelThree]            = Level3;
+//        map[NumLock+LevelFive+LevelThree+Shift]      = Level4;
+//
+//        // Lock has no effect
+//        map[Lock]                                    = Level1;
+//        map[Lock+Shift]                              = Level2;
+//        map[Lock+LevelThree]                         = Level3;
+//        map[Lock+LevelThree+Shift]                   = Level4;
+//
+//        map[Lock+LevelFive]                          = Level5;
+//        map[Lock+LevelFive+Shift]                    = Level6;
+//        map[Lock+LevelFive+LevelThree]               = Level7;
+//        map[Lock+LevelFive+LevelThree+Shift]         = Level8;
+//
+//        map[Lock+NumLock]                            = Level5;
+//        map[Lock+NumLock+Shift]                      = Level6;
+//        map[Lock+NumLock+LevelThree]                 = Level7;
+//        map[Lock+NumLock+LevelThree+Shift]           = Level8;
+//
+//        map[Lock+NumLock+LevelFive]                  = Level1;
+//        map[Lock+NumLock+LevelFive+Shift]            = Level2;
+//        map[Lock+NumLock+LevelFive+LevelThree]       = Level3;
+//        map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level4;
+//
+//        preserve[LevelFive+Shift] = Shift;
+//        preserve[NumLock+Shift] = Shift;
+//        preserve[Lock+LevelFive+Shift] = Shift;
+//        preserve[Lock+NumLock+Shift] = Shift;
+//
+//        level_name[Level1] = "Base";
+//        level_name[Level2] = "Shift";
+//        level_name[Level3] = "Alt Base";
+//        level_name[Level4] = "Shift Alt";
+//        level_name[Level5] = "X";
+//        level_name[Level6] = "X Shift";
+//        level_name[Level7] = "X Alt Base";
+//        level_name[Level8] = "X Shift Alt";
+//    };
+//
+//    type "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK" {
+//    	// Level5-Lock is implemented by using NumLock, because a real modifier
+//    	// is required.
+//    	
+//        modifiers = Shift + Lock + LevelThree + NumLock + LevelFive;
+//    
+//        map[None]                                    = Level1;
+//        map[Shift]                                   = Level2;
+//        map[LevelThree]                              = Level3;
+//        map[LevelThree+Shift]                        = Level4;
+//
+//        map[LevelFive]                               = Level5;
+//        map[LevelFive+Shift]                         = Level6;
+//        map[LevelFive+LevelThree]                    = Level7;
+//        map[LevelFive+LevelThree+Shift]              = Level8;
+//
+//        map[NumLock]                                 = Level5;
+//        map[NumLock+Shift]                           = Level6;
+//        map[NumLock+LevelThree]                      = Level7;
+//        map[NumLock+LevelThree+Shift]                = Level8;
+//
+//        map[NumLock+LevelFive]                       = Level1;
+//        map[NumLock+LevelFive+Shift]                 = Level2;
+//        map[NumLock+LevelFive+LevelThree]            = Level3;
+//        map[NumLock+LevelFive+LevelThree+Shift]      = Level4;
+//
+//        // Lock interchanges Level1 and Level2
+//        map[Lock]                                    = Level2;
+//        map[Lock+Shift]                              = Level1;
+//        map[Lock+LevelThree]                         = Level3;
+//        map[Lock+LevelThree+Shift]                   = Level4;
+//
+//        map[Lock+LevelFive]                          = Level5;
+//        map[Lock+LevelFive+Shift]                    = Level6;
+//        map[Lock+LevelFive+LevelThree]               = Level7;
+//        map[Lock+LevelFive+LevelThree+Shift]         = Level8;
+//
+//        map[Lock+NumLock]                            = Level5;
+//        map[Lock+NumLock+Shift]                      = Level6;
+//        map[Lock+NumLock+LevelThree]                 = Level7;
+//        map[Lock+NumLock+LevelThree+Shift]           = Level8;
+//
+//        map[Lock+NumLock+LevelFive]                  = Level2;
+//        map[Lock+NumLock+LevelFive+Shift]            = Level1;
+//        map[Lock+NumLock+LevelFive+LevelThree]       = Level4;
+//        map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level3;
+//
+//        preserve[LevelFive+Shift] = Shift;
+//        preserve[NumLock+Shift] = Shift;
+//
+//        level_name[Level1] = "Base";
+//        level_name[Level2] = "Shift";
+//        level_name[Level3] = "Alt Base";
+//        level_name[Level4] = "Shift Alt";
+//        level_name[Level5] = "X";
+//        level_name[Level6] = "X Shift";
+//        level_name[Level7] = "X Alt Base";
+//        level_name[Level8] = "X Shift Alt";
+//    };
+
+    type "EIGHT_LEVEL_SEMIALPHABETIC" {
+	modifiers = Shift+Lock+LevelThree+LevelFive;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[Lock]  = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] =  Level3;
+        map[Lock+Shift+LevelThree] = Level4;
+
+	map[LevelFive] = Level5;
+	map[Shift+LevelFive] = Level6;
+	map[Lock+LevelFive]  = Level6;
+	map[LevelThree+LevelFive] = Level7;
+	map[Shift+LevelThree+LevelFive] = Level8;
+	map[Lock+LevelThree+LevelFive] =  Level7;
+        map[Lock+Shift+LevelThree+LevelFive] = Level8;
+
+	preserve[Lock+LevelThree] = Lock;
+	preserve[Lock+Shift+LevelThree] = Lock;
+	preserve[Lock+LevelFive] = Lock;
+	preserve[Lock+Shift+LevelFive] = Lock;
+	preserve[Lock+LevelThree+LevelFive] = Lock;
+	preserve[Lock+Shift+LevelThree+LevelFive] = Lock;
+
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+	level_name[Level5] = "X";
+	level_name[Level6] = "X Shift";
+	level_name[Level7] = "X Alt Base";
+	level_name[Level8] = "X Shift Alt";
+    };
+
+};
diff --git a/xorg-server/xkeyboard-config/types/mousekeys b/xorg-server/xkeyboard-config/types/mousekeys
index 03225990a..88d88a21e 100644
--- a/xorg-server/xkeyboard-config/types/mousekeys
+++ b/xorg-server/xkeyboard-config/types/mousekeys
@@ -1,10 +1,10 @@
-partial default xkb_types "default" {
-    virtual_modifiers Alt;
-
-    type "SHIFT+ALT" {
-   	modifiers = Shift+Alt;
-    	map[Shift+Alt] = Level2;
-    	level_name[Level1] = "Base";
-	level_name[Level2] = "Shift+Alt";
-    };
-};
+partial default xkb_types "default" {
+    virtual_modifiers Alt;
+
+    type "SHIFT+ALT" {
+   	modifiers = Shift+Alt;
+    	map[Shift+Alt] = Level2;
+    	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift+Alt";
+    };
+};
diff --git a/xorg-server/xkeyboard-config/types/nokia b/xorg-server/xkeyboard-config/types/nokia
index f77d8868a..e08095a66 100644
--- a/xorg-server/xkeyboard-config/types/nokia
+++ b/xorg-server/xkeyboard-config/types/nokia
@@ -1,14 +1,14 @@
-partial default xkb_types "default" {
-
-    // Some types that are used by Nokia devices and keyboard.
-    virtual_modifiers LevelThree;
-
-    type "PC_FN_LEVEL2" {
-	modifiers = LevelThree;
-	map[None] = Level1;
-	map[LevelThree] = Level2;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Fn";
-    };
-
-};
+partial default xkb_types "default" {
+
+    // Some types that are used by Nokia devices and keyboard.
+    virtual_modifiers LevelThree;
+
+    type "PC_FN_LEVEL2" {
+	modifiers = LevelThree;
+	map[None] = Level1;
+	map[LevelThree] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Fn";
+    };
+
+};
diff --git a/xorg-server/xkeyboard-config/xkeyboard-config.pc.in b/xorg-server/xkeyboard-config/xkeyboard-config.pc.in
index d44ba1482..da842c9ff 100644
--- a/xorg-server/xkeyboard-config/xkeyboard-config.pc.in
+++ b/xorg-server/xkeyboard-config/xkeyboard-config.pc.in
@@ -1,8 +1,8 @@
-prefix=@prefix@
-datarootdir=@datarootdir@
-datadir=@datadir@
-xkb_base=@xkb_base@
-
-Name: XKeyboardConfig
-Description: X Keyboard configuration data
-Version: @VERSION@
+prefix=@prefix@
+datarootdir=@datarootdir@
+datadir=@datadir@
+xkb_base=@xkb_base@
+
+Name: XKeyboardConfig
+Description: X Keyboard configuration data
+Version: @VERSION@
diff --git a/xorg-server/xorg-server.m4 b/xorg-server/xorg-server.m4
index bdecf6227..80d6da01e 100644
--- a/xorg-server/xorg-server.m4
+++ b/xorg-server/xorg-server.m4
@@ -1,49 +1,49 @@
-dnl Copyright 2005 Red Hat, Inc
-dnl 
-dnl Permission to use, copy, modify, distribute, and sell this software and its
-dnl documentation for any purpose is hereby granted without fee, provided that
-dnl the above copyright notice appear in all copies and that both that
-dnl copyright notice and this permission notice appear in supporting
-dnl documentation.
-dnl 
-dnl The above copyright notice and this permission notice shall be included
-dnl in all copies or substantial portions of the Software.
-dnl 
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-dnl OTHER DEALINGS IN THE SOFTWARE.
-dnl 
-dnl Except as contained in this notice, the name of the copyright holders shall
-dnl not be used in advertising or otherwise to promote the sale, use or
-dnl other dealings in this Software without prior written authorization
-dnl from the copyright holders.
-dnl 
-
-# XORG_DRIVER_CHECK_EXT()
-# --------------------------
-# Checks for the $1 define in xorg-server.h (from the sdk).  If it
-# is defined, then add $1 to $REQUIRED_MODULES.
-
-AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
-	AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-	SAVE_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include "xorg-server.h"
-#if !defined $1
-#error $1 not defined
-#endif
-		]])],
-		[_EXT_CHECK=yes],
-		[_EXT_CHECK=no])
-	CFLAGS="$SAVE_CFLAGS"
-	AC_MSG_CHECKING([if $1 is defined])
-	AC_MSG_RESULT([$_EXT_CHECK])
-	if test "$_EXT_CHECK" != no; then
-		REQUIRED_MODULES="$REQUIRED_MODULES $2"
-	fi
-])
+dnl Copyright 2005 Red Hat, Inc
+dnl 
+dnl Permission to use, copy, modify, distribute, and sell this software and its
+dnl documentation for any purpose is hereby granted without fee, provided that
+dnl the above copyright notice appear in all copies and that both that
+dnl copyright notice and this permission notice appear in supporting
+dnl documentation.
+dnl 
+dnl The above copyright notice and this permission notice shall be included
+dnl in all copies or substantial portions of the Software.
+dnl 
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+dnl OTHER DEALINGS IN THE SOFTWARE.
+dnl 
+dnl Except as contained in this notice, the name of the copyright holders shall
+dnl not be used in advertising or otherwise to promote the sale, use or
+dnl other dealings in this Software without prior written authorization
+dnl from the copyright holders.
+dnl 
+
+# XORG_DRIVER_CHECK_EXT()
+# --------------------------
+# Checks for the $1 define in xorg-server.h (from the sdk).  If it
+# is defined, then add $1 to $REQUIRED_MODULES.
+
+AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
+	AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+	SAVE_CFLAGS="$CFLAGS"
+	CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include "xorg-server.h"
+#if !defined $1
+#error $1 not defined
+#endif
+		]])],
+		[_EXT_CHECK=yes],
+		[_EXT_CHECK=no])
+	CFLAGS="$SAVE_CFLAGS"
+	AC_MSG_CHECKING([if $1 is defined])
+	AC_MSG_RESULT([$_EXT_CHECK])
+	if test "$_EXT_CHECK" != no; then
+		REQUIRED_MODULES="$REQUIRED_MODULES $2"
+	fi
+])
diff --git a/xorg-server/xserver.ent.in b/xorg-server/xserver.ent.in
index aa02d7b93..5cb4e23d3 100644
--- a/xorg-server/xserver.ent.in
+++ b/xorg-server/xserver.ent.in
@@ -1,3 +1,3 @@
-<!-- shared -*-xml-*- entity definitions for the X server documentation -->
-<!ENTITY xserver.version "@PACKAGE_VERSION@">
-<!ENTITY xserver.reldate "@RELEASE_DATE@">
+<!-- shared -*-xml-*- entity definitions for the X server documentation -->
+<!ENTITY xserver.version "@PACKAGE_VERSION@">
+<!ENTITY xserver.reldate "@RELEASE_DATE@">