aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/xkbdata.src/COPYING179
-rw-r--r--xorg-server/xkbdata.src/ChangeLog432
-rw-r--r--xorg-server/xkbdata.src/Makefile.in159
-rw-r--r--xorg-server/xkbdata.src/NEWS5
-rw-r--r--xorg-server/xkbdata.src/README2
-rw-r--r--xorg-server/xkbdata.src/aclocal.m4344
-rw-r--r--xorg-server/xkbdata.src/compat/Makefile.in111
-rw-r--r--xorg-server/xkbdata.src/compat/compat.dir32
-rw-r--r--xorg-server/xkbdata.src/compat/level515
-rw-r--r--xorg-server/xkbdata.src/configure3244
-rw-r--r--xorg-server/xkbdata.src/configure.in6
-rw-r--r--xorg-server/xkbdata.src/docs/Makefile.in103
-rw-r--r--xorg-server/xkbdata.src/docs/README.enhancing10
-rw-r--r--xorg-server/xkbdata.src/geometry/Makefile.in156
-rw-r--r--xorg-server/xkbdata.src/geometry/dell105
-rw-r--r--xorg-server/xkbdata.src/geometry/digital_vndr/Makefile.in109
-rw-r--r--xorg-server/xkbdata.src/geometry/geometry.dir65
-rw-r--r--xorg-server/xkbdata.src/geometry/sgi_vndr/Makefile.in109
-rw-r--r--xorg-server/xkbdata.src/install-sh514
-rw-r--r--xorg-server/xkbdata.src/keycodes/Makefile.in153
-rw-r--r--xorg-server/xkbdata.src/keycodes/amiga4
-rw-r--r--xorg-server/xkbdata.src/keycodes/ataritt2
-rw-r--r--xorg-server/xkbdata.src/keycodes/digital_vndr/Makefile.in106
-rw-r--r--xorg-server/xkbdata.src/keycodes/evdev19
-rw-r--r--xorg-server/xkbdata.src/keycodes/fujitsu2
-rw-r--r--xorg-server/xkbdata.src/keycodes/keycodes.dir66
-rw-r--r--xorg-server/xkbdata.src/keycodes/macintosh12
-rw-r--r--xorg-server/xkbdata.src/keycodes/sgi_vndr/Makefile.in106
-rw-r--r--xorg-server/xkbdata.src/keycodes/sgi_vndr/indigo4
-rw-r--r--xorg-server/xkbdata.src/keycodes/sgi_vndr/indy24
-rw-r--r--xorg-server/xkbdata.src/keycodes/sun10
-rw-r--r--xorg-server/xkbdata.src/keycodes/xfree8632
-rw-r--r--xorg-server/xkbdata.src/keycodes/xfree982
-rw-r--r--xorg-server/xkbdata.src/keymap/Makefile.in153
-rw-r--r--xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.in106
-rw-r--r--xorg-server/xkbdata.src/keymap/keymap.dir316
-rw-r--r--xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.in106
-rw-r--r--xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.in106
-rw-r--r--xorg-server/xkbdata.src/keymap/xfree864
-rw-r--r--xorg-server/xkbdata.src/missing61
-rw-r--r--xorg-server/xkbdata.src/po/ChangeLog4
-rw-r--r--xorg-server/xkbdata.src/po/Makefile.in.in4
-rw-r--r--xorg-server/xkbdata.src/po/POTFILES.in1
-rw-r--r--xorg-server/xkbdata.src/po/POTFILES.skip1
-rw-r--r--xorg-server/xkbdata.src/po/bg.po2012
-rw-r--r--xorg-server/xkbdata.src/po/ca.po2748
-rw-r--r--xorg-server/xkbdata.src/po/crh.po2799
-rw-r--r--xorg-server/xkbdata.src/po/cs.po1955
-rw-r--r--xorg-server/xkbdata.src/po/da.po2685
-rw-r--r--xorg-server/xkbdata.src/po/de.po2904
-rw-r--r--xorg-server/xkbdata.src/po/eo.po2817
-rw-r--r--xorg-server/xkbdata.src/po/fi.po2522
-rw-r--r--xorg-server/xkbdata.src/po/fr.po2120
-rw-r--r--xorg-server/xkbdata.src/po/id.po2901
-rw-r--r--xorg-server/xkbdata.src/po/it.po2993
-rw-r--r--xorg-server/xkbdata.src/po/ko.po2606
-rw-r--r--xorg-server/xkbdata.src/po/ky.po2682
-rw-r--r--xorg-server/xkbdata.src/po/lt.po2781
-rw-r--r--xorg-server/xkbdata.src/po/nb.po2689
-rw-r--r--xorg-server/xkbdata.src/po/sv.po1985
-rw-r--r--xorg-server/xkbdata.src/po/vi.po1968
-rw-r--r--xorg-server/xkbdata.src/rules/Makefile.am125
-rw-r--r--xorg-server/xkbdata.src/rules/Makefile.in268
-rw-r--r--xorg-server/xkbdata.src/rules/base.l1o_s.part1
-rw-r--r--xorg-server/xkbdata.src/rules/base.l2o_s.part1
-rw-r--r--xorg-server/xkbdata.src/rules/base.l3o_s.part1
-rw-r--r--xorg-server/xkbdata.src/rules/base.l4o_s.part1
-rw-r--r--xorg-server/xkbdata.src/rules/base.lists.part43
-rw-r--r--xorg-server/xkbdata.src/rules/base.lo_s.part2
-rw-r--r--xorg-server/xkbdata.src/rules/base.m_g.part1
-rw-r--r--xorg-server/xkbdata.src/rules/base.m_k.part3
-rw-r--r--xorg-server/xkbdata.src/rules/base.m_s.part40
-rw-r--r--xorg-server/xkbdata.src/rules/base.ml1_s.part2
-rw-r--r--xorg-server/xkbdata.src/rules/base.ml_s.part10
-rw-r--r--xorg-server/xkbdata.src/rules/base.o_c.part1
-rw-r--r--xorg-server/xkbdata.src/rules/base.o_k.part0
-rw-r--r--xorg-server/xkbdata.src/rules/base.o_s.part16
-rw-r--r--xorg-server/xkbdata.src/rules/base.o_t.part1
-rw-r--r--xorg-server/xkbdata.src/rules/base.xml.in730
-rw-r--r--xorg-server/xkbdata.src/rules/compat/Makefile.am24
-rw-r--r--xorg-server/xkbdata.src/rules/compat/Makefile.in128
-rw-r--r--xorg-server/xkbdata.src/rules/compat/ln_s.sh6
-rw-r--r--xorg-server/xkbdata.src/rules/compat/ml1_s.sh6
-rw-r--r--xorg-server/xkbdata.src/rules/compat/variantRename.lst2
-rw-r--r--xorg-server/xkbdata.src/rules/evdev.m_k.part2
-rw-r--r--xorg-server/xkbdata.src/rules/evdev.m_s.part3
-rw-r--r--xorg-server/xkbdata.src/rules/evdev.xml.in730
-rw-r--r--xorg-server/xkbdata.src/rules/merge.sh9
-rw-r--r--xorg-server/xkbdata.src/semantics/Makefile.in111
-rw-r--r--xorg-server/xkbdata.src/symbols/Makefile.am9
-rw-r--r--xorg-server/xkbdata.src/symbols/Makefile.in162
-rw-r--r--xorg-server/xkbdata.src/symbols/altwin19
-rw-r--r--xorg-server/xkbdata.src/symbols/ara6
-rw-r--r--xorg-server/xkbdata.src/symbols/be121
-rw-r--r--xorg-server/xkbdata.src/symbols/bg101
-rw-r--r--xorg-server/xkbdata.src/symbols/brai62
-rw-r--r--xorg-server/xkbdata.src/symbols/ca20
-rw-r--r--xorg-server/xkbdata.src/symbols/capslock16
-rw-r--r--xorg-server/xkbdata.src/symbols/compose2
-rw-r--r--xorg-server/xkbdata.src/symbols/ctrl14
-rw-r--r--xorg-server/xkbdata.src/symbols/de345
-rw-r--r--xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.in106
-rw-r--r--xorg-server/xkbdata.src/symbols/epo26
-rw-r--r--xorg-server/xkbdata.src/symbols/es10
-rw-r--r--xorg-server/xkbdata.src/symbols/et8
-rw-r--r--xorg-server/xkbdata.src/symbols/fi46
-rw-r--r--xorg-server/xkbdata.src/symbols/fr349
-rw-r--r--xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.in106
-rw-r--r--xorg-server/xkbdata.src/symbols/gb49
-rw-r--r--xorg-server/xkbdata.src/symbols/gr3
-rw-r--r--xorg-server/xkbdata.src/symbols/group39
-rw-r--r--xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.in106
-rw-r--r--xorg-server/xkbdata.src/symbols/in85
-rw-r--r--xorg-server/xkbdata.src/symbols/inet895
-rw-r--r--xorg-server/xkbdata.src/symbols/it2
-rw-r--r--xorg-server/xkbdata.src/symbols/keypad100
-rw-r--r--xorg-server/xkbdata.src/symbols/kg141
-rw-r--r--xorg-server/xkbdata.src/symbols/kpdl17
-rw-r--r--xorg-server/xkbdata.src/symbols/kr4
-rw-r--r--xorg-server/xkbdata.src/symbols/latam9
-rw-r--r--xorg-server/xkbdata.src/symbols/level32
-rw-r--r--xorg-server/xkbdata.src/symbols/lt11
-rw-r--r--xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in106
-rw-r--r--xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.in106
-rw-r--r--xorg-server/xkbdata.src/symbols/pc7
-rw-r--r--xorg-server/xkbdata.src/symbols/pk250
-rw-r--r--xorg-server/xkbdata.src/symbols/pl11
-rw-r--r--xorg-server/xkbdata.src/symbols/ro40
-rw-r--r--xorg-server/xkbdata.src/symbols/rs46
-rw-r--r--xorg-server/xkbdata.src/symbols/ru83
-rw-r--r--xorg-server/xkbdata.src/symbols/se1
-rw-r--r--xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.in106
-rw-r--r--xorg-server/xkbdata.src/symbols/si20
-rw-r--r--xorg-server/xkbdata.src/symbols/sn42
-rw-r--r--xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.in106
-rw-r--r--xorg-server/xkbdata.src/symbols/srvr_ctrl7
-rw-r--r--xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.in106
-rw-r--r--xorg-server/xkbdata.src/symbols/symbols.dir1218
-rw-r--r--xorg-server/xkbdata.src/symbols/terminate8
-rw-r--r--xorg-server/xkbdata.src/symbols/tj197
-rw-r--r--xorg-server/xkbdata.src/symbols/tm50
-rw-r--r--xorg-server/xkbdata.src/symbols/tr74
-rw-r--r--xorg-server/xkbdata.src/symbols/typo53
-rw-r--r--xorg-server/xkbdata.src/symbols/ua118
-rw-r--r--xorg-server/xkbdata.src/symbols/us1
-rw-r--r--xorg-server/xkbdata.src/symbols/uz21
-rw-r--r--xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.in106
-rw-r--r--xorg-server/xkbdata.src/types/Makefile.in111
-rw-r--r--xorg-server/xkbdata.src/types/numpad32
-rw-r--r--xorg-server/xkbdata.src/types/types.dir13
-rw-r--r--xorg-server/xkbdata.src/xkeyboard-config.spec2
151 files changed, 42980 insertions, 15590 deletions
diff --git a/xorg-server/xkbdata.src/COPYING b/xorg-server/xkbdata.src/COPYING
index c7232aa96..e63aa3d31 100644
--- a/xorg-server/xkbdata.src/COPYING
+++ b/xorg-server/xkbdata.src/COPYING
@@ -1,3 +1,9 @@
+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
@@ -15,3 +21,176 @@ 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, 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 (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/xkbdata.src/ChangeLog b/xorg-server/xkbdata.src/ChangeLog
index 876a080af..cc8d10ad2 100644
--- a/xorg-server/xkbdata.src/ChangeLog
+++ b/xorg-server/xkbdata.src/ChangeLog
@@ -1,5 +1,437 @@
+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
diff --git a/xorg-server/xkbdata.src/Makefile.in b/xorg-server/xkbdata.src/Makefile.in
index 37bf2ea1e..155003418 100644
--- a/xorg-server/xkbdata.src/Makefile.in
+++ b/xorg-server/xkbdata.src/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -13,15 +13,11 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -43,17 +39,20 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES = xkeyboard-config.spec
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -70,8 +69,6 @@ distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -84,10 +81,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -101,43 +94,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -157,15 +131,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -173,6 +147,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -196,8 +171,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
AUTOMAKE_OPTIONS = foreign
@@ -247,7 +226,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
xkeyboard-config.spec: $(top_builddir)/config.status $(srcdir)/xkeyboard-config.spec.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -280,8 +258,7 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -325,8 +302,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -351,8 +328,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -362,13 +339,12 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -383,24 +359,22 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
- mkdir $(distdir)
- $(mkdir_p) $(distdir)/. $(distdir)/po
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ test -d $(distdir) || mkdir $(distdir)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -414,7 +388,7 @@ distdir: $(DISTFILES)
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -422,6 +396,8 @@ distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -429,7 +405,7 @@ distdir: $(DISTFILES)
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -438,6 +414,10 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -465,6 +445,8 @@ distcheck: dist
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -504,7 +486,7 @@ distcheck: dist
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -576,12 +558,20 @@ install-data-am:
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -602,24 +592,25 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-data-am install-strip
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
- check-am clean clean-generic clean-recursive ctags \
- ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
- dist-tarZ dist-zip distcheck distclean distclean-generic \
- distclean-recursive distclean-tags distcleancheck distdir \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+ dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-data-hook install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
+ install-data-hook install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive \
- mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
- uninstall-info-am
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
# ACLOCAL_AMFLAGS = -I m4
diff --git a/xorg-server/xkbdata.src/NEWS b/xorg-server/xkbdata.src/NEWS
index 1edd53443..cba14ad17 100644
--- a/xorg-server/xkbdata.src/NEWS
+++ b/xorg-server/xkbdata.src/NEWS
@@ -1,3 +1,8 @@
+1.6 Bugfixes (36). Updated/new translations. Some new layouts and models.
+ Added terminate:* group
+ Dropped locale-specific models
+ Improved compat rules
+1.5 Bugfixes (45). Updated/new translations. Some new layouts and models. Serious cleanup in symbols/inet.
1.4 Bugfixes (31). Updated/new translations. Some new layouts and models. Added evdev ruleset.
1.3 Bugfixes (35). Updated/new translations. Some new layouts and models. A lot of country and language-related information put into base.xml. Dropped unsupported rulesets sgi and sun.
1.2 Bugfixes (36). Updated/new translations, renewed relations with TP. Some new layouts and models. A lot of changes from OLPC project. Changed base.xml merging schema (.gmo files are installed and used explicitly)
diff --git a/xorg-server/xkbdata.src/README b/xorg-server/xkbdata.src/README
index 9d3ae1071..c95d3fd83 100644
--- a/xorg-server/xkbdata.src/README
+++ b/xorg-server/xkbdata.src/README
@@ -14,7 +14,7 @@ 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://www.x-docs.org/XKB/XKBproto.pdf
+http://xfree86.org/current/XKBproto.pdf
For XKB configuration information see 'docs/README.config' file.
diff --git a/xorg-server/xkbdata.src/aclocal.m4 b/xorg-server/xkbdata.src/aclocal.m4
index 8d8b5c242..51ad140c6 100644
--- a/xorg-server/xkbdata.src/aclocal.m4
+++ b/xorg-server/xkbdata.src/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,6 +11,14 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+[m4_warning([this file was generated for autoconf 2.63.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
# Copyright (C) 1995-2002 Free Software Foundation, Inc.
# Copyright (C) 2001-2003,2004 Red Hat, Inc.
#
@@ -498,25 +506,25 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcar
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-AC_SUBST(INTLTOOL_DESKTOP_RULE)
-AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-AC_SUBST(INTLTOOL_KEYS_RULE)
-AC_SUBST(INTLTOOL_PROP_RULE)
-AC_SUBST(INTLTOOL_OAF_RULE)
-AC_SUBST(INTLTOOL_PONG_RULE)
-AC_SUBST(INTLTOOL_SERVER_RULE)
-AC_SUBST(INTLTOOL_SHEET_RULE)
-AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
-AC_SUBST(INTLTOOL_UI_RULE)
-AC_SUBST(INTLTOOL_XAM_RULE)
-AC_SUBST(INTLTOOL_KBD_RULE)
-AC_SUBST(INTLTOOL_XML_RULE)
-AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-AC_SUBST(INTLTOOL_CAVES_RULE)
-AC_SUBST(INTLTOOL_SCHEMAS_RULE)
-AC_SUBST(INTLTOOL_THEME_RULE)
-AC_SUBST(INTLTOOL_SERVICE_RULE)
-AC_SUBST(INTLTOOL_POLICY_RULE)
+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
+_IT_SUBST(INTLTOOL_KEYS_RULE)
+_IT_SUBST(INTLTOOL_PROP_RULE)
+_IT_SUBST(INTLTOOL_OAF_RULE)
+_IT_SUBST(INTLTOOL_PONG_RULE)
+_IT_SUBST(INTLTOOL_SERVER_RULE)
+_IT_SUBST(INTLTOOL_SHEET_RULE)
+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
+_IT_SUBST(INTLTOOL_UI_RULE)
+_IT_SUBST(INTLTOOL_XAM_RULE)
+_IT_SUBST(INTLTOOL_KBD_RULE)
+_IT_SUBST(INTLTOOL_XML_RULE)
+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+_IT_SUBST(INTLTOOL_CAVES_RULE)
+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
+_IT_SUBST(INTLTOOL_THEME_RULE)
+_IT_SUBST(INTLTOOL_SERVICE_RULE)
+_IT_SUBST(INTLTOOL_POLICY_RULE)
# Check the gettext tools to make sure they are GNU
AC_PATH_PROG(XGETTEXT, xgettext)
@@ -533,12 +541,17 @@ if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
fi
-AC_PATH_PROG(INTLTOOL_PERL, [perl])
+AC_PATH_PROG(INTLTOOL_PERL, perl)
if test -z "$INTLTOOL_PERL"; then
- AC_MSG_ERROR([perl not found; required for intltool])
+ AC_MSG_ERROR([perl not found])
fi
-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
- AC_MSG_ERROR([perl 5.x required for intltool])
+AC_MSG_CHECKING([for perl >= 5.8.1])
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+if test $? -ne 0; then
+ AC_MSG_ERROR([perl 5.8.1 is required for intltool])
+else
+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+ AC_MSG_RESULT([$IT_PERL_VERSION])
fi
if test "x$2" != "xno-xml"; then
AC_MSG_CHECKING([for XML::Parser])
@@ -594,6 +607,9 @@ dnl The following CONFIG_COMMANDS should be exetuted at the very end
dnl of config.status.
AC_CONFIG_COMMANDS_PRE([
AC_CONFIG_COMMANDS([$1/stamp-it], [
+ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
+ AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
+ fi
rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
>"$1/stamp-it.tmp"
[sed '/^#/d
@@ -613,6 +629,17 @@ AC_CONFIG_COMMANDS_PRE([
])dnl
])
+# _IT_SUBST(VARIABLE)
+# -------------------
+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+#
+AC_DEFUN([_IT_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)
+
# deprecated macros
AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
# A hint is needed for aclocal from Automake <= 1.9.4:
@@ -651,7 +678,7 @@ AC_DEFUN([AM_NLS],
AC_SUBST(USE_NLS)
])
-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -661,14 +688,31 @@ AC_DEFUN([AM_NLS],
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version. Point them to the right macro.
+m4_if([$1], [1.10.2], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too. Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.9.6])])
+[AM_AUTOMAKE_VERSION([1.10.2])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -725,14 +769,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 7
+# serial 8
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
@@ -741,8 +785,10 @@ AC_DEFUN([AM_CONDITIONAL],
[AC_PREREQ(2.52)dnl
ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
if $2; then
$1_TRUE=
$1_FALSE='#'
@@ -756,15 +802,14 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 8
+# serial 9
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -792,6 +837,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
[$1], CXX, [depcc="$CXX" am_compiler_list=],
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=])
@@ -857,6 +903,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -909,61 +956,74 @@ if test "x$enable_dependency_tracking" != xno; then
AMDEPBACKSLASH='\'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-#serial 3
+#serial 5
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
+[{
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`AS_DIRNAME(["$file"])`
+ AS_MKDIR_P([$dirpart/$fdir])
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
done
-done
+}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -982,14 +1042,14 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 12
+# serial 13
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -1006,16 +1066,20 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
+[AC_PREREQ([2.60])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+ fi
fi
# test whether we have cygpath
@@ -1035,6 +1099,9 @@ m4_ifval([$2],
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
@@ -1070,6 +1137,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
[_AM_DEPENDENCIES(CXX)],
[define([AC_PROG_CXX],
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
])
])
@@ -1083,16 +1154,17 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
+_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $1 | $1:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -1105,7 +1177,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
AC_SUBST(install_sh)])
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
@@ -1212,14 +1284,14 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
+# serial 5
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
@@ -1235,6 +1307,7 @@ AC_SUBST($1)])
# If it does, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
@@ -1245,7 +1318,7 @@ else
fi
])
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1253,70 +1326,33 @@ fi
# AM_PROG_MKDIR_P
# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake. There are at least two reasons why we must not
-# use `-m 0755':
-# - it causes special bits like SGID to be ignored,
-# - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out. Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
+# Check for `mkdir -p'.
AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
- # $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined. However this is wrong
- # for two reasons:
- # 1. if the package is installed by a user who cannot write `.'
- # make install will fail,
- # 2. the above comment should most certainly read
- # $(mkdir_p) $(DESTDIR)$(somedir)
- # so it does not work when $(somedir) is undefined and
- # $(DESTDIR) is not.
- # To support the latter case, we have to write
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
- # so the `.' trick is pointless.
- mkdir_p='mkdir -p --'
-else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
- done
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
- if test -f "$ac_aux_dir/mkinstalldirs"; then
- mkdir_p='$(mkinstalldirs)'
- else
- mkdir_p='$(install_sh) -d'
- fi
-fi
-AC_SUBST([mkdir_p])])
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+ [[\\/$]]* | ?:[[\\/]]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 3
+# serial 4
# _AM_MANGLE_OPTION(NAME)
# -----------------------
@@ -1333,7 +1369,7 @@ AC_DEFUN([_AM_SET_OPTION],
# ----------------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
# -------------------------------------------
@@ -1418,9 +1454,21 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
+# Copyright (C) 2006 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
diff --git a/xorg-server/xkbdata.src/compat/Makefile.in b/xorg-server/xkbdata.src/compat/Makefile.in
index 9f0b27772..d644884cd 100644
--- a/xorg-server/xkbdata.src/compat/Makefile.in
+++ b/xorg-server/xkbdata.src/compat/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -18,15 +18,11 @@
# Replaces Imake's MakeXkbDir() rule
# svu: taken from xkbdata
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -63,8 +59,6 @@ DATA = $(dist_compat_DATA) $(dist_dir_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -77,10 +71,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -94,43 +84,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -150,15 +121,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -166,6 +137,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -189,8 +161,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
compatdir = $(xkb_base)/compat
@@ -214,8 +190,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -239,10 +215,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_compatDATA: $(dist_compat_DATA)
@$(NORMAL_INSTALL)
- test -z "$(compatdir)" || $(mkdir_p) "$(DESTDIR)$(compatdir)"
+ test -z "$(compatdir)" || $(MKDIR_P) "$(DESTDIR)$(compatdir)"
@list='$(dist_compat_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -259,7 +234,7 @@ uninstall-dist_compatDATA:
done
install-dist_dirDATA: $(dist_dir_DATA)
@$(NORMAL_INSTALL)
- test -z "$(dirdir)" || $(mkdir_p) "$(DESTDIR)$(dirdir)"
+ test -z "$(dirdir)" || $(MKDIR_P) "$(DESTDIR)$(dirdir)"
@list='$(dist_dir_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -282,23 +257,21 @@ CTAGS:
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/..
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -314,7 +287,7 @@ check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(compatdir)" "$(DESTDIR)$(dirdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -361,12 +334,20 @@ info-am:
install-data-am: install-dist_compatDATA install-dist_dirDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -385,19 +366,21 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_compatDATA uninstall-dist_dirDATA \
- uninstall-info-am
+uninstall-am: uninstall-dist_compatDATA uninstall-dist_dirDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_compatDATA install-dist_dirDATA install-exec \
- install-exec-am install-info install-info-am install-man \
+ install-dist_compatDATA install-dist_dirDATA install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_compatDATA uninstall-dist_dirDATA \
- uninstall-info-am
+ uninstall-dist_compatDATA uninstall-dist_dirDATA
$(subdir).dir: $(dir_data)
diff --git a/xorg-server/xkbdata.src/compat/compat.dir b/xorg-server/xkbdata.src/compat/compat.dir
index c99d7fbaf..04a9667d9 100644
--- a/xorg-server/xkbdata.src/compat/compat.dir
+++ b/xorg-server/xkbdata.src/compat/compat.dir
@@ -1,29 +1,29 @@
--d------ -------- pc98(basic)
--d------ -------- xtest(xtest)
-dp----- -------- misc(misc)
+-dp----- -------- lednum(num_lock)
+--p----- -------- lednum(group_lock)
+--p----- -------- lednum(shift_lock)
+-dp----- -------- pc(pc)
-dp----- -------- mousekeys(mousekeys)
--dp----- -------- norepeat(norepeat)
--dp----- -------- ledcaps(caps_lock)
---p----- -------- ledcaps(group_lock)
---p----- -------- ledcaps(shift_lock)
+-d------ -------- xtest(xtest)
+-d------ -------- pc98(basic)
-dp----- -------- japan(japan)
--p----- -------- japan(kana_lock)
--d------ -------- default(default)
--d------ -------- complete(complete)
--dp----- -------- iso9995(default)
+-dp----- -------- norepeat(norepeat)
h-p----- -------- keypad(overlay)
h-p----- -------- keypad(overlay1)
h-p----- -------- keypad(overlay2)
--d------ -------- basic(basic)
+-d------ -------- default(default)
+-dp----- -------- xfree86(basic)
+-dp----- -------- iso9995(default)
+-d------ -------- complete(complete)
+-d------ -------- olpc(olpc)
-dp----- -------- level5(default)
--dp----- -------- lednum(num_lock)
---p----- -------- lednum(group_lock)
---p----- -------- lednum(shift_lock)
+-dp----- -------- ledcaps(caps_lock)
+--p----- -------- ledcaps(group_lock)
+--p----- -------- ledcaps(shift_lock)
+-d------ -------- basic(basic)
-dp----- -------- ledscroll(scroll_lock)
--p----- -------- ledscroll(group_lock)
--p----- -------- ledscroll(shift_lock)
--dp----- -------- pc(pc)
--d------ -------- olpc(olpc)
-dp----- -------- accessx(basic)
--p----- -------- accessx(full)
--dp----- -------- xfree86(basic)
diff --git a/xorg-server/xkbdata.src/compat/level5 b/xorg-server/xkbdata.src/compat/level5
index db87d4dcc..6c2da991c 100644
--- a/xorg-server/xkbdata.src/compat/level5
+++ b/xorg-server/xkbdata.src/compat/level5
@@ -14,34 +14,31 @@ default partial xkb_compatibility "default" {
latchMods.clearLocks= True;
latchMods.latchToLock= True;
- //ISO_Level5_Shift
- interpret 0xfe11+Any {
+ interpret ISO_Level5_Shift+Any {
useModMapMods= level1;
virtualModifier= LevelFive;
action= SetMods(modifiers=LevelFive);
};
- interpret 0xfe11 {
+ interpret ISO_Level5_Shift {
action= SetMods(modifiers=LevelFive);
};
- //ISO_Level5_Latch
- interpret 0xfe12+Any {
+ interpret ISO_Level5_Latch+Any {
virtualModifier= LevelFive;
action= LatchMods(modifiers=LevelFive);
};
- interpret 0xfe12 {
+ interpret ISO_Level5_Latch {
action= LatchMods(modifiers=LevelFive);
};
- //ISO_Level5_Lock
- interpret 0xfe13+Any {
+ interpret ISO_Level5_Lock+Any {
virtualModifier= LevelFive;
action= LockMods(modifiers=LevelFive);
};
- interpret 0xfe13 {
+ interpret ISO_Level5_Lock {
action= LockMods(modifiers=LevelFive);
};
};
diff --git a/xorg-server/xkbdata.src/configure b/xorg-server/xkbdata.src/configure
index 04991cd55..b7d5dcbb1 100644
--- a/xorg-server/xkbdata.src/configure
+++ b/xorg-server/xkbdata.src/configure
@@ -1,9 +1,9 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xkeyboard-config 1.4.
+# Generated by GNU Autoconf 2.63 for xkeyboard-config 1.6.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
@@ -15,7 +15,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -37,17 +37,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
else
- PATH_SEPARATOR=:
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
fi
- rm -f conf$$.sh
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
fi
# Support unset when possible.
@@ -63,8 +91,6 @@ fi
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
-as_nl='
-'
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -87,7 +113,7 @@ if test "x$as_myself" = x; then
as_myself=$0
fi
if test ! -f "$as_myself"; then
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
{ (exit 1); exit 1; }
fi
@@ -100,17 +126,10 @@ PS2='> '
PS4='+ '
# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
-do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -132,7 +151,7 @@ as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -158,7 +177,7 @@ else
as_have_required=no
fi
- if test $as_have_required = yes && (eval ":
+ if test $as_have_required = yes && (eval ":
(as_func_return () {
(exit \$1)
}
@@ -240,7 +259,7 @@ IFS=$as_save_IFS
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -261,7 +280,7 @@ _ASEOF
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -341,10 +360,10 @@ fi
if test "x$CONFIG_SHELL" != x; then
for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ done
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
fi
@@ -413,9 +432,10 @@ fi
test \$exitcode = 0") || {
echo No shell found that supports shell functions.
- echo Please tell autoconf@gnu.org about your system,
- echo including any error possibly output before this
- echo message
+ echo Please tell bug-autoconf@gnu.org about your system,
+ echo including any error possibly output before this message.
+ echo This can help us improve future autoconf versions.
+ echo Configuration will now proceed without shell functions.
}
@@ -451,7 +471,7 @@ test \$exitcode = 0") || {
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
@@ -479,7 +499,6 @@ case `echo -n x` in
*)
ECHO_N='-n';;
esac
-
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -492,19 +511,22 @@ if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
- mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
+ fi
else
as_ln_s='cp -p'
fi
@@ -529,10 +551,10 @@ else
as_test_x='
eval sh -c '\''
if test -d "$1"; then
- test -d "$1/.";
+ test -d "$1/.";
else
case $1 in
- -*)set "./$1";;
+ -*)set "./$1";;
esac;
case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
@@ -572,8 +594,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xkeyboard-config'
PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='1.4'
-PACKAGE_STRING='xkeyboard-config 1.4'
+PACKAGE_VERSION='1.6'
+PACKAGE_STRING='xkeyboard-config 1.6'
PACKAGE_BUGREPORT=''
ac_unique_file="rules/base.xml.in"
@@ -613,140 +635,152 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-MAINTAINER_MODE_TRUE
-MAINTAINER_MODE_FALSE
-MAINT
-XKBCOMP
-CREATE_RULES_SYMLINK_TRUE
-CREATE_RULES_SYMLINK_FALSE
-CREATE_XKBCOMP_SYMLINK_TRUE
-CREATE_XKBCOMP_SYMLINK_FALSE
-USE_COMPAT_RULES_TRUE
-USE_COMPAT_RULES_FALSE
-USE_NLS
-INTLTOOL_UPDATE
-INTLTOOL_MERGE
-INTLTOOL_EXTRACT
-INTLTOOL_DESKTOP_RULE
-INTLTOOL_DIRECTORY_RULE
-INTLTOOL_KEYS_RULE
-INTLTOOL_PROP_RULE
-INTLTOOL_OAF_RULE
-INTLTOOL_PONG_RULE
-INTLTOOL_SERVER_RULE
-INTLTOOL_SHEET_RULE
-INTLTOOL_SOUNDLIST_RULE
-INTLTOOL_UI_RULE
-INTLTOOL_XAM_RULE
-INTLTOOL_KBD_RULE
-INTLTOOL_XML_RULE
-INTLTOOL_XML_NOMERGE_RULE
-INTLTOOL_CAVES_RULE
-INTLTOOL_SCHEMAS_RULE
-INTLTOOL_THEME_RULE
-INTLTOOL_SERVICE_RULE
-INTLTOOL_POLICY_RULE
-XGETTEXT
-MSGMERGE
-MSGFMT
-GMSGFMT
-INTLTOOL_PERL
-ALL_LINGUAS
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CCDEPMODE
-am__fastdepCC_TRUE
-am__fastdepCC_FALSE
-DATADIRNAME
-GETTEXT_PACKAGE
-CPP
-GREP
-EGREP
-MSGFMT_OPTS
-CATALOGS
-CATOBJEXT
-GMOFILES
-INSTOBJEXT
-INTLLIBS
-PO_IN_DATADIR_TRUE
-PO_IN_DATADIR_FALSE
-POFILES
-POSUB
-MKINSTALLDIRS
-xkb_base
-xkb_rules_symlink
+ac_subst_vars='LTLIBOBJS
LIBOBJS
-LTLIBOBJS'
+xkb_rules_symlink
+xkb_base
+MKINSTALLDIRS
+POSUB
+POFILES
+PO_IN_DATADIR_FALSE
+PO_IN_DATADIR_TRUE
+INTLLIBS
+INSTOBJEXT
+GMOFILES
+CATOBJEXT
+CATALOGS
+MSGFMT_OPTS
+EGREP
+GREP
+CPP
+GETTEXT_PACKAGE
+DATADIRNAME
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+ALL_LINGUAS
+INTLTOOL_PERL
+GMSGFMT
+MSGFMT
+MSGMERGE
+XGETTEXT
+INTLTOOL_POLICY_RULE
+INTLTOOL_SERVICE_RULE
+INTLTOOL_THEME_RULE
+INTLTOOL_SCHEMAS_RULE
+INTLTOOL_CAVES_RULE
+INTLTOOL_XML_NOMERGE_RULE
+INTLTOOL_XML_RULE
+INTLTOOL_KBD_RULE
+INTLTOOL_XAM_RULE
+INTLTOOL_UI_RULE
+INTLTOOL_SOUNDLIST_RULE
+INTLTOOL_SHEET_RULE
+INTLTOOL_SERVER_RULE
+INTLTOOL_PONG_RULE
+INTLTOOL_OAF_RULE
+INTLTOOL_PROP_RULE
+INTLTOOL_KEYS_RULE
+INTLTOOL_DIRECTORY_RULE
+INTLTOOL_DESKTOP_RULE
+INTLTOOL_EXTRACT
+INTLTOOL_MERGE
+INTLTOOL_UPDATE
+USE_NLS
+USE_COMPAT_RULES_FALSE
+USE_COMPAT_RULES_TRUE
+CREATE_XKBCOMP_SYMLINK_FALSE
+CREATE_XKBCOMP_SYMLINK_TRUE
+CREATE_RULES_SYMLINK_FALSE
+CREATE_RULES_SYMLINK_TRUE
+XKBCOMP
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_maintainer_mode
+with_xkb_base
+with_xkb_rules_symlink
+enable_xkbcomp_symlink
+enable_compat_rules
+enable_nls
+enable_dependency_tracking
+'
ac_precious_vars='build_alias
host_alias
target_alias
@@ -761,6 +795,8 @@ CPP'
# Initialize some variables set by options.
ac_init_help=
ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
# The variables have the same names as the options, with
# dashes changed to underlines.
cache_file=/dev/null
@@ -859,13 +895,21 @@ do
datarootdir=$ac_optarg ;;
-disable-* | --disable-*)
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=no ;;
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=no ;;
-docdir | --docdir | --docdi | --doc | --do)
ac_prev=docdir ;;
@@ -878,13 +922,21 @@ do
dvidir=$ac_optarg ;;
-enable-* | --enable-*)
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=\$ac_optarg ;;
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1075,22 +1127,38 @@ do
ac_init_version=: ;;
-with-* | --with-*)
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=\$ac_optarg ;;
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=\$ac_optarg ;;
-without-* | --without-*)
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=no ;;
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=no ;;
--x)
# Obsolete; use --with-x.
@@ -1110,7 +1178,7 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) { echo "$as_me: error: unrecognized option: $ac_option
+ -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; }
;;
@@ -1119,16 +1187,16 @@ Try \`$0 --help' for more information." >&2
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+ { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
{ (exit 1); exit 1; }; }
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
*)
# FIXME: should be removed in autoconf 3.0.
- echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
@@ -1137,22 +1205,38 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { echo "$as_me: error: missing argument to $ac_option" >&2
+ { $as_echo "$as_me: error: missing argument to $ac_option" >&2
{ (exit 1); exit 1; }; }
fi
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+ case $enable_option_checking in
+ no) ;;
+ fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+ { (exit 1); exit 1; }; } ;;
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ esac
+fi
+
+# Check all directory arguments for consistency.
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir
do
eval ac_val=\$$ac_var
+ # Remove trailing slashes.
+ case $ac_val in
+ */ )
+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+ eval $ac_var=\$ac_val;;
+ esac
+ # Be sure to have absolute directory names.
case $ac_val in
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
{ (exit 1); exit 1; }; }
done
@@ -1167,7 +1251,7 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
@@ -1183,10 +1267,10 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { echo "$as_me: error: Working directory cannot be determined" >&2
+ { $as_echo "$as_me: error: working directory cannot be determined" >&2
{ (exit 1); exit 1; }; }
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- { echo "$as_me: error: pwd does not report name of working directory" >&2
+ { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
{ (exit 1); exit 1; }; }
@@ -1194,12 +1278,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
# Try the directory containing this script, then the parent directory.
- ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+ ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_myself" : 'X\(//\)[^/]' \| \
+ X"$as_myself" : 'X\(//\)$' \| \
+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -1226,12 +1310,12 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+ { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
{ (exit 1); exit 1; }; }
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+ cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
{ (exit 1); exit 1; }; }
pwd)`
# When building in place, set srcdir=.
@@ -1258,7 +1342,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xkeyboard-config 1.4 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 1.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1280,9 +1364,9 @@ Configuration:
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
+ [$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
+ [PREFIX]
By default, \`make install' will install all the files in
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
@@ -1292,25 +1376,26 @@ for instance \`--prefix=\$HOME'.
For better control, use the options below.
Fine tuning of the installation directories:
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
- --infodir=DIR info documentation [DATAROOTDIR/info]
- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
- --mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/xkeyboard-config]
- --htmldir=DIR html documentation [DOCDIR]
- --dvidir=DIR dvi documentation [DOCDIR]
- --pdfdir=DIR pdf documentation [DOCDIR]
- --psdir=DIR ps documentation [DOCDIR]
+ --bindir=DIR user executables [EPREFIX/bin]
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
+ --libexecdir=DIR program executables [EPREFIX/libexec]
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C header files [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+ --infodir=DIR info documentation [DATAROOTDIR/info]
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+ --mandir=DIR man documentation [DATAROOTDIR/man]
+ --docdir=DIR documentation root
+ [DATAROOTDIR/doc/xkeyboard-config]
+ --htmldir=DIR html documentation [DOCDIR]
+ --dvidir=DIR dvi documentation [DOCDIR]
+ --pdfdir=DIR pdf documentation [DOCDIR]
+ --psdir=DIR ps documentation [DOCDIR]
_ACEOF
cat <<\_ACEOF
@@ -1324,11 +1409,12 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xkeyboard-config 1.4:";;
+ short | recursive ) echo "Configuration of xkeyboard-config 1.6:";;
esac
cat <<\_ACEOF
Optional Features:
+ --disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-maintainer-mode enable make rules and dependencies not useful
@@ -1365,15 +1451,17 @@ fi
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d "$ac_dir" || continue
+ test -d "$ac_dir" ||
+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+ continue
ac_builddir=.
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1409,7 +1497,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
echo &&
$SHELL "$ac_srcdir/configure" --help=recursive
else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi || ac_status=$?
cd "$ac_pwd" || { ac_status=$?; break; }
done
@@ -1418,11 +1506,11 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xkeyboard-config configure 1.4
-generated by GNU Autoconf 2.61
+xkeyboard-config configure 1.6
+generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1432,8 +1520,8 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xkeyboard-config $as_me 1.4, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+It was created by xkeyboard-config $as_me 1.6, which was
+generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -1469,7 +1557,7 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- echo "PATH: $as_dir"
+ $as_echo "PATH: $as_dir"
done
IFS=$as_save_IFS
@@ -1504,7 +1592,7 @@ do
| -silent | --silent | --silen | --sile | --sil)
continue ;;
*\'*)
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1556,11 +1644,12 @@ _ASBOX
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
*) $as_unset $ac_var ;;
esac ;;
esac
@@ -1590,9 +1679,9 @@ _ASBOX
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- echo "$ac_var='\''$ac_val'\''"
+ $as_echo "$ac_var='\''$ac_val'\''"
done | sort
echo
@@ -1607,9 +1696,9 @@ _ASBOX
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- echo "$ac_var='\''$ac_val'\''"
+ $as_echo "$ac_var='\''$ac_val'\''"
done | sort
echo
fi
@@ -1625,8 +1714,8 @@ _ASBOX
echo
fi
test "$ac_signal" != 0 &&
- echo "$as_me: caught signal $ac_signal"
- echo "$as_me: exit $exit_status"
+ $as_echo "$as_me: caught signal $ac_signal"
+ $as_echo "$as_me: exit $exit_status"
} >&5
rm -f core *.core core.conftest.* &&
rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1668,21 +1757,24 @@ _ACEOF
# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- set x "$CONFIG_SITE"
+ ac_site_file1=$CONFIG_SITE
elif test "x$prefix" != xNONE; then
- set x "$prefix/share/config.site" "$prefix/etc/config.site"
+ ac_site_file1=$prefix/share/config.site
+ ac_site_file2=$prefix/etc/config.site
else
- set x "$ac_default_prefix/share/config.site" \
- "$ac_default_prefix/etc/config.site"
+ ac_site_file1=$ac_default_prefix/share/config.site
+ ac_site_file2=$ac_default_prefix/etc/config.site
fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
+ test "x$ac_site_file" = xNONE && continue
if test -r "$ac_site_file"; then
- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+ { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
fi
@@ -1692,16 +1784,16 @@ if test -r "$cache_file"; then
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+ { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
*) . "./$cache_file";;
esac
fi
else
- { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+ { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -1715,29 +1807,38 @@ for ac_var in $ac_precious_vars; do
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
-echo "$as_me: current value: $ac_new_val" >&2;}
- ac_cache_corrupted=:
+ # differences in whitespace do not lead to failure.
+ ac_old_val_w=`echo x $ac_old_val`
+ ac_new_val_w=`echo x $ac_new_val`
+ if test "$ac_old_val_w" != "$ac_new_val_w"; then
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ ac_cache_corrupted=:
+ else
+ { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+ eval $ac_var=\$ac_old_val
+ fi
+ { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
+ { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
@@ -1747,10 +1848,12 @@ echo "$as_me: current value: $ac_new_val" >&2;}
fi
done
if $ac_cache_corrupted; then
- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1786,7 +1889,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-am__api_version="1.9"
+am__api_version='1.10'
+
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
@@ -1804,8 +1908,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
fi
done
if test -z "$ac_aux_dir"; then
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1831,11 +1935,12 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -1864,17 +1969,29 @@ case $as_dir/ in
# program-specific install script used by HP pwplus--don't use.
:
else
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
+ rm -rf conftest.one conftest.two conftest.dir
+ echo one > conftest.one
+ echo two > conftest.two
+ mkdir conftest.dir
+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+ test -s conftest.one && test -s conftest.two &&
+ test -s conftest.dir/conftest.one &&
+ test -s conftest.dir/conftest.two
+ then
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
fi
fi
done
done
;;
esac
+
done
IFS=$as_save_IFS
+rm -rf conftest.one conftest.two conftest.dir
fi
if test "${ac_cv_path_install+set}" = set; then
@@ -1887,8 +2004,8 @@ fi
INSTALL=$ac_install_sh
fi
fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
@@ -1898,8 +2015,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
echo timestamp > conftest.file
@@ -1922,9 +2039,9 @@ if (
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
+ { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
+$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
alias in your environment" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1935,26 +2052,23 @@ then
# Ok.
:
else
- { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+ { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
+$as_echo "$as_me: error: newly created file is older than distributed files!
Check your system clock" >&2;}
{ (exit 1); exit 1; }; }
fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
# Use a double $ so make ignores it.
test "$program_suffix" != NONE &&
program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $. echo might interpret backslashes.
+# Double any \ or $.
# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
@@ -1965,51 +2079,66 @@ if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
- { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
- # $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined. However this is wrong
- # for two reasons:
- # 1. if the package is installed by a user who cannot write `.'
- # make install will fail,
- # 2. the above comment should most certainly read
- # $(mkdir_p) $(DESTDIR)$(somedir)
- # so it does not work when $(somedir) is undefined and
- # $(DESTDIR) is not.
- # To support the latter case, we have to write
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
- # so the `.' trick is pointless.
- mkdir_p='mkdir -p --'
-else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
- done
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
- if test -f "$ac_aux_dir/mkinstalldirs"; then
- mkdir_p='$(mkinstalldirs)'
+ { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in mkdir gmkdir; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+ 'mkdir (GNU coreutils) '* | \
+ 'mkdir (coreutils) '* | \
+ 'mkdir (fileutils) '4.1*)
+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+ break 3;;
+ esac
+ done
+ done
+done
+IFS=$as_save_IFS
+
+fi
+
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
else
- mkdir_p='$(install_sh) -d'
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for MKDIR_P within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ test -d ./--version && rmdir ./--version
+ MKDIR_P="$ac_install_sh -d"
fi
fi
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+ [\\/$]* | ?:[\\/]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_AWK+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -2022,7 +2151,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2033,22 +2162,23 @@ fi
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
test -n "$AWK" && break
done
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
SHELL = /bin/sh
@@ -2065,12 +2195,12 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
SET_MAKE=
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
@@ -2083,12 +2213,16 @@ else
fi
rmdir .tst 2>/dev/null
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ am__isrc=' -I$(srcdir)'
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
{ (exit 1); exit 1; }; }
+ fi
fi
# test whether we have cygpath
@@ -2103,7 +2237,7 @@ fi
# Define the identity of the package.
PACKAGE='xkeyboard-config'
- VERSION='1.4'
+ VERSION='1.6'
cat >>confdefs.h <<_ACEOF
@@ -2131,7 +2265,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
@@ -2141,10 +2275,10 @@ if test "$cross_compiling" != no; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -2157,7 +2291,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2168,11 +2302,11 @@ fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
- { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2181,10 +2315,10 @@ if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -2197,7 +2331,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2208,11 +2342,11 @@ fi
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_ct_STRIP" = x; then
@@ -2220,12 +2354,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
STRIP=$ac_ct_STRIP
@@ -2235,7 +2365,7 @@ else
fi
fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
@@ -2249,8 +2379,8 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
@@ -2258,11 +2388,9 @@ else
USE_MAINTAINER_MODE=no
fi
- { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
-
-
-if test $USE_MAINTAINER_MODE = yes; then
+ { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
+ if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
MAINTAINER_MODE_FALSE='#'
else
@@ -2278,10 +2406,10 @@ fi
# Extract the first word of "xkbcomp", so it can be a program name with args.
set dummy xkbcomp; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_XKBCOMP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $XKBCOMP in
[\\/]* | ?:[\\/]*)
@@ -2296,7 +2424,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_XKBCOMP="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2309,17 +2437,17 @@ esac
fi
XKBCOMP=$ac_cv_path_XKBCOMP
if test -n "$XKBCOMP"; then
- { echo "$as_me:$LINENO: result: $XKBCOMP" >&5
-echo "${ECHO_T}$XKBCOMP" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $XKBCOMP" >&5
+$as_echo "$XKBCOMP" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
if test x$XKBCOMP = xnot_found ; then
- { { echo "$as_me:$LINENO: error: xkbcomp is required to install the xkb data files" >&5
-echo "$as_me: error: xkbcomp is required to install the xkb data files" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: xkbcomp is required to install the xkb data files" >&5
+$as_echo "$as_me: error: xkbcomp is required to install the xkb data files" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -2355,9 +2483,7 @@ else
fi
-
-
-if test "x$xkb_rules_symlink" != "x"; then
+ if test "x$xkb_rules_symlink" != "x"; then
CREATE_RULES_SYMLINK_TRUE=
CREATE_RULES_SYMLINK_FALSE='#'
else
@@ -2366,9 +2492,7 @@ else
fi
-
-
-if test "x$enable_xkbcomp_symlink" = "xyes"; then
+ if test "x$enable_xkbcomp_symlink" = "xyes"; then
CREATE_XKBCOMP_SYMLINK_TRUE=
CREATE_XKBCOMP_SYMLINK_FALSE='#'
else
@@ -2377,9 +2501,7 @@ else
fi
-
-
-if test "x$enable_compat_rules" = "xyes"; then
+ if test "x$enable_compat_rules" = "xyes"; then
USE_COMPAT_RULES_TRUE=
USE_COMPAT_RULES_FALSE='#'
else
@@ -2392,8 +2514,8 @@ fi
# i18n
# ****
- { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+$as_echo_n "checking whether NLS is requested... " >&6; }
# Check whether --enable-nls was given.
if test "${enable_nls+set}" = set; then
enableval=$enable_nls; USE_NLS=$enableval
@@ -2401,8 +2523,8 @@ else
USE_NLS=yes
fi
- { echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
DEPDIR="${am__leading_dot}deps"
@@ -2417,8 +2539,8 @@ am__doit:
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
_am_result=none
@@ -2445,8 +2567,8 @@ if test "$am__include" = "#"; then
fi
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
rm -f confinc confmf
# Check whether --enable-dependency-tracking was given.
@@ -2458,9 +2580,7 @@ if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
+ if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
AMDEP_FALSE='#'
else
@@ -2469,7 +2589,6 @@ else
fi
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2478,10 +2597,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2494,7 +2613,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2505,11 +2624,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2518,10 +2637,10 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2534,7 +2653,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2545,11 +2664,11 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_ct_CC" = x; then
@@ -2557,12 +2676,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
@@ -2575,10 +2690,10 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2591,7 +2706,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2602,11 +2717,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2615,10 +2730,10 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2636,7 +2751,7 @@ do
continue
fi
ac_cv_prog_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2659,11 +2774,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2674,10 +2789,10 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2690,7 +2805,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2701,11 +2816,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2718,10 +2833,10 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2734,7 +2849,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2745,11 +2860,11 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2761,12 +2876,8 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
@@ -2776,44 +2887,50 @@ fi
fi
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
{ (ac_try="$ac_compiler --version >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -v >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -V >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
@@ -2832,27 +2949,22 @@ main ()
}
_ACEOF
ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort. b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions. Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
ac_rmfiles=
for ac_file in $ac_files
do
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
* ) ac_rmfiles="$ac_rmfiles $ac_file";;
esac
done
@@ -2863,10 +2975,11 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link_default") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -2877,7 +2990,7 @@ for ac_file in $ac_files ''
do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
;;
[ab].out )
# We found the default executable, but exeext='' is most
@@ -2904,25 +3017,27 @@ else
ac_file=''
fi
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
if test -z "$ac_file"; then
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
+ { (exit 77); exit 77; }; }; }
fi
ac_exeext=$ac_cv_exeext
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
@@ -2931,49 +3046,53 @@ if test "$cross_compiling" != yes; then
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cross_compiling=no
else
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+$as_echo "$as_me: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
fi
fi
fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
@@ -2982,31 +3101,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
break;;
* ) break;;
esac
done
else
- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
fi
rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
if test "${ac_cv_objext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -3029,40 +3150,43 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
done
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -3088,20 +3212,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
@@ -3111,15 +3236,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GCC=yes
+else
+ GCC=
+fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
@@ -3146,20 +3275,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
CFLAGS=""
@@ -3184,20 +3314,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
:
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_c_werror_flag=$ac_save_c_werror_flag
@@ -3223,20 +3354,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -3251,8 +3383,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
@@ -3268,10 +3400,10 @@ else
CFLAGS=
fi
fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
if test "${ac_cv_prog_cc_c89+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
@@ -3342,20 +3474,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cc_c89=$ac_arg
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -3371,15 +3504,15 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
- { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+ { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
xno)
- { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+ { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
*)
CC="$CC $ac_cv_prog_cc_c89"
- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
esac
@@ -3391,10 +3524,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
@@ -3456,6 +3589,7 @@ else
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -3481,13 +3615,11 @@ else
fi
fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-if
+ if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
@@ -3503,8 +3635,8 @@ fi
case "$am__api_version" in
1.01234)
- { { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
-echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
+$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
{ (exit 1); exit 1; }; }
;;
*)
@@ -3512,27 +3644,27 @@ echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
esac
if test -n "0.30"; then
- { echo "$as_me:$LINENO: checking for intltool >= 0.30" >&5
-echo $ECHO_N "checking for intltool >= 0.30... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for intltool >= 0.30" >&5
+$as_echo_n "checking for intltool >= 0.30... " >&6; }
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.30 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
-echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
+$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
- { { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.30 or later." >&5
-echo "$as_me: error: Your intltool is too old. You need intltool 0.30 or later." >&2;}
+ { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.30 or later." >&5
+$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.30 or later." >&2;}
{ (exit 1); exit 1; }; }
fi
# Extract the first word of "intltool-update", so it can be a program name with args.
set dummy intltool-update; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
[\\/]* | ?:[\\/]*)
@@ -3547,7 +3679,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3559,20 +3691,20 @@ esac
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
- { echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
-echo "${ECHO_T}$INTLTOOL_UPDATE" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
+$as_echo "$INTLTOOL_UPDATE" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
# Extract the first word of "intltool-merge", so it can be a program name with args.
set dummy intltool-merge; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
[\\/]* | ?:[\\/]*)
@@ -3587,7 +3719,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3599,20 +3731,20 @@ esac
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
- { echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
-echo "${ECHO_T}$INTLTOOL_MERGE" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
+$as_echo "$INTLTOOL_MERGE" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
# Extract the first word of "intltool-extract", so it can be a program name with args.
set dummy intltool-extract; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
[\\/]* | ?:[\\/]*)
@@ -3627,7 +3759,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3639,17 +3771,17 @@ esac
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
- { echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
-echo "${ECHO_T}$INTLTOOL_EXTRACT" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
+$as_echo "$INTLTOOL_EXTRACT" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
- { { echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
-echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
+ { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
+$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -3693,13 +3825,89 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
# Check the gettext tools to make sure they are GNU
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_XGETTEXT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $XGETTEXT in
[\\/]* | ?:[\\/]*)
@@ -3714,7 +3922,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3726,20 +3934,20 @@ esac
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
- { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
# Extract the first word of "msgmerge", so it can be a program name with args.
set dummy msgmerge; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_MSGMERGE+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $MSGMERGE in
[\\/]* | ?:[\\/]*)
@@ -3754,7 +3962,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3766,20 +3974,20 @@ esac
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
- { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-echo "${ECHO_T}$MSGMERGE" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+$as_echo "$MSGMERGE" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_MSGFMT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $MSGFMT in
[\\/]* | ?:[\\/]*)
@@ -3794,7 +4002,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3806,20 +4014,20 @@ esac
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
- { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_GMSGFMT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $GMSGFMT in
[\\/]* | ?:[\\/]*)
@@ -3834,7 +4042,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3847,34 +4055,34 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
- { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
- { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
-echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
{ (exit 1); exit 1; }; }
fi
xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
- { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
-echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
{ (exit 1); exit 1; }; }
fi
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
[\\/]* | ?:[\\/]*)
@@ -3889,7 +4097,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3901,33 +4109,40 @@ esac
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
- { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
-echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
+$as_echo "$INTLTOOL_PERL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
if test -z "$INTLTOOL_PERL"; then
- { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
-echo "$as_me: error: perl not found; required for intltool" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
+$as_echo "$as_me: error: perl not found" >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
- { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
-echo "$as_me: error: perl 5.x required for intltool" >&2;}
+{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
+$as_echo_n "checking for perl >= 5.8.1... " >&6; }
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+if test $? -ne 0; then
+ { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
+$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
{ (exit 1); exit 1; }; }
+else
+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+ { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
+$as_echo "$IT_PERL_VERSION" >&6; }
fi
if test "x" != "xno-xml"; then
- { echo "$as_me:$LINENO: checking for XML::Parser" >&5
-echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
+$as_echo_n "checking for XML::Parser... " >&6; }
if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
- { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
+ { $as_echo "$as_me:$LINENO: result: ok" >&5
+$as_echo "ok" >&6; }
else
- { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
-echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
+$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
{ (exit 1); exit 1; }; }
fi
fi
@@ -3960,29 +4175,32 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
DATADIRNAME=share
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
case $host in
*-*-solaris*)
- { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -4035,32 +4253,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_func_bind_textdomain_codeset=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_bind_textdomain_codeset=no
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
-if test $ac_cv_func_bind_textdomain_codeset = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
DATADIRNAME=share
else
DATADIRNAME=lib
@@ -4073,6 +4295,7 @@ fi
esac
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
@@ -4095,15 +4318,15 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
if test "${ac_cv_prog_CPP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -4135,20 +4358,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
:
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
@@ -4172,13 +4396,14 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -4186,7 +4411,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
@@ -4211,8 +4436,8 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
@@ -4240,20 +4465,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
:
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
@@ -4277,13 +4503,14 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -4291,7 +4518,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
@@ -4307,11 +4534,13 @@ rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then
:
else
- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
fi
ac_ext=c
@@ -4321,42 +4550,37 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
if test "${ac_cv_path_GREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
+ if test -z "$GREP"; then
ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_prog in grep ggrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
- # Check for GNU ac_path_GREP and select it if it is found.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
*GNU*)
ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
*)
ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ $as_echo_n 0123456789 >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- echo 'GREP' >> "conftest.nl"
+ $as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
@@ -4371,74 +4595,60 @@ case `"$ac_path_GREP" --version 2>&1` in
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
-
- $ac_path_GREP_found && break 3
+ $ac_path_GREP_found && break 3
+ done
done
done
-
-done
IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ if test -z "$ac_cv_path_GREP"; then
+ { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
{ (exit 1); exit 1; }; }
-fi
-
+ fi
else
ac_cv_path_GREP=$GREP
fi
-
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
GREP="$ac_cv_path_GREP"
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
if test "${ac_cv_path_EGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
then ac_cv_path_EGREP="$GREP -E"
else
- # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+ if test -z "$EGREP"; then
ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_prog in egrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
- # Check for GNU ac_path_EGREP and select it if it is found.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
*GNU*)
ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
*)
ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ $as_echo_n 0123456789 >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- echo 'EGREP' >> "conftest.nl"
+ $as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
@@ -4453,40 +4663,31 @@ case `"$ac_path_EGREP" --version 2>&1` in
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
-
- $ac_path_EGREP_found && break 3
+ $ac_path_EGREP_found && break 3
+ done
done
done
-
-done
IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ if test -z "$ac_cv_path_EGREP"; then
+ { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
{ (exit 1); exit 1; }; }
-fi
-
+ fi
else
ac_cv_path_EGREP=$EGREP
fi
-
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
EGREP="$ac_cv_path_EGREP"
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -4513,20 +4714,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_header_stdc=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_stdc=no
@@ -4618,37 +4820,40 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_header_stdc=no
fi
+rm -rf conftest.dSYM
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
@@ -4670,11 +4875,11 @@ fi
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -4692,20 +4897,21 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
eval "$as_ac_Header=yes"
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Header=no"
@@ -4713,12 +4919,15 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -4730,20 +4939,21 @@ done
for ac_header in locale.h
do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
else
# Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4759,32 +4969,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4798,69 +5009,73 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -4868,10 +5083,10 @@ fi
done
if test $ac_cv_header_locale_h = yes; then
- { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
-echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
+$as_echo_n "checking for LC_MESSAGES... " >&6; }
if test "${am_cv_val_LC_MESSAGES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -4894,31 +5109,35 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
am_cv_val_LC_MESSAGES=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
am_cv_val_LC_MESSAGES=no
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
+$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
if test $am_cv_val_LC_MESSAGES = yes; then
cat >>confdefs.h <<\_ACEOF
@@ -4937,17 +5156,17 @@ _ACEOF
INTLLIBS=
if test "${ac_cv_header_libintl_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for libintl.h" >&5
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
+$as_echo_n "checking for libintl.h... " >&6; }
if test "${ac_cv_header_libintl_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+$as_echo "$ac_cv_header_libintl_h" >&6; }
else
# Is the header compilable?
-{ echo "$as_me:$LINENO: checking libintl.h usability" >&5
-echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5
+$as_echo_n "checking libintl.h usability... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4963,32 +5182,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
# Is the header present?
-{ echo "$as_me:$LINENO: checking libintl.h presence" >&5
-echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5
+$as_echo_n "checking libintl.h presence... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5002,76 +5222,77 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ echo "$as_me:$LINENO: checking for libintl.h" >&5
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
+$as_echo_n "checking for libintl.h... " >&6; }
if test "${ac_cv_header_libintl_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_cv_header_libintl_h=$ac_header_preproc
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+$as_echo "$ac_cv_header_libintl_h" >&6; }
fi
-if test $ac_cv_header_libintl_h = yes; then
+if test "x$ac_cv_header_libintl_h" = x""yes; then
gt_cv_func_dgettext_libintl="no"
libintl_extra_libs=""
#
# First check in libc
#
- { echo "$as_me:$LINENO: checking for ngettext in libc" >&5
-echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5
+$as_echo_n "checking for ngettext in libc... " >&6; }
if test "${gt_cv_func_ngettext_libc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5096,38 +5317,42 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
gt_cv_func_ngettext_libc=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
gt_cv_func_ngettext_libc=no
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
-echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
+$as_echo "$gt_cv_func_ngettext_libc" >&6; }
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- { echo "$as_me:$LINENO: checking for dgettext in libc" >&5
-echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
+$as_echo_n "checking for dgettext in libc... " >&6; }
if test "${gt_cv_func_dgettext_libc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5152,43 +5377,47 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
gt_cv_func_dgettext_libc=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
gt_cv_func_dgettext_libc=no
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
-echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
+$as_echo "$gt_cv_func_dgettext_libc" >&6; }
fi
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
for ac_func in bind_textdomain_codeset
do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5241,35 +5470,42 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
eval "$as_ac_var=yes"
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
@@ -5284,10 +5520,10 @@ done
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
- { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
-echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
+$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
@@ -5319,37 +5555,41 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_intl_bindtextdomain=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_bindtextdomain=no
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; }
-if test $ac_cv_lib_intl_bindtextdomain = yes; then
- { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
+$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
+ { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+$as_echo_n "checking for ngettext in -lintl... " >&6; }
if test "${ac_cv_lib_intl_ngettext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
@@ -5381,37 +5621,41 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_intl_ngettext=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_ngettext=no
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
-if test $ac_cv_lib_intl_ngettext = yes; then
- { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
-echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
+ { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
+$as_echo_n "checking for dgettext in -lintl... " >&6; }
if test "${ac_cv_lib_intl_dgettext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
@@ -5443,33 +5687,37 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_intl_dgettext=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_dgettext=no
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; }
-if test $ac_cv_lib_intl_dgettext = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
+$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
gt_cv_func_dgettext_libintl=yes
fi
@@ -5479,14 +5727,14 @@ fi
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
- { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
-echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; }
- { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
- { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
+$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
+ { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+$as_echo_n "checking for ngettext in -lintl... " >&6; }
if test "${ac_cv_lib_intl_ngettext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl -liconv $LIBS"
@@ -5518,37 +5766,41 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_intl_ngettext=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_ngettext=no
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
-if test $ac_cv_lib_intl_ngettext = yes; then
- { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
-echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
+ { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
+$as_echo_n "checking for dcgettext in -lintl... " >&6; }
if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl -liconv $LIBS"
@@ -5580,33 +5832,37 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_intl_dcgettext=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_dcgettext=no
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; }
-if test $ac_cv_lib_intl_dcgettext = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
+$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
@@ -5631,11 +5887,11 @@ fi
for ac_func in bind_textdomain_codeset
do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5688,35 +5944,42 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
eval "$as_ac_var=yes"
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
@@ -5752,10 +6015,10 @@ _ACEOF
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_MSGFMT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
/*)
@@ -5779,11 +6042,11 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
- { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "$MSGFMT" != "no"; then
glib_save_LIBS="$LIBS"
@@ -5791,11 +6054,11 @@ fi
for ac_func in dcgettext
do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5848,43 +6111,50 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
eval "$as_ac_var=yes"
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
done
MSGFMT_OPTS=
- { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
-echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
+$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
msgid ""
@@ -5898,25 +6168,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
-if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
+if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
($MSGFMT -c -o /dev/null conftest.foo) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_GMSGFMT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $GMSGFMT in
[\\/]* | ?:[\\/]*)
@@ -5931,7 +6201,7 @@ do
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -5944,20 +6214,20 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
- { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_XGETTEXT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
/*)
@@ -5981,11 +6251,11 @@ esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
- { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
cat >conftest.$ac_ext <<_ACEOF
@@ -6010,30 +6280,33 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
CATOBJEXT=.gmo
DATADIRNAME=share
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
case $host in
*-*-solaris*)
- { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -6086,32 +6359,36 @@ case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_func_bind_textdomain_codeset=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_bind_textdomain_codeset=no
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
-if test $ac_cv_func_bind_textdomain_codeset = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
CATOBJEXT=.gmo
DATADIRNAME=share
else
@@ -6127,6 +6404,7 @@ fi
esac
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
@@ -6152,8 +6430,8 @@ _ACEOF
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
- { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
+ { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
+$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
fi
@@ -6185,8 +6463,8 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
- { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
-echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
+$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
useit=no
@@ -6210,8 +6488,8 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; }
fi
done
LINGUAS=$NEW_LINGUAS
- { echo "$as_me:$LINENO: result: $LINGUAS" >&5
-echo "${ECHO_T}$LINGUAS" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
+$as_echo "$LINGUAS" >&6; }
fi
if test -n "$LINGUAS"; then
@@ -6243,7 +6521,7 @@ echo "${ECHO_T}$LINGUAS" >&6; }
< $srcdir/po/POTFILES.in > po/POTFILES
-ALL_LINGUAS="af az bg cs da el en_GB es fi fr hu it ka ko nl ru rw sk sl sq sr sr@Latn sv tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="af az bg ca crh cs da de el en_GB eo es fi fr hu id it ka ko ky lt nb nl ru rw sk sl sq sr sv tr uk vi zh_CN zh_TW"
@@ -6277,11 +6555,12 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
*) $as_unset $ac_var ;;
esac ;;
esac
@@ -6314,12 +6593,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
- { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+ { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
cat confcache >$cache_file
else
- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
rm -f confcache
@@ -6336,6 +6615,12 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
# take arguments), then branch to the quote section. Otherwise,
# look for a macro that doesn't take arguments.
ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
t clear
:clear
s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
@@ -6365,7 +6650,7 @@ ac_ltlibobjs=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
- ac_i=`echo "$ac_i" | sed "$ac_script"`
+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -6377,44 +6662,44 @@ LTLIBOBJS=$ac_ltlibobjs
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${CREATE_RULES_SYMLINK_TRUE}" && test -z "${CREATE_RULES_SYMLINK_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"CREATE_RULES_SYMLINK\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"CREATE_RULES_SYMLINK\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"CREATE_RULES_SYMLINK\" was never defined.
+$as_echo "$as_me: error: conditional \"CREATE_RULES_SYMLINK\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${CREATE_XKBCOMP_SYMLINK_TRUE}" && test -z "${CREATE_XKBCOMP_SYMLINK_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"CREATE_XKBCOMP_SYMLINK\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"CREATE_XKBCOMP_SYMLINK\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"CREATE_XKBCOMP_SYMLINK\" was never defined.
+$as_echo "$as_me: error: conditional \"CREATE_XKBCOMP_SYMLINK\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${USE_COMPAT_RULES_TRUE}" && test -z "${USE_COMPAT_RULES_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"USE_COMPAT_RULES\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"USE_COMPAT_RULES\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_COMPAT_RULES\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_COMPAT_RULES\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
+$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -6424,11 +6709,12 @@ fi
: ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
@@ -6441,7 +6727,7 @@ ac_cs_silent=false
SHELL=\${CONFIG_SHELL-$SHELL}
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
@@ -6451,7 +6737,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -6473,17 +6759,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
else
- PATH_SEPARATOR=:
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
fi
- rm -f conf$$.sh
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
fi
# Support unset when possible.
@@ -6499,8 +6813,6 @@ fi
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
-as_nl='
-'
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -6523,7 +6835,7 @@ if test "x$as_myself" = x; then
as_myself=$0
fi
if test ! -f "$as_myself"; then
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
{ (exit 1); exit 1; }
fi
@@ -6536,17 +6848,10 @@ PS2='> '
PS4='+ '
# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
-do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -6568,7 +6873,7 @@ as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -6619,7 +6924,7 @@ $as_unset CDPATH
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
@@ -6647,7 +6952,6 @@ case `echo -n x` in
*)
ECHO_N='-n';;
esac
-
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -6660,19 +6964,22 @@ if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
- mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
+ fi
else
as_ln_s='cp -p'
fi
@@ -6697,10 +7004,10 @@ else
as_test_x='
eval sh -c '\''
if test -d "$1"; then
- test -d "$1/.";
+ test -d "$1/.";
else
case $1 in
- -*)set "./$1";;
+ -*)set "./$1";;
esac;
case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
@@ -6722,8 +7029,8 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xkeyboard-config $as_me 1.4, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+This file was extended by xkeyboard-config $as_me 1.6, which was
+generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -6736,27 +7043,34 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
config_files="$ac_config_files"
config_commands="$ac_config_commands"
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [FILE]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
- -q, --quiet do not print progress messages
+ -q, --quiet, --silent
+ do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
- --file=FILE[:TEMPLATE]
- instantiate the configuration file FILE
+ --file=FILE[:TEMPLATE]
+ instantiate the configuration file FILE
Configuration files:
$config_files
@@ -6767,24 +7081,26 @@ $config_commands
Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-xkeyboard-config config.status 1.4
-configured by $0, generated by GNU Autoconf 2.61,
- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+xkeyboard-config config.status 1.6
+configured by $0, generated by GNU Autoconf 2.63,
+ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value. By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
ac_need_defaults=:
while test $# != 0
do
@@ -6806,21 +7122,24 @@ do
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- echo "$ac_cs_version"; exit ;;
+ $as_echo "$ac_cs_version"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
- CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
ac_need_defaults=false;;
--he | --h | --help | --hel | -h )
- echo "$ac_cs_usage"; exit ;;
+ $as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;;
# This is an error.
- -*) { echo "$as_me: error: unrecognized option: $1
+ -*) { $as_echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; } ;;
@@ -6839,27 +7158,29 @@ if $ac_cs_silent; then
fi
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
- CONFIG_SHELL=$SHELL
+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ shift
+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+ CONFIG_SHELL='$SHELL'
export CONFIG_SHELL
- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ exec "\$@"
fi
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
exec 5>>config.log
{
echo
sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
## Running $as_me. ##
_ASBOX
- echo "$ac_log"
+ $as_echo "$ac_log"
} >&5
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
#
# INIT-COMMANDS
#
@@ -6868,7 +7189,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# Handling of arguments.
for ac_config_target in $ac_config_targets
@@ -6907,8 +7228,8 @@ do
"docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
done
@@ -6948,239 +7269,144 @@ $debug ||
(umask 077 && mkdir "$tmp")
} ||
{
- echo "$me: cannot create a temporary directory in ." >&2
+ $as_echo "$as_me: cannot create a temporary directory in ." >&2
{ (exit 1); exit 1; }
}
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
if test -n "$CONFIG_FILES"; then
-_ACEOF
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-CYGPATH_W!$CYGPATH_W$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-install_sh!$install_sh$ac_delim
-STRIP!$STRIP$ac_delim
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-AWK!$AWK$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$ac_delim
-MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
-MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
-MAINT!$MAINT$ac_delim
-XKBCOMP!$XKBCOMP$ac_delim
-CREATE_RULES_SYMLINK_TRUE!$CREATE_RULES_SYMLINK_TRUE$ac_delim
-CREATE_RULES_SYMLINK_FALSE!$CREATE_RULES_SYMLINK_FALSE$ac_delim
-CREATE_XKBCOMP_SYMLINK_TRUE!$CREATE_XKBCOMP_SYMLINK_TRUE$ac_delim
-CREATE_XKBCOMP_SYMLINK_FALSE!$CREATE_XKBCOMP_SYMLINK_FALSE$ac_delim
-USE_COMPAT_RULES_TRUE!$USE_COMPAT_RULES_TRUE$ac_delim
-USE_COMPAT_RULES_FALSE!$USE_COMPAT_RULES_FALSE$ac_delim
-USE_NLS!$USE_NLS$ac_delim
-INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
-INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
-INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
-INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
-INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim
-INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim
-INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim
-INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim
-INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim
-INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim
-INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim
-INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim
-INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim
-INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim
-INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim
-INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim
-INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim
-INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim
-INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
-INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
-INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
-INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
-XGETTEXT!$XGETTEXT$ac_delim
-MSGMERGE!$MSGMERGE$ac_delim
-MSGFMT!$MSGFMT$ac_delim
-GMSGFMT!$GMSGFMT$ac_delim
-INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
-ALL_LINGUAS!$ALL_LINGUAS$ac_delim
-_ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
- ac_eof=`expr $ac_eof + 1`
+ac_cr=' '
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+ ac_cs_awk_cr='\\r'
+else
+ ac_cs_awk_cr=$ac_cr
fi
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
_ACEOF
+{
+ echo "cat >conf$$subs.awk <<_ACEOF" &&
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+ echo "_ACEOF"
+} >conf$$subs.sh ||
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-DEPDIR!$DEPDIR$ac_delim
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-DATADIRNAME!$DATADIRNAME$ac_delim
-GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
-CATALOGS!$CATALOGS$ac_delim
-CATOBJEXT!$CATOBJEXT$ac_delim
-GMOFILES!$GMOFILES$ac_delim
-INSTOBJEXT!$INSTOBJEXT$ac_delim
-INTLLIBS!$INTLLIBS$ac_delim
-PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
-PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
-POFILES!$POFILES$ac_delim
-POSUB!$POSUB$ac_delim
-MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
-xkb_base!$xkb_base$ac_delim
-xkb_rules_symlink!$xkb_rules_symlink$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
+ . ./conf$$subs.sh ||
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+ if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
{ (exit 1); exit 1; }; }
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
done
+rm -f conf$$subs.sh
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
- ac_eof=`expr $ac_eof + 1`
-fi
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+ N
+ s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+ for (key in S) S_is_set[key] = 1
+ FS = ""
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+}
+{
+ line = $ 0
+ nfields = split(line, field, "@")
+ substed = 0
+ len = length(field[1])
+ for (i = 2; i < nfields; i++) {
+ key = field[i]
+ keylen = length(key)
+ if (S_is_set[key]) {
+ value = S[key]
+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+ len += length(value) + length(field[++i])
+ substed = 1
+ } else
+ len += 1 + keylen
+ }
+
+ print line
+}
+
+_ACAWK
_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+ cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+ || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+ { (exit 1); exit 1; }; }
_ACEOF
-
# VPATH may cause trouble with some makes, so we remove $(srcdir),
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
@@ -7196,19 +7422,21 @@ s/^[^=]*=[ ]*$//
}'
fi
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
fi # test -n "$CONFIG_FILES"
-for ac_tag in :F $CONFIG_FILES :C $CONFIG_COMMANDS
+eval set X " :F $CONFIG_FILES :C $CONFIG_COMMANDS"
+shift
+for ac_tag
do
case $ac_tag in
:[FHLC]) ac_mode=$ac_tag; continue;;
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+ :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
{ (exit 1); exit 1; }; };;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -7237,26 +7465,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
{ (exit 1); exit 1; }; };;
esac
- ac_file_inputs="$ac_file_inputs $ac_f"
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ ac_file_inputs="$ac_file_inputs '$ac_f'"
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
- configure_input="Generated from "`IFS=:
- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+ configure_input='Generated from '`
+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+ `' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+ { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
fi
+ # Neutralize special characters interpreted by sed in replacement strings.
+ case $configure_input in #(
+ *\&* | *\|* | *\\* )
+ ac_sed_conf_input=`$as_echo "$configure_input" |
+ sed 's/[\\\\&|]/\\\\&/g'`;; #(
+ *) ac_sed_conf_input=$configure_input;;
+ esac
case $ac_tag in
- *:-:* | *:-) cat >"$tmp/stdin";;
+ *:-:* | *:-) cat >"$tmp/stdin" \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
;;
esac
@@ -7266,7 +7506,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -7292,7 +7532,7 @@ echo X"$ac_file" |
as_dirs=
while :; do
case $as_dir in #(
- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
@@ -7301,7 +7541,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -7322,17 +7562,17 @@ echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
ac_builddir=.
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -7370,14 +7610,20 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
+ ac_MKDIR_P=$MKDIR_P
+ case $MKDIR_P in
+ [\\/$]* | ?:[\\/]* ) ;;
+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+ esac
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
p
q
}
@@ -7386,13 +7632,14 @@ case `sed -n '/datarootdir/ {
/@infodir@/p
/@localedir@/p
/@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
*datarootdir*) ac_datarootdir_seen=yes;;
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_datarootdir_hack='
s&@datadir@&$datadir&g
s&@docdir@&$docdir&g
@@ -7406,15 +7653,16 @@ _ACEOF
# Neutralize VPATH when `$srcdir' = `.'.
# Shell code in configure.ac might set extrasub.
# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
$extrasub
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
s&@srcdir@&$ac_srcdir&;t t
s&@abs_srcdir@&$ac_abs_srcdir&;t t
s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -7423,48 +7671,67 @@ s&@builddir@&$ac_builddir&;t t
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
rm -f "$tmp/stdin"
case $ac_file in
- -) cat "$tmp/out"; rm -f "$tmp/out";;
- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
- esac
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ esac \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
;;
- :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+ :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
case $ac_file$ac_mode in
- "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
+$as_echo X"$mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -7482,33 +7749,33 @@ echo X"$mf" |
q
}
s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`$as_dirname -- "$file" ||
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
+$as_echo X"$file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -7526,7 +7793,7 @@ echo X"$file" |
q
}
s/.*/./; q'`
- { as_dir=$dirpart/$fdir
+ { as_dir=$dirpart/$fdir
case $as_dir in #(
-*) as_dir=./$as_dir;;
esac
@@ -7534,7 +7801,7 @@ echo X"$file" |
as_dirs=
while :; do
case $as_dir in #(
- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
@@ -7543,7 +7810,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -7564,18 +7831,24 @@ echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
done
-done
+}
;;
"default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
esac ;;
"po/stamp-it":C)
+ if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
+ { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
+$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
sed '/^#/d
@@ -7602,6 +7875,11 @@ _ACEOF
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
+test $ac_write_fail = 0 ||
+ { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
@@ -7623,6 +7901,10 @@ if test "$no_create" != yes; then
# would make configure fail if this is the last instruction.
$ac_cs_success || { (exit 1); exit 1; }
fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
echo '***********************************************************'
@@ -7634,7 +7916,7 @@ else
echo " Symbolic link(s) to legacy rules: $xkb_rules_symlink"
fi
-if test "$enable_compat_rules" == "yes" ; then
+if test "$enable_compat_rules" = "yes" ; then
echo " Compatibility rules are included"
else
echo " Compatibility rules are not included"
diff --git a/xorg-server/xkbdata.src/configure.in b/xorg-server/xkbdata.src/configure.in
index b2df0669c..8dded0c4a 100644
--- a/xorg-server/xkbdata.src/configure.in
+++ b/xorg-server/xkbdata.src/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(xkeyboard-config, 1.4)
+AC_INIT(xkeyboard-config, 1.6)
AC_CONFIG_SRCDIR(rules/base.xml.in)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
@@ -46,7 +46,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
AM_GLIB_GNU_GETTEXT
-ALL_LINGUAS="af az bg cs da el en_GB es fi fr hu it ka ko nl ru rw sk sl sq sr sr@Latn sv tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="af az bg ca crh cs da de el en_GB eo es fi fr hu id it ka ko ky lt nb nl ru rw sk sl sq sr sv tr uk vi zh_CN zh_TW"
AC_SUBST(xkb_base)
AC_SUBST(xkb_rules_symlink)
@@ -91,7 +91,7 @@ else
echo " Symbolic link(s) to legacy rules: $xkb_rules_symlink"
fi
-if test "$enable_compat_rules" == "yes" ; then
+if test "$enable_compat_rules" = "yes" ; then
echo " Compatibility rules are included"
else
echo " Compatibility rules are not included"
diff --git a/xorg-server/xkbdata.src/docs/Makefile.in b/xorg-server/xkbdata.src/docs/Makefile.in
index d9cf91106..33b637891 100644
--- a/xorg-server/xkbdata.src/docs/Makefile.in
+++ b/xorg-server/xkbdata.src/docs/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -13,15 +13,11 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -46,8 +42,6 @@ DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -60,10 +54,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -77,43 +67,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -133,15 +104,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -149,6 +120,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -172,8 +144,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
EXTRA_DIST = README.config README.enhancing README.symbols HOWTO.transition HOWTO.testing
@@ -184,8 +160,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -209,7 +185,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
tags: TAGS
TAGS:
@@ -218,22 +193,21 @@ CTAGS:
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -292,12 +266,20 @@ info-am:
install-data-am:
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -316,16 +298,19 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/docs/README.enhancing b/xorg-server/xkbdata.src/docs/README.enhancing
index 5e684925f..024ea146e 100644
--- a/xorg-server/xkbdata.src/docs/README.enhancing
+++ b/xorg-server/xkbdata.src/docs/README.enhancing
@@ -13,11 +13,11 @@
1. Overview
The developer of a new layout should read the xkb protocol specification (The
-X Keyboard Extension: Protocol Specification <URL:http://www.x-
-docs.org/XKB/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).
+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-
diff --git a/xorg-server/xkbdata.src/geometry/Makefile.in b/xorg-server/xkbdata.src/geometry/Makefile.in
index 46de52ae5..5965542c5 100644
--- a/xorg-server/xkbdata.src/geometry/Makefile.in
+++ b/xorg-server/xkbdata.src/geometry/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -18,15 +18,11 @@
# Replaces Imake's MakeXkbDir() rule
# svu: taken from xkbdata
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -52,10 +48,11 @@ SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -66,14 +63,14 @@ am__installdirs = "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(geomdir)"
dist_dirDATA_INSTALL = $(INSTALL_DATA)
dist_geomDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_dir_DATA) $(dist_geom_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -86,10 +83,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -103,43 +96,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -159,15 +133,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -175,6 +149,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -198,8 +173,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
SUBDIRS = digital_vndr sgi_vndr
@@ -223,8 +202,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -248,10 +227,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_dirDATA: $(dist_dir_DATA)
@$(NORMAL_INSTALL)
- test -z "$(dirdir)" || $(mkdir_p) "$(DESTDIR)$(dirdir)"
+ test -z "$(dirdir)" || $(MKDIR_P) "$(DESTDIR)$(dirdir)"
@list='$(dist_dir_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -268,7 +246,7 @@ uninstall-dist_dirDATA:
done
install-dist_geomDATA: $(dist_geom_DATA)
@$(NORMAL_INSTALL)
- test -z "$(geomdir)" || $(mkdir_p) "$(DESTDIR)$(geomdir)"
+ test -z "$(geomdir)" || $(MKDIR_P) "$(DESTDIR)$(geomdir)"
@list='$(dist_geom_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -315,8 +293,7 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -360,8 +337,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -386,8 +363,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -397,13 +374,12 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -417,23 +393,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/..
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -447,7 +421,7 @@ distdir: $(DISTFILES)
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -455,6 +429,8 @@ distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -465,7 +441,7 @@ all-am: Makefile $(DATA)
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(geomdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
install-exec: install-exec-recursive
@@ -512,12 +488,20 @@ info-am:
install-data-am: install-dist_dirDATA install-dist_geomDATA
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -536,24 +520,24 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-dist_dirDATA uninstall-dist_geomDATA \
- uninstall-info-am
+uninstall-am: uninstall-dist_dirDATA uninstall-dist_geomDATA
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- clean clean-generic clean-recursive ctags ctags-recursive \
- distclean distclean-generic distclean-recursive distclean-tags \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic ctags \
+ ctags-recursive distclean distclean-generic distclean-tags \
distdir dvi dvi-am html html-am info info-am install \
install-am install-data install-data-am install-dist_dirDATA \
- install-dist_geomDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-dist_dirDATA \
- uninstall-dist_geomDATA uninstall-info-am
+ install-dist_geomDATA install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-dist_dirDATA uninstall-dist_geomDATA
$(subdir).dir: $(dir_data)
diff --git a/xorg-server/xkbdata.src/geometry/dell b/xorg-server/xkbdata.src/geometry/dell
index 76f135e25..064f8e6e5 100644
--- a/xorg-server/xkbdata.src/geometry/dell
+++ b/xorg-server/xkbdata.src/geometry/dell
@@ -539,4 +539,107 @@ xkb_geometry "dellm65" {
};
};
-
+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/xkbdata.src/geometry/digital_vndr/Makefile.in b/xorg-server/xkbdata.src/geometry/digital_vndr/Makefile.in
index 370a54696..82b3b990b 100644
--- a/xorg-server/xkbdata.src/geometry/digital_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/geometry/digital_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_geom_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
geomdir = $(xkb_base)/geometry/digital_vndr
@@ -198,8 +174,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -223,10 +199,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_geomDATA: $(dist_geom_DATA)
@$(NORMAL_INSTALL)
- test -z "$(geomdir)" || $(mkdir_p) "$(DESTDIR)$(geomdir)"
+ test -z "$(geomdir)" || $(MKDIR_P) "$(DESTDIR)$(geomdir)"
@list='$(dist_geom_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -249,22 +224,21 @@ CTAGS:
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -280,7 +254,7 @@ check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(geomdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -326,12 +300,20 @@ info-am:
install-data-am: install-dist_geomDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -350,17 +332,20 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_geomDATA uninstall-info-am
+uninstall-am: uninstall-dist_geomDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_geomDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
+ install-dist_geomDATA install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am uninstall-dist_geomDATA \
- uninstall-info-am
+ pdf-am ps ps-am uninstall uninstall-am uninstall-dist_geomDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/geometry/geometry.dir b/xorg-server/xkbdata.src/geometry/geometry.dir
index dad940531..b5e627de2 100644
--- a/xorg-server/xkbdata.src/geometry/geometry.dir
+++ b/xorg-server/xkbdata.src/geometry/geometry.dir
@@ -1,17 +1,8 @@
+-d------ -------- everex(STEPnote)
-d------ -------- macintosh(macintosh)
-------- -------- macintosh(applepro)
-------- -------- macintosh(macbook78)
-------- -------- macintosh(macbook79)
--d------ -------- winbook(XP5)
--d------ -------- kinesis(model100)
--d------ -------- northgate(omnikey101)
--d------ -------- sony(nwp5461)
--------- -------- thinkpad(common)
--------- -------- thinkpad(us)
--------- -------- thinkpad(intl)
--------- -------- thinkpad(60)
--d------ -------- fujitsu(138)
--------- -------- fujitsu(140)
-------- -------- sun(type4)
-------- -------- sun(type4tuv)
-------- -------- sun(type4_ca)
@@ -45,14 +36,8 @@
-------- -------- sun(x86)
-------- -------- sun(MS_x86)
-------- -------- sun(x86tuv)
--d------ -------- amiga(usa1)
--------- -------- amiga(de)
--d------ -------- microsoft(natural)
--------- -------- microsoft(elite)
--d------ -------- hp(pc101)
--------- -------- hp(hil)
--------- -------- hp(omnibook)
--------- -------- hp(omnibook_intl)
+-d------ -------- fujitsu(138)
+-------- -------- fujitsu(140)
-d------ -------- pc(pc101)
-------- -------- pc(pc102)
-------- -------- pc(pc104)
@@ -63,7 +48,6 @@
-------- -------- pc(kr106)
-------- -------- pc(latitude)
-------- -------- pc(pc104alt)
--d------ -------- chicony(us)
-d------ -------- hhk(win1)
-------- -------- hhk(win2)
-------- -------- hhk(win3)
@@ -73,26 +57,36 @@
-------- -------- hhk(jp3)
-------- -------- hhk(jp4)
h-p----- -------- hhk(basic)
+-d------ -------- kinesis(model100)
+-d------ -------- hp(pc101)
+-------- -------- hp(hil)
+-------- -------- hp(omnibook)
+-------- -------- hp(omnibook_intl)
+-d------ -------- microsoft(natural)
+-------- -------- microsoft(elite)
+-d------ -------- keytronic(FlexPro)
+-d------ -------- northgate(omnikey101)
+-d------ -------- sgi_vndr/indy(pc101)
+-------- -------- sgi_vndr/indy(pc102)
+-------- -------- sgi_vndr/indy(jp106)
-d------ -------- sgi_vndr/O2(pc101)
-------- -------- sgi_vndr/O2(pc102)
-------- -------- sgi_vndr/O2(jp106)
-d------ -------- sgi_vndr/indigo(pc101)
-------- -------- sgi_vndr/indigo(pc102)
--d------ -------- sgi_vndr/indy(pc101)
--------- -------- sgi_vndr/indy(pc102)
--------- -------- sgi_vndr/indy(jp106)
--d------ -------- keytronic(FlexPro)
+-d------ -------- sony(nwp5461)
+-d------ -------- winbook(XP5)
+-d------ -------- ataritt(us)
+-------- -------- ataritt(de)
+-------- -------- thinkpad(common)
+-------- -------- thinkpad(us)
+-------- -------- thinkpad(intl)
+-------- -------- thinkpad(60)
-d------ -------- dell(dell101)
-------- -------- dell(dell65)
-------- -------- dell(dell65x)
-------- -------- dell(dellm65)
--d------ -------- everex(STEPnote)
--d------ -------- nec(pc98)
--------- -------- digital_vndr/lk(lk201)
--------- -------- digital_vndr/lk(lk401)
--------- -------- digital_vndr/lk(lk450)
--------- -------- digital_vndr/lk(lk401bj)
--------- -------- digital_vndr/lk(lk401jj)
+-------- -------- dell(latitude)
--p----- -------- digital_vndr/pc(common)
--p----- -------- digital_vndr/pc(leds_on_keys)
--p----- -------- digital_vndr/pc(leds_alone)
@@ -101,5 +95,12 @@ h-p----- -------- hhk(basic)
-------- -------- digital_vndr/pc(pcxaj)
-------- -------- digital_vndr/unix(unix)
-------- -------- digital_vndr/unix(lk421jj)
--d------ -------- ataritt(us)
--------- -------- ataritt(de)
+-------- -------- digital_vndr/lk(lk201)
+-------- -------- digital_vndr/lk(lk401)
+-------- -------- digital_vndr/lk(lk450)
+-------- -------- digital_vndr/lk(lk401bj)
+-------- -------- digital_vndr/lk(lk401jj)
+-d------ -------- chicony(us)
+-d------ -------- nec(pc98)
+-d------ -------- amiga(usa1)
+-------- -------- amiga(de)
diff --git a/xorg-server/xkbdata.src/geometry/sgi_vndr/Makefile.in b/xorg-server/xkbdata.src/geometry/sgi_vndr/Makefile.in
index 294bb3914..d50ee7bcf 100644
--- a/xorg-server/xkbdata.src/geometry/sgi_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/geometry/sgi_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_geom_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
geomdir = $(xkb_base)/geometry/sgi_vndr
@@ -198,8 +174,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -223,10 +199,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_geomDATA: $(dist_geom_DATA)
@$(NORMAL_INSTALL)
- test -z "$(geomdir)" || $(mkdir_p) "$(DESTDIR)$(geomdir)"
+ test -z "$(geomdir)" || $(MKDIR_P) "$(DESTDIR)$(geomdir)"
@list='$(dist_geom_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -249,22 +224,21 @@ CTAGS:
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -280,7 +254,7 @@ check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(geomdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -326,12 +300,20 @@ info-am:
install-data-am: install-dist_geomDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -350,17 +332,20 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_geomDATA uninstall-info-am
+uninstall-am: uninstall-dist_geomDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_geomDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
+ install-dist_geomDATA install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am uninstall-dist_geomDATA \
- uninstall-info-am
+ pdf-am ps ps-am uninstall uninstall-am uninstall-dist_geomDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/install-sh b/xorg-server/xkbdata.src/install-sh
index 4d4a9519e..a5897de6e 100644
--- a/xorg-server/xkbdata.src/install-sh
+++ b/xorg-server/xkbdata.src/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2005-05-14.22
+scriptversion=2006-12-25.00
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,38 +39,68 @@ scriptversion=2005-05-14.22
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
-# from scratch. It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+
+nl='
+'
+IFS=" "" $nl"
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
+if test -z "$doit"; then
+ doit_exec=exec
+else
+ doit_exec=$doit
+fi
-# put in absolute paths if you don't have them in your path; or use env. vars.
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+ test "$posix_glob" != "?" || {
+ if (set -f) 2>/dev/null; then
+ posix_glob=
+ else
+ posix_glob=:
+ fi
+ }
+'
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
-chmodcmd="$chmodprog 0755"
-chowncmd=
chgrpcmd=
-stripcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
src=
dst=
dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
no_target_directory=
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
or: $0 [OPTION]... SRCFILES... DIRECTORY
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
or: $0 [OPTION]... -d DIRECTORIES...
@@ -80,81 +110,86 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
In the 4th, create DIRECTORIES.
Options:
--c (ignored)
--d create directories instead of installing files.
--g GROUP $chgrpprog installed files to GROUP.
--m MODE $chmodprog installed files to MODE.
--o USER $chownprog installed files to USER.
--s $stripprog installed files.
--t DIRECTORY install into DIRECTORY.
--T report an error if DSTFILE is a directory.
---help display this help and exit.
---version display version info and exit.
+ --help display this help and exit.
+ --version display version info and exit.
+
+ -c (ignored)
+ -C install only if different (preserve the last data modification time)
+ -d create directories instead of installing files.
+ -g GROUP $chgrpprog installed files to GROUP.
+ -m MODE $chmodprog installed files to MODE.
+ -o USER $chownprog installed files to USER.
+ -s $stripprog installed files.
+ -t DIRECTORY install into DIRECTORY.
+ -T report an error if DSTFILE is a directory.
Environment variables override the default commands:
- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+ RMPROG STRIPPROG
"
-while test -n "$1"; do
+while test $# -ne 0; do
case $1 in
- -c) shift
- continue;;
+ -c) ;;
+
+ -C) copy_on_change=true;;
- -d) dir_arg=true
- shift
- continue;;
+ -d) dir_arg=true;;
-g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
+ shift;;
--help) echo "$usage"; exit $?;;
- -m) chmodcmd="$chmodprog $2"
- shift
- shift
- continue;;
+ -m) mode=$2
+ case $mode in
+ *' '* | *' '* | *'
+'* | *'*'* | *'?'* | *'['*)
+ echo "$0: invalid mode: $mode" >&2
+ exit 1;;
+ esac
+ shift;;
-o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
+ shift;;
- -s) stripcmd=$stripprog
- shift
- continue;;
+ -s) stripcmd=$stripprog;;
- -t) dstarg=$2
- shift
- shift
- continue;;
+ -t) dst_arg=$2
+ shift;;
- -T) no_target_directory=true
- shift
- continue;;
+ -T) no_target_directory=true;;
--version) echo "$0 $scriptversion"; exit $?;;
- *) # When -d is used, all remaining arguments are directories to create.
- # When -t is used, the destination is already specified.
- test -n "$dir_arg$dstarg" && break
- # Otherwise, the last argument is the destination. Remove it from $@.
- for arg
- do
- if test -n "$dstarg"; then
- # $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dstarg"
- shift # fnord
- fi
- shift # arg
- dstarg=$arg
- done
+ --) shift
break;;
+
+ -*) echo "$0: invalid option: $1" >&2
+ exit 1;;
+
+ *) break;;
esac
+ shift
done
-if test -z "$1"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+ # When -d is used, all remaining arguments are directories to create.
+ # When -t is used, the destination is already specified.
+ # Otherwise, the last argument is the destination. Remove it from $@.
+ for arg
+ do
+ if test -n "$dst_arg"; then
+ # $@ is not empty: it contains at least $arg.
+ set fnord "$@" "$dst_arg"
+ shift # fnord
+ fi
+ shift # arg
+ dst_arg=$arg
+ done
+fi
+
+if test $# -eq 0; then
if test -z "$dir_arg"; then
echo "$0: no input file specified." >&2
exit 1
@@ -164,24 +199,47 @@ if test -z "$1"; then
exit 0
fi
+if test -z "$dir_arg"; then
+ trap '(exit $?); exit' 1 2 13 15
+
+ # Set umask so as not to create temps with too-generous modes.
+ # However, 'strip' requires both read and write access to temps.
+ case $mode in
+ # Optimize common cases.
+ *644) cp_umask=133;;
+ *755) cp_umask=22;;
+
+ *[0-7])
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw='% 200'
+ fi
+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+ *)
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw=,u+rw
+ fi
+ cp_umask=$mode$u_plus_rw;;
+ esac
+fi
+
for src
do
# Protect names starting with `-'.
case $src in
- -*) src=./$src ;;
+ -*) src=./$src;;
esac
if test -n "$dir_arg"; then
dst=$src
- src=
-
- if test -d "$dst"; then
- mkdircmd=:
- chmodcmd=
- else
- mkdircmd=$mkdirprog
- fi
+ dstdir=$dst
+ test -d "$dstdir"
+ dstdir_status=$?
else
+
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
@@ -190,71 +248,199 @@ do
exit 1
fi
- if test -z "$dstarg"; then
+ if test -z "$dst_arg"; then
echo "$0: no destination specified." >&2
exit 1
fi
- dst=$dstarg
+ dst=$dst_arg
# Protect names starting with `-'.
case $dst in
- -*) dst=./$dst ;;
+ -*) dst=./$dst;;
esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
if test -n "$no_target_directory"; then
- echo "$0: $dstarg: Is a directory" >&2
+ echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
- dst=$dst/`basename "$src"`
+ dstdir=$dst
+ dst=$dstdir/`basename "$src"`
+ dstdir_status=0
+ else
+ # Prefer dirname, but fall back on a substitute if dirname fails.
+ dstdir=`
+ (dirname "$dst") 2>/dev/null ||
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
+ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$dst" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'
+ `
+
+ test -d "$dstdir"
+ dstdir_status=$?
fi
fi
- # This sed command emulates the dirname command.
- dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+ obsolete_mkdir_used=false
+
+ if test $dstdir_status != 0; then
+ case $posix_mkdir in
+ '')
+ # Create intermediate dirs using mode 755 as modified by the umask.
+ # This is like FreeBSD 'install' as of 1997-10-28.
+ umask=`umask`
+ case $stripcmd.$umask in
+ # Optimize common cases.
+ *[2367][2367]) mkdir_umask=$umask;;
+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+ *[0-7])
+ mkdir_umask=`expr $umask + 22 \
+ - $umask % 100 % 40 + $umask % 20 \
+ - $umask % 10 % 4 + $umask % 2
+ `;;
+ *) mkdir_umask=$umask,go-w;;
+ esac
+
+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+ mkdir_mode=-m$mode
+ else
+ mkdir_mode=
+ fi
+
+ posix_mkdir=false
+ case $umask in
+ *[123567][0-7][0-7])
+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+ ;;
+ *)
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+ if (umask $mkdir_umask &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ then
+ if test -z "$dir_arg" || {
+ # Check for POSIX incompatibilities with -m.
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+ # other-writeable bit of parent directory when it shouldn't.
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ case $ls_ld_tmpdir in
+ d????-?r-*) different_mode=700;;
+ d????-?--*) different_mode=755;;
+ *) false;;
+ esac &&
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+ }
+ }
+ then posix_mkdir=:
+ fi
+ rmdir "$tmpdir/d" "$tmpdir"
+ else
+ # Remove any dirs left behind by ancient mkdir implementations.
+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ fi
+ trap '' 0;;
+ esac;;
+ esac
- # Make sure that the destination directory exists.
+ if
+ $posix_mkdir && (
+ umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+ )
+ then :
+ else
- # Skip lots of stat calls in the usual case.
- if test ! -d "$dstdir"; then
- defaultIFS='
- '
- IFS="${IFS-$defaultIFS}"
+ # The umask is ridiculous, or mkdir does not conform to POSIX,
+ # or it failed possibly due to a race condition. Create the
+ # directory the slow way, step by step, checking for races as we go.
- oIFS=$IFS
- # Some sh's can't handle IFS=/ for some reason.
- IFS='%'
- set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
- shift
- IFS=$oIFS
+ case $dstdir in
+ /*) prefix='/';;
+ -*) prefix='./';;
+ *) prefix='';;
+ esac
- pathcomp=
+ eval "$initialize_posix_glob"
- while test $# -ne 0 ; do
- pathcomp=$pathcomp$1
+ oIFS=$IFS
+ IFS=/
+ $posix_glob set -f
+ set fnord $dstdir
shift
- if test ! -d "$pathcomp"; then
- $mkdirprog "$pathcomp"
- # mkdir can fail with a `File exist' error in case several
- # install-sh are creating the directory concurrently. This
- # is OK.
- test -d "$pathcomp" || exit
+ $posix_glob set +f
+ IFS=$oIFS
+
+ prefixes=
+
+ for d
+ do
+ test -z "$d" && continue
+
+ prefix=$prefix$d
+ if test -d "$prefix"; then
+ prefixes=
+ else
+ if $posix_mkdir; then
+ (umask=$mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+ # Don't fail if two instances are running concurrently.
+ test -d "$prefix" || exit 1
+ else
+ case $prefix in
+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) qprefix=$prefix;;
+ esac
+ prefixes="$prefixes '$qprefix'"
+ fi
+ fi
+ prefix=$prefix/
+ done
+
+ if test -n "$prefixes"; then
+ # Don't fail if two instances are running concurrently.
+ (umask $mkdir_umask &&
+ eval "\$doit_exec \$mkdirprog $prefixes") ||
+ test -d "$dstdir" || exit 1
+ obsolete_mkdir_used=true
fi
- pathcomp=$pathcomp/
- done
+ fi
fi
if test -n "$dir_arg"; then
- $doit $mkdircmd "$dst" \
- && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
else
- dstfile=`basename "$dst"`
# Make a couple of temp file names in the proper directory.
dsttmp=$dstdir/_inst.$$_
@@ -262,10 +448,9 @@ do
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
- trap '(exit $?); exit' 1 2 13 15
# Copy the file name to the temp name.
- $doit $cpprog "$src" "$dsttmp" &&
+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
# and set any options; do chmod last to preserve setuid bits.
#
@@ -273,48 +458,59 @@ do
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $cpprog $src $dsttmp" command.
#
- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-
- # Now rename the file to the real destination.
- { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
- || {
- # The rename failed, perhaps because mv can't rename something else
- # to itself, or perhaps because mv is so ancient that it does not
- # support -f.
-
- # Now remove or move aside any old file at destination location.
- # We try this two ways since rm can't unlink itself on some
- # systems and the destination file might be busy for other
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
- if test -f "$dstdir/$dstfile"; then
- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
- || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
- || {
- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
- (exit 1); exit 1
- }
- else
- :
- fi
- } &&
-
- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
- }
- }
- fi || { (exit 1); exit 1; }
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+ # If -C, don't bother to copy if it wouldn't change the file.
+ if $copy_on_change &&
+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
+
+ eval "$initialize_posix_glob" &&
+ $posix_glob set -f &&
+ set X $old && old=:$2:$4:$5:$6 &&
+ set X $new && new=:$2:$4:$5:$6 &&
+ $posix_glob set +f &&
+
+ test "$old" = "$new" &&
+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+ then
+ rm -f "$dsttmp"
+ else
+ # Rename the file to the real destination.
+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+ {
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ test ! -f "$dst" ||
+ $doit $rmcmd -f "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+ } ||
+ { echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ fi || exit 1
+
+ trap '' 0
+ fi
done
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
- (exit 0); exit 0
-}
-
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
diff --git a/xorg-server/xkbdata.src/keycodes/Makefile.in b/xorg-server/xkbdata.src/keycodes/Makefile.in
index 552016071..1df15c3a1 100644
--- a/xorg-server/xkbdata.src/keycodes/Makefile.in
+++ b/xorg-server/xkbdata.src/keycodes/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -18,15 +18,11 @@
# Replaces Imake's MakeXkbDir() rule
# svu: taken from xkbdata
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -52,10 +48,11 @@ SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -66,14 +63,14 @@ am__installdirs = "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(keycodesdir)"
dist_dirDATA_INSTALL = $(INSTALL_DATA)
dist_keycodesDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_dir_DATA) $(dist_keycodes_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -86,10 +83,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -103,43 +96,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -159,15 +133,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -175,6 +149,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -198,8 +173,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
SUBDIRS = digital_vndr sgi_vndr
@@ -230,8 +209,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -255,10 +234,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_dirDATA: $(dist_dir_DATA)
@$(NORMAL_INSTALL)
- test -z "$(dirdir)" || $(mkdir_p) "$(DESTDIR)$(dirdir)"
+ test -z "$(dirdir)" || $(MKDIR_P) "$(DESTDIR)$(dirdir)"
@list='$(dist_dir_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -275,7 +253,7 @@ uninstall-dist_dirDATA:
done
install-dist_keycodesDATA: $(dist_keycodes_DATA)
@$(NORMAL_INSTALL)
- test -z "$(keycodesdir)" || $(mkdir_p) "$(DESTDIR)$(keycodesdir)"
+ test -z "$(keycodesdir)" || $(MKDIR_P) "$(DESTDIR)$(keycodesdir)"
@list='$(dist_keycodes_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -322,8 +300,7 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -367,8 +344,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -393,8 +370,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -404,13 +381,12 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -424,23 +400,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/..
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -454,7 +428,7 @@ distdir: $(DISTFILES)
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -462,6 +436,8 @@ distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -472,7 +448,7 @@ all-am: Makefile $(DATA)
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(keycodesdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
install-exec: install-exec-recursive
@@ -519,12 +495,20 @@ info-am:
install-data-am: install-dist_dirDATA install-dist_keycodesDATA
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -543,24 +527,25 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-dist_dirDATA uninstall-dist_keycodesDATA \
- uninstall-info-am
+uninstall-am: uninstall-dist_dirDATA uninstall-dist_keycodesDATA
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- clean clean-generic clean-recursive ctags ctags-recursive \
- distclean distclean-generic distclean-recursive distclean-tags \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic ctags \
+ ctags-recursive distclean distclean-generic distclean-tags \
distdir dvi dvi-am html html-am info info-am install \
install-am install-data install-data-am install-dist_dirDATA \
- install-dist_keycodesDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ install-dist_keycodesDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am uninstall-dist_dirDATA \
- uninstall-dist_keycodesDATA uninstall-info-am
+ uninstall-dist_keycodesDATA
$(subdir).dir: $(dir_data)
diff --git a/xorg-server/xkbdata.src/keycodes/amiga b/xorg-server/xkbdata.src/keycodes/amiga
index 7b661a5cf..7d2576701 100644
--- a/xorg-server/xkbdata.src/keycodes/amiga
+++ b/xorg-server/xkbdata.src/keycodes/amiga
@@ -7,7 +7,7 @@
default xkb_keycodes "usa1" {
minimum= 8;
- maximum= 111;
+ maximum= 255;
<ESC> = 77;
<FK01> = 88;
@@ -119,7 +119,7 @@ default xkb_keycodes "usa1" {
xkb_keycodes "de" {
minimum= 8;
- maximum= 111;
+ maximum= 255;
<ESC> = 77;
<FK01> = 88;
diff --git a/xorg-server/xkbdata.src/keycodes/ataritt b/xorg-server/xkbdata.src/keycodes/ataritt
index 3cfd503be..7eae09f49 100644
--- a/xorg-server/xkbdata.src/keycodes/ataritt
+++ b/xorg-server/xkbdata.src/keycodes/ataritt
@@ -7,7 +7,7 @@
default xkb_keycodes "us" {
minimum= 8;
- maximum= 134;
+ maximum= 255;
<ESC> = 9;
<AE01> = 10;
diff --git a/xorg-server/xkbdata.src/keycodes/digital_vndr/Makefile.in b/xorg-server/xkbdata.src/keycodes/digital_vndr/Makefile.in
index 3ca867294..c4645694c 100644
--- a/xorg-server/xkbdata.src/keycodes/digital_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/keycodes/digital_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_keycodes_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
keycodesdir = $(xkb_base)/keycodes/digital_vndr
@@ -198,8 +174,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -223,10 +199,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_keycodesDATA: $(dist_keycodes_DATA)
@$(NORMAL_INSTALL)
- test -z "$(keycodesdir)" || $(mkdir_p) "$(DESTDIR)$(keycodesdir)"
+ test -z "$(keycodesdir)" || $(MKDIR_P) "$(DESTDIR)$(keycodesdir)"
@list='$(dist_keycodes_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -249,22 +224,21 @@ CTAGS:
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -280,7 +254,7 @@ check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(keycodesdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -326,12 +300,20 @@ info-am:
install-data-am: install-dist_keycodesDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -350,17 +332,21 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_keycodesDATA uninstall-info-am
+uninstall-am: uninstall-dist_keycodesDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_keycodesDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ install-dist_keycodesDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_keycodesDATA uninstall-info-am
+ uninstall-dist_keycodesDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/keycodes/evdev b/xorg-server/xkbdata.src/keycodes/evdev
index 673a967e6..d6963a2d5 100644
--- a/xorg-server/xkbdata.src/keycodes/evdev
+++ b/xorg-server/xkbdata.src/keycodes/evdev
@@ -36,6 +36,7 @@ default xkb_keycodes "evdev" {
<AD11> = 34;
<AD12> = 35;
<BKSL> = 51;
+ alias <AC12> = <BKSL>;
<RTRN> = 36;
<CAPS> = 66;
@@ -145,7 +146,8 @@ default xkb_keycodes "evdev" {
// Keys that are generated on Japanese keyboards
- <HZTG> = 93; // Hankaku/Zenkakau toggle
+ //<HZTG> = 93; // Hankaku/Zenkakau toggle - not actually used
+ alias <HZTG> = <TLDE>;
<HKTG> = 101; // Hiragana/Katakana toggle
<AB11> = 97; // backslash/underscore
<HENK> = 100; // Henkan
@@ -270,7 +272,7 @@ default xkb_keycodes "evdev" {
<I244> = 244; // #define KEY_BATTERY 236
<I245> = 245; // #define KEY_BLUETOOTH 237
<I246> = 246; // #define KEY_WLAN 238
- <I247> = 247; // (not defined in input.h) 239
+ <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
@@ -299,18 +301,9 @@ default xkb_keycodes "evdev" {
indicator 11 = "Charging";
alias <ALGR> = <RALT>;
-};
-// For japanese 106 keyboard.
-xkb_keycodes "jp106" {
- include "evdev(evdev)"
- <HZTG> = 49;
- <AC12> = 51;
-};
-
-// For brazilian ABNT2 keyboard.
-xkb_keycodes "abnt2" {
- include "evdev(evdev)"
+ // For Brazilian ABNT2
+ alias <KPPT> = <I129>;
};
// PC98
diff --git a/xorg-server/xkbdata.src/keycodes/fujitsu b/xorg-server/xkbdata.src/keycodes/fujitsu
index e0e63c6b5..c36a3a984 100644
--- a/xorg-server/xkbdata.src/keycodes/fujitsu
+++ b/xorg-server/xkbdata.src/keycodes/fujitsu
@@ -27,7 +27,7 @@
default xkb_keycodes "138" {
minimum= 8;
- maximum= 156;
+ maximum= 255;
<ESC> = 37;
<AE01> = 38;
diff --git a/xorg-server/xkbdata.src/keycodes/keycodes.dir b/xorg-server/xkbdata.src/keycodes/keycodes.dir
index 002037e6f..f1d572ad5 100644
--- a/xorg-server/xkbdata.src/keycodes/keycodes.dir
+++ b/xorg-server/xkbdata.src/keycodes/keycodes.dir
@@ -1,18 +1,6 @@
-d------ -------- macintosh(macintosh)
--------- -------- macintosh(badmap)
--------- -------- macintosh(goodmap)
-------- -------- macintosh(old)
-------- -------- macintosh(hhk)
--d------ -------- aliases(qwerty)
--------- -------- aliases(azerty)
--------- -------- aliases(qwertz)
--------- -------- sony(nwp5461)
--d------ -------- fujitsu(138)
--d------ -------- xfree98(pc98)
--d------ -------- evdev(evdev)
--------- -------- evdev(jp106)
--------- -------- evdev(abnt2)
--------- -------- evdev(pc98)
-d------ -------- sun(type4)
-------- -------- sun(type5)
-------- -------- sun(type4tuv)
@@ -38,12 +26,12 @@
-------- -------- sun(type4__se)
-------- -------- sun(type4_se)
-------- -------- sun(type4_se_swapctl)
--d------ -------- amiga(usa1)
--------- -------- amiga(de)
+-d------ -------- xfree98(pc98)
+-d------ -------- fujitsu(138)
-d------ -------- hp(hp-101)
-------- -------- hp(hil)
--d------ -------- sgi_vndr/indigo(pc101)
--------- -------- sgi_vndr/indigo(pc102)
+-------- -------- ibm(rs6k-101)
+-------- -------- ibm(rs6k-102)
-d------ -------- sgi_vndr/indy(universal)
-------- -------- sgi_vndr/indy(pc101)
-------- -------- sgi_vndr/indy(pc102)
@@ -52,9 +40,28 @@
-------- -------- sgi_vndr/indy(jp106)
h-p----- -------- sgi_vndr/indy(overlayKeypad)
h-p----- -------- sgi_vndr/indy(shiftLock)
+-d------ -------- sgi_vndr/indigo(pc101)
+-------- -------- sgi_vndr/indigo(pc102)
-d------ -------- sgi_vndr/iris(iris)
--------- -------- ibm(rs6k-101)
--------- -------- ibm(rs6k-102)
+-------- -------- sony(nwp5461)
+-d------ -------- evdev(evdev)
+-------- -------- evdev(pc98)
+-d------ -------- xfree86(xfree86)
+-------- -------- xfree86(basic)
+-------- -------- xfree86(102)
+-------- -------- xfree86(thinkpadz60)
+-d------ -------- ataritt(us)
+-------- -------- ataritt(de)
+-------- -------- digital_vndr/pc(pc_common)
+-------- -------- digital_vndr/pc(pc10x)
+-------- -------- digital_vndr/pc(pc101)
+-------- -------- digital_vndr/pc(pc102)
+-------- -------- digital_vndr/pc(pc104)
+-------- -------- digital_vndr/pc(lk411_common)
+-------- -------- digital_vndr/pc(lk411)
+-------- -------- digital_vndr/pc(lk450)
+-------- -------- digital_vndr/pc(pcxajaa)
+-------- -------- digital_vndr/pc(lk411jj)
-------- -------- digital_vndr/lk(lk_common)
-------- -------- digital_vndr/lk(lkx01)
-------- -------- digital_vndr/lk(lk201)
@@ -67,21 +74,8 @@ h-p----- -------- sgi_vndr/indy(shiftLock)
-------- -------- digital_vndr/lk(lk421jj)
-------- -------- digital_vndr/lk(lk401bj)
-------- -------- digital_vndr/lk(lk401jj)
--------- -------- digital_vndr/pc(pc_common)
--------- -------- digital_vndr/pc(pc10x)
--------- -------- digital_vndr/pc(pc101)
--------- -------- digital_vndr/pc(pc102)
--------- -------- digital_vndr/pc(pc104)
--------- -------- digital_vndr/pc(lk411_common)
--------- -------- digital_vndr/pc(lk411)
--------- -------- digital_vndr/pc(lk450)
--------- -------- digital_vndr/pc(pcxajaa)
--------- -------- digital_vndr/pc(lk411jj)
--d------ -------- ataritt(us)
--------- -------- ataritt(de)
--d------ -------- xfree86(xfree86)
--------- -------- xfree86(basic)
--------- -------- xfree86(102)
--------- -------- xfree86(jp106)
--------- -------- xfree86(abnt2)
--------- -------- xfree86(thinkpadz60)
+-d------ -------- aliases(qwerty)
+-------- -------- aliases(azerty)
+-------- -------- aliases(qwertz)
+-d------ -------- amiga(usa1)
+-------- -------- amiga(de)
diff --git a/xorg-server/xkbdata.src/keycodes/macintosh b/xorg-server/xkbdata.src/keycodes/macintosh
index 8f5418b25..d41ac4bcb 100644
--- a/xorg-server/xkbdata.src/keycodes/macintosh
+++ b/xorg-server/xkbdata.src/keycodes/macintosh
@@ -38,20 +38,10 @@ default xkb_keycodes "macintosh" {
};
-xkb_keycodes "badmap" {
- <TLDE> = 94;
- <LSGT> = 49;
-};
-
-xkb_keycodes "goodmap" {
- <TLDE> = 49;
- <LSGT> = 94;
-};
-
xkb_keycodes "old" {
minimum= 8;
- maximum= 134;
+ maximum= 255;
<ESC> = 61;
<TLDE> = 58;
diff --git a/xorg-server/xkbdata.src/keycodes/sgi_vndr/Makefile.in b/xorg-server/xkbdata.src/keycodes/sgi_vndr/Makefile.in
index f913b105b..a064ed494 100644
--- a/xorg-server/xkbdata.src/keycodes/sgi_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/keycodes/sgi_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_keycodes_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
keycodesdir = $(xkb_base)/keycodes/sgi_vndr
@@ -198,8 +174,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -223,10 +199,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_keycodesDATA: $(dist_keycodes_DATA)
@$(NORMAL_INSTALL)
- test -z "$(keycodesdir)" || $(mkdir_p) "$(DESTDIR)$(keycodesdir)"
+ test -z "$(keycodesdir)" || $(MKDIR_P) "$(DESTDIR)$(keycodesdir)"
@list='$(dist_keycodes_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -249,22 +224,21 @@ CTAGS:
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -280,7 +254,7 @@ check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(keycodesdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -326,12 +300,20 @@ info-am:
install-data-am: install-dist_keycodesDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -350,17 +332,21 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_keycodesDATA uninstall-info-am
+uninstall-am: uninstall-dist_keycodesDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_keycodesDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ install-dist_keycodesDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_keycodesDATA uninstall-info-am
+ uninstall-dist_keycodesDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/keycodes/sgi_vndr/indigo b/xorg-server/xkbdata.src/keycodes/sgi_vndr/indigo
index fd87e57ba..6605ade53 100644
--- a/xorg-server/xkbdata.src/keycodes/sgi_vndr/indigo
+++ b/xorg-server/xkbdata.src/keycodes/sgi_vndr/indigo
@@ -1,7 +1,7 @@
// $Xorg: indigo,v 1.3 2000/08/17 19:54:39 cpqbld Exp $
default xkb_keycodes "pc101" {
- minimum= 10;
- maximum= 118;
+ minimum= 8;
+ maximum= 255;
<TLDE> = 62;
<AE01> = 15;
diff --git a/xorg-server/xkbdata.src/keycodes/sgi_vndr/indy b/xorg-server/xkbdata.src/keycodes/sgi_vndr/indy
index a777c374b..e16a0cbc1 100644
--- a/xorg-server/xkbdata.src/keycodes/sgi_vndr/indy
+++ b/xorg-server/xkbdata.src/keycodes/sgi_vndr/indy
@@ -1,15 +1,15 @@
// $Xorg: indy,v 1.3 2000/08/17 19:54:39 cpqbld Exp $
default xkb_keycodes "universal" {
- minimum= 15;
- maximum= 149;
+ minimum= 8;
+ maximum= 255;
include "sgi_vndr/indy(pc105)"
alternate <BKSL> = 91;
alternate <BKSL> = 100;
alternate <BKSL> = 101;
};
xkb_keycodes "pc101" {
- minimum= 15;
- maximum= 149;
+ minimum= 8;
+ maximum= 255;
<TLDE> = 22;
<AE01> = 30;
@@ -147,13 +147,13 @@ xkb_keycodes "pc102" {
<BKSL> = 91;
<LSGT> = 27;
augment "sgi_vndr/indy(pc101)"
- maximum= 149;
- minimum= 15;
+ maximum= 255;
+ minimum= 8;
};
xkb_keycodes "pc104" {
include "sgi_vndr/indy(pc101)"
- minimum= 15;
- maximum= 149;
+ minimum= 8;
+ maximum= 255;
// These key names are here to support so-called "Windows95"
// keyboards like the Microsoft Natural keyboard.
@@ -164,8 +164,8 @@ xkb_keycodes "pc104" {
xkb_keycodes "pc105" {
<LSGT> = 27;
augment "sgi_vndr/indy(pc104)"
- minimum= 15;
- maximum= 149;
+ minimum= 8;
+ maximum= 255;
};
xkb_keycodes "jp106" {
<HZTG> = 22;
@@ -178,8 +178,8 @@ xkb_keycodes "jp106" {
alias <AE00> = <HZTG>;
alias <AE13> = <BKSL>;
augment "sgi_vndr/indy(pc101)"
- minimum= 15;
- maximum= 149;
+ minimum= 8;
+ maximum= 255;
};
// can be combined with any other "indy" keycode
// description to add virtual keys which can be
diff --git a/xorg-server/xkbdata.src/keycodes/sun b/xorg-server/xkbdata.src/keycodes/sun
index 70400a4c6..cdf8694fc 100644
--- a/xorg-server/xkbdata.src/keycodes/sun
+++ b/xorg-server/xkbdata.src/keycodes/sun
@@ -61,7 +61,7 @@
default xkb_keycodes "type4" {
minimum= 8;
- maximum= 132;
+ maximum= 255;
<ESC> = 36;
<AE01> = 37;
@@ -192,7 +192,7 @@ default xkb_keycodes "type4" {
xkb_keycodes "type5" {
minimum= 8;
- maximum= 132;
+ maximum= 255;
<ESC> = 36;
<AE01> = 37;
@@ -379,7 +379,7 @@ xkb_keycodes "type5_euro" {
xkb_keycodes "type5hobo" {
minimum= 8;
- maximum= 132;
+ maximum= 255;
<ESC> = 36;
<AE01> = 37;
@@ -606,7 +606,7 @@ xkb_keycodes "type6_jp_usb" {
xkb_keycodes "type5_se" {
minimum= 8;
- maximum= 132;
+ maximum= 255;
// Row G
<HELP> = 125;
@@ -788,7 +788,7 @@ xkb_keycodes "type5c_se" {
xkb_keycodes "type4__se" {
minimum= 8;
- maximum= 132;
+ maximum= 255;
// Row F
<STOP> = 8;
diff --git a/xorg-server/xkbdata.src/keycodes/xfree86 b/xorg-server/xkbdata.src/keycodes/xfree86
index f140a841b..bf91fa8ff 100644
--- a/xorg-server/xkbdata.src/keycodes/xfree86
+++ b/xorg-server/xkbdata.src/keycodes/xfree86
@@ -12,6 +12,7 @@
default xkb_keycodes "xfree86" {
include "xfree86(basic)"
<BKSL> = 51;
+ alias <AC12> = <BKSL>;
<LSGT> = 94;
};
@@ -255,10 +256,10 @@ xkb_keycodes "basic" {
// <I53> = 211; <K73>
<I54> = 212;
<I55> = 213;
- <OUTP> = 214;
- <KITG> = 215;
- <KIDN> = 216;
- <KIUP> = 217;
+ <I56> = 214;
+ <I57> = 215;
+ <I58> = 216;
+ <I59> = 217;
<I5A> = 218;
// <I5B> = 219; <K74>
// <I5C> = 220; <K75>
@@ -351,6 +352,10 @@ xkb_keycodes "basic" {
alias <PAST> = <I18>;
alias <FIND> = <I19>;
alias <CUT> = <I1A>;
+ alias <OUTP> = <I56>;
+ alias <KITG> = <I57>;
+ alias <KIDN> = <I58>;
+ alias <KIUP> = <I59>;
// Other codes never generated. The XFree86 ddx never generates
// these codes.
@@ -367,6 +372,9 @@ xkb_keycodes "basic" {
indicator 3 = "Scroll Lock";
alias <ALGR> = <RALT>;
+
+ // For Brazilian ABNT2
+ alias <KPPT> = <I06>;
};
// What keyboard is this?
@@ -400,22 +408,6 @@ xkb_keycodes "102" {
};
-// For japanese 106 keyboard. by tsuka(tsuka@kawalab.dnj.ynu.ac.jp)
-//
-// All of the keycodes here are now in the basic "xfree86" set.
-//
-xkb_keycodes "jp106" {
- include "xfree86(basic)"
- <AC12> = 51;
-};
-
-
-// For brazilian ABNT2 keyboard. by Ricardo Y. Igarashi(iga@that.com.br)
-xkb_keycodes "abnt2" {
- include "xfree86(xfree86)"
- <KPPT> = 134;
-};
-
// IBM ThinkPad Z60m/Z60t/Z61m/Z61t
xkb_keycodes "thinkpadz60" {
include "xfree86(xfree86)"
diff --git a/xorg-server/xkbdata.src/keycodes/xfree98 b/xorg-server/xkbdata.src/keycodes/xfree98
index 6d34772f9..59483caf3 100644
--- a/xorg-server/xkbdata.src/keycodes/xfree98
+++ b/xorg-server/xkbdata.src/keycodes/xfree98
@@ -29,7 +29,7 @@
default xkb_keycodes "pc98" {
minimum= 8;
- maximum= 134;
+ maximum= 255;
<ESC> = 8;
<AE01> = 9;
diff --git a/xorg-server/xkbdata.src/keymap/Makefile.in b/xorg-server/xkbdata.src/keymap/Makefile.in
index dab44ddd0..e9ea9ca8e 100644
--- a/xorg-server/xkbdata.src/keymap/Makefile.in
+++ b/xorg-server/xkbdata.src/keymap/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -18,15 +18,11 @@
# Replaces Imake's MakeXkbDir() rule
# svu: taken from xkbdata
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -52,10 +48,11 @@ SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -66,14 +63,14 @@ am__installdirs = "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(keymapdir)"
dist_dirDATA_INSTALL = $(INSTALL_DATA)
dist_keymapDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_dir_DATA) $(dist_keymap_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -86,10 +83,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -103,43 +96,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -159,15 +133,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -175,6 +149,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -198,8 +173,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
SUBDIRS = digital_vndr sgi_vndr sun_vndr
@@ -220,8 +199,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -245,10 +224,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_dirDATA: $(dist_dir_DATA)
@$(NORMAL_INSTALL)
- test -z "$(dirdir)" || $(mkdir_p) "$(DESTDIR)$(dirdir)"
+ test -z "$(dirdir)" || $(MKDIR_P) "$(DESTDIR)$(dirdir)"
@list='$(dist_dir_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -265,7 +243,7 @@ uninstall-dist_dirDATA:
done
install-dist_keymapDATA: $(dist_keymap_DATA)
@$(NORMAL_INSTALL)
- test -z "$(keymapdir)" || $(mkdir_p) "$(DESTDIR)$(keymapdir)"
+ test -z "$(keymapdir)" || $(MKDIR_P) "$(DESTDIR)$(keymapdir)"
@list='$(dist_keymap_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -312,8 +290,7 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -357,8 +334,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -383,8 +360,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -394,13 +371,12 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -414,23 +390,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/..
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -444,7 +418,7 @@ distdir: $(DISTFILES)
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -452,6 +426,8 @@ distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -462,7 +438,7 @@ all-am: Makefile $(DATA)
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(keymapdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
install-exec: install-exec-recursive
@@ -509,12 +485,20 @@ info-am:
install-data-am: install-dist_dirDATA install-dist_keymapDATA
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -533,24 +517,25 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-dist_dirDATA uninstall-dist_keymapDATA \
- uninstall-info-am
+uninstall-am: uninstall-dist_dirDATA uninstall-dist_keymapDATA
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- clean clean-generic clean-recursive ctags ctags-recursive \
- distclean distclean-generic distclean-recursive distclean-tags \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic ctags \
+ ctags-recursive distclean distclean-generic distclean-tags \
distdir dvi dvi-am html html-am info info-am install \
install-am install-data install-data-am install-dist_dirDATA \
- install-dist_keymapDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ install-dist_keymapDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am uninstall-dist_dirDATA \
- uninstall-dist_keymapDATA uninstall-info-am
+ uninstall-dist_keymapDATA
$(subdir).dir: $(dir_data)
diff --git a/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.in b/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.in
index 08bf4b750..808af57f2 100644
--- a/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_keymap_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
keymapdir = $(xkb_base)/keymap/digital_vndr
@@ -198,8 +174,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -223,10 +199,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_keymapDATA: $(dist_keymap_DATA)
@$(NORMAL_INSTALL)
- test -z "$(keymapdir)" || $(mkdir_p) "$(DESTDIR)$(keymapdir)"
+ test -z "$(keymapdir)" || $(MKDIR_P) "$(DESTDIR)$(keymapdir)"
@list='$(dist_keymap_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -249,22 +224,21 @@ CTAGS:
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -280,7 +254,7 @@ check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(keymapdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -326,12 +300,20 @@ info-am:
install-data-am: install-dist_keymapDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -350,17 +332,21 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_keymapDATA uninstall-info-am
+uninstall-am: uninstall-dist_keymapDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_keymapDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ install-dist_keymapDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_keymapDATA uninstall-info-am
+ uninstall-dist_keymapDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/keymap/keymap.dir b/xorg-server/xkbdata.src/keymap/keymap.dir
index 6dbb8f1b7..7b8f07a92 100644
--- a/xorg-server/xkbdata.src/keymap/keymap.dir
+++ b/xorg-server/xkbdata.src/keymap/keymap.dir
@@ -1,11 +1,135 @@
-d------ -------- macintosh(macintosh)
-------- -------- macintosh(macintosh_old)
--------- -------- sun_vndr/de(type4_de)
--------- -------- sun_vndr/de(type4_de_nodeadkeys)
--------- -------- sun_vndr/de(type4_de_openlook)
--d------ -------- sun_vndr/de(type5_de)
--------- -------- sun_vndr/de(type5_de_nodeadkeys)
--------- -------- sun_vndr/de(type5_de_openlook)
+-d------ -------- xfree98(jp)
+-d------ -------- sgi_vndr/fr(indy)
+-------- -------- sgi_vndr/fr(indy_nodeadkeys)
+-------- -------- sgi_vndr/fr(indigo)
+-------- -------- sgi_vndr/fr(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/dvorak(indy)
+-------- -------- sgi_vndr/dvorak(indigo)
+-d------ -------- sgi_vndr/ch(de_indy)
+-------- -------- sgi_vndr/ch(de_indy_nodeadkeys)
+-------- -------- sgi_vndr/ch(de_indigo)
+-------- -------- sgi_vndr/ch(de_indigo_nodeadkeys)
+-------- -------- sgi_vndr/ch(fr_indy)
+-------- -------- sgi_vndr/ch(fr_indy_nodeadkeys)
+-------- -------- sgi_vndr/ch(fr_indigo)
+-------- -------- sgi_vndr/ch(fr_indigo_nodeadkeys)
+-d------ -------- sgi_vndr/pl(indy)
+-------- -------- sgi_vndr/pl(indy_nodeadkeys)
+-------- -------- sgi_vndr/pl(indigo)
+-------- -------- sgi_vndr/pl(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/th(indy)
+-------- -------- sgi_vndr/th(indigo)
+-d------ -------- sgi_vndr/no(indy)
+-------- -------- sgi_vndr/no(indy_nodeadkeys)
+-------- -------- sgi_vndr/no(indigo)
+-------- -------- sgi_vndr/no(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/es(indy)
+-------- -------- sgi_vndr/es(indy_nodeadkeys)
+-------- -------- sgi_vndr/es(indigo)
+-------- -------- sgi_vndr/es(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/cz(indy)
+-------- -------- sgi_vndr/cz(indigo)
+-------- -------- sgi_vndr/cz(indy_qwerty)
+-------- -------- sgi_vndr/cz(indigo_qwerty)
+-d------ -------- sgi_vndr/hu(indy)
+-------- -------- sgi_vndr/hu(indy_toggle)
+-------- -------- sgi_vndr/hu(indy_shift_toggle)
+-------- -------- sgi_vndr/hu(indy_ctrl_shift_toggle)
+-------- -------- sgi_vndr/hu(indy_ctrl_alt_toggle)
+-------- -------- sgi_vndr/hu(indy_caps_toggle)
+-------- -------- sgi_vndr/hu(indigo)
+-------- -------- sgi_vndr/hu(indigo_toggle)
+-------- -------- sgi_vndr/hu(indigo_shift_toggle)
+-------- -------- sgi_vndr/hu(indigo_ctrl_shift_toggle)
+-------- -------- sgi_vndr/hu(indigo_ctrl_alt_toggle)
+-------- -------- sgi_vndr/hu(indigo_caps_toggle)
+-d------ -------- sgi_vndr/en_US(indy)
+-------- -------- sgi_vndr/en_US(indy_nodeadkeys)
+-------- -------- sgi_vndr/en_US(indy101)
+-------- -------- sgi_vndr/en_US(indy101_nodeadkeys)
+-------- -------- sgi_vndr/en_US(indy104)
+-------- -------- sgi_vndr/en_US(indy104_nodeadkeys)
+-------- -------- sgi_vndr/en_US(indigo)
+-------- -------- sgi_vndr/en_US(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/jp(indy)
+-d------ -------- sgi_vndr/gb(indy)
+-------- -------- sgi_vndr/gb(indy_nodeadkeys)
+-------- -------- sgi_vndr/gb(indigo)
+-------- -------- sgi_vndr/gb(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/se(indy)
+-------- -------- sgi_vndr/se(indy_nodeadkeys)
+-------- -------- sgi_vndr/se(indigo)
+-------- -------- sgi_vndr/se(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/dk(indy)
+-------- -------- sgi_vndr/dk(indy_nodeadkeys)
+-------- -------- sgi_vndr/dk(indigo)
+-------- -------- sgi_vndr/dk(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/sk(indy)
+-------- -------- sgi_vndr/sk(indigo)
+-------- -------- sgi_vndr/sk(indy_qwerty)
+-------- -------- sgi_vndr/sk(indigo_qwerty)
+-d------ -------- sgi_vndr/pt(indy)
+-------- -------- sgi_vndr/pt(indy_nodeadkeys)
+-------- -------- sgi_vndr/pt(indigo)
+-------- -------- sgi_vndr/pt(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/us(indy)
+-------- -------- sgi_vndr/us(indy101_euro)
+-------- -------- sgi_vndr/us(indy_compose)
+-------- -------- sgi_vndr/us(indigo)
+-------- -------- sgi_vndr/us(indigo_compose)
+-------- -------- sgi_vndr/us(indigo101_compose)
+-d------ -------- sgi_vndr/ca(indy)
+-------- -------- sgi_vndr/ca(indy_nodeadkeys)
+-------- -------- sgi_vndr/ca(indigo)
+-------- -------- sgi_vndr/ca(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/de(indy)
+-------- -------- sgi_vndr/de(indy_nodeadkeys)
+-------- -------- sgi_vndr/de(indigo)
+-------- -------- sgi_vndr/de(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/it(indy)
+-------- -------- sgi_vndr/it(indy_nodeadkeys)
+-------- -------- sgi_vndr/it(indigo)
+-------- -------- sgi_vndr/it(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/bg(indy)
+-------- -------- sgi_vndr/bg(indigo)
+-d------ -------- sgi_vndr/be(indy)
+-------- -------- sgi_vndr/be(indy_nodeadkeys)
+-------- -------- sgi_vndr/be(indigo)
+-------- -------- sgi_vndr/be(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/ru(indy)
+-------- -------- sgi_vndr/ru(indy_toggle)
+-------- -------- sgi_vndr/ru(indy_shift_toggle)
+-------- -------- sgi_vndr/ru(indy_ctrl_shift_toggle)
+-------- -------- sgi_vndr/ru(indy_ctrl_alt_toggle)
+-------- -------- sgi_vndr/ru(indy_caps_toggle)
+-------- -------- sgi_vndr/ru(indigo)
+-------- -------- sgi_vndr/ru(indigo_toggle)
+-------- -------- sgi_vndr/ru(indigo_shift_toggle)
+-------- -------- sgi_vndr/ru(indigo_ctrl_shift_toggle)
+-------- -------- sgi_vndr/ru(indigo_ctrl_alt_toggle)
+-------- -------- sgi_vndr/ru(indigo_caps_toggle)
+-d------ -------- sgi_vndr/fi(indy)
+-------- -------- sgi_vndr/fi(indy_nodeadkeys)
+-------- -------- sgi_vndr/fi(indigo)
+-------- -------- sgi_vndr/fi(indigo_nodeadkeys)
+-------- -------- sun_vndr/fr(type4_fr)
+-------- -------- sun_vndr/fr(type4_fr_openlook)
+-d------ -------- sun_vndr/fr(type5_fr)
+-------- -------- sun_vndr/fr(type5_fr_openlook)
+-------- -------- sun_vndr/pl(type4_pl)
+-------- -------- sun_vndr/pl(type4_pl_openlook)
+-d------ -------- sun_vndr/pl(type5_pl)
+-------- -------- sun_vndr/pl(type5_pl_openlook)
+-------- -------- sun_vndr/no(type4_no)
+-------- -------- sun_vndr/no(type4_no_openlook)
+-d------ -------- sun_vndr/no(type5_no)
+-------- -------- sun_vndr/no(type5_no_openlook)
+-------- -------- sun_vndr/es(type4_es)
+-------- -------- sun_vndr/es(type4_es_openlook)
+-d------ -------- sun_vndr/es(type5_es)
+-------- -------- sun_vndr/es(type5_es_openlook)
-------- -------- sun_vndr/all(Belgian6)
-------- -------- sun_vndr/all(Belgian6_usb)
-------- -------- sun_vndr/all(Canada4)
@@ -140,22 +264,6 @@
-------- -------- sun_vndr/uk(type4_uk_openlook)
-d------ -------- sun_vndr/uk(type5_uk)
-------- -------- sun_vndr/uk(type5_uk_openlook)
--------- -------- sun_vndr/fi(type4_fi)
--------- -------- sun_vndr/fi(type4_fi_openlook)
--d------ -------- sun_vndr/fi(type5_fi)
--------- -------- sun_vndr/fi(type5_fi_openlook)
--------- -------- sun_vndr/no(type4_no)
--------- -------- sun_vndr/no(type4_no_openlook)
--d------ -------- sun_vndr/no(type5_no)
--------- -------- sun_vndr/no(type5_no_openlook)
--------- -------- sun_vndr/pl(type4_pl)
--------- -------- sun_vndr/pl(type4_pl_openlook)
--d------ -------- sun_vndr/pl(type5_pl)
--------- -------- sun_vndr/pl(type5_pl_openlook)
--------- -------- sun_vndr/fr(type4_fr)
--------- -------- sun_vndr/fr(type4_fr_openlook)
--d------ -------- sun_vndr/fr(type5_fr)
--------- -------- sun_vndr/fr(type5_fr_openlook)
-d------ -------- sun_vndr/se(type5c_se_fixdollar)
-------- -------- sun_vndr/se(type5c_se)
-------- -------- sun_vndr/se(type5_se)
@@ -168,147 +276,21 @@
-------- -------- sun_vndr/us(type5_us_openlook)
-------- -------- sun_vndr/us(type5_unix)
-------- -------- sun_vndr/us(type5_unix_openlook)
--------- -------- sun_vndr/es(type4_es)
--------- -------- sun_vndr/es(type4_es_openlook)
--d------ -------- sun_vndr/es(type5_es)
--------- -------- sun_vndr/es(type5_es_openlook)
+-------- -------- sun_vndr/de(type4_de)
+-------- -------- sun_vndr/de(type4_de_nodeadkeys)
+-------- -------- sun_vndr/de(type4_de_openlook)
+-d------ -------- sun_vndr/de(type5_de)
+-------- -------- sun_vndr/de(type5_de_nodeadkeys)
+-------- -------- sun_vndr/de(type5_de_openlook)
-------- -------- sun_vndr/ru(type4_ru)
-------- -------- sun_vndr/ru(type4_ru_openlook)
-d------ -------- sun_vndr/ru(type5_ru)
-------- -------- sun_vndr/ru(type5_ru_openlook)
+-------- -------- sun_vndr/fi(type4_fi)
+-------- -------- sun_vndr/fi(type4_fi_openlook)
+-d------ -------- sun_vndr/fi(type5_fi)
+-------- -------- sun_vndr/fi(type5_fi_openlook)
-------- -------- sony(news5000-nwp5461)
--d------ -------- xfree98(jp)
--d------ -------- amiga(usa1)
--------- -------- amiga(de)
--d------ -------- sgi_vndr/de(indy)
--------- -------- sgi_vndr/de(indy_nodeadkeys)
--------- -------- sgi_vndr/de(indigo)
--------- -------- sgi_vndr/de(indigo_nodeadkeys)
--d------ -------- sgi_vndr/fi(indy)
--------- -------- sgi_vndr/fi(indy_nodeadkeys)
--------- -------- sgi_vndr/fi(indigo)
--------- -------- sgi_vndr/fi(indigo_nodeadkeys)
--d------ -------- sgi_vndr/be(indy)
--------- -------- sgi_vndr/be(indy_nodeadkeys)
--------- -------- sgi_vndr/be(indigo)
--------- -------- sgi_vndr/be(indigo_nodeadkeys)
--d------ -------- sgi_vndr/dk(indy)
--------- -------- sgi_vndr/dk(indy_nodeadkeys)
--------- -------- sgi_vndr/dk(indigo)
--------- -------- sgi_vndr/dk(indigo_nodeadkeys)
--d------ -------- sgi_vndr/hu(indy)
--------- -------- sgi_vndr/hu(indy_toggle)
--------- -------- sgi_vndr/hu(indy_shift_toggle)
--------- -------- sgi_vndr/hu(indy_ctrl_shift_toggle)
--------- -------- sgi_vndr/hu(indy_ctrl_alt_toggle)
--------- -------- sgi_vndr/hu(indy_caps_toggle)
--------- -------- sgi_vndr/hu(indigo)
--------- -------- sgi_vndr/hu(indigo_toggle)
--------- -------- sgi_vndr/hu(indigo_shift_toggle)
--------- -------- sgi_vndr/hu(indigo_ctrl_shift_toggle)
--------- -------- sgi_vndr/hu(indigo_ctrl_alt_toggle)
--------- -------- sgi_vndr/hu(indigo_caps_toggle)
--d------ -------- sgi_vndr/cz(indy)
--------- -------- sgi_vndr/cz(indigo)
--------- -------- sgi_vndr/cz(indy_qwerty)
--------- -------- sgi_vndr/cz(indigo_qwerty)
--d------ -------- sgi_vndr/bg(indy)
--------- -------- sgi_vndr/bg(indigo)
--d------ -------- sgi_vndr/sk(indy)
--------- -------- sgi_vndr/sk(indigo)
--------- -------- sgi_vndr/sk(indy_qwerty)
--------- -------- sgi_vndr/sk(indigo_qwerty)
--d------ -------- sgi_vndr/en_US(indy)
--------- -------- sgi_vndr/en_US(indy_nodeadkeys)
--------- -------- sgi_vndr/en_US(indy101)
--------- -------- sgi_vndr/en_US(indy101_nodeadkeys)
--------- -------- sgi_vndr/en_US(indy104)
--------- -------- sgi_vndr/en_US(indy104_nodeadkeys)
--------- -------- sgi_vndr/en_US(indigo)
--------- -------- sgi_vndr/en_US(indigo_nodeadkeys)
--d------ -------- sgi_vndr/jp(indy)
--d------ -------- sgi_vndr/no(indy)
--------- -------- sgi_vndr/no(indy_nodeadkeys)
--------- -------- sgi_vndr/no(indigo)
--------- -------- sgi_vndr/no(indigo_nodeadkeys)
--d------ -------- sgi_vndr/pl(indy)
--------- -------- sgi_vndr/pl(indy_nodeadkeys)
--------- -------- sgi_vndr/pl(indigo)
--------- -------- sgi_vndr/pl(indigo_nodeadkeys)
--d------ -------- sgi_vndr/gb(indy)
--------- -------- sgi_vndr/gb(indy_nodeadkeys)
--------- -------- sgi_vndr/gb(indigo)
--------- -------- sgi_vndr/gb(indigo_nodeadkeys)
--d------ -------- sgi_vndr/ch(de_indy)
--------- -------- sgi_vndr/ch(de_indy_nodeadkeys)
--------- -------- sgi_vndr/ch(de_indigo)
--------- -------- sgi_vndr/ch(de_indigo_nodeadkeys)
--------- -------- sgi_vndr/ch(fr_indy)
--------- -------- sgi_vndr/ch(fr_indy_nodeadkeys)
--------- -------- sgi_vndr/ch(fr_indigo)
--------- -------- sgi_vndr/ch(fr_indigo_nodeadkeys)
--d------ -------- sgi_vndr/pt(indy)
--------- -------- sgi_vndr/pt(indy_nodeadkeys)
--------- -------- sgi_vndr/pt(indigo)
--------- -------- sgi_vndr/pt(indigo_nodeadkeys)
--d------ -------- sgi_vndr/ca(indy)
--------- -------- sgi_vndr/ca(indy_nodeadkeys)
--------- -------- sgi_vndr/ca(indigo)
--------- -------- sgi_vndr/ca(indigo_nodeadkeys)
--d------ -------- sgi_vndr/fr(indy)
--------- -------- sgi_vndr/fr(indy_nodeadkeys)
--------- -------- sgi_vndr/fr(indigo)
--------- -------- sgi_vndr/fr(indigo_nodeadkeys)
--d------ -------- sgi_vndr/se(indy)
--------- -------- sgi_vndr/se(indy_nodeadkeys)
--------- -------- sgi_vndr/se(indigo)
--------- -------- sgi_vndr/se(indigo_nodeadkeys)
--d------ -------- sgi_vndr/us(indy)
--------- -------- sgi_vndr/us(indy101_euro)
--------- -------- sgi_vndr/us(indy_compose)
--------- -------- sgi_vndr/us(indigo)
--------- -------- sgi_vndr/us(indigo_compose)
--------- -------- sgi_vndr/us(indigo101_compose)
--d------ -------- sgi_vndr/dvorak(indy)
--------- -------- sgi_vndr/dvorak(indigo)
--d------ -------- sgi_vndr/es(indy)
--------- -------- sgi_vndr/es(indy_nodeadkeys)
--------- -------- sgi_vndr/es(indigo)
--------- -------- sgi_vndr/es(indigo_nodeadkeys)
--d------ -------- sgi_vndr/it(indy)
--------- -------- sgi_vndr/it(indy_nodeadkeys)
--------- -------- sgi_vndr/it(indigo)
--------- -------- sgi_vndr/it(indigo_nodeadkeys)
--d------ -------- sgi_vndr/th(indy)
--------- -------- sgi_vndr/th(indigo)
--d------ -------- sgi_vndr/ru(indy)
--------- -------- sgi_vndr/ru(indy_toggle)
--------- -------- sgi_vndr/ru(indy_shift_toggle)
--------- -------- sgi_vndr/ru(indy_ctrl_shift_toggle)
--------- -------- sgi_vndr/ru(indy_ctrl_alt_toggle)
--------- -------- sgi_vndr/ru(indy_caps_toggle)
--------- -------- sgi_vndr/ru(indigo)
--------- -------- sgi_vndr/ru(indigo_toggle)
--------- -------- sgi_vndr/ru(indigo_shift_toggle)
--------- -------- sgi_vndr/ru(indigo_ctrl_shift_toggle)
--------- -------- sgi_vndr/ru(indigo_ctrl_alt_toggle)
--------- -------- sgi_vndr/ru(indigo_caps_toggle)
--------- -------- digital_vndr/us(lk201)
--------- -------- digital_vndr/us(lk401)
--------- -------- digital_vndr/us(lk411)
--------- -------- digital_vndr/us(lk421)
--------- -------- digital_vndr/us(lk441)
--------- -------- digital_vndr/us(lk443)
--------- -------- digital_vndr/us(lk44x)
--------- -------- digital_vndr/us(lk450)
--------- -------- digital_vndr/us(pcxalaa)
--------- -------- digital_vndr/us(pcxalfa)
--------- -------- digital_vndr/us(pcxalga)
--------- -------- digital_vndr/us(pcxalka)
--------- -------- digital_vndr/us(pcxal)
--------- -------- digital_vndr/us(mnk)
--d------ -------- ataritt(us)
--------- -------- ataritt(de)
-d------ -------- xfree86(us)
-------- -------- xfree86(ar)
-------- -------- xfree86(be)
@@ -360,3 +342,21 @@
-------- -------- xfree86(fr_CH)
-------- -------- xfree86(mt_us)
-------- -------- xfree86(sk_qwerty)
+-d------ -------- ataritt(us)
+-------- -------- ataritt(de)
+-------- -------- digital_vndr/us(lk201)
+-------- -------- digital_vndr/us(lk401)
+-------- -------- digital_vndr/us(lk411)
+-------- -------- digital_vndr/us(lk421)
+-------- -------- digital_vndr/us(lk441)
+-------- -------- digital_vndr/us(lk443)
+-------- -------- digital_vndr/us(lk44x)
+-------- -------- digital_vndr/us(lk450)
+-------- -------- digital_vndr/us(pcxalaa)
+-------- -------- digital_vndr/us(pcxalfa)
+-------- -------- digital_vndr/us(pcxalga)
+-------- -------- digital_vndr/us(pcxalka)
+-------- -------- digital_vndr/us(pcxal)
+-------- -------- digital_vndr/us(mnk)
+-d------ -------- amiga(usa1)
+-------- -------- amiga(de)
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.in b/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.in
index a1fac16bd..9afff68fc 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_keymap_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
keymapdir = $(xkb_base)/keymap/sgi_vndr
@@ -206,8 +182,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -231,10 +207,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_keymapDATA: $(dist_keymap_DATA)
@$(NORMAL_INSTALL)
- test -z "$(keymapdir)" || $(mkdir_p) "$(DESTDIR)$(keymapdir)"
+ test -z "$(keymapdir)" || $(MKDIR_P) "$(DESTDIR)$(keymapdir)"
@list='$(dist_keymap_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -257,22 +232,21 @@ CTAGS:
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -288,7 +262,7 @@ check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(keymapdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -334,12 +308,20 @@ info-am:
install-data-am: install-dist_keymapDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -358,17 +340,21 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_keymapDATA uninstall-info-am
+uninstall-am: uninstall-dist_keymapDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_keymapDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ install-dist_keymapDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_keymapDATA uninstall-info-am
+ uninstall-dist_keymapDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.in b/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.in
index 4de9e71eb..e728e0869 100644
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_keymap_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
keymapdir = $(xkb_base)/keymap/sun_vndr
@@ -201,8 +177,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -226,10 +202,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_keymapDATA: $(dist_keymap_DATA)
@$(NORMAL_INSTALL)
- test -z "$(keymapdir)" || $(mkdir_p) "$(DESTDIR)$(keymapdir)"
+ test -z "$(keymapdir)" || $(MKDIR_P) "$(DESTDIR)$(keymapdir)"
@list='$(dist_keymap_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -252,22 +227,21 @@ CTAGS:
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -283,7 +257,7 @@ check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(keymapdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -329,12 +303,20 @@ info-am:
install-data-am: install-dist_keymapDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -353,17 +335,21 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_keymapDATA uninstall-info-am
+uninstall-am: uninstall-dist_keymapDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_keymapDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ install-dist_keymapDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_keymapDATA uninstall-info-am
+ uninstall-dist_keymapDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/keymap/xfree86 b/xorg-server/xkbdata.src/keymap/xfree86
index aa70c9792..e4255a633 100644
--- a/xorg-server/xkbdata.src/keymap/xfree86
+++ b/xorg-server/xkbdata.src/keymap/xfree86
@@ -33,7 +33,7 @@ xkb_keymap "bg" {
};
// us_intl and br by Ricardo Y. Igarashi (iga@that.com.br)
xkb_keymap "br" {
- xkb_keycodes { include "xfree86(abnt2)" };
+ xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
xkb_symbols { include "us(pc101)+br" };
@@ -141,7 +141,7 @@ xkb_keymap "it" {
xkb_geometry { include "pc(pc102)" };
};
xkb_keymap "jp106" {
- xkb_keycodes { include "xfree86(jp106)" };
+ xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
xkb_symbols { include "jp(jp106)" };
diff --git a/xorg-server/xkbdata.src/missing b/xorg-server/xkbdata.src/missing
index 894e786e1..1c8ff7049 100644
--- a/xorg-server/xkbdata.src/missing
+++ b/xorg-server/xkbdata.src/missing
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
@@ -33,6 +33,8 @@ if test $# -eq 0; then
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@ fi
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@ Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@ esac
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@ esac
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@ WARNING: \`$1' is $msg. You should only need it if
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@ WARNING: \`$1' is needed, but is $msg.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@ WARNING: \`$1' $msg. You should only need it if
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@ WARNING: \`$1' is $msg. You should only need it if
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@ WARNING: \`$1' is $msg. You should only need it if
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@ WARNING: \`$1' is $msg. You should only need it if
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@ WARNING: \`$1' is $msg. You should only need it if
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff --git a/xorg-server/xkbdata.src/po/ChangeLog b/xorg-server/xkbdata.src/po/ChangeLog
index da39e3df6..254a4768f 100644
--- a/xorg-server/xkbdata.src/po/ChangeLog
+++ b/xorg-server/xkbdata.src/po/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-27 svu
+
+ * *.po: sync with TP
+
2008-09-30 svu
* *.po: sync with TP
diff --git a/xorg-server/xkbdata.src/po/Makefile.in.in b/xorg-server/xkbdata.src/po/Makefile.in.in
index 57ef267b3..c7e83022c 100644
--- a/xorg-server/xkbdata.src/po/Makefile.in.in
+++ b/xorg-server/xkbdata.src/po/Makefile.in.in
@@ -21,7 +21,7 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
PACKAGE = @PACKAGE@
VERSION = @VERSION@
-SHELL = /bin/sh
+SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -56,7 +56,7 @@ ALL_LINGUAS = @ALL_LINGUAS@
PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
diff --git a/xorg-server/xkbdata.src/po/POTFILES.in b/xorg-server/xkbdata.src/po/POTFILES.in
index a3868ab0b..8b93ba498 100644
--- a/xorg-server/xkbdata.src/po/POTFILES.in
+++ b/xorg-server/xkbdata.src/po/POTFILES.in
@@ -1,2 +1 @@
rules/base.xml.in
-rules/evdev.xml.in
diff --git a/xorg-server/xkbdata.src/po/POTFILES.skip b/xorg-server/xkbdata.src/po/POTFILES.skip
new file mode 100644
index 000000000..78ff7e014
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/POTFILES.skip
@@ -0,0 +1 @@
+rules/evdev.xml.in
diff --git a/xorg-server/xkbdata.src/po/bg.po b/xorg-server/xkbdata.src/po/bg.po
index c0f67c0f6..4263f655f 100644
--- a/xorg-server/xkbdata.src/po/bg.po
+++ b/xorg-server/xkbdata.src/po/bg.po
@@ -1,14 +1,14 @@
# Bulgarian translation of xkeyboard-config.
-# Copyright (C) 2002, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
# This file is distributed under the same license as the xkeyboard-config package.
-# Alexander Shopov <ash@contact.bg>, 2002, 2005, 2006, 2007, 2008.
+# Alexander Shopov <ash@contact.bg>, 2002, 2005, 2006, 2007, 2008, 2009.
#
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config-1.4-pre1\n"
+"Project-Id-Version: xkeyboard-config-1.6pre1\n"
"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2008-09-15 23:52+0100\n"
-"PO-Revision-Date: 2008-09-19 22:12+0300\n"
+"POT-Creation-Date: 2009-05-12 23:49+0100\n"
+"PO-Revision-Date: 2009-05-14 06:15+0300\n"
"Last-Translator: Alexander Shopov <ash@contact.bg>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
"MIME-Version: 1.0\n"
@@ -16,2607 +16,2731 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../rules/base.xml.in.h:1 ../rules/evdev.xml.in.h:1
+#: ../rules/base.xml.in.h:1
msgid "(F)"
msgstr "(F)"
-#: ../rules/base.xml.in.h:2 ../rules/evdev.xml.in.h:2
+#: ../rules/base.xml.in.h:2
msgid "(Legacy) Alternative"
msgstr "(остаряла) алтернативна"
-#: ../rules/base.xml.in.h:3 ../rules/evdev.xml.in.h:3
+#: ../rules/base.xml.in.h:3
msgid "(Legacy) Alternative, Sun dead keys"
-msgstr "(остаряла) алтернативна, с „мъртви клавиши“ на Sun"
+msgstr "(остаряла) алтернативна, с „мъртви“ клавиши на Sun"
-#: ../rules/base.xml.in.h:4 ../rules/evdev.xml.in.h:4
+#: ../rules/base.xml.in.h:4
msgid "(Legacy) Alternative, eliminate dead keys"
-msgstr "(остаряла) алтернативна, без „мъртви клавиши“"
+msgstr "(остаряла) алтернативна, без „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:5 ../rules/evdev.xml.in.h:5
+#: ../rules/base.xml.in.h:5
msgid "101/104 key Compatible"
msgstr "Съвместима със 101/104 клавиша"
-#: ../rules/base.xml.in.h:6 ../rules/evdev.xml.in.h:6
+#: ../rules/base.xml.in.h:6
msgid "101/qwerty/comma/Dead keys"
-msgstr "101/qwerty/запетая/с „мъртви клавиши“"
+msgstr "101/qwerty/запетая/с „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:7 ../rules/evdev.xml.in.h:7
+#: ../rules/base.xml.in.h:7
msgid "101/qwerty/comma/Eliminate dead keys"
-msgstr "101/qwerty/запетая/без „мъртви клавиши“"
+msgstr "101/qwerty/запетая/без „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:8 ../rules/evdev.xml.in.h:8
+#: ../rules/base.xml.in.h:8
msgid "101/qwerty/dot/Dead keys"
-msgstr "101/qwerty/точка/с „мъртви клавиши“"
+msgstr "101/qwerty/точка/с „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:9 ../rules/evdev.xml.in.h:9
+#: ../rules/base.xml.in.h:9
msgid "101/qwerty/dot/Eliminate dead keys"
-msgstr "101/qwerty/точка/без „мъртви клавиши“"
+msgstr "101/qwerty/точка/без „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:10 ../rules/evdev.xml.in.h:10
+#: ../rules/base.xml.in.h:10
msgid "101/qwertz/comma/Dead keys"
-msgstr "101/qwertz/запетая/с „мъртви клавиши“"
+msgstr "101/qwertz/запетая/с „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:11 ../rules/evdev.xml.in.h:11
+#: ../rules/base.xml.in.h:11
msgid "101/qwertz/comma/Eliminate dead keys"
-msgstr "101/qwertz/запетая/без „мъртви клавиши“"
+msgstr "101/qwertz/запетая/без „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:12 ../rules/evdev.xml.in.h:12
+#: ../rules/base.xml.in.h:12
msgid "101/qwertz/dot/Dead keys"
-msgstr "101/qwertz/точка/с „мъртви клавиши“"
+msgstr "101/qwertz/точка/с „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:13 ../rules/evdev.xml.in.h:13
+#: ../rules/base.xml.in.h:13
msgid "101/qwertz/dot/Eliminate dead keys"
-msgstr "101/qwertz/точка/без „мъртви клавиши“"
+msgstr "101/qwertz/точка/без „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:14 ../rules/evdev.xml.in.h:14
+#: ../rules/base.xml.in.h:14
msgid "102/qwerty/comma/Dead keys"
-msgstr "102/qwerty/запетая/с „мъртви клавиши“"
+msgstr "102/qwerty/запетая/с „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:15 ../rules/evdev.xml.in.h:15
+#: ../rules/base.xml.in.h:15
msgid "102/qwerty/comma/Eliminate dead keys"
-msgstr "102/qwerty/запетая/без „мъртви клавиши“"
+msgstr "102/qwerty/запетая/без „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:16 ../rules/evdev.xml.in.h:16
+#: ../rules/base.xml.in.h:16
msgid "102/qwerty/dot/Dead keys"
-msgstr "102/qwerty/точка/с „мъртви клавиши“"
+msgstr "102/qwerty/точка/с „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:17 ../rules/evdev.xml.in.h:17
+#: ../rules/base.xml.in.h:17
msgid "102/qwerty/dot/Eliminate dead keys"
-msgstr "102/qwerty/точка/без „мъртви клавиши“"
+msgstr "102/qwerty/точка/без „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:18 ../rules/evdev.xml.in.h:18
+#: ../rules/base.xml.in.h:18
msgid "102/qwertz/comma/Dead keys"
-msgstr "102/qwertz/запетая/с „мъртви клавиши“"
+msgstr "102/qwertz/запетая/с „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:19 ../rules/evdev.xml.in.h:19
+#: ../rules/base.xml.in.h:19
msgid "102/qwertz/comma/Eliminate dead keys"
-msgstr "102/qwertz/запетая/без „мъртви клавиши“"
+msgstr "102/qwertz/запетая/без „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:20 ../rules/evdev.xml.in.h:20
+#: ../rules/base.xml.in.h:20
msgid "102/qwertz/dot/Dead keys"
-msgstr "102/qwertz/точка/с „мъртви клавиши“"
+msgstr "102/qwertz/точка/с „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:21 ../rules/evdev.xml.in.h:21
+#: ../rules/base.xml.in.h:21
msgid "102/qwertz/dot/Eliminate dead keys"
-msgstr "102/qwertz/точка/без „мъртви клавиши“"
+msgstr "102/qwertz/точка/без „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:22 ../rules/evdev.xml.in.h:22
+#: ../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:23 ../rules/evdev.xml.in.h:23
+#: ../rules/base.xml.in.h:26
msgid "A4Tech KBS-8"
msgstr "A4Tech KBS-8"
-#: ../rules/base.xml.in.h:24 ../rules/evdev.xml.in.h:24
+#: ../rules/base.xml.in.h:27
msgid "A4Tech Wireless Desktop RFKB-23"
msgstr "A4Tech Wireless Desktop RFKB-23 (безжична)"
-#: ../rules/base.xml.in.h:25 ../rules/evdev.xml.in.h:25
+#: ../rules/base.xml.in.h:28
msgid "ACPI Standard"
msgstr "Стандартна ACPI"
-#: ../rules/base.xml.in.h:26 ../rules/evdev.xml.in.h:26
-msgid "ATM/phone-style hexadecimal keypad"
-msgstr "Цифрова клавиатура — шестнайсетична/банкомат/телефон"
+#: ../rules/base.xml.in.h:29
+msgid "ATM/phone-style"
+msgstr "Като банкомат/телефон"
-#: ../rules/base.xml.in.h:27 ../rules/evdev.xml.in.h:27
+#: ../rules/base.xml.in.h:30
msgid "Acer AirKey V"
msgstr "Acer AirKey V"
-#: ../rules/base.xml.in.h:28 ../rules/evdev.xml.in.h:28
+#: ../rules/base.xml.in.h:31
msgid "Acer C300"
msgstr "Acer C300"
-#: ../rules/base.xml.in.h:29 ../rules/evdev.xml.in.h:29
+#: ../rules/base.xml.in.h:32
msgid "Acer Ferrari 4000"
msgstr "Acer Ferrari 4000"
-#: ../rules/base.xml.in.h:30 ../rules/evdev.xml.in.h:30
+#: ../rules/base.xml.in.h:33
msgid "Acer Laptop"
msgstr "Acer, за мобилен компютър"
-#: ../rules/base.xml.in.h:31 ../rules/evdev.xml.in.h:31
-msgid "Add the EuroSign to the 2 key."
-msgstr "€ е при „2“"
-
-#: ../rules/base.xml.in.h:32 ../rules/evdev.xml.in.h:32
-msgid "Add the EuroSign to the 4 key."
-msgstr "€ е при „4“"
-
-#: ../rules/base.xml.in.h:33 ../rules/evdev.xml.in.h:33
-msgid "Add the EuroSign to the 5 key."
-msgstr "€ е при „5“"
-
-#: ../rules/base.xml.in.h:34 ../rules/evdev.xml.in.h:34
-msgid "Add the EuroSign to the E key."
-msgstr "€ е при „E“"
-
-#: ../rules/base.xml.in.h:35 ../rules/evdev.xml.in.h:35
-msgid "Add the standard behavior to Menu key."
+#: ../rules/base.xml.in.h:34
+msgid "Add the standard behavior to Menu key"
msgstr "Добавяне на стандартното поведение на Menu"
-#: ../rules/base.xml.in.h:36 ../rules/evdev.xml.in.h:36
-msgid "Adding the EuroSign to certain keys"
+#: ../rules/base.xml.in.h:35
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "Добавяне на двойните ударения на Esperanto"
+
+#: ../rules/base.xml.in.h:36
+msgid "Adding EuroSign to certain keys"
msgstr "Добавяне на знака „€“ към някои клавиши"
-#: ../rules/base.xml.in.h:37 ../rules/evdev.xml.in.h:37
+#: ../rules/base.xml.in.h:37
msgid "Advance Scorpius KI"
msgstr "Advance Scorpius KI"
-#: ../rules/base.xml.in.h:38 ../rules/evdev.xml.in.h:38
+#: ../rules/base.xml.in.h:38
msgid "Afg"
msgstr "Афг"
-#: ../rules/base.xml.in.h:39 ../rules/evdev.xml.in.h:39
+#: ../rules/base.xml.in.h:39
msgid "Afghanistan"
msgstr "афганистанска"
-#: ../rules/base.xml.in.h:40 ../rules/evdev.xml.in.h:40
+#: ../rules/base.xml.in.h:40
msgid "Akan"
msgstr "акан"
-#: ../rules/base.xml.in.h:41 ../rules/evdev.xml.in.h:41
+#: ../rules/base.xml.in.h:41
msgid "Alb"
msgstr "Алб"
-#: ../rules/base.xml.in.h:42 ../rules/evdev.xml.in.h:42
+#: ../rules/base.xml.in.h:42
msgid "Albania"
msgstr "албанска"
-#: ../rules/base.xml.in.h:43 ../rules/evdev.xml.in.h:43
-msgid "Alt and Meta are on the Alt keys."
+#: ../rules/base.xml.in.h:43
+msgid "Alt and Meta are on Alt keys"
msgstr "Alt-овете отговарят на Meta и на Alt"
-#: ../rules/base.xml.in.h:44 ../rules/evdev.xml.in.h:44
-msgid "Alt is mapped to the right Win-key and Super to Menu."
+#: ../rules/base.xml.in.h:44
+msgid "Alt is mapped to Right Win, Super to Menu"
msgstr "Десният Win е Alt, а Menu — Super"
-#: ../rules/base.xml.in.h:45 ../rules/evdev.xml.in.h:45
-msgid "Alt+CapsLock changes layout."
-msgstr "Заедно Alt+CapsLock сменят подредбата"
+#: ../rules/base.xml.in.h:45
+msgid "Alt+CapsLock"
+msgstr "Alt+CapsLock"
-#: ../rules/base.xml.in.h:46 ../rules/evdev.xml.in.h:46
-msgid "Alt+Ctrl change layout."
-msgstr "Заедно Alt+Ctrl сменят подредбата"
+#: ../rules/base.xml.in.h:46
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
-#: ../rules/base.xml.in.h:47 ../rules/evdev.xml.in.h:47
-msgid "Alt+Shift change layout."
-msgstr "Заедно Alt+Shift сменят подредбата"
+#: ../rules/base.xml.in.h:47
+msgid "Alt+Shift"
+msgstr "Alt+Shift"
-#: ../rules/base.xml.in.h:48 ../rules/evdev.xml.in.h:48
+#: ../rules/base.xml.in.h:48
+msgid "Alt+Space"
+msgstr "Alt+Space"
+
+#: ../rules/base.xml.in.h:49
msgid "Alt-Q"
msgstr "Alt-Q"
-#: ../rules/base.xml.in.h:49 ../rules/evdev.xml.in.h:49
+#: ../rules/base.xml.in.h:50
msgid "Alt/Win key behavior"
msgstr "Поведение на Alt/Win"
-#: ../rules/base.xml.in.h:50 ../rules/evdev.xml.in.h:50
+#: ../rules/base.xml.in.h:51
msgid "Alternative"
msgstr "алтернативна"
-#: ../rules/base.xml.in.h:51 ../rules/evdev.xml.in.h:51
+#: ../rules/base.xml.in.h:52
msgid "Alternative Eastern"
msgstr "алтернативна източна"
-#: ../rules/base.xml.in.h:52 ../rules/evdev.xml.in.h:52
+#: ../rules/base.xml.in.h:53
msgid "Alternative Phonetic"
-msgstr "алтернативна фонетична"
+msgstr "фонетична, алтернативна"
-#: ../rules/base.xml.in.h:53 ../rules/evdev.xml.in.h:53
+#: ../rules/base.xml.in.h:54
msgid "Alternative international (former us_intl)"
msgstr "алтернативна, международна (бившата us_intl)"
-#: ../rules/base.xml.in.h:54 ../rules/evdev.xml.in.h:54
+#: ../rules/base.xml.in.h:55
msgid "Alternative, Sun dead keys"
-msgstr "алтернативна, с „мъртви клавиши“ на Sun"
+msgstr "алтернативна, с „мъртви“ клавиши на Sun"
-#: ../rules/base.xml.in.h:55 ../rules/evdev.xml.in.h:55
+#: ../rules/base.xml.in.h:56
msgid "Alternative, eliminate dead keys"
-msgstr "алтернативна, без „мъртви клавиши“"
+msgstr "алтернативна, без „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:56 ../rules/evdev.xml.in.h:56
+#: ../rules/base.xml.in.h:57
msgid "Alternative, latin-9 only"
msgstr "алтернативна, само латиница-9"
-#: ../rules/base.xml.in.h:57 ../rules/evdev.xml.in.h:57
+#: ../rules/base.xml.in.h:58
msgid "And"
msgstr "Анд"
-#: ../rules/base.xml.in.h:58 ../rules/evdev.xml.in.h:58
+#: ../rules/base.xml.in.h:59
msgid "Andorra"
msgstr "андорска"
-#: ../rules/base.xml.in.h:59 ../rules/evdev.xml.in.h:59
+#: ../rules/base.xml.in.h:60
+msgid "Any Alt key"
+msgstr "Всеки Alt"
+
+#: ../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 "Всеки Win (докато е натиснат)"
+
+#: ../rules/base.xml.in.h:63
msgid "Apostrophe (') variant"
msgstr "вариант с апостроф (')"
-#: ../rules/base.xml.in.h:60 ../rules/evdev.xml.in.h:60
+#: ../rules/base.xml.in.h:64
msgid "Apple"
msgstr "Apple"
-#: ../rules/base.xml.in.h:61 ../rules/evdev.xml.in.h:61
+#: ../rules/base.xml.in.h:65
msgid "Apple Laptop"
msgstr "Apple, за мобилен компютър"
-#: ../rules/base.xml.in.h:62 ../rules/evdev.xml.in.h:62
+#: ../rules/base.xml.in.h:66
msgid "Ara"
msgstr "Ара"
-#: ../rules/base.xml.in.h:63 ../rules/evdev.xml.in.h:63
+#: ../rules/base.xml.in.h:67
msgid "Arabic"
msgstr "арабска"
-#: ../rules/base.xml.in.h:64 ../rules/evdev.xml.in.h:64
+#: ../rules/base.xml.in.h:68
msgid "Arm"
msgstr "Арм"
-#: ../rules/base.xml.in.h:65 ../rules/evdev.xml.in.h:65
+#: ../rules/base.xml.in.h:69
msgid "Armenia"
msgstr "арменска"
-#: ../rules/base.xml.in.h:66 ../rules/evdev.xml.in.h:66
+#: ../rules/base.xml.in.h:70
msgid "Asturian variant with bottom-dot H and bottom-dot L"
msgstr "астурски вариант с Ḥ и Ḷ (с точки отдолу)"
-#: ../rules/base.xml.in.h:67 ../rules/evdev.xml.in.h:67
+#: ../rules/base.xml.in.h:71
msgid "Asus Laptop"
msgstr "Asus, за мобилен компютър"
-#: ../rules/base.xml.in.h:68 ../rules/evdev.xml.in.h:68
+#: ../rules/base.xml.in.h:72
+msgid "At bottom left"
+msgstr "Долу вляво"
+
+#: ../rules/base.xml.in.h:73
+msgid "At left of 'A'"
+msgstr "Вляво от „A“"
+
+#: ../rules/base.xml.in.h:74
msgid "Aze"
msgstr "Азъ"
-#: ../rules/base.xml.in.h:69 ../rules/evdev.xml.in.h:69
+#: ../rules/base.xml.in.h:75
msgid "Azerbaijan"
msgstr "азърбейджанска"
-#: ../rules/base.xml.in.h:70 ../rules/evdev.xml.in.h:70
+#: ../rules/base.xml.in.h:76
msgid "Azona RF2300 wireless Internet Keyboard"
msgstr "Azona RF2300 wireless Internet Keyboard (безжична, за Интернет)"
-#: ../rules/base.xml.in.h:71 ../rules/evdev.xml.in.h:71
+#: ../rules/base.xml.in.h:77
msgid "BTC 5090"
msgstr "BTC 5090"
-#: ../rules/base.xml.in.h:72 ../rules/evdev.xml.in.h:72
+#: ../rules/base.xml.in.h:78
msgid "BTC 5113RF Multimedia"
msgstr "BTC 5113RF Multimedia (за мултимедия)"
-#: ../rules/base.xml.in.h:73 ../rules/evdev.xml.in.h:73
+#: ../rules/base.xml.in.h:79
msgid "BTC 5126T"
msgstr "BTC 5126T"
-#: ../rules/base.xml.in.h:74 ../rules/evdev.xml.in.h:74
+#: ../rules/base.xml.in.h:80
msgid "BTC 6301URF"
msgstr "BTC 6301URF"
-#: ../rules/base.xml.in.h:75 ../rules/evdev.xml.in.h:75
+#: ../rules/base.xml.in.h:81
msgid "BTC 9000"
msgstr "BTC 9000"
-#: ../rules/base.xml.in.h:76 ../rules/evdev.xml.in.h:76
+#: ../rules/base.xml.in.h:82
msgid "BTC 9000A"
msgstr "BTC 9000A"
-#: ../rules/base.xml.in.h:77 ../rules/evdev.xml.in.h:77
+#: ../rules/base.xml.in.h:83
msgid "BTC 9001AH"
msgstr "BTC 9001AH"
-#: ../rules/base.xml.in.h:78 ../rules/evdev.xml.in.h:78
+#: ../rules/base.xml.in.h:84
msgid "BTC 9019U"
msgstr "BTC 9019U"
-#: ../rules/base.xml.in.h:79 ../rules/evdev.xml.in.h:79
+#: ../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:80 ../rules/evdev.xml.in.h:80
+#: ../rules/base.xml.in.h:87
msgid "Ban"
msgstr "Бан"
-#: ../rules/base.xml.in.h:81 ../rules/evdev.xml.in.h:81
+#: ../rules/base.xml.in.h:88
msgid "Bangladesh"
msgstr "бангладешска"
-#: ../rules/base.xml.in.h:82 ../rules/evdev.xml.in.h:82
+#: ../rules/base.xml.in.h:89
msgid "Bel"
msgstr "Бел"
-#: ../rules/base.xml.in.h:83 ../rules/evdev.xml.in.h:83
+#: ../rules/base.xml.in.h:90
msgid "Belarus"
msgstr "беларуска"
-#: ../rules/base.xml.in.h:84 ../rules/evdev.xml.in.h:84
+#: ../rules/base.xml.in.h:91
msgid "Belgium"
msgstr "белгийска"
-#: ../rules/base.xml.in.h:85 ../rules/evdev.xml.in.h:85
+#: ../rules/base.xml.in.h:92
msgid "BenQ X-Touch"
msgstr "BenQ X-Touch"
-#: ../rules/base.xml.in.h:86 ../rules/evdev.xml.in.h:86
+#: ../rules/base.xml.in.h:93
msgid "BenQ X-Touch 730"
msgstr "BenQ X-Touch 730"
-#: ../rules/base.xml.in.h:87 ../rules/evdev.xml.in.h:87
+#: ../rules/base.xml.in.h:94
msgid "BenQ X-Touch 800"
msgstr "BenQ X-Touch 800"
-#: ../rules/base.xml.in.h:88 ../rules/evdev.xml.in.h:88
+#: ../rules/base.xml.in.h:95
msgid "Bengali"
msgstr "бенгалска"
-#: ../rules/base.xml.in.h:89 ../rules/evdev.xml.in.h:89
+#: ../rules/base.xml.in.h:96
msgid "Bengali Probhat"
msgstr "бенгалска — пробхат"
-#: ../rules/base.xml.in.h:90 ../rules/evdev.xml.in.h:90
+#: ../rules/base.xml.in.h:97
msgid "Bepo, ergonomic, Dvorak way"
msgstr "Bepo, ергономична, по Дворак"
-#: ../rules/base.xml.in.h:91 ../rules/evdev.xml.in.h:91
+#: ../rules/base.xml.in.h:98
msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
msgstr "Bepo, ергономична, по Дворак, само латиница-9"
-#: ../rules/base.xml.in.h:92 ../rules/evdev.xml.in.h:92
+#: ../rules/base.xml.in.h:99
msgid "Bgr"
msgstr "Бъл"
-#: ../rules/base.xml.in.h:93 ../rules/evdev.xml.in.h:93
+#: ../rules/base.xml.in.h:100
msgid "Bhu"
msgstr "Бут"
-#: ../rules/base.xml.in.h:94 ../rules/evdev.xml.in.h:94
+#: ../rules/base.xml.in.h:101
msgid "Bhutan"
msgstr "бутанска"
-#: ../rules/base.xml.in.h:95 ../rules/evdev.xml.in.h:95
+#: ../rules/base.xml.in.h:102
msgid "Biblical Hebrew (Tiro)"
msgstr "библейски иврит (Тиро)"
-#: ../rules/base.xml.in.h:96 ../rules/evdev.xml.in.h:96
+#: ../rules/base.xml.in.h:103
msgid "Bih"
msgstr "БиХ"
-#: ../rules/base.xml.in.h:97 ../rules/evdev.xml.in.h:97
+#: ../rules/base.xml.in.h:104
msgid "Blr"
msgstr "Бел"
-#: ../rules/base.xml.in.h:98 ../rules/evdev.xml.in.h:98
+#: ../rules/base.xml.in.h:105
msgid "Bosnia and Herzegovina"
msgstr "босненска"
-#: ../rules/base.xml.in.h:99 ../rules/evdev.xml.in.h:99
-msgid "Both Alt keys together change layout."
-msgstr "Двата Alt-а заедно сменят подредбата"
-
-#: ../rules/base.xml.in.h:100 ../rules/evdev.xml.in.h:100
-msgid "Both Ctrl keys together change layout."
-msgstr "Двата Ctrl-а заедно сменят подредбата"
+#: ../rules/base.xml.in.h:106
+msgid "Both Alt keys together"
+msgstr "Двата Alt-а заедно"
-#: ../rules/base.xml.in.h:101 ../rules/evdev.xml.in.h:101
-msgid "Both Shift keys together change layout."
-msgstr "Двата Shift-а заедно сменят подредбата"
+#: ../rules/base.xml.in.h:107
+msgid "Both Ctrl keys together"
+msgstr "Двата Ctrl-а заедно"
-#: ../rules/base.xml.in.h:102 ../rules/evdev.xml.in.h:102
-msgid "Both Win-keys switch layout while pressed."
-msgstr "Двата Win-а заедно сменят подредбата докато са натиснати"
+#: ../rules/base.xml.in.h:108
+msgid "Both Shift keys together"
+msgstr "Двата Shift-а заедно"
-#: ../rules/base.xml.in.h:103 ../rules/evdev.xml.in.h:103
+#: ../rules/base.xml.in.h:109
msgid "Bra"
msgstr "Бра"
-#: ../rules/base.xml.in.h:104 ../rules/evdev.xml.in.h:104
+#: ../rules/base.xml.in.h:110
msgid "Braille"
msgstr "брайл"
-#: ../rules/base.xml.in.h:105 ../rules/evdev.xml.in.h:105
+#: ../rules/base.xml.in.h:111
msgid "Brazil"
msgstr "бразилска"
-#: ../rules/base.xml.in.h:106 ../rules/evdev.xml.in.h:106
-msgid "Brazilian ABNT2"
-msgstr "Бразилска ABNT2"
+#: ../rules/base.xml.in.h:112
+msgid "Breton"
+msgstr "бретонска"
-#: ../rules/base.xml.in.h:107 ../rules/evdev.xml.in.h:107
+#: ../rules/base.xml.in.h:113
msgid "Brl"
msgstr "Брй"
-#: ../rules/base.xml.in.h:108 ../rules/evdev.xml.in.h:108
+#: ../rules/base.xml.in.h:114
msgid "Brother Internet Keyboard"
msgstr "Brother Internet Keyboard (за Интернет)"
-#: ../rules/base.xml.in.h:109 ../rules/evdev.xml.in.h:109
+#: ../rules/base.xml.in.h:115
msgid "Buckwalter"
msgstr "Buckwalter"
-#: ../rules/base.xml.in.h:110 ../rules/evdev.xml.in.h:110
+#: ../rules/base.xml.in.h:116
msgid "Bulgaria"
msgstr "българска"
-#: ../rules/base.xml.in.h:111 ../rules/evdev.xml.in.h:111
+#: ../rules/base.xml.in.h:117
+msgid "CRULP"
+msgstr "CRULP (урду)"
+
+#: ../rules/base.xml.in.h:118
msgid "Cambodia"
msgstr "камбоджанска"
-#: ../rules/base.xml.in.h:112 ../rules/evdev.xml.in.h:112
+#: ../rules/base.xml.in.h:119
msgid "Can"
msgstr "Кан"
-#: ../rules/base.xml.in.h:113 ../rules/evdev.xml.in.h:113
+#: ../rules/base.xml.in.h:120
msgid "Canada"
msgstr "канадска"
-#: ../rules/base.xml.in.h:114 ../rules/evdev.xml.in.h:114
-msgid "Caps Lock is Compose."
-msgstr "CapsLock функционира като Compose"
+#: ../rules/base.xml.in.h:121
+msgid "Caps Lock"
+msgstr "CapsLock"
-#: ../rules/base.xml.in.h:115 ../rules/evdev.xml.in.h:115
-msgid "CapsLock LED shows alternative layout."
-msgstr "Светодиодът на CapsLock указва смяна на подредбата"
+#: ../rules/base.xml.in.h:122
+msgid "CapsLock"
+msgstr "CapsLock"
-#: ../rules/base.xml.in.h:116 ../rules/evdev.xml.in.h:116
-msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
-msgstr "CapsLock работи като Shift със заключване. Shift отменя временно CapsLock"
+#: ../rules/base.xml.in.h:123
+msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
+msgstr "CapsLock (към първата подредба), Shift+CapsLock (към последната)"
-#: ../rules/base.xml.in.h:117 ../rules/evdev.xml.in.h:117
-msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
-msgstr "CapsLock работи като Shift със заключване. Shift не влияе на CapsLock"
+#: ../rules/base.xml.in.h:124
+msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
+msgstr "CapsLock (докато е натиснат), Alt+CapsLock замества CapsLock"
-#: ../rules/base.xml.in.h:118 ../rules/evdev.xml.in.h:118
-msgid "CapsLock just locks the Shift modifier."
-msgstr "CapsLock само заключва състоянието Shift"
+#: ../rules/base.xml.in.h:125
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
+msgstr "CapsLock работи като Shift със заключване. Shift временно отменя CapsLock"
-#: ../rules/base.xml.in.h:119 ../rules/evdev.xml.in.h:119
+#: ../rules/base.xml.in.h:126
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock"
+msgstr "CapsLock работи като Shift със заключване. Shift не влияе на CapsLock"
+
+#: ../rules/base.xml.in.h:127
msgid "CapsLock key behavior"
msgstr "Поведение на CapsLock"
-#: ../rules/base.xml.in.h:120 ../rules/evdev.xml.in.h:120
-msgid "CapsLock key changes layout."
-msgstr "CapsLock сменя подредбата"
-
-#: ../rules/base.xml.in.h:121 ../rules/evdev.xml.in.h:121
-msgid "CapsLock switch to first layout, Shift+CapsLock switch to last layout."
-msgstr "CapsLock сменя към първата подредба, Shift+CapsLock — към последната"
-
-#: ../rules/base.xml.in.h:122 ../rules/evdev.xml.in.h:122
-msgid "CapsLock toggles Shift so all keys are affected."
+#: ../rules/base.xml.in.h:128
+msgid "CapsLock toggles Shift so all keys are affected"
msgstr "CapsLock сменя състоянието Shift за всички клавиши"
-#: ../rules/base.xml.in.h:123 ../rules/evdev.xml.in.h:123
-msgid "CapsLock toggles normal capitalization of alphabetic characters."
+#: ../rules/base.xml.in.h:129
+msgid "CapsLock toggles normal capitalization of alphabetic characters"
msgstr "CapsLock сменя състоянието Shift само на буквените клавиши"
-#: ../rules/base.xml.in.h:124 ../rules/evdev.xml.in.h:124
-msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+#: ../rules/base.xml.in.h:130
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
msgstr "CapsLock използва вътрешна промяна на регистъра. Shift временно отменя CapsLock"
-#: ../rules/base.xml.in.h:125 ../rules/evdev.xml.in.h:125
-msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+#: ../rules/base.xml.in.h:131
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
msgstr "CapsLock използва вътрешна промяна на регистъра. Shift не влияе на CapsLock"
-#: ../rules/base.xml.in.h:126 ../rules/evdev.xml.in.h:126
+#: ../rules/base.xml.in.h:132
msgid "Catalan variant with middle-dot L"
msgstr "каталунски вариант с Ŀ (с точка в средата)"
-#: ../rules/base.xml.in.h:127 ../rules/evdev.xml.in.h:127
+#: ../rules/base.xml.in.h:133
msgid "Cedilla"
msgstr "седий"
-#: ../rules/base.xml.in.h:128 ../rules/evdev.xml.in.h:128
+#: ../rules/base.xml.in.h:134
msgid "Che"
msgstr "Чех"
-#: ../rules/base.xml.in.h:129 ../rules/evdev.xml.in.h:129
+#: ../rules/base.xml.in.h:135
msgid "Cherokee"
msgstr "черокска"
-#: ../rules/base.xml.in.h:130 ../rules/evdev.xml.in.h:130
+#: ../rules/base.xml.in.h:136
+msgid "Cherry B.UNLIMITED"
+msgstr "Cherry B.UNLIMITED"
+
+#: ../rules/base.xml.in.h:137
msgid "Cherry Blue Line CyBo@rd"
msgstr "Cherry Blue Line CyBo@rd"
-#: ../rules/base.xml.in.h:131 ../rules/evdev.xml.in.h:131
+#: ../rules/base.xml.in.h:138
msgid "Cherry Blue Line CyBo@rd (alternate option)"
msgstr "Cherry Blue Line CyBo@rd (алтернативен вариант)"
-#: ../rules/base.xml.in.h:132 ../rules/evdev.xml.in.h:132
+#: ../rules/base.xml.in.h:139
msgid "Cherry CyBo@rd USB-Hub"
msgstr "Cherry CyBo@rd USB-Hub"
-#: ../rules/base.xml.in.h:133 ../rules/evdev.xml.in.h:133
+#: ../rules/base.xml.in.h:140
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Expert"
+
+#: ../rules/base.xml.in.h:141
msgid "Cherry CyMotion Master Linux"
msgstr "Cherry CyMotion Master Linux"
-#: ../rules/base.xml.in.h:134 ../rules/evdev.xml.in.h:134
+#: ../rules/base.xml.in.h:142
msgid "Cherry CyMotion Master XPress"
msgstr "Cherry CyMotion Master XPress"
-#: ../rules/base.xml.in.h:135 ../rules/evdev.xml.in.h:135
+#: ../rules/base.xml.in.h:143
msgid "Chicony Internet Keyboard"
msgstr "Chicony Internet Keyboard (за Интернет)"
-#: ../rules/base.xml.in.h:136 ../rules/evdev.xml.in.h:136
+#: ../rules/base.xml.in.h:144
msgid "Chicony KB-9885"
msgstr "Chicony KB-9885"
-#: ../rules/base.xml.in.h:137 ../rules/evdev.xml.in.h:137
+#: ../rules/base.xml.in.h:145
msgid "Chicony KU-0108"
msgstr "Chicony KU-0108"
-#: ../rules/base.xml.in.h:138 ../rules/evdev.xml.in.h:138
+#: ../rules/base.xml.in.h:146
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0420"
+
+#: ../rules/base.xml.in.h:147
msgid "China"
msgstr "Кит"
-#: ../rules/base.xml.in.h:139 ../rules/evdev.xml.in.h:139
+#: ../rules/base.xml.in.h:148
msgid "Chuvash"
msgstr "чувашка"
-#: ../rules/base.xml.in.h:140 ../rules/evdev.xml.in.h:140
+#: ../rules/base.xml.in.h:149
msgid "Chuvash Latin"
msgstr "чувашка, латиница"
-#: ../rules/base.xml.in.h:141 ../rules/evdev.xml.in.h:141
+#: ../rules/base.xml.in.h:150
msgid "Classic"
msgstr "класическа"
-#: ../rules/base.xml.in.h:142 ../rules/evdev.xml.in.h:142
+#: ../rules/base.xml.in.h:151
msgid "Classic Dvorak"
msgstr "класическа, Дворак"
-#: ../rules/base.xml.in.h:143 ../rules/evdev.xml.in.h:143
+#: ../rules/base.xml.in.h:152
msgid "Classmate PC"
msgstr "Classmate PC"
-#: ../rules/base.xml.in.h:144 ../rules/evdev.xml.in.h:144
+#: ../rules/base.xml.in.h:153
msgid "CloGaelach"
msgstr "CloGaelach"
-#: ../rules/base.xml.in.h:145 ../rules/evdev.xml.in.h:145
+#: ../rules/base.xml.in.h:154
msgid "Colemak"
msgstr "коулмак"
-#: ../rules/base.xml.in.h:146 ../rules/evdev.xml.in.h:146
+#: ../rules/base.xml.in.h:155
msgid "Compaq Easy Access Keyboard"
msgstr "Compaq Easy Access Keyboard (за лесен достъп)"
-#: ../rules/base.xml.in.h:147 ../rules/evdev.xml.in.h:147
+#: ../rules/base.xml.in.h:156
msgid "Compaq Internet Keyboard (13 keys)"
msgstr "Compaq Internet Keyboard (за Интернет, 13 допълнителни клавиша)"
-#: ../rules/base.xml.in.h:148 ../rules/evdev.xml.in.h:148
+#: ../rules/base.xml.in.h:157
msgid "Compaq Internet Keyboard (18 keys)"
msgstr "Compaq Internet Keyboard (за Интернет, 18 допълнителни клавиша)"
-#: ../rules/base.xml.in.h:149 ../rules/evdev.xml.in.h:149
+#: ../rules/base.xml.in.h:158
msgid "Compaq Internet Keyboard (7 keys)"
msgstr "Compaq Internet Keyboard (за Интернет, 7 допълнителни клавиша)"
-#: ../rules/base.xml.in.h:150 ../rules/evdev.xml.in.h:150
+#: ../rules/base.xml.in.h:159
msgid "Compaq iPaq Keyboard"
msgstr "Compaq iPaq Keyboard"
-#: ../rules/base.xml.in.h:151 ../rules/evdev.xml.in.h:151
+#: ../rules/base.xml.in.h:160
msgid "Compose key position"
msgstr "Положение на Compose"
-#: ../rules/base.xml.in.h:152 ../rules/evdev.xml.in.h:152
+#: ../rules/base.xml.in.h:161
msgid "Congo, Democratic Republic of the"
msgstr "конгоанска (ДРК)"
-#: ../rules/base.xml.in.h:153 ../rules/evdev.xml.in.h:153
-msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
-msgstr "И двата Win-а функционират като Control (както и клавишите Ctrl)"
+#: ../rules/base.xml.in.h:162
+msgid "Control + Alt + Backspace"
+msgstr "Control+Alt+Backspace"
-#: ../rules/base.xml.in.h:154 ../rules/evdev.xml.in.h:154
-msgid "Croatia"
-msgstr "хърватска"
+#: ../rules/base.xml.in.h:163
+msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
+msgstr "И двата Alt-а са Control, Win е Alt"
+
+#: ../rules/base.xml.in.h:164
+msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
+msgstr "И двата Win-а са Control (както и клавишите Ctrl)"
+
+#: ../rules/base.xml.in.h:165
+msgid "Crimean Tatar (Dobruca-1 Q)"
+msgstr "татарска (Крим) (Dobruca-1 Q)"
-#: ../rules/base.xml.in.h:155 ../rules/evdev.xml.in.h:155
-msgid "Ctrl key at bottom left"
-msgstr "Ctrl е долу вляво"
+#: ../rules/base.xml.in.h:166
+msgid "Crimean Tatar (Dobruca-2 Q)"
+msgstr "татарска (Крим) (Dobruca-2 Q)"
-#: ../rules/base.xml.in.h:156 ../rules/evdev.xml.in.h:156
-msgid "Ctrl key at left of 'A'"
-msgstr "Ctrl е вляво от „A“"
+#: ../rules/base.xml.in.h:167
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "татарска (Крим) (турско Alt-Q)"
+
+#: ../rules/base.xml.in.h:168
+msgid "Crimean Tatar (Turkish F)"
+msgstr "татарска (Крим) (турско F)"
+
+#: ../rules/base.xml.in.h:169
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "татарска (Крим) (турско Q)"
+
+#: ../rules/base.xml.in.h:170
+msgid "Croatia"
+msgstr "хърватска"
-#: ../rules/base.xml.in.h:157 ../rules/evdev.xml.in.h:157
+#: ../rules/base.xml.in.h:171
msgid "Ctrl key position"
msgstr "Положение на Ctrl"
-#: ../rules/base.xml.in.h:158 ../rules/evdev.xml.in.h:158
-msgid "Ctrl+Shift change layout."
-msgstr "Заедно Ctrl+Shift сменят подредбата"
+#: ../rules/base.xml.in.h:172
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
-#: ../rules/base.xml.in.h:159 ../rules/evdev.xml.in.h:159
+#: ../rules/base.xml.in.h:173
msgid "Cyrillic"
msgstr "кирилска"
-#: ../rules/base.xml.in.h:160 ../rules/evdev.xml.in.h:160
+#: ../rules/base.xml.in.h:174
msgid "Cyrillic with guillemets"
msgstr "кирилска с френски кавички"
-#: ../rules/base.xml.in.h:161 ../rules/evdev.xml.in.h:161
+#: ../rules/base.xml.in.h:175
msgid "Cyrillic, Z and ZHE swapped"
msgstr "кирилска с разменени „З“ и „Ж“"
-#: ../rules/base.xml.in.h:162 ../rules/evdev.xml.in.h:162
+#: ../rules/base.xml.in.h:176
msgid "Cze"
msgstr "Чеч"
-#: ../rules/base.xml.in.h:163 ../rules/evdev.xml.in.h:163
+#: ../rules/base.xml.in.h:177
msgid "Czechia"
msgstr "чеченска"
-#: ../rules/base.xml.in.h:164 ../rules/evdev.xml.in.h:164
+#: ../rules/base.xml.in.h:178
+msgid "DOS"
+msgstr "DOS"
+
+#: ../rules/base.xml.in.h:179
msgid "DRC"
msgstr "Кнг"
-#: ../rules/base.xml.in.h:165 ../rules/evdev.xml.in.h:165
+#: ../rules/base.xml.in.h:180
msgid "DTK2000"
msgstr "DTK2000"
-#: ../rules/base.xml.in.h:166 ../rules/evdev.xml.in.h:166
+#: ../rules/base.xml.in.h:181
msgid "Dan"
msgstr "Дат"
-#: ../rules/base.xml.in.h:167 ../rules/evdev.xml.in.h:167
+#: ../rules/base.xml.in.h:182
msgid "Dead acute"
-msgstr "„мъртво ударение“"
+msgstr "„мъртво“ ударение"
-#: ../rules/base.xml.in.h:168 ../rules/evdev.xml.in.h:168
+#: ../rules/base.xml.in.h:183
msgid "Dead grave acute"
-msgstr "„мъртво, тежко ударение“"
+msgstr "„мъртво“ тежко ударение"
-#: ../rules/base.xml.in.h:169 ../rules/evdev.xml.in.h:169
-msgid "Default numeric keypad keys."
+#: ../rules/base.xml.in.h:184
+msgid "Default numeric keypad keys"
msgstr "Стандартни клавиши на цифровата клавиатура"
-#: ../rules/base.xml.in.h:170 ../rules/evdev.xml.in.h:170
+#: ../rules/base.xml.in.h:185
msgid "Dell"
msgstr "Dell"
-#: ../rules/base.xml.in.h:171 ../rules/evdev.xml.in.h:171
+#: ../rules/base.xml.in.h:186
msgid "Dell 101-key PC"
msgstr "Клавиатура на Dell със 101 клавиша за PC"
-#: ../rules/base.xml.in.h:172 ../rules/evdev.xml.in.h:172
+#: ../rules/base.xml.in.h:187
msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx (за мобилен компютър)"
-#: ../rules/base.xml.in.h:173 ../rules/evdev.xml.in.h:173
+#: ../rules/base.xml.in.h:188
msgid "Dell Laptop/notebook Precision M series"
msgstr "Dell Laptop/notebook Precision M series (за мобилен компютър)"
-#: ../rules/base.xml.in.h:174 ../rules/evdev.xml.in.h:174
+#: ../rules/base.xml.in.h:189
msgid "Dell Latitude series laptop"
msgstr "За преносим компютър Dell Latitude"
-#: ../rules/base.xml.in.h:175 ../rules/evdev.xml.in.h:175
+#: ../rules/base.xml.in.h:190
msgid "Dell Precision M65"
msgstr "Dell Precision M65"
-#: ../rules/base.xml.in.h:176 ../rules/evdev.xml.in.h:176
+#: ../rules/base.xml.in.h:191
msgid "Dell SK-8125"
msgstr "Dell SK-8125"
-#: ../rules/base.xml.in.h:177 ../rules/evdev.xml.in.h:177
+#: ../rules/base.xml.in.h:192
msgid "Dell SK-8135"
msgstr "Dell SK-8135"
-#: ../rules/base.xml.in.h:178 ../rules/evdev.xml.in.h:178
+#: ../rules/base.xml.in.h:193
msgid "Dell USB Multimedia Keyboard"
msgstr "Dell USB Multimedia Keybard (за мултимедия)"
-#: ../rules/base.xml.in.h:179 ../rules/evdev.xml.in.h:179
+#: ../rules/base.xml.in.h:194
msgid "Denmark"
msgstr "датска"
-#: ../rules/base.xml.in.h:180 ../rules/evdev.xml.in.h:180
+#: ../rules/base.xml.in.h:195
msgid "Deu"
msgstr "Нем"
-#: ../rules/base.xml.in.h:181 ../rules/evdev.xml.in.h:181
+#: ../rules/base.xml.in.h:196
msgid "Dexxa Wireless Desktop Keyboard"
msgstr "Dexxa Wireless Desktop Keyboard (безжична)"
-#: ../rules/base.xml.in.h:182 ../rules/evdev.xml.in.h:182
+#: ../rules/base.xml.in.h:197
msgid "Diamond 9801 / 9802 series"
msgstr "Diamond 9801/9802 series"
-#: ../rules/base.xml.in.h:183 ../rules/evdev.xml.in.h:183
+#: ../rules/base.xml.in.h:198
msgid "Dvorak"
msgstr "Дворак"
-#: ../rules/base.xml.in.h:184 ../rules/evdev.xml.in.h:184
+#: ../rules/base.xml.in.h:199
msgid "Dvorak (UK Punctuation)"
msgstr "Дворак, (пунктуация на Обединеното кралство)"
-#: ../rules/base.xml.in.h:185 ../rules/evdev.xml.in.h:185
+#: ../rules/base.xml.in.h:200
msgid "Dvorak international"
msgstr "Дворак, международна"
-#: ../rules/base.xml.in.h:186 ../rules/evdev.xml.in.h:186
-msgid "Dvorak, Polish quotes on key \"1/!\""
-msgstr "Дворак, полски кавички на клавиша „1/!“"
+#: ../rules/base.xml.in.h:201
+msgid "Dvorak, Polish quotes on key 1"
+msgstr "Дворак, полски кавички на клавиша „1“"
-#: ../rules/base.xml.in.h:187 ../rules/evdev.xml.in.h:187
+#: ../rules/base.xml.in.h:202
msgid "Dvorak, Polish quotes on quotemark key"
msgstr "Дворак, полски кавички на клавиша за кавички"
-#: ../rules/base.xml.in.h:188 ../rules/evdev.xml.in.h:188
+#: ../rules/base.xml.in.h:203
+msgid "E"
+msgstr "E"
+
+#: ../rules/base.xml.in.h:204
msgid "Eastern"
msgstr "източна"
-#: ../rules/base.xml.in.h:189 ../rules/evdev.xml.in.h:189
+#: ../rules/base.xml.in.h:205
msgid "Eliminate dead keys"
-msgstr "без „мъртви клавиши“"
+msgstr "без „мъртви“ клавиши"
+
+#: ../rules/base.xml.in.h:206
+msgid "Enable extra typographic characters"
+msgstr "Допълнителни типографски знаци"
+
+#: ../rules/base.xml.in.h:207
+msgid "English"
+msgstr "английска"
-#: ../rules/base.xml.in.h:190 ../rules/evdev.xml.in.h:190
+#: ../rules/base.xml.in.h:208
msgid "Ennyah DKB-1008"
msgstr "Ennyah DKB-1008"
-#: ../rules/base.xml.in.h:191 ../rules/evdev.xml.in.h:191
+#: ../rules/base.xml.in.h:209
+msgid "Enter on keypad"
+msgstr "Enter на цифровата клавиатура"
+
+#: ../rules/base.xml.in.h:210
msgid "Epo"
msgstr "Есп"
-#: ../rules/base.xml.in.h:192 ../rules/evdev.xml.in.h:192
+#: ../rules/base.xml.in.h:211
msgid "Ergonomic"
msgstr "ергономична"
-#: ../rules/base.xml.in.h:193 ../rules/evdev.xml.in.h:193
+#: ../rules/base.xml.in.h:212
msgid "Esp"
msgstr "Исп"
-#: ../rules/base.xml.in.h:194 ../rules/evdev.xml.in.h:194
+#: ../rules/base.xml.in.h:213
msgid "Esperanto"
msgstr "есперантска"
-#: ../rules/base.xml.in.h:195 ../rules/evdev.xml.in.h:195
+#: ../rules/base.xml.in.h:214
msgid "Est"
msgstr "Ест"
-#: ../rules/base.xml.in.h:196 ../rules/evdev.xml.in.h:196
+#: ../rules/base.xml.in.h:215
msgid "Estonia"
msgstr "естонска"
-#: ../rules/base.xml.in.h:197 ../rules/evdev.xml.in.h:197
+#: ../rules/base.xml.in.h:216
msgid "Eth"
msgstr "Ети"
-#: ../rules/base.xml.in.h:198 ../rules/evdev.xml.in.h:198
+#: ../rules/base.xml.in.h:217
msgid "Ethiopia"
msgstr "етиопска"
-#: ../rules/base.xml.in.h:199 ../rules/evdev.xml.in.h:199
+#: ../rules/base.xml.in.h:218
msgid "Evdev-managed keyboard"
msgstr "Клавиатура управлявана от Evdev"
-#: ../rules/base.xml.in.h:200 ../rules/evdev.xml.in.h:200
+#: ../rules/base.xml.in.h:219
msgid "Everex STEPnote"
msgstr "Everex STEPnote"
-#: ../rules/base.xml.in.h:201 ../rules/evdev.xml.in.h:201
+#: ../rules/base.xml.in.h:220
msgid "Ewe"
msgstr "еве"
-#: ../rules/base.xml.in.h:202 ../rules/evdev.xml.in.h:202
+#: ../rules/base.xml.in.h:221
msgid "Extended"
msgstr "разширена"
-#: ../rules/base.xml.in.h:203 ../rules/evdev.xml.in.h:203
+#: ../rules/base.xml.in.h:222
+msgid "Extended - Winkeys"
+msgstr "разширена — Winkeys"
+
+#: ../rules/base.xml.in.h:223
msgid "Extended Backslash"
msgstr "удължен Backslash"
-#: ../rules/base.xml.in.h:204 ../rules/evdev.xml.in.h:204
+#: ../rules/base.xml.in.h:224
msgid "F-letter (F) variant"
msgstr "вариант с буква F (F)"
-#: ../rules/base.xml.in.h:205 ../rules/evdev.xml.in.h:205
+#: ../rules/base.xml.in.h:225
+msgid "FL90"
+msgstr "FL90"
+
+#: ../rules/base.xml.in.h:226
msgid "Fao"
msgstr "Фар"
-#: ../rules/base.xml.in.h:206 ../rules/evdev.xml.in.h:206
+#: ../rules/base.xml.in.h:227
msgid "Faroe Islands"
msgstr "фарьорска"
-#: ../rules/base.xml.in.h:207 ../rules/evdev.xml.in.h:207
+#: ../rules/base.xml.in.h:228
msgid "Fin"
msgstr "Фин"
-#: ../rules/base.xml.in.h:208 ../rules/evdev.xml.in.h:208
+#: ../rules/base.xml.in.h:229
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:211 ../rules/evdev.xml.in.h:211
+#: ../rules/base.xml.in.h:232
msgid "Four-level key with abstract separators"
msgstr "Клавиш на четири нива с абстрактни разделители"
-#: ../rules/base.xml.in.h:212 ../rules/evdev.xml.in.h:212
+#: ../rules/base.xml.in.h:233
msgid "Four-level key with comma"
msgstr "Клавиш на четири нива с десетична запетая"
-#: ../rules/base.xml.in.h:213 ../rules/evdev.xml.in.h:213
+#: ../rules/base.xml.in.h:234
msgid "Four-level key with dot"
msgstr "Клавиш на четири нива с десетична точка"
-#: ../rules/base.xml.in.h:214 ../rules/evdev.xml.in.h:214
+#: ../rules/base.xml.in.h:235
+msgid "Four-level key with dot, latin-9 restriction"
+msgstr "Клавиш на четири нива с десетична точка, само латиница-9"
+
+#: ../rules/base.xml.in.h:236
msgid "Four-level key with momayyez"
msgstr "Клавиш на четири нива с арабска десетична запетая"
-#: ../rules/base.xml.in.h:215 ../rules/evdev.xml.in.h:215
+#: ../rules/base.xml.in.h:237
msgid "Fra"
msgstr "Фре"
-#: ../rules/base.xml.in.h:216 ../rules/evdev.xml.in.h:216
+#: ../rules/base.xml.in.h:238
msgid "France"
msgstr "френска"
-#: ../rules/base.xml.in.h:217 ../rules/evdev.xml.in.h:217
+#: ../rules/base.xml.in.h:239
msgid "French"
msgstr "френска"
-#: ../rules/base.xml.in.h:218 ../rules/evdev.xml.in.h:218
+#: ../rules/base.xml.in.h:240
msgid "French (Macintosh)"
msgstr "френска (за Macintosh)"
-#: ../rules/base.xml.in.h:219 ../rules/evdev.xml.in.h:219
+#: ../rules/base.xml.in.h:241
msgid "French (legacy)"
msgstr "френска (остаряла)"
-#: ../rules/base.xml.in.h:220 ../rules/evdev.xml.in.h:220
+#: ../rules/base.xml.in.h:242
msgid "French Dvorak"
msgstr "френска Дворак"
-#: ../rules/base.xml.in.h:221 ../rules/evdev.xml.in.h:221
+#: ../rules/base.xml.in.h:243
msgid "French, Sun dead keys"
-msgstr "френска, с „мъртвите клавиши“ на Sun"
+msgstr "френска, с „мъртвите“ клавиши на Sun"
-#: ../rules/base.xml.in.h:222 ../rules/evdev.xml.in.h:222
+#: ../rules/base.xml.in.h:244
msgid "French, eliminate dead keys"
-msgstr "френска, без „мъртви клавиши“"
+msgstr "френска, без „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:223 ../rules/evdev.xml.in.h:223
-msgid "Fujitsu-Siemens Computers AMILO A1667G laptop"
-msgstr "Fujitsu-Siemens Computers AMILO A1667G laptop (за мобилен компютър)"
+#: ../rules/base.xml.in.h:245
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Fujitsu-Siemens Computers AMILO laptop (за мобилен компютър)"
-#: ../rules/base.xml.in.h:224 ../rules/evdev.xml.in.h:224
+#: ../rules/base.xml.in.h:246
msgid "Fula"
msgstr "фула"
-#: ../rules/base.xml.in.h:225 ../rules/evdev.xml.in.h:225
+#: ../rules/base.xml.in.h:247
msgid "GBr"
msgstr "ВБр"
-#: ../rules/base.xml.in.h:226 ../rules/evdev.xml.in.h:226
+#: ../rules/base.xml.in.h:248
msgid "Ga"
msgstr "га"
-#: ../rules/base.xml.in.h:227 ../rules/evdev.xml.in.h:227
+#: ../rules/base.xml.in.h:249
msgid "Generic 101-key PC"
msgstr "Стандартна клавиатура за PC със 101 клавиша"
-#: ../rules/base.xml.in.h:228 ../rules/evdev.xml.in.h:228
+#: ../rules/base.xml.in.h:250
msgid "Generic 102-key (Intl) PC"
msgstr "Стандартна клавиатура за PC със 102 клавиша (международна)"
-#: ../rules/base.xml.in.h:229 ../rules/evdev.xml.in.h:229
+#: ../rules/base.xml.in.h:251
msgid "Generic 104-key PC"
msgstr "Стандартна клавиатура за PC със 104 клавиша"
-#: ../rules/base.xml.in.h:230 ../rules/evdev.xml.in.h:230
+#: ../rules/base.xml.in.h:252
msgid "Generic 105-key (Intl) PC"
msgstr "Стандартна клавиатура за PC със 105 клавиша (международна)"
-#: ../rules/base.xml.in.h:231 ../rules/evdev.xml.in.h:231
+#: ../rules/base.xml.in.h:253
msgid "Genius Comfy KB-12e"
msgstr "Genius Comfy KB-12e"
-#: ../rules/base.xml.in.h:232 ../rules/evdev.xml.in.h:232
+#: ../rules/base.xml.in.h:254
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:233 ../rules/evdev.xml.in.h:233
+#: ../rules/base.xml.in.h:255
msgid "Genius Comfy KB-21e-Scroll"
msgstr "Genius Comfy KB-21e-Scroll"
-#: ../rules/base.xml.in.h:234 ../rules/evdev.xml.in.h:234
+#: ../rules/base.xml.in.h:256
msgid "Genius KB-19e NB"
msgstr "Genius KB-19e NB"
-#: ../rules/base.xml.in.h:235 ../rules/evdev.xml.in.h:235
+#: ../rules/base.xml.in.h:257
+msgid "Genius KKB-2050HS"
+msgstr "Genius KKB-2050HS"
+
+#: ../rules/base.xml.in.h:258
msgid "Geo"
msgstr "Гру"
-#: ../rules/base.xml.in.h:236 ../rules/evdev.xml.in.h:236
+#: ../rules/base.xml.in.h:259
msgid "Georgia"
msgstr "грузинска"
-#: ../rules/base.xml.in.h:237 ../rules/evdev.xml.in.h:237
+#: ../rules/base.xml.in.h:260
msgid "Georgian"
msgstr "грузинска"
-#: ../rules/base.xml.in.h:238 ../rules/evdev.xml.in.h:238
+#: ../rules/base.xml.in.h:261
msgid "Georgian AZERTY Tskapo"
msgstr "грузинска, цкапо azerty"
-#: ../rules/base.xml.in.h:239 ../rules/evdev.xml.in.h:239
+#: ../rules/base.xml.in.h:262
msgid "German (Macintosh)"
msgstr "немска (за Macintosh)"
-#: ../rules/base.xml.in.h:240 ../rules/evdev.xml.in.h:240
+#: ../rules/base.xml.in.h:263
msgid "German, Sun dead keys"
-msgstr "немска, с „мъртви клавиши“ на Sun"
+msgstr "немска, с „мъртви“ клавиши на Sun"
-#: ../rules/base.xml.in.h:241 ../rules/evdev.xml.in.h:241
+#: ../rules/base.xml.in.h:264
msgid "German, eliminate dead keys"
-msgstr "немска, без „мъртви клавиши“"
+msgstr "немска, без „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:242 ../rules/evdev.xml.in.h:242
+#: ../rules/base.xml.in.h:265
msgid "Germany"
msgstr "немска"
-#: ../rules/base.xml.in.h:243 ../rules/evdev.xml.in.h:243
+#: ../rules/base.xml.in.h:266
msgid "Gha"
msgstr "Ган"
-#: ../rules/base.xml.in.h:244 ../rules/evdev.xml.in.h:244
+#: ../rules/base.xml.in.h:267
msgid "Ghana"
msgstr "ганийска"
-#: ../rules/base.xml.in.h:245 ../rules/evdev.xml.in.h:245
+#: ../rules/base.xml.in.h:268
msgid "Gre"
msgstr "Гръ"
-#: ../rules/base.xml.in.h:246 ../rules/evdev.xml.in.h:246
+#: ../rules/base.xml.in.h:269
msgid "Greece"
msgstr "гръцка"
-#: ../rules/base.xml.in.h:247 ../rules/evdev.xml.in.h:247
+#: ../rules/base.xml.in.h:270
msgid "Group toggle on multiply/divide key"
msgstr "сменяне на състоянието при натискането на умножение/деление"
-#: ../rules/base.xml.in.h:248 ../rules/evdev.xml.in.h:248
+#: ../rules/base.xml.in.h:271
msgid "Gui"
msgstr "гвй"
-#: ../rules/base.xml.in.h:249 ../rules/evdev.xml.in.h:249
+#: ../rules/base.xml.in.h:272
msgid "Guinea"
msgstr "гвинейска"
-#: ../rules/base.xml.in.h:250 ../rules/evdev.xml.in.h:250
+#: ../rules/base.xml.in.h:273
msgid "Gujarati"
msgstr "гуджарати"
-#: ../rules/base.xml.in.h:251 ../rules/evdev.xml.in.h:251
+#: ../rules/base.xml.in.h:274
msgid "Gurmukhi"
msgstr "гурмуки"
-#: ../rules/base.xml.in.h:252 ../rules/evdev.xml.in.h:252
+#: ../rules/base.xml.in.h:275
msgid "Gurmukhi Jhelum"
msgstr "гурмуки джелум"
-#: ../rules/base.xml.in.h:253 ../rules/evdev.xml.in.h:253
+#: ../rules/base.xml.in.h:276
msgid "Gyration"
msgstr "Gyration"
-#: ../rules/base.xml.in.h:254 ../rules/evdev.xml.in.h:254
+#: ../rules/base.xml.in.h:277
msgid "Happy Hacking Keyboard"
msgstr "Happy Hacking Keyboard (за весело хакерстване)"
-#: ../rules/base.xml.in.h:255 ../rules/evdev.xml.in.h:255
+#: ../rules/base.xml.in.h:278
msgid "Happy Hacking Keyboard for Mac"
msgstr "Happy Hacking Keyboard for Mac (за весело хакерстване)"
-#: ../rules/base.xml.in.h:256 ../rules/evdev.xml.in.h:256
+#: ../rules/base.xml.in.h:279
msgid "Hausa"
msgstr "хауска"
-#: ../rules/base.xml.in.h:257 ../rules/evdev.xml.in.h:257
+#: ../rules/base.xml.in.h:280
msgid "Hewlett-Packard Internet Keyboard"
msgstr "Hewlett-Packard Internet Keyboard (за Интернет)"
-#: ../rules/base.xml.in.h:258 ../rules/evdev.xml.in.h:258
-msgid "Hewlett-Packard Internet Keyboard 5181"
-msgstr "Hewlett-Packard Internet Keyboard 5181 (за Интернет)"
-
-#: ../rules/base.xml.in.h:259 ../rules/evdev.xml.in.h:259
-msgid "Hewlett-Packard Internet Keyboard 5185"
-msgstr "Hewlett-Packard Internet Keyboard 5185 (за Интернет)"
-
-#: ../rules/base.xml.in.h:260 ../rules/evdev.xml.in.h:260
+#: ../rules/base.xml.in.h:281
msgid "Hewlett-Packard Omnibook 500 FA"
msgstr "Hewlett-Packard Omnibook 500 FA"
-#: ../rules/base.xml.in.h:261 ../rules/evdev.xml.in.h:261
+#: ../rules/base.xml.in.h:282
msgid "Hewlett-Packard Omnibook 5xx"
msgstr "Hewlett-Packard Omnibook 5xx"
-#: ../rules/base.xml.in.h:262 ../rules/evdev.xml.in.h:262
+#: ../rules/base.xml.in.h:283
msgid "Hewlett-Packard Omnibook 6000/6100"
msgstr "Hewlett-Packard Omnibook 6000/6100"
-#: ../rules/base.xml.in.h:263 ../rules/evdev.xml.in.h:263
+#: ../rules/base.xml.in.h:284
msgid "Hewlett-Packard Omnibook XE3 GC"
msgstr "Hewlett-Packard Omnibook XE3 GC"
-#: ../rules/base.xml.in.h:264 ../rules/evdev.xml.in.h:264
+#: ../rules/base.xml.in.h:285
msgid "Hewlett-Packard Omnibook XE3 GF"
msgstr "Hewlett-Packard Omnibook XE3 GF"
-#: ../rules/base.xml.in.h:265 ../rules/evdev.xml.in.h:265
+#: ../rules/base.xml.in.h:286
msgid "Hewlett-Packard Omnibook XT1000"
msgstr "Hewlett-Packard Omnibook XT1000"
-#: ../rules/base.xml.in.h:266 ../rules/evdev.xml.in.h:266
+#: ../rules/base.xml.in.h:287
msgid "Hewlett-Packard Pavilion ZT11xx"
msgstr "Hewlett-Packard Pavilion ZT11xx"
-#: ../rules/base.xml.in.h:267 ../rules/evdev.xml.in.h:267
-msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard (за мултимедия)"
+#: ../rules/base.xml.in.h:288
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
-#: ../rules/base.xml.in.h:268 ../rules/evdev.xml.in.h:268
-msgid "Hewlett-Packard SK-2505 Internet Keyboard"
-msgstr "Hewlett-Packard SK-2505 Internet Keyboard (за Интернет)"
+#: ../rules/base.xml.in.h:289
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-250x Multimedia Keyboard (за мултимедия)"
-#: ../rules/base.xml.in.h:269 ../rules/evdev.xml.in.h:269
+#: ../rules/base.xml.in.h:290
msgid "Hewlett-Packard nx9020"
msgstr "Hewlett-Packard nx9020"
-#: ../rules/base.xml.in.h:270 ../rules/evdev.xml.in.h:270
+#: ../rules/base.xml.in.h:291
+msgid "Hexadecimal"
+msgstr "шестнадесетична"
+
+#: ../rules/base.xml.in.h:292
msgid "Hindi Bolnagri"
msgstr "фонетична Болнагри за хинди"
-#: ../rules/base.xml.in.h:271 ../rules/evdev.xml.in.h:271
+#: ../rules/base.xml.in.h:293
+msgid "Hindi Wx"
+msgstr "хинди Wx"
+
+#: ../rules/base.xml.in.h:294
msgid "Homophonic"
msgstr "фонетична"
-#: ../rules/base.xml.in.h:272 ../rules/evdev.xml.in.h:272
+#: ../rules/base.xml.in.h:295
msgid "Honeywell Euroboard"
msgstr "Honeywell Euroboard"
-#: ../rules/base.xml.in.h:273 ../rules/evdev.xml.in.h:273
+#: ../rules/base.xml.in.h:296
msgid "Hrv"
msgstr "Хър"
-#: ../rules/base.xml.in.h:274 ../rules/evdev.xml.in.h:274
+#: ../rules/base.xml.in.h:297
msgid "Hun"
msgstr "Унг"
-#: ../rules/base.xml.in.h:275 ../rules/evdev.xml.in.h:275
+#: ../rules/base.xml.in.h:298
msgid "Hungary"
msgstr "унгарска"
-#: ../rules/base.xml.in.h:276 ../rules/evdev.xml.in.h:276
-msgid "Hyper is mapped to the Win-keys."
-msgstr "И двата Win-а функционират като Hyper"
+#: ../rules/base.xml.in.h:299
+msgid "Hyper is mapped to Win-keys"
+msgstr "И двата Win-а са Hyper"
-#: ../rules/base.xml.in.h:277 ../rules/evdev.xml.in.h:277
+#: ../rules/base.xml.in.h:300
msgid "IBM (LST 1205-92)"
msgstr "IBM (LST 1205-92)"
-#: ../rules/base.xml.in.h:278 ../rules/evdev.xml.in.h:278
+#: ../rules/base.xml.in.h:301
msgid "IBM Rapid Access"
msgstr "IBM Rapid Access"
-#: ../rules/base.xml.in.h:279 ../rules/evdev.xml.in.h:279
+#: ../rules/base.xml.in.h:302
msgid "IBM Rapid Access II"
msgstr "IBM Rapid Access II"
-#: ../rules/base.xml.in.h:280 ../rules/evdev.xml.in.h:280
-msgid "IBM Rapid Access II (alternate option)"
-msgstr "IBM Rapid Access II (алтернативна)"
-
-#: ../rules/base.xml.in.h:281 ../rules/evdev.xml.in.h:281
+#: ../rules/base.xml.in.h:303
msgid "IBM Space Saver"
msgstr "IBM Space Saver"
-#: ../rules/base.xml.in.h:282 ../rules/evdev.xml.in.h:282
+#: ../rules/base.xml.in.h:304
msgid "IBM ThinkPad 560Z/600/600E/A22E"
msgstr "IBM ThinkPad 560Z/600/600E/A22E"
-#: ../rules/base.xml.in.h:283 ../rules/evdev.xml.in.h:283
+#: ../rules/base.xml.in.h:305
msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl (международна)"
-#: ../rules/base.xml.in.h:284 ../rules/evdev.xml.in.h:284
+#: ../rules/base.xml.in.h:306
msgid "IBM ThinkPad R60/T60/R61/T61"
msgstr "IBM ThinkPad R60/T60/R61/T61"
-#: ../rules/base.xml.in.h:285 ../rules/evdev.xml.in.h:285
+#: ../rules/base.xml.in.h:307
msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
-#: ../rules/base.xml.in.h:286 ../rules/evdev.xml.in.h:286
+#: ../rules/base.xml.in.h:308
msgid "ISO Alternate"
msgstr "ISO (алтернативна)"
-#: ../rules/base.xml.in.h:287 ../rules/evdev.xml.in.h:287
+#: ../rules/base.xml.in.h:309
msgid "Iceland"
msgstr "исландска"
-#: ../rules/base.xml.in.h:288 ../rules/evdev.xml.in.h:288
+#: ../rules/base.xml.in.h:310
msgid "Igbo"
msgstr "игбо"
-#: ../rules/base.xml.in.h:289 ../rules/evdev.xml.in.h:289
+#: ../rules/base.xml.in.h:311
+msgid "Include dead tilde"
+msgstr "включване на „мъртва“ тилда"
+
+#: ../rules/base.xml.in.h:312
msgid "Ind"
msgstr "Инд"
-#: ../rules/base.xml.in.h:290 ../rules/evdev.xml.in.h:290
+#: ../rules/base.xml.in.h:313
msgid "India"
msgstr "индийска"
-#: ../rules/base.xml.in.h:291 ../rules/evdev.xml.in.h:291
+#: ../rules/base.xml.in.h:314
msgid "International (AltGr dead keys)"
-msgstr "международна, с „мъртви клавиши“ чрез AltGr"
+msgstr "международна, с „мъртви“ клавиши чрез AltGr"
-#: ../rules/base.xml.in.h:292 ../rules/evdev.xml.in.h:292
+#: ../rules/base.xml.in.h:315
msgid "International (with dead keys)"
-msgstr "международна, с „мъртви клавиши“"
+msgstr "международна, с „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:293 ../rules/evdev.xml.in.h:293
+#: ../rules/base.xml.in.h:316
msgid "Inuktitut"
msgstr "ескимоска"
-#: ../rules/base.xml.in.h:294 ../rules/evdev.xml.in.h:294
+#: ../rules/base.xml.in.h:317
msgid "Iran"
msgstr "иранска"
-#: ../rules/base.xml.in.h:295 ../rules/evdev.xml.in.h:295
+#: ../rules/base.xml.in.h:318
msgid "Iraq"
msgstr "иракска"
-#: ../rules/base.xml.in.h:296 ../rules/evdev.xml.in.h:296
+#: ../rules/base.xml.in.h:319
msgid "Ireland"
msgstr "ирландска"
-#: ../rules/base.xml.in.h:297 ../rules/evdev.xml.in.h:297
+#: ../rules/base.xml.in.h:320
msgid "Irl"
msgstr "Ирл"
-#: ../rules/base.xml.in.h:298 ../rules/evdev.xml.in.h:298
+#: ../rules/base.xml.in.h:321
msgid "Irn"
msgstr "Ирн"
-#: ../rules/base.xml.in.h:299 ../rules/evdev.xml.in.h:299
+#: ../rules/base.xml.in.h:322
msgid "Irq"
msgstr "Ирк"
-#: ../rules/base.xml.in.h:300 ../rules/evdev.xml.in.h:300
+#: ../rules/base.xml.in.h:323
msgid "Isl"
msgstr "Исл"
-#: ../rules/base.xml.in.h:301 ../rules/evdev.xml.in.h:301
+#: ../rules/base.xml.in.h:324
msgid "Isr"
msgstr "Изр"
-#: ../rules/base.xml.in.h:302 ../rules/evdev.xml.in.h:302
+#: ../rules/base.xml.in.h:325
msgid "Israel"
msgstr "израелска"
-#: ../rules/base.xml.in.h:303 ../rules/evdev.xml.in.h:303
+#: ../rules/base.xml.in.h:326
msgid "Ita"
msgstr "Ита"
-#: ../rules/base.xml.in.h:304 ../rules/evdev.xml.in.h:304
+#: ../rules/base.xml.in.h:327
msgid "Italy"
msgstr "италианска"
-#: ../rules/base.xml.in.h:305 ../rules/evdev.xml.in.h:305
+#: ../rules/base.xml.in.h:328
msgid "Japan"
msgstr "японска"
-#: ../rules/base.xml.in.h:306 ../rules/evdev.xml.in.h:306
+#: ../rules/base.xml.in.h:329
msgid "Japan (PC-98xx Series)"
msgstr "японска, серии PC-98xx"
-#: ../rules/base.xml.in.h:307 ../rules/evdev.xml.in.h:307
-msgid "Japanese 106-key"
-msgstr "Японска със 106 клавиша"
-
-#: ../rules/base.xml.in.h:308 ../rules/evdev.xml.in.h:308
+#: ../rules/base.xml.in.h:330
msgid "Japanese keyboard options"
msgstr "Настройки за японска клавиатура"
-#: ../rules/base.xml.in.h:309 ../rules/evdev.xml.in.h:309
+#: ../rules/base.xml.in.h:331
msgid "Jpn"
msgstr "Япо"
-#: ../rules/base.xml.in.h:310 ../rules/evdev.xml.in.h:310
+#: ../rules/base.xml.in.h:332
+msgid "Kalmyk"
+msgstr "калмишка"
+
+#: ../rules/base.xml.in.h:333
msgid "Kana"
msgstr "японска сричкова (кана)"
-#: ../rules/base.xml.in.h:311 ../rules/evdev.xml.in.h:311
+#: ../rules/base.xml.in.h:334
msgid "Kana Lock key is locking"
msgstr "Клавишът Lock на кана заключва"
-#: ../rules/base.xml.in.h:312 ../rules/evdev.xml.in.h:312
+#: ../rules/base.xml.in.h:335
msgid "Kannada"
msgstr "канареска"
-#: ../rules/base.xml.in.h:313 ../rules/evdev.xml.in.h:313
+#: ../rules/base.xml.in.h:336
msgid "Kashubian"
msgstr "кашубска"
-#: ../rules/base.xml.in.h:314 ../rules/evdev.xml.in.h:314
+#: ../rules/base.xml.in.h:337
msgid "Kaz"
msgstr "Каз"
-#: ../rules/base.xml.in.h:315 ../rules/evdev.xml.in.h:315
+#: ../rules/base.xml.in.h:338
msgid "Kazakh with Russian"
msgstr "казахска с руски букви"
-#: ../rules/base.xml.in.h:316 ../rules/evdev.xml.in.h:316
+#: ../rules/base.xml.in.h:339
msgid "Kazakhstan"
msgstr "казахска"
-#: ../rules/base.xml.in.h:317 ../rules/evdev.xml.in.h:317
-msgid "Keypad"
-msgstr "цифрова клавиатура"
+#: ../rules/base.xml.in.h:340
+msgid "Key sequence to kill the X server"
+msgstr "Клавишна комбинация за убиването на X сървъра"
-#: ../rules/base.xml.in.h:318 ../rules/evdev.xml.in.h:318
-msgid "Keypad with unicode additions (arrows and math operators)"
-msgstr "Цифрова клавиатура с допълненията от Уникод (стрелки и математически операции)"
+#: ../rules/base.xml.in.h:341
+msgid "Key to choose 3rd level"
+msgstr "Клавиш за избор третото ниво"
-#: ../rules/base.xml.in.h:319 ../rules/evdev.xml.in.h:319
-msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Цифрова клавиатура с допълненията от Уникод (стрелки и математически операции). Операциите са на стандартното ниво"
+#: ../rules/base.xml.in.h:342
+msgid "Key(s) to change layout"
+msgstr "Клавиш(и) за смяна на подредбата"
-#: ../rules/base.xml.in.h:320 ../rules/evdev.xml.in.h:320
+#: ../rules/base.xml.in.h:343
+msgid "Keypad"
+msgstr "цифрова клавиатура"
+
+#: ../rules/base.xml.in.h:344
msgid "Keytronic FlexPro"
msgstr "Keytronic FlexPro"
-#: ../rules/base.xml.in.h:321 ../rules/evdev.xml.in.h:321
+#: ../rules/base.xml.in.h:345
+msgid "Kgz"
+msgstr "Крг"
+
+#: ../rules/base.xml.in.h:346
msgid "Khm"
msgstr "Кам"
-#: ../rules/base.xml.in.h:322 ../rules/evdev.xml.in.h:322
-msgid "Kir"
-msgstr "Кир"
-
-#: ../rules/base.xml.in.h:323 ../rules/evdev.xml.in.h:323
+#: ../rules/base.xml.in.h:347
msgid "Komi"
msgstr "комска"
-#: ../rules/base.xml.in.h:324 ../rules/evdev.xml.in.h:324
+#: ../rules/base.xml.in.h:348
msgid "Kor"
msgstr "Кор"
-#: ../rules/base.xml.in.h:325 ../rules/evdev.xml.in.h:325
+#: ../rules/base.xml.in.h:349
msgid "Korea, Republic of"
msgstr "корейска (Република Корея)"
-#: ../rules/base.xml.in.h:326 ../rules/evdev.xml.in.h:326
-msgid "Korean 106-key"
-msgstr "Корейска със 106 клавиша"
-
-#: ../rules/base.xml.in.h:327 ../rules/evdev.xml.in.h:327
+#: ../rules/base.xml.in.h:350
msgid "Ktunaxa"
msgstr "ктунакса"
-#: ../rules/base.xml.in.h:328 ../rules/evdev.xml.in.h:328
+#: ../rules/base.xml.in.h:351
msgid "Kurdish, (F)"
msgstr "кюрдска, (Ф)"
-#: ../rules/base.xml.in.h:329 ../rules/evdev.xml.in.h:329
+#: ../rules/base.xml.in.h:352
msgid "Kurdish, Arabic-Latin"
msgstr "кюрдска, арабски и латински букви"
-#: ../rules/base.xml.in.h:330 ../rules/evdev.xml.in.h:330
+#: ../rules/base.xml.in.h:353
msgid "Kurdish, Latin Alt-Q"
-msgstr "кюрдска, латинска Alt-Q"
+msgstr "кюрдска, латинско Alt-Q"
-#: ../rules/base.xml.in.h:331 ../rules/evdev.xml.in.h:331
+#: ../rules/base.xml.in.h:354
msgid "Kurdish, Latin Q"
-msgstr "кюрдкса, латинско Q"
+msgstr "кюрдска, латинско Q"
-#: ../rules/base.xml.in.h:332 ../rules/evdev.xml.in.h:332
+#: ../rules/base.xml.in.h:355
msgid "Kyrgyzstan"
msgstr "киргистанска"
-#: ../rules/base.xml.in.h:333 ../rules/evdev.xml.in.h:333
+#: ../rules/base.xml.in.h:356
msgid "LAm"
msgstr "ЛАм"
-#: ../rules/base.xml.in.h:334 ../rules/evdev.xml.in.h:334
-msgid "LCtrl+LShift change layout."
-msgstr "Заедно левите Ctrl+Shift сменят подредбата"
-
-#: ../rules/base.xml.in.h:335 ../rules/evdev.xml.in.h:335
+#: ../rules/base.xml.in.h:357
msgid "LEKP"
msgstr "LEKP"
-#: ../rules/base.xml.in.h:336 ../rules/evdev.xml.in.h:336
+#: ../rules/base.xml.in.h:358
msgid "LEKPa"
msgstr "LEKPa"
-#: ../rules/base.xml.in.h:337 ../rules/evdev.xml.in.h:337
+#: ../rules/base.xml.in.h:359
msgid "Lao"
msgstr "Лао"
-#: ../rules/base.xml.in.h:338 ../rules/evdev.xml.in.h:338
+#: ../rules/base.xml.in.h:360
msgid "Laos"
msgstr "лаоска"
-#: ../rules/base.xml.in.h:339 ../rules/evdev.xml.in.h:339
+#: ../rules/base.xml.in.h:361
msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
msgstr "Laptop/notebook Compaq Laptop Keyboard (за мобилен компютър, напр. Armada)"
-#: ../rules/base.xml.in.h:340 ../rules/evdev.xml.in.h:340
+#: ../rules/base.xml.in.h:362
msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
msgstr "Laptop/notebook Compaq Internet Keyboard (за мобилен компютър, напр. Presario, и Интернет)"
-#: ../rules/base.xml.in.h:341 ../rules/evdev.xml.in.h:341
+#: ../rules/base.xml.in.h:363
msgid "Laptop/notebook eMachines m68xx"
msgstr "Laptop/notebook eMachines m68xx (за мобилен компютър)"
-#: ../rules/base.xml.in.h:342 ../rules/evdev.xml.in.h:342
+#: ../rules/base.xml.in.h:364
msgid "Latin"
msgstr "латинска"
-#: ../rules/base.xml.in.h:343 ../rules/evdev.xml.in.h:343
+#: ../rules/base.xml.in.h:365
msgid "Latin American"
msgstr "латиноамериканска"
-#: ../rules/base.xml.in.h:344 ../rules/evdev.xml.in.h:344
+#: ../rules/base.xml.in.h:366
msgid "Latin Unicode"
msgstr "латинска за Уникод"
-#: ../rules/base.xml.in.h:345 ../rules/evdev.xml.in.h:345
+#: ../rules/base.xml.in.h:367
msgid "Latin Unicode qwerty"
msgstr "латинска за Уникод (qwerty)"
-#: ../rules/base.xml.in.h:346 ../rules/evdev.xml.in.h:346
+#: ../rules/base.xml.in.h:368
msgid "Latin qwerty"
msgstr "латинска (qwerty)"
-#: ../rules/base.xml.in.h:347 ../rules/evdev.xml.in.h:347
+#: ../rules/base.xml.in.h:369
msgid "Latin unicode"
msgstr "латинска за Уникод"
-#: ../rules/base.xml.in.h:348 ../rules/evdev.xml.in.h:348
+#: ../rules/base.xml.in.h:370
msgid "Latin unicode qwerty"
msgstr "латинска за Уникод, qwerty"
-#: ../rules/base.xml.in.h:349 ../rules/evdev.xml.in.h:349
+#: ../rules/base.xml.in.h:371
msgid "Latin with guillemets"
msgstr "латинска с френски кавички"
-#: ../rules/base.xml.in.h:350 ../rules/evdev.xml.in.h:350
+#: ../rules/base.xml.in.h:372
msgid "Latvia"
msgstr "латвийска"
-#: ../rules/base.xml.in.h:351 ../rules/evdev.xml.in.h:351
+#: ../rules/base.xml.in.h:373
msgid "Lav"
msgstr "Лат"
-#: ../rules/base.xml.in.h:352 ../rules/evdev.xml.in.h:352
-msgid "Layout switching"
-msgstr "Смяна на подредбата"
+#: ../rules/base.xml.in.h:374
+msgid "Left Alt"
+msgstr "Левият Alt"
-#: ../rules/base.xml.in.h:353 ../rules/evdev.xml.in.h:353
-msgid "Left Alt is swapped with left Win-key."
-msgstr "Левият Alt е разменен с левия Win"
+#: ../rules/base.xml.in.h:375
+msgid "Left Alt (while pressed)"
+msgstr "Левият Alt (докато е натиснат)"
-#: ../rules/base.xml.in.h:354 ../rules/evdev.xml.in.h:354
-msgid "Left Alt key changes layout."
-msgstr "Десният Alt сменя подредбата"
+#: ../rules/base.xml.in.h:376
+msgid "Left Alt is swapped with Left Win"
+msgstr "Левият Alt е разменен с левия Win"
-#: ../rules/base.xml.in.h:355 ../rules/evdev.xml.in.h:355
-msgid "Left Alt key switches layout while pressed."
-msgstr "Левият Alt сменя подредбата докато е натиснат"
+#: ../rules/base.xml.in.h:377
+msgid "Left Ctrl"
+msgstr "Левият Ctrl"
-#: ../rules/base.xml.in.h:356 ../rules/evdev.xml.in.h:356
-msgid "Left Ctrl key changes layout."
-msgstr "Левият Ctrl сменя подредбата"
+#: ../rules/base.xml.in.h:378
+msgid "Left Ctrl+Left Shift"
+msgstr "Левият Ctrl+левият Shift"
-#: ../rules/base.xml.in.h:357 ../rules/evdev.xml.in.h:357
-msgid "Left Shift key changes layout."
-msgstr "Левият Shift сменя подредбата"
+#: ../rules/base.xml.in.h:379
+msgid "Left Shift"
+msgstr "Левият Shift"
-#: ../rules/base.xml.in.h:358 ../rules/evdev.xml.in.h:358
-msgid "Left Win-key changes layout."
-msgstr "Левият Win сменя подредбата"
+#: ../rules/base.xml.in.h:380
+msgid "Left Win"
+msgstr "Левият Win"
-#: ../rules/base.xml.in.h:359 ../rules/evdev.xml.in.h:359
-msgid "Left Win-key is Compose."
-msgstr "Левият Win функционира като Compose"
+#: ../rules/base.xml.in.h:381
+msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgstr "CapsLock (към първата подредба), десният Win/Menu (към последната)"
-#: ../rules/base.xml.in.h:360 ../rules/evdev.xml.in.h:360
-msgid "Left Win-key switches layout while pressed."
-msgstr "Левият Win сменя подредбата докато е натиснат"
+#: ../rules/base.xml.in.h:382
+msgid "Left Win (while pressed)"
+msgstr "Левият Win (докато е натиснат)"
-#: ../rules/base.xml.in.h:361 ../rules/evdev.xml.in.h:361
+#: ../rules/base.xml.in.h:383
msgid "Left hand"
msgstr "за левичари"
-#: ../rules/base.xml.in.h:362 ../rules/evdev.xml.in.h:362
+#: ../rules/base.xml.in.h:384
msgid "Left handed Dvorak"
msgstr "Дворак за левичари"
-#: ../rules/base.xml.in.h:363 ../rules/evdev.xml.in.h:363
+#: ../rules/base.xml.in.h:385
msgid "Legacy"
msgstr "остаряла"
-#: ../rules/base.xml.in.h:364 ../rules/evdev.xml.in.h:364
-msgid "Legacy Wang 724 keypad"
-msgstr "Остаряла цифрова клавиатура — Wang 724"
+#: ../rules/base.xml.in.h:386
+msgid "Legacy Wang 724"
+msgstr "Остаряла Wang 724"
#. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:366 ../rules/evdev.xml.in.h:366
+#: ../rules/base.xml.in.h:388
msgid "Legacy key with comma"
msgstr "Остарял клавиш с десетична запетая"
-#: ../rules/base.xml.in.h:367 ../rules/evdev.xml.in.h:367
+#: ../rules/base.xml.in.h:389
msgid "Legacy key with dot"
msgstr "Остарял клавиш с десетична точка"
-#: ../rules/base.xml.in.h:368 ../rules/evdev.xml.in.h:368
-msgid "Legacy keypad"
-msgstr "Остаряла цифрова клавиатура"
-
-#: ../rules/base.xml.in.h:369 ../rules/evdev.xml.in.h:369
-msgid "Less-than/Greater-than is Compose."
-msgstr "⋚ функционира като Compose"
+#: ../rules/base.xml.in.h:390
+msgid "Less-than/Greater-than"
+msgstr "По-малко/по-голямо"
-#: ../rules/base.xml.in.h:370 ../rules/evdev.xml.in.h:370
+#: ../rules/base.xml.in.h:391
msgid "Lithuania"
msgstr "литовска"
-#: ../rules/base.xml.in.h:371 ../rules/evdev.xml.in.h:371
+#: ../rules/base.xml.in.h:392
msgid "Logitech Access Keyboard"
msgstr "Logitech Access Keyboard"
-#: ../rules/base.xml.in.h:372 ../rules/evdev.xml.in.h:372
+#: ../rules/base.xml.in.h:393
msgid "Logitech Cordless Desktop"
msgstr "Logitech Cordless Desktop (безжична)"
-#: ../rules/base.xml.in.h:373 ../rules/evdev.xml.in.h:373
+#: ../rules/base.xml.in.h:394
msgid "Logitech Cordless Desktop (alternate option)"
msgstr "Logitech Cordless Desktop (алтернативен вариант)"
-#: ../rules/base.xml.in.h:374 ../rules/evdev.xml.in.h:374
+#: ../rules/base.xml.in.h:395
msgid "Logitech Cordless Desktop EX110"
msgstr "Logitech Cordless Desktop EX110"
-#: ../rules/base.xml.in.h:375 ../rules/evdev.xml.in.h:375
+#: ../rules/base.xml.in.h:396
msgid "Logitech Cordless Desktop LX-300"
msgstr "Logitech Cordless Desktop LX-300 (безжична)"
-#: ../rules/base.xml.in.h:376 ../rules/evdev.xml.in.h:376
+#: ../rules/base.xml.in.h:397
msgid "Logitech Cordless Desktop Navigator"
msgstr "Logitech Cordless Desktop Navigator (безжична)"
-#: ../rules/base.xml.in.h:377 ../rules/evdev.xml.in.h:377
+#: ../rules/base.xml.in.h:398
msgid "Logitech Cordless Desktop Optical"
msgstr "Logitech Cordless Desktop Optical (оптична)"
-#: ../rules/base.xml.in.h:378 ../rules/evdev.xml.in.h:378
-msgid "Logitech Cordless Desktop Pro (alternate option2)"
-msgstr "Logitech Cordless Desktop Pro (безжична, алтернативен вариант 2)"
+#: ../rules/base.xml.in.h:399
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgstr "Logitech Cordless Desktop Pro (алтернативен вариант 2)"
-#: ../rules/base.xml.in.h:379 ../rules/evdev.xml.in.h:379
+#: ../rules/base.xml.in.h:400
msgid "Logitech Cordless Desktop iTouch"
msgstr "Logitech Cordless Desktop iTouch (безжична)"
-#: ../rules/base.xml.in.h:380 ../rules/evdev.xml.in.h:380
+#: ../rules/base.xml.in.h:401
msgid "Logitech Cordless Freedom/Desktop Navigator"
msgstr "Logitech Cordless Freedom/Desktop Navigator (безжична)"
-#: ../rules/base.xml.in.h:381 ../rules/evdev.xml.in.h:381
+#: ../rules/base.xml.in.h:402
msgid "Logitech G15 extra keys via G15daemon"
msgstr "Logitech G15, допълнителни клавиши чрез G15daemon"
-#: ../rules/base.xml.in.h:382 ../rules/evdev.xml.in.h:382
+#: ../rules/base.xml.in.h:403
msgid "Logitech Generic Keyboard"
msgstr "Logitech Generic Keyboard (стандартна)"
-#: ../rules/base.xml.in.h:383 ../rules/evdev.xml.in.h:383
+#: ../rules/base.xml.in.h:404
msgid "Logitech Internet 350 Keyboard"
msgstr "Logitech Internet 350 Keyboard (за Интернет)"
-#: ../rules/base.xml.in.h:384 ../rules/evdev.xml.in.h:384
+#: ../rules/base.xml.in.h:405
msgid "Logitech Internet Keyboard"
msgstr "Logitech Internet Keyboard (за Интернет)"
-#: ../rules/base.xml.in.h:385 ../rules/evdev.xml.in.h:385
+#: ../rules/base.xml.in.h:406
msgid "Logitech Internet Navigator Keyboard"
msgstr "Logitech Internet Navigator Keyboard (за Интернет)"
-#: ../rules/base.xml.in.h:386 ../rules/evdev.xml.in.h:386
+#: ../rules/base.xml.in.h:407
msgid "Logitech Media Elite Keyboard"
msgstr "Logitech Media Elite Keyboard"
-#: ../rules/base.xml.in.h:387 ../rules/evdev.xml.in.h:387
+#: ../rules/base.xml.in.h:408
msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard (безжична, за мултимедия)"
-#: ../rules/base.xml.in.h:388 ../rules/evdev.xml.in.h:388
+#: ../rules/base.xml.in.h:409
msgid "Logitech Ultra-X Keyboard"
msgstr "Logitech Ultra-X Keyboard"
-#: ../rules/base.xml.in.h:389 ../rules/evdev.xml.in.h:389
+#: ../rules/base.xml.in.h:410
msgid "Logitech diNovo Edge Keyboard"
msgstr "Logitech diNovo Edge Keyboard"
-#: ../rules/base.xml.in.h:390 ../rules/evdev.xml.in.h:390
+#: ../rules/base.xml.in.h:411
msgid "Logitech diNovo Keyboard"
msgstr "Logitech diNovo Keyboard"
-#: ../rules/base.xml.in.h:391 ../rules/evdev.xml.in.h:391
+#: ../rules/base.xml.in.h:412
msgid "Logitech iTouch"
msgstr "Logitech iTouch"
-#: ../rules/base.xml.in.h:392 ../rules/evdev.xml.in.h:392
+#: ../rules/base.xml.in.h:413
msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6) (безжична)"
-#: ../rules/base.xml.in.h:393 ../rules/evdev.xml.in.h:393
+#: ../rules/base.xml.in.h:414
msgid "Logitech iTouch Internet Navigator Keyboard SE"
msgstr "Logitech iTouch Internet Navigator Keyboard SE (за Интернет)"
-#: ../rules/base.xml.in.h:394 ../rules/evdev.xml.in.h:394
+#: ../rules/base.xml.in.h:415
msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB) (за Интернет)"
-#: ../rules/base.xml.in.h:395 ../rules/evdev.xml.in.h:395
+#: ../rules/base.xml.in.h:416
+msgid "Lower Sorbian"
+msgstr "долно сорбска"
+
+#: ../rules/base.xml.in.h:417
+msgid "Lower Sorbian (qwertz)"
+msgstr "долно сорбска (qwertz)"
+
+#: ../rules/base.xml.in.h:418
msgid "Ltu"
msgstr "Лит"
-#: ../rules/base.xml.in.h:396 ../rules/evdev.xml.in.h:396
+#: ../rules/base.xml.in.h:419
msgid "MESS"
msgstr "MESS"
-#: ../rules/base.xml.in.h:397 ../rules/evdev.xml.in.h:397
+#: ../rules/base.xml.in.h:420
msgid "MNE"
msgstr "Чгр"
-#: ../rules/base.xml.in.h:398 ../rules/evdev.xml.in.h:398
+#: ../rules/base.xml.in.h:421
msgid "MacBook/MacBook Pro"
msgstr "MacBook/MacBook Pro"
-#: ../rules/base.xml.in.h:399 ../rules/evdev.xml.in.h:399
+#: ../rules/base.xml.in.h:422
msgid "MacBook/MacBook Pro (Intl)"
msgstr "MacBook/MacBook Pro (международна)"
-#: ../rules/base.xml.in.h:400 ../rules/evdev.xml.in.h:400
+#: ../rules/base.xml.in.h:423
msgid "Macedonia"
msgstr "македонска"
-#: ../rules/base.xml.in.h:401 ../rules/evdev.xml.in.h:401
+#: ../rules/base.xml.in.h:424
msgid "Macintosh"
msgstr "Macintosh"
-#: ../rules/base.xml.in.h:402 ../rules/evdev.xml.in.h:402
+#: ../rules/base.xml.in.h:425
msgid "Macintosh Old"
msgstr "Macintosh Old (стар вариант)"
-#: ../rules/base.xml.in.h:403 ../rules/evdev.xml.in.h:403
+#: ../rules/base.xml.in.h:426
msgid "Macintosh, Sun dead keys"
-msgstr "Macintosh, с „мъртви клавиши“ на Sun"
+msgstr "Macintosh, с „мъртви“ клавиши на Sun"
-#: ../rules/base.xml.in.h:404 ../rules/evdev.xml.in.h:404
+#: ../rules/base.xml.in.h:427
msgid "Macintosh, eliminate dead keys"
-msgstr "Macintosh, без „мъртви клавиши“"
+msgstr "Macintosh, без „мъртви“ клавиши"
+
+#: ../rules/base.xml.in.h:428
+msgid "Make CapsLock an additional Backspace"
+msgstr "CapsLock е допълнителен Backspace"
+
+#: ../rules/base.xml.in.h:429
+msgid "Make CapsLock an additional Ctrl"
+msgstr "CapsLock е допълнителен Ctrl"
-#: ../rules/base.xml.in.h:405 ../rules/evdev.xml.in.h:405
-msgid "Make CapsLock an additional Ctrl."
-msgstr "CapsLock функционира като допълнителен Ctrl"
+#: ../rules/base.xml.in.h:430
+msgid "Make CapsLock an additional ESC"
+msgstr "CapsLock е допълнителен Esc"
-#: ../rules/base.xml.in.h:406 ../rules/evdev.xml.in.h:406
+#: ../rules/base.xml.in.h:431
msgid "Mal"
msgstr "Млд"
-#: ../rules/base.xml.in.h:407 ../rules/evdev.xml.in.h:407
+#: ../rules/base.xml.in.h:432
msgid "Malayalam"
msgstr "малаяламска"
-#: ../rules/base.xml.in.h:408 ../rules/evdev.xml.in.h:408
+#: ../rules/base.xml.in.h:433
msgid "Malayalam Lalitha"
msgstr "малаяламска лалита"
-#: ../rules/base.xml.in.h:409 ../rules/evdev.xml.in.h:409
+#: ../rules/base.xml.in.h:434
msgid "Maldives"
msgstr "малдивска"
-#: ../rules/base.xml.in.h:410 ../rules/evdev.xml.in.h:410
+#: ../rules/base.xml.in.h:435
msgid "Malta"
msgstr "малтийска"
-#: ../rules/base.xml.in.h:411 ../rules/evdev.xml.in.h:411
+#: ../rules/base.xml.in.h:436
msgid "Maltese keyboard with US layout"
msgstr "малтийска с американска подредба"
-#: ../rules/base.xml.in.h:412 ../rules/evdev.xml.in.h:412
+#: ../rules/base.xml.in.h:437
msgid "Mao"
msgstr "Мао"
-#: ../rules/base.xml.in.h:413 ../rules/evdev.xml.in.h:413
+#: ../rules/base.xml.in.h:438
msgid "Maori"
msgstr "маорска"
-#: ../rules/base.xml.in.h:414 ../rules/evdev.xml.in.h:414
+#: ../rules/base.xml.in.h:439
msgid "Memorex MX1998"
msgstr "Memorex MX1998"
-#: ../rules/base.xml.in.h:415 ../rules/evdev.xml.in.h:415
+#: ../rules/base.xml.in.h:440
msgid "Memorex MX2500 EZ-Access Keyboard"
msgstr "Memorex MX2500 EZ-Access Keyboard (за лесен достъп)"
-#: ../rules/base.xml.in.h:416 ../rules/evdev.xml.in.h:416
+#: ../rules/base.xml.in.h:441
msgid "Memorex MX2750"
msgstr "Memorex MX2750"
-#: ../rules/base.xml.in.h:417 ../rules/evdev.xml.in.h:417
-msgid "Menu is Compose."
-msgstr "Menu функционира като Compose"
+#: ../rules/base.xml.in.h:442
+msgid "Menu"
+msgstr "Menu"
-#: ../rules/base.xml.in.h:418 ../rules/evdev.xml.in.h:418
-msgid "Menu key changes layout."
-msgstr "Menu сменя подредбата"
+#: ../rules/base.xml.in.h:443
+msgid "Meta is mapped to Left Win"
+msgstr "Левият Win е Meta"
-#: ../rules/base.xml.in.h:419 ../rules/evdev.xml.in.h:419
-msgid "Meta is mapped to the Win-keys."
-msgstr "И двата Win-а функционират като Meta"
+#: ../rules/base.xml.in.h:444
+msgid "Meta is mapped to Win keys"
+msgstr "И двата Win-а са Meta"
-#: ../rules/base.xml.in.h:420 ../rules/evdev.xml.in.h:420
-msgid "Meta is mapped to the left Win-key."
-msgstr "Левият Win функционира като Meta"
+#: ../rules/base.xml.in.h:445
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Comfort Curve Keyboard 2000"
-#: ../rules/base.xml.in.h:421 ../rules/evdev.xml.in.h:421
+#: ../rules/base.xml.in.h:446
msgid "Microsoft Internet Keyboard"
msgstr "Microsoft Internet Keyboard (за Интернет)"
-#: ../rules/base.xml.in.h:422 ../rules/evdev.xml.in.h:422
+#: ../rules/base.xml.in.h:447
msgid "Microsoft Internet Keyboard Pro, Swedish"
msgstr "Microsoft Internet Keyboard Pro, Swedish (за Интернет, шведска)"
-#: ../rules/base.xml.in.h:423 ../rules/evdev.xml.in.h:423
+#: ../rules/base.xml.in.h:448
msgid "Microsoft Natural"
msgstr "Microsoft Natural"
-#: ../rules/base.xml.in.h:424 ../rules/evdev.xml.in.h:424
+#: ../rules/base.xml.in.h:449
msgid "Microsoft Natural Keyboard Elite"
msgstr "Microsoft Natural Keyboard Elite"
-#: ../rules/base.xml.in.h:425 ../rules/evdev.xml.in.h:425
+#: ../rules/base.xml.in.h:450
msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
msgstr "Microsoft Natural Keyboard Pro/Microsoft Internet Keyboard Pro (за Интернет)"
-#: ../rules/base.xml.in.h:426 ../rules/evdev.xml.in.h:426
+#: ../rules/base.xml.in.h:451
msgid "Microsoft Natural Keyboard Pro OEM"
msgstr "Microsoft Natural Keyboard Pro OEM"
-#: ../rules/base.xml.in.h:427 ../rules/evdev.xml.in.h:427
+#: ../rules/base.xml.in.h:452
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:428 ../rules/evdev.xml.in.h:428
+#: ../rules/base.xml.in.h:453
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000 (безжична, ергономична)"
+
+#: ../rules/base.xml.in.h:454
msgid "Microsoft Office Keyboard"
msgstr "Microsoft Office Keyboard (за офиса)"
-#: ../rules/base.xml.in.h:429 ../rules/evdev.xml.in.h:429
+#: ../rules/base.xml.in.h:455
msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
msgstr "Microsoft Wireless Multimedia Keyboard 1.0A (безжична, за мултимедия)"
-#: ../rules/base.xml.in.h:430 ../rules/evdev.xml.in.h:430
+#: ../rules/base.xml.in.h:456
msgid "Miscellaneous compatibility options"
msgstr "Разни настройки за съвместимост"
-#: ../rules/base.xml.in.h:431 ../rules/evdev.xml.in.h:431
+#: ../rules/base.xml.in.h:457
msgid "Mkd"
msgstr "Мак"
-#: ../rules/base.xml.in.h:432 ../rules/evdev.xml.in.h:432
+#: ../rules/base.xml.in.h:458
msgid "Mlt"
msgstr "Мал"
-#: ../rules/base.xml.in.h:433 ../rules/evdev.xml.in.h:433
+#: ../rules/base.xml.in.h:459
msgid "Mmr"
msgstr "Миа"
-#: ../rules/base.xml.in.h:434 ../rules/evdev.xml.in.h:434
+#: ../rules/base.xml.in.h:460
msgid "Mng"
msgstr "Мон"
-#: ../rules/base.xml.in.h:435 ../rules/evdev.xml.in.h:435
+#: ../rules/base.xml.in.h:461
msgid "Mongolia"
msgstr "монголска"
-#: ../rules/base.xml.in.h:436 ../rules/evdev.xml.in.h:436
+#: ../rules/base.xml.in.h:462
msgid "Montenegro"
msgstr "черногорска"
-#: ../rules/base.xml.in.h:437 ../rules/evdev.xml.in.h:437
+#: ../rules/base.xml.in.h:463
msgid "Morocco"
msgstr "мароканска"
-#: ../rules/base.xml.in.h:438 ../rules/evdev.xml.in.h:438
+#: ../rules/base.xml.in.h:464
msgid "Multilingual"
msgstr "многоезична"
-#: ../rules/base.xml.in.h:439 ../rules/evdev.xml.in.h:439
+#: ../rules/base.xml.in.h:465
msgid "Multilingual, first part"
msgstr "многоезична, първа част"
-#: ../rules/base.xml.in.h:440 ../rules/evdev.xml.in.h:440
+#: ../rules/base.xml.in.h:466
msgid "Multilingual, second part"
msgstr "многоезична, втора част"
-#: ../rules/base.xml.in.h:441 ../rules/evdev.xml.in.h:441
+#: ../rules/base.xml.in.h:467
msgid "Myanmar"
msgstr "мианмарска"
-#: ../rules/base.xml.in.h:442 ../rules/evdev.xml.in.h:442
+#: ../rules/base.xml.in.h:468
msgid "NICOLA-F style Backspace"
msgstr "Backspace на мястото определено от подредбата NICOLA-F"
-#: ../rules/base.xml.in.h:443 ../rules/evdev.xml.in.h:443
-msgid "Neostyle"
-msgstr "новостилна"
+#: ../rules/base.xml.in.h:469
+msgid "NLA"
+msgstr "NLA"
+
+#: ../rules/base.xml.in.h:470
+msgid "Nativo"
+msgstr "нативна"
+
+#: ../rules/base.xml.in.h:471
+msgid "Nativo for Esperanto"
+msgstr "нативна за есперанто"
+
+#: ../rules/base.xml.in.h:472
+msgid "Nativo for USA keyboards"
+msgstr "нативна за САЩ"
+
+#: ../rules/base.xml.in.h:473
+msgid "Neo 2"
+msgstr "Neo 2"
-#: ../rules/base.xml.in.h:444 ../rules/evdev.xml.in.h:444
+#: ../rules/base.xml.in.h:474
msgid "Nep"
msgstr "Неп"
-#: ../rules/base.xml.in.h:445 ../rules/evdev.xml.in.h:445
+#: ../rules/base.xml.in.h:475
msgid "Nepal"
msgstr "непалска"
-#: ../rules/base.xml.in.h:446 ../rules/evdev.xml.in.h:446
+#: ../rules/base.xml.in.h:476
msgid "Netherlands"
msgstr "холандска"
-#: ../rules/base.xml.in.h:447 ../rules/evdev.xml.in.h:447
+#: ../rules/base.xml.in.h:477
msgid "Nig"
msgstr "Ниг"
-#: ../rules/base.xml.in.h:448 ../rules/evdev.xml.in.h:448
+#: ../rules/base.xml.in.h:478
msgid "Nigeria"
msgstr "нигерийска"
-#: ../rules/base.xml.in.h:449 ../rules/evdev.xml.in.h:449
+#: ../rules/base.xml.in.h:479
msgid "Nld"
msgstr "Хол"
-#: ../rules/base.xml.in.h:450 ../rules/evdev.xml.in.h:450
+#: ../rules/base.xml.in.h:480
+msgid "Non-breakable space character at fourth level"
+msgstr "Интервал без разделяне на четвърто ниво"
+
+#: ../rules/base.xml.in.h:481
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Интервал без разделяне на четвърто ниво и тесен интервал без разделяне на шесто ниво"
+
+#: ../rules/base.xml.in.h:482
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
+msgstr "Интервал без разделяне на четвърто ниво и тесен интервал без разделяне на шесто ниво (с Ctrl+Shift)"
+
+#: ../rules/base.xml.in.h:483
+msgid "Non-breakable space character at second level"
+msgstr "Интервал без разделяне на второ ниво"
+
+#: ../rules/base.xml.in.h:484
+msgid "Non-breakable space character at third level"
+msgstr "Интервал без разделяне на трето ниво"
+
+#: ../rules/base.xml.in.h:485
+msgid "Non-breakable space character at third level, nothing at fourth level"
+msgstr "Интервал без разделяне на трето ниво и нищо на четвърто ниво"
+
+#: ../rules/base.xml.in.h:486
+msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Интервал без разделяне на трето ниво и тесен интервал без разделяне на четвърто ниво"
+
+#: ../rules/base.xml.in.h:487
msgid "Nor"
msgstr "Нор"
-#: ../rules/base.xml.in.h:451 ../rules/evdev.xml.in.h:451
+#: ../rules/base.xml.in.h:488
msgid "Northern Saami"
msgstr "северносамска (Норвегия)"
-#: ../rules/base.xml.in.h:452 ../rules/evdev.xml.in.h:452
+#: ../rules/base.xml.in.h:489
msgid "Northern Saami, eliminate dead keys"
-msgstr "северносамска, без „мъртви клавиши“"
+msgstr "северносамска, без „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:453 ../rules/evdev.xml.in.h:453
+#: ../rules/base.xml.in.h:490
msgid "Northgate OmniKey 101"
msgstr "Northgate OmniKey 101"
-#: ../rules/base.xml.in.h:454 ../rules/evdev.xml.in.h:454
+#: ../rules/base.xml.in.h:491
msgid "Norway"
msgstr "норвежка"
-#: ../rules/base.xml.in.h:455 ../rules/evdev.xml.in.h:455
-msgid "NumLock LED shows alternative layout."
-msgstr "Свeтодиодът на NumLock указва смяна на подредбата"
+#: ../rules/base.xml.in.h:492
+msgid "NumLock"
+msgstr "NumLock"
-#: ../rules/base.xml.in.h:456 ../rules/evdev.xml.in.h:456
+#: ../rules/base.xml.in.h:493
msgid "Numeric keypad delete key behaviour"
msgstr "Поведение на клавиша за триене на цифровата клавиатура"
-#: ../rules/base.xml.in.h:457 ../rules/evdev.xml.in.h:457
-msgid "Numeric keypad keys work as with Mac."
+#: ../rules/base.xml.in.h:494
+msgid "Numeric keypad keys work as with Mac"
msgstr "Цифровата клавиатура функционира като в Macintosh"
-#: ../rules/base.xml.in.h:458 ../rules/evdev.xml.in.h:458
+#: ../rules/base.xml.in.h:495
msgid "Numeric keypad layout selection"
msgstr "Избор на подредбата на цифровата клавиатура"
-#: ../rules/base.xml.in.h:459 ../rules/evdev.xml.in.h:459
+#: ../rules/base.xml.in.h:496
msgid "OADG 109A"
msgstr "OADG 109A"
-#: ../rules/base.xml.in.h:460 ../rules/evdev.xml.in.h:460
+#: ../rules/base.xml.in.h:497
msgid "OLPC"
msgstr "OLPC"
-#: ../rules/base.xml.in.h:461 ../rules/evdev.xml.in.h:461
+#: ../rules/base.xml.in.h:498
msgid "OLPC Dari"
msgstr "дарийска за OLPC (фарси)"
-#: ../rules/base.xml.in.h:462 ../rules/evdev.xml.in.h:462
+#: ../rules/base.xml.in.h:499
msgid "OLPC Pashto"
msgstr "пащунска за OLPC"
-#: ../rules/base.xml.in.h:463 ../rules/evdev.xml.in.h:463
+#: ../rules/base.xml.in.h:500
msgid "OLPC Southern Uzbek"
msgstr "южно узбекска за OLPC"
-#: ../rules/base.xml.in.h:464 ../rules/evdev.xml.in.h:464
+#: ../rules/base.xml.in.h:501
+msgid "Occitan"
+msgstr "провансалска"
+
+#: ../rules/base.xml.in.h:502
msgid "Ogham"
msgstr "огамска"
-#: ../rules/base.xml.in.h:465 ../rules/evdev.xml.in.h:465
+#: ../rules/base.xml.in.h:503
msgid "Ogham IS434"
msgstr "огамска IS434"
-#: ../rules/base.xml.in.h:466 ../rules/evdev.xml.in.h:466
+#: ../rules/base.xml.in.h:504
msgid "Oriya"
msgstr "орийска"
-#: ../rules/base.xml.in.h:467 ../rules/evdev.xml.in.h:467
+#: ../rules/base.xml.in.h:505
msgid "Ortek MCK-800 MM/Internet keyboard"
msgstr "Ortek MCK-800 MM/Internet keyboard (за Интернет)"
-#: ../rules/base.xml.in.h:468 ../rules/evdev.xml.in.h:468
+#: ../rules/base.xml.in.h:506
msgid "Ossetian"
msgstr "осетинска"
-#: ../rules/base.xml.in.h:469 ../rules/evdev.xml.in.h:469
+#: ../rules/base.xml.in.h:507
msgid "Ossetian, Winkeys"
msgstr "осетинска, клавиши Win"
-#: ../rules/base.xml.in.h:470 ../rules/evdev.xml.in.h:470
+#: ../rules/base.xml.in.h:508
msgid "Ossetian, legacy"
msgstr "осетинска, остаряла"
-#: ../rules/base.xml.in.h:471 ../rules/evdev.xml.in.h:471
+#: ../rules/base.xml.in.h:509
msgid "PC-98xx Series"
msgstr "Серии PC-98xx"
-#: ../rules/base.xml.in.h:472 ../rules/evdev.xml.in.h:472
+#: ../rules/base.xml.in.h:510
msgid "Pak"
msgstr "Пак"
-#: ../rules/base.xml.in.h:473 ../rules/evdev.xml.in.h:473
+#: ../rules/base.xml.in.h:511
msgid "Pakistan"
msgstr "пакистанска"
-#: ../rules/base.xml.in.h:474 ../rules/evdev.xml.in.h:474
+#: ../rules/base.xml.in.h:512
msgid "Pashto"
msgstr "пащунска"
-#: ../rules/base.xml.in.h:475 ../rules/evdev.xml.in.h:475
+#: ../rules/base.xml.in.h:513
msgid "Pattachote"
msgstr "патачотска"
-#: ../rules/base.xml.in.h:476 ../rules/evdev.xml.in.h:476
+#: ../rules/base.xml.in.h:514
msgid "Phonetic"
msgstr "фонетична"
-#: ../rules/base.xml.in.h:477 ../rules/evdev.xml.in.h:477
+#: ../rules/base.xml.in.h:515
+msgid "Phonetic Winkeys"
+msgstr "фонетична, клавиши Win"
+
+#: ../rules/base.xml.in.h:516
msgid "Pol"
msgstr "Пол"
-#: ../rules/base.xml.in.h:478 ../rules/evdev.xml.in.h:478
+#: ../rules/base.xml.in.h:517
msgid "Poland"
msgstr "полска"
-#: ../rules/base.xml.in.h:479 ../rules/evdev.xml.in.h:479
+#: ../rules/base.xml.in.h:518
msgid "Polytonic"
msgstr "политонална"
-#: ../rules/base.xml.in.h:480 ../rules/evdev.xml.in.h:480
+#: ../rules/base.xml.in.h:519
msgid "Portugal"
msgstr "португалска"
-#: ../rules/base.xml.in.h:481 ../rules/evdev.xml.in.h:481
-msgid "Press Left Alt key to choose 3rd level."
-msgstr "Левият Alt избира третото ниво"
-
-#: ../rules/base.xml.in.h:482 ../rules/evdev.xml.in.h:482
-msgid "Press Left Win-key to choose 3rd level."
-msgstr "Левият Win избира третото ниво"
-
-#: ../rules/base.xml.in.h:483 ../rules/evdev.xml.in.h:483
-msgid "Press Menu key to choose 3rd level."
-msgstr "Menu избира третото ниво"
-
-#: ../rules/base.xml.in.h:484 ../rules/evdev.xml.in.h:484
-msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
-msgstr "Десният Alt избира третото ниво, Shift+десният Alt функционират като клавиша Multi"
-
-#: ../rules/base.xml.in.h:485 ../rules/evdev.xml.in.h:485
-msgid "Press Right Alt key to choose 3rd level."
-msgstr "Десният Alt избира третото ниво"
-
-#: ../rules/base.xml.in.h:486 ../rules/evdev.xml.in.h:486
-msgid "Press Right Ctrl to choose 3rd level."
-msgstr "Десният Ctrl избира третото ниво"
-
-#: ../rules/base.xml.in.h:487 ../rules/evdev.xml.in.h:487
-msgid "Press Right Win-key to choose 3rd level."
-msgstr "Десният Win избира третото ниво"
-
-#: ../rules/base.xml.in.h:488 ../rules/evdev.xml.in.h:488
-msgid "Press any of Alt keys to choose 3rd level."
-msgstr "Всеки от двата Alt-а избира третото ниво"
-
-#: ../rules/base.xml.in.h:489 ../rules/evdev.xml.in.h:489
-msgid "Press any of Win-keys to choose 3rd level."
-msgstr "Всеки от двата Win-а избира третото ниво"
-
-#: ../rules/base.xml.in.h:490 ../rules/evdev.xml.in.h:490
+#: ../rules/base.xml.in.h:520
msgid "Pro"
msgstr "про"
-#: ../rules/base.xml.in.h:491 ../rules/evdev.xml.in.h:491
+#: ../rules/base.xml.in.h:521
msgid "Pro Keypad"
msgstr "цифрова клавиатура про"
-#: ../rules/base.xml.in.h:492 ../rules/evdev.xml.in.h:492
+#: ../rules/base.xml.in.h:522
msgid "Probhat"
msgstr "пробхатска"
-#: ../rules/base.xml.in.h:493 ../rules/evdev.xml.in.h:493
+#: ../rules/base.xml.in.h:523
msgid "Programmer Dvorak"
msgstr "Дворак за програмисти"
-#: ../rules/base.xml.in.h:494 ../rules/evdev.xml.in.h:494
+#: ../rules/base.xml.in.h:524
msgid "Propeller Voyager (KTEZ-1000)"
msgstr "Propeller Voyager (KTEZ-1000)"
-#: ../rules/base.xml.in.h:495 ../rules/evdev.xml.in.h:495
+#: ../rules/base.xml.in.h:525
msgid "Prt"
msgstr "Пор"
-#: ../rules/base.xml.in.h:496 ../rules/evdev.xml.in.h:496
+#: ../rules/base.xml.in.h:526
msgid "QTronix Scorpius 98N+"
msgstr "QTronix Scorpius 98N+"
-#: ../rules/base.xml.in.h:497 ../rules/evdev.xml.in.h:497
-msgid "R-Alt switches layout while pressed."
-msgstr "Десният Alt сменя подредбата докато е натиснат"
+#: ../rules/base.xml.in.h:527
+msgid "Right Alt"
+msgstr "Десният Alt"
-#: ../rules/base.xml.in.h:498 ../rules/evdev.xml.in.h:498
-msgid "Right Alt is Compose."
-msgstr "Десният Alt функционира като Compose"
+#: ../rules/base.xml.in.h:528
+msgid "Right Alt (while pressed)"
+msgstr "Десният Alt (докато е натиснат)"
-#: ../rules/base.xml.in.h:499 ../rules/evdev.xml.in.h:499
-msgid "Right Alt key changes layout."
-msgstr "Десният Alt сменя подредбата"
-
-#: ../rules/base.xml.in.h:500 ../rules/evdev.xml.in.h:500
-msgid "Right Alt key never chooses 3rd level."
+#: ../rules/base.xml.in.h:529
+msgid "Right Alt key never chooses 3rd level"
msgstr "Десният Alt никога не избира третото ниво"
-#: ../rules/base.xml.in.h:501 ../rules/evdev.xml.in.h:501
-msgid "Right Ctrl is Compose."
-msgstr "Десният Ctrl функционира като Compose"
-
-#: ../rules/base.xml.in.h:502 ../rules/evdev.xml.in.h:502
-msgid "Right Ctrl key changes layout."
-msgstr "Десният Ctrl сменя подредбата"
+#: ../rules/base.xml.in.h:530
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr "Десният Alt, Shift+десният Alt са Multi"
-#: ../rules/base.xml.in.h:503 ../rules/evdev.xml.in.h:503
-msgid "Right Ctrl key switches layout while pressed."
-msgstr "Десният Ctrl сменя подредбата докато е натиснат"
+#: ../rules/base.xml.in.h:531
+msgid "Right Ctrl"
+msgstr "Десният Ctrl"
-#: ../rules/base.xml.in.h:504 ../rules/evdev.xml.in.h:504
-msgid "Right Ctrl key works as Right Alt."
-msgstr "Десният Ctrl функционира като десен Alt"
+#: ../rules/base.xml.in.h:532
+msgid "Right Ctrl (while pressed)"
+msgstr "Десният Ctrl (докато е натиснат)"
-#: ../rules/base.xml.in.h:505 ../rules/evdev.xml.in.h:505
-msgid "Right Shift key changes layout."
-msgstr "Десният Shift сменя подредбата"
+#: ../rules/base.xml.in.h:533
+msgid "Right Ctrl as Right Alt"
+msgstr "Десният Ctrl е десен Alt"
-#: ../rules/base.xml.in.h:506 ../rules/evdev.xml.in.h:506
-msgid "Right Win-key changes layout."
-msgstr "Десният Win сменя подредбата"
+#: ../rules/base.xml.in.h:534
+msgid "Right Shift"
+msgstr "Десният Shift"
-#: ../rules/base.xml.in.h:507 ../rules/evdev.xml.in.h:507
-msgid "Right Win-key is Compose."
-msgstr "Десният Win функционира като Compose"
+#: ../rules/base.xml.in.h:535
+msgid "Right Win"
+msgstr "Десният Win"
-#: ../rules/base.xml.in.h:508 ../rules/evdev.xml.in.h:508
-msgid "Right Win-key switches layout while pressed."
-msgstr "Десният Win сменя подредбата докато е натиснат"
+#: ../rules/base.xml.in.h:536
+msgid "Right Win (while pressed)"
+msgstr "Десният Win (докато е натиснат)"
-#: ../rules/base.xml.in.h:509 ../rules/evdev.xml.in.h:509
+#: ../rules/base.xml.in.h:537
msgid "Right hand"
msgstr "за десничари"
-#: ../rules/base.xml.in.h:510 ../rules/evdev.xml.in.h:510
+#: ../rules/base.xml.in.h:538
msgid "Right handed Dvorak"
msgstr "Дворак за десничари"
-#: ../rules/base.xml.in.h:511 ../rules/evdev.xml.in.h:511
+#: ../rules/base.xml.in.h:539
msgid "Romania"
msgstr "румънска"
-#: ../rules/base.xml.in.h:512 ../rules/evdev.xml.in.h:512
+#: ../rules/base.xml.in.h:540
msgid "Romanian keyboard with German letters"
msgstr "румънска клавиатура с немски букви"
-#: ../rules/base.xml.in.h:513 ../rules/evdev.xml.in.h:513
+#: ../rules/base.xml.in.h:541
msgid "Romanian keyboard with German letters, eliminate dead keys"
-msgstr "румънска клавиатура с немски букви, без „мъртви клавиши“"
+msgstr "румънска клавиатура с немски букви, без „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:514 ../rules/evdev.xml.in.h:514
+#: ../rules/base.xml.in.h:542
msgid "Rou"
msgstr "Рум"
-#: ../rules/base.xml.in.h:515 ../rules/evdev.xml.in.h:515
+#: ../rules/base.xml.in.h:543
msgid "Rus"
msgstr "Рус"
-#: ../rules/base.xml.in.h:516 ../rules/evdev.xml.in.h:516
+#: ../rules/base.xml.in.h:544
msgid "Russia"
msgstr "руска"
-#: ../rules/base.xml.in.h:517 ../rules/evdev.xml.in.h:517
+#: ../rules/base.xml.in.h:545
msgid "Russian"
msgstr "руска"
-#: ../rules/base.xml.in.h:518 ../rules/evdev.xml.in.h:518
+#: ../rules/base.xml.in.h:546
msgid "Russian phonetic"
msgstr "руска фонетична"
-#: ../rules/base.xml.in.h:519 ../rules/evdev.xml.in.h:519
+#: ../rules/base.xml.in.h:547
msgid "Russian phonetic Dvorak"
msgstr "руска фонетична, Дворак"
-#: ../rules/base.xml.in.h:520 ../rules/evdev.xml.in.h:520
+#: ../rules/base.xml.in.h:548
msgid "Russian phonetic, eliminate dead keys"
-msgstr "руска фонетична, без „мъртви клавиши“"
+msgstr "руска фонетична, без „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:521 ../rules/evdev.xml.in.h:521
+#: ../rules/base.xml.in.h:549
msgid "Russian with Kazakh"
msgstr "руска с казахски букви"
-#: ../rules/base.xml.in.h:522 ../rules/evdev.xml.in.h:522
+#: ../rules/base.xml.in.h:550
msgid "SILVERCREST Multimedia Wireless Keyboard"
msgstr "SILVERCREST Multimedia Wireless Keyboard (безжична, за мултимедия)"
-#: ../rules/base.xml.in.h:523 ../rules/evdev.xml.in.h:523
+#: ../rules/base.xml.in.h:551
msgid "SK-1300"
msgstr "SK-1300"
-#: ../rules/base.xml.in.h:524 ../rules/evdev.xml.in.h:524
+#: ../rules/base.xml.in.h:552
msgid "SK-2500"
msgstr "SK-2500"
-#: ../rules/base.xml.in.h:525 ../rules/evdev.xml.in.h:525
+#: ../rules/base.xml.in.h:553
msgid "SK-6200"
msgstr "SK-6200"
-#: ../rules/base.xml.in.h:526 ../rules/evdev.xml.in.h:526
+#: ../rules/base.xml.in.h:554
msgid "SK-7100"
msgstr "SK-7100"
-#: ../rules/base.xml.in.h:527 ../rules/evdev.xml.in.h:527
+#: ../rules/base.xml.in.h:555
msgid "SRB"
msgstr "Срб"
-#: ../rules/base.xml.in.h:528 ../rules/evdev.xml.in.h:528
+#: ../rules/base.xml.in.h:556
msgid "SVEN Ergonomic 2500"
msgstr "SVEN Ergonomic 2500 (ергономична)"
-#: ../rules/base.xml.in.h:529 ../rules/evdev.xml.in.h:529
+#: ../rules/base.xml.in.h:557
msgid "SVEN Slim 303"
msgstr "SVEN Slim 303"
-#: ../rules/base.xml.in.h:530 ../rules/evdev.xml.in.h:530
+#: ../rules/base.xml.in.h:558
msgid "Samsung SDM 4500P"
msgstr "Samsung SDM 4500P"
-#: ../rules/base.xml.in.h:531 ../rules/evdev.xml.in.h:531
+#: ../rules/base.xml.in.h:559
msgid "Samsung SDM 4510P"
msgstr "Samsung SDM 4510P"
-#: ../rules/base.xml.in.h:532 ../rules/evdev.xml.in.h:532
-msgid "ScrollLock LED shows alternative layout."
-msgstr "Светодиодът на ScrollLock указва смяна на подредбата"
+#: ../rules/base.xml.in.h:560
+msgid "Scroll Lock"
+msgstr "ScrollLock"
-#: ../rules/base.xml.in.h:533 ../rules/evdev.xml.in.h:533
+#: ../rules/base.xml.in.h:561
+msgid "ScrollLock"
+msgstr "ScrollLock"
+
+#: ../rules/base.xml.in.h:562
msgid "Secwepemctsin"
msgstr "шъкуъпмъктчин"
-#: ../rules/base.xml.in.h:534 ../rules/evdev.xml.in.h:534
+#: ../rules/base.xml.in.h:563
+msgid "Semi-colon on third level"
+msgstr "Точка и запетая на третото ниво"
+
+#: ../rules/base.xml.in.h:564
msgid "Serbia"
msgstr "сръбска"
-#: ../rules/base.xml.in.h:535 ../rules/evdev.xml.in.h:535
-msgid "Shift cancels CapsLock."
+#: ../rules/base.xml.in.h:565
+msgid "Shift cancels CapsLock"
msgstr "Shift отменя CapsLock"
-#: ../rules/base.xml.in.h:536 ../rules/evdev.xml.in.h:536
-msgid "Shift with numeric keypad keys works as in MS Windows."
-msgstr "Shift функционира с цифровата клавиатура както в MS Windows"
+#: ../rules/base.xml.in.h:566
+msgid "Shift does not cancel NumLock, chooses 3d level instead"
+msgstr "Shift не отменя CapsLock, а избира третото ниво"
-#: ../rules/base.xml.in.h:537 ../rules/evdev.xml.in.h:537
-msgid "Shift+CapsLock changes layout."
-msgstr "Заедно Shift+CapsLock сменят подредбата"
+#: ../rules/base.xml.in.h:567
+msgid "Shift with numeric keypad keys works as in MS Windows"
+msgstr "Shift за цифровата клавиатура както в MS Windows"
-#: ../rules/base.xml.in.h:538 ../rules/evdev.xml.in.h:538
+#: ../rules/base.xml.in.h:568
+msgid "Shift+CapsLock"
+msgstr "Shift+CapsLock"
+
+#: ../rules/base.xml.in.h:569
msgid "Simple"
msgstr "Обикновена"
-#: ../rules/base.xml.in.h:539 ../rules/evdev.xml.in.h:539
+#: ../rules/base.xml.in.h:570
msgid "Slovakia"
msgstr "словашка"
-#: ../rules/base.xml.in.h:540 ../rules/evdev.xml.in.h:540
+#: ../rules/base.xml.in.h:571
msgid "Slovenia"
msgstr "словенска"
-#: ../rules/base.xml.in.h:541 ../rules/evdev.xml.in.h:541
+#: ../rules/base.xml.in.h:572
msgid "South Africa"
msgstr "южноафриканска"
-#: ../rules/base.xml.in.h:542 ../rules/evdev.xml.in.h:542
+#: ../rules/base.xml.in.h:573
msgid "Southern Uzbek"
msgstr "южно узбекска"
-#: ../rules/base.xml.in.h:543 ../rules/evdev.xml.in.h:543
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr "Интервал без разделяне на четвърто ниво и тесен интервал без разделяне на шесто ниво"
-
-#: ../rules/base.xml.in.h:544 ../rules/evdev.xml.in.h:544
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift"
-msgstr "Интервал без разделяне на четвърто ниво и тесен интервал без разделяне на шесто ниво (с Ctrl+Shift)"
-
-#: ../rules/base.xml.in.h:545 ../rules/evdev.xml.in.h:545
-msgid "Space key outputs non-breakable space character at fourth level."
-msgstr "Интервал без разделяне на четвърто ниво"
-
-#: ../rules/base.xml.in.h:546 ../rules/evdev.xml.in.h:546
-msgid "Space key outputs non-breakable space character at second level."
-msgstr "Интервал без разделяне на второ ниво"
-
-#: ../rules/base.xml.in.h:547 ../rules/evdev.xml.in.h:547
-msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
-msgstr "Интервал без разделяне на трето ниво и нищо на четвърто ниво"
-
-#: ../rules/base.xml.in.h:548 ../rules/evdev.xml.in.h:548
-msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr "Интервал без разделяне на трето ниво и тесен интервал без разделяне на четвърто ниво"
-
-#: ../rules/base.xml.in.h:549 ../rules/evdev.xml.in.h:549
-msgid "Space key outputs non-breakable space character at third level."
-msgstr "Интервал без разделяне на трето ниво"
-
-#: ../rules/base.xml.in.h:550 ../rules/evdev.xml.in.h:550
-msgid "Space key outputs usual space at any level."
-msgstr "Интервал на всички нива"
-
-#: ../rules/base.xml.in.h:551 ../rules/evdev.xml.in.h:551
+#: ../rules/base.xml.in.h:574
msgid "Spain"
msgstr "испанска"
-#: ../rules/base.xml.in.h:552 ../rules/evdev.xml.in.h:552
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+#: ../rules/base.xml.in.h:575
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
msgstr "Специалните комбинации (Ctrl+Alt+&lt;клавиш&gt;) се обработват от сървъра"
-#: ../rules/base.xml.in.h:553 ../rules/evdev.xml.in.h:553
+#: ../rules/base.xml.in.h:576
msgid "SrL"
msgstr "Шри"
-#: ../rules/base.xml.in.h:554 ../rules/evdev.xml.in.h:554
+#: ../rules/base.xml.in.h:577
msgid "Sri Lanka"
msgstr "шриланкска"
-#: ../rules/base.xml.in.h:555 ../rules/evdev.xml.in.h:555
+#: ../rules/base.xml.in.h:578
msgid "Standard"
msgstr "стандартна"
-#: ../rules/base.xml.in.h:556 ../rules/evdev.xml.in.h:556
+#: ../rules/base.xml.in.h:579
msgid "Standard (Cedilla)"
msgstr "стандартна (седий)"
+#: ../rules/base.xml.in.h:580
+msgid "Standard Phonetic"
+msgstr "стандартна фонетична"
+
#. RSTU 2019-91
-#: ../rules/base.xml.in.h:558 ../rules/evdev.xml.in.h:558
+#: ../rules/base.xml.in.h:582
msgid "Standard RSTU"
msgstr "стандартна украинска"
#. RSTU 2019-91
-#: ../rules/base.xml.in.h:560 ../rules/evdev.xml.in.h:560
+#: ../rules/base.xml.in.h:584
msgid "Standard RSTU on Russian layout"
msgstr "стандартна украинска, руска подредба"
-#: ../rules/base.xml.in.h:561 ../rules/evdev.xml.in.h:561
+#: ../rules/base.xml.in.h:585
msgid "Sun Type 5/6"
msgstr "На Sun, вид 5/6"
-#: ../rules/base.xml.in.h:562 ../rules/evdev.xml.in.h:562
+#: ../rules/base.xml.in.h:586
msgid "Sun dead keys"
-msgstr "Sun, без „мъртви клавиши“"
+msgstr "Sun, без „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:563 ../rules/evdev.xml.in.h:563
+#: ../rules/base.xml.in.h:587
msgid "Super Power Multimedia Keyboard"
msgstr "Super Power Multimedia Keyboard (за мултимедия)"
-#: ../rules/base.xml.in.h:564 ../rules/evdev.xml.in.h:564
-msgid "Super is mapped to the Win-keys."
-msgstr "И двата Win-а функционират като Super"
-
-#: ../rules/base.xml.in.h:565 ../rules/evdev.xml.in.h:565
+#: ../rules/base.xml.in.h:588
msgid "Svdvorak"
msgstr "Свдворак"
-#: ../rules/base.xml.in.h:566 ../rules/evdev.xml.in.h:566
+#: ../rules/base.xml.in.h:589
msgid "Svk"
msgstr "Свш"
-#: ../rules/base.xml.in.h:567 ../rules/evdev.xml.in.h:567
+#: ../rules/base.xml.in.h:590
msgid "Svn"
msgstr "Свн"
-#: ../rules/base.xml.in.h:568 ../rules/evdev.xml.in.h:568
-msgid "Swap Ctrl and CapsLock."
+#: ../rules/base.xml.in.h:591
+msgid "Swap Ctrl and CapsLock"
msgstr "Размяна на Ctrl и CapsLock"
-#: ../rules/base.xml.in.h:569 ../rules/evdev.xml.in.h:569
-msgid "Swap ESC and CapsLock."
+#: ../rules/base.xml.in.h:592
+msgid "Swap ESC and CapsLock"
msgstr "Размяна на Esc и CapsLock"
-#: ../rules/base.xml.in.h:570 ../rules/evdev.xml.in.h:570
-msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-msgstr "Размяна на кодовете на два клавиша, когато клавиатурите за Macintosh са разпознати неправилно от ядрото"
-
-#: ../rules/base.xml.in.h:571 ../rules/evdev.xml.in.h:571
+#: ../rules/base.xml.in.h:593
msgid "Swe"
msgstr "Шве"
-#: ../rules/base.xml.in.h:572 ../rules/evdev.xml.in.h:572
+#: ../rules/base.xml.in.h:594
msgid "Sweden"
msgstr "шведска"
-#: ../rules/base.xml.in.h:573 ../rules/evdev.xml.in.h:573
+#: ../rules/base.xml.in.h:595
msgid "Switzerland"
msgstr "швейцарска"
-#: ../rules/base.xml.in.h:574 ../rules/evdev.xml.in.h:574
+#: ../rules/base.xml.in.h:596
msgid "Symplon PaceBook (tablet PC)"
msgstr "Symplon PaceBook (за таблет)"
-#: ../rules/base.xml.in.h:575 ../rules/evdev.xml.in.h:575
+#: ../rules/base.xml.in.h:597
msgid "Syr"
msgstr "Сир"
-#: ../rules/base.xml.in.h:576 ../rules/evdev.xml.in.h:576
+#: ../rules/base.xml.in.h:598
msgid "Syria"
msgstr "сирийска"
-#: ../rules/base.xml.in.h:577 ../rules/evdev.xml.in.h:577
+#: ../rules/base.xml.in.h:599
msgid "Syriac"
msgstr "сириакска (арамейска)"
-#: ../rules/base.xml.in.h:578 ../rules/evdev.xml.in.h:578
+#: ../rules/base.xml.in.h:600
msgid "Syriac phonetic"
msgstr "сириакска фонетична (арамейска)"
-#: ../rules/base.xml.in.h:579 ../rules/evdev.xml.in.h:579
+#: ../rules/base.xml.in.h:601
msgid "TIS-820.2538"
msgstr "TIS-820.2538"
-#: ../rules/base.xml.in.h:580 ../rules/evdev.xml.in.h:580
+#: ../rules/base.xml.in.h:602
msgid "Tajikistan"
msgstr "таджикска"
-#: ../rules/base.xml.in.h:581 ../rules/evdev.xml.in.h:581
+#: ../rules/base.xml.in.h:603
msgid "Tamil"
msgstr "тамилска"
-#: ../rules/base.xml.in.h:582 ../rules/evdev.xml.in.h:582
+#: ../rules/base.xml.in.h:604
msgid "Tamil TAB Typewriter"
msgstr "тамилска машинописна с табулация"
-#: ../rules/base.xml.in.h:583 ../rules/evdev.xml.in.h:583
+#: ../rules/base.xml.in.h:605
msgid "Tamil TSCII Typewriter"
msgstr "тамилска машинописна — TSCII"
-#: ../rules/base.xml.in.h:584 ../rules/evdev.xml.in.h:584
+#: ../rules/base.xml.in.h:606
msgid "Tamil Unicode"
msgstr "тамилска за Уникод"
-#: ../rules/base.xml.in.h:585 ../rules/evdev.xml.in.h:585
+#: ../rules/base.xml.in.h:607
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
+
+#: ../rules/base.xml.in.h:608
msgid "Tatar"
msgstr "татарска"
-#: ../rules/base.xml.in.h:586 ../rules/evdev.xml.in.h:586
+#: ../rules/base.xml.in.h:609
msgid "Telugu"
msgstr "телугу"
-#: ../rules/base.xml.in.h:587 ../rules/evdev.xml.in.h:587
+#: ../rules/base.xml.in.h:610
msgid "Tha"
msgstr "Тай"
-#: ../rules/base.xml.in.h:588 ../rules/evdev.xml.in.h:588
+#: ../rules/base.xml.in.h:611
msgid "Thailand"
msgstr "тайландска"
-#: ../rules/base.xml.in.h:589 ../rules/evdev.xml.in.h:589
-msgid "Third level choosers"
-msgstr "Избор на третото ниво"
-
-#: ../rules/base.xml.in.h:590 ../rules/evdev.xml.in.h:590
+#: ../rules/base.xml.in.h:612
msgid "Tibetan"
msgstr "тибетска"
-#: ../rules/base.xml.in.h:591 ../rules/evdev.xml.in.h:591
+#: ../rules/base.xml.in.h:613
msgid "Tibetan (with ASCII numerals)"
msgstr "тибетска (с цифри от ASCII)"
-#: ../rules/base.xml.in.h:592 ../rules/evdev.xml.in.h:592
+#: ../rules/base.xml.in.h:614
msgid "Tifinagh"
msgstr "тифинах"
-#: ../rules/base.xml.in.h:593 ../rules/evdev.xml.in.h:593
+#: ../rules/base.xml.in.h:615
msgid "Tifinagh Alternative"
msgstr "алтернативна за тифинах"
-#: ../rules/base.xml.in.h:594 ../rules/evdev.xml.in.h:594
+#: ../rules/base.xml.in.h:616
msgid "Tifinagh Alternative Phonetic"
msgstr "алтернативна, фонетична за тифинах"
-#: ../rules/base.xml.in.h:595 ../rules/evdev.xml.in.h:595
+#: ../rules/base.xml.in.h:617
msgid "Tifinagh Extended"
msgstr "разширена за тифинах"
-#: ../rules/base.xml.in.h:596 ../rules/evdev.xml.in.h:596
+#: ../rules/base.xml.in.h:618
msgid "Tifinagh Extended Phonetic"
msgstr "разширена фонетична за тифинах"
-#: ../rules/base.xml.in.h:597 ../rules/evdev.xml.in.h:597
+#: ../rules/base.xml.in.h:619
msgid "Tifinagh Phonetic"
msgstr "фонетична за тифинах"
-#: ../rules/base.xml.in.h:598 ../rules/evdev.xml.in.h:598
+#: ../rules/base.xml.in.h:620
msgid "Tilde (~) variant"
msgstr "вариант с тилда (~)"
-#: ../rules/base.xml.in.h:599 ../rules/evdev.xml.in.h:599
+#: ../rules/base.xml.in.h:621
msgid "Tjk"
msgstr "Тдж"
-#: ../rules/base.xml.in.h:600 ../rules/evdev.xml.in.h:600
+#: ../rules/base.xml.in.h:622
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr "към съответния клавиш в Dvorak"
+
+#: ../rules/base.xml.in.h:623
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr "към съответния клавиш Qwerty"
+
+#: ../rules/base.xml.in.h:624
msgid "Toshiba Satellite S3000"
msgstr "Toshiba Satellite S3000"
-#: ../rules/base.xml.in.h:601 ../rules/evdev.xml.in.h:601
+#: ../rules/base.xml.in.h:625
+msgid "Traditional Phonetic"
+msgstr "фонетична, традиционна"
+
+#: ../rules/base.xml.in.h:626
msgid "Trust Direct Access Keyboard"
msgstr "Trust Direct Access Keyboard"
-#: ../rules/base.xml.in.h:602 ../rules/evdev.xml.in.h:602
+#: ../rules/base.xml.in.h:627
+msgid "Trust Slimline"
+msgstr "Trust Slimline"
+
+#: ../rules/base.xml.in.h:628
msgid "Trust Wireless Keyboard Classic"
msgstr "Trust Wireless Keyboard Classic (безжична)"
-#: ../rules/base.xml.in.h:603 ../rules/evdev.xml.in.h:603
+#: ../rules/base.xml.in.h:629
msgid "Tur"
msgstr "Тур"
-#: ../rules/base.xml.in.h:604 ../rules/evdev.xml.in.h:604
+#: ../rules/base.xml.in.h:630
msgid "Turkey"
msgstr "турска"
-#: ../rules/base.xml.in.h:605 ../rules/evdev.xml.in.h:605
+#: ../rules/base.xml.in.h:631
+msgid "Turkmenistan"
+msgstr "туркменистанска"
+
+#: ../rules/base.xml.in.h:632
msgid "Typewriter"
msgstr "машинописна"
-#: ../rules/base.xml.in.h:606 ../rules/evdev.xml.in.h:606
+#: ../rules/base.xml.in.h:633
msgid "UCW layout (accented letters only)"
msgstr "Подредба UCW (само ударени букви)"
-#: ../rules/base.xml.in.h:607 ../rules/evdev.xml.in.h:607
+#: ../rules/base.xml.in.h:634
msgid "US keyboard with Bosnian digraphs"
msgstr "американска с босненски диграфи"
-#: ../rules/base.xml.in.h:608 ../rules/evdev.xml.in.h:608
+#: ../rules/base.xml.in.h:635
msgid "US keyboard with Bosnian letters"
msgstr "американска с босненски букви"
-#: ../rules/base.xml.in.h:609 ../rules/evdev.xml.in.h:609
+#: ../rules/base.xml.in.h:636
msgid "US keyboard with Croatian digraphs"
msgstr "американска с хърватски диграфи"
-#: ../rules/base.xml.in.h:610 ../rules/evdev.xml.in.h:610
+#: ../rules/base.xml.in.h:637
msgid "US keyboard with Croatian letters"
msgstr "американска с хърватски букви"
-#: ../rules/base.xml.in.h:611 ../rules/evdev.xml.in.h:611
+#: ../rules/base.xml.in.h:638
msgid "US keyboard with Estonian letters"
msgstr "американска с естонски букви"
-#: ../rules/base.xml.in.h:612 ../rules/evdev.xml.in.h:612
+#: ../rules/base.xml.in.h:639
msgid "US keyboard with Lithuanian letters"
msgstr "американска с литовски букви"
-#: ../rules/base.xml.in.h:613 ../rules/evdev.xml.in.h:613
-msgid "US keyboard with Slovenian digraphs"
-msgstr "американска със словенски диграфи"
-
-#: ../rules/base.xml.in.h:614 ../rules/evdev.xml.in.h:614
+#: ../rules/base.xml.in.h:640
msgid "US keyboard with Slovenian letters"
msgstr "американска със словенски букви"
-#: ../rules/base.xml.in.h:615 ../rules/evdev.xml.in.h:615
+#: ../rules/base.xml.in.h:641
msgid "USA"
msgstr "Аме"
-#: ../rules/base.xml.in.h:616 ../rules/evdev.xml.in.h:616
+#: ../rules/base.xml.in.h:642
msgid "Udmurt"
msgstr "удмурт"
-#: ../rules/base.xml.in.h:617 ../rules/evdev.xml.in.h:617
+#: ../rules/base.xml.in.h:643
msgid "Ukr"
msgstr "Укр"
-#: ../rules/base.xml.in.h:618 ../rules/evdev.xml.in.h:618
+#: ../rules/base.xml.in.h:644
msgid "Ukraine"
msgstr "украинска"
-#: ../rules/base.xml.in.h:619 ../rules/evdev.xml.in.h:619
+#: ../rules/base.xml.in.h:645
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Допълненията от Уникод (стрелки и математически операции)"
+
+#: ../rules/base.xml.in.h:646
+msgid "Unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Допълненията от Уникод (стрелки и математически операции). Операциите са на стандартното ниво"
+
+#: ../rules/base.xml.in.h:647
msgid "UnicodeExpert"
msgstr "експертна за Уникод"
-#: ../rules/base.xml.in.h:620 ../rules/evdev.xml.in.h:620
+#: ../rules/base.xml.in.h:648
msgid "United Kingdom"
msgstr "британска"
-#: ../rules/base.xml.in.h:621 ../rules/evdev.xml.in.h:621
-msgid "Urdu"
-msgstr "урду"
+#: ../rules/base.xml.in.h:649
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
+
+#: ../rules/base.xml.in.h:650
+msgid "Urdu, Alternative phonetic"
+msgstr "урду, фонетична, алтернативна"
-#: ../rules/base.xml.in.h:622 ../rules/evdev.xml.in.h:622
+#: ../rules/base.xml.in.h:651
+msgid "Urdu, Phonetic"
+msgstr "урду, фонетична"
+
+#: ../rules/base.xml.in.h:652
+msgid "Urdu, Winkeys"
+msgstr "урду, клавиши Win"
+
+#: ../rules/base.xml.in.h:653
msgid "Use Bosnian digraphs"
msgstr "с босненски диграфи"
-#: ../rules/base.xml.in.h:623 ../rules/evdev.xml.in.h:623
+#: ../rules/base.xml.in.h:654
msgid "Use Croatian digraphs"
msgstr "с хърватски диграфи"
-#: ../rules/base.xml.in.h:624 ../rules/evdev.xml.in.h:624
-msgid "Use Slovenian digraphs"
-msgstr "със словенски диграфи"
-
-#: ../rules/base.xml.in.h:625 ../rules/evdev.xml.in.h:625
+#: ../rules/base.xml.in.h:655
msgid "Use guillemets for quotes"
msgstr "със френски кавички"
-#: ../rules/base.xml.in.h:626 ../rules/evdev.xml.in.h:626
-msgid "Use keyboard LED to show alternative layout."
+#: ../rules/base.xml.in.h:656
+msgid "Use keyboard LED to show alternative layout"
msgstr "Индикация чрез клавиатурен светодиод за смяна на подредбата"
-#: ../rules/base.xml.in.h:627 ../rules/evdev.xml.in.h:627
+#: ../rules/base.xml.in.h:657
msgid "Using space key to input non-breakable space character"
msgstr "Генериране на интервал без разделяне с клавишa за интервал"
-#: ../rules/base.xml.in.h:628 ../rules/evdev.xml.in.h:628
+#: ../rules/base.xml.in.h:658
+msgid "Usual space at any level"
+msgstr "Нормален интервал на всички нива"
+
+#: ../rules/base.xml.in.h:659
msgid "Uzb"
msgstr "Узб"
-#: ../rules/base.xml.in.h:629 ../rules/evdev.xml.in.h:629
+#: ../rules/base.xml.in.h:660
msgid "Uzbekistan"
msgstr "узбекистанска"
-#: ../rules/base.xml.in.h:630 ../rules/evdev.xml.in.h:630
+#: ../rules/base.xml.in.h:661
msgid "Vietnam"
msgstr "виетнамска"
-#: ../rules/base.xml.in.h:631 ../rules/evdev.xml.in.h:631
+#: ../rules/base.xml.in.h:662
msgid "ViewSonic KU-306 Internet Keyboard"
msgstr "ViewSonic KU-306 Internet Keyboard (за Интернет)"
-#: ../rules/base.xml.in.h:632 ../rules/evdev.xml.in.h:632
+#: ../rules/base.xml.in.h:663
msgid "Vnm"
msgstr "Вие"
-#: ../rules/base.xml.in.h:633 ../rules/evdev.xml.in.h:633
+#: ../rules/base.xml.in.h:664
msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
msgstr "Цифрова клавиатура — Wang 724, с допълненията от Уникод (стрелки и математически операции)"
-#: ../rules/base.xml.in.h:634 ../rules/evdev.xml.in.h:634
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Цифрова клавиатура — Wang 724, с допълненията от Уникод (стрелки и математически операции). Операциите са на стандартното ниво"
+#: ../rules/base.xml.in.h:665
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Цифрова клавиатура Wang 724, с допълненията от Уникод (стрелки и математически операции). Операциите са на стандартното ниво"
-#: ../rules/base.xml.in.h:635 ../rules/evdev.xml.in.h:635
+#: ../rules/base.xml.in.h:666
msgid "Wang model 724 azerty"
msgstr "Wang model 724 azerty"
-#: ../rules/base.xml.in.h:636 ../rules/evdev.xml.in.h:636
+#: ../rules/base.xml.in.h:667
msgid "Western"
msgstr "западна"
-#: ../rules/base.xml.in.h:637 ../rules/evdev.xml.in.h:637
+#: ../rules/base.xml.in.h:668
msgid "Winbook Model XP5"
msgstr "Winbook Model XP5"
-#: ../rules/base.xml.in.h:638 ../rules/evdev.xml.in.h:638
+#: ../rules/base.xml.in.h:669
msgid "Winkeys"
msgstr "клавиши Win"
-#: ../rules/base.xml.in.h:639 ../rules/evdev.xml.in.h:639
+#: ../rules/base.xml.in.h:670
msgid "With &lt;\\|&gt; key"
msgstr "клавиш &lt;\\|&gt;"
-#: ../rules/base.xml.in.h:640 ../rules/evdev.xml.in.h:640
+#: ../rules/base.xml.in.h:671
msgid "With EuroSign on 5"
msgstr "€ е при „5“"
-#: ../rules/base.xml.in.h:641 ../rules/evdev.xml.in.h:641
+#: ../rules/base.xml.in.h:672
msgid "With guillemets"
msgstr "френски кавички"
-#: ../rules/base.xml.in.h:642 ../rules/evdev.xml.in.h:642
+#: ../rules/base.xml.in.h:673
msgid "Yahoo! Internet Keyboard"
msgstr "Yahoo! Internet Keyboard (за Интернет)"
-#: ../rules/base.xml.in.h:643 ../rules/evdev.xml.in.h:643
+#: ../rules/base.xml.in.h:674
msgid "Yakut"
msgstr "якутска"
-#: ../rules/base.xml.in.h:644 ../rules/evdev.xml.in.h:644
+#: ../rules/base.xml.in.h:675
msgid "Yoruba"
msgstr "йоруба"
-#: ../rules/base.xml.in.h:645 ../rules/evdev.xml.in.h:645
+#: ../rules/base.xml.in.h:676
msgid "Z and ZHE swapped"
msgstr "разменени „З“ и „Ж“"
-#: ../rules/base.xml.in.h:646 ../rules/evdev.xml.in.h:646
+#: ../rules/base.xml.in.h:677
msgid "Zar"
msgstr "ЮАф"
-#: ../rules/base.xml.in.h:647 ../rules/evdev.xml.in.h:647
+#: ../rules/base.xml.in.h:678
msgid "azerty"
msgstr "azerty"
-#: ../rules/base.xml.in.h:648 ../rules/evdev.xml.in.h:648
+#: ../rules/base.xml.in.h:679
msgid "azerty/digits"
msgstr "azerty/цифри"
-#: ../rules/base.xml.in.h:649 ../rules/evdev.xml.in.h:649
+#: ../rules/base.xml.in.h:680
msgid "digits"
msgstr "цифри"
-#: ../rules/base.xml.in.h:650 ../rules/evdev.xml.in.h:650
+#: ../rules/base.xml.in.h:681
msgid "displaced semicolon and quote (obsolete)"
msgstr "разменени точка и запетая и кавички (остаряла)"
-#: ../rules/base.xml.in.h:651 ../rules/evdev.xml.in.h:651
+#: ../rules/base.xml.in.h:682
msgid "lyx"
msgstr "lyx"
-#: ../rules/base.xml.in.h:652 ../rules/evdev.xml.in.h:652
+#: ../rules/base.xml.in.h:683
msgid "qwerty"
msgstr "qwerty"
-#: ../rules/base.xml.in.h:653 ../rules/evdev.xml.in.h:653
+#: ../rules/base.xml.in.h:684
msgid "qwerty, extended Backslash"
msgstr "qwerty с удължен Backslash"
-#: ../rules/base.xml.in.h:654 ../rules/evdev.xml.in.h:654
+#: ../rules/base.xml.in.h:685
msgid "qwerty/digits"
msgstr "qwerty/цифри"
-#: ../rules/base.xml.in.h:655 ../rules/evdev.xml.in.h:655
+#: ../rules/base.xml.in.h:686
msgid "qwertz"
msgstr "qwertz"
diff --git a/xorg-server/xkbdata.src/po/ca.po b/xorg-server/xkbdata.src/po/ca.po
new file mode 100644
index 000000000..5ae16fa2e
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/ca.po
@@ -0,0 +1,2748 @@
+# Translation of xkeyboard-config-1.6pre1.po to Catalan
+# Copyright © 2007 Free Software Foundation, Inc.
+# This file is distributed under the same license as the xkeyboard-config package.
+#
+# Josep Ma. Ferrer <txemaq@gmail.com>, 2007, 2008, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config-1.6pre1\n"
+"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
+"POT-Creation-Date: 2009-05-12 23:49+0100\n"
+"PO-Revision-Date: 2009-05-13 21:19+0200\n"
+"Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
+"Language-Team: Catalan <ca@dodds.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)"
+
+#: ../rules/base.xml.in.h:2
+msgid "(Legacy) Alternative"
+msgstr "(Llegat) Alternativa"
+
+#: ../rules/base.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "(Llegat) Alternativa, tecles mortes de Sun"
+
+#: ../rules/base.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "(Llegat) Alternativa, sense tecles mortes"
+
+#: ../rules/base.xml.in.h:5
+msgid "101/104 key Compatible"
+msgstr "Compatible de 101/104 tecles"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/coma/tecles mortes"
+
+#: ../rules/base.xml.in.h:7
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/coma/sense tecles mortes"
+
+#: ../rules/base.xml.in.h:8
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/punt/tecles mortes"
+
+#: ../rules/base.xml.in.h:9
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/punt/sense tecles mortes"
+
+#: ../rules/base.xml.in.h:10
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/coma/tecles mortes"
+
+#: ../rules/base.xml.in.h:11
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/coma/sense tecles mortes"
+
+#: ../rules/base.xml.in.h:12
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/punt/tecles mortes"
+
+#: ../rules/base.xml.in.h:13
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/punt/sense tecles mortes"
+
+#: ../rules/base.xml.in.h:14
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/coma/tecles mortes"
+
+#: ../rules/base.xml.in.h:15
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/coma/sense tecles mortes"
+
+#: ../rules/base.xml.in.h:16
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/punt/tecles mortes"
+
+#: ../rules/base.xml.in.h:17
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/punt/sense tecles mortes"
+
+#: ../rules/base.xml.in.h:18
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/coma/tecles mortes"
+
+#: ../rules/base.xml.in.h:19
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/coma/sense tecles mortes"
+
+#: ../rules/base.xml.in.h:20
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/punt/tecles mortes"
+
+#: ../rules/base.xml.in.h:21
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/punt/sense tecles mortes"
+
+#: ../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 estàndard"
+
+#: ../rules/base.xml.in.h:29
+msgid "ATM/phone-style"
+msgstr "Estil ATM/telèfon"
+
+#: ../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 "Portàtil Acer"
+
+#: ../rules/base.xml.in.h:34
+msgid "Add the standard behavior to Menu key"
+msgstr "Afegeix el comportament estàndard a la tecla Menú"
+
+#: ../rules/base.xml.in.h:35
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "S'afegeix el circumflex de l'esperanto (supersigno)"
+
+#: ../rules/base.xml.in.h:36
+msgid "Adding EuroSign to certain keys"
+msgstr "S'afegeix el signe de l'euro a certes tecles"
+
+#: ../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ània"
+
+#: ../rules/base.xml.in.h:43
+msgid "Alt and Meta are on Alt keys"
+msgstr "Alt i Meta són a les tecles Alt"
+
+#: ../rules/base.xml.in.h:44
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr "Alt s'assigna a la tecla Win dreta i Super a Menú"
+
+#: ../rules/base.xml.in.h:45
+msgid "Alt+CapsLock"
+msgstr "Alt+BloqMaj"
+
+#: ../rules/base.xml.in.h:46
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
+
+#: ../rules/base.xml.in.h:47
+msgid "Alt+Shift"
+msgstr "Alt+Maj"
+
+#: ../rules/base.xml.in.h:48
+msgid "Alt+Space"
+msgstr "Alt+Espai"
+
+#: ../rules/base.xml.in.h:49
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:50
+msgid "Alt/Win key behavior"
+msgstr "Comportament de la tecla Alt/Win"
+
+#: ../rules/base.xml.in.h:51
+msgid "Alternative"
+msgstr "Alternativa"
+
+#: ../rules/base.xml.in.h:52
+msgid "Alternative Eastern"
+msgstr "Oriental alternativa"
+
+#: ../rules/base.xml.in.h:53
+msgid "Alternative Phonetic"
+msgstr "Fonètic alternativa"
+
+#: ../rules/base.xml.in.h:54
+msgid "Alternative international (former us_intl)"
+msgstr "Internacional alternativa (antic us_intl)"
+
+#: ../rules/base.xml.in.h:55
+msgid "Alternative, Sun dead keys"
+msgstr "Alternativa, Sun tecles mortes"
+
+#: ../rules/base.xml.in.h:56
+msgid "Alternative, eliminate dead keys"
+msgstr "Alternativa, sense tecles mortes"
+
+#: ../rules/base.xml.in.h:57
+msgid "Alternative, latin-9 only"
+msgstr "Alternativa, només latin-9"
+
+#: ../rules/base.xml.in.h:58
+msgid "And"
+msgstr "And"
+
+#: ../rules/base.xml.in.h:59
+msgid "Andorra"
+msgstr "Andorra"
+
+#: ../rules/base.xml.in.h:60
+msgid "Any Alt key"
+msgstr "Qualsevol tecla Alt"
+
+#: ../rules/base.xml.in.h:61
+msgid "Any Win key"
+msgstr "Qualsevol tecla Win"
+
+#: ../rules/base.xml.in.h:62
+msgid "Any Win key (while pressed)"
+msgstr "Qualsevol tecla Win (mentre estan premudes)"
+
+#: ../rules/base.xml.in.h:63
+msgid "Apostrophe (') variant"
+msgstr "Variant amb apòstrof (')"
+
+#: ../rules/base.xml.in.h:64
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:65
+msgid "Apple Laptop"
+msgstr "Portàtil Apple"
+
+#: ../rules/base.xml.in.h:66
+msgid "Ara"
+msgstr "Ara"
+
+#: ../rules/base.xml.in.h:67
+msgid "Arabic"
+msgstr "Àrab"
+
+#: ../rules/base.xml.in.h:68
+msgid "Arm"
+msgstr "Arm"
+
+#: ../rules/base.xml.in.h:69
+msgid "Armenia"
+msgstr "Armènia"
+
+#: ../rules/base.xml.in.h:70
+msgid "Asturian variant with bottom-dot H and bottom-dot L"
+msgstr "Variant asturiana amb H punt baix i L amb punt volat"
+
+#: ../rules/base.xml.in.h:71
+msgid "Asus Laptop"
+msgstr "Portàtil Asus"
+
+#: ../rules/base.xml.in.h:72
+msgid "At bottom left"
+msgstr "A baix esquerra"
+
+#: ../rules/base.xml.in.h:73
+msgid "At left of 'A'"
+msgstr "A l'esquerra d'«A»"
+
+#: ../rules/base.xml.in.h:74
+msgid "Aze"
+msgstr "Aze"
+
+#: ../rules/base.xml.in.h:75
+msgid "Azerbaijan"
+msgstr "Azerbaitjan"
+
+#: ../rules/base.xml.in.h:76
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Teclat Azona RF2300 wireless Internet"
+
+#: ../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 "Ban"
+
+#: ../rules/base.xml.in.h:88
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+#: ../rules/base.xml.in.h:89
+msgid "Bel"
+msgstr "Bel"
+
+#: ../rules/base.xml.in.h:90
+msgid "Belarus"
+msgstr "Bielorússia"
+
+#: ../rules/base.xml.in.h:91
+msgid "Belgium"
+msgstr "Bèlgica"
+
+#: ../rules/base.xml.in.h:92
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
+
+#: ../rules/base.xml.in.h:93
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:94
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
+
+#: ../rules/base.xml.in.h:95
+msgid "Bengali"
+msgstr "Bengalí"
+
+#: ../rules/base.xml.in.h:96
+msgid "Bengali Probhat"
+msgstr "Bengalí Probhat"
+
+#: ../rules/base.xml.in.h:97
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Bepo, ergonòmic, tipus Dvorak"
+
+#: ../rules/base.xml.in.h:98
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Bepo, ergonòmic, tipus Dvorak, només latin-9"
+
+#: ../rules/base.xml.in.h:99
+msgid "Bgr"
+msgstr "Bgr"
+
+#: ../rules/base.xml.in.h:100
+msgid "Bhu"
+msgstr "Bhu"
+
+#: ../rules/base.xml.in.h:101
+msgid "Bhutan"
+msgstr "Bhutan"
+
+#: ../rules/base.xml.in.h:102
+msgid "Biblical Hebrew (Tiro)"
+msgstr "Hebreu bíblic (Tiro)"
+
+#: ../rules/base.xml.in.h:103
+msgid "Bih"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:104
+msgid "Blr"
+msgstr "Blr"
+
+#: ../rules/base.xml.in.h:105
+msgid "Bosnia and Herzegovina"
+msgstr "Bòsnia i Hercegovina"
+
+#: ../rules/base.xml.in.h:106
+msgid "Both Alt keys together"
+msgstr "Les dues tecles Alt juntes"
+
+#: ../rules/base.xml.in.h:107
+msgid "Both Ctrl keys together"
+msgstr "Les dues tecles Ctrl juntes"
+
+#: ../rules/base.xml.in.h:108
+msgid "Both Shift keys together"
+msgstr "Les dues tecles Maj juntes"
+
+#: ../rules/base.xml.in.h:109
+msgid "Bra"
+msgstr "Bra"
+
+#: ../rules/base.xml.in.h:110
+msgid "Braille"
+msgstr "Braille"
+
+#: ../rules/base.xml.in.h:111
+msgid "Brazil"
+msgstr "Brasil"
+
+#: ../rules/base.xml.in.h:112
+msgid "Breton"
+msgstr "Bretó"
+
+#: ../rules/base.xml.in.h:113
+msgid "Brl"
+msgstr "Brl"
+
+#: ../rules/base.xml.in.h:114
+msgid "Brother Internet Keyboard"
+msgstr "Teclat Brother Internet"
+
+#: ../rules/base.xml.in.h:115
+msgid "Buckwalter"
+msgstr "Buckwalter"
+
+#: ../rules/base.xml.in.h:116
+msgid "Bulgaria"
+msgstr "Bulgària"
+
+#: ../rules/base.xml.in.h:117
+msgid "CRULP"
+msgstr "CRULP"
+
+#: ../rules/base.xml.in.h:118
+msgid "Cambodia"
+msgstr "Cambodja"
+
+#: ../rules/base.xml.in.h:119
+msgid "Can"
+msgstr "Can"
+
+#: ../rules/base.xml.in.h:120
+msgid "Canada"
+msgstr "Canadà"
+
+#: ../rules/base.xml.in.h:121
+msgid "Caps Lock"
+msgstr "Bloq Majús"
+
+#: ../rules/base.xml.in.h:122
+msgid "CapsLock"
+msgstr "BloqMaj"
+
+#: ../rules/base.xml.in.h:123
+msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
+msgstr "BloqMaj (a la primera disposició), Maj+BloqMaj (a la darrera disposició)"
+
+#: ../rules/base.xml.in.h:124
+msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
+msgstr "BloqMaj (mentre està premuda), Alt+BloqMaj efectua l'acció de BloqMaj original"
+
+#: ../rules/base.xml.in.h:125
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
+msgstr "BloqMaj actua com a Maj amb bloqueig. Maj «pausa» BloqMaj"
+
+#: ../rules/base.xml.in.h:126
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock"
+msgstr "BloqMaj actua com a Maj amb bloqueig. Maj no afecta a BloqMaj"
+
+#: ../rules/base.xml.in.h:127
+msgid "CapsLock key behavior"
+msgstr "Comportament de la tecla BloqMaj"
+
+#: ../rules/base.xml.in.h:128
+msgid "CapsLock toggles Shift so all keys are affected"
+msgstr "BloqMaj commuta Maj, de manera que afecta totes les tecles"
+
+#: ../rules/base.xml.in.h:129
+msgid "CapsLock toggles normal capitalization of alphabetic characters"
+msgstr "BloqMaj commuta les majúscules normals dels caràcters alfabètics"
+
+#: ../rules/base.xml.in.h:130
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
+msgstr "BloqMaj usa internament les majúscules. Maj «pausa» BloqMaj"
+
+#: ../rules/base.xml.in.h:131
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
+msgstr "BloqMaj usa internament les majúscules. Maj no afecta BloqMaj"
+
+#: ../rules/base.xml.in.h:132
+msgid "Catalan variant with middle-dot L"
+msgstr "Variant catalana amb L amb punt volat"
+
+#: ../rules/base.xml.in.h:133
+msgid "Cedilla"
+msgstr "Trencat"
+
+#: ../rules/base.xml.in.h:134
+msgid "Che"
+msgstr "Che"
+
+#: ../rules/base.xml.in.h:135
+msgid "Cherokee"
+msgstr "Cherokee"
+
+#: ../rules/base.xml.in.h:136
+msgid "Cherry B.UNLIMITED"
+msgstr "Cherry B.UNLIMITED"
+
+#: ../rules/base.xml.in.h:137
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:138
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (opció alternativa)"
+
+#: ../rules/base.xml.in.h:139
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:140
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Expert"
+
+#: ../rules/base.xml.in.h:141
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:142
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
+
+#: ../rules/base.xml.in.h:143
+msgid "Chicony Internet Keyboard"
+msgstr "Teclat Chicony Internet"
+
+#: ../rules/base.xml.in.h:144
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:145
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
+
+#: ../rules/base.xml.in.h:146
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0420"
+
+#: ../rules/base.xml.in.h:147
+msgid "China"
+msgstr "Xina"
+
+#: ../rules/base.xml.in.h:148
+msgid "Chuvash"
+msgstr "Chuvash"
+
+#: ../rules/base.xml.in.h:149
+msgid "Chuvash Latin"
+msgstr "Chuvash llatí"
+
+#: ../rules/base.xml.in.h:150
+msgid "Classic"
+msgstr "Clàssic"
+
+#: ../rules/base.xml.in.h:151
+msgid "Classic Dvorak"
+msgstr "Dvorak clàssic"
+
+#: ../rules/base.xml.in.h:152
+msgid "Classmate PC"
+msgstr "Classmate PC"
+
+#: ../rules/base.xml.in.h:153
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:154
+msgid "Colemak"
+msgstr "Colemak"
+
+#: ../rules/base.xml.in.h:155
+msgid "Compaq Easy Access Keyboard"
+msgstr "Teclat Compaq Easy Access"
+
+#: ../rules/base.xml.in.h:156
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Teclat Compaq Internet (13 tecles)"
+
+#: ../rules/base.xml.in.h:157
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Teclat Compaq Internet (18 tecles)"
+
+#: ../rules/base.xml.in.h:158
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Teclat Compaq Internet (7 tecles)"
+
+#: ../rules/base.xml.in.h:159
+msgid "Compaq iPaq Keyboard"
+msgstr "Teclat Compaq iPaq"
+
+#: ../rules/base.xml.in.h:160
+msgid "Compose key position"
+msgstr "Posició de la tecla Compose"
+
+#: ../rules/base.xml.in.h:161
+msgid "Congo, Democratic Republic of the"
+msgstr "Congo, República Democràtica del"
+
+#: ../rules/base.xml.in.h:162
+msgid "Control + Alt + Backspace"
+msgstr "Control + Alt + Retrocés"
+
+#: ../rules/base.xml.in.h:163
+msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
+msgstr "Control s'assigna a les tecles Alt, Alt s'assigna a les tecles Win"
+
+#: ../rules/base.xml.in.h:164
+msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
+msgstr "Control s'assigna a les tecles Win (i a les tecles Ctrl habituals)"
+
+#: ../rules/base.xml.in.h:165
+msgid "Crimean Tatar (Dobruca-1 Q)"
+msgstr "Tàtar de Crimea (Dobruca-1 Q)"
+
+#: ../rules/base.xml.in.h:166
+msgid "Crimean Tatar (Dobruca-2 Q)"
+msgstr "Tàtar de Crimea (Dobruca-2 Q)"
+
+#: ../rules/base.xml.in.h:167
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Tàtar de Crimea (Turc Alt-Q)"
+
+#: ../rules/base.xml.in.h:168
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Tàtar de Crimea (Turc F)"
+
+#: ../rules/base.xml.in.h:169
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Tàtar de Crimea (Turc Q)"
+
+#: ../rules/base.xml.in.h:170
+msgid "Croatia"
+msgstr "Croàcia"
+
+#: ../rules/base.xml.in.h:171
+msgid "Ctrl key position"
+msgstr "Posició de la tecla Ctrl"
+
+#: ../rules/base.xml.in.h:172
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Maj"
+
+#: ../rules/base.xml.in.h:173
+msgid "Cyrillic"
+msgstr "Ciríl·lic"
+
+#: ../rules/base.xml.in.h:174
+msgid "Cyrillic with guillemets"
+msgstr "Ciríl·lic amb cometes angulars"
+
+#: ../rules/base.xml.in.h:175
+msgid "Cyrillic, Z and ZHE swapped"
+msgstr "Ciríl·lic, Z i ZHE intercanviades"
+
+#: ../rules/base.xml.in.h:176
+msgid "Cze"
+msgstr "Cze"
+
+#: ../rules/base.xml.in.h:177
+msgid "Czechia"
+msgstr "Txèquia"
+
+#: ../rules/base.xml.in.h:178
+msgid "DOS"
+msgstr "DOS"
+
+#: ../rules/base.xml.in.h:179
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:180
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:181
+msgid "Dan"
+msgstr "Dan"
+
+#: ../rules/base.xml.in.h:182
+msgid "Dead acute"
+msgstr "Accent mort"
+
+#: ../rules/base.xml.in.h:183
+msgid "Dead grave acute"
+msgstr "Accent greu mort"
+
+#: ../rules/base.xml.in.h:184
+msgid "Default numeric keypad keys"
+msgstr "Tecles predeterminades del teclat numèric"
+
+#: ../rules/base.xml.in.h:185
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:186
+msgid "Dell 101-key PC"
+msgstr "Dell PC 101 tecles"
+
+#: ../rules/base.xml.in.h:187
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Portàtil Dell Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:188
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Portàtil Dell sèrie Precision M"
+
+#: ../rules/base.xml.in.h:189
+msgid "Dell Latitude series laptop"
+msgstr "Portàtil Dell sèrie Latitude"
+
+#: ../rules/base.xml.in.h:190
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
+
+#: ../rules/base.xml.in.h:191
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
+
+#: ../rules/base.xml.in.h:192
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
+
+#: ../rules/base.xml.in.h:193
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Teclat Dell USB Multimedia"
+
+#: ../rules/base.xml.in.h:194
+msgid "Denmark"
+msgstr "Dinamarca"
+
+#: ../rules/base.xml.in.h:195
+msgid "Deu"
+msgstr "Deu"
+
+#: ../rules/base.xml.in.h:196
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Teclat Dexxa Wireless Desktop"
+
+#: ../rules/base.xml.in.h:197
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond sèries 9801 / 9802"
+
+#: ../rules/base.xml.in.h:198
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:199
+msgid "Dvorak (UK Punctuation)"
+msgstr "Dvorak (Puntuació UK)"
+
+#: ../rules/base.xml.in.h:200
+msgid "Dvorak international"
+msgstr "Dvorak internacional"
+
+#: ../rules/base.xml.in.h:201
+msgid "Dvorak, Polish quotes on key 1"
+msgstr "Dvorak, cometes poloneses a la tecla 1"
+
+#: ../rules/base.xml.in.h:202
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorak, cometes poloneses a la tecla cometes"
+
+#: ../rules/base.xml.in.h:203
+msgid "E"
+msgstr "E"
+
+#: ../rules/base.xml.in.h:204
+msgid "Eastern"
+msgstr "Oriental"
+
+#: ../rules/base.xml.in.h:205
+msgid "Eliminate dead keys"
+msgstr "Elimina les tecles mortes"
+
+#: ../rules/base.xml.in.h:206
+msgid "Enable extra typographic characters"
+msgstr "Habilita els caràcters tipogràfics extres"
+
+#: ../rules/base.xml.in.h:207
+msgid "English"
+msgstr "Anglès"
+
+#: ../rules/base.xml.in.h:208
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:209
+msgid "Enter on keypad"
+msgstr "Retorn en el teclat numèric"
+
+#: ../rules/base.xml.in.h:210
+msgid "Epo"
+msgstr "Epo"
+
+#: ../rules/base.xml.in.h:211
+msgid "Ergonomic"
+msgstr "Ergonòmic"
+
+#: ../rules/base.xml.in.h:212
+msgid "Esp"
+msgstr "Esp"
+
+#: ../rules/base.xml.in.h:213
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../rules/base.xml.in.h:214
+msgid "Est"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:215
+msgid "Estonia"
+msgstr "Estònia"
+
+#: ../rules/base.xml.in.h:216
+msgid "Eth"
+msgstr "Eth"
+
+#: ../rules/base.xml.in.h:217
+msgid "Ethiopia"
+msgstr "Etiòpia"
+
+#: ../rules/base.xml.in.h:218
+msgid "Evdev-managed keyboard"
+msgstr "Teclat gestionat per «evdev»"
+
+#: ../rules/base.xml.in.h:219
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:220
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../rules/base.xml.in.h:221
+msgid "Extended"
+msgstr "Estés"
+
+#: ../rules/base.xml.in.h:222
+msgid "Extended - Winkeys"
+msgstr "Estés - Tecles Win"
+
+#: ../rules/base.xml.in.h:223
+msgid "Extended Backslash"
+msgstr "Barra inversa estesa"
+
+#: ../rules/base.xml.in.h:224
+msgid "F-letter (F) variant"
+msgstr "Variant de lletra F (F)"
+
+#: ../rules/base.xml.in.h:225
+msgid "FL90"
+msgstr "FL90"
+
+#: ../rules/base.xml.in.h:226
+msgid "Fao"
+msgstr "Fao"
+
+#: ../rules/base.xml.in.h:227
+msgid "Faroe Islands"
+msgstr "Illes Faroe"
+
+#: ../rules/base.xml.in.h:228
+msgid "Fin"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:229
+msgid "Finland"
+msgstr "Finlàndia"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:232
+msgid "Four-level key with abstract separators"
+msgstr "Tecla de quatre nivells amb separadors abstractes"
+
+#: ../rules/base.xml.in.h:233
+msgid "Four-level key with comma"
+msgstr "Tecla de quatre nivells amb coma"
+
+#: ../rules/base.xml.in.h:234
+msgid "Four-level key with dot"
+msgstr "Tecla de quatre nivells amb punt"
+
+#: ../rules/base.xml.in.h:235
+msgid "Four-level key with dot, latin-9 restriction"
+msgstr "Tecla de quatre nivells amb punt, restricció de latin-9"
+
+# Què collons és momayyez? jm
+#: ../rules/base.xml.in.h:236
+msgid "Four-level key with momayyez"
+msgstr "Tecla de quatre nivells amb momayyez"
+
+#: ../rules/base.xml.in.h:237
+msgid "Fra"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:238
+msgid "France"
+msgstr "França"
+
+#: ../rules/base.xml.in.h:239
+msgid "French"
+msgstr "Francès"
+
+#: ../rules/base.xml.in.h:240
+msgid "French (Macintosh)"
+msgstr "Francès (Macintosh)"
+
+#: ../rules/base.xml.in.h:241
+msgid "French (legacy)"
+msgstr "Francès (llegat)"
+
+#: ../rules/base.xml.in.h:242
+msgid "French Dvorak"
+msgstr "Francès Dvorak"
+
+#: ../rules/base.xml.in.h:243
+msgid "French, Sun dead keys"
+msgstr "Francès, tecles mortes de Sun"
+
+#: ../rules/base.xml.in.h:244
+msgid "French, eliminate dead keys"
+msgstr "Francès, sense tecles mortes"
+
+#: ../rules/base.xml.in.h:245
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Fujitsu-Siemens Computers AMILO portàtil"
+
+#: ../rules/base.xml.in.h:246
+msgid "Fula"
+msgstr "Fula"
+
+#: ../rules/base.xml.in.h:247
+msgid "GBr"
+msgstr "GBr"
+
+#: ../rules/base.xml.in.h:248
+msgid "Ga"
+msgstr "Ga"
+
+#: ../rules/base.xml.in.h:249
+msgid "Generic 101-key PC"
+msgstr "PC genèric de 101 tecles"
+
+#: ../rules/base.xml.in.h:250
+msgid "Generic 102-key (Intl) PC"
+msgstr "PC genèric de 102 tecles (intl)"
+
+#: ../rules/base.xml.in.h:251
+msgid "Generic 104-key PC"
+msgstr "PC genèric de 104 tecles"
+
+#: ../rules/base.xml.in.h:252
+msgid "Generic 105-key (Intl) PC"
+msgstr "PC genèric de 105 tecles (intl)"
+
+#: ../rules/base.xml.in.h:253
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:254
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Teclat Genius MM KWD-910"
+
+#: ../rules/base.xml.in.h:255
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:256
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:257
+msgid "Genius KKB-2050HS"
+msgstr "Genius KKB-2050HS"
+
+#: ../rules/base.xml.in.h:258
+msgid "Geo"
+msgstr "Geo"
+
+#: ../rules/base.xml.in.h:259
+msgid "Georgia"
+msgstr "Geòrgia"
+
+#: ../rules/base.xml.in.h:260
+msgid "Georgian"
+msgstr "Georgià"
+
+#: ../rules/base.xml.in.h:261
+msgid "Georgian AZERTY Tskapo"
+msgstr "Georgià AZERTY Tskapo"
+
+#: ../rules/base.xml.in.h:262
+msgid "German (Macintosh)"
+msgstr "Alemany (Macintosh)"
+
+#: ../rules/base.xml.in.h:263
+msgid "German, Sun dead keys"
+msgstr "Alemany, tecles mortes de Sun"
+
+#: ../rules/base.xml.in.h:264
+msgid "German, eliminate dead keys"
+msgstr "Alemany, sense tecles mortes"
+
+#: ../rules/base.xml.in.h:265
+msgid "Germany"
+msgstr "Alemanya"
+
+#: ../rules/base.xml.in.h:266
+msgid "Gha"
+msgstr "Gha"
+
+#: ../rules/base.xml.in.h:267
+msgid "Ghana"
+msgstr "Ghana"
+
+#: ../rules/base.xml.in.h:268
+msgid "Gre"
+msgstr "Gre"
+
+#: ../rules/base.xml.in.h:269
+msgid "Greece"
+msgstr "Grècia"
+
+#: ../rules/base.xml.in.h:270
+msgid "Group toggle on multiply/divide key"
+msgstr "Commutació de grup en la tecla de multiplicació/divisió"
+
+#: ../rules/base.xml.in.h:271
+msgid "Gui"
+msgstr "Gui"
+
+#: ../rules/base.xml.in.h:272
+msgid "Guinea"
+msgstr "Guinea"
+
+#: ../rules/base.xml.in.h:273
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../rules/base.xml.in.h:274
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../rules/base.xml.in.h:275
+msgid "Gurmukhi Jhelum"
+msgstr "Gurmukhi Jhelum"
+
+#: ../rules/base.xml.in.h:276
+msgid "Gyration"
+msgstr "Gyration"
+
+#: ../rules/base.xml.in.h:277
+msgid "Happy Hacking Keyboard"
+msgstr "Teclat Happy Hacking"
+
+#: ../rules/base.xml.in.h:278
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Teclat Happy Hacking per a Mac"
+
+#: ../rules/base.xml.in.h:279
+msgid "Hausa"
+msgstr "Haussa"
+
+#: ../rules/base.xml.in.h:280
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Teclat Hewlett-Packard Internet"
+
+#: ../rules/base.xml.in.h:281
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:282
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:283
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:284
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:285
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:286
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:287
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:288
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
+
+#: ../rules/base.xml.in.h:289
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Teclat Hewlett-Packard SK-250x Multimedia"
+
+#: ../rules/base.xml.in.h:290
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
+
+#: ../rules/base.xml.in.h:291
+msgid "Hexadecimal"
+msgstr "Hexadecimal"
+
+#: ../rules/base.xml.in.h:292
+msgid "Hindi Bolnagri"
+msgstr "Hindi Bolnagri"
+
+#: ../rules/base.xml.in.h:293
+msgid "Hindi Wx"
+msgstr "Hindi Wx"
+
+#: ../rules/base.xml.in.h:294
+msgid "Homophonic"
+msgstr "Homofònic"
+
+#: ../rules/base.xml.in.h:295
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:296
+msgid "Hrv"
+msgstr "Hrv"
+
+#: ../rules/base.xml.in.h:297
+msgid "Hun"
+msgstr "Hun"
+
+#: ../rules/base.xml.in.h:298
+msgid "Hungary"
+msgstr "Hongria"
+
+#: ../rules/base.xml.in.h:299
+msgid "Hyper is mapped to Win-keys"
+msgstr "Hyper s'assigna a les tecles Win"
+
+#: ../rules/base.xml.in.h:300
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:301
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:302
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:303
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
+
+#: ../rules/base.xml.in.h:304
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:305
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+
+#: ../rules/base.xml.in.h:306
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
+
+#: ../rules/base.xml.in.h:307
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+
+#: ../rules/base.xml.in.h:308
+msgid "ISO Alternate"
+msgstr "Alternativa ISO"
+
+#: ../rules/base.xml.in.h:309
+msgid "Iceland"
+msgstr "Islàndia"
+
+#: ../rules/base.xml.in.h:310
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../rules/base.xml.in.h:311
+msgid "Include dead tilde"
+msgstr "Inclou la titlla morta"
+
+#: ../rules/base.xml.in.h:312
+msgid "Ind"
+msgstr "Ind"
+
+#: ../rules/base.xml.in.h:313
+msgid "India"
+msgstr "Índia"
+
+#: ../rules/base.xml.in.h:314
+msgid "International (AltGr dead keys)"
+msgstr "Internacional (tecles mortes AltGr)"
+
+#: ../rules/base.xml.in.h:315
+msgid "International (with dead keys)"
+msgstr "Internacional (amb tecles mortes)"
+
+#: ../rules/base.xml.in.h:316
+msgid "Inuktitut"
+msgstr "Inuktitut"
+
+#: ../rules/base.xml.in.h:317
+msgid "Iran"
+msgstr "Iran"
+
+#: ../rules/base.xml.in.h:318
+msgid "Iraq"
+msgstr "Iraq"
+
+#: ../rules/base.xml.in.h:319
+msgid "Ireland"
+msgstr "Irlanda"
+
+#: ../rules/base.xml.in.h:320
+msgid "Irl"
+msgstr "Irl"
+
+#: ../rules/base.xml.in.h:321
+msgid "Irn"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:322
+msgid "Irq"
+msgstr "Irq"
+
+#: ../rules/base.xml.in.h:323
+msgid "Isl"
+msgstr "Isl"
+
+#: ../rules/base.xml.in.h:324
+msgid "Isr"
+msgstr "Isr"
+
+#: ../rules/base.xml.in.h:325
+msgid "Israel"
+msgstr "Israel"
+
+#: ../rules/base.xml.in.h:326
+msgid "Ita"
+msgstr "Ita"
+
+#: ../rules/base.xml.in.h:327
+msgid "Italy"
+msgstr "Itàlia"
+
+#: ../rules/base.xml.in.h:328
+msgid "Japan"
+msgstr "Japó"
+
+#: ../rules/base.xml.in.h:329
+msgid "Japan (PC-98xx Series)"
+msgstr "Japó (sèries PC-98xx)"
+
+#: ../rules/base.xml.in.h:330
+msgid "Japanese keyboard options"
+msgstr "Opcions del teclat japonès"
+
+#: ../rules/base.xml.in.h:331
+msgid "Jpn"
+msgstr "Jpn"
+
+#: ../rules/base.xml.in.h:332
+msgid "Kalmyk"
+msgstr "Calmuc"
+
+#: ../rules/base.xml.in.h:333
+msgid "Kana"
+msgstr "Kana"
+
+#: ../rules/base.xml.in.h:334
+msgid "Kana Lock key is locking"
+msgstr "La tecla de bloqueig Kana està blocant"
+
+#: ../rules/base.xml.in.h:335
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../rules/base.xml.in.h:336
+msgid "Kashubian"
+msgstr "Caixubi"
+
+#: ../rules/base.xml.in.h:337
+msgid "Kaz"
+msgstr "Kaz"
+
+#: ../rules/base.xml.in.h:338
+msgid "Kazakh with Russian"
+msgstr "Kazakh amb rus"
+
+#: ../rules/base.xml.in.h:339
+msgid "Kazakhstan"
+msgstr "Kazakhstan"
+
+#: ../rules/base.xml.in.h:340
+msgid "Key sequence to kill the X server"
+msgstr "Seqüència de tecles per a matar el servidor X"
+
+#: ../rules/base.xml.in.h:341
+msgid "Key to choose 3rd level"
+msgstr "Tecla per a seleccionar el 3r nivell"
+
+#: ../rules/base.xml.in.h:342
+msgid "Key(s) to change layout"
+msgstr "Tecla(es) per a canviar la disposició"
+
+#: ../rules/base.xml.in.h:343
+msgid "Keypad"
+msgstr "Teclat numèric"
+
+#: ../rules/base.xml.in.h:344
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:345
+msgid "Kgz"
+msgstr "Kgz"
+
+#: ../rules/base.xml.in.h:346
+msgid "Khm"
+msgstr "Khm"
+
+#: ../rules/base.xml.in.h:347
+msgid "Komi"
+msgstr "Komi"
+
+#: ../rules/base.xml.in.h:348
+msgid "Kor"
+msgstr "Kor"
+
+#: ../rules/base.xml.in.h:349
+msgid "Korea, Republic of"
+msgstr "Corea, República de"
+
+#: ../rules/base.xml.in.h:350
+msgid "Ktunaxa"
+msgstr "Kutenai (Ktunaxa)"
+
+#: ../rules/base.xml.in.h:351
+msgid "Kurdish, (F)"
+msgstr "Kurd, (F)"
+
+#: ../rules/base.xml.in.h:352
+msgid "Kurdish, Arabic-Latin"
+msgstr "Kurd, aràbic-llatí"
+
+#: ../rules/base.xml.in.h:353
+msgid "Kurdish, Latin Alt-Q"
+msgstr "Kurd, llatí Alt-Q"
+
+#: ../rules/base.xml.in.h:354
+msgid "Kurdish, Latin Q"
+msgstr "Kurd, llatí Q"
+
+#: ../rules/base.xml.in.h:355
+msgid "Kyrgyzstan"
+msgstr "Kirguizistan"
+
+#: ../rules/base.xml.in.h:356
+msgid "LAm"
+msgstr "LAm"
+
+#: ../rules/base.xml.in.h:357
+msgid "LEKP"
+msgstr "LEKP"
+
+#: ../rules/base.xml.in.h:358
+msgid "LEKPa"
+msgstr "LEKPa"
+
+#: ../rules/base.xml.in.h:359
+msgid "Lao"
+msgstr "Laosià"
+
+#: ../rules/base.xml.in.h:360
+msgid "Laos"
+msgstr "Laos"
+
+#: ../rules/base.xml.in.h:361
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Teclat de portàtil Compaq (p.ex. Armada)"
+
+#: ../rules/base.xml.in.h:362
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Teclat Internet de portàtil Compaq (p.ex. Presario)"
+
+#: ../rules/base.xml.in.h:363
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Portàtil eMachines m68xx"
+
+#: ../rules/base.xml.in.h:364
+msgid "Latin"
+msgstr "Llatí"
+
+#: ../rules/base.xml.in.h:365
+msgid "Latin American"
+msgstr "Llatinoamericà"
+
+#: ../rules/base.xml.in.h:366
+msgid "Latin Unicode"
+msgstr "Llatí Unicode"
+
+#: ../rules/base.xml.in.h:367
+msgid "Latin Unicode qwerty"
+msgstr "Llatí Unicode qwerty"
+
+#: ../rules/base.xml.in.h:368
+msgid "Latin qwerty"
+msgstr "Llatí qwerty"
+
+#: ../rules/base.xml.in.h:369
+msgid "Latin unicode"
+msgstr "Llatí unicode"
+
+#: ../rules/base.xml.in.h:370
+msgid "Latin unicode qwerty"
+msgstr "Llatí unicode qwerty"
+
+#: ../rules/base.xml.in.h:371
+msgid "Latin with guillemets"
+msgstr "Llatí amb cometes angulars"
+
+#: ../rules/base.xml.in.h:372
+msgid "Latvia"
+msgstr "Letònia"
+
+#: ../rules/base.xml.in.h:373
+msgid "Lav"
+msgstr "Lav"
+
+#: ../rules/base.xml.in.h:374
+msgid "Left Alt"
+msgstr "Alt esquerra"
+
+#: ../rules/base.xml.in.h:375
+msgid "Left Alt (while pressed)"
+msgstr "Alt esquerra (mentre està premuda)"
+
+#: ../rules/base.xml.in.h:376
+msgid "Left Alt is swapped with Left Win"
+msgstr "Alt esquerra està intercanviada amb la tecla Win esquerra"
+
+#: ../rules/base.xml.in.h:377
+msgid "Left Ctrl"
+msgstr "Ctrl esquerra"
+
+#: ../rules/base.xml.in.h:378
+msgid "Left Ctrl+Left Shift"
+msgstr "Ctrl esquerra + Maj esquerra"
+
+#: ../rules/base.xml.in.h:379
+msgid "Left Shift"
+msgstr "Maj esquerra"
+
+#: ../rules/base.xml.in.h:380
+msgid "Left Win"
+msgstr "Win esquerra"
+
+#: ../rules/base.xml.in.h:381
+msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgstr "Win esquerraj (a la primera disposició), Win/Menú dreta (a la darrera disposició)"
+
+#: ../rules/base.xml.in.h:382
+msgid "Left Win (while pressed)"
+msgstr "Win esquerra (mentre està premuda)"
+
+#: ../rules/base.xml.in.h:383
+msgid "Left hand"
+msgstr "Esquerrà"
+
+#: ../rules/base.xml.in.h:384
+msgid "Left handed Dvorak"
+msgstr "Dvorak esquerrà"
+
+#: ../rules/base.xml.in.h:385
+msgid "Legacy"
+msgstr "Llegat"
+
+#: ../rules/base.xml.in.h:386
+msgid "Legacy Wang 724"
+msgstr "Wang 724 llegat"
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:388
+msgid "Legacy key with comma"
+msgstr "Tecla llegada amb coma"
+
+#: ../rules/base.xml.in.h:389
+msgid "Legacy key with dot"
+msgstr "Tecla llegada amb punt"
+
+#: ../rules/base.xml.in.h:390
+msgid "Less-than/Greater-than"
+msgstr "Més petit-que/Més gran-que"
+
+#: ../rules/base.xml.in.h:391
+msgid "Lithuania"
+msgstr "Lituània"
+
+#: ../rules/base.xml.in.h:392
+msgid "Logitech Access Keyboard"
+msgstr "Teclat Logitech Access"
+
+#: ../rules/base.xml.in.h:393
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:394
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (opció alternativa)"
+
+#: ../rules/base.xml.in.h:395
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
+
+#: ../rules/base.xml.in.h:396
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:397
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:398
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:399
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgstr "Logitech Cordless Desktop Pro (opció alternativa 2)"
+
+#: ../rules/base.xml.in.h:400
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:401
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:402
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15 amb tecles extres via G15daemon"
+
+#: ../rules/base.xml.in.h:403
+msgid "Logitech Generic Keyboard"
+msgstr "Teclat Logitech genèric"
+
+#: ../rules/base.xml.in.h:404
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Teclat Logitech Internet 350"
+
+#: ../rules/base.xml.in.h:405
+msgid "Logitech Internet Keyboard"
+msgstr "Teclat Logitech Internet"
+
+#: ../rules/base.xml.in.h:406
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Teclat Logitech Internet Navigator"
+
+#: ../rules/base.xml.in.h:407
+msgid "Logitech Media Elite Keyboard"
+msgstr "Teclat Logitech Media Elite"
+
+#: ../rules/base.xml.in.h:408
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Teclat Logitech Ultra-X Cordless Media Desktop"
+
+#: ../rules/base.xml.in.h:409
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Teclat Logitech Ultra-X"
+
+#: ../rules/base.xml.in.h:410
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Teclat Logitech diNovo Edge"
+
+#: ../rules/base.xml.in.h:411
+msgid "Logitech diNovo Keyboard"
+msgstr "Teclat Logitech diNovo"
+
+#: ../rules/base.xml.in.h:412
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:413
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Teclat Logitech iTouch Cordless (model Y-RB6)"
+
+#: ../rules/base.xml.in.h:414
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Teclat Logitech iTouch Internet Navigator SE"
+
+#: ../rules/base.xml.in.h:415
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Teclat Logitech iTouch Internet Navigator SE (USB)"
+
+#: ../rules/base.xml.in.h:416
+msgid "Lower Sorbian"
+msgstr "Baix sòrab"
+
+#: ../rules/base.xml.in.h:417
+msgid "Lower Sorbian (qwertz)"
+msgstr "Baix sòrab (qwertz)"
+
+#: ../rules/base.xml.in.h:418
+msgid "Ltu"
+msgstr "Ltu"
+
+#: ../rules/base.xml.in.h:419
+msgid "MESS"
+msgstr "MESS"
+
+#: ../rules/base.xml.in.h:420
+msgid "MNE"
+msgstr "MNE"
+
+#: ../rules/base.xml.in.h:421
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
+
+#: ../rules/base.xml.in.h:422
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (Intl)"
+
+#: ../rules/base.xml.in.h:423
+msgid "Macedonia"
+msgstr "Macedònia"
+
+#: ../rules/base.xml.in.h:424
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:425
+msgid "Macintosh Old"
+msgstr "Macintosh antic"
+
+#: ../rules/base.xml.in.h:426
+msgid "Macintosh, Sun dead keys"
+msgstr "Macintosh, tecles mortes de Sun"
+
+#: ../rules/base.xml.in.h:427
+msgid "Macintosh, eliminate dead keys"
+msgstr "Macintosh, sense tecles mortes"
+
+#: ../rules/base.xml.in.h:428
+msgid "Make CapsLock an additional Backspace"
+msgstr "Converteix BloqMaj en un Retrocés addicional"
+
+#: ../rules/base.xml.in.h:429
+msgid "Make CapsLock an additional Ctrl"
+msgstr "Converteix BloqMaj en un Ctrl addicional"
+
+#: ../rules/base.xml.in.h:430
+msgid "Make CapsLock an additional ESC"
+msgstr "Converteix BloqMaj en un Esc addicional"
+
+#: ../rules/base.xml.in.h:431
+msgid "Mal"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:432
+msgid "Malayalam"
+msgstr "Malaialam"
+
+#: ../rules/base.xml.in.h:433
+msgid "Malayalam Lalitha"
+msgstr "Malaialam Lalitha"
+
+#: ../rules/base.xml.in.h:434
+msgid "Maldives"
+msgstr "Maldives"
+
+#: ../rules/base.xml.in.h:435
+msgid "Malta"
+msgstr "Malta"
+
+#: ../rules/base.xml.in.h:436
+msgid "Maltese keyboard with US layout"
+msgstr "Teclat maltès amb disposició US"
+
+#: ../rules/base.xml.in.h:437
+msgid "Mao"
+msgstr "Mao"
+
+#: ../rules/base.xml.in.h:438
+msgid "Maori"
+msgstr "Maori"
+
+#: ../rules/base.xml.in.h:439
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:440
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Teclat Memorex MX2500 EZ-Access"
+
+#: ../rules/base.xml.in.h:441
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:442
+msgid "Menu"
+msgstr "Menú"
+
+#: ../rules/base.xml.in.h:443
+msgid "Meta is mapped to Left Win"
+msgstr "Meta s'assigna a la tecla Win esquerra"
+
+#: ../rules/base.xml.in.h:444
+msgid "Meta is mapped to Win keys"
+msgstr "Meta s'assigna a les tecles Win"
+
+#: ../rules/base.xml.in.h:445
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Comfort Curve Keyboard 2000"
+
+#: ../rules/base.xml.in.h:446
+msgid "Microsoft Internet Keyboard"
+msgstr "Teclat Microsoft Internet"
+
+#: ../rules/base.xml.in.h:447
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, Suec"
+
+#: ../rules/base.xml.in.h:448
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:449
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Teclat Microsoft Natural Elite"
+
+#: ../rules/base.xml.in.h:450
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Teclat Microsoft Natural Pro / Teclat Microsoft Internet Pro"
+
+#: ../rules/base.xml.in.h:451
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Teclat Microsoft Natural Pro OEM"
+
+#: ../rules/base.xml.in.h:452
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Teclat Microsoft Natural Pro USB / Teclat Microsoft Internet Pro"
+
+#: ../rules/base.xml.in.h:453
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+
+#: ../rules/base.xml.in.h:454
+msgid "Microsoft Office Keyboard"
+msgstr "Teclat Microsoft Office"
+
+#: ../rules/base.xml.in.h:455
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Teclat Microsoft Wireless Multimedia 1.0A"
+
+#: ../rules/base.xml.in.h:456
+msgid "Miscellaneous compatibility options"
+msgstr "Opcions de compatibilitat diverses"
+
+#: ../rules/base.xml.in.h:457
+msgid "Mkd"
+msgstr "Mkd"
+
+#: ../rules/base.xml.in.h:458
+msgid "Mlt"
+msgstr "Mlt"
+
+#: ../rules/base.xml.in.h:459
+msgid "Mmr"
+msgstr "Mmr"
+
+#: ../rules/base.xml.in.h:460
+msgid "Mng"
+msgstr "Mng"
+
+#: ../rules/base.xml.in.h:461
+msgid "Mongolia"
+msgstr "Mongòlia"
+
+#: ../rules/base.xml.in.h:462
+msgid "Montenegro"
+msgstr "Montenegro"
+
+#: ../rules/base.xml.in.h:463
+msgid "Morocco"
+msgstr "Marroc"
+
+#: ../rules/base.xml.in.h:464
+msgid "Multilingual"
+msgstr "Multilingüe"
+
+#: ../rules/base.xml.in.h:465
+msgid "Multilingual, first part"
+msgstr "Multilingüe, primera part"
+
+#: ../rules/base.xml.in.h:466
+msgid "Multilingual, second part"
+msgstr "Multilingüe, segona part"
+
+#: ../rules/base.xml.in.h:467
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#: ../rules/base.xml.in.h:468
+msgid "NICOLA-F style Backspace"
+msgstr "Retrocés estil NICOLA-F"
+
+#: ../rules/base.xml.in.h:469
+msgid "NLA"
+msgstr "NLA"
+
+#: ../rules/base.xml.in.h:470
+msgid "Nativo"
+msgstr "Nativo"
+
+#: ../rules/base.xml.in.h:471
+msgid "Nativo for Esperanto"
+msgstr "Nativo per a l'Esperanto"
+
+#: ../rules/base.xml.in.h:472
+msgid "Nativo for USA keyboards"
+msgstr "Nativo per als teclats EUA"
+
+#: ../rules/base.xml.in.h:473
+msgid "Neo 2"
+msgstr "Neo 2"
+
+#: ../rules/base.xml.in.h:474
+msgid "Nep"
+msgstr "Nep"
+
+#: ../rules/base.xml.in.h:475
+msgid "Nepal"
+msgstr "Nepal"
+
+#: ../rules/base.xml.in.h:476
+msgid "Netherlands"
+msgstr "Països Baixos"
+
+#: ../rules/base.xml.in.h:477
+msgid "Nig"
+msgstr "Nig"
+
+#: ../rules/base.xml.in.h:478
+msgid "Nigeria"
+msgstr "Nigèria"
+
+#: ../rules/base.xml.in.h:479
+msgid "Nld"
+msgstr "Nld"
+
+#: ../rules/base.xml.in.h:480
+msgid "Non-breakable space character at fourth level"
+msgstr "Caràcter d'espai sense salt al nivell quart"
+
+#: ../rules/base.xml.in.h:481
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Caràcter d'espai sense salt al nivell quart, i un caràcter d'espai fi sense salt al nivell sisè"
+
+#: ../rules/base.xml.in.h:482
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
+msgstr "Caràcter d'espai sense salt al nivell quart, un caràcter d'espai fi sense salt al nivell sisè (via Ctrl+Maj)"
+
+#: ../rules/base.xml.in.h:483
+msgid "Non-breakable space character at second level"
+msgstr "La tecla d'espai produeix un caràcter d'espai sense salt al nivell segon"
+
+#: ../rules/base.xml.in.h:484
+msgid "Non-breakable space character at third level"
+msgstr "La tecla d'espai produeix un caràcter d'espai sense salt al nivell tercer"
+
+#: ../rules/base.xml.in.h:485
+msgid "Non-breakable space character at third level, nothing at fourth level"
+msgstr "La tecla d'espai produeix un caràcter d'espai sense salt al nivell tercer, i res al nivell quart"
+
+#: ../rules/base.xml.in.h:486
+msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "La tecla d'espai produeix un caràcter d'espai sense salt al nivell tercer, i un caràcter d'espai fi sense salt al nivell quart"
+
+#: ../rules/base.xml.in.h:487
+msgid "Nor"
+msgstr "Nor"
+
+#: ../rules/base.xml.in.h:488
+msgid "Northern Saami"
+msgstr "Saami del nord"
+
+#: ../rules/base.xml.in.h:489
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Saami del nord, sense tecles mortes"
+
+#: ../rules/base.xml.in.h:490
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:491
+msgid "Norway"
+msgstr "Noruega"
+
+#: ../rules/base.xml.in.h:492
+msgid "NumLock"
+msgstr "BloqNúm"
+
+#: ../rules/base.xml.in.h:493
+msgid "Numeric keypad delete key behaviour"
+msgstr "Comportament de la tecla de supressió del teclat numèric"
+
+#: ../rules/base.xml.in.h:494
+msgid "Numeric keypad keys work as with Mac"
+msgstr "Les tecles del teclat numèric funcionen com al Mac"
+
+#: ../rules/base.xml.in.h:495
+msgid "Numeric keypad layout selection"
+msgstr "Selecció de la disposició del teclat numèric"
+
+#: ../rules/base.xml.in.h:496
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:497
+msgid "OLPC"
+msgstr "OLPC"
+
+#: ../rules/base.xml.in.h:498
+msgid "OLPC Dari"
+msgstr "OLPC Dari"
+
+#: ../rules/base.xml.in.h:499
+msgid "OLPC Pashto"
+msgstr "OLPC Paixtu"
+
+#: ../rules/base.xml.in.h:500
+msgid "OLPC Southern Uzbek"
+msgstr "OLPC Uzbek del sud"
+
+#: ../rules/base.xml.in.h:501
+msgid "Occitan"
+msgstr "Occità"
+
+#: ../rules/base.xml.in.h:502
+msgid "Ogham"
+msgstr "Ogham"
+
+#: ../rules/base.xml.in.h:503
+msgid "Ogham IS434"
+msgstr "Ogham IS434"
+
+#: ../rules/base.xml.in.h:504
+msgid "Oriya"
+msgstr "Oriya"
+
+#: ../rules/base.xml.in.h:505
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Teclat Ortek MCK-800 MM/Internet"
+
+#: ../rules/base.xml.in.h:506
+msgid "Ossetian"
+msgstr "Osset"
+
+#: ../rules/base.xml.in.h:507
+msgid "Ossetian, Winkeys"
+msgstr "Osset, tecles Win"
+
+#: ../rules/base.xml.in.h:508
+msgid "Ossetian, legacy"
+msgstr "Osset, llegat"
+
+#: ../rules/base.xml.in.h:509
+msgid "PC-98xx Series"
+msgstr "Sèries PC-98xx"
+
+#: ../rules/base.xml.in.h:510
+msgid "Pak"
+msgstr "Pak"
+
+#: ../rules/base.xml.in.h:511
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: ../rules/base.xml.in.h:512
+msgid "Pashto"
+msgstr "Paixtu"
+
+#: ../rules/base.xml.in.h:513
+msgid "Pattachote"
+msgstr "Pattachote"
+
+#: ../rules/base.xml.in.h:514
+msgid "Phonetic"
+msgstr "Fonètic"
+
+#: ../rules/base.xml.in.h:515
+msgid "Phonetic Winkeys"
+msgstr "Tecles Win fonètiques"
+
+#: ../rules/base.xml.in.h:516
+msgid "Pol"
+msgstr "Pol"
+
+#: ../rules/base.xml.in.h:517
+msgid "Poland"
+msgstr "Polònia"
+
+#: ../rules/base.xml.in.h:518
+msgid "Polytonic"
+msgstr "Politònic"
+
+#: ../rules/base.xml.in.h:519
+msgid "Portugal"
+msgstr "Portugal"
+
+#: ../rules/base.xml.in.h:520
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:521
+msgid "Pro Keypad"
+msgstr "Pro Keypad"
+
+#: ../rules/base.xml.in.h:522
+msgid "Probhat"
+msgstr "Probhat"
+
+#: ../rules/base.xml.in.h:523
+msgid "Programmer Dvorak"
+msgstr "Dvorak de programador"
+
+#: ../rules/base.xml.in.h:524
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:525
+msgid "Prt"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:526
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:527
+msgid "Right Alt"
+msgstr "Alt dreta"
+
+#: ../rules/base.xml.in.h:528
+msgid "Right Alt (while pressed)"
+msgstr "Alt dreta (mentre està premuda)"
+
+#: ../rules/base.xml.in.h:529
+msgid "Right Alt key never chooses 3rd level"
+msgstr "La tecla Alt dreta mai selecciona el 3r nivell"
+
+#: ../rules/base.xml.in.h:530
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr "Alt dreta, Maj+Alt dreta és la Multi_Key"
+
+#: ../rules/base.xml.in.h:531
+msgid "Right Ctrl"
+msgstr "Ctrl dreta"
+
+#: ../rules/base.xml.in.h:532
+msgid "Right Ctrl (while pressed)"
+msgstr "Ctrl dreta (mentre està premuda)"
+
+#: ../rules/base.xml.in.h:533
+msgid "Right Ctrl as Right Alt"
+msgstr "Ctrl dreta com a Alt dreta"
+
+#: ../rules/base.xml.in.h:534
+msgid "Right Shift"
+msgstr "Maj dreta"
+
+#: ../rules/base.xml.in.h:535
+msgid "Right Win"
+msgstr "Win dreta"
+
+#: ../rules/base.xml.in.h:536
+msgid "Right Win (while pressed)"
+msgstr "Win dreta (mentre està premuda)"
+
+#: ../rules/base.xml.in.h:537
+msgid "Right hand"
+msgstr "Dretà"
+
+#: ../rules/base.xml.in.h:538
+msgid "Right handed Dvorak"
+msgstr "Dvorak dretà"
+
+#: ../rules/base.xml.in.h:539
+msgid "Romania"
+msgstr "Romania"
+
+#: ../rules/base.xml.in.h:540
+msgid "Romanian keyboard with German letters"
+msgstr "Teclat romanès amb lletres alemanyes"
+
+#: ../rules/base.xml.in.h:541
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Teclat romanès amb lletres alemanyes, sense tecles mortes"
+
+#: ../rules/base.xml.in.h:542
+msgid "Rou"
+msgstr "Rou"
+
+#: ../rules/base.xml.in.h:543
+msgid "Rus"
+msgstr "Rus"
+
+#: ../rules/base.xml.in.h:544
+msgid "Russia"
+msgstr "Rússia"
+
+#: ../rules/base.xml.in.h:545
+msgid "Russian"
+msgstr "Rus"
+
+#: ../rules/base.xml.in.h:546
+msgid "Russian phonetic"
+msgstr "Rus fonètic"
+
+#: ../rules/base.xml.in.h:547
+msgid "Russian phonetic Dvorak"
+msgstr "Rus fonètic Dvorak"
+
+#: ../rules/base.xml.in.h:548
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Rus fonètic, sense tecles mortes"
+
+#: ../rules/base.xml.in.h:549
+msgid "Russian with Kazakh"
+msgstr "Rus amb Kazakh"
+
+#: ../rules/base.xml.in.h:550
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "Teclat SILVERCREST Multimedia Wireless"
+
+#: ../rules/base.xml.in.h:551
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:552
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:553
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:554
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:555
+msgid "SRB"
+msgstr "SRB"
+
+#: ../rules/base.xml.in.h:556
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:557
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
+
+#: ../rules/base.xml.in.h:558
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:559
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:560
+msgid "Scroll Lock"
+msgstr "Bloq Despl"
+
+#: ../rules/base.xml.in.h:561
+msgid "ScrollLock"
+msgstr "BloqDespl"
+
+#: ../rules/base.xml.in.h:562
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+#: ../rules/base.xml.in.h:563
+msgid "Semi-colon on third level"
+msgstr "Punt i coma al tercer nivell"
+
+#: ../rules/base.xml.in.h:564
+msgid "Serbia"
+msgstr "Sèrbia"
+
+#: ../rules/base.xml.in.h:565
+msgid "Shift cancels CapsLock"
+msgstr "Maj cancel·la BloqMaj"
+
+#: ../rules/base.xml.in.h:566
+msgid "Shift does not cancel NumLock, chooses 3d level instead"
+msgstr "Maj no cancel·la BloqNúm, en el seu lloc selecciona el 3r nivell"
+
+#: ../rules/base.xml.in.h:567
+msgid "Shift with numeric keypad keys works as in MS Windows"
+msgstr "Maj amb el teclat numèric funciona com al MS Windows"
+
+#: ../rules/base.xml.in.h:568
+msgid "Shift+CapsLock"
+msgstr "Maj+BloqMaj"
+
+#: ../rules/base.xml.in.h:569
+msgid "Simple"
+msgstr "Senzill"
+
+#: ../rules/base.xml.in.h:570
+msgid "Slovakia"
+msgstr "Eslovàquia"
+
+#: ../rules/base.xml.in.h:571
+msgid "Slovenia"
+msgstr "Eslovènia"
+
+#: ../rules/base.xml.in.h:572
+msgid "South Africa"
+msgstr "Sudàfrica"
+
+#: ../rules/base.xml.in.h:573
+msgid "Southern Uzbek"
+msgstr "Uzbek del sud"
+
+#: ../rules/base.xml.in.h:574
+msgid "Spain"
+msgstr "Espanya"
+
+#: ../rules/base.xml.in.h:575
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
+msgstr "Tecles especials (Ctrl+Alt+&lt;tecla&gt;) gestionades en un servidor"
+
+#: ../rules/base.xml.in.h:576
+msgid "SrL"
+msgstr "SrL"
+
+#: ../rules/base.xml.in.h:577
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#: ../rules/base.xml.in.h:578
+msgid "Standard"
+msgstr "Estàndard"
+
+#: ../rules/base.xml.in.h:579
+msgid "Standard (Cedilla)"
+msgstr "Estàndard (ce trencada)"
+
+#: ../rules/base.xml.in.h:580
+msgid "Standard Phonetic"
+msgstr "Fonètic estàndard"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:582
+msgid "Standard RSTU"
+msgstr "Estàndard RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:584
+msgid "Standard RSTU on Russian layout"
+msgstr "Estàndard RSTU en una disposició russa"
+
+#: ../rules/base.xml.in.h:585
+msgid "Sun Type 5/6"
+msgstr "Sun Type 5/6"
+
+#: ../rules/base.xml.in.h:586
+msgid "Sun dead keys"
+msgstr "Tecles mortes de Sun"
+
+#: ../rules/base.xml.in.h:587
+msgid "Super Power Multimedia Keyboard"
+msgstr "Teclat Super Power Multimedia"
+
+#: ../rules/base.xml.in.h:588
+msgid "Svdvorak"
+msgstr "Svdvorak"
+
+#: ../rules/base.xml.in.h:589
+msgid "Svk"
+msgstr "Svk"
+
+#: ../rules/base.xml.in.h:590
+msgid "Svn"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:591
+msgid "Swap Ctrl and CapsLock"
+msgstr "Intercanvia Ctrl i BloqMaj"
+
+#: ../rules/base.xml.in.h:592
+msgid "Swap ESC and CapsLock"
+msgstr "Intercanvia Esc i BloqMaj"
+
+#: ../rules/base.xml.in.h:593
+msgid "Swe"
+msgstr "Swe"
+
+#: ../rules/base.xml.in.h:594
+msgid "Sweden"
+msgstr "Suècia"
+
+#: ../rules/base.xml.in.h:595
+msgid "Switzerland"
+msgstr "Suïssa"
+
+#: ../rules/base.xml.in.h:596
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:597
+msgid "Syr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:598
+msgid "Syria"
+msgstr "Síria"
+
+#: ../rules/base.xml.in.h:599
+msgid "Syriac"
+msgstr "Siri"
+
+#: ../rules/base.xml.in.h:600
+msgid "Syriac phonetic"
+msgstr "Siri fonètic"
+
+#: ../rules/base.xml.in.h:601
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:602
+msgid "Tajikistan"
+msgstr "Tadjikistan"
+
+#: ../rules/base.xml.in.h:603
+msgid "Tamil"
+msgstr "Tàmil"
+
+#: ../rules/base.xml.in.h:604
+msgid "Tamil TAB Typewriter"
+msgstr "Tàmil TAB Typewriter"
+
+#: ../rules/base.xml.in.h:605
+msgid "Tamil TSCII Typewriter"
+msgstr "Tàmil TSCII Typewriter"
+
+#: ../rules/base.xml.in.h:606
+msgid "Tamil Unicode"
+msgstr "Tàmil Unicode"
+
+#: ../rules/base.xml.in.h:607
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
+
+#: ../rules/base.xml.in.h:608
+msgid "Tatar"
+msgstr "Tàtar"
+
+#: ../rules/base.xml.in.h:609
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../rules/base.xml.in.h:610
+msgid "Tha"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:611
+msgid "Thailand"
+msgstr "Tailàndia"
+
+#: ../rules/base.xml.in.h:612
+msgid "Tibetan"
+msgstr "Tibetà"
+
+#: ../rules/base.xml.in.h:613
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibetà (amb nombres ASCII)"
+
+#: ../rules/base.xml.in.h:614
+msgid "Tifinagh"
+msgstr "Tifinagh"
+
+#: ../rules/base.xml.in.h:615
+msgid "Tifinagh Alternative"
+msgstr "Tifinagh alternativa"
+
+#: ../rules/base.xml.in.h:616
+msgid "Tifinagh Alternative Phonetic"
+msgstr "Tifinagh fonètic alternativa"
+
+#: ../rules/base.xml.in.h:617
+msgid "Tifinagh Extended"
+msgstr "Tifinagh ampliada"
+
+#: ../rules/base.xml.in.h:618
+msgid "Tifinagh Extended Phonetic"
+msgstr "Tifinagh fonètic ampliada"
+
+#: ../rules/base.xml.in.h:619
+msgid "Tifinagh Phonetic"
+msgstr "Tifinagh fonètica"
+
+#: ../rules/base.xml.in.h:620
+msgid "Tilde (~) variant"
+msgstr "Variant titlla (~)"
+
+#: ../rules/base.xml.in.h:621
+msgid "Tjk"
+msgstr "Tjk"
+
+#: ../rules/base.xml.in.h:622
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr "A la tecla corresponent en un teclat Dvorak."
+
+#: ../rules/base.xml.in.h:623
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr "A la tecla corresponent en un teclat Qwerty."
+
+#: ../rules/base.xml.in.h:624
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:625
+msgid "Traditional Phonetic"
+msgstr "Fonètic tradicional"
+
+#: ../rules/base.xml.in.h:626
+msgid "Trust Direct Access Keyboard"
+msgstr "Teclat Trust Direct Access"
+
+#: ../rules/base.xml.in.h:627
+msgid "Trust Slimline"
+msgstr "Trust Slimline"
+
+#: ../rules/base.xml.in.h:628
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Teclat Trust Wireless Classic"
+
+#: ../rules/base.xml.in.h:629
+msgid "Tur"
+msgstr "Tur"
+
+#: ../rules/base.xml.in.h:630
+msgid "Turkey"
+msgstr "Turquia"
+
+#: ../rules/base.xml.in.h:631
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+#: ../rules/base.xml.in.h:632
+msgid "Typewriter"
+msgstr "Màquina d'escriure"
+
+#: ../rules/base.xml.in.h:633
+msgid "UCW layout (accented letters only)"
+msgstr "Disposició UCW (només lletres accentuades)"
+
+#: ../rules/base.xml.in.h:634
+msgid "US keyboard with Bosnian digraphs"
+msgstr "Teclat US amb dígrafs bosnians"
+
+#: ../rules/base.xml.in.h:635
+msgid "US keyboard with Bosnian letters"
+msgstr "Teclat US amb lletres bosnianes"
+
+#: ../rules/base.xml.in.h:636
+msgid "US keyboard with Croatian digraphs"
+msgstr "Teclat US amb dígrafs croats"
+
+#: ../rules/base.xml.in.h:637
+msgid "US keyboard with Croatian letters"
+msgstr "Teclat US amb lletres croates"
+
+#: ../rules/base.xml.in.h:638
+msgid "US keyboard with Estonian letters"
+msgstr "Teclat US amb lletres estònies"
+
+#: ../rules/base.xml.in.h:639
+msgid "US keyboard with Lithuanian letters"
+msgstr "Teclat US amb dígrafs lituans"
+
+#: ../rules/base.xml.in.h:640
+msgid "US keyboard with Slovenian letters"
+msgstr "Teclat US amb lletres eslovenes"
+
+#: ../rules/base.xml.in.h:641
+msgid "USA"
+msgstr "EUA"
+
+#: ../rules/base.xml.in.h:642
+msgid "Udmurt"
+msgstr "Udmurt"
+
+#: ../rules/base.xml.in.h:643
+msgid "Ukr"
+msgstr "Ukr"
+
+#: ../rules/base.xml.in.h:644
+msgid "Ukraine"
+msgstr "Ucraïna"
+
+#: ../rules/base.xml.in.h:645
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Addicions Unicode (fletxes i operadors matemàtics)"
+
+#: ../rules/base.xml.in.h:646
+msgid "Unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Addicions Unicode (fletxes i operadors matemàtics). Els operadors matemàtics al nivell predeterminat"
+
+#: ../rules/base.xml.in.h:647
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:648
+msgid "United Kingdom"
+msgstr "Regne Unit"
+
+#: ../rules/base.xml.in.h:649
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
+
+#: ../rules/base.xml.in.h:650
+msgid "Urdu, Alternative phonetic"
+msgstr "Urdú, fonètic alternatiu"
+
+#: ../rules/base.xml.in.h:651
+msgid "Urdu, Phonetic"
+msgstr "Urdú, fonètic"
+
+#: ../rules/base.xml.in.h:652
+msgid "Urdu, Winkeys"
+msgstr "Urdú, tecles Win"
+
+#: ../rules/base.xml.in.h:653
+msgid "Use Bosnian digraphs"
+msgstr "Usa dígrafs bosnians"
+
+#: ../rules/base.xml.in.h:654
+msgid "Use Croatian digraphs"
+msgstr "Usa dígrafs croats"
+
+#: ../rules/base.xml.in.h:655
+msgid "Use guillemets for quotes"
+msgstr "Usa cometes angulars per les cometes"
+
+#: ../rules/base.xml.in.h:656
+msgid "Use keyboard LED to show alternative layout"
+msgstr "Usa el LED del teclat per a mostrar la disposició alternativa"
+
+#: ../rules/base.xml.in.h:657
+msgid "Using space key to input non-breakable space character"
+msgstr "Usa la tecla d'espai per a introduir un caràcter d'espai sense salt"
+
+#: ../rules/base.xml.in.h:658
+msgid "Usual space at any level"
+msgstr "Espai normal en qualsevol nivell"
+
+#: ../rules/base.xml.in.h:659
+msgid "Uzb"
+msgstr "Uzb"
+
+#: ../rules/base.xml.in.h:660
+msgid "Uzbekistan"
+msgstr "Uzbekistan"
+
+#: ../rules/base.xml.in.h:661
+msgid "Vietnam"
+msgstr "Vietnam"
+
+#: ../rules/base.xml.in.h:662
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "Teclat ViewSonic KU-306 Internet"
+
+#: ../rules/base.xml.in.h:663
+msgid "Vnm"
+msgstr "Vnm"
+
+#: ../rules/base.xml.in.h:664
+msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgstr "Teclat numèric Wang 724 amb addicions Unicode (fletxes i operadors matemàtics)"
+
+#: ../rules/base.xml.in.h:665
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Teclat numèric Wang 724 amb addicions Unicode (fletxes i operadors matemàtics). Els operadors matemàtics en el nivell per defecte"
+
+#: ../rules/base.xml.in.h:666
+msgid "Wang model 724 azerty"
+msgstr "Wang model 724 azerty"
+
+#: ../rules/base.xml.in.h:667
+msgid "Western"
+msgstr "Occidental"
+
+#: ../rules/base.xml.in.h:668
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:669
+msgid "Winkeys"
+msgstr "Tecles Win"
+
+#: ../rules/base.xml.in.h:670
+msgid "With &lt;\\|&gt; key"
+msgstr "Amb la tecla &lt;\\|&gt;"
+
+#: ../rules/base.xml.in.h:671
+msgid "With EuroSign on 5"
+msgstr "Amb el signe de l'euro al 5"
+
+#: ../rules/base.xml.in.h:672
+msgid "With guillemets"
+msgstr "Amb cometes angulars"
+
+#: ../rules/base.xml.in.h:673
+msgid "Yahoo! Internet Keyboard"
+msgstr "Teclat Yahoo! Internet"
+
+#: ../rules/base.xml.in.h:674
+msgid "Yakut"
+msgstr "Iacut"
+
+#: ../rules/base.xml.in.h:675
+msgid "Yoruba"
+msgstr "Ioruba"
+
+#: ../rules/base.xml.in.h:676
+msgid "Z and ZHE swapped"
+msgstr "Z i ZHE intercanviades"
+
+#: ../rules/base.xml.in.h:677
+msgid "Zar"
+msgstr "Zar"
+
+#: ../rules/base.xml.in.h:678
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:679
+msgid "azerty/digits"
+msgstr "azerty/dígits"
+
+#: ../rules/base.xml.in.h:680
+msgid "digits"
+msgstr "dígits"
+
+#: ../rules/base.xml.in.h:681
+msgid "displaced semicolon and quote (obsolete)"
+msgstr "punt i coma i cometa desplaçats (obsolet)"
+
+#: ../rules/base.xml.in.h:682
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:683
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:684
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, barra inversa ampliada"
+
+#: ../rules/base.xml.in.h:685
+msgid "qwerty/digits"
+msgstr "qwerty/dígits"
+
+#: ../rules/base.xml.in.h:686
+msgid "qwertz"
+msgstr "qwertz"
diff --git a/xorg-server/xkbdata.src/po/crh.po b/xorg-server/xkbdata.src/po/crh.po
new file mode 100644
index 000000000..0afa89b68
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/crh.po
@@ -0,0 +1,2799 @@
+# Crimean Tatar (Crimean Turkish) translation for xkeyboard-config.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the xkeyboard-config package.
+#
+# Reşat SABIQ <tilde.birlik@gmail.com>, 2009.
+# Özgür Qarahan <karahan@vatankirim.net>, 2009.
+# Şimdilik, bazan Türkçe tercimeler qullanıla.
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 1.6pre1\n"
+"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
+"POT-Creation-Date: 2009-05-12 23:49+0100\n"
+"PO-Revision-Date: 2009-05-25 03:22-0500\n"
+"Last-Translator: Reşat SABIQ <tilde.birlik@gmail.com>\n"
+"Language-Team: Crimean Tatar (Crimean Turkish) <tilde-birlik-tercime@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+# tüklü
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr "F tizilimi"
+
+#: ../rules/base.xml.in.h:2
+msgid "(Legacy) Alternative"
+msgstr "(Qadim) Alternativ"
+
+#: ../rules/base.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "(Qadim) Alternativ, Sun ölü tuşlar"
+
+#: ../rules/base.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "(Qadim) Alternativ, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:5
+msgid "101/104 key Compatible"
+msgstr "101/104 tuş Qabili Telif"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/virgül/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:7
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/virgül/Ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:8
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/noqta/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:9
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/noqta/Ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:10
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/virgül/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:11
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/virgül/Ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:12
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/noqta/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:13
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/noqta/Ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:14
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/virgül/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:15
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/virgül/Ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:16
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/noqta/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:17
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/noqta/Ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:18
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/virgül/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:19
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/virgül/Ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:20
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/noqta/Ölü tuşlar"
+
+#: ../rules/base.xml.in.h:21
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/noqta/Ölü tuşsuz"
+
+#: ../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 Telsiz Masaüstü RFKB-23"
+
+#: ../rules/base.xml.in.h:28
+msgid "ACPI Standard"
+msgstr "ACPI Standartı"
+
+# tüklü
+#: ../rules/base.xml.in.h:29
+msgid "ATM/phone-style"
+msgstr "ATM/telefon-uslûbı"
+
+#: ../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 Tizüstü"
+
+#: ../rules/base.xml.in.h:34
+msgid "Add the standard behavior to Menu key"
+msgstr "Menü tuşuna standart davranışnı ekle."
+
+#: ../rules/base.xml.in.h:35
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "Esperanto qıyışıq-yaylarınıñ (circumflex) eklenüvi (supersigno)"
+
+#: ../rules/base.xml.in.h:36
+msgid "Adding EuroSign to certain keys"
+msgstr "Belli tuşlarğa € remziniñ eklenüvi"
+
+#: ../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 "Afğanistan"
+
+#: ../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 "Arnavutlıq"
+
+#: ../rules/base.xml.in.h:43
+msgid "Alt and Meta are on Alt keys"
+msgstr "Alt ve Meta, Alt tuşlarındadır"
+
+#: ../rules/base.xml.in.h:44
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr "Alt, Sağ Pencereler (Win) tuşuna, Süper ise Menü tuşuna haritalandırılır"
+
+#: ../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+Boşluq"
+
+#: ../rules/base.xml.in.h:49
+msgid "Alt-Q"
+msgstr "Alt-Q (yazılımcı klavyesi)"
+
+#: ../rules/base.xml.in.h:50
+msgid "Alt/Win key behavior"
+msgstr "Alt/Win tuşu davranışı"
+
+#: ../rules/base.xml.in.h:51
+msgid "Alternative"
+msgstr "Alternativ"
+
+#: ../rules/base.xml.in.h:52
+msgid "Alternative Eastern"
+msgstr "Alternativ Şarqiy"
+
+#: ../rules/base.xml.in.h:53
+msgid "Alternative Phonetic"
+msgstr "Alternativ Fonetik"
+
+#: ../rules/base.xml.in.h:54
+msgid "Alternative international (former us_intl)"
+msgstr "Alternativ milletlerara (Q klavyesi; evelki us_intl)"
+
+#: ../rules/base.xml.in.h:55
+msgid "Alternative, Sun dead keys"
+msgstr "Alternativ, Sun ölü tuşlar"
+
+#: ../rules/base.xml.in.h:56
+msgid "Alternative, eliminate dead keys"
+msgstr "Alternativ, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:57
+msgid "Alternative, latin-9 only"
+msgstr "Alternativ, faqat latin-9"
+
+#: ../rules/base.xml.in.h:58
+msgid "And"
+msgstr "And"
+
+#: ../rules/base.xml.in.h:59
+msgid "Andorra"
+msgstr "Andora"
+
+#: ../rules/base.xml.in.h:60
+msgid "Any Alt key"
+msgstr "Er angi Alt tuşu"
+
+#: ../rules/base.xml.in.h:61
+msgid "Any Win key"
+msgstr "Er angi Pencereler (Win) tuşu"
+
+# tüklü
+#: ../rules/base.xml.in.h:62
+msgid "Any Win key (while pressed)"
+msgstr "Er angi Pencereler (Win) tuşu (basıq olğanda)"
+
+#: ../rules/base.xml.in.h:63
+msgid "Apostrophe (') variant"
+msgstr "Apostrof (') variantı"
+
+#: ../rules/base.xml.in.h:64
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:65
+msgid "Apple Laptop"
+msgstr "Apple Tizüstü"
+
+#: ../rules/base.xml.in.h:66
+msgid "Ara"
+msgstr "Ara"
+
+#: ../rules/base.xml.in.h:67
+msgid "Arabic"
+msgstr "Arapça"
+
+#: ../rules/base.xml.in.h:68
+msgid "Arm"
+msgstr "Erm"
+
+#: ../rules/base.xml.in.h:69
+msgid "Armenia"
+msgstr "Ermenistan"
+
+#: ../rules/base.xml.in.h:70
+msgid "Asturian variant with bottom-dot H and bottom-dot L"
+msgstr "Alt-noqtalı H ve alt-noqatlı L ile Asturian variant"
+
+#: ../rules/base.xml.in.h:71
+msgid "Asus Laptop"
+msgstr "Asus Tizüstü"
+
+#: ../rules/base.xml.in.h:72
+msgid "At bottom left"
+msgstr "Tüpniñ solunda"
+
+#: ../rules/base.xml.in.h:73
+msgid "At left of 'A'"
+msgstr "'A'nıñ solunda"
+
+#: ../rules/base.xml.in.h:74
+msgid "Aze"
+msgstr "Aze"
+
+#: ../rules/base.xml.in.h:75
+msgid "Azerbaijan"
+msgstr "Azerbaycan"
+
+# tüklü
+#: ../rules/base.xml.in.h:76
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 telsiz İnternet Klavyesi"
+
+#: ../rules/base.xml.in.h:77
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+# tüklü
+#: ../rules/base.xml.in.h:78
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Çoqlumüit"
+
+#: ../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 Telsiz İnternet ve Oyunlav"
+
+#: ../rules/base.xml.in.h:86
+msgid "Baltic+"
+msgstr "Baltıq+"
+
+#: ../rules/base.xml.in.h:87
+msgid "Ban"
+msgstr "Ban"
+
+#: ../rules/base.xml.in.h:88
+msgid "Bangladesh"
+msgstr "Bangladeş"
+
+#: ../rules/base.xml.in.h:89
+msgid "Bel"
+msgstr "Bel"
+
+#: ../rules/base.xml.in.h:90
+msgid "Belarus"
+msgstr "Belarus"
+
+#: ../rules/base.xml.in.h:91
+msgid "Belgium"
+msgstr "Belçika"
+
+#: ../rules/base.xml.in.h:92
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
+
+#: ../rules/base.xml.in.h:93
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:94
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
+
+#: ../rules/base.xml.in.h:95
+msgid "Bengali"
+msgstr "Bengali"
+
+#: ../rules/base.xml.in.h:96
+msgid "Bengali Probhat"
+msgstr "Bengali Probhat"
+
+#: ../rules/base.xml.in.h:97
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Bepo, ergonomik, Dvorak yolu"
+
+#: ../rules/base.xml.in.h:98
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Bepo, ergonomik, Dvorak yolu, faqat latin-9"
+
+#: ../rules/base.xml.in.h:99
+msgid "Bgr"
+msgstr "Bgr"
+
+#: ../rules/base.xml.in.h:100
+msgid "Bhu"
+msgstr "Bhu"
+
+#: ../rules/base.xml.in.h:101
+msgid "Bhutan"
+msgstr "Butan"
+
+#: ../rules/base.xml.in.h:102
+msgid "Biblical Hebrew (Tiro)"
+msgstr "İnciliy İbraniyce (Tiro)"
+
+#: ../rules/base.xml.in.h:103
+msgid "Bih"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:104
+msgid "Blr"
+msgstr "Blr"
+
+#: ../rules/base.xml.in.h:105
+msgid "Bosnia and Herzegovina"
+msgstr "Bosna-Hersek"
+
+#: ../rules/base.xml.in.h:106
+msgid "Both Alt keys together"
+msgstr "Alt tuşlarınıñ ekisi de"
+
+#: ../rules/base.xml.in.h:107
+msgid "Both Ctrl keys together"
+msgstr "Ctrl tuşlarınıñ ekisi de"
+
+#: ../rules/base.xml.in.h:108
+msgid "Both Shift keys together"
+msgstr "Shift tuşlarınıñ ekisi de"
+
+#: ../rules/base.xml.in.h:109
+msgid "Bra"
+msgstr "Bra"
+
+# tınış
+#: ../rules/base.xml.in.h:110
+msgid "Braille"
+msgstr "Körler elifbesi"
+
+#: ../rules/base.xml.in.h:111
+msgid "Brazil"
+msgstr "Brezilya"
+
+# tüklü
+#: ../rules/base.xml.in.h:112
+msgid "Breton"
+msgstr "Breton"
+
+#: ../rules/base.xml.in.h:113
+msgid "Brl"
+msgstr "Brl"
+
+#: ../rules/base.xml.in.h:114
+msgid "Brother Internet Keyboard"
+msgstr "Brother İnternet Klavyesi"
+
+#: ../rules/base.xml.in.h:115
+msgid "Buckwalter"
+msgstr "Bükvalter"
+
+#: ../rules/base.xml.in.h:116
+msgid "Bulgaria"
+msgstr "Bulgaristan"
+
+# tüklü
+#: ../rules/base.xml.in.h:117
+msgid "CRULP"
+msgstr "CRULP"
+
+#: ../rules/base.xml.in.h:118
+msgid "Cambodia"
+msgstr "Kamboçya"
+
+#: ../rules/base.xml.in.h:119
+msgid "Can"
+msgstr "Kan"
+
+#: ../rules/base.xml.in.h:120
+msgid "Canada"
+msgstr "Kanada"
+
+# tüklü
+#: ../rules/base.xml.in.h:121
+msgid "Caps Lock"
+msgstr "Caps Lock"
+
+#: ../rules/base.xml.in.h:122
+msgid "CapsLock"
+msgstr "CapsLock"
+
+#: ../rules/base.xml.in.h:123
+msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
+msgstr "CapsLock (birinci tizilimge almaştırır), Shift+CapsLock (soñkisine)"
+
+#: ../rules/base.xml.in.h:124
+msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
+msgstr "CapsLock tuşu (basıq olğanda), Alt+CapsLock asliy CapsLock amelini yapar"
+
+#: ../rules/base.xml.in.h:125
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
+msgstr "CapsLock kilitlemeli Shift kibi çalışır. Shift ise CapsLock tuşunı \"tınışlar\""
+
+#: ../rules/base.xml.in.h:126
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock"
+msgstr "CapsLock kilitlemeli Shift kibi çalışır. Shift tuşu Caps Lock davranışına tesirlemez."
+
+#: ../rules/base.xml.in.h:127
+msgid "CapsLock key behavior"
+msgstr "CapsLock tuşunıñ davranışı"
+
+# bundan alfabetik olmayan tuşlar da etkilenir.
+#: ../rules/base.xml.in.h:128
+msgid "CapsLock toggles Shift so all keys are affected"
+msgstr "CapsLock Shift davranışını tuşlarnıñ episi tesirlenecek şekilde almaştırır"
+
+# tuşu büyük/küçük harf geçişi yapar.
+#: ../rules/base.xml.in.h:129
+msgid "CapsLock toggles normal capitalization of alphabetic characters"
+msgstr "CapsLock elifbe remizleriniñ normal başlaştırılmasını almaştırır"
+
+#: ../rules/base.xml.in.h:130
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
+msgstr "CapsLock içki başlaştırmanı qullanır. Shift CapsLock tuşunı \"tınışlar\""
+
+#: ../rules/base.xml.in.h:131
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
+msgstr "CapsLock içki başlaştırmanı qullanır. Shift CapsLock davranışına tesirlemez."
+
+#: ../rules/base.xml.in.h:132
+msgid "Catalan variant with middle-dot L"
+msgstr "Ortası noqtalı L'li Katalan yerleşimi"
+
+#: ../rules/base.xml.in.h:133
+msgid "Cedilla"
+msgstr "Sedilla"
+
+#: ../rules/base.xml.in.h:134
+msgid "Che"
+msgstr "Che"
+
+#: ../rules/base.xml.in.h:135
+msgid "Cherokee"
+msgstr "Çeroki"
+
+#: ../rules/base.xml.in.h:136
+msgid "Cherry B.UNLIMITED"
+msgstr "Cherry B.UNLIMITED"
+
+#: ../rules/base.xml.in.h:137
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:138
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (diğer seçenek)"
+
+#: ../rules/base.xml.in.h:139
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:140
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Expert"
+
+#: ../rules/base.xml.in.h:141
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:142
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
+
+#: ../rules/base.xml.in.h:143
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony İnternet Klavyesi"
+
+#: ../rules/base.xml.in.h:144
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:145
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
+
+#: ../rules/base.xml.in.h:146
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0420"
+
+#: ../rules/base.xml.in.h:147
+msgid "China"
+msgstr "Çin"
+
+#: ../rules/base.xml.in.h:148
+msgid "Chuvash"
+msgstr "Çuvaşça"
+
+#: ../rules/base.xml.in.h:149
+msgid "Chuvash Latin"
+msgstr "Çuvaşça Latin"
+
+#: ../rules/base.xml.in.h:150
+msgid "Classic"
+msgstr "Klassik"
+
+#: ../rules/base.xml.in.h:151
+msgid "Classic Dvorak"
+msgstr "Klassik Dvorak"
+
+#: ../rules/base.xml.in.h:152
+msgid "Classmate PC"
+msgstr "Classmate Şahsiy Bilgisayar (PC)"
+
+#: ../rules/base.xml.in.h:153
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:154
+msgid "Colemak"
+msgstr "Colemak"
+
+#: ../rules/base.xml.in.h:155
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Kolay Erişim Klavyesi"
+
+#: ../rules/base.xml.in.h:156
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq İnternet Klavyesi (13 tuşlu)"
+
+#: ../rules/base.xml.in.h:157
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq İnternet Klavyesi (18 tuşlu)"
+
+#: ../rules/base.xml.in.h:158
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "İnternet Klavyesi (7 tuşlu)"
+
+#: ../rules/base.xml.in.h:159
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Klavyesi"
+
+#: ../rules/base.xml.in.h:160
+msgid "Compose key position"
+msgstr "Telif (Compose) tuşu qonumı"
+
+#: ../rules/base.xml.in.h:161
+msgid "Congo, Democratic Republic of the"
+msgstr "Kongo Demokratik Cumhuriyeti"
+
+#: ../rules/base.xml.in.h:162
+msgid "Control + Alt + Backspace"
+msgstr "Control + Alt + Kerisilme"
+
+#: ../rules/base.xml.in.h:163
+msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
+msgstr "Control (Muraqabe), Alt tuşlarına haritalandırılır, Alt ise Pencereler (Win) tuşlarına haritalandırılır"
+
+#: ../rules/base.xml.in.h:164
+msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
+msgstr "Control (Muraqabe), Pencereler (Win) tuşlarına (ve adetiy Ctrl tuşlarına) haritalandırılır"
+
+#: ../rules/base.xml.in.h:165
+msgid "Crimean Tatar (Dobruca-1 Q)"
+msgstr "Qırımtatarca (Dobruca-1 Q)"
+
+#: ../rules/base.xml.in.h:166
+msgid "Crimean Tatar (Dobruca-2 Q)"
+msgstr "Qırımtatarca (Dobruca-2 Q)"
+
+#: ../rules/base.xml.in.h:167
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Qırımtatarca (Türkçe Alt-Q)"
+
+#: ../rules/base.xml.in.h:168
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Qırımtatarca (Türkçe F)"
+
+#: ../rules/base.xml.in.h:169
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Qırımtatarca (Türkçe Q)"
+
+#: ../rules/base.xml.in.h:170
+msgid "Croatia"
+msgstr "Hırvatistan"
+
+#: ../rules/base.xml.in.h:171
+msgid "Ctrl key position"
+msgstr "Ctrl tuşunıñ mevamı"
+
+#: ../rules/base.xml.in.h:172
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
+
+#: ../rules/base.xml.in.h:173
+msgid "Cyrillic"
+msgstr "Kiril"
+
+#: ../rules/base.xml.in.h:174
+msgid "Cyrillic with guillemets"
+msgstr "Köşeli qavuslarnen Kiril"
+
+#: ../rules/base.xml.in.h:175
+msgid "Cyrillic, Z and ZHE swapped"
+msgstr "Kiril, Z ile J almaştırılğan"
+
+#: ../rules/base.xml.in.h:176
+msgid "Cze"
+msgstr "Çek"
+
+#: ../rules/base.xml.in.h:177
+msgid "Czechia"
+msgstr "Çek Cumhuriyeti"
+
+#: ../rules/base.xml.in.h:178
+msgid "DOS"
+msgstr "DOS"
+
+#: ../rules/base.xml.in.h:179
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:180
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:181
+msgid "Dan"
+msgstr "Dan"
+
+#: ../rules/base.xml.in.h:182
+msgid "Dead acute"
+msgstr "Ölü acute (´)"
+
+#: ../rules/base.xml.in.h:183
+msgid "Dead grave acute"
+msgstr "Ölü grave acute (`)"
+
+#: ../rules/base.xml.in.h:184
+msgid "Default numeric keypad keys"
+msgstr "Ög-belgilengen sayısal tuştaqımı tuşları"
+
+#: ../rules/base.xml.in.h:185
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:186
+msgid "Dell 101-key PC"
+msgstr "Dell 101 tuşlu PC"
+
+#: ../rules/base.xml.in.h:187
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Tizüstü/defter Dell Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:188
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell Tizüstü/defter Precision M series"
+
+#: ../rules/base.xml.in.h:189
+msgid "Dell Latitude series laptop"
+msgstr "Dell Latitude serisi Tizüstü"
+
+#: ../rules/base.xml.in.h:190
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
+
+#: ../rules/base.xml.in.h:191
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
+
+#: ../rules/base.xml.in.h:192
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
+
+# tüklü
+#: ../rules/base.xml.in.h:193
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Dell USB Çoqlumüit Klavyesi"
+
+#: ../rules/base.xml.in.h:194
+msgid "Denmark"
+msgstr "Danimarka"
+
+#: ../rules/base.xml.in.h:195
+msgid "Deu"
+msgstr "Alm"
+
+#: ../rules/base.xml.in.h:196
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Kablosuz Masaüstü Klavyesi"
+
+#: ../rules/base.xml.in.h:197
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 serileri"
+
+#: ../rules/base.xml.in.h:198
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:199
+msgid "Dvorak (UK Punctuation)"
+msgstr "Dvorak (Birleşken Qırallıq Noqtalaması)"
+
+#: ../rules/base.xml.in.h:200
+msgid "Dvorak international"
+msgstr "Dvorak milletlerara"
+
+#: ../rules/base.xml.in.h:201
+#, fuzzy
+msgid "Dvorak, Polish quotes on key 1"
+msgstr "Dvorak, \"1/!\" tuşunda Lehçe tırnaqlar"
+
+#: ../rules/base.xml.in.h:202
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorak, tırnaq-tamğası tuşunda Lehçe tırnaqlar"
+
+#: ../rules/base.xml.in.h:203
+msgid "E"
+msgstr "E"
+
+#: ../rules/base.xml.in.h:204
+msgid "Eastern"
+msgstr "Şarqiy"
+
+#: ../rules/base.xml.in.h:205
+msgid "Eliminate dead keys"
+msgstr "Ölü tuşları normal yapar"
+
+#: ../rules/base.xml.in.h:206
+msgid "Enable extra typographic characters"
+msgstr "Ziyade matbaa remizlerini qabilleştir"
+
+#: ../rules/base.xml.in.h:207
+msgid "English"
+msgstr "İnglizce"
+
+#: ../rules/base.xml.in.h:208
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:209
+msgid "Enter on keypad"
+msgstr "Tuştaqımında kirsetilsin"
+
+#: ../rules/base.xml.in.h:210
+msgid "Epo"
+msgstr "Epo"
+
+#: ../rules/base.xml.in.h:211
+msgid "Ergonomic"
+msgstr "Ergonomik"
+
+#: ../rules/base.xml.in.h:212
+msgid "Esp"
+msgstr "Esp"
+
+#: ../rules/base.xml.in.h:213
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../rules/base.xml.in.h:214
+msgid "Est"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:215
+msgid "Estonia"
+msgstr "Estonya"
+
+#: ../rules/base.xml.in.h:216
+msgid "Eth"
+msgstr "Ety"
+
+#: ../rules/base.xml.in.h:217
+msgid "Ethiopia"
+msgstr "Habeşistan"
+
+#: ../rules/base.xml.in.h:218
+msgid "Evdev-managed keyboard"
+msgstr "Evdev yönetimli klavye"
+
+#: ../rules/base.xml.in.h:219
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:220
+msgid "Ewe"
+msgstr "Eve"
+
+#: ../rules/base.xml.in.h:221
+msgid "Extended"
+msgstr "Uzatılğan"
+
+#: ../rules/base.xml.in.h:222
+msgid "Extended - Winkeys"
+msgstr "Uzatılğan - Win-tuşları"
+
+#: ../rules/base.xml.in.h:223
+msgid "Extended Backslash"
+msgstr "Uzatılğan Kerisilme"
+
+#: ../rules/base.xml.in.h:224
+msgid "F-letter (F) variant"
+msgstr "F harfli (F) türü"
+
+#: ../rules/base.xml.in.h:225
+msgid "FL90"
+msgstr "FL90"
+
+#: ../rules/base.xml.in.h:226
+msgid "Fao"
+msgstr "Fao"
+
+#: ../rules/base.xml.in.h:227
+msgid "Faroe Islands"
+msgstr "Faroe Adaları"
+
+#: ../rules/base.xml.in.h:228
+msgid "Fin"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:229
+msgid "Finland"
+msgstr "Finlandiya"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:232
+msgid "Four-level key with abstract separators"
+msgstr "Mücerret ayırğıçlarnen dördünci seviye tuşu"
+
+#: ../rules/base.xml.in.h:233
+msgid "Four-level key with comma"
+msgstr "Virgülnen dördünci seviye tuşu"
+
+#: ../rules/base.xml.in.h:234
+msgid "Four-level key with dot"
+msgstr "Noqtanen dördünci seviye tuşu"
+
+#: ../rules/base.xml.in.h:235
+msgid "Four-level key with dot, latin-9 restriction"
+msgstr "Noqtanen dördünci seviye tuşu, latin-9 sıñırlaması"
+
+#: ../rules/base.xml.in.h:236
+msgid "Four-level key with momayyez"
+msgstr "Momayyez ile dördünci seviye tuşu"
+
+#: ../rules/base.xml.in.h:237
+msgid "Fra"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:238
+msgid "France"
+msgstr "Fransa"
+
+#: ../rules/base.xml.in.h:239
+msgid "French"
+msgstr "Fransızca"
+
+#: ../rules/base.xml.in.h:240
+msgid "French (Macintosh)"
+msgstr "Fransız (Makintoş)"
+
+#: ../rules/base.xml.in.h:241
+msgid "French (legacy)"
+msgstr "Fransızca (qadim)"
+
+#: ../rules/base.xml.in.h:242
+msgid "French Dvorak"
+msgstr "Fransızca Dvorak"
+
+#: ../rules/base.xml.in.h:243
+msgid "French, Sun dead keys"
+msgstr "Fransızca, Sun ölü tuşlar"
+
+#: ../rules/base.xml.in.h:244
+msgid "French, eliminate dead keys"
+msgstr "Fransızca, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:245
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Fujitsu-Siemens Bilgisayarları AMILO tizüstü"
+
+#: ../rules/base.xml.in.h:246
+msgid "Fula"
+msgstr "Fula"
+
+#: ../rules/base.xml.in.h:247
+msgid "GBr"
+msgstr "GBr"
+
+#: ../rules/base.xml.in.h:248
+msgid "Ga"
+msgstr "Ga"
+
+#: ../rules/base.xml.in.h:249
+msgid "Generic 101-key PC"
+msgstr "Soysal 101 tuşlu PC"
+
+#: ../rules/base.xml.in.h:250
+msgid "Generic 102-key (Intl) PC"
+msgstr "Soysal 102 tuşlu (Uluslararası) PC"
+
+#: ../rules/base.xml.in.h:251
+msgid "Generic 104-key PC"
+msgstr "Soysal 104 tuşlu PC"
+
+#: ../rules/base.xml.in.h:252
+msgid "Generic 105-key (Intl) PC"
+msgstr "Soysal 105 tuşlu (uluslararası) PC"
+
+#: ../rules/base.xml.in.h:253
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:254
+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:255
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:256
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:257
+msgid "Genius KKB-2050HS"
+msgstr "Genius KKB-2050HS"
+
+#: ../rules/base.xml.in.h:258
+msgid "Geo"
+msgstr "Geo"
+
+#: ../rules/base.xml.in.h:259
+msgid "Georgia"
+msgstr "Gürcistan"
+
+#: ../rules/base.xml.in.h:260
+msgid "Georgian"
+msgstr "Gürci"
+
+#: ../rules/base.xml.in.h:261
+msgid "Georgian AZERTY Tskapo"
+msgstr "Gürci AZERTY Tskapo"
+
+#: ../rules/base.xml.in.h:262
+msgid "German (Macintosh)"
+msgstr "Alman (Makintoş)"
+
+#: ../rules/base.xml.in.h:263
+msgid "German, Sun dead keys"
+msgstr "Almanca, Sun ölü tuşlar"
+
+#: ../rules/base.xml.in.h:264
+msgid "German, eliminate dead keys"
+msgstr "Almanca, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:265
+msgid "Germany"
+msgstr "Almanya"
+
+#: ../rules/base.xml.in.h:266
+msgid "Gha"
+msgstr "Gha"
+
+#: ../rules/base.xml.in.h:267
+msgid "Ghana"
+msgstr "Gana"
+
+#: ../rules/base.xml.in.h:268
+msgid "Gre"
+msgstr "Gre"
+
+#: ../rules/base.xml.in.h:269
+msgid "Greece"
+msgstr "Yunanistan"
+
+#: ../rules/base.xml.in.h:270
+msgid "Group toggle on multiply/divide key"
+msgstr "Arttır/Böl tuşu üzerine zümreni almaştır"
+
+#: ../rules/base.xml.in.h:271
+msgid "Gui"
+msgstr "Qıllanıcı Arayüzü (Gui)"
+
+#: ../rules/base.xml.in.h:272
+msgid "Guinea"
+msgstr "Gine"
+
+#: ../rules/base.xml.in.h:273
+msgid "Gujarati"
+msgstr "Batı Hint dili"
+
+#: ../rules/base.xml.in.h:274
+msgid "Gurmukhi"
+msgstr "Gurmuki"
+
+#: ../rules/base.xml.in.h:275
+msgid "Gurmukhi Jhelum"
+msgstr "Gurmuki Jhelum"
+
+#: ../rules/base.xml.in.h:276
+msgid "Gyration"
+msgstr "Çekimsel"
+
+#: ../rules/base.xml.in.h:277
+msgid "Happy Hacking Keyboard"
+msgstr "Happy Hacking Klavyesi"
+
+#: ../rules/base.xml.in.h:278
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Mac içün Happy Hacking Klavyesi"
+
+#: ../rules/base.xml.in.h:279
+msgid "Hausa"
+msgstr "Havza"
+
+#: ../rules/base.xml.in.h:280
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard İnternet Klavyesi"
+
+#: ../rules/base.xml.in.h:281
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:282
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:283
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:284
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:285
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:286
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:287
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:288
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
+
+#: ../rules/base.xml.in.h:289
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-250x Çoqlumüit Klavyesi"
+
+#: ../rules/base.xml.in.h:290
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
+
+# tüklü
+#: ../rules/base.xml.in.h:291
+msgid "Hexadecimal"
+msgstr "Onaltıdalıq"
+
+#: ../rules/base.xml.in.h:292
+msgid "Hindi Bolnagri"
+msgstr "Hindce Bolnagri"
+
+#: ../rules/base.xml.in.h:293
+msgid "Hindi Wx"
+msgstr "Hindce Wx"
+
+#: ../rules/base.xml.in.h:294
+msgid "Homophonic"
+msgstr "Davuştaş (Homophonic)"
+
+#: ../rules/base.xml.in.h:295
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:296
+msgid "Hrv"
+msgstr "Hrv"
+
+#: ../rules/base.xml.in.h:297
+msgid "Hun"
+msgstr "Mcr"
+
+#: ../rules/base.xml.in.h:298
+msgid "Hungary"
+msgstr "Macaristan"
+
+#: ../rules/base.xml.in.h:299
+msgid "Hyper is mapped to Win-keys"
+msgstr "Hyper, Pencereler-tuşlarına (Win) haritalandırılır"
+
+#: ../rules/base.xml.in.h:300
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:301
+msgid "IBM Rapid Access"
+msgstr "IBM Hızlı Erişim"
+
+#: ../rules/base.xml.in.h:302
+msgid "IBM Rapid Access II"
+msgstr "IBM Hızlı Erişim II"
+
+#: ../rules/base.xml.in.h:303
+msgid "IBM Space Saver"
+msgstr "IBM Feza Saqlayıcı (Space Saver)"
+
+#: ../rules/base.xml.in.h:304
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:305
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+
+#: ../rules/base.xml.in.h:306
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
+
+#: ../rules/base.xml.in.h:307
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+
+#: ../rules/base.xml.in.h:308
+msgid "ISO Alternate"
+msgstr "ISO diğer"
+
+#: ../rules/base.xml.in.h:309
+msgid "Iceland"
+msgstr "İzlanda"
+
+#: ../rules/base.xml.in.h:310
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../rules/base.xml.in.h:311
+msgid "Include dead tilde"
+msgstr "Ölü tildeni kirset"
+
+#: ../rules/base.xml.in.h:312
+msgid "Ind"
+msgstr "Ind"
+
+#: ../rules/base.xml.in.h:313
+msgid "India"
+msgstr "Hindistan"
+
+#: ../rules/base.xml.in.h:314
+msgid "International (AltGr dead keys)"
+msgstr "Milletlerara (AltGr ölü tuşlarınen)"
+
+#: ../rules/base.xml.in.h:315
+msgid "International (with dead keys)"
+msgstr "Milletlerara (ölü tuşlarnen)"
+
+#: ../rules/base.xml.in.h:316
+msgid "Inuktitut"
+msgstr "Inuktitut"
+
+#: ../rules/base.xml.in.h:317
+msgid "Iran"
+msgstr "İran"
+
+#: ../rules/base.xml.in.h:318
+msgid "Iraq"
+msgstr "Irak"
+
+#: ../rules/base.xml.in.h:319
+msgid "Ireland"
+msgstr "İrlanda"
+
+#: ../rules/base.xml.in.h:320
+msgid "Irl"
+msgstr "İrl"
+
+#: ../rules/base.xml.in.h:321
+msgid "Irn"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:322
+msgid "Irq"
+msgstr "Irk"
+
+#: ../rules/base.xml.in.h:323
+msgid "Isl"
+msgstr "Izl"
+
+#: ../rules/base.xml.in.h:324
+msgid "Isr"
+msgstr "İbr"
+
+#: ../rules/base.xml.in.h:325
+msgid "Israel"
+msgstr "İsrail"
+
+#: ../rules/base.xml.in.h:326
+msgid "Ita"
+msgstr "İta"
+
+#: ../rules/base.xml.in.h:327
+msgid "Italy"
+msgstr "İtalya"
+
+#: ../rules/base.xml.in.h:328
+msgid "Japan"
+msgstr "Japonya"
+
+#: ../rules/base.xml.in.h:329
+msgid "Japan (PC-98xx Series)"
+msgstr "Japon (PC-98xx Series)"
+
+#: ../rules/base.xml.in.h:330
+msgid "Japanese keyboard options"
+msgstr "Japonca klavye ihtiyariyatı"
+
+#: ../rules/base.xml.in.h:331
+msgid "Jpn"
+msgstr "Jpn"
+
+#: ../rules/base.xml.in.h:332
+msgid "Kalmyk"
+msgstr "Qalmıqça"
+
+#: ../rules/base.xml.in.h:333
+msgid "Kana"
+msgstr "Kana"
+
+#: ../rules/base.xml.in.h:334
+msgid "Kana Lock key is locking"
+msgstr "Kana Lock tuşu kilitler"
+
+#: ../rules/base.xml.in.h:335
+msgid "Kannada"
+msgstr "Güney Hint dili"
+
+#: ../rules/base.xml.in.h:336
+msgid "Kashubian"
+msgstr "Kaşubyalı"
+
+#: ../rules/base.xml.in.h:337
+msgid "Kaz"
+msgstr "Kaz"
+
+#: ../rules/base.xml.in.h:338
+msgid "Kazakh with Russian"
+msgstr "Kazak (rus)"
+
+#: ../rules/base.xml.in.h:339
+msgid "Kazakhstan"
+msgstr "Kazakistan"
+
+# # tüklü
+#: ../rules/base.xml.in.h:340
+msgid "Key sequence to kill the X server"
+msgstr "X sunucısını öldürmek içün tuş silsilesi"
+
+#: ../rules/base.xml.in.h:341
+msgid "Key to choose 3rd level"
+msgstr "3. seviyeni saylaycaq tuş"
+
+#: ../rules/base.xml.in.h:342
+msgid "Key(s) to change layout"
+msgstr "Tizilimni deñiştirecek tuş(lar)"
+
+#: ../rules/base.xml.in.h:343
+msgid "Keypad"
+msgstr "Tuştaqımı"
+
+#: ../rules/base.xml.in.h:344
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:345
+msgid "Kgz"
+msgstr "Kgz"
+
+#: ../rules/base.xml.in.h:346
+msgid "Khm"
+msgstr "Kım"
+
+#: ../rules/base.xml.in.h:347
+msgid "Komi"
+msgstr "Komice"
+
+#: ../rules/base.xml.in.h:348
+msgid "Kor"
+msgstr "Kor"
+
+#: ../rules/base.xml.in.h:349
+msgid "Korea, Republic of"
+msgstr "Kore Cumhuriyeti"
+
+# tüklü
+#: ../rules/base.xml.in.h:350
+msgid "Ktunaxa"
+msgstr "Ktunaxa"
+
+#: ../rules/base.xml.in.h:351
+msgid "Kurdish, (F)"
+msgstr "Kürtçe (Türkçe F klavye)"
+
+#: ../rules/base.xml.in.h:352
+msgid "Kurdish, Arabic-Latin"
+msgstr "Kürtçe (Arapça-Latin)"
+
+#: ../rules/base.xml.in.h:353
+msgid "Kurdish, Latin Alt-Q"
+msgstr "Kürtçe (Türkçe Alt-Q klavye)"
+
+#: ../rules/base.xml.in.h:354
+msgid "Kurdish, Latin Q"
+msgstr "Kürtçe (Türkçe Q klavye)"
+
+#: ../rules/base.xml.in.h:355
+msgid "Kyrgyzstan"
+msgstr "Kırgızistan"
+
+#: ../rules/base.xml.in.h:356
+msgid "LAm"
+msgstr "LAm"
+
+# tüklü
+#: ../rules/base.xml.in.h:357
+msgid "LEKP"
+msgstr "LEKP"
+
+#: ../rules/base.xml.in.h:358
+msgid "LEKPa"
+msgstr "LEKPa"
+
+#: ../rules/base.xml.in.h:359
+msgid "Lao"
+msgstr "Lao"
+
+#: ../rules/base.xml.in.h:360
+msgid "Laos"
+msgstr "Laos"
+
+#: ../rules/base.xml.in.h:361
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Tizüstü/defter Compaq (örn. Armada) Tizüstü Klavyesi"
+
+#: ../rules/base.xml.in.h:362
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Tizüstü/defter Compaq (örn. Presario) İnternet Klavyesi"
+
+#: ../rules/base.xml.in.h:363
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Tizüstü/defter eMachines m68xx"
+
+#: ../rules/base.xml.in.h:364
+msgid "Latin"
+msgstr "Latin"
+
+#: ../rules/base.xml.in.h:365
+msgid "Latin American"
+msgstr "Latin Amerikan"
+
+#: ../rules/base.xml.in.h:366
+msgid "Latin Unicode"
+msgstr "Latin Unicode"
+
+#: ../rules/base.xml.in.h:367
+msgid "Latin Unicode qwerty"
+msgstr "Latin Unicode qwerty"
+
+#: ../rules/base.xml.in.h:368
+msgid "Latin qwerty"
+msgstr "Latin qwerty"
+
+#: ../rules/base.xml.in.h:369
+msgid "Latin unicode"
+msgstr "Latin unikod"
+
+#: ../rules/base.xml.in.h:370
+msgid "Latin unicode qwerty"
+msgstr "Latin unikod qwerty"
+
+#: ../rules/base.xml.in.h:371
+msgid "Latin with guillemets"
+msgstr "Açılı ayraçlarla Latin"
+
+#: ../rules/base.xml.in.h:372
+msgid "Latvia"
+msgstr "Letonya"
+
+#: ../rules/base.xml.in.h:373
+msgid "Lav"
+msgstr "Lav"
+
+#: ../rules/base.xml.in.h:374
+msgid "Left Alt"
+msgstr "Sol Alt"
+
+#: ../rules/base.xml.in.h:375
+msgid "Left Alt (while pressed)"
+msgstr "Sol Alt tuşu (basıq olğanda)"
+
+#: ../rules/base.xml.in.h:376
+msgid "Left Alt is swapped with Left Win"
+msgstr "Sol Alt tuşu, sol Pencereler (Win) tuşunen almaştırılır"
+
+#: ../rules/base.xml.in.h:377
+msgid "Left Ctrl"
+msgstr "Sol Ctrl"
+
+#: ../rules/base.xml.in.h:378
+msgid "Left Ctrl+Left Shift"
+msgstr "Sol Ctrl+Sol Shift"
+
+#: ../rules/base.xml.in.h:379
+msgid "Left Shift"
+msgstr "Sol Shift"
+
+#: ../rules/base.xml.in.h:380
+msgid "Left Win"
+msgstr "Sol Win"
+
+#: ../rules/base.xml.in.h:381
+msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgstr "Sol Pencereler (Win) (birinci tizilimge almaştırır), Sağ Pencereler/Menü (soñkisine)"
+
+#: ../rules/base.xml.in.h:382
+msgid "Left Win (while pressed)"
+msgstr "Sol Pencereler (Win) tuşu (basıq olğanda)"
+
+#: ../rules/base.xml.in.h:383
+msgid "Left hand"
+msgstr "Solak"
+
+#: ../rules/base.xml.in.h:384
+msgid "Left handed Dvorak"
+msgstr "Solak Dvorak"
+
+#: ../rules/base.xml.in.h:385
+msgid "Legacy"
+msgstr "Qadim"
+
+#: ../rules/base.xml.in.h:386
+msgid "Legacy Wang 724"
+msgstr "Qadim Wang 724"
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:388
+msgid "Legacy key with comma"
+msgstr "Virgülnen qadim tuş"
+
+#: ../rules/base.xml.in.h:389
+msgid "Legacy key with dot"
+msgstr "Noqtanen qadim tuş"
+
+#: ../rules/base.xml.in.h:390
+msgid "Less-than/Greater-than"
+msgstr "Daa kiçik/Daa büyük"
+
+#: ../rules/base.xml.in.h:391
+msgid "Lithuania"
+msgstr "Litvanya"
+
+#: ../rules/base.xml.in.h:392
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
+
+#: ../rules/base.xml.in.h:393
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Kabelsiz Masaüstü"
+
+# tüklü
+#: ../rules/base.xml.in.h:394
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Kabelsiz Masaüstü (alternativ ihtiyariyat)"
+
+#: ../rules/base.xml.in.h:395
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Kabelsiz Masaüstü EX110"
+
+#: ../rules/base.xml.in.h:396
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Kablosuz Masaüstü LX-300"
+
+#: ../rules/base.xml.in.h:397
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Kablosuz Masaüstü Yürsetici"
+
+#: ../rules/base.xml.in.h:398
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Kablosuz Masaüstü Optik"
+
+#: ../rules/base.xml.in.h:399
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgstr "Logitech Kabelsiz Masaüstü Pro (almaşıq ihtiyar 2)"
+
+#: ../rules/base.xml.in.h:400
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Kablosuz Masaüstü iTouch"
+
+#: ../rules/base.xml.in.h:401
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Kablosuz Özgür/Masaüstü Yürsetici"
+
+#: ../rules/base.xml.in.h:402
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15, G15daemon üzerinden ek tuşlu"
+
+#: ../rules/base.xml.in.h:403
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech Umumiy Klavyesi"
+
+#: ../rules/base.xml.in.h:404
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech İnternet 350 Klavyesi"
+
+#: ../rules/base.xml.in.h:405
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech İnternet Klavyesi"
+
+#: ../rules/base.xml.in.h:406
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech İnternet Yürsetici Klavyesi"
+
+#: ../rules/base.xml.in.h:407
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Vasta Elit Klavye"
+
+#: ../rules/base.xml.in.h:408
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Logitech Ultra-X Kabelsiz Vasta Masaüstü Klavyesi"
+
+#: ../rules/base.xml.in.h:409
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
+
+#: ../rules/base.xml.in.h:410
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge Klavyesi"
+
+#: ../rules/base.xml.in.h:411
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech Access Klavye"
+
+#: ../rules/base.xml.in.h:412
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:413
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Kablosuz Klavyesi (model Y-RB6)"
+
+#: ../rules/base.xml.in.h:414
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch İnternet Yürsetici Klavyesi SE"
+
+#: ../rules/base.xml.in.h:415
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch İnternet Yürsetici Klavyesi SE (USB)"
+
+# tüklü
+#: ../rules/base.xml.in.h:416
+msgid "Lower Sorbian"
+msgstr "Alt Sorbian"
+
+#: ../rules/base.xml.in.h:417
+msgid "Lower Sorbian (qwertz)"
+msgstr "Alt Sorbian (qwertz)"
+
+#: ../rules/base.xml.in.h:418
+msgid "Ltu"
+msgstr "Ltu"
+
+#: ../rules/base.xml.in.h:419
+msgid "MESS"
+msgstr "MESS"
+
+# tüklü
+#: ../rules/base.xml.in.h:420
+msgid "MNE"
+msgstr "MNE"
+
+#: ../rules/base.xml.in.h:421
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
+
+#: ../rules/base.xml.in.h:422
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (Milletlerara)"
+
+#: ../rules/base.xml.in.h:423
+msgid "Macedonia"
+msgstr "Makedonya"
+
+#: ../rules/base.xml.in.h:424
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:425
+msgid "Macintosh Old"
+msgstr "Eski Macintosh"
+
+#: ../rules/base.xml.in.h:426
+msgid "Macintosh, Sun dead keys"
+msgstr "Makintoş, Sun ölü tuşlar"
+
+#: ../rules/base.xml.in.h:427
+msgid "Macintosh, eliminate dead keys"
+msgstr "Makintoş, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:428
+msgid "Make CapsLock an additional Backspace"
+msgstr "CapsLock tuşunı ek bir Kerisilme (Backspace) yap"
+
+#: ../rules/base.xml.in.h:429
+msgid "Make CapsLock an additional Ctrl"
+msgstr "CapsLock tuşunı ek bir Ctrl yap"
+
+#: ../rules/base.xml.in.h:430
+msgid "Make CapsLock an additional ESC"
+msgstr "CapsLock tuşunı ek bir ESC yap"
+
+#: ../rules/base.xml.in.h:431
+msgid "Mal"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:432
+msgid "Malayalam"
+msgstr "Malayalam tili"
+
+#: ../rules/base.xml.in.h:433
+msgid "Malayalam Lalitha"
+msgstr "Malayalam Lalitha tili"
+
+#: ../rules/base.xml.in.h:434
+msgid "Maldives"
+msgstr "Maldivler"
+
+#: ../rules/base.xml.in.h:435
+msgid "Malta"
+msgstr "Malta"
+
+#: ../rules/base.xml.in.h:436
+msgid "Maltese keyboard with US layout"
+msgstr "Ameriken yerleşimli Maltız klavyesi"
+
+#: ../rules/base.xml.in.h:437
+msgid "Mao"
+msgstr "Mao"
+
+#: ../rules/base.xml.in.h:438
+msgid "Maori"
+msgstr "Mayorka"
+
+#: ../rules/base.xml.in.h:439
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:440
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ Erişim Klavyesi"
+
+#: ../rules/base.xml.in.h:441
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:442
+msgid "Menu"
+msgstr "Menü"
+
+#: ../rules/base.xml.in.h:443
+msgid "Meta is mapped to Left Win"
+msgstr "Meta, sol Pencereler tuşuna (Win) haritalandırılır"
+
+#: ../rules/base.xml.in.h:444
+msgid "Meta is mapped to Win keys"
+msgstr "Meta, Pencereler tuşlarına (Win) haritalandırılır"
+
+#: ../rules/base.xml.in.h:445
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Comfort Curve Keyboard 2000"
+
+#: ../rules/base.xml.in.h:446
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft İnternet Klavyesi"
+
+#: ../rules/base.xml.in.h:447
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft İnternet Klavyesi Pro, İsveçce"
+
+#: ../rules/base.xml.in.h:448
+msgid "Microsoft Natural"
+msgstr "Microsoft Basit"
+
+#: ../rules/base.xml.in.h:449
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Tabiiy Klavye Elit"
+
+#: ../rules/base.xml.in.h:450
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Basit Klavye Pro / Microsoft İnternet Klavyesi Pro"
+
+#: ../rules/base.xml.in.h:451
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Basit Klavye Pro OEM"
+
+#: ../rules/base.xml.in.h:452
+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:453
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Microsoft Tabiiy Telsiz Ergonomik Klavye 7000"
+
+#: ../rules/base.xml.in.h:454
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Ofis Klavyesi"
+
+#: ../rules/base.xml.in.h:455
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+
+#: ../rules/base.xml.in.h:456
+msgid "Miscellaneous compatibility options"
+msgstr "Müteferriq telif qabiliyeti ihtiyariyatı"
+
+#: ../rules/base.xml.in.h:457
+msgid "Mkd"
+msgstr "Mkd"
+
+#: ../rules/base.xml.in.h:458
+msgid "Mlt"
+msgstr "Mlt"
+
+#: ../rules/base.xml.in.h:459
+msgid "Mmr"
+msgstr "Mmr"
+
+#: ../rules/base.xml.in.h:460
+msgid "Mng"
+msgstr "Moğ"
+
+#: ../rules/base.xml.in.h:461
+msgid "Mongolia"
+msgstr "Moğolistan"
+
+#: ../rules/base.xml.in.h:462
+msgid "Montenegro"
+msgstr "Qaradağ"
+
+#: ../rules/base.xml.in.h:463
+msgid "Morocco"
+msgstr "Fas"
+
+#: ../rules/base.xml.in.h:464
+msgid "Multilingual"
+msgstr "Çokdilli"
+
+#: ../rules/base.xml.in.h:465
+msgid "Multilingual, first part"
+msgstr "Çokdilli, ilk bölüm"
+
+#: ../rules/base.xml.in.h:466
+msgid "Multilingual, second part"
+msgstr "Çokdilli, ikinci bölüm"
+
+#: ../rules/base.xml.in.h:467
+msgid "Myanmar"
+msgstr "Miyanmar"
+
+#: ../rules/base.xml.in.h:468
+msgid "NICOLA-F style Backspace"
+msgstr "NICOLA-F uslûbı Kerisilme"
+
+#: ../rules/base.xml.in.h:469
+msgid "NLA"
+msgstr "NLA"
+
+# tüklü
+#: ../rules/base.xml.in.h:470
+msgid "Nativo"
+msgstr "Nativo"
+
+#: ../rules/base.xml.in.h:471
+msgid "Nativo for Esperanto"
+msgstr "Esperanto içün Nativo"
+
+#: ../rules/base.xml.in.h:472
+msgid "Nativo for USA keyboards"
+msgstr "AQŞ klavyeleri içün Nativo"
+
+#: ../rules/base.xml.in.h:473
+msgid "Neo 2"
+msgstr "Neo 2"
+
+#: ../rules/base.xml.in.h:474
+msgid "Nep"
+msgstr "Nep"
+
+#: ../rules/base.xml.in.h:475
+msgid "Nepal"
+msgstr "Nepal"
+
+#: ../rules/base.xml.in.h:476
+msgid "Netherlands"
+msgstr "Hollanda"
+
+#: ../rules/base.xml.in.h:477
+msgid "Nig"
+msgstr "Nij"
+
+#: ../rules/base.xml.in.h:478
+msgid "Nigeria"
+msgstr "Nijerya"
+
+#: ../rules/base.xml.in.h:479
+msgid "Nld"
+msgstr "Hol"
+
+#: ../rules/base.xml.in.h:480
+msgid "Non-breakable space character at fourth level"
+msgstr "Dördünci seviyede qırılamaz boşluq remzi"
+
+#: ../rules/base.xml.in.h:481
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Dördünci seviyede qırılamaz boşluq remzi, altıncı seviyede ise ince qırılamaz boşluq remzi"
+
+#: ../rules/base.xml.in.h:482
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
+msgstr "Dördünci seviyede qırılamaz boşluq remzi, altıncı seviyede ise ince qırılamaz boşluq remzi (Ctrl+Shift vastasınen)"
+
+#: ../rules/base.xml.in.h:483
+msgid "Non-breakable space character at second level"
+msgstr "Ekinci seviyede qırılamaz boşluq remzi"
+
+#: ../rules/base.xml.in.h:484
+msgid "Non-breakable space character at third level"
+msgstr "Üçünci seviyede qırılamaz boşluq remzi"
+
+#: ../rules/base.xml.in.h:485
+msgid "Non-breakable space character at third level, nothing at fourth level"
+msgstr "Üçünci seviyede qırılamaz boşluq remzi, dördünci seviyede iç bir şey"
+
+#: ../rules/base.xml.in.h:486
+msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Dördünci seviyede qırılamaz boşluq remzi, dördünci seviyede ise ince qırılamaz boşluq remzi"
+
+#: ../rules/base.xml.in.h:487
+msgid "Nor"
+msgstr "Nor"
+
+#: ../rules/base.xml.in.h:488
+msgid "Northern Saami"
+msgstr "Kuzey Sami"
+
+#: ../rules/base.xml.in.h:489
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Kuzey Sami, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:490
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:491
+msgid "Norway"
+msgstr "Norveç"
+
+# tüklü
+#: ../rules/base.xml.in.h:492
+msgid "NumLock"
+msgstr "NumLock"
+
+#: ../rules/base.xml.in.h:493
+msgid "Numeric keypad delete key behaviour"
+msgstr "Sayısal tuştaqımı sil tuşu davranışı"
+
+#: ../rules/base.xml.in.h:494
+msgid "Numeric keypad keys work as with Mac"
+msgstr "Sayısal tuştaqımı tuşları Mac ile olğanı kibi çalışır"
+
+#: ../rules/base.xml.in.h:495
+msgid "Numeric keypad layout selection"
+msgstr "Sayısal tuştaqımı tizilimi saylamı"
+
+#: ../rules/base.xml.in.h:496
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:497
+msgid "OLPC"
+msgstr "Bala Başına Bir Tizüstü (BBBT; OLPC)"
+
+#: ../rules/base.xml.in.h:498
+msgid "OLPC Dari"
+msgstr "OLPC Dari"
+
+#: ../rules/base.xml.in.h:499
+msgid "OLPC Pashto"
+msgstr "OLPC Paşto"
+
+#: ../rules/base.xml.in.h:500
+msgid "OLPC Southern Uzbek"
+msgstr "OLPC Cenübiy Özbekçe"
+
+#: ../rules/base.xml.in.h:501
+msgid "Occitan"
+msgstr "Occitan"
+
+#: ../rules/base.xml.in.h:502
+msgid "Ogham"
+msgstr "Ogham"
+
+#: ../rules/base.xml.in.h:503
+msgid "Ogham IS434"
+msgstr "Ogham IS434"
+
+#: ../rules/base.xml.in.h:504
+msgid "Oriya"
+msgstr "Orissa dili"
+
+#: ../rules/base.xml.in.h:505
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Oretec MCK-800 MM/İnternet Klavyesi"
+
+#: ../rules/base.xml.in.h:506
+msgid "Ossetian"
+msgstr "Osetçe"
+
+#: ../rules/base.xml.in.h:507
+msgid "Ossetian, Winkeys"
+msgstr "Osetçe, Win-tuşları"
+
+#: ../rules/base.xml.in.h:508
+msgid "Ossetian, legacy"
+msgstr "Osetçe, qadim"
+
+#: ../rules/base.xml.in.h:509
+msgid "PC-98xx Series"
+msgstr "PC-98xx Serisi"
+
+#: ../rules/base.xml.in.h:510
+msgid "Pak"
+msgstr "Pak"
+
+#: ../rules/base.xml.in.h:511
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: ../rules/base.xml.in.h:512
+msgid "Pashto"
+msgstr "Paşto"
+
+#: ../rules/base.xml.in.h:513
+msgid "Pattachote"
+msgstr "Pataküte"
+
+#: ../rules/base.xml.in.h:514
+msgid "Phonetic"
+msgstr "Fonetik"
+
+#: ../rules/base.xml.in.h:515
+msgid "Phonetic Winkeys"
+msgstr "Fonetik, Win-tuşları"
+
+#: ../rules/base.xml.in.h:516
+msgid "Pol"
+msgstr "Pol"
+
+#: ../rules/base.xml.in.h:517
+msgid "Poland"
+msgstr "Polonya"
+
+#: ../rules/base.xml.in.h:518
+msgid "Polytonic"
+msgstr "Politonik"
+
+#: ../rules/base.xml.in.h:519
+msgid "Portugal"
+msgstr "Portekiz"
+
+#: ../rules/base.xml.in.h:520
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:521
+msgid "Pro Keypad"
+msgstr "Pro Klavye"
+
+#: ../rules/base.xml.in.h:522
+msgid "Probhat"
+msgstr "Probat"
+
+#: ../rules/base.xml.in.h:523
+msgid "Programmer Dvorak"
+msgstr "Programcı Dvorak"
+
+#: ../rules/base.xml.in.h:524
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:525
+msgid "Prt"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:526
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:527
+msgid "Right Alt"
+msgstr "Sağ Alt"
+
+#: ../rules/base.xml.in.h:528
+msgid "Right Alt (while pressed)"
+msgstr "Sağ Alt (basıq olğanda)"
+
+#: ../rules/base.xml.in.h:529
+msgid "Right Alt key never chooses 3rd level"
+msgstr "Sağ Alt tuşu 3. seviyeni asla saylamaz"
+
+#: ../rules/base.xml.in.h:530
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr "Sağ Alt, Shift+Sağ Alt tuşu ise Çoqlu_Tuştır (Multi_Key)"
+
+#: ../rules/base.xml.in.h:531
+msgid "Right Ctrl"
+msgstr "Sağ Ctrl"
+
+#: ../rules/base.xml.in.h:532
+msgid "Right Ctrl (while pressed)"
+msgstr "Sağ Ctrl (basıq olğanda)"
+
+#: ../rules/base.xml.in.h:533
+msgid "Right Ctrl as Right Alt"
+msgstr "Sağ Ctrl tuşu Sağ Alt'tır"
+
+#: ../rules/base.xml.in.h:534
+msgid "Right Shift"
+msgstr "Sağ Shift"
+
+#: ../rules/base.xml.in.h:535
+msgid "Right Win"
+msgstr "Sağ Pencereler (Win)"
+
+#: ../rules/base.xml.in.h:536
+msgid "Right Win (while pressed)"
+msgstr "Sağ Pencereler (Win) (basıq olğanda)"
+
+#: ../rules/base.xml.in.h:537
+msgid "Right hand"
+msgstr "Sağ el"
+
+#: ../rules/base.xml.in.h:538
+msgid "Right handed Dvorak"
+msgstr "Oñaqay Dvorak"
+
+#: ../rules/base.xml.in.h:539
+msgid "Romania"
+msgstr "Romaniya"
+
+#: ../rules/base.xml.in.h:540
+msgid "Romanian keyboard with German letters"
+msgstr "Alman harfleriyle Romanya klavyesi"
+
+#: ../rules/base.xml.in.h:541
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Alman harfleriyle Romanya klavyesi, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:542
+msgid "Rou"
+msgstr "Rou"
+
+#: ../rules/base.xml.in.h:543
+msgid "Rus"
+msgstr "Rus"
+
+#: ../rules/base.xml.in.h:544
+msgid "Russia"
+msgstr "Rusiye"
+
+#: ../rules/base.xml.in.h:545
+msgid "Russian"
+msgstr "Rusça"
+
+#: ../rules/base.xml.in.h:546
+msgid "Russian phonetic"
+msgstr "Rusça fonetik"
+
+#: ../rules/base.xml.in.h:547
+msgid "Russian phonetic Dvorak"
+msgstr "Rusça fonetik Dvorak"
+
+#: ../rules/base.xml.in.h:548
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Rusça fonetik, ölü tuşsuz"
+
+#: ../rules/base.xml.in.h:549
+msgid "Russian with Kazakh"
+msgstr "Rusça (kazak)"
+
+#: ../rules/base.xml.in.h:550
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Çokluortam Kablosuz Klavyesi"
+
+#: ../rules/base.xml.in.h:551
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:552
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:553
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:554
+msgid "SK-7100"
+msgstr "SK-7100"
+
+# tüklü
+#: ../rules/base.xml.in.h:555
+msgid "SRB"
+msgstr "SRB"
+
+#: ../rules/base.xml.in.h:556
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomik 2500"
+
+# tüklü
+#: ../rules/base.xml.in.h:557
+msgid "SVEN Slim 303"
+msgstr "SVEN Zarif 303"
+
+#: ../rules/base.xml.in.h:558
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:559
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:560
+msgid "Scroll Lock"
+msgstr "Taydırma Kiliti (Scroll Lock)"
+
+#: ../rules/base.xml.in.h:561
+msgid "ScrollLock"
+msgstr "Taydırma Kiliti (ScrollLock)"
+
+# tüklü
+#: ../rules/base.xml.in.h:562
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+#: ../rules/base.xml.in.h:563
+msgid "Semi-colon on third level"
+msgstr "Üçünci seviyede noqtalı virgül"
+
+#: ../rules/base.xml.in.h:564
+msgid "Serbia"
+msgstr "Sırbistan"
+
+#: ../rules/base.xml.in.h:565
+msgid "Shift cancels CapsLock"
+msgstr "Shift CapsLock'nı lâğu eter"
+
+#: ../rules/base.xml.in.h:566
+msgid "Shift does not cancel NumLock, chooses 3d level instead"
+msgstr "Shift NumLock'nı lâğu etmez, onıñ yerine 3. seviyeni saylar"
+
+#: ../rules/base.xml.in.h:567
+msgid "Shift with numeric keypad keys works as in MS Windows"
+msgstr "Shift ile sayısal tuştaqımı tuşları MS Windows'taki kibi çalışır"
+
+#: ../rules/base.xml.in.h:568
+msgid "Shift+CapsLock"
+msgstr "Shift+CapsLock"
+
+#: ../rules/base.xml.in.h:569
+msgid "Simple"
+msgstr "Basit"
+
+#: ../rules/base.xml.in.h:570
+msgid "Slovakia"
+msgstr "Slovakya"
+
+#: ../rules/base.xml.in.h:571
+msgid "Slovenia"
+msgstr "Slovenya"
+
+#: ../rules/base.xml.in.h:572
+msgid "South Africa"
+msgstr "Cenübiy Afrika"
+
+#: ../rules/base.xml.in.h:573
+msgid "Southern Uzbek"
+msgstr "Cenübiy Özbekçe"
+
+#: ../rules/base.xml.in.h:574
+msgid "Spain"
+msgstr "İspanya"
+
+#: ../rules/base.xml.in.h:575
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
+msgstr "Mahsus tuşlar (Ctrl+Alt+&lt;tuş&gt;) bir sunucıda qollanır"
+
+#: ../rules/base.xml.in.h:576
+msgid "SrL"
+msgstr "SrL"
+
+#: ../rules/base.xml.in.h:577
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#: ../rules/base.xml.in.h:578
+msgid "Standard"
+msgstr "Standart"
+
+#: ../rules/base.xml.in.h:579
+msgid "Standard (Cedilla)"
+msgstr "Standart (Sedilla)"
+
+#: ../rules/base.xml.in.h:580
+msgid "Standard Phonetic"
+msgstr "Standart Fonetik"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:582
+msgid "Standard RSTU"
+msgstr "Standart RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:584
+msgid "Standard RSTU on Russian layout"
+msgstr "Rusça tizilim üzerinde standart RSTU"
+
+#: ../rules/base.xml.in.h:585
+msgid "Sun Type 5/6"
+msgstr "Sun Tür 5/6"
+
+#: ../rules/base.xml.in.h:586
+msgid "Sun dead keys"
+msgstr "Sun ölü tuşlar"
+
+#: ../rules/base.xml.in.h:587
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:588
+msgid "Svdvorak"
+msgstr "Svdvorak"
+
+#: ../rules/base.xml.in.h:589
+msgid "Svk"
+msgstr "Svk"
+
+#: ../rules/base.xml.in.h:590
+msgid "Svn"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:591
+msgid "Swap Ctrl and CapsLock"
+msgstr "Ctrl ile CapsLock yerlerini almaştır"
+
+#: ../rules/base.xml.in.h:592
+msgid "Swap ESC and CapsLock"
+msgstr "ESC ile CapsLock yerlerini almaştır"
+
+#: ../rules/base.xml.in.h:593
+msgid "Swe"
+msgstr "İsve"
+
+#: ../rules/base.xml.in.h:594
+msgid "Sweden"
+msgstr "İsveç"
+
+#: ../rules/base.xml.in.h:595
+msgid "Switzerland"
+msgstr "İsviçre"
+
+#: ../rules/base.xml.in.h:596
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:597
+msgid "Syr"
+msgstr "Sur"
+
+#: ../rules/base.xml.in.h:598
+msgid "Syria"
+msgstr "Suriye"
+
+#: ../rules/base.xml.in.h:599
+msgid "Syriac"
+msgstr "Suriye"
+
+#: ../rules/base.xml.in.h:600
+msgid "Syriac phonetic"
+msgstr "Suriye fonetik"
+
+#: ../rules/base.xml.in.h:601
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:602
+msgid "Tajikistan"
+msgstr "Tacikistan"
+
+#: ../rules/base.xml.in.h:603
+msgid "Tamil"
+msgstr "Tamil dili"
+
+#: ../rules/base.xml.in.h:604
+msgid "Tamil TAB Typewriter"
+msgstr "Tamil TAB Daktilo"
+
+#: ../rules/base.xml.in.h:605
+msgid "Tamil TSCII Typewriter"
+msgstr "Tamil TSCII Daktilo"
+
+#: ../rules/base.xml.in.h:606
+msgid "Tamil Unicode"
+msgstr "Tamil Unicode"
+
+#: ../rules/base.xml.in.h:607
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
+
+#: ../rules/base.xml.in.h:608
+msgid "Tatar"
+msgstr "İdil Tatarcası"
+
+#: ../rules/base.xml.in.h:609
+msgid "Telugu"
+msgstr "Telugu dili"
+
+#: ../rules/base.xml.in.h:610
+msgid "Tha"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:611
+msgid "Thailand"
+msgstr "Tayland"
+
+#: ../rules/base.xml.in.h:612
+msgid "Tibetan"
+msgstr "Tibetçe"
+
+#: ../rules/base.xml.in.h:613
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibetçe (ASCII sayılarnen)"
+
+#: ../rules/base.xml.in.h:614
+msgid "Tifinagh"
+msgstr "Tifinagh"
+
+#: ../rules/base.xml.in.h:615
+msgid "Tifinagh Alternative"
+msgstr "Tifinagh Diğer"
+
+#: ../rules/base.xml.in.h:616
+msgid "Tifinagh Alternative Phonetic"
+msgstr "Tifinagh Diğer Fonetik"
+
+#: ../rules/base.xml.in.h:617
+msgid "Tifinagh Extended"
+msgstr "Tifinagh Gelişkin"
+
+#: ../rules/base.xml.in.h:618
+msgid "Tifinagh Extended Phonetic"
+msgstr "Tifinagh Gelişmiş Fonetik"
+
+#: ../rules/base.xml.in.h:619
+msgid "Tifinagh Phonetic"
+msgstr "Tifinagh Fonetik"
+
+#: ../rules/base.xml.in.h:620
+msgid "Tilde (~) variant"
+msgstr "Tilde (~) variantı"
+
+#: ../rules/base.xml.in.h:621
+msgid "Tjk"
+msgstr "Tck"
+
+#: ../rules/base.xml.in.h:622
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr "Dvorak klavyesindeki muqabil tuşqa."
+
+#: ../rules/base.xml.in.h:623
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr "Qwerty klavyesindeki muqabil tuşqa."
+
+#: ../rules/base.xml.in.h:624
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:625
+msgid "Traditional Phonetic"
+msgstr "Ananeviy Fonetik"
+
+#: ../rules/base.xml.in.h:626
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Doğrudan İrişim Klavyesi"
+
+#: ../rules/base.xml.in.h:627
+msgid "Trust Slimline"
+msgstr "Trust Slimline"
+
+#: ../rules/base.xml.in.h:628
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Kabelsiz Klasik Klavye"
+
+#: ../rules/base.xml.in.h:629
+msgid "Tur"
+msgstr "Trk"
+
+#: ../rules/base.xml.in.h:630
+msgid "Turkey"
+msgstr "Türkiye"
+
+#: ../rules/base.xml.in.h:631
+msgid "Turkmenistan"
+msgstr "Türkmenistan"
+
+#: ../rules/base.xml.in.h:632
+msgid "Typewriter"
+msgstr "Daktilo"
+
+# tüklü
+#: ../rules/base.xml.in.h:633
+msgid "UCW layout (accented letters only)"
+msgstr "UCW tizilimi (ancaq urğulı arifler)"
+
+#: ../rules/base.xml.in.h:634
+msgid "US keyboard with Bosnian digraphs"
+msgstr "Bosna ikil harfleriyle amerikan klavyesi"
+
+#: ../rules/base.xml.in.h:635
+msgid "US keyboard with Bosnian letters"
+msgstr "Bosna harfleriyle amerikan klavyesi"
+
+#: ../rules/base.xml.in.h:636
+msgid "US keyboard with Croatian digraphs"
+msgstr "Hırvat ikil harfleriyle amerikan klavyesi"
+
+#: ../rules/base.xml.in.h:637
+msgid "US keyboard with Croatian letters"
+msgstr "Hırvat harfleriyle amerikan klavyesi"
+
+#: ../rules/base.xml.in.h:638
+msgid "US keyboard with Estonian letters"
+msgstr "Eston ariflernen Amerikan klavyesi"
+
+#: ../rules/base.xml.in.h:639
+msgid "US keyboard with Lithuanian letters"
+msgstr "Litvanya harfleriyle amerikan klavyesi"
+
+#: ../rules/base.xml.in.h:640
+msgid "US keyboard with Slovenian letters"
+msgstr "Sloven harfleriyle amerikan klavyesi"
+
+#: ../rules/base.xml.in.h:641
+msgid "USA"
+msgstr "ABD"
+
+#: ../rules/base.xml.in.h:642
+msgid "Udmurt"
+msgstr "Udmurtça"
+
+#: ../rules/base.xml.in.h:643
+msgid "Ukr"
+msgstr "Ukr"
+
+#: ../rules/base.xml.in.h:644
+msgid "Ukraine"
+msgstr "Ukraina"
+
+#: ../rules/base.xml.in.h:645
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Unikod eklemeleri (oqlar ve riyaziy işleticiler)"
+
+#: ../rules/base.xml.in.h:646
+msgid "Unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Unikod eklemeleri (oqlar ve riyaziy işleticiler). Riyaziyat işleticileri ög-belgilengen seviyede"
+
+#: ../rules/base.xml.in.h:647
+msgid "UnicodeExpert"
+msgstr "Unicode Uzman"
+
+#: ../rules/base.xml.in.h:648
+msgid "United Kingdom"
+msgstr "İngiltere"
+
+#: ../rules/base.xml.in.h:649
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
+
+#: ../rules/base.xml.in.h:650
+msgid "Urdu, Alternative phonetic"
+msgstr "Urdu, Alternativ fonetik"
+
+#: ../rules/base.xml.in.h:651
+msgid "Urdu, Phonetic"
+msgstr "Urdu, Fonetik"
+
+#: ../rules/base.xml.in.h:652
+msgid "Urdu, Winkeys"
+msgstr "Urdu, Win-tuşları"
+
+#: ../rules/base.xml.in.h:653
+msgid "Use Bosnian digraphs"
+msgstr "Bosna ikil harflerini kullanır"
+
+#: ../rules/base.xml.in.h:654
+msgid "Use Croatian digraphs"
+msgstr "Hırvat ikil harflerini kullanır"
+
+#: ../rules/base.xml.in.h:655
+msgid "Use guillemets for quotes"
+msgstr "Tırnakların yerine açılı ayraçlar kullanılır"
+
+# tüklü
+#: ../rules/base.xml.in.h:656
+msgid "Use keyboard LED to show alternative layout"
+msgstr "Alternativ tizilimni köstermek içün klavye LED'ini qullan"
+
+#: ../rules/base.xml.in.h:657
+msgid "Using space key to input non-breakable space character"
+msgstr "Qırılmaz boşluq remzini kirdilemek içün boşluq tuşu qullanımı"
+
+#: ../rules/base.xml.in.h:658
+msgid "Usual space at any level"
+msgstr "Er seviyede adetiy boşluq"
+
+#: ../rules/base.xml.in.h:659
+msgid "Uzb"
+msgstr "Özb"
+
+#: ../rules/base.xml.in.h:660
+msgid "Uzbekistan"
+msgstr "Özbekistan"
+
+#: ../rules/base.xml.in.h:661
+msgid "Vietnam"
+msgstr "Vietnam"
+
+#: ../rules/base.xml.in.h:662
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "ViewSonic KU-306 İnternet Klavyesi"
+
+#: ../rules/base.xml.in.h:663
+msgid "Vnm"
+msgstr "Vnm"
+
+# tüklü
+#: ../rules/base.xml.in.h:664
+msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgstr "Wang 724 tuştaqımı Unikod eklemelerinen (oqlar ve riyaziy işleticiler)"
+
+#: ../rules/base.xml.in.h:665
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Wang 724 tuştaqımı Unikod eklemelerinen (oqlar ve riyaziy işleticiler). Riyaziy tuşlar ög-belgilengen seviyede"
+
+#: ../rules/base.xml.in.h:666
+msgid "Wang model 724 azerty"
+msgstr "Wang model 724 azerty"
+
+#: ../rules/base.xml.in.h:667
+msgid "Western"
+msgstr "Ğarbiy"
+
+#: ../rules/base.xml.in.h:668
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:669
+msgid "Winkeys"
+msgstr "Win-tuşları"
+
+#: ../rules/base.xml.in.h:670
+msgid "With &lt;\\|&gt; key"
+msgstr "&lt;\\|&gt; tuşunen"
+
+#: ../rules/base.xml.in.h:671
+msgid "With EuroSign on 5"
+msgstr "€ sembolü ile 5 tuşu"
+
+#: ../rules/base.xml.in.h:672
+msgid "With guillemets"
+msgstr "Açılı ayraçlarla"
+
+#: ../rules/base.xml.in.h:673
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! İnternet Klavyesi"
+
+#: ../rules/base.xml.in.h:674
+msgid "Yakut"
+msgstr "Sahaca"
+
+#: ../rules/base.xml.in.h:675
+msgid "Yoruba"
+msgstr "Yoruba"
+
+#: ../rules/base.xml.in.h:676
+msgid "Z and ZHE swapped"
+msgstr "Z ile J almaştırılır"
+
+#: ../rules/base.xml.in.h:677
+msgid "Zar"
+msgstr "Zar"
+
+#: ../rules/base.xml.in.h:678
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:679
+msgid "azerty/digits"
+msgstr "azerty/raqamlar"
+
+#: ../rules/base.xml.in.h:680
+msgid "digits"
+msgstr "raqamlar"
+
+#: ../rules/base.xml.in.h:681
+msgid "displaced semicolon and quote (obsolete)"
+msgstr "noqtalı virgül ve qoştırnaq yersizleştirilgen (eskirtilgen)"
+
+#: ../rules/base.xml.in.h:682
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:683
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:684
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, uzatılğan Kerisilme"
+
+#: ../rules/base.xml.in.h:685
+msgid "qwerty/digits"
+msgstr "qwerty/raqamlar"
+
+#: ../rules/base.xml.in.h:686
+msgid "qwertz"
+msgstr "qwertz"
+
+#~ msgid "Brazilian ABNT2"
+#~ msgstr "Brazilya dili ABNT2"
+
+#~ msgid "Japanese 106-key"
+#~ msgstr "Japonca 106 tuşlu"
+
+#~ msgid "Kir"
+#~ msgstr "Kir"
+
+#~ msgid "Korean 106-key"
+#~ msgstr "Korece 106 tuşlu"
+
+#~ msgid "Super is mapped to Win keys"
+#~ msgstr "Super, Pencereler (Win) tuşlarına haritalandırılır"
+
+#~ msgid "US keyboard with Slovenian digraphs"
+#~ msgstr "Sloven ikil harfleriyle amerikan klavyesi"
+
+#~ msgid "Unicode"
+#~ msgstr "Unikod"
+
+#~ msgid "Use Slovenian digraphs"
+#~ msgstr "Sloven ikil harflerini kullanır"
diff --git a/xorg-server/xkbdata.src/po/cs.po b/xorg-server/xkbdata.src/po/cs.po
index 5ebdf70b9..573dcda46 100644
--- a/xorg-server/xkbdata.src/po/cs.po
+++ b/xorg-server/xkbdata.src/po/cs.po
@@ -1,2623 +1,2748 @@
# Translation of xkeyboard-config to Czech.
-# Copyright (C) 2007, 2008 the author(s) of xkeyboard-config.
+# Copyright (C) 2007, 2008, 2009 the author(s) of xkeyboard-config.
# This file is distributed under the same license as the xkeyboard-config package.
# Michal Bukovjan <bukm@centrum.cz>, 2003.
-# Petr Kovar <pknbe@volny.cz>, 2007, 2008.
+# Petr Kovar <pknbe@volny.cz>, 2007, 2008, 2009.
#
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config 1.4-pre1\n"
+"Project-Id-Version: xkeyboard-config-1.6pre1\n"
"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2008-09-15 23:52+0100\n"
-"PO-Revision-Date: 2008-09-18 00:16+0200\n"
+"POT-Creation-Date: 2009-05-12 23:49+0100\n"
+"PO-Revision-Date: 2009-05-15 19:52+0200\n"
"Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: KBabel 1.11.4\n"
-#: ../rules/base.xml.in.h:1 ../rules/evdev.xml.in.h:1
+#: ../rules/base.xml.in.h:1
msgid "(F)"
msgstr "(F)"
-#: ../rules/base.xml.in.h:2 ../rules/evdev.xml.in.h:2
+#: ../rules/base.xml.in.h:2
msgid "(Legacy) Alternative"
msgstr "(Zděděné) alternativní"
-#: ../rules/base.xml.in.h:3 ../rules/evdev.xml.in.h:3
+#: ../rules/base.xml.in.h:3
msgid "(Legacy) Alternative, Sun dead keys"
msgstr "(Zděděné) alternativní, mrtvé klávesy Sun"
-#: ../rules/base.xml.in.h:4 ../rules/evdev.xml.in.h:4
+#: ../rules/base.xml.in.h:4
msgid "(Legacy) Alternative, eliminate dead keys"
msgstr "(Zděděné) alternativní, vyloučit mrtvé klávesy"
-#: ../rules/base.xml.in.h:5 ../rules/evdev.xml.in.h:5
+#: ../rules/base.xml.in.h:5
msgid "101/104 key Compatible"
msgstr "101/104klávesové, kompatibilní"
-#: ../rules/base.xml.in.h:6 ../rules/evdev.xml.in.h:6
+#: ../rules/base.xml.in.h:6
msgid "101/qwerty/comma/Dead keys"
msgstr "101/qwerty/čárka/mrtvé klávesy"
-#: ../rules/base.xml.in.h:7 ../rules/evdev.xml.in.h:7
+#: ../rules/base.xml.in.h:7
msgid "101/qwerty/comma/Eliminate dead keys"
msgstr "101/qwerty/čárka/vyloučit mrtvé klávesy"
-#: ../rules/base.xml.in.h:8 ../rules/evdev.xml.in.h:8
+#: ../rules/base.xml.in.h:8
msgid "101/qwerty/dot/Dead keys"
msgstr "101/qwerty/tečka/mrtvé klávesy"
-#: ../rules/base.xml.in.h:9 ../rules/evdev.xml.in.h:9
+#: ../rules/base.xml.in.h:9
msgid "101/qwerty/dot/Eliminate dead keys"
msgstr "101/qwerty/tečka/vyloučit mrtvé klávesy"
-#: ../rules/base.xml.in.h:10 ../rules/evdev.xml.in.h:10
+#: ../rules/base.xml.in.h:10
msgid "101/qwertz/comma/Dead keys"
msgstr "101/qwertz/čárka/mrtvé klávesy"
-#: ../rules/base.xml.in.h:11 ../rules/evdev.xml.in.h:11
+#: ../rules/base.xml.in.h:11
msgid "101/qwertz/comma/Eliminate dead keys"
msgstr "101/qwertz/čárka/vyloučit mrtvé klávesy"
-#: ../rules/base.xml.in.h:12 ../rules/evdev.xml.in.h:12
+#: ../rules/base.xml.in.h:12
msgid "101/qwertz/dot/Dead keys"
msgstr "101/qwertz/tečka/mrtvé klávesy"
-#: ../rules/base.xml.in.h:13 ../rules/evdev.xml.in.h:13
+#: ../rules/base.xml.in.h:13
msgid "101/qwertz/dot/Eliminate dead keys"
msgstr "101/qwertz/tečka/vyloučit mrtvé klávesy"
-#: ../rules/base.xml.in.h:14 ../rules/evdev.xml.in.h:14
+#: ../rules/base.xml.in.h:14
msgid "102/qwerty/comma/Dead keys"
msgstr "102/qwerty/čárka/mrtvé klávesy"
-#: ../rules/base.xml.in.h:15 ../rules/evdev.xml.in.h:15
+#: ../rules/base.xml.in.h:15
msgid "102/qwerty/comma/Eliminate dead keys"
msgstr "102/qwerty/čárka/vyloučit mrtvé klávesy"
-#: ../rules/base.xml.in.h:16 ../rules/evdev.xml.in.h:16
+#: ../rules/base.xml.in.h:16
msgid "102/qwerty/dot/Dead keys"
msgstr "102/qwerty/tečka/mrtvé klávesy"
-#: ../rules/base.xml.in.h:17 ../rules/evdev.xml.in.h:17
+#: ../rules/base.xml.in.h:17
msgid "102/qwerty/dot/Eliminate dead keys"
msgstr "102/qwerty/tečka/vyloučit mrtvé klávesy"
-#: ../rules/base.xml.in.h:18 ../rules/evdev.xml.in.h:18
+#: ../rules/base.xml.in.h:18
msgid "102/qwertz/comma/Dead keys"
msgstr "102/qwertz/čárka/mrtvé klávesy"
-#: ../rules/base.xml.in.h:19 ../rules/evdev.xml.in.h:19
+#: ../rules/base.xml.in.h:19
msgid "102/qwertz/comma/Eliminate dead keys"
msgstr "102/qwertz/čárka/vyloučit mrtvé klávesy"
-#: ../rules/base.xml.in.h:20 ../rules/evdev.xml.in.h:20
+#: ../rules/base.xml.in.h:20
msgid "102/qwertz/dot/Dead keys"
msgstr "102/qwertz/tečka/mrtvé klávesy"
-#: ../rules/base.xml.in.h:21 ../rules/evdev.xml.in.h:21
+#: ../rules/base.xml.in.h:21
msgid "102/qwertz/dot/Eliminate dead keys"
msgstr "102/qwertz/tečka/vyloučit mrtvé klávesy"
-#: ../rules/base.xml.in.h:22 ../rules/evdev.xml.in.h:22
+#: ../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:23 ../rules/evdev.xml.in.h:23
+#: ../rules/base.xml.in.h:26
msgid "A4Tech KBS-8"
msgstr "A4Tech KBS-8"
-#: ../rules/base.xml.in.h:24 ../rules/evdev.xml.in.h:24
+#: ../rules/base.xml.in.h:27
msgid "A4Tech Wireless Desktop RFKB-23"
msgstr "A4Tech Wireless Desktop RFKB-23"
-#: ../rules/base.xml.in.h:25 ../rules/evdev.xml.in.h:25
+#: ../rules/base.xml.in.h:28
msgid "ACPI Standard"
msgstr "Standard ACPI"
-#: ../rules/base.xml.in.h:26 ../rules/evdev.xml.in.h:26
-msgid "ATM/phone-style hexadecimal keypad"
-msgstr "ATM/šestnáctimístná klávesnice telefonního typu"
+#: ../rules/base.xml.in.h:29
+msgid "ATM/phone-style"
+msgstr "ATM/telefonní typ"
-#: ../rules/base.xml.in.h:27 ../rules/evdev.xml.in.h:27
+#: ../rules/base.xml.in.h:30
msgid "Acer AirKey V"
msgstr "Acer AirKey V"
-#: ../rules/base.xml.in.h:28 ../rules/evdev.xml.in.h:28
+#: ../rules/base.xml.in.h:31
msgid "Acer C300"
msgstr "Acer C300"
-#: ../rules/base.xml.in.h:29 ../rules/evdev.xml.in.h:29
+#: ../rules/base.xml.in.h:32
msgid "Acer Ferrari 4000"
msgstr "Acer Ferrari 4000"
-#: ../rules/base.xml.in.h:30 ../rules/evdev.xml.in.h:30
+#: ../rules/base.xml.in.h:33
msgid "Acer Laptop"
msgstr "Acer Laptop"
-#: ../rules/base.xml.in.h:31 ../rules/evdev.xml.in.h:31
-msgid "Add the EuroSign to the 2 key."
-msgstr "Přidá znak eura na klávesu 2."
-
-#: ../rules/base.xml.in.h:32 ../rules/evdev.xml.in.h:32
-msgid "Add the EuroSign to the 4 key."
-msgstr "Přidá znak eura na klávesu 4."
+#: ../rules/base.xml.in.h:34
+msgid "Add the standard behavior to Menu key"
+msgstr "Přidá standardní chování ke klávese Menu"
-#: ../rules/base.xml.in.h:33 ../rules/evdev.xml.in.h:33
-msgid "Add the EuroSign to the 5 key."
-msgstr "Přidá znak eura na klávesu 5."
+#: ../rules/base.xml.in.h:35
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "Přidává průtažný přízvuk v esperantu (supersigno)"
-#: ../rules/base.xml.in.h:34 ../rules/evdev.xml.in.h:34
-msgid "Add the EuroSign to the E key."
-msgstr "Přidá znak eura na klávesu E."
-
-#: ../rules/base.xml.in.h:35 ../rules/evdev.xml.in.h:35
-msgid "Add the standard behavior to Menu key."
-msgstr "Přidá standardní chování ke klávese Menu."
-
-#: ../rules/base.xml.in.h:36 ../rules/evdev.xml.in.h:36
-msgid "Adding the EuroSign to certain keys"
+#: ../rules/base.xml.in.h:36
+msgid "Adding EuroSign to certain keys"
msgstr "Přidává znak eura k určitým klávesám"
-#: ../rules/base.xml.in.h:37 ../rules/evdev.xml.in.h:37
+#: ../rules/base.xml.in.h:37
msgid "Advance Scorpius KI"
msgstr "Advance Scorpius KI"
-#: ../rules/base.xml.in.h:38 ../rules/evdev.xml.in.h:38
+#: ../rules/base.xml.in.h:38
msgid "Afg"
msgstr "AFG"
-#: ../rules/base.xml.in.h:39 ../rules/evdev.xml.in.h:39
+#: ../rules/base.xml.in.h:39
msgid "Afghanistan"
msgstr "Afghánistán"
-#: ../rules/base.xml.in.h:40 ../rules/evdev.xml.in.h:40
+#: ../rules/base.xml.in.h:40
msgid "Akan"
msgstr "Akan"
-#: ../rules/base.xml.in.h:41 ../rules/evdev.xml.in.h:41
+#: ../rules/base.xml.in.h:41
msgid "Alb"
msgstr "ALB"
-#: ../rules/base.xml.in.h:42 ../rules/evdev.xml.in.h:42
+#: ../rules/base.xml.in.h:42
msgid "Albania"
msgstr "Albánie"
-#: ../rules/base.xml.in.h:43 ../rules/evdev.xml.in.h:43
-msgid "Alt and Meta are on the Alt keys."
-msgstr "Alt a Meta na klávesách Alt."
+#: ../rules/base.xml.in.h:43
+msgid "Alt and Meta are on Alt keys"
+msgstr "Alt a Meta na klávesách Alt"
-#: ../rules/base.xml.in.h:44 ../rules/evdev.xml.in.h:44
-msgid "Alt is mapped to the right Win-key and Super to Menu."
-msgstr "Alt je přiřazena k pravé klávese Win a Super k Menu."
+#: ../rules/base.xml.in.h:44
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr "Alt je přiřazena k pravé klávese Win a Super k Menu"
-#: ../rules/base.xml.in.h:45 ../rules/evdev.xml.in.h:45
-msgid "Alt+CapsLock changes layout."
-msgstr "Alt+Caps Lock mění rozložení."
+#: ../rules/base.xml.in.h:45
+msgid "Alt+CapsLock"
+msgstr "Alt+Caps Lock"
-#: ../rules/base.xml.in.h:46 ../rules/evdev.xml.in.h:46
-msgid "Alt+Ctrl change layout."
-msgstr "Alt+Ctrl mění rozložení."
+#: ../rules/base.xml.in.h:46
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
-#: ../rules/base.xml.in.h:47 ../rules/evdev.xml.in.h:47
-msgid "Alt+Shift change layout."
-msgstr "Alt+Shift mění rozložení."
+#: ../rules/base.xml.in.h:47
+msgid "Alt+Shift"
+msgstr "Alt+Shift"
-#: ../rules/base.xml.in.h:48 ../rules/evdev.xml.in.h:48
+#: ../rules/base.xml.in.h:48
+msgid "Alt+Space"
+msgstr "Alt+Mezerník"
+
+#: ../rules/base.xml.in.h:49
msgid "Alt-Q"
msgstr "Alt-Q"
-#: ../rules/base.xml.in.h:49 ../rules/evdev.xml.in.h:49
+#: ../rules/base.xml.in.h:50
msgid "Alt/Win key behavior"
msgstr "Chování klávesy Alt/Win"
-#: ../rules/base.xml.in.h:50 ../rules/evdev.xml.in.h:50
+#: ../rules/base.xml.in.h:51
msgid "Alternative"
msgstr "Alternativní"
-#: ../rules/base.xml.in.h:51 ../rules/evdev.xml.in.h:51
+#: ../rules/base.xml.in.h:52
msgid "Alternative Eastern"
msgstr "Alternativní východní"
-#: ../rules/base.xml.in.h:52 ../rules/evdev.xml.in.h:52
+#: ../rules/base.xml.in.h:53
msgid "Alternative Phonetic"
msgstr "Alternativní fonetické"
-#: ../rules/base.xml.in.h:53 ../rules/evdev.xml.in.h:53
+#: ../rules/base.xml.in.h:54
msgid "Alternative international (former us_intl)"
msgstr "Alternativní mezinárodní (bývalé us_intl)"
-#: ../rules/base.xml.in.h:54 ../rules/evdev.xml.in.h:54
+#: ../rules/base.xml.in.h:55
msgid "Alternative, Sun dead keys"
msgstr "Alternativní, mrtvé klávesy Sun"
-#: ../rules/base.xml.in.h:55 ../rules/evdev.xml.in.h:55
+#: ../rules/base.xml.in.h:56
msgid "Alternative, eliminate dead keys"
msgstr "Alternativní, vyloučit mrtvé klávesy"
-#: ../rules/base.xml.in.h:56 ../rules/evdev.xml.in.h:56
+#: ../rules/base.xml.in.h:57
msgid "Alternative, latin-9 only"
msgstr "Alternativní, pouze Latin-9"
-#: ../rules/base.xml.in.h:57 ../rules/evdev.xml.in.h:57
+#: ../rules/base.xml.in.h:58
msgid "And"
msgstr "AND"
-#: ../rules/base.xml.in.h:58 ../rules/evdev.xml.in.h:58
+#: ../rules/base.xml.in.h:59
msgid "Andorra"
msgstr "Andorra"
-#: ../rules/base.xml.in.h:59 ../rules/evdev.xml.in.h:59
+#: ../rules/base.xml.in.h:60
+msgid "Any Alt key"
+msgstr "Libovolná klávesa Alt"
+
+#: ../rules/base.xml.in.h:61
+msgid "Any Win key"
+msgstr "Libovolná klávesa Win"
+
+#: ../rules/base.xml.in.h:62
+msgid "Any Win key (while pressed)"
+msgstr "Libovolná klávesa Win (při stisknutí)"
+
+#: ../rules/base.xml.in.h:63
msgid "Apostrophe (') variant"
msgstr "Varianta s apostrofem (')"
-#: ../rules/base.xml.in.h:60 ../rules/evdev.xml.in.h:60
+#: ../rules/base.xml.in.h:64
msgid "Apple"
msgstr "Apple"
-#: ../rules/base.xml.in.h:61 ../rules/evdev.xml.in.h:61
+#: ../rules/base.xml.in.h:65
msgid "Apple Laptop"
msgstr "Apple Laptop"
-#: ../rules/base.xml.in.h:62 ../rules/evdev.xml.in.h:62
+#: ../rules/base.xml.in.h:66
msgid "Ara"
msgstr "ARA"
-#: ../rules/base.xml.in.h:63 ../rules/evdev.xml.in.h:63
+#: ../rules/base.xml.in.h:67
msgid "Arabic"
msgstr "Arabské"
-#: ../rules/base.xml.in.h:64 ../rules/evdev.xml.in.h:64
+#: ../rules/base.xml.in.h:68
msgid "Arm"
msgstr "ARM"
-#: ../rules/base.xml.in.h:65 ../rules/evdev.xml.in.h:65
+#: ../rules/base.xml.in.h:69
msgid "Armenia"
msgstr "Arménie"
-#: ../rules/base.xml.in.h:66 ../rules/evdev.xml.in.h:66
+#: ../rules/base.xml.in.h:70
msgid "Asturian variant with bottom-dot H and bottom-dot L"
msgstr "Asturská varianta s H s tečkou pod a L s tečkou pod"
-#: ../rules/base.xml.in.h:67 ../rules/evdev.xml.in.h:67
+#: ../rules/base.xml.in.h:71
msgid "Asus Laptop"
msgstr "Asus Laptop"
-#: ../rules/base.xml.in.h:68 ../rules/evdev.xml.in.h:68
+#: ../rules/base.xml.in.h:72
+msgid "At bottom left"
+msgstr "Vlevo dole"
+
+#: ../rules/base.xml.in.h:73
+msgid "At left of 'A'"
+msgstr "Nalevo od \"A\""
+
+#: ../rules/base.xml.in.h:74
msgid "Aze"
msgstr "AZE"
-#: ../rules/base.xml.in.h:69 ../rules/evdev.xml.in.h:69
+#: ../rules/base.xml.in.h:75
msgid "Azerbaijan"
msgstr "Ázerbájdžán"
-#: ../rules/base.xml.in.h:70 ../rules/evdev.xml.in.h:70
+#: ../rules/base.xml.in.h:76
msgid "Azona RF2300 wireless Internet Keyboard"
msgstr "Azona RF2300 Internet Keyboard, bezdrátová"
-#: ../rules/base.xml.in.h:71 ../rules/evdev.xml.in.h:71
+#: ../rules/base.xml.in.h:77
msgid "BTC 5090"
msgstr "BTC 5090"
-#: ../rules/base.xml.in.h:72 ../rules/evdev.xml.in.h:72
+#: ../rules/base.xml.in.h:78
msgid "BTC 5113RF Multimedia"
msgstr "BTC 5113RF Multimedia"
-#: ../rules/base.xml.in.h:73 ../rules/evdev.xml.in.h:73
+#: ../rules/base.xml.in.h:79
msgid "BTC 5126T"
msgstr "BTC 5126T"
-#: ../rules/base.xml.in.h:74 ../rules/evdev.xml.in.h:74
+#: ../rules/base.xml.in.h:80
msgid "BTC 6301URF"
msgstr "BTC 6301URF"
-#: ../rules/base.xml.in.h:75 ../rules/evdev.xml.in.h:75
+#: ../rules/base.xml.in.h:81
msgid "BTC 9000"
msgstr "BTC 9000"
-#: ../rules/base.xml.in.h:76 ../rules/evdev.xml.in.h:76
+#: ../rules/base.xml.in.h:82
msgid "BTC 9000A"
msgstr "BTC 9000A"
-#: ../rules/base.xml.in.h:77 ../rules/evdev.xml.in.h:77
+#: ../rules/base.xml.in.h:83
msgid "BTC 9001AH"
msgstr "BTC 9001AH"
-#: ../rules/base.xml.in.h:78 ../rules/evdev.xml.in.h:78
+#: ../rules/base.xml.in.h:84
msgid "BTC 9019U"
msgstr "BTC 9019U"
-#: ../rules/base.xml.in.h:79 ../rules/evdev.xml.in.h:79
+#: ../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:80 ../rules/evdev.xml.in.h:80
+#: ../rules/base.xml.in.h:87
msgid "Ban"
msgstr "BAN"
-#: ../rules/base.xml.in.h:81 ../rules/evdev.xml.in.h:81
+#: ../rules/base.xml.in.h:88
msgid "Bangladesh"
msgstr "Bangladéš"
-#: ../rules/base.xml.in.h:82 ../rules/evdev.xml.in.h:82
+#: ../rules/base.xml.in.h:89
msgid "Bel"
msgstr "BEL"
-#: ../rules/base.xml.in.h:83 ../rules/evdev.xml.in.h:83
+#: ../rules/base.xml.in.h:90
msgid "Belarus"
msgstr "Bělorusko"
-#: ../rules/base.xml.in.h:84 ../rules/evdev.xml.in.h:84
+#: ../rules/base.xml.in.h:91
msgid "Belgium"
msgstr "Belgie"
-#: ../rules/base.xml.in.h:85 ../rules/evdev.xml.in.h:85
+#: ../rules/base.xml.in.h:92
msgid "BenQ X-Touch"
msgstr "BenQ X-Touch"
-#: ../rules/base.xml.in.h:86 ../rules/evdev.xml.in.h:86
+#: ../rules/base.xml.in.h:93
msgid "BenQ X-Touch 730"
msgstr "BenQ X-Touch 730"
-#: ../rules/base.xml.in.h:87 ../rules/evdev.xml.in.h:87
+#: ../rules/base.xml.in.h:94
msgid "BenQ X-Touch 800"
msgstr "BenQ X-Touch 800"
-#: ../rules/base.xml.in.h:88 ../rules/evdev.xml.in.h:88
+#: ../rules/base.xml.in.h:95
msgid "Bengali"
msgstr "Bengálské"
-#: ../rules/base.xml.in.h:89 ../rules/evdev.xml.in.h:89
+#: ../rules/base.xml.in.h:96
msgid "Bengali Probhat"
msgstr "Bengálské Probhat"
-#: ../rules/base.xml.in.h:90 ../rules/evdev.xml.in.h:90
+#: ../rules/base.xml.in.h:97
msgid "Bepo, ergonomic, Dvorak way"
msgstr "Bepo, ergonomické, typ Dvorak"
-#: ../rules/base.xml.in.h:91 ../rules/evdev.xml.in.h:91
+#: ../rules/base.xml.in.h:98
msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
msgstr "Bepo, ergonomické, typ Dvorak, pouze Latin-9"
-#: ../rules/base.xml.in.h:92 ../rules/evdev.xml.in.h:92
+#: ../rules/base.xml.in.h:99
msgid "Bgr"
msgstr "BGR"
-#: ../rules/base.xml.in.h:93 ../rules/evdev.xml.in.h:93
+#: ../rules/base.xml.in.h:100
msgid "Bhu"
msgstr "BHU"
-#: ../rules/base.xml.in.h:94 ../rules/evdev.xml.in.h:94
+#: ../rules/base.xml.in.h:101
msgid "Bhutan"
msgstr "Bhútán"
-#: ../rules/base.xml.in.h:95 ../rules/evdev.xml.in.h:95
+#: ../rules/base.xml.in.h:102
msgid "Biblical Hebrew (Tiro)"
msgstr "Biblická hebrejština (Tiro)"
-#: ../rules/base.xml.in.h:96 ../rules/evdev.xml.in.h:96
+#: ../rules/base.xml.in.h:103
msgid "Bih"
msgstr "BIH"
-#: ../rules/base.xml.in.h:97 ../rules/evdev.xml.in.h:97
+#: ../rules/base.xml.in.h:104
msgid "Blr"
msgstr "BLR"
-#: ../rules/base.xml.in.h:98 ../rules/evdev.xml.in.h:98
+#: ../rules/base.xml.in.h:105
msgid "Bosnia and Herzegovina"
msgstr "Bosna a Hercegovina"
-#: ../rules/base.xml.in.h:99 ../rules/evdev.xml.in.h:99
-msgid "Both Alt keys together change layout."
-msgstr "Obě klávesy Alt dohromady mění rozložení."
-
-#: ../rules/base.xml.in.h:100 ../rules/evdev.xml.in.h:100
-msgid "Both Ctrl keys together change layout."
-msgstr "Obě klávesy Ctrl dohromady mění rozložení."
+#: ../rules/base.xml.in.h:106
+msgid "Both Alt keys together"
+msgstr "Obě klávesy Alt dohromady"
-#: ../rules/base.xml.in.h:101 ../rules/evdev.xml.in.h:101
-msgid "Both Shift keys together change layout."
-msgstr "Obě klávesy Shift dohromady mění rozložení."
+#: ../rules/base.xml.in.h:107
+msgid "Both Ctrl keys together"
+msgstr "Obě klávesy Ctrl dohromady"
-#: ../rules/base.xml.in.h:102 ../rules/evdev.xml.in.h:102
-msgid "Both Win-keys switch layout while pressed."
-msgstr "Obě klávesy Win přepínají při stisknutí rozložení."
+#: ../rules/base.xml.in.h:108
+msgid "Both Shift keys together"
+msgstr "Obě klávesy Shift dohromady"
-#: ../rules/base.xml.in.h:103 ../rules/evdev.xml.in.h:103
+#: ../rules/base.xml.in.h:109
msgid "Bra"
msgstr "BRA"
-#: ../rules/base.xml.in.h:104 ../rules/evdev.xml.in.h:104
+#: ../rules/base.xml.in.h:110
msgid "Braille"
msgstr "Braillovo písmo"
-#: ../rules/base.xml.in.h:105 ../rules/evdev.xml.in.h:105
+#: ../rules/base.xml.in.h:111
msgid "Brazil"
msgstr "Brazílie"
-#: ../rules/base.xml.in.h:106 ../rules/evdev.xml.in.h:106
-msgid "Brazilian ABNT2"
-msgstr "Brazilské ABNT2"
+#: ../rules/base.xml.in.h:112
+msgid "Breton"
+msgstr "Bretonské"
-#: ../rules/base.xml.in.h:107 ../rules/evdev.xml.in.h:107
+#: ../rules/base.xml.in.h:113
msgid "Brl"
msgstr "BRL"
-#: ../rules/base.xml.in.h:108 ../rules/evdev.xml.in.h:108
+#: ../rules/base.xml.in.h:114
msgid "Brother Internet Keyboard"
msgstr "Brother Internet Keyboard"
-#: ../rules/base.xml.in.h:109 ../rules/evdev.xml.in.h:109
+#: ../rules/base.xml.in.h:115
msgid "Buckwalter"
msgstr "Buckwalter"
-#: ../rules/base.xml.in.h:110 ../rules/evdev.xml.in.h:110
+#: ../rules/base.xml.in.h:116
msgid "Bulgaria"
msgstr "Bulharsko"
-#: ../rules/base.xml.in.h:111 ../rules/evdev.xml.in.h:111
+#: ../rules/base.xml.in.h:117
+msgid "CRULP"
+msgstr "CRULP"
+
+#: ../rules/base.xml.in.h:118
msgid "Cambodia"
msgstr "Kambodža"
-#: ../rules/base.xml.in.h:112 ../rules/evdev.xml.in.h:112
+#: ../rules/base.xml.in.h:119
msgid "Can"
msgstr "CAN"
-#: ../rules/base.xml.in.h:113 ../rules/evdev.xml.in.h:113
+#: ../rules/base.xml.in.h:120
msgid "Canada"
msgstr "Kanada"
-#: ../rules/base.xml.in.h:114 ../rules/evdev.xml.in.h:114
-msgid "Caps Lock is Compose."
-msgstr "Caps Lock je Compose."
+#: ../rules/base.xml.in.h:121
+msgid "Caps Lock"
+msgstr "Caps Lock"
-#: ../rules/base.xml.in.h:115 ../rules/evdev.xml.in.h:115
-msgid "CapsLock LED shows alternative layout."
-msgstr "LED Caps Lock zobrazuje alternativní rozložení."
+#: ../rules/base.xml.in.h:122
+msgid "CapsLock"
+msgstr "Caps Lock"
-#: ../rules/base.xml.in.h:116 ../rules/evdev.xml.in.h:116
-msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+#: ../rules/base.xml.in.h:123
+msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
+msgstr "Caps Lock (na první rozložení), Shift+Caps Lock (na poslední rozložení)"
+
+#: ../rules/base.xml.in.h:124
+msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
+msgstr "Caps Lock (při stisknutí), Alt+Caps Lock provádí původní akci Caps Lock"
+
+#: ../rules/base.xml.in.h:125
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
msgstr "Caps Lock funguje jako Shift s uzamčením. Shift přerušuje Caps Lock."
-#: ../rules/base.xml.in.h:117 ../rules/evdev.xml.in.h:117
-msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+#: ../rules/base.xml.in.h:126
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock"
msgstr "Caps Lock funguje jako Shift s uzamčením. Shift neovlivňuje Caps Lock."
-#: ../rules/base.xml.in.h:118 ../rules/evdev.xml.in.h:118
-msgid "CapsLock just locks the Shift modifier."
-msgstr "Caps Lock pouze uzamkne modifikátor Shift."
-
-#: ../rules/base.xml.in.h:119 ../rules/evdev.xml.in.h:119
+#: ../rules/base.xml.in.h:127
msgid "CapsLock key behavior"
msgstr "Chování klávesy Caps Lock"
-#: ../rules/base.xml.in.h:120 ../rules/evdev.xml.in.h:120
-msgid "CapsLock key changes layout."
-msgstr "Klávesa Caps Lock mění rozložení."
-
-#: ../rules/base.xml.in.h:121 ../rules/evdev.xml.in.h:121
-msgid "CapsLock switch to first layout, Shift+CapsLock switch to last layout."
-msgstr "Caps Lock přepíná na první rozložení, Shift+Caps Lock přepíná na poslední rozložení."
+#: ../rules/base.xml.in.h:128
+msgid "CapsLock toggles Shift so all keys are affected"
+msgstr "Caps Lock přepne Shift, takže budou dotčeny všechny klávesy"
-#: ../rules/base.xml.in.h:122 ../rules/evdev.xml.in.h:122
-msgid "CapsLock toggles Shift so all keys are affected."
-msgstr "Caps Lock přepne Shift, takže budou dotčeny všechny klávesy."
+#: ../rules/base.xml.in.h:129
+msgid "CapsLock toggles normal capitalization of alphabetic characters"
+msgstr "Caps Lock přepne běžný převod abecedních znaků na verzálky"
-#: ../rules/base.xml.in.h:123 ../rules/evdev.xml.in.h:123
-msgid "CapsLock toggles normal capitalization of alphabetic characters."
-msgstr "Caps Lock přepne běžný převod abecedních znaků na verzálky."
-
-#: ../rules/base.xml.in.h:124 ../rules/evdev.xml.in.h:124
-msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+#: ../rules/base.xml.in.h:130
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
msgstr "Caps Lock používá vnitřní převod na verzálky. Shift přerušuje Caps Lock."
-#: ../rules/base.xml.in.h:125 ../rules/evdev.xml.in.h:125
-msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+#: ../rules/base.xml.in.h:131
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
msgstr "Caps Lock používá vnitřní převod na verzálky. Shift neovlivňuje Caps Lock."
-#: ../rules/base.xml.in.h:126 ../rules/evdev.xml.in.h:126
+#: ../rules/base.xml.in.h:132
msgid "Catalan variant with middle-dot L"
msgstr "Katalánská varianta s ela geminada"
-#: ../rules/base.xml.in.h:127 ../rules/evdev.xml.in.h:127
+#: ../rules/base.xml.in.h:133
msgid "Cedilla"
msgstr "Cédille"
-#: ../rules/base.xml.in.h:128 ../rules/evdev.xml.in.h:128
+#: ../rules/base.xml.in.h:134
msgid "Che"
msgstr "CHE"
-#: ../rules/base.xml.in.h:129 ../rules/evdev.xml.in.h:129
+#: ../rules/base.xml.in.h:135
msgid "Cherokee"
msgstr "Čerokí"
-#: ../rules/base.xml.in.h:130 ../rules/evdev.xml.in.h:130
+#: ../rules/base.xml.in.h:136
+msgid "Cherry B.UNLIMITED"
+msgstr "Cherry B.UNLIMITED"
+
+#: ../rules/base.xml.in.h:137
msgid "Cherry Blue Line CyBo@rd"
msgstr "Cherry Blue Line CyBo@rd"
-#: ../rules/base.xml.in.h:131 ../rules/evdev.xml.in.h:131
+#: ../rules/base.xml.in.h:138
msgid "Cherry Blue Line CyBo@rd (alternate option)"
msgstr "Cherry Blue Line CyBo@rd (alternativní volba)"
-#: ../rules/base.xml.in.h:132 ../rules/evdev.xml.in.h:132
+#: ../rules/base.xml.in.h:139
msgid "Cherry CyBo@rd USB-Hub"
msgstr "Cherry CyBo@rd USB-Hub"
-#: ../rules/base.xml.in.h:133 ../rules/evdev.xml.in.h:133
+#: ../rules/base.xml.in.h:140
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Expert"
+
+#: ../rules/base.xml.in.h:141
msgid "Cherry CyMotion Master Linux"
msgstr "Cherry CyMotion Master Linux"
-#: ../rules/base.xml.in.h:134 ../rules/evdev.xml.in.h:134
+#: ../rules/base.xml.in.h:142
msgid "Cherry CyMotion Master XPress"
msgstr "Cherry CyMotion Master XPress"
-#: ../rules/base.xml.in.h:135 ../rules/evdev.xml.in.h:135
+#: ../rules/base.xml.in.h:143
msgid "Chicony Internet Keyboard"
msgstr "Chicony Internet Keyboard"
-#: ../rules/base.xml.in.h:136 ../rules/evdev.xml.in.h:136
+#: ../rules/base.xml.in.h:144
msgid "Chicony KB-9885"
msgstr "Chicony KB-9885"
-#: ../rules/base.xml.in.h:137 ../rules/evdev.xml.in.h:137
+#: ../rules/base.xml.in.h:145
msgid "Chicony KU-0108"
msgstr "Chicony KU-0108"
-#: ../rules/base.xml.in.h:138 ../rules/evdev.xml.in.h:138
+#: ../rules/base.xml.in.h:146
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0420"
+
+#: ../rules/base.xml.in.h:147
msgid "China"
msgstr "Čína"
-#: ../rules/base.xml.in.h:139 ../rules/evdev.xml.in.h:139
+#: ../rules/base.xml.in.h:148
msgid "Chuvash"
msgstr "Čuvašské"
-#: ../rules/base.xml.in.h:140 ../rules/evdev.xml.in.h:140
+#: ../rules/base.xml.in.h:149
msgid "Chuvash Latin"
msgstr "Čuvašské latinské"
-#: ../rules/base.xml.in.h:141 ../rules/evdev.xml.in.h:141
+#: ../rules/base.xml.in.h:150
msgid "Classic"
msgstr "Klasické"
-#: ../rules/base.xml.in.h:142 ../rules/evdev.xml.in.h:142
+#: ../rules/base.xml.in.h:151
msgid "Classic Dvorak"
msgstr "Klasické Dvorak"
-#: ../rules/base.xml.in.h:143 ../rules/evdev.xml.in.h:143
+#: ../rules/base.xml.in.h:152
msgid "Classmate PC"
msgstr "Classmate PC"
-#: ../rules/base.xml.in.h:144 ../rules/evdev.xml.in.h:144
+#: ../rules/base.xml.in.h:153
msgid "CloGaelach"
msgstr "CloGaelach"
-#: ../rules/base.xml.in.h:145 ../rules/evdev.xml.in.h:145
+#: ../rules/base.xml.in.h:154
msgid "Colemak"
msgstr "Colemak"
-#: ../rules/base.xml.in.h:146 ../rules/evdev.xml.in.h:146
+#: ../rules/base.xml.in.h:155
msgid "Compaq Easy Access Keyboard"
msgstr "Compaq Easy Access Keyboard"
-#: ../rules/base.xml.in.h:147 ../rules/evdev.xml.in.h:147
+#: ../rules/base.xml.in.h:156
msgid "Compaq Internet Keyboard (13 keys)"
msgstr "Compaq Internet Keyboard (13 kláves)"
-#: ../rules/base.xml.in.h:148 ../rules/evdev.xml.in.h:148
+#: ../rules/base.xml.in.h:157
msgid "Compaq Internet Keyboard (18 keys)"
msgstr "Compaq Internet Keyboard (18 kláves)"
-#: ../rules/base.xml.in.h:149 ../rules/evdev.xml.in.h:149
+#: ../rules/base.xml.in.h:158
msgid "Compaq Internet Keyboard (7 keys)"
msgstr "Compaq Internet Keyboard (7 kláves)"
-#: ../rules/base.xml.in.h:150 ../rules/evdev.xml.in.h:150
+#: ../rules/base.xml.in.h:159
msgid "Compaq iPaq Keyboard"
msgstr "Compaq iPaq Keyboard"
-#: ../rules/base.xml.in.h:151 ../rules/evdev.xml.in.h:151
+#: ../rules/base.xml.in.h:160
msgid "Compose key position"
msgstr "Umístění klávesy Compose"
-#: ../rules/base.xml.in.h:152 ../rules/evdev.xml.in.h:152
+#: ../rules/base.xml.in.h:161
msgid "Congo, Democratic Republic of the"
msgstr "Konžská demokratická republika"
-#: ../rules/base.xml.in.h:153 ../rules/evdev.xml.in.h:153
-msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
-msgstr "Ctrl je přiřazena ke klávesám Win (a obvyklým klávesám Ctrl)."
+#: ../rules/base.xml.in.h:162
+msgid "Control + Alt + Backspace"
+msgstr "Ctrl + Alt + Backspace"
-#: ../rules/base.xml.in.h:154 ../rules/evdev.xml.in.h:154
-msgid "Croatia"
-msgstr "Chorvatsko"
+#: ../rules/base.xml.in.h:163
+msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
+msgstr "Ctrl je přiřazena ke klávesám Alt, Alt je přiřazena ke klávesám Win"
+
+#: ../rules/base.xml.in.h:164
+msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
+msgstr "Ctrl je přiřazena ke klávesám Win (a obvyklým klávesám Ctrl)"
+
+#: ../rules/base.xml.in.h:165
+msgid "Crimean Tatar (Dobruca-1 Q)"
+msgstr "Krymskotatarské (Dobruca-1 Q)"
-#: ../rules/base.xml.in.h:155 ../rules/evdev.xml.in.h:155
-msgid "Ctrl key at bottom left"
-msgstr "Klávesa Ctrl vlevo dole"
+#: ../rules/base.xml.in.h:166
+msgid "Crimean Tatar (Dobruca-2 Q)"
+msgstr "Krymskotatarské (Dobruca-2 Q)"
-#: ../rules/base.xml.in.h:156 ../rules/evdev.xml.in.h:156
-msgid "Ctrl key at left of 'A'"
-msgstr "Klávesa Ctrl nalevo od \"A\""
+#: ../rules/base.xml.in.h:167
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Krymskotatarské (turecké Alt-Q)"
-#: ../rules/base.xml.in.h:157 ../rules/evdev.xml.in.h:157
+#: ../rules/base.xml.in.h:168
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Krymskotatarské (turecké F)"
+
+#: ../rules/base.xml.in.h:169
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Krymskotatarské (turecké Q)"
+
+#: ../rules/base.xml.in.h:170
+msgid "Croatia"
+msgstr "Chorvatsko"
+
+#: ../rules/base.xml.in.h:171
msgid "Ctrl key position"
msgstr "Umístění klávesy Ctrl"
-#: ../rules/base.xml.in.h:158 ../rules/evdev.xml.in.h:158
-msgid "Ctrl+Shift change layout."
-msgstr "Ctrl+Shift mění rozložení."
+#: ../rules/base.xml.in.h:172
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
-#: ../rules/base.xml.in.h:159 ../rules/evdev.xml.in.h:159
+#: ../rules/base.xml.in.h:173
msgid "Cyrillic"
msgstr "Cyrilice"
-#: ../rules/base.xml.in.h:160 ../rules/evdev.xml.in.h:160
+#: ../rules/base.xml.in.h:174
msgid "Cyrillic with guillemets"
msgstr "Cyrilice s francouzskými uvozovkami"
-#: ../rules/base.xml.in.h:161 ../rules/evdev.xml.in.h:161
+#: ../rules/base.xml.in.h:175
msgid "Cyrillic, Z and ZHE swapped"
msgstr "Cyrilice, prohozené Z a Ž"
-#: ../rules/base.xml.in.h:162 ../rules/evdev.xml.in.h:162
+#: ../rules/base.xml.in.h:176
msgid "Cze"
msgstr "CZE"
-#: ../rules/base.xml.in.h:163 ../rules/evdev.xml.in.h:163
+#: ../rules/base.xml.in.h:177
msgid "Czechia"
msgstr "Česko"
-#: ../rules/base.xml.in.h:164 ../rules/evdev.xml.in.h:164
+#: ../rules/base.xml.in.h:178
+msgid "DOS"
+msgstr "DOS"
+
+#: ../rules/base.xml.in.h:179
msgid "DRC"
msgstr "DRC"
-#: ../rules/base.xml.in.h:165 ../rules/evdev.xml.in.h:165
+#: ../rules/base.xml.in.h:180
msgid "DTK2000"
msgstr "DTK2000"
-#: ../rules/base.xml.in.h:166 ../rules/evdev.xml.in.h:166
+#: ../rules/base.xml.in.h:181
msgid "Dan"
msgstr "DAN"
-#: ../rules/base.xml.in.h:167 ../rules/evdev.xml.in.h:167
+#: ../rules/base.xml.in.h:182
msgid "Dead acute"
msgstr "Mrtvá čárka"
-#: ../rules/base.xml.in.h:168 ../rules/evdev.xml.in.h:168
+#: ../rules/base.xml.in.h:183
msgid "Dead grave acute"
msgstr "Mrtvá opačná čárka (gravis)"
-#: ../rules/base.xml.in.h:169 ../rules/evdev.xml.in.h:169
-msgid "Default numeric keypad keys."
-msgstr "Výchozí numerická klávesnice."
+#: ../rules/base.xml.in.h:184
+msgid "Default numeric keypad keys"
+msgstr "Výchozí numerická klávesnice"
-#: ../rules/base.xml.in.h:170 ../rules/evdev.xml.in.h:170
+#: ../rules/base.xml.in.h:185
msgid "Dell"
msgstr "Dell"
-#: ../rules/base.xml.in.h:171 ../rules/evdev.xml.in.h:171
+#: ../rules/base.xml.in.h:186
msgid "Dell 101-key PC"
msgstr "Dell PC 101klávesové"
-#: ../rules/base.xml.in.h:172 ../rules/evdev.xml.in.h:172
+#: ../rules/base.xml.in.h:187
msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
msgstr "Notebook Dell Inspiron 6xxx/8xxx"
-#: ../rules/base.xml.in.h:173 ../rules/evdev.xml.in.h:173
+#: ../rules/base.xml.in.h:188
msgid "Dell Laptop/notebook Precision M series"
msgstr "Notebook Dell řady Precision M"
-#: ../rules/base.xml.in.h:174 ../rules/evdev.xml.in.h:174
+#: ../rules/base.xml.in.h:189
msgid "Dell Latitude series laptop"
msgstr "Notebook řady Dell Latitude"
-#: ../rules/base.xml.in.h:175 ../rules/evdev.xml.in.h:175
+#: ../rules/base.xml.in.h:190
msgid "Dell Precision M65"
msgstr "Dell Precision M65"
-#: ../rules/base.xml.in.h:176 ../rules/evdev.xml.in.h:176
+#: ../rules/base.xml.in.h:191
msgid "Dell SK-8125"
msgstr "Dell SK-8125"
-#: ../rules/base.xml.in.h:177 ../rules/evdev.xml.in.h:177
+#: ../rules/base.xml.in.h:192
msgid "Dell SK-8135"
msgstr "Dell SK-8135"
-#: ../rules/base.xml.in.h:178 ../rules/evdev.xml.in.h:178
+#: ../rules/base.xml.in.h:193
msgid "Dell USB Multimedia Keyboard"
msgstr "Dell USB Multimedia Keyboard"
-#: ../rules/base.xml.in.h:179 ../rules/evdev.xml.in.h:179
+#: ../rules/base.xml.in.h:194
msgid "Denmark"
msgstr "Dánsko"
-#: ../rules/base.xml.in.h:180 ../rules/evdev.xml.in.h:180
+#: ../rules/base.xml.in.h:195
msgid "Deu"
msgstr "DEU"
-#: ../rules/base.xml.in.h:181 ../rules/evdev.xml.in.h:181
+#: ../rules/base.xml.in.h:196
msgid "Dexxa Wireless Desktop Keyboard"
msgstr "Dexxa Wireless Desktop Keyboard"
-#: ../rules/base.xml.in.h:182 ../rules/evdev.xml.in.h:182
+#: ../rules/base.xml.in.h:197
msgid "Diamond 9801 / 9802 series"
msgstr "Řada Diamond 9801 / 9802"
-#: ../rules/base.xml.in.h:183 ../rules/evdev.xml.in.h:183
+#: ../rules/base.xml.in.h:198
msgid "Dvorak"
msgstr "Dvorak"
-#: ../rules/base.xml.in.h:184 ../rules/evdev.xml.in.h:184
+#: ../rules/base.xml.in.h:199
msgid "Dvorak (UK Punctuation)"
msgstr "Dvorak (britská interpunkce)"
-#: ../rules/base.xml.in.h:185 ../rules/evdev.xml.in.h:185
+#: ../rules/base.xml.in.h:200
msgid "Dvorak international"
msgstr "Dvorak mezinárodní"
-#: ../rules/base.xml.in.h:186 ../rules/evdev.xml.in.h:186
-msgid "Dvorak, Polish quotes on key \"1/!\""
-msgstr "Dvorak, polské uvozovky na klávese \"1/!\""
+#: ../rules/base.xml.in.h:201
+msgid "Dvorak, Polish quotes on key 1"
+msgstr "Dvorak, polské uvozovky na klávese 1"
-#: ../rules/base.xml.in.h:187 ../rules/evdev.xml.in.h:187
+#: ../rules/base.xml.in.h:202
msgid "Dvorak, Polish quotes on quotemark key"
msgstr "Dvorak, polské uvozovky na klávese uvozovky"
-#: ../rules/base.xml.in.h:188 ../rules/evdev.xml.in.h:188
+#: ../rules/base.xml.in.h:203
+msgid "E"
+msgstr "E"
+
+#: ../rules/base.xml.in.h:204
msgid "Eastern"
msgstr "Východní"
-#: ../rules/base.xml.in.h:189 ../rules/evdev.xml.in.h:189
+#: ../rules/base.xml.in.h:205
msgid "Eliminate dead keys"
msgstr "Vyloučit mrtvé klávesy"
-#: ../rules/base.xml.in.h:190 ../rules/evdev.xml.in.h:190
+#: ../rules/base.xml.in.h:206
+msgid "Enable extra typographic characters"
+msgstr "Povolit přídavné znaky hladké sazby"
+
+#: ../rules/base.xml.in.h:207
+msgid "English"
+msgstr "Anglické"
+
+#: ../rules/base.xml.in.h:208
msgid "Ennyah DKB-1008"
msgstr "Ennyah DKB-1008"
-#: ../rules/base.xml.in.h:191 ../rules/evdev.xml.in.h:191
+#: ../rules/base.xml.in.h:209
+msgid "Enter on keypad"
+msgstr "Enter na numerické klávesnici"
+
+#: ../rules/base.xml.in.h:210
msgid "Epo"
msgstr "EPO"
-#: ../rules/base.xml.in.h:192 ../rules/evdev.xml.in.h:192
+#: ../rules/base.xml.in.h:211
msgid "Ergonomic"
msgstr "Ergonomické"
-#: ../rules/base.xml.in.h:193 ../rules/evdev.xml.in.h:193
+#: ../rules/base.xml.in.h:212
msgid "Esp"
msgstr "ESP"
-#: ../rules/base.xml.in.h:194 ../rules/evdev.xml.in.h:194
+#: ../rules/base.xml.in.h:213
msgid "Esperanto"
msgstr "Esperanto"
-#: ../rules/base.xml.in.h:195 ../rules/evdev.xml.in.h:195
+#: ../rules/base.xml.in.h:214
msgid "Est"
msgstr "EST"
-#: ../rules/base.xml.in.h:196 ../rules/evdev.xml.in.h:196
+#: ../rules/base.xml.in.h:215
msgid "Estonia"
msgstr "Estonsko"
-#: ../rules/base.xml.in.h:197 ../rules/evdev.xml.in.h:197
+#: ../rules/base.xml.in.h:216
msgid "Eth"
msgstr "ETH"
-#: ../rules/base.xml.in.h:198 ../rules/evdev.xml.in.h:198
+#: ../rules/base.xml.in.h:217
msgid "Ethiopia"
msgstr "Etiopie"
-#: ../rules/base.xml.in.h:199 ../rules/evdev.xml.in.h:199
+#: ../rules/base.xml.in.h:218
msgid "Evdev-managed keyboard"
msgstr "Klávesnice spravovaná pomocí Evdev"
-#: ../rules/base.xml.in.h:200 ../rules/evdev.xml.in.h:200
+#: ../rules/base.xml.in.h:219
msgid "Everex STEPnote"
msgstr "Everex STEPnote"
-#: ../rules/base.xml.in.h:201 ../rules/evdev.xml.in.h:201
+#: ../rules/base.xml.in.h:220
msgid "Ewe"
msgstr "Ewe"
-#: ../rules/base.xml.in.h:202 ../rules/evdev.xml.in.h:202
+#: ../rules/base.xml.in.h:221
msgid "Extended"
msgstr "Rozšířené"
-#: ../rules/base.xml.in.h:203 ../rules/evdev.xml.in.h:203
+#: ../rules/base.xml.in.h:222
+msgid "Extended - Winkeys"
+msgstr "Rozšířené - klávesy Win"
+
+#: ../rules/base.xml.in.h:223
msgid "Extended Backslash"
msgstr "Rozšířená klávesa zpětného lomítka"
-#: ../rules/base.xml.in.h:204 ../rules/evdev.xml.in.h:204
+#: ../rules/base.xml.in.h:224
msgid "F-letter (F) variant"
msgstr "Varianta se znakem F"
-#: ../rules/base.xml.in.h:205 ../rules/evdev.xml.in.h:205
+#: ../rules/base.xml.in.h:225
+msgid "FL90"
+msgstr "FL90"
+
+#: ../rules/base.xml.in.h:226
msgid "Fao"
msgstr "FAO"
-#: ../rules/base.xml.in.h:206 ../rules/evdev.xml.in.h:206
+#: ../rules/base.xml.in.h:227
msgid "Faroe Islands"
msgstr "Faerské ostrovy"
-#: ../rules/base.xml.in.h:207 ../rules/evdev.xml.in.h:207
+#: ../rules/base.xml.in.h:228
msgid "Fin"
msgstr "FIN"
-#: ../rules/base.xml.in.h:208 ../rules/evdev.xml.in.h:208
+#: ../rules/base.xml.in.h:229
msgid "Finland"
msgstr "Finsko"
#. This assumes the KP_ abstract symbols are actually useful for some apps
#. The description needs to be rewritten
-#: ../rules/base.xml.in.h:211 ../rules/evdev.xml.in.h:211
+#: ../rules/base.xml.in.h:232
msgid "Four-level key with abstract separators"
msgstr "Klávesa čtvrté úrovně s abstraktními oddělovači"
-#: ../rules/base.xml.in.h:212 ../rules/evdev.xml.in.h:212
+#: ../rules/base.xml.in.h:233
msgid "Four-level key with comma"
msgstr "Klávesa čtvrté úrovně s čárkou"
-#: ../rules/base.xml.in.h:213 ../rules/evdev.xml.in.h:213
+#: ../rules/base.xml.in.h:234
msgid "Four-level key with dot"
msgstr "Klávesa čtvrté úrovně s tečkou"
-#: ../rules/base.xml.in.h:214 ../rules/evdev.xml.in.h:214
+#: ../rules/base.xml.in.h:235
+msgid "Four-level key with dot, latin-9 restriction"
+msgstr "Klávesa čtvrté úrovně s tečkou, omezení Latin-9"
+
+#: ../rules/base.xml.in.h:236
msgid "Four-level key with momayyez"
msgstr "Klávesa čtvrté úrovně se znakem momajjez"
-#: ../rules/base.xml.in.h:215 ../rules/evdev.xml.in.h:215
+#: ../rules/base.xml.in.h:237
msgid "Fra"
msgstr "FRA"
-#: ../rules/base.xml.in.h:216 ../rules/evdev.xml.in.h:216
+#: ../rules/base.xml.in.h:238
msgid "France"
msgstr "Francie"
-#: ../rules/base.xml.in.h:217 ../rules/evdev.xml.in.h:217
+#: ../rules/base.xml.in.h:239
msgid "French"
msgstr "Francouzské"
-#: ../rules/base.xml.in.h:218 ../rules/evdev.xml.in.h:218
+#: ../rules/base.xml.in.h:240
msgid "French (Macintosh)"
msgstr "Francouzské (Macintosh)"
-#: ../rules/base.xml.in.h:219 ../rules/evdev.xml.in.h:219
+#: ../rules/base.xml.in.h:241
msgid "French (legacy)"
msgstr "Francouzské (zděděné)"
-#: ../rules/base.xml.in.h:220 ../rules/evdev.xml.in.h:220
+#: ../rules/base.xml.in.h:242
msgid "French Dvorak"
msgstr "Francouzské Dvorak"
-#: ../rules/base.xml.in.h:221 ../rules/evdev.xml.in.h:221
+#: ../rules/base.xml.in.h:243
msgid "French, Sun dead keys"
msgstr "Francouzské, mrtvé klávesy Sun"
-#: ../rules/base.xml.in.h:222 ../rules/evdev.xml.in.h:222
+#: ../rules/base.xml.in.h:244
msgid "French, eliminate dead keys"
msgstr "Francouzské, vyloučit mrtvé klávesy"
-#: ../rules/base.xml.in.h:223 ../rules/evdev.xml.in.h:223
-msgid "Fujitsu-Siemens Computers AMILO A1667G laptop"
-msgstr "Notebook Fujitsu-Siemens Computers AMILO A1667G"
+#: ../rules/base.xml.in.h:245
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Notebook Fujitsu-Siemens Computers AMILO"
-#: ../rules/base.xml.in.h:224 ../rules/evdev.xml.in.h:224
+#: ../rules/base.xml.in.h:246
msgid "Fula"
msgstr "Fula"
-#: ../rules/base.xml.in.h:225 ../rules/evdev.xml.in.h:225
+#: ../rules/base.xml.in.h:247
msgid "GBr"
msgstr "GBR"
-#: ../rules/base.xml.in.h:226 ../rules/evdev.xml.in.h:226
+#: ../rules/base.xml.in.h:248
msgid "Ga"
msgstr "GA"
-#: ../rules/base.xml.in.h:227 ../rules/evdev.xml.in.h:227
+#: ../rules/base.xml.in.h:249
msgid "Generic 101-key PC"
msgstr "Obecné PC 101klávesové"
-#: ../rules/base.xml.in.h:228 ../rules/evdev.xml.in.h:228
+#: ../rules/base.xml.in.h:250
msgid "Generic 102-key (Intl) PC"
msgstr "Obecné PC 102klávesové (mez.)"
-#: ../rules/base.xml.in.h:229 ../rules/evdev.xml.in.h:229
+#: ../rules/base.xml.in.h:251
msgid "Generic 104-key PC"
msgstr "Obecné PC 104klávesové"
-#: ../rules/base.xml.in.h:230 ../rules/evdev.xml.in.h:230
+#: ../rules/base.xml.in.h:252
msgid "Generic 105-key (Intl) PC"
msgstr "Obecné PC 105klávesové (mez.)"
-#: ../rules/base.xml.in.h:231 ../rules/evdev.xml.in.h:231
+#: ../rules/base.xml.in.h:253
msgid "Genius Comfy KB-12e"
msgstr "Genius Comfy KB-12e"
-#: ../rules/base.xml.in.h:232 ../rules/evdev.xml.in.h:232
+#: ../rules/base.xml.in.h:254
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:233 ../rules/evdev.xml.in.h:233
+#: ../rules/base.xml.in.h:255
msgid "Genius Comfy KB-21e-Scroll"
msgstr "Genius Comfy KB-21e-Scroll"
-#: ../rules/base.xml.in.h:234 ../rules/evdev.xml.in.h:234
+#: ../rules/base.xml.in.h:256
msgid "Genius KB-19e NB"
msgstr "Genius KB-19e NB"
-#: ../rules/base.xml.in.h:235 ../rules/evdev.xml.in.h:235
+#: ../rules/base.xml.in.h:257
+msgid "Genius KKB-2050HS"
+msgstr "Genius KKB-2050HS"
+
+#: ../rules/base.xml.in.h:258
msgid "Geo"
msgstr "GEO"
-#: ../rules/base.xml.in.h:236 ../rules/evdev.xml.in.h:236
+#: ../rules/base.xml.in.h:259
msgid "Georgia"
msgstr "Gruzie"
-#: ../rules/base.xml.in.h:237 ../rules/evdev.xml.in.h:237
+#: ../rules/base.xml.in.h:260
msgid "Georgian"
msgstr "Gruzínské"
-#: ../rules/base.xml.in.h:238 ../rules/evdev.xml.in.h:238
+#: ../rules/base.xml.in.h:261
msgid "Georgian AZERTY Tskapo"
msgstr "Gruzínské AZERTY Tskapo"
-#: ../rules/base.xml.in.h:239 ../rules/evdev.xml.in.h:239
+#: ../rules/base.xml.in.h:262
msgid "German (Macintosh)"
msgstr "Německé (Macintosh)"
-#: ../rules/base.xml.in.h:240 ../rules/evdev.xml.in.h:240
+#: ../rules/base.xml.in.h:263
msgid "German, Sun dead keys"
msgstr "Německé, mrtvé klávesy Sun"
-#: ../rules/base.xml.in.h:241 ../rules/evdev.xml.in.h:241
+#: ../rules/base.xml.in.h:264
msgid "German, eliminate dead keys"
msgstr "Německé, vyloučit mrtvé klávesy"
-#: ../rules/base.xml.in.h:242 ../rules/evdev.xml.in.h:242
+#: ../rules/base.xml.in.h:265
msgid "Germany"
msgstr "Německo"
-#: ../rules/base.xml.in.h:243 ../rules/evdev.xml.in.h:243
+#: ../rules/base.xml.in.h:266
msgid "Gha"
msgstr "GHA"
-#: ../rules/base.xml.in.h:244 ../rules/evdev.xml.in.h:244
+#: ../rules/base.xml.in.h:267
msgid "Ghana"
msgstr "Ghana"
-#: ../rules/base.xml.in.h:245 ../rules/evdev.xml.in.h:245
+#: ../rules/base.xml.in.h:268
msgid "Gre"
msgstr "GRE"
-#: ../rules/base.xml.in.h:246 ../rules/evdev.xml.in.h:246
+#: ../rules/base.xml.in.h:269
msgid "Greece"
msgstr "Řecko"
-#: ../rules/base.xml.in.h:247 ../rules/evdev.xml.in.h:247
+#: ../rules/base.xml.in.h:270
msgid "Group toggle on multiply/divide key"
msgstr "Přepínání skupiny klávesou násobení/dělení"
-#: ../rules/base.xml.in.h:248 ../rules/evdev.xml.in.h:248
+#: ../rules/base.xml.in.h:271
msgid "Gui"
msgstr "GUI"
-#: ../rules/base.xml.in.h:249 ../rules/evdev.xml.in.h:249
+#: ../rules/base.xml.in.h:272
msgid "Guinea"
msgstr "Guinea"
-#: ../rules/base.xml.in.h:250 ../rules/evdev.xml.in.h:250
+#: ../rules/base.xml.in.h:273
msgid "Gujarati"
msgstr "Gudžarátské"
-#: ../rules/base.xml.in.h:251 ../rules/evdev.xml.in.h:251
+#: ../rules/base.xml.in.h:274
msgid "Gurmukhi"
msgstr "Gurmuchské"
-#: ../rules/base.xml.in.h:252 ../rules/evdev.xml.in.h:252
+#: ../rules/base.xml.in.h:275
msgid "Gurmukhi Jhelum"
msgstr "Gurmuchské (Jhelum)"
-#: ../rules/base.xml.in.h:253 ../rules/evdev.xml.in.h:253
+#: ../rules/base.xml.in.h:276
msgid "Gyration"
msgstr "Gyration"
-#: ../rules/base.xml.in.h:254 ../rules/evdev.xml.in.h:254
+#: ../rules/base.xml.in.h:277
msgid "Happy Hacking Keyboard"
msgstr "Happy Hacking Keyboard"
-#: ../rules/base.xml.in.h:255 ../rules/evdev.xml.in.h:255
+#: ../rules/base.xml.in.h:278
msgid "Happy Hacking Keyboard for Mac"
msgstr "Happy Hacking Keyboard for Mac"
-#: ../rules/base.xml.in.h:256 ../rules/evdev.xml.in.h:256
+#: ../rules/base.xml.in.h:279
msgid "Hausa"
msgstr "Hausa"
-#: ../rules/base.xml.in.h:257 ../rules/evdev.xml.in.h:257
+#: ../rules/base.xml.in.h:280
msgid "Hewlett-Packard Internet Keyboard"
msgstr "Hewlett-Packard Internet Keyboard"
-#: ../rules/base.xml.in.h:258 ../rules/evdev.xml.in.h:258
-msgid "Hewlett-Packard Internet Keyboard 5181"
-msgstr "Hewlett-Packard Internet Keyboard 5181"
-
-#: ../rules/base.xml.in.h:259 ../rules/evdev.xml.in.h:259
-msgid "Hewlett-Packard Internet Keyboard 5185"
-msgstr "Hewlett-Packard Internet Keyboard 5185"
-
-#: ../rules/base.xml.in.h:260 ../rules/evdev.xml.in.h:260
+#: ../rules/base.xml.in.h:281
msgid "Hewlett-Packard Omnibook 500 FA"
msgstr "Hewlett-Packard Omnibook 500 FA"
-#: ../rules/base.xml.in.h:261 ../rules/evdev.xml.in.h:261
+#: ../rules/base.xml.in.h:282
msgid "Hewlett-Packard Omnibook 5xx"
msgstr "Hewlett-Packard Omnibook 5xx"
-#: ../rules/base.xml.in.h:262 ../rules/evdev.xml.in.h:262
+#: ../rules/base.xml.in.h:283
msgid "Hewlett-Packard Omnibook 6000/6100"
msgstr "Hewlett-Packard Omnibook 6000/6100"
-#: ../rules/base.xml.in.h:263 ../rules/evdev.xml.in.h:263
+#: ../rules/base.xml.in.h:284
msgid "Hewlett-Packard Omnibook XE3 GC"
msgstr "Hewlett-Packard Omnibook XE3 GC"
-#: ../rules/base.xml.in.h:264 ../rules/evdev.xml.in.h:264
+#: ../rules/base.xml.in.h:285
msgid "Hewlett-Packard Omnibook XE3 GF"
msgstr "Hewlett-Packard Omnibook XE3 GF"
-#: ../rules/base.xml.in.h:265 ../rules/evdev.xml.in.h:265
+#: ../rules/base.xml.in.h:286
msgid "Hewlett-Packard Omnibook XT1000"
msgstr "Hewlett-Packard Omnibook XT1000"
-#: ../rules/base.xml.in.h:266 ../rules/evdev.xml.in.h:266
+#: ../rules/base.xml.in.h:287
msgid "Hewlett-Packard Pavilion ZT11xx"
msgstr "Hewlett-Packard Pavilion ZT11xx"
-#: ../rules/base.xml.in.h:267 ../rules/evdev.xml.in.h:267
-msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
+#: ../rules/base.xml.in.h:288
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
-#: ../rules/base.xml.in.h:268 ../rules/evdev.xml.in.h:268
-msgid "Hewlett-Packard SK-2505 Internet Keyboard"
-msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
+#: ../rules/base.xml.in.h:289
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-250x Multimedia Keyboard"
-#: ../rules/base.xml.in.h:269 ../rules/evdev.xml.in.h:269
+#: ../rules/base.xml.in.h:290
msgid "Hewlett-Packard nx9020"
msgstr "Hewlett-Packard nx9020"
-#: ../rules/base.xml.in.h:270 ../rules/evdev.xml.in.h:270
+#: ../rules/base.xml.in.h:291
+msgid "Hexadecimal"
+msgstr "Hexadecimální"
+
+#: ../rules/base.xml.in.h:292
msgid "Hindi Bolnagri"
msgstr "Hindské bolnagri"
-#: ../rules/base.xml.in.h:271 ../rules/evdev.xml.in.h:271
+#: ../rules/base.xml.in.h:293
+msgid "Hindi Wx"
+msgstr "Hindské Wx"
+
+#: ../rules/base.xml.in.h:294
msgid "Homophonic"
msgstr "Stejně znějící"
-#: ../rules/base.xml.in.h:272 ../rules/evdev.xml.in.h:272
+#: ../rules/base.xml.in.h:295
msgid "Honeywell Euroboard"
msgstr "Honeywell Euroboard"
-#: ../rules/base.xml.in.h:273 ../rules/evdev.xml.in.h:273
+#: ../rules/base.xml.in.h:296
msgid "Hrv"
msgstr "HRV"
-#: ../rules/base.xml.in.h:274 ../rules/evdev.xml.in.h:274
+#: ../rules/base.xml.in.h:297
msgid "Hun"
msgstr "HUN"
-#: ../rules/base.xml.in.h:275 ../rules/evdev.xml.in.h:275
+#: ../rules/base.xml.in.h:298
msgid "Hungary"
msgstr "Maďarsko"
-#: ../rules/base.xml.in.h:276 ../rules/evdev.xml.in.h:276
-msgid "Hyper is mapped to the Win-keys."
-msgstr "Hyper je přiřazena ke klávesám Win."
+#: ../rules/base.xml.in.h:299
+msgid "Hyper is mapped to Win-keys"
+msgstr "Hyper je přiřazena ke klávesám Win"
-#: ../rules/base.xml.in.h:277 ../rules/evdev.xml.in.h:277
+#: ../rules/base.xml.in.h:300
msgid "IBM (LST 1205-92)"
msgstr "IBM (LST 1205-92)"
-#: ../rules/base.xml.in.h:278 ../rules/evdev.xml.in.h:278
+#: ../rules/base.xml.in.h:301
msgid "IBM Rapid Access"
msgstr "IBM Rapid Access"
-#: ../rules/base.xml.in.h:279 ../rules/evdev.xml.in.h:279
+#: ../rules/base.xml.in.h:302
msgid "IBM Rapid Access II"
msgstr "IBM Rapid Access II"
-#: ../rules/base.xml.in.h:280 ../rules/evdev.xml.in.h:280
-msgid "IBM Rapid Access II (alternate option)"
-msgstr "IBM Rapid Access II (alternativní volba)"
-
-#: ../rules/base.xml.in.h:281 ../rules/evdev.xml.in.h:281
+#: ../rules/base.xml.in.h:303
msgid "IBM Space Saver"
msgstr "IBM Space Saver"
-#: ../rules/base.xml.in.h:282 ../rules/evdev.xml.in.h:282
+#: ../rules/base.xml.in.h:304
msgid "IBM ThinkPad 560Z/600/600E/A22E"
msgstr "IBM ThinkPad 560Z/600/600E/A22E"
-#: ../rules/base.xml.in.h:283 ../rules/evdev.xml.in.h:283
+#: ../rules/base.xml.in.h:305
msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
msgstr "IBM ThinkPad 560Z/600/600E/A22E, mez."
-#: ../rules/base.xml.in.h:284 ../rules/evdev.xml.in.h:284
+#: ../rules/base.xml.in.h:306
msgid "IBM ThinkPad R60/T60/R61/T61"
msgstr "IBM ThinkPad R60/T60/R61/T61"
-#: ../rules/base.xml.in.h:285 ../rules/evdev.xml.in.h:285
+#: ../rules/base.xml.in.h:307
msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
-#: ../rules/base.xml.in.h:286 ../rules/evdev.xml.in.h:286
+#: ../rules/base.xml.in.h:308
msgid "ISO Alternate"
msgstr "ISO alternativní"
-#: ../rules/base.xml.in.h:287 ../rules/evdev.xml.in.h:287
+#: ../rules/base.xml.in.h:309
msgid "Iceland"
msgstr "Island"
-#: ../rules/base.xml.in.h:288 ../rules/evdev.xml.in.h:288
+#: ../rules/base.xml.in.h:310
msgid "Igbo"
msgstr "Igbo"
-#: ../rules/base.xml.in.h:289 ../rules/evdev.xml.in.h:289
+#: ../rules/base.xml.in.h:311
+msgid "Include dead tilde"
+msgstr "Zahrnout mrtvou klávesu vlnovky"
+
+#: ../rules/base.xml.in.h:312
msgid "Ind"
msgstr "IND"
-#: ../rules/base.xml.in.h:290 ../rules/evdev.xml.in.h:290
+#: ../rules/base.xml.in.h:313
msgid "India"
msgstr "Indie"
-#: ../rules/base.xml.in.h:291 ../rules/evdev.xml.in.h:291
+#: ../rules/base.xml.in.h:314
msgid "International (AltGr dead keys)"
msgstr "Mezinárodní (mrtvé klávesy AltGr)"
-#: ../rules/base.xml.in.h:292 ../rules/evdev.xml.in.h:292
+#: ../rules/base.xml.in.h:315
msgid "International (with dead keys)"
msgstr "Mezinárodní (s mrtvými klávesami)"
-#: ../rules/base.xml.in.h:293 ../rules/evdev.xml.in.h:293
+#: ../rules/base.xml.in.h:316
msgid "Inuktitut"
msgstr "Inuktitut"
-#: ../rules/base.xml.in.h:294 ../rules/evdev.xml.in.h:294
+#: ../rules/base.xml.in.h:317
msgid "Iran"
msgstr "Írán"
-#: ../rules/base.xml.in.h:295 ../rules/evdev.xml.in.h:295
+#: ../rules/base.xml.in.h:318
msgid "Iraq"
msgstr "Irák"
-#: ../rules/base.xml.in.h:296 ../rules/evdev.xml.in.h:296
+#: ../rules/base.xml.in.h:319
msgid "Ireland"
msgstr "Irsko"
-#: ../rules/base.xml.in.h:297 ../rules/evdev.xml.in.h:297
+#: ../rules/base.xml.in.h:320
msgid "Irl"
msgstr "IRL"
-#: ../rules/base.xml.in.h:298 ../rules/evdev.xml.in.h:298
+#: ../rules/base.xml.in.h:321
msgid "Irn"
msgstr "IRN"
-#: ../rules/base.xml.in.h:299 ../rules/evdev.xml.in.h:299
+#: ../rules/base.xml.in.h:322
msgid "Irq"
msgstr "IRQ"
-#: ../rules/base.xml.in.h:300 ../rules/evdev.xml.in.h:300
+#: ../rules/base.xml.in.h:323
msgid "Isl"
msgstr "ISL"
-#: ../rules/base.xml.in.h:301 ../rules/evdev.xml.in.h:301
+#: ../rules/base.xml.in.h:324
msgid "Isr"
msgstr "ISR"
-#: ../rules/base.xml.in.h:302 ../rules/evdev.xml.in.h:302
+#: ../rules/base.xml.in.h:325
msgid "Israel"
msgstr "Izrael"
-#: ../rules/base.xml.in.h:303 ../rules/evdev.xml.in.h:303
+#: ../rules/base.xml.in.h:326
msgid "Ita"
msgstr "ITA"
-#: ../rules/base.xml.in.h:304 ../rules/evdev.xml.in.h:304
+#: ../rules/base.xml.in.h:327
msgid "Italy"
msgstr "Itálie"
-#: ../rules/base.xml.in.h:305 ../rules/evdev.xml.in.h:305
+#: ../rules/base.xml.in.h:328
msgid "Japan"
msgstr "Japonsko"
-#: ../rules/base.xml.in.h:306 ../rules/evdev.xml.in.h:306
+#: ../rules/base.xml.in.h:329
msgid "Japan (PC-98xx Series)"
msgstr "Japonsko (řada PC-98xx)"
-#: ../rules/base.xml.in.h:307 ../rules/evdev.xml.in.h:307
-msgid "Japanese 106-key"
-msgstr "Japonské 106klávesové"
-
-#: ../rules/base.xml.in.h:308 ../rules/evdev.xml.in.h:308
+#: ../rules/base.xml.in.h:330
msgid "Japanese keyboard options"
msgstr "Volby japonské klávesnice"
-#: ../rules/base.xml.in.h:309 ../rules/evdev.xml.in.h:309
+#: ../rules/base.xml.in.h:331
msgid "Jpn"
msgstr "JPN"
-#: ../rules/base.xml.in.h:310 ../rules/evdev.xml.in.h:310
+#: ../rules/base.xml.in.h:332
+msgid "Kalmyk"
+msgstr "Kalmycké"
+
+#: ../rules/base.xml.in.h:333
msgid "Kana"
msgstr "Kana"
-#: ../rules/base.xml.in.h:311 ../rules/evdev.xml.in.h:311
+#: ../rules/base.xml.in.h:334
msgid "Kana Lock key is locking"
msgstr "Klávesa Kana Lock uzamyká"
-#: ../rules/base.xml.in.h:312 ../rules/evdev.xml.in.h:312
+#: ../rules/base.xml.in.h:335
msgid "Kannada"
msgstr "Kannadské"
-#: ../rules/base.xml.in.h:313 ../rules/evdev.xml.in.h:313
+#: ../rules/base.xml.in.h:336
msgid "Kashubian"
msgstr "Kašubské"
-#: ../rules/base.xml.in.h:314 ../rules/evdev.xml.in.h:314
+#: ../rules/base.xml.in.h:337
msgid "Kaz"
msgstr "KAZ"
-#: ../rules/base.xml.in.h:315 ../rules/evdev.xml.in.h:315
+#: ../rules/base.xml.in.h:338
msgid "Kazakh with Russian"
msgstr "Kazašská s ruštinou"
-#: ../rules/base.xml.in.h:316 ../rules/evdev.xml.in.h:316
+#: ../rules/base.xml.in.h:339
msgid "Kazakhstan"
msgstr "Kazachstán"
-#: ../rules/base.xml.in.h:317 ../rules/evdev.xml.in.h:317
-msgid "Keypad"
-msgstr "Numerická klávesnice"
+#: ../rules/base.xml.in.h:340
+msgid "Key sequence to kill the X server"
+msgstr "Pořadí kláves zabíjející server X"
+
+#: ../rules/base.xml.in.h:341
+msgid "Key to choose 3rd level"
+msgstr "Klávesa umožňující výběr 3. úrovně"
-#: ../rules/base.xml.in.h:318 ../rules/evdev.xml.in.h:318
-msgid "Keypad with unicode additions (arrows and math operators)"
-msgstr "Numerická klávesnice s doplňky Unicode (šipky a matematické operátory)"
+#: ../rules/base.xml.in.h:342
+msgid "Key(s) to change layout"
+msgstr "Klávesa měnící rozložení"
-#: ../rules/base.xml.in.h:319 ../rules/evdev.xml.in.h:319
-msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Numerická klávesnice s doplňky Unicode (šipky a matematické operátory). Matematické operátory na výchozí úrovni."
+#: ../rules/base.xml.in.h:343
+msgid "Keypad"
+msgstr "Numerická klávesnice"
-#: ../rules/base.xml.in.h:320 ../rules/evdev.xml.in.h:320
+#: ../rules/base.xml.in.h:344
msgid "Keytronic FlexPro"
msgstr "Keytronic FlexPro"
-#: ../rules/base.xml.in.h:321 ../rules/evdev.xml.in.h:321
+#: ../rules/base.xml.in.h:345
+msgid "Kgz"
+msgstr "KGZ"
+
+#: ../rules/base.xml.in.h:346
msgid "Khm"
msgstr "KHM"
-#: ../rules/base.xml.in.h:322 ../rules/evdev.xml.in.h:322
-msgid "Kir"
-msgstr "KIR"
-
-#: ../rules/base.xml.in.h:323 ../rules/evdev.xml.in.h:323
+#: ../rules/base.xml.in.h:347
msgid "Komi"
msgstr "Komi"
-#: ../rules/base.xml.in.h:324 ../rules/evdev.xml.in.h:324
+#: ../rules/base.xml.in.h:348
msgid "Kor"
msgstr "KOR"
-#: ../rules/base.xml.in.h:325 ../rules/evdev.xml.in.h:325
+#: ../rules/base.xml.in.h:349
msgid "Korea, Republic of"
msgstr "Korejská republika"
-#: ../rules/base.xml.in.h:326 ../rules/evdev.xml.in.h:326
-msgid "Korean 106-key"
-msgstr "Korejské 106klávesové"
-
-#: ../rules/base.xml.in.h:327 ../rules/evdev.xml.in.h:327
+#: ../rules/base.xml.in.h:350
msgid "Ktunaxa"
msgstr "Ktunaxa"
-#: ../rules/base.xml.in.h:328 ../rules/evdev.xml.in.h:328
+#: ../rules/base.xml.in.h:351
msgid "Kurdish, (F)"
msgstr "Kurdské, (F)"
-#: ../rules/base.xml.in.h:329 ../rules/evdev.xml.in.h:329
+#: ../rules/base.xml.in.h:352
msgid "Kurdish, Arabic-Latin"
msgstr "Kurdské, arabsko-latinské"
-#: ../rules/base.xml.in.h:330 ../rules/evdev.xml.in.h:330
+#: ../rules/base.xml.in.h:353
msgid "Kurdish, Latin Alt-Q"
msgstr "Kurdské, latinské Alt-Q"
-#: ../rules/base.xml.in.h:331 ../rules/evdev.xml.in.h:331
+#: ../rules/base.xml.in.h:354
msgid "Kurdish, Latin Q"
msgstr "Kurdské, latinské Q"
-#: ../rules/base.xml.in.h:332 ../rules/evdev.xml.in.h:332
+#: ../rules/base.xml.in.h:355
msgid "Kyrgyzstan"
msgstr "Kyrgyzstán"
-#: ../rules/base.xml.in.h:333 ../rules/evdev.xml.in.h:333
+#: ../rules/base.xml.in.h:356
msgid "LAm"
msgstr "LAm"
-#: ../rules/base.xml.in.h:334 ../rules/evdev.xml.in.h:334
-msgid "LCtrl+LShift change layout."
-msgstr "Levá klávesa Ctrl a levá klávesa Shift mění rozložení."
-
-#: ../rules/base.xml.in.h:335 ../rules/evdev.xml.in.h:335
+#: ../rules/base.xml.in.h:357
msgid "LEKP"
msgstr "LEKP"
-#: ../rules/base.xml.in.h:336 ../rules/evdev.xml.in.h:336
+#: ../rules/base.xml.in.h:358
msgid "LEKPa"
msgstr "LEKPa"
-#: ../rules/base.xml.in.h:337 ../rules/evdev.xml.in.h:337
+#: ../rules/base.xml.in.h:359
msgid "Lao"
msgstr "LAO"
-#: ../rules/base.xml.in.h:338 ../rules/evdev.xml.in.h:338
+#: ../rules/base.xml.in.h:360
msgid "Laos"
msgstr "Laos"
-#: ../rules/base.xml.in.h:339 ../rules/evdev.xml.in.h:339
+#: ../rules/base.xml.in.h:361
msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
msgstr "Laptop Keyboard pro notebook Compaq (např. Armada)"
-#: ../rules/base.xml.in.h:340 ../rules/evdev.xml.in.h:340
+#: ../rules/base.xml.in.h:362
msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
msgstr "Internet Keyboard pro notebook Compaq (např. Presario)"
-#: ../rules/base.xml.in.h:341 ../rules/evdev.xml.in.h:341
+#: ../rules/base.xml.in.h:363
msgid "Laptop/notebook eMachines m68xx"
msgstr "Notebook eMachines m68xx"
-#: ../rules/base.xml.in.h:342 ../rules/evdev.xml.in.h:342
+#: ../rules/base.xml.in.h:364
msgid "Latin"
msgstr "Latinské"
-#: ../rules/base.xml.in.h:343 ../rules/evdev.xml.in.h:343
+#: ../rules/base.xml.in.h:365
msgid "Latin American"
msgstr "Latinskoamerické"
-#: ../rules/base.xml.in.h:344 ../rules/evdev.xml.in.h:344
+#: ../rules/base.xml.in.h:366
msgid "Latin Unicode"
msgstr "Latinské Unicode"
-#: ../rules/base.xml.in.h:345 ../rules/evdev.xml.in.h:345
+#: ../rules/base.xml.in.h:367
msgid "Latin Unicode qwerty"
msgstr "Latinské Unicode qwerty"
-#: ../rules/base.xml.in.h:346 ../rules/evdev.xml.in.h:346
+#: ../rules/base.xml.in.h:368
msgid "Latin qwerty"
msgstr "Latinské qwerty"
-#: ../rules/base.xml.in.h:347 ../rules/evdev.xml.in.h:347
+#: ../rules/base.xml.in.h:369
msgid "Latin unicode"
msgstr "Latinské Unicode"
-#: ../rules/base.xml.in.h:348 ../rules/evdev.xml.in.h:348
+#: ../rules/base.xml.in.h:370
msgid "Latin unicode qwerty"
msgstr "Latinské Unicode qwerty"
-#: ../rules/base.xml.in.h:349 ../rules/evdev.xml.in.h:349
+#: ../rules/base.xml.in.h:371
msgid "Latin with guillemets"
msgstr "Latinské s francouzskými uvozovkami"
-#: ../rules/base.xml.in.h:350 ../rules/evdev.xml.in.h:350
+#: ../rules/base.xml.in.h:372
msgid "Latvia"
msgstr "Lotyšsko"
-#: ../rules/base.xml.in.h:351 ../rules/evdev.xml.in.h:351
+#: ../rules/base.xml.in.h:373
msgid "Lav"
msgstr "LAV"
-#: ../rules/base.xml.in.h:352 ../rules/evdev.xml.in.h:352
-msgid "Layout switching"
-msgstr "Přepínání rozložení"
+#: ../rules/base.xml.in.h:374
+msgid "Left Alt"
+msgstr "Levá klávesa Alt"
-#: ../rules/base.xml.in.h:353 ../rules/evdev.xml.in.h:353
-msgid "Left Alt is swapped with left Win-key."
-msgstr "Levá klávesa Alt je prohozena s levou klávesou Win."
+#: ../rules/base.xml.in.h:375
+msgid "Left Alt (while pressed)"
+msgstr "Levá klávesa Alt (při stisknutí)"
-#: ../rules/base.xml.in.h:354 ../rules/evdev.xml.in.h:354
-msgid "Left Alt key changes layout."
-msgstr "Levá klávesa Alt mění rozložení."
+#: ../rules/base.xml.in.h:376
+msgid "Left Alt is swapped with Left Win"
+msgstr "Levá klávesa Alt je prohozena s levou klávesou Win"
-#: ../rules/base.xml.in.h:355 ../rules/evdev.xml.in.h:355
-msgid "Left Alt key switches layout while pressed."
-msgstr "Levá klávesa Alt přepne při stisknutí rozložení."
+#: ../rules/base.xml.in.h:377
+msgid "Left Ctrl"
+msgstr "Levá klávesa Ctrl"
-#: ../rules/base.xml.in.h:356 ../rules/evdev.xml.in.h:356
-msgid "Left Ctrl key changes layout."
-msgstr "Levá klávesa Ctrl mění rozložení."
+#: ../rules/base.xml.in.h:378
+msgid "Left Ctrl+Left Shift"
+msgstr "Levá klávesa Ctrl + levá klávesa Shift"
-#: ../rules/base.xml.in.h:357 ../rules/evdev.xml.in.h:357
-msgid "Left Shift key changes layout."
-msgstr "Levá klávesa Shift mění rozložení."
+#: ../rules/base.xml.in.h:379
+msgid "Left Shift"
+msgstr "Levá klávesa Shift"
-#: ../rules/base.xml.in.h:358 ../rules/evdev.xml.in.h:358
-msgid "Left Win-key changes layout."
-msgstr "Levá klávesa Win mění rozložení."
+#: ../rules/base.xml.in.h:380
+msgid "Left Win"
+msgstr "Levá klávesa Win"
-#: ../rules/base.xml.in.h:359 ../rules/evdev.xml.in.h:359
-msgid "Left Win-key is Compose."
-msgstr "Levá klávesa Win je Compose."
+#: ../rules/base.xml.in.h:381
+msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgstr "Levá klávesa Win (na první rozložení), pravá klávesa Win/Menu (na poslední rozložení)"
-#: ../rules/base.xml.in.h:360 ../rules/evdev.xml.in.h:360
-msgid "Left Win-key switches layout while pressed."
-msgstr "Levá klávesa Win přepne při stisknutí rozložení."
+#: ../rules/base.xml.in.h:382
+msgid "Left Win (while pressed)"
+msgstr "Levá klávesa Win (při stisknutí)"
-#: ../rules/base.xml.in.h:361 ../rules/evdev.xml.in.h:361
+#: ../rules/base.xml.in.h:383
msgid "Left hand"
msgstr "Levoruké"
-#: ../rules/base.xml.in.h:362 ../rules/evdev.xml.in.h:362
+#: ../rules/base.xml.in.h:384
msgid "Left handed Dvorak"
msgstr "Levoruké Dvorak"
-#: ../rules/base.xml.in.h:363 ../rules/evdev.xml.in.h:363
+#: ../rules/base.xml.in.h:385
msgid "Legacy"
msgstr "Zděděné"
-#: ../rules/base.xml.in.h:364 ../rules/evdev.xml.in.h:364
-msgid "Legacy Wang 724 keypad"
-msgstr "Zděděná numerická klávesnice Wang 724"
+#: ../rules/base.xml.in.h:386
+msgid "Legacy Wang 724"
+msgstr "Zděděná Wang 724"
#. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:366 ../rules/evdev.xml.in.h:366
+#: ../rules/base.xml.in.h:388
msgid "Legacy key with comma"
msgstr "Zděděná klávesa s čárkou"
-#: ../rules/base.xml.in.h:367 ../rules/evdev.xml.in.h:367
+#: ../rules/base.xml.in.h:389
msgid "Legacy key with dot"
msgstr "Zděděná klávesa s tečkou"
-#: ../rules/base.xml.in.h:368 ../rules/evdev.xml.in.h:368
-msgid "Legacy keypad"
-msgstr "Zděděná numerická klávesnice"
-
-#: ../rules/base.xml.in.h:369 ../rules/evdev.xml.in.h:369
-msgid "Less-than/Greater-than is Compose."
-msgstr "Menší než/větší než je Compose."
+#: ../rules/base.xml.in.h:390
+msgid "Less-than/Greater-than"
+msgstr "Menší než/větší než"
-#: ../rules/base.xml.in.h:370 ../rules/evdev.xml.in.h:370
+#: ../rules/base.xml.in.h:391
msgid "Lithuania"
msgstr "Litva"
-#: ../rules/base.xml.in.h:371 ../rules/evdev.xml.in.h:371
+#: ../rules/base.xml.in.h:392
msgid "Logitech Access Keyboard"
msgstr "Logitech Access Keyboard"
-#: ../rules/base.xml.in.h:372 ../rules/evdev.xml.in.h:372
+#: ../rules/base.xml.in.h:393
msgid "Logitech Cordless Desktop"
msgstr "Logitech Cordless Desktop"
-#: ../rules/base.xml.in.h:373 ../rules/evdev.xml.in.h:373
+#: ../rules/base.xml.in.h:394
msgid "Logitech Cordless Desktop (alternate option)"
msgstr "Logitech Cordless Desktop (alternativní volba)"
-#: ../rules/base.xml.in.h:374 ../rules/evdev.xml.in.h:374
+#: ../rules/base.xml.in.h:395
msgid "Logitech Cordless Desktop EX110"
msgstr "Logitech Cordless Desktop EX110"
-#: ../rules/base.xml.in.h:375 ../rules/evdev.xml.in.h:375
+#: ../rules/base.xml.in.h:396
msgid "Logitech Cordless Desktop LX-300"
msgstr "Logitech Cordless Desktop LX-300"
-#: ../rules/base.xml.in.h:376 ../rules/evdev.xml.in.h:376
+#: ../rules/base.xml.in.h:397
msgid "Logitech Cordless Desktop Navigator"
msgstr "Logitech Cordless Desktop Navigator"
-#: ../rules/base.xml.in.h:377 ../rules/evdev.xml.in.h:377
+#: ../rules/base.xml.in.h:398
msgid "Logitech Cordless Desktop Optical"
msgstr "Logitech Cordless Desktop Optical"
-#: ../rules/base.xml.in.h:378 ../rules/evdev.xml.in.h:378
-msgid "Logitech Cordless Desktop Pro (alternate option2)"
+#: ../rules/base.xml.in.h:399
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
msgstr "Logitech Cordless Desktop Pro (alternativní volba 2)"
-#: ../rules/base.xml.in.h:379 ../rules/evdev.xml.in.h:379
+#: ../rules/base.xml.in.h:400
msgid "Logitech Cordless Desktop iTouch"
msgstr "Logitech Cordless Desktop iTouch"
-#: ../rules/base.xml.in.h:380 ../rules/evdev.xml.in.h:380
+#: ../rules/base.xml.in.h:401
msgid "Logitech Cordless Freedom/Desktop Navigator"
msgstr "Logitech Cordless Freedom/Desktop Navigator"
-#: ../rules/base.xml.in.h:381 ../rules/evdev.xml.in.h:381
+#: ../rules/base.xml.in.h:402
msgid "Logitech G15 extra keys via G15daemon"
msgstr "Přídavné klávesy Logitech G15 pomocí G15daemon"
-#: ../rules/base.xml.in.h:382 ../rules/evdev.xml.in.h:382
+#: ../rules/base.xml.in.h:403
msgid "Logitech Generic Keyboard"
msgstr "Logitech Generic Keyboard"
-#: ../rules/base.xml.in.h:383 ../rules/evdev.xml.in.h:383
+#: ../rules/base.xml.in.h:404
msgid "Logitech Internet 350 Keyboard"
msgstr "Logitech Internet 350 Keyboard"
-#: ../rules/base.xml.in.h:384 ../rules/evdev.xml.in.h:384
+#: ../rules/base.xml.in.h:405
msgid "Logitech Internet Keyboard"
msgstr "Logitech Internet Keyboard"
-#: ../rules/base.xml.in.h:385 ../rules/evdev.xml.in.h:385
+#: ../rules/base.xml.in.h:406
msgid "Logitech Internet Navigator Keyboard"
msgstr "Logitech Internet Navigator Keyboard"
-#: ../rules/base.xml.in.h:386 ../rules/evdev.xml.in.h:386
+#: ../rules/base.xml.in.h:407
msgid "Logitech Media Elite Keyboard"
msgstr "Logitech Media Elite Keyboard"
-#: ../rules/base.xml.in.h:387 ../rules/evdev.xml.in.h:387
+#: ../rules/base.xml.in.h:408
msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
-#: ../rules/base.xml.in.h:388 ../rules/evdev.xml.in.h:388
+#: ../rules/base.xml.in.h:409
msgid "Logitech Ultra-X Keyboard"
msgstr "Logitech Ultra-X Keyboard"
-#: ../rules/base.xml.in.h:389 ../rules/evdev.xml.in.h:389
+#: ../rules/base.xml.in.h:410
msgid "Logitech diNovo Edge Keyboard"
msgstr "Logitech diNovo Edge Keyboard"
-#: ../rules/base.xml.in.h:390 ../rules/evdev.xml.in.h:390
+#: ../rules/base.xml.in.h:411
msgid "Logitech diNovo Keyboard"
msgstr "Logitech diNovo Keyboard"
-#: ../rules/base.xml.in.h:391 ../rules/evdev.xml.in.h:391
+#: ../rules/base.xml.in.h:412
msgid "Logitech iTouch"
msgstr "Logitech iTouch"
-#: ../rules/base.xml.in.h:392 ../rules/evdev.xml.in.h:392
+#: ../rules/base.xml.in.h:413
msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-#: ../rules/base.xml.in.h:393 ../rules/evdev.xml.in.h:393
+#: ../rules/base.xml.in.h:414
msgid "Logitech iTouch Internet Navigator Keyboard SE"
msgstr "Logitech iTouch Internet Navigator Keyboard SE"
-#: ../rules/base.xml.in.h:394 ../rules/evdev.xml.in.h:394
+#: ../rules/base.xml.in.h:415
msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-#: ../rules/base.xml.in.h:395 ../rules/evdev.xml.in.h:395
+#: ../rules/base.xml.in.h:416
+msgid "Lower Sorbian"
+msgstr "Dolnolužické"
+
+#: ../rules/base.xml.in.h:417
+msgid "Lower Sorbian (qwertz)"
+msgstr "Dolnolužické (qwertz)"
+
+#: ../rules/base.xml.in.h:418
msgid "Ltu"
msgstr "LTU"
-#: ../rules/base.xml.in.h:396 ../rules/evdev.xml.in.h:396
+#: ../rules/base.xml.in.h:419
msgid "MESS"
msgstr "MESS"
-#: ../rules/base.xml.in.h:397 ../rules/evdev.xml.in.h:397
+#: ../rules/base.xml.in.h:420
msgid "MNE"
msgstr "MNE"
-#: ../rules/base.xml.in.h:398 ../rules/evdev.xml.in.h:398
+#: ../rules/base.xml.in.h:421
msgid "MacBook/MacBook Pro"
msgstr "MacBook/MacBook Pro"
-#: ../rules/base.xml.in.h:399 ../rules/evdev.xml.in.h:399
+#: ../rules/base.xml.in.h:422
msgid "MacBook/MacBook Pro (Intl)"
msgstr "MacBook/MacBook Pro (mez.)"
-#: ../rules/base.xml.in.h:400 ../rules/evdev.xml.in.h:400
+#: ../rules/base.xml.in.h:423
msgid "Macedonia"
msgstr "Makedonie"
-#: ../rules/base.xml.in.h:401 ../rules/evdev.xml.in.h:401
+#: ../rules/base.xml.in.h:424
msgid "Macintosh"
msgstr "Macintosh"
-#: ../rules/base.xml.in.h:402 ../rules/evdev.xml.in.h:402
+#: ../rules/base.xml.in.h:425
msgid "Macintosh Old"
msgstr "Macintosh staré"
-#: ../rules/base.xml.in.h:403 ../rules/evdev.xml.in.h:403
+#: ../rules/base.xml.in.h:426
msgid "Macintosh, Sun dead keys"
msgstr "Macintosh, mrtvé klávesy Sun"
-#: ../rules/base.xml.in.h:404 ../rules/evdev.xml.in.h:404
+#: ../rules/base.xml.in.h:427
msgid "Macintosh, eliminate dead keys"
msgstr "Macintosh, vyloučit mrtvé klávesy"
-#: ../rules/base.xml.in.h:405 ../rules/evdev.xml.in.h:405
-msgid "Make CapsLock an additional Ctrl."
-msgstr "Vytvořit z klávesy Caps Lock další Ctrl."
+#: ../rules/base.xml.in.h:428
+msgid "Make CapsLock an additional Backspace"
+msgstr "Vytvořit z klávesy Caps Lock další Backspace"
+
+#: ../rules/base.xml.in.h:429
+msgid "Make CapsLock an additional Ctrl"
+msgstr "Vytvořit z klávesy Caps Lock další Ctrl"
+
+#: ../rules/base.xml.in.h:430
+msgid "Make CapsLock an additional ESC"
+msgstr "Vytvořit z klávesy Caps Lock další Esc"
-#: ../rules/base.xml.in.h:406 ../rules/evdev.xml.in.h:406
+#: ../rules/base.xml.in.h:431
msgid "Mal"
msgstr "MAL"
-#: ../rules/base.xml.in.h:407 ../rules/evdev.xml.in.h:407
+#: ../rules/base.xml.in.h:432
msgid "Malayalam"
msgstr "Malajálamské"
-#: ../rules/base.xml.in.h:408 ../rules/evdev.xml.in.h:408
+#: ../rules/base.xml.in.h:433
msgid "Malayalam Lalitha"
msgstr "Malajálamské lalitha"
-#: ../rules/base.xml.in.h:409 ../rules/evdev.xml.in.h:409
+#: ../rules/base.xml.in.h:434
msgid "Maldives"
msgstr "Maledivy"
-#: ../rules/base.xml.in.h:410 ../rules/evdev.xml.in.h:410
+#: ../rules/base.xml.in.h:435
msgid "Malta"
msgstr "Malta"
-#: ../rules/base.xml.in.h:411 ../rules/evdev.xml.in.h:411
+#: ../rules/base.xml.in.h:436
msgid "Maltese keyboard with US layout"
msgstr "Maltézská klávesnice s americkým rozložením"
-#: ../rules/base.xml.in.h:412 ../rules/evdev.xml.in.h:412
+#: ../rules/base.xml.in.h:437
msgid "Mao"
msgstr "MAO"
-#: ../rules/base.xml.in.h:413 ../rules/evdev.xml.in.h:413
+#: ../rules/base.xml.in.h:438
msgid "Maori"
msgstr "Maorské"
-#: ../rules/base.xml.in.h:414 ../rules/evdev.xml.in.h:414
+#: ../rules/base.xml.in.h:439
msgid "Memorex MX1998"
msgstr "Memorex MX1998"
-#: ../rules/base.xml.in.h:415 ../rules/evdev.xml.in.h:415
+#: ../rules/base.xml.in.h:440
msgid "Memorex MX2500 EZ-Access Keyboard"
msgstr "Memorex MX2500 EZ-Access Keyboard"
-#: ../rules/base.xml.in.h:416 ../rules/evdev.xml.in.h:416
+#: ../rules/base.xml.in.h:441
msgid "Memorex MX2750"
msgstr "Memorex MX2750"
-#: ../rules/base.xml.in.h:417 ../rules/evdev.xml.in.h:417
-msgid "Menu is Compose."
-msgstr "Menu je Compose."
+#: ../rules/base.xml.in.h:442
+msgid "Menu"
+msgstr "Menu"
-#: ../rules/base.xml.in.h:418 ../rules/evdev.xml.in.h:418
-msgid "Menu key changes layout."
-msgstr "Klávesa Menu mění rozložení."
+#: ../rules/base.xml.in.h:443
+msgid "Meta is mapped to Left Win"
+msgstr "Meta je přiřazena k levé klávese Win"
-#: ../rules/base.xml.in.h:419 ../rules/evdev.xml.in.h:419
-msgid "Meta is mapped to the Win-keys."
-msgstr "Meta je přiřazena ke klávesám Win."
+#: ../rules/base.xml.in.h:444
+msgid "Meta is mapped to Win keys"
+msgstr "Meta je přiřazena ke klávesám Win"
-#: ../rules/base.xml.in.h:420 ../rules/evdev.xml.in.h:420
-msgid "Meta is mapped to the left Win-key."
-msgstr "Meta je přiřazena k levé klávese Win."
+#: ../rules/base.xml.in.h:445
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Comfort Curve Keyboard 2000"
-#: ../rules/base.xml.in.h:421 ../rules/evdev.xml.in.h:421
+#: ../rules/base.xml.in.h:446
msgid "Microsoft Internet Keyboard"
msgstr "Microsoft Internet Keyboard"
-#: ../rules/base.xml.in.h:422 ../rules/evdev.xml.in.h:422
+#: ../rules/base.xml.in.h:447
msgid "Microsoft Internet Keyboard Pro, Swedish"
msgstr "Microsoft Internet Keyboard Pro, švédská"
-#: ../rules/base.xml.in.h:423 ../rules/evdev.xml.in.h:423
+#: ../rules/base.xml.in.h:448
msgid "Microsoft Natural"
msgstr "Microsoft Natural"
-#: ../rules/base.xml.in.h:424 ../rules/evdev.xml.in.h:424
+#: ../rules/base.xml.in.h:449
msgid "Microsoft Natural Keyboard Elite"
msgstr "Microsoft Natural Keyboard Elite"
-#: ../rules/base.xml.in.h:425 ../rules/evdev.xml.in.h:425
+#: ../rules/base.xml.in.h:450
msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-#: ../rules/base.xml.in.h:426 ../rules/evdev.xml.in.h:426
+#: ../rules/base.xml.in.h:451
msgid "Microsoft Natural Keyboard Pro OEM"
msgstr "Microsoft Natural Keyboard Pro OEM"
-#: ../rules/base.xml.in.h:427 ../rules/evdev.xml.in.h:427
+#: ../rules/base.xml.in.h:452
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:428 ../rules/evdev.xml.in.h:428
+#: ../rules/base.xml.in.h:453
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+
+#: ../rules/base.xml.in.h:454
msgid "Microsoft Office Keyboard"
msgstr "Microsoft Office Keyboard"
-#: ../rules/base.xml.in.h:429 ../rules/evdev.xml.in.h:429
+#: ../rules/base.xml.in.h:455
msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
-#: ../rules/base.xml.in.h:430 ../rules/evdev.xml.in.h:430
+#: ../rules/base.xml.in.h:456
msgid "Miscellaneous compatibility options"
msgstr "Dodatečné volby kompatibility"
-#: ../rules/base.xml.in.h:431 ../rules/evdev.xml.in.h:431
+#: ../rules/base.xml.in.h:457
msgid "Mkd"
msgstr "MKD"
-#: ../rules/base.xml.in.h:432 ../rules/evdev.xml.in.h:432
+#: ../rules/base.xml.in.h:458
msgid "Mlt"
msgstr "MLT"
-#: ../rules/base.xml.in.h:433 ../rules/evdev.xml.in.h:433
+#: ../rules/base.xml.in.h:459
msgid "Mmr"
msgstr "MMR"
-#: ../rules/base.xml.in.h:434 ../rules/evdev.xml.in.h:434
+#: ../rules/base.xml.in.h:460
msgid "Mng"
msgstr "MNG"
-#: ../rules/base.xml.in.h:435 ../rules/evdev.xml.in.h:435
+#: ../rules/base.xml.in.h:461
msgid "Mongolia"
msgstr "Mongolsko"
-#: ../rules/base.xml.in.h:436 ../rules/evdev.xml.in.h:436
+#: ../rules/base.xml.in.h:462
msgid "Montenegro"
msgstr "Černá Hora"
-#: ../rules/base.xml.in.h:437 ../rules/evdev.xml.in.h:437
+#: ../rules/base.xml.in.h:463
msgid "Morocco"
msgstr "Maroko"
-#: ../rules/base.xml.in.h:438 ../rules/evdev.xml.in.h:438
+#: ../rules/base.xml.in.h:464
msgid "Multilingual"
msgstr "Vícejazyčné"
-#: ../rules/base.xml.in.h:439 ../rules/evdev.xml.in.h:439
+#: ../rules/base.xml.in.h:465
msgid "Multilingual, first part"
msgstr "Vícejazyčné, první část"
-#: ../rules/base.xml.in.h:440 ../rules/evdev.xml.in.h:440
+#: ../rules/base.xml.in.h:466
msgid "Multilingual, second part"
msgstr "Vícejazyčné, druhá část"
-#: ../rules/base.xml.in.h:441 ../rules/evdev.xml.in.h:441
+#: ../rules/base.xml.in.h:467
msgid "Myanmar"
msgstr "Barma"
-#: ../rules/base.xml.in.h:442 ../rules/evdev.xml.in.h:442
+#: ../rules/base.xml.in.h:468
msgid "NICOLA-F style Backspace"
msgstr "Backspace typu NICOLA-F"
-#: ../rules/base.xml.in.h:443 ../rules/evdev.xml.in.h:443
-msgid "Neostyle"
-msgstr "Neostyle"
+#: ../rules/base.xml.in.h:469
+msgid "NLA"
+msgstr "NLA"
+
+#: ../rules/base.xml.in.h:470
+msgid "Nativo"
+msgstr "Nativo"
+
+#: ../rules/base.xml.in.h:471
+msgid "Nativo for Esperanto"
+msgstr "Nativo pro esperanto"
+
+#: ../rules/base.xml.in.h:472
+msgid "Nativo for USA keyboards"
+msgstr "Nativo pro americké klávesnice"
-#: ../rules/base.xml.in.h:444 ../rules/evdev.xml.in.h:444
+#: ../rules/base.xml.in.h:473
+msgid "Neo 2"
+msgstr "Neo 2"
+
+#: ../rules/base.xml.in.h:474
msgid "Nep"
msgstr "NEP"
-#: ../rules/base.xml.in.h:445 ../rules/evdev.xml.in.h:445
+#: ../rules/base.xml.in.h:475
msgid "Nepal"
msgstr "Nepál"
-#: ../rules/base.xml.in.h:446 ../rules/evdev.xml.in.h:446
+#: ../rules/base.xml.in.h:476
msgid "Netherlands"
msgstr "Nizozemsko"
-#: ../rules/base.xml.in.h:447 ../rules/evdev.xml.in.h:447
+#: ../rules/base.xml.in.h:477
msgid "Nig"
msgstr "NIG"
-#: ../rules/base.xml.in.h:448 ../rules/evdev.xml.in.h:448
+#: ../rules/base.xml.in.h:478
msgid "Nigeria"
msgstr "Nigérie"
-#: ../rules/base.xml.in.h:449 ../rules/evdev.xml.in.h:449
+#: ../rules/base.xml.in.h:479
msgid "Nld"
msgstr "NLD"
-#: ../rules/base.xml.in.h:450 ../rules/evdev.xml.in.h:450
+#: ../rules/base.xml.in.h:480
+msgid "Non-breakable space character at fourth level"
+msgstr "Na čtvrté úrovni znak nedělitelné mezery"
+
+#: ../rules/base.xml.in.h:481
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Na čtvrté úrovni znak nedělitelné mezery, tenká nedělitelná mezera na šesté úrovni"
+
+#: ../rules/base.xml.in.h:482
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
+msgstr "Na čtvrté úrovni znak nedělitelné mezery, tenká nedělitelná mezera na šesté úrovni (přes Ctrl+Shift)"
+
+#: ../rules/base.xml.in.h:483
+msgid "Non-breakable space character at second level"
+msgstr "Na druhé úrovni znak nedělitelné mezery"
+
+#: ../rules/base.xml.in.h:484
+msgid "Non-breakable space character at third level"
+msgstr "Na třetí úrovni znak nedělitelné mezery"
+
+#: ../rules/base.xml.in.h:485
+msgid "Non-breakable space character at third level, nothing at fourth level"
+msgstr "Na třetí úrovni znak nedělitelné mezery, nic na úrovni čtvrté"
+
+#: ../rules/base.xml.in.h:486
+msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Na třetí úrovni znak nedělitelné mezery, tenká nedělitelná mezera na čtvrté úrovni"
+
+#: ../rules/base.xml.in.h:487
msgid "Nor"
msgstr "NOR"
-#: ../rules/base.xml.in.h:451 ../rules/evdev.xml.in.h:451
+#: ../rules/base.xml.in.h:488
msgid "Northern Saami"
msgstr "Severolaponské"
-#: ../rules/base.xml.in.h:452 ../rules/evdev.xml.in.h:452
+#: ../rules/base.xml.in.h:489
msgid "Northern Saami, eliminate dead keys"
msgstr "Severolaponské, vyloučit mrtvé klávesy"
-#: ../rules/base.xml.in.h:453 ../rules/evdev.xml.in.h:453
+#: ../rules/base.xml.in.h:490
msgid "Northgate OmniKey 101"
msgstr "Northgate OmniKey 101"
-#: ../rules/base.xml.in.h:454 ../rules/evdev.xml.in.h:454
+#: ../rules/base.xml.in.h:491
msgid "Norway"
msgstr "Norsko"
-#: ../rules/base.xml.in.h:455 ../rules/evdev.xml.in.h:455
-msgid "NumLock LED shows alternative layout."
-msgstr "LED Num Lock zobrazuje alternativní rozložení."
+#: ../rules/base.xml.in.h:492
+msgid "NumLock"
+msgstr "Num Lock"
-#: ../rules/base.xml.in.h:456 ../rules/evdev.xml.in.h:456
+#: ../rules/base.xml.in.h:493
msgid "Numeric keypad delete key behaviour"
msgstr "Chování klávesy Delete na numerické klávesnici"
-#: ../rules/base.xml.in.h:457 ../rules/evdev.xml.in.h:457
-msgid "Numeric keypad keys work as with Mac."
-msgstr "Klávesy numerické klávesnice fungují stejně jako u počítače Mac."
+#: ../rules/base.xml.in.h:494
+msgid "Numeric keypad keys work as with Mac"
+msgstr "Klávesy numerické klávesnice fungují stejně jako u počítače Mac"
-#: ../rules/base.xml.in.h:458 ../rules/evdev.xml.in.h:458
+#: ../rules/base.xml.in.h:495
msgid "Numeric keypad layout selection"
msgstr "Výběr rozložení numerické klávesnice"
-#: ../rules/base.xml.in.h:459 ../rules/evdev.xml.in.h:459
+#: ../rules/base.xml.in.h:496
msgid "OADG 109A"
msgstr "OADG 109A"
-#: ../rules/base.xml.in.h:460 ../rules/evdev.xml.in.h:460
+#: ../rules/base.xml.in.h:497
msgid "OLPC"
msgstr "OLPC"
-#: ../rules/base.xml.in.h:461 ../rules/evdev.xml.in.h:461
+#: ../rules/base.xml.in.h:498
msgid "OLPC Dari"
msgstr "OLPC, darí"
-#: ../rules/base.xml.in.h:462 ../rules/evdev.xml.in.h:462
+#: ../rules/base.xml.in.h:499
msgid "OLPC Pashto"
msgstr "OLPC, paštó"
-#: ../rules/base.xml.in.h:463 ../rules/evdev.xml.in.h:463
+#: ../rules/base.xml.in.h:500
msgid "OLPC Southern Uzbek"
msgstr "OLPC, jihouzbecké"
-#: ../rules/base.xml.in.h:464 ../rules/evdev.xml.in.h:464
+#: ../rules/base.xml.in.h:501
+msgid "Occitan"
+msgstr "Okcitánské"
+
+#: ../rules/base.xml.in.h:502
msgid "Ogham"
msgstr "Ogam"
-#: ../rules/base.xml.in.h:465 ../rules/evdev.xml.in.h:465
+#: ../rules/base.xml.in.h:503
msgid "Ogham IS434"
msgstr "Ogham IS434"
-#: ../rules/base.xml.in.h:466 ../rules/evdev.xml.in.h:466
+#: ../rules/base.xml.in.h:504
msgid "Oriya"
msgstr "Urijské"
-#: ../rules/base.xml.in.h:467 ../rules/evdev.xml.in.h:467
+#: ../rules/base.xml.in.h:505
msgid "Ortek MCK-800 MM/Internet keyboard"
msgstr "Internet keyboard pro Ortek MCK-800 MM"
-#: ../rules/base.xml.in.h:468 ../rules/evdev.xml.in.h:468
+#: ../rules/base.xml.in.h:506
msgid "Ossetian"
msgstr "Osetinské"
-#: ../rules/base.xml.in.h:469 ../rules/evdev.xml.in.h:469
+#: ../rules/base.xml.in.h:507
msgid "Ossetian, Winkeys"
msgstr "Osetinské, klávesy Win"
-#: ../rules/base.xml.in.h:470 ../rules/evdev.xml.in.h:470
+#: ../rules/base.xml.in.h:508
msgid "Ossetian, legacy"
msgstr "Osetinské, zděděné"
-#: ../rules/base.xml.in.h:471 ../rules/evdev.xml.in.h:471
+#: ../rules/base.xml.in.h:509
msgid "PC-98xx Series"
msgstr "Řada PC-98xx"
-#: ../rules/base.xml.in.h:472 ../rules/evdev.xml.in.h:472
+#: ../rules/base.xml.in.h:510
msgid "Pak"
msgstr "PAK"
-#: ../rules/base.xml.in.h:473 ../rules/evdev.xml.in.h:473
+#: ../rules/base.xml.in.h:511
msgid "Pakistan"
msgstr "Pákistán"
-#: ../rules/base.xml.in.h:474 ../rules/evdev.xml.in.h:474
+#: ../rules/base.xml.in.h:512
msgid "Pashto"
msgstr "Paštské"
-#: ../rules/base.xml.in.h:475 ../rules/evdev.xml.in.h:475
+#: ../rules/base.xml.in.h:513
msgid "Pattachote"
msgstr "Pattachote"
-#: ../rules/base.xml.in.h:476 ../rules/evdev.xml.in.h:476
+#: ../rules/base.xml.in.h:514
msgid "Phonetic"
msgstr "Fonetické"
-#: ../rules/base.xml.in.h:477 ../rules/evdev.xml.in.h:477
+#: ../rules/base.xml.in.h:515
+msgid "Phonetic Winkeys"
+msgstr "Fonetické klávesy Win"
+
+#: ../rules/base.xml.in.h:516
msgid "Pol"
msgstr "POL"
-#: ../rules/base.xml.in.h:478 ../rules/evdev.xml.in.h:478
+#: ../rules/base.xml.in.h:517
msgid "Poland"
msgstr "Polsko"
-#: ../rules/base.xml.in.h:479 ../rules/evdev.xml.in.h:479
+#: ../rules/base.xml.in.h:518
msgid "Polytonic"
msgstr "Polytonické"
-#: ../rules/base.xml.in.h:480 ../rules/evdev.xml.in.h:480
+#: ../rules/base.xml.in.h:519
msgid "Portugal"
msgstr "Portugalsko"
-#: ../rules/base.xml.in.h:481 ../rules/evdev.xml.in.h:481
-msgid "Press Left Alt key to choose 3rd level."
-msgstr "Stisknutí levé klávesy Alt umožní výběr 3. úrovně."
-
-#: ../rules/base.xml.in.h:482 ../rules/evdev.xml.in.h:482
-msgid "Press Left Win-key to choose 3rd level."
-msgstr "Stisknutí levé klávesy Win umožní výběr 3. úrovně."
-
-#: ../rules/base.xml.in.h:483 ../rules/evdev.xml.in.h:483
-msgid "Press Menu key to choose 3rd level."
-msgstr "Stisknutí levé klávesy Menu umožní výběr 3. úrovně."
-
-#: ../rules/base.xml.in.h:484 ../rules/evdev.xml.in.h:484
-msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
-msgstr "Stisknutí pravé klávesy Alt umožní výběr 3. úrovně, Shift a pravá klávesa Alt je Multi_Key."
-
-#: ../rules/base.xml.in.h:485 ../rules/evdev.xml.in.h:485
-msgid "Press Right Alt key to choose 3rd level."
-msgstr "Stisknutí pravé klávesy Alt umožní výběr 3. úrovně."
-
-#: ../rules/base.xml.in.h:486 ../rules/evdev.xml.in.h:486
-msgid "Press Right Ctrl to choose 3rd level."
-msgstr "Stisknutí pravé klávesy Ctrl umožní výběr 3. úrovně."
-
-#: ../rules/base.xml.in.h:487 ../rules/evdev.xml.in.h:487
-msgid "Press Right Win-key to choose 3rd level."
-msgstr "Stisknutí pravé klávesy Win umožní výběr 3. úrovně."
-
-#: ../rules/base.xml.in.h:488 ../rules/evdev.xml.in.h:488
-msgid "Press any of Alt keys to choose 3rd level."
-msgstr "Stisknutí jakékoliv klávesy Alt umožní výběr 3. úrovně."
-
-#: ../rules/base.xml.in.h:489 ../rules/evdev.xml.in.h:489
-msgid "Press any of Win-keys to choose 3rd level."
-msgstr "Stisknutí jakékoliv klávesy Win umožní výběr 3. úrovně."
-
-#: ../rules/base.xml.in.h:490 ../rules/evdev.xml.in.h:490
+#: ../rules/base.xml.in.h:520
msgid "Pro"
msgstr "Pro"
-#: ../rules/base.xml.in.h:491 ../rules/evdev.xml.in.h:491
+#: ../rules/base.xml.in.h:521
msgid "Pro Keypad"
msgstr "Pro Keypad"
-#: ../rules/base.xml.in.h:492 ../rules/evdev.xml.in.h:492
+#: ../rules/base.xml.in.h:522
msgid "Probhat"
msgstr "Prt"
-#: ../rules/base.xml.in.h:493 ../rules/evdev.xml.in.h:493
+#: ../rules/base.xml.in.h:523
msgid "Programmer Dvorak"
msgstr "Programátorské Dvorak"
-#: ../rules/base.xml.in.h:494 ../rules/evdev.xml.in.h:494
+#: ../rules/base.xml.in.h:524
msgid "Propeller Voyager (KTEZ-1000)"
msgstr "Propeller Voyager (KTEZ-1000)"
-#: ../rules/base.xml.in.h:495 ../rules/evdev.xml.in.h:495
+#: ../rules/base.xml.in.h:525
msgid "Prt"
msgstr "PRT"
-#: ../rules/base.xml.in.h:496 ../rules/evdev.xml.in.h:496
+#: ../rules/base.xml.in.h:526
msgid "QTronix Scorpius 98N+"
msgstr "QTronix Scorpius 98N+"
-#: ../rules/base.xml.in.h:497 ../rules/evdev.xml.in.h:497
-msgid "R-Alt switches layout while pressed."
-msgstr "Pravá klávesa Alt přepne při stisknutí rozložení."
-
-#: ../rules/base.xml.in.h:498 ../rules/evdev.xml.in.h:498
-msgid "Right Alt is Compose."
-msgstr "Pravá klávesa Alt je Compose."
-
-#: ../rules/base.xml.in.h:499 ../rules/evdev.xml.in.h:499
-msgid "Right Alt key changes layout."
-msgstr "Pravá klávesa Alt mění rozložení."
+#: ../rules/base.xml.in.h:527
+msgid "Right Alt"
+msgstr "Pravá klávesa Alt"
-#: ../rules/base.xml.in.h:500 ../rules/evdev.xml.in.h:500
-msgid "Right Alt key never chooses 3rd level."
-msgstr "Pravá klávesa Alt nikdy neumožní výběr 3. úrovně."
+#: ../rules/base.xml.in.h:528
+msgid "Right Alt (while pressed)"
+msgstr "Pravá klávesa Alt (při stisknutí)"
-#: ../rules/base.xml.in.h:501 ../rules/evdev.xml.in.h:501
-msgid "Right Ctrl is Compose."
-msgstr "Pravá klávesa Ctrl je Compose."
+#: ../rules/base.xml.in.h:529
+msgid "Right Alt key never chooses 3rd level"
+msgstr "Pravá klávesa Alt nikdy neumožní výběr 3. úrovně"
-#: ../rules/base.xml.in.h:502 ../rules/evdev.xml.in.h:502
-msgid "Right Ctrl key changes layout."
-msgstr "Pravá klávesa Ctrl mění rozložení."
+#: ../rules/base.xml.in.h:530
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr "Pravá klávesa Alt, Shift a pravá klávesa Alt je Multi_Key"
-#: ../rules/base.xml.in.h:503 ../rules/evdev.xml.in.h:503
-msgid "Right Ctrl key switches layout while pressed."
-msgstr "Pravá klávesa Ctrl přepne při stisknutí rozložení."
+#: ../rules/base.xml.in.h:531
+msgid "Right Ctrl"
+msgstr "Pravá klávesa Ctrl"
-#: ../rules/base.xml.in.h:504 ../rules/evdev.xml.in.h:504
-msgid "Right Ctrl key works as Right Alt."
-msgstr "Pravá klávesa Ctrl funguje jako pravá klávesa Alt."
+#: ../rules/base.xml.in.h:532
+msgid "Right Ctrl (while pressed)"
+msgstr "Pravá klávesa Ctrl (při stisknutí)"
-#: ../rules/base.xml.in.h:505 ../rules/evdev.xml.in.h:505
-msgid "Right Shift key changes layout."
-msgstr "Pravá klávesa Shift mění rozložení."
+#: ../rules/base.xml.in.h:533
+msgid "Right Ctrl as Right Alt"
+msgstr "Pravá klávesa Ctrl funguje jako pravá klávesa Alt"
-#: ../rules/base.xml.in.h:506 ../rules/evdev.xml.in.h:506
-msgid "Right Win-key changes layout."
-msgstr "Pravá klávesa Win mění rozložení."
+#: ../rules/base.xml.in.h:534
+msgid "Right Shift"
+msgstr "Pravá klávesa Shift"
-#: ../rules/base.xml.in.h:507 ../rules/evdev.xml.in.h:507
-msgid "Right Win-key is Compose."
-msgstr "Pravá klávesa Win je Compose."
+#: ../rules/base.xml.in.h:535
+msgid "Right Win"
+msgstr "Pravá klávesa Win"
-#: ../rules/base.xml.in.h:508 ../rules/evdev.xml.in.h:508
-msgid "Right Win-key switches layout while pressed."
-msgstr "Pravá klávesa Win přepne při stisknutí rozložení."
+#: ../rules/base.xml.in.h:536
+msgid "Right Win (while pressed)"
+msgstr "Pravá klávesa Win (při stisknutí)"
-#: ../rules/base.xml.in.h:509 ../rules/evdev.xml.in.h:509
+#: ../rules/base.xml.in.h:537
msgid "Right hand"
msgstr "Pravoruké"
-#: ../rules/base.xml.in.h:510 ../rules/evdev.xml.in.h:510
+#: ../rules/base.xml.in.h:538
msgid "Right handed Dvorak"
msgstr "Pravoruké Dvorak"
-#: ../rules/base.xml.in.h:511 ../rules/evdev.xml.in.h:511
+#: ../rules/base.xml.in.h:539
msgid "Romania"
msgstr "Rumunsko"
-#: ../rules/base.xml.in.h:512 ../rules/evdev.xml.in.h:512
+#: ../rules/base.xml.in.h:540
msgid "Romanian keyboard with German letters"
msgstr "Rumunská klávesnice s německými znaky"
-#: ../rules/base.xml.in.h:513 ../rules/evdev.xml.in.h:513
+#: ../rules/base.xml.in.h:541
msgid "Romanian keyboard with German letters, eliminate dead keys"
msgstr "Rumunská klávesnice s německými znaky, vyloučit mrtvé klávesy"
-#: ../rules/base.xml.in.h:514 ../rules/evdev.xml.in.h:514
+#: ../rules/base.xml.in.h:542
msgid "Rou"
msgstr "ROU"
-#: ../rules/base.xml.in.h:515 ../rules/evdev.xml.in.h:515
+#: ../rules/base.xml.in.h:543
msgid "Rus"
msgstr "RUS"
-#: ../rules/base.xml.in.h:516 ../rules/evdev.xml.in.h:516
+#: ../rules/base.xml.in.h:544
msgid "Russia"
msgstr "Rusko"
-#: ../rules/base.xml.in.h:517 ../rules/evdev.xml.in.h:517
+#: ../rules/base.xml.in.h:545
msgid "Russian"
msgstr "Ruské"
-#: ../rules/base.xml.in.h:518 ../rules/evdev.xml.in.h:518
+#: ../rules/base.xml.in.h:546
msgid "Russian phonetic"
msgstr "Ruské fonetické"
-#: ../rules/base.xml.in.h:519 ../rules/evdev.xml.in.h:519
+#: ../rules/base.xml.in.h:547
msgid "Russian phonetic Dvorak"
msgstr "Ruské fonetické Dvorak"
-#: ../rules/base.xml.in.h:520 ../rules/evdev.xml.in.h:520
+#: ../rules/base.xml.in.h:548
msgid "Russian phonetic, eliminate dead keys"
msgstr "Ruské fonetické, vyloučit mrtvé klávesy"
-#: ../rules/base.xml.in.h:521 ../rules/evdev.xml.in.h:521
+#: ../rules/base.xml.in.h:549
msgid "Russian with Kazakh"
msgstr "Ruská s kazaštinou"
-#: ../rules/base.xml.in.h:522 ../rules/evdev.xml.in.h:522
+#: ../rules/base.xml.in.h:550
msgid "SILVERCREST Multimedia Wireless Keyboard"
msgstr "SILVERCREST Multimedia Wireless Keyboard"
-#: ../rules/base.xml.in.h:523 ../rules/evdev.xml.in.h:523
+#: ../rules/base.xml.in.h:551
msgid "SK-1300"
msgstr "SK-1300"
-#: ../rules/base.xml.in.h:524 ../rules/evdev.xml.in.h:524
+#: ../rules/base.xml.in.h:552
msgid "SK-2500"
msgstr "SK-2500"
-#: ../rules/base.xml.in.h:525 ../rules/evdev.xml.in.h:525
+#: ../rules/base.xml.in.h:553
msgid "SK-6200"
msgstr "SK-6200"
-#: ../rules/base.xml.in.h:526 ../rules/evdev.xml.in.h:526
+#: ../rules/base.xml.in.h:554
msgid "SK-7100"
msgstr "SK-7100"
-#: ../rules/base.xml.in.h:527 ../rules/evdev.xml.in.h:527
+#: ../rules/base.xml.in.h:555
msgid "SRB"
msgstr "SRB"
-#: ../rules/base.xml.in.h:528 ../rules/evdev.xml.in.h:528
+#: ../rules/base.xml.in.h:556
msgid "SVEN Ergonomic 2500"
msgstr "SVEN Ergonomic 2500"
-#: ../rules/base.xml.in.h:529 ../rules/evdev.xml.in.h:529
+#: ../rules/base.xml.in.h:557
msgid "SVEN Slim 303"
msgstr "SVEN Slim 303"
-#: ../rules/base.xml.in.h:530 ../rules/evdev.xml.in.h:530
+#: ../rules/base.xml.in.h:558
msgid "Samsung SDM 4500P"
msgstr "Samsung SDM 4500P"
-#: ../rules/base.xml.in.h:531 ../rules/evdev.xml.in.h:531
+#: ../rules/base.xml.in.h:559
msgid "Samsung SDM 4510P"
msgstr "Samsung SDM 4510P"
-#: ../rules/base.xml.in.h:532 ../rules/evdev.xml.in.h:532
-msgid "ScrollLock LED shows alternative layout."
-msgstr "LED Scroll Lock zobrazuje alternativní rozložení."
+#: ../rules/base.xml.in.h:560
+msgid "Scroll Lock"
+msgstr "Scroll Lock"
-#: ../rules/base.xml.in.h:533 ../rules/evdev.xml.in.h:533
+#: ../rules/base.xml.in.h:561
+msgid "ScrollLock"
+msgstr "Scroll Lock"
+
+#: ../rules/base.xml.in.h:562
msgid "Secwepemctsin"
msgstr "Secwepemctsin"
-#: ../rules/base.xml.in.h:534 ../rules/evdev.xml.in.h:534
+#: ../rules/base.xml.in.h:563
+msgid "Semi-colon on third level"
+msgstr "Středník na třetí úrovni"
+
+#: ../rules/base.xml.in.h:564
msgid "Serbia"
msgstr "Srbsko"
-#: ../rules/base.xml.in.h:535 ../rules/evdev.xml.in.h:535
-msgid "Shift cancels CapsLock."
-msgstr "Shift ruší Caps Lock."
+#: ../rules/base.xml.in.h:565
+msgid "Shift cancels CapsLock"
+msgstr "Shift ruší Caps Lock"
-#: ../rules/base.xml.in.h:536 ../rules/evdev.xml.in.h:536
-msgid "Shift with numeric keypad keys works as in MS Windows."
-msgstr "Shift s numerickými klávesami funguje jako v MS Windows."
+#: ../rules/base.xml.in.h:566
+msgid "Shift does not cancel NumLock, chooses 3d level instead"
+msgstr "Shift neruší Num Lock, namísto toho vybírá 3. úroveň"
-#: ../rules/base.xml.in.h:537 ../rules/evdev.xml.in.h:537
-msgid "Shift+CapsLock changes layout."
-msgstr "Shift+Caps Lock mění rozložení."
+#: ../rules/base.xml.in.h:567
+msgid "Shift with numeric keypad keys works as in MS Windows"
+msgstr "Shift s numerickými klávesami funguje jako v MS Windows"
-#: ../rules/base.xml.in.h:538 ../rules/evdev.xml.in.h:538
+#: ../rules/base.xml.in.h:568
+msgid "Shift+CapsLock"
+msgstr "Shift+Caps Lock"
+
+#: ../rules/base.xml.in.h:569
msgid "Simple"
msgstr "Jednoduché"
-#: ../rules/base.xml.in.h:539 ../rules/evdev.xml.in.h:539
+#: ../rules/base.xml.in.h:570
msgid "Slovakia"
msgstr "Slovensko"
-#: ../rules/base.xml.in.h:540 ../rules/evdev.xml.in.h:540
+#: ../rules/base.xml.in.h:571
msgid "Slovenia"
msgstr "Slovinsko"
-#: ../rules/base.xml.in.h:541 ../rules/evdev.xml.in.h:541
+#: ../rules/base.xml.in.h:572
msgid "South Africa"
msgstr "Jižní Afrika"
-#: ../rules/base.xml.in.h:542 ../rules/evdev.xml.in.h:542
+#: ../rules/base.xml.in.h:573
msgid "Southern Uzbek"
msgstr "Jihouzbecké"
-#: ../rules/base.xml.in.h:543 ../rules/evdev.xml.in.h:543
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr "Stisknutí mezerníku zadává na čtvrté úrovni znak nedělitelné mezery, tenkou nedělitelnou mezeru na šesté úrovni"
-
-#: ../rules/base.xml.in.h:544 ../rules/evdev.xml.in.h:544
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift"
-msgstr "Stisknutí mezerníku zadává na čtvrté úrovni znak nedělitelné mezery, tenkou nedělitelnou mezeru na šesté úrovni (přes Ctrl+Shift)"
-
-#: ../rules/base.xml.in.h:545 ../rules/evdev.xml.in.h:545
-msgid "Space key outputs non-breakable space character at fourth level."
-msgstr "Stisknutí mezerníku zadává na čtvrté úrovni znak nedělitelné mezery."
-
-#: ../rules/base.xml.in.h:546 ../rules/evdev.xml.in.h:546
-msgid "Space key outputs non-breakable space character at second level."
-msgstr "Stisknutí mezerníku zadává na druhé úrovni znak nedělitelné mezery."
-
-#: ../rules/base.xml.in.h:547 ../rules/evdev.xml.in.h:547
-msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
-msgstr "Stisknutí mezerníku zadává na třetí úrovni znak nedělitelné mezery, nic na úrovni čtvrté."
-
-#: ../rules/base.xml.in.h:548 ../rules/evdev.xml.in.h:548
-msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr "Stisknutí mezerníku zadává na třetí úrovni znak nedělitelné mezery, tenkou nedělitelnou mezeru na čtvrté úrovni"
-
-#: ../rules/base.xml.in.h:549 ../rules/evdev.xml.in.h:549
-msgid "Space key outputs non-breakable space character at third level."
-msgstr "Stisknutí mezerníku zadává na třetí úrovni znak nedělitelné mezery."
-
-#: ../rules/base.xml.in.h:550 ../rules/evdev.xml.in.h:550
-msgid "Space key outputs usual space at any level."
-msgstr "Stisknutí mezerníku zadává na jakékoliv úrovni znak běžné mezery."
-
-#: ../rules/base.xml.in.h:551 ../rules/evdev.xml.in.h:551
+#: ../rules/base.xml.in.h:574
msgid "Spain"
msgstr "Španělsko"
-#: ../rules/base.xml.in.h:552 ../rules/evdev.xml.in.h:552
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
-msgstr "Speciální klávesy (Ctrl+Alt+&lt;klávesa&gt;) zpracovány v serveru."
+#: ../rules/base.xml.in.h:575
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
+msgstr "Speciální klávesy (Ctrl+Alt+&lt;klávesa&gt;) zpracovány v serveru"
-#: ../rules/base.xml.in.h:553 ../rules/evdev.xml.in.h:553
+#: ../rules/base.xml.in.h:576
msgid "SrL"
msgstr "SRL"
-#: ../rules/base.xml.in.h:554 ../rules/evdev.xml.in.h:554
+#: ../rules/base.xml.in.h:577
msgid "Sri Lanka"
msgstr "Srí Lanka"
-#: ../rules/base.xml.in.h:555 ../rules/evdev.xml.in.h:555
+#: ../rules/base.xml.in.h:578
msgid "Standard"
msgstr "Standardní"
-#: ../rules/base.xml.in.h:556 ../rules/evdev.xml.in.h:556
+#: ../rules/base.xml.in.h:579
msgid "Standard (Cedilla)"
msgstr "Standardní (cédille)"
+#: ../rules/base.xml.in.h:580
+msgid "Standard Phonetic"
+msgstr "Standardní fonetické"
+
#. RSTU 2019-91
-#: ../rules/base.xml.in.h:558 ../rules/evdev.xml.in.h:558
+#: ../rules/base.xml.in.h:582
msgid "Standard RSTU"
msgstr "Standardní RSTU"
#. RSTU 2019-91
-#: ../rules/base.xml.in.h:560 ../rules/evdev.xml.in.h:560
+#: ../rules/base.xml.in.h:584
msgid "Standard RSTU on Russian layout"
msgstr "Standardní RSTU s ruským rozložením"
-#: ../rules/base.xml.in.h:561 ../rules/evdev.xml.in.h:561
+#: ../rules/base.xml.in.h:585
msgid "Sun Type 5/6"
msgstr "Sun Type 5/6"
-#: ../rules/base.xml.in.h:562 ../rules/evdev.xml.in.h:562
+#: ../rules/base.xml.in.h:586
msgid "Sun dead keys"
msgstr "Mrtvé klávesy Sun"
-#: ../rules/base.xml.in.h:563 ../rules/evdev.xml.in.h:563
+#: ../rules/base.xml.in.h:587
msgid "Super Power Multimedia Keyboard"
msgstr "Super Power Multimedia Keyboard"
-#: ../rules/base.xml.in.h:564 ../rules/evdev.xml.in.h:564
-msgid "Super is mapped to the Win-keys."
-msgstr "Super je přiřazena ke klávesám Win."
-
-#: ../rules/base.xml.in.h:565 ../rules/evdev.xml.in.h:565
+#: ../rules/base.xml.in.h:588
msgid "Svdvorak"
msgstr "Svdvorak"
-#: ../rules/base.xml.in.h:566 ../rules/evdev.xml.in.h:566
+#: ../rules/base.xml.in.h:589
msgid "Svk"
msgstr "SVK"
-#: ../rules/base.xml.in.h:567 ../rules/evdev.xml.in.h:567
+#: ../rules/base.xml.in.h:590
msgid "Svn"
msgstr "SVN"
-#: ../rules/base.xml.in.h:568 ../rules/evdev.xml.in.h:568
-msgid "Swap Ctrl and CapsLock."
-msgstr "Zaměnit Ctrl a Caps Lock."
-
-#: ../rules/base.xml.in.h:569 ../rules/evdev.xml.in.h:569
-msgid "Swap ESC and CapsLock."
-msgstr "Zaměnit Esc a Caps Lock."
+#: ../rules/base.xml.in.h:591
+msgid "Swap Ctrl and CapsLock"
+msgstr "Zaměnit Ctrl a Caps Lock"
-#: ../rules/base.xml.in.h:570 ../rules/evdev.xml.in.h:570
-msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-msgstr "Zamění klávesové kódy dvou kláves v případě chybné detekce klávesnic Mac jádrem."
+#: ../rules/base.xml.in.h:592
+msgid "Swap ESC and CapsLock"
+msgstr "Zaměnit Esc a Caps Lock"
-#: ../rules/base.xml.in.h:571 ../rules/evdev.xml.in.h:571
+#: ../rules/base.xml.in.h:593
msgid "Swe"
msgstr "SWE"
-#: ../rules/base.xml.in.h:572 ../rules/evdev.xml.in.h:572
+#: ../rules/base.xml.in.h:594
msgid "Sweden"
msgstr "Švédsko"
-#: ../rules/base.xml.in.h:573 ../rules/evdev.xml.in.h:573
+#: ../rules/base.xml.in.h:595
msgid "Switzerland"
msgstr "Švýcarsko"
-#: ../rules/base.xml.in.h:574 ../rules/evdev.xml.in.h:574
+#: ../rules/base.xml.in.h:596
msgid "Symplon PaceBook (tablet PC)"
msgstr "Symplon PaceBook (tablet PC)"
-#: ../rules/base.xml.in.h:575 ../rules/evdev.xml.in.h:575
+#: ../rules/base.xml.in.h:597
msgid "Syr"
msgstr "SYR"
-#: ../rules/base.xml.in.h:576 ../rules/evdev.xml.in.h:576
+#: ../rules/base.xml.in.h:598
msgid "Syria"
msgstr "Sýrie"
-#: ../rules/base.xml.in.h:577 ../rules/evdev.xml.in.h:577
+#: ../rules/base.xml.in.h:599
msgid "Syriac"
msgstr "Syrské"
-#: ../rules/base.xml.in.h:578 ../rules/evdev.xml.in.h:578
+#: ../rules/base.xml.in.h:600
msgid "Syriac phonetic"
msgstr "Syrské fonetické"
-#: ../rules/base.xml.in.h:579 ../rules/evdev.xml.in.h:579
+#: ../rules/base.xml.in.h:601
msgid "TIS-820.2538"
msgstr "TIS-820.2538"
-#: ../rules/base.xml.in.h:580 ../rules/evdev.xml.in.h:580
+#: ../rules/base.xml.in.h:602
msgid "Tajikistan"
msgstr "Tádžikistán"
-#: ../rules/base.xml.in.h:581 ../rules/evdev.xml.in.h:581
+#: ../rules/base.xml.in.h:603
msgid "Tamil"
msgstr "Tamilské"
-#: ../rules/base.xml.in.h:582 ../rules/evdev.xml.in.h:582
+#: ../rules/base.xml.in.h:604
msgid "Tamil TAB Typewriter"
msgstr "Tamil TAB Typewriter"
-#: ../rules/base.xml.in.h:583 ../rules/evdev.xml.in.h:583
+#: ../rules/base.xml.in.h:605
msgid "Tamil TSCII Typewriter"
msgstr "Tamil TSCII Typewriter"
-#: ../rules/base.xml.in.h:584 ../rules/evdev.xml.in.h:584
+#: ../rules/base.xml.in.h:606
msgid "Tamil Unicode"
msgstr "Tamilské Unicode"
-#: ../rules/base.xml.in.h:585 ../rules/evdev.xml.in.h:585
+#: ../rules/base.xml.in.h:607
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
+
+#: ../rules/base.xml.in.h:608
msgid "Tatar"
msgstr "Tatarské"
-#: ../rules/base.xml.in.h:586 ../rules/evdev.xml.in.h:586
+#: ../rules/base.xml.in.h:609
msgid "Telugu"
msgstr "Tegulské"
-#: ../rules/base.xml.in.h:587 ../rules/evdev.xml.in.h:587
+#: ../rules/base.xml.in.h:610
msgid "Tha"
msgstr "THA"
-#: ../rules/base.xml.in.h:588 ../rules/evdev.xml.in.h:588
+#: ../rules/base.xml.in.h:611
msgid "Thailand"
msgstr "Thajsko"
-#: ../rules/base.xml.in.h:589 ../rules/evdev.xml.in.h:589
-msgid "Third level choosers"
-msgstr "Výběr třetí úrovně"
-
-#: ../rules/base.xml.in.h:590 ../rules/evdev.xml.in.h:590
+#: ../rules/base.xml.in.h:612
msgid "Tibetan"
msgstr "Tibetské"
-#: ../rules/base.xml.in.h:591 ../rules/evdev.xml.in.h:591
+#: ../rules/base.xml.in.h:613
msgid "Tibetan (with ASCII numerals)"
msgstr "Tibetské (s číslicemi ASCII)"
-#: ../rules/base.xml.in.h:592 ../rules/evdev.xml.in.h:592
+#: ../rules/base.xml.in.h:614
msgid "Tifinagh"
msgstr "Tifinagh"
-#: ../rules/base.xml.in.h:593 ../rules/evdev.xml.in.h:593
+#: ../rules/base.xml.in.h:615
msgid "Tifinagh Alternative"
msgstr "Tifinagh, alternativní"
-#: ../rules/base.xml.in.h:594 ../rules/evdev.xml.in.h:594
+#: ../rules/base.xml.in.h:616
msgid "Tifinagh Alternative Phonetic"
msgstr "Tifinagh, alternativní fonetické"
-#: ../rules/base.xml.in.h:595 ../rules/evdev.xml.in.h:595
+#: ../rules/base.xml.in.h:617
msgid "Tifinagh Extended"
msgstr "Tifinagh, rozšířené"
-#: ../rules/base.xml.in.h:596 ../rules/evdev.xml.in.h:596
+#: ../rules/base.xml.in.h:618
msgid "Tifinagh Extended Phonetic"
msgstr "Tifinagh, rozšířené fonetické"
-#: ../rules/base.xml.in.h:597 ../rules/evdev.xml.in.h:597
+#: ../rules/base.xml.in.h:619
msgid "Tifinagh Phonetic"
msgstr "Tifinagh, fonetické"
-#: ../rules/base.xml.in.h:598 ../rules/evdev.xml.in.h:598
+#: ../rules/base.xml.in.h:620
msgid "Tilde (~) variant"
msgstr "Varianta s vlnovkou (~)"
-#: ../rules/base.xml.in.h:599 ../rules/evdev.xml.in.h:599
+#: ../rules/base.xml.in.h:621
msgid "Tjk"
msgstr "TJK"
-#: ../rules/base.xml.in.h:600 ../rules/evdev.xml.in.h:600
+#: ../rules/base.xml.in.h:622
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr "K odpovídající klávese na klávesnici Dvorak."
+
+#: ../rules/base.xml.in.h:623
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr "K odpovídající klávese na klávesnici Qwerty."
+
+#: ../rules/base.xml.in.h:624
msgid "Toshiba Satellite S3000"
msgstr "Toshiba Satellite S3000"
-#: ../rules/base.xml.in.h:601 ../rules/evdev.xml.in.h:601
+#: ../rules/base.xml.in.h:625
+msgid "Traditional Phonetic"
+msgstr "Tradiční fonetické"
+
+#: ../rules/base.xml.in.h:626
msgid "Trust Direct Access Keyboard"
msgstr "Trust Direct Access Keyboard"
-#: ../rules/base.xml.in.h:602 ../rules/evdev.xml.in.h:602
+#: ../rules/base.xml.in.h:627
+msgid "Trust Slimline"
+msgstr "Trust Slimline"
+
+#: ../rules/base.xml.in.h:628
msgid "Trust Wireless Keyboard Classic"
msgstr "Trust Wireless Keyboard Classic"
-#: ../rules/base.xml.in.h:603 ../rules/evdev.xml.in.h:603
+#: ../rules/base.xml.in.h:629
msgid "Tur"
msgstr "TUR"
-#: ../rules/base.xml.in.h:604 ../rules/evdev.xml.in.h:604
+#: ../rules/base.xml.in.h:630
msgid "Turkey"
msgstr "Turecko"
-#: ../rules/base.xml.in.h:605 ../rules/evdev.xml.in.h:605
+#: ../rules/base.xml.in.h:631
+msgid "Turkmenistan"
+msgstr "Turkmenistán"
+
+#: ../rules/base.xml.in.h:632
msgid "Typewriter"
msgstr "Psací stroj"
-#: ../rules/base.xml.in.h:606 ../rules/evdev.xml.in.h:606
+#: ../rules/base.xml.in.h:633
msgid "UCW layout (accented letters only)"
msgstr "Rozložení UCW (pouze znaky s diakritikou)"
-#: ../rules/base.xml.in.h:607 ../rules/evdev.xml.in.h:607
+#: ../rules/base.xml.in.h:634
msgid "US keyboard with Bosnian digraphs"
msgstr "Americká klávesnice s bosenskými spřežkami"
-#: ../rules/base.xml.in.h:608 ../rules/evdev.xml.in.h:608
+#: ../rules/base.xml.in.h:635
msgid "US keyboard with Bosnian letters"
msgstr "Americká klávesnice s bosenskými znaky"
-#: ../rules/base.xml.in.h:609 ../rules/evdev.xml.in.h:609
+#: ../rules/base.xml.in.h:636
msgid "US keyboard with Croatian digraphs"
msgstr "Americká klávesnice s chorvatskými spřežkami"
-#: ../rules/base.xml.in.h:610 ../rules/evdev.xml.in.h:610
+#: ../rules/base.xml.in.h:637
msgid "US keyboard with Croatian letters"
msgstr "Americká klávesnice s chorvatskými znaky"
-#: ../rules/base.xml.in.h:611 ../rules/evdev.xml.in.h:611
+#: ../rules/base.xml.in.h:638
msgid "US keyboard with Estonian letters"
msgstr "Americká klávesnice s estonskými znaky"
-#: ../rules/base.xml.in.h:612 ../rules/evdev.xml.in.h:612
+#: ../rules/base.xml.in.h:639
msgid "US keyboard with Lithuanian letters"
msgstr "Americká klávesnice s litevskými znaky"
-#: ../rules/base.xml.in.h:613 ../rules/evdev.xml.in.h:613
-msgid "US keyboard with Slovenian digraphs"
-msgstr "Americká klávesnice se slovinskými spřežkami"
-
-#: ../rules/base.xml.in.h:614 ../rules/evdev.xml.in.h:614
+#: ../rules/base.xml.in.h:640
msgid "US keyboard with Slovenian letters"
msgstr "Americká klávesnice se slovinskými znaky"
-#: ../rules/base.xml.in.h:615 ../rules/evdev.xml.in.h:615
+#: ../rules/base.xml.in.h:641
msgid "USA"
msgstr "USA"
-#: ../rules/base.xml.in.h:616 ../rules/evdev.xml.in.h:616
+#: ../rules/base.xml.in.h:642
msgid "Udmurt"
msgstr "Udmurtské"
-#: ../rules/base.xml.in.h:617 ../rules/evdev.xml.in.h:617
+#: ../rules/base.xml.in.h:643
msgid "Ukr"
msgstr "UKR"
-#: ../rules/base.xml.in.h:618 ../rules/evdev.xml.in.h:618
+#: ../rules/base.xml.in.h:644
msgid "Ukraine"
msgstr "Ukrajina"
-#: ../rules/base.xml.in.h:619 ../rules/evdev.xml.in.h:619
+#: ../rules/base.xml.in.h:645
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Doplňky Unicode (šipky a matematické operátory)"
+
+#: ../rules/base.xml.in.h:646
+msgid "Unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Doplňky Unicode (šipky a matematické operátory). Matematické operátory na výchozí úrovni."
+
+#: ../rules/base.xml.in.h:647
msgid "UnicodeExpert"
msgstr "UnicodeExpert"
-#: ../rules/base.xml.in.h:620 ../rules/evdev.xml.in.h:620
+#: ../rules/base.xml.in.h:648
msgid "United Kingdom"
msgstr "Spojené království"
-#: ../rules/base.xml.in.h:621 ../rules/evdev.xml.in.h:621
-msgid "Urdu"
-msgstr "Urdské"
+#: ../rules/base.xml.in.h:649
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
+
+#: ../rules/base.xml.in.h:650
+msgid "Urdu, Alternative phonetic"
+msgstr "Urdské, alternativní fonetické"
+
+#: ../rules/base.xml.in.h:651
+msgid "Urdu, Phonetic"
+msgstr "Urdské, fonetické"
-#: ../rules/base.xml.in.h:622 ../rules/evdev.xml.in.h:622
+#: ../rules/base.xml.in.h:652
+msgid "Urdu, Winkeys"
+msgstr "Urdské, klávesy Win"
+
+#: ../rules/base.xml.in.h:653
msgid "Use Bosnian digraphs"
msgstr "Používat bosenské spřežky"
-#: ../rules/base.xml.in.h:623 ../rules/evdev.xml.in.h:623
+#: ../rules/base.xml.in.h:654
msgid "Use Croatian digraphs"
msgstr "Používat chorvatské spřežky"
-#: ../rules/base.xml.in.h:624 ../rules/evdev.xml.in.h:624
-msgid "Use Slovenian digraphs"
-msgstr "Používat slovinské spřežky"
-
-#: ../rules/base.xml.in.h:625 ../rules/evdev.xml.in.h:625
+#: ../rules/base.xml.in.h:655
msgid "Use guillemets for quotes"
msgstr "Používat francouzské uvozovky"
-#: ../rules/base.xml.in.h:626 ../rules/evdev.xml.in.h:626
-msgid "Use keyboard LED to show alternative layout."
-msgstr "Použít LED klávesnice k zobrazení alternativního rozložení."
+#: ../rules/base.xml.in.h:656
+msgid "Use keyboard LED to show alternative layout"
+msgstr "Použít LED klávesnice k zobrazení alternativního rozložení"
-#: ../rules/base.xml.in.h:627 ../rules/evdev.xml.in.h:627
+#: ../rules/base.xml.in.h:657
msgid "Using space key to input non-breakable space character"
msgstr "Používání mezerníku k zadávání znaku nedělitelné mezery"
-#: ../rules/base.xml.in.h:628 ../rules/evdev.xml.in.h:628
+#: ../rules/base.xml.in.h:658
+msgid "Usual space at any level"
+msgstr "Na jakékoliv úrovni znak běžné mezery"
+
+#: ../rules/base.xml.in.h:659
msgid "Uzb"
msgstr "UZB"
-#: ../rules/base.xml.in.h:629 ../rules/evdev.xml.in.h:629
+#: ../rules/base.xml.in.h:660
msgid "Uzbekistan"
msgstr "Uzbekistán"
-#: ../rules/base.xml.in.h:630 ../rules/evdev.xml.in.h:630
+#: ../rules/base.xml.in.h:661
msgid "Vietnam"
msgstr "Vietnam"
-#: ../rules/base.xml.in.h:631 ../rules/evdev.xml.in.h:631
+#: ../rules/base.xml.in.h:662
msgid "ViewSonic KU-306 Internet Keyboard"
msgstr "ViewSonic KU-306 Internet Keyboard"
-#: ../rules/base.xml.in.h:632 ../rules/evdev.xml.in.h:632
+#: ../rules/base.xml.in.h:663
msgid "Vnm"
msgstr "VNM"
-#: ../rules/base.xml.in.h:633 ../rules/evdev.xml.in.h:633
+#: ../rules/base.xml.in.h:664
msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
msgstr "Numerická klávesnice Wang 724 s doplňky Unicode (šipky a matematické operátory)"
-#: ../rules/base.xml.in.h:634 ../rules/evdev.xml.in.h:634
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
+#: ../rules/base.xml.in.h:665
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
msgstr "Numerická klávesnice Wang 724 s doplňky Unicode (šipky a matematické operátory). Matematické operátory na výchozí úrovni."
-#: ../rules/base.xml.in.h:635 ../rules/evdev.xml.in.h:635
+#: ../rules/base.xml.in.h:666
msgid "Wang model 724 azerty"
msgstr "Wang, model 724 azerty"
-#: ../rules/base.xml.in.h:636 ../rules/evdev.xml.in.h:636
+#: ../rules/base.xml.in.h:667
msgid "Western"
msgstr "Západní"
-#: ../rules/base.xml.in.h:637 ../rules/evdev.xml.in.h:637
+#: ../rules/base.xml.in.h:668
msgid "Winbook Model XP5"
msgstr "Winbook Model XP5"
-#: ../rules/base.xml.in.h:638 ../rules/evdev.xml.in.h:638
+#: ../rules/base.xml.in.h:669
msgid "Winkeys"
msgstr "Klávesy Win"
-#: ../rules/base.xml.in.h:639 ../rules/evdev.xml.in.h:639
+#: ../rules/base.xml.in.h:670
msgid "With &lt;\\|&gt; key"
msgstr "S klávesou &lt;\\|&gt;"
-#: ../rules/base.xml.in.h:640 ../rules/evdev.xml.in.h:640
+#: ../rules/base.xml.in.h:671
msgid "With EuroSign on 5"
msgstr "Se znakem eura na klávese 5"
-#: ../rules/base.xml.in.h:641 ../rules/evdev.xml.in.h:641
+#: ../rules/base.xml.in.h:672
msgid "With guillemets"
msgstr "S francouzskými uvozovkami"
-#: ../rules/base.xml.in.h:642 ../rules/evdev.xml.in.h:642
+#: ../rules/base.xml.in.h:673
msgid "Yahoo! Internet Keyboard"
msgstr "Yahoo! Internet Keyboard"
-#: ../rules/base.xml.in.h:643 ../rules/evdev.xml.in.h:643
+#: ../rules/base.xml.in.h:674
msgid "Yakut"
msgstr "jakutské"
-#: ../rules/base.xml.in.h:644 ../rules/evdev.xml.in.h:644
+#: ../rules/base.xml.in.h:675
msgid "Yoruba"
msgstr "Jorubské"
-#: ../rules/base.xml.in.h:645 ../rules/evdev.xml.in.h:645
+#: ../rules/base.xml.in.h:676
msgid "Z and ZHE swapped"
msgstr "Prohozené Z a Ž"
-#: ../rules/base.xml.in.h:646 ../rules/evdev.xml.in.h:646
+#: ../rules/base.xml.in.h:677
msgid "Zar"
msgstr "ZAR"
-#: ../rules/base.xml.in.h:647 ../rules/evdev.xml.in.h:647
+#: ../rules/base.xml.in.h:678
msgid "azerty"
msgstr "azerty"
-#: ../rules/base.xml.in.h:648 ../rules/evdev.xml.in.h:648
+#: ../rules/base.xml.in.h:679
msgid "azerty/digits"
msgstr "azerty/číslice"
-#: ../rules/base.xml.in.h:649 ../rules/evdev.xml.in.h:649
+#: ../rules/base.xml.in.h:680
msgid "digits"
msgstr "číslice"
-#: ../rules/base.xml.in.h:650 ../rules/evdev.xml.in.h:650
+#: ../rules/base.xml.in.h:681
msgid "displaced semicolon and quote (obsolete)"
msgstr "posunutý středník a uvozovka (zastaralé)"
-#: ../rules/base.xml.in.h:651 ../rules/evdev.xml.in.h:651
+#: ../rules/base.xml.in.h:682
msgid "lyx"
msgstr "lyx"
-#: ../rules/base.xml.in.h:652 ../rules/evdev.xml.in.h:652
+#: ../rules/base.xml.in.h:683
msgid "qwerty"
msgstr "qwerty"
-#: ../rules/base.xml.in.h:653 ../rules/evdev.xml.in.h:653
+#: ../rules/base.xml.in.h:684
msgid "qwerty, extended Backslash"
msgstr "qwerty, rozšířená klávesa zpětného lomítka"
-#: ../rules/base.xml.in.h:654 ../rules/evdev.xml.in.h:654
+#: ../rules/base.xml.in.h:685
msgid "qwerty/digits"
msgstr "qwerty/číslice"
-#: ../rules/base.xml.in.h:655 ../rules/evdev.xml.in.h:655
+#: ../rules/base.xml.in.h:686
msgid "qwertz"
msgstr "qwertz"
diff --git a/xorg-server/xkbdata.src/po/da.po b/xorg-server/xkbdata.src/po/da.po
index 2f606d52b..a404aef5e 100644
--- a/xorg-server/xkbdata.src/po/da.po
+++ b/xorg-server/xkbdata.src/po/da.po
@@ -1,15 +1,33 @@
# Danish translation of xfree86-xkb-xml.
-# Copyright (C) 2003-2008 Free Software Foundation, Inc.
+# Copyright (C) 2003-2009 Free Software Foundation, Inc.
# This file is distributed under the same license as the xkeyboard-config package.
# Ole Laursen <olau@hardworking.dk>, 2003.
-# Joe Hansen <joedalton2@yahoo.dk>, 2008.
+# Joe Hansen <joedalton2@yahoo.dk>, 2008, 2009.
+#
+# Backspace = rettelsestast
+# compose = compose (uafklaret, en streng er tilbage med den)
+#
+# Jeg tror at når der står "compose" i forbindelse med tastaturer er der
+# en specialtast til at skrive en email med "Compose email", derfor
+# synes jeg at det vil være det bedste at kalde det en "Skriv e-mail
+# tast" og så skrive "compose" bagefter i parentes. (kenneths besked, se også Kelds)
+#
+# delete key = slettetast
+# digraph = digraf (En digraf er to bogstaver, der repræsenterer én lyd.
+# En digraf er ikke det samme som en ligatur.) Eksempler: "hj" og "hv"
+# i "hjælp", "hvis" og "hvordan", eller "ph" i engelsk "phone". Kilde
+# dansk wikipedia
+# keypad = numerisk tastatur
+# legacy = forældet
+# pressed = trykket ned (ikke nedtrykket)
+# tilde = tilde
#
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config-1.3-pre1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-13 23:22+0100\n"
-"PO-Revision-Date: 2008-08-20 23:03+0100\n"
+"Project-Id-Version: xkeyboard-config-1.6pre1\n"
+"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
+"POT-Creation-Date: 2009-05-12 23:49+0100\n"
+"PO-Revision-Date: 2009-05-15 23:06+0100\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
"MIME-Version: 1.0\n"
@@ -18,149 +36,147 @@ msgstr ""
#: ../rules/base.xml.in.h:1
msgid "(F)"
-msgstr ""
+msgstr "(F)"
#: ../rules/base.xml.in.h:2
-#, fuzzy
msgid "(Legacy) Alternative"
-msgstr "Fransk (alternativ)"
+msgstr "(Forældet) Alternativ"
#: ../rules/base.xml.in.h:3
msgid "(Legacy) Alternative, Sun dead keys"
-msgstr ""
+msgstr "(Forældet) Alternativ, Sun døde taster"
#: ../rules/base.xml.in.h:4
-#, fuzzy
msgid "(Legacy) Alternative, eliminate dead keys"
-msgstr "Slå døde taster fra"
+msgstr "(Forældet) Alternativ, slå døde taster fra"
#: ../rules/base.xml.in.h:5
-msgid "(Legacy) Dvorak"
-msgstr ""
-
-#: ../rules/base.xml.in.h:6
msgid "101/104 key Compatible"
-msgstr ""
+msgstr "101/104 tastkompatibel"
-#: ../rules/base.xml.in.h:7
-#, fuzzy
+#: ../rules/base.xml.in.h:6
msgid "101/qwerty/comma/Dead keys"
-msgstr "l2/101/qwerty/komma"
+msgstr "101/qwerty/komma/Døde taster"
-#: ../rules/base.xml.in.h:8
+#: ../rules/base.xml.in.h:7
msgid "101/qwerty/comma/Eliminate dead keys"
msgstr "101/qwerty/komma/Slå døde taster fra"
-#: ../rules/base.xml.in.h:9
+#: ../rules/base.xml.in.h:8
msgid "101/qwerty/dot/Dead keys"
-msgstr "101/qwerty/punktum/døde taster"
+msgstr "101/qwerty/punktum/Døde taster"
-#: ../rules/base.xml.in.h:10
+#: ../rules/base.xml.in.h:9
msgid "101/qwerty/dot/Eliminate dead keys"
msgstr "101/qwerty/punktum/Slå døde taster fra"
-#: ../rules/base.xml.in.h:11
+#: ../rules/base.xml.in.h:10
msgid "101/qwertz/comma/Dead keys"
msgstr "101/qwertz/komma/Døde taster"
-#: ../rules/base.xml.in.h:12
+#: ../rules/base.xml.in.h:11
msgid "101/qwertz/comma/Eliminate dead keys"
msgstr "101/qwertz/komma/Slå døde taster fra"
-#: ../rules/base.xml.in.h:13
+#: ../rules/base.xml.in.h:12
msgid "101/qwertz/dot/Dead keys"
msgstr "101/qwertz/punktum/Døde taster"
-#: ../rules/base.xml.in.h:14
+#: ../rules/base.xml.in.h:13
msgid "101/qwertz/dot/Eliminate dead keys"
msgstr "101/qwertz/punktum/Slå døde taster fra"
-#: ../rules/base.xml.in.h:15
+#: ../rules/base.xml.in.h:14
msgid "102/qwerty/comma/Dead keys"
msgstr "102/qwerty/komma/Døde taster"
-#: ../rules/base.xml.in.h:16
+#: ../rules/base.xml.in.h:15
msgid "102/qwerty/comma/Eliminate dead keys"
msgstr "102/qwerty/komma/Slå døde taster fra"
-#: ../rules/base.xml.in.h:17
+#: ../rules/base.xml.in.h:16
msgid "102/qwerty/dot/Dead keys"
msgstr "102/qwerty/punktum/Døde taster"
-#: ../rules/base.xml.in.h:18
+#: ../rules/base.xml.in.h:17
msgid "102/qwerty/dot/Eliminate dead keys"
msgstr "102/qwerty/punktum/Slå døde taster fra"
-#: ../rules/base.xml.in.h:19
+#: ../rules/base.xml.in.h:18
msgid "102/qwertz/comma/Dead keys"
msgstr "102/qwertz/komma/Døde taster"
-#: ../rules/base.xml.in.h:20
+#: ../rules/base.xml.in.h:19
msgid "102/qwertz/comma/Eliminate dead keys"
msgstr "102/qwertz/komma/Slå døde taster fra"
-#: ../rules/base.xml.in.h:21
+#: ../rules/base.xml.in.h:20
msgid "102/qwertz/dot/Dead keys"
msgstr "102/qwertz/punktum/Døde taster"
-#: ../rules/base.xml.in.h:22
+#: ../rules/base.xml.in.h:21
msgid "102/qwertz/dot/Eliminate dead keys"
msgstr "102/qwertz/punktum/Slå døde taster fra"
+#: ../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:24
+#: ../rules/base.xml.in.h:26
msgid "A4Tech KBS-8"
msgstr "A4Tech KBS-8"
-#: ../rules/base.xml.in.h:25
+#: ../rules/base.xml.in.h:27
msgid "A4Tech Wireless Desktop RFKB-23"
msgstr "A4Tech Wireless Desktop RFKB-23"
-#: ../rules/base.xml.in.h:26
+#: ../rules/base.xml.in.h:28
msgid "ACPI Standard"
msgstr "ACPI-standard"
-#: ../rules/base.xml.in.h:27
+# ATM = hæveautomat, måske skal det oversættes.
+#: ../rules/base.xml.in.h:29
+msgid "ATM/phone-style"
+msgstr "ATM/telefonstil"
+
+#: ../rules/base.xml.in.h:30
msgid "Acer AirKey V"
msgstr "Acer AirKey V"
-#: ../rules/base.xml.in.h:28
+#: ../rules/base.xml.in.h:31
msgid "Acer C300"
msgstr "Acer C300"
-#: ../rules/base.xml.in.h:29
+#: ../rules/base.xml.in.h:32
msgid "Acer Ferrari 4000"
msgstr "Acer Ferrari 4000"
-#: ../rules/base.xml.in.h:30
+#: ../rules/base.xml.in.h:33
msgid "Acer Laptop"
msgstr "Acer bærbar"
-#: ../rules/base.xml.in.h:31
-msgid "Add the EuroSign to the 2 key."
-msgstr "Tilføj eurotegnet til 2-tasten."
-
-#: ../rules/base.xml.in.h:32
-msgid "Add the EuroSign to the 4 key."
-msgstr "Tilføj eurotegnet til 4-tasten."
-
-#: ../rules/base.xml.in.h:33
-msgid "Add the EuroSign to the 5 key."
-msgstr "Tilføj eurotegnet til 5-tasten."
-
#: ../rules/base.xml.in.h:34
-msgid "Add the EuroSign to the E key."
-msgstr "Tilføj eurotegnet til E-tasten."
+msgid "Add the standard behavior to Menu key"
+msgstr "Tilføj standardopførslen til menutasten"
#: ../rules/base.xml.in.h:35
-msgid "Add the standard behavior to Menu key."
-msgstr "Tilføj standardopførslen til menutasten."
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "Tilføjelse af esperanto accent circonflexe (supersigno)"
#: ../rules/base.xml.in.h:36
-msgid "Adding the EuroSign to certain keys"
+msgid "Adding EuroSign to certain keys"
msgstr "Tilføjelse af eurotegnet til bestemte taster"
#: ../rules/base.xml.in.h:37
@@ -188,2549 +204,2715 @@ msgid "Albania"
msgstr "Albanien"
#: ../rules/base.xml.in.h:43
-msgid "Alt and Meta are on the Alt keys."
-msgstr "Alt og Meta er på Alt-tasterne."
+msgid "Alt and Meta are on Alt keys"
+msgstr "Alt og Meta er på Alt-tasterne"
#: ../rules/base.xml.in.h:44
-msgid "Alt is mapped to the right Win-key and Super to Menu."
-msgstr "Alt ligger på den højre Win-tast og Super på Menu."
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr "Alt ligger på den højre Win-tast og Super på Menu"
#: ../rules/base.xml.in.h:45
-msgid "Alt+CapsLock changes layout."
-msgstr "Alt+Caps lock-tast skifter layout."
+msgid "Alt+CapsLock"
+msgstr "Alt+CapsLock"
#: ../rules/base.xml.in.h:46
-msgid "Alt+Ctrl change layout."
-msgstr "Alt+Ctrl skifter layout."
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
#: ../rules/base.xml.in.h:47
-msgid "Alt+Shift change layout."
-msgstr "Alt+skift skifter layout."
+msgid "Alt+Shift"
+msgstr "Alt+Skift"
#: ../rules/base.xml.in.h:48
+msgid "Alt+Space"
+msgstr "Alt+Mellemrum"
+
+#: ../rules/base.xml.in.h:49
msgid "Alt-Q"
msgstr "Alt-Q"
-#: ../rules/base.xml.in.h:49
+#: ../rules/base.xml.in.h:50
msgid "Alt/Win key behavior"
msgstr "Alt/Win-tasteopførsel"
-#: ../rules/base.xml.in.h:50
+#: ../rules/base.xml.in.h:51
msgid "Alternative"
msgstr "Alternative"
-#: ../rules/base.xml.in.h:51
+#: ../rules/base.xml.in.h:52
msgid "Alternative Eastern"
msgstr "Alternativ østlig"
-#: ../rules/base.xml.in.h:52
-#, fuzzy
+#: ../rules/base.xml.in.h:53
msgid "Alternative Phonetic"
-msgstr "Alternativ"
+msgstr "Alternativ fonetisk"
-#: ../rules/base.xml.in.h:53
+#: ../rules/base.xml.in.h:54
msgid "Alternative international (former us_intl)"
msgstr "Alternativ international (tidligere us_intl)"
-#: ../rules/base.xml.in.h:54
-#, fuzzy
+#: ../rules/base.xml.in.h:55
msgid "Alternative, Sun dead keys"
-msgstr "Slå døde taster fra"
+msgstr "Alternativ, Sun døde taster"
-#: ../rules/base.xml.in.h:55
+#: ../rules/base.xml.in.h:56
msgid "Alternative, eliminate dead keys"
msgstr "Alternativ, slå døde taster fra"
-#: ../rules/base.xml.in.h:56
+#: ../rules/base.xml.in.h:57
msgid "Alternative, latin-9 only"
msgstr "Alternativ, kun latin-9"
-#: ../rules/base.xml.in.h:57
+#: ../rules/base.xml.in.h:58
msgid "And"
msgstr "And"
-#: ../rules/base.xml.in.h:58
+#: ../rules/base.xml.in.h:59
msgid "Andorra"
msgstr "Andorra"
-#: ../rules/base.xml.in.h:59
+#: ../rules/base.xml.in.h:60
+msgid "Any Alt key"
+msgstr "Enhver Alt-tast"
+
+#: ../rules/base.xml.in.h:61
+msgid "Any Win key"
+msgstr "Enhver Win-tast"
+
+#: ../rules/base.xml.in.h:62
+msgid "Any Win key (while pressed)"
+msgstr "Enhver Win-tast (mens trykket ned)"
+
+#: ../rules/base.xml.in.h:63
msgid "Apostrophe (') variant"
-msgstr ""
+msgstr "Apostrof (') variant"
-#: ../rules/base.xml.in.h:60
+#: ../rules/base.xml.in.h:64
msgid "Apple"
msgstr "Apple"
-#: ../rules/base.xml.in.h:61
+#: ../rules/base.xml.in.h:65
msgid "Apple Laptop"
msgstr "Apple bærbar"
-#: ../rules/base.xml.in.h:62
+#: ../rules/base.xml.in.h:66
msgid "Ara"
msgstr "Ara"
-#: ../rules/base.xml.in.h:63
+#: ../rules/base.xml.in.h:67
msgid "Arabic"
msgstr "Arabisk"
-#: ../rules/base.xml.in.h:64
+#: ../rules/base.xml.in.h:68
msgid "Arm"
msgstr "Arm"
-#: ../rules/base.xml.in.h:65
+#: ../rules/base.xml.in.h:69
msgid "Armenia"
msgstr "Armenien"
-#: ../rules/base.xml.in.h:66
+# Asturian (Asturian: Asturianu or Bable) is a Romance
+# language of the West Iberian group, Astur-Leonese
+# Subgroup, spoken in the Spanish province of Asturias
+# by the Asturian people.
+#: ../rules/base.xml.in.h:70
msgid "Asturian variant with bottom-dot H and bottom-dot L"
-msgstr ""
+msgstr "Asturisk variant med bundpunktum H og bundpunktum L"
-#: ../rules/base.xml.in.h:67
+#: ../rules/base.xml.in.h:71
msgid "Asus Laptop"
msgstr "Asus bærbar"
-#: ../rules/base.xml.in.h:68
+#: ../rules/base.xml.in.h:72
+msgid "At bottom left"
+msgstr "Nederst til venstre"
+
+#: ../rules/base.xml.in.h:73
+msgid "At left of 'A'"
+msgstr "Til venstre for 'A'"
+
+#: ../rules/base.xml.in.h:74
msgid "Aze"
msgstr "Ase"
-#: ../rules/base.xml.in.h:69
+#: ../rules/base.xml.in.h:75
msgid "Azerbaijan"
msgstr "Aserbajdsjan"
-#: ../rules/base.xml.in.h:70
+#: ../rules/base.xml.in.h:76
msgid "Azona RF2300 wireless Internet Keyboard"
msgstr "Azona RF2300 wireless Internet Keyboard"
-#: ../rules/base.xml.in.h:71
+#: ../rules/base.xml.in.h:77
msgid "BTC 5090"
msgstr "BTC 5090"
-#: ../rules/base.xml.in.h:72
+#: ../rules/base.xml.in.h:78
msgid "BTC 5113RF Multimedia"
msgstr "BTC 5113RF-multimedie"
-#: ../rules/base.xml.in.h:73
+#: ../rules/base.xml.in.h:79
msgid "BTC 5126T"
msgstr "BTC 5126T"
-#: ../rules/base.xml.in.h:74
+#: ../rules/base.xml.in.h:80
msgid "BTC 6301URF"
msgstr "BTC 6301URF"
-#: ../rules/base.xml.in.h:75
+#: ../rules/base.xml.in.h:81
msgid "BTC 9000"
msgstr "BTC 9000"
-#: ../rules/base.xml.in.h:76
+#: ../rules/base.xml.in.h:82
msgid "BTC 9000A"
msgstr "BTC 9000A"
-#: ../rules/base.xml.in.h:77
+#: ../rules/base.xml.in.h:83
msgid "BTC 9001AH"
msgstr "BTC 9001AH"
-#: ../rules/base.xml.in.h:78
-#, fuzzy
+#: ../rules/base.xml.in.h:84
msgid "BTC 9019U"
-msgstr "BTC 9001AH"
+msgstr "BTC 9019U"
-#: ../rules/base.xml.in.h:79
-#, fuzzy
+#: ../rules/base.xml.in.h:85
+msgid "BTC 9116U Mini Wireless Internet and Gaming"
+msgstr "BTC 9116U minitrådløst internet og spil"
+
+#: ../rules/base.xml.in.h:86
msgid "Baltic+"
-msgstr "Basal"
+msgstr "Baltisk+"
-#: ../rules/base.xml.in.h:80
+#: ../rules/base.xml.in.h:87
msgid "Ban"
msgstr "Ban"
-#: ../rules/base.xml.in.h:81
+#: ../rules/base.xml.in.h:88
msgid "Bangladesh"
msgstr "Bangladesh"
-#: ../rules/base.xml.in.h:82
+#: ../rules/base.xml.in.h:89
msgid "Bel"
msgstr "Bel"
-#: ../rules/base.xml.in.h:83
+#: ../rules/base.xml.in.h:90
msgid "Belarus"
msgstr "Hviderusland"
-#: ../rules/base.xml.in.h:84
+#: ../rules/base.xml.in.h:91
msgid "Belgium"
msgstr "Belgien"
-#: ../rules/base.xml.in.h:85
+#: ../rules/base.xml.in.h:92
msgid "BenQ X-Touch"
msgstr "BenQ X-Touch"
-#: ../rules/base.xml.in.h:86
+#: ../rules/base.xml.in.h:93
msgid "BenQ X-Touch 730"
msgstr "BenQ X-Touch 730"
-#: ../rules/base.xml.in.h:87
+#: ../rules/base.xml.in.h:94
msgid "BenQ X-Touch 800"
msgstr "BenQ X-Touch 800"
-#: ../rules/base.xml.in.h:88
+#: ../rules/base.xml.in.h:95
msgid "Bengali"
msgstr "Bengali"
-#: ../rules/base.xml.in.h:89
-#, fuzzy
+#: ../rules/base.xml.in.h:96
msgid "Bengali Probhat"
-msgstr "Bengali"
+msgstr "Bengali probhat"
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:97
msgid "Bepo, ergonomic, Dvorak way"
-msgstr ""
+msgstr "Bepo, ergonomisk, Dvorakmåde"
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:98
msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
-msgstr ""
+msgstr "Bepo, ergonomisk, Dvorakmåde, kun latin-9"
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:99
msgid "Bgr"
msgstr "Bgr"
-#: ../rules/base.xml.in.h:93
-#, fuzzy
+#: ../rules/base.xml.in.h:100
msgid "Bhu"
-msgstr "Bih"
+msgstr "Bhu"
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:101
msgid "Bhutan"
msgstr "Bhutan"
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:102
msgid "Biblical Hebrew (Tiro)"
msgstr "Bibelsk hebraisk (Tiro)"
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:103
msgid "Bih"
msgstr "Bih"
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:104
msgid "Blr"
msgstr "Blr"
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:105
msgid "Bosnia and Herzegovina"
msgstr "Bosnien-herzegovina"
-#: ../rules/base.xml.in.h:99
-msgid "Both Alt keys together change layout."
-msgstr "Begge Alt-taster til sammen skifter layout."
-
-#: ../rules/base.xml.in.h:100
-msgid "Both Ctrl keys together change layout."
-msgstr "Begge Ctrl-taster til sammen skifter layout."
-
-#: ../rules/base.xml.in.h:101
-msgid "Both Shift keys together change layout."
-msgstr "Begge skiftetaster til sammen skifter layout."
-
-#: ../rules/base.xml.in.h:102
-msgid "Both Win-keys switch layout while pressed."
-msgstr "Begge Win-taster skifter layout når der trykkes på dem."
-
-#: ../rules/base.xml.in.h:103
-msgid "Bra"
-msgstr "Bra"
-
-#: ../rules/base.xml.in.h:104
-#, fuzzy
-msgid "Braille"
-msgstr "Brasiliansk"
-
-#: ../rules/base.xml.in.h:105
-#, fuzzy
-msgid "Brazil"
-msgstr "Brasiliansk"
-
#: ../rules/base.xml.in.h:106
-msgid "Brazilian ABNT2"
-msgstr "Brasiliansk ABNT2"
+msgid "Both Alt keys together"
+msgstr "Begge Alt-taster sammen"
#: ../rules/base.xml.in.h:107
-#, fuzzy
-msgid "Brl"
-msgstr "Bel"
+msgid "Both Ctrl keys together"
+msgstr "Begge Ctrl-taster sammen"
#: ../rules/base.xml.in.h:108
-msgid "Brother Internet Keyboard"
-msgstr "Brother Internet Keyboard"
+msgid "Both Shift keys together"
+msgstr "Begge skiftetaster sammen"
#: ../rules/base.xml.in.h:109
-msgid "Buckwalter"
-msgstr ""
+msgid "Bra"
+msgstr "Bra"
#: ../rules/base.xml.in.h:110
-#, fuzzy
-msgid "Bulgaria"
-msgstr "Bulgarisk"
+msgid "Braille"
+msgstr "Blindskrift"
#: ../rules/base.xml.in.h:111
-msgid "Cambodia"
-msgstr "Cambodia"
+msgid "Brazil"
+msgstr "Brasilien"
#: ../rules/base.xml.in.h:112
-msgid "Can"
-msgstr "Can"
+msgid "Breton"
+msgstr "Breton"
#: ../rules/base.xml.in.h:113
-msgid "Canada"
-msgstr "Canada"
+msgid "Brl"
+msgstr "Brl"
#: ../rules/base.xml.in.h:114
-#, fuzzy
-msgid "Caps Lock is Compose."
-msgstr "Menu is Compose"
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
#: ../rules/base.xml.in.h:115
-msgid "CapsLock LED shows alternative layout."
-msgstr "Caps Lock LED viser alternativ layout."
+msgid "Buckwalter"
+msgstr "Buckwalter"
#: ../rules/base.xml.in.h:116
-#, fuzzy
-msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
-msgstr "Agerer som skiftetasten med lås. Skift annullerer Caps Lock."
+msgid "Bulgaria"
+msgstr "Bulgarien"
#: ../rules/base.xml.in.h:117
-#, fuzzy
-msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
-msgstr "Agerer som skiftetasten med lås. Skift annullerer ikke Caps Lock."
+msgid "CRULP"
+msgstr "CRULP"
#: ../rules/base.xml.in.h:118
-msgid "CapsLock just locks the Shift modifier."
-msgstr ""
+msgid "Cambodia"
+msgstr "Cambodia"
#: ../rules/base.xml.in.h:119
-msgid "CapsLock key behavior"
-msgstr "Opførsel for Caps Lock-tast"
+msgid "Can"
+msgstr "Can"
#: ../rules/base.xml.in.h:120
-#, fuzzy
-msgid "CapsLock key changes layout."
-msgstr "Caps Lock-tast skifter gruppe"
+msgid "Canada"
+msgstr "Canada"
#: ../rules/base.xml.in.h:121
-msgid "CapsLock switch to first layout, Shift+CapsLock switch to last layout."
-msgstr ""
+msgid "Caps Lock"
+msgstr "Caps Lock"
#: ../rules/base.xml.in.h:122
-msgid "CapsLock toggles Shift so all keys are affected."
-msgstr ""
+msgid "CapsLock"
+msgstr "CapsLock"
#: ../rules/base.xml.in.h:123
-msgid "CapsLock toggles normal capitalization of alphabetic characters."
-msgstr ""
+msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
+msgstr "Caps Lock (skifter til første layout), Skift+Caps Lock (skifter til sidste layout)"
#: ../rules/base.xml.in.h:124
-#, fuzzy
-msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
-msgstr "Bruger intern forstørrelse af bogstaver. Skift annullerer Caps Lock."
+msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
+msgstr "CapsLock (mens presset ned), Alt+CapsLock udfører den oprindleige capslockhandling"
#: ../rules/base.xml.in.h:125
-#, fuzzy
-msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
-msgstr "Bruger intern forstørrelse af bogstaver. Skift annullerer ikke Caps Lock."
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
+msgstr "CapsLock agerer som skiftetasten med lås. Skift »pauser« Caps Lock"
#: ../rules/base.xml.in.h:126
-msgid "Catalan variant with middle-dot L"
-msgstr ""
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock"
+msgstr "CapsLock agerer som skiftetasten med lås. Skift påvirker ikke Caps Lock"
#: ../rules/base.xml.in.h:127
-msgid "Cedilla"
-msgstr ""
+msgid "CapsLock key behavior"
+msgstr "Opførsel for Caps Lock-tast"
#: ../rules/base.xml.in.h:128
-#, fuzzy
-msgid "Che"
-msgstr "Tje"
+msgid "CapsLock toggles Shift so all keys are affected"
+msgstr "Caps Lock ændrer Skift så alle taster bliver påvirket"
#: ../rules/base.xml.in.h:129
+msgid "CapsLock toggles normal capitalization of alphabetic characters"
+msgstr "CapsLock slår små/store bogstaver til/fra"
+
+#: ../rules/base.xml.in.h:130
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
+msgstr "Bruger intern forstørrelse af bogstaver. Skift sætter Caps Lock »på hold«"
+
+#: ../rules/base.xml.in.h:131
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
+msgstr "Bruger intern forstørrelse af bogstaver. Skift påvirker ikke Caps Lock"
+
+#: ../rules/base.xml.in.h:132
+msgid "Catalan variant with middle-dot L"
+msgstr "Katalansk variant med midterpunktum L"
+
+#: ../rules/base.xml.in.h:133
+msgid "Cedilla"
+msgstr "Cedille"
+
+#: ../rules/base.xml.in.h:134
+msgid "Che"
+msgstr "Che"
+
+#: ../rules/base.xml.in.h:135
+msgid "Cherokee"
+msgstr "Cherokee"
+
+#: ../rules/base.xml.in.h:136
+msgid "Cherry B.UNLIMITED"
+msgstr "Cherry B.UBEGRÆNSET"
+
+#: ../rules/base.xml.in.h:137
msgid "Cherry Blue Line CyBo@rd"
msgstr "Cherry Blue Line CyBo@rd"
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:138
msgid "Cherry Blue Line CyBo@rd (alternate option)"
msgstr "Cherry Blue Line CyBo@rd (alternativ)"
-#: ../rules/base.xml.in.h:131
-#, fuzzy
+#: ../rules/base.xml.in.h:139
msgid "Cherry CyBo@rd USB-Hub"
-msgstr "Cherry Blue Line CyBo@rd"
+msgstr "Cherry CyBo@rd USB-hub"
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:140
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Expert"
+
+#: ../rules/base.xml.in.h:141
msgid "Cherry CyMotion Master Linux"
-msgstr ""
+msgstr "Cherry CyMotion Master Linux"
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:142
msgid "Cherry CyMotion Master XPress"
-msgstr ""
+msgstr "Cherry CyMotion Master XPress"
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:143
msgid "Chicony Internet Keyboard"
msgstr "Chicony Internet Keyboard"
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:144
msgid "Chicony KB-9885"
msgstr "Chicony KB-9885"
-#: ../rules/base.xml.in.h:136
-#, fuzzy
+#: ../rules/base.xml.in.h:145
msgid "Chicony KU-0108"
-msgstr "Chicony KB-9885"
+msgstr "Chicony KU-0108"
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:146
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0420"
+
+#: ../rules/base.xml.in.h:147
msgid "China"
-msgstr ""
+msgstr "Kina"
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:148
msgid "Chuvash"
-msgstr ""
+msgstr "Chusvash"
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:149
msgid "Chuvash Latin"
-msgstr ""
+msgstr "Chuvash latin"
-#: ../rules/base.xml.in.h:140
-#, fuzzy
+#: ../rules/base.xml.in.h:150
msgid "Classic"
-msgstr "Basal"
+msgstr "Klassisk"
-#: ../rules/base.xml.in.h:141
-#, fuzzy
+#: ../rules/base.xml.in.h:151
msgid "Classic Dvorak"
-msgstr "Dvorak"
+msgstr "Klassisk Dvorak"
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:152
msgid "Classmate PC"
-msgstr ""
+msgstr "Classmate PC"
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:153
msgid "CloGaelach"
msgstr "CloGaelach"
-#: ../rules/base.xml.in.h:144
+#: ../rules/base.xml.in.h:154
msgid "Colemak"
-msgstr ""
+msgstr "Colemak"
-#: ../rules/base.xml.in.h:145
+#: ../rules/base.xml.in.h:155
msgid "Compaq Easy Access Keyboard"
msgstr "Compaq Easy Access Keyboard"
-#: ../rules/base.xml.in.h:146
+#: ../rules/base.xml.in.h:156
msgid "Compaq Internet Keyboard (13 keys)"
msgstr "Compaq Internet Keyboard (13 taster)"
-#: ../rules/base.xml.in.h:147
+#: ../rules/base.xml.in.h:157
msgid "Compaq Internet Keyboard (18 keys)"
msgstr "Compaq Internet Keyboard (18 taster)"
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:158
msgid "Compaq Internet Keyboard (7 keys)"
msgstr "Compaq Internet Keyboard (7 taster)"
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:159
msgid "Compaq iPaq Keyboard"
msgstr "Compaq iPaq Keyboard"
-#: ../rules/base.xml.in.h:150
-#, fuzzy
+#: ../rules/base.xml.in.h:160
msgid "Compose key position"
-msgstr "Ctrl-tast placering"
+msgstr "Placering af Composetast"
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:161
msgid "Congo, Democratic Republic of the"
-msgstr ""
+msgstr "Congo, Den Demokratiske Republik"
-#: ../rules/base.xml.in.h:152
-#, fuzzy
-msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
-msgstr "Super ligger på Win-tasterne (standard)."
+#: ../rules/base.xml.in.h:162
+msgid "Control + Alt + Backspace"
+msgstr "Control + Alt + Slet tilbage"
-#: ../rules/base.xml.in.h:153
-msgid "Croatia"
-msgstr "Kroatien"
+#: ../rules/base.xml.in.h:163
+msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
+msgstr "Kontrol ligger på Alt-tasterne, Alt ligger på Win-tasterne"
-#: ../rules/base.xml.in.h:154
-msgid "Ctrl key at bottom left"
-msgstr "Ctrl-tast nederst til venstre"
+#: ../rules/base.xml.in.h:164
+msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
+msgstr "Kontrol ligger på Win-tasterne (og de normale Ctrl-taster)"
-#: ../rules/base.xml.in.h:155
-msgid "Ctrl key at left of 'A'"
-msgstr "Ctrl-tast til venstre for 'A'"
+#: ../rules/base.xml.in.h:165
+msgid "Crimean Tatar (Dobruca-1 Q)"
+msgstr "Krimsk tatar (Dobruca-1 Q)"
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:166
+msgid "Crimean Tatar (Dobruca-2 Q)"
+msgstr "Krimsk tatar (Dobruca-2 Q)"
+
+#: ../rules/base.xml.in.h:167
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Krimsk tatar (Tyrkisk Alt-Q)"
+
+#: ../rules/base.xml.in.h:168
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Krimsk tatar (Tyrkisk F)"
+
+#: ../rules/base.xml.in.h:169
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Krimsk tatar (Tyrkisk Q)"
+
+#: ../rules/base.xml.in.h:170
+msgid "Croatia"
+msgstr "Kroatien"
+
+#: ../rules/base.xml.in.h:171
msgid "Ctrl key position"
msgstr "Ctrl-tast placering"
-#: ../rules/base.xml.in.h:157
-msgid "Ctrl+Shift change layout."
-msgstr "Ctrl+skift skifter layout."
+#: ../rules/base.xml.in.h:172
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Skift"
-#: ../rules/base.xml.in.h:158
+#: ../rules/base.xml.in.h:173
msgid "Cyrillic"
msgstr "Kyrillisk"
-#: ../rules/base.xml.in.h:159
+# guillemets er dem her: »«
+#: ../rules/base.xml.in.h:174
msgid "Cyrillic with guillemets"
-msgstr ""
+msgstr "Kyrillisk med guillemeter"
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:175
msgid "Cyrillic, Z and ZHE swapped"
-msgstr ""
+msgstr "Kyrillisk, Z og ZHE ombyttet"
-#: ../rules/base.xml.in.h:161
+#: ../rules/base.xml.in.h:176
msgid "Cze"
msgstr "Tje"
-#: ../rules/base.xml.in.h:162
-#, fuzzy
+# engelsk fejl her? Hedder det ikke Czech Republic
+#: ../rules/base.xml.in.h:177
msgid "Czechia"
-msgstr "Tjekkisk"
+msgstr "Tjekkiet"
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:178
+msgid "DOS"
+msgstr "DOS"
+
+#: ../rules/base.xml.in.h:179
msgid "DRC"
msgstr "DRC"
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:180
msgid "DTK2000"
msgstr "DTK2000"
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:181
msgid "Dan"
msgstr "Dan"
-#: ../rules/base.xml.in.h:166
+#: ../rules/base.xml.in.h:182
msgid "Dead acute"
msgstr "Død accent"
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:183
msgid "Dead grave acute"
msgstr "Død accent grave"
-#: ../rules/base.xml.in.h:168
-msgid "Default numeric keypad keys."
-msgstr "Standard numerisk tastatur taster."
+#: ../rules/base.xml.in.h:184
+msgid "Default numeric keypad keys"
+msgstr "Standard numerisk tastatur taster"
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:185
msgid "Dell"
msgstr "Dell"
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:186
msgid "Dell 101-key PC"
msgstr "Dell 101-taster PC"
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:187
msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
msgstr "Dell bærbar/notebook Inspiron 6xxx/8xxx"
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:188
msgid "Dell Laptop/notebook Precision M series"
msgstr "Dell bærbar/notebook Precision M series"
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:189
msgid "Dell Latitude series laptop"
msgstr "Dell Latitude series bærbar"
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:190
msgid "Dell Precision M65"
msgstr "Dell Precision M65"
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:191
msgid "Dell SK-8125"
msgstr "Dell Sk-8125"
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:192
msgid "Dell SK-8135"
msgstr "Dell SK-8135"
-# mon ikke fejl i engelsk her.
-#: ../rules/base.xml.in.h:177
-msgid "Dell USB Multimedia Keybard"
-msgstr "Dell USB Multimedia Keybard"
+#: ../rules/base.xml.in.h:193
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Dell USB Multimedia tastatur"
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:194
msgid "Denmark"
msgstr "Danmark"
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:195
msgid "Deu"
msgstr "Tys"
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:196
msgid "Dexxa Wireless Desktop Keyboard"
msgstr "Dexxa Wireless Desktop Keyboard"
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:197
msgid "Diamond 9801 / 9802 series"
msgstr "Diamond 9801 / 9802-serien"
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:198
msgid "Dvorak"
msgstr "Dvorak"
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:199
+msgid "Dvorak (UK Punctuation)"
+msgstr "Dvorak (UK tegnsætning)"
+
+#: ../rules/base.xml.in.h:200
msgid "Dvorak international"
msgstr "Dvorak international"
-#: ../rules/base.xml.in.h:184
-msgid "Dvorak, Polish quotes on key \"1/!\""
-msgstr ""
+#: ../rules/base.xml.in.h:201
+msgid "Dvorak, Polish quotes on key 1"
+msgstr "Dvorak, polske anførelsestegn på tast 1"
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:202
msgid "Dvorak, Polish quotes on quotemark key"
-msgstr ""
+msgstr "Dvorak, polske anførelsestegn på anførelsestast"
-#: ../rules/base.xml.in.h:186
-#, fuzzy
+#: ../rules/base.xml.in.h:203
+msgid "E"
+msgstr "Ø"
+
+#: ../rules/base.xml.in.h:204
msgid "Eastern"
-msgstr "Est"
+msgstr "Østlig"
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:205
msgid "Eliminate dead keys"
msgstr "Slå døde taster fra"
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:206
+msgid "Enable extra typographic characters"
+msgstr "Slå ekstra typografiske karakterer til"
+
+#: ../rules/base.xml.in.h:207
+msgid "English"
+msgstr "Engelsk"
+
+#: ../rules/base.xml.in.h:208
msgid "Ennyah DKB-1008"
msgstr "Ennyah DKB-1008"
-#: ../rules/base.xml.in.h:189
-#, fuzzy
+#: ../rules/base.xml.in.h:209
+msgid "Enter on keypad"
+msgstr "Retur på numerisk tastatur"
+
+#: ../rules/base.xml.in.h:210
msgid "Epo"
-msgstr "Esp"
+msgstr "Epo"
-#: ../rules/base.xml.in.h:190
-#, fuzzy
+#: ../rules/base.xml.in.h:211
msgid "Ergonomic"
-msgstr "SVEN Ergonomic 2500"
+msgstr "Ergonomisk"
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:212
msgid "Esp"
msgstr "Esp"
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:213
msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:214
msgid "Est"
msgstr "Est"
-#: ../rules/base.xml.in.h:194
-#, fuzzy
+#: ../rules/base.xml.in.h:215
msgid "Estonia"
-msgstr "Estisk"
+msgstr "Estland"
-#: ../rules/base.xml.in.h:195
-#, fuzzy
+#: ../rules/base.xml.in.h:216
msgid "Eth"
-msgstr "Est"
+msgstr "Eti"
-#: ../rules/base.xml.in.h:196
-#, fuzzy
+#: ../rules/base.xml.in.h:217
msgid "Ethiopia"
-msgstr "Estisk"
+msgstr "Etiopien"
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:218
msgid "Evdev-managed keyboard"
-msgstr ""
+msgstr "Evdev-håndteret tastatur"
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:219
msgid "Everex STEPnote"
msgstr "Everex STEPnote"
-#: ../rules/base.xml.in.h:199
-#, fuzzy
+#: ../rules/base.xml.in.h:220
msgid "Ewe"
-msgstr "Sve"
+msgstr "Ewe"
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:221
msgid "Extended"
msgstr "Udvidet"
-#: ../rules/base.xml.in.h:201
-#, fuzzy
+#: ../rules/base.xml.in.h:222
+msgid "Extended - Winkeys"
+msgstr "Udvidet - Wintaster"
+
+#: ../rules/base.xml.in.h:223
msgid "Extended Backslash"
-msgstr "Udvidet"
+msgstr "Udvidet omvendt skråstreg"
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:224
msgid "F-letter (F) variant"
-msgstr ""
+msgstr "F-bogstav (F) variant"
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:225
+msgid "FL90"
+msgstr "FL90"
+
+#: ../rules/base.xml.in.h:226
msgid "Fao"
msgstr "Fær"
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:227
msgid "Faroe Islands"
msgstr "Færøerne"
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:228
msgid "Fin"
msgstr "Fin"
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:229
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:209
+#: ../rules/base.xml.in.h:232
msgid "Four-level key with abstract separators"
-msgstr ""
+msgstr "Niveau fire tast med abstrakt adskillelser"
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:233
msgid "Four-level key with comma"
-msgstr ""
+msgstr "Niveau fire tast med komma"
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:234
msgid "Four-level key with dot"
-msgstr ""
+msgstr "Niveau fire tast med punktum"
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:235
+msgid "Four-level key with dot, latin-9 restriction"
+msgstr "Niveau fire tast med punktum, latin-9 begrænsning"
+
+#: ../rules/base.xml.in.h:236
msgid "Four-level key with momayyez"
-msgstr ""
+msgstr "Niveau fire tast med momayyez"
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:237
msgid "Fra"
msgstr "Fra"
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:238
msgid "France"
msgstr "Frankrig"
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:239
msgid "French"
msgstr "Fransk"
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:240
msgid "French (Macintosh)"
msgstr "Fransk (Macintosh)"
-#: ../rules/base.xml.in.h:217
-#, fuzzy
+#: ../rules/base.xml.in.h:241
msgid "French (legacy)"
-msgstr "Fransk (alternativ)"
+msgstr "Fransk (forældet)"
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:242
msgid "French Dvorak"
msgstr "Fransk dvorak"
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:243
msgid "French, Sun dead keys"
msgstr "Fransk, Sun døde taster"
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:244
msgid "French, eliminate dead keys"
msgstr "Fransk, slå døde taster fra"
-#: ../rules/base.xml.in.h:221
-msgid "Fujitsu-Siemens Computers AMILO A1667G laptop"
-msgstr "Fujitsu-Siemens Computers AMILO A1667G bærbar"
+#: ../rules/base.xml.in.h:245
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Fujitsu-Siemens Computers AMILO bærbar"
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:246
msgid "Fula"
-msgstr ""
+msgstr "Fula"
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:247
msgid "GBr"
msgstr "GBr"
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:248
msgid "Ga"
-msgstr ""
+msgstr "Ga"
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:249
msgid "Generic 101-key PC"
msgstr "Generisk 101-taster PC"
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:250
msgid "Generic 102-key (Intl) PC"
msgstr "Generisk 102-taster (Intl) PC"
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:251
msgid "Generic 104-key PC"
msgstr "Generisk 104-taster PC"
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:252
msgid "Generic 105-key (Intl) PC"
msgstr "Generisk 105-taster (Intl) PC"
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:253
msgid "Genius Comfy KB-12e"
msgstr "Genius Comfy KB-12e"
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:254
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:231
+#: ../rules/base.xml.in.h:255
msgid "Genius Comfy KB-21e-Scroll"
msgstr "Genius Comfy KB-21e-Scroll"
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:256
msgid "Genius KB-19e NB"
msgstr "Genius KB-19e NB"
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:257
+msgid "Genius KKB-2050HS"
+msgstr "Genius KKB-2050HS"
+
+#: ../rules/base.xml.in.h:258
msgid "Geo"
msgstr "Geo"
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:259
msgid "Georgia"
msgstr "Georgien"
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:260
msgid "Georgian"
msgstr "Georgisk"
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:261
msgid "Georgian AZERTY Tskapo"
msgstr "Georgisk AZERTY Tskapo"
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:262
msgid "German (Macintosh)"
msgstr "Tysk (Macintosh)"
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:263
msgid "German, Sun dead keys"
msgstr "Tysk, Sun døde taster"
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:264
msgid "German, eliminate dead keys"
msgstr "Tysk, slå døde taster fra"
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:265
msgid "Germany"
msgstr "Tyskland"
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:266
msgid "Gha"
msgstr "Gha"
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:267
msgid "Ghana"
msgstr "Ghana"
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:268
msgid "Gre"
msgstr "Græ"
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:269
msgid "Greece"
msgstr "Grækenland"
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:270
msgid "Group toggle on multiply/divide key"
-msgstr ""
+msgstr "Samlet ændring på division-/divideretast"
-#: ../rules/base.xml.in.h:246
-#, fuzzy
+#: ../rules/base.xml.in.h:271
msgid "Gui"
-msgstr "Guj"
+msgstr "Gui"
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:272
msgid "Guinea"
-msgstr ""
+msgstr "Guinea"
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:273
msgid "Gujarati"
msgstr "Gujarati"
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:274
msgid "Gurmukhi"
msgstr "Gurmukhi"
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:275
msgid "Gurmukhi Jhelum"
msgstr "Gurmukhi Jhelum"
-#: ../rules/base.xml.in.h:251
-#, fuzzy
+#: ../rules/base.xml.in.h:276
msgid "Gyration"
-msgstr "Kroatisk"
+msgstr "Roteren"
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:277
msgid "Happy Hacking Keyboard"
-msgstr ""
+msgstr "Glædelig hacking tastatur"
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:278
msgid "Happy Hacking Keyboard for Mac"
-msgstr ""
+msgstr "Glædelig hacking tastatur til Mac"
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:279
msgid "Hausa"
-msgstr ""
+msgstr "Hausa"
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:280
msgid "Hewlett-Packard Internet Keyboard"
msgstr "Hewlett-Packard Internet Keyboard"
-#: ../rules/base.xml.in.h:256
-msgid "Hewlett-Packard Internet Keyboard 5181"
-msgstr "Hewlett-Packard Internet Keyboard 5181"
-
-#: ../rules/base.xml.in.h:257
-msgid "Hewlett-Packard Internet Keyboard 5185"
-msgstr "Hewlett-Packard Internet Keyboard 5185"
-
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:281
msgid "Hewlett-Packard Omnibook 500 FA"
msgstr "Hewlett-Packard Omnibook 500 FA"
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:282
msgid "Hewlett-Packard Omnibook 5xx"
msgstr "Hewlett-Packard Omnibook 5xx"
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:283
msgid "Hewlett-Packard Omnibook 6000/6100"
msgstr "Hewlett-Packard Omnibook 6000/6100"
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:284
msgid "Hewlett-Packard Omnibook XE3 GC"
msgstr "Hewlett-Packard Omnibook XE3 GC"
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:285
msgid "Hewlett-Packard Omnibook XE3 GF"
msgstr "Hewlett-Packard Omnibook XE3 GF"
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:286
msgid "Hewlett-Packard Omnibook XT1000"
msgstr "Hewlett-Packard Omnibook XT1000"
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:287
msgid "Hewlett-Packard Pavilion ZT11xx"
msgstr "Hewlett-Packard Pavilion ZT11xx"
-#: ../rules/base.xml.in.h:265
-msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
+#: ../rules/base.xml.in.h:288
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
-#: ../rules/base.xml.in.h:266
-msgid "Hewlett-Packard SK-2505 Internet Keyboard"
-msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
+#: ../rules/base.xml.in.h:289
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-250x Multimedia tastatur"
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:290
msgid "Hewlett-Packard nx9020"
msgstr "Hewlett-Packard nx9020"
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:291
+msgid "Hexadecimal"
+msgstr "Sekstentals"
+
+#: ../rules/base.xml.in.h:292
msgid "Hindi Bolnagri"
-msgstr ""
+msgstr "Hindi bolnagri"
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:293
+msgid "Hindi Wx"
+msgstr "Hindi Wx"
+
+#: ../rules/base.xml.in.h:294
msgid "Homophonic"
-msgstr ""
+msgstr "Homofonisk"
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:295
msgid "Honeywell Euroboard"
msgstr "Honeywell Euroboard"
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:296
msgid "Hrv"
msgstr "Hrv"
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:297
msgid "Hun"
msgstr "Ung"
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:298
msgid "Hungary"
msgstr "Ungarn"
-#: ../rules/base.xml.in.h:274
-msgid "Hyper is mapped to the Win-keys."
-msgstr "Hyper ligger på Win-tasterne."
+#: ../rules/base.xml.in.h:299
+msgid "Hyper is mapped to Win-keys"
+msgstr "Hyper ligger på Win-tasterne"
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:300
msgid "IBM (LST 1205-92)"
msgstr "IBM (LST 1205-92)"
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:301
msgid "IBM Rapid Access"
msgstr "IBM Rapid Access"
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:302
msgid "IBM Rapid Access II"
msgstr "IBM Rapid Access II"
-#: ../rules/base.xml.in.h:278
-msgid "IBM Rapid Access II (alternate option)"
-msgstr "IBM Rapid Access II (alternativ)"
+#: ../rules/base.xml.in.h:303
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:304
msgid "IBM ThinkPad 560Z/600/600E/A22E"
msgstr "IBM ThinkPad 560Z/600/600E/A22E"
-#: ../rules/base.xml.in.h:280
-#, fuzzy
+#: ../rules/base.xml.in.h:305
msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, intl"
-#: ../rules/base.xml.in.h:281
-msgid "IBM ThinkPad R60/T60/Z60m/Z60t/R61/T61/Z61m/Z61t"
-msgstr "IBM ThinkPad R60/T60/Z60m/Z60t/R61/T61/Z61m/Z61t"
+#: ../rules/base.xml.in.h:306
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:307
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+
+#: ../rules/base.xml.in.h:308
msgid "ISO Alternate"
msgstr "ISO-alternativ"
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:309
msgid "Iceland"
msgstr "Island"
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:310
msgid "Igbo"
-msgstr ""
+msgstr "Igbo"
-#: ../rules/base.xml.in.h:285
-#, fuzzy
+#: ../rules/base.xml.in.h:311
+msgid "Include dead tilde"
+msgstr "Inkludere død tilde"
+
+#: ../rules/base.xml.in.h:312
msgid "Ind"
-msgstr "Irn"
+msgstr "Ind"
-#: ../rules/base.xml.in.h:286
-#, fuzzy
+#: ../rules/base.xml.in.h:313
msgid "India"
-msgstr "Canadisk"
+msgstr "Indien"
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:314
msgid "International (AltGr dead keys)"
-msgstr ""
+msgstr "International (AltGr døde taster)"
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:315
msgid "International (with dead keys)"
-msgstr ""
+msgstr "International (med døde taster)"
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:316
msgid "Inuktitut"
msgstr "Inuktitut"
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:317
msgid "Iran"
msgstr "Iran"
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:318
msgid "Iraq"
msgstr "Irak"
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:319
msgid "Ireland"
msgstr "Irland"
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:320
msgid "Irl"
msgstr "Irl"
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:321
msgid "Irn"
msgstr "Irn"
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:322
msgid "Irq"
msgstr "Irk"
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:323
msgid "Isl"
msgstr "Isl"
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:324
msgid "Isr"
msgstr "Isr"
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:325
msgid "Israel"
msgstr "Israel"
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:326
msgid "Ita"
msgstr "Ita"
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:327
msgid "Italy"
msgstr "Italien"
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:328
msgid "Japan"
msgstr "Japan"
-#: ../rules/base.xml.in.h:302
+#: ../rules/base.xml.in.h:329
msgid "Japan (PC-98xx Series)"
msgstr "Japan (PC-98xx serier)"
-#: ../rules/base.xml.in.h:303
-msgid "Japanese 106-key"
-msgstr "Japansk 106-taster"
-
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:330
msgid "Japanese keyboard options"
-msgstr ""
+msgstr "Japanske tastaturvalg"
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:331
msgid "Jpn"
msgstr "Jpn"
-#: ../rules/base.xml.in.h:306
-#, fuzzy
+# The Kalmyk language (Хальмг келн; also known as Kalmuck,
+# Calmouk, Qalmaq, Kalmytskii Jazyk, Khal:mag, Volga Oirat,
+# Weilate, Western Mongol) is the language spoken by the
+# Kalmyks, that is, the Oirats of Kalmykia (Russian Federation).
+# Kalmyk belongs to the Oirat subgroup of the Mongolic language family.
+#: ../rules/base.xml.in.h:332
+msgid "Kalmyk"
+msgstr "Kalmyk"
+
+#: ../rules/base.xml.in.h:333
msgid "Kana"
-msgstr "Kan"
+msgstr "Kana"
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:334
msgid "Kana Lock key is locking"
-msgstr ""
+msgstr "Kana låsetast låser"
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:335
msgid "Kannada"
msgstr "Kannada"
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:336
msgid "Kashubian"
-msgstr ""
+msgstr "Kashubian"
-#: ../rules/base.xml.in.h:310
-#, fuzzy
+#: ../rules/base.xml.in.h:337
msgid "Kaz"
-msgstr "Kan"
+msgstr "Kaz"
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:338
msgid "Kazakh with Russian"
-msgstr ""
+msgstr "Kazakh med russisk"
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:339
msgid "Kazakhstan"
msgstr "Kazakstan"
-#: ../rules/base.xml.in.h:313
-msgid "Keypad"
-msgstr ""
+#: ../rules/base.xml.in.h:340
+msgid "Key sequence to kill the X server"
+msgstr "Tastsekvens for at slå X-serveren ned"
-#: ../rules/base.xml.in.h:314
-msgid "Keypad with unicode additions (arrows and math operators)"
-msgstr ""
+#: ../rules/base.xml.in.h:341
+msgid "Key to choose 3rd level"
+msgstr "Tast for at vælge tredje niveau"
-#: ../rules/base.xml.in.h:315
-msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr ""
+#: ../rules/base.xml.in.h:342
+msgid "Key(s) to change layout"
+msgstr "Tast(er) for at skifte layout"
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:343
+msgid "Keypad"
+msgstr "Numerisk tastatur"
+
+#: ../rules/base.xml.in.h:344
msgid "Keytronic FlexPro"
msgstr "Keytronic FlexPro"
-#: ../rules/base.xml.in.h:317
-msgid "Khm"
-msgstr ""
+#: ../rules/base.xml.in.h:345
+msgid "Kgz"
+msgstr "Kgz"
-#: ../rules/base.xml.in.h:318
-msgid "Kir"
-msgstr ""
+#: ../rules/base.xml.in.h:346
+msgid "Khm"
+msgstr "Khm"
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:347
msgid "Komi"
-msgstr ""
+msgstr "Komi"
-#: ../rules/base.xml.in.h:320
-#, fuzzy
+#: ../rules/base.xml.in.h:348
msgid "Kor"
-msgstr "Nor"
+msgstr "Kor"
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:349
msgid "Korea, Republic of"
-msgstr ""
+msgstr "Republikken Korea"
-#: ../rules/base.xml.in.h:322
-msgid "Korean 106-key"
-msgstr "Koreansk 106-tast"
+#: ../rules/base.xml.in.h:350
+msgid "Ktunaxa"
+msgstr "Ktunaxa"
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:351
msgid "Kurdish, (F)"
msgstr "Kurdisk, (F)"
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:352
msgid "Kurdish, Arabic-Latin"
-msgstr ""
+msgstr "Kurdisk, arabisk-latin"
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:353
msgid "Kurdish, Latin Alt-Q"
-msgstr ""
+msgstr "Kurdisk, latin Alt-Q"
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:354
msgid "Kurdish, Latin Q"
-msgstr ""
+msgstr "Kurdisk, latin Q"
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:355
msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Kyrgyzstan"
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:356
msgid "LAm"
msgstr "LAm"
-#: ../rules/base.xml.in.h:329
-#, fuzzy
-msgid "LCtrl+LShift change layout."
-msgstr "Ctrl+skift skifter gruppe"
-
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:357
msgid "LEKP"
-msgstr ""
+msgstr "LEKP"
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:358
msgid "LEKPa"
-msgstr ""
+msgstr "LEKPa"
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:359
msgid "Lao"
msgstr "Lao"
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:360
msgid "Laos"
msgstr "Laos"
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:361
msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
msgstr "Bærbar Compaq (fx Armada) Laptop Keyboard"
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:362
msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
msgstr "Bærbar/notebook Compaq (fx Presario) Internet Keyboard"
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:363
msgid "Laptop/notebook eMachines m68xx"
msgstr "Bærbar/notebook eMachines m68xx"
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:364
msgid "Latin"
msgstr "Latin"
-#: ../rules/base.xml.in.h:338
-#, fuzzy
+#: ../rules/base.xml.in.h:365
msgid "Latin American"
msgstr "Latinamerika"
-#: ../rules/base.xml.in.h:339
-#, fuzzy
+#: ../rules/base.xml.in.h:366
msgid "Latin Unicode"
-msgstr "Latinamerika"
+msgstr "Latin unicode"
-#: ../rules/base.xml.in.h:340
-#, fuzzy
+#: ../rules/base.xml.in.h:367
msgid "Latin Unicode qwerty"
-msgstr "UnicodeExpert"
+msgstr "Latin unicode qwerty"
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:368
msgid "Latin qwerty"
msgstr "Latin qwerty"
-#: ../rules/base.xml.in.h:342
-#, fuzzy
+#: ../rules/base.xml.in.h:369
msgid "Latin unicode"
-msgstr "Latinamerika"
+msgstr "Latin unicode"
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:370
msgid "Latin unicode qwerty"
-msgstr ""
+msgstr "Latin unicode qwerty"
-#: ../rules/base.xml.in.h:344
+# guillemets er dem her: »«
+#: ../rules/base.xml.in.h:371
msgid "Latin with guillemets"
-msgstr ""
+msgstr "Latin med gullemeter"
-#: ../rules/base.xml.in.h:345
-#, fuzzy
+#: ../rules/base.xml.in.h:372
msgid "Latvia"
-msgstr "Lettisk"
+msgstr "Letland"
-#: ../rules/base.xml.in.h:346
-#, fuzzy
+#: ../rules/base.xml.in.h:373
msgid "Lav"
-msgstr "Let"
+msgstr "Lav"
-#: ../rules/base.xml.in.h:347
-msgid "Layout switching"
-msgstr ""
+#: ../rules/base.xml.in.h:374
+msgid "Left Alt"
+msgstr "Venstre Alt"
-#: ../rules/base.xml.in.h:348
-#, fuzzy
-msgid "Left Alt is swapped with left Win-key."
-msgstr "Meta ligger på venstre Win-tast."
+#: ../rules/base.xml.in.h:375
+msgid "Left Alt (while pressed)"
+msgstr "Venstre Alt (mens trykket ned)"
-#: ../rules/base.xml.in.h:349
-#, fuzzy
-msgid "Left Alt key changes layout."
-msgstr "Venstre Alt-tast skifter gruppe"
+#: ../rules/base.xml.in.h:376
+msgid "Left Alt is swapped with Left Win"
+msgstr "Venstre Alt ombyttes med venstre Win-tast"
-#: ../rules/base.xml.in.h:350
-#, fuzzy
-msgid "Left Alt key switches layout while pressed."
-msgstr "Venstre Win-tast skifter gruppe mens nedtrykket"
+#: ../rules/base.xml.in.h:377
+msgid "Left Ctrl"
+msgstr "Venstre Ctrl"
-#: ../rules/base.xml.in.h:351
-#, fuzzy
-msgid "Left Ctrl key changes layout."
-msgstr "Venstre Ctrl-tast skifter gruppe"
+#: ../rules/base.xml.in.h:378
+msgid "Left Ctrl+Left Shift"
+msgstr "Venstre Ctrl+Venstre Skift"
-#: ../rules/base.xml.in.h:352
-#, fuzzy
-msgid "Left Shift key changes layout."
-msgstr "Venstre skiftetast skifter gruppe"
+#: ../rules/base.xml.in.h:379
+msgid "Left Shift"
+msgstr "Venstre Skift"
-#: ../rules/base.xml.in.h:353
-#, fuzzy
-msgid "Left Win-key changes layout."
-msgstr "Venstre Win-tast skifter gruppe"
+#: ../rules/base.xml.in.h:380
+msgid "Left Win"
+msgstr "Venstre Win"
-#: ../rules/base.xml.in.h:354
-#, fuzzy
-msgid "Left Win-key is Compose."
-msgstr "Højre Win-tast er Compose"
+#: ../rules/base.xml.in.h:381
+msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgstr "Venstre Win (skifter til første layout), Højre Win/Menu (skifter til sidste layout)"
-#: ../rules/base.xml.in.h:355
-#, fuzzy
-msgid "Left Win-key switches layout while pressed."
-msgstr "Venstre Win-tast skifter gruppe mens nedtrykket"
+#: ../rules/base.xml.in.h:382
+msgid "Left Win (while pressed)"
+msgstr "Venstre Win-tast (mens trykket ned)"
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:383
msgid "Left hand"
msgstr "Venstre hånd"
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:384
msgid "Left handed Dvorak"
msgstr "Venstrehåndet dvorak"
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:385
msgid "Legacy"
-msgstr ""
+msgstr "Forældet"
-#: ../rules/base.xml.in.h:359
-msgid "Legacy Wang 724 keypad"
-msgstr ""
+#: ../rules/base.xml.in.h:386
+msgid "Legacy Wang 724"
+msgstr "Forældet Wang 724"
#. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:388
msgid "Legacy key with comma"
-msgstr ""
+msgstr "Forældet tast med komma"
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:389
msgid "Legacy key with dot"
-msgstr ""
+msgstr "Forældet tast med punktum"
-#: ../rules/base.xml.in.h:363
-msgid "Legacy keypad"
-msgstr ""
-
-#: ../rules/base.xml.in.h:364
-msgid "Less-than/Greater-than is Compose."
-msgstr ""
+#: ../rules/base.xml.in.h:390
+msgid "Less-than/Greater-than"
+msgstr "Mindre end/Større end"
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:391
msgid "Lithuania"
-msgstr ""
+msgstr "Litauen"
-#: ../rules/base.xml.in.h:366
-#, fuzzy
+#: ../rules/base.xml.in.h:392
msgid "Logitech Access Keyboard"
-msgstr "Logitech Deluxe Access Keyboard"
+msgstr "Logitech Access Keyboard"
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:393
msgid "Logitech Cordless Desktop"
msgstr "Logitech Cordless Desktop"
-#: ../rules/base.xml.in.h:368
-#, fuzzy
+#: ../rules/base.xml.in.h:394
msgid "Logitech Cordless Desktop (alternate option)"
-msgstr "Logitech Cordless Desktop Pro (alternativ)"
+msgstr "Logitech Cordless Desktop (alternativ valg)"
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:395
msgid "Logitech Cordless Desktop EX110"
msgstr "Logitech Cordless Desktop EX110"
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:396
msgid "Logitech Cordless Desktop LX-300"
msgstr "Logitech Cordless Desktop LX-300"
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:397
msgid "Logitech Cordless Desktop Navigator"
msgstr "Logitech Cordless Desktop Navigator"
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:398
msgid "Logitech Cordless Desktop Optical"
msgstr "Logitech Cordless Desktop Optical"
-#: ../rules/base.xml.in.h:373
-msgid "Logitech Cordless Desktop Pro (alternate option2)"
-msgstr "Logitech Cordless Desktop Pro (alternativ 2)"
+#: ../rules/base.xml.in.h:399
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgstr "Logitech Cordless Desktop Pro (alternativ tilvalg 2)"
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:400
msgid "Logitech Cordless Desktop iTouch"
msgstr "Logitech Cordless Desktop iTouch"
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:401
msgid "Logitech Cordless Freedom/Desktop Navigator"
msgstr "Logitech Cordless Freedom/Desktop Navigator"
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:402
msgid "Logitech G15 extra keys via G15daemon"
msgstr "Logitech G15 ekstra taster via G15daemon"
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:403
msgid "Logitech Generic Keyboard"
msgstr "Logitech Generic Keyboard"
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:404
msgid "Logitech Internet 350 Keyboard"
msgstr "Logitech Internet 350 Keyboard"
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:405
msgid "Logitech Internet Keyboard"
msgstr "Logitech Internet Keyboard"
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:406
msgid "Logitech Internet Navigator Keyboard"
msgstr "Logitech Internet Navigator Keyboard"
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:407
msgid "Logitech Media Elite Keyboard"
msgstr "Logitech Media Elite Keyboard"
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:408
msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:409
msgid "Logitech Ultra-X Keyboard"
msgstr "Logitech Ultra-X Keyboard"
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:410
msgid "Logitech diNovo Edge Keyboard"
msgstr "Logitech diNovo Edge Keyboard"
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:411
msgid "Logitech diNovo Keyboard"
msgstr "Logitech diNovo Keyboard"
-#: ../rules/base.xml.in.h:386
+#: ../rules/base.xml.in.h:412
msgid "Logitech iTouch"
msgstr "Logitech iTouch"
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:413
msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-#: ../rules/base.xml.in.h:388
-#, fuzzy
+#: ../rules/base.xml.in.h:414
msgid "Logitech iTouch Internet Navigator Keyboard SE"
-msgstr "Logitech Internet Navigator Keyboard"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
-#: ../rules/base.xml.in.h:389
-#, fuzzy
+#: ../rules/base.xml.in.h:415
msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-msgstr "Logitech Internet Navigator Keyboard"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:416
+msgid "Lower Sorbian"
+msgstr "Nedre Sorbian"
+
+#: ../rules/base.xml.in.h:417
+msgid "Lower Sorbian (qwertz)"
+msgstr "Nedre Sorbian (qwertz)"
+
+#: ../rules/base.xml.in.h:418
msgid "Ltu"
msgstr "Lit"
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:419
msgid "MESS"
-msgstr ""
+msgstr "MESS"
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:420
msgid "MNE"
-msgstr ""
+msgstr "MNE"
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:421
msgid "MacBook/MacBook Pro"
-msgstr ""
+msgstr "MacBook/MacBook Pro"
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:422
msgid "MacBook/MacBook Pro (Intl)"
-msgstr ""
+msgstr "MacBook/MacBook Pro (Intl)"
-#: ../rules/base.xml.in.h:395
-#, fuzzy
+#: ../rules/base.xml.in.h:423
msgid "Macedonia"
-msgstr "Makedonsk"
+msgstr "Makedonien"
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:424
msgid "Macintosh"
msgstr "Macintosh"
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:425
msgid "Macintosh Old"
msgstr "Macintosh gammel"
-#: ../rules/base.xml.in.h:398
-#, fuzzy
+#: ../rules/base.xml.in.h:426
msgid "Macintosh, Sun dead keys"
-msgstr "Sun døde taster"
+msgstr "Macintosh, sun døde taster"
-#: ../rules/base.xml.in.h:399
-#, fuzzy
+#: ../rules/base.xml.in.h:427
msgid "Macintosh, eliminate dead keys"
-msgstr "Slå døde taster fra"
+msgstr "Macintosh, slå døde taster fra"
-#: ../rules/base.xml.in.h:400
-#, fuzzy
-msgid "Make CapsLock an additional Ctrl."
+#: ../rules/base.xml.in.h:428
+msgid "Make CapsLock an additional Backspace"
+msgstr "Gør Caps Lock til en ekstra rettelsestast"
+
+#: ../rules/base.xml.in.h:429
+msgid "Make CapsLock an additional Ctrl"
msgstr "Gør Caps Lock til en ekstra Ctrl"
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:430
+msgid "Make CapsLock an additional ESC"
+msgstr "Gør Caps Lock til en ekstra Esc"
+
+#: ../rules/base.xml.in.h:431
msgid "Mal"
msgstr "Mal"
-#: ../rules/base.xml.in.h:402
+#: ../rules/base.xml.in.h:432
msgid "Malayalam"
msgstr "Malayalam"
-#: ../rules/base.xml.in.h:403
-#, fuzzy
+#: ../rules/base.xml.in.h:433
msgid "Malayalam Lalitha"
-msgstr "Malayalam"
+msgstr "Malayalam Lalitha"
-#: ../rules/base.xml.in.h:404
-#, fuzzy
+#: ../rules/base.xml.in.h:434
msgid "Maldives"
-msgstr "Maltesisk"
+msgstr "Maldiverne"
-#: ../rules/base.xml.in.h:405
-#, fuzzy
+#: ../rules/base.xml.in.h:435
msgid "Malta"
-msgstr "Mal"
+msgstr "Malta"
-#: ../rules/base.xml.in.h:406
-#, fuzzy
+#: ../rules/base.xml.in.h:436
msgid "Maltese keyboard with US layout"
-msgstr "Maltesisk (US-layout)"
+msgstr "Maltesisk tastatur med US-layout"
-#: ../rules/base.xml.in.h:407
-#, fuzzy
+#: ../rules/base.xml.in.h:437
msgid "Mao"
-msgstr "Fær"
+msgstr "Mao"
-#: ../rules/base.xml.in.h:408
-#, fuzzy
+#: ../rules/base.xml.in.h:438
msgid "Maori"
-msgstr "Farsi"
+msgstr "Maori"
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:439
msgid "Memorex MX1998"
msgstr "Memorex MX1998"
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:440
msgid "Memorex MX2500 EZ-Access Keyboard"
msgstr "Memorex MX2500 EZ-Access Keyboard"
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:441
msgid "Memorex MX2750"
msgstr "Memorex MX2750"
-#: ../rules/base.xml.in.h:412
-#, fuzzy
-msgid "Menu is Compose."
-msgstr "Menu is Compose"
+#: ../rules/base.xml.in.h:442
+msgid "Menu"
+msgstr "Menu"
-#: ../rules/base.xml.in.h:413
-#, fuzzy
-msgid "Menu key changes layout."
-msgstr "Menutast skifter gruppe"
+#: ../rules/base.xml.in.h:443
+msgid "Meta is mapped to Left Win"
+msgstr "Meta ligger på venstre Win-tast"
-#: ../rules/base.xml.in.h:414
-msgid "Meta is mapped to the Win-keys."
-msgstr "Meta ligger på Win-tasterne."
+#: ../rules/base.xml.in.h:444
+msgid "Meta is mapped to Win keys"
+msgstr "Meta ligger på Win-tasterne"
-#: ../rules/base.xml.in.h:415
-msgid "Meta is mapped to the left Win-key."
-msgstr "Meta ligger på venstre Win-tast."
+#: ../rules/base.xml.in.h:445
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Comfort Curve Keyboard 2000"
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:446
msgid "Microsoft Internet Keyboard"
msgstr "Microsoft Internet Keyboard"
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:447
msgid "Microsoft Internet Keyboard Pro, Swedish"
msgstr "Microsoft Internet Keyboard Pro, svensk"
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:448
msgid "Microsoft Natural"
msgstr "Microsoft Natural"
-#: ../rules/base.xml.in.h:419
-#, fuzzy
+#: ../rules/base.xml.in.h:449
msgid "Microsoft Natural Keyboard Elite"
-msgstr "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Elite"
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:450
msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:451
msgid "Microsoft Natural Keyboard Pro OEM"
msgstr "Microsoft Natural Keyboard Pro OEM"
-#: ../rules/base.xml.in.h:422
-#, fuzzy
+#: ../rules/base.xml.in.h:452
msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:453
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+
+#: ../rules/base.xml.in.h:454
msgid "Microsoft Office Keyboard"
msgstr "Microsoft Office Keyboard"
-#: ../rules/base.xml.in.h:424
-#, fuzzy
+#: ../rules/base.xml.in.h:455
msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
-msgstr "Microsoft Internet Keyboard"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
-#: ../rules/base.xml.in.h:425
+#: ../rules/base.xml.in.h:456
msgid "Miscellaneous compatibility options"
msgstr "Diverse kompatibilitetsvalg"
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:457
msgid "Mkd"
msgstr "Mkd"
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:458
msgid "Mlt"
msgstr "Mlt"
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:459
msgid "Mmr"
msgstr "Mmr"
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:460
msgid "Mng"
msgstr "Mng"
-#: ../rules/base.xml.in.h:430
-#, fuzzy
+#: ../rules/base.xml.in.h:461
msgid "Mongolia"
-msgstr "Mongolsk"
+msgstr "Mongoliet"
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:462
msgid "Montenegro"
-msgstr ""
+msgstr "Montenegro"
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:463
msgid "Morocco"
-msgstr ""
+msgstr "Marokko"
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:464
msgid "Multilingual"
-msgstr ""
+msgstr "Flersproget"
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:465
msgid "Multilingual, first part"
-msgstr ""
+msgstr "Flersproget, første del"
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:466
msgid "Multilingual, second part"
-msgstr ""
+msgstr "Flersproget, anden del"
-#: ../rules/base.xml.in.h:436
-#, fuzzy
+#: ../rules/base.xml.in.h:467
msgid "Myanmar"
-msgstr "Mmr"
+msgstr "Burma"
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:468
msgid "NICOLA-F style Backspace"
-msgstr ""
+msgstr "NICOLA-F-stil rettelsestast"
-#: ../rules/base.xml.in.h:438
-msgid "Neostyle"
-msgstr ""
+#: ../rules/base.xml.in.h:469
+msgid "NLA"
+msgstr "NLA"
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:470
+msgid "Nativo"
+msgstr "Nativo"
+
+#: ../rules/base.xml.in.h:471
+msgid "Nativo for Esperanto"
+msgstr "Nativo for esperanto"
+
+#: ../rules/base.xml.in.h:472
+msgid "Nativo for USA keyboards"
+msgstr "Nativo for USA-tastaturer"
+
+#: ../rules/base.xml.in.h:473
+msgid "Neo 2"
+msgstr "Neo 2"
+
+#: ../rules/base.xml.in.h:474
msgid "Nep"
-msgstr ""
+msgstr "Nep"
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:475
msgid "Nepal"
msgstr "Nepal"
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:476
msgid "Netherlands"
msgstr "Holland"
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:477
msgid "Nig"
msgstr "Nig"
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:478
msgid "Nigeria"
msgstr "Nigeria"
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:479
msgid "Nld"
msgstr "Hollandsk"
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:480
+msgid "Non-breakable space character at fourth level"
+msgstr "Ubrydelig mellemrumskarakter på fjerde niveau"
+
+#: ../rules/base.xml.in.h:481
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Ubrydelig mellemrumskarakter på fjerde niveau, tynd ubrydelige mellemrumskarakter på sjette niveau"
+
+#: ../rules/base.xml.in.h:482
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
+msgstr "Ubrydelig mellemrumskarakter på fjerde niveau, tynd ubrydelige mellemrumskarakter på sjette niveau (via Ctrl+Skift)"
+
+#: ../rules/base.xml.in.h:483
+msgid "Non-breakable space character at second level"
+msgstr "Ubrydelig mellemrumskarakter på andet niveau"
+
+#: ../rules/base.xml.in.h:484
+msgid "Non-breakable space character at third level"
+msgstr "Ubrydelig mellemrumskarakter på tredje niveau"
+
+#: ../rules/base.xml.in.h:485
+msgid "Non-breakable space character at third level, nothing at fourth level"
+msgstr "Ubrydelig mellemrumskarakter på tredje niveau, intet på fjerde niveau"
+
+#: ../rules/base.xml.in.h:486
+msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Ubrydelig mellemrumskarakter på tredje niveau, tynd ubrydelig mellemrumskarakter på fjerde niveau"
+
+#: ../rules/base.xml.in.h:487
msgid "Nor"
msgstr "Nor"
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:488
msgid "Northern Saami"
msgstr "Nordligt saami"
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:489
msgid "Northern Saami, eliminate dead keys"
msgstr "Nordligt saami, slå døde taster fra"
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:490
msgid "Northgate OmniKey 101"
msgstr "Northgate OmniKey 101"
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:491
msgid "Norway"
msgstr "Norge"
-#: ../rules/base.xml.in.h:450
-#, fuzzy
-msgid "NumLock LED shows alternative layout."
-msgstr "Num Lock LED viser alternativ gruppe"
+#: ../rules/base.xml.in.h:492
+msgid "NumLock"
+msgstr "NumLock"
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:493
msgid "Numeric keypad delete key behaviour"
-msgstr ""
+msgstr "Numerisk tastatur slettetast opførsel"
-#: ../rules/base.xml.in.h:452
-msgid "Numeric keypad keys work as with Mac."
-msgstr ""
+#: ../rules/base.xml.in.h:494
+msgid "Numeric keypad keys work as with Mac"
+msgstr "Numerisk tastatur taster fungerer som med Mac"
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:495
msgid "Numeric keypad layout selection"
-msgstr ""
+msgstr "Numerisk tastatur layout udvælgelse"
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:496
msgid "OADG 109A"
msgstr "OADG 109A"
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:497
msgid "OLPC"
-msgstr ""
+msgstr "OLPC"
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:498
msgid "OLPC Dari"
-msgstr ""
+msgstr "OLPC Dari"
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:499
msgid "OLPC Pashto"
-msgstr ""
+msgstr "OLPC Pashto"
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:500
msgid "OLPC Southern Uzbek"
-msgstr ""
+msgstr "OLPC sydlig uzbek"
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:501
+msgid "Occitan"
+msgstr "Occitansk"
+
+#: ../rules/base.xml.in.h:502
msgid "Ogham"
msgstr "Ogham"
-#: ../rules/base.xml.in.h:460
+#: ../rules/base.xml.in.h:503
msgid "Ogham IS434"
msgstr "Ogham IS434"
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:504
msgid "Oriya"
msgstr "Oriya"
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:505
msgid "Ortek MCK-800 MM/Internet keyboard"
msgstr "Ortek MCK-800 MM/Internet keyboard"
-#: ../rules/base.xml.in.h:463
-#, fuzzy
+#: ../rules/base.xml.in.h:506
msgid "Ossetian"
-msgstr "Russisk"
+msgstr "Ossetisk"
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:507
msgid "Ossetian, Winkeys"
-msgstr ""
+msgstr "Ossetisk, Winkeys"
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:508
msgid "Ossetian, legacy"
-msgstr ""
+msgstr "Ossetisk, forældet"
-#: ../rules/base.xml.in.h:466
+#: ../rules/base.xml.in.h:509
msgid "PC-98xx Series"
msgstr "PC-98xx-serien"
-#: ../rules/base.xml.in.h:467
-#, fuzzy
+#: ../rules/base.xml.in.h:510
msgid "Pak"
-msgstr "Pan"
+msgstr "Pak"
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:511
msgid "Pakistan"
msgstr "Pakistan"
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:512
msgid "Pashto"
-msgstr ""
+msgstr "Pashto"
-#: ../rules/base.xml.in.h:470
-#, fuzzy
+#: ../rules/base.xml.in.h:513
msgid "Pattachote"
-msgstr "Thai (Pattachote)"
+msgstr "Pattachote"
-#: ../rules/base.xml.in.h:471
+#: ../rules/base.xml.in.h:514
msgid "Phonetic"
msgstr "Fonetisk"
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:515
+msgid "Phonetic Winkeys"
+msgstr "Fonetisk Wintaster"
+
+#: ../rules/base.xml.in.h:516
msgid "Pol"
msgstr "Pol"
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:517
msgid "Poland"
msgstr "Polen"
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:518
msgid "Polytonic"
msgstr "Polytonisk"
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:519
msgid "Portugal"
msgstr "Portugal"
-#: ../rules/base.xml.in.h:476
-#, fuzzy
-msgid "Press Left Alt key to choose 3rd level."
-msgstr "Tryk venstre Win-tast for at vælge tredje niveau"
-
-#: ../rules/base.xml.in.h:477
-#, fuzzy
-msgid "Press Left Win-key to choose 3rd level."
-msgstr "Tryk venstre Win-tast for at vælge tredje niveau"
-
-#: ../rules/base.xml.in.h:478
-#, fuzzy
-msgid "Press Menu key to choose 3rd level."
-msgstr "Tryk menutast for at vælge tredje niveau"
-
-#: ../rules/base.xml.in.h:479
-#, fuzzy
-msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
-msgstr "Tryk højre Win-tast for at vælge tredje niveau"
-
-#: ../rules/base.xml.in.h:480
-#, fuzzy
-msgid "Press Right Alt key to choose 3rd level."
-msgstr "Tryk højre Win-tast for at vælge tredje niveau"
-
-#: ../rules/base.xml.in.h:481
-#, fuzzy
-msgid "Press Right Ctrl to choose 3rd level."
-msgstr "Tryk højre Ctrl-tast for at vælge tredje niveau"
-
-#: ../rules/base.xml.in.h:482
-#, fuzzy
-msgid "Press Right Win-key to choose 3rd level."
-msgstr "Tryk højre Win-tast for at vælge tredje niveau"
-
-#: ../rules/base.xml.in.h:483
-msgid "Press any of Alt keys to choose 3rd level."
-msgstr "Tryk på en af Alt-tasterne for at vælge tredje niveau."
-
-#: ../rules/base.xml.in.h:484
-msgid "Press any of Win-keys to choose 3rd level."
-msgstr "Tryk på en af Win-tasterne for at vælge tredje niveau."
-
-#: ../rules/base.xml.in.h:485
-#, fuzzy
+#: ../rules/base.xml.in.h:520
msgid "Pro"
-msgstr "Pol"
+msgstr "Pro"
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:521
msgid "Pro Keypad"
-msgstr ""
+msgstr "Pro numerisk tastatur"
-#: ../rules/base.xml.in.h:487
-#, fuzzy
+#: ../rules/base.xml.in.h:522
msgid "Probhat"
-msgstr "Prt"
+msgstr "Probhat"
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:523
msgid "Programmer Dvorak"
-msgstr ""
+msgstr "Programmørdvorak"
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:524
msgid "Propeller Voyager (KTEZ-1000)"
msgstr "Propeller Voyager (KTEZ-1000)"
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:525
msgid "Prt"
msgstr "Prt"
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:526
msgid "QTronix Scorpius 98N+"
msgstr "QTronix Scorpius 98N+"
-#: ../rules/base.xml.in.h:492
-#, fuzzy
-msgid "R-Alt switches layout while pressed."
-msgstr "Højre Alt skifter gruppe mens nedtrykket"
-
-#: ../rules/base.xml.in.h:493
-#, fuzzy
-msgid "Right Alt is Compose."
-msgstr "Højre Alt er Compose"
+#: ../rules/base.xml.in.h:527
+msgid "Right Alt"
+msgstr "Højre Alt"
-#: ../rules/base.xml.in.h:494
-#, fuzzy
-msgid "Right Alt key changes layout."
-msgstr "Højre Alt-tast skifter gruppe"
+#: ../rules/base.xml.in.h:528
+msgid "Right Alt (while pressed)"
+msgstr "Højre Alt (mens trykket ned)"
-#: ../rules/base.xml.in.h:495
-#, fuzzy
-msgid "Right Alt key never chooses 3rd level."
-msgstr "Tryk højre Win-tast for at vælge tredje niveau"
+#: ../rules/base.xml.in.h:529
+msgid "Right Alt key never chooses 3rd level"
+msgstr "Højre Alt-tast vælger aldrig tredje niveau"
-#: ../rules/base.xml.in.h:496
-#, fuzzy
-msgid "Right Ctrl is Compose."
-msgstr "Højre Alt er Compose"
+#: ../rules/base.xml.in.h:530
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr "Højre Alt-tast, Skift+højre Alt-tast er fler_tast"
-#: ../rules/base.xml.in.h:497
-#, fuzzy
-msgid "Right Ctrl key changes layout."
-msgstr "Højre Ctrl-tast skifter gruppe"
+#: ../rules/base.xml.in.h:531
+msgid "Right Ctrl"
+msgstr "Højre Ctrl"
-#: ../rules/base.xml.in.h:498
-#, fuzzy
-msgid "Right Ctrl key switches layout while pressed."
-msgstr "Højre Win-tast skifter gruppe mens nedtrykket"
+#: ../rules/base.xml.in.h:532
+msgid "Right Ctrl (while pressed)"
+msgstr "Højre Ctrl-tast (mens trykket ned)"
-#: ../rules/base.xml.in.h:499
-#, fuzzy
-msgid "Right Ctrl key works as Right Alt."
+#: ../rules/base.xml.in.h:533
+msgid "Right Ctrl as Right Alt"
msgstr "Højre Ctrl-tast virker som højre Alt"
-#: ../rules/base.xml.in.h:500
-#, fuzzy
-msgid "Right Shift key changes layout."
-msgstr "Højre skiftetast skifter gruppe"
-
-#: ../rules/base.xml.in.h:501
-#, fuzzy
-msgid "Right Win-key changes layout."
-msgstr "Højre Win-tast skifter gruppe"
+#: ../rules/base.xml.in.h:534
+msgid "Right Shift"
+msgstr "Højre Skift"
-#: ../rules/base.xml.in.h:502
-#, fuzzy
-msgid "Right Win-key is Compose."
-msgstr "Højre Win-tast er Compose"
+#: ../rules/base.xml.in.h:535
+msgid "Right Win"
+msgstr "Højre Win"
-#: ../rules/base.xml.in.h:503
-#, fuzzy
-msgid "Right Win-key switches layout while pressed."
-msgstr "Højre Win-tast skifter gruppe mens nedtrykket"
+#: ../rules/base.xml.in.h:536
+msgid "Right Win (while pressed)"
+msgstr "Højre Win-tast (mens trykket ned)"
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:537
msgid "Right hand"
msgstr "Højre hånd"
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:538
msgid "Right handed Dvorak"
msgstr "Højre hånd dvorak"
-#: ../rules/base.xml.in.h:506
-#, fuzzy
+#: ../rules/base.xml.in.h:539
msgid "Romania"
-msgstr "Rumænsk"
+msgstr "Rumænien"
-#: ../rules/base.xml.in.h:507
-#, fuzzy
+#: ../rules/base.xml.in.h:540
msgid "Romanian keyboard with German letters"
-msgstr "US-tastatur med rumænske bogstaver"
+msgstr "Rumænsk tastatur med tyske bogstaver"
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:541
msgid "Romanian keyboard with German letters, eliminate dead keys"
-msgstr ""
+msgstr "Rumænsk tastatur med tyske bogstaver, eliminer døde taster"
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:542
msgid "Rou"
msgstr "Rum"
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:543
msgid "Rus"
msgstr "Rus"
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:544
msgid "Russia"
msgstr "Rusland"
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:545
msgid "Russian"
msgstr "Russisk"
-#: ../rules/base.xml.in.h:513
-#, fuzzy
+#: ../rules/base.xml.in.h:546
msgid "Russian phonetic"
-msgstr "Russisk"
+msgstr "Russisk fonetisk"
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:547
msgid "Russian phonetic Dvorak"
-msgstr ""
+msgstr "Russisk fonetisk dvorak"
-#: ../rules/base.xml.in.h:515
-#, fuzzy
+#: ../rules/base.xml.in.h:548
msgid "Russian phonetic, eliminate dead keys"
-msgstr "Slå døde taster fra"
+msgstr "Russisk fonetisk, slå døde taster fra"
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:549
msgid "Russian with Kazakh"
-msgstr ""
+msgstr "Russisk med kazakh"
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:550
msgid "SILVERCREST Multimedia Wireless Keyboard"
msgstr "SILVERCREST Multimedia Wireless Keyboard"
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:551
msgid "SK-1300"
msgstr "SK-1300"
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:552
msgid "SK-2500"
msgstr "SK-2500"
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:553
msgid "SK-6200"
msgstr "SK-6200"
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:554
msgid "SK-7100"
msgstr "SK-7100"
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:555
msgid "SRB"
-msgstr ""
+msgstr "SRB"
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:556
msgid "SVEN Ergonomic 2500"
msgstr "SVEN Ergonomic 2500"
-#: ../rules/base.xml.in.h:524
+#: ../rules/base.xml.in.h:557
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
+
+#: ../rules/base.xml.in.h:558
msgid "Samsung SDM 4500P"
msgstr "Samsung SDM 4500P"
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:559
msgid "Samsung SDM 4510P"
msgstr "Samsung SDM 4510P"
-#: ../rules/base.xml.in.h:526
-#, fuzzy
-msgid "ScrollLock LED shows alternative layout."
-msgstr "Scroll Lock LED viser alternativ gruppe"
+#: ../rules/base.xml.in.h:560
+msgid "Scroll Lock"
+msgstr "Scroll Lock"
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:561
+msgid "ScrollLock"
+msgstr "ScrollLock"
+
+#: ../rules/base.xml.in.h:562
msgid "Secwepemctsin"
-msgstr ""
+msgstr "Secwepemctsin"
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:563
+msgid "Semi-colon on third level"
+msgstr "Semikolon på tredje niveau"
+
+#: ../rules/base.xml.in.h:564
msgid "Serbia"
msgstr "Serbien"
-#: ../rules/base.xml.in.h:529
-msgid "Shift cancels CapsLock."
-msgstr ""
+#: ../rules/base.xml.in.h:565
+msgid "Shift cancels CapsLock"
+msgstr "Skift afbryder Caps Lock"
-#: ../rules/base.xml.in.h:530
-#, fuzzy
-msgid "Shift with numeric keypad keys works as in MS Windows."
+#: ../rules/base.xml.in.h:566
+msgid "Shift does not cancel NumLock, chooses 3d level instead"
+msgstr "Skift afbryder ikke NumLock, vælger tredje niveau i steden for"
+
+#: ../rules/base.xml.in.h:567
+msgid "Shift with numeric keypad keys works as in MS Windows"
msgstr "Skift med numeriske taster virker som i MS Windows"
-#: ../rules/base.xml.in.h:531
-#, fuzzy
-msgid "Shift+CapsLock changes layout."
-msgstr "Caps Lock-tast skifter gruppe"
+#: ../rules/base.xml.in.h:568
+msgid "Shift+CapsLock"
+msgstr "Skift+Caps Lock"
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:569
+msgid "Simple"
+msgstr "Simpel"
+
+#: ../rules/base.xml.in.h:570
msgid "Slovakia"
msgstr "Slovakiet"
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:571
msgid "Slovenia"
msgstr "Slovenien"
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:572
msgid "South Africa"
msgstr "Sydafrika"
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:573
msgid "Southern Uzbek"
-msgstr ""
-
-#: ../rules/base.xml.in.h:536
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:537
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift"
-msgstr ""
+msgstr "Sydlig uzbek"
-#: ../rules/base.xml.in.h:538
-msgid "Space key outputs non-breakable space character at fourth level."
-msgstr ""
-
-#: ../rules/base.xml.in.h:539
-msgid "Space key outputs non-breakable space character at second level."
-msgstr ""
-
-#: ../rules/base.xml.in.h:540
-msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
-msgstr ""
-
-#: ../rules/base.xml.in.h:541
-msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:542
-msgid "Space key outputs non-breakable space character at third level."
-msgstr ""
-
-#: ../rules/base.xml.in.h:543
-msgid "Space key outputs usual space at any level."
-msgstr ""
-
-#: ../rules/base.xml.in.h:544
-#, fuzzy
+#: ../rules/base.xml.in.h:574
msgid "Spain"
-msgstr "Spansk"
+msgstr "Spanien"
-#: ../rules/base.xml.in.h:545
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
-msgstr "Specialtaster (Ctrl+Alt+&lt;key&gt;) håndteret i en server."
+#: ../rules/base.xml.in.h:575
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
+msgstr "Specialtaster (Ctrl+Alt+&lt;key&gt;) håndteret i en server"
-#: ../rules/base.xml.in.h:546
-#, fuzzy
+#: ../rules/base.xml.in.h:576
msgid "SrL"
-msgstr "Syr"
+msgstr "SrL"
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:577
msgid "Sri Lanka"
msgstr "Sri Lanka"
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:578
msgid "Standard"
msgstr "Standard"
-#: ../rules/base.xml.in.h:549
-#, fuzzy
+#: ../rules/base.xml.in.h:579
msgid "Standard (Cedilla)"
-msgstr "Standard"
+msgstr "Standard (Cedilla)"
+
+#: ../rules/base.xml.in.h:580
+msgid "Standard Phonetic"
+msgstr "Standard fonetisk"
#. RSTU 2019-91
-#: ../rules/base.xml.in.h:551
-#, fuzzy
+#: ../rules/base.xml.in.h:582
msgid "Standard RSTU"
-msgstr "Standard"
+msgstr "Standard RSTU"
#. RSTU 2019-91
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:584
msgid "Standard RSTU on Russian layout"
-msgstr ""
+msgstr "Standard-RSTU på russisk layout"
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:585
msgid "Sun Type 5/6"
msgstr "Sun type 5/6"
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:586
msgid "Sun dead keys"
msgstr "Sun døde taster"
-#: ../rules/base.xml.in.h:556
-#, fuzzy
+#: ../rules/base.xml.in.h:587
msgid "Super Power Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
-
-#: ../rules/base.xml.in.h:557
-#, fuzzy
-msgid "Super is mapped to the Win-keys."
-msgstr "Hyper ligger på Win-tasterne."
+msgstr "Super Power Multimedia Keyboard"
-#: ../rules/base.xml.in.h:558
-#, fuzzy
+#: ../rules/base.xml.in.h:588
msgid "Svdvorak"
-msgstr "Dvorak"
+msgstr "Svdvorak"
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:589
msgid "Svk"
msgstr "Svk"
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:590
msgid "Svn"
msgstr "Svn"
-#: ../rules/base.xml.in.h:561
-#, fuzzy
-msgid "Swap Ctrl and CapsLock."
+#: ../rules/base.xml.in.h:591
+msgid "Swap Ctrl and CapsLock"
msgstr "Ombyt Ctrl og Caps Lock"
-#: ../rules/base.xml.in.h:562
-#, fuzzy
-msgid "Swap ESC and CapsLock."
+#: ../rules/base.xml.in.h:592
+msgid "Swap ESC and CapsLock"
msgstr "Ombyt Ctrl og Caps Lock"
-#: ../rules/base.xml.in.h:563
-msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-msgstr ""
-
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:593
msgid "Swe"
msgstr "Sve"
-#: ../rules/base.xml.in.h:565
-#, fuzzy
+#: ../rules/base.xml.in.h:594
msgid "Sweden"
-msgstr "Sve"
+msgstr "Sverige"
-#: ../rules/base.xml.in.h:566
-#, fuzzy
+#: ../rules/base.xml.in.h:595
msgid "Switzerland"
-msgstr "Schweizisk-tysk"
+msgstr "Schweiz"
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:596
msgid "Symplon PaceBook (tablet PC)"
msgstr "Symplon PaceBook (tablet-pc)"
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:597
msgid "Syr"
msgstr "Syr"
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:598
msgid "Syria"
msgstr "Syrien"
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:599
msgid "Syriac"
msgstr "Syrisk"
-#: ../rules/base.xml.in.h:571
-#, fuzzy
+#: ../rules/base.xml.in.h:600
msgid "Syriac phonetic"
-msgstr "Fonetisk"
+msgstr "Syrisk fonetisk"
-#: ../rules/base.xml.in.h:572
-#, fuzzy
+#: ../rules/base.xml.in.h:601
msgid "TIS-820.2538"
-msgstr "Thai (TIS-820.2538)"
+msgstr "TIS-820.2538"
-#: ../rules/base.xml.in.h:573
-#, fuzzy
+#: ../rules/base.xml.in.h:602
msgid "Tajikistan"
-msgstr "Tajik"
+msgstr "Tadjikistan"
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:603
msgid "Tamil"
msgstr "Tamil"
-#: ../rules/base.xml.in.h:575
-#, fuzzy
+#: ../rules/base.xml.in.h:604
msgid "Tamil TAB Typewriter"
-msgstr "\"Skrivemaskine\""
+msgstr "Tamil TAB-skrivemaskine"
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:605
msgid "Tamil TSCII Typewriter"
-msgstr ""
+msgstr "Tamil TSCII-skrivemaskine"
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:606
msgid "Tamil Unicode"
-msgstr ""
+msgstr "Tamil unicode"
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:607
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
+
+#: ../rules/base.xml.in.h:608
msgid "Tatar"
-msgstr ""
+msgstr "Tatar"
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:609
msgid "Telugu"
msgstr "Telugu"
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:610
msgid "Tha"
msgstr "Tha"
-#: ../rules/base.xml.in.h:581
-#, fuzzy
+#: ../rules/base.xml.in.h:611
msgid "Thailand"
-msgstr "Tamil"
+msgstr "Thailand"
-#: ../rules/base.xml.in.h:582
-msgid "Third level choosers"
-msgstr "Tredje niveaus vælgere"
-
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:612
msgid "Tibetan"
-msgstr ""
+msgstr "Tibetansk"
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:613
msgid "Tibetan (with ASCII numerals)"
-msgstr ""
+msgstr "Tibetansk (med ASCII-numre)"
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:614
msgid "Tifinagh"
-msgstr ""
+msgstr "Tifinagh"
-#: ../rules/base.xml.in.h:586
-#, fuzzy
+#: ../rules/base.xml.in.h:615
msgid "Tifinagh Alternative"
-msgstr "Fransk (alternativ)"
+msgstr "Tifinagh alternativ"
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:616
msgid "Tifinagh Alternative Phonetic"
-msgstr ""
+msgstr "Tifinagh alternativ fonetisk"
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:617
msgid "Tifinagh Extended"
msgstr "Tifinagh udvidet"
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:618
msgid "Tifinagh Extended Phonetic"
-msgstr ""
+msgstr "Tifinagh udvidet fonetisk"
-#: ../rules/base.xml.in.h:590
-#, fuzzy
+#: ../rules/base.xml.in.h:619
msgid "Tifinagh Phonetic"
-msgstr "Fonetisk"
+msgstr "Tifinagh fonetisk"
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:620
msgid "Tilde (~) variant"
-msgstr ""
+msgstr "Tilde (~) variant"
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:621
msgid "Tjk"
msgstr "Tjk"
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:622
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr "Til den tilsvarende tast i et Dvoraktastatur."
+
+#: ../rules/base.xml.in.h:623
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr "Til den tilsvarende tast på et Qwertytastatur."
+
+#: ../rules/base.xml.in.h:624
msgid "Toshiba Satellite S3000"
msgstr "Toshiba Satellite S3000"
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:625
+msgid "Traditional Phonetic"
+msgstr "Traditionel fonetisk"
+
+#: ../rules/base.xml.in.h:626
msgid "Trust Direct Access Keyboard"
msgstr "Trust Direct Access Keyboard"
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:627
+msgid "Trust Slimline"
+msgstr "Trust Slimline"
+
+#: ../rules/base.xml.in.h:628
msgid "Trust Wireless Keyboard Classic"
msgstr "Trust Wireless Keyboard Classic"
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:629
msgid "Tur"
msgstr "Tyr"
-#: ../rules/base.xml.in.h:597
-#, fuzzy
+#: ../rules/base.xml.in.h:630
msgid "Turkey"
-msgstr "Tyr"
+msgstr "Tyrkiet"
-#: ../rules/base.xml.in.h:598
-#, fuzzy
+#: ../rules/base.xml.in.h:631
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+#: ../rules/base.xml.in.h:632
msgid "Typewriter"
-msgstr "\"Skrivemaskine\""
+msgstr "Skrivemaskine"
-#: ../rules/base.xml.in.h:599
-#, fuzzy
+#: ../rules/base.xml.in.h:633
+msgid "UCW layout (accented letters only)"
+msgstr "UCW-layout (kun bogstaver med accent)"
+
+#: ../rules/base.xml.in.h:634
msgid "US keyboard with Bosnian digraphs"
-msgstr "US-tastatur med rumænske bogstaver"
+msgstr "US-tastatur med bosniske digrafer"
-#: ../rules/base.xml.in.h:600
-#, fuzzy
+#: ../rules/base.xml.in.h:635
msgid "US keyboard with Bosnian letters"
-msgstr "US-tastatur med rumænske bogstaver"
+msgstr "US-tastatur med bosniske bogstaver"
-#: ../rules/base.xml.in.h:601
-#, fuzzy
+#: ../rules/base.xml.in.h:636
msgid "US keyboard with Croatian digraphs"
-msgstr "US-tastatur med rumænske bogstaver"
+msgstr "US-tastatur med kroatiske digrafer"
-#: ../rules/base.xml.in.h:602
-#, fuzzy
+#: ../rules/base.xml.in.h:637
msgid "US keyboard with Croatian letters"
-msgstr "US-tastatur med rumænske bogstaver"
+msgstr "US-tastatur med kroatiske bogstaver"
-#: ../rules/base.xml.in.h:603
-#, fuzzy
+#: ../rules/base.xml.in.h:638
msgid "US keyboard with Estonian letters"
-msgstr "US-tastatur med rumænske bogstaver"
+msgstr "US-tastatur med esttiske bogstaver"
-#: ../rules/base.xml.in.h:604
-#, fuzzy
+#: ../rules/base.xml.in.h:639
msgid "US keyboard with Lithuanian letters"
-msgstr "US-tastatur med rumænske bogstaver"
-
-#: ../rules/base.xml.in.h:605
-#, fuzzy
-msgid "US keyboard with Slovenian digraphs"
-msgstr "US-tastatur med rumænske bogstaver"
+msgstr "US-tastatur med litauiske bogstaver"
-#: ../rules/base.xml.in.h:606
-#, fuzzy
+#: ../rules/base.xml.in.h:640
msgid "US keyboard with Slovenian letters"
-msgstr "US-tastatur med rumænske bogstaver"
+msgstr "US-tastatur med slovenske bogstaver"
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:641
msgid "USA"
msgstr "USA"
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:642
msgid "Udmurt"
-msgstr ""
+msgstr "Udmurt"
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:643
msgid "Ukr"
msgstr "Ukr"
-#: ../rules/base.xml.in.h:610
-#, fuzzy
+#: ../rules/base.xml.in.h:644
msgid "Ukraine"
msgstr "Ukraine"
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:645
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Unicode tilføjelser (pile og matematiske tegn)"
+
+#: ../rules/base.xml.in.h:646
+msgid "Unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Unicode tilføjelser (pile og matematiske tegn). Matematiske tegn på standardniveau"
+
+#: ../rules/base.xml.in.h:647
msgid "UnicodeExpert"
msgstr "UnicodeExpert"
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:648
msgid "United Kingdom"
msgstr "United Kingdom"
-#: ../rules/base.xml.in.h:613
-msgid "Urdu"
-msgstr ""
+#: ../rules/base.xml.in.h:649
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:650
+msgid "Urdu, Alternative phonetic"
+msgstr "Urdu, alternativ fonetisk"
+
+#: ../rules/base.xml.in.h:651
+msgid "Urdu, Phonetic"
+msgstr "Urdu, fonetisk"
+
+#: ../rules/base.xml.in.h:652
+msgid "Urdu, Winkeys"
+msgstr "Urdu, Win-taster"
+
+#: ../rules/base.xml.in.h:653
msgid "Use Bosnian digraphs"
-msgstr ""
+msgstr "Anvend bosniske digrafer"
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:654
msgid "Use Croatian digraphs"
-msgstr ""
+msgstr "Anvend kroatiske digrafer"
-#: ../rules/base.xml.in.h:616
-msgid "Use Slovenian digraphs"
-msgstr ""
-
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:655
msgid "Use guillemets for quotes"
-msgstr ""
+msgstr "Anvend guillemeter som anførelsestegn"
-#: ../rules/base.xml.in.h:618
-#, fuzzy
-msgid "Use keyboard LED to show alternative layout."
-msgstr "Bruger tastatur-LED til at vise alternativ gruppe"
+#: ../rules/base.xml.in.h:656
+msgid "Use keyboard LED to show alternative layout"
+msgstr "Brug tastatur-LED til at vise alternativ layout"
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:657
msgid "Using space key to input non-breakable space character"
-msgstr ""
+msgstr "Brug mellemrum for at indtaste ubrydelig mellemrumskarakter"
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:658
+msgid "Usual space at any level"
+msgstr "Normal mellemrum på alle niveauer"
+
+#: ../rules/base.xml.in.h:659
msgid "Uzb"
msgstr "Uzb"
-#: ../rules/base.xml.in.h:621
-#, fuzzy
+#: ../rules/base.xml.in.h:660
msgid "Uzbekistan"
-msgstr "Uzbekisk"
+msgstr "Usbekistan"
-#: ../rules/base.xml.in.h:622
-#, fuzzy
+#: ../rules/base.xml.in.h:661
msgid "Vietnam"
-msgstr "Vietnamesisk"
+msgstr "Vietnam"
-#: ../rules/base.xml.in.h:623
-#, fuzzy
+#: ../rules/base.xml.in.h:662
msgid "ViewSonic KU-306 Internet Keyboard"
-msgstr "Chicony Internet Keyboard"
+msgstr "ViewSonic KU-306 Internet Keyboard"
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:663
msgid "Vnm"
msgstr "Vnm"
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:664
msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
-msgstr ""
+msgstr "Wang 724 numerisk tastatur med unicode tilføjelser (pile og matematiske tegn)"
-#: ../rules/base.xml.in.h:626
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr ""
+#: ../rules/base.xml.in.h:665
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Wang 724 numerisk tastatur med unicode tilføjelser (pile og matematiske tegn). Matematiske tegn på standardniveau"
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:666
msgid "Wang model 724 azerty"
-msgstr ""
+msgstr "Wang model 724 azerty"
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:667
msgid "Western"
-msgstr ""
+msgstr "Vestlig"
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:668
msgid "Winbook Model XP5"
msgstr "Winbook Model XP5"
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:669
msgid "Winkeys"
msgstr "Win-taster"
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:670
msgid "With &lt;\\|&gt; key"
-msgstr ""
+msgstr "Med &lt;\\|&gt; tast"
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:671
msgid "With EuroSign on 5"
-msgstr ""
+msgstr "Med eurotegn på 5"
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:672
msgid "With guillemets"
-msgstr ""
+msgstr "Med guillemeter"
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:673
msgid "Yahoo! Internet Keyboard"
msgstr "Yahoo! Internet Keyboard"
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:674
+msgid "Yakut"
+msgstr "Yakut"
+
+#: ../rules/base.xml.in.h:675
msgid "Yoruba"
-msgstr ""
+msgstr "Yoruba"
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:676
msgid "Z and ZHE swapped"
-msgstr ""
+msgstr "Z og ZHE ombyttet"
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:677
msgid "Zar"
-msgstr ""
+msgstr "Zar"
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:678
msgid "azerty"
msgstr "azerty"
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:679
msgid "azerty/digits"
msgstr "azerty/cifre"
-#: ../rules/base.xml.in.h:640
+#: ../rules/base.xml.in.h:680
msgid "digits"
msgstr "cifre"
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:681
msgid "displaced semicolon and quote (obsolete)"
-msgstr ""
+msgstr "forkert placeret semikolon og anførelsestegn (forældet)"
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:682
msgid "lyx"
msgstr "lyx"
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:683
msgid "qwerty"
msgstr "qwerty"
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:684
msgid "qwerty, extended Backslash"
-msgstr ""
+msgstr "qwerty, udvidet omvendt skråstreg"
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:685
msgid "qwerty/digits"
msgstr "qwerty/cifre"
-#: ../rules/base.xml.in.h:646
-#, fuzzy
+#: ../rules/base.xml.in.h:686
msgid "qwertz"
-msgstr "qwerty"
+msgstr "qwertz"
+
+#~ msgid "Brazilian ABNT2"
+#~ msgstr "Brasiliansk ABNT2"
+
+#~ msgid "Japanese 106-key"
+#~ msgstr "Japansk 106-taster"
+
+#~ msgid "Kir"
+#~ msgstr "Kir"
+
+#~ msgid "Korean 106-key"
+#~ msgstr "Koreansk 106-tast"
+
+#~ msgid "Super is mapped to Win keys"
+#~ msgstr "Super ligger på Win-tasterne"
+
+#~ msgid "US keyboard with Slovenian digraphs"
+#~ msgstr "US-tastatur med slovenske digrafer"
+
+#~ msgid "Unicode"
+#~ msgstr "Unicode"
+
+#~ msgid "Use Slovenian digraphs"
+#~ msgstr "Anvend slovenske digrafer"
+
+#~ msgid "Add the EuroSign to the 2 key."
+#~ msgstr "Tilføj eurotegnet til 2-tasten."
+
+#~ msgid "Add the EuroSign to the 4 key."
+#~ msgstr "Tilføj eurotegnet til 4-tasten."
+
+#~ msgid "Add the EuroSign to the 5 key."
+#~ msgstr "Tilføj eurotegnet til 5-tasten."
+
+#~ msgid "Add the EuroSign to the E key."
+#~ msgstr "Tilføj eurotegnet til E-tasten."
+
+#~ msgid "Alt+Ctrl change layout."
+#~ msgstr "Alt+Ctrl skifter layout."
+
+#~ msgid "Alt+Shift change layout."
+#~ msgstr "Alt+skift skifter layout."
+
+#~ msgid "CapsLock LED shows alternative layout."
+#~ msgstr "Caps Lock LED viser alternativ layout."
+
+#~ msgid "CapsLock just locks the Shift modifier."
+#~ msgstr "Caps Lock låser kun skift-ændreren."
+
+#~ msgid "CapsLock key changes layout."
+#~ msgstr "Caps Lock-tast skifter layout."
+
+#~ msgid "Ctrl+Shift change layout."
+#~ msgstr "Ctrl+skift skifter layout."
+
+#~ msgid "Hewlett-Packard Internet Keyboard 5181"
+#~ msgstr "Hewlett-Packard Internet Keyboard 5181"
+
+#~ msgid "Hewlett-Packard Internet Keyboard 5185"
+#~ msgstr "Hewlett-Packard Internet Keyboard 5185"
+
+#~ msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+#~ msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
+
+#~ msgid "IBM Rapid Access II (alternate option)"
+#~ msgstr "IBM Rapid Access II (alternativ)"
+
+#~ msgid "LCtrl+LShift change layout."
+#~ msgstr "Venstre Ctrl+skift skifter layout."
+
+#~ msgid "Layout switching"
+#~ msgstr "Layout ombytning"
+
+#~ msgid "Left Alt key changes layout."
+#~ msgstr "Venstre Alt-tast skifter layout."
+
+#~ msgid "Left Ctrl key changes layout."
+#~ msgstr "Venstre Ctrl-tast skifter layout."
+
+#~ msgid "Left Shift key changes layout."
+#~ msgstr "Venstre skiftetast skifter layout."
+
+#~ msgid "Left Win-key changes layout."
+#~ msgstr "Venstre Win-tast skifter layout."
+
+#~ msgid "Neostyle"
+#~ msgstr "Neostil"
+
+#~ msgid "NumLock LED shows alternative layout."
+#~ msgstr "Num Lock LED viser alternativ layout."
+
+#~ msgid "Press Left Alt key to choose 3rd level."
+#~ msgstr "Tryk venstre Alt-tast for at vælge tredje niveau."
+
+#~ msgid "Press Left Win-key to choose 3rd level."
+#~ msgstr "Tryk venstre Win-tast for at vælge tredje niveau."
+
+#~ msgid "Press Right Alt key to choose 3rd level."
+#~ msgstr "Tryk højre Alt-tast for at vælge tredje niveau."
+
+#~ msgid "Press Right Ctrl to choose 3rd level."
+#~ msgstr "Tryk højre Ctrl-tast for at vælge tredje niveau."
+
+#~ msgid "Press Right Win-key to choose 3rd level."
+#~ msgstr "Tryk højre Win-tast for at vælge tredje niveau."
+
+#~ msgid "Press any of Alt keys to choose 3rd level."
+#~ msgstr "Tryk på en af Alt-tasterne for at vælge tredje niveau."
+
+#~ msgid "Press any of Win-keys to choose 3rd level."
+#~ msgstr "Tryk på en af Win-tasterne for at vælge tredje niveau."
+
+#~ msgid "Right Alt key changes layout."
+#~ msgstr "Højre Alt-tast skifter gruppe."
+
+#~ msgid "Right Ctrl key changes layout."
+#~ msgstr "Højre Ctrl-tast skifter layout."
+
+#~ msgid "Right Shift key changes layout."
+#~ msgstr "Højre skiftetast skifter gruppe"
+
+#~ msgid "Right Win-key changes layout."
+#~ msgstr "Højre Win-tast skifter layout."
+
+#~ msgid "ScrollLock LED shows alternative layout."
+#~ msgstr "Scroll Lock LED viser alternativ layout."
+
+#~ msgid "Shift+CapsLock changes layout."
+#~ msgstr "Skift+Caps Lock-tast skifter layout."
+
+#~ msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+#~ msgstr "Ombyt tastkoder på to taster når Mac-tastaturer fejlopfanges af kerne."
+
+#~ msgid "Third level choosers"
+#~ msgstr "Tredje niveaus vælgere"
+
+#~ msgid "Urdu"
+#~ msgstr "Urdu"
#~ msgid "A Tamil typewrite-style keymap; TAB encoding"
#~ msgstr "En tamilsk skrivemaskine-tastaturudlægning; TAB-kodning"
@@ -2786,9 +2968,6 @@ msgstr "qwerty"
#~ msgid "Hin"
#~ msgstr "Hin"
-#~ msgid "Hindi"
-#~ msgstr "Hindi"
-
#~ msgid "INSCRIPT layout"
#~ msgstr "INSCRIPT-layout"
@@ -2846,9 +3025,6 @@ msgstr "qwerty"
#~ msgid "Slovak (qwerty)"
#~ msgstr "Slovakisk (qwerty)"
-#~ msgid "Sme"
-#~ msgstr "Sme"
-
#~ msgid "Sv"
#~ msgstr "Sv"
@@ -2873,9 +3049,6 @@ msgstr "qwerty"
#~ msgid "Turkish Alt-Q Layout"
#~ msgstr "Tyrkisk Alt-Q-layout"
-#~ msgid "U.S. English"
-#~ msgstr "U.S. Engelsk"
-
#~ msgid "U.S. English w/ ISO9995-3"
#~ msgstr "U.S. Engelsk w/ ISO9995-3"
diff --git a/xorg-server/xkbdata.src/po/de.po b/xorg-server/xkbdata.src/po/de.po
new file mode 100644
index 000000000..962483568
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/de.po
@@ -0,0 +1,2904 @@
+# German translation of xkeyboard-config.
+# This file is distributed under the same license as the xkeyboard-config package.
+# Mario Blättermann <mariobl@gnome.org>, 2009.
+# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config-1.6pre1\n"
+"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
+"POT-Creation-Date: 2009-05-12 23:49+0100\n"
+"PO-Revision-Date: 2009-05-13 21:02+0100\n"
+"Last-Translator: Mario Blättermann <mario.blaettermann@t-online.de>\n"
+"Language-Team: German <translation-team-de@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: German\n"
+"X-Poedit-Country: GERMANY\n"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2
+msgid "(Legacy) Alternative"
+msgstr "Alternative (veraltet)"
+
+#: ../rules/base.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "Alternative (veraltet), Sun-Akzenttasten"
+
+#: ../rules/base.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "Alternative (veraltet), ohne Akzenttasten"
+
+#: ../rules/base.xml.in.h:5
+msgid "101/104 key Compatible"
+msgstr "101/104-Tasten kompatibel"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/Komma/Akzenttasten"
+
+#: ../rules/base.xml.in.h:7
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/Komma/ohne Akzenttasten"
+
+#: ../rules/base.xml.in.h:8
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/Punkt/Akzenttasten"
+
+#: ../rules/base.xml.in.h:9
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/Punkt/ohne Akzenttasten"
+
+#: ../rules/base.xml.in.h:10
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/Komma/Akzenttasten"
+
+#: ../rules/base.xml.in.h:11
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/Komma/ohne Akzenttasten"
+
+#: ../rules/base.xml.in.h:12
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/Punkt/Akzenttasten"
+
+#: ../rules/base.xml.in.h:13
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/Punkt/ohne Akzenttasten"
+
+#: ../rules/base.xml.in.h:14
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/Komma/Akzenttasten"
+
+#: ../rules/base.xml.in.h:15
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/Komma/ohne Akzenttasten"
+
+#: ../rules/base.xml.in.h:16
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/Punkt/Akzenttasten"
+
+#: ../rules/base.xml.in.h:17
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/Punkt/ohne Akzenttasten"
+
+#: ../rules/base.xml.in.h:18
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/Komma/Akzenttasten"
+
+#: ../rules/base.xml.in.h:19
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/Komma/ohne Akzenttasten"
+
+#: ../rules/base.xml.in.h:20
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/Punkt/Akzenttasten"
+
+#: ../rules/base.xml.in.h:21
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/Punkt/ohne Akzenttasten"
+
+#: ../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-Standard"
+
+#: ../rules/base.xml.in.h:29
+msgid "ATM/phone-style"
+msgstr "ATM/Telefonstil"
+
+#: ../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 Laptop"
+
+#: ../rules/base.xml.in.h:34
+msgid "Add the standard behavior to Menu key"
+msgstr "Standardverhalten zur Menütaste hinzufügen"
+
+#: ../rules/base.xml.in.h:35
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "Esperanto-Circumflex (^) hinzufügen (supersigno)"
+
+#: ../rules/base.xml.in.h:36
+msgid "Adding EuroSign to certain keys"
+msgstr "Euro-Symbol zu verschiedenen Tasten hinzufügen"
+
+#: ../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 "Afghanistan"
+
+#: ../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 "Albanien"
+
+#: ../rules/base.xml.in.h:43
+msgid "Alt and Meta are on Alt keys"
+msgstr "Alt und Meta befinden sich auf den Alt-Tasten."
+
+#: ../rules/base.xml.in.h:44
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr "Alt ist der rechten Win-Taste zugeordnet und Super der Menü-Taste."
+
+#: ../rules/base.xml.in.h:45
+msgid "Alt+CapsLock"
+msgstr "Alt+Feststelltaste"
+
+#: ../rules/base.xml.in.h:46
+msgid "Alt+Ctrl"
+msgstr "Alt+Strg"
+
+#: ../rules/base.xml.in.h:47
+msgid "Alt+Shift"
+msgstr "Alt+Umschalttaste"
+
+#: ../rules/base.xml.in.h:48
+msgid "Alt+Space"
+msgstr "Alt+Leertaste"
+
+#: ../rules/base.xml.in.h:49
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:50
+msgid "Alt/Win key behavior"
+msgstr "Verhalten der Alt/Windows-Tasten"
+
+#: ../rules/base.xml.in.h:51
+msgid "Alternative"
+msgstr "Alternative"
+
+#: ../rules/base.xml.in.h:52
+msgid "Alternative Eastern"
+msgstr "Alternative, östlich"
+
+#: ../rules/base.xml.in.h:53
+msgid "Alternative Phonetic"
+msgstr "Alternative, phonetisch"
+
+#: ../rules/base.xml.in.h:54
+msgid "Alternative international (former us_intl)"
+msgstr "Alternative international (früher us_intl)"
+
+#: ../rules/base.xml.in.h:55
+msgid "Alternative, Sun dead keys"
+msgstr "Alternative, Sun-Akzenttasten"
+
+#: ../rules/base.xml.in.h:56
+msgid "Alternative, eliminate dead keys"
+msgstr "Alternative, ohne Akzenttasten"
+
+#: ../rules/base.xml.in.h:57
+msgid "Alternative, latin-9 only"
+msgstr "Alternative, nur latin-9"
+
+#: ../rules/base.xml.in.h:58
+msgid "And"
+msgstr "And"
+
+#: ../rules/base.xml.in.h:59
+msgid "Andorra"
+msgstr "Andorra"
+
+#: ../rules/base.xml.in.h:60
+msgid "Any Alt key"
+msgstr "Beliebige Alt-Taste"
+
+#: ../rules/base.xml.in.h:61
+msgid "Any Win key"
+msgstr "Beliebige Windows-Taste"
+
+#: ../rules/base.xml.in.h:62
+msgid "Any Win key (while pressed)"
+msgstr "Beliebige Windows-Taste (gedrückt halten)"
+
+#: ../rules/base.xml.in.h:63
+msgid "Apostrophe (') variant"
+msgstr "Apostroph-Variante (')"
+
+#: ../rules/base.xml.in.h:64
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:65
+msgid "Apple Laptop"
+msgstr "Apple-Laptop"
+
+#: ../rules/base.xml.in.h:66
+msgid "Ara"
+msgstr "Ara"
+
+#: ../rules/base.xml.in.h:67
+msgid "Arabic"
+msgstr "Arabisch"
+
+#: ../rules/base.xml.in.h:68
+msgid "Arm"
+msgstr "Arm"
+
+#: ../rules/base.xml.in.h:69
+msgid "Armenia"
+msgstr "Armenien"
+
+#: ../rules/base.xml.in.h:70
+msgid "Asturian variant with bottom-dot H and bottom-dot L"
+msgstr "Asturische Variante mit unterpunktetem L und H"
+
+#: ../rules/base.xml.in.h:71
+msgid "Asus Laptop"
+msgstr "Asus-Laptop"
+
+#: ../rules/base.xml.in.h:72
+msgid "At bottom left"
+msgstr "Unten links"
+
+#: ../rules/base.xml.in.h:73
+msgid "At left of 'A'"
+msgstr "Links von »A«"
+
+#: ../rules/base.xml.in.h:74
+msgid "Aze"
+msgstr "Aze"
+
+#: ../rules/base.xml.in.h:75
+msgid "Azerbaijan"
+msgstr "Aserbaidschan"
+
+#: ../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 "Baltisch+"
+
+#: ../rules/base.xml.in.h:87
+msgid "Ban"
+msgstr "Ban"
+
+#: ../rules/base.xml.in.h:88
+msgid "Bangladesh"
+msgstr "Bangladesch"
+
+#: ../rules/base.xml.in.h:89
+msgid "Bel"
+msgstr "Bel"
+
+#: ../rules/base.xml.in.h:90
+msgid "Belarus"
+msgstr "Weißrussland"
+
+#: ../rules/base.xml.in.h:91
+msgid "Belgium"
+msgstr "Belgien"
+
+#: ../rules/base.xml.in.h:92
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
+
+#: ../rules/base.xml.in.h:93
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:94
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
+
+#: ../rules/base.xml.in.h:95
+msgid "Bengali"
+msgstr "Bengalisch"
+
+#: ../rules/base.xml.in.h:96
+msgid "Bengali Probhat"
+msgstr "Bengali Probhat"
+
+#: ../rules/base.xml.in.h:97
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Bepo, ergonomisch, Dvorak-ähnlich"
+
+#: ../rules/base.xml.in.h:98
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Bepo, ergonomisch, Dvorak-ähnlich, nur latin-9"
+
+#: ../rules/base.xml.in.h:99
+msgid "Bgr"
+msgstr "Bgr"
+
+#: ../rules/base.xml.in.h:100
+msgid "Bhu"
+msgstr "Bhu"
+
+#: ../rules/base.xml.in.h:101
+msgid "Bhutan"
+msgstr "Bhutan"
+
+#: ../rules/base.xml.in.h:102
+msgid "Biblical Hebrew (Tiro)"
+msgstr "Althebräisch (Tiro)"
+
+#: ../rules/base.xml.in.h:103
+msgid "Bih"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:104
+msgid "Blr"
+msgstr "Blr"
+
+#: ../rules/base.xml.in.h:105
+msgid "Bosnia and Herzegovina"
+msgstr "Bosnien-Herzegowina"
+
+#: ../rules/base.xml.in.h:106
+msgid "Both Alt keys together"
+msgstr "Beide Alt-Tasten gleichzeitig"
+
+#: ../rules/base.xml.in.h:107
+msgid "Both Ctrl keys together"
+msgstr "Beide Steuerungstasten gleichzeitig"
+
+#: ../rules/base.xml.in.h:108
+msgid "Both Shift keys together"
+msgstr "Beide Umschalttasten gleichzeitig"
+
+#: ../rules/base.xml.in.h:109
+msgid "Bra"
+msgstr "Bra"
+
+#: ../rules/base.xml.in.h:110
+msgid "Braille"
+msgstr "Braille"
+
+#: ../rules/base.xml.in.h:111
+msgid "Brazil"
+msgstr "Brasilien"
+
+#: ../rules/base.xml.in.h:112
+msgid "Breton"
+msgstr "Bretonisch"
+
+#: ../rules/base.xml.in.h:113
+msgid "Brl"
+msgstr "Brl"
+
+#: ../rules/base.xml.in.h:114
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
+
+#: ../rules/base.xml.in.h:115
+msgid "Buckwalter"
+msgstr "Buckwalter"
+
+#: ../rules/base.xml.in.h:116
+msgid "Bulgaria"
+msgstr "Bulgarien"
+
+#: ../rules/base.xml.in.h:117
+msgid "CRULP"
+msgstr "CRULP"
+
+#: ../rules/base.xml.in.h:118
+msgid "Cambodia"
+msgstr "Kambodscha"
+
+#: ../rules/base.xml.in.h:119
+msgid "Can"
+msgstr "Can"
+
+#: ../rules/base.xml.in.h:120
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../rules/base.xml.in.h:121
+msgid "Caps Lock"
+msgstr "Feststelltaste"
+
+#: ../rules/base.xml.in.h:122
+msgid "CapsLock"
+msgstr "Feststelltaste"
+
+#: ../rules/base.xml.in.h:123
+msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
+msgstr "Feststelltaste (zur ersten Belegung), Umschalttaste+Feststelltaste (zur letzten Belegung)"
+
+#: ../rules/base.xml.in.h:124
+msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
+msgstr "Feststelltaste (gedrückt halten), Alt+Feststelltaste führen die normale Feststelltasten-Aktion aus"
+
+#: ../rules/base.xml.in.h:125
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
+msgstr "Feststelltaste arbeitet als Umschalttaste mit Sperrung. Umschalttaste »unterbricht« Feststelltaste"
+
+#: ../rules/base.xml.in.h:126
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock"
+msgstr "Feststelltaste arbeitet als Umschalttaste mit Sperrung. Umschalttaste beeinflusst Feststelltaste nicht"
+
+#: ../rules/base.xml.in.h:127
+msgid "CapsLock key behavior"
+msgstr "Verhalten der Feststelltaste"
+
+#: ../rules/base.xml.in.h:128
+msgid "CapsLock toggles Shift so all keys are affected"
+msgstr "Feststelltaste kehrt Umschalttaste um, so dass alle Tasten beeinflusst werden"
+
+#: ../rules/base.xml.in.h:129
+msgid "CapsLock toggles normal capitalization of alphabetic characters"
+msgstr "Feststelltaste kehrt die normale Großschreibung alphabetischer Zeichen um"
+
+#: ../rules/base.xml.in.h:130
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
+msgstr "Feststelltaste verwendet interne Großschreibung. Umschalttaste »unterbricht« Feststelltaste"
+
+#: ../rules/base.xml.in.h:131
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
+msgstr "Feststelltaste verwendet interne Großschreibung. Umschalttaste beeinflusst Feststelltaste nicht"
+
+#: ../rules/base.xml.in.h:132
+msgid "Catalan variant with middle-dot L"
+msgstr "Katalanische Variante mit mittelpunktiertem L"
+
+#: ../rules/base.xml.in.h:133
+msgid "Cedilla"
+msgstr "Cedilla"
+
+#: ../rules/base.xml.in.h:134
+msgid "Che"
+msgstr "Che"
+
+#: ../rules/base.xml.in.h:135
+msgid "Cherokee"
+msgstr "Cherokee"
+
+#: ../rules/base.xml.in.h:136
+msgid "Cherry B.UNLIMITED"
+msgstr "Cherry B.UNLIMITED"
+
+#: ../rules/base.xml.in.h:137
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:138
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (alternative Option)"
+
+#: ../rules/base.xml.in.h:139
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:140
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Expert"
+
+#: ../rules/base.xml.in.h:141
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:142
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
+
+#: ../rules/base.xml.in.h:143
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard"
+
+#: ../rules/base.xml.in.h:144
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:145
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
+
+#: ../rules/base.xml.in.h:146
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0420"
+
+#: ../rules/base.xml.in.h:147
+msgid "China"
+msgstr "China"
+
+#: ../rules/base.xml.in.h:148
+msgid "Chuvash"
+msgstr "Tschuwaschisch"
+
+#: ../rules/base.xml.in.h:149
+msgid "Chuvash Latin"
+msgstr "Tschuwaschisch (lateinische Schrift)"
+
+#: ../rules/base.xml.in.h:150
+msgid "Classic"
+msgstr "Klassisch"
+
+#: ../rules/base.xml.in.h:151
+msgid "Classic Dvorak"
+msgstr "Dvorak (klassisch)"
+
+#: ../rules/base.xml.in.h:152
+msgid "Classmate PC"
+msgstr "Classmate PC"
+
+#: ../rules/base.xml.in.h:153
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:154
+msgid "Colemak"
+msgstr "Colemak"
+
+#: ../rules/base.xml.in.h:155
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
+
+#: ../rules/base.xml.in.h:156
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 Tasten)"
+
+#: ../rules/base.xml.in.h:157
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 Tasten)"
+
+#: ../rules/base.xml.in.h:158
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 Tasten)"
+
+#: ../rules/base.xml.in.h:159
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
+
+#: ../rules/base.xml.in.h:160
+msgid "Compose key position"
+msgstr "Position der Compose-Taste"
+
+#: ../rules/base.xml.in.h:161
+msgid "Congo, Democratic Republic of the"
+msgstr "Demokratische Republik Kongo"
+
+#: ../rules/base.xml.in.h:162
+msgid "Control + Alt + Backspace"
+msgstr "Strg + Alt + Entf"
+
+#: ../rules/base.xml.in.h:163
+msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
+msgstr "Strg ist den Alt-Tasten zugeordnet, Alt ist den Windows-Tasten zugeordnet"
+
+#: ../rules/base.xml.in.h:164
+msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
+msgstr "Strg ist den Win-Tasten zugeordnet (und den üblichen Strg-Tasten)"
+
+#: ../rules/base.xml.in.h:165
+msgid "Crimean Tatar (Dobruca-1 Q)"
+msgstr "Krimtatarisch (Dobruca-1 Q)"
+
+#: ../rules/base.xml.in.h:166
+msgid "Crimean Tatar (Dobruca-2 Q)"
+msgstr "Krimtatarisch (Dobruca-2 Q)"
+
+#: ../rules/base.xml.in.h:167
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Krimtatarisch (Türkisch Alt-Q)"
+
+#: ../rules/base.xml.in.h:168
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Krimtatarisch (Türkisch F)"
+
+#: ../rules/base.xml.in.h:169
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Krimtatarisch (Türkisch Q)"
+
+#: ../rules/base.xml.in.h:170
+msgid "Croatia"
+msgstr "Kroatien"
+
+#: ../rules/base.xml.in.h:171
+msgid "Ctrl key position"
+msgstr "Position der Strg-Taste"
+
+#: ../rules/base.xml.in.h:172
+msgid "Ctrl+Shift"
+msgstr "Strg+Umschalttaste"
+
+#: ../rules/base.xml.in.h:173
+msgid "Cyrillic"
+msgstr "Kyrillisch"
+
+#: ../rules/base.xml.in.h:174
+msgid "Cyrillic with guillemets"
+msgstr "Kyrillisch mit Anführungszeichen"
+
+#: ../rules/base.xml.in.h:175
+msgid "Cyrillic, Z and ZHE swapped"
+msgstr "Kyrillisch, »З« und »Ж« vertauscht"
+
+#: ../rules/base.xml.in.h:176
+msgid "Cze"
+msgstr "Cze"
+
+#: ../rules/base.xml.in.h:177
+msgid "Czechia"
+msgstr "Tschechien"
+
+#: ../rules/base.xml.in.h:178
+msgid "DOS"
+msgstr "DOS"
+
+#: ../rules/base.xml.in.h:179
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:180
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:181
+msgid "Dan"
+msgstr "Dan"
+
+#: ../rules/base.xml.in.h:182
+msgid "Dead acute"
+msgstr "Ohne Acute-(')Akzentzeichen"
+
+#: ../rules/base.xml.in.h:183
+msgid "Dead grave acute"
+msgstr "Ohne Grave-(`) und Acute-(')Akzentzeichen"
+
+#: ../rules/base.xml.in.h:184
+msgid "Default numeric keypad keys"
+msgstr "Vorgegebene Nummernblocktasten"
+
+#: ../rules/base.xml.in.h:185
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:186
+msgid "Dell 101-key PC"
+msgstr "Dell PC-Tastatur mit 101 Tasten"
+
+#: ../rules/base.xml.in.h:187
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dell Laptop/Notebook Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:188
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell Laptop/Notebook Precision-M-Serie"
+
+#: ../rules/base.xml.in.h:189
+msgid "Dell Latitude series laptop"
+msgstr "Dell Latitude-Laptop"
+
+#: ../rules/base.xml.in.h:190
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
+
+#: ../rules/base.xml.in.h:191
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
+
+#: ../rules/base.xml.in.h:192
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
+
+#: ../rules/base.xml.in.h:193
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Dell USB Multimedia Keybard"
+
+#: ../rules/base.xml.in.h:194
+msgid "Denmark"
+msgstr "Dänemark"
+
+#: ../rules/base.xml.in.h:195
+msgid "Deu"
+msgstr "Deu"
+
+#: ../rules/base.xml.in.h:196
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:197
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802-Serie"
+
+#: ../rules/base.xml.in.h:198
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:199
+msgid "Dvorak (UK Punctuation)"
+msgstr "Dvorak (britische Punktierung)"
+
+#: ../rules/base.xml.in.h:200
+msgid "Dvorak international"
+msgstr "Dvorak international"
+
+#: ../rules/base.xml.in.h:201
+msgid "Dvorak, Polish quotes on key 1"
+msgstr "Dvorak, polnische Anführungszeichen auf Taste 1"
+
+#: ../rules/base.xml.in.h:202
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorak, polnische Anführungszeichen auf Taste mit Zitatzeichen"
+
+#: ../rules/base.xml.in.h:203
+msgid "E"
+msgstr "E"
+
+#: ../rules/base.xml.in.h:204
+msgid "Eastern"
+msgstr "Östlich"
+
+#: ../rules/base.xml.in.h:205
+msgid "Eliminate dead keys"
+msgstr "Akzenttatsen deaktivieren"
+
+#: ../rules/base.xml.in.h:206
+msgid "Enable extra typographic characters"
+msgstr "Typographische Sonderzeichen aktivieren"
+
+#: ../rules/base.xml.in.h:207
+msgid "English"
+msgstr "Englisch"
+
+#: ../rules/base.xml.in.h:208
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:209
+msgid "Enter on keypad"
+msgstr "Eingabetaste im Nummernblock"
+
+#: ../rules/base.xml.in.h:210
+msgid "Epo"
+msgstr "Epo"
+
+#: ../rules/base.xml.in.h:211
+msgid "Ergonomic"
+msgstr "Ergonomic"
+
+#: ../rules/base.xml.in.h:212
+msgid "Esp"
+msgstr "Esp"
+
+#: ../rules/base.xml.in.h:213
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../rules/base.xml.in.h:214
+msgid "Est"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:215
+msgid "Estonia"
+msgstr "Estland"
+
+#: ../rules/base.xml.in.h:216
+msgid "Eth"
+msgstr "Eth"
+
+#: ../rules/base.xml.in.h:217
+msgid "Ethiopia"
+msgstr "Äthiopien"
+
+#: ../rules/base.xml.in.h:218
+msgid "Evdev-managed keyboard"
+msgstr "Evdev-verwaltete Tastatur"
+
+#: ../rules/base.xml.in.h:219
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:220
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../rules/base.xml.in.h:221
+msgid "Extended"
+msgstr "Erweitert"
+
+#: ../rules/base.xml.in.h:222
+msgid "Extended - Winkeys"
+msgstr "Erweitert - Windows-Tasten"
+
+#: ../rules/base.xml.in.h:223
+msgid "Extended Backslash"
+msgstr "Erweiterter Backslash"
+
+#: ../rules/base.xml.in.h:224
+msgid "F-letter (F) variant"
+msgstr "F-Variante"
+
+#: ../rules/base.xml.in.h:225
+msgid "FL90"
+msgstr "FL90"
+
+#: ../rules/base.xml.in.h:226
+msgid "Fao"
+msgstr "Fao"
+
+#: ../rules/base.xml.in.h:227
+msgid "Faroe Islands"
+msgstr "Färöer-Inseln"
+
+#: ../rules/base.xml.in.h:228
+msgid "Fin"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:229
+msgid "Finland"
+msgstr "Finnland"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:232
+msgid "Four-level key with abstract separators"
+msgstr "Taste der vierten Ebene mit abstrakten Trennern"
+
+#: ../rules/base.xml.in.h:233
+msgid "Four-level key with comma"
+msgstr "Taste der vierten Ebene mit Komma"
+
+#: ../rules/base.xml.in.h:234
+msgid "Four-level key with dot"
+msgstr "Taste der vierten Ebene mit Punkt"
+
+#: ../rules/base.xml.in.h:235
+msgid "Four-level key with dot, latin-9 restriction"
+msgstr "Taste der vierten Ebene mit Punkt, latin-9-Einschränkung"
+
+# momayyez? Was ist das?
+#: ../rules/base.xml.in.h:236
+msgid "Four-level key with momayyez"
+msgstr "Taste der vierten Ebene mit »momayyez«"
+
+#: ../rules/base.xml.in.h:237
+msgid "Fra"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:238
+msgid "France"
+msgstr "Frankreich"
+
+#: ../rules/base.xml.in.h:239
+msgid "French"
+msgstr "Französisch"
+
+#: ../rules/base.xml.in.h:240
+msgid "French (Macintosh)"
+msgstr "Französisch (Macintosh)"
+
+#: ../rules/base.xml.in.h:241
+msgid "French (legacy)"
+msgstr "Französisch (veraltet)"
+
+#: ../rules/base.xml.in.h:242
+msgid "French Dvorak"
+msgstr "Französisch (Dvorak)"
+
+#: ../rules/base.xml.in.h:243
+msgid "French, Sun dead keys"
+msgstr "Französisch, Sun-Akzenttasten"
+
+#: ../rules/base.xml.in.h:244
+msgid "French, eliminate dead keys"
+msgstr "Französisch, ohne Akzenttasten"
+
+#: ../rules/base.xml.in.h:245
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Fujitsu-Siemens Computers AMILO Laptop"
+
+#: ../rules/base.xml.in.h:246
+msgid "Fula"
+msgstr "Fula"
+
+#: ../rules/base.xml.in.h:247
+msgid "GBr"
+msgstr "GBr"
+
+#: ../rules/base.xml.in.h:248
+msgid "Ga"
+msgstr "Ga"
+
+#: ../rules/base.xml.in.h:249
+msgid "Generic 101-key PC"
+msgstr "Generische PC-Tastatur mit 101 Tasten"
+
+#: ../rules/base.xml.in.h:250
+msgid "Generic 102-key (Intl) PC"
+msgstr "Generische PC-Tastatur mit 102 Tasten (Intl)"
+
+#: ../rules/base.xml.in.h:251
+msgid "Generic 104-key PC"
+msgstr "Generische PC-Tastatur mit 104 Tasten"
+
+#: ../rules/base.xml.in.h:252
+msgid "Generic 105-key (Intl) PC"
+msgstr "Generische PC-Tastatur mit 105 Tasten (Intl)"
+
+#: ../rules/base.xml.in.h:253
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:254
+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:255
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:256
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:257
+msgid "Genius KKB-2050HS"
+msgstr "Genius KKB-2050HS"
+
+#: ../rules/base.xml.in.h:258
+msgid "Geo"
+msgstr "Geo"
+
+#: ../rules/base.xml.in.h:259
+msgid "Georgia"
+msgstr "Georgien"
+
+#: ../rules/base.xml.in.h:260
+msgid "Georgian"
+msgstr "Georgisch"
+
+#: ../rules/base.xml.in.h:261
+msgid "Georgian AZERTY Tskapo"
+msgstr "Georgisch, AZERTY Tskapo"
+
+#: ../rules/base.xml.in.h:262
+msgid "German (Macintosh)"
+msgstr "Deutsch (Macintosh)"
+
+#: ../rules/base.xml.in.h:263
+msgid "German, Sun dead keys"
+msgstr "Deutsch, Sun-Akzenttasten"
+
+#: ../rules/base.xml.in.h:264
+msgid "German, eliminate dead keys"
+msgstr "Deutsch, ohne Akzenttasten"
+
+#: ../rules/base.xml.in.h:265
+msgid "Germany"
+msgstr "Deutschland"
+
+#: ../rules/base.xml.in.h:266
+msgid "Gha"
+msgstr "Gha"
+
+#: ../rules/base.xml.in.h:267
+msgid "Ghana"
+msgstr "Ghana"
+
+#: ../rules/base.xml.in.h:268
+msgid "Gre"
+msgstr "Gre"
+
+#: ../rules/base.xml.in.h:269
+msgid "Greece"
+msgstr "Griechenland"
+
+#: ../rules/base.xml.in.h:270
+msgid "Group toggle on multiply/divide key"
+msgstr "Gruppenumschalter auf der Multiplikations-/Divisionstaste"
+
+#: ../rules/base.xml.in.h:271
+msgid "Gui"
+msgstr "Gui"
+
+#: ../rules/base.xml.in.h:272
+msgid "Guinea"
+msgstr "Guinea"
+
+#: ../rules/base.xml.in.h:273
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../rules/base.xml.in.h:274
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../rules/base.xml.in.h:275
+msgid "Gurmukhi Jhelum"
+msgstr "Gurmukhi Jhelum"
+
+#: ../rules/base.xml.in.h:276
+msgid "Gyration"
+msgstr "Gyration"
+
+#: ../rules/base.xml.in.h:277
+msgid "Happy Hacking Keyboard"
+msgstr "Happy Hacking Keyboard"
+
+#: ../rules/base.xml.in.h:278
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "»Happy Hacking Keyboard« für Mac"
+
+#: ../rules/base.xml.in.h:279
+msgid "Hausa"
+msgstr "Haussa"
+
+#: ../rules/base.xml.in.h:280
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
+
+#: ../rules/base.xml.in.h:281
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:282
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:283
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:284
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:285
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:286
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:287
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:288
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
+
+#: ../rules/base.xml.in.h:289
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-250x Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:290
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
+
+#: ../rules/base.xml.in.h:291
+msgid "Hexadecimal"
+msgstr "Hexadezimal"
+
+#: ../rules/base.xml.in.h:292
+msgid "Hindi Bolnagri"
+msgstr "Hindi Bolnagri"
+
+#: ../rules/base.xml.in.h:293
+msgid "Hindi Wx"
+msgstr "Hindi Wx"
+
+#: ../rules/base.xml.in.h:294
+msgid "Homophonic"
+msgstr "Homophonic"
+
+#: ../rules/base.xml.in.h:295
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:296
+msgid "Hrv"
+msgstr "Hrv"
+
+#: ../rules/base.xml.in.h:297
+msgid "Hun"
+msgstr "Hun"
+
+#: ../rules/base.xml.in.h:298
+msgid "Hungary"
+msgstr "Ungarn"
+
+#: ../rules/base.xml.in.h:299
+msgid "Hyper is mapped to Win-keys"
+msgstr "Hyper ist den Win-Tasten zugeordnet"
+
+#: ../rules/base.xml.in.h:300
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:301
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:302
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:303
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
+
+#: ../rules/base.xml.in.h:304
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:305
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+
+#: ../rules/base.xml.in.h:306
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
+
+#: ../rules/base.xml.in.h:307
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+
+#: ../rules/base.xml.in.h:308
+msgid "ISO Alternate"
+msgstr "ISO-Alternative"
+
+#: ../rules/base.xml.in.h:309
+msgid "Iceland"
+msgstr "Island"
+
+#: ../rules/base.xml.in.h:310
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../rules/base.xml.in.h:311
+msgid "Include dead tilde"
+msgstr "Akzent-Tilde einschließen"
+
+#: ../rules/base.xml.in.h:312
+msgid "Ind"
+msgstr "Ind"
+
+#: ../rules/base.xml.in.h:313
+msgid "India"
+msgstr "Indien"
+
+#: ../rules/base.xml.in.h:314
+msgid "International (AltGr dead keys)"
+msgstr "International (AltGr-Akzenttasten)"
+
+#: ../rules/base.xml.in.h:315
+msgid "International (with dead keys)"
+msgstr "International (mit Akzenttasten)"
+
+#: ../rules/base.xml.in.h:316
+msgid "Inuktitut"
+msgstr "Inuktitut"
+
+#: ../rules/base.xml.in.h:317
+msgid "Iran"
+msgstr "Iran"
+
+#: ../rules/base.xml.in.h:318
+msgid "Iraq"
+msgstr "Irak"
+
+#: ../rules/base.xml.in.h:319
+msgid "Ireland"
+msgstr "Irland"
+
+#: ../rules/base.xml.in.h:320
+msgid "Irl"
+msgstr "Irl"
+
+#: ../rules/base.xml.in.h:321
+msgid "Irn"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:322
+msgid "Irq"
+msgstr "Irq"
+
+#: ../rules/base.xml.in.h:323
+msgid "Isl"
+msgstr "Isl"
+
+#: ../rules/base.xml.in.h:324
+msgid "Isr"
+msgstr "Isr"
+
+#: ../rules/base.xml.in.h:325
+msgid "Israel"
+msgstr "Israel"
+
+#: ../rules/base.xml.in.h:326
+msgid "Ita"
+msgstr "Ita"
+
+#: ../rules/base.xml.in.h:327
+msgid "Italy"
+msgstr "Italien"
+
+#: ../rules/base.xml.in.h:328
+msgid "Japan"
+msgstr "Japan"
+
+#: ../rules/base.xml.in.h:329
+msgid "Japan (PC-98xx Series)"
+msgstr "Japan (PC-98xx-Serie)"
+
+#: ../rules/base.xml.in.h:330
+msgid "Japanese keyboard options"
+msgstr "Japanische Tastaturoptionen"
+
+#: ../rules/base.xml.in.h:331
+msgid "Jpn"
+msgstr "Jpn"
+
+#: ../rules/base.xml.in.h:332
+msgid "Kalmyk"
+msgstr "Kalmückisch"
+
+#: ../rules/base.xml.in.h:333
+msgid "Kana"
+msgstr "Kana"
+
+#: ../rules/base.xml.in.h:334
+msgid "Kana Lock key is locking"
+msgstr "Kana-Sperrtaste ist gesperrt"
+
+#: ../rules/base.xml.in.h:335
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../rules/base.xml.in.h:336
+msgid "Kashubian"
+msgstr "Kaschubisch"
+
+#: ../rules/base.xml.in.h:337
+msgid "Kaz"
+msgstr "Kaz"
+
+#: ../rules/base.xml.in.h:338
+msgid "Kazakh with Russian"
+msgstr "Kasachisch mit russischer Belegung"
+
+#: ../rules/base.xml.in.h:339
+msgid "Kazakhstan"
+msgstr "Kasachstan"
+
+#: ../rules/base.xml.in.h:340
+msgid "Key sequence to kill the X server"
+msgstr "Tastenkombination zum erzwungenen Beenden des X-Servers"
+
+#: ../rules/base.xml.in.h:341
+msgid "Key to choose 3rd level"
+msgstr "Taste zum Wechsel in die dritte Tastaturebene"
+
+#: ../rules/base.xml.in.h:342
+msgid "Key(s) to change layout"
+msgstr "Taste(n) zum Wechseln der Belegung"
+
+#: ../rules/base.xml.in.h:343
+msgid "Keypad"
+msgstr "Nummernblock"
+
+#: ../rules/base.xml.in.h:344
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:345
+msgid "Kgz"
+msgstr "Kgz"
+
+#: ../rules/base.xml.in.h:346
+msgid "Khm"
+msgstr "Khm"
+
+#: ../rules/base.xml.in.h:347
+msgid "Komi"
+msgstr "Komi"
+
+#: ../rules/base.xml.in.h:348
+msgid "Kor"
+msgstr "Kor"
+
+#: ../rules/base.xml.in.h:349
+msgid "Korea, Republic of"
+msgstr "Korea, Republik"
+
+#: ../rules/base.xml.in.h:350
+msgid "Ktunaxa"
+msgstr "Ktunaxa"
+
+#: ../rules/base.xml.in.h:351
+msgid "Kurdish, (F)"
+msgstr "Kurdisch, (F)"
+
+#: ../rules/base.xml.in.h:352
+msgid "Kurdish, Arabic-Latin"
+msgstr "Kurdisch, Arabisch-Lateinisch"
+
+#: ../rules/base.xml.in.h:353
+msgid "Kurdish, Latin Alt-Q"
+msgstr "Kurdisch, Lateinisches Alt-Q"
+
+#: ../rules/base.xml.in.h:354
+msgid "Kurdish, Latin Q"
+msgstr "Kurdisch, Lateinisches Q"
+
+#: ../rules/base.xml.in.h:355
+msgid "Kyrgyzstan"
+msgstr "Kirgisistan"
+
+#: ../rules/base.xml.in.h:356
+msgid "LAm"
+msgstr "LAm"
+
+#: ../rules/base.xml.in.h:357
+msgid "LEKP"
+msgstr "LEKP"
+
+#: ../rules/base.xml.in.h:358
+msgid "LEKPa"
+msgstr "LEKPa"
+
+#: ../rules/base.xml.in.h:359
+msgid "Lao"
+msgstr "Lao"
+
+#: ../rules/base.xml.in.h:360
+msgid "Laos"
+msgstr "Laos"
+
+#: ../rules/base.xml.in.h:361
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Compaq Laptop/Notebook-Tastatur (z.B. Armada) Laptop-Tastatur"
+
+#: ../rules/base.xml.in.h:362
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Compaq Laptop/Notebook-Tastatur (z.B. Presario) Laptop-Tastatur"
+
+#: ../rules/base.xml.in.h:363
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Laptop/notebook eMachines m68xx"
+
+#: ../rules/base.xml.in.h:364
+msgid "Latin"
+msgstr "Latein"
+
+#: ../rules/base.xml.in.h:365
+msgid "Latin American"
+msgstr "Lateinamerikanisch"
+
+#: ../rules/base.xml.in.h:366
+msgid "Latin Unicode"
+msgstr "Latein (Unicode)"
+
+#: ../rules/base.xml.in.h:367
+msgid "Latin Unicode qwerty"
+msgstr "Lateinische qwerty-Tastatur (Unicode)"
+
+#: ../rules/base.xml.in.h:368
+msgid "Latin qwerty"
+msgstr "Lateinische qwerty-Tastatur"
+
+#: ../rules/base.xml.in.h:369
+msgid "Latin unicode"
+msgstr "Latein (Unicode)"
+
+#: ../rules/base.xml.in.h:370
+msgid "Latin unicode qwerty"
+msgstr "Lateinische qwerty-Tastatur (Unicode)"
+
+#: ../rules/base.xml.in.h:371
+msgid "Latin with guillemets"
+msgstr "Lateinisch mit Anführungszeichen"
+
+#: ../rules/base.xml.in.h:372
+msgid "Latvia"
+msgstr "Lettland"
+
+#: ../rules/base.xml.in.h:373
+msgid "Lav"
+msgstr "Lav"
+
+#: ../rules/base.xml.in.h:374
+msgid "Left Alt"
+msgstr "Linke Alt-Taste"
+
+#: ../rules/base.xml.in.h:375
+msgid "Left Alt (while pressed)"
+msgstr "Linke Alt-Taste (gedrückt halten)"
+
+#: ../rules/base.xml.in.h:376
+msgid "Left Alt is swapped with Left Win"
+msgstr "Linke Alt-Taste ist gegen linke Windows-Taste vertauscht"
+
+#: ../rules/base.xml.in.h:377
+msgid "Left Ctrl"
+msgstr "Linke Strg-Taste"
+
+#: ../rules/base.xml.in.h:378
+msgid "Left Ctrl+Left Shift"
+msgstr "Linke Strg-Taste+Linke Umschalttaste"
+
+#: ../rules/base.xml.in.h:379
+msgid "Left Shift"
+msgstr "Linke Umschalttaste"
+
+#: ../rules/base.xml.in.h:380
+msgid "Left Win"
+msgstr "Linke Windows-Taste"
+
+#: ../rules/base.xml.in.h:381
+msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgstr "Linke Windows-Taste (zur ersten Belegung), rechte Windows/Menütaste (zur letzten Belegung)"
+
+#: ../rules/base.xml.in.h:382
+msgid "Left Win (while pressed)"
+msgstr "Linke Windows-Taste (gedrückt halten)"
+
+#: ../rules/base.xml.in.h:383
+msgid "Left hand"
+msgstr "Linkshändig"
+
+#: ../rules/base.xml.in.h:384
+msgid "Left handed Dvorak"
+msgstr "Dvorak (linkshändig)"
+
+#: ../rules/base.xml.in.h:385
+msgid "Legacy"
+msgstr "Veraltet"
+
+#: ../rules/base.xml.in.h:386
+msgid "Legacy Wang 724"
+msgstr "Wang 724 (veraltet)"
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:388
+msgid "Legacy key with comma"
+msgstr "Veraltete Taste mit Komma"
+
+#: ../rules/base.xml.in.h:389
+msgid "Legacy key with dot"
+msgstr "Veraltete Taste mit Punkt"
+
+#: ../rules/base.xml.in.h:390
+msgid "Less-than/Greater-than"
+msgstr "Kleiner als/größer als"
+
+#: ../rules/base.xml.in.h:391
+msgid "Lithuania"
+msgstr "Litauen"
+
+#: ../rules/base.xml.in.h:392
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
+
+#: ../rules/base.xml.in.h:393
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:394
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (alternative Option)"
+
+#: ../rules/base.xml.in.h:395
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
+
+#: ../rules/base.xml.in.h:396
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:397
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:398
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:399
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgstr "Logitech Cordless Desktop Pro (alternative Option 2)"
+
+#: ../rules/base.xml.in.h:400
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:401
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:402
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15-Sondertasten über den G1-Daemon"
+
+#: ../rules/base.xml.in.h:403
+msgid "Logitech Generic Keyboard"
+msgstr "Generische Logitech-Tastatur"
+
+#: ../rules/base.xml.in.h:404
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech Internet 350 Keyboard"
+
+#: ../rules/base.xml.in.h:405
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:406
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: ../rules/base.xml.in.h:407
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Media Elite Keyboard"
+
+#: ../rules/base.xml.in.h:408
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:409
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
+
+#: ../rules/base.xml.in.h:410
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge Keyboard"
+
+#: ../rules/base.xml.in.h:411
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Keyboard"
+
+#: ../rules/base.xml.in.h:412
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:413
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (Modell Y-RB6)"
+
+#: ../rules/base.xml.in.h:414
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
+
+#: ../rules/base.xml.in.h:415
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+
+#: ../rules/base.xml.in.h:416
+msgid "Lower Sorbian"
+msgstr "Niedersorbisch"
+
+#: ../rules/base.xml.in.h:417
+msgid "Lower Sorbian (qwertz)"
+msgstr "Niedersorbisch (qwertz)"
+
+#: ../rules/base.xml.in.h:418
+msgid "Ltu"
+msgstr "Ltu"
+
+#: ../rules/base.xml.in.h:419
+msgid "MESS"
+msgstr "MESS"
+
+#: ../rules/base.xml.in.h:420
+msgid "MNE"
+msgstr "MNE"
+
+#: ../rules/base.xml.in.h:421
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
+
+#: ../rules/base.xml.in.h:422
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (Intl)"
+
+#: ../rules/base.xml.in.h:423
+msgid "Macedonia"
+msgstr "Mazedonien"
+
+#: ../rules/base.xml.in.h:424
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:425
+msgid "Macintosh Old"
+msgstr "Macintosh (Alt)"
+
+#: ../rules/base.xml.in.h:426
+msgid "Macintosh, Sun dead keys"
+msgstr "Macintosh, Sun-Akzenttasten"
+
+#: ../rules/base.xml.in.h:427
+msgid "Macintosh, eliminate dead keys"
+msgstr "Macintosh (ohne Akzenttasten)"
+
+#: ../rules/base.xml.in.h:428
+msgid "Make CapsLock an additional Backspace"
+msgstr "Feststelltaste als zusätzliche Löschtaste verwenden"
+
+#: ../rules/base.xml.in.h:429
+msgid "Make CapsLock an additional Ctrl"
+msgstr "Feststelltaste als zusätzliche Strg-Taste verwenden"
+
+#: ../rules/base.xml.in.h:430
+msgid "Make CapsLock an additional ESC"
+msgstr "Feststelltaste als zusätzliche Esc-Taste verwenden."
+
+#: ../rules/base.xml.in.h:431
+msgid "Mal"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:432
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../rules/base.xml.in.h:433
+msgid "Malayalam Lalitha"
+msgstr "Malayalam Lalitha"
+
+#: ../rules/base.xml.in.h:434
+msgid "Maldives"
+msgstr "Malediven"
+
+#: ../rules/base.xml.in.h:435
+msgid "Malta"
+msgstr "Malta"
+
+#: ../rules/base.xml.in.h:436
+msgid "Maltese keyboard with US layout"
+msgstr "Maltesische Tastatur mit US-Belegung"
+
+#: ../rules/base.xml.in.h:437
+msgid "Mao"
+msgstr "Mao"
+
+#: ../rules/base.xml.in.h:438
+msgid "Maori"
+msgstr "Maori"
+
+#: ../rules/base.xml.in.h:439
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:440
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
+
+#: ../rules/base.xml.in.h:441
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:442
+msgid "Menu"
+msgstr "Menü"
+
+#: ../rules/base.xml.in.h:443
+msgid "Meta is mapped to Left Win"
+msgstr "Meta ist der linken Windows-Taste zugeordnet"
+
+#: ../rules/base.xml.in.h:444
+msgid "Meta is mapped to Win keys"
+msgstr "Meta ist den Windows-Tasten zugeordnet"
+
+#: ../rules/base.xml.in.h:445
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Comfort Curve Keyboard 2000"
+
+#: ../rules/base.xml.in.h:446
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
+
+#: ../rules/base.xml.in.h:447
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, Schwedisch"
+
+#: ../rules/base.xml.in.h:448
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:449
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural Keyboard Elite"
+
+#: ../rules/base.xml.in.h:450
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:451
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: ../rules/base.xml.in.h:452
+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:453
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+
+#: ../rules/base.xml.in.h:454
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
+
+#: ../rules/base.xml.in.h:455
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+
+#: ../rules/base.xml.in.h:456
+msgid "Miscellaneous compatibility options"
+msgstr "Verschiedene Optionen zur Kompatibilität"
+
+#: ../rules/base.xml.in.h:457
+msgid "Mkd"
+msgstr "Mkd"
+
+#: ../rules/base.xml.in.h:458
+msgid "Mlt"
+msgstr "Mlt"
+
+#: ../rules/base.xml.in.h:459
+msgid "Mmr"
+msgstr "Mmr"
+
+#: ../rules/base.xml.in.h:460
+msgid "Mng"
+msgstr "Mng"
+
+#: ../rules/base.xml.in.h:461
+msgid "Mongolia"
+msgstr "Mongolei"
+
+#: ../rules/base.xml.in.h:462
+msgid "Montenegro"
+msgstr "Montenegro"
+
+#: ../rules/base.xml.in.h:463
+msgid "Morocco"
+msgstr "Marokko"
+
+#: ../rules/base.xml.in.h:464
+msgid "Multilingual"
+msgstr "Mehrsprachig"
+
+#: ../rules/base.xml.in.h:465
+msgid "Multilingual, first part"
+msgstr "Mehrsprachig, erster Teil"
+
+#: ../rules/base.xml.in.h:466
+msgid "Multilingual, second part"
+msgstr "Mehrsprachig, zweiter Teil"
+
+#: ../rules/base.xml.in.h:467
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#: ../rules/base.xml.in.h:468
+msgid "NICOLA-F style Backspace"
+msgstr "Löschtaste wie NICOLA-F"
+
+#: ../rules/base.xml.in.h:469
+msgid "NLA"
+msgstr "NLA"
+
+#: ../rules/base.xml.in.h:470
+msgid "Nativo"
+msgstr "Nativo"
+
+#: ../rules/base.xml.in.h:471
+msgid "Nativo for Esperanto"
+msgstr "Nativo für Esperanto"
+
+#: ../rules/base.xml.in.h:472
+msgid "Nativo for USA keyboards"
+msgstr "Nativo für US-Tastaturen"
+
+#: ../rules/base.xml.in.h:473
+msgid "Neo 2"
+msgstr "Neo 2"
+
+#: ../rules/base.xml.in.h:474
+msgid "Nep"
+msgstr "Nep"
+
+#: ../rules/base.xml.in.h:475
+msgid "Nepal"
+msgstr "Nepal"
+
+#: ../rules/base.xml.in.h:476
+msgid "Netherlands"
+msgstr "Niederlande"
+
+#: ../rules/base.xml.in.h:477
+msgid "Nig"
+msgstr "Nig"
+
+#: ../rules/base.xml.in.h:478
+msgid "Nigeria"
+msgstr "Nigeria"
+
+#: ../rules/base.xml.in.h:479
+msgid "Nld"
+msgstr "Nld"
+
+#: ../rules/base.xml.in.h:480
+msgid "Non-breakable space character at fourth level"
+msgstr "Nicht umbrechbares Leerzeichen in der vierten Tastaturebene"
+
+#: ../rules/base.xml.in.h:481
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Nicht umbrechbares Leerzeichen in der vierten Tastaturebene, schmales nicht umbrechbares Leerzeichen in der sechsten Ebene"
+
+#: ../rules/base.xml.in.h:482
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
+msgstr "Nicht umbrechbares Leerzeichen in der vierten Tastaturebene, schmales nicht umbrechbares Leerzeichen in der sechsten Ebene (mit Strg + Umschalttaste)"
+
+#: ../rules/base.xml.in.h:483
+msgid "Non-breakable space character at second level"
+msgstr "Nicht umbrechbares Leerzeichen in der zweiten Tastaturebene"
+
+#: ../rules/base.xml.in.h:484
+msgid "Non-breakable space character at third level"
+msgstr "Nicht umbrechbares Leerzeichen in der dritten Tastaturebene"
+
+#: ../rules/base.xml.in.h:485
+msgid "Non-breakable space character at third level, nothing at fourth level"
+msgstr "Nicht umbrechbares Leerzeichen in der dritten Tastaturebene, nichts in der vierten Ebene"
+
+#: ../rules/base.xml.in.h:486
+msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Nicht umbrechbares Leerzeichen in der dritten Tastaturebene, schmales nicht umbrechbares Leerzeichen in der vierten Ebene"
+
+#: ../rules/base.xml.in.h:487
+msgid "Nor"
+msgstr "Nor"
+
+#: ../rules/base.xml.in.h:488
+msgid "Northern Saami"
+msgstr "Nördliches Saami"
+
+#: ../rules/base.xml.in.h:489
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Nördliches Saami, ohne Akzenttasten"
+
+#: ../rules/base.xml.in.h:490
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:491
+msgid "Norway"
+msgstr "Norwegen"
+
+#: ../rules/base.xml.in.h:492
+msgid "NumLock"
+msgstr "NumLock"
+
+#: ../rules/base.xml.in.h:493
+msgid "Numeric keypad delete key behaviour"
+msgstr "Verhalten der Löschtaste des Nummernblocks"
+
+#: ../rules/base.xml.in.h:494
+msgid "Numeric keypad keys work as with Mac"
+msgstr "Tasten des Nummernblocks arbeiten wie bei Mac"
+
+#: ../rules/base.xml.in.h:495
+msgid "Numeric keypad layout selection"
+msgstr "Belegungsauswahl des Nummernblocks"
+
+#: ../rules/base.xml.in.h:496
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:497
+msgid "OLPC"
+msgstr "OLPC"
+
+#: ../rules/base.xml.in.h:498
+msgid "OLPC Dari"
+msgstr "OLPC Dari"
+
+#: ../rules/base.xml.in.h:499
+msgid "OLPC Pashto"
+msgstr "OLPC Paschtunisch"
+
+#: ../rules/base.xml.in.h:500
+msgid "OLPC Southern Uzbek"
+msgstr "OLPC Süd-Usbekisch"
+
+#: ../rules/base.xml.in.h:501
+msgid "Occitan"
+msgstr "Okzitanisch"
+
+#: ../rules/base.xml.in.h:502
+msgid "Ogham"
+msgstr "Ogham"
+
+#: ../rules/base.xml.in.h:503
+msgid "Ogham IS434"
+msgstr "Ogham IS434"
+
+#: ../rules/base.xml.in.h:504
+msgid "Oriya"
+msgstr "Oriya"
+
+#: ../rules/base.xml.in.h:505
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/Internettastatur"
+
+#: ../rules/base.xml.in.h:506
+msgid "Ossetian"
+msgstr "Ossetisch"
+
+#: ../rules/base.xml.in.h:507
+msgid "Ossetian, Winkeys"
+msgstr "Ossetisch, Windows-Tasten"
+
+#: ../rules/base.xml.in.h:508
+msgid "Ossetian, legacy"
+msgstr "Ossetisch, veraltet"
+
+#: ../rules/base.xml.in.h:509
+msgid "PC-98xx Series"
+msgstr "PC-98xx-Serie"
+
+#: ../rules/base.xml.in.h:510
+msgid "Pak"
+msgstr "Pak"
+
+#: ../rules/base.xml.in.h:511
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: ../rules/base.xml.in.h:512
+msgid "Pashto"
+msgstr "Paschtunisch"
+
+#: ../rules/base.xml.in.h:513
+msgid "Pattachote"
+msgstr "Pattachote"
+
+#: ../rules/base.xml.in.h:514
+msgid "Phonetic"
+msgstr "Phonetisch"
+
+#: ../rules/base.xml.in.h:515
+msgid "Phonetic Winkeys"
+msgstr "Phonetisch, Windows-Tasten"
+
+#: ../rules/base.xml.in.h:516
+msgid "Pol"
+msgstr "Pol"
+
+#: ../rules/base.xml.in.h:517
+msgid "Poland"
+msgstr "Polen"
+
+#: ../rules/base.xml.in.h:518
+msgid "Polytonic"
+msgstr "Polytonic"
+
+#: ../rules/base.xml.in.h:519
+msgid "Portugal"
+msgstr "Portugal"
+
+#: ../rules/base.xml.in.h:520
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:521
+msgid "Pro Keypad"
+msgstr "Pro Keypad"
+
+#: ../rules/base.xml.in.h:522
+msgid "Probhat"
+msgstr "Probhat"
+
+#: ../rules/base.xml.in.h:523
+msgid "Programmer Dvorak"
+msgstr "Dvorak für Programmierer"
+
+#: ../rules/base.xml.in.h:524
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:525
+msgid "Prt"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:526
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:527
+msgid "Right Alt"
+msgstr "Rechte Alt-Taste"
+
+#: ../rules/base.xml.in.h:528
+msgid "Right Alt (while pressed)"
+msgstr "Rechte Alt-Taste (gedrückt halten)"
+
+#: ../rules/base.xml.in.h:529
+msgid "Right Alt key never chooses 3rd level"
+msgstr "Rechte Alt-Taste wählt niemals die dritte Tastaturebene."
+
+#: ../rules/base.xml.in.h:530
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr "Rechte Alt-Taste, Umschalttaste+rechte Alt-Taste ist Multi-Taste"
+
+#: ../rules/base.xml.in.h:531
+msgid "Right Ctrl"
+msgstr "Rechte Strg-Taste"
+
+#: ../rules/base.xml.in.h:532
+msgid "Right Ctrl (while pressed)"
+msgstr "Rechte Strg-Taste (gedrückt halten)"
+
+#: ../rules/base.xml.in.h:533
+msgid "Right Ctrl as Right Alt"
+msgstr "Rechte Strg-Taste wie rechte Alt-Taste"
+
+#: ../rules/base.xml.in.h:534
+msgid "Right Shift"
+msgstr "Rechte Umschalttaste"
+
+#: ../rules/base.xml.in.h:535
+msgid "Right Win"
+msgstr "Rechte Windows-Taste"
+
+#: ../rules/base.xml.in.h:536
+msgid "Right Win (while pressed)"
+msgstr "Rechte Windows-Taste (gedrückt halten)"
+
+#: ../rules/base.xml.in.h:537
+msgid "Right hand"
+msgstr "Rechtshändig"
+
+#: ../rules/base.xml.in.h:538
+msgid "Right handed Dvorak"
+msgstr "Dvorak (rechtshändig)"
+
+#: ../rules/base.xml.in.h:539
+msgid "Romania"
+msgstr "Rumänien"
+
+#: ../rules/base.xml.in.h:540
+msgid "Romanian keyboard with German letters"
+msgstr "Rumänische Tastatur mit deutschen Buchstaben"
+
+#: ../rules/base.xml.in.h:541
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Rumänische Tastatur mit deutschen Buchstaben, ohne Akzenttasten"
+
+#: ../rules/base.xml.in.h:542
+msgid "Rou"
+msgstr "Rou"
+
+#: ../rules/base.xml.in.h:543
+msgid "Rus"
+msgstr "Rus"
+
+#: ../rules/base.xml.in.h:544
+msgid "Russia"
+msgstr "Russland"
+
+#: ../rules/base.xml.in.h:545
+msgid "Russian"
+msgstr "Russisch"
+
+#: ../rules/base.xml.in.h:546
+msgid "Russian phonetic"
+msgstr "Russisch (phonetisch)"
+
+#: ../rules/base.xml.in.h:547
+msgid "Russian phonetic Dvorak"
+msgstr "Russisch (phonetisch, Dvorak)"
+
+#: ../rules/base.xml.in.h:548
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Russisch (phonetisch), ohne Akzenttasten"
+
+#: ../rules/base.xml.in.h:549
+msgid "Russian with Kazakh"
+msgstr "Russisch mit kasachischer Belegung"
+
+#: ../rules/base.xml.in.h:550
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
+
+#: ../rules/base.xml.in.h:551
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:552
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:553
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:554
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:555
+msgid "SRB"
+msgstr "SRB"
+
+#: ../rules/base.xml.in.h:556
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:557
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
+
+#: ../rules/base.xml.in.h:558
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:559
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:560
+msgid "Scroll Lock"
+msgstr "Rollen"
+
+#: ../rules/base.xml.in.h:561
+msgid "ScrollLock"
+msgstr "Rollen"
+
+#: ../rules/base.xml.in.h:562
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+#: ../rules/base.xml.in.h:563
+msgid "Semi-colon on third level"
+msgstr "Semikolon in der dritten Tastaturebene"
+
+#: ../rules/base.xml.in.h:564
+msgid "Serbia"
+msgstr "Serbien"
+
+#: ../rules/base.xml.in.h:565
+msgid "Shift cancels CapsLock"
+msgstr "Umschalttaste deaktiviert Feststelltaste"
+
+#: ../rules/base.xml.in.h:566
+msgid "Shift does not cancel NumLock, chooses 3d level instead"
+msgstr "Umschalttaste deaktiviert NumLock nicht, wechselt stattdessen in die dritte Tastaturebene"
+
+#: ../rules/base.xml.in.h:567
+msgid "Shift with numeric keypad keys works as in MS Windows"
+msgstr "Unschalttaste funktioniert mit den Tasten des Nummernblocks wie in MS Windows"
+
+#: ../rules/base.xml.in.h:568
+msgid "Shift+CapsLock"
+msgstr "Umschalt-+Feststelltaste"
+
+#: ../rules/base.xml.in.h:569
+msgid "Simple"
+msgstr "Einfach"
+
+#: ../rules/base.xml.in.h:570
+msgid "Slovakia"
+msgstr "Slowakei"
+
+#: ../rules/base.xml.in.h:571
+msgid "Slovenia"
+msgstr "Slowenien"
+
+#: ../rules/base.xml.in.h:572
+msgid "South Africa"
+msgstr "Südafrika"
+
+#: ../rules/base.xml.in.h:573
+msgid "Southern Uzbek"
+msgstr "Süd-Usbekisch"
+
+#: ../rules/base.xml.in.h:574
+msgid "Spain"
+msgstr "Spanien"
+
+#: ../rules/base.xml.in.h:575
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
+msgstr "Spezialtasten für Server (Strg+Alt+&lt;Taste&gt;)"
+
+#: ../rules/base.xml.in.h:576
+msgid "SrL"
+msgstr "SrL"
+
+#: ../rules/base.xml.in.h:577
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#: ../rules/base.xml.in.h:578
+msgid "Standard"
+msgstr "Standard"
+
+#: ../rules/base.xml.in.h:579
+msgid "Standard (Cedilla)"
+msgstr "Standard (Cedilla)"
+
+#: ../rules/base.xml.in.h:580
+msgid "Standard Phonetic"
+msgstr "Standard, phonetisch"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:582
+msgid "Standard RSTU"
+msgstr "Standard RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:584
+msgid "Standard RSTU on Russian layout"
+msgstr "Standard-RSTU mit russischer Belegung"
+
+#: ../rules/base.xml.in.h:585
+msgid "Sun Type 5/6"
+msgstr "Sun Typ 5/6"
+
+#: ../rules/base.xml.in.h:586
+msgid "Sun dead keys"
+msgstr "Sun-Akzenttasten"
+
+#: ../rules/base.xml.in.h:587
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:588
+msgid "Svdvorak"
+msgstr "Svdvorak"
+
+#: ../rules/base.xml.in.h:589
+msgid "Svk"
+msgstr "Svk"
+
+#: ../rules/base.xml.in.h:590
+msgid "Svn"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:591
+msgid "Swap Ctrl and CapsLock"
+msgstr "Strg-Taste und Feststelltaste vertauschen"
+
+#: ../rules/base.xml.in.h:592
+msgid "Swap ESC and CapsLock"
+msgstr "Esc und Feststelltaste vertauschen"
+
+#: ../rules/base.xml.in.h:593
+msgid "Swe"
+msgstr "Swe"
+
+#: ../rules/base.xml.in.h:594
+msgid "Sweden"
+msgstr "Schweden"
+
+#: ../rules/base.xml.in.h:595
+msgid "Switzerland"
+msgstr "Schweiz"
+
+#: ../rules/base.xml.in.h:596
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:597
+msgid "Syr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:598
+msgid "Syria"
+msgstr "Syrien"
+
+#: ../rules/base.xml.in.h:599
+msgid "Syriac"
+msgstr "Syrisch"
+
+#: ../rules/base.xml.in.h:600
+msgid "Syriac phonetic"
+msgstr "Syrisch (phonetisch)"
+
+#: ../rules/base.xml.in.h:601
+msgid "TIS-820.2538"
+msgstr "Thai (TIS-620)"
+
+#: ../rules/base.xml.in.h:602
+msgid "Tajikistan"
+msgstr "Tadschikistan"
+
+#: ../rules/base.xml.in.h:603
+msgid "Tamil"
+msgstr "Tamilisch"
+
+#: ../rules/base.xml.in.h:604
+msgid "Tamil TAB Typewriter"
+msgstr "Tamilisch (TAB Schreibmaschine)"
+
+#: ../rules/base.xml.in.h:605
+msgid "Tamil TSCII Typewriter"
+msgstr "Tamilisch (TSCII Schreibmaschine)"
+
+#: ../rules/base.xml.in.h:606
+msgid "Tamil Unicode"
+msgstr "Tamilisch (Unicode)"
+
+#: ../rules/base.xml.in.h:607
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
+
+#: ../rules/base.xml.in.h:608
+msgid "Tatar"
+msgstr "Tatarisch"
+
+#: ../rules/base.xml.in.h:609
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../rules/base.xml.in.h:610
+msgid "Tha"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:611
+msgid "Thailand"
+msgstr "Thailand"
+
+#: ../rules/base.xml.in.h:612
+msgid "Tibetan"
+msgstr "Tibetisch"
+
+#: ../rules/base.xml.in.h:613
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibetanisch (mit ASCII-Ziffern)"
+
+#: ../rules/base.xml.in.h:614
+msgid "Tifinagh"
+msgstr "Tifinagh"
+
+#: ../rules/base.xml.in.h:615
+msgid "Tifinagh Alternative"
+msgstr "Tifinagh (alternativ)"
+
+#: ../rules/base.xml.in.h:616
+msgid "Tifinagh Alternative Phonetic"
+msgstr "Tifinagh (alternativ, phonetisch)"
+
+#: ../rules/base.xml.in.h:617
+msgid "Tifinagh Extended"
+msgstr "Tifinagh (erweitert)"
+
+#: ../rules/base.xml.in.h:618
+msgid "Tifinagh Extended Phonetic"
+msgstr "Tifinagh (erweitert, phonetisch)"
+
+#: ../rules/base.xml.in.h:619
+msgid "Tifinagh Phonetic"
+msgstr "Tifinagh (phonetisch)"
+
+#: ../rules/base.xml.in.h:620
+msgid "Tilde (~) variant"
+msgstr "Tilde-Variante (~)"
+
+#: ../rules/base.xml.in.h:621
+msgid "Tjk"
+msgstr "Tjk"
+
+#: ../rules/base.xml.in.h:622
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr "Zur entsprechenden Taste einer Dvorak-Tastatur."
+
+#: ../rules/base.xml.in.h:623
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr "Zur entsprechenden Taste einer Qwerty-Tastatur."
+
+#: ../rules/base.xml.in.h:624
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:625
+msgid "Traditional Phonetic"
+msgstr "Traditionell (phonetisch)"
+
+#: ../rules/base.xml.in.h:626
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: ../rules/base.xml.in.h:627
+msgid "Trust Slimline"
+msgstr "Trust Slimline"
+
+#: ../rules/base.xml.in.h:628
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: ../rules/base.xml.in.h:629
+msgid "Tur"
+msgstr "Tur"
+
+#: ../rules/base.xml.in.h:630
+msgid "Turkey"
+msgstr "Türkei"
+
+#: ../rules/base.xml.in.h:631
+msgid "Turkmenistan"
+msgstr "Turkmenien"
+
+#: ../rules/base.xml.in.h:632
+msgid "Typewriter"
+msgstr "Schreibmaschine"
+
+#: ../rules/base.xml.in.h:633
+msgid "UCW layout (accented letters only)"
+msgstr "UCW-Belegung (nur akzentuierte Buchstaben)"
+
+#: ../rules/base.xml.in.h:634
+msgid "US keyboard with Bosnian digraphs"
+msgstr "US-Tastatur mit bosnischen Digraphen"
+
+#: ../rules/base.xml.in.h:635
+msgid "US keyboard with Bosnian letters"
+msgstr "US-Tastatur mit bosnischen Buchstaben"
+
+#: ../rules/base.xml.in.h:636
+msgid "US keyboard with Croatian digraphs"
+msgstr "US-Tastatur mit kroatischen Digraphen"
+
+#: ../rules/base.xml.in.h:637
+msgid "US keyboard with Croatian letters"
+msgstr "US-Tastatur mit kroatischen Buchstaben"
+
+#: ../rules/base.xml.in.h:638
+msgid "US keyboard with Estonian letters"
+msgstr "US-Tastatur mit estnischen Buchstaben"
+
+#: ../rules/base.xml.in.h:639
+msgid "US keyboard with Lithuanian letters"
+msgstr "US-Tastatur mit litauischen Buchstaben"
+
+#: ../rules/base.xml.in.h:640
+msgid "US keyboard with Slovenian letters"
+msgstr "US-Tastatur mit slowenischen Buchstaben"
+
+#: ../rules/base.xml.in.h:641
+msgid "USA"
+msgstr "USA"
+
+#: ../rules/base.xml.in.h:642
+msgid "Udmurt"
+msgstr "Udmurtisch"
+
+#: ../rules/base.xml.in.h:643
+msgid "Ukr"
+msgstr "Ukr"
+
+#: ../rules/base.xml.in.h:644
+msgid "Ukraine"
+msgstr "Ukraine"
+
+#: ../rules/base.xml.in.h:645
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Unicode-Ergänzungen (Pfeile und mathematische Operatoren)"
+
+#: ../rules/base.xml.in.h:646
+msgid "Unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Unicode-Ergänzungen (Pfeile und mathematische Operatoren). Mathematische Operatoren befinden sich in der Standardebene."
+
+#: ../rules/base.xml.in.h:647
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:648
+msgid "United Kingdom"
+msgstr "Vereinigtes Königreich"
+
+#: ../rules/base.xml.in.h:649
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
+
+#: ../rules/base.xml.in.h:650
+msgid "Urdu, Alternative phonetic"
+msgstr "Urdu, Alternative (phonetisch)"
+
+#: ../rules/base.xml.in.h:651
+msgid "Urdu, Phonetic"
+msgstr "Urdu, phonetisch"
+
+#: ../rules/base.xml.in.h:652
+msgid "Urdu, Winkeys"
+msgstr "Urdu, Windows-Tasten"
+
+#: ../rules/base.xml.in.h:653
+msgid "Use Bosnian digraphs"
+msgstr "Bosnische Digraphen verwenden"
+
+#: ../rules/base.xml.in.h:654
+msgid "Use Croatian digraphs"
+msgstr "Kroatische Digraphen verwenden"
+
+#: ../rules/base.xml.in.h:655
+msgid "Use guillemets for quotes"
+msgstr "Anführungszeichen für Zitate verwenden"
+
+#: ../rules/base.xml.in.h:656
+msgid "Use keyboard LED to show alternative layout"
+msgstr "Tastatur-LED zur Anzeige der alternativen Belegung verwenden"
+
+#: ../rules/base.xml.in.h:657
+msgid "Using space key to input non-breakable space character"
+msgstr "Leertaste zur Eingabe nicht umbrechbarer Zeichen verwenden"
+
+#: ../rules/base.xml.in.h:658
+msgid "Usual space at any level"
+msgstr "Leertaste gibt in jeder Ebene stets Leerzeichen aus"
+
+#: ../rules/base.xml.in.h:659
+msgid "Uzb"
+msgstr "Uzb"
+
+#: ../rules/base.xml.in.h:660
+msgid "Uzbekistan"
+msgstr "Usbekistan"
+
+#: ../rules/base.xml.in.h:661
+msgid "Vietnam"
+msgstr "Vietnam"
+
+#: ../rules/base.xml.in.h:662
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "ViewSonic KU-306 Internet Keyboard"
+
+#: ../rules/base.xml.in.h:663
+msgid "Vnm"
+msgstr "Vnm"
+
+#: ../rules/base.xml.in.h:664
+msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgstr "Wang 724 mit Unicode-Ergänzungen (Pfeile und mathematische Operatoren)"
+
+#: ../rules/base.xml.in.h:665
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Wang 724 mit Unicode-Ergänzungen (Pfeile und mathematische Operatoren). Mathematische Operatoren in der Standardebene"
+
+#: ../rules/base.xml.in.h:666
+msgid "Wang model 724 azerty"
+msgstr "Wang Modell 724 (azerty)"
+
+#: ../rules/base.xml.in.h:667
+msgid "Western"
+msgstr "Westlich"
+
+#: ../rules/base.xml.in.h:668
+msgid "Winbook Model XP5"
+msgstr "Winbook Modell XP5"
+
+#: ../rules/base.xml.in.h:669
+msgid "Winkeys"
+msgstr "Win-Tasten"
+
+#: ../rules/base.xml.in.h:670
+msgid "With &lt;\\|&gt; key"
+msgstr "Mit &lt;\\|&gt;-Taste"
+
+#: ../rules/base.xml.in.h:671
+msgid "With EuroSign on 5"
+msgstr "mit Euro-Symbol auf »5«"
+
+#: ../rules/base.xml.in.h:672
+msgid "With guillemets"
+msgstr "Mit Anführungszeichen"
+
+#: ../rules/base.xml.in.h:673
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
+
+#: ../rules/base.xml.in.h:674
+msgid "Yakut"
+msgstr "Jakutisch"
+
+#: ../rules/base.xml.in.h:675
+msgid "Yoruba"
+msgstr "Joruba"
+
+#: ../rules/base.xml.in.h:676
+msgid "Z and ZHE swapped"
+msgstr "»З« und »Ж« sind vertauscht"
+
+#: ../rules/base.xml.in.h:677
+msgid "Zar"
+msgstr "Zar"
+
+#: ../rules/base.xml.in.h:678
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:679
+msgid "azerty/digits"
+msgstr "azerty/Ziffern"
+
+#: ../rules/base.xml.in.h:680
+msgid "digits"
+msgstr "Ziffern"
+
+#: ../rules/base.xml.in.h:681
+msgid "displaced semicolon and quote (obsolete)"
+msgstr "Falsch platziertes Semikolon und Anführungszeichen (veraltet)"
+
+#: ../rules/base.xml.in.h:682
+msgid "lyx"
+msgstr "LyX"
+
+#: ../rules/base.xml.in.h:683
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:684
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, erweiterter Backslash"
+
+#: ../rules/base.xml.in.h:685
+msgid "qwerty/digits"
+msgstr "qwerty/Ziffern"
+
+#: ../rules/base.xml.in.h:686
+msgid "qwertz"
+msgstr "qwertz"
+
+#~ msgid "Brazilian ABNT2"
+#~ msgstr "ABNT2 (Brasilianisch)"
+
+#~ msgid "Japanese 106-key"
+#~ msgstr "Japanisch (106 Tasten)"
+
+#~ msgid "Kir"
+#~ msgstr "Kir"
+
+#~ msgid "Korean 106-key"
+#~ msgstr "Koreanisch (106 Tasten)"
+
+#~ msgid "Super is mapped to Win keys"
+#~ msgstr "Super ist den Win-Tasten zugeordnet"
+
+#~ msgid "US keyboard with Slovenian digraphs"
+#~ msgstr "US-Tastatur mit slowenischen Digraphen"
+
+#~ msgid "Unicode"
+#~ msgstr "Unicode"
+
+#~ msgid "Use Slovenian digraphs"
+#~ msgstr "Slowenische Digraphen verwenden"
+
+#~ msgid "Add the EuroSign to the 2 key."
+#~ msgstr "Euro-Symbol zur Taste »2« hinzufügen."
+
+#~ msgid "Add the EuroSign to the 4 key."
+#~ msgstr "Euro-Symbol zur Taste »4« hinzufügen."
+
+#~ msgid "Add the EuroSign to the 5 key."
+#~ msgstr "Euro-Symbol zur Taste »5« hinzufügen."
+
+#~ msgid "Add the EuroSign to the E key."
+#~ msgstr "Euro-Symbol zur Taste »E« hinzufügen."
+
+#~ msgid "Alt+Ctrl change layout."
+#~ msgstr "Alt+Strg ändern die Belegung."
+
+#~ msgid "Alt+Shift change layout."
+#~ msgstr "Alt-+Umschalttaste wechselt die Belegung."
+
+#~ msgid "CapsLock LED shows alternative layout."
+#~ msgstr "Feststelltasten-LED zeigt alternative Belegung an."
+
+#~ msgid "CapsLock key changes layout."
+#~ msgstr "Die Feststelltaste ändert die Belegung."
+
+#~ msgid "Ctrl+Shift change layout."
+#~ msgstr "Strg+Umschalttaste ändert die Belegung."
+
+#~ msgid "Hewlett-Packard Internet Keyboard 5181"
+#~ msgstr "Hewlett-Packard Internet Keyboard 5181"
+
+#~ msgid "Hewlett-Packard Internet Keyboard 5185"
+#~ msgstr "Hewlett-Packard Internet Keyboard 5185"
+
+#~ msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+#~ msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
+
+#~ msgid "IBM Rapid Access II (alternate option)"
+#~ msgstr "IBM Rapid Access II (alternative Option)"
+
+#, fuzzy
+#~ msgid "LCtrl+LShift change layout."
+#~ msgstr "Beide Alt-Tasten gleichzeitig ändern die Belegung."
+
+#~ msgid "Layout switching"
+#~ msgstr "Umschalten der Belegung"
+
+#~ msgid "Left Alt key changes layout."
+#~ msgstr "Linke Alt-Taste wechselt die Belegung."
+
+#~ msgid "Left Ctrl key changes layout."
+#~ msgstr "Linke Strg-Taste wechselt die Belegung."
+
+#~ msgid "Left Shift key changes layout."
+#~ msgstr "Linke Umschalt-Taste wechselt die Belegung."
+
+#~ msgid "Left Win-key changes layout."
+#~ msgstr "Linke Windows-Taste wechselt die Belegung."
+
+#, fuzzy
+#~ msgid "Left Win-key is Compose."
+#~ msgstr "Linke Windows-Taste wechselt die Belegung."
+
+#, fuzzy
+#~ msgid "Legacy keypad"
+#~ msgstr "Altes Multi-Threading unterstützen"
+
+#, fuzzy
+#~ msgid "Menu is Compose."
+#~ msgstr "Der Menübaum ist leer"
+
+#~ msgid "Neostyle"
+#~ msgstr "Neostyle"
+
+#~ msgid "NumLock LED shows alternative layout."
+#~ msgstr "NumLock-LED zeigt alternative Belegung an."
+
+#~ msgid "Press Left Alt key to choose 3rd level."
+#~ msgstr "Linke Alt-Taste drücken, um in die dritte Tastaturebene zu gelangen."
+
+#~ msgid "Press Left Win-key to choose 3rd level."
+#~ msgstr "Linke Win-Taste drücken, um in die dritte Tastaturebene zu gelangen."
+
+#~ msgid "Press Right Alt key to choose 3rd level."
+#~ msgstr "Rechte Alt-Taste drücken, um in die dritte Tastaturebene zu gelangen."
+
+#~ msgid "Press Right Ctrl to choose 3rd level."
+#~ msgstr "Rechte Strg-Taste drücken, um in die dritte Tastaturebene zu gelangen."
+
+#~ msgid "Press Right Win-key to choose 3rd level."
+#~ msgstr "Rechte Win-Taste drücken, um in die dritte Tastaturebene zu gelangen."
+
+#~ msgid "Press any of Alt keys to choose 3rd level."
+#~ msgstr "Eine beliebige Alt-Taste drücken, um in die dritte Tastaturebene zu gelangen."
+
+#~ msgid "Press any of Win-keys to choose 3rd level."
+#~ msgstr "Eine beliebige Win-Taste drücken, um in die dritte Tastaturebene zu gelangen."
+
+#, fuzzy
+#~ msgid "Right Alt is Compose."
+#~ msgstr "rechter Rotationszähler ist negativ"
+
+#~ msgid "Right Alt key changes layout."
+#~ msgstr "Rechte Alt-Taste wechselt die Belegung."
+
+#~ msgid "Right Ctrl key changes layout."
+#~ msgstr "Rechte Ctrl-Taste wechselt die Belegung."
+
+#~ msgid "Right Shift key changes layout."
+#~ msgstr "Rechte Umschalt-Taste wechselt die Belegung."
+
+#~ msgid "Right Win-key changes layout."
+#~ msgstr "Rechte Windows-Taste wechselt die Belegung."
+
+#, fuzzy
+#~ msgid "Right Win-key is Compose."
+#~ msgstr "Rechte Windows-Taste wechselt die Belegung."
+
+#~ msgid "ScrollLock LED shows alternative layout."
+#~ msgstr "ScrollLock-LED zeigt alternative Belegung an."
+
+#~ msgid "Shift+CapsLock changes layout."
+#~ msgstr "Umschalt-+Feststelltaste wechselt die Belegung."
+
+#~ msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+#~ msgstr "Tastencodes zweier Tasten vertauschen, wenn Mac-Tastaturen nicht korrekt vom Kernel erkannt werden."
+
+#~ msgid "Third level choosers"
+#~ msgstr "Auswahltasten der dritten Ebene"
+
+#~ msgid "Urdu"
+#~ msgstr "Urdu"
diff --git a/xorg-server/xkbdata.src/po/eo.po b/xorg-server/xkbdata.src/po/eo.po
new file mode 100644
index 000000000..3f9a5c3fd
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/eo.po
@@ -0,0 +1,2817 @@
+# Esperanta traduko por 'xkeyboard-config'
+# Copyright (C) 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the xkeyboard-config package.
+# Felipe Castro <fefcas@gmail.com>, 2008.
+#
+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-01-16 18:26-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
+"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\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 "(Malmoderna) Alternativa"
+
+#: ../rules/base.xml.in.h:3 ../rules/evdev.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "(Malmoderna) Alternativa, senpaŝaj klavoj de 'Sun'"
+
+#: ../rules/base.xml.in.h:4 ../rules/evdev.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "(Malmoderna) Alternativa, forigi senpaŝajn klavojn"
+
+#: ../rules/base.xml.in.h:5 ../rules/evdev.xml.in.h:5
+msgid "101/104 key Compatible"
+msgstr "Kongrua al 101/104 klavoj"
+
+#: ../rules/base.xml.in.h:6 ../rules/evdev.xml.in.h:6
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/komo/Senpaŝaj klavoj"
+
+#: ../rules/base.xml.in.h:7 ../rules/evdev.xml.in.h:7
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/komo/Forigi senpaŝajn klavojn"
+
+#: ../rules/base.xml.in.h:8 ../rules/evdev.xml.in.h:8
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/punkto/Senpaŝaj klavoj"
+
+#: ../rules/base.xml.in.h:9 ../rules/evdev.xml.in.h:9
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/punkto/Forigi senpaŝajn klavojn"
+
+#: ../rules/base.xml.in.h:10 ../rules/evdev.xml.in.h:10
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/komo/Senpaŝaj klavoj"
+
+#: ../rules/base.xml.in.h:11 ../rules/evdev.xml.in.h:11
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/komo/Forigi senpaŝajn klavojn"
+
+#: ../rules/base.xml.in.h:12 ../rules/evdev.xml.in.h:12
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/qwertz/punkto/Senpaŝaj klavoj"
+
+#: ../rules/base.xml.in.h:13 ../rules/evdev.xml.in.h:13
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/punkto/Forigi senpaŝajn klavojn"
+
+#: ../rules/base.xml.in.h:14 ../rules/evdev.xml.in.h:14
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/komo/Senpaŝaj klavoj"
+
+#: ../rules/base.xml.in.h:15 ../rules/evdev.xml.in.h:15
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/komo/Forigi senpaŝajn klavojn"
+
+#: ../rules/base.xml.in.h:16 ../rules/evdev.xml.in.h:16
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/punkto/Senpaŝaj klavoj"
+
+#: ../rules/base.xml.in.h:17 ../rules/evdev.xml.in.h:17
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/punkto/Forigi senpaŝajn klavojn"
+
+#: ../rules/base.xml.in.h:18 ../rules/evdev.xml.in.h:18
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/komo/Senpaŝaj klavoj"
+
+#: ../rules/base.xml.in.h:19 ../rules/evdev.xml.in.h:19
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/komo/Forigi senpaŝajn klavojn"
+
+#: ../rules/base.xml.in.h:20 ../rules/evdev.xml.in.h:20
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/punkto/Senpaŝaj klavoj"
+
+#: ../rules/base.xml.in.h:21 ../rules/evdev.xml.in.h:21
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/punkto/Forigi senpaŝajn klavojn"
+
+#: ../rules/base.xml.in.h:22 ../rules/evdev.xml.in.h:22
+msgid "2"
+msgstr "2"
+
+#: ../rules/base.xml.in.h:23 ../rules/evdev.xml.in.h:23
+msgid "4"
+msgstr "4"
+
+#: ../rules/base.xml.in.h:24 ../rules/evdev.xml.in.h:24
+msgid "5"
+msgstr "5"
+
+#: ../rules/base.xml.in.h:25 ../rules/evdev.xml.in.h:25
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
+
+#: ../rules/base.xml.in.h:26 ../rules/evdev.xml.in.h:26
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
+
+#: ../rules/base.xml.in.h:27 ../rules/evdev.xml.in.h:27
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
+
+#: ../rules/base.xml.in.h:28 ../rules/evdev.xml.in.h:28
+msgid "ACPI Standard"
+msgstr "ACPI Laŭnorma"
+
+#: ../rules/base.xml.in.h:29 ../rules/evdev.xml.in.h:29
+msgid "ATM/phone-style"
+msgstr "ATM/telefon-stilo"
+
+#: ../rules/base.xml.in.h:30 ../rules/evdev.xml.in.h:30
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
+
+#: ../rules/base.xml.in.h:31 ../rules/evdev.xml.in.h:31
+msgid "Acer C300"
+msgstr "Acer C300"
+
+#: ../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 Laptop"
+
+#: ../rules/base.xml.in.h:34 ../rules/evdev.xml.in.h:34
+msgid "Add the standard behavior to Menu key"
+msgstr "Aldoni laŭnorman funkciadon al la klavo Menu"
+
+#: ../rules/base.xml.in.h:35 ../rules/evdev.xml.in.h:35
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "Aldonado de Esperantaj supersignoj"
+
+#: ../rules/base.xml.in.h:36 ../rules/evdev.xml.in.h:36
+msgid "Adding EuroSign to certain keys"
+msgstr "Aldonado de EŭroSigno al iuj klavoj"
+
+#: ../rules/base.xml.in.h:37 ../rules/evdev.xml.in.h:37
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
+
+#: ../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 "Afganujo"
+
+#: ../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 "Albanujo"
+
+#: ../rules/base.xml.in.h:43 ../rules/evdev.xml.in.h:43
+msgid "Alt and Meta are on Alt keys"
+msgstr "Alt kaj Meta estas ĉe la klavoj Alt"
+
+#: ../rules/base.xml.in.h:44 ../rules/evdev.xml.in.h:44
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr "Alt estas mapita al la dekstra klavo Win kaj Super al Menu"
+
+#: ../rules/base.xml.in.h:45 ../rules/evdev.xml.in.h:45
+msgid "Alt+CapsLock"
+msgstr "Alt+CapsLock"
+
+#: ../rules/base.xml.in.h:46 ../rules/evdev.xml.in.h:46
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
+
+#: ../rules/base.xml.in.h:47 ../rules/evdev.xml.in.h:47
+msgid "Alt+Shift"
+msgstr "Alt+Shift"
+
+#: ../rules/base.xml.in.h:48 ../rules/evdev.xml.in.h:48
+msgid "Alt+Space"
+msgstr "Alt+Space"
+
+#: ../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 "Alt/Win, klava funkciado"
+
+#: ../rules/base.xml.in.h:51 ../rules/evdev.xml.in.h:51
+msgid "Alternative"
+msgstr "Alternativa"
+
+#: ../rules/base.xml.in.h:52 ../rules/evdev.xml.in.h:52
+msgid "Alternative Eastern"
+msgstr "Alternativa Orienta"
+
+#: ../rules/base.xml.in.h:53 ../rules/evdev.xml.in.h:53
+msgid "Alternative Phonetic"
+msgstr "Alternativa Fonetika"
+
+#: ../rules/base.xml.in.h:54 ../rules/evdev.xml.in.h:54
+msgid "Alternative international (former us_intl)"
+msgstr "Alternativa internacia (antaŭe us_intl)"
+
+#: ../rules/base.xml.in.h:55 ../rules/evdev.xml.in.h:55
+msgid "Alternative, Sun dead keys"
+msgstr "Alternava, senpaŝaj klavoj de 'Sun'"
+
+#: ../rules/base.xml.in.h:56 ../rules/evdev.xml.in.h:56
+msgid "Alternative, eliminate dead keys"
+msgstr "Alternativa, forigi senpaŝajn klavojn"
+
+#: ../rules/base.xml.in.h:57 ../rules/evdev.xml.in.h:57
+msgid "Alternative, latin-9 only"
+msgstr "Alternativa, nur latin-9"
+
+#: ../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 "Andoro"
+
+#: ../rules/base.xml.in.h:60 ../rules/evdev.xml.in.h:60
+msgid "Any Alt key"
+msgstr "Iu ajn klavo Alt"
+
+#: ../rules/base.xml.in.h:61 ../rules/evdev.xml.in.h:61
+msgid "Any Win key"
+msgstr "Iu ajn klavo Win"
+
+#: ../rules/base.xml.in.h:62 ../rules/evdev.xml.in.h:62
+msgid "Any Win key (while pressed)"
+msgstr "Iu ajn klavo Win (dum premata)"
+
+#: ../rules/base.xml.in.h:63 ../rules/evdev.xml.in.h:63
+msgid "Apostrophe (') variant"
+msgstr "Variaĵo de citilo (')"
+
+#: ../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 Laptop"
+
+#: ../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 "Araba"
+
+#: ../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 "Armenujo"
+
+#: ../rules/base.xml.in.h:70 ../rules/evdev.xml.in.h:70
+msgid "Asturian variant with bottom-dot H and bottom-dot L"
+msgstr "Asturia variaĵo kun subpunktita H kaj subpunktita L"
+
+#: ../rules/base.xml.in.h:71 ../rules/evdev.xml.in.h:71
+msgid "Asus Laptop"
+msgstr "Asus Laptop"
+
+#: ../rules/base.xml.in.h:72 ../rules/evdev.xml.in.h:72
+msgid "At bottom left"
+msgstr "Malsupre maldekstre"
+
+#: ../rules/base.xml.in.h:73 ../rules/evdev.xml.in.h:73
+msgid "At left of 'A'"
+msgstr "Maldekstre de 'A'"
+
+#: ../rules/base.xml.in.h:74 ../rules/evdev.xml.in.h:74
+msgid "Aze"
+msgstr "Aze"
+
+#: ../rules/base.xml.in.h:75 ../rules/evdev.xml.in.h:75
+msgid "Azerbaijan"
+msgstr "Azerbajĝano"
+
+#: ../rules/base.xml.in.h:76 ../rules/evdev.xml.in.h:76
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 sendrata Internet Keyboard"
+
+#: ../rules/base.xml.in.h:77 ../rules/evdev.xml.in.h:77
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:78 ../rules/evdev.xml.in.h:78
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: ../rules/base.xml.in.h:79 ../rules/evdev.xml.in.h:79
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:80 ../rules/evdev.xml.in.h:80
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
+
+#: ../rules/base.xml.in.h:81 ../rules/evdev.xml.in.h:81
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:82 ../rules/evdev.xml.in.h:82
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:83 ../rules/evdev.xml.in.h:83
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:84 ../rules/evdev.xml.in.h:84
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
+
+#: ../rules/base.xml.in.h:85 ../rules/evdev.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 ../rules/evdev.xml.in.h:86
+msgid "Ban"
+msgstr "Ban"
+
+#: ../rules/base.xml.in.h:87 ../rules/evdev.xml.in.h:87
+msgid "Bangladesh"
+msgstr "Bangladeŝo"
+
+#: ../rules/base.xml.in.h:88 ../rules/evdev.xml.in.h:88
+msgid "Bel"
+msgstr "Bel"
+
+#: ../rules/base.xml.in.h:89 ../rules/evdev.xml.in.h:89
+msgid "Belarus"
+msgstr "Belorusujo"
+
+#: ../rules/base.xml.in.h:90 ../rules/evdev.xml.in.h:90
+msgid "Belgium"
+msgstr "Belgujo"
+
+#: ../rules/base.xml.in.h:91 ../rules/evdev.xml.in.h:91
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
+
+#: ../rules/base.xml.in.h:92 ../rules/evdev.xml.in.h:92
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:93 ../rules/evdev.xml.in.h:93
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
+
+#: ../rules/base.xml.in.h:94 ../rules/evdev.xml.in.h:94
+msgid "Bengali"
+msgstr "Bengala"
+
+#: ../rules/base.xml.in.h:95 ../rules/evdev.xml.in.h:95
+msgid "Bengali Probhat"
+msgstr "Bengala Probhat"
+
+#: ../rules/base.xml.in.h:96 ../rules/evdev.xml.in.h:96
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Bepo, komforteca, Dvorake"
+
+#: ../rules/base.xml.in.h:97 ../rules/evdev.xml.in.h:97
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Bepo, komforteca, Dvorake, nur latin-9"
+
+#: ../rules/base.xml.in.h:98 ../rules/evdev.xml.in.h:98
+msgid "Bgr"
+msgstr "Bgr"
+
+#: ../rules/base.xml.in.h:99 ../rules/evdev.xml.in.h:99
+msgid "Bhu"
+msgstr "Bhu"
+
+#: ../rules/base.xml.in.h:100 ../rules/evdev.xml.in.h:100
+msgid "Bhutan"
+msgstr "Bhutano"
+
+#: ../rules/base.xml.in.h:101 ../rules/evdev.xml.in.h:101
+msgid "Biblical Hebrew (Tiro)"
+msgstr "Biblia Hebrea (Tiro)"
+
+#: ../rules/base.xml.in.h:102 ../rules/evdev.xml.in.h:102
+msgid "Bih"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:103 ../rules/evdev.xml.in.h:103
+msgid "Blr"
+msgstr "Blr"
+
+#: ../rules/base.xml.in.h:104 ../rules/evdev.xml.in.h:104
+msgid "Bosnia and Herzegovina"
+msgstr "Bosnujo kaj Hercegovino"
+
+#: ../rules/base.xml.in.h:105 ../rules/evdev.xml.in.h:105
+msgid "Both Alt keys together"
+msgstr "Ambaŭ klavoj Alt kune"
+
+#: ../rules/base.xml.in.h:106 ../rules/evdev.xml.in.h:106
+msgid "Both Ctrl keys together"
+msgstr "Ambaŭ klavoj Ctrl kune"
+
+#: ../rules/base.xml.in.h:107 ../rules/evdev.xml.in.h:107
+msgid "Both Shift keys together"
+msgstr "Ambaŭ klavoj Shift kune"
+
+#: ../rules/base.xml.in.h:108 ../rules/evdev.xml.in.h:108
+msgid "Bra"
+msgstr "Bra"
+
+#: ../rules/base.xml.in.h:109 ../rules/evdev.xml.in.h:109
+msgid "Braille"
+msgstr "Brajla"
+
+#: ../rules/base.xml.in.h:110 ../rules/evdev.xml.in.h:110
+msgid "Brazil"
+msgstr "Brazilo"
+
+#: ../rules/base.xml.in.h:111 ../rules/evdev.xml.in.h:111
+msgid "Brazilian ABNT2"
+msgstr "Brazila ABNT2"
+
+#: ../rules/base.xml.in.h:112 ../rules/evdev.xml.in.h:112
+msgid "Breton"
+msgstr "Bretona"
+
+#: ../rules/base.xml.in.h:113 ../rules/evdev.xml.in.h:113
+msgid "Brl"
+msgstr "Brl"
+
+#: ../rules/base.xml.in.h:114 ../rules/evdev.xml.in.h:114
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
+
+#: ../rules/base.xml.in.h:115 ../rules/evdev.xml.in.h:115
+msgid "Buckwalter"
+msgstr "Buckwalter"
+
+#: ../rules/base.xml.in.h:116 ../rules/evdev.xml.in.h:116
+msgid "Bulgaria"
+msgstr "Bulgarujo"
+
+#: ../rules/base.xml.in.h:117 ../rules/evdev.xml.in.h:117
+msgid "CRULP"
+msgstr "CRULP"
+
+#: ../rules/base.xml.in.h:118 ../rules/evdev.xml.in.h:118
+msgid "Cambodia"
+msgstr "Kamboĝo"
+
+#: ../rules/base.xml.in.h:119 ../rules/evdev.xml.in.h:119
+msgid "Can"
+msgstr "Can"
+
+#: ../rules/base.xml.in.h:120 ../rules/evdev.xml.in.h:120
+msgid "Canada"
+msgstr "Kanado"
+
+#: ../rules/base.xml.in.h:121 ../rules/evdev.xml.in.h:121
+msgid "Caps Lock"
+msgstr "Caps Lock"
+
+#: ../rules/base.xml.in.h:122 ../rules/evdev.xml.in.h:122
+msgid "CapsLock"
+msgstr "CapsLock"
+
+#: ../rules/base.xml.in.h:123 ../rules/evdev.xml.in.h:123
+msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
+msgstr "CapsLock (al la unua aranĝo), Shift+CapsLock (al la lasta aranĝo)"
+
+#: ../rules/base.xml.in.h:124 ../rules/evdev.xml.in.h:124
+msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
+msgstr "CapsLock (dum premata), Alt+CapsLock restarigas la originalan uskligon"
+
+#: ../rules/base.xml.in.h:125 ../rules/evdev.xml.in.h:125
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
+msgstr "CapsLock funkcias kiel Shift kun ŝlosado. Shift \"paŭzas\" CapsLock"
+
+#: ../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 "CapsLock funkcias kiel Shift kun ŝlosado. Shift ne influas CapsLock"
+
+#: ../rules/base.xml.in.h:127 ../rules/evdev.xml.in.h:127
+msgid "CapsLock key behavior"
+msgstr "Funkciado de la klavo CapsLock"
+
+#: ../rules/base.xml.in.h:128 ../rules/evdev.xml.in.h:128
+msgid "CapsLock toggles Shift so all keys are affected"
+msgstr "CapsLock alternigas Shift, influante ĉiujn klavojn"
+
+#: ../rules/base.xml.in.h:129 ../rules/evdev.xml.in.h:129
+msgid "CapsLock toggles normal capitalization of alphabetic characters"
+msgstr "CapsLock alternigas la ordinaran uskligon de alfabetaj signoj"
+
+#: ../rules/base.xml.in.h:130 ../rules/evdev.xml.in.h:130
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
+msgstr "CapsLock uzas internan uskligon. Shift \"paŭzas\" CapsLock"
+
+#: ../rules/base.xml.in.h:131 ../rules/evdev.xml.in.h:131
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
+msgstr "CapsLock uzas internan uskligon. Shift ne influas CapsLock"
+
+#: ../rules/base.xml.in.h:132 ../rules/evdev.xml.in.h:132
+msgid "Catalan variant with middle-dot L"
+msgstr "Kataluna variaĵo kun centro-punktita L"
+
+#: ../rules/base.xml.in.h:133 ../rules/evdev.xml.in.h:133
+msgid "Cedilla"
+msgstr "Subhoketo"
+
+#: ../rules/base.xml.in.h:134 ../rules/evdev.xml.in.h:134
+msgid "Che"
+msgstr "Che"
+
+#: ../rules/base.xml.in.h:135 ../rules/evdev.xml.in.h:135
+msgid "Cherokee"
+msgstr "Ĉeroka"
+
+#: ../rules/base.xml.in.h:136 ../rules/evdev.xml.in.h:136
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:137 ../rules/evdev.xml.in.h:137
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (alternativa opcio)"
+
+#: ../rules/base.xml.in.h:138 ../rules/evdev.xml.in.h:138
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:139 ../rules/evdev.xml.in.h:139
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Expert"
+
+#: ../rules/base.xml.in.h:140 ../rules/evdev.xml.in.h:140
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:141 ../rules/evdev.xml.in.h:141
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
+
+#: ../rules/base.xml.in.h:142 ../rules/evdev.xml.in.h:142
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard"
+
+#: ../rules/base.xml.in.h:143 ../rules/evdev.xml.in.h:143
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:144 ../rules/evdev.xml.in.h:144
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
+
+#: ../rules/base.xml.in.h:145 ../rules/evdev.xml.in.h:145
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0420"
+
+#: ../rules/base.xml.in.h:146 ../rules/evdev.xml.in.h:146
+msgid "China"
+msgstr "Ĉinujo"
+
+#: ../rules/base.xml.in.h:147 ../rules/evdev.xml.in.h:147
+msgid "Chuvash"
+msgstr "Ĉuvaŝa"
+
+#: ../rules/base.xml.in.h:148 ../rules/evdev.xml.in.h:148
+msgid "Chuvash Latin"
+msgstr "Ĉuvaŝa Latine"
+
+#: ../rules/base.xml.in.h:149 ../rules/evdev.xml.in.h:149
+msgid "Classic"
+msgstr "Klasike"
+
+#: ../rules/base.xml.in.h:150 ../rules/evdev.xml.in.h:150
+msgid "Classic Dvorak"
+msgstr "Klasika Dvorako"
+
+#: ../rules/base.xml.in.h:151 ../rules/evdev.xml.in.h:151
+msgid "Classmate PC"
+msgstr "Classmate PC"
+
+#: ../rules/base.xml.in.h:152 ../rules/evdev.xml.in.h:152
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:153 ../rules/evdev.xml.in.h:153
+msgid "Colemak"
+msgstr "Colemak"
+
+#: ../rules/base.xml.in.h:154 ../rules/evdev.xml.in.h:154
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
+
+#: ../rules/base.xml.in.h:155 ../rules/evdev.xml.in.h:155
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 klavoj)"
+
+#: ../rules/base.xml.in.h:156 ../rules/evdev.xml.in.h:156
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 klavoj)"
+
+#: ../rules/base.xml.in.h:157 ../rules/evdev.xml.in.h:157
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 klavoj)"
+
+#: ../rules/base.xml.in.h:158 ../rules/evdev.xml.in.h:158
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
+
+#: ../rules/base.xml.in.h:159 ../rules/evdev.xml.in.h:159
+msgid "Compose key position"
+msgstr "Pozicio de la klavo 'Compose'"
+
+#: ../rules/base.xml.in.h:160 ../rules/evdev.xml.in.h:160
+msgid "Congo, Democratic Republic of the"
+msgstr "Kongo, Demokratia Respubliko de"
+
+#: ../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 "'Control' estas mapita al klavoj 'Alt', 'Alt' estas mapita al klavoj 'Win'"
+
+#: ../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 "'Control' estas mapita al klavoj 'Win' (kaj al la kutimaj klavoj 'Ctrl')"
+
+#: ../rules/base.xml.in.h:163 ../rules/evdev.xml.in.h:163
+msgid "Croatia"
+msgstr "Kroata"
+
+#: ../rules/base.xml.in.h:164 ../rules/evdev.xml.in.h:164
+msgid "Ctrl key position"
+msgstr "Pozicio de la klavo 'Ctrl'"
+
+#: ../rules/base.xml.in.h:165 ../rules/evdev.xml.in.h:165
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
+
+#: ../rules/base.xml.in.h:166 ../rules/evdev.xml.in.h:166
+msgid "Cyrillic"
+msgstr "Cirila"
+
+#: ../rules/base.xml.in.h:167 ../rules/evdev.xml.in.h:167
+msgid "Cyrillic with guillemets"
+msgstr "Cirila kun angul-citiloj"
+
+#: ../rules/base.xml.in.h:168 ../rules/evdev.xml.in.h:168
+msgid "Cyrillic, Z and ZHE swapped"
+msgstr "Cirila, Z kaj ZHE interŝanĝita"
+
+#: ../rules/base.xml.in.h:169 ../rules/evdev.xml.in.h:169
+msgid "Cze"
+msgstr "Cze"
+
+#: ../rules/base.xml.in.h:170 ../rules/evdev.xml.in.h:170
+msgid "Czechia"
+msgstr "Ĉeĥa"
+
+#: ../rules/base.xml.in.h:171 ../rules/evdev.xml.in.h:171
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:172 ../rules/evdev.xml.in.h:172
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:173 ../rules/evdev.xml.in.h:173
+msgid "Dan"
+msgstr "Dan"
+
+#: ../rules/base.xml.in.h:174 ../rules/evdev.xml.in.h:174
+msgid "Dead acute"
+msgstr "Senpaŝa dekstra korno"
+
+#: ../rules/base.xml.in.h:175 ../rules/evdev.xml.in.h:175
+msgid "Dead grave acute"
+msgstr "Senpaŝa maldekstra korno"
+
+#: ../rules/base.xml.in.h:176 ../rules/evdev.xml.in.h:176
+msgid "Default numeric keypad keys"
+msgstr "Implicitaj ciferoj en cifer-klavaro"
+
+#: ../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 "Dell 101-klava PC"
+
+#: ../rules/base.xml.in.h:179 ../rules/evdev.xml.in.h:179
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:180 ../rules/evdev.xml.in.h:180
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell Laptop/notebook Precision M series"
+
+#: ../rules/base.xml.in.h:181 ../rules/evdev.xml.in.h:181
+msgid "Dell Latitude series laptop"
+msgstr "Dell Latitude series laptop"
+
+#: ../rules/base.xml.in.h:182 ../rules/evdev.xml.in.h:182
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
+
+#: ../rules/base.xml.in.h:183 ../rules/evdev.xml.in.h:183
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
+
+#: ../rules/base.xml.in.h:184 ../rules/evdev.xml.in.h:184
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
+
+#: ../rules/base.xml.in.h:185 ../rules/evdev.xml.in.h:185
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Dell USB Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:186 ../rules/evdev.xml.in.h:186
+msgid "Denmark"
+msgstr "Danujo"
+
+#: ../rules/base.xml.in.h:187 ../rules/evdev.xml.in.h:187
+msgid "Deu"
+msgstr "Deu"
+
+#: ../rules/base.xml.in.h:188 ../rules/evdev.xml.in.h:188
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:189 ../rules/evdev.xml.in.h:189
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 serio"
+
+#: ../rules/base.xml.in.h:190 ../rules/evdev.xml.in.h:190
+msgid "Dvorak"
+msgstr "Dvorako"
+
+#: ../rules/base.xml.in.h:191 ../rules/evdev.xml.in.h:191
+msgid "Dvorak (UK Punctuation)"
+msgstr "Dvorako (Interpunkcio de UK)"
+
+#: ../rules/base.xml.in.h:192 ../rules/evdev.xml.in.h:192
+msgid "Dvorak international"
+msgstr "Internacia Dvorako"
+
+#: ../rules/base.xml.in.h:193 ../rules/evdev.xml.in.h:193
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr "Dvorako, Polaj citiloj ĉe la klavo \"1/!\""
+
+#: ../rules/base.xml.in.h:194 ../rules/evdev.xml.in.h:194
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorako, Polaj citiloj ĉe citila klavo"
+
+#: ../rules/base.xml.in.h:195 ../rules/evdev.xml.in.h:195
+msgid "E"
+msgstr "E"
+
+#: ../rules/base.xml.in.h:196 ../rules/evdev.xml.in.h:196
+msgid "Eastern"
+msgstr "Orienta"
+
+#: ../rules/base.xml.in.h:197 ../rules/evdev.xml.in.h:197
+msgid "Eliminate dead keys"
+msgstr "Forigi senpaŝajn klavojn"
+
+#: ../rules/base.xml.in.h:198 ../rules/evdev.xml.in.h:198
+msgid "Enable extra typographic characters"
+msgstr "Ebligi kromajn tipografiajn signojn"
+
+#: ../rules/base.xml.in.h:199 ../rules/evdev.xml.in.h:199
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:200 ../rules/evdev.xml.in.h:200
+msgid "Epo"
+msgstr "Epo"
+
+#: ../rules/base.xml.in.h:201 ../rules/evdev.xml.in.h:201
+msgid "Ergonomic"
+msgstr "Ergonomia"
+
+#: ../rules/base.xml.in.h:202 ../rules/evdev.xml.in.h:202
+msgid "Esp"
+msgstr "Esp"
+
+#: ../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 "Estonujo"
+
+#: ../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 "Etiopujo"
+
+#: ../rules/base.xml.in.h:208 ../rules/evdev.xml.in.h:208
+msgid "Evdev-managed keyboard"
+msgstr "Klavaro traktita per 'Evdev'"
+
+#: ../rules/base.xml.in.h:209 ../rules/evdev.xml.in.h:209
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:210 ../rules/evdev.xml.in.h:210
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../rules/base.xml.in.h:211 ../rules/evdev.xml.in.h:211
+msgid "Extended"
+msgstr "Etendite"
+
+#: ../rules/base.xml.in.h:212 ../rules/evdev.xml.in.h:212
+msgid "Extended Backslash"
+msgstr "Etendita Malsuprenstreko"
+
+#: ../rules/base.xml.in.h:213 ../rules/evdev.xml.in.h:213
+msgid "F-letter (F) variant"
+msgstr "F-litero (F) variaĵo"
+
+#: ../rules/base.xml.in.h:214 ../rules/evdev.xml.in.h:214
+msgid "FL90"
+msgstr "FL90"
+
+#: ../rules/base.xml.in.h:215 ../rules/evdev.xml.in.h:215
+msgid "Fao"
+msgstr "Fao"
+
+#: ../rules/base.xml.in.h:216 ../rules/evdev.xml.in.h:216
+msgid "Faroe Islands"
+msgstr "Ferooj"
+
+#: ../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 "Finlando"
+
+#. 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 "Kvar-nivela klavo kun abstraktaj apartigiloj"
+
+#: ../rules/base.xml.in.h:222 ../rules/evdev.xml.in.h:222
+msgid "Four-level key with comma"
+msgstr "Kvar-nivela klavo kun komo"
+
+#: ../rules/base.xml.in.h:223 ../rules/evdev.xml.in.h:223
+msgid "Four-level key with dot"
+msgstr "Kvar-nivela klavo kun punkto"
+
+#: ../rules/base.xml.in.h:224 ../rules/evdev.xml.in.h:224
+msgid "Four-level key with dot, latin-9 restriction"
+msgstr "Kvar-nivela klavo kun punkto, limigite al latin-9"
+
+#: ../rules/base.xml.in.h:225 ../rules/evdev.xml.in.h:225
+msgid "Four-level key with momayyez"
+msgstr "Kvar-nivela klavo kun 'momayyez'"
+
+#: ../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 "Francujo"
+
+#: ../rules/base.xml.in.h:228 ../rules/evdev.xml.in.h:228
+msgid "French"
+msgstr "Franca"
+
+#: ../rules/base.xml.in.h:229 ../rules/evdev.xml.in.h:229
+msgid "French (Macintosh)"
+msgstr "Franca (Macintosh)"
+
+#: ../rules/base.xml.in.h:230 ../rules/evdev.xml.in.h:230
+msgid "French (legacy)"
+msgstr "Franca (malmoderna)"
+
+#: ../rules/base.xml.in.h:231 ../rules/evdev.xml.in.h:231
+msgid "French Dvorak"
+msgstr "Franca Dvorako"
+
+#: ../rules/base.xml.in.h:232 ../rules/evdev.xml.in.h:232
+msgid "French, Sun dead keys"
+msgstr "Franca, senpaŝaj klavoj de 'Sun'"
+
+#: ../rules/base.xml.in.h:233 ../rules/evdev.xml.in.h:233
+msgid "French, eliminate dead keys"
+msgstr "Franca, forigi senpaŝajn klavojn"
+
+#: ../rules/base.xml.in.h:234 ../rules/evdev.xml.in.h:234
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Tekokomputilo Fujitsu-Siemens Computers AMILO"
+
+#: ../rules/base.xml.in.h:235 ../rules/evdev.xml.in.h:235
+msgid "Fula"
+msgstr "Fulba"
+
+#: ../rules/base.xml.in.h:236 ../rules/evdev.xml.in.h:236
+msgid "GBr"
+msgstr "GBr"
+
+#: ../rules/base.xml.in.h:237 ../rules/evdev.xml.in.h:237
+msgid "Ga"
+msgstr "Ga"
+
+#: ../rules/base.xml.in.h:238 ../rules/evdev.xml.in.h:238
+msgid "Generic 101-key PC"
+msgstr "Ĝenerala 101-klava PC"
+
+#: ../rules/base.xml.in.h:239 ../rules/evdev.xml.in.h:239
+msgid "Generic 102-key (Intl) PC"
+msgstr "Ĝenerala 102-klava (Intl) PC"
+
+#: ../rules/base.xml.in.h:240 ../rules/evdev.xml.in.h:240
+msgid "Generic 104-key PC"
+msgstr "Ĝenerala 104-klava PC"
+
+#: ../rules/base.xml.in.h:241 ../rules/evdev.xml.in.h:241
+msgid "Generic 105-key (Intl) PC"
+msgstr "Ĝenerala 105-klava (Intl) PC"
+
+#: ../rules/base.xml.in.h:242 ../rules/evdev.xml.in.h:242
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:243 ../rules/evdev.xml.in.h:243
+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:244 ../rules/evdev.xml.in.h:244
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:245 ../rules/evdev.xml.in.h:245
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:246 ../rules/evdev.xml.in.h:246
+msgid "Geo"
+msgstr "Geo"
+
+#: ../rules/base.xml.in.h:247 ../rules/evdev.xml.in.h:247
+msgid "Georgia"
+msgstr "Kartvelujo"
+
+#: ../rules/base.xml.in.h:248 ../rules/evdev.xml.in.h:248
+msgid "Georgian"
+msgstr "Kartvela"
+
+#: ../rules/base.xml.in.h:249 ../rules/evdev.xml.in.h:249
+msgid "Georgian AZERTY Tskapo"
+msgstr "Kartvela AZERTY Tskapo"
+
+#: ../rules/base.xml.in.h:250 ../rules/evdev.xml.in.h:250
+msgid "German (Macintosh)"
+msgstr "Germana (Macintosh)"
+
+#: ../rules/base.xml.in.h:251 ../rules/evdev.xml.in.h:251
+msgid "German, Sun dead keys"
+msgstr "Germana, senpaŝaj klavoj de 'Sun'"
+
+#: ../rules/base.xml.in.h:252 ../rules/evdev.xml.in.h:252
+msgid "German, eliminate dead keys"
+msgstr "Germana, forigi senpaŝajn klavojn"
+
+#: ../rules/base.xml.in.h:253 ../rules/evdev.xml.in.h:253
+msgid "Germany"
+msgstr "Germanujo"
+
+#: ../rules/base.xml.in.h:254 ../rules/evdev.xml.in.h:254
+msgid "Gha"
+msgstr "Gha"
+
+#: ../rules/base.xml.in.h:255 ../rules/evdev.xml.in.h:255
+msgid "Ghana"
+msgstr "Ganao"
+
+#: ../rules/base.xml.in.h:256 ../rules/evdev.xml.in.h:256
+msgid "Gre"
+msgstr "Gre"
+
+#: ../rules/base.xml.in.h:257 ../rules/evdev.xml.in.h:257
+msgid "Greece"
+msgstr "Grekujo"
+
+#: ../rules/base.xml.in.h:258 ../rules/evdev.xml.in.h:258
+msgid "Group toggle on multiply/divide key"
+msgstr "Grup-alternado en la klavo multipliko/divido"
+
+#: ../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 "Gvineo"
+
+#: ../rules/base.xml.in.h:261 ../rules/evdev.xml.in.h:261
+msgid "Gujarati"
+msgstr "Guĝarata"
+
+#: ../rules/base.xml.in.h:262 ../rules/evdev.xml.in.h:262
+msgid "Gurmukhi"
+msgstr "Gurmukia"
+
+#: ../rules/base.xml.in.h:263 ../rules/evdev.xml.in.h:263
+msgid "Gurmukhi Jhelum"
+msgstr "Gurmukia de Jhelum"
+
+#: ../rules/base.xml.in.h:264 ../rules/evdev.xml.in.h:264
+msgid "Gyration"
+msgstr "Gyration"
+
+#: ../rules/base.xml.in.h:265 ../rules/evdev.xml.in.h:265
+msgid "Happy Hacking Keyboard"
+msgstr "Happy Hacking Keyboard"
+
+#: ../rules/base.xml.in.h:266 ../rules/evdev.xml.in.h:266
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Happy Hacking Keyboard por Mac"
+
+#: ../rules/base.xml.in.h:267 ../rules/evdev.xml.in.h:267
+msgid "Hausa"
+msgstr "Haŭsa"
+
+#: ../rules/base.xml.in.h:268 ../rules/evdev.xml.in.h:268
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
+
+#: ../rules/base.xml.in.h:269 ../rules/evdev.xml.in.h:269
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:270 ../rules/evdev.xml.in.h:270
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:271 ../rules/evdev.xml.in.h:271
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:272 ../rules/evdev.xml.in.h:272
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:273 ../rules/evdev.xml.in.h:273
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:274 ../rules/evdev.xml.in.h:274
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:275 ../rules/evdev.xml.in.h:275
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:276 ../rules/evdev.xml.in.h:276
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
+
+#: ../rules/base.xml.in.h:277 ../rules/evdev.xml.in.h:277
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-250x Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:278 ../rules/evdev.xml.in.h:278
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
+
+#: ../rules/base.xml.in.h:279 ../rules/evdev.xml.in.h:279
+msgid "Hexadecimal"
+msgstr "Deksesume"
+
+#: ../rules/base.xml.in.h:280 ../rules/evdev.xml.in.h:280
+msgid "Hindi Bolnagri"
+msgstr "Hinda per Bolnagri"
+
+#: ../rules/base.xml.in.h:281 ../rules/evdev.xml.in.h:281
+msgid "Homophonic"
+msgstr "Homofonia"
+
+#: ../rules/base.xml.in.h:282 ../rules/evdev.xml.in.h:282
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:283 ../rules/evdev.xml.in.h:283
+msgid "Hrv"
+msgstr "Hrv"
+
+#: ../rules/base.xml.in.h:284 ../rules/evdev.xml.in.h:284
+msgid "Hun"
+msgstr "Hun"
+
+#: ../rules/base.xml.in.h:285 ../rules/evdev.xml.in.h:285
+msgid "Hungary"
+msgstr "Hungarujo"
+
+#: ../rules/base.xml.in.h:286 ../rules/evdev.xml.in.h:286
+msgid "Hyper is mapped to Win-keys"
+msgstr "'Hyper' estas mapita al la klavoj 'Win'"
+
+#: ../rules/base.xml.in.h:287 ../rules/evdev.xml.in.h:287
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:288 ../rules/evdev.xml.in.h:288
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:289 ../rules/evdev.xml.in.h:289
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:290 ../rules/evdev.xml.in.h:290
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
+
+#: ../rules/base.xml.in.h:291 ../rules/evdev.xml.in.h:291
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:292 ../rules/evdev.xml.in.h:292
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+
+#: ../rules/base.xml.in.h:293 ../rules/evdev.xml.in.h:293
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
+
+#: ../rules/base.xml.in.h:294 ../rules/evdev.xml.in.h:294
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+
+#: ../rules/base.xml.in.h:295 ../rules/evdev.xml.in.h:295
+msgid "ISO Alternate"
+msgstr "Alternativa ISO"
+
+#: ../rules/base.xml.in.h:296 ../rules/evdev.xml.in.h:296
+msgid "Iceland"
+msgstr "Islando"
+
+#: ../rules/base.xml.in.h:297 ../rules/evdev.xml.in.h:297
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../rules/base.xml.in.h:298 ../rules/evdev.xml.in.h:298
+msgid "Include dead tilde"
+msgstr "Inkluzivi senpaŝan tildon"
+
+#: ../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 "Bharato"
+
+#: ../rules/base.xml.in.h:301 ../rules/evdev.xml.in.h:301
+msgid "International (AltGr dead keys)"
+msgstr "Internacia (senpaŝaj klavoj per 'AltGr')"
+
+#: ../rules/base.xml.in.h:302 ../rules/evdev.xml.in.h:302
+msgid "International (with dead keys)"
+msgstr "Internacia (senpaŝaj klavoj)"
+
+#: ../rules/base.xml.in.h:303 ../rules/evdev.xml.in.h:303
+msgid "Inuktitut"
+msgstr "Inuita"
+
+#: ../rules/base.xml.in.h:304 ../rules/evdev.xml.in.h:304
+msgid "Iran"
+msgstr "Irano"
+
+#: ../rules/base.xml.in.h:305 ../rules/evdev.xml.in.h:305
+msgid "Iraq"
+msgstr "Irako"
+
+#: ../rules/base.xml.in.h:306 ../rules/evdev.xml.in.h:306
+msgid "Ireland"
+msgstr "Irlando"
+
+#: ../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 "Irq"
+
+#: ../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 "Israelo"
+
+#: ../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 "Italujo"
+
+#: ../rules/base.xml.in.h:315 ../rules/evdev.xml.in.h:315
+msgid "Japan"
+msgstr "Nipono"
+
+#: ../rules/base.xml.in.h:316 ../rules/evdev.xml.in.h:316
+msgid "Japan (PC-98xx Series)"
+msgstr "Nipono (Serio PC-98xx)"
+
+#: ../rules/base.xml.in.h:317 ../rules/evdev.xml.in.h:317
+msgid "Japanese 106-key"
+msgstr "Nipono 106-klava"
+
+#: ../rules/base.xml.in.h:318 ../rules/evdev.xml.in.h:318
+msgid "Japanese keyboard options"
+msgstr "Opcioj de nipona klavaro"
+
+#: ../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 "Kalmyk"
+
+#: ../rules/base.xml.in.h:321 ../rules/evdev.xml.in.h:321
+msgid "Kana"
+msgstr "Kanao"
+
+#: ../rules/base.xml.in.h:322 ../rules/evdev.xml.in.h:322
+msgid "Kana Lock key is locking"
+msgstr "Kanaa klavo 'Lock' ŝlosigas"
+
+#: ../rules/base.xml.in.h:323 ../rules/evdev.xml.in.h:323
+msgid "Kannada"
+msgstr "Kanara"
+
+#: ../rules/base.xml.in.h:324 ../rules/evdev.xml.in.h:324
+msgid "Kashubian"
+msgstr "Kaŝuba"
+
+#: ../rules/base.xml.in.h:325 ../rules/evdev.xml.in.h:325
+msgid "Kaz"
+msgstr "Kaz"
+
+#: ../rules/base.xml.in.h:326 ../rules/evdev.xml.in.h:326
+msgid "Kazakh with Russian"
+msgstr "Kazaĥa kaj Rusa"
+
+#: ../rules/base.xml.in.h:327 ../rules/evdev.xml.in.h:327
+msgid "Kazakhstan"
+msgstr "Kazaĥujo"
+
+#: ../rules/base.xml.in.h:328 ../rules/evdev.xml.in.h:328
+msgid "Key to choose 3rd level"
+msgstr "Klavo por elekti 3-an nivelon"
+
+#: ../rules/base.xml.in.h:329 ../rules/evdev.xml.in.h:329
+msgid "Key(s) to change layout"
+msgstr "Klavo(j) por ŝanĝi la aranĝon"
+
+#: ../rules/base.xml.in.h:330 ../rules/evdev.xml.in.h:330
+msgid "Keypad"
+msgstr "Cifer-klavaro"
+
+#: ../rules/base.xml.in.h:331 ../rules/evdev.xml.in.h:331
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:332 ../rules/evdev.xml.in.h:332
+msgid "Khm"
+msgstr "Khm"
+
+#: ../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 "Komia"
+
+#: ../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 "Koreujo, Respubliko de"
+
+#: ../rules/base.xml.in.h:337 ../rules/evdev.xml.in.h:337
+msgid "Korean 106-key"
+msgstr "Korea 106-klava"
+
+#: ../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 "Kurda, (F)"
+
+#: ../rules/base.xml.in.h:340 ../rules/evdev.xml.in.h:340
+msgid "Kurdish, Arabic-Latin"
+msgstr "Kurda, Araba-Latina"
+
+#: ../rules/base.xml.in.h:341 ../rules/evdev.xml.in.h:341
+msgid "Kurdish, Latin Alt-Q"
+msgstr "Kurda, Latina Alt-Q"
+
+#: ../rules/base.xml.in.h:342 ../rules/evdev.xml.in.h:342
+msgid "Kurdish, Latin Q"
+msgstr "Kurda, Lania Q"
+
+#: ../rules/base.xml.in.h:343 ../rules/evdev.xml.in.h:343
+msgid "Kyrgyzstan"
+msgstr "Kirgizujo"
+
+#: ../rules/base.xml.in.h:344 ../rules/evdev.xml.in.h:344
+msgid "LAm"
+msgstr "LAm"
+
+#: ../rules/base.xml.in.h:345 ../rules/evdev.xml.in.h:345
+msgid "LEKP"
+msgstr "LEKP"
+
+#: ../rules/base.xml.in.h:346 ../rules/evdev.xml.in.h:346
+msgid "LEKPa"
+msgstr "LEKPa"
+
+#: ../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 "Laoso"
+
+#: ../rules/base.xml.in.h:349 ../rules/evdev.xml.in.h:349
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+
+#: ../rules/base.xml.in.h:350 ../rules/evdev.xml.in.h:350
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+
+#: ../rules/base.xml.in.h:351 ../rules/evdev.xml.in.h:351
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Laptop/notebook eMachines m68xx"
+
+#: ../rules/base.xml.in.h:352 ../rules/evdev.xml.in.h:352
+msgid "Latin"
+msgstr "Latineca"
+
+#: ../rules/base.xml.in.h:353 ../rules/evdev.xml.in.h:353
+msgid "Latin American"
+msgstr "Latin-amerika"
+
+#: ../rules/base.xml.in.h:354 ../rules/evdev.xml.in.h:354
+msgid "Latin Unicode"
+msgstr "Latineca Unikoda"
+
+#: ../rules/base.xml.in.h:355 ../rules/evdev.xml.in.h:355
+msgid "Latin Unicode qwerty"
+msgstr "Latineca Unikoda qwerty"
+
+#: ../rules/base.xml.in.h:356 ../rules/evdev.xml.in.h:356
+msgid "Latin qwerty"
+msgstr "Latineca qwerty"
+
+#: ../rules/base.xml.in.h:357 ../rules/evdev.xml.in.h:357
+msgid "Latin unicode"
+msgstr "Latineca unikoda"
+
+#: ../rules/base.xml.in.h:358 ../rules/evdev.xml.in.h:358
+msgid "Latin unicode qwerty"
+msgstr "Latineca unikoda qwerty"
+
+#: ../rules/base.xml.in.h:359 ../rules/evdev.xml.in.h:359
+msgid "Latin with guillemets"
+msgstr "Latineca kun angul-citiloj"
+
+#: ../rules/base.xml.in.h:360 ../rules/evdev.xml.in.h:360
+msgid "Latvia"
+msgstr "Latvujo"
+
+#: ../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 "Maldekstra Alt"
+
+#: ../rules/base.xml.in.h:363 ../rules/evdev.xml.in.h:363
+msgid "Left Alt (while pressed)"
+msgstr "Maldekstra 'Alt' (dum premata)"
+
+#: ../rules/base.xml.in.h:364 ../rules/evdev.xml.in.h:364
+msgid "Left Alt is swapped with Left Win"
+msgstr "La maldekstra 'Alt' estas permutita kun la maldekstra klavo 'Win'"
+
+#: ../rules/base.xml.in.h:365 ../rules/evdev.xml.in.h:365
+msgid "Left Ctrl"
+msgstr "Maldekstra Ctrl"
+
+#: ../rules/base.xml.in.h:366 ../rules/evdev.xml.in.h:366
+msgid "Left Ctrl+Left Shift"
+msgstr "Maldekstra Ctrl+Maldekstra Shift"
+
+#: ../rules/base.xml.in.h:367 ../rules/evdev.xml.in.h:367
+msgid "Left Shift"
+msgstr "Maldekstra Shift"
+
+#: ../rules/base.xml.in.h:368 ../rules/evdev.xml.in.h:368
+msgid "Left Win"
+msgstr "Maldekstra 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 "Maldekstra Win (al la unua aranĝo), Dekstra Win/Menu (al la lasta aranĝo)"
+
+#: ../rules/base.xml.in.h:370 ../rules/evdev.xml.in.h:370
+msgid "Left Win (while pressed)"
+msgstr "Maldekstra Win (dum premata)"
+
+#: ../rules/base.xml.in.h:371 ../rules/evdev.xml.in.h:371
+msgid "Left hand"
+msgstr "Maldekstra mano"
+
+#: ../rules/base.xml.in.h:372 ../rules/evdev.xml.in.h:372
+msgid "Left handed Dvorak"
+msgstr "Maldekstreca Dvorako"
+
+#: ../rules/base.xml.in.h:373 ../rules/evdev.xml.in.h:373
+msgid "Legacy"
+msgstr "Malmoderna"
+
+#: ../rules/base.xml.in.h:374 ../rules/evdev.xml.in.h:374
+msgid "Legacy Wang 724"
+msgstr "Malmoderna Wang 724"
+
+#. 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 "Malmoderna klavo kun komo"
+
+#: ../rules/base.xml.in.h:377 ../rules/evdev.xml.in.h:377
+msgid "Legacy key with dot"
+msgstr "Malmoderna klavo kun punkto"
+
+#: ../rules/base.xml.in.h:378 ../rules/evdev.xml.in.h:378
+msgid "Less-than/Greater-than"
+msgstr "Pli-signo/Malpli-signo"
+
+#: ../rules/base.xml.in.h:379 ../rules/evdev.xml.in.h:379
+msgid "Lithuania"
+msgstr "Litovujo"
+
+#: ../rules/base.xml.in.h:380 ../rules/evdev.xml.in.h:380
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
+
+#: ../rules/base.xml.in.h:381 ../rules/evdev.xml.in.h:381
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:382 ../rules/evdev.xml.in.h:382
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (alternativa opcio)"
+
+#: ../rules/base.xml.in.h:383 ../rules/evdev.xml.in.h:383
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
+
+#: ../rules/base.xml.in.h:384 ../rules/evdev.xml.in.h:384
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:385 ../rules/evdev.xml.in.h:385
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:386 ../rules/evdev.xml.in.h:386
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:387 ../rules/evdev.xml.in.h:387
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr "Logitech Cordless Desktop Pro (alternativa opcio 2)"
+
+#: ../rules/base.xml.in.h:388 ../rules/evdev.xml.in.h:388
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:389 ../rules/evdev.xml.in.h:389
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:390 ../rules/evdev.xml.in.h:390
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15 extra keys via G15daemon"
+
+#: ../rules/base.xml.in.h:391 ../rules/evdev.xml.in.h:391
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech - Ĝenerala Klavaro"
+
+#: ../rules/base.xml.in.h:392 ../rules/evdev.xml.in.h:392
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech Internet 350 Keyboard"
+
+#: ../rules/base.xml.in.h:393 ../rules/evdev.xml.in.h:393
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:394 ../rules/evdev.xml.in.h:394
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: ../rules/base.xml.in.h:395 ../rules/evdev.xml.in.h:395
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Media Elite Keyboard"
+
+#: ../rules/base.xml.in.h:396 ../rules/evdev.xml.in.h:396
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:397 ../rules/evdev.xml.in.h:397
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
+
+#: ../rules/base.xml.in.h:398 ../rules/evdev.xml.in.h:398
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge Keyboard"
+
+#: ../rules/base.xml.in.h:399 ../rules/evdev.xml.in.h:399
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Keyboard"
+
+#: ../rules/base.xml.in.h:400 ../rules/evdev.xml.in.h:400
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:401 ../rules/evdev.xml.in.h:401
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+
+#: ../rules/base.xml.in.h:402 ../rules/evdev.xml.in.h:402
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
+
+#: ../rules/base.xml.in.h:403 ../rules/evdev.xml.in.h:403
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+
+#: ../rules/base.xml.in.h:404 ../rules/evdev.xml.in.h:404
+msgid "Lower Sorbian"
+msgstr "Malsupra Soraba"
+
+#: ../rules/base.xml.in.h:405 ../rules/evdev.xml.in.h:405
+msgid "Lower Sorbian (qwertz)"
+msgstr "Malsupra Soraba (qwertz)"
+
+#: ../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 "MNE"
+
+#: ../rules/base.xml.in.h:409 ../rules/evdev.xml.in.h:409
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
+
+#: ../rules/base.xml.in.h:410 ../rules/evdev.xml.in.h:410
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (Intl)"
+
+#: ../rules/base.xml.in.h:411 ../rules/evdev.xml.in.h:411
+msgid "Macedonia"
+msgstr "Makedonujo"
+
+#: ../rules/base.xml.in.h:412 ../rules/evdev.xml.in.h:412
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:413 ../rules/evdev.xml.in.h:413
+msgid "Macintosh Old"
+msgstr "Macintosh 'Malnova'"
+
+#: ../rules/base.xml.in.h:414 ../rules/evdev.xml.in.h:414
+msgid "Macintosh, Sun dead keys"
+msgstr "Macintosh, senpaŝaj klavoj de 'Sun'"
+
+#: ../rules/base.xml.in.h:415 ../rules/evdev.xml.in.h:415
+msgid "Macintosh, eliminate dead keys"
+msgstr "Macintosh, forigi senpaŝajn klavojn"
+
+#: ../rules/base.xml.in.h:416 ../rules/evdev.xml.in.h:416
+msgid "Make CapsLock an additional Backspace"
+msgstr "Igi CapsLock kroman Backspace"
+
+#: ../rules/base.xml.in.h:417 ../rules/evdev.xml.in.h:417
+msgid "Make CapsLock an additional Ctrl"
+msgstr "Igi CapsLock kroman Ctrl"
+
+#: ../rules/base.xml.in.h:418 ../rules/evdev.xml.in.h:418
+msgid "Make CapsLock an additional ESC"
+msgstr "Igi CapsLock kroman ESC"
+
+#: ../rules/base.xml.in.h:419 ../rules/evdev.xml.in.h:419
+msgid "Mal"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:420 ../rules/evdev.xml.in.h:420
+msgid "Malayalam"
+msgstr "Malajala"
+
+#: ../rules/base.xml.in.h:421 ../rules/evdev.xml.in.h:421
+msgid "Malayalam Lalitha"
+msgstr "Malajala 'Lalitha'"
+
+#: ../rules/base.xml.in.h:422 ../rules/evdev.xml.in.h:422
+msgid "Maldives"
+msgstr "Maldivoj"
+
+#: ../rules/base.xml.in.h:423 ../rules/evdev.xml.in.h:423
+msgid "Malta"
+msgstr "Maltolando"
+
+#: ../rules/base.xml.in.h:424 ../rules/evdev.xml.in.h:424
+msgid "Maltese keyboard with US layout"
+msgstr "Malta klavaro kun usona aranĝo"
+
+#: ../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 "Maoria"
+
+#: ../rules/base.xml.in.h:427 ../rules/evdev.xml.in.h:427
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:428 ../rules/evdev.xml.in.h:428
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
+
+#: ../rules/base.xml.in.h:429 ../rules/evdev.xml.in.h:429
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:430 ../rules/evdev.xml.in.h:430
+msgid "Menu"
+msgstr "Menu"
+
+#: ../rules/base.xml.in.h:431 ../rules/evdev.xml.in.h:431
+msgid "Meta is mapped to Left Win"
+msgstr "Meta estas mapita al la Maldekstra Win"
+
+#: ../rules/base.xml.in.h:432 ../rules/evdev.xml.in.h:432
+msgid "Meta is mapped to Win keys"
+msgstr "Meta estas mapita al la klavoj Win"
+
+#: ../rules/base.xml.in.h:433 ../rules/evdev.xml.in.h:433
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Comfort Curve Keyboard 2000"
+
+#: ../rules/base.xml.in.h:434 ../rules/evdev.xml.in.h:434
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
+
+#: ../rules/base.xml.in.h:435 ../rules/evdev.xml.in.h:435
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, Sveda"
+
+#: ../rules/base.xml.in.h:436 ../rules/evdev.xml.in.h:436
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:437 ../rules/evdev.xml.in.h:437
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural Keyboard Elite"
+
+#: ../rules/base.xml.in.h:438 ../rules/evdev.xml.in.h:438
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:439 ../rules/evdev.xml.in.h:439
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: ../rules/base.xml.in.h:440 ../rules/evdev.xml.in.h:440
+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:441 ../rules/evdev.xml.in.h:441
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+
+#: ../rules/base.xml.in.h:442 ../rules/evdev.xml.in.h:442
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
+
+#: ../rules/base.xml.in.h:443 ../rules/evdev.xml.in.h:443
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+
+#: ../rules/base.xml.in.h:444 ../rules/evdev.xml.in.h:444
+msgid "Miscellaneous compatibility options"
+msgstr "Ceteraj kongruaj opcioj"
+
+#: ../rules/base.xml.in.h:445 ../rules/evdev.xml.in.h:445
+msgid "Mkd"
+msgstr "Mkd"
+
+#: ../rules/base.xml.in.h:446 ../rules/evdev.xml.in.h:446
+msgid "Mlt"
+msgstr "Mlt"
+
+#: ../rules/base.xml.in.h:447 ../rules/evdev.xml.in.h:447
+msgid "Mmr"
+msgstr "Mmr"
+
+#: ../rules/base.xml.in.h:448 ../rules/evdev.xml.in.h:448
+msgid "Mng"
+msgstr "Mng"
+
+#: ../rules/base.xml.in.h:449 ../rules/evdev.xml.in.h:449
+msgid "Mongolia"
+msgstr "Mongolujo"
+
+#: ../rules/base.xml.in.h:450 ../rules/evdev.xml.in.h:450
+msgid "Montenegro"
+msgstr "Montenegro"
+
+#: ../rules/base.xml.in.h:451 ../rules/evdev.xml.in.h:451
+msgid "Morocco"
+msgstr "Maroko"
+
+#: ../rules/base.xml.in.h:452 ../rules/evdev.xml.in.h:452
+msgid "Multilingual"
+msgstr "Plurlingva"
+
+#: ../rules/base.xml.in.h:453 ../rules/evdev.xml.in.h:453
+msgid "Multilingual, first part"
+msgstr "Plurlingva, unua parto"
+
+#: ../rules/base.xml.in.h:454 ../rules/evdev.xml.in.h:454
+msgid "Multilingual, second part"
+msgstr "Plurlingva, dua parto"
+
+#: ../rules/base.xml.in.h:455 ../rules/evdev.xml.in.h:455
+msgid "Myanmar"
+msgstr "Birmo"
+
+#: ../rules/base.xml.in.h:456 ../rules/evdev.xml.in.h:456
+msgid "NICOLA-F style Backspace"
+msgstr "Retropaŝo laŭ estilo NICOLA-F"
+
+#: ../rules/base.xml.in.h:457 ../rules/evdev.xml.in.h:457
+msgid "NLA"
+msgstr "NLA"
+
+#: ../rules/base.xml.in.h:458 ../rules/evdev.xml.in.h:458
+msgid "Nativo"
+msgstr "Nativo"
+
+#: ../rules/base.xml.in.h:459 ../rules/evdev.xml.in.h:459
+msgid "Nativo for Esperanto"
+msgstr "Nativo por Esperanto"
+
+#: ../rules/base.xml.in.h:460 ../rules/evdev.xml.in.h:460
+msgid "Nativo for USA keyboards"
+msgstr "Nativo por usonaj klavaroj"
+
+#: ../rules/base.xml.in.h:461 ../rules/evdev.xml.in.h:461
+msgid "Neo 2"
+msgstr "Neo 2"
+
+#: ../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 "Nepalo"
+
+#: ../rules/base.xml.in.h:464 ../rules/evdev.xml.in.h:464
+msgid "Netherlands"
+msgstr "Nederlando"
+
+#: ../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 "Niĝerujo"
+
+#: ../rules/base.xml.in.h:467 ../rules/evdev.xml.in.h:467
+msgid "Nld"
+msgstr "Nld"
+
+#: ../rules/base.xml.in.h:468 ../rules/evdev.xml.in.h:468
+msgid "Non-breakable space character at fourth level"
+msgstr "Ne-rompebla spaco-signo ĉe la 4-a nivelo"
+
+#: ../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 "Ne-rompebla spaco-signo ĉe la 4-a nivelo, maldika ne-rompebla spaco-signo ĉe la 6-a nivelo"
+
+#: ../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 "Ne-rompebla spaco-signo ĉe la 4-a nivelo, maldika ne-rompebla spaco-signo ĉe la 6-a nivelo (per Ctrl+Shift)"
+
+#: ../rules/base.xml.in.h:471 ../rules/evdev.xml.in.h:471
+msgid "Non-breakable space character at second level"
+msgstr "Ne-rompebla spaco-signo ĉe la 2-a nivelo"
+
+#: ../rules/base.xml.in.h:472 ../rules/evdev.xml.in.h:472
+msgid "Non-breakable space character at third level"
+msgstr "Ne-rompebla spaco-signo ĉe la 3-a nivelo"
+
+#: ../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 "Ne-rompebla spaco-signo ĉe la 3-a nivelo, nenio ĉe la 4-a nivelo"
+
+#: ../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 "Ne-rompebla spaco-signo ĉe la 3-a nivelo, maldika ne-rompebla spaco-signo ĉe la 4-a nivelo"
+
+#: ../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 "Norda Samea"
+
+#: ../rules/base.xml.in.h:477 ../rules/evdev.xml.in.h:477
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Norda Samea, forigi senpaŝajn klavojn"
+
+#: ../rules/base.xml.in.h:478 ../rules/evdev.xml.in.h:478
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:479 ../rules/evdev.xml.in.h:479
+msgid "Norway"
+msgstr "Norvegujo"
+
+#: ../rules/base.xml.in.h:480 ../rules/evdev.xml.in.h:480
+msgid "NumLock"
+msgstr "NumLock"
+
+#: ../rules/base.xml.in.h:481 ../rules/evdev.xml.in.h:481
+msgid "Numeric keypad delete key behaviour"
+msgstr "Funkciado de la forig-klavo de la ciferklavaro"
+
+#: ../rules/base.xml.in.h:482 ../rules/evdev.xml.in.h:482
+msgid "Numeric keypad keys work as with Mac"
+msgstr "La klavoj de la ciferklavaro funkcias same kiel en Mac"
+
+#: ../rules/base.xml.in.h:483 ../rules/evdev.xml.in.h:483
+msgid "Numeric keypad layout selection"
+msgstr "Elektado de aranĝo por la ciferklavaro"
+
+#: ../rules/base.xml.in.h:484 ../rules/evdev.xml.in.h:484
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:485 ../rules/evdev.xml.in.h:485
+msgid "OLPC"
+msgstr "OLPC"
+
+#: ../rules/base.xml.in.h:486 ../rules/evdev.xml.in.h:486
+msgid "OLPC Dari"
+msgstr "OLPC Daria"
+
+#: ../rules/base.xml.in.h:487 ../rules/evdev.xml.in.h:487
+msgid "OLPC Pashto"
+msgstr "OLPC Paŝtoa"
+
+#: ../rules/base.xml.in.h:488 ../rules/evdev.xml.in.h:488
+msgid "OLPC Southern Uzbek"
+msgstr "OLPC Suda Uzbekujo"
+
+#: ../rules/base.xml.in.h:489 ../rules/evdev.xml.in.h:489
+msgid "Ogham"
+msgstr "Ogamo"
+
+#: ../rules/base.xml.in.h:490 ../rules/evdev.xml.in.h:490
+msgid "Ogham IS434"
+msgstr "Ogamo IS434"
+
+#: ../rules/base.xml.in.h:491 ../rules/evdev.xml.in.h:491
+msgid "Oriya"
+msgstr "Orija"
+
+#: ../rules/base.xml.in.h:492 ../rules/evdev.xml.in.h:492
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/Internet keyboard"
+
+#: ../rules/base.xml.in.h:493 ../rules/evdev.xml.in.h:493
+msgid "Ossetian"
+msgstr "Oseta"
+
+#: ../rules/base.xml.in.h:494 ../rules/evdev.xml.in.h:494
+msgid "Ossetian, Winkeys"
+msgstr "Oseta, klavoj 'Win'"
+
+#: ../rules/base.xml.in.h:495 ../rules/evdev.xml.in.h:495
+msgid "Ossetian, legacy"
+msgstr "Oseta, malmoderna"
+
+#: ../rules/base.xml.in.h:496 ../rules/evdev.xml.in.h:496
+msgid "PC-98xx Series"
+msgstr "PC-98xx Series"
+
+#: ../rules/base.xml.in.h:497 ../rules/evdev.xml.in.h:497
+msgid "Pak"
+msgstr "Pak"
+
+#: ../rules/base.xml.in.h:498 ../rules/evdev.xml.in.h:498
+msgid "Pakistan"
+msgstr "Pakistano"
+
+#: ../rules/base.xml.in.h:499 ../rules/evdev.xml.in.h:499
+msgid "Pashto"
+msgstr "Paŝtoa"
+
+#: ../rules/base.xml.in.h:500 ../rules/evdev.xml.in.h:500
+msgid "Pattachote"
+msgstr "Pattachote"
+
+#: ../rules/base.xml.in.h:501 ../rules/evdev.xml.in.h:501
+msgid "Phonetic"
+msgstr "Fonetika"
+
+#: ../rules/base.xml.in.h:502 ../rules/evdev.xml.in.h:502
+msgid "Pol"
+msgstr "Pol"
+
+#: ../rules/base.xml.in.h:503 ../rules/evdev.xml.in.h:503
+msgid "Poland"
+msgstr "Polujo"
+
+#: ../rules/base.xml.in.h:504 ../rules/evdev.xml.in.h:504
+msgid "Polytonic"
+msgstr "Plurtona"
+
+#: ../rules/base.xml.in.h:505 ../rules/evdev.xml.in.h:505
+msgid "Portugal"
+msgstr "Portugalujo"
+
+#: ../rules/base.xml.in.h:506 ../rules/evdev.xml.in.h:506
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:507 ../rules/evdev.xml.in.h:507
+msgid "Pro Keypad"
+msgstr "Pro Keypad"
+
+#: ../rules/base.xml.in.h:508 ../rules/evdev.xml.in.h:508
+msgid "Probhat"
+msgstr "Probhat"
+
+#: ../rules/base.xml.in.h:509 ../rules/evdev.xml.in.h:509
+msgid "Programmer Dvorak"
+msgstr "Dvorako por programistoj"
+
+#: ../rules/base.xml.in.h:510 ../rules/evdev.xml.in.h:510
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:511 ../rules/evdev.xml.in.h:511
+msgid "Prt"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:512 ../rules/evdev.xml.in.h:512
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:513 ../rules/evdev.xml.in.h:513
+msgid "Right Alt"
+msgstr "Dekstra Alt"
+
+#: ../rules/base.xml.in.h:514 ../rules/evdev.xml.in.h:514
+msgid "Right Alt (while pressed)"
+msgstr "Dekstra Alt (dum premata)"
+
+#: ../rules/base.xml.in.h:515 ../rules/evdev.xml.in.h:515
+msgid "Right Alt key never chooses 3rd level"
+msgstr "Dekstra Alt neniam elektas la 3-an nivelon"
+
+#: ../rules/base.xml.in.h:516 ../rules/evdev.xml.in.h:516
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr "Dekstra Alt, Shift+Dekstra Alt estas Multi_Key"
+
+#: ../rules/base.xml.in.h:517 ../rules/evdev.xml.in.h:517
+msgid "Right Ctrl"
+msgstr "Dekstra Ctrl"
+
+#: ../rules/base.xml.in.h:518 ../rules/evdev.xml.in.h:518
+msgid "Right Ctrl (while pressed)"
+msgstr "Dekstra Ctrl (dum premata)"
+
+#: ../rules/base.xml.in.h:519 ../rules/evdev.xml.in.h:519
+msgid "Right Ctrl as Right Alt"
+msgstr "Dekstra Ctrl kiel Dekstran Alt"
+
+#: ../rules/base.xml.in.h:520 ../rules/evdev.xml.in.h:520
+msgid "Right Shift"
+msgstr "Dekstra Shift"
+
+#: ../rules/base.xml.in.h:521 ../rules/evdev.xml.in.h:521
+msgid "Right Win"
+msgstr "Dekstra Win"
+
+#: ../rules/base.xml.in.h:522 ../rules/evdev.xml.in.h:522
+msgid "Right Win (while pressed)"
+msgstr "Dekstra Win (dum premata)"
+
+#: ../rules/base.xml.in.h:523 ../rules/evdev.xml.in.h:523
+msgid "Right hand"
+msgstr "Dekstra mano"
+
+#: ../rules/base.xml.in.h:524 ../rules/evdev.xml.in.h:524
+msgid "Right handed Dvorak"
+msgstr "Dekstreca Dvorako"
+
+#: ../rules/base.xml.in.h:525 ../rules/evdev.xml.in.h:525
+msgid "Romania"
+msgstr "Rumanujo"
+
+#: ../rules/base.xml.in.h:526 ../rules/evdev.xml.in.h:526
+msgid "Romanian keyboard with German letters"
+msgstr "Rumana klavaro kun germanaj literoj"
+
+#: ../rules/base.xml.in.h:527 ../rules/evdev.xml.in.h:527
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Rumana klavaro kun germanaj literoj, forigi senpaŝajn klavojn"
+
+#: ../rules/base.xml.in.h:528 ../rules/evdev.xml.in.h:528
+msgid "Rou"
+msgstr "Rou"
+
+#: ../rules/base.xml.in.h:529 ../rules/evdev.xml.in.h:529
+msgid "Rus"
+msgstr "Rus"
+
+#: ../rules/base.xml.in.h:530 ../rules/evdev.xml.in.h:530
+msgid "Russia"
+msgstr "Rusujo"
+
+#: ../rules/base.xml.in.h:531 ../rules/evdev.xml.in.h:531
+msgid "Russian"
+msgstr "Rusa"
+
+#: ../rules/base.xml.in.h:532 ../rules/evdev.xml.in.h:532
+msgid "Russian phonetic"
+msgstr "Rusa fonetika"
+
+#: ../rules/base.xml.in.h:533 ../rules/evdev.xml.in.h:533
+msgid "Russian phonetic Dvorak"
+msgstr "Rusa fonetika Dvorako"
+
+#: ../rules/base.xml.in.h:534 ../rules/evdev.xml.in.h:534
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Rusa fonetika, forigi senpaŝajn klavojn"
+
+#: ../rules/base.xml.in.h:535 ../rules/evdev.xml.in.h:535
+msgid "Russian with Kazakh"
+msgstr "Rusa kun Kazaĥa"
+
+#: ../rules/base.xml.in.h:536 ../rules/evdev.xml.in.h:536
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
+
+#: ../rules/base.xml.in.h:537 ../rules/evdev.xml.in.h:537
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:538 ../rules/evdev.xml.in.h:538
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:539 ../rules/evdev.xml.in.h:539
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:540 ../rules/evdev.xml.in.h:540
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:541 ../rules/evdev.xml.in.h:541
+msgid "SRB"
+msgstr "SRB"
+
+#: ../rules/base.xml.in.h:542 ../rules/evdev.xml.in.h:542
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:543 ../rules/evdev.xml.in.h:543
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
+
+#: ../rules/base.xml.in.h:544 ../rules/evdev.xml.in.h:544
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:545 ../rules/evdev.xml.in.h:545
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:546 ../rules/evdev.xml.in.h:546
+msgid "ScrollLock"
+msgstr "ScrollLock"
+
+#: ../rules/base.xml.in.h:547 ../rules/evdev.xml.in.h:547
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+#: ../rules/base.xml.in.h:548 ../rules/evdev.xml.in.h:548
+msgid "Semi-colon on third level"
+msgstr "Punkto-komo ĉe la 3-a nivelo"
+
+#: ../rules/base.xml.in.h:549 ../rules/evdev.xml.in.h:549
+msgid "Serbia"
+msgstr "Serbujo"
+
+#: ../rules/base.xml.in.h:550 ../rules/evdev.xml.in.h:550
+msgid "Shift cancels CapsLock"
+msgstr "Shift nuligas CapsLock"
+
+#: ../rules/base.xml.in.h:551 ../rules/evdev.xml.in.h:551
+msgid "Shift does not cancel NumLock, chooses 3d level instead"
+msgstr "Shift ne nuligas NumLock, ĝi elektigas la 3-a nivelon anstataŭe"
+
+#: ../rules/base.xml.in.h:552 ../rules/evdev.xml.in.h:552
+msgid "Shift with numeric keypad keys works as in MS Windows"
+msgstr "Shift kun la ciferklavaro funkcias same kiel en MS Windows"
+
+#: ../rules/base.xml.in.h:553 ../rules/evdev.xml.in.h:553
+msgid "Shift+CapsLock"
+msgstr "Shift+CapsLock"
+
+#: ../rules/base.xml.in.h:554 ../rules/evdev.xml.in.h:554
+msgid "Simple"
+msgstr "Simpla"
+
+#: ../rules/base.xml.in.h:555 ../rules/evdev.xml.in.h:555
+msgid "Slovakia"
+msgstr "Slovakujo"
+
+#: ../rules/base.xml.in.h:556 ../rules/evdev.xml.in.h:556
+msgid "Slovenia"
+msgstr "Slovenujo"
+
+#: ../rules/base.xml.in.h:557 ../rules/evdev.xml.in.h:557
+msgid "South Africa"
+msgstr "Sud-Afriko"
+
+#: ../rules/base.xml.in.h:558 ../rules/evdev.xml.in.h:558
+msgid "Southern Uzbek"
+msgstr "Suda Uzbekujo"
+
+#: ../rules/base.xml.in.h:559 ../rules/evdev.xml.in.h:559
+msgid "Spain"
+msgstr "Hispanio"
+
+#: ../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 "Specialaj klavoj (Ctrl+Alt+&lt;klavo&gt;) traktotaj en servilo"
+
+#: ../rules/base.xml.in.h:561 ../rules/evdev.xml.in.h:561
+msgid "SrL"
+msgstr "SrL"
+
+#: ../rules/base.xml.in.h:562 ../rules/evdev.xml.in.h:562
+msgid "Sri Lanka"
+msgstr "Sri-Lanko"
+
+#: ../rules/base.xml.in.h:563 ../rules/evdev.xml.in.h:563
+msgid "Standard"
+msgstr "Laŭnorma"
+
+#: ../rules/base.xml.in.h:564 ../rules/evdev.xml.in.h:564
+msgid "Standard (Cedilla)"
+msgstr "Laŭnorma (Subhoko)"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:566 ../rules/evdev.xml.in.h:566
+msgid "Standard RSTU"
+msgstr "Laŭnorma RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:568 ../rules/evdev.xml.in.h:568
+msgid "Standard RSTU on Russian layout"
+msgstr "Laŭnorma RSTU en Rusa aranĝo"
+
+#: ../rules/base.xml.in.h:569 ../rules/evdev.xml.in.h:569
+msgid "Sun Type 5/6"
+msgstr "Sun Type 5/6"
+
+#: ../rules/base.xml.in.h:570 ../rules/evdev.xml.in.h:570
+msgid "Sun dead keys"
+msgstr "Senpaŝaj klavoj de 'Sun'"
+
+#: ../rules/base.xml.in.h:571 ../rules/evdev.xml.in.h:571
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:572 ../rules/evdev.xml.in.h:572
+msgid "Super is mapped to Win keys"
+msgstr "'Super' estas mapita al la klavoj Win"
+
+#: ../rules/base.xml.in.h:573 ../rules/evdev.xml.in.h:573
+msgid "Svdvorak"
+msgstr "Svdvorak"
+
+#: ../rules/base.xml.in.h:574 ../rules/evdev.xml.in.h:574
+msgid "Svk"
+msgstr "Svk"
+
+#: ../rules/base.xml.in.h:575 ../rules/evdev.xml.in.h:575
+msgid "Svn"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:576 ../rules/evdev.xml.in.h:576
+msgid "Swap Ctrl and CapsLock"
+msgstr "Permuti Ctrl kaj CapsLock"
+
+#: ../rules/base.xml.in.h:577 ../rules/evdev.xml.in.h:577
+msgid "Swap ESC and CapsLock"
+msgstr "Permuti ESC kaj CapsLock"
+
+#: ../rules/base.xml.in.h:578 ../rules/evdev.xml.in.h:578
+msgid "Swe"
+msgstr "Swe"
+
+#: ../rules/base.xml.in.h:579 ../rules/evdev.xml.in.h:579
+msgid "Sweden"
+msgstr "Svedujo"
+
+#: ../rules/base.xml.in.h:580 ../rules/evdev.xml.in.h:580
+msgid "Switzerland"
+msgstr "Svislando"
+
+#: ../rules/base.xml.in.h:581 ../rules/evdev.xml.in.h:581
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tabuleta PC)"
+
+#: ../rules/base.xml.in.h:582 ../rules/evdev.xml.in.h:582
+msgid "Syr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:583 ../rules/evdev.xml.in.h:583
+msgid "Syria"
+msgstr "Sirio"
+
+#: ../rules/base.xml.in.h:584 ../rules/evdev.xml.in.h:584
+msgid "Syriac"
+msgstr "Siria"
+
+#: ../rules/base.xml.in.h:585 ../rules/evdev.xml.in.h:585
+msgid "Syriac phonetic"
+msgstr "Siria fonetika"
+
+#: ../rules/base.xml.in.h:586 ../rules/evdev.xml.in.h:586
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:587 ../rules/evdev.xml.in.h:587
+msgid "Tajikistan"
+msgstr "Taĝikujo"
+
+#: ../rules/base.xml.in.h:588 ../rules/evdev.xml.in.h:588
+msgid "Tamil"
+msgstr "Tamila"
+
+#: ../rules/base.xml.in.h:589 ../rules/evdev.xml.in.h:589
+msgid "Tamil TAB Typewriter"
+msgstr "Tamila TAB Typewriter"
+
+#: ../rules/base.xml.in.h:590 ../rules/evdev.xml.in.h:590
+msgid "Tamil TSCII Typewriter"
+msgstr "Tamila TSCII Typewriter"
+
+#: ../rules/base.xml.in.h:591 ../rules/evdev.xml.in.h:591
+msgid "Tamil Unicode"
+msgstr "Tamila Unikodo"
+
+#: ../rules/base.xml.in.h:592 ../rules/evdev.xml.in.h:592
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
+
+#: ../rules/base.xml.in.h:593 ../rules/evdev.xml.in.h:593
+msgid "Tatar"
+msgstr "Tatara"
+
+#: ../rules/base.xml.in.h:594 ../rules/evdev.xml.in.h:594
+msgid "Telugu"
+msgstr "Telugua"
+
+#: ../rules/base.xml.in.h:595 ../rules/evdev.xml.in.h:595
+msgid "Tha"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:596 ../rules/evdev.xml.in.h:596
+msgid "Thailand"
+msgstr "Tajlando"
+
+#: ../rules/base.xml.in.h:597 ../rules/evdev.xml.in.h:597
+msgid "Tibetan"
+msgstr "Tibeta"
+
+#: ../rules/base.xml.in.h:598 ../rules/evdev.xml.in.h:598
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibeta (kun ASCII ciferoj)"
+
+#: ../rules/base.xml.in.h:599 ../rules/evdev.xml.in.h:599
+msgid "Tifinagh"
+msgstr "Tifinagh"
+
+#: ../rules/base.xml.in.h:600 ../rules/evdev.xml.in.h:600
+msgid "Tifinagh Alternative"
+msgstr "Tifinagh Alternativa"
+
+#: ../rules/base.xml.in.h:601 ../rules/evdev.xml.in.h:601
+msgid "Tifinagh Alternative Phonetic"
+msgstr "Tifinagh Alternativa Fonetika"
+
+#: ../rules/base.xml.in.h:602 ../rules/evdev.xml.in.h:602
+msgid "Tifinagh Extended"
+msgstr "Tifinagh Etendita"
+
+#: ../rules/base.xml.in.h:603 ../rules/evdev.xml.in.h:603
+msgid "Tifinagh Extended Phonetic"
+msgstr "Tifinagh Etendita Fonetika"
+
+#: ../rules/base.xml.in.h:604 ../rules/evdev.xml.in.h:604
+msgid "Tifinagh Phonetic"
+msgstr "Tifinagh Fonetika"
+
+#: ../rules/base.xml.in.h:605 ../rules/evdev.xml.in.h:605
+msgid "Tilde (~) variant"
+msgstr "Tilda (~) variaĵo"
+
+#: ../rules/base.xml.in.h:606 ../rules/evdev.xml.in.h:606
+msgid "Tjk"
+msgstr "Tjk"
+
+#: ../rules/base.xml.in.h:607 ../rules/evdev.xml.in.h:607
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr "Al la ekvivalenta klavo en Dvoraka klavaro."
+
+#: ../rules/base.xml.in.h:608 ../rules/evdev.xml.in.h:608
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr "Al la ekvivalenta klavo en klavaro Qwerty."
+
+#: ../rules/base.xml.in.h:609 ../rules/evdev.xml.in.h:609
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:610 ../rules/evdev.xml.in.h:610
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: ../rules/base.xml.in.h:611 ../rules/evdev.xml.in.h:611
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: ../rules/base.xml.in.h:612 ../rules/evdev.xml.in.h:612
+msgid "Tur"
+msgstr "Tur"
+
+#: ../rules/base.xml.in.h:613 ../rules/evdev.xml.in.h:613
+msgid "Turkey"
+msgstr "Turkujo"
+
+#: ../rules/base.xml.in.h:614 ../rules/evdev.xml.in.h:614
+msgid "Typewriter"
+msgstr "Skribmaŝino"
+
+#: ../rules/base.xml.in.h:615 ../rules/evdev.xml.in.h:615
+msgid "UCW layout (accented letters only)"
+msgstr "Aranĝo UCW (nur diakritaĵoj)"
+
+#: ../rules/base.xml.in.h:616 ../rules/evdev.xml.in.h:616
+msgid "US keyboard with Bosnian digraphs"
+msgstr "Usona klavaro kun bosnaj duliteraĵoj"
+
+#: ../rules/base.xml.in.h:617 ../rules/evdev.xml.in.h:617
+msgid "US keyboard with Bosnian letters"
+msgstr "Usona klavaro kun bosnaj literoj"
+
+#: ../rules/base.xml.in.h:618 ../rules/evdev.xml.in.h:618
+msgid "US keyboard with Croatian digraphs"
+msgstr "Usona klavaro kun kroataj duliteraĵoj"
+
+#: ../rules/base.xml.in.h:619 ../rules/evdev.xml.in.h:619
+msgid "US keyboard with Croatian letters"
+msgstr "Usona klavaro kun kroataj literoj"
+
+#: ../rules/base.xml.in.h:620 ../rules/evdev.xml.in.h:620
+msgid "US keyboard with Estonian letters"
+msgstr "Usona klavaro kun estonaj literoj"
+
+#: ../rules/base.xml.in.h:621 ../rules/evdev.xml.in.h:621
+msgid "US keyboard with Lithuanian letters"
+msgstr "Usona klavaro kun litovaj literoj"
+
+#: ../rules/base.xml.in.h:622 ../rules/evdev.xml.in.h:622
+msgid "US keyboard with Slovenian digraphs"
+msgstr "Usona klavaro kun slovenaj duliteraĵoj"
+
+#: ../rules/base.xml.in.h:623 ../rules/evdev.xml.in.h:623
+msgid "US keyboard with Slovenian letters"
+msgstr "Usona klavaro kun slovenaj literoj"
+
+#: ../rules/base.xml.in.h:624 ../rules/evdev.xml.in.h:624
+msgid "USA"
+msgstr "Usono"
+
+#: ../rules/base.xml.in.h:625 ../rules/evdev.xml.in.h:625
+msgid "Udmurt"
+msgstr "Udmurta"
+
+#: ../rules/base.xml.in.h:626 ../rules/evdev.xml.in.h:626
+msgid "Ukr"
+msgstr "Ukr"
+
+#: ../rules/base.xml.in.h:627 ../rules/evdev.xml.in.h:627
+msgid "Ukraine"
+msgstr "Ukrajnujo"
+
+#: ../rules/base.xml.in.h:628 ../rules/evdev.xml.in.h:628
+msgid "Unicode"
+msgstr "Unikodo"
+
+#: ../rules/base.xml.in.h:629 ../rules/evdev.xml.in.h:629
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Unikodaj aldonoj (sagoj kaj operaci-simboloj)"
+
+#: ../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 "Unikodaj aldonoj (sagoj kaj operaci-simboloj). Operaci-simboloj en la implicita nivelo."
+
+#: ../rules/base.xml.in.h:631 ../rules/evdev.xml.in.h:631
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:632 ../rules/evdev.xml.in.h:632
+msgid "United Kingdom"
+msgstr "Unuiĝinta Reĝlando"
+
+#: ../rules/base.xml.in.h:633 ../rules/evdev.xml.in.h:633
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
+
+#: ../rules/base.xml.in.h:634 ../rules/evdev.xml.in.h:634
+msgid "Urdu, Alternative phonetic"
+msgstr "Urdu, Alternativa fonetika"
+
+#: ../rules/base.xml.in.h:635 ../rules/evdev.xml.in.h:635
+msgid "Urdu, Phonetic"
+msgstr "Urdu, Fonetike"
+
+#: ../rules/base.xml.in.h:636 ../rules/evdev.xml.in.h:636
+msgid "Urdu, Winkeys"
+msgstr "Urdu, Win-klavoj"
+
+#: ../rules/base.xml.in.h:637 ../rules/evdev.xml.in.h:637
+msgid "Use Bosnian digraphs"
+msgstr "Uzi bosnajn duliteraĵojn"
+
+#: ../rules/base.xml.in.h:638 ../rules/evdev.xml.in.h:638
+msgid "Use Croatian digraphs"
+msgstr "Uzi kroatajn duliteraĵojn"
+
+#: ../rules/base.xml.in.h:639 ../rules/evdev.xml.in.h:639
+msgid "Use Slovenian digraphs"
+msgstr "Uzi slovenajn duliteraĵojn"
+
+#: ../rules/base.xml.in.h:640 ../rules/evdev.xml.in.h:640
+msgid "Use guillemets for quotes"
+msgstr "Uzi angul-citilojn por citiloj"
+
+#: ../rules/base.xml.in.h:641 ../rules/evdev.xml.in.h:641
+msgid "Use keyboard LED to show alternative layout"
+msgstr "Uzi la LED de klavaro por indiki alternativan aranĝon"
+
+#: ../rules/base.xml.in.h:642 ../rules/evdev.xml.in.h:642
+msgid "Using space key to input non-breakable space character"
+msgstr "Uzado de spac-klavo por enmeti ne-rompeblan spaco-signon"
+
+#: ../rules/base.xml.in.h:643 ../rules/evdev.xml.in.h:643
+msgid "Usual space at any level"
+msgstr "Kutima spaco-signo ĉe iu ajn nivelo"
+
+#: ../rules/base.xml.in.h:644 ../rules/evdev.xml.in.h:644
+msgid "Uzb"
+msgstr "Uzb"
+
+#: ../rules/base.xml.in.h:645 ../rules/evdev.xml.in.h:645
+msgid "Uzbekistan"
+msgstr "Uzbekujo"
+
+#: ../rules/base.xml.in.h:646 ../rules/evdev.xml.in.h:646
+msgid "Vietnam"
+msgstr "Vjetnamujo"
+
+#: ../rules/base.xml.in.h:647 ../rules/evdev.xml.in.h:647
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "ViewSonic KU-306 Internet Keyboard"
+
+#: ../rules/base.xml.in.h:648 ../rules/evdev.xml.in.h:648
+msgid "Vnm"
+msgstr "Vnm"
+
+#: ../rules/base.xml.in.h:649 ../rules/evdev.xml.in.h:649
+msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgstr "Wang 724 ciferklavaro kun unikodaj aldonoj (sagoj kaj operaci-simboloj)"
+
+#: ../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 "Wang 724 ciferklavaro kun unikodaj aldonoj (sagoj kaj operaci-simboloj). Operaci-simboloj en la implicita nivelo"
+
+#: ../rules/base.xml.in.h:651 ../rules/evdev.xml.in.h:651
+msgid "Wang model 724 azerty"
+msgstr "Wang modelo 724 azerty"
+
+#: ../rules/base.xml.in.h:652 ../rules/evdev.xml.in.h:652
+msgid "Western"
+msgstr "Okcidenta"
+
+#: ../rules/base.xml.in.h:653 ../rules/evdev.xml.in.h:653
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:654 ../rules/evdev.xml.in.h:654
+msgid "Winkeys"
+msgstr "Win-klavoj"
+
+#: ../rules/base.xml.in.h:655 ../rules/evdev.xml.in.h:655
+msgid "With &lt;\\|&gt; key"
+msgstr "Kun klavo &lt;\\|&gt;"
+
+#: ../rules/base.xml.in.h:656 ../rules/evdev.xml.in.h:656
+msgid "With EuroSign on 5"
+msgstr "Kun EŭroSigno ĉe 5"
+
+#: ../rules/base.xml.in.h:657 ../rules/evdev.xml.in.h:657
+msgid "With guillemets"
+msgstr "Kun angul-citiloj"
+
+#: ../rules/base.xml.in.h:658 ../rules/evdev.xml.in.h:658
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
+
+#: ../rules/base.xml.in.h:659 ../rules/evdev.xml.in.h:659
+msgid "Yakut"
+msgstr "Yakut"
+
+#: ../rules/base.xml.in.h:660 ../rules/evdev.xml.in.h:660
+msgid "Yoruba"
+msgstr "Joruba"
+
+#: ../rules/base.xml.in.h:661 ../rules/evdev.xml.in.h:661
+msgid "Z and ZHE swapped"
+msgstr "Z kaj ZHE permutitaj"
+
+#: ../rules/base.xml.in.h:662 ../rules/evdev.xml.in.h:662
+msgid "Zar"
+msgstr "Zar"
+
+#: ../rules/base.xml.in.h:663 ../rules/evdev.xml.in.h:663
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:664 ../rules/evdev.xml.in.h:664
+msgid "azerty/digits"
+msgstr "azerty/ciferoj"
+
+#: ../rules/base.xml.in.h:665 ../rules/evdev.xml.in.h:665
+msgid "digits"
+msgstr "ciferoj"
+
+#: ../rules/base.xml.in.h:666 ../rules/evdev.xml.in.h:666
+msgid "displaced semicolon and quote (obsolete)"
+msgstr "translokitaj punktokomo kaj citilo (malaktuale)"
+
+#: ../rules/base.xml.in.h:667 ../rules/evdev.xml.in.h:667
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:668 ../rules/evdev.xml.in.h:668
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:669 ../rules/evdev.xml.in.h:669
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, etendita Malsuprenstreko"
+
+#: ../rules/base.xml.in.h:670 ../rules/evdev.xml.in.h:670
+msgid "qwerty/digits"
+msgstr "qwerty/ciferoj"
+
+#: ../rules/base.xml.in.h:671 ../rules/evdev.xml.in.h:671
+msgid "qwertz"
+msgstr "qwertz"
+
+#~ msgid "Add the EuroSign to the 2 key."
+#~ msgstr "Aldoni la EŭroSignon al la klavo 2."
+
+#~ msgid "Add the EuroSign to the 4 key."
+#~ msgstr "Aldoni la EŭroSignon al la klavo 4."
+
+#~ msgid "Add the EuroSign to the 5 key."
+#~ msgstr "Aldoni la EŭroSignon al la klavo 5."
+
+#~ msgid "Add the EuroSign to the E key."
+#~ msgstr "Aldoni la EŭroSignon al la klavo E."
+
+#~ msgid "Alt+Ctrl change layout."
+#~ msgstr "Alt+Ctrl ŝanĝas la aranĝon."
+
+#~ msgid "Alt+Shift change layout."
+#~ msgstr "Alt+Shift ŝanĝas la aranĝon."
+
+#~ msgid "Baltic+"
+#~ msgstr "Balta+"
+
+#~ msgid "CapsLock LED shows alternative layout."
+#~ msgstr "LED de CapsLock indikas alternativan aranĝon."
+
+#~ msgid "CapsLock just locks the Shift modifier."
+#~ msgstr "CapsLock simple ŝlosas la modifilon Shift."
+
+#~ msgid "CapsLock key changes layout."
+#~ msgstr "La klavo CapsLock ŝanĝas la aranĝon."
+
+#~ msgid "Ctrl+Shift change layout."
+#~ msgstr "'Ctrl+Shift' ŝanĝas la aranĝon."
+
+#~ msgid "Hewlett-Packard Internet Keyboard 5181"
+#~ msgstr "Hewlett-Packard Internet Keyboard 5181"
+
+#~ msgid "Hewlett-Packard Internet Keyboard 5185"
+#~ msgstr "Hewlett-Packard Internet Keyboard 5185"
+
+#~ msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+#~ msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
+
+#~ msgid "IBM Rapid Access II (alternate option)"
+#~ msgstr "IBM Rapid Access II (alternativa opcio)"
+
+#~ msgid "LCtrl+LShift change layout."
+#~ msgstr "LCtrl+LShift ŝanĝas la aranĝon."
+
+#~ msgid "Layout switching"
+#~ msgstr "Ŝaltado de aranĝo"
+
+#~ msgid "Left Alt key changes layout."
+#~ msgstr "La maldekstra klavo 'Alt' ŝanĝas la aranĝon."
+
+#~ msgid "Left Ctrl key changes layout."
+#~ msgstr "La maldekstra klavo 'Ctrl' ŝanĝas la aranĝon."
+
+#~ msgid "Left Shift key changes layout."
+#~ msgstr "La maldekstra klavo 'Shift' ŝanĝas la aranĝon."
+
+#~ msgid "Left Win-key changes layout."
+#~ msgstr "La maldekstra klavo 'Win' ŝanĝas la aranĝon."
+
+#~ msgid "Left Win-key is Compose."
+#~ msgstr "La maldekstra klavo 'Win' estas 'Compose'."
+
+#~ msgid "Legacy keypad"
+#~ msgstr "Malmoderna numerklavaro"
+
+#~ msgid "Menu is Compose."
+#~ msgstr "'Menuo' estas 'Compose'."
+
+#~ msgid "Neostyle"
+#~ msgstr "Neostyle"
+
+#~ msgid "NumLock LED shows alternative layout."
+#~ msgstr "LED de 'NumLock' indikas alternativan aranĝon."
+
+#~ msgid "Press Left Alt key to choose 3rd level."
+#~ msgstr "Premi la maldekstran klavon 'Alt' por elekti 3-an nivelon."
+
+#~ msgid "Press Left Win-key to choose 3rd level."
+#~ msgstr "Premi la maldekstran klavon 'Win' por elekti 3-an nivelon."
+
+#~ msgid "Press Right Alt key to choose 3rd level."
+#~ msgstr "Premi la dekstran klavon 'Alt' por elekti 3-an nivelon."
+
+#~ msgid "Press Right Ctrl to choose 3rd level."
+#~ msgstr "Premi la dekstran klavon 'Ctrl' por elekti 3-an nivelon."
+
+#~ msgid "Press Right Win-key to choose 3rd level."
+#~ msgstr "Premi la dekstran klavon 'Win' por elekti 3-an nivelon."
+
+#~ msgid "Press any of Alt keys to choose 3rd level."
+#~ msgstr "Premi iu ajn el la klavoj 'Alt' por elekti 3-an nivelon."
+
+#~ msgid "Press any of Win-keys to choose 3rd level."
+#~ msgstr "Premi iu ajn el la klavoj 'Win' por elekti 3-an nivelon."
+
+#~ msgid "Right Alt is Compose."
+#~ msgstr "Dekstra 'Alt' estas 'Compose'."
+
+#~ msgid "Right Alt key changes layout."
+#~ msgstr "Dekstra 'Alt' ŝanĝas la aranĝon."
+
+#~ msgid "Right Ctrl key changes layout."
+#~ msgstr "Dekstra 'Ctrl' ŝanĝas la aranĝon."
+
+#~ msgid "Right Shift key changes layout."
+#~ msgstr "Dekstra 'Shift' ŝanĝas la aranĝon."
+
+#~ msgid "Right Win-key changes layout."
+#~ msgstr "Dekstra 'Win' ŝanĝas la aranĝon."
+
+#~ msgid "Right Win-key is Compose."
+#~ msgstr "Dekstra 'Win' estas 'Compose'."
+
+#~ msgid "ScrollLock LED shows alternative layout."
+#~ msgstr "LED de 'ScrollLock' indikas alternativan aranĝon."
+
+#~ msgid "Shift+CapsLock changes layout."
+#~ msgstr "'Shift'+CapsLock ŝanĝas la aranĝon."
+
+#~ msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+#~ msgstr "Permuti klavkodojn de du klavoj kiam klavaroj Mac estas misdetektitaj de la sistem-kerno."
+
+#~ msgid "Third level choosers"
+#~ msgstr "Elektiloj por 3-a nivelo"
+
+#~ msgid "Urdu"
+#~ msgstr "Urdua"
diff --git a/xorg-server/xkbdata.src/po/fi.po b/xorg-server/xkbdata.src/po/fi.po
index 13f9679f2..ff5be340e 100644
--- a/xorg-server/xkbdata.src/po/fi.po
+++ b/xorg-server/xkbdata.src/po/fi.po
@@ -1,15 +1,15 @@
# Finnish 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.
-# Tommi Vainikainen <Tommi.Vainikainen@iki.fi>, 2005, 2007.
+# Tommi Vainikainen <Tommi.Vainikainen@iki.fi>, 2005, 2007-2009.
# Ilkka Tuohela <hile@iki.fi>, 2007.
#
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config 1.1-pre1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-11 22:14+0100\n"
-"PO-Revision-Date: 2007-09-13 20:04+0300\n"
+"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-01-16 08:05+0200\n"
"Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -17,2680 +17,3047 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../rules/base.xml.in.h:1
+#: ../rules/base.xml.in.h:1 ../rules/evdev.xml.in.h:1
msgid "(F)"
msgstr "(F)"
-#: ../rules/base.xml.in.h:2
+#: ../rules/base.xml.in.h:2 ../rules/evdev.xml.in.h:2
msgid "(Legacy) Alternative"
msgstr "(Perinteinen) vaihtoehtoinen"
-#: ../rules/base.xml.in.h:3
+#: ../rules/base.xml.in.h:3 ../rules/evdev.xml.in.h:3
msgid "(Legacy) Alternative, Sun dead keys"
msgstr "(Perinteinen) vaihtoehtoinen, Sunin kuolleet näppäimet"
-#: ../rules/base.xml.in.h:4
+#: ../rules/base.xml.in.h:4 ../rules/evdev.xml.in.h:4
msgid "(Legacy) Alternative, eliminate dead keys"
msgstr "(Perinteinen) vaihtoehtoinen, ei kuolleita näppäimiä"
-#: ../rules/base.xml.in.h:5
-msgid "(Legacy) Dvorak"
-msgstr "(Perinteinen) dvorak"
-
-#: ../rules/base.xml.in.h:6
+#: ../rules/base.xml.in.h:5 ../rules/evdev.xml.in.h:5
msgid "101/104 key Compatible"
msgstr "101/104-näppäiminen tai yhteensopiva"
-#: ../rules/base.xml.in.h:7 ../rules/sun.xml.in.h:2
+#: ../rules/base.xml.in.h:6 ../rules/evdev.xml.in.h:6
msgid "101/qwerty/comma/Dead keys"
msgstr "101/qwerty/pilkku/Kuolleet näppäimet"
-#: ../rules/base.xml.in.h:8 ../rules/sun.xml.in.h:3
+#: ../rules/base.xml.in.h:7 ../rules/evdev.xml.in.h:7
msgid "101/qwerty/comma/Eliminate dead keys"
msgstr "101/qwerty/pilkku/Ei kuolleita näppäimiä"
-#: ../rules/base.xml.in.h:9 ../rules/sun.xml.in.h:4
+#: ../rules/base.xml.in.h:8 ../rules/evdev.xml.in.h:8
msgid "101/qwerty/dot/Dead keys"
msgstr "101/qwerty/piste/Kuolleet näppäimet"
-#: ../rules/base.xml.in.h:10 ../rules/sun.xml.in.h:5
+#: ../rules/base.xml.in.h:9 ../rules/evdev.xml.in.h:9
msgid "101/qwerty/dot/Eliminate dead keys"
msgstr "101/qwerty/piste/Ei kuolleita näppäimiä"
-#: ../rules/base.xml.in.h:11 ../rules/sun.xml.in.h:6
+#: ../rules/base.xml.in.h:10 ../rules/evdev.xml.in.h:10
msgid "101/qwertz/comma/Dead keys"
msgstr "101/qwertz/pilkku/Kuolleet näppäimet"
-#: ../rules/base.xml.in.h:12
+#: ../rules/base.xml.in.h:11 ../rules/evdev.xml.in.h:11
msgid "101/qwertz/comma/Eliminate dead keys"
msgstr "101/qwertz/pilkku/Ei kuolleita näppäimiä"
-#: ../rules/base.xml.in.h:13 ../rules/sun.xml.in.h:7
+#: ../rules/base.xml.in.h:12 ../rules/evdev.xml.in.h:12
msgid "101/qwertz/dot/Dead keys"
msgstr "101/qwertz/piste/Kuolleet näppäimet"
-#: ../rules/base.xml.in.h:14 ../rules/sun.xml.in.h:8
+#: ../rules/base.xml.in.h:13 ../rules/evdev.xml.in.h:13
msgid "101/qwertz/dot/Eliminate dead keys"
msgstr "101/qwertz/piste/Ei kuolleita näppäimiä"
-#: ../rules/base.xml.in.h:15 ../rules/sun.xml.in.h:9
+#: ../rules/base.xml.in.h:14 ../rules/evdev.xml.in.h:14
msgid "102/qwerty/comma/Dead keys"
msgstr "102/qwerty/pilkku/Kuolleet näppäimet"
-#: ../rules/base.xml.in.h:16 ../rules/sun.xml.in.h:10
+#: ../rules/base.xml.in.h:15 ../rules/evdev.xml.in.h:15
msgid "102/qwerty/comma/Eliminate dead keys"
msgstr "102/qwerty/pilkku/Ei kuolleita näppäimiä"
-#: ../rules/base.xml.in.h:17 ../rules/sun.xml.in.h:11
+#: ../rules/base.xml.in.h:16 ../rules/evdev.xml.in.h:16
msgid "102/qwerty/dot/Dead keys"
msgstr "102/qwerty/piste/Kuolleet näppäimet"
-#: ../rules/base.xml.in.h:18 ../rules/sun.xml.in.h:12
+#: ../rules/base.xml.in.h:17 ../rules/evdev.xml.in.h:17
msgid "102/qwerty/dot/Eliminate dead keys"
msgstr "102/qwerty/piste/Ei kuolleita näppäimiä"
-#: ../rules/base.xml.in.h:19 ../rules/sun.xml.in.h:13
+#: ../rules/base.xml.in.h:18 ../rules/evdev.xml.in.h:18
msgid "102/qwertz/comma/Dead keys"
msgstr "102/qwertz/pilkku/Kuolleet näppäimet"
-#: ../rules/base.xml.in.h:20 ../rules/sun.xml.in.h:14
+#: ../rules/base.xml.in.h:19 ../rules/evdev.xml.in.h:19
msgid "102/qwertz/comma/Eliminate dead keys"
msgstr "102/qwertz/pilkku/Ei kuolleita näppäimiä"
-#: ../rules/base.xml.in.h:21 ../rules/sun.xml.in.h:15
+#: ../rules/base.xml.in.h:20 ../rules/evdev.xml.in.h:20
msgid "102/qwertz/dot/Dead keys"
msgstr "102/qwertz/piste/Kuolleet näppäimet"
-#: ../rules/base.xml.in.h:22 ../rules/sun.xml.in.h:16
+#: ../rules/base.xml.in.h:21 ../rules/evdev.xml.in.h:21
msgid "102/qwertz/dot/Eliminate dead keys"
msgstr "102/qwertz/piste/Ei kuolleita näppäimiä"
-#: ../rules/base.xml.in.h:23
+#: ../rules/base.xml.in.h:22 ../rules/evdev.xml.in.h:22
+msgid "2"
+msgstr "2"
+
+#: ../rules/base.xml.in.h:23 ../rules/evdev.xml.in.h:23
+msgid "4"
+msgstr "4"
+
+#: ../rules/base.xml.in.h:24 ../rules/evdev.xml.in.h:24
+msgid "5"
+msgstr "5"
+
+#: ../rules/base.xml.in.h:25 ../rules/evdev.xml.in.h:25
msgid "A4Tech KB-21"
msgstr "A4Tech KB-21"
-#: ../rules/base.xml.in.h:24
+#: ../rules/base.xml.in.h:26 ../rules/evdev.xml.in.h:26
msgid "A4Tech KBS-8"
msgstr "A4Tech KBS-8"
-#: ../rules/base.xml.in.h:25
+#: ../rules/base.xml.in.h:27 ../rules/evdev.xml.in.h:27
msgid "A4Tech Wireless Desktop RFKB-23"
msgstr "A4Tech-langaton työpöytänäppäimistö RFKB-23"
-#: ../rules/base.xml.in.h:26
+#: ../rules/base.xml.in.h:28 ../rules/evdev.xml.in.h:28
msgid "ACPI Standard"
msgstr "ACPI-standardi"
-#: ../rules/base.xml.in.h:27
-msgid "AZERTY Tskapo"
-msgstr "AZERTY Tskapo"
+#: ../rules/base.xml.in.h:29 ../rules/evdev.xml.in.h:29
+msgid "ATM/phone-style"
+msgstr ""
-#: ../rules/base.xml.in.h:28
+#: ../rules/base.xml.in.h:30 ../rules/evdev.xml.in.h:30
msgid "Acer AirKey V"
msgstr "Acer AirKey V"
-#: ../rules/base.xml.in.h:29
+#: ../rules/base.xml.in.h:31 ../rules/evdev.xml.in.h:31
msgid "Acer C300"
msgstr "Acer C300"
-#: ../rules/base.xml.in.h:30
+#: ../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:31
+#: ../rules/base.xml.in.h:33 ../rules/evdev.xml.in.h:33
msgid "Acer Laptop"
msgstr "Acer-kannettava"
-#: ../rules/base.xml.in.h:32
-msgid "Add the EuroSign to the 2 key."
-msgstr "Lisää euro-merkki 2-näppäimeen."
-
-#: ../rules/base.xml.in.h:33
-msgid "Add the EuroSign to the 5 key."
-msgstr "Lisää euro-merkki 5-näppäimeen."
-
-#: ../rules/base.xml.in.h:34
-msgid "Add the EuroSign to the E key."
-msgstr "Lisää euro-merkki E-näppäimeen."
+#: ../rules/base.xml.in.h:34 ../rules/evdev.xml.in.h:34
+msgid "Add the standard behavior to Menu key"
+msgstr "Lisää standardi toiminta valikkonäppäimeen"
-#: ../rules/base.xml.in.h:35
-msgid "Add the standard behavior to Menu key."
-msgstr "Lisää standardi toiminta valikkonäppäimeen."
+# Tulkitsin asiaa pikaisella tutkimuksella siten, että supersigno on
+# esperantoa ja tarkoittaa noin suunnilleen korkomerkkiä.
+#: ../rules/base.xml.in.h:35 ../rules/evdev.xml.in.h:35
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "Esperanton tarkkeiden lisäys (supersigno)"
-#: ../rules/base.xml.in.h:36
-msgid "Adding the EuroSign to certain keys"
+#: ../rules/base.xml.in.h:36 ../rules/evdev.xml.in.h:36
+msgid "Adding EuroSign to certain keys"
msgstr "Euro-merkin lisäys haluttuun näppäimeen"
-#: ../rules/base.xml.in.h:37
+#: ../rules/base.xml.in.h:37 ../rules/evdev.xml.in.h:37
msgid "Advance Scorpius KI"
msgstr "Advance Scorpius KI"
-#: ../rules/base.xml.in.h:38
+#: ../rules/base.xml.in.h:38 ../rules/evdev.xml.in.h:38
msgid "Afg"
msgstr "Afg"
-#: ../rules/base.xml.in.h:39
+#: ../rules/base.xml.in.h:39 ../rules/evdev.xml.in.h:39
msgid "Afghanistan"
msgstr "Afganistan"
-#: ../rules/base.xml.in.h:40
+#: ../rules/base.xml.in.h:40 ../rules/evdev.xml.in.h:40
msgid "Akan"
msgstr "Akan"
-#: ../rules/base.xml.in.h:41
+#: ../rules/base.xml.in.h:41 ../rules/evdev.xml.in.h:41
msgid "Alb"
msgstr "Alb"
-#: ../rules/base.xml.in.h:42
+#: ../rules/base.xml.in.h:42 ../rules/evdev.xml.in.h:42
msgid "Albania"
msgstr "Albania"
-#: ../rules/base.xml.in.h:43
-msgid "Alt and Meta are on the Alt keys."
-msgstr "Alt ja Meta ovat Alt-näppäimissä."
+#: ../rules/base.xml.in.h:43 ../rules/evdev.xml.in.h:43
+msgid "Alt and Meta are on Alt keys"
+msgstr "Alt ja Meta ovat Alt-näppäimissä"
-#: ../rules/base.xml.in.h:44
-msgid "Alt is mapped to the right Win-key and Super to Menu."
-msgstr "Alt tulee oikeasta Win-näppäimestä ja Super valikkonäppäimestä."
+#: ../rules/base.xml.in.h:44 ../rules/evdev.xml.in.h:44
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr "Alt tulee oikeasta Win-näppäimestä, Super valikkonäppäimestä"
-#: ../rules/base.xml.in.h:45
-msgid "Alt+CapsLock changes layout."
-msgstr "Alt+CapsLock vaihtaa asettelua."
+#: ../rules/base.xml.in.h:45 ../rules/evdev.xml.in.h:45
+msgid "Alt+CapsLock"
+msgstr "Alt+CapsLock"
-#: ../rules/base.xml.in.h:46
-msgid "Alt+Ctrl change layout."
-msgstr "Alt+Ctrl vaihtaa asettelua."
+#: ../rules/base.xml.in.h:46 ../rules/evdev.xml.in.h:46
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
-#: ../rules/base.xml.in.h:47
-msgid "Alt+Shift change layout."
-msgstr "Alt+Shift vaihtaa asettelua."
+#: ../rules/base.xml.in.h:47 ../rules/evdev.xml.in.h:47
+msgid "Alt+Shift"
+msgstr "Alt+Shift"
-#: ../rules/base.xml.in.h:48
+#: ../rules/base.xml.in.h:48 ../rules/evdev.xml.in.h:48
+msgid "Alt+Space"
+msgstr "Alt+Välilyönti"
+
+#: ../rules/base.xml.in.h:49 ../rules/evdev.xml.in.h:49
msgid "Alt-Q"
msgstr "Alt-Q"
-#: ../rules/base.xml.in.h:49
+#: ../rules/base.xml.in.h:50 ../rules/evdev.xml.in.h:50
msgid "Alt/Win key behavior"
msgstr "Alt- ja Win-näppäinten toiminta"
-#: ../rules/base.xml.in.h:50
+#: ../rules/base.xml.in.h:51 ../rules/evdev.xml.in.h:51
msgid "Alternative"
msgstr "Vaihtoehtoinen"
-#: ../rules/base.xml.in.h:51
+#: ../rules/base.xml.in.h:52 ../rules/evdev.xml.in.h:52
msgid "Alternative Eastern"
msgstr "Vaihtoehtoinen itäinen"
-#: ../rules/base.xml.in.h:52
+#: ../rules/base.xml.in.h:53 ../rules/evdev.xml.in.h:53
msgid "Alternative Phonetic"
msgstr "Vaihtoehtoinen foneettinen"
-#: ../rules/base.xml.in.h:53
+#: ../rules/base.xml.in.h:54 ../rules/evdev.xml.in.h:54
msgid "Alternative international (former us_intl)"
msgstr "Vaihtoehtoinen kansainvälinen (aiempi us_intl)"
-#: ../rules/base.xml.in.h:54
+#: ../rules/base.xml.in.h:55 ../rules/evdev.xml.in.h:55
msgid "Alternative, Sun dead keys"
msgstr "Vaihtoehtoinen, Sunin kuolleet näppäimet"
-#: ../rules/base.xml.in.h:55
+#: ../rules/base.xml.in.h:56 ../rules/evdev.xml.in.h:56
msgid "Alternative, eliminate dead keys"
msgstr "Vaihtoehtoinen, ei kuolleita näppäimiä"
-#: ../rules/base.xml.in.h:56
+#: ../rules/base.xml.in.h:57 ../rules/evdev.xml.in.h:57
msgid "Alternative, latin-9 only"
msgstr "Vaihtoehtoinen, vain latin-9"
-#: ../rules/base.xml.in.h:57
+#: ../rules/base.xml.in.h:58 ../rules/evdev.xml.in.h:58
msgid "And"
msgstr "And"
-#: ../rules/base.xml.in.h:58
+#: ../rules/base.xml.in.h:59 ../rules/evdev.xml.in.h:59
msgid "Andorra"
msgstr "Andorra"
-#: ../rules/base.xml.in.h:59
+#: ../rules/base.xml.in.h:60 ../rules/evdev.xml.in.h:60
+msgid "Any Alt key"
+msgstr "Mikä tahansa Alt-näppäin"
+
+#: ../rules/base.xml.in.h:61 ../rules/evdev.xml.in.h:61
+msgid "Any Win key"
+msgstr "Mikä tahansa Win-näppäin"
+
+#: ../rules/base.xml.in.h:62 ../rules/evdev.xml.in.h:62
+msgid "Any Win key (while pressed)"
+msgstr "Mikä tahansa Win-näppäin (painettaessa)"
+
+#: ../rules/base.xml.in.h:63 ../rules/evdev.xml.in.h:63
msgid "Apostrophe (') variant"
msgstr "Heittomerkkimuunnos (')"
-#: ../rules/base.xml.in.h:60
+#: ../rules/base.xml.in.h:64 ../rules/evdev.xml.in.h:64
msgid "Apple"
msgstr "Apple"
-#: ../rules/base.xml.in.h:61
+#: ../rules/base.xml.in.h:65 ../rules/evdev.xml.in.h:65
msgid "Apple Laptop"
msgstr "Apple-kannettava"
-#: ../rules/base.xml.in.h:62
+#: ../rules/base.xml.in.h:66 ../rules/evdev.xml.in.h:66
msgid "Ara"
msgstr "Ara"
-#: ../rules/base.xml.in.h:63
+#: ../rules/base.xml.in.h:67 ../rules/evdev.xml.in.h:67
msgid "Arabic"
msgstr "Arabia"
-#: ../rules/base.xml.in.h:64
+#: ../rules/base.xml.in.h:68 ../rules/evdev.xml.in.h:68
msgid "Arm"
msgstr "Arm"
-#: ../rules/base.xml.in.h:65
+#: ../rules/base.xml.in.h:69 ../rules/evdev.xml.in.h:69
msgid "Armenia"
msgstr "Armenia"
-#: ../rules/base.xml.in.h:66
+#: ../rules/base.xml.in.h:70 ../rules/evdev.xml.in.h:70
+msgid "Asturian variant with bottom-dot H and bottom-dot L"
+msgstr "Asturia-vaihtoehto keskipilkullisella H-kirjaimella ja alapilkullisella L-kirjaimella"
+
+#: ../rules/base.xml.in.h:71 ../rules/evdev.xml.in.h:71
msgid "Asus Laptop"
msgstr "Asus-kannettava"
-#: ../rules/base.xml.in.h:67
+#: ../rules/base.xml.in.h:72 ../rules/evdev.xml.in.h:72
+msgid "At bottom left"
+msgstr "Alhaalla vasemmalla"
+
+#: ../rules/base.xml.in.h:73 ../rules/evdev.xml.in.h:73
+msgid "At left of 'A'"
+msgstr "\"A\"-näppäimestä vasemmalla"
+
+#: ../rules/base.xml.in.h:74 ../rules/evdev.xml.in.h:74
msgid "Aze"
msgstr "Aze"
-#: ../rules/base.xml.in.h:68
+#: ../rules/base.xml.in.h:75 ../rules/evdev.xml.in.h:75
msgid "Azerbaijan"
msgstr "Azerbaidzan"
-#: ../rules/base.xml.in.h:69
+#: ../rules/base.xml.in.h:76 ../rules/evdev.xml.in.h:76
msgid "Azona RF2300 wireless Internet Keyboard"
msgstr "Azona RF2300 -langaton Internet-näppäimistö"
-#: ../rules/base.xml.in.h:70
+#: ../rules/base.xml.in.h:77 ../rules/evdev.xml.in.h:77
msgid "BTC 5090"
msgstr "BTC 5090"
-#: ../rules/base.xml.in.h:71
+#: ../rules/base.xml.in.h:78 ../rules/evdev.xml.in.h:78
msgid "BTC 5113RF Multimedia"
msgstr "BTC 5113RF Multimedia"
-#: ../rules/base.xml.in.h:72
+#: ../rules/base.xml.in.h:79 ../rules/evdev.xml.in.h:79
msgid "BTC 5126T"
msgstr "BTC 5126T"
-#: ../rules/base.xml.in.h:73
+#: ../rules/base.xml.in.h:80 ../rules/evdev.xml.in.h:80
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
+
+#: ../rules/base.xml.in.h:81 ../rules/evdev.xml.in.h:81
msgid "BTC 9000"
msgstr "BTC 9000"
-#: ../rules/base.xml.in.h:74
+#: ../rules/base.xml.in.h:82 ../rules/evdev.xml.in.h:82
msgid "BTC 9000A"
msgstr "BTC 9000A"
-#: ../rules/base.xml.in.h:75
+#: ../rules/base.xml.in.h:83 ../rules/evdev.xml.in.h:83
msgid "BTC 9001AH"
msgstr "BTC 9001AH"
-#: ../rules/base.xml.in.h:76
+#: ../rules/base.xml.in.h:84 ../rules/evdev.xml.in.h:84
msgid "BTC 9019U"
msgstr "BTC 9019U"
-#: ../rules/base.xml.in.h:77
+#: ../rules/base.xml.in.h:85 ../rules/evdev.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 ../rules/evdev.xml.in.h:86
msgid "Ban"
msgstr "Ban"
-#: ../rules/base.xml.in.h:78
+#: ../rules/base.xml.in.h:87 ../rules/evdev.xml.in.h:87
msgid "Bangladesh"
msgstr "Bangladesh"
-#: ../rules/base.xml.in.h:79 ../rules/sun.xml.in.h:22
+#: ../rules/base.xml.in.h:88 ../rules/evdev.xml.in.h:88
msgid "Bel"
msgstr "Bel"
-#: ../rules/base.xml.in.h:80
+#: ../rules/base.xml.in.h:89 ../rules/evdev.xml.in.h:89
msgid "Belarus"
msgstr "Valko-Venäjä"
-#: ../rules/base.xml.in.h:81
+#: ../rules/base.xml.in.h:90 ../rules/evdev.xml.in.h:90
msgid "Belgium"
msgstr "Belgia"
-#: ../rules/base.xml.in.h:82
+#: ../rules/base.xml.in.h:91 ../rules/evdev.xml.in.h:91
msgid "BenQ X-Touch"
msgstr "BenQ X-Touch"
-#: ../rules/base.xml.in.h:83
+#: ../rules/base.xml.in.h:92 ../rules/evdev.xml.in.h:92
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:93 ../rules/evdev.xml.in.h:93
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
+
+#: ../rules/base.xml.in.h:94 ../rules/evdev.xml.in.h:94
msgid "Bengali"
msgstr "Bengali"
-#: ../rules/base.xml.in.h:84
+#: ../rules/base.xml.in.h:95 ../rules/evdev.xml.in.h:95
msgid "Bengali Probhat"
msgstr "Bengali probhat"
-#: ../rules/base.xml.in.h:85
+#: ../rules/base.xml.in.h:96 ../rules/evdev.xml.in.h:96
msgid "Bepo, ergonomic, Dvorak way"
msgstr "Bepo, ergonominen, Dvorak-tavalla"
-#: ../rules/base.xml.in.h:86
+#: ../rules/base.xml.in.h:97 ../rules/evdev.xml.in.h:97
msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
msgstr "Bepo, ergonominen, Dvorak-tavalla, pelkkä latin-9"
-#: ../rules/base.xml.in.h:87 ../rules/sun.xml.in.h:24
+#: ../rules/base.xml.in.h:98 ../rules/evdev.xml.in.h:98
msgid "Bgr"
msgstr "Bgr"
-#: ../rules/base.xml.in.h:88
+#: ../rules/base.xml.in.h:99 ../rules/evdev.xml.in.h:99
msgid "Bhu"
msgstr "Bhu"
-#: ../rules/base.xml.in.h:89
+#: ../rules/base.xml.in.h:100 ../rules/evdev.xml.in.h:100
msgid "Bhutan"
msgstr "Bhutan"
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:101 ../rules/evdev.xml.in.h:101
msgid "Biblical Hebrew (Tiro)"
msgstr "Raamatullinen Heprea (Tiro)"
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:102 ../rules/evdev.xml.in.h:102
msgid "Bih"
msgstr "Bih"
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:103 ../rules/evdev.xml.in.h:103
msgid "Blr"
msgstr "Blr"
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:104 ../rules/evdev.xml.in.h:104
msgid "Bosnia and Herzegovina"
msgstr "Bosnia-Hertsegovina"
-#: ../rules/base.xml.in.h:94
-msgid "Both Alt keys together change layout."
-msgstr "Molemmat Alt-näppäimet yhdessä vaihtavat asettelua."
+#: ../rules/base.xml.in.h:105 ../rules/evdev.xml.in.h:105
+msgid "Both Alt keys together"
+msgstr "Molemmat Alt-näppäimet"
-#: ../rules/base.xml.in.h:95
-msgid "Both Ctrl keys together change layout."
-msgstr "Molemmat Ctrl-näppäimet yhdessä vaihtavat asettelua."
+#: ../rules/base.xml.in.h:106 ../rules/evdev.xml.in.h:106
+msgid "Both Ctrl keys together"
+msgstr "Molemmat Ctrl-näppäimet"
-#: ../rules/base.xml.in.h:96
-msgid "Both Shift keys together change layout."
-msgstr "Molemmat Shift-näppäimet yhdessä vaihtavat asettelua."
+#: ../rules/base.xml.in.h:107 ../rules/evdev.xml.in.h:107
+msgid "Both Shift keys together"
+msgstr "Molemmat Shift-näppäimet"
-#: ../rules/base.xml.in.h:97
-msgid "Both Win-keys switch layout while pressed."
-msgstr "Molemmat Win-näppäimet vaihtavat asettelua painettaessa."
-
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:108 ../rules/evdev.xml.in.h:108
msgid "Bra"
msgstr "Bra"
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:109 ../rules/evdev.xml.in.h:109
msgid "Braille"
msgstr "Braille"
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:110 ../rules/evdev.xml.in.h:110
msgid "Brazil"
msgstr "Brasilia"
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:111 ../rules/evdev.xml.in.h:111
msgid "Brazilian ABNT2"
msgstr "Brasilialainen ABNT2"
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:112 ../rules/evdev.xml.in.h:112
+msgid "Breton"
+msgstr "Bretoni"
+
+#: ../rules/base.xml.in.h:113 ../rules/evdev.xml.in.h:113
msgid "Brl"
msgstr "Brl"
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:114 ../rules/evdev.xml.in.h:114
msgid "Brother Internet Keyboard"
msgstr "Brother-Internet-näppäimistö"
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:115 ../rules/evdev.xml.in.h:115
msgid "Buckwalter"
msgstr "Buckwalter"
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:116 ../rules/evdev.xml.in.h:116
msgid "Bulgaria"
msgstr "Bulgaria"
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:117 ../rules/evdev.xml.in.h:117
+msgid "CRULP"
+msgstr "CRULP"
+
+#: ../rules/base.xml.in.h:118 ../rules/evdev.xml.in.h:118
msgid "Cambodia"
msgstr "Kambodža"
-#: ../rules/base.xml.in.h:107 ../rules/sun.xml.in.h:29
+#: ../rules/base.xml.in.h:119 ../rules/evdev.xml.in.h:119
msgid "Can"
msgstr "Can"
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:120 ../rules/evdev.xml.in.h:120
msgid "Canada"
msgstr "Kanada"
-#: ../rules/base.xml.in.h:109
-msgid "Caps Lock is Compose."
-msgstr "Caps Lock on Compose."
+#: ../rules/base.xml.in.h:121 ../rules/evdev.xml.in.h:121
+msgid "Caps Lock"
+msgstr "Caps Lock"
-#: ../rules/base.xml.in.h:110
-msgid "CapsLock LED shows alternative layout."
-msgstr "CapsLock-ledi näyttää vaihtoehtoista asettelua."
+#: ../rules/base.xml.in.h:122 ../rules/evdev.xml.in.h:122
+msgid "CapsLock"
+msgstr "CapsLock"
-#: ../rules/base.xml.in.h:111
-msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
-msgstr "CapsLock toimii lukitsevana Shiftinä. Shift kumoaa CapsLockin."
+#: ../rules/base.xml.in.h:123 ../rules/evdev.xml.in.h:123
+msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
+msgstr "CapsLock (ensimmäiselle tasolle), Shift+CapsLock (viimeiselle tasolle)"
-#: ../rules/base.xml.in.h:112
-msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
-msgstr "CapsLock toimii lukitsevana Shiftinä. Shift ei kumoa CapsLockia."
+#: ../rules/base.xml.in.h:124 ../rules/evdev.xml.in.h:124
+msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
+msgstr "CapsLock (painettaessa), Alt+CapsLock tekee normaalin CapsLock-toiminnon"
-#: ../rules/base.xml.in.h:113
-msgid "CapsLock just locks the Shift modifier."
-msgstr "CapsLock vain lukitsee Shift-muunnoksen."
+#: ../rules/base.xml.in.h:125 ../rules/evdev.xml.in.h:125
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
+msgstr "CapsLock toimii lukitsevana Shiftinä. Shift kumoaa CapsLockin"
-#: ../rules/base.xml.in.h:114 ../rules/sun.xml.in.h:33
+#: ../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 "CapsLock toimii lukitsevana Shiftinä. Shift ei kumoa CapsLockia"
+
+#: ../rules/base.xml.in.h:127 ../rules/evdev.xml.in.h:127
msgid "CapsLock key behavior"
msgstr "CapsLock-näppäimen toiminta"
-#: ../rules/base.xml.in.h:115
-msgid "CapsLock key changes layout."
-msgstr "CapsLock-näppäin vaihtaa asettelua."
-
-#: ../rules/base.xml.in.h:116
-msgid "CapsLock toggles Shift so all keys are affected."
-msgstr "CapsLock vaihtaa Shiftiä vaikuttaen kaikkiin näppäimiin."
+#: ../rules/base.xml.in.h:128 ../rules/evdev.xml.in.h:128
+msgid "CapsLock toggles Shift so all keys are affected"
+msgstr "CapsLock vaihtaa Shiftiä vaikuttaen kaikkiin näppäimiin"
-#: ../rules/base.xml.in.h:117
-msgid "CapsLock toggles normal capitalization of alphabetic characters."
-msgstr "CapsLock vaihtaa normaalin suuraakkostuksen aakkosille."
+#: ../rules/base.xml.in.h:129 ../rules/evdev.xml.in.h:129
+msgid "CapsLock toggles normal capitalization of alphabetic characters"
+msgstr "CapsLock vaihtaa normaalin suuraakkostuksen aakkosille"
-#: ../rules/base.xml.in.h:118
-msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
-msgstr "CapsLock käyttää sisäistä suuraakkostusta. Shift peruu CapsLockin."
+#: ../rules/base.xml.in.h:130 ../rules/evdev.xml.in.h:130
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
+msgstr "CapsLock käyttää sisäistä suuraakkostusta. Shift kumoaa CapsLockin"
-#: ../rules/base.xml.in.h:119
-msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
-msgstr "CapsLock käyttää sisäistä suuraakkostusta. Shift ei peru CapsLockia."
+#: ../rules/base.xml.in.h:131 ../rules/evdev.xml.in.h:131
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
+msgstr "CapsLock käyttää sisäistä suuraakkostusta. Shift ei kumoa CapsLockia"
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:132 ../rules/evdev.xml.in.h:132
msgid "Catalan variant with middle-dot L"
msgstr "Katalaani-vaihtoehto keskipilkullisella L-kirjaimella"
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:133 ../rules/evdev.xml.in.h:133
+msgid "Cedilla"
+msgstr "Sedilji"
+
+#: ../rules/base.xml.in.h:134 ../rules/evdev.xml.in.h:134
msgid "Che"
msgstr "Che"
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:135 ../rules/evdev.xml.in.h:135
+msgid "Cherokee"
+msgstr "Cherokee"
+
+#: ../rules/base.xml.in.h:136 ../rules/evdev.xml.in.h:136
msgid "Cherry Blue Line CyBo@rd"
msgstr "Cherry Blue Line CyBo@rd"
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:137 ../rules/evdev.xml.in.h:137
msgid "Cherry Blue Line CyBo@rd (alternate option)"
msgstr "Cherry Blue Line CyBo@rd (vaihtoehtoinen valinta)"
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:138 ../rules/evdev.xml.in.h:138
msgid "Cherry CyBo@rd USB-Hub"
msgstr "Cherry CyBo@rd USB-Hub"
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:139 ../rules/evdev.xml.in.h:139
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Expert"
+
+#: ../rules/base.xml.in.h:140 ../rules/evdev.xml.in.h:140
msgid "Cherry CyMotion Master Linux"
msgstr "Cherry CyMotion Master Linux"
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:141 ../rules/evdev.xml.in.h:141
msgid "Cherry CyMotion Master XPress"
msgstr "Cherry CyMotion Master XPress"
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:142 ../rules/evdev.xml.in.h:142
msgid "Chicony Internet Keyboard"
msgstr "Chicony-Internet-näppäimistö"
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:143 ../rules/evdev.xml.in.h:143
msgid "Chicony KB-9885"
msgstr "Chicony KB-9885"
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:144 ../rules/evdev.xml.in.h:144
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
+
+#: ../rules/base.xml.in.h:145 ../rules/evdev.xml.in.h:145
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0420"
+
+#: ../rules/base.xml.in.h:146 ../rules/evdev.xml.in.h:146
msgid "China"
msgstr "Kiina"
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:147 ../rules/evdev.xml.in.h:147
msgid "Chuvash"
msgstr "Chuvash"
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:148 ../rules/evdev.xml.in.h:148
msgid "Chuvash Latin"
msgstr "Chuvash latinalainen"
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:149 ../rules/evdev.xml.in.h:149
+msgid "Classic"
+msgstr "Perinteinen"
+
+#: ../rules/base.xml.in.h:150 ../rules/evdev.xml.in.h:150
msgid "Classic Dvorak"
msgstr "Perinteinen dvorak"
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:151 ../rules/evdev.xml.in.h:151
msgid "Classmate PC"
msgstr "Classmate PC"
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:152 ../rules/evdev.xml.in.h:152
msgid "CloGaelach"
msgstr "CloGaelach"
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:153 ../rules/evdev.xml.in.h:153
msgid "Colemak"
msgstr "Colemak"
-#: ../rules/base.xml.in.h:136
-msgid "Commabelow"
-msgstr "Commabelow"
-
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:154 ../rules/evdev.xml.in.h:154
msgid "Compaq Easy Access Keyboard"
msgstr "Compaq Easy Access -näppäimistö"
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:155 ../rules/evdev.xml.in.h:155
msgid "Compaq Internet Keyboard (13 keys)"
msgstr "Compaq-Internet-näppäimistö (13 näppäintä)"
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:156 ../rules/evdev.xml.in.h:156
msgid "Compaq Internet Keyboard (18 keys)"
msgstr "Compaq-Internet-näppäimistö (18 näppäintä)"
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:157 ../rules/evdev.xml.in.h:157
msgid "Compaq Internet Keyboard (7 keys)"
msgstr "Compaq-Internet-näppäimistö (7 näppäintä)"
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:158 ../rules/evdev.xml.in.h:158
msgid "Compaq iPaq Keyboard"
msgstr "Compaq iPaq-näppäimistö"
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:159 ../rules/evdev.xml.in.h:159
msgid "Compose key position"
msgstr "Compose-näppäimen sijainti"
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:160 ../rules/evdev.xml.in.h:160
msgid "Congo, Democratic Republic of the"
msgstr "Kongon tasavalta"
-#: ../rules/base.xml.in.h:144
-msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
-msgstr "Contol on liitetty Win-näppäimiin (ja Control-näppäimiin)."
+#: ../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 "Contol on liitetty Alt-näppäimiin, Alt Win-näppäimiin"
-#: ../rules/base.xml.in.h:145
+#: ../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 "Contol on liitetty Win-näppäimiin (ja tavalliset Ctrl-näppämet)"
+
+#: ../rules/base.xml.in.h:163 ../rules/evdev.xml.in.h:163
msgid "Croatia"
msgstr "Kroatia"
-#: ../rules/base.xml.in.h:146
-msgid "Ctrl key at bottom left"
-msgstr "Ctrl-näppäin alhaalla vasemmalla"
-
-#: ../rules/base.xml.in.h:147
-msgid "Ctrl key at left of 'A'"
-msgstr "Ctrl-näppäin \"A\"-näppäimestä vasemmalla"
-
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:164 ../rules/evdev.xml.in.h:164
msgid "Ctrl key position"
msgstr "Ctrl-näppäimen sijainti"
-#: ../rules/base.xml.in.h:149
-msgid "Ctrl+Shift change layout."
-msgstr "Ctrl+Shift vaihtaa asettelua."
+#: ../rules/base.xml.in.h:165 ../rules/evdev.xml.in.h:165
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:166 ../rules/evdev.xml.in.h:166
msgid "Cyrillic"
msgstr "Kyrillinen"
-#: ../rules/base.xml.in.h:151 ../rules/sun.xml.in.h:39
+#: ../rules/base.xml.in.h:167 ../rules/evdev.xml.in.h:167
+msgid "Cyrillic with guillemets"
+msgstr "Kyrillinen guillemot-lainausmerkeillä"
+
+#: ../rules/base.xml.in.h:168 ../rules/evdev.xml.in.h:168
+msgid "Cyrillic, Z and ZHE swapped"
+msgstr "Kyrillinen, Z ja ZHE vaihdettu"
+
+#: ../rules/base.xml.in.h:169 ../rules/evdev.xml.in.h:169
msgid "Cze"
msgstr "Cze"
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:170 ../rules/evdev.xml.in.h:170
msgid "Czechia"
msgstr "Tšekki"
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:171 ../rules/evdev.xml.in.h:171
msgid "DRC"
msgstr "DRC"
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:172 ../rules/evdev.xml.in.h:172
msgid "DTK2000"
msgstr "DTK2000"
-#: ../rules/base.xml.in.h:155 ../rules/sun.xml.in.h:42
+#: ../rules/base.xml.in.h:173 ../rules/evdev.xml.in.h:173
+msgid "Dan"
+msgstr "Dan"
+
+#: ../rules/base.xml.in.h:174 ../rules/evdev.xml.in.h:174
msgid "Dead acute"
msgstr "Kuollut akuutti"
-#: ../rules/base.xml.in.h:156 ../rules/sun.xml.in.h:43
+#: ../rules/base.xml.in.h:175 ../rules/evdev.xml.in.h:175
msgid "Dead grave acute"
msgstr "Kuollut gravis"
-#: ../rules/base.xml.in.h:157
-msgid "Default numeric keypad keys."
-msgstr "Oletussormionäppäimet."
+#: ../rules/base.xml.in.h:176 ../rules/evdev.xml.in.h:176
+msgid "Default numeric keypad keys"
+msgstr "Oletussormionäppäimet"
-#: ../rules/base.xml.in.h:158
+#: ../rules/base.xml.in.h:177 ../rules/evdev.xml.in.h:177
msgid "Dell"
msgstr "Dell"
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:178 ../rules/evdev.xml.in.h:178
msgid "Dell 101-key PC"
msgstr "Dell 101-näppäiminen PC"
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:179 ../rules/evdev.xml.in.h:179
msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
msgstr "Kannettava Dell Inspiron 6xxx/8xxx"
-#: ../rules/base.xml.in.h:161
+#: ../rules/base.xml.in.h:180 ../rules/evdev.xml.in.h:180
msgid "Dell Laptop/notebook Precision M series"
msgstr "Kannettava Dell Precision M -sarja"
-#: ../rules/base.xml.in.h:162
+#: ../rules/base.xml.in.h:181 ../rules/evdev.xml.in.h:181
msgid "Dell Latitude series laptop"
msgstr "Kannettava Dell Latitude-sarja"
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:182 ../rules/evdev.xml.in.h:182
msgid "Dell Precision M65"
msgstr "Dell Precision M65"
-#: ../rules/base.xml.in.h:164
-msgid "Dell USB Multimedia Keybard"
+#: ../rules/base.xml.in.h:183 ../rules/evdev.xml.in.h:183
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
+
+#: ../rules/base.xml.in.h:184 ../rules/evdev.xml.in.h:184
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
+
+#: ../rules/base.xml.in.h:185 ../rules/evdev.xml.in.h:185
+msgid "Dell USB Multimedia Keyboard"
msgstr "Dell USB -multimedianäppäimistö"
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:186 ../rules/evdev.xml.in.h:186
msgid "Denmark"
msgstr "Tanska"
-#: ../rules/base.xml.in.h:166 ../rules/sun.xml.in.h:44
+#: ../rules/base.xml.in.h:187 ../rules/evdev.xml.in.h:187
msgid "Deu"
msgstr "Deu"
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:188 ../rules/evdev.xml.in.h:188
msgid "Dexxa Wireless Desktop Keyboard"
msgstr "Dexxa-langaton työpöytänäppäimistö"
-#: ../rules/base.xml.in.h:168
+#: ../rules/base.xml.in.h:189 ../rules/evdev.xml.in.h:189
msgid "Diamond 9801 / 9802 series"
msgstr "Diamond 9801/9802-sarja"
-#: ../rules/base.xml.in.h:169 ../rules/sun.xml.in.h:46
-msgid "Dnk"
-msgstr "Dnk"
-
-#: ../rules/base.xml.in.h:170 ../rules/sun.xml.in.h:48
+#: ../rules/base.xml.in.h:190 ../rules/evdev.xml.in.h:190
msgid "Dvorak"
msgstr "Dvorak"
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:191 ../rules/evdev.xml.in.h:191
+msgid "Dvorak (UK Punctuation)"
+msgstr "Dvorak (UK-pilkutus)"
+
+#: ../rules/base.xml.in.h:192 ../rules/evdev.xml.in.h:192
+msgid "Dvorak international"
+msgstr "Dvorak kansainvälinen"
+
+#: ../rules/base.xml.in.h:193 ../rules/evdev.xml.in.h:193
msgid "Dvorak, Polish quotes on key \"1/!\""
msgstr "Dvorak, puolalaiset lainausmerkit \"1/!\"-näppäimistä"
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:194 ../rules/evdev.xml.in.h:194
msgid "Dvorak, Polish quotes on quotemark key"
msgstr "Dvorak, puolalaiset lainausmerkit lainausmerkkinäppäimestä"
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:195 ../rules/evdev.xml.in.h:195
+msgid "E"
+msgstr "E"
+
+#: ../rules/base.xml.in.h:196 ../rules/evdev.xml.in.h:196
msgid "Eastern"
msgstr "Itäinen"
-#: ../rules/base.xml.in.h:174 ../rules/sun.xml.in.h:49
+#: ../rules/base.xml.in.h:197 ../rules/evdev.xml.in.h:197
msgid "Eliminate dead keys"
msgstr "Ei kuolleita näppäimiä"
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:198 ../rules/evdev.xml.in.h:198
+msgid "Enable extra typographic characters"
+msgstr "Ota käyttöön ylimääräiset typografiset merkit"
+
+#: ../rules/base.xml.in.h:199 ../rules/evdev.xml.in.h:199
msgid "Ennyah DKB-1008"
msgstr "Ennyah DKB-1008"
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:200 ../rules/evdev.xml.in.h:200
msgid "Epo"
msgstr "Epo"
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:201 ../rules/evdev.xml.in.h:201
msgid "Ergonomic"
msgstr "ergonominen"
-#: ../rules/base.xml.in.h:178 ../rules/sun.xml.in.h:50
+#: ../rules/base.xml.in.h:202 ../rules/evdev.xml.in.h:202
msgid "Esp"
msgstr "Esp"
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:203 ../rules/evdev.xml.in.h:203
msgid "Esperanto"
msgstr "Esperanto"
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:204 ../rules/evdev.xml.in.h:204
msgid "Est"
msgstr "Est"
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:205 ../rules/evdev.xml.in.h:205
msgid "Estonia"
msgstr "Viro"
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:206 ../rules/evdev.xml.in.h:206
msgid "Eth"
msgstr "Eth"
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:207 ../rules/evdev.xml.in.h:207
msgid "Ethiopia"
msgstr "Etiopia"
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:208 ../rules/evdev.xml.in.h:208
msgid "Evdev-managed keyboard"
msgstr "Evdev-hallittu näppäimistö"
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:209 ../rules/evdev.xml.in.h:209
msgid "Everex STEPnote"
msgstr "Everex STEPnote"
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:210 ../rules/evdev.xml.in.h:210
msgid "Ewe"
msgstr "Ewe"
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:211 ../rules/evdev.xml.in.h:211
msgid "Extended"
msgstr "Laajennettu"
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:212 ../rules/evdev.xml.in.h:212
msgid "Extended Backslash"
msgstr "Laajennettu kenoviiva"
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:213 ../rules/evdev.xml.in.h:213
msgid "F-letter (F) variant"
msgstr "F-kirjainmuunnos (F)"
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:214 ../rules/evdev.xml.in.h:214
+msgid "FL90"
+msgstr "FL90"
+
+#: ../rules/base.xml.in.h:215 ../rules/evdev.xml.in.h:215
msgid "Fao"
msgstr "Fao"
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:216 ../rules/evdev.xml.in.h:216
msgid "Faroe Islands"
msgstr "Färsaaret"
-#: ../rules/base.xml.in.h:192 ../rules/sun.xml.in.h:51
+#: ../rules/base.xml.in.h:217 ../rules/evdev.xml.in.h:217
msgid "Fin"
msgstr "Fin"
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:218 ../rules/evdev.xml.in.h:218
msgid "Finland"
msgstr "Suomi"
#. This assumes the KP_ abstract symbols are actually useful for some apps
#. The description needs to be rewritten
-#: ../rules/base.xml.in.h:196
+#: ../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:197
+#: ../rules/base.xml.in.h:222 ../rules/evdev.xml.in.h:222
msgid "Four-level key with comma"
msgstr ""
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:223 ../rules/evdev.xml.in.h:223
msgid "Four-level key with dot"
msgstr ""
-#: ../rules/base.xml.in.h:199
+#: ../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:200 ../rules/sun.xml.in.h:53
+#: ../rules/base.xml.in.h:226 ../rules/evdev.xml.in.h:226
msgid "Fra"
msgstr "Fra"
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:227 ../rules/evdev.xml.in.h:227
msgid "France"
msgstr "Ranska"
-#: ../rules/base.xml.in.h:202 ../rules/sun.xml.in.h:55
+#: ../rules/base.xml.in.h:228 ../rules/evdev.xml.in.h:228
msgid "French"
msgstr "Ranskalainen"
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:229 ../rules/evdev.xml.in.h:229
msgid "French (Macintosh)"
msgstr "Ranskalainen (Macintosh)"
-#: ../rules/base.xml.in.h:204 ../rules/sun.xml.in.h:56
+#: ../rules/base.xml.in.h:230 ../rules/evdev.xml.in.h:230
msgid "French (legacy)"
msgstr "Ranskalainen (vanha)"
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:231 ../rules/evdev.xml.in.h:231
msgid "French Dvorak"
msgstr "Ranskalainen dvorak"
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:232 ../rules/evdev.xml.in.h:232
msgid "French, Sun dead keys"
msgstr "Ranskalainen, Sunin kuolleet näppäimet"
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:233 ../rules/evdev.xml.in.h:233
msgid "French, eliminate dead keys"
msgstr "Ranskalainen, ei kuolleita näppäimiä"
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:234 ../rules/evdev.xml.in.h:234
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Fujitsu-Siemens Computers AMILO-kannettava"
+
+#: ../rules/base.xml.in.h:235 ../rules/evdev.xml.in.h:235
msgid "Fula"
msgstr "Fula"
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:236 ../rules/evdev.xml.in.h:236
msgid "GBr"
msgstr "GBr"
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:237 ../rules/evdev.xml.in.h:237
msgid "Ga"
msgstr "Ga"
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:238 ../rules/evdev.xml.in.h:238
msgid "Generic 101-key PC"
msgstr "Yleinen 101-näppäiminen PC"
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:239 ../rules/evdev.xml.in.h:239
msgid "Generic 102-key (Intl) PC"
msgstr "Yleinen 102-näppäiminen (kansainvälinen) PC"
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:240 ../rules/evdev.xml.in.h:240
msgid "Generic 104-key PC"
msgstr "Yleinen 104-näppäiminen PC"
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:241 ../rules/evdev.xml.in.h:241
msgid "Generic 105-key (Intl) PC"
msgstr "Yleinen 105-näppäiminen (kansainvälinen) PC"
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:242 ../rules/evdev.xml.in.h:242
msgid "Genius Comfy KB-12e"
msgstr "Genius Comfy KB-21e"
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:243 ../rules/evdev.xml.in.h:243
msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
msgstr "Genius Comfy KB-16M / Genius MM-näppäimistö KWD-910"
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:244 ../rules/evdev.xml.in.h:244
msgid "Genius Comfy KB-21e-Scroll"
msgstr "Genius Comfy KB-21e-rulla"
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:245 ../rules/evdev.xml.in.h:245
msgid "Genius KB-19e NB"
msgstr "Genius KB-19e NB"
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:246 ../rules/evdev.xml.in.h:246
msgid "Geo"
msgstr "Geo"
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:247 ../rules/evdev.xml.in.h:247
msgid "Georgia"
msgstr "Georgia"
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:248 ../rules/evdev.xml.in.h:248
msgid "Georgian"
msgstr "Georgia"
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:249 ../rules/evdev.xml.in.h:249
+msgid "Georgian AZERTY Tskapo"
+msgstr "Georgian AZERTY Tskapo"
+
+#: ../rules/base.xml.in.h:250 ../rules/evdev.xml.in.h:250
msgid "German (Macintosh)"
msgstr "Saksalainen (Macintosh)"
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:251 ../rules/evdev.xml.in.h:251
msgid "German, Sun dead keys"
msgstr "Saksalainen, Sunin kuolleet näppäimet"
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:252 ../rules/evdev.xml.in.h:252
msgid "German, eliminate dead keys"
msgstr "Saksalainen, ei kuolleita näppäimiä"
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:253 ../rules/evdev.xml.in.h:253
msgid "Germany"
msgstr "Saksa"
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:254 ../rules/evdev.xml.in.h:254
msgid "Gha"
msgstr "Gha"
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:255 ../rules/evdev.xml.in.h:255
msgid "Ghana"
msgstr "Ghana"
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:256 ../rules/evdev.xml.in.h:256
msgid "Gre"
msgstr "Gre"
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:257 ../rules/evdev.xml.in.h:257
msgid "Greece"
msgstr "Kreikka"
-#: ../rules/base.xml.in.h:230
+#: ../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:231
+#: ../rules/base.xml.in.h:260 ../rules/evdev.xml.in.h:260
msgid "Guinea"
msgstr "Guinea"
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:261 ../rules/evdev.xml.in.h:261
msgid "Gujarati"
msgstr "Gujarati"
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:262 ../rules/evdev.xml.in.h:262
msgid "Gurmukhi"
msgstr "Gurmukhi"
-# Lienee merkki
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:263 ../rules/evdev.xml.in.h:263
+msgid "Gurmukhi Jhelum"
+msgstr "Gurmukhi Jhelum"
+
+# Lienee tuotemerkki
+#: ../rules/base.xml.in.h:264 ../rules/evdev.xml.in.h:264
msgid "Gyration"
msgstr "Gyration"
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:265 ../rules/evdev.xml.in.h:265
msgid "Happy Hacking Keyboard"
msgstr "Happy Hacking -näppäimistö"
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:266 ../rules/evdev.xml.in.h:266
msgid "Happy Hacking Keyboard for Mac"
msgstr "Happy Hacking -näppäimistö, Mac-versio"
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:267 ../rules/evdev.xml.in.h:267
msgid "Hausa"
msgstr "Hausa"
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:268 ../rules/evdev.xml.in.h:268
msgid "Hewlett-Packard Internet Keyboard"
msgstr "Hewlett-Packard-Internet-näppäimistö"
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:269 ../rules/evdev.xml.in.h:269
msgid "Hewlett-Packard Omnibook 500 FA"
msgstr "Hewlett-Packard Omnibook 500 FA"
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:270 ../rules/evdev.xml.in.h:270
msgid "Hewlett-Packard Omnibook 5xx"
msgstr "Hewlett-Packard Omnibook 5xx"
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:271 ../rules/evdev.xml.in.h:271
msgid "Hewlett-Packard Omnibook 6000/6100"
msgstr "Hewlett-Packard Omnibook 6000/6100"
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:272 ../rules/evdev.xml.in.h:272
msgid "Hewlett-Packard Omnibook XE3 GC"
msgstr "Hewlett-Packard Omnibook XE3 GC"
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:273 ../rules/evdev.xml.in.h:273
msgid "Hewlett-Packard Omnibook XE3 GF"
msgstr "Hewlett-Packard Omnibook XE3 GF"
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:274 ../rules/evdev.xml.in.h:274
msgid "Hewlett-Packard Omnibook XT1000"
msgstr "Hewlett-Packard Omnibook XT1000"
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:275 ../rules/evdev.xml.in.h:275
msgid "Hewlett-Packard Pavilion ZT11xx"
msgstr "Hewlett-Packard Pavilion ZT11xx"
-#: ../rules/base.xml.in.h:246
-msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-2501-multimedianäppäimistö"
+#: ../rules/base.xml.in.h:276 ../rules/evdev.xml.in.h:276
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
+
+#: ../rules/base.xml.in.h:277 ../rules/evdev.xml.in.h:277
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-250x-multimedianäppäimistö"
-#: ../rules/base.xml.in.h:247
-msgid "Hewlett-Packard SK-2505 Internet Keyboard"
-msgstr "Hewlett-Packard SK-2505-Internet-näppäimistö"
+#: ../rules/base.xml.in.h:278 ../rules/evdev.xml.in.h:278
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:279 ../rules/evdev.xml.in.h:279
+msgid "Hexadecimal"
+msgstr "Heksadesimaali"
+
+#: ../rules/base.xml.in.h:280 ../rules/evdev.xml.in.h:280
msgid "Hindi Bolnagri"
msgstr "Hindi Bolnagri"
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:281 ../rules/evdev.xml.in.h:281
+msgid "Homophonic"
+msgstr "Homofoninen"
+
+#: ../rules/base.xml.in.h:282 ../rules/evdev.xml.in.h:282
msgid "Honeywell Euroboard"
msgstr "Honeywell Euroboard"
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:283 ../rules/evdev.xml.in.h:283
msgid "Hrv"
msgstr "Hrv"
-#: ../rules/base.xml.in.h:251 ../rules/sun.xml.in.h:59
+#: ../rules/base.xml.in.h:284 ../rules/evdev.xml.in.h:284
msgid "Hun"
msgstr "Hun"
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:285 ../rules/evdev.xml.in.h:285
msgid "Hungary"
msgstr "Unkari"
-#: ../rules/base.xml.in.h:253
-msgid "Hyper is mapped to the Win-keys."
-msgstr "Hyper tulee Win-näppäimistä."
+#: ../rules/base.xml.in.h:286 ../rules/evdev.xml.in.h:286
+msgid "Hyper is mapped to Win-keys"
+msgstr "Hyper tulee Win-näppäimistä"
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:287 ../rules/evdev.xml.in.h:287
msgid "IBM (LST 1205-92)"
msgstr "IMB (LST 1205-92)"
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:288 ../rules/evdev.xml.in.h:288
msgid "IBM Rapid Access"
msgstr "IBM Rapid Access"
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:289 ../rules/evdev.xml.in.h:289
msgid "IBM Rapid Access II"
msgstr "IBM Rapid Access II"
-#: ../rules/base.xml.in.h:257
-msgid "IBM Rapid Access II (alternate option)"
-msgstr "IBM Rapid Access II (vaihtoehtoinen)"
+#: ../rules/base.xml.in.h:290 ../rules/evdev.xml.in.h:290
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:291 ../rules/evdev.xml.in.h:291
msgid "IBM ThinkPad 560Z/600/600E/A22E"
msgstr "IBM ThinkPad 560Z/600/600E/A22E"
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:292 ../rules/evdev.xml.in.h:292
msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
msgstr "IBM ThinkPad 560Z/600/600E/A22E, kansainvälinen"
-#: ../rules/base.xml.in.h:260 ../rules/sun.xml.in.h:61
+#: ../rules/base.xml.in.h:293 ../rules/evdev.xml.in.h:293
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
+
+#: ../rules/base.xml.in.h:294 ../rules/evdev.xml.in.h:294
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+
+#: ../rules/base.xml.in.h:295 ../rules/evdev.xml.in.h:295
msgid "ISO Alternate"
msgstr "ISO vaihtoehtoinen"
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:296 ../rules/evdev.xml.in.h:296
msgid "Iceland"
msgstr "Islanti"
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:297 ../rules/evdev.xml.in.h:297
msgid "Igbo"
msgstr "Igbo"
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:298 ../rules/evdev.xml.in.h:298
+msgid "Include dead tilde"
+msgstr "Sisällytä kuollut tilde"
+
+#: ../rules/base.xml.in.h:299 ../rules/evdev.xml.in.h:299
msgid "Ind"
msgstr "Ind"
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:300 ../rules/evdev.xml.in.h:300
msgid "India"
msgstr "Intia"
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:301 ../rules/evdev.xml.in.h:301
msgid "International (AltGr dead keys)"
msgstr "Kansainvälinen (AltGr -kuolleet näppäimet)"
-#: ../rules/base.xml.in.h:266 ../rules/sun.xml.in.h:62
+#: ../rules/base.xml.in.h:302 ../rules/evdev.xml.in.h:302
msgid "International (with dead keys)"
msgstr "Kansainvälinen (ilman kuolleita näppäimiä)"
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:303 ../rules/evdev.xml.in.h:303
msgid "Inuktitut"
msgstr "Inuktitut"
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:304 ../rules/evdev.xml.in.h:304
msgid "Iran"
msgstr "Iran"
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:305 ../rules/evdev.xml.in.h:305
msgid "Iraq"
msgstr "Irak"
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:306 ../rules/evdev.xml.in.h:306
msgid "Ireland"
msgstr "Irlanti"
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:307 ../rules/evdev.xml.in.h:307
msgid "Irl"
msgstr "Irl"
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:308 ../rules/evdev.xml.in.h:308
msgid "Irn"
msgstr "Irn"
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:309 ../rules/evdev.xml.in.h:309
msgid "Irq"
msgstr "Irq"
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:310 ../rules/evdev.xml.in.h:310
msgid "Isl"
msgstr "Isl"
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:311 ../rules/evdev.xml.in.h:311
msgid "Isr"
msgstr "Isr"
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:312 ../rules/evdev.xml.in.h:312
msgid "Israel"
msgstr "Israel"
-#: ../rules/base.xml.in.h:277 ../rules/sun.xml.in.h:63
+#: ../rules/base.xml.in.h:313 ../rules/evdev.xml.in.h:313
msgid "Ita"
msgstr "Ita"
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:314 ../rules/evdev.xml.in.h:314
msgid "Italy"
msgstr "Italia"
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:315 ../rules/evdev.xml.in.h:315
msgid "Japan"
msgstr "Japani"
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:316 ../rules/evdev.xml.in.h:316
msgid "Japan (PC-98xx Series)"
msgstr "Japani (PC-98xx-sarja)"
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:317 ../rules/evdev.xml.in.h:317
msgid "Japanese 106-key"
msgstr "Japanilainen 106-näppäiminen"
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:318 ../rules/evdev.xml.in.h:318
msgid "Japanese keyboard options"
msgstr "japanilaisen näppäimistön valinnat"
-#: ../rules/base.xml.in.h:283 ../rules/sun.xml.in.h:66
+#: ../rules/base.xml.in.h:319 ../rules/evdev.xml.in.h:319
msgid "Jpn"
msgstr "Jpn"
-#: ../rules/base.xml.in.h:284
+#: ../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 "Kana"
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:322 ../rules/evdev.xml.in.h:322
msgid "Kana Lock key is locking"
msgstr "Kana, lukitusnäppäin lukitseva"
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:323 ../rules/evdev.xml.in.h:323
msgid "Kannada"
msgstr "Kannada"
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:324 ../rules/evdev.xml.in.h:324
msgid "Kashubian"
msgstr "Kashubia"
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:325 ../rules/evdev.xml.in.h:325
msgid "Kaz"
msgstr "Kaz"
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:326 ../rules/evdev.xml.in.h:326
msgid "Kazakh with Russian"
msgstr "Kazakstan venäjän kanssa"
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:327 ../rules/evdev.xml.in.h:327
msgid "Kazakhstan"
msgstr "Kazakstan"
-#: ../rules/base.xml.in.h:291
-msgid "Keypad"
-msgstr "Sormio"
+#: ../rules/base.xml.in.h:328 ../rules/evdev.xml.in.h:328
+msgid "Key to choose 3rd level"
+msgstr "Kolmannen tason valintanäppäin"
-#: ../rules/base.xml.in.h:292
-msgid "Keypad with unicode additions (arrows and math operators)"
-msgstr "Sormio unicode-lisäosilla (nuolet ja matematiikkatoiminnot)"
+#: ../rules/base.xml.in.h:329 ../rules/evdev.xml.in.h:329
+msgid "Key(s) to change layout"
+msgstr "Asettelunvaihtonäppäimet"
-#: ../rules/base.xml.in.h:293
-msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Sormio unicode-lisäosilla (nuolet ja matematiikkatoiminnot). Matematiikkatoiminnot oletustasolla."
+#: ../rules/base.xml.in.h:330 ../rules/evdev.xml.in.h:330
+msgid "Keypad"
+msgstr "Sormio"
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:331 ../rules/evdev.xml.in.h:331
msgid "Keytronic FlexPro"
msgstr "Keytronic FlexPro"
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:332 ../rules/evdev.xml.in.h:332
msgid "Khm"
msgstr "Khm"
-#: ../rules/base.xml.in.h:296
+#: ../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:297
+#: ../rules/base.xml.in.h:336 ../rules/evdev.xml.in.h:336
msgid "Korea, Republic of"
msgstr "Etelä-Korea"
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:337 ../rules/evdev.xml.in.h:337
msgid "Korean 106-key"
msgstr "Korealainen 106-näppäiminen"
-#: ../rules/base.xml.in.h:299
-msgid "Kotoistus"
-msgstr "Kotoistus"
+#: ../rules/base.xml.in.h:338 ../rules/evdev.xml.in.h:338
+msgid "Ktunaxa"
+msgstr ""
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:339 ../rules/evdev.xml.in.h:339
msgid "Kurdish, (F)"
msgstr "Kurdi, (F)"
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:340 ../rules/evdev.xml.in.h:340
msgid "Kurdish, Arabic-Latin"
msgstr "Kurdi, arabia-latinalainen"
-#: ../rules/base.xml.in.h:302
+#: ../rules/base.xml.in.h:341 ../rules/evdev.xml.in.h:341
msgid "Kurdish, Latin Alt-Q"
msgstr "Kurdi, latinalainen Alt-Q"
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:342 ../rules/evdev.xml.in.h:342
msgid "Kurdish, Latin Q"
msgstr "Kurdi, latinalainen Q"
-#: ../rules/base.xml.in.h:304
-msgid "Kyr"
-msgstr "Kyr"
-
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:343 ../rules/evdev.xml.in.h:343
msgid "Kyrgyzstan"
msgstr "Kirgisia"
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:344 ../rules/evdev.xml.in.h:344
msgid "LAm"
msgstr "LAm"
-#: ../rules/base.xml.in.h:307
-msgid "LCtrl+LShift change layout."
-msgstr "LCtrl+LShift vaihtaa ryhmää"
+#: ../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:308
+#: ../rules/base.xml.in.h:347 ../rules/evdev.xml.in.h:347
msgid "Lao"
msgstr "Lao"
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:348 ../rules/evdev.xml.in.h:348
msgid "Laos"
msgstr "Laos"
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:349 ../rules/evdev.xml.in.h:349
msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
msgstr "Kannettava Compaq (esim. Armada) kannettavan näppäimistö "
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:350 ../rules/evdev.xml.in.h:350
msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
msgstr "Kannettava Compaq (esim. Armada) Internet-näppäimistö "
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:351 ../rules/evdev.xml.in.h:351
msgid "Laptop/notebook eMachines m68xx"
msgstr "Kannettava eMachines m68xx"
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:352 ../rules/evdev.xml.in.h:352
msgid "Latin"
msgstr "Latinalainen"
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:353 ../rules/evdev.xml.in.h:353
msgid "Latin American"
msgstr "Latinalainen amerikka"
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:354 ../rules/evdev.xml.in.h:354
msgid "Latin Unicode"
msgstr "Latinalainen Unicode"
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:355 ../rules/evdev.xml.in.h:355
msgid "Latin Unicode qwerty"
msgstr "Latinalainen Unicode-qwerty"
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:356 ../rules/evdev.xml.in.h:356
msgid "Latin qwerty"
msgstr "Latinalainen qwerty"
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:357 ../rules/evdev.xml.in.h:357
+msgid "Latin unicode"
+msgstr "Latinalainen Unicode"
+
+#: ../rules/base.xml.in.h:358 ../rules/evdev.xml.in.h:358
+msgid "Latin unicode qwerty"
+msgstr "Latinalainen Unicode-qwerty"
+
+#: ../rules/base.xml.in.h:359 ../rules/evdev.xml.in.h:359
msgid "Latin with guillemets"
msgstr "Latinalainen guillemot-lainausmerkeillä"
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:360 ../rules/evdev.xml.in.h:360
msgid "Latvia"
msgstr "Latvia"
-#: ../rules/base.xml.in.h:320
-msgid "Layout switching"
-msgstr "Asettelun vaihto"
+#: ../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 "Vasen Alt"
-#: ../rules/base.xml.in.h:321
-msgid "Left Alt is swapped with left Win-key."
-msgstr "Vaihda vasen Alt-näppän vasemman Win-näppäimen kanssa."
+#: ../rules/base.xml.in.h:363 ../rules/evdev.xml.in.h:363
+msgid "Left Alt (while pressed)"
+msgstr "Vasen Alt-näppäin (painettaessa)"
-#: ../rules/base.xml.in.h:322
-msgid "Left Alt key changes layout."
-msgstr "Vasen Alt-näppäin vaihtaa asettelua."
+#: ../rules/base.xml.in.h:364 ../rules/evdev.xml.in.h:364
+msgid "Left Alt is swapped with Left Win"
+msgstr "Vaihda vasen Alt-näppän vasemman Win-näppäimen kanssa"
-#: ../rules/base.xml.in.h:323
-msgid "Left Alt key switches layout while pressed."
-msgstr "Vasen Alt-näppäin vaihtaa asettelua painettaessa."
+#: ../rules/base.xml.in.h:365 ../rules/evdev.xml.in.h:365
+msgid "Left Ctrl"
+msgstr "Vasen Ctrl"
-#: ../rules/base.xml.in.h:324
-msgid "Left Ctrl key changes layout."
-msgstr "Vasen Ctrl-näppäin vaihtaa asettelua."
+#: ../rules/base.xml.in.h:366 ../rules/evdev.xml.in.h:366
+msgid "Left Ctrl+Left Shift"
+msgstr "Vasen Ctrl+Vasen Shift"
-#: ../rules/base.xml.in.h:325
-msgid "Left Shift key changes layout."
-msgstr "Vasen Shift-näppäin vaihtaa asettelua."
+#: ../rules/base.xml.in.h:367 ../rules/evdev.xml.in.h:367
+msgid "Left Shift"
+msgstr "Vasen Shift"
-#: ../rules/base.xml.in.h:326
-msgid "Left Win-key changes layout."
-msgstr "Vasen Win-näppäin vaihtaa asettelua."
+#: ../rules/base.xml.in.h:368 ../rules/evdev.xml.in.h:368
+msgid "Left Win"
+msgstr "Vasen Win"
-#: ../rules/base.xml.in.h:327
-msgid "Left Win-key is Compose."
-msgstr "Vasen Win-näppäin on Compose."
+#: ../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 "Vasen Win (ensimmäiselle asettelulle), Oikea Win/valikko (viimeiselle asettelulle)"
-#: ../rules/base.xml.in.h:328
-msgid "Left Win-key switches layout while pressed."
-msgstr "Vasen Win-näppäin vaihtaa asettelua painettaessa."
+#: ../rules/base.xml.in.h:370 ../rules/evdev.xml.in.h:370
+msgid "Left Win (while pressed)"
+msgstr "Vasen Win (painettaessa)"
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:371 ../rules/evdev.xml.in.h:371
msgid "Left hand"
msgstr "Vasenkätinen"
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:372 ../rules/evdev.xml.in.h:372
msgid "Left handed Dvorak"
msgstr "Vasenkätinen dvorak"
-#: ../rules/base.xml.in.h:331
-msgid "Legacy Wang 724 keypad"
-msgstr "Perinteinen Wang 724 -sormio"
+#: ../rules/base.xml.in.h:373 ../rules/evdev.xml.in.h:373
+msgid "Legacy"
+msgstr "Perinteinen"
+
+#: ../rules/base.xml.in.h:374 ../rules/evdev.xml.in.h:374
+msgid "Legacy Wang 724"
+msgstr "Perinteinen Wang 724"
#. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:376 ../rules/evdev.xml.in.h:376
msgid "Legacy key with comma"
msgstr ""
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:377 ../rules/evdev.xml.in.h:377
msgid "Legacy key with dot"
msgstr ""
-#: ../rules/base.xml.in.h:335
-msgid "Legacy keypad"
-msgstr ""
+#: ../rules/base.xml.in.h:378 ../rules/evdev.xml.in.h:378
+msgid "Less-than/Greater-than"
+msgstr "Pienempi-kuin/suurempi-kuin"
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:379 ../rules/evdev.xml.in.h:379
msgid "Lithuania"
msgstr "Liettua"
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:380 ../rules/evdev.xml.in.h:380
msgid "Logitech Access Keyboard"
msgstr "Logitech Access Keyboard"
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:381 ../rules/evdev.xml.in.h:381
msgid "Logitech Cordless Desktop"
msgstr "Logitech Cordless Desktop"
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:382 ../rules/evdev.xml.in.h:382
msgid "Logitech Cordless Desktop (alternate option)"
msgstr "Logitech Cordless Desktop (vaihtoehtoinen)"
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:383 ../rules/evdev.xml.in.h:383
msgid "Logitech Cordless Desktop EX110"
msgstr "Logitech Cordless Desktop EX110"
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:384 ../rules/evdev.xml.in.h:384
msgid "Logitech Cordless Desktop LX-300"
msgstr "Logitech Cordless Desktop LX-300"
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:385 ../rules/evdev.xml.in.h:385
msgid "Logitech Cordless Desktop Navigator"
msgstr "Logitech Cordless Desktop Navigator"
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:386 ../rules/evdev.xml.in.h:386
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:387 ../rules/evdev.xml.in.h:387
msgid "Logitech Cordless Desktop Pro (alternate option2)"
msgstr "Logitech Cordless Desktop Pro (vaihtoehtoinen2)"
-#: ../rules/base.xml.in.h:344
+#: ../rules/base.xml.in.h:388 ../rules/evdev.xml.in.h:388
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:389 ../rules/evdev.xml.in.h:389
msgid "Logitech Cordless Freedom/Desktop Navigator"
msgstr "Logitech Cordless Freedom/Desktop Navigator"
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:390 ../rules/evdev.xml.in.h:390
msgid "Logitech G15 extra keys via G15daemon"
msgstr "Logitech G15 -lisänäppäimet G15daemon-ohjelmasta"
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:391 ../rules/evdev.xml.in.h:391
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech-yleisnäppäimistö"
+
+#: ../rules/base.xml.in.h:392 ../rules/evdev.xml.in.h:392
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech Internet 350 -näppämistö"
+
+#: ../rules/base.xml.in.h:393 ../rules/evdev.xml.in.h:393
msgid "Logitech Internet Keyboard"
-msgstr "Logitech Internet Keyboard"
+msgstr "Logitech Internet -näppämistö"
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:394 ../rules/evdev.xml.in.h:394
msgid "Logitech Internet Navigator Keyboard"
-msgstr "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator -näppämistö"
+
+#: ../rules/base.xml.in.h:395 ../rules/evdev.xml.in.h:395
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Media Elite -näppäimistö"
+
+#: ../rules/base.xml.in.h:396 ../rules/evdev.xml.in.h:396
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Logitech Ultra-X Cordless Media Desktop -näppäimistö"
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:397 ../rules/evdev.xml.in.h:397
msgid "Logitech Ultra-X Keyboard"
msgstr "Logitech Ultra-X-näppäimistö"
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:398 ../rules/evdev.xml.in.h:398
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge -näppäimistö"
+
+#: ../rules/base.xml.in.h:399 ../rules/evdev.xml.in.h:399
msgid "Logitech diNovo Keyboard"
msgstr "Logitech diNovo-näppäimistö"
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:400 ../rules/evdev.xml.in.h:400
msgid "Logitech iTouch"
msgstr "Logitech iTouch"
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:401 ../rules/evdev.xml.in.h:401
msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
msgstr "Logitech iTouch Cordless Keyboard (malli Y-RB6)"
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:402 ../rules/evdev.xml.in.h:402
msgid "Logitech iTouch Internet Navigator Keyboard SE"
msgstr "Logitech iTouch Internet Navigator Keyboard SE"
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:403 ../rules/evdev.xml.in.h:403
msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-#: ../rules/base.xml.in.h:354
+#: ../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:355
-msgid "Lva"
-msgstr "Lva"
-
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:407 ../rules/evdev.xml.in.h:407
msgid "MESS"
msgstr "MESS"
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:408 ../rules/evdev.xml.in.h:408
+msgid "MNE"
+msgstr "MNE"
+
+#: ../rules/base.xml.in.h:409 ../rules/evdev.xml.in.h:409
msgid "MacBook/MacBook Pro"
msgstr "MacBook/MacBook Pro"
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:410 ../rules/evdev.xml.in.h:410
msgid "MacBook/MacBook Pro (Intl)"
msgstr "MacBook/MacBook Pro (kansainvälinen)"
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:411 ../rules/evdev.xml.in.h:411
msgid "Macedonia"
msgstr "Makedonia"
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:412 ../rules/evdev.xml.in.h:412
msgid "Macintosh"
msgstr "Macintosh"
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:413 ../rules/evdev.xml.in.h:413
msgid "Macintosh Old"
msgstr "Macintosh vanha"
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:414 ../rules/evdev.xml.in.h:414
msgid "Macintosh, Sun dead keys"
msgstr "Macintosh, Sunin kuolleet näppäimet"
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:415 ../rules/evdev.xml.in.h:415
msgid "Macintosh, eliminate dead keys"
msgstr "Macintosh, ei kuolleita näppäimiä"
-#: ../rules/base.xml.in.h:364
-msgid "Make CapsLock an additional Ctrl."
-msgstr "Tee CapsLockista ylimääräinen Ctrl."
+#: ../rules/base.xml.in.h:416 ../rules/evdev.xml.in.h:416
+msgid "Make CapsLock an additional Backspace"
+msgstr "Tee CapsLockista ylimääräinen askelpalautin"
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:417 ../rules/evdev.xml.in.h:417
+msgid "Make CapsLock an additional Ctrl"
+msgstr "Tee CapsLockista ylimääräinen Ctrl"
+
+#: ../rules/base.xml.in.h:418 ../rules/evdev.xml.in.h:418
+msgid "Make CapsLock an additional ESC"
+msgstr "Tee CapsLockista ylimääräinen Esc"
+
+#: ../rules/base.xml.in.h:419 ../rules/evdev.xml.in.h:419
msgid "Mal"
msgstr "Mal"
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:420 ../rules/evdev.xml.in.h:420
msgid "Malayalam"
msgstr "Malayalam"
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:421 ../rules/evdev.xml.in.h:421
+msgid "Malayalam Lalitha"
+msgstr "Malayalam Lalitha"
+
+#: ../rules/base.xml.in.h:422 ../rules/evdev.xml.in.h:422
msgid "Maldives"
msgstr "Malediivit"
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:423 ../rules/evdev.xml.in.h:423
msgid "Malta"
msgstr "Malta"
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:424 ../rules/evdev.xml.in.h:424
msgid "Maltese keyboard with US layout"
msgstr "Maltalainen näppäimistö US-asettelulla"
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:425 ../rules/evdev.xml.in.h:425
msgid "Mao"
msgstr "Mao"
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:426 ../rules/evdev.xml.in.h:426
msgid "Maori"
msgstr "Maori"
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:427 ../rules/evdev.xml.in.h:427
msgid "Memorex MX1998"
msgstr "Memorex MX1998"
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:428 ../rules/evdev.xml.in.h:428
msgid "Memorex MX2500 EZ-Access Keyboard"
msgstr "Memorex MX2500 EZ-Access-näppäimistö"
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:429 ../rules/evdev.xml.in.h:429
msgid "Memorex MX2750"
msgstr "Memorex MX2750"
-#: ../rules/base.xml.in.h:375
-msgid "Menu is Compose."
-msgstr "Valikko on Compose."
+#: ../rules/base.xml.in.h:430 ../rules/evdev.xml.in.h:430
+msgid "Menu"
+msgstr "Valikko"
-#: ../rules/base.xml.in.h:376
-msgid "Menu key changes layout."
-msgstr "Valikkonäppäin vaihtaa asettelua."
+#: ../rules/base.xml.in.h:431 ../rules/evdev.xml.in.h:431
+msgid "Meta is mapped to Left Win"
+msgstr "Meta tulee vasemmasta Win-näppäimestä"
-#: ../rules/base.xml.in.h:377
-msgid "Meta is mapped to the Win-keys."
-msgstr "Meta tulee Win-näppäimistä."
+#: ../rules/base.xml.in.h:432 ../rules/evdev.xml.in.h:432
+msgid "Meta is mapped to Win keys"
+msgstr "Meta tulee Win-näppäimistä"
-#: ../rules/base.xml.in.h:378
-msgid "Meta is mapped to the left Win-key."
-msgstr "Meta tulee vasemmasta Win-näppäimestä."
+#: ../rules/base.xml.in.h:433 ../rules/evdev.xml.in.h:433
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Comfort Curve 2000 -näppäimistö"
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:434 ../rules/evdev.xml.in.h:434
msgid "Microsoft Internet Keyboard"
msgstr "Microsoft-Internet-näppäimistö"
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:435 ../rules/evdev.xml.in.h:435
msgid "Microsoft Internet Keyboard Pro, Swedish"
msgstr "Microsoft-Internet-näppäimistö Pro, ruotsalainen"
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:436 ../rules/evdev.xml.in.h:436
msgid "Microsoft Natural"
msgstr "Microsoft Natural"
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:437 ../rules/evdev.xml.in.h:437
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural-näppäimistö Elite"
+
+#: ../rules/base.xml.in.h:438 ../rules/evdev.xml.in.h:438
msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
msgstr "Microsoft Natural-näppäimistö Pro / Microsoft-Internet-näppäimistö Pro"
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:439 ../rules/evdev.xml.in.h:439
msgid "Microsoft Natural Keyboard Pro OEM"
msgstr "Microsoft Natural-näppäimistö Pro OEM"
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:440 ../rules/evdev.xml.in.h:440
msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
msgstr "Microsoft Natural-näppäimistö Pro USB / Microsoft-Internet-näppäimistö Pro"
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:441 ../rules/evdev.xml.in.h:441
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Microsoft Natural Wireless Ergonomic -näppäimistö 7000"
+
+#: ../rules/base.xml.in.h:442 ../rules/evdev.xml.in.h:442
msgid "Microsoft Office Keyboard"
msgstr "Microsoft Office-näppäimistö"
-#: ../rules/base.xml.in.h:386
+#: ../rules/base.xml.in.h:443 ../rules/evdev.xml.in.h:443
msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
msgstr "Microsoft-langaton multimedianäppämistö 1.0A"
-#: ../rules/base.xml.in.h:387 ../rules/sun.xml.in.h:72
+#: ../rules/base.xml.in.h:444 ../rules/evdev.xml.in.h:444
msgid "Miscellaneous compatibility options"
msgstr "Sekalaisia yhteensopivuusvalintoja"
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:445 ../rules/evdev.xml.in.h:445
msgid "Mkd"
msgstr "Mkd"
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:446 ../rules/evdev.xml.in.h:446
msgid "Mlt"
msgstr "Mlt"
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:447 ../rules/evdev.xml.in.h:447
msgid "Mmr"
msgstr "Mmr"
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:448 ../rules/evdev.xml.in.h:448
msgid "Mng"
msgstr "Mng"
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:449 ../rules/evdev.xml.in.h:449
msgid "Mongolia"
msgstr "Mongolia"
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:450 ../rules/evdev.xml.in.h:450
+msgid "Montenegro"
+msgstr "Montenegro"
+
+#: ../rules/base.xml.in.h:451 ../rules/evdev.xml.in.h:451
msgid "Morocco"
msgstr "Marokko"
-#: ../rules/base.xml.in.h:394 ../rules/sun.xml.in.h:73
+#: ../rules/base.xml.in.h:452 ../rules/evdev.xml.in.h:452
msgid "Multilingual"
msgstr "Monikielinen"
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:453 ../rules/evdev.xml.in.h:453
msgid "Multilingual, first part"
msgstr "Monikielinen, ensimmäinen osa"
-#: ../rules/base.xml.in.h:396 ../rules/sun.xml.in.h:74
+#: ../rules/base.xml.in.h:454 ../rules/evdev.xml.in.h:454
msgid "Multilingual, second part"
msgstr "Monikielinen, toinen osa"
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:455 ../rules/evdev.xml.in.h:455
msgid "Myanmar"
msgstr "Myanmar"
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:456 ../rules/evdev.xml.in.h:456
msgid "NICOLA-F style Backspace"
msgstr "NICOLA-F-tyylin Backspace"
-#: ../rules/base.xml.in.h:399
-msgid "Neostyle"
-msgstr "Neostyle"
+#: ../rules/base.xml.in.h:457 ../rules/evdev.xml.in.h:457
+msgid "NLA"
+msgstr "NLA"
-#: ../rules/base.xml.in.h:400
+#: ../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 "Neo 2"
+
+#: ../rules/base.xml.in.h:462 ../rules/evdev.xml.in.h:462
msgid "Nep"
msgstr "Nep"
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:463 ../rules/evdev.xml.in.h:463
msgid "Nepal"
msgstr "Nepal"
-#: ../rules/base.xml.in.h:402
+#: ../rules/base.xml.in.h:464 ../rules/evdev.xml.in.h:464
msgid "Netherlands"
msgstr "Alankomaat"
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:465 ../rules/evdev.xml.in.h:465
msgid "Nig"
msgstr "Nig"
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:466 ../rules/evdev.xml.in.h:466
msgid "Nigeria"
msgstr "Nigeria"
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:467 ../rules/evdev.xml.in.h:467
msgid "Nld"
msgstr "Nld"
-#: ../rules/base.xml.in.h:406 ../rules/sun.xml.in.h:75
+#: ../rules/base.xml.in.h:468 ../rules/evdev.xml.in.h:468
+msgid "Non-breakable space character at fourth level"
+msgstr "Sitova välilyöntimerkki 4. tasolla"
+
+#: ../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 "Sitova välilyöntimerkki 4. tasolla ja kapea sitova välilyöntimerkki 6. tasolla"
+
+#: ../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 "Sitova välilyöntimerkki 4. tasolla, kapea sitova välilyöntimerkki 6. tasolla (Ctrl+Shift)"
+
+#: ../rules/base.xml.in.h:471 ../rules/evdev.xml.in.h:471
+msgid "Non-breakable space character at second level"
+msgstr "Sitova välilyöntimerkki 2. tasolla"
+
+#: ../rules/base.xml.in.h:472 ../rules/evdev.xml.in.h:472
+msgid "Non-breakable space character at third level"
+msgstr "Sitova välilyöntimerkki 3. tasolla"
+
+#: ../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 "Sitova välilyöntimerkki 3. tasolla eikä mitään 4. tasolla"
+
+#: ../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 "Sitova välilyöntimerkki 3. tasolla, kapea sitova välilyöntimerkki 4. tasolla"
+
+#: ../rules/base.xml.in.h:475 ../rules/evdev.xml.in.h:475
msgid "Nor"
msgstr "Nor"
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:476 ../rules/evdev.xml.in.h:476
msgid "Northern Saami"
msgstr "Pohjoissaami"
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:477 ../rules/evdev.xml.in.h:477
msgid "Northern Saami, eliminate dead keys"
msgstr "Pohjoissaami, ei kuolleita näppäimiä"
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:478 ../rules/evdev.xml.in.h:478
msgid "Northgate OmniKey 101"
msgstr "Northgate OmniKey 101"
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:479 ../rules/evdev.xml.in.h:479
msgid "Norway"
msgstr "Norja"
-#: ../rules/base.xml.in.h:411
-msgid "NumLock LED shows alternative layout."
-msgstr "Numlock-ledi näyttää vaihtoehtoista asettelua."
+#: ../rules/base.xml.in.h:480 ../rules/evdev.xml.in.h:480
+msgid "NumLock"
+msgstr "NumLock"
-#: ../rules/base.xml.in.h:412
+#: ../rules/base.xml.in.h:481 ../rules/evdev.xml.in.h:481
msgid "Numeric keypad delete key behaviour"
msgstr "Numerosormion Del-näppäimen toiminta"
-#: ../rules/base.xml.in.h:413
-msgid "Numeric keypad keys work as with Mac."
-msgstr "Sormionäppäimet toimivat kuten Macissa."
+#: ../rules/base.xml.in.h:482 ../rules/evdev.xml.in.h:482
+msgid "Numeric keypad keys work as with Mac"
+msgstr "Sormionäppäimet toimivat kuten Macissa"
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:483 ../rules/evdev.xml.in.h:483
msgid "Numeric keypad layout selection"
msgstr "Sormion asettelun valinta"
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:484 ../rules/evdev.xml.in.h:484
msgid "OADG 109A"
msgstr "OADG 109A"
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:485 ../rules/evdev.xml.in.h:485
+msgid "OLPC"
+msgstr "OLPC"
+
+#: ../rules/base.xml.in.h:486 ../rules/evdev.xml.in.h:486
+msgid "OLPC Dari"
+msgstr "OLPC, dari"
+
+#: ../rules/base.xml.in.h:487 ../rules/evdev.xml.in.h:487
+msgid "OLPC Pashto"
+msgstr "OLPC, pashto"
+
+#: ../rules/base.xml.in.h:488 ../rules/evdev.xml.in.h:488
+msgid "OLPC Southern Uzbek"
+msgstr "OLPC, eteläinen uzbeekki"
+
+#: ../rules/base.xml.in.h:489 ../rules/evdev.xml.in.h:489
msgid "Ogham"
msgstr "Ogham"
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:490 ../rules/evdev.xml.in.h:490
msgid "Ogham IS434"
msgstr "Ogham IS434"
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:491 ../rules/evdev.xml.in.h:491
msgid "Oriya"
msgstr "Oriya"
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:492 ../rules/evdev.xml.in.h:492
msgid "Ortek MCK-800 MM/Internet keyboard"
msgstr "Ortek MCK-800 MM/Internet-näppäimistö"
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:493 ../rules/evdev.xml.in.h:493
msgid "Ossetian"
msgstr "Ossetia"
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:494 ../rules/evdev.xml.in.h:494
msgid "Ossetian, Winkeys"
msgstr "Ossetia, Win-näppäimet"
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:495 ../rules/evdev.xml.in.h:495
+msgid "Ossetian, legacy"
+msgstr "Ossetia, vanha"
+
+#: ../rules/base.xml.in.h:496 ../rules/evdev.xml.in.h:496
msgid "PC-98xx Series"
msgstr "PC-98xx-sarja"
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:497 ../rules/evdev.xml.in.h:497
msgid "Pak"
msgstr "Pak"
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:498 ../rules/evdev.xml.in.h:498
msgid "Pakistan"
msgstr "Pakistan"
-#: ../rules/base.xml.in.h:425
+#: ../rules/base.xml.in.h:499 ../rules/evdev.xml.in.h:499
msgid "Pashto"
msgstr "Pashto"
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:500 ../rules/evdev.xml.in.h:500
msgid "Pattachote"
msgstr "Pattachote"
-#: ../rules/base.xml.in.h:427 ../rules/sun.xml.in.h:78
+#: ../rules/base.xml.in.h:501 ../rules/evdev.xml.in.h:501
msgid "Phonetic"
msgstr "Foneettinen"
-#: ../rules/base.xml.in.h:428 ../rules/sun.xml.in.h:79
+#: ../rules/base.xml.in.h:502 ../rules/evdev.xml.in.h:502
msgid "Pol"
msgstr "Pol"
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:503 ../rules/evdev.xml.in.h:503
msgid "Poland"
msgstr "Puola"
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:504 ../rules/evdev.xml.in.h:504
msgid "Polytonic"
msgstr "Polytoninen"
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:505 ../rules/evdev.xml.in.h:505
msgid "Portugal"
msgstr "Portugali"
-#: ../rules/base.xml.in.h:432
-msgid "Press Left Alt key to choose 3rd level."
-msgstr "Paina vasenta Alt-näppäintä valitaksesi kolmannen tason."
-
-#: ../rules/base.xml.in.h:433
-msgid "Press Left Win-key to choose 3rd level."
-msgstr "Paina vasenta Win-näppäintä valitaksesi kolmannen tason."
-
-#: ../rules/base.xml.in.h:434
-msgid "Press Menu key to choose 3rd level."
-msgstr "Paina valikkonäppäintä valitaksesi kolmannen tason."
-
-#: ../rules/base.xml.in.h:435
-msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
-msgstr "Paina oikeaa Alt-näppäintä valitaksesi kolmannen tason, Shift-Oikea Alt on Multi_Key."
-
-#: ../rules/base.xml.in.h:436
-msgid "Press Right Alt key to choose 3rd level."
-msgstr "Paina oikeaa Alt-näppäintä valitaksesi kolmannen tason."
-
-#: ../rules/base.xml.in.h:437
-msgid "Press Right Ctrl to choose 3rd level."
-msgstr "Paina oikeaa Ctrl-näppäintä valitaksesi kolmannen tason."
-
-#: ../rules/base.xml.in.h:438
-msgid "Press Right Win-key to choose 3rd level."
-msgstr "Paina oikeaa Win-näppäintä valitaksesi kolmannen tason."
-
-#: ../rules/base.xml.in.h:439
-msgid "Press any of Alt keys to choose 3rd level."
-msgstr "Paina jotakin Alt-näppäintä valitaksesi kolmannen tason."
-
-#: ../rules/base.xml.in.h:440
-msgid "Press any of Win-keys to choose 3rd level."
-msgstr "Paina jotakin Win-näppäintä valitaksesi kolmannen tason."
-
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:506 ../rules/evdev.xml.in.h:506
msgid "Pro"
msgstr "Pro"
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:507 ../rules/evdev.xml.in.h:507
msgid "Pro Keypad"
msgstr "Pro sormio"
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:508 ../rules/evdev.xml.in.h:508
msgid "Probhat"
msgstr "Probhat"
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:509 ../rules/evdev.xml.in.h:509
+msgid "Programmer Dvorak"
+msgstr "Ohjelmoijan dvorak"
+
+#: ../rules/base.xml.in.h:510 ../rules/evdev.xml.in.h:510
msgid "Propeller Voyager (KTEZ-1000)"
msgstr "Propeller Voyager (KTEZ-1000)"
-#: ../rules/base.xml.in.h:445 ../rules/sun.xml.in.h:88
+#: ../rules/base.xml.in.h:511 ../rules/evdev.xml.in.h:511
msgid "Prt"
msgstr "Prt"
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:512 ../rules/evdev.xml.in.h:512
msgid "QTronix Scorpius 98N+"
msgstr "QTronix Scorpius 98N+"
-#: ../rules/base.xml.in.h:447
-msgid "R-Alt switches layout while pressed."
-msgstr "Oikea Alt vaihtaa asettelua painettaessa."
-
-#: ../rules/base.xml.in.h:448
-msgid "Right Alt is Compose."
-msgstr "Oikea Alt on Compose."
-
-#: ../rules/base.xml.in.h:449
-msgid "Right Alt key changes layout."
-msgstr "Oikea Alt-näppäin vaihtaa asettelua."
+#: ../rules/base.xml.in.h:513 ../rules/evdev.xml.in.h:513
+msgid "Right Alt"
+msgstr "Oikea Alt"
-#: ../rules/base.xml.in.h:450 ../rules/sun.xml.in.h:90
-msgid "Right Alt key never chooses 3rd level."
-msgstr "Oikea Alt-näppäin ei koskaan valitse kolmatta tasoa."
+#: ../rules/base.xml.in.h:514 ../rules/evdev.xml.in.h:514
+msgid "Right Alt (while pressed)"
+msgstr "Oikea Alt (painettaessa)"
-#: ../rules/base.xml.in.h:451
-msgid "Right Ctrl is Compose."
-msgstr "Oikea Ctrl on Compose."
+#: ../rules/base.xml.in.h:515 ../rules/evdev.xml.in.h:515
+msgid "Right Alt key never chooses 3rd level"
+msgstr "Oikea Alt-näppäin ei koskaan valitse kolmatta tasoa"
-#: ../rules/base.xml.in.h:452
-msgid "Right Ctrl key changes layout."
-msgstr "Oikea Ctrl-näppäin vaihtaa asettelua."
+#: ../rules/base.xml.in.h:516 ../rules/evdev.xml.in.h:516
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr "Oikea Alt, Shift-Oikea Alt on Multi_Key"
-#: ../rules/base.xml.in.h:453
-msgid "Right Ctrl key switches layout while pressed."
-msgstr "Oikea Ctrl-näppäin vaihtaa asettelua painettaessa."
+#: ../rules/base.xml.in.h:517 ../rules/evdev.xml.in.h:517
+msgid "Right Ctrl"
+msgstr "Oikea Ctrl"
-#: ../rules/base.xml.in.h:454
-msgid "Right Ctrl key works as Right Alt."
-msgstr "Oikea Ctrl-näppäin toimii oikeana Alt-näppäimenä."
+#: ../rules/base.xml.in.h:518 ../rules/evdev.xml.in.h:518
+msgid "Right Ctrl (while pressed)"
+msgstr "Oikea Ctrl (painettaessa)"
-#: ../rules/base.xml.in.h:455
-msgid "Right Shift key changes layout."
-msgstr "Oikea Shift-näppäin vaihtaa asettelua."
+#: ../rules/base.xml.in.h:519 ../rules/evdev.xml.in.h:519
+msgid "Right Ctrl as Right Alt"
+msgstr "Oikea Ctrl kuten oikea Alt"
-#: ../rules/base.xml.in.h:456
-msgid "Right Win-key changes layout."
-msgstr "Oikea Win-näppäin vaihtaa asettelua."
+#: ../rules/base.xml.in.h:520 ../rules/evdev.xml.in.h:520
+msgid "Right Shift"
+msgstr "Oikea Shift"
-#: ../rules/base.xml.in.h:457
-msgid "Right Win-key is Compose."
-msgstr "Oikea Win-näppäin on Compose."
+#: ../rules/base.xml.in.h:521 ../rules/evdev.xml.in.h:521
+msgid "Right Win"
+msgstr "Oikea Win"
-#: ../rules/base.xml.in.h:458
-msgid "Right Win-key switches layout while pressed."
-msgstr "Oikea Win-näppäin vaihtaa asettelua painettaessa."
+#: ../rules/base.xml.in.h:522 ../rules/evdev.xml.in.h:522
+msgid "Right Win (while pressed)"
+msgstr "Oikea Win (painettaessa)"
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:523 ../rules/evdev.xml.in.h:523
msgid "Right hand"
msgstr "Oikeakätinen"
-#: ../rules/base.xml.in.h:460
+#: ../rules/base.xml.in.h:524 ../rules/evdev.xml.in.h:524
msgid "Right handed Dvorak"
msgstr "Oikeakätinen dvorak"
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:525 ../rules/evdev.xml.in.h:525
msgid "Romania"
msgstr "Romania"
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:526 ../rules/evdev.xml.in.h:526
msgid "Romanian keyboard with German letters"
msgstr "Romanialainen näppäimistö saksalaisilla kirjaimilla"
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:527 ../rules/evdev.xml.in.h:527
msgid "Romanian keyboard with German letters, eliminate dead keys"
msgstr "Romanialainen näppäimistö saksalaisilla kirjaimilla, ei kuolleita näppäimiä"
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:528 ../rules/evdev.xml.in.h:528
msgid "Rou"
msgstr "Rou"
-#: ../rules/base.xml.in.h:465 ../rules/sun.xml.in.h:95
+#: ../rules/base.xml.in.h:529 ../rules/evdev.xml.in.h:529
msgid "Rus"
msgstr "Rus"
-#: ../rules/base.xml.in.h:466
+#: ../rules/base.xml.in.h:530 ../rules/evdev.xml.in.h:530
msgid "Russia"
msgstr "Venäjä"
-#: ../rules/base.xml.in.h:467 ../rules/sun.xml.in.h:96
+#: ../rules/base.xml.in.h:531 ../rules/evdev.xml.in.h:531
msgid "Russian"
msgstr "Venäläinen"
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:532 ../rules/evdev.xml.in.h:532
msgid "Russian phonetic"
msgstr "Venäläinen foneettinen"
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:533 ../rules/evdev.xml.in.h:533
+msgid "Russian phonetic Dvorak"
+msgstr "Venäläinen foneettinen dvorak"
+
+#: ../rules/base.xml.in.h:534 ../rules/evdev.xml.in.h:534
msgid "Russian phonetic, eliminate dead keys"
msgstr "Venäläinen foneettinen, ei kuolleita näppäimiä"
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:535 ../rules/evdev.xml.in.h:535
msgid "Russian with Kazakh"
msgstr "Venäjä kazakhin kanssa"
-#: ../rules/base.xml.in.h:471
-msgid "SCG"
-msgstr "SCG"
-
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:536 ../rules/evdev.xml.in.h:536
msgid "SILVERCREST Multimedia Wireless Keyboard"
msgstr "SILVERCREST langaton multimedianäppäimistö"
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:537 ../rules/evdev.xml.in.h:537
msgid "SK-1300"
msgstr "SK-1300"
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:538 ../rules/evdev.xml.in.h:538
msgid "SK-2500"
msgstr "SK-2500"
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:539 ../rules/evdev.xml.in.h:539
msgid "SK-6200"
msgstr "SK-6200"
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:540 ../rules/evdev.xml.in.h:540
msgid "SK-7100"
msgstr "SK-7100"
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:541 ../rules/evdev.xml.in.h:541
+msgid "SRB"
+msgstr "SRB"
+
+#: ../rules/base.xml.in.h:542 ../rules/evdev.xml.in.h:542
msgid "SVEN Ergonomic 2500"
msgstr "SVEN Ergonomic 2500"
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:543 ../rules/evdev.xml.in.h:543
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
+
+#: ../rules/base.xml.in.h:544 ../rules/evdev.xml.in.h:544
msgid "Samsung SDM 4500P"
msgstr "Samsung SDM 4500P"
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:545 ../rules/evdev.xml.in.h:545
msgid "Samsung SDM 4510P"
msgstr "Samsung SDM 4510P"
-#: ../rules/base.xml.in.h:480
-msgid "ScrollLock LED shows alternative layout."
-msgstr "ScrollLock-ledi näyttää vaihtoehtoista asettelua."
+#: ../rules/base.xml.in.h:546 ../rules/evdev.xml.in.h:546
+msgid "ScrollLock"
+msgstr "ScrollLock"
+
+#: ../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 "Puolipilkku kolmannella tasolla"
-#: ../rules/base.xml.in.h:481
-msgid "Serbia and Montenegro"
-msgstr "Serbia ja Montenegro "
+#: ../rules/base.xml.in.h:549 ../rules/evdev.xml.in.h:549
+msgid "Serbia"
+msgstr "Serbia"
-#: ../rules/base.xml.in.h:482
-msgid "Shift with numeric keypad keys works as in MS Windows."
-msgstr "Shift ja sormionäppäimet toimivat kuten MS Windowsissa."
+#: ../rules/base.xml.in.h:550 ../rules/evdev.xml.in.h:550
+msgid "Shift cancels CapsLock"
+msgstr "Shift kumoaa CapsLockin"
+
+#: ../rules/base.xml.in.h:551 ../rules/evdev.xml.in.h:551
+msgid "Shift does not cancel NumLock, chooses 3d level instead"
+msgstr "Shift ei kumoa CapsLockia, valitsee 3. tason sen sijaan"
+
+#: ../rules/base.xml.in.h:552 ../rules/evdev.xml.in.h:552
+msgid "Shift with numeric keypad keys works as in MS Windows"
+msgstr "Shift ja sormionäppäimet toimivat kuten MS Windowsissa"
-#: ../rules/base.xml.in.h:483
-msgid "Shift+CapsLock changes layout."
-msgstr "Shift+CapsLock vaihtaa asettelua."
+#: ../rules/base.xml.in.h:553 ../rules/evdev.xml.in.h:553
+msgid "Shift+CapsLock"
+msgstr "Shift+CapsLock"
-#: ../rules/base.xml.in.h:484
+#: ../rules/base.xml.in.h:554 ../rules/evdev.xml.in.h:554
+msgid "Simple"
+msgstr "yksinkertainen"
+
+#: ../rules/base.xml.in.h:555 ../rules/evdev.xml.in.h:555
msgid "Slovakia"
msgstr "Slovakia"
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:556 ../rules/evdev.xml.in.h:556
msgid "Slovenia"
msgstr "Slovenia"
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:557 ../rules/evdev.xml.in.h:557
msgid "South Africa"
msgstr "Etelä-Afrikka"
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:558 ../rules/evdev.xml.in.h:558
msgid "Southern Uzbek"
msgstr "Eteläinen uzbeekki"
-#: ../rules/base.xml.in.h:488
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr "Välilyönnistä tulee sitova välilyöntimerkki 4. tasolla ja kapea sitova välilyöntimerkki 6. tasolla"
-
-#: ../rules/base.xml.in.h:489
-msgid "Space key outputs non-breakable space character at fourth level."
-msgstr "Välilyönnistä tulee sitova välilyöntimerkki 4. tasolla."
-
-#: ../rules/base.xml.in.h:490
-msgid "Space key outputs non-breakable space character at second level."
-msgstr "Välilyönnistä tulee sitova välilyöntimerkki 2. tasolla."
-
-#: ../rules/base.xml.in.h:491
-msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
-msgstr "Välilyönnistä tulee sitova välilyöntimerkki 3. tasolla eikä mitään 4. tasolla."
-
-#: ../rules/base.xml.in.h:492
-msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr "Välilyönnistä tulee sitova välilyöntimerkki 3. tasolla ja kapea sitova välilyöntimerkki 4. tasolla."
-
-#: ../rules/base.xml.in.h:493
-msgid "Space key outputs non-breakable space character at third level."
-msgstr "Välilyönnistä tulee sitova välilyöntimerkki 3. tasolla."
-
-#: ../rules/base.xml.in.h:494
-msgid "Space key outputs usual space at any level."
-msgstr "Välilyönnistä tulee tavallinen välilyönti kaikilla tasoilla."
-
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:559 ../rules/evdev.xml.in.h:559
msgid "Spain"
msgstr "Espanja"
-#: ../rules/base.xml.in.h:496 ../rules/sun.xml.in.h:103
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
-msgstr "Erikoisnäppäimet (Ctrl+Alt+&lt;näppäin&gt;) käsitellään palvelimessa."
+#: ../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 "Erikoisnäppäimet (Ctrl+Alt+&lt;näppäin&gt;) käsitellään palvelimessa"
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:561 ../rules/evdev.xml.in.h:561
msgid "SrL"
msgstr "SrL"
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:562 ../rules/evdev.xml.in.h:562
msgid "Sri Lanka"
msgstr "Sri Lanka"
-#: ../rules/base.xml.in.h:499 ../rules/sun.xml.in.h:104
+#: ../rules/base.xml.in.h:563 ../rules/evdev.xml.in.h:563
msgid "Standard"
msgstr "Tavallinen"
-#: ../rules/base.xml.in.h:500
-msgid "Standard (Commabelow)"
+#: ../rules/base.xml.in.h:564 ../rules/evdev.xml.in.h:564
+msgid "Standard (Cedilla)"
msgstr "Tavallinen (Pilkku alla)"
#. RSTU 2019-91
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:566 ../rules/evdev.xml.in.h:566
msgid "Standard RSTU"
msgstr "Tavallinen RSTU"
#. RSTU 2019-91
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:568 ../rules/evdev.xml.in.h:568
msgid "Standard RSTU on Russian layout"
msgstr "Tavallinen RSTU venäläisellä asettelulla"
-#: ../rules/base.xml.in.h:505 ../rules/sun.xml.in.h:112
+#: ../rules/base.xml.in.h:569 ../rules/evdev.xml.in.h:569
+msgid "Sun Type 5/6"
+msgstr "Sun Type 5/6"
+
+#: ../rules/base.xml.in.h:570 ../rules/evdev.xml.in.h:570
msgid "Sun dead keys"
msgstr "Sunin kuolleet näppäimet"
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:571 ../rules/evdev.xml.in.h:571
msgid "Super Power Multimedia Keyboard"
msgstr "Super Power -multimedianäppäimistö"
-#: ../rules/base.xml.in.h:507
-msgid "Super is mapped to the Win-keys."
-msgstr "Super tulee Win-näppäimistä."
+#: ../rules/base.xml.in.h:572 ../rules/evdev.xml.in.h:572
+msgid "Super is mapped to Win keys"
+msgstr "Super tulee Win-näppäimistä"
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:573 ../rules/evdev.xml.in.h:573
msgid "Svdvorak"
msgstr "Svdvorak"
-#: ../rules/base.xml.in.h:509 ../rules/sun.xml.in.h:113
+#: ../rules/base.xml.in.h:574 ../rules/evdev.xml.in.h:574
msgid "Svk"
msgstr "Svk"
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:575 ../rules/evdev.xml.in.h:575
msgid "Svn"
msgstr "Svn"
-#: ../rules/base.xml.in.h:511
-msgid "Swap Ctrl and CapsLock."
-msgstr "Vaihda Ctrl ja CapsLock."
+#: ../rules/base.xml.in.h:576 ../rules/evdev.xml.in.h:576
+msgid "Swap Ctrl and CapsLock"
+msgstr "Vaihda Ctrl ja CapsLock"
-#: ../rules/base.xml.in.h:512
-msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-msgstr "Vaihda kahden näppäimen näppäinkoodin, jos ydin tunnistaa väärin Mac-näppäimistön."
+#: ../rules/base.xml.in.h:577 ../rules/evdev.xml.in.h:577
+msgid "Swap ESC and CapsLock"
+msgstr "Vaihda Esc ja CapsLock"
-#: ../rules/base.xml.in.h:513 ../rules/sun.xml.in.h:115
+#: ../rules/base.xml.in.h:578 ../rules/evdev.xml.in.h:578
msgid "Swe"
msgstr "Swe"
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:579 ../rules/evdev.xml.in.h:579
msgid "Sweden"
msgstr "Ruotsi"
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:580 ../rules/evdev.xml.in.h:580
msgid "Switzerland"
msgstr "Sveitsi"
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:581 ../rules/evdev.xml.in.h:581
msgid "Symplon PaceBook (tablet PC)"
msgstr "Symplon PaceBook (lehtiö-PC)"
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:582 ../rules/evdev.xml.in.h:582
msgid "Syr"
msgstr "Syr"
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:583 ../rules/evdev.xml.in.h:583
msgid "Syria"
msgstr "Syyria"
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:584 ../rules/evdev.xml.in.h:584
msgid "Syriac"
msgstr "Syyrialainen"
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:585 ../rules/evdev.xml.in.h:585
msgid "Syriac phonetic"
msgstr "Syyrialainen foneettinen"
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:586 ../rules/evdev.xml.in.h:586
msgid "TIS-820.2538"
msgstr "TIS-820.2538"
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:587 ../rules/evdev.xml.in.h:587
msgid "Tajikistan"
msgstr "Tadžikistan"
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:588 ../rules/evdev.xml.in.h:588
msgid "Tamil"
msgstr "Tamili"
-#: ../rules/base.xml.in.h:524
+#: ../rules/base.xml.in.h:589 ../rules/evdev.xml.in.h:589
msgid "Tamil TAB Typewriter"
msgstr "Tamili TAB Typewriter"
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:590 ../rules/evdev.xml.in.h:590
msgid "Tamil TSCII Typewriter"
msgstr "Tamili TSCII Typewriter"
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:591 ../rules/evdev.xml.in.h:591
msgid "Tamil Unicode"
msgstr "Tamili Unicode"
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:592 ../rules/evdev.xml.in.h:592
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
+
+#: ../rules/base.xml.in.h:593 ../rules/evdev.xml.in.h:593
msgid "Tatar"
msgstr "Tataari"
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:594 ../rules/evdev.xml.in.h:594
msgid "Telugu"
msgstr "Telugu"
-#: ../rules/base.xml.in.h:529
+#: ../rules/base.xml.in.h:595 ../rules/evdev.xml.in.h:595
msgid "Tha"
msgstr "Tha"
-#: ../rules/base.xml.in.h:530
+#: ../rules/base.xml.in.h:596 ../rules/evdev.xml.in.h:596
msgid "Thailand"
msgstr "Thaimaa"
-#: ../rules/base.xml.in.h:531 ../rules/sun.xml.in.h:119
-msgid "Third level choosers"
-msgstr "Kolmannnen tason valitsimet"
-
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:597 ../rules/evdev.xml.in.h:597
msgid "Tibetan"
msgstr "Tiibet"
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:598 ../rules/evdev.xml.in.h:598
msgid "Tibetan (with ASCII numerals)"
msgstr "Tiibet (ASCII-numeroilla)"
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:599 ../rules/evdev.xml.in.h:599
msgid "Tifinagh"
msgstr "Tifinagh"
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:600 ../rules/evdev.xml.in.h:600
msgid "Tifinagh Alternative"
msgstr "Tifinagh, vaihtoehtoinen"
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:601 ../rules/evdev.xml.in.h:601
msgid "Tifinagh Alternative Phonetic"
msgstr "Tifinagh, vaihtoehtoinen foneettinen"
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:602 ../rules/evdev.xml.in.h:602
msgid "Tifinagh Extended"
msgstr "Tifinagh, laajennettu"
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:603 ../rules/evdev.xml.in.h:603
msgid "Tifinagh Extended Phonetic"
msgstr "Tifinagh, laajennettu foneettinen"
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:604 ../rules/evdev.xml.in.h:604
msgid "Tifinagh Phonetic"
msgstr "Tifinagh, foneettinen"
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:605 ../rules/evdev.xml.in.h:605
msgid "Tilde (~) variant"
msgstr "Tildemuunnos (~)"
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:606 ../rules/evdev.xml.in.h:606
msgid "Tjk"
msgstr "Tjk"
-#: ../rules/base.xml.in.h:542
+#: ../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 "Toshiba Satellite S3000"
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:610 ../rules/evdev.xml.in.h:610
msgid "Trust Direct Access Keyboard"
msgstr "Trust Direct Access Keyboard"
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:611 ../rules/evdev.xml.in.h:611
msgid "Trust Wireless Keyboard Classic"
msgstr "Trust Wireless Keyboard Classic"
-#: ../rules/base.xml.in.h:545 ../rules/sun.xml.in.h:120
+#: ../rules/base.xml.in.h:612 ../rules/evdev.xml.in.h:612
msgid "Tur"
msgstr "Tur"
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:613 ../rules/evdev.xml.in.h:613
msgid "Turkey"
msgstr "Turkki"
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:614 ../rules/evdev.xml.in.h:614
msgid "Typewriter"
msgstr "Kirjoituskone"
-#: ../rules/base.xml.in.h:548 ../rules/sun.xml.in.h:124
-msgid "U.S. English"
-msgstr "Amerikanenglanti"
+#: ../rules/base.xml.in.h:615 ../rules/evdev.xml.in.h:615
+msgid "UCW layout (accented letters only)"
+msgstr ""
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:616 ../rules/evdev.xml.in.h:616
msgid "US keyboard with Bosnian digraphs"
msgstr "Yhdysvaltalainen näppäimistö bosnialaisilla merkkipareilla"
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:617 ../rules/evdev.xml.in.h:617
msgid "US keyboard with Bosnian letters"
msgstr "Yhdysvaltalainen näppäimistö bosnialaisilla kirjaimilla"
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:618 ../rules/evdev.xml.in.h:618
msgid "US keyboard with Croatian digraphs"
msgstr "Yhdysvaltalainen näppäimistö kroatialaisilla merkkipareilla"
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:619 ../rules/evdev.xml.in.h:619
msgid "US keyboard with Croatian letters"
msgstr "Yhdysvaltalainen näppäimistö kroatialaisilla kirjaimilla"
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:620 ../rules/evdev.xml.in.h:620
+msgid "US keyboard with Estonian letters"
+msgstr "Yhdysvaltalainen näppäimistö virolaisilla kirjaimilla"
+
+#: ../rules/base.xml.in.h:621 ../rules/evdev.xml.in.h:621
msgid "US keyboard with Lithuanian letters"
msgstr "Yhdysvaltalainen näppäimistö liettualaisilla kirjaimilla"
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:622 ../rules/evdev.xml.in.h:622
msgid "US keyboard with Slovenian digraphs"
msgstr "Yhdysvaltalainen näppäimistö slovenialaisilla merkkipareilla"
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:623 ../rules/evdev.xml.in.h:623
msgid "US keyboard with Slovenian letters"
msgstr "Yhdysvaltalainen näppäimistö slovenialaisilla kirjaimilla"
-#: ../rules/base.xml.in.h:556 ../rules/sun.xml.in.h:126
+#: ../rules/base.xml.in.h:624 ../rules/evdev.xml.in.h:624
msgid "USA"
msgstr "USA"
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:625 ../rules/evdev.xml.in.h:625
msgid "Udmurt"
msgstr "Udmurt"
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:626 ../rules/evdev.xml.in.h:626
msgid "Ukr"
msgstr "Ukr"
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:627 ../rules/evdev.xml.in.h:627
msgid "Ukraine"
msgstr "Ukraina"
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:628 ../rules/evdev.xml.in.h:628
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../rules/base.xml.in.h:629 ../rules/evdev.xml.in.h:629
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Unicode-lisäosat (nuolet ja matematiikkatoiminnot)"
+
+#: ../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 "Unicode-lisäosat (nuolet ja matematiikkatoiminnot). Matematiikkatoiminnot oletustasolla"
+
+#: ../rules/base.xml.in.h:631 ../rules/evdev.xml.in.h:631
msgid "UnicodeExpert"
msgstr "Unicode-asiantuntija"
-#: ../rules/base.xml.in.h:561 ../rules/sun.xml.in.h:127
+#: ../rules/base.xml.in.h:632 ../rules/evdev.xml.in.h:632
msgid "United Kingdom"
msgstr "Iso-Britannia"
-#: ../rules/base.xml.in.h:562
-msgid "Urdu"
-msgstr "Urdu"
+#: ../rules/base.xml.in.h:633 ../rules/evdev.xml.in.h:633
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:634 ../rules/evdev.xml.in.h:634
+msgid "Urdu, Alternative phonetic"
+msgstr "Urdu, vaihtoehtoinen foneettinen"
+
+#: ../rules/base.xml.in.h:635 ../rules/evdev.xml.in.h:635
+msgid "Urdu, Phonetic"
+msgstr "Urdu, foneettinen"
+
+#: ../rules/base.xml.in.h:636 ../rules/evdev.xml.in.h:636
+msgid "Urdu, Winkeys"
+msgstr "Urdu, Win-näppäimet"
+
+#: ../rules/base.xml.in.h:637 ../rules/evdev.xml.in.h:637
msgid "Use Bosnian digraphs"
msgstr "Käytä bosnialaisia merkkipareja"
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:638 ../rules/evdev.xml.in.h:638
msgid "Use Croatian digraphs"
msgstr "Käytä kroatialaisia merkkipareja"
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:639 ../rules/evdev.xml.in.h:639
msgid "Use Slovenian digraphs"
msgstr "Käytä slovenialaisia merkkipareja"
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:640 ../rules/evdev.xml.in.h:640
msgid "Use guillemets for quotes"
msgstr "Käytä guillemot-lainausmerkkejä"
-#: ../rules/base.xml.in.h:567
-msgid "Use keyboard LED to show alternative layout."
-msgstr "Käytä näppäimistö-lediä näyttämään vaihtoehtoista asettelua."
+#: ../rules/base.xml.in.h:641 ../rules/evdev.xml.in.h:641
+msgid "Use keyboard LED to show alternative layout"
+msgstr "Käytä näppäimistö-lediä näyttämään vaihtoehtoista asettelua"
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:642 ../rules/evdev.xml.in.h:642
msgid "Using space key to input non-breakable space character"
msgstr "Sitovan välilyöntimerkin syöttäminen"
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:643 ../rules/evdev.xml.in.h:643
+msgid "Usual space at any level"
+msgstr "Normaali välilyönti kaikilla tasoilla"
+
+#: ../rules/base.xml.in.h:644 ../rules/evdev.xml.in.h:644
msgid "Uzb"
msgstr "Uzb"
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:645 ../rules/evdev.xml.in.h:645
msgid "Uzbekistan"
msgstr "Uzbekistan"
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:646 ../rules/evdev.xml.in.h:646
msgid "Vietnam"
msgstr "Vietnam"
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:647 ../rules/evdev.xml.in.h:647
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "ViewSonic KU-306 Internet -näppäimistö"
+
+#: ../rules/base.xml.in.h:648 ../rules/evdev.xml.in.h:648
msgid "Vnm"
msgstr "Vnm"
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:649 ../rules/evdev.xml.in.h:649
msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
msgstr "Wang 724 -sormio Unicode-lisäyksin (nuolet sekä matematiikkaoperaatiot)"
-#: ../rules/base.xml.in.h:574
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Wang 724 -sormio Unicode-lisäyksin (nuolet sekä matematiikkaoperaatiot). Matematiikkaoperaatiot oletustasolla."
+#: ../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 "Wang 724 -sormio Unicode-lisäyksin (nuolet sekä matematiikkaoperaatiot). Matematiikkaoperaatiot oletustasolla"
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:651 ../rules/evdev.xml.in.h:651
msgid "Wang model 724 azerty"
msgstr "Wang malli 724 azerty"
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:652 ../rules/evdev.xml.in.h:652
msgid "Western"
msgstr "Läntinen"
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:653 ../rules/evdev.xml.in.h:653
msgid "Winbook Model XP5"
msgstr "Winbook Model XP5"
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:654 ../rules/evdev.xml.in.h:654
msgid "Winkeys"
msgstr "Win-näppäimet"
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:655 ../rules/evdev.xml.in.h:655
msgid "With &lt;\\|&gt; key"
msgstr "&lt;\\|&gt;-näppäimillä"
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:656 ../rules/evdev.xml.in.h:656
msgid "With EuroSign on 5"
msgstr "Euro-merkki 5-näppäimessä"
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:657 ../rules/evdev.xml.in.h:657
msgid "With guillemets"
msgstr "Guillemot-lainausmerkeillä"
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:658 ../rules/evdev.xml.in.h:658
msgid "Yahoo! Internet Keyboard"
msgstr "Yahoo!-Internet-näppäimistö"
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:659 ../rules/evdev.xml.in.h:659
+msgid "Yakut"
+msgstr "Yakut"
+
+#: ../rules/base.xml.in.h:660 ../rules/evdev.xml.in.h:660
msgid "Yoruba"
msgstr "Yoruba"
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:661 ../rules/evdev.xml.in.h:661
msgid "Z and ZHE swapped"
msgstr "Z ja ZHE vaihdettu"
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:662 ../rules/evdev.xml.in.h:662
msgid "Zar"
msgstr "Zar"
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:663 ../rules/evdev.xml.in.h:663
msgid "azerty"
msgstr "azerty"
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:664 ../rules/evdev.xml.in.h:664
msgid "azerty/digits"
msgstr "azerty/numerot"
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:665 ../rules/evdev.xml.in.h:665
msgid "digits"
msgstr "numerot"
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:666 ../rules/evdev.xml.in.h:666
msgid "displaced semicolon and quote (obsolete)"
msgstr ""
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:667 ../rules/evdev.xml.in.h:667
msgid "lyx"
msgstr "lyx"
-#: ../rules/base.xml.in.h:591 ../rules/sun.xml.in.h:132
+#: ../rules/base.xml.in.h:668 ../rules/evdev.xml.in.h:668
msgid "qwerty"
msgstr "qwerty"
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:669 ../rules/evdev.xml.in.h:669
msgid "qwerty, extended Backslash"
msgstr "qwerty, laajennettu Backslash"
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:670 ../rules/evdev.xml.in.h:670
msgid "qwerty/digits"
msgstr "qwerty/numerot"
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:671 ../rules/evdev.xml.in.h:671
msgid "qwertz"
msgstr "qwertz"
-#: ../rules/sun.xml.in.h:1
-msgid "\"Typewriter\""
-msgstr "\"Kirjoituskone\""
+#~ msgid "(Legacy) Dvorak"
+#~ msgstr "(Perinteinen) dvorak"
-#: ../rules/sun.xml.in.h:17
-msgid "Acts as Shift with locking. Shift cancels Caps."
-msgstr "Toimii lukitsevana Shiftinä. Shift kumoaa CapsLockin."
+#~ msgid "Add the EuroSign to the 2 key."
+#~ msgstr "Lisää euro-merkki 2-näppäimeen."
-#: ../rules/sun.xml.in.h:18
-msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
-msgstr "Toimii lukitsevana Shiftinä. Shift ei kumoa CapsLockia."
+#~ msgid "Add the EuroSign to the 5 key."
+#~ msgstr "Lisää euro-merkki 5-näppäimeen."
-#: ../rules/sun.xml.in.h:19
-msgid "Alt+Control changes group"
-msgstr "Alt+Ctrl vaihtaa ryhmää"
+#~ msgid "Add the EuroSign to the E key."
+#~ msgstr "Lisää euro-merkki E-näppäimeen."
-#: ../rules/sun.xml.in.h:20
-msgid "Alt+Shift changes group"
-msgstr "Alt+Shift vaihtaa ryhmää"
+#~ msgid "Alt+Ctrl change layout."
+#~ msgstr "Alt+Ctrl vaihtaa asettelua."
-#: ../rules/sun.xml.in.h:21
-msgid "Basic"
-msgstr "Perus"
+#~ msgid "Alt+Shift change layout."
+#~ msgstr "Alt+Shift vaihtaa asettelua."
-#: ../rules/sun.xml.in.h:23
-msgid "Belgian"
-msgstr "belgialainen"
+#~ msgid "Both Alt keys together change layout."
+#~ msgstr "Molemmat Alt-näppäimet yhdessä vaihtavat asettelua."
-#: ../rules/sun.xml.in.h:25
-msgid "Both Alt keys together change group"
-msgstr "Molemmat Alt-näppäimet yhdessä vaihtavat ryhmää"
+#~ msgid "Both Ctrl keys together change layout."
+#~ msgstr "Molemmat Ctrl-näppäimet yhdessä vaihtavat asettelua."
-#: ../rules/sun.xml.in.h:26
-msgid "Both Ctrl keys together change group"
-msgstr "Molemmat Ctrl-näppäimet yhdessä vaihtavat ryhmää"
+#~ msgid "Both Shift keys together change layout."
+#~ msgstr "Molemmat Shift-näppäimet yhdessä vaihtavat asettelua."
-#: ../rules/sun.xml.in.h:27
-msgid "Both Shift keys together change group"
-msgstr "Molemmat Shift-näppäimet yhdessä vaihtavat ryhmää"
+#~ msgid "Caps Lock is Compose."
+#~ msgstr "Caps Lock on Compose."
-#: ../rules/sun.xml.in.h:28
-msgid "Bulgarian"
-msgstr "bulgarialainen"
+#~ msgid "CapsLock LED shows alternative layout."
+#~ msgstr "CapsLock-ledi näyttää vaihtoehtoista asettelua."
-#: ../rules/sun.xml.in.h:30
-msgid "Canadian"
-msgstr "kanadalainen"
+#~ msgid "CapsLock just locks the Shift modifier."
+#~ msgstr "CapsLock vain lukitsee Shift-muunnoksen."
-#: ../rules/sun.xml.in.h:31
-msgid "Caps Lock is Compose"
-msgstr "Caps Lock on Compose"
+#~ msgid "CapsLock key changes layout."
+#~ msgstr "CapsLock-näppäin vaihtaa asettelua."
-#: ../rules/sun.xml.in.h:32
-msgid "Caps Lock key changes group"
-msgstr "CapsLock-näppäin vaihtaa ryhmää"
+#~ msgid "Commabelow"
+#~ msgstr "Commabelow"
-#: ../rules/sun.xml.in.h:34
-msgid "Caps_Lock LED shows alternative group"
-msgstr "CapsLock-ledi näyttää vaihtoehtoista ryhmää"
+#~ msgid "Ctrl+Shift change layout."
+#~ msgstr "Ctrl+Shift vaihtaa asettelua."
-#: ../rules/sun.xml.in.h:35
-msgid "Control Key Position"
-msgstr "Ctrl-näppäimen sijainti"
+#~ msgid "Dnk"
+#~ msgstr "Dnk"
-#: ../rules/sun.xml.in.h:36
-msgid "Control key at bottom left"
-msgstr "Ctrl-näppäin alhaalla vasemmalla"
+#~ msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+#~ msgstr "Hewlett-Packard SK-2505-Internet-näppäimistö"
-#: ../rules/sun.xml.in.h:37
-msgid "Control key at left of 'A'"
-msgstr "Ctrl-näppäin \"A\"-näppäimestä vasemmalla"
+#~ msgid "IBM Rapid Access II (alternate option)"
+#~ msgstr "IBM Rapid Access II (vaihtoehtoinen)"
-#: ../rules/sun.xml.in.h:38
-msgid "Control+Shift changes group"
-msgstr "Ctrl+Shift vaihtaa ryhmää"
+#~ msgid "Kotoistus"
+#~ msgstr "Kotoistus"
-#: ../rules/sun.xml.in.h:40
-msgid "Czech"
-msgstr "tšekkiläinen"
+#~ msgid "Kyr"
+#~ msgstr "Kyr"
-#: ../rules/sun.xml.in.h:41
-msgid "Danish"
-msgstr "tanskalainen"
+#~ msgid "LCtrl+LShift change layout."
+#~ msgstr "LCtrl+LShift vaihtaa ryhmää"
-#: ../rules/sun.xml.in.h:45
-msgid "DeuCH"
-msgstr "DeuCH"
+#~ msgid "Layout switching"
+#~ msgstr "Asettelun vaihto"
-#: ../rules/sun.xml.in.h:47
-msgid "Dvo"
-msgstr "Dvo"
+#~ msgid "Left Alt key changes layout."
+#~ msgstr "Vasen Alt-näppäin vaihtaa asettelua."
-#: ../rules/sun.xml.in.h:52
-msgid "Finnish"
-msgstr "suomalainen"
+#~ msgid "Left Alt key switches layout while pressed."
+#~ msgstr "Vasen Alt-näppäin vaihtaa asettelua painettaessa."
-#: ../rules/sun.xml.in.h:54
-msgid "FraCH"
-msgstr "FraCH"
+#~ msgid "Left Ctrl key changes layout."
+#~ msgstr "Vasen Ctrl-näppäin vaihtaa asettelua."
-#: ../rules/sun.xml.in.h:57
-msgid "German"
-msgstr "saksalainen"
+#~ msgid "Left Shift key changes layout."
+#~ msgstr "Vasen Shift-näppäin vaihtaa asettelua."
-#: ../rules/sun.xml.in.h:58
-msgid "Group Shift/Lock behavior"
-msgstr "Ryhmien vaihto ja lukitus"
+#~ msgid "Left Win-key changes layout."
+#~ msgstr "Vasen Win-näppäin vaihtaa asettelua."
-#: ../rules/sun.xml.in.h:60
-msgid "Hungarian"
-msgstr "unkarilainen"
+#~ msgid "Left Win-key is Compose."
+#~ msgstr "Vasen Win-näppäin on Compose."
-#: ../rules/sun.xml.in.h:64
-msgid "Italian"
-msgstr "italialainen"
+#~ msgid "Lva"
+#~ msgstr "Lva"
-#: ../rules/sun.xml.in.h:65
-msgid "Japanese"
-msgstr "japanilainen"
+#~ msgid "Menu is Compose."
+#~ msgstr "Valikko on Compose."
-#: ../rules/sun.xml.in.h:67
-msgid "Left Alt key changes group"
-msgstr "Vasen Alt-näppäin vaihtaa ryhmää"
+#~ msgid "Neostyle"
+#~ msgstr "Neostyle"
-#: ../rules/sun.xml.in.h:68
-msgid "Left Alt key switches group while pressed"
-msgstr "Vasen Alt-näppäin vaihtaa ryhmää painettaessa"
+#~ msgid "NumLock LED shows alternative layout."
+#~ msgstr "Numlock-ledi näyttää vaihtoehtoista asettelua."
-#: ../rules/sun.xml.in.h:69
-msgid "Left Ctrl key changes group"
-msgstr "Vasen Ctrl-näppäin vaihtaa ryhmää"
+#~ msgid "Press Left Alt key to choose 3rd level."
+#~ msgstr "Paina vasenta Alt-näppäintä valitaksesi kolmannen tason."
-#: ../rules/sun.xml.in.h:70
-msgid "Left Shift key changes group"
-msgstr "Vasen Shift-näppäin vaihtaa ryhmää"
+#~ msgid "Press Left Win-key to choose 3rd level."
+#~ msgstr "Paina vasenta Win-näppäintä valitaksesi kolmannen tason."
-#: ../rules/sun.xml.in.h:71
-msgid "Make CapsLock an additional Control"
-msgstr "Tee CapsLockista ylimääräinen Ctrl"
+#~ msgid "Press Right Alt key to choose 3rd level."
+#~ msgstr "Paina oikeaa Alt-näppäintä valitaksesi kolmannen tason."
-#: ../rules/sun.xml.in.h:76
-msgid "Norwegian"
-msgstr "norjalainen"
+#~ msgid "Press Right Ctrl to choose 3rd level."
+#~ msgstr "Paina oikeaa Ctrl-näppäintä valitaksesi kolmannen tason."
-#: ../rules/sun.xml.in.h:77
-msgid "Num_Lock LED shows alternative group"
-msgstr "Numlock-ledi näyttää vaihtoehtoista ryhmää"
+#~ msgid "Press Right Win-key to choose 3rd level."
+#~ msgstr "Paina oikeaa Win-näppäintä valitaksesi kolmannen tason."
-#: ../rules/sun.xml.in.h:80
-msgid "Polish"
-msgstr "puolalainen"
+#~ msgid "Press any of Alt keys to choose 3rd level."
+#~ msgstr "Paina jotakin Alt-näppäintä valitaksesi kolmannen tason."
-#: ../rules/sun.xml.in.h:81
-msgid "Polish with Polish quotes on key \"1/!\""
-msgstr "puolalainen, puolalaiset lainausmerkit \"1/!\"-näppäimistä"
+#~ msgid "Press any of Win-keys to choose 3rd level."
+#~ msgstr "Paina jotakin Win-näppäintä valitaksesi kolmannen tason."
-#: ../rules/sun.xml.in.h:82
-msgid "Portuguese"
-msgstr "portugalilainen"
+#~ msgid "R-Alt switches layout while pressed."
+#~ msgstr "Oikea Alt vaihtaa asettelua painettaessa."
-#: ../rules/sun.xml.in.h:83
-msgid "Press Left Alt key to choose 3rd level"
-msgstr "Paina vasenta Alt-näppäintä valitaksesi kolmannen tason"
+#~ msgid "Right Alt is Compose."
+#~ msgstr "Oikea Alt on Compose."
-#: ../rules/sun.xml.in.h:84
-msgid "Press Right Alt key to choose 3rd level"
-msgstr "Paina oikeaa Alt-näppäintä valitaksesi kolmannen tason"
+#~ msgid "Right Alt key changes layout."
+#~ msgstr "Oikea Alt-näppäin vaihtaa asettelua."
-#: ../rules/sun.xml.in.h:85
-msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
-msgstr "Paina oikeaa Alt-näppäintä valitaksesi kolmannen tason, Shift-Oikea Alt on Multi_Key"
+#~ msgid "Right Ctrl key changes layout."
+#~ msgstr "Oikea Ctrl-näppäin vaihtaa asettelua."
-#: ../rules/sun.xml.in.h:86
-msgid "Press Right Control to choose 3rd level"
-msgstr "Paina oikeaa Ctrl-näppäintä valitaksesi kolmannen tason"
+#~ msgid "Right Ctrl key switches layout while pressed."
+#~ msgstr "Oikea Ctrl-näppäin vaihtaa asettelua painettaessa."
-#: ../rules/sun.xml.in.h:87
-msgid "Press any of Alt keys to choose 3rd level"
-msgstr "Paina jotakin Alt-näppäintä valitaksesi kolmannen tason"
+#~ msgid "Right Shift key changes layout."
+#~ msgstr "Oikea Shift-näppäin vaihtaa asettelua."
-#: ../rules/sun.xml.in.h:89
-msgid "Right Alt key changes group"
-msgstr "Oikea Alt-näppäin vaihtaa ryhmää"
+#~ msgid "Right Win-key changes layout."
+#~ msgstr "Oikea Win-näppäin vaihtaa asettelua."
-#: ../rules/sun.xml.in.h:91
-msgid "Right Alt switches group while pressed"
-msgstr "Oikea Alt vaihtaa ryhmää painettaessa"
+#~ msgid "Right Win-key is Compose."
+#~ msgstr "Oikea Win-näppäin on Compose."
-#: ../rules/sun.xml.in.h:92
-msgid "Right Control key works as Right Alt"
-msgstr "Oikea Ctrl-näppäin toimii oikeana Alt-näppäimenä"
+#~ msgid "SCG"
+#~ msgstr "SCG"
-#: ../rules/sun.xml.in.h:93
-msgid "Right Ctrl key changes group"
-msgstr "Oikea Ctrl-näppäin vaihtaa ryhmää"
+#~ msgid "ScrollLock LED shows alternative layout."
+#~ msgstr "ScrollLock-ledi näyttää vaihtoehtoista asettelua."
-#: ../rules/sun.xml.in.h:94
-msgid "Right Shift key changes group"
-msgstr "Oikea Shift-näppäin vaihtaa ryhmää"
+#~ msgid "Shift+CapsLock changes layout."
+#~ msgstr "Shift+CapsLock vaihtaa asettelua."
-#: ../rules/sun.xml.in.h:97
-msgid "Scroll Lock changes group"
-msgstr "Scrolllock vaihtaa ryhmää"
+#~ msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+#~ msgstr "Vaihda kahden näppäimen näppäinkoodin, jos ydin tunnistaa väärin Mac-näppäimistön."
-#: ../rules/sun.xml.in.h:98
-msgid "Scroll_Lock LED shows alternative group"
-msgstr "Scrolllock-ledi näyttää vaihtoehtoista ryhmää"
+#~ msgid "Third level choosers"
+#~ msgstr "Kolmannnen tason valitsimet"
-#: ../rules/sun.xml.in.h:99
-msgid "Shift with numpad keys works as in MS Windows"
-msgstr "Shift ja sormionäppäimet toimivat kuten MS Windowsissa"
+#~ msgid "U.S. English"
+#~ msgstr "Amerikanenglanti"
-#: ../rules/sun.xml.in.h:100
-msgid "Shift+CapsLock changes group"
-msgstr "Shift+CapsLock vaihtaa ryhmää"
+#~ msgid "Urdu"
+#~ msgstr "Urdu"
-#: ../rules/sun.xml.in.h:101
-msgid "Slovak"
-msgstr "slovakialainen"
+#~ msgid "\"Typewriter\""
+#~ msgstr "\"Kirjoituskone\""
-#: ../rules/sun.xml.in.h:102
-msgid "Spanish"
-msgstr "espanjalainen"
+#~ msgid "Acts as Shift with locking. Shift cancels Caps."
+#~ msgstr "Toimii lukitsevana Shiftinä. Shift kumoaa CapsLockin."
-#: ../rules/sun.xml.in.h:105
-msgid "Sun Type 4"
-msgstr "Sun Type 4"
+#~ msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
+#~ msgstr "Toimii lukitsevana Shiftinä. Shift ei kumoa CapsLockia."
-#: ../rules/sun.xml.in.h:106
-msgid "Sun Type 5"
-msgstr "Sun Type 5"
+#~ msgid "Alt+Control changes group"
+#~ msgstr "Alt+Ctrl vaihtaa ryhmää"
-#: ../rules/sun.xml.in.h:107
-msgid "Sun Type 5 European"
-msgstr "Sun Type 5 eurooppalainen"
+#~ msgid "Alt+Shift changes group"
+#~ msgstr "Alt+Shift vaihtaa ryhmää"
-#: ../rules/sun.xml.in.h:108
-msgid "Sun Type 5 Unix"
-msgstr "Sun Type 5 Unix"
+#~ msgid "Basic"
+#~ msgstr "Perus"
-#: ../rules/sun.xml.in.h:109
-msgid "Sun Type 6"
-msgstr "Sun Type 6"
+#~ msgid "Belgian"
+#~ msgstr "belgialainen"
-#: ../rules/sun.xml.in.h:110
-msgid "Sun Type 6 Unix"
-msgstr "Sun Type 6 Unix"
+#~ msgid "Bulgarian"
+#~ msgstr "bulgarialainen"
-#: ../rules/sun.xml.in.h:111
-msgid "Sun Type 6 with Euro key"
-msgstr "Sun Type 6 Euro-näppäimellä"
+#~ msgid "Canadian"
+#~ msgstr "kanadalainen"
-#: ../rules/sun.xml.in.h:114
-msgid "Swap Control and Caps Lock"
-msgstr "Vaihda Ctrl ja CapsLock"
+#~ msgid "Caps Lock key changes group"
+#~ msgstr "CapsLock-näppäin vaihtaa ryhmää"
-#: ../rules/sun.xml.in.h:116
-msgid "Swedish"
-msgstr "ruotsalainen"
+#~ msgid "Caps_Lock LED shows alternative group"
+#~ msgstr "CapsLock-ledi näyttää vaihtoehtoista ryhmää"
-#: ../rules/sun.xml.in.h:117
-msgid "Swiss French"
-msgstr "sveitsinranskalainen"
+#~ msgid "Control Key Position"
+#~ msgstr "Ctrl-näppäimen sijainti"
-#: ../rules/sun.xml.in.h:118
-msgid "Swiss German"
-msgstr "sveitsinsaksalainen"
+#~ msgid "Control key at bottom left"
+#~ msgstr "Ctrl-näppäin alhaalla vasemmalla"
-#: ../rules/sun.xml.in.h:121
-msgid "Turkish"
-msgstr "turkkilainen"
+#~ msgid "Control key at left of 'A'"
+#~ msgstr "Ctrl-näppäin \"A\"-näppäimestä vasemmalla"
-#: ../rules/sun.xml.in.h:122
-msgid "Turkish (F)"
-msgstr "turkkilainen (F)"
+#~ msgid "Control+Shift changes group"
+#~ msgstr "Ctrl+Shift vaihtaa ryhmää"
-#: ../rules/sun.xml.in.h:123
-msgid "Turkish Alt-Q Layout"
-msgstr "turkkilainen Alt-Q-asettelu"
+#~ msgid "Czech"
+#~ msgstr "tšekkiläinen"
-#: ../rules/sun.xml.in.h:125
-msgid "U.S. English w/ ISO9995-3"
-msgstr "Amerikanenglanti + ISO9995-3"
+#~ msgid "Danish"
+#~ msgstr "tanskalainen"
-#: ../rules/sun.xml.in.h:128
-msgid "Use keyboard LED to show alternative group"
-msgstr "Käytä näppäimistö-lediä näyttämään vaihtoehtoista ryhmää"
+#~ msgid "DeuCH"
+#~ msgstr "DeuCH"
-#: ../rules/sun.xml.in.h:129
-msgid "Uses internal capitalization. Shift cancels Caps."
-msgstr "Käyttää sisäistä suuraakkostusta. Shift kumoaa CapsLockin."
+#~ msgid "Dvo"
+#~ msgstr "Dvo"
-#: ../rules/sun.xml.in.h:130
-msgid "Uses internal capitalization. Shift doesn't cancel Caps."
-msgstr "Käyttää sisäistä suuraakkostusta. Shift ei kumoa CapsLockia."
+#~ msgid "Finnish"
+#~ msgstr "suomalainen"
-#: ../rules/sun.xml.in.h:131
-msgid "bksl"
-msgstr "bksl"
+#~ msgid "FraCH"
+#~ msgstr "FraCH"
-#: ../rules/sun.xml.in.h:133
-msgid "type4"
-msgstr "type4"
+#~ msgid "German"
+#~ msgstr "saksalainen"
-#~ msgid "Acer TravelMate 800"
-#~ msgstr "Acer TravelMate 800"
+#~ msgid "Group Shift/Lock behavior"
+#~ msgstr "Ryhmien vaihto ja lukitus"
+
+#~ msgid "Hungarian"
+#~ msgstr "unkarilainen"
+
+#~ msgid "Italian"
+#~ msgstr "italialainen"
+
+#~ msgid "Japanese"
+#~ msgstr "japanilainen"
+
+#~ msgid "Left Alt key changes group"
+#~ msgstr "Vasen Alt-näppäin vaihtaa ryhmää"
+
+#~ msgid "Left Ctrl key changes group"
+#~ msgstr "Vasen Ctrl-näppäin vaihtaa ryhmää"
+
+#~ msgid "Left Shift key changes group"
+#~ msgstr "Vasen Shift-näppäin vaihtaa ryhmää"
+
+#~ msgid "Make CapsLock an additional Control"
+#~ msgstr "Tee CapsLockista ylimääräinen Ctrl"
+
+#~ msgid "Norwegian"
+#~ msgstr "norjalainen"
+
+#~ msgid "Num_Lock LED shows alternative group"
+#~ msgstr "Numlock-ledi näyttää vaihtoehtoista ryhmää"
+
+#~ msgid "Polish"
+#~ msgstr "puolalainen"
+
+#~ msgid "Polish with Polish quotes on key \"1/!\""
+#~ msgstr "puolalainen, puolalaiset lainausmerkit \"1/!\"-näppäimistä"
+
+#~ msgid "Portuguese"
+#~ msgstr "portugalilainen"
+
+#~ msgid "Press Left Alt key to choose 3rd level"
+#~ msgstr "Paina vasenta Alt-näppäintä valitaksesi kolmannen tason"
+
+#~ msgid "Press Right Alt key to choose 3rd level"
+#~ msgstr "Paina oikeaa Alt-näppäintä valitaksesi kolmannen tason"
+
+#~ msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
+#~ msgstr "Paina oikeaa Alt-näppäintä valitaksesi kolmannen tason, Shift-Oikea Alt on Multi_Key"
+
+#~ msgid "Press Right Control to choose 3rd level"
+#~ msgstr "Paina oikeaa Ctrl-näppäintä valitaksesi kolmannen tason"
+
+#~ msgid "Press any of Alt keys to choose 3rd level"
+#~ msgstr "Paina jotakin Alt-näppäintä valitaksesi kolmannen tason"
+
+#~ msgid "Right Alt key changes group"
+#~ msgstr "Oikea Alt-näppäin vaihtaa ryhmää"
+
+#~ msgid "Right Control key works as Right Alt"
+#~ msgstr "Oikea Ctrl-näppäin toimii oikeana Alt-näppäimenä"
+
+#~ msgid "Right Ctrl key changes group"
+#~ msgstr "Oikea Ctrl-näppäin vaihtaa ryhmää"
+
+#~ msgid "Right Shift key changes group"
+#~ msgstr "Oikea Shift-näppäin vaihtaa ryhmää"
+
+#~ msgid "Scroll Lock changes group"
+#~ msgstr "Scrolllock vaihtaa ryhmää"
-#~ msgid "BenQ X-Touch 730"
-#~ msgstr "BenQ X-Touch 730"
+#~ msgid "Scroll_Lock LED shows alternative group"
+#~ msgstr "Scrolllock-ledi näyttää vaihtoehtoista ryhmää"
-#~ msgid "BenQ X-Touch 800"
-#~ msgstr "BenQ X-Touch 800"
+#~ msgid "Shift with numpad keys works as in MS Windows"
+#~ msgstr "Shift ja sormionäppäimet toimivat kuten MS Windowsissa"
+
+#~ msgid "Slovak"
+#~ msgstr "slovakialainen"
+
+#~ msgid "Spanish"
+#~ msgstr "espanjalainen"
+
+#~ msgid "Sun Type 4"
+#~ msgstr "Sun Type 4"
+
+#~ msgid "Sun Type 5 European"
+#~ msgstr "Sun Type 5 eurooppalainen"
+
+#~ 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 Euro-näppäimellä"
+
+#~ msgid "Swap Control and Caps Lock"
+#~ msgstr "Vaihda Ctrl ja CapsLock"
+
+#~ msgid "Swedish"
+#~ msgstr "ruotsalainen"
+
+#~ msgid "Swiss French"
+#~ msgstr "sveitsinranskalainen"
+
+#~ msgid "Swiss German"
+#~ msgstr "sveitsinsaksalainen"
+
+#~ msgid "Turkish"
+#~ msgstr "turkkilainen"
+
+#~ msgid "Turkish (F)"
+#~ msgstr "turkkilainen (F)"
+
+#~ msgid "Turkish Alt-Q Layout"
+#~ msgstr "turkkilainen Alt-Q-asettelu"
+
+#~ msgid "U.S. English w/ ISO9995-3"
+#~ msgstr "Amerikanenglanti + ISO9995-3"
+
+#~ msgid "Use keyboard LED to show alternative group"
+#~ msgstr "Käytä näppäimistö-lediä näyttämään vaihtoehtoista ryhmää"
+
+#~ msgid "Uses internal capitalization. Shift cancels Caps."
+#~ msgstr "Käyttää sisäistä suuraakkostusta. Shift kumoaa CapsLockin."
+
+#~ msgid "Uses internal capitalization. Shift doesn't cancel Caps."
+#~ msgstr "Käyttää sisäistä suuraakkostusta. Shift ei kumoa CapsLockia."
+
+#~ msgid "bksl"
+#~ msgstr "bksl"
+
+#~ msgid "type4"
+#~ msgstr "type4"
+
+#~ msgid "Acer TravelMate 800"
+#~ msgstr "Acer TravelMate 800"
#~ msgid "Dell SK-8125 USB Multimedia Keybard"
#~ msgstr "Dell SK-8125 USB -multimedianäppäimistö"
@@ -2701,18 +3068,9 @@ msgstr "type4"
#~ msgid "Force standard legacy keypad"
#~ msgstr "Pakota standardi vanha sormio"
-#~ msgid "Logitech Cordless Desktop Optical"
-#~ msgstr "Logitech Cordless Desktop Optical"
-
-#~ msgid "Logitech Cordless Desktop Pro"
-#~ msgstr "Logitech Cordless Desktop Pro"
-
#~ msgid "Logitech Cordless Desktop Pro (alternate option)"
#~ msgstr "Logitech Cordless Desktop Pro (vaihtoehtoinen)"
-#~ msgid "Logitech Cordless Desktop iTouch"
-#~ msgstr "Logitech Cordless Desktop iTouch"
-
#~ msgid "Use keypad with unicode additions (arrows and math operators)"
#~ msgstr "Käytä sormiota unicodelisäyksin (nuolet sekä matematiikkaoperaattorit)"
diff --git a/xorg-server/xkbdata.src/po/fr.po b/xorg-server/xkbdata.src/po/fr.po
index 123374554..aaaa672f3 100644
--- a/xorg-server/xkbdata.src/po/fr.po
+++ b/xorg-server/xkbdata.src/po/fr.po
@@ -7,10 +7,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config 1.4-pre1\n"
+"Project-Id-Version: xkeyboard-config 1.6pre1\n"
"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2008-09-15 23:52+0100\n"
-"PO-Revision-Date: 2008-09-18 10:49-0500\n"
+"POT-Creation-Date: 2009-05-12 23:49+0100\n"
+"PO-Revision-Date: 2009-05-19 14:20-0500\n"
"Last-Translator: Marc Veillet <scouigne@gmail.com>\n"
"Language-Team: French <traduc@traduc.org>\n"
"MIME-Version: 1.0\n"
@@ -20,2611 +20,2888 @@ msgstr ""
"X-Poedit-Language: French\n"
"X-Poedit-Country: CANADA\n"
-#: ../rules/base.xml.in.h:1 ../rules/evdev.xml.in.h:1
+#: ../rules/base.xml.in.h:1
msgid "(F)"
msgstr "(F)"
-#: ../rules/base.xml.in.h:2 ../rules/evdev.xml.in.h:2
+#: ../rules/base.xml.in.h:2
msgid "(Legacy) Alternative"
msgstr "(Obsolète) Autre"
-#: ../rules/base.xml.in.h:3 ../rules/evdev.xml.in.h:3
+#: ../rules/base.xml.in.h:3
msgid "(Legacy) Alternative, Sun dead keys"
msgstr "(Obsolète) Autre, touches mortes Sun"
-#: ../rules/base.xml.in.h:4 ../rules/evdev.xml.in.h:4
+#: ../rules/base.xml.in.h:4
msgid "(Legacy) Alternative, eliminate dead keys"
msgstr "(Obsolète) Autre, sans touches mortes"
-#: ../rules/base.xml.in.h:5 ../rules/evdev.xml.in.h:5
+#: ../rules/base.xml.in.h:5
msgid "101/104 key Compatible"
msgstr "Compatible 101/104 touches"
-#: ../rules/base.xml.in.h:6 ../rules/evdev.xml.in.h:6
+#: ../rules/base.xml.in.h:6
msgid "101/qwerty/comma/Dead keys"
msgstr "101/qwerty/virgule/touches mortes"
-#: ../rules/base.xml.in.h:7 ../rules/evdev.xml.in.h:7
+#: ../rules/base.xml.in.h:7
msgid "101/qwerty/comma/Eliminate dead keys"
msgstr "101/qwerty/virgule/sans touches mortes"
-#: ../rules/base.xml.in.h:8 ../rules/evdev.xml.in.h:8
+#: ../rules/base.xml.in.h:8
msgid "101/qwerty/dot/Dead keys"
msgstr "101/qwerty/point/touches mortes"
-#: ../rules/base.xml.in.h:9 ../rules/evdev.xml.in.h:9
+#: ../rules/base.xml.in.h:9
msgid "101/qwerty/dot/Eliminate dead keys"
msgstr "101/qwerty/point/sans touches mortes"
-#: ../rules/base.xml.in.h:10 ../rules/evdev.xml.in.h:10
+#: ../rules/base.xml.in.h:10
msgid "101/qwertz/comma/Dead keys"
msgstr "101/qwertz/virgule/touches mortes"
-#: ../rules/base.xml.in.h:11 ../rules/evdev.xml.in.h:11
+#: ../rules/base.xml.in.h:11
msgid "101/qwertz/comma/Eliminate dead keys"
msgstr "101/qwertz/virgule/sans touches mortes"
-#: ../rules/base.xml.in.h:12 ../rules/evdev.xml.in.h:12
+#: ../rules/base.xml.in.h:12
msgid "101/qwertz/dot/Dead keys"
msgstr "101/qwertz/point/touches mortes"
-#: ../rules/base.xml.in.h:13 ../rules/evdev.xml.in.h:13
+#: ../rules/base.xml.in.h:13
msgid "101/qwertz/dot/Eliminate dead keys"
msgstr "101/qwertz/point/sans touches mortes"
-#: ../rules/base.xml.in.h:14 ../rules/evdev.xml.in.h:14
+#: ../rules/base.xml.in.h:14
msgid "102/qwerty/comma/Dead keys"
msgstr "102/qwerty/virgule/touches mortes"
-#: ../rules/base.xml.in.h:15 ../rules/evdev.xml.in.h:15
+#: ../rules/base.xml.in.h:15
msgid "102/qwerty/comma/Eliminate dead keys"
msgstr "102/qwerty/virgule/sans touches mortes"
-#: ../rules/base.xml.in.h:16 ../rules/evdev.xml.in.h:16
+#: ../rules/base.xml.in.h:16
msgid "102/qwerty/dot/Dead keys"
msgstr "102/qwerty/point/touches mortes"
-#: ../rules/base.xml.in.h:17 ../rules/evdev.xml.in.h:17
+#: ../rules/base.xml.in.h:17
msgid "102/qwerty/dot/Eliminate dead keys"
msgstr "102/qwerty/point/sans touches mortes"
-#: ../rules/base.xml.in.h:18 ../rules/evdev.xml.in.h:18
+#: ../rules/base.xml.in.h:18
msgid "102/qwertz/comma/Dead keys"
msgstr "102/qwertz/virgule/touches mortes"
-#: ../rules/base.xml.in.h:19 ../rules/evdev.xml.in.h:19
+#: ../rules/base.xml.in.h:19
msgid "102/qwertz/comma/Eliminate dead keys"
msgstr "102/qwertz/virgule/sans touches mortes"
-#: ../rules/base.xml.in.h:20 ../rules/evdev.xml.in.h:20
+#: ../rules/base.xml.in.h:20
msgid "102/qwertz/dot/Dead keys"
msgstr "102/qwertz/point/touches mortes"
-#: ../rules/base.xml.in.h:21 ../rules/evdev.xml.in.h:21
+#: ../rules/base.xml.in.h:21
msgid "102/qwertz/dot/Eliminate dead keys"
msgstr "102/qwertz/point/sans touches mortes"
-#: ../rules/base.xml.in.h:22 ../rules/evdev.xml.in.h:22
+#: ../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:23 ../rules/evdev.xml.in.h:23
+#: ../rules/base.xml.in.h:26
msgid "A4Tech KBS-8"
msgstr "A4Tech KBS-8"
-#: ../rules/base.xml.in.h:24 ../rules/evdev.xml.in.h:24
+#: ../rules/base.xml.in.h:27
msgid "A4Tech Wireless Desktop RFKB-23"
msgstr "A4Tech Desktop RFKB-23 sans fil"
-#: ../rules/base.xml.in.h:25 ../rules/evdev.xml.in.h:25
+#: ../rules/base.xml.in.h:28
msgid "ACPI Standard"
msgstr "ACPI standard"
-#: ../rules/base.xml.in.h:26 ../rules/evdev.xml.in.h:26
-msgid "ATM/phone-style hexadecimal keypad"
-msgstr "ATM/clavier hexadécimal de style téléphonique"
+#: ../rules/base.xml.in.h:29
+msgid "ATM/phone-style"
+msgstr "ATM/clavier de style téléphonique"
-#: ../rules/base.xml.in.h:27 ../rules/evdev.xml.in.h:27
+#: ../rules/base.xml.in.h:30
msgid "Acer AirKey V"
msgstr "Acer AirKey V"
-#: ../rules/base.xml.in.h:28 ../rules/evdev.xml.in.h:28
+#: ../rules/base.xml.in.h:31
msgid "Acer C300"
msgstr "Acer C300"
-#: ../rules/base.xml.in.h:29 ../rules/evdev.xml.in.h:29
+#: ../rules/base.xml.in.h:32
msgid "Acer Ferrari 4000"
msgstr "Acer Ferrari 4000"
-#: ../rules/base.xml.in.h:30 ../rules/evdev.xml.in.h:30
+#: ../rules/base.xml.in.h:33
msgid "Acer Laptop"
msgstr "Portable Acer"
-#: ../rules/base.xml.in.h:31 ../rules/evdev.xml.in.h:31
-msgid "Add the EuroSign to the 2 key."
-msgstr "Ajouter le signe Euro sur la touche 2."
-
-#: ../rules/base.xml.in.h:32 ../rules/evdev.xml.in.h:32
-msgid "Add the EuroSign to the 4 key."
-msgstr "Ajouter le signe Euro sur la touche 4."
-
-#: ../rules/base.xml.in.h:33 ../rules/evdev.xml.in.h:33
-msgid "Add the EuroSign to the 5 key."
-msgstr "Ajouter le signe Euro sur la touche 5."
-
-#: ../rules/base.xml.in.h:34 ../rules/evdev.xml.in.h:34
-msgid "Add the EuroSign to the E key."
-msgstr "Ajouter le signe Euro sur la touche E."
+#: ../rules/base.xml.in.h:34
+msgid "Add the standard behavior to Menu key"
+msgstr "Ajouter le comportement standard sur la touche Menu"
-#: ../rules/base.xml.in.h:35 ../rules/evdev.xml.in.h:35
-msgid "Add the standard behavior to Menu key."
-msgstr "Ajouter le comportement standard sur la touche Menu."
+#: ../rules/base.xml.in.h:35
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "Ajout du circonflexe de l'espéranto (supersigno)"
-#: ../rules/base.xml.in.h:36 ../rules/evdev.xml.in.h:36
-msgid "Adding the EuroSign to certain keys"
+#: ../rules/base.xml.in.h:36
+msgid "Adding EuroSign to certain keys"
msgstr "Ajout du signe Euro sur certaines touches"
-#: ../rules/base.xml.in.h:37 ../rules/evdev.xml.in.h:37
+#: ../rules/base.xml.in.h:37
msgid "Advance Scorpius KI"
msgstr "Advance Scorpius KI"
-#: ../rules/base.xml.in.h:38 ../rules/evdev.xml.in.h:38
+#: ../rules/base.xml.in.h:38
msgid "Afg"
msgstr "Afg"
-#: ../rules/base.xml.in.h:39 ../rules/evdev.xml.in.h:39
+#: ../rules/base.xml.in.h:39
msgid "Afghanistan"
msgstr "Afghanistan"
-#: ../rules/base.xml.in.h:40 ../rules/evdev.xml.in.h:40
+#: ../rules/base.xml.in.h:40
msgid "Akan"
msgstr "Akan"
-#: ../rules/base.xml.in.h:41 ../rules/evdev.xml.in.h:41
+#: ../rules/base.xml.in.h:41
msgid "Alb"
msgstr "Alb"
-#: ../rules/base.xml.in.h:42 ../rules/evdev.xml.in.h:42
+#: ../rules/base.xml.in.h:42
msgid "Albania"
msgstr "Albanie"
-#: ../rules/base.xml.in.h:43 ../rules/evdev.xml.in.h:43
-msgid "Alt and Meta are on the Alt keys."
+#: ../rules/base.xml.in.h:43
+msgid "Alt and Meta are on Alt keys"
msgstr "Alt et Meta sont sur les touches Alt."
-#: ../rules/base.xml.in.h:44 ../rules/evdev.xml.in.h:44
-msgid "Alt is mapped to the right Win-key and Super to Menu."
-msgstr "Alt est obtenu avec la touche Logo de droite, et Super avec Menu."
+#: ../rules/base.xml.in.h:44
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr "Alt est obtenu avec la touche Logo de droite, et Super avec Menu"
-#: ../rules/base.xml.in.h:45 ../rules/evdev.xml.in.h:45
-msgid "Alt+CapsLock changes layout."
-msgstr "Les touches Alt.+Verr. maj. changent de configuration."
+#: ../rules/base.xml.in.h:45
+msgid "Alt+CapsLock"
+msgstr "Alt.+Verr. maj."
-#: ../rules/base.xml.in.h:46 ../rules/evdev.xml.in.h:46
-msgid "Alt+Ctrl change layout."
-msgstr "Alt+Ctrl change de configuration."
+#: ../rules/base.xml.in.h:46
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
-#: ../rules/base.xml.in.h:47 ../rules/evdev.xml.in.h:47
-msgid "Alt+Shift change layout."
-msgstr "Alt+Maj. change de configuration."
+#: ../rules/base.xml.in.h:47
+msgid "Alt+Shift"
+msgstr "Alt+Maj."
-#: ../rules/base.xml.in.h:48 ../rules/evdev.xml.in.h:48
+#: ../rules/base.xml.in.h:48
+msgid "Alt+Space"
+msgstr "Alt+Espace"
+
+#: ../rules/base.xml.in.h:49
msgid "Alt-Q"
msgstr "Alt-Q"
-#: ../rules/base.xml.in.h:49 ../rules/evdev.xml.in.h:49
+#: ../rules/base.xml.in.h:50
msgid "Alt/Win key behavior"
msgstr "Comportement des touches Alt/Logo"
-#: ../rules/base.xml.in.h:50 ../rules/evdev.xml.in.h:50
+#: ../rules/base.xml.in.h:51
msgid "Alternative"
msgstr "Autre"
-#: ../rules/base.xml.in.h:51 ../rules/evdev.xml.in.h:51
+#: ../rules/base.xml.in.h:52
msgid "Alternative Eastern"
msgstr "Orientale, variante"
-#: ../rules/base.xml.in.h:52 ../rules/evdev.xml.in.h:52
+#: ../rules/base.xml.in.h:53
msgid "Alternative Phonetic"
msgstr "Autre, phonétique"
-#: ../rules/base.xml.in.h:53 ../rules/evdev.xml.in.h:53
+#: ../rules/base.xml.in.h:54
msgid "Alternative international (former us_intl)"
msgstr "International (auparavant us_intl)"
-#: ../rules/base.xml.in.h:54 ../rules/evdev.xml.in.h:54
+#: ../rules/base.xml.in.h:55
msgid "Alternative, Sun dead keys"
msgstr "Autre, touches mortes Sun"
-#: ../rules/base.xml.in.h:55 ../rules/evdev.xml.in.h:55
+#: ../rules/base.xml.in.h:56
msgid "Alternative, eliminate dead keys"
msgstr "Autre, sans touches mortes"
-#: ../rules/base.xml.in.h:56 ../rules/evdev.xml.in.h:56
+#: ../rules/base.xml.in.h:57
msgid "Alternative, latin-9 only"
msgstr "Autre, latin-9 seulement"
-#: ../rules/base.xml.in.h:57 ../rules/evdev.xml.in.h:57
+#: ../rules/base.xml.in.h:58
msgid "And"
msgstr "And"
-#: ../rules/base.xml.in.h:58 ../rules/evdev.xml.in.h:58
+#: ../rules/base.xml.in.h:59
msgid "Andorra"
msgstr "Andorre"
-#: ../rules/base.xml.in.h:59 ../rules/evdev.xml.in.h:59
+#: ../rules/base.xml.in.h:60
+msgid "Any Alt key"
+msgstr "N'importe quelle touche Alt"
+
+#: ../rules/base.xml.in.h:61
+msgid "Any Win key"
+msgstr "N'importe quelle touche Logo"
+
+#: ../rules/base.xml.in.h:62
+msgid "Any Win key (while pressed)"
+msgstr "N'importe quelle touche Logo (lorsque pressées)"
+
+#: ../rules/base.xml.in.h:63
msgid "Apostrophe (') variant"
msgstr "Variante apostrophe"
-#: ../rules/base.xml.in.h:60 ../rules/evdev.xml.in.h:60
+#: ../rules/base.xml.in.h:64
msgid "Apple"
msgstr "Apple"
-#: ../rules/base.xml.in.h:61 ../rules/evdev.xml.in.h:61
+#: ../rules/base.xml.in.h:65
msgid "Apple Laptop"
msgstr "Portable Apple"
-#: ../rules/base.xml.in.h:62 ../rules/evdev.xml.in.h:62
+#: ../rules/base.xml.in.h:66
msgid "Ara"
msgstr "Ara"
-#: ../rules/base.xml.in.h:63 ../rules/evdev.xml.in.h:63
+#: ../rules/base.xml.in.h:67
msgid "Arabic"
msgstr "Arabe"
-#: ../rules/base.xml.in.h:64 ../rules/evdev.xml.in.h:64
+#: ../rules/base.xml.in.h:68
msgid "Arm"
msgstr "Arm"
-#: ../rules/base.xml.in.h:65 ../rules/evdev.xml.in.h:65
+#: ../rules/base.xml.in.h:69
msgid "Armenia"
msgstr "Arménie"
-#: ../rules/base.xml.in.h:66 ../rules/evdev.xml.in.h:66
+#: ../rules/base.xml.in.h:70
msgid "Asturian variant with bottom-dot H and bottom-dot L"
msgstr "Variante asturienne avec H point bas et L point bas"
-#: ../rules/base.xml.in.h:67 ../rules/evdev.xml.in.h:67
+#: ../rules/base.xml.in.h:71
msgid "Asus Laptop"
msgstr "Portable Asus"
-#: ../rules/base.xml.in.h:68 ../rules/evdev.xml.in.h:68
+#: ../rules/base.xml.in.h:72
+msgid "At bottom left"
+msgstr "En bas à gauche"
+
+#: ../rules/base.xml.in.h:73
+msgid "At left of 'A'"
+msgstr "Touche à la gauche du « A »"
+
+#: ../rules/base.xml.in.h:74
msgid "Aze"
msgstr "Aze"
-#: ../rules/base.xml.in.h:69 ../rules/evdev.xml.in.h:69
+#: ../rules/base.xml.in.h:75
msgid "Azerbaijan"
msgstr "Azerbaïdjan"
-#: ../rules/base.xml.in.h:70 ../rules/evdev.xml.in.h:70
+#: ../rules/base.xml.in.h:76
msgid "Azona RF2300 wireless Internet Keyboard"
msgstr "Azona RF2300 Internet sans fil"
-#: ../rules/base.xml.in.h:71 ../rules/evdev.xml.in.h:71
+#: ../rules/base.xml.in.h:77
msgid "BTC 5090"
msgstr "BTC 5090"
-#: ../rules/base.xml.in.h:72 ../rules/evdev.xml.in.h:72
+#: ../rules/base.xml.in.h:78
msgid "BTC 5113RF Multimedia"
msgstr "BTC 5113RF Multimedia"
-#: ../rules/base.xml.in.h:73 ../rules/evdev.xml.in.h:73
+#: ../rules/base.xml.in.h:79
msgid "BTC 5126T"
msgstr "BTC 5126T"
-#: ../rules/base.xml.in.h:74 ../rules/evdev.xml.in.h:74
+#: ../rules/base.xml.in.h:80
msgid "BTC 6301URF"
msgstr "BTC 6301URF"
-#: ../rules/base.xml.in.h:75 ../rules/evdev.xml.in.h:75
+#: ../rules/base.xml.in.h:81
msgid "BTC 9000"
msgstr "BTC 9000"
-#: ../rules/base.xml.in.h:76 ../rules/evdev.xml.in.h:76
+#: ../rules/base.xml.in.h:82
msgid "BTC 9000A"
msgstr "BTC 9000A"
-#: ../rules/base.xml.in.h:77 ../rules/evdev.xml.in.h:77
+#: ../rules/base.xml.in.h:83
msgid "BTC 9001AH"
msgstr "BTC 9001AH"
-#: ../rules/base.xml.in.h:78 ../rules/evdev.xml.in.h:78
+#: ../rules/base.xml.in.h:84
msgid "BTC 9019U"
msgstr "BTC 9019U"
-#: ../rules/base.xml.in.h:79 ../rules/evdev.xml.in.h:79
+#: ../rules/base.xml.in.h:85
+msgid "BTC 9116U Mini Wireless Internet and Gaming"
+msgstr "BTC 9116U Mini Internet et Jeu sans fil"
+
+#: ../rules/base.xml.in.h:86
msgid "Baltic+"
msgstr "Baltic+"
-#: ../rules/base.xml.in.h:80 ../rules/evdev.xml.in.h:80
+#: ../rules/base.xml.in.h:87
msgid "Ban"
msgstr "Ban"
-#: ../rules/base.xml.in.h:81 ../rules/evdev.xml.in.h:81
+#: ../rules/base.xml.in.h:88
msgid "Bangladesh"
msgstr "Bangladesh"
-#: ../rules/base.xml.in.h:82 ../rules/evdev.xml.in.h:82
+#: ../rules/base.xml.in.h:89
msgid "Bel"
msgstr "Bel"
-#: ../rules/base.xml.in.h:83 ../rules/evdev.xml.in.h:83
+#: ../rules/base.xml.in.h:90
msgid "Belarus"
msgstr "Bélarus"
-#: ../rules/base.xml.in.h:84 ../rules/evdev.xml.in.h:84
+#: ../rules/base.xml.in.h:91
msgid "Belgium"
msgstr "Belgique"
-#: ../rules/base.xml.in.h:85 ../rules/evdev.xml.in.h:85
+#: ../rules/base.xml.in.h:92
msgid "BenQ X-Touch"
msgstr "BenQ X-Touch"
-#: ../rules/base.xml.in.h:86 ../rules/evdev.xml.in.h:86
+#: ../rules/base.xml.in.h:93
msgid "BenQ X-Touch 730"
msgstr "BenQ X-Touch 730"
-#: ../rules/base.xml.in.h:87 ../rules/evdev.xml.in.h:87
+#: ../rules/base.xml.in.h:94
msgid "BenQ X-Touch 800"
msgstr "BenQ X-Touch 800"
-#: ../rules/base.xml.in.h:88 ../rules/evdev.xml.in.h:88
+#: ../rules/base.xml.in.h:95
msgid "Bengali"
msgstr "Bengali"
-#: ../rules/base.xml.in.h:89 ../rules/evdev.xml.in.h:89
+#: ../rules/base.xml.in.h:96
msgid "Bengali Probhat"
msgstr "Bengali Probhat"
-#: ../rules/base.xml.in.h:90 ../rules/evdev.xml.in.h:90
+#: ../rules/base.xml.in.h:97
msgid "Bepo, ergonomic, Dvorak way"
msgstr "Bepo, ergonomc, modèle Dvorak"
-#: ../rules/base.xml.in.h:91 ../rules/evdev.xml.in.h:91
+#: ../rules/base.xml.in.h:98
msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
msgstr "Bepo, ergonomic, modèle Dvorak, latin-9 seulement"
-#: ../rules/base.xml.in.h:92 ../rules/evdev.xml.in.h:92
+#: ../rules/base.xml.in.h:99
msgid "Bgr"
msgstr "Bgr"
-#: ../rules/base.xml.in.h:93 ../rules/evdev.xml.in.h:93
+#: ../rules/base.xml.in.h:100
msgid "Bhu"
msgstr "Bhu"
-#: ../rules/base.xml.in.h:94 ../rules/evdev.xml.in.h:94
+#: ../rules/base.xml.in.h:101
msgid "Bhutan"
msgstr "Bhoutan"
-#: ../rules/base.xml.in.h:95 ../rules/evdev.xml.in.h:95
+#: ../rules/base.xml.in.h:102
msgid "Biblical Hebrew (Tiro)"
msgstr "Hébreu biblique (Tiro)"
-#: ../rules/base.xml.in.h:96 ../rules/evdev.xml.in.h:96
+#: ../rules/base.xml.in.h:103
msgid "Bih"
msgstr "Bih"
-#: ../rules/base.xml.in.h:97 ../rules/evdev.xml.in.h:97
+#: ../rules/base.xml.in.h:104
msgid "Blr"
msgstr "Blr"
-#: ../rules/base.xml.in.h:98 ../rules/evdev.xml.in.h:98
+#: ../rules/base.xml.in.h:105
msgid "Bosnia and Herzegovina"
msgstr "Bosnie-Herzégovine"
-#: ../rules/base.xml.in.h:99 ../rules/evdev.xml.in.h:99
-msgid "Both Alt keys together change layout."
-msgstr "Les touches Alt ensemble changent de disposition."
-
-#: ../rules/base.xml.in.h:100 ../rules/evdev.xml.in.h:100
-msgid "Both Ctrl keys together change layout."
-msgstr "Les touches Ctrl ensemble changent de disposition."
+#: ../rules/base.xml.in.h:106
+msgid "Both Alt keys together"
+msgstr "Les touches Alt ensemble"
-#: ../rules/base.xml.in.h:101 ../rules/evdev.xml.in.h:101
-msgid "Both Shift keys together change layout."
-msgstr "Les touches Maj. ensemble changent de disposition."
+#: ../rules/base.xml.in.h:107
+msgid "Both Ctrl keys together"
+msgstr "Les touches Ctrl ensemble"
-#: ../rules/base.xml.in.h:102 ../rules/evdev.xml.in.h:102
-msgid "Both Win-keys switch layout while pressed."
-msgstr "Les deux touches Logo ensemble changent de disposition."
+#: ../rules/base.xml.in.h:108
+msgid "Both Shift keys together"
+msgstr "Les touches Maj. ensemble"
-#: ../rules/base.xml.in.h:103 ../rules/evdev.xml.in.h:103
+#: ../rules/base.xml.in.h:109
msgid "Bra"
msgstr "Bra"
-#: ../rules/base.xml.in.h:104 ../rules/evdev.xml.in.h:104
+#: ../rules/base.xml.in.h:110
msgid "Braille"
msgstr "Braille"
-#: ../rules/base.xml.in.h:105 ../rules/evdev.xml.in.h:105
+#: ../rules/base.xml.in.h:111
msgid "Brazil"
msgstr "Brésil"
-#: ../rules/base.xml.in.h:106 ../rules/evdev.xml.in.h:106
-msgid "Brazilian ABNT2"
-msgstr "ABNT2 brésilien"
+#: ../rules/base.xml.in.h:112
+msgid "Breton"
+msgstr "Breton"
-#: ../rules/base.xml.in.h:107 ../rules/evdev.xml.in.h:107
+#: ../rules/base.xml.in.h:113
msgid "Brl"
msgstr "Brl"
-#: ../rules/base.xml.in.h:108 ../rules/evdev.xml.in.h:108
+#: ../rules/base.xml.in.h:114
msgid "Brother Internet Keyboard"
msgstr "Brother Internet"
-#: ../rules/base.xml.in.h:109 ../rules/evdev.xml.in.h:109
+#: ../rules/base.xml.in.h:115
msgid "Buckwalter"
msgstr "Buckwalter"
-#: ../rules/base.xml.in.h:110 ../rules/evdev.xml.in.h:110
+#: ../rules/base.xml.in.h:116
msgid "Bulgaria"
msgstr "Bulgarie"
-#: ../rules/base.xml.in.h:111 ../rules/evdev.xml.in.h:111
+#: ../rules/base.xml.in.h:117
+msgid "CRULP"
+msgstr "CRULP"
+
+#: ../rules/base.xml.in.h:118
msgid "Cambodia"
msgstr "Cambodge"
-#: ../rules/base.xml.in.h:112 ../rules/evdev.xml.in.h:112
+#: ../rules/base.xml.in.h:119
msgid "Can"
msgstr "Can"
-#: ../rules/base.xml.in.h:113 ../rules/evdev.xml.in.h:113
+#: ../rules/base.xml.in.h:120
msgid "Canada"
msgstr "Canada"
-#: ../rules/base.xml.in.h:114 ../rules/evdev.xml.in.h:114
-msgid "Caps Lock is Compose."
-msgstr "Verr. maj. est Compose."
+#: ../rules/base.xml.in.h:121
+msgid "Caps Lock"
+msgstr "Verr. maj."
+
+#: ../rules/base.xml.in.h:122
+msgid "CapsLock"
+msgstr "Verr. Maj."
-#: ../rules/base.xml.in.h:115 ../rules/evdev.xml.in.h:115
-msgid "CapsLock LED shows alternative layout."
-msgstr "Le témoins lumineux du Verr. maj. indique un groupe autre que le premier."
+#: ../rules/base.xml.in.h:123
+msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
+msgstr "Verr. Maj. change vers la première disposition, Maj.+Verr. Maj. change vers la dernière disposition"
-#: ../rules/base.xml.in.h:116 ../rules/evdev.xml.in.h:116
-msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
-msgstr "Verr. maj. agit comme Maj. verrouillé. Maj. l'annule temporairement."
+#: ../rules/base.xml.in.h:124
+msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
+msgstr "Verr. Maj. (lorsque pressée), Alt+Verr. Maj. provoque le même résultat"
-#: ../rules/base.xml.in.h:117 ../rules/evdev.xml.in.h:117
-msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
-msgstr "Verr. maj. agit comme Maj. verrouillé. Maj. n'a pas d'effet."
+#: ../rules/base.xml.in.h:125
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
+msgstr "Verr. maj. agit comme Maj. verrouillé. Maj. \"l'annule temporairement\""
-#: ../rules/base.xml.in.h:118 ../rules/evdev.xml.in.h:118
-msgid "CapsLock just locks the Shift modifier."
-msgstr "Verr. maj. verrouille le modificateur de majuscules."
+#: ../rules/base.xml.in.h:126
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock"
+msgstr "Verr. maj. agit comme Maj. verrouillé. Maj. n'a pas d'effet sur Verr. Maj."
-#: ../rules/base.xml.in.h:119 ../rules/evdev.xml.in.h:119
+#: ../rules/base.xml.in.h:127
msgid "CapsLock key behavior"
msgstr "Comportement de la touche Verrouillage majuscule"
-#: ../rules/base.xml.in.h:120 ../rules/evdev.xml.in.h:120
-msgid "CapsLock key changes layout."
-msgstr "La touche Verr. maj. change de disposition."
+#: ../rules/base.xml.in.h:128
+msgid "CapsLock toggles Shift so all keys are affected"
+msgstr "Verr. maj. inverse Maj., ce qui affecte toutes les touches"
-#: ../rules/base.xml.in.h:121 ../rules/evdev.xml.in.h:121
-msgid "CapsLock switch to first layout, Shift+CapsLock switch to last layout."
-msgstr "Verr. Maj. change vers la première disposition, Maj.+Verr. Maj. change vers la dernière disposition."
+#: ../rules/base.xml.in.h:129
+msgid "CapsLock toggles normal capitalization of alphabetic characters"
+msgstr "Verr. maj. inverse la mise en majuscule usuelle des caractères alphabétiques"
-#: ../rules/base.xml.in.h:122 ../rules/evdev.xml.in.h:122
-msgid "CapsLock toggles Shift so all keys are affected."
-msgstr "Verr. maj. agit comme Maj. verrouillé, pour toutes les touches."
+#: ../rules/base.xml.in.h:130
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
+msgstr "Verr. maj. permet la mise en majuscule interne. Maj. \"annule\" le verrouillage des majuscules"
-#: ../rules/base.xml.in.h:123 ../rules/evdev.xml.in.h:123
-msgid "CapsLock toggles normal capitalization of alphabetic characters."
-msgstr "Verr. maj. permet la mise en majuscule usuelle des caractères alphabétiques."
+#: ../rules/base.xml.in.h:131
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
+msgstr "Verr. maj. permet la mise en majuscule interne. Maj. n'a pas d'effet sur cette commande"
-#: ../rules/base.xml.in.h:124 ../rules/evdev.xml.in.h:124
-msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
-msgstr "Verr. maj. permet la mise en majuscule interne. Maj. l'annule temporairement."
-
-#: ../rules/base.xml.in.h:125 ../rules/evdev.xml.in.h:125
-msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
-msgstr "Verr. maj. permet la mise en majuscule interne. Maj. n'a pas d'effet dessus."
-
-#: ../rules/base.xml.in.h:126 ../rules/evdev.xml.in.h:126
+#: ../rules/base.xml.in.h:132
msgid "Catalan variant with middle-dot L"
msgstr "Catalan avec L point médian"
-#: ../rules/base.xml.in.h:127 ../rules/evdev.xml.in.h:127
+#: ../rules/base.xml.in.h:133
msgid "Cedilla"
msgstr "Cédille"
-#: ../rules/base.xml.in.h:128 ../rules/evdev.xml.in.h:128
+#: ../rules/base.xml.in.h:134
msgid "Che"
msgstr "Che"
-#: ../rules/base.xml.in.h:129 ../rules/evdev.xml.in.h:129
+#: ../rules/base.xml.in.h:135
msgid "Cherokee"
msgstr "Cherokee"
-#: ../rules/base.xml.in.h:130 ../rules/evdev.xml.in.h:130
+#: ../rules/base.xml.in.h:136
+msgid "Cherry B.UNLIMITED"
+msgstr "Cherry B.UNLIMITED"
+
+#: ../rules/base.xml.in.h:137
msgid "Cherry Blue Line CyBo@rd"
msgstr "Cherry Blue Line CyBo@rd"
-#: ../rules/base.xml.in.h:131 ../rules/evdev.xml.in.h:131
+#: ../rules/base.xml.in.h:138
msgid "Cherry Blue Line CyBo@rd (alternate option)"
msgstr "Cherry Blue Line CyBo@rd (autre option)"
-#: ../rules/base.xml.in.h:132 ../rules/evdev.xml.in.h:132
+#: ../rules/base.xml.in.h:139
msgid "Cherry CyBo@rd USB-Hub"
msgstr "Cherry CyBo@rd USB-Hub"
-#: ../rules/base.xml.in.h:133 ../rules/evdev.xml.in.h:133
+#: ../rules/base.xml.in.h:140
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Expert"
+
+#: ../rules/base.xml.in.h:141
msgid "Cherry CyMotion Master Linux"
msgstr "Cherry CyMotion Master Linux"
-#: ../rules/base.xml.in.h:134 ../rules/evdev.xml.in.h:134
+#: ../rules/base.xml.in.h:142
msgid "Cherry CyMotion Master XPress"
msgstr "Cherry CyMotion Master XPress"
-#: ../rules/base.xml.in.h:135 ../rules/evdev.xml.in.h:135
+#: ../rules/base.xml.in.h:143
msgid "Chicony Internet Keyboard"
msgstr "Chicony Internet"
-#: ../rules/base.xml.in.h:136 ../rules/evdev.xml.in.h:136
+#: ../rules/base.xml.in.h:144
msgid "Chicony KB-9885"
msgstr "Chicony KB-9885"
-#: ../rules/base.xml.in.h:137 ../rules/evdev.xml.in.h:137
+#: ../rules/base.xml.in.h:145
msgid "Chicony KU-0108"
msgstr "Chicony KU-0108"
-#: ../rules/base.xml.in.h:138 ../rules/evdev.xml.in.h:138
+#: ../rules/base.xml.in.h:146
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0108"
+
+#: ../rules/base.xml.in.h:147
msgid "China"
msgstr "Chine"
-#: ../rules/base.xml.in.h:139 ../rules/evdev.xml.in.h:139
+#: ../rules/base.xml.in.h:148
msgid "Chuvash"
msgstr "Chuvash"
-#: ../rules/base.xml.in.h:140 ../rules/evdev.xml.in.h:140
+#: ../rules/base.xml.in.h:149
msgid "Chuvash Latin"
msgstr "Latin Chuvash"
-#: ../rules/base.xml.in.h:141 ../rules/evdev.xml.in.h:141
+#: ../rules/base.xml.in.h:150
msgid "Classic"
msgstr "Classique"
-#: ../rules/base.xml.in.h:142 ../rules/evdev.xml.in.h:142
+#: ../rules/base.xml.in.h:151
msgid "Classic Dvorak"
msgstr "Dvorak classique"
-#: ../rules/base.xml.in.h:143 ../rules/evdev.xml.in.h:143
+#: ../rules/base.xml.in.h:152
msgid "Classmate PC"
msgstr "Classmate PC"
-#: ../rules/base.xml.in.h:144 ../rules/evdev.xml.in.h:144
+#: ../rules/base.xml.in.h:153
msgid "CloGaelach"
msgstr "CloGaelach"
-#: ../rules/base.xml.in.h:145 ../rules/evdev.xml.in.h:145
+#: ../rules/base.xml.in.h:154
msgid "Colemak"
msgstr "Colemak"
-#: ../rules/base.xml.in.h:146 ../rules/evdev.xml.in.h:146
+#: ../rules/base.xml.in.h:155
msgid "Compaq Easy Access Keyboard"
msgstr "Compaq Easy Access"
-#: ../rules/base.xml.in.h:147 ../rules/evdev.xml.in.h:147
+#: ../rules/base.xml.in.h:156
msgid "Compaq Internet Keyboard (13 keys)"
msgstr "Compaq Internet (13 touches)"
-#: ../rules/base.xml.in.h:148 ../rules/evdev.xml.in.h:148
+#: ../rules/base.xml.in.h:157
msgid "Compaq Internet Keyboard (18 keys)"
msgstr "Compaq Internet (18 touches)"
-#: ../rules/base.xml.in.h:149 ../rules/evdev.xml.in.h:149
+#: ../rules/base.xml.in.h:158
msgid "Compaq Internet Keyboard (7 keys)"
msgstr "Compaq Internet (7 touches)"
-#: ../rules/base.xml.in.h:150 ../rules/evdev.xml.in.h:150
+#: ../rules/base.xml.in.h:159
msgid "Compaq iPaq Keyboard"
msgstr "Compaq iPaq"
-#: ../rules/base.xml.in.h:151 ../rules/evdev.xml.in.h:151
+#: ../rules/base.xml.in.h:160
msgid "Compose key position"
msgstr "Position de la touche Compose"
-#: ../rules/base.xml.in.h:152 ../rules/evdev.xml.in.h:152
+#: ../rules/base.xml.in.h:161
msgid "Congo, Democratic Republic of the"
msgstr "République démocratique du Congo"
-#: ../rules/base.xml.in.h:153 ../rules/evdev.xml.in.h:153
-msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
-msgstr "La touche Ctrl est obtenue avec la touche Logo (et les touches Ctrl habituelles)."
+#: ../rules/base.xml.in.h:162
+msgid "Control + Alt + Backspace"
+msgstr "Control + Alt + Eff. arrière"
-#: ../rules/base.xml.in.h:154 ../rules/evdev.xml.in.h:154
-msgid "Croatia"
-msgstr "Croatie"
+#: ../rules/base.xml.in.h:163
+msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
+msgstr "La touche Ctrl est obtenue avec la touche Alt, Alt est obtenue avec les touches logo"
+
+#: ../rules/base.xml.in.h:164
+msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
+msgstr "La touche Ctrl est obtenue avec la touche Logo (et les touches Ctrl habituelles)"
+
+#: ../rules/base.xml.in.h:165
+msgid "Crimean Tatar (Dobruca-1 Q)"
+msgstr "Tatar de Crimée (Q Dobruca-1)"
+
+#: ../rules/base.xml.in.h:166
+msgid "Crimean Tatar (Dobruca-2 Q)"
+msgstr "Tatar de Crimée (Q Dobruca-2)"
-#: ../rules/base.xml.in.h:155 ../rules/evdev.xml.in.h:155
-msgid "Ctrl key at bottom left"
-msgstr "Touche Ctrl en bas à gauche"
+#: ../rules/base.xml.in.h:167
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Tatar de Crimée (Alt-Q turc)"
-#: ../rules/base.xml.in.h:156 ../rules/evdev.xml.in.h:156
-msgid "Ctrl key at left of 'A'"
-msgstr "Touche Ctrl à la gauche du « A »"
+#: ../rules/base.xml.in.h:168
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Tatar de Crimée (F turc)"
-#: ../rules/base.xml.in.h:157 ../rules/evdev.xml.in.h:157
+#: ../rules/base.xml.in.h:169
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Tatar de Crimée (Q turc)"
+
+#: ../rules/base.xml.in.h:170
+msgid "Croatia"
+msgstr "Croatie"
+
+#: ../rules/base.xml.in.h:171
msgid "Ctrl key position"
msgstr "Position de la touche Ctrl"
-#: ../rules/base.xml.in.h:158 ../rules/evdev.xml.in.h:158
-msgid "Ctrl+Shift change layout."
-msgstr "Ctrl+Maj. change de disposition."
+#: ../rules/base.xml.in.h:172
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Maj."
-#: ../rules/base.xml.in.h:159 ../rules/evdev.xml.in.h:159
+#: ../rules/base.xml.in.h:173
msgid "Cyrillic"
msgstr "Cyrillique"
-#: ../rules/base.xml.in.h:160 ../rules/evdev.xml.in.h:160
+#: ../rules/base.xml.in.h:174
msgid "Cyrillic with guillemets"
msgstr "Cyrillique avec guillemets"
-#: ../rules/base.xml.in.h:161 ../rules/evdev.xml.in.h:161
+#: ../rules/base.xml.in.h:175
msgid "Cyrillic, Z and ZHE swapped"
msgstr "Cyrillique, Z et ZHE permutés"
-#: ../rules/base.xml.in.h:162 ../rules/evdev.xml.in.h:162
+#: ../rules/base.xml.in.h:176
msgid "Cze"
msgstr "Cze"
-#: ../rules/base.xml.in.h:163 ../rules/evdev.xml.in.h:163
+#: ../rules/base.xml.in.h:177
msgid "Czechia"
msgstr "République tchèque"
-#: ../rules/base.xml.in.h:164 ../rules/evdev.xml.in.h:164
+#: ../rules/base.xml.in.h:178
+msgid "DOS"
+msgstr "DOS"
+
+#: ../rules/base.xml.in.h:179
msgid "DRC"
msgstr "RDC"
-#: ../rules/base.xml.in.h:165 ../rules/evdev.xml.in.h:165
+#: ../rules/base.xml.in.h:180
msgid "DTK2000"
msgstr "DTK2000"
-#: ../rules/base.xml.in.h:166 ../rules/evdev.xml.in.h:166
+#: ../rules/base.xml.in.h:181
msgid "Dan"
msgstr "Dan"
-#: ../rules/base.xml.in.h:167 ../rules/evdev.xml.in.h:167
+#: ../rules/base.xml.in.h:182
msgid "Dead acute"
msgstr "Touche morte d'accent aigu"
-#: ../rules/base.xml.in.h:168 ../rules/evdev.xml.in.h:168
+#: ../rules/base.xml.in.h:183
msgid "Dead grave acute"
msgstr "Touche morte d'accent grave"
-#: ../rules/base.xml.in.h:169 ../rules/evdev.xml.in.h:169
-msgid "Default numeric keypad keys."
-msgstr "Touches du pavé numérique par défaut."
+#: ../rules/base.xml.in.h:184
+msgid "Default numeric keypad keys"
+msgstr "Touches du pavé numérique par défaut"
-#: ../rules/base.xml.in.h:170 ../rules/evdev.xml.in.h:170
+#: ../rules/base.xml.in.h:185
msgid "Dell"
msgstr "Dell"
-#: ../rules/base.xml.in.h:171 ../rules/evdev.xml.in.h:171
+#: ../rules/base.xml.in.h:186
msgid "Dell 101-key PC"
msgstr "Dell PC 101 touches"
-#: ../rules/base.xml.in.h:172 ../rules/evdev.xml.in.h:172
+#: ../rules/base.xml.in.h:187
msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
msgstr "Portable Dell Inspiron 6xxx/8xxx"
-#: ../rules/base.xml.in.h:173 ../rules/evdev.xml.in.h:173
+#: ../rules/base.xml.in.h:188
msgid "Dell Laptop/notebook Precision M series"
msgstr "Portable Dell Precision série M"
-#: ../rules/base.xml.in.h:174 ../rules/evdev.xml.in.h:174
+#: ../rules/base.xml.in.h:189
msgid "Dell Latitude series laptop"
msgstr "Portable Latitude Dell"
-#: ../rules/base.xml.in.h:175 ../rules/evdev.xml.in.h:175
+#: ../rules/base.xml.in.h:190
msgid "Dell Precision M65"
msgstr "Dell Precision M65"
-#: ../rules/base.xml.in.h:176 ../rules/evdev.xml.in.h:176
+#: ../rules/base.xml.in.h:191
msgid "Dell SK-8125"
msgstr "Dell SK-8125"
-#: ../rules/base.xml.in.h:177 ../rules/evdev.xml.in.h:177
+#: ../rules/base.xml.in.h:192
msgid "Dell SK-8135"
msgstr "Dell SK-8135"
-#: ../rules/base.xml.in.h:178 ../rules/evdev.xml.in.h:178
+#: ../rules/base.xml.in.h:193
msgid "Dell USB Multimedia Keyboard"
msgstr "Clavier multimédia USB Dell"
-#: ../rules/base.xml.in.h:179 ../rules/evdev.xml.in.h:179
+#: ../rules/base.xml.in.h:194
msgid "Denmark"
msgstr "Danemark"
-#: ../rules/base.xml.in.h:180 ../rules/evdev.xml.in.h:180
+#: ../rules/base.xml.in.h:195
msgid "Deu"
msgstr "Deu"
-#: ../rules/base.xml.in.h:181 ../rules/evdev.xml.in.h:181
+#: ../rules/base.xml.in.h:196
msgid "Dexxa Wireless Desktop Keyboard"
msgstr "Dexxa Desktop sans fil"
-#: ../rules/base.xml.in.h:182 ../rules/evdev.xml.in.h:182
+#: ../rules/base.xml.in.h:197
msgid "Diamond 9801 / 9802 series"
msgstr "Diamond 9801 / 9802 series"
-#: ../rules/base.xml.in.h:183 ../rules/evdev.xml.in.h:183
+#: ../rules/base.xml.in.h:198
msgid "Dvorak"
msgstr "Dvorak"
-#: ../rules/base.xml.in.h:184 ../rules/evdev.xml.in.h:184
+#: ../rules/base.xml.in.h:199
msgid "Dvorak (UK Punctuation)"
msgstr "Dvorak (ponctuation britannique)"
-#: ../rules/base.xml.in.h:185 ../rules/evdev.xml.in.h:185
+#: ../rules/base.xml.in.h:200
msgid "Dvorak international"
msgstr "Dvorak international"
-#: ../rules/base.xml.in.h:186 ../rules/evdev.xml.in.h:186
-msgid "Dvorak, Polish quotes on key \"1/!\""
-msgstr "Dvorak, guillemets polonais sur la touche « 1/! »"
+#: ../rules/base.xml.in.h:201
+msgid "Dvorak, Polish quotes on key 1"
+msgstr "Dvorak, guillemets polonais sur la touche « 1 »"
-#: ../rules/base.xml.in.h:187 ../rules/evdev.xml.in.h:187
+#: ../rules/base.xml.in.h:202
msgid "Dvorak, Polish quotes on quotemark key"
msgstr "Dvorak, guillemets polonais sur la touche des guillemets"
-#: ../rules/base.xml.in.h:188 ../rules/evdev.xml.in.h:188
+#: ../rules/base.xml.in.h:203
+msgid "E"
+msgstr "E"
+
+#: ../rules/base.xml.in.h:204
msgid "Eastern"
msgstr "Orientale"
-#: ../rules/base.xml.in.h:189 ../rules/evdev.xml.in.h:189
+#: ../rules/base.xml.in.h:205
msgid "Eliminate dead keys"
msgstr "Éliminer les touches mortes"
-#: ../rules/base.xml.in.h:190 ../rules/evdev.xml.in.h:190
+#: ../rules/base.xml.in.h:206
+msgid "Enable extra typographic characters"
+msgstr "Active des caractères typographiques supplémentaires"
+
+#: ../rules/base.xml.in.h:207
+msgid "English"
+msgstr "Anglais"
+
+#: ../rules/base.xml.in.h:208
msgid "Ennyah DKB-1008"
msgstr "Ennyah DKB-1008"
-#: ../rules/base.xml.in.h:191 ../rules/evdev.xml.in.h:191
+#: ../rules/base.xml.in.h:209
+msgid "Enter on keypad"
+msgstr "Retour sur clavier numérique"
+
+#: ../rules/base.xml.in.h:210
msgid "Epo"
msgstr "Epo"
-#: ../rules/base.xml.in.h:192 ../rules/evdev.xml.in.h:192
+#: ../rules/base.xml.in.h:211
msgid "Ergonomic"
msgstr "Ergonomique"
-#: ../rules/base.xml.in.h:193 ../rules/evdev.xml.in.h:193
+#: ../rules/base.xml.in.h:212
msgid "Esp"
msgstr "Esp"
-#: ../rules/base.xml.in.h:194 ../rules/evdev.xml.in.h:194
+#: ../rules/base.xml.in.h:213
msgid "Esperanto"
msgstr "Esperanto"
-#: ../rules/base.xml.in.h:195 ../rules/evdev.xml.in.h:195
+#: ../rules/base.xml.in.h:214
msgid "Est"
msgstr "Est"
-#: ../rules/base.xml.in.h:196 ../rules/evdev.xml.in.h:196
+#: ../rules/base.xml.in.h:215
msgid "Estonia"
msgstr "Estonie"
-#: ../rules/base.xml.in.h:197 ../rules/evdev.xml.in.h:197
+#: ../rules/base.xml.in.h:216
msgid "Eth"
msgstr "Eth"
-#: ../rules/base.xml.in.h:198 ../rules/evdev.xml.in.h:198
+#: ../rules/base.xml.in.h:217
msgid "Ethiopia"
-msgstr "Ethiopie"
+msgstr "Éthiopie"
-#: ../rules/base.xml.in.h:199 ../rules/evdev.xml.in.h:199
+#: ../rules/base.xml.in.h:218
msgid "Evdev-managed keyboard"
msgstr "Clavier piloté par evdev"
-#: ../rules/base.xml.in.h:200 ../rules/evdev.xml.in.h:200
+#: ../rules/base.xml.in.h:219
msgid "Everex STEPnote"
msgstr "Everex STEPnote"
-#: ../rules/base.xml.in.h:201 ../rules/evdev.xml.in.h:201
+#: ../rules/base.xml.in.h:220
msgid "Ewe"
msgstr "Ewe"
-#: ../rules/base.xml.in.h:202 ../rules/evdev.xml.in.h:202
+#: ../rules/base.xml.in.h:221
msgid "Extended"
msgstr "Étendue"
-#: ../rules/base.xml.in.h:203 ../rules/evdev.xml.in.h:203
+#: ../rules/base.xml.in.h:222
+msgid "Extended - Winkeys"
+msgstr "Étendue - Touches logo"
+
+#: ../rules/base.xml.in.h:223
msgid "Extended Backslash"
msgstr "Barre contre-oblique étendue"
-#: ../rules/base.xml.in.h:204 ../rules/evdev.xml.in.h:204
+#: ../rules/base.xml.in.h:224
msgid "F-letter (F) variant"
msgstr "Variante (F)"
-#: ../rules/base.xml.in.h:205 ../rules/evdev.xml.in.h:205
+#: ../rules/base.xml.in.h:225
+msgid "FL90"
+msgstr "FL90"
+
+#: ../rules/base.xml.in.h:226
msgid "Fao"
msgstr "Fao"
-#: ../rules/base.xml.in.h:206 ../rules/evdev.xml.in.h:206
+#: ../rules/base.xml.in.h:227
msgid "Faroe Islands"
-msgstr "Îles Féroé"
+msgstr "Féroé, Îles"
-#: ../rules/base.xml.in.h:207 ../rules/evdev.xml.in.h:207
+#: ../rules/base.xml.in.h:228
msgid "Fin"
msgstr "Fin"
-#: ../rules/base.xml.in.h:208 ../rules/evdev.xml.in.h:208
+#: ../rules/base.xml.in.h:229
msgid "Finland"
msgstr "Finlande"
#. This assumes the KP_ abstract symbols are actually useful for some apps
#. The description needs to be rewritten
-#: ../rules/base.xml.in.h:211 ../rules/evdev.xml.in.h:211
+#: ../rules/base.xml.in.h:232
msgid "Four-level key with abstract separators"
msgstr "Touches à quatre niveaux avec séparateurs abstraits"
-#: ../rules/base.xml.in.h:212 ../rules/evdev.xml.in.h:212
+#: ../rules/base.xml.in.h:233
msgid "Four-level key with comma"
msgstr "Touches à quatre niveaux avec virgule"
-#: ../rules/base.xml.in.h:213 ../rules/evdev.xml.in.h:213
+#: ../rules/base.xml.in.h:234
msgid "Four-level key with dot"
msgstr "Touches à quatre niveaux avec point"
-#: ../rules/base.xml.in.h:214 ../rules/evdev.xml.in.h:214
+#: ../rules/base.xml.in.h:235
+msgid "Four-level key with dot, latin-9 restriction"
+msgstr "Touches à quatre niveaux avec point, avec restrinction Latin-9"
+
+#: ../rules/base.xml.in.h:236
msgid "Four-level key with momayyez"
msgstr "Touches à quatre niveaux avec momayyez"
-#: ../rules/base.xml.in.h:215 ../rules/evdev.xml.in.h:215
+#: ../rules/base.xml.in.h:237
msgid "Fra"
msgstr "Fra"
-#: ../rules/base.xml.in.h:216 ../rules/evdev.xml.in.h:216
+#: ../rules/base.xml.in.h:238
msgid "France"
msgstr "France"
-#: ../rules/base.xml.in.h:217 ../rules/evdev.xml.in.h:217
+#: ../rules/base.xml.in.h:239
msgid "French"
msgstr "Français"
-#: ../rules/base.xml.in.h:218 ../rules/evdev.xml.in.h:218
+#: ../rules/base.xml.in.h:240
msgid "French (Macintosh)"
msgstr "Français (Apple-Macintosh)"
-#: ../rules/base.xml.in.h:219 ../rules/evdev.xml.in.h:219
+#: ../rules/base.xml.in.h:241
msgid "French (legacy)"
msgstr "Français (obsolète)"
-#: ../rules/base.xml.in.h:220 ../rules/evdev.xml.in.h:220
+#: ../rules/base.xml.in.h:242
msgid "French Dvorak"
msgstr "Dvorak français"
-#: ../rules/base.xml.in.h:221 ../rules/evdev.xml.in.h:221
+#: ../rules/base.xml.in.h:243
msgid "French, Sun dead keys"
msgstr "Français, touches mortes Sun"
-#: ../rules/base.xml.in.h:222 ../rules/evdev.xml.in.h:222
+#: ../rules/base.xml.in.h:244
msgid "French, eliminate dead keys"
msgstr "Français, sans touches mortes"
-#: ../rules/base.xml.in.h:223 ../rules/evdev.xml.in.h:223
-msgid "Fujitsu-Siemens Computers AMILO A1667G laptop"
-msgstr "Portable Fujitsu-Siemens Computers AMILO A1667G"
+#: ../rules/base.xml.in.h:245
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Portable Fujitsu-Siemens Computers AMILO"
-#: ../rules/base.xml.in.h:224 ../rules/evdev.xml.in.h:224
+#: ../rules/base.xml.in.h:246
msgid "Fula"
msgstr "Peul"
-#: ../rules/base.xml.in.h:225 ../rules/evdev.xml.in.h:225
+#: ../rules/base.xml.in.h:247
msgid "GBr"
msgstr "GBr"
-#: ../rules/base.xml.in.h:226 ../rules/evdev.xml.in.h:226
+#: ../rules/base.xml.in.h:248
msgid "Ga"
msgstr "Ga"
-#: ../rules/base.xml.in.h:227 ../rules/evdev.xml.in.h:227
+#: ../rules/base.xml.in.h:249
msgid "Generic 101-key PC"
msgstr "PC générique 101 touches"
-#: ../rules/base.xml.in.h:228 ../rules/evdev.xml.in.h:228
+#: ../rules/base.xml.in.h:250
msgid "Generic 102-key (Intl) PC"
msgstr "PC générique 102 touches (intl)"
-#: ../rules/base.xml.in.h:229 ../rules/evdev.xml.in.h:229
+#: ../rules/base.xml.in.h:251
msgid "Generic 104-key PC"
msgstr "PC générique 104 touches"
-#: ../rules/base.xml.in.h:230 ../rules/evdev.xml.in.h:230
+#: ../rules/base.xml.in.h:252
msgid "Generic 105-key (Intl) PC"
msgstr "PC générique 105 touches (intl)"
-#: ../rules/base.xml.in.h:231 ../rules/evdev.xml.in.h:231
+#: ../rules/base.xml.in.h:253
msgid "Genius Comfy KB-12e"
msgstr "Genius Comfy KB-12e"
-#: ../rules/base.xml.in.h:232 ../rules/evdev.xml.in.h:232
+#: ../rules/base.xml.in.h:254
msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
msgstr "Genius Comfy KB-16M / Genius MM KWD-910"
-#: ../rules/base.xml.in.h:233 ../rules/evdev.xml.in.h:233
+#: ../rules/base.xml.in.h:255
msgid "Genius Comfy KB-21e-Scroll"
msgstr "Genius Comfy KB-21e-Scroll"
-#: ../rules/base.xml.in.h:234 ../rules/evdev.xml.in.h:234
+#: ../rules/base.xml.in.h:256
msgid "Genius KB-19e NB"
msgstr "Genius KB-19e NB"
-#: ../rules/base.xml.in.h:235 ../rules/evdev.xml.in.h:235
+#: ../rules/base.xml.in.h:257
+msgid "Genius KKB-2050HS"
+msgstr "Genius KKB-2050HS"
+
+#: ../rules/base.xml.in.h:258
msgid "Geo"
msgstr "Geo"
-#: ../rules/base.xml.in.h:236 ../rules/evdev.xml.in.h:236
+#: ../rules/base.xml.in.h:259
msgid "Georgia"
msgstr "Géorgie"
-#: ../rules/base.xml.in.h:237 ../rules/evdev.xml.in.h:237
+#: ../rules/base.xml.in.h:260
msgid "Georgian"
msgstr "Géorgien"
-#: ../rules/base.xml.in.h:238 ../rules/evdev.xml.in.h:238
+#: ../rules/base.xml.in.h:261
msgid "Georgian AZERTY Tskapo"
msgstr "AZERTY géorgien Tskapo"
-#: ../rules/base.xml.in.h:239 ../rules/evdev.xml.in.h:239
+#: ../rules/base.xml.in.h:262
msgid "German (Macintosh)"
msgstr "Allemand (Apple-Macintosh)"
-#: ../rules/base.xml.in.h:240 ../rules/evdev.xml.in.h:240
+#: ../rules/base.xml.in.h:263
msgid "German, Sun dead keys"
msgstr "Allemand, touches mortes Sun"
-#: ../rules/base.xml.in.h:241 ../rules/evdev.xml.in.h:241
+#: ../rules/base.xml.in.h:264
msgid "German, eliminate dead keys"
msgstr "Allemand, sans touches mortes"
-#: ../rules/base.xml.in.h:242 ../rules/evdev.xml.in.h:242
+#: ../rules/base.xml.in.h:265
msgid "Germany"
msgstr "Allemagne"
-#: ../rules/base.xml.in.h:243 ../rules/evdev.xml.in.h:243
+#: ../rules/base.xml.in.h:266
msgid "Gha"
msgstr "Gha"
-#: ../rules/base.xml.in.h:244 ../rules/evdev.xml.in.h:244
+#: ../rules/base.xml.in.h:267
msgid "Ghana"
msgstr "Ghana"
-#: ../rules/base.xml.in.h:245 ../rules/evdev.xml.in.h:245
+#: ../rules/base.xml.in.h:268
msgid "Gre"
msgstr "Gre"
-#: ../rules/base.xml.in.h:246 ../rules/evdev.xml.in.h:246
+#: ../rules/base.xml.in.h:269
msgid "Greece"
msgstr "Grèce"
-#: ../rules/base.xml.in.h:247 ../rules/evdev.xml.in.h:247
+#: ../rules/base.xml.in.h:270
msgid "Group toggle on multiply/divide key"
msgstr "Les touches Multiplier/Diviser basculent d'un groupe à l'autre"
-#: ../rules/base.xml.in.h:248 ../rules/evdev.xml.in.h:248
+#: ../rules/base.xml.in.h:271
msgid "Gui"
msgstr "Gui"
-#: ../rules/base.xml.in.h:249 ../rules/evdev.xml.in.h:249
+#: ../rules/base.xml.in.h:272
msgid "Guinea"
msgstr "Guinée"
-#: ../rules/base.xml.in.h:250 ../rules/evdev.xml.in.h:250
+#: ../rules/base.xml.in.h:273
msgid "Gujarati"
msgstr "Gujarati"
-#: ../rules/base.xml.in.h:251 ../rules/evdev.xml.in.h:251
+#: ../rules/base.xml.in.h:274
msgid "Gurmukhi"
msgstr "Gurmukhi"
-#: ../rules/base.xml.in.h:252 ../rules/evdev.xml.in.h:252
+#: ../rules/base.xml.in.h:275
msgid "Gurmukhi Jhelum"
msgstr "Gurmukhi Jhelum"
-#: ../rules/base.xml.in.h:253 ../rules/evdev.xml.in.h:253
+#: ../rules/base.xml.in.h:276
msgid "Gyration"
msgstr "Gyration"
-#: ../rules/base.xml.in.h:254 ../rules/evdev.xml.in.h:254
+#: ../rules/base.xml.in.h:277
msgid "Happy Hacking Keyboard"
msgstr "Clavier Happy Hacking"
-#: ../rules/base.xml.in.h:255 ../rules/evdev.xml.in.h:255
+#: ../rules/base.xml.in.h:278
msgid "Happy Hacking Keyboard for Mac"
msgstr "Clavier Happy Hacking pour Mac"
-#: ../rules/base.xml.in.h:256 ../rules/evdev.xml.in.h:256
+#: ../rules/base.xml.in.h:279
msgid "Hausa"
msgstr "Haoussa"
-#: ../rules/base.xml.in.h:257 ../rules/evdev.xml.in.h:257
+#: ../rules/base.xml.in.h:280
msgid "Hewlett-Packard Internet Keyboard"
msgstr "Hewlett-Packard Internet"
-#: ../rules/base.xml.in.h:258 ../rules/evdev.xml.in.h:258
-msgid "Hewlett-Packard Internet Keyboard 5181"
-msgstr "Hewlett-Packard avec clavier Internet 5181"
-
-#: ../rules/base.xml.in.h:259 ../rules/evdev.xml.in.h:259
-msgid "Hewlett-Packard Internet Keyboard 5185"
-msgstr "Hewlett-Packard avec clavier Internet 5185"
-
-#: ../rules/base.xml.in.h:260 ../rules/evdev.xml.in.h:260
+#: ../rules/base.xml.in.h:281
msgid "Hewlett-Packard Omnibook 500 FA"
msgstr "Hewlett-Packard Omnibook 500 FA"
-#: ../rules/base.xml.in.h:261 ../rules/evdev.xml.in.h:261
+#: ../rules/base.xml.in.h:282
msgid "Hewlett-Packard Omnibook 5xx"
msgstr "Hewlett-Packard Omnibook 5xx"
-#: ../rules/base.xml.in.h:262 ../rules/evdev.xml.in.h:262
+#: ../rules/base.xml.in.h:283
msgid "Hewlett-Packard Omnibook 6000/6100"
msgstr "Hewlett-Packard Omnibook 6000/6100"
-#: ../rules/base.xml.in.h:263 ../rules/evdev.xml.in.h:263
+#: ../rules/base.xml.in.h:284
msgid "Hewlett-Packard Omnibook XE3 GC"
msgstr "Hewlett-Packard Omnibook XE3 GC"
-#: ../rules/base.xml.in.h:264 ../rules/evdev.xml.in.h:264
+#: ../rules/base.xml.in.h:285
msgid "Hewlett-Packard Omnibook XE3 GF"
msgstr "Hewlett-Packard Omnibook XE3 GF"
-#: ../rules/base.xml.in.h:265 ../rules/evdev.xml.in.h:265
+#: ../rules/base.xml.in.h:286
msgid "Hewlett-Packard Omnibook XT1000"
msgstr "Hewlett-Packard Omnibook XT1000"
-#: ../rules/base.xml.in.h:266 ../rules/evdev.xml.in.h:266
+#: ../rules/base.xml.in.h:287
msgid "Hewlett-Packard Pavilion ZT11xx"
msgstr "Hewlett-Packard Pavilion ZT11xx"
-#: ../rules/base.xml.in.h:267 ../rules/evdev.xml.in.h:267
-msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-2501 Multimedia"
+#: ../rules/base.xml.in.h:288
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
-#: ../rules/base.xml.in.h:268 ../rules/evdev.xml.in.h:268
-msgid "Hewlett-Packard SK-2505 Internet Keyboard"
-msgstr "Hewlett-Packard SK-2505 Internet"
+#: ../rules/base.xml.in.h:289
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-250x, clavier multimedia"
-#: ../rules/base.xml.in.h:269 ../rules/evdev.xml.in.h:269
+#: ../rules/base.xml.in.h:290
msgid "Hewlett-Packard nx9020"
msgstr "Hewlett-Packard nx9020"
-#: ../rules/base.xml.in.h:270 ../rules/evdev.xml.in.h:270
+#: ../rules/base.xml.in.h:291
+msgid "Hexadecimal"
+msgstr "Hexadécimal"
+
+#: ../rules/base.xml.in.h:292
msgid "Hindi Bolnagri"
msgstr "Hindi Bolnagri"
-#: ../rules/base.xml.in.h:271 ../rules/evdev.xml.in.h:271
+#: ../rules/base.xml.in.h:293
+msgid "Hindi Wx"
+msgstr "Hindi Wx"
+
+#: ../rules/base.xml.in.h:294
msgid "Homophonic"
msgstr "Homophone"
-#: ../rules/base.xml.in.h:272 ../rules/evdev.xml.in.h:272
+#: ../rules/base.xml.in.h:295
msgid "Honeywell Euroboard"
msgstr "Honeywell Euroboard"
-#: ../rules/base.xml.in.h:273 ../rules/evdev.xml.in.h:273
+#: ../rules/base.xml.in.h:296
msgid "Hrv"
msgstr "Hrv"
-#: ../rules/base.xml.in.h:274 ../rules/evdev.xml.in.h:274
+#: ../rules/base.xml.in.h:297
msgid "Hun"
msgstr "Hun"
-#: ../rules/base.xml.in.h:275 ../rules/evdev.xml.in.h:275
+#: ../rules/base.xml.in.h:298
msgid "Hungary"
msgstr "Hongrie"
-#: ../rules/base.xml.in.h:276 ../rules/evdev.xml.in.h:276
-msgid "Hyper is mapped to the Win-keys."
-msgstr "Hyper est obtenu avec n'importe quelle touche Logo."
+#: ../rules/base.xml.in.h:299
+msgid "Hyper is mapped to Win-keys"
+msgstr "Hyper est obtenu avec n'importe quelle touche Logo"
-#: ../rules/base.xml.in.h:277 ../rules/evdev.xml.in.h:277
+#: ../rules/base.xml.in.h:300
msgid "IBM (LST 1205-92)"
msgstr "IBM (LST 1205-92)"
-#: ../rules/base.xml.in.h:278 ../rules/evdev.xml.in.h:278
+#: ../rules/base.xml.in.h:301
msgid "IBM Rapid Access"
msgstr "IBM Rapid Access"
-#: ../rules/base.xml.in.h:279 ../rules/evdev.xml.in.h:279
+#: ../rules/base.xml.in.h:302
msgid "IBM Rapid Access II"
msgstr "IBM Rapid Access II"
-#: ../rules/base.xml.in.h:280 ../rules/evdev.xml.in.h:280
-msgid "IBM Rapid Access II (alternate option)"
-msgstr "IBM Rapid Access II (autre option)"
-
-#: ../rules/base.xml.in.h:281 ../rules/evdev.xml.in.h:281
+#: ../rules/base.xml.in.h:303
msgid "IBM Space Saver"
msgstr "IBM Space Saver"
-#: ../rules/base.xml.in.h:282 ../rules/evdev.xml.in.h:282
+#: ../rules/base.xml.in.h:304
msgid "IBM ThinkPad 560Z/600/600E/A22E"
msgstr "IBM ThinkPad 560Z/600/600E/A22E"
-#: ../rules/base.xml.in.h:283 ../rules/evdev.xml.in.h:283
+#: ../rules/base.xml.in.h:305
msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
msgstr "IBM ThinkPad 560Z/600/600E/A22E (Intl)"
-#: ../rules/base.xml.in.h:284 ../rules/evdev.xml.in.h:284
+#: ../rules/base.xml.in.h:306
msgid "IBM ThinkPad R60/T60/R61/T61"
msgstr "IBM ThinkPad R60/T60/R61/T61"
-#: ../rules/base.xml.in.h:285 ../rules/evdev.xml.in.h:285
+#: ../rules/base.xml.in.h:307
msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
-#: ../rules/base.xml.in.h:286 ../rules/evdev.xml.in.h:286
+#: ../rules/base.xml.in.h:308
msgid "ISO Alternate"
msgstr "Autre ISO"
-#: ../rules/base.xml.in.h:287 ../rules/evdev.xml.in.h:287
+#: ../rules/base.xml.in.h:309
msgid "Iceland"
msgstr "Islande"
-#: ../rules/base.xml.in.h:288 ../rules/evdev.xml.in.h:288
+#: ../rules/base.xml.in.h:310
msgid "Igbo"
msgstr "Igbo"
-#: ../rules/base.xml.in.h:289 ../rules/evdev.xml.in.h:289
+#: ../rules/base.xml.in.h:311
+msgid "Include dead tilde"
+msgstr "Inclut le tilde"
+
+#: ../rules/base.xml.in.h:312
msgid "Ind"
msgstr "Ind"
-#: ../rules/base.xml.in.h:290 ../rules/evdev.xml.in.h:290
+#: ../rules/base.xml.in.h:313
msgid "India"
msgstr "Inde"
-#: ../rules/base.xml.in.h:291 ../rules/evdev.xml.in.h:291
+#: ../rules/base.xml.in.h:314
msgid "International (AltGr dead keys)"
msgstr "International (AltCar et touches mortes)"
-#: ../rules/base.xml.in.h:292 ../rules/evdev.xml.in.h:292
+#: ../rules/base.xml.in.h:315
msgid "International (with dead keys)"
msgstr "International (avec touches mortes)"
-#: ../rules/base.xml.in.h:293 ../rules/evdev.xml.in.h:293
+#: ../rules/base.xml.in.h:316
msgid "Inuktitut"
msgstr "Inuktitut"
-#: ../rules/base.xml.in.h:294 ../rules/evdev.xml.in.h:294
+#: ../rules/base.xml.in.h:317
msgid "Iran"
msgstr "Iran"
-#: ../rules/base.xml.in.h:295 ../rules/evdev.xml.in.h:295
+#: ../rules/base.xml.in.h:318
msgid "Iraq"
msgstr "Irak"
-#: ../rules/base.xml.in.h:296 ../rules/evdev.xml.in.h:296
+#: ../rules/base.xml.in.h:319
msgid "Ireland"
msgstr "Irlande"
-#: ../rules/base.xml.in.h:297 ../rules/evdev.xml.in.h:297
+#: ../rules/base.xml.in.h:320
msgid "Irl"
msgstr "Irl"
-#: ../rules/base.xml.in.h:298 ../rules/evdev.xml.in.h:298
+#: ../rules/base.xml.in.h:321
msgid "Irn"
msgstr "Irn"
-#: ../rules/base.xml.in.h:299 ../rules/evdev.xml.in.h:299
+#: ../rules/base.xml.in.h:322
msgid "Irq"
msgstr "Irq"
-#: ../rules/base.xml.in.h:300 ../rules/evdev.xml.in.h:300
+#: ../rules/base.xml.in.h:323
msgid "Isl"
msgstr "Isl"
-#: ../rules/base.xml.in.h:301 ../rules/evdev.xml.in.h:301
+#: ../rules/base.xml.in.h:324
msgid "Isr"
msgstr "Isr"
-#: ../rules/base.xml.in.h:302 ../rules/evdev.xml.in.h:302
+#: ../rules/base.xml.in.h:325
msgid "Israel"
msgstr "Israël"
-#: ../rules/base.xml.in.h:303 ../rules/evdev.xml.in.h:303
+#: ../rules/base.xml.in.h:326
msgid "Ita"
msgstr "Ita"
-#: ../rules/base.xml.in.h:304 ../rules/evdev.xml.in.h:304
+#: ../rules/base.xml.in.h:327
msgid "Italy"
msgstr "Italie"
-#: ../rules/base.xml.in.h:305 ../rules/evdev.xml.in.h:305
+#: ../rules/base.xml.in.h:328
msgid "Japan"
msgstr "Japon"
-#: ../rules/base.xml.in.h:306 ../rules/evdev.xml.in.h:306
+#: ../rules/base.xml.in.h:329
msgid "Japan (PC-98xx Series)"
msgstr "PC-98xx japonais"
-#: ../rules/base.xml.in.h:307 ../rules/evdev.xml.in.h:307
-msgid "Japanese 106-key"
-msgstr "Japonais 106 touches"
-
-#: ../rules/base.xml.in.h:308 ../rules/evdev.xml.in.h:308
+#: ../rules/base.xml.in.h:330
msgid "Japanese keyboard options"
msgstr "Options de clavier japonais"
-#: ../rules/base.xml.in.h:309 ../rules/evdev.xml.in.h:309
+#: ../rules/base.xml.in.h:331
msgid "Jpn"
msgstr "Jpn"
-#: ../rules/base.xml.in.h:310 ../rules/evdev.xml.in.h:310
+#: ../rules/base.xml.in.h:332
+msgid "Kalmyk"
+msgstr "Kalmyk"
+
+#: ../rules/base.xml.in.h:333
msgid "Kana"
msgstr "Kana"
-#: ../rules/base.xml.in.h:311 ../rules/evdev.xml.in.h:311
+#: ../rules/base.xml.in.h:334
msgid "Kana Lock key is locking"
msgstr "La touche de verrouillage Kana agit comme touche de verrouillage"
-#: ../rules/base.xml.in.h:312 ../rules/evdev.xml.in.h:312
+#: ../rules/base.xml.in.h:335
msgid "Kannada"
msgstr "Kannada"
-#: ../rules/base.xml.in.h:313 ../rules/evdev.xml.in.h:313
+#: ../rules/base.xml.in.h:336
msgid "Kashubian"
msgstr "Kachoube"
-#: ../rules/base.xml.in.h:314 ../rules/evdev.xml.in.h:314
+#: ../rules/base.xml.in.h:337
msgid "Kaz"
msgstr "Kaz"
-#: ../rules/base.xml.in.h:315 ../rules/evdev.xml.in.h:315
+#: ../rules/base.xml.in.h:338
msgid "Kazakh with Russian"
msgstr "Kazakh avec russe"
-#: ../rules/base.xml.in.h:316 ../rules/evdev.xml.in.h:316
+#: ../rules/base.xml.in.h:339
msgid "Kazakhstan"
msgstr "Kazakhstan"
-#: ../rules/base.xml.in.h:317 ../rules/evdev.xml.in.h:317
-msgid "Keypad"
-msgstr "Pavé numérique"
+#: ../rules/base.xml.in.h:340
+msgid "Key sequence to kill the X server"
+msgstr "Séquence de touches pour fermer le serveur X"
+
+#: ../rules/base.xml.in.h:341
+msgid "Key to choose 3rd level"
+msgstr "Touche sélectionnant le 3e niveau"
-#: ../rules/base.xml.in.h:318 ../rules/evdev.xml.in.h:318
-msgid "Keypad with unicode additions (arrows and math operators)"
-msgstr "Clavier avec ajouts Unicode (touches fléchées et opérateurs mathématiques)"
+#: ../rules/base.xml.in.h:342
+msgid "Key(s) to change layout"
+msgstr "Touche(s) changeant de disposition."
-#: ../rules/base.xml.in.h:319 ../rules/evdev.xml.in.h:319
-msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Clavier avec ajouts Unicode (touches fléchées et opérateurs mathématiques). Les opérateurs mathématiques se trouvent sur le niveau par défaut."
+#: ../rules/base.xml.in.h:343
+msgid "Keypad"
+msgstr "Pavé numérique"
-#: ../rules/base.xml.in.h:320 ../rules/evdev.xml.in.h:320
+#: ../rules/base.xml.in.h:344
msgid "Keytronic FlexPro"
msgstr "Keytronic FlexPro"
-#: ../rules/base.xml.in.h:321 ../rules/evdev.xml.in.h:321
+#: ../rules/base.xml.in.h:345
+msgid "Kgz"
+msgstr "Kgz"
+
+#: ../rules/base.xml.in.h:346
msgid "Khm"
msgstr "Khm"
-#: ../rules/base.xml.in.h:322 ../rules/evdev.xml.in.h:322
-msgid "Kir"
-msgstr "Kir"
-
-#: ../rules/base.xml.in.h:323 ../rules/evdev.xml.in.h:323
+#: ../rules/base.xml.in.h:347
msgid "Komi"
msgstr "Komi"
-#: ../rules/base.xml.in.h:324 ../rules/evdev.xml.in.h:324
+#: ../rules/base.xml.in.h:348
msgid "Kor"
msgstr "Kor"
-#: ../rules/base.xml.in.h:325 ../rules/evdev.xml.in.h:325
+#: ../rules/base.xml.in.h:349
msgid "Korea, Republic of"
-msgstr "République de Corée"
-
-#: ../rules/base.xml.in.h:326 ../rules/evdev.xml.in.h:326
-msgid "Korean 106-key"
-msgstr "Coréen 106 touches"
+msgstr "Corée, République de"
-#: ../rules/base.xml.in.h:327 ../rules/evdev.xml.in.h:327
+#: ../rules/base.xml.in.h:350
msgid "Ktunaxa"
msgstr "Ktunaxa"
-#: ../rules/base.xml.in.h:328 ../rules/evdev.xml.in.h:328
+#: ../rules/base.xml.in.h:351
msgid "Kurdish, (F)"
msgstr "Kurde, (F)"
-#: ../rules/base.xml.in.h:329 ../rules/evdev.xml.in.h:329
+#: ../rules/base.xml.in.h:352
msgid "Kurdish, Arabic-Latin"
msgstr "Kurde, Arabe-latin"
-#: ../rules/base.xml.in.h:330 ../rules/evdev.xml.in.h:330
+#: ../rules/base.xml.in.h:353
msgid "Kurdish, Latin Alt-Q"
msgstr "Kurde, Latin Alt-Q"
-#: ../rules/base.xml.in.h:331 ../rules/evdev.xml.in.h:331
+#: ../rules/base.xml.in.h:354
msgid "Kurdish, Latin Q"
msgstr "Kurde, Latin Q"
-#: ../rules/base.xml.in.h:332 ../rules/evdev.xml.in.h:332
+#: ../rules/base.xml.in.h:355
msgid "Kyrgyzstan"
msgstr "Kirghizistan"
-#: ../rules/base.xml.in.h:333 ../rules/evdev.xml.in.h:333
+#: ../rules/base.xml.in.h:356
msgid "LAm"
msgstr "LAm"
-#: ../rules/base.xml.in.h:334 ../rules/evdev.xml.in.h:334
-msgid "LCtrl+LShift change layout."
-msgstr "Ctrl gauche+Maj. gauche change de disposition."
-
-#: ../rules/base.xml.in.h:335 ../rules/evdev.xml.in.h:335
+#: ../rules/base.xml.in.h:357
msgid "LEKP"
msgstr "LEKP"
-#: ../rules/base.xml.in.h:336 ../rules/evdev.xml.in.h:336
+#: ../rules/base.xml.in.h:358
msgid "LEKPa"
msgstr "LEKPa"
-#: ../rules/base.xml.in.h:337 ../rules/evdev.xml.in.h:337
+#: ../rules/base.xml.in.h:359
msgid "Lao"
msgstr "Lao"
-#: ../rules/base.xml.in.h:338 ../rules/evdev.xml.in.h:338
+#: ../rules/base.xml.in.h:360
msgid "Laos"
msgstr "Laos"
-#: ../rules/base.xml.in.h:339 ../rules/evdev.xml.in.h:339
+#: ../rules/base.xml.in.h:361
msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
msgstr "Compaq portable (p.e. Armada)"
-#: ../rules/base.xml.in.h:340 ../rules/evdev.xml.in.h:340
+#: ../rules/base.xml.in.h:362
msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
msgstr "Compaq portable Internet (p.e. Presario)"
-#: ../rules/base.xml.in.h:341 ../rules/evdev.xml.in.h:341
+#: ../rules/base.xml.in.h:363
msgid "Laptop/notebook eMachines m68xx"
msgstr "eMachines m68xx"
-#: ../rules/base.xml.in.h:342 ../rules/evdev.xml.in.h:342
+#: ../rules/base.xml.in.h:364
msgid "Latin"
msgstr "Latin"
-#: ../rules/base.xml.in.h:343 ../rules/evdev.xml.in.h:343
+#: ../rules/base.xml.in.h:365
msgid "Latin American"
msgstr "Amérique latine"
-#: ../rules/base.xml.in.h:344 ../rules/evdev.xml.in.h:344
+#: ../rules/base.xml.in.h:366
msgid "Latin Unicode"
msgstr "Latin Unicode"
-#: ../rules/base.xml.in.h:345 ../rules/evdev.xml.in.h:345
+#: ../rules/base.xml.in.h:367
msgid "Latin Unicode qwerty"
msgstr "Latin Unicode qwerty"
-#: ../rules/base.xml.in.h:346 ../rules/evdev.xml.in.h:346
+#: ../rules/base.xml.in.h:368
msgid "Latin qwerty"
msgstr "Latin qwerty"
-#: ../rules/base.xml.in.h:347 ../rules/evdev.xml.in.h:347
+#: ../rules/base.xml.in.h:369
msgid "Latin unicode"
msgstr "Unicode Latin"
-#: ../rules/base.xml.in.h:348 ../rules/evdev.xml.in.h:348
+#: ../rules/base.xml.in.h:370
msgid "Latin unicode qwerty"
msgstr "Unicode Latin QWERTY"
-#: ../rules/base.xml.in.h:349 ../rules/evdev.xml.in.h:349
+#: ../rules/base.xml.in.h:371
msgid "Latin with guillemets"
msgstr "Latin avec guillemets"
-#: ../rules/base.xml.in.h:350 ../rules/evdev.xml.in.h:350
+#: ../rules/base.xml.in.h:372
msgid "Latvia"
msgstr "Lettonie"
-#: ../rules/base.xml.in.h:351 ../rules/evdev.xml.in.h:351
+#: ../rules/base.xml.in.h:373
msgid "Lav"
msgstr "Lav"
-#: ../rules/base.xml.in.h:352 ../rules/evdev.xml.in.h:352
-msgid "Layout switching"
-msgstr "Changement de disposition"
+#: ../rules/base.xml.in.h:374
+msgid "Left Alt"
+msgstr "Alt gauche"
-#: ../rules/base.xml.in.h:353 ../rules/evdev.xml.in.h:353
-msgid "Left Alt is swapped with left Win-key."
-msgstr "La touche Alt de gauche est échangée avec la touche Logo de gauche."
+#: ../rules/base.xml.in.h:375
+msgid "Left Alt (while pressed)"
+msgstr "Alt de gauche (lorsque pressée)"
-#: ../rules/base.xml.in.h:354 ../rules/evdev.xml.in.h:354
-msgid "Left Alt key changes layout."
-msgstr "La touche Alt de gauche change de disposition."
+#: ../rules/base.xml.in.h:376
+msgid "Left Alt is swapped with Left Win"
+msgstr "La touche Alt de gauche est échangée avec la touche Logo de gauche"
-#: ../rules/base.xml.in.h:355 ../rules/evdev.xml.in.h:355
-msgid "Left Alt key switches layout while pressed."
-msgstr "Maintenir la touche Alt de gauche enfoncée change de disposition."
+#: ../rules/base.xml.in.h:377
+msgid "Left Ctrl"
+msgstr "Ctrl gauche"
-#: ../rules/base.xml.in.h:356 ../rules/evdev.xml.in.h:356
-msgid "Left Ctrl key changes layout."
-msgstr "La touche Ctrl de gauche change de disposition."
+#: ../rules/base.xml.in.h:378
+msgid "Left Ctrl+Left Shift"
+msgstr "Ctrl gauche+Maj. gauche"
-#: ../rules/base.xml.in.h:357 ../rules/evdev.xml.in.h:357
-msgid "Left Shift key changes layout."
-msgstr "La touche Maj. de gauche change de disposition."
+#: ../rules/base.xml.in.h:379
+msgid "Left Shift"
+msgstr "Maj. gauche"
-#: ../rules/base.xml.in.h:358 ../rules/evdev.xml.in.h:358
-msgid "Left Win-key changes layout."
-msgstr "La touche Logo de gauche change de disposition."
+#: ../rules/base.xml.in.h:380
+msgid "Left Win"
+msgstr "Touche Logo gauche"
-#: ../rules/base.xml.in.h:359 ../rules/evdev.xml.in.h:359
-msgid "Left Win-key is Compose."
-msgstr "La touche Logo de gauche est Compose."
+#: ../rules/base.xml.in.h:381
+msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgstr "Touche logo de gauche (première disposition), touche logo de droite (dernière disposition)"
-#: ../rules/base.xml.in.h:360 ../rules/evdev.xml.in.h:360
-msgid "Left Win-key switches layout while pressed."
-msgstr "Maintenir la touche Logo de gauche enfoncée change de disposition."
+#: ../rules/base.xml.in.h:382
+msgid "Left Win (while pressed)"
+msgstr "Logo de gauche (lorsque pressée)"
-#: ../rules/base.xml.in.h:361 ../rules/evdev.xml.in.h:361
+#: ../rules/base.xml.in.h:383
msgid "Left hand"
msgstr "Main gauche"
-#: ../rules/base.xml.in.h:362 ../rules/evdev.xml.in.h:362
+#: ../rules/base.xml.in.h:384
msgid "Left handed Dvorak"
msgstr "Dvorak pour gaucher"
-#: ../rules/base.xml.in.h:363 ../rules/evdev.xml.in.h:363
+#: ../rules/base.xml.in.h:385
msgid "Legacy"
msgstr "Obsolète"
-#: ../rules/base.xml.in.h:364 ../rules/evdev.xml.in.h:364
-msgid "Legacy Wang 724 keypad"
+#: ../rules/base.xml.in.h:386
+msgid "Legacy Wang 724"
msgstr "Clavier Wang 724 obsolète"
#. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:366 ../rules/evdev.xml.in.h:366
+#: ../rules/base.xml.in.h:388
msgid "Legacy key with comma"
msgstr "Touche obsolète avec virgule"
-#: ../rules/base.xml.in.h:367 ../rules/evdev.xml.in.h:367
+#: ../rules/base.xml.in.h:389
msgid "Legacy key with dot"
msgstr "Touche obsolète avec point"
-#: ../rules/base.xml.in.h:368 ../rules/evdev.xml.in.h:368
-msgid "Legacy keypad"
-msgstr "Clavier obsolète"
-
-#: ../rules/base.xml.in.h:369 ../rules/evdev.xml.in.h:369
-msgid "Less-than/Greater-than is Compose."
-msgstr "Plus petit que/Plus grand que est Compose."
+#: ../rules/base.xml.in.h:390
+msgid "Less-than/Greater-than"
+msgstr "Plus petit que/Plus grand que"
-#: ../rules/base.xml.in.h:370 ../rules/evdev.xml.in.h:370
+#: ../rules/base.xml.in.h:391
msgid "Lithuania"
msgstr "Lituanie"
-#: ../rules/base.xml.in.h:371 ../rules/evdev.xml.in.h:371
+#: ../rules/base.xml.in.h:392
msgid "Logitech Access Keyboard"
msgstr "Clavier Logitech Access"
-#: ../rules/base.xml.in.h:372 ../rules/evdev.xml.in.h:372
+#: ../rules/base.xml.in.h:393
msgid "Logitech Cordless Desktop"
msgstr "Logitech Cordless Desktop"
-#: ../rules/base.xml.in.h:373 ../rules/evdev.xml.in.h:373
+#: ../rules/base.xml.in.h:394
msgid "Logitech Cordless Desktop (alternate option)"
msgstr "Logitech Cordless Desktop (autre option)"
-#: ../rules/base.xml.in.h:374 ../rules/evdev.xml.in.h:374
+#: ../rules/base.xml.in.h:395
msgid "Logitech Cordless Desktop EX110"
msgstr "Logitech Cordless Desktop EX110"
-#: ../rules/base.xml.in.h:375 ../rules/evdev.xml.in.h:375
+#: ../rules/base.xml.in.h:396
msgid "Logitech Cordless Desktop LX-300"
msgstr "Logitech Cordless Desktop LX-300"
-#: ../rules/base.xml.in.h:376 ../rules/evdev.xml.in.h:376
+#: ../rules/base.xml.in.h:397
msgid "Logitech Cordless Desktop Navigator"
msgstr "Logitech Cordless Desktop Navigator"
-#: ../rules/base.xml.in.h:377 ../rules/evdev.xml.in.h:377
+#: ../rules/base.xml.in.h:398
msgid "Logitech Cordless Desktop Optical"
msgstr "Logitech Cordless Desktop Optical"
-#: ../rules/base.xml.in.h:378 ../rules/evdev.xml.in.h:378
-msgid "Logitech Cordless Desktop Pro (alternate option2)"
-msgstr "Logitech Cordless Desktop Pro (autre option 2)"
+#: ../rules/base.xml.in.h:399
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgstr "Logitech Cordless Desktop Pro (option alt 2)"
-#: ../rules/base.xml.in.h:379 ../rules/evdev.xml.in.h:379
+#: ../rules/base.xml.in.h:400
msgid "Logitech Cordless Desktop iTouch"
msgstr "Logitech Cordless Desktop iTouch"
-#: ../rules/base.xml.in.h:380 ../rules/evdev.xml.in.h:380
+#: ../rules/base.xml.in.h:401
msgid "Logitech Cordless Freedom/Desktop Navigator"
msgstr "Logitech Cordless Freedom/Desktop Navigator"
-#: ../rules/base.xml.in.h:381 ../rules/evdev.xml.in.h:381
+#: ../rules/base.xml.in.h:402
msgid "Logitech G15 extra keys via G15daemon"
msgstr "Touches supplémentaires pour Logitech G15 via le démon G15"
-#: ../rules/base.xml.in.h:382 ../rules/evdev.xml.in.h:382
+#: ../rules/base.xml.in.h:403
msgid "Logitech Generic Keyboard"
msgstr "Clavier Logitech générique"
-#: ../rules/base.xml.in.h:383 ../rules/evdev.xml.in.h:383
+#: ../rules/base.xml.in.h:404
msgid "Logitech Internet 350 Keyboard"
msgstr "Clavier Logitech Internet 350"
-#: ../rules/base.xml.in.h:384 ../rules/evdev.xml.in.h:384
+#: ../rules/base.xml.in.h:405
msgid "Logitech Internet Keyboard"
msgstr "Clavier Logitech Internet"
-#: ../rules/base.xml.in.h:385 ../rules/evdev.xml.in.h:385
+#: ../rules/base.xml.in.h:406
msgid "Logitech Internet Navigator Keyboard"
msgstr "Clavier Logitech Internet Navigator"
-#: ../rules/base.xml.in.h:386 ../rules/evdev.xml.in.h:386
+#: ../rules/base.xml.in.h:407
msgid "Logitech Media Elite Keyboard"
msgstr "Clavier Logitech Media Elite"
-#: ../rules/base.xml.in.h:387 ../rules/evdev.xml.in.h:387
+#: ../rules/base.xml.in.h:408
msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
msgstr "Clavier Logitech sans-fil Ultra-X Media"
-#: ../rules/base.xml.in.h:388 ../rules/evdev.xml.in.h:388
+#: ../rules/base.xml.in.h:409
msgid "Logitech Ultra-X Keyboard"
msgstr "Clavier Logitech Ultra-X"
-#: ../rules/base.xml.in.h:389 ../rules/evdev.xml.in.h:389
+#: ../rules/base.xml.in.h:410
msgid "Logitech diNovo Edge Keyboard"
msgstr "Clavier Logitech diNovo Edge"
-#: ../rules/base.xml.in.h:390 ../rules/evdev.xml.in.h:390
+#: ../rules/base.xml.in.h:411
msgid "Logitech diNovo Keyboard"
msgstr "Clavier Logitech diNovo"
-#: ../rules/base.xml.in.h:391 ../rules/evdev.xml.in.h:391
+#: ../rules/base.xml.in.h:412
msgid "Logitech iTouch"
msgstr "Logitech iTouch"
-#: ../rules/base.xml.in.h:392 ../rules/evdev.xml.in.h:392
+#: ../rules/base.xml.in.h:413
msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
msgstr "Logitech iTouch Cordless (modèle Y-RB6)"
-#: ../rules/base.xml.in.h:393 ../rules/evdev.xml.in.h:393
+#: ../rules/base.xml.in.h:414
msgid "Logitech iTouch Internet Navigator Keyboard SE"
msgstr "Logitech Internet Navigator iTouch SE"
-#: ../rules/base.xml.in.h:394 ../rules/evdev.xml.in.h:394
+#: ../rules/base.xml.in.h:415
msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
msgstr "Logitech Internet Navigator iTouch SE (USB)"
-#: ../rules/base.xml.in.h:395 ../rules/evdev.xml.in.h:395
+#: ../rules/base.xml.in.h:416
+msgid "Lower Sorbian"
+msgstr "Serbe minuscule"
+
+#: ../rules/base.xml.in.h:417
+msgid "Lower Sorbian (qwertz)"
+msgstr "Serbe minuscule (qwertz)"
+
+#: ../rules/base.xml.in.h:418
msgid "Ltu"
msgstr "Ltu"
-#: ../rules/base.xml.in.h:396 ../rules/evdev.xml.in.h:396
+#: ../rules/base.xml.in.h:419
msgid "MESS"
msgstr "MESS"
-#: ../rules/base.xml.in.h:397 ../rules/evdev.xml.in.h:397
+#: ../rules/base.xml.in.h:420
msgid "MNE"
msgstr "MNE"
-#: ../rules/base.xml.in.h:398 ../rules/evdev.xml.in.h:398
+#: ../rules/base.xml.in.h:421
msgid "MacBook/MacBook Pro"
msgstr "MacBook/MacBook Pro"
-#: ../rules/base.xml.in.h:399 ../rules/evdev.xml.in.h:399
+#: ../rules/base.xml.in.h:422
msgid "MacBook/MacBook Pro (Intl)"
msgstr "MacBook/MacBook Pro (Intl)"
-#: ../rules/base.xml.in.h:400 ../rules/evdev.xml.in.h:400
+#: ../rules/base.xml.in.h:423
msgid "Macedonia"
msgstr "Macédoine"
-#: ../rules/base.xml.in.h:401 ../rules/evdev.xml.in.h:401
+#: ../rules/base.xml.in.h:424
msgid "Macintosh"
msgstr "Apple-Macintosh"
-#: ../rules/base.xml.in.h:402 ../rules/evdev.xml.in.h:402
+#: ../rules/base.xml.in.h:425
msgid "Macintosh Old"
msgstr "Apple-Macintosh ancien"
-#: ../rules/base.xml.in.h:403 ../rules/evdev.xml.in.h:403
+#: ../rules/base.xml.in.h:426
msgid "Macintosh, Sun dead keys"
msgstr "Macintosh, touches mortes Sun"
-#: ../rules/base.xml.in.h:404 ../rules/evdev.xml.in.h:404
+#: ../rules/base.xml.in.h:427
msgid "Macintosh, eliminate dead keys"
msgstr "Macintosh, sans touches mortes"
-#: ../rules/base.xml.in.h:405 ../rules/evdev.xml.in.h:405
-msgid "Make CapsLock an additional Ctrl."
-msgstr "Faire de la touche Verr. maj. une touche Ctrl supplémentaire."
+#: ../rules/base.xml.in.h:428
+msgid "Make CapsLock an additional Backspace"
+msgstr "Faire de la touche Verr. maj. une touche Ret. arr. supplémentaire."
+
+#: ../rules/base.xml.in.h:429
+msgid "Make CapsLock an additional Ctrl"
+msgstr "Faire de la touche Verr. maj. une touche Ctrl supplémentaire"
-#: ../rules/base.xml.in.h:406 ../rules/evdev.xml.in.h:406
+#: ../rules/base.xml.in.h:430
+msgid "Make CapsLock an additional ESC"
+msgstr "Faire de la touche Verr. maj. une touche Esc. supplémentaire."
+
+#: ../rules/base.xml.in.h:431
msgid "Mal"
msgstr "Mal"
-#: ../rules/base.xml.in.h:407 ../rules/evdev.xml.in.h:407
+#: ../rules/base.xml.in.h:432
msgid "Malayalam"
msgstr "Malayalam"
-#: ../rules/base.xml.in.h:408 ../rules/evdev.xml.in.h:408
+#: ../rules/base.xml.in.h:433
msgid "Malayalam Lalitha"
msgstr "Malayalam Lalitha"
-#: ../rules/base.xml.in.h:409 ../rules/evdev.xml.in.h:409
+#: ../rules/base.xml.in.h:434
msgid "Maldives"
msgstr "Maldives"
-#: ../rules/base.xml.in.h:410 ../rules/evdev.xml.in.h:410
+#: ../rules/base.xml.in.h:435
msgid "Malta"
msgstr "Malte"
-#: ../rules/base.xml.in.h:411 ../rules/evdev.xml.in.h:411
+#: ../rules/base.xml.in.h:436
msgid "Maltese keyboard with US layout"
msgstr "Clavier maltais avec disposition US"
-#: ../rules/base.xml.in.h:412 ../rules/evdev.xml.in.h:412
+#: ../rules/base.xml.in.h:437
msgid "Mao"
msgstr "Mao"
-#: ../rules/base.xml.in.h:413 ../rules/evdev.xml.in.h:413
+#: ../rules/base.xml.in.h:438
msgid "Maori"
msgstr "Maori"
-#: ../rules/base.xml.in.h:414 ../rules/evdev.xml.in.h:414
+#: ../rules/base.xml.in.h:439
msgid "Memorex MX1998"
msgstr "Memorex MX1998"
-#: ../rules/base.xml.in.h:415 ../rules/evdev.xml.in.h:415
+#: ../rules/base.xml.in.h:440
msgid "Memorex MX2500 EZ-Access Keyboard"
msgstr "Memorex MX2500 EZ-Access"
-#: ../rules/base.xml.in.h:416 ../rules/evdev.xml.in.h:416
+#: ../rules/base.xml.in.h:441
msgid "Memorex MX2750"
msgstr "Memorex MX2750"
-#: ../rules/base.xml.in.h:417 ../rules/evdev.xml.in.h:417
-msgid "Menu is Compose."
-msgstr "Menu est Compose."
+#: ../rules/base.xml.in.h:442
+msgid "Menu"
+msgstr "Menu"
-#: ../rules/base.xml.in.h:418 ../rules/evdev.xml.in.h:418
-msgid "Menu key changes layout."
-msgstr "La touche Menu change de disposition."
+#: ../rules/base.xml.in.h:443
+msgid "Meta is mapped to Left Win"
+msgstr "Méta est obtenu avec la touche Logo de gauche"
-#: ../rules/base.xml.in.h:419 ../rules/evdev.xml.in.h:419
-msgid "Meta is mapped to the Win-keys."
-msgstr "Méta est obtenu avec n'importe quelle touche Logo."
+#: ../rules/base.xml.in.h:444
+msgid "Meta is mapped to Win keys"
+msgstr "Méta est obtenu avec n'importe quelle touche Logo"
-#: ../rules/base.xml.in.h:420 ../rules/evdev.xml.in.h:420
-msgid "Meta is mapped to the left Win-key."
-msgstr "Méta est obtenu avec la touche Logo de gauche."
+#: ../rules/base.xml.in.h:445
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Clavier Microsoft Comfort Curve 2000"
-#: ../rules/base.xml.in.h:421 ../rules/evdev.xml.in.h:421
+#: ../rules/base.xml.in.h:446
msgid "Microsoft Internet Keyboard"
msgstr "Clavier Microsoft Internet"
-#: ../rules/base.xml.in.h:422 ../rules/evdev.xml.in.h:422
+#: ../rules/base.xml.in.h:447
msgid "Microsoft Internet Keyboard Pro, Swedish"
msgstr "Clavier Microsoft Internet Pro, suédois"
-#: ../rules/base.xml.in.h:423 ../rules/evdev.xml.in.h:423
+#: ../rules/base.xml.in.h:448
msgid "Microsoft Natural"
msgstr "Microsoft Natural"
-#: ../rules/base.xml.in.h:424 ../rules/evdev.xml.in.h:424
+#: ../rules/base.xml.in.h:449
msgid "Microsoft Natural Keyboard Elite"
msgstr "Clavier Microsoft Natural Elite"
-#: ../rules/base.xml.in.h:425 ../rules/evdev.xml.in.h:425
+#: ../rules/base.xml.in.h:450
msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
msgstr "Clavier Microsoft Natural Pro / Clavier Microsoft Internet Pro"
-#: ../rules/base.xml.in.h:426 ../rules/evdev.xml.in.h:426
+#: ../rules/base.xml.in.h:451
msgid "Microsoft Natural Keyboard Pro OEM"
msgstr "Clavier Microsoft Natural Pro OEM"
-#: ../rules/base.xml.in.h:427 ../rules/evdev.xml.in.h:427
+#: ../rules/base.xml.in.h:452
msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
msgstr "Clavier Microsoft Natural Pro USB / Clavier Microsoft Internet Pro"
-#: ../rules/base.xml.in.h:428 ../rules/evdev.xml.in.h:428
+#: ../rules/base.xml.in.h:453
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Clavier Microsoft ergonomique naturel sans fil 7000"
+
+#: ../rules/base.xml.in.h:454
msgid "Microsoft Office Keyboard"
msgstr "Clavier Microsoft Office"
-#: ../rules/base.xml.in.h:429 ../rules/evdev.xml.in.h:429
+#: ../rules/base.xml.in.h:455
msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
msgstr "Clavier Microsoft Multimedia sans fil 1.0A"
-#: ../rules/base.xml.in.h:430 ../rules/evdev.xml.in.h:430
+#: ../rules/base.xml.in.h:456
msgid "Miscellaneous compatibility options"
msgstr "Diverses options de compatibilité"
-#: ../rules/base.xml.in.h:431 ../rules/evdev.xml.in.h:431
+#: ../rules/base.xml.in.h:457
msgid "Mkd"
msgstr "Mkd"
-#: ../rules/base.xml.in.h:432 ../rules/evdev.xml.in.h:432
+#: ../rules/base.xml.in.h:458
msgid "Mlt"
msgstr "Mlt"
-#: ../rules/base.xml.in.h:433 ../rules/evdev.xml.in.h:433
+#: ../rules/base.xml.in.h:459
msgid "Mmr"
msgstr "Mmr"
-#: ../rules/base.xml.in.h:434 ../rules/evdev.xml.in.h:434
+#: ../rules/base.xml.in.h:460
msgid "Mng"
msgstr "Mng"
-#: ../rules/base.xml.in.h:435 ../rules/evdev.xml.in.h:435
+#: ../rules/base.xml.in.h:461
msgid "Mongolia"
msgstr "Mongolie"
-#: ../rules/base.xml.in.h:436 ../rules/evdev.xml.in.h:436
+#: ../rules/base.xml.in.h:462
msgid "Montenegro"
-msgstr "Serbie-et-Monténégro"
+msgstr "Monténégro"
-#: ../rules/base.xml.in.h:437 ../rules/evdev.xml.in.h:437
+#: ../rules/base.xml.in.h:463
msgid "Morocco"
msgstr "Maroc"
-#: ../rules/base.xml.in.h:438 ../rules/evdev.xml.in.h:438
+#: ../rules/base.xml.in.h:464
msgid "Multilingual"
msgstr "Multilingue"
-#: ../rules/base.xml.in.h:439 ../rules/evdev.xml.in.h:439
+#: ../rules/base.xml.in.h:465
msgid "Multilingual, first part"
msgstr "Multilingue, partie 1"
-#: ../rules/base.xml.in.h:440 ../rules/evdev.xml.in.h:440
+#: ../rules/base.xml.in.h:466
msgid "Multilingual, second part"
msgstr "Multilingue, partie 2"
-#: ../rules/base.xml.in.h:441 ../rules/evdev.xml.in.h:441
+#: ../rules/base.xml.in.h:467
msgid "Myanmar"
msgstr "Myanmar"
-#: ../rules/base.xml.in.h:442 ../rules/evdev.xml.in.h:442
+#: ../rules/base.xml.in.h:468
msgid "NICOLA-F style Backspace"
msgstr "Ret. Arr. de style NICOLA-F"
-#: ../rules/base.xml.in.h:443 ../rules/evdev.xml.in.h:443
-msgid "Neostyle"
-msgstr "Neostyle"
+#: ../rules/base.xml.in.h:469
+msgid "NLA"
+msgstr "NLA"
-#: ../rules/base.xml.in.h:444 ../rules/evdev.xml.in.h:444
+#: ../rules/base.xml.in.h:470
+msgid "Nativo"
+msgstr "Nativo"
+
+#: ../rules/base.xml.in.h:471
+msgid "Nativo for Esperanto"
+msgstr "Native pour Espéranto"
+
+#: ../rules/base.xml.in.h:472
+msgid "Nativo for USA keyboards"
+msgstr "Nativo pour claviers américains"
+
+#: ../rules/base.xml.in.h:473
+msgid "Neo 2"
+msgstr "Neo 2"
+
+#: ../rules/base.xml.in.h:474
msgid "Nep"
msgstr "Nep"
-#: ../rules/base.xml.in.h:445 ../rules/evdev.xml.in.h:445
+#: ../rules/base.xml.in.h:475
msgid "Nepal"
msgstr "Népal"
-#: ../rules/base.xml.in.h:446 ../rules/evdev.xml.in.h:446
+#: ../rules/base.xml.in.h:476
msgid "Netherlands"
msgstr "Pays-Bas"
-#: ../rules/base.xml.in.h:447 ../rules/evdev.xml.in.h:447
+#: ../rules/base.xml.in.h:477
msgid "Nig"
msgstr "Nig"
-#: ../rules/base.xml.in.h:448 ../rules/evdev.xml.in.h:448
+#: ../rules/base.xml.in.h:478
msgid "Nigeria"
msgstr "Nigeria"
-#: ../rules/base.xml.in.h:449 ../rules/evdev.xml.in.h:449
+#: ../rules/base.xml.in.h:479
msgid "Nld"
msgstr "Nld"
-#: ../rules/base.xml.in.h:450 ../rules/evdev.xml.in.h:450
+#: ../rules/base.xml.in.h:480
+msgid "Non-breakable space character at fourth level"
+msgstr "Espace insécable au 4e niveau."
+
+#: ../rules/base.xml.in.h:481
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Espace insécable au 4e niveau et une espace fine insécable au 6e niveau"
+
+#: ../rules/base.xml.in.h:482
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
+msgstr "Espace insécable au 4e niveau et une espace fine insécable au 6e niveau (par les touches Ctrl+Maj.)"
+
+#: ../rules/base.xml.in.h:483
+msgid "Non-breakable space character at second level"
+msgstr "Espace insécable au 2e niveau"
+
+#: ../rules/base.xml.in.h:484
+msgid "Non-breakable space character at third level"
+msgstr "Espace insécable au 3e niveau"
+
+#: ../rules/base.xml.in.h:485
+msgid "Non-breakable space character at third level, nothing at fourth level"
+msgstr "Espace insécable au 3e niveau et rien au 4e niveau"
+
+#: ../rules/base.xml.in.h:486
+msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Espace insécable au 3e niveau et une espace fine insécable au 4e niveau"
+
+#: ../rules/base.xml.in.h:487
msgid "Nor"
msgstr "Nor"
-#: ../rules/base.xml.in.h:451 ../rules/evdev.xml.in.h:451
+#: ../rules/base.xml.in.h:488
msgid "Northern Saami"
msgstr "Sami du Nord"
-#: ../rules/base.xml.in.h:452 ../rules/evdev.xml.in.h:452
+#: ../rules/base.xml.in.h:489
msgid "Northern Saami, eliminate dead keys"
msgstr "Sami du Nord, sans touches mortes"
-#: ../rules/base.xml.in.h:453 ../rules/evdev.xml.in.h:453
+#: ../rules/base.xml.in.h:490
msgid "Northgate OmniKey 101"
msgstr "Northgate OmniKey 101"
-#: ../rules/base.xml.in.h:454 ../rules/evdev.xml.in.h:454
+#: ../rules/base.xml.in.h:491
msgid "Norway"
msgstr "Norvège"
-#: ../rules/base.xml.in.h:455 ../rules/evdev.xml.in.h:455
-msgid "NumLock LED shows alternative layout."
-msgstr "Le témoin lumineux de verrouillage numérique indique une disposition alternative."
+#: ../rules/base.xml.in.h:492
+msgid "NumLock"
+msgstr "Verr. Num."
-#: ../rules/base.xml.in.h:456 ../rules/evdev.xml.in.h:456
+#: ../rules/base.xml.in.h:493
msgid "Numeric keypad delete key behaviour"
msgstr "Comportement de la touche de suppression du clavier numérique"
-#: ../rules/base.xml.in.h:457 ../rules/evdev.xml.in.h:457
-msgid "Numeric keypad keys work as with Mac."
-msgstr "Les touches du pavé numérique se comportent comme sur Mac."
+#: ../rules/base.xml.in.h:494
+msgid "Numeric keypad keys work as with Mac"
+msgstr "Les touches du pavé numérique se comportent comme sur MacIntosh"
-#: ../rules/base.xml.in.h:458 ../rules/evdev.xml.in.h:458
+#: ../rules/base.xml.in.h:495
msgid "Numeric keypad layout selection"
msgstr "Sélection de groupe du clavier numérique"
-#: ../rules/base.xml.in.h:459 ../rules/evdev.xml.in.h:459
+#: ../rules/base.xml.in.h:496
msgid "OADG 109A"
msgstr "OADG 109A"
-#: ../rules/base.xml.in.h:460 ../rules/evdev.xml.in.h:460
+#: ../rules/base.xml.in.h:497
msgid "OLPC"
msgstr "OLPC"
-#: ../rules/base.xml.in.h:461 ../rules/evdev.xml.in.h:461
+#: ../rules/base.xml.in.h:498
msgid "OLPC Dari"
msgstr "OLPC Dari"
-#: ../rules/base.xml.in.h:462 ../rules/evdev.xml.in.h:462
+#: ../rules/base.xml.in.h:499
msgid "OLPC Pashto"
msgstr "OLPC Pashto"
-#: ../rules/base.xml.in.h:463 ../rules/evdev.xml.in.h:463
+#: ../rules/base.xml.in.h:500
msgid "OLPC Southern Uzbek"
msgstr "OLPC Ouzbek du Sud"
-#: ../rules/base.xml.in.h:464 ../rules/evdev.xml.in.h:464
+#: ../rules/base.xml.in.h:501
+msgid "Occitan"
+msgstr "Occitan"
+
+#: ../rules/base.xml.in.h:502
msgid "Ogham"
msgstr "Ogham"
-#: ../rules/base.xml.in.h:465 ../rules/evdev.xml.in.h:465
+#: ../rules/base.xml.in.h:503
msgid "Ogham IS434"
msgstr "Ogham IS434"
-#: ../rules/base.xml.in.h:466 ../rules/evdev.xml.in.h:466
+#: ../rules/base.xml.in.h:504
msgid "Oriya"
msgstr "Oriya"
-#: ../rules/base.xml.in.h:467 ../rules/evdev.xml.in.h:467
+#: ../rules/base.xml.in.h:505
msgid "Ortek MCK-800 MM/Internet keyboard"
msgstr "Clavier Internet Ortek MCK-800 MM"
-#: ../rules/base.xml.in.h:468 ../rules/evdev.xml.in.h:468
+#: ../rules/base.xml.in.h:506
msgid "Ossetian"
msgstr "Ossétie"
-#: ../rules/base.xml.in.h:469 ../rules/evdev.xml.in.h:469
+#: ../rules/base.xml.in.h:507
msgid "Ossetian, Winkeys"
msgstr "Ossétie avec touches Logo"
-#: ../rules/base.xml.in.h:470 ../rules/evdev.xml.in.h:470
+#: ../rules/base.xml.in.h:508
msgid "Ossetian, legacy"
msgstr "(Obsolète) Ossétie"
-#: ../rules/base.xml.in.h:471 ../rules/evdev.xml.in.h:471
+#: ../rules/base.xml.in.h:509
msgid "PC-98xx Series"
msgstr "PC-98xx Series"
-#: ../rules/base.xml.in.h:472 ../rules/evdev.xml.in.h:472
+#: ../rules/base.xml.in.h:510
msgid "Pak"
msgstr "Pak"
-#: ../rules/base.xml.in.h:473 ../rules/evdev.xml.in.h:473
+#: ../rules/base.xml.in.h:511
msgid "Pakistan"
msgstr "Pakistan"
-#: ../rules/base.xml.in.h:474 ../rules/evdev.xml.in.h:474
+#: ../rules/base.xml.in.h:512
msgid "Pashto"
msgstr "Pashto"
-#: ../rules/base.xml.in.h:475 ../rules/evdev.xml.in.h:475
+#: ../rules/base.xml.in.h:513
msgid "Pattachote"
msgstr "Pattachote"
-#: ../rules/base.xml.in.h:476 ../rules/evdev.xml.in.h:476
+#: ../rules/base.xml.in.h:514
msgid "Phonetic"
msgstr "Phonétique"
-#: ../rules/base.xml.in.h:477 ../rules/evdev.xml.in.h:477
+#: ../rules/base.xml.in.h:515
+msgid "Phonetic Winkeys"
+msgstr "Touches logo phonétiques"
+
+#: ../rules/base.xml.in.h:516
msgid "Pol"
msgstr "Pol"
-#: ../rules/base.xml.in.h:478 ../rules/evdev.xml.in.h:478
+#: ../rules/base.xml.in.h:517
msgid "Poland"
msgstr "Pologne"
-#: ../rules/base.xml.in.h:479 ../rules/evdev.xml.in.h:479
+#: ../rules/base.xml.in.h:518
msgid "Polytonic"
msgstr "Polytonique"
-#: ../rules/base.xml.in.h:480 ../rules/evdev.xml.in.h:480
+#: ../rules/base.xml.in.h:519
msgid "Portugal"
msgstr "Portugal"
-#: ../rules/base.xml.in.h:481 ../rules/evdev.xml.in.h:481
-msgid "Press Left Alt key to choose 3rd level."
-msgstr "La touche Alt de gauche sélectionne le 3e niveau."
-
-#: ../rules/base.xml.in.h:482 ../rules/evdev.xml.in.h:482
-msgid "Press Left Win-key to choose 3rd level."
-msgstr "La touche Logo de gauche sélectionne le 3e niveau."
-
-#: ../rules/base.xml.in.h:483 ../rules/evdev.xml.in.h:483
-msgid "Press Menu key to choose 3rd level."
-msgstr "La touche Menu sélectionne le 3e niveau."
-
-#: ../rules/base.xml.in.h:484 ../rules/evdev.xml.in.h:484
-msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
-msgstr "La touche Alt de droite (AltGr) sélectionne le 3e niveau, une touche Maj. et la touche Atl de droite est la touche Compose."
-
-#: ../rules/base.xml.in.h:485 ../rules/evdev.xml.in.h:485
-msgid "Press Right Alt key to choose 3rd level."
-msgstr "La touche Alt de droite (AltGr) sélectionne le 3e niveau."
-
-#: ../rules/base.xml.in.h:486 ../rules/evdev.xml.in.h:486
-msgid "Press Right Ctrl to choose 3rd level."
-msgstr "La touche Ctrl de droite sélectionne le 3e niveau."
-
-#: ../rules/base.xml.in.h:487 ../rules/evdev.xml.in.h:487
-msgid "Press Right Win-key to choose 3rd level."
-msgstr "La touche Logo de droite sélectionne le 3e niveau."
-
-#: ../rules/base.xml.in.h:488 ../rules/evdev.xml.in.h:488
-msgid "Press any of Alt keys to choose 3rd level."
-msgstr "N'importe quelle touche Alt sélectionne le 3e niveau."
-
-#: ../rules/base.xml.in.h:489 ../rules/evdev.xml.in.h:489
-msgid "Press any of Win-keys to choose 3rd level."
-msgstr "N'importe quelle touche Logo sélectionne le 3e niveau."
-
-#: ../rules/base.xml.in.h:490 ../rules/evdev.xml.in.h:490
+#: ../rules/base.xml.in.h:520
msgid "Pro"
msgstr "Pro"
-#: ../rules/base.xml.in.h:491 ../rules/evdev.xml.in.h:491
+#: ../rules/base.xml.in.h:521
msgid "Pro Keypad"
msgstr "Pavé Pro"
-#: ../rules/base.xml.in.h:492 ../rules/evdev.xml.in.h:492
+#: ../rules/base.xml.in.h:522
msgid "Probhat"
msgstr "Probhat"
-#: ../rules/base.xml.in.h:493 ../rules/evdev.xml.in.h:493
+#: ../rules/base.xml.in.h:523
msgid "Programmer Dvorak"
msgstr "Programmeur Dvorak"
-#: ../rules/base.xml.in.h:494 ../rules/evdev.xml.in.h:494
+#: ../rules/base.xml.in.h:524
msgid "Propeller Voyager (KTEZ-1000)"
msgstr "Propeller Voyager (KTEZ-1000)"
-#: ../rules/base.xml.in.h:495 ../rules/evdev.xml.in.h:495
+#: ../rules/base.xml.in.h:525
msgid "Prt"
msgstr "Prt"
-#: ../rules/base.xml.in.h:496 ../rules/evdev.xml.in.h:496
+#: ../rules/base.xml.in.h:526
msgid "QTronix Scorpius 98N+"
msgstr "QTronix Scorpius 98N+"
-#: ../rules/base.xml.in.h:497 ../rules/evdev.xml.in.h:497
-msgid "R-Alt switches layout while pressed."
-msgstr "Maintenir la touche Alt de droite enfoncée change de disposition."
-
-#: ../rules/base.xml.in.h:498 ../rules/evdev.xml.in.h:498
-msgid "Right Alt is Compose."
-msgstr "La touche Alt de droite est Compose."
-
-#: ../rules/base.xml.in.h:499 ../rules/evdev.xml.in.h:499
-msgid "Right Alt key changes layout."
-msgstr "La touche Alt de droite change de disposition."
+#: ../rules/base.xml.in.h:527
+msgid "Right Alt"
+msgstr "Alt. droite"
-#: ../rules/base.xml.in.h:500 ../rules/evdev.xml.in.h:500
-msgid "Right Alt key never chooses 3rd level."
-msgstr "La touche Alt de droite ne sélectionne jamais le 3e niveau."
+#: ../rules/base.xml.in.h:528
+msgid "Right Alt (while pressed)"
+msgstr "Alt de droite (lorsque pressée)"
-#: ../rules/base.xml.in.h:501 ../rules/evdev.xml.in.h:501
-msgid "Right Ctrl is Compose."
-msgstr "La touche Ctrl de droite est Compose."
+#: ../rules/base.xml.in.h:529
+msgid "Right Alt key never chooses 3rd level"
+msgstr "Alt de droite ne sélectionne jamais le 3e niveau"
-#: ../rules/base.xml.in.h:502 ../rules/evdev.xml.in.h:502
-msgid "Right Ctrl key changes layout."
-msgstr "La touche Ctrl de droite change de disposition."
+#: ../rules/base.xml.in.h:530
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr "Alt de droite, Maj.+Alt de droite est une touche multiple"
-#: ../rules/base.xml.in.h:503 ../rules/evdev.xml.in.h:503
-msgid "Right Ctrl key switches layout while pressed."
-msgstr "Maintenir la touche Ctrl de droite enfoncée change de disposition."
+#: ../rules/base.xml.in.h:531
+msgid "Right Ctrl"
+msgstr "Crtl de droite"
-#: ../rules/base.xml.in.h:504 ../rules/evdev.xml.in.h:504
-msgid "Right Ctrl key works as Right Alt."
-msgstr "La touche Ctrl de droite se comporte comme la touche Alt de droite."
+#: ../rules/base.xml.in.h:532
+msgid "Right Ctrl (while pressed)"
+msgstr "Ctrl de droite (lorsque pressée)"
-#: ../rules/base.xml.in.h:505 ../rules/evdev.xml.in.h:505
-msgid "Right Shift key changes layout."
-msgstr "La touche Maj. de droite change de disposition."
+#: ../rules/base.xml.in.h:533
+msgid "Right Ctrl as Right Alt"
+msgstr "Ctrl de droite comme Alt de droite"
-#: ../rules/base.xml.in.h:506 ../rules/evdev.xml.in.h:506
-msgid "Right Win-key changes layout."
-msgstr "La touche Logo de droite change de disposition."
+#: ../rules/base.xml.in.h:534
+msgid "Right Shift"
+msgstr "Maj. droite"
-#: ../rules/base.xml.in.h:507 ../rules/evdev.xml.in.h:507
-msgid "Right Win-key is Compose."
-msgstr "La touche Logo de droite est Compose."
+#: ../rules/base.xml.in.h:535
+msgid "Right Win"
+msgstr "Touche logo droite"
-#: ../rules/base.xml.in.h:508 ../rules/evdev.xml.in.h:508
-msgid "Right Win-key switches layout while pressed."
-msgstr "Maintenir la touche Logo de droite enfoncée change de disposition."
+#: ../rules/base.xml.in.h:536
+msgid "Right Win (while pressed)"
+msgstr "Touche logo de (lorsque pressée)"
-#: ../rules/base.xml.in.h:509 ../rules/evdev.xml.in.h:509
+#: ../rules/base.xml.in.h:537
msgid "Right hand"
msgstr "Main droite"
-#: ../rules/base.xml.in.h:510 ../rules/evdev.xml.in.h:510
+#: ../rules/base.xml.in.h:538
msgid "Right handed Dvorak"
msgstr "Dvorak pour droitier"
-#: ../rules/base.xml.in.h:511 ../rules/evdev.xml.in.h:511
+#: ../rules/base.xml.in.h:539
msgid "Romania"
msgstr "Roumanie"
-#: ../rules/base.xml.in.h:512 ../rules/evdev.xml.in.h:512
+#: ../rules/base.xml.in.h:540
msgid "Romanian keyboard with German letters"
msgstr "Clavier roumain avec lettres allemandes"
-#: ../rules/base.xml.in.h:513 ../rules/evdev.xml.in.h:513
+#: ../rules/base.xml.in.h:541
msgid "Romanian keyboard with German letters, eliminate dead keys"
msgstr "Clavier roumain avec lettres allemandes, sans touches mortes"
-#: ../rules/base.xml.in.h:514 ../rules/evdev.xml.in.h:514
+#: ../rules/base.xml.in.h:542
msgid "Rou"
msgstr "Rou"
-#: ../rules/base.xml.in.h:515 ../rules/evdev.xml.in.h:515
+#: ../rules/base.xml.in.h:543
msgid "Rus"
msgstr "Rus"
-#: ../rules/base.xml.in.h:516 ../rules/evdev.xml.in.h:516
+#: ../rules/base.xml.in.h:544
msgid "Russia"
msgstr "Russie"
-#: ../rules/base.xml.in.h:517 ../rules/evdev.xml.in.h:517
+#: ../rules/base.xml.in.h:545
msgid "Russian"
msgstr "Russe"
-#: ../rules/base.xml.in.h:518 ../rules/evdev.xml.in.h:518
+#: ../rules/base.xml.in.h:546
msgid "Russian phonetic"
msgstr "Phonétique russe"
-#: ../rules/base.xml.in.h:519 ../rules/evdev.xml.in.h:519
+#: ../rules/base.xml.in.h:547
msgid "Russian phonetic Dvorak"
msgstr "Dvorak phonétique russe"
-#: ../rules/base.xml.in.h:520 ../rules/evdev.xml.in.h:520
+#: ../rules/base.xml.in.h:548
msgid "Russian phonetic, eliminate dead keys"
msgstr "Phonétique russe, sans lettres mortes"
-#: ../rules/base.xml.in.h:521 ../rules/evdev.xml.in.h:521
+#: ../rules/base.xml.in.h:549
msgid "Russian with Kazakh"
msgstr "Russe avec kazakh"
-#: ../rules/base.xml.in.h:522 ../rules/evdev.xml.in.h:522
+#: ../rules/base.xml.in.h:550
msgid "SILVERCREST Multimedia Wireless Keyboard"
msgstr "SILVERCREST Multimedia sans fil"
-#: ../rules/base.xml.in.h:523 ../rules/evdev.xml.in.h:523
+#: ../rules/base.xml.in.h:551
msgid "SK-1300"
msgstr "SK-1300"
-#: ../rules/base.xml.in.h:524 ../rules/evdev.xml.in.h:524
+#: ../rules/base.xml.in.h:552
msgid "SK-2500"
msgstr "SK-2500"
-#: ../rules/base.xml.in.h:525 ../rules/evdev.xml.in.h:525
+#: ../rules/base.xml.in.h:553
msgid "SK-6200"
msgstr "SK-6200"
-#: ../rules/base.xml.in.h:526 ../rules/evdev.xml.in.h:526
+#: ../rules/base.xml.in.h:554
msgid "SK-7100"
msgstr "SK-7100"
-#: ../rules/base.xml.in.h:527 ../rules/evdev.xml.in.h:527
+#: ../rules/base.xml.in.h:555
msgid "SRB"
msgstr "SRB"
-#: ../rules/base.xml.in.h:528 ../rules/evdev.xml.in.h:528
+#: ../rules/base.xml.in.h:556
msgid "SVEN Ergonomic 2500"
msgstr "SVEN Ergonomic 2500"
-#: ../rules/base.xml.in.h:529 ../rules/evdev.xml.in.h:529
+#: ../rules/base.xml.in.h:557
msgid "SVEN Slim 303"
msgstr "SVEN Slim 303"
-#: ../rules/base.xml.in.h:530 ../rules/evdev.xml.in.h:530
+#: ../rules/base.xml.in.h:558
msgid "Samsung SDM 4500P"
msgstr "Samsung SDM 4500P"
-#: ../rules/base.xml.in.h:531 ../rules/evdev.xml.in.h:531
+#: ../rules/base.xml.in.h:559
msgid "Samsung SDM 4510P"
msgstr "Samsung SDM 4510P"
-#: ../rules/base.xml.in.h:532 ../rules/evdev.xml.in.h:532
-msgid "ScrollLock LED shows alternative layout."
-msgstr "Le témoin lumineux d'Arrêt défil. indique une disposition différente."
+#: ../rules/base.xml.in.h:560
+msgid "Scroll Lock"
+msgstr "Arrêt défilement"
-#: ../rules/base.xml.in.h:533 ../rules/evdev.xml.in.h:533
+#: ../rules/base.xml.in.h:561
+msgid "ScrollLock"
+msgstr "Arrêt défil."
+
+#: ../rules/base.xml.in.h:562
msgid "Secwepemctsin"
msgstr "Secwepemctsin"
-#: ../rules/base.xml.in.h:534 ../rules/evdev.xml.in.h:534
+#: ../rules/base.xml.in.h:563
+msgid "Semi-colon on third level"
+msgstr "Point virgule au 3e niveau"
+
+#: ../rules/base.xml.in.h:564
msgid "Serbia"
msgstr "Serbie"
-#: ../rules/base.xml.in.h:535 ../rules/evdev.xml.in.h:535
-msgid "Shift cancels CapsLock."
-msgstr "Interchanger Ctrl et Verr. maj."
+#: ../rules/base.xml.in.h:565
+msgid "Shift cancels CapsLock"
+msgstr "Maj. annule le verrouillage majuscule"
+
+#: ../rules/base.xml.in.h:566
+msgid "Shift does not cancel NumLock, chooses 3d level instead"
+msgstr "Maj. n'annule pas le verrouillage numérique; choisir le 3e niveau"
-#: ../rules/base.xml.in.h:536 ../rules/evdev.xml.in.h:536
-msgid "Shift with numeric keypad keys works as in MS Windows."
-msgstr "La touche Maj. avec le pavé numérique se comporte comme dans MS Windows."
+#: ../rules/base.xml.in.h:567
+msgid "Shift with numeric keypad keys works as in MS Windows"
+msgstr "La touche Maj. avec le pavé numérique se comporte comme dans MS Windows"
-#: ../rules/base.xml.in.h:537 ../rules/evdev.xml.in.h:537
-msgid "Shift+CapsLock changes layout."
-msgstr "Les touches Maj.+Verr. maj. changent de disposition."
+#: ../rules/base.xml.in.h:568
+msgid "Shift+CapsLock"
+msgstr "Maj.+ Verr. maj."
-#: ../rules/base.xml.in.h:538 ../rules/evdev.xml.in.h:538
+#: ../rules/base.xml.in.h:569
msgid "Simple"
msgstr "Simple"
-#: ../rules/base.xml.in.h:539 ../rules/evdev.xml.in.h:539
+#: ../rules/base.xml.in.h:570
msgid "Slovakia"
msgstr "Slovaquie"
-#: ../rules/base.xml.in.h:540 ../rules/evdev.xml.in.h:540
+#: ../rules/base.xml.in.h:571
msgid "Slovenia"
msgstr "Slovénie"
-#: ../rules/base.xml.in.h:541 ../rules/evdev.xml.in.h:541
+#: ../rules/base.xml.in.h:572
msgid "South Africa"
msgstr "Afrique du Sud"
-#: ../rules/base.xml.in.h:542 ../rules/evdev.xml.in.h:542
+#: ../rules/base.xml.in.h:573
msgid "Southern Uzbek"
msgstr "Ouzbek du Sud"
-#: ../rules/base.xml.in.h:543 ../rules/evdev.xml.in.h:543
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr "La barre d'espacement renvoie une espace insécable au 4e niveau et une espace fine insécable au 6e niveau"
-
-#: ../rules/base.xml.in.h:544 ../rules/evdev.xml.in.h:544
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift"
-msgstr "La barre d'espacement renvoie une espace insécable au 4e niveau et une espace fine insécable au 6e niveau (par les touches Ctrl+Maj.)"
-
-#: ../rules/base.xml.in.h:545 ../rules/evdev.xml.in.h:545
-msgid "Space key outputs non-breakable space character at fourth level."
-msgstr "La barre d'espacement renvoie une espace insécable au 4e niveau."
-
-#: ../rules/base.xml.in.h:546 ../rules/evdev.xml.in.h:546
-msgid "Space key outputs non-breakable space character at second level."
-msgstr "La barre d'espacement renvoie une espace insécable au 2e niveau."
-
-#: ../rules/base.xml.in.h:547 ../rules/evdev.xml.in.h:547
-msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
-msgstr "La barre d'espacement renvoie une espace insécable au 3e niveau et rien au 4e niveau."
-
-#: ../rules/base.xml.in.h:548 ../rules/evdev.xml.in.h:548
-msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr "La barre d'espacement renvoie une espace insécable au 3e niveau et une espace fine insécable au 4e niveau"
-
-#: ../rules/base.xml.in.h:549 ../rules/evdev.xml.in.h:549
-msgid "Space key outputs non-breakable space character at third level."
-msgstr "La barre d'espacement renvoie une espace insécable au 3e niveau."
-
-#: ../rules/base.xml.in.h:550 ../rules/evdev.xml.in.h:550
-msgid "Space key outputs usual space at any level."
-msgstr "La barre d'espacement renvoie une espace ordinaire à tous les niveaux."
-
-#: ../rules/base.xml.in.h:551 ../rules/evdev.xml.in.h:551
+#: ../rules/base.xml.in.h:574
msgid "Spain"
msgstr "Espagne"
-#: ../rules/base.xml.in.h:552 ../rules/evdev.xml.in.h:552
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
-msgstr "Les combinaisons spéciales (Ctrl+Alt+&lt;touche&gt;) sont traitées par un serveur."
+#: ../rules/base.xml.in.h:575
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
+msgstr "Les combinaisons spéciales (Ctrl+Alt+&lt;touche&gt;) sont traitées par un serveur"
-#: ../rules/base.xml.in.h:553 ../rules/evdev.xml.in.h:553
+#: ../rules/base.xml.in.h:576
msgid "SrL"
msgstr "SrL"
-#: ../rules/base.xml.in.h:554 ../rules/evdev.xml.in.h:554
+#: ../rules/base.xml.in.h:577
msgid "Sri Lanka"
msgstr "Sri Lanka"
-#: ../rules/base.xml.in.h:555 ../rules/evdev.xml.in.h:555
+#: ../rules/base.xml.in.h:578
msgid "Standard"
msgstr "Standard"
-#: ../rules/base.xml.in.h:556 ../rules/evdev.xml.in.h:556
+#: ../rules/base.xml.in.h:579
msgid "Standard (Cedilla)"
msgstr "Standard (cédille)"
+#: ../rules/base.xml.in.h:580
+msgid "Standard Phonetic"
+msgstr "Phonétique standard"
+
#. RSTU 2019-91
-#: ../rules/base.xml.in.h:558 ../rules/evdev.xml.in.h:558
+#: ../rules/base.xml.in.h:582
msgid "Standard RSTU"
msgstr "Standard RSTU"
#. RSTU 2019-91
-#: ../rules/base.xml.in.h:560 ../rules/evdev.xml.in.h:560
+#: ../rules/base.xml.in.h:584
msgid "Standard RSTU on Russian layout"
msgstr "Standard RSTU avec une disposition russe"
-#: ../rules/base.xml.in.h:561 ../rules/evdev.xml.in.h:561
+#: ../rules/base.xml.in.h:585
msgid "Sun Type 5/6"
msgstr "Sun Type 5/6"
-#: ../rules/base.xml.in.h:562 ../rules/evdev.xml.in.h:562
+#: ../rules/base.xml.in.h:586
msgid "Sun dead keys"
msgstr "Touches mortes Sun"
-#: ../rules/base.xml.in.h:563 ../rules/evdev.xml.in.h:563
+#: ../rules/base.xml.in.h:587
msgid "Super Power Multimedia Keyboard"
msgstr "Multimedia Super Power"
-#: ../rules/base.xml.in.h:564 ../rules/evdev.xml.in.h:564
-msgid "Super is mapped to the Win-keys."
-msgstr "Super est obtenu avec n'importe quelle touche Logo."
-
-#: ../rules/base.xml.in.h:565 ../rules/evdev.xml.in.h:565
+#: ../rules/base.xml.in.h:588
msgid "Svdvorak"
msgstr "Svdvorak"
-#: ../rules/base.xml.in.h:566 ../rules/evdev.xml.in.h:566
+#: ../rules/base.xml.in.h:589
msgid "Svk"
msgstr "Svk"
-#: ../rules/base.xml.in.h:567 ../rules/evdev.xml.in.h:567
+#: ../rules/base.xml.in.h:590
msgid "Svn"
msgstr "Svn"
-#: ../rules/base.xml.in.h:568 ../rules/evdev.xml.in.h:568
-msgid "Swap Ctrl and CapsLock."
-msgstr "Interchanger Ctrl et Verr. maj."
+#: ../rules/base.xml.in.h:591
+msgid "Swap Ctrl and CapsLock"
+msgstr "Permuter Ctrl et Verr. maj."
-#: ../rules/base.xml.in.h:569 ../rules/evdev.xml.in.h:569
-msgid "Swap ESC and CapsLock."
-msgstr "Interchanger ESC et Verr. maj."
+#: ../rules/base.xml.in.h:592
+msgid "Swap ESC and CapsLock"
+msgstr "Permuter ESC et Verr. maj."
-#: ../rules/base.xml.in.h:570 ../rules/evdev.xml.in.h:570
-msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-msgstr "Échange les codes de deux touches pour les claviers Mac mal reconnus par le noyau."
-
-#: ../rules/base.xml.in.h:571 ../rules/evdev.xml.in.h:571
+#: ../rules/base.xml.in.h:593
msgid "Swe"
msgstr "Sué"
-#: ../rules/base.xml.in.h:572 ../rules/evdev.xml.in.h:572
+#: ../rules/base.xml.in.h:594
msgid "Sweden"
msgstr "Suède"
-#: ../rules/base.xml.in.h:573 ../rules/evdev.xml.in.h:573
+#: ../rules/base.xml.in.h:595
msgid "Switzerland"
msgstr "Suisse"
-#: ../rules/base.xml.in.h:574 ../rules/evdev.xml.in.h:574
+#: ../rules/base.xml.in.h:596
msgid "Symplon PaceBook (tablet PC)"
msgstr "Symplon PaceBook (tablet PC)"
-#: ../rules/base.xml.in.h:575 ../rules/evdev.xml.in.h:575
+#: ../rules/base.xml.in.h:597
msgid "Syr"
msgstr "Syr"
-#: ../rules/base.xml.in.h:576 ../rules/evdev.xml.in.h:576
+#: ../rules/base.xml.in.h:598
msgid "Syria"
msgstr "Syrie"
-#: ../rules/base.xml.in.h:577 ../rules/evdev.xml.in.h:577
+#: ../rules/base.xml.in.h:599
msgid "Syriac"
msgstr "Syriaque"
-#: ../rules/base.xml.in.h:578 ../rules/evdev.xml.in.h:578
+#: ../rules/base.xml.in.h:600
msgid "Syriac phonetic"
msgstr "Phonétique syriaque"
-#: ../rules/base.xml.in.h:579 ../rules/evdev.xml.in.h:579
+#: ../rules/base.xml.in.h:601
msgid "TIS-820.2538"
msgstr "TIS-820.2538"
-#: ../rules/base.xml.in.h:580 ../rules/evdev.xml.in.h:580
+#: ../rules/base.xml.in.h:602
msgid "Tajikistan"
msgstr "Tadjikistan"
-#: ../rules/base.xml.in.h:581 ../rules/evdev.xml.in.h:581
+#: ../rules/base.xml.in.h:603
msgid "Tamil"
msgstr "Tamoul"
-#: ../rules/base.xml.in.h:582 ../rules/evdev.xml.in.h:582
+#: ../rules/base.xml.in.h:604
msgid "Tamil TAB Typewriter"
msgstr "Machine à écrire tamoule TAB"
-#: ../rules/base.xml.in.h:583 ../rules/evdev.xml.in.h:583
+#: ../rules/base.xml.in.h:605
msgid "Tamil TSCII Typewriter"
msgstr "Machine à écrire tamoule TSCII"
-#: ../rules/base.xml.in.h:584 ../rules/evdev.xml.in.h:584
+#: ../rules/base.xml.in.h:606
msgid "Tamil Unicode"
msgstr "Unicode tamoul"
-#: ../rules/base.xml.in.h:585 ../rules/evdev.xml.in.h:585
+#: ../rules/base.xml.in.h:607
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
+
+#: ../rules/base.xml.in.h:608
msgid "Tatar"
msgstr "Tatar"
-#: ../rules/base.xml.in.h:586 ../rules/evdev.xml.in.h:586
+#: ../rules/base.xml.in.h:609
msgid "Telugu"
msgstr "Telugu"
-#: ../rules/base.xml.in.h:587 ../rules/evdev.xml.in.h:587
+#: ../rules/base.xml.in.h:610
msgid "Tha"
msgstr "Tha"
-#: ../rules/base.xml.in.h:588 ../rules/evdev.xml.in.h:588
+#: ../rules/base.xml.in.h:611
msgid "Thailand"
msgstr "Thaïlande"
-#: ../rules/base.xml.in.h:589 ../rules/evdev.xml.in.h:589
-msgid "Third level choosers"
-msgstr "Sélecteur du 3e niveau"
-
-#: ../rules/base.xml.in.h:590 ../rules/evdev.xml.in.h:590
+#: ../rules/base.xml.in.h:612
msgid "Tibetan"
msgstr "Tibétain"
-#: ../rules/base.xml.in.h:591 ../rules/evdev.xml.in.h:591
+#: ../rules/base.xml.in.h:613
msgid "Tibetan (with ASCII numerals)"
msgstr "Tibétain (avec touches numériques ASCII)"
-#: ../rules/base.xml.in.h:592 ../rules/evdev.xml.in.h:592
+#: ../rules/base.xml.in.h:614
msgid "Tifinagh"
msgstr "Tifinagh"
-#: ../rules/base.xml.in.h:593 ../rules/evdev.xml.in.h:593
+#: ../rules/base.xml.in.h:615
msgid "Tifinagh Alternative"
msgstr "Tifinagh alternatif"
-#: ../rules/base.xml.in.h:594 ../rules/evdev.xml.in.h:594
+#: ../rules/base.xml.in.h:616
msgid "Tifinagh Alternative Phonetic"
msgstr "Tifinagh avec phonétique alternative"
-#: ../rules/base.xml.in.h:595 ../rules/evdev.xml.in.h:595
+#: ../rules/base.xml.in.h:617
msgid "Tifinagh Extended"
msgstr "Tifinagh étendu"
-#: ../rules/base.xml.in.h:596 ../rules/evdev.xml.in.h:596
+#: ../rules/base.xml.in.h:618
msgid "Tifinagh Extended Phonetic"
msgstr "Tifinagh avec phonétique étendue"
-#: ../rules/base.xml.in.h:597 ../rules/evdev.xml.in.h:597
+#: ../rules/base.xml.in.h:619
msgid "Tifinagh Phonetic"
msgstr "Tifinagh phonétique"
-#: ../rules/base.xml.in.h:598 ../rules/evdev.xml.in.h:598
+#: ../rules/base.xml.in.h:620
msgid "Tilde (~) variant"
msgstr "Variante avec tilde"
-#: ../rules/base.xml.in.h:599 ../rules/evdev.xml.in.h:599
+#: ../rules/base.xml.in.h:621
msgid "Tjk"
msgstr "Tjk"
-#: ../rules/base.xml.in.h:600 ../rules/evdev.xml.in.h:600
+#: ../rules/base.xml.in.h:622
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr "Mène à la touche correspondante sur un clavier Dvorak."
+
+#: ../rules/base.xml.in.h:623
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr "Mène à la touche correspondante sur un clavier Qwerty"
+
+#: ../rules/base.xml.in.h:624
msgid "Toshiba Satellite S3000"
msgstr "Toshiba Satellite S3000"
-#: ../rules/base.xml.in.h:601 ../rules/evdev.xml.in.h:601
+#: ../rules/base.xml.in.h:625
+msgid "Traditional Phonetic"
+msgstr "Phonétique traditionnel"
+
+#: ../rules/base.xml.in.h:626
msgid "Trust Direct Access Keyboard"
msgstr "Trust Direct Access"
-#: ../rules/base.xml.in.h:602 ../rules/evdev.xml.in.h:602
+#: ../rules/base.xml.in.h:627
+msgid "Trust Slimline"
+msgstr "Trust Slimline"
+
+#: ../rules/base.xml.in.h:628
msgid "Trust Wireless Keyboard Classic"
msgstr "Trust Wireless Classic"
-#: ../rules/base.xml.in.h:603 ../rules/evdev.xml.in.h:603
+#: ../rules/base.xml.in.h:629
msgid "Tur"
msgstr "Tur"
-#: ../rules/base.xml.in.h:604 ../rules/evdev.xml.in.h:604
+#: ../rules/base.xml.in.h:630
msgid "Turkey"
msgstr "Turquie"
-#: ../rules/base.xml.in.h:605 ../rules/evdev.xml.in.h:605
+#: ../rules/base.xml.in.h:631
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+#: ../rules/base.xml.in.h:632
msgid "Typewriter"
msgstr "Machine à écrire"
-#: ../rules/base.xml.in.h:606 ../rules/evdev.xml.in.h:606
+#: ../rules/base.xml.in.h:633
msgid "UCW layout (accented letters only)"
msgstr "Disposition UCW (lettres accentuées seulement)"
-#: ../rules/base.xml.in.h:607 ../rules/evdev.xml.in.h:607
+#: ../rules/base.xml.in.h:634
msgid "US keyboard with Bosnian digraphs"
msgstr "Clavier US avec digraphes bosniaques"
-#: ../rules/base.xml.in.h:608 ../rules/evdev.xml.in.h:608
+#: ../rules/base.xml.in.h:635
msgid "US keyboard with Bosnian letters"
msgstr "Clavier US avec lettres bosniaques"
-#: ../rules/base.xml.in.h:609 ../rules/evdev.xml.in.h:609
+#: ../rules/base.xml.in.h:636
msgid "US keyboard with Croatian digraphs"
msgstr "Clavier US avec digraphes croates"
-#: ../rules/base.xml.in.h:610 ../rules/evdev.xml.in.h:610
+#: ../rules/base.xml.in.h:637
msgid "US keyboard with Croatian letters"
msgstr "Clavier US avec lettres croates"
-#: ../rules/base.xml.in.h:611 ../rules/evdev.xml.in.h:611
+#: ../rules/base.xml.in.h:638
msgid "US keyboard with Estonian letters"
msgstr "Clavier US avec lettres estoniennes"
-#: ../rules/base.xml.in.h:612 ../rules/evdev.xml.in.h:612
+#: ../rules/base.xml.in.h:639
msgid "US keyboard with Lithuanian letters"
msgstr "Clavier US avec lettres lituaniennes"
-#: ../rules/base.xml.in.h:613 ../rules/evdev.xml.in.h:613
-msgid "US keyboard with Slovenian digraphs"
-msgstr "Clavier US avec digraphes slovènes"
-
-#: ../rules/base.xml.in.h:614 ../rules/evdev.xml.in.h:614
+#: ../rules/base.xml.in.h:640
msgid "US keyboard with Slovenian letters"
msgstr "Clavier US avec lettres slovènes"
-#: ../rules/base.xml.in.h:615 ../rules/evdev.xml.in.h:615
+#: ../rules/base.xml.in.h:641
msgid "USA"
msgstr "USA"
-#: ../rules/base.xml.in.h:616 ../rules/evdev.xml.in.h:616
+#: ../rules/base.xml.in.h:642
msgid "Udmurt"
msgstr "Oudmourte"
-#: ../rules/base.xml.in.h:617 ../rules/evdev.xml.in.h:617
+#: ../rules/base.xml.in.h:643
msgid "Ukr"
msgstr "Ukr"
-#: ../rules/base.xml.in.h:618 ../rules/evdev.xml.in.h:618
+#: ../rules/base.xml.in.h:644
msgid "Ukraine"
msgstr "Ukraine"
-#: ../rules/base.xml.in.h:619 ../rules/evdev.xml.in.h:619
+#: ../rules/base.xml.in.h:645
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Ajouts Unicode (touches fléchées et opérateurs mathématiques)"
+
+#: ../rules/base.xml.in.h:646
+msgid "Unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Ajouts Unicode (touches fléchées et opérateurs mathématiques). Les opérateurs mathématiques se trouvent sur le niveau par défaut"
+
+#: ../rules/base.xml.in.h:647
msgid "UnicodeExpert"
msgstr "UnicodeExpert"
-#: ../rules/base.xml.in.h:620 ../rules/evdev.xml.in.h:620
+#: ../rules/base.xml.in.h:648
msgid "United Kingdom"
msgstr "Royaume-Uni"
-#: ../rules/base.xml.in.h:621 ../rules/evdev.xml.in.h:621
-msgid "Urdu"
-msgstr "Ourdou"
+#: ../rules/base.xml.in.h:649
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
-#: ../rules/base.xml.in.h:622 ../rules/evdev.xml.in.h:622
+#: ../rules/base.xml.in.h:650
+msgid "Urdu, Alternative phonetic"
+msgstr "Ourdou, phonétique alternatif"
+
+#: ../rules/base.xml.in.h:651
+msgid "Urdu, Phonetic"
+msgstr "Ourdou, phonétique"
+
+#: ../rules/base.xml.in.h:652
+msgid "Urdu, Winkeys"
+msgstr "Ourdou, touches Logo"
+
+#: ../rules/base.xml.in.h:653
msgid "Use Bosnian digraphs"
msgstr "Avec digraphes bosniaques"
-#: ../rules/base.xml.in.h:623 ../rules/evdev.xml.in.h:623
+#: ../rules/base.xml.in.h:654
msgid "Use Croatian digraphs"
msgstr "Avec digraphes croates"
-#: ../rules/base.xml.in.h:624 ../rules/evdev.xml.in.h:624
-msgid "Use Slovenian digraphs"
-msgstr "Avec digraphes slovènes"
-
-#: ../rules/base.xml.in.h:625 ../rules/evdev.xml.in.h:625
+#: ../rules/base.xml.in.h:655
msgid "Use guillemets for quotes"
msgstr "Remplacer les guillemets droits avec les guillements français"
-#: ../rules/base.xml.in.h:626 ../rules/evdev.xml.in.h:626
-msgid "Use keyboard LED to show alternative layout."
-msgstr "Utiliser les voyants lumineux du clavier pour afficher une disposition alternative."
+#: ../rules/base.xml.in.h:656
+msgid "Use keyboard LED to show alternative layout"
+msgstr "Utiliser les voyants lumineux du clavier pour afficher une disposition alternative"
-#: ../rules/base.xml.in.h:627 ../rules/evdev.xml.in.h:627
+#: ../rules/base.xml.in.h:657
msgid "Using space key to input non-breakable space character"
msgstr "Utiliser la barre d'espacement pout insérer un espace insécable"
-#: ../rules/base.xml.in.h:628 ../rules/evdev.xml.in.h:628
+#: ../rules/base.xml.in.h:658
+msgid "Usual space at any level"
+msgstr "La barre d'espacement renvoie une espace ordinaire à tous les niveaux"
+
+#: ../rules/base.xml.in.h:659
msgid "Uzb"
msgstr "Uzb"
-#: ../rules/base.xml.in.h:629 ../rules/evdev.xml.in.h:629
+#: ../rules/base.xml.in.h:660
msgid "Uzbekistan"
msgstr "Ouzbékistan"
-#: ../rules/base.xml.in.h:630 ../rules/evdev.xml.in.h:630
+#: ../rules/base.xml.in.h:661
msgid "Vietnam"
msgstr "Viêt Nam"
-#: ../rules/base.xml.in.h:631 ../rules/evdev.xml.in.h:631
+#: ../rules/base.xml.in.h:662
msgid "ViewSonic KU-306 Internet Keyboard"
msgstr "Clavier Internet ViewSonic KU-306"
-#: ../rules/base.xml.in.h:632 ../rules/evdev.xml.in.h:632
+#: ../rules/base.xml.in.h:663
msgid "Vnm"
msgstr "Vnm"
-#: ../rules/base.xml.in.h:633 ../rules/evdev.xml.in.h:633
+#: ../rules/base.xml.in.h:664
msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
msgstr "Clavier Wang 724 avec ajouts Unicode (touches fléchées et opérateurs mathématiques)"
-#: ../rules/base.xml.in.h:634 ../rules/evdev.xml.in.h:634
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Clavier Wang 724 avec ajouts Unicode (touches fléchées et opérateurs mathématiques). Les opérateurs mathématiques se trouvent sur le niveau par défaut."
+#: ../rules/base.xml.in.h:665
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Clavier Wang 724 avec ajouts Unicode (touches fléchées et opérateurs mathématiques). Les opérateurs mathématiques se trouvent sur le niveau par défaut"
-#: ../rules/base.xml.in.h:635 ../rules/evdev.xml.in.h:635
+#: ../rules/base.xml.in.h:666
msgid "Wang model 724 azerty"
msgstr "Modèle Wang 724 azerty"
-#: ../rules/base.xml.in.h:636 ../rules/evdev.xml.in.h:636
+#: ../rules/base.xml.in.h:667
msgid "Western"
msgstr "Occidentale"
-#: ../rules/base.xml.in.h:637 ../rules/evdev.xml.in.h:637
+#: ../rules/base.xml.in.h:668
msgid "Winbook Model XP5"
msgstr "Winbook Model XP5"
-#: ../rules/base.xml.in.h:638 ../rules/evdev.xml.in.h:638
+#: ../rules/base.xml.in.h:669
msgid "Winkeys"
msgstr "Touches Logo"
-#: ../rules/base.xml.in.h:639 ../rules/evdev.xml.in.h:639
+#: ../rules/base.xml.in.h:670
msgid "With &lt;\\|&gt; key"
msgstr "Avec la touche &lt;\\|&gt;"
-#: ../rules/base.xml.in.h:640 ../rules/evdev.xml.in.h:640
+#: ../rules/base.xml.in.h:671
msgid "With EuroSign on 5"
msgstr "Avec le signe Euro sur la touche 5."
-#: ../rules/base.xml.in.h:641 ../rules/evdev.xml.in.h:641
+#: ../rules/base.xml.in.h:672
msgid "With guillemets"
msgstr "Avec guillemets"
-#: ../rules/base.xml.in.h:642 ../rules/evdev.xml.in.h:642
+#: ../rules/base.xml.in.h:673
msgid "Yahoo! Internet Keyboard"
msgstr "Clavier Yahoo! Internet"
-#: ../rules/base.xml.in.h:643 ../rules/evdev.xml.in.h:643
+#: ../rules/base.xml.in.h:674
msgid "Yakut"
msgstr "Yacoute"
-#: ../rules/base.xml.in.h:644 ../rules/evdev.xml.in.h:644
+#: ../rules/base.xml.in.h:675
msgid "Yoruba"
msgstr "Yoruba"
-#: ../rules/base.xml.in.h:645 ../rules/evdev.xml.in.h:645
+#: ../rules/base.xml.in.h:676
msgid "Z and ZHE swapped"
msgstr "Z et ZHE permutés"
-#: ../rules/base.xml.in.h:646 ../rules/evdev.xml.in.h:646
+#: ../rules/base.xml.in.h:677
msgid "Zar"
msgstr "Zar"
-#: ../rules/base.xml.in.h:647 ../rules/evdev.xml.in.h:647
+#: ../rules/base.xml.in.h:678
msgid "azerty"
msgstr "azerty"
-#: ../rules/base.xml.in.h:648 ../rules/evdev.xml.in.h:648
+#: ../rules/base.xml.in.h:679
msgid "azerty/digits"
msgstr "azerty/chiffres"
-#: ../rules/base.xml.in.h:649 ../rules/evdev.xml.in.h:649
+#: ../rules/base.xml.in.h:680
msgid "digits"
msgstr "chiffres"
-#: ../rules/base.xml.in.h:650 ../rules/evdev.xml.in.h:650
+#: ../rules/base.xml.in.h:681
msgid "displaced semicolon and quote (obsolete)"
msgstr "(Obsolète) Point-virgule et guillemets droits déplacés"
-#: ../rules/base.xml.in.h:651 ../rules/evdev.xml.in.h:651
+#: ../rules/base.xml.in.h:682
msgid "lyx"
msgstr "lyx"
-#: ../rules/base.xml.in.h:652 ../rules/evdev.xml.in.h:652
+#: ../rules/base.xml.in.h:683
msgid "qwerty"
msgstr "qwerty"
-#: ../rules/base.xml.in.h:653 ../rules/evdev.xml.in.h:653
+#: ../rules/base.xml.in.h:684
msgid "qwerty, extended Backslash"
msgstr "qwerty, contre-oblique étendue"
-#: ../rules/base.xml.in.h:654 ../rules/evdev.xml.in.h:654
+#: ../rules/base.xml.in.h:685
msgid "qwerty/digits"
msgstr "qwerty/chiffres"
-#: ../rules/base.xml.in.h:655 ../rules/evdev.xml.in.h:655
+#: ../rules/base.xml.in.h:686
msgid "qwertz"
msgstr "qwertz"
+#~ msgid "Brazilian ABNT2"
+#~ msgstr "ABNT2 brésilien"
+
+#~ msgid "Japanese 106-key"
+#~ msgstr "Japonais 106 touches"
+
+#~ msgid "Kir"
+#~ msgstr "Kir"
+
+#~ msgid "Korean 106-key"
+#~ msgstr "Coréen 106 touches"
+
+#~ msgid "Super is mapped to Win keys"
+#~ msgstr "Super est obtenu avec n'importe quelle touche Logo"
+
+#~ msgid "US keyboard with Slovenian digraphs"
+#~ msgstr "Clavier US avec digraphes slovènes"
+
+#~ msgid "Unicode"
+#~ msgstr "Unicode"
+
+#~ msgid "Use Slovenian digraphs"
+#~ msgstr "Avec digraphes slovènes"
+
+#~ msgid "Add the EuroSign to the 2 key."
+#~ msgstr "Ajouter le signe Euro sur la touche 2."
+
+#~ msgid "Add the EuroSign to the 4 key."
+#~ msgstr "Ajouter le signe Euro sur la touche 4."
+
+#~ msgid "Add the EuroSign to the 5 key."
+#~ msgstr "Ajouter le signe Euro sur la touche 5."
+
+#~ msgid "Add the EuroSign to the E key."
+#~ msgstr "Ajouter le signe Euro sur la touche E."
+
+#~ msgid "Alt+Ctrl change layout."
+#~ msgstr "Alt+Ctrl change de configuration."
+
+#~ msgid "Alt+Shift change layout."
+#~ msgstr "Alt+Maj. change de configuration."
+
+#~ msgid "CapsLock LED shows alternative layout."
+#~ msgstr "Le témoins lumineux du Verr. maj. indique un groupe autre que le premier."
+
+#~ msgid "CapsLock just locks the Shift modifier."
+#~ msgstr "Verr. maj. verrouille le modificateur de majuscules."
+
+#~ msgid "CapsLock key changes layout."
+#~ msgstr "La touche Verr. maj. change de disposition."
+
+#~ msgid "Ctrl+Shift change layout."
+#~ msgstr "Ctrl+Maj. change de disposition."
+
+#~ msgid "Hewlett-Packard Internet Keyboard 5181"
+#~ msgstr "Hewlett-Packard avec clavier Internet 5181"
+
+#~ msgid "Hewlett-Packard Internet Keyboard 5185"
+#~ msgstr "Hewlett-Packard avec clavier Internet 5185"
+
+#~ msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+#~ msgstr "Hewlett-Packard SK-2505 Internet"
+
+#~ msgid "IBM Rapid Access II (alternate option)"
+#~ msgstr "IBM Rapid Access II (autre option)"
+
+#~ msgid "LCtrl+LShift change layout."
+#~ msgstr "Ctrl gauche+Maj. gauche change de disposition."
+
+#~ msgid "Layout switching"
+#~ msgstr "Changement de disposition"
+
+#~ msgid "Left Alt key changes layout."
+#~ msgstr "La touche Alt de gauche change de disposition."
+
+#~ msgid "Left Ctrl key changes layout."
+#~ msgstr "La touche Ctrl de gauche change de disposition."
+
+#~ msgid "Left Shift key changes layout."
+#~ msgstr "La touche Maj. de gauche change de disposition."
+
+#~ msgid "Left Win-key changes layout."
+#~ msgstr "La touche Logo de gauche change de disposition."
+
+#~ msgid "Left Win-key is Compose."
+#~ msgstr "La touche Logo de gauche est Compose."
+
+#~ msgid "Legacy keypad"
+#~ msgstr "Clavier obsolète"
+
+#~ msgid "Menu is Compose."
+#~ msgstr "Menu est Compose."
+
+#~ msgid "Neostyle"
+#~ msgstr "Neostyle"
+
+#~ msgid "NumLock LED shows alternative layout."
+#~ msgstr "Le témoin lumineux de verrouillage numérique indique une disposition alternative."
+
+#~ msgid "Press Left Alt key to choose 3rd level."
+#~ msgstr "La touche Alt de gauche sélectionne le 3e niveau."
+
+#~ msgid "Press Left Win-key to choose 3rd level."
+#~ msgstr "La touche Logo de gauche sélectionne le 3e niveau."
+
+#~ msgid "Press Right Alt key to choose 3rd level."
+#~ msgstr "La touche Alt de droite (AltGr) sélectionne le 3e niveau."
+
+#~ msgid "Press Right Ctrl to choose 3rd level."
+#~ msgstr "La touche Ctrl de droite sélectionne le 3e niveau."
+
+#~ msgid "Press Right Win-key to choose 3rd level."
+#~ msgstr "La touche Logo de droite sélectionne le 3e niveau."
+
+#~ msgid "Press any of Alt keys to choose 3rd level."
+#~ msgstr "N'importe quelle touche Alt sélectionne le 3e niveau."
+
+#~ msgid "Press any of Win-keys to choose 3rd level."
+#~ msgstr "N'importe quelle touche Logo sélectionne le 3e niveau."
+
+#~ msgid "Right Alt is Compose."
+#~ msgstr "La touche Alt de droite est Compose."
+
+#~ msgid "Right Alt key changes layout."
+#~ msgstr "La touche Alt de droite change de disposition."
+
+#~ msgid "Right Ctrl key changes layout."
+#~ msgstr "La touche Ctrl de droite change de disposition."
+
+#~ msgid "Right Shift key changes layout."
+#~ msgstr "La touche Maj. de droite change de disposition."
+
+#~ msgid "Right Win-key changes layout."
+#~ msgstr "La touche Logo de droite change de disposition."
+
+#~ msgid "Right Win-key is Compose."
+#~ msgstr "La touche Logo de droite est Compose."
+
+#~ msgid "ScrollLock LED shows alternative layout."
+#~ msgstr "Le témoin lumineux d'Arrêt défil. indique une disposition différente."
+
+#~ msgid "Shift+CapsLock changes layout."
+#~ msgstr "Les touches Maj.+Verr. maj. changent de disposition."
+
+#~ msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+#~ msgstr "Échange les codes de deux touches pour les claviers Mac mal reconnus par le noyau."
+
+#~ msgid "Third level choosers"
+#~ msgstr "Sélecteur du 3e niveau"
+
+#~ msgid "Urdu"
+#~ msgstr "Ourdou"
+
#~ msgid "(Legacy) Dvorak"
#~ msgstr "(Obsolète) Dvorak"
@@ -2655,9 +2932,6 @@ msgstr "qwertz"
#~ msgid "SCG"
#~ msgstr "SCG"
-#~ msgid "U.S. English"
-#~ msgstr "Anglais U.S."
-
#~ msgid "Macintosh layout"
#~ msgstr "Disposition Apple-Macintosh"
diff --git a/xorg-server/xkbdata.src/po/id.po b/xorg-server/xkbdata.src/po/id.po
new file mode 100644
index 000000000..116550cb3
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/id.po
@@ -0,0 +1,2901 @@
+# Terjemahan pesan Bahasa Indonesia untuk xkeyboard-config.
+# Copyright (C) 2008 THE xkeyboard-config'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the xkeyboard-config package.
+# Erwid M Jadied <jadied@gmail.com>, 2008.
+# Andhika Padmawan <andhika.padmawan@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config-1.6pre1\n"
+"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
+"POT-Creation-Date: 2009-05-12 23:49+0100\n"
+"PO-Revision-Date: 2009-05-14 22:03+0700\n"
+"Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
+"Language-Team: Indonesian <translation-team-id@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: Indonesian\n"
+"X-Poedit-Country: INDONESIA\n"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr "(F)"
+
+#: ../rules/base.xml.in.h:2
+msgid "(Legacy) Alternative"
+msgstr "(Legacy) Alternative"
+
+#: ../rules/base.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "(Legacy) Alternative, Tombol mati Matahari"
+
+#: ../rules/base.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "(Legacy) Alternative, hapus tombol mati"
+
+#: ../rules/base.xml.in.h:5
+msgid "101/104 key Compatible"
+msgstr "101/104 tombol Kompatibel"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101/qwerty/koma/Tombol mati"
+
+#: ../rules/base.xml.in.h:7
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101/qwerty/koma/ Hapuskan tombol mati"
+
+#: ../rules/base.xml.in.h:8
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101/qwerty/titik/Tombol mati"
+
+#: ../rules/base.xml.in.h:9
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101/qwerty/titik/Hapus tombol mati"
+
+#: ../rules/base.xml.in.h:10
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101/qwertz/koma/Tombol mati"
+
+#: ../rules/base.xml.in.h:11
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101/qwertz/koma/Hapus tombol mati"
+
+#: ../rules/base.xml.in.h:12
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101/awertz/titik/Tombol mati"
+
+#: ../rules/base.xml.in.h:13
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101/qwertz/titik/hapus tombol mati"
+
+#: ../rules/base.xml.in.h:14
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102/qwerty/koma/Tombol mati"
+
+#: ../rules/base.xml.in.h:15
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102/qwerty/koma/Hapus tombol mati"
+
+#: ../rules/base.xml.in.h:16
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102/qwerty/titik/Tombol mati"
+
+#: ../rules/base.xml.in.h:17
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102/qwerty/titik/Hapus tombol mati"
+
+#: ../rules/base.xml.in.h:18
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102/qwertz/koma/Tombol mati"
+
+#: ../rules/base.xml.in.h:19
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102/qwertz/koma/Hapus tombol mati"
+
+#: ../rules/base.xml.in.h:20
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102/qwertz/titik/Tombol mati"
+
+#: ../rules/base.xml.in.h:21
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102/qwertz/titik/Hapus tombol mati"
+
+#: ../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 Standard"
+
+#: ../rules/base.xml.in.h:29
+msgid "ATM/phone-style"
+msgstr "Gaya ATM/telepon"
+
+#: ../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 Laptop"
+
+#: ../rules/base.xml.in.h:34
+msgid "Add the standard behavior to Menu key"
+msgstr "Tambah tindakan standar pada tombol Menu"
+
+#: ../rules/base.xml.in.h:35
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "Menambah circumflex Esperanto (supersigno)"
+
+#: ../rules/base.xml.in.h:36
+msgid "Adding EuroSign to certain keys"
+msgstr "Menambahkan tanda Euro ke tombol tertentu"
+
+#: ../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 "Albania"
+
+#: ../rules/base.xml.in.h:43
+msgid "Alt and Meta are on Alt keys"
+msgstr "Alt dan Meta pada tombol Alt"
+
+#: ../rules/base.xml.in.h:44
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr "Alt dipetakan ke Win Kanan, Super ke 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+Space"
+
+#: ../rules/base.xml.in.h:49
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:50
+msgid "Alt/Win key behavior"
+msgstr "Tindakan Tombol Alt/Win "
+
+#: ../rules/base.xml.in.h:51
+msgid "Alternative"
+msgstr "Alternative"
+
+#: ../rules/base.xml.in.h:52
+msgid "Alternative Eastern"
+msgstr "Alternative Eastern"
+
+#: ../rules/base.xml.in.h:53
+msgid "Alternative Phonetic"
+msgstr "Alternative Phonetik"
+
+#: ../rules/base.xml.in.h:54
+msgid "Alternative international (former us_intl)"
+msgstr "Alternatif Internasional (us_intl)"
+
+#: ../rules/base.xml.in.h:55
+msgid "Alternative, Sun dead keys"
+msgstr "Alternative, tombol mati Matahari"
+
+#: ../rules/base.xml.in.h:56
+msgid "Alternative, eliminate dead keys"
+msgstr "Alternative, hapus tombol mati"
+
+#: ../rules/base.xml.in.h:57
+msgid "Alternative, latin-9 only"
+msgstr "Alternative, hanya latin-9"
+
+#: ../rules/base.xml.in.h:58
+msgid "And"
+msgstr "And"
+
+#: ../rules/base.xml.in.h:59
+msgid "Andorra"
+msgstr "Andorra"
+
+#: ../rules/base.xml.in.h:60
+msgid "Any Alt key"
+msgstr "Tombol Alt apapun"
+
+#: ../rules/base.xml.in.h:61
+msgid "Any Win key"
+msgstr "Tombol Win apapun"
+
+#: ../rules/base.xml.in.h:62
+msgid "Any Win key (while pressed)"
+msgstr "Tombol Win apapun (ketika ditekan)"
+
+#: ../rules/base.xml.in.h:63
+msgid "Apostrophe (') variant"
+msgstr "Varian apostrof (')"
+
+#: ../rules/base.xml.in.h:64
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:65
+msgid "Apple Laptop"
+msgstr "Apple Laptop"
+
+#: ../rules/base.xml.in.h:66
+msgid "Ara"
+msgstr "Ara"
+
+#: ../rules/base.xml.in.h:67
+msgid "Arabic"
+msgstr "Arab"
+
+#: ../rules/base.xml.in.h:68
+msgid "Arm"
+msgstr "Arm"
+
+#: ../rules/base.xml.in.h:69
+msgid "Armenia"
+msgstr "Armenia"
+
+#: ../rules/base.xml.in.h:70
+msgid "Asturian variant with bottom-dot H and bottom-dot L"
+msgstr "Varian Asturian dengan titik di bawah pada H dan L "
+
+#: ../rules/base.xml.in.h:71
+msgid "Asus Laptop"
+msgstr "Asus Laptop"
+
+#: ../rules/base.xml.in.h:72
+msgid "At bottom left"
+msgstr "Di kiri bawah"
+
+#: ../rules/base.xml.in.h:73
+msgid "At left of 'A'"
+msgstr "Di sebelah kiri 'A'"
+
+#: ../rules/base.xml.in.h:74
+msgid "Aze"
+msgstr "Aze"
+
+#: ../rules/base.xml.in.h:75
+msgid "Azerbaijan"
+msgstr "Ajarbaijan"
+
+#: ../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 91116U Internet dan Permainan Nirkabel Mini"
+
+#: ../rules/base.xml.in.h:86
+msgid "Baltic+"
+msgstr "Baltic+"
+
+#: ../rules/base.xml.in.h:87
+msgid "Ban"
+msgstr "Ban"
+
+#: ../rules/base.xml.in.h:88
+msgid "Bangladesh"
+msgstr "Banglades"
+
+#: ../rules/base.xml.in.h:89
+msgid "Bel"
+msgstr "Bel"
+
+#: ../rules/base.xml.in.h:90
+msgid "Belarus"
+msgstr "Belarus"
+
+#: ../rules/base.xml.in.h:91
+msgid "Belgium"
+msgstr "Belgia"
+
+#: ../rules/base.xml.in.h:92
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
+
+#: ../rules/base.xml.in.h:93
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:94
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
+
+#: ../rules/base.xml.in.h:95
+msgid "Bengali"
+msgstr "Bengali"
+
+#: ../rules/base.xml.in.h:96
+msgid "Bengali Probhat"
+msgstr "Bengali Probhat"
+
+#: ../rules/base.xml.in.h:97
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Bepo, ergonomic, Dvorak way"
+
+#: ../rules/base.xml.in.h:98
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Bepo, ergonomic, Dvorak way, latin-9 only"
+
+#: ../rules/base.xml.in.h:99
+msgid "Bgr"
+msgstr "Bgr"
+
+#: ../rules/base.xml.in.h:100
+msgid "Bhu"
+msgstr "Bhu"
+
+#: ../rules/base.xml.in.h:101
+msgid "Bhutan"
+msgstr "Bhutan"
+
+#: ../rules/base.xml.in.h:102
+msgid "Biblical Hebrew (Tiro)"
+msgstr "Biblical Hebrew (Tiro)"
+
+#: ../rules/base.xml.in.h:103
+msgid "Bih"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:104
+msgid "Blr"
+msgstr "Blr"
+
+#: ../rules/base.xml.in.h:105
+msgid "Bosnia and Herzegovina"
+msgstr "Bosnia dan Herzegovina"
+
+#: ../rules/base.xml.in.h:106
+msgid "Both Alt keys together"
+msgstr "Kedua tombol Alt bersama"
+
+#: ../rules/base.xml.in.h:107
+msgid "Both Ctrl keys together"
+msgstr "Kedua tombol Ctrl bersama"
+
+#: ../rules/base.xml.in.h:108
+msgid "Both Shift keys together"
+msgstr "Kedua tombol Shift bersama"
+
+#: ../rules/base.xml.in.h:109
+msgid "Bra"
+msgstr "Bra"
+
+#: ../rules/base.xml.in.h:110
+msgid "Braille"
+msgstr "Braille"
+
+#: ../rules/base.xml.in.h:111
+msgid "Brazil"
+msgstr "Brasil"
+
+#: ../rules/base.xml.in.h:112
+msgid "Breton"
+msgstr "Breton"
+
+#: ../rules/base.xml.in.h:113
+msgid "Brl"
+msgstr "Brl"
+
+#: ../rules/base.xml.in.h:114
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
+
+#: ../rules/base.xml.in.h:115
+msgid "Buckwalter"
+msgstr "Buckwalter"
+
+#: ../rules/base.xml.in.h:116
+msgid "Bulgaria"
+msgstr "Bulgaria"
+
+#: ../rules/base.xml.in.h:117
+msgid "CRULP"
+msgstr "CRULP"
+
+#: ../rules/base.xml.in.h:118
+msgid "Cambodia"
+msgstr "Kamboja"
+
+#: ../rules/base.xml.in.h:119
+msgid "Can"
+msgstr "Can"
+
+#: ../rules/base.xml.in.h:120
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../rules/base.xml.in.h:121
+msgid "Caps Lock"
+msgstr "Caps Lock"
+
+#: ../rules/base.xml.in.h:122
+msgid "CapsLock"
+msgstr "CapsLock"
+
+#: ../rules/base.xml.in.h:123
+msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
+msgstr "CapsLock (ke tata letak pertama), Shift+CapsLock (ke tata letak terakhir)"
+
+#: ../rules/base.xml.in.h:124
+msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
+msgstr "CapsLock (ketika ditekan), Alt+CapsLock melakukan aksi capslock asli"
+
+#: ../rules/base.xml.in.h:125
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
+msgstr "CapsLock bertindak sebagai Shift dengan mengunci. Shift \"jeda\" CapsLock."
+
+#: ../rules/base.xml.in.h:126
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock"
+msgstr "CapsLock bertindak sebagai Shift yang terkunci. Shift tidak mempengaruhi CapsLock"
+
+#: ../rules/base.xml.in.h:127
+msgid "CapsLock key behavior"
+msgstr "Tindakan tombol CapsLock"
+
+#: ../rules/base.xml.in.h:128
+msgid "CapsLock toggles Shift so all keys are affected"
+msgstr "CapsLock toggle Shift sehingga semua tombol terpengaruh"
+
+#: ../rules/base.xml.in.h:129
+msgid "CapsLock toggles normal capitalization of alphabetic characters"
+msgstr "CapsLock toggle huruf besar normal atau karakter secara alfabet"
+
+#: ../rules/base.xml.in.h:130
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
+msgstr "CapsLock menggunakan huruf besar internal. Shift \"pauses\" CapsLock"
+
+#: ../rules/base.xml.in.h:131
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
+msgstr "CapsLock menggunakan huruf besar internal. Shift tidak mempengaruhi CapsLock"
+
+#: ../rules/base.xml.in.h:132
+msgid "Catalan variant with middle-dot L"
+msgstr "Varian Katalan dengan titik-tengah pada L"
+
+#: ../rules/base.xml.in.h:133
+msgid "Cedilla"
+msgstr "Cedilla"
+
+#: ../rules/base.xml.in.h:134
+msgid "Che"
+msgstr "Che"
+
+#: ../rules/base.xml.in.h:135
+msgid "Cherokee"
+msgstr "Cherokee"
+
+#: ../rules/base.xml.in.h:136
+msgid "Cherry B.UNLIMITED"
+msgstr "Cherry B.UNLIMITED"
+
+#: ../rules/base.xml.in.h:137
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:138
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (alternate option)"
+
+#: ../rules/base.xml.in.h:139
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:140
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Expert"
+
+#: ../rules/base.xml.in.h:141
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:142
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
+
+#: ../rules/base.xml.in.h:143
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard"
+
+#: ../rules/base.xml.in.h:144
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:145
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
+
+#: ../rules/base.xml.in.h:146
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0420"
+
+#: ../rules/base.xml.in.h:147
+msgid "China"
+msgstr "China"
+
+#: ../rules/base.xml.in.h:148
+msgid "Chuvash"
+msgstr "Chuvash"
+
+#: ../rules/base.xml.in.h:149
+msgid "Chuvash Latin"
+msgstr "Chuvash Latin"
+
+#: ../rules/base.xml.in.h:150
+msgid "Classic"
+msgstr "Classic"
+
+#: ../rules/base.xml.in.h:151
+msgid "Classic Dvorak"
+msgstr "Classic Dvorak"
+
+#: ../rules/base.xml.in.h:152
+msgid "Classmate PC"
+msgstr "Classmate PC"
+
+#: ../rules/base.xml.in.h:153
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:154
+msgid "Colemak"
+msgstr "Colemak"
+
+#: ../rules/base.xml.in.h:155
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
+
+#: ../rules/base.xml.in.h:156
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 tombol)"
+
+#: ../rules/base.xml.in.h:157
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 tombol)"
+
+#: ../rules/base.xml.in.h:158
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 tombol)"
+
+#: ../rules/base.xml.in.h:159
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
+
+#: ../rules/base.xml.in.h:160
+msgid "Compose key position"
+msgstr "Posisi tombol Compose"
+
+#: ../rules/base.xml.in.h:161
+msgid "Congo, Democratic Republic of the"
+msgstr "Kongo, Republik Demokrat"
+
+#: ../rules/base.xml.in.h:162
+msgid "Control + Alt + Backspace"
+msgstr "Control + Alt + Backspace"
+
+#: ../rules/base.xml.in.h:163
+msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
+msgstr "Kendali dipetakan ke tombol Alt, Alt dipetakan ke tombol Win"
+
+#: ../rules/base.xml.in.h:164
+msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
+msgstr "Kendali dipetakan ke tombol Win ( dan tombol Ctrl biasa)"
+
+#: ../rules/base.xml.in.h:165
+msgid "Crimean Tatar (Dobruca-1 Q)"
+msgstr "Crimean Tatar (Dobruca-1 Q)"
+
+#: ../rules/base.xml.in.h:166
+msgid "Crimean Tatar (Dobruca-2 Q)"
+msgstr "Crimean Tatar (Dobruca-2 Q)"
+
+#: ../rules/base.xml.in.h:167
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Crimean Tatar (Turkish Alt-Q)"
+
+#: ../rules/base.xml.in.h:168
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Crimean Tatar (Turkish F)"
+
+#: ../rules/base.xml.in.h:169
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Crimean Tatar (Turkish Q)"
+
+#: ../rules/base.xml.in.h:170
+msgid "Croatia"
+msgstr "Kroasia"
+
+#: ../rules/base.xml.in.h:171
+msgid "Ctrl key position"
+msgstr "Posisi tombol Ctrl"
+
+#: ../rules/base.xml.in.h:172
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
+
+#: ../rules/base.xml.in.h:173
+msgid "Cyrillic"
+msgstr "Cyrillic"
+
+#: ../rules/base.xml.in.h:174
+msgid "Cyrillic with guillemets"
+msgstr "Cyrillic dengan guillemets"
+
+#: ../rules/base.xml.in.h:175
+msgid "Cyrillic, Z and ZHE swapped"
+msgstr "Cyrillic, Z dan ZHE di-swap"
+
+#: ../rules/base.xml.in.h:176
+msgid "Cze"
+msgstr "Cze"
+
+#: ../rules/base.xml.in.h:177
+msgid "Czechia"
+msgstr "Czechia"
+
+#: ../rules/base.xml.in.h:178
+msgid "DOS"
+msgstr "DOS"
+
+#: ../rules/base.xml.in.h:179
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:180
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:181
+msgid "Dan"
+msgstr "Dan"
+
+#: ../rules/base.xml.in.h:182
+msgid "Dead acute"
+msgstr "Dead acute"
+
+#: ../rules/base.xml.in.h:183
+msgid "Dead grave acute"
+msgstr "Dead grave acute"
+
+#: ../rules/base.xml.in.h:184
+msgid "Default numeric keypad keys"
+msgstr "Tombol angka keypad standar"
+
+#: ../rules/base.xml.in.h:185
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:186
+msgid "Dell 101-key PC"
+msgstr "Dell 101-key PC"
+
+#: ../rules/base.xml.in.h:187
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+
+#: ../rules/base.xml.in.h:188
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell Laptop/notebook Precision M series"
+
+#: ../rules/base.xml.in.h:189
+msgid "Dell Latitude series laptop"
+msgstr "Dell Latitude series laptop"
+
+#: ../rules/base.xml.in.h:190
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
+
+#: ../rules/base.xml.in.h:191
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
+
+#: ../rules/base.xml.in.h:192
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
+
+#: ../rules/base.xml.in.h:193
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Dell USB Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:194
+msgid "Denmark"
+msgstr "Denmark"
+
+#: ../rules/base.xml.in.h:195
+msgid "Deu"
+msgstr "Deu"
+
+#: ../rules/base.xml.in.h:196
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:197
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 series"
+
+#: ../rules/base.xml.in.h:198
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: ../rules/base.xml.in.h:199
+msgid "Dvorak (UK Punctuation)"
+msgstr "Dvorak (UK Punctuation)"
+
+#: ../rules/base.xml.in.h:200
+msgid "Dvorak international"
+msgstr "Dvorak international"
+
+#: ../rules/base.xml.in.h:201
+msgid "Dvorak, Polish quotes on key 1"
+msgstr "Dvorak, tanda kutip Polandia pada tombol 1"
+
+#: ../rules/base.xml.in.h:202
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorak, tanda kutip Polandia pada tombol quotemark"
+
+#: ../rules/base.xml.in.h:203
+msgid "E"
+msgstr "E"
+
+#: ../rules/base.xml.in.h:204
+msgid "Eastern"
+msgstr "Eastern"
+
+#: ../rules/base.xml.in.h:205
+msgid "Eliminate dead keys"
+msgstr "Hapus tombol mati"
+
+#: ../rules/base.xml.in.h:206
+msgid "Enable extra typographic characters"
+msgstr "Aktifkan karakter tipografi ekstra"
+
+#: ../rules/base.xml.in.h:207
+msgid "English"
+msgstr "Inggris"
+
+#: ../rules/base.xml.in.h:208
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:209
+msgid "Enter on keypad"
+msgstr "Enter pada keypad"
+
+#: ../rules/base.xml.in.h:210
+msgid "Epo"
+msgstr "Epo"
+
+#: ../rules/base.xml.in.h:211
+msgid "Ergonomic"
+msgstr "Ergonomic"
+
+#: ../rules/base.xml.in.h:212
+msgid "Esp"
+msgstr "Esp"
+
+#: ../rules/base.xml.in.h:213
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../rules/base.xml.in.h:214
+msgid "Est"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:215
+msgid "Estonia"
+msgstr "Estonia"
+
+#: ../rules/base.xml.in.h:216
+msgid "Eth"
+msgstr "Eth"
+
+#: ../rules/base.xml.in.h:217
+msgid "Ethiopia"
+msgstr "Ethiopia"
+
+#: ../rules/base.xml.in.h:218
+msgid "Evdev-managed keyboard"
+msgstr "Evdev-managed keyboard"
+
+#: ../rules/base.xml.in.h:219
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:220
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../rules/base.xml.in.h:221
+msgid "Extended"
+msgstr "Extended"
+
+#: ../rules/base.xml.in.h:222
+msgid "Extended - Winkeys"
+msgstr "Extended - Winkeys"
+
+#: ../rules/base.xml.in.h:223
+msgid "Extended Backslash"
+msgstr "Extended Backslash"
+
+#: ../rules/base.xml.in.h:224
+msgid "F-letter (F) variant"
+msgstr "varian huruf-F (F)"
+
+#: ../rules/base.xml.in.h:225
+msgid "FL90"
+msgstr "FL90"
+
+#: ../rules/base.xml.in.h:226
+msgid "Fao"
+msgstr "Fao"
+
+#: ../rules/base.xml.in.h:227
+msgid "Faroe Islands"
+msgstr "kepulauan Farao"
+
+#: ../rules/base.xml.in.h:228
+msgid "Fin"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:229
+msgid "Finland"
+msgstr "Finlandia"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:232
+msgid "Four-level key with abstract separators"
+msgstr "Tombol empat-tingkat dengan pemisah abstrak"
+
+#: ../rules/base.xml.in.h:233
+msgid "Four-level key with comma"
+msgstr "Tombol empat-tingkat dengan koma"
+
+#: ../rules/base.xml.in.h:234
+msgid "Four-level key with dot"
+msgstr "Tombol empat-tingkat dengan titik"
+
+#: ../rules/base.xml.in.h:235
+msgid "Four-level key with dot, latin-9 restriction"
+msgstr "Tombol empat-tingkat dengan titik, pembatasan latin-9"
+
+#: ../rules/base.xml.in.h:236
+msgid "Four-level key with momayyez"
+msgstr "Tombol empat tingkat dengan momayyez"
+
+#: ../rules/base.xml.in.h:237
+msgid "Fra"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:238
+msgid "France"
+msgstr "Perancis"
+
+#: ../rules/base.xml.in.h:239
+msgid "French"
+msgstr "Perancis"
+
+#: ../rules/base.xml.in.h:240
+msgid "French (Macintosh)"
+msgstr "French (Macintosh)"
+
+#: ../rules/base.xml.in.h:241
+msgid "French (legacy)"
+msgstr "French (legacy)"
+
+#: ../rules/base.xml.in.h:242
+msgid "French Dvorak"
+msgstr "French Dvorak"
+
+#: ../rules/base.xml.in.h:243
+msgid "French, Sun dead keys"
+msgstr "Frence, Tombol mati Matahari"
+
+#: ../rules/base.xml.in.h:244
+msgid "French, eliminate dead keys"
+msgstr "French, hapus tombol mati"
+
+#: ../rules/base.xml.in.h:245
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Fujitsu-Siemens Computers AMILO laptop"
+
+#: ../rules/base.xml.in.h:246
+msgid "Fula"
+msgstr "Fula"
+
+#: ../rules/base.xml.in.h:247
+msgid "GBr"
+msgstr "GBr"
+
+#: ../rules/base.xml.in.h:248
+msgid "Ga"
+msgstr "Ga"
+
+#: ../rules/base.xml.in.h:249
+msgid "Generic 101-key PC"
+msgstr "Generic 101-key PC"
+
+#: ../rules/base.xml.in.h:250
+msgid "Generic 102-key (Intl) PC"
+msgstr "Generic 102-key (Intl) PC"
+
+#: ../rules/base.xml.in.h:251
+msgid "Generic 104-key PC"
+msgstr "Generic 104-key PC"
+
+#: ../rules/base.xml.in.h:252
+msgid "Generic 105-key (Intl) PC"
+msgstr "Generic 105-key (Intl) PC"
+
+#: ../rules/base.xml.in.h:253
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:254
+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:255
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:256
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:257
+msgid "Genius KKB-2050HS"
+msgstr "Genius KKB-2050HS"
+
+#: ../rules/base.xml.in.h:258
+msgid "Geo"
+msgstr "Geo"
+
+#: ../rules/base.xml.in.h:259
+msgid "Georgia"
+msgstr "Georgia"
+
+#: ../rules/base.xml.in.h:260
+msgid "Georgian"
+msgstr "Georgia"
+
+#: ../rules/base.xml.in.h:261
+msgid "Georgian AZERTY Tskapo"
+msgstr "Georgian AZERTY Tskapo"
+
+#: ../rules/base.xml.in.h:262
+msgid "German (Macintosh)"
+msgstr "German (Macintosh)"
+
+#: ../rules/base.xml.in.h:263
+msgid "German, Sun dead keys"
+msgstr "German, Tombol mati Matahari"
+
+#: ../rules/base.xml.in.h:264
+msgid "German, eliminate dead keys"
+msgstr "German, hapus tombol mati"
+
+#: ../rules/base.xml.in.h:265
+msgid "Germany"
+msgstr "Jerman"
+
+#: ../rules/base.xml.in.h:266
+msgid "Gha"
+msgstr "Gha"
+
+#: ../rules/base.xml.in.h:267
+msgid "Ghana"
+msgstr "Ghana"
+
+#: ../rules/base.xml.in.h:268
+msgid "Gre"
+msgstr "Gre"
+
+#: ../rules/base.xml.in.h:269
+msgid "Greece"
+msgstr "Yunani"
+
+#: ../rules/base.xml.in.h:270
+msgid "Group toggle on multiply/divide key"
+msgstr "Grup toggle pada tombol perkalian/pembagian"
+
+#: ../rules/base.xml.in.h:271
+msgid "Gui"
+msgstr "Gui"
+
+#: ../rules/base.xml.in.h:272
+msgid "Guinea"
+msgstr "Guinea"
+
+#: ../rules/base.xml.in.h:273
+msgid "Gujarati"
+msgstr "Gujurati"
+
+#: ../rules/base.xml.in.h:274
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../rules/base.xml.in.h:275
+msgid "Gurmukhi Jhelum"
+msgstr "Gurmukhi Jhelum"
+
+#: ../rules/base.xml.in.h:276
+msgid "Gyration"
+msgstr "Gyration"
+
+#: ../rules/base.xml.in.h:277
+msgid "Happy Hacking Keyboard"
+msgstr "Happy Hacking Keyboard"
+
+#: ../rules/base.xml.in.h:278
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Happy Hacking Keyboard untukr Mac"
+
+#: ../rules/base.xml.in.h:279
+msgid "Hausa"
+msgstr "Hausa"
+
+#: ../rules/base.xml.in.h:280
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
+
+#: ../rules/base.xml.in.h:281
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:282
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:283
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:284
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:285
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:286
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:287
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:288
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
+
+#: ../rules/base.xml.in.h:289
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Papan Ketik Multimedia Hewlett-Packard SK-2501"
+
+#: ../rules/base.xml.in.h:290
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
+
+#: ../rules/base.xml.in.h:291
+msgid "Hexadecimal"
+msgstr "Heksadesimal"
+
+#: ../rules/base.xml.in.h:292
+msgid "Hindi Bolnagri"
+msgstr "Hindi Bolnagri"
+
+#: ../rules/base.xml.in.h:293
+msgid "Hindi Wx"
+msgstr "Hindi Wx"
+
+#: ../rules/base.xml.in.h:294
+msgid "Homophonic"
+msgstr "Hindi Bolnagri"
+
+#: ../rules/base.xml.in.h:295
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:296
+msgid "Hrv"
+msgstr "Hvr"
+
+#: ../rules/base.xml.in.h:297
+msgid "Hun"
+msgstr "Hun"
+
+#: ../rules/base.xml.in.h:298
+msgid "Hungary"
+msgstr "Hungaria"
+
+#: ../rules/base.xml.in.h:299
+msgid "Hyper is mapped to Win-keys"
+msgstr "Hiper dipetakan ke tombol Win"
+
+#: ../rules/base.xml.in.h:300
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:301
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:302
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:303
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
+
+#: ../rules/base.xml.in.h:304
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:305
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+
+#: ../rules/base.xml.in.h:306
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
+
+#: ../rules/base.xml.in.h:307
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+
+#: ../rules/base.xml.in.h:308
+msgid "ISO Alternate"
+msgstr "ISO Alternate"
+
+#: ../rules/base.xml.in.h:309
+msgid "Iceland"
+msgstr "Islandia"
+
+#: ../rules/base.xml.in.h:310
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../rules/base.xml.in.h:311
+msgid "Include dead tilde"
+msgstr "Termasuk tilde mati"
+
+#: ../rules/base.xml.in.h:312
+msgid "Ind"
+msgstr "Ind"
+
+#: ../rules/base.xml.in.h:313
+msgid "India"
+msgstr "India"
+
+#: ../rules/base.xml.in.h:314
+msgid "International (AltGr dead keys)"
+msgstr "Internasional (AltGr tombol mati)"
+
+#: ../rules/base.xml.in.h:315
+msgid "International (with dead keys)"
+msgstr "Internasional (dengan tombol mati)"
+
+#: ../rules/base.xml.in.h:316
+msgid "Inuktitut"
+msgstr "Inuktitut"
+
+#: ../rules/base.xml.in.h:317
+msgid "Iran"
+msgstr "Iran"
+
+#: ../rules/base.xml.in.h:318
+msgid "Iraq"
+msgstr "Irak"
+
+#: ../rules/base.xml.in.h:319
+msgid "Ireland"
+msgstr "Irlandia"
+
+#: ../rules/base.xml.in.h:320
+msgid "Irl"
+msgstr "Irl"
+
+#: ../rules/base.xml.in.h:321
+msgid "Irn"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:322
+msgid "Irq"
+msgstr "Irq"
+
+#: ../rules/base.xml.in.h:323
+msgid "Isl"
+msgstr "Isl"
+
+#: ../rules/base.xml.in.h:324
+msgid "Isr"
+msgstr "Isr"
+
+#: ../rules/base.xml.in.h:325
+msgid "Israel"
+msgstr "Israel"
+
+#: ../rules/base.xml.in.h:326
+msgid "Ita"
+msgstr "Ita"
+
+#: ../rules/base.xml.in.h:327
+msgid "Italy"
+msgstr "Italia"
+
+#: ../rules/base.xml.in.h:328
+msgid "Japan"
+msgstr "Jepang"
+
+#: ../rules/base.xml.in.h:329
+msgid "Japan (PC-98xx Series)"
+msgstr "Japan (PC-98xx Series)"
+
+#: ../rules/base.xml.in.h:330
+msgid "Japanese keyboard options"
+msgstr "Pilihan Keyboard Jepang"
+
+#: ../rules/base.xml.in.h:331
+msgid "Jpn"
+msgstr "Jpn"
+
+#: ../rules/base.xml.in.h:332
+msgid "Kalmyk"
+msgstr "Kalmyk"
+
+#: ../rules/base.xml.in.h:333
+msgid "Kana"
+msgstr "Kana"
+
+#: ../rules/base.xml.in.h:334
+msgid "Kana Lock key is locking"
+msgstr "Tombol Kana Lock terkunci"
+
+#: ../rules/base.xml.in.h:335
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../rules/base.xml.in.h:336
+msgid "Kashubian"
+msgstr "Kashubian"
+
+#: ../rules/base.xml.in.h:337
+msgid "Kaz"
+msgstr "Kaz"
+
+#: ../rules/base.xml.in.h:338
+msgid "Kazakh with Russian"
+msgstr "Kazakh dengan Rusia"
+
+#: ../rules/base.xml.in.h:339
+msgid "Kazakhstan"
+msgstr "Kazakhstan"
+
+#: ../rules/base.xml.in.h:340
+msgid "Key sequence to kill the X server"
+msgstr "Sekuensi kunci untuk mematikan server X"
+
+#: ../rules/base.xml.in.h:341
+msgid "Key to choose 3rd level"
+msgstr "Tekan Menu Kiri untuk memilih tingkat 3"
+
+#: ../rules/base.xml.in.h:342
+msgid "Key(s) to change layout"
+msgstr "Tombol untuk mengubah tata letak"
+
+#: ../rules/base.xml.in.h:343
+msgid "Keypad"
+msgstr "Keypad"
+
+#: ../rules/base.xml.in.h:344
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:345
+msgid "Kgz"
+msgstr "Kgz"
+
+#: ../rules/base.xml.in.h:346
+msgid "Khm"
+msgstr "Khm"
+
+#: ../rules/base.xml.in.h:347
+msgid "Komi"
+msgstr "Komi"
+
+#: ../rules/base.xml.in.h:348
+msgid "Kor"
+msgstr "Kor"
+
+#: ../rules/base.xml.in.h:349
+msgid "Korea, Republic of"
+msgstr "Republik Korea"
+
+#: ../rules/base.xml.in.h:350
+msgid "Ktunaxa"
+msgstr "Ktunaxa"
+
+#: ../rules/base.xml.in.h:351
+msgid "Kurdish, (F)"
+msgstr "Kurdish, (F)"
+
+#: ../rules/base.xml.in.h:352
+msgid "Kurdish, Arabic-Latin"
+msgstr "Kurdish, Arabic-Latin"
+
+#: ../rules/base.xml.in.h:353
+msgid "Kurdish, Latin Alt-Q"
+msgstr "Kurdish, Latin Alt-Q"
+
+#: ../rules/base.xml.in.h:354
+msgid "Kurdish, Latin Q"
+msgstr "Kurdish, Latin Q"
+
+#: ../rules/base.xml.in.h:355
+msgid "Kyrgyzstan"
+msgstr "Kyrgyzstan"
+
+#: ../rules/base.xml.in.h:356
+msgid "LAm"
+msgstr "LAm"
+
+#: ../rules/base.xml.in.h:357
+msgid "LEKP"
+msgstr "LEKP"
+
+#: ../rules/base.xml.in.h:358
+msgid "LEKPa"
+msgstr "LEKPa"
+
+#: ../rules/base.xml.in.h:359
+msgid "Lao"
+msgstr "Lao"
+
+#: ../rules/base.xml.in.h:360
+msgid "Laos"
+msgstr "Laos"
+
+#: ../rules/base.xml.in.h:361
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+
+#: ../rules/base.xml.in.h:362
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+
+#: ../rules/base.xml.in.h:363
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Laptop/notebook eMachines m68xx"
+
+#: ../rules/base.xml.in.h:364
+msgid "Latin"
+msgstr "Latin"
+
+#: ../rules/base.xml.in.h:365
+msgid "Latin American"
+msgstr "Latin Amerika"
+
+#: ../rules/base.xml.in.h:366
+msgid "Latin Unicode"
+msgstr "Latin Unicode"
+
+#: ../rules/base.xml.in.h:367
+msgid "Latin Unicode qwerty"
+msgstr "Latin Unicode qwerty"
+
+#: ../rules/base.xml.in.h:368
+msgid "Latin qwerty"
+msgstr "Latin qwerty"
+
+#: ../rules/base.xml.in.h:369
+msgid "Latin unicode"
+msgstr "Latin unicode"
+
+#: ../rules/base.xml.in.h:370
+msgid "Latin unicode qwerty"
+msgstr "Latin unicode qwerty"
+
+#: ../rules/base.xml.in.h:371
+msgid "Latin with guillemets"
+msgstr "Latin dengan guillemets"
+
+#: ../rules/base.xml.in.h:372
+msgid "Latvia"
+msgstr "Latvia"
+
+#: ../rules/base.xml.in.h:373
+msgid "Lav"
+msgstr "Lav"
+
+#: ../rules/base.xml.in.h:374
+msgid "Left Alt"
+msgstr "Alt Kiri"
+
+#: ../rules/base.xml.in.h:375
+msgid "Left Alt (while pressed)"
+msgstr "Alt Kiri (ketika ditekan)"
+
+#: ../rules/base.xml.in.h:376
+msgid "Left Alt is swapped with Left Win"
+msgstr "Alt Kiri ditukar dengan Win Kiri"
+
+#: ../rules/base.xml.in.h:377
+msgid "Left Ctrl"
+msgstr "Ctrl Kiri"
+
+#: ../rules/base.xml.in.h:378
+msgid "Left Ctrl+Left Shift"
+msgstr "Ctrl Kiri+Shift Kiri"
+
+#: ../rules/base.xml.in.h:379
+msgid "Left Shift"
+msgstr "Shift Kiri"
+
+#: ../rules/base.xml.in.h:380
+msgid "Left Win"
+msgstr "Win Kiri"
+
+#: ../rules/base.xml.in.h:381
+msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgstr "Win Kiri (ke tata letak pertama), Win/Menu Kanan (ke tata letak terakhir)"
+
+#: ../rules/base.xml.in.h:382
+msgid "Left Win (while pressed)"
+msgstr "Win Kiri (ketika ditekan)"
+
+#: ../rules/base.xml.in.h:383
+msgid "Left hand"
+msgstr "Kidal"
+
+#: ../rules/base.xml.in.h:384
+msgid "Left handed Dvorak"
+msgstr "Left handed Dvorak"
+
+#: ../rules/base.xml.in.h:385
+msgid "Legacy"
+msgstr "Legacy"
+
+#: ../rules/base.xml.in.h:386
+msgid "Legacy Wang 724"
+msgstr "Legacy Wang 724"
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:388
+msgid "Legacy key with comma"
+msgstr "Tombol Legacy dengan koma"
+
+#: ../rules/base.xml.in.h:389
+msgid "Legacy key with dot"
+msgstr "Tombol Legacy dengan titik"
+
+#: ../rules/base.xml.in.h:390
+msgid "Less-than/Greater-than"
+msgstr "Lebih-kecil/Lebih-besar"
+
+#: ../rules/base.xml.in.h:391
+msgid "Lithuania"
+msgstr "Lithuania"
+
+#: ../rules/base.xml.in.h:392
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
+
+#: ../rules/base.xml.in.h:393
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:394
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (pilihan alternatif)"
+
+#: ../rules/base.xml.in.h:395
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
+
+#: ../rules/base.xml.in.h:396
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:397
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:398
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:399
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgstr "Logitech Cordless Desktop Pro (opsi alternatif 2)"
+
+#: ../rules/base.xml.in.h:400
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:401
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:402
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15 extra keys via G15daemon"
+
+#: ../rules/base.xml.in.h:403
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech Generic Keyboard"
+
+#: ../rules/base.xml.in.h:404
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech Internet 350 Keyboard"
+
+#: ../rules/base.xml.in.h:405
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:406
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: ../rules/base.xml.in.h:407
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Media Elite Keyboard"
+
+#: ../rules/base.xml.in.h:408
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:409
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
+
+#: ../rules/base.xml.in.h:410
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge Keyboard"
+
+#: ../rules/base.xml.in.h:411
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Keyboard"
+
+#: ../rules/base.xml.in.h:412
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:413
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+
+#: ../rules/base.xml.in.h:414
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
+
+#: ../rules/base.xml.in.h:415
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+
+#: ../rules/base.xml.in.h:416
+msgid "Lower Sorbian"
+msgstr "Lower Sorbian"
+
+#: ../rules/base.xml.in.h:417
+msgid "Lower Sorbian (qwertz)"
+msgstr "Lower Sorbian (qwertz)"
+
+#: ../rules/base.xml.in.h:418
+msgid "Ltu"
+msgstr "Ltu"
+
+#: ../rules/base.xml.in.h:419
+msgid "MESS"
+msgstr "MESS"
+
+#: ../rules/base.xml.in.h:420
+msgid "MNE"
+msgstr "MNE"
+
+#: ../rules/base.xml.in.h:421
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
+
+#: ../rules/base.xml.in.h:422
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (Intl)"
+
+#: ../rules/base.xml.in.h:423
+msgid "Macedonia"
+msgstr "Masedonia"
+
+#: ../rules/base.xml.in.h:424
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:425
+msgid "Macintosh Old"
+msgstr "Macintosh Old"
+
+#: ../rules/base.xml.in.h:426
+msgid "Macintosh, Sun dead keys"
+msgstr "Machintosh, tombol mati Matahari"
+
+#: ../rules/base.xml.in.h:427
+msgid "Macintosh, eliminate dead keys"
+msgstr "Machintosh, hapus tombol mati"
+
+#: ../rules/base.xml.in.h:428
+msgid "Make CapsLock an additional Backspace"
+msgstr "Buat CapsLock sebagai tambahan Backspace"
+
+#: ../rules/base.xml.in.h:429
+msgid "Make CapsLock an additional Ctrl"
+msgstr "Buat CapsLock sebagai tambahan Ctrl"
+
+#: ../rules/base.xml.in.h:430
+msgid "Make CapsLock an additional ESC"
+msgstr "Buat CapsLock sebagai tambahan ESC"
+
+#: ../rules/base.xml.in.h:431
+msgid "Mal"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:432
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../rules/base.xml.in.h:433
+msgid "Malayalam Lalitha"
+msgstr "Malayalam Lalitha"
+
+#: ../rules/base.xml.in.h:434
+msgid "Maldives"
+msgstr "Maldives"
+
+#: ../rules/base.xml.in.h:435
+msgid "Malta"
+msgstr "Malta"
+
+#: ../rules/base.xml.in.h:436
+msgid "Maltese keyboard with US layout"
+msgstr "Keyboard Maltase dengan Layout US"
+
+#: ../rules/base.xml.in.h:437
+msgid "Mao"
+msgstr "Mao"
+
+#: ../rules/base.xml.in.h:438
+msgid "Maori"
+msgstr "Maori"
+
+#: ../rules/base.xml.in.h:439
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:440
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
+
+#: ../rules/base.xml.in.h:441
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:442
+msgid "Menu"
+msgstr "Menu"
+
+#: ../rules/base.xml.in.h:443
+msgid "Meta is mapped to Left Win"
+msgstr "Meta dipetakan ke tombol Win Kiri"
+
+#: ../rules/base.xml.in.h:444
+msgid "Meta is mapped to Win keys"
+msgstr "Meta dipetakan ke tombol Win"
+
+#: ../rules/base.xml.in.h:445
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Comfort Curve Keyboard 2000"
+
+#: ../rules/base.xml.in.h:446
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
+
+#: ../rules/base.xml.in.h:447
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, Swedia"
+
+#: ../rules/base.xml.in.h:448
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:449
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural Keyboard Elite"
+
+#: ../rules/base.xml.in.h:450
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:451
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: ../rules/base.xml.in.h:452
+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:453
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+
+#: ../rules/base.xml.in.h:454
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
+
+#: ../rules/base.xml.in.h:455
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+
+#: ../rules/base.xml.in.h:456
+msgid "Miscellaneous compatibility options"
+msgstr "Pilihan kompabilitas lain-lain"
+
+#: ../rules/base.xml.in.h:457
+msgid "Mkd"
+msgstr "Mkd"
+
+#: ../rules/base.xml.in.h:458
+msgid "Mlt"
+msgstr "Mlt"
+
+#: ../rules/base.xml.in.h:459
+msgid "Mmr"
+msgstr "Mmr"
+
+#: ../rules/base.xml.in.h:460
+msgid "Mng"
+msgstr "Mng"
+
+#: ../rules/base.xml.in.h:461
+msgid "Mongolia"
+msgstr "Mongolia"
+
+#: ../rules/base.xml.in.h:462
+msgid "Montenegro"
+msgstr "Montenegro"
+
+#: ../rules/base.xml.in.h:463
+msgid "Morocco"
+msgstr "Maroko"
+
+#: ../rules/base.xml.in.h:464
+msgid "Multilingual"
+msgstr "Multilingual"
+
+#: ../rules/base.xml.in.h:465
+msgid "Multilingual, first part"
+msgstr "Multilingual, bagian pertama"
+
+#: ../rules/base.xml.in.h:466
+msgid "Multilingual, second part"
+msgstr "Multilingual, bagian kedua"
+
+#: ../rules/base.xml.in.h:467
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#: ../rules/base.xml.in.h:468
+msgid "NICOLA-F style Backspace"
+msgstr "NICOLA-F style Backspace"
+
+#: ../rules/base.xml.in.h:469
+msgid "NLA"
+msgstr "NLA"
+
+#: ../rules/base.xml.in.h:470
+msgid "Nativo"
+msgstr "Nativo"
+
+#: ../rules/base.xml.in.h:471
+msgid "Nativo for Esperanto"
+msgstr "Nativo untuk Esperanto"
+
+#: ../rules/base.xml.in.h:472
+msgid "Nativo for USA keyboards"
+msgstr "Nativo untuk papan ketik USA"
+
+#: ../rules/base.xml.in.h:473
+msgid "Neo 2"
+msgstr "Neo 2"
+
+#: ../rules/base.xml.in.h:474
+msgid "Nep"
+msgstr "Nep"
+
+#: ../rules/base.xml.in.h:475
+msgid "Nepal"
+msgstr "Nepal"
+
+#: ../rules/base.xml.in.h:476
+msgid "Netherlands"
+msgstr "Belanda"
+
+#: ../rules/base.xml.in.h:477
+msgid "Nig"
+msgstr "Nig"
+
+#: ../rules/base.xml.in.h:478
+msgid "Nigeria"
+msgstr "Negeria"
+
+#: ../rules/base.xml.in.h:479
+msgid "Nld"
+msgstr "Nld"
+
+#: ../rules/base.xml.in.h:480
+msgid "Non-breakable space character at fourth level"
+msgstr "Karakter spasi yang tidak pecah pada tingkat 4"
+
+#: ../rules/base.xml.in.h:481
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Karakter spasi yang tidak pecah pada tingkat 4, karakter spasi yang tidak pecah dan tipis pada tingkat 6"
+
+#: ../rules/base.xml.in.h:482
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
+msgstr "Karakter spasi yang tidak pecah pada tingkat 4, karakter spasi yang tidak pecah dan tipis pada tingkat 6 (via Ctrl+Shift)"
+
+#: ../rules/base.xml.in.h:483
+msgid "Non-breakable space character at second level"
+msgstr "Karakter spasi yang tidak pecah pada tingkat 2"
+
+#: ../rules/base.xml.in.h:484
+msgid "Non-breakable space character at third level"
+msgstr "Karakter spasi yang tidak pecah pada tingkat 3"
+
+#: ../rules/base.xml.in.h:485
+msgid "Non-breakable space character at third level, nothing at fourth level"
+msgstr "Karakter spasi yang tidak pecah pada tingkat 3, tidak ada pada tingkat 4"
+
+#: ../rules/base.xml.in.h:486
+msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Karakter spasi yang tidak pecah pada tingkat 3, karakter spasi yang tidak pecah dan tipis pada tingkat 4"
+
+#: ../rules/base.xml.in.h:487
+msgid "Nor"
+msgstr "Nor"
+
+#: ../rules/base.xml.in.h:488
+msgid "Northern Saami"
+msgstr "Northern Saami"
+
+#: ../rules/base.xml.in.h:489
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Northern Saami, hapus tombo mati"
+
+#: ../rules/base.xml.in.h:490
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:491
+msgid "Norway"
+msgstr "Norwegia"
+
+#: ../rules/base.xml.in.h:492
+msgid "NumLock"
+msgstr "NumLock"
+
+#: ../rules/base.xml.in.h:493
+msgid "Numeric keypad delete key behaviour"
+msgstr "Keypad numerik menghapus perilaku tombol"
+
+#: ../rules/base.xml.in.h:494
+msgid "Numeric keypad keys work as with Mac"
+msgstr "Keypad numerik bekerja seperti dengan Mac"
+
+#: ../rules/base.xml.in.h:495
+msgid "Numeric keypad layout selection"
+msgstr "Pilihan layout Keypad numerik "
+
+#: ../rules/base.xml.in.h:496
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:497
+msgid "OLPC"
+msgstr "OLPC"
+
+#: ../rules/base.xml.in.h:498
+msgid "OLPC Dari"
+msgstr "OLPC Dari"
+
+#: ../rules/base.xml.in.h:499
+msgid "OLPC Pashto"
+msgstr "OLPC Pashto"
+
+#: ../rules/base.xml.in.h:500
+msgid "OLPC Southern Uzbek"
+msgstr "OLPC Southern Uzbek"
+
+#: ../rules/base.xml.in.h:501
+msgid "Occitan"
+msgstr "Occitan"
+
+#: ../rules/base.xml.in.h:502
+msgid "Ogham"
+msgstr "Ogham"
+
+#: ../rules/base.xml.in.h:503
+msgid "Ogham IS434"
+msgstr "Ogham IS434"
+
+#: ../rules/base.xml.in.h:504
+msgid "Oriya"
+msgstr "Oriya"
+
+#: ../rules/base.xml.in.h:505
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/Internet keyboard"
+
+#: ../rules/base.xml.in.h:506
+msgid "Ossetian"
+msgstr "Ossetian"
+
+#: ../rules/base.xml.in.h:507
+msgid "Ossetian, Winkeys"
+msgstr "Ossetian, Tombol Win"
+
+#: ../rules/base.xml.in.h:508
+msgid "Ossetian, legacy"
+msgstr "Ossetian, legacy"
+
+#: ../rules/base.xml.in.h:509
+msgid "PC-98xx Series"
+msgstr "PC-98xx Series"
+
+#: ../rules/base.xml.in.h:510
+msgid "Pak"
+msgstr "Pak"
+
+#: ../rules/base.xml.in.h:511
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: ../rules/base.xml.in.h:512
+msgid "Pashto"
+msgstr "Pashto"
+
+#: ../rules/base.xml.in.h:513
+msgid "Pattachote"
+msgstr "Pattachote"
+
+#: ../rules/base.xml.in.h:514
+msgid "Phonetic"
+msgstr "Phonetic"
+
+#: ../rules/base.xml.in.h:515
+msgid "Phonetic Winkeys"
+msgstr "Phonetic Winkeys"
+
+#: ../rules/base.xml.in.h:516
+msgid "Pol"
+msgstr "Pol"
+
+#: ../rules/base.xml.in.h:517
+msgid "Poland"
+msgstr "Polandia"
+
+#: ../rules/base.xml.in.h:518
+msgid "Polytonic"
+msgstr "Polytonic"
+
+#: ../rules/base.xml.in.h:519
+msgid "Portugal"
+msgstr "Portugal"
+
+#: ../rules/base.xml.in.h:520
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:521
+msgid "Pro Keypad"
+msgstr "Pro Keypad"
+
+#: ../rules/base.xml.in.h:522
+msgid "Probhat"
+msgstr "Probhat"
+
+#: ../rules/base.xml.in.h:523
+msgid "Programmer Dvorak"
+msgstr "Programmer Dvorak"
+
+#: ../rules/base.xml.in.h:524
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:525
+msgid "Prt"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:526
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:527
+msgid "Right Alt"
+msgstr "Alt Kanan"
+
+#: ../rules/base.xml.in.h:528
+msgid "Right Alt (while pressed)"
+msgstr "Alt Kanan (ketika ditekan)"
+
+#: ../rules/base.xml.in.h:529
+msgid "Right Alt key never chooses 3rd level"
+msgstr "Alt Kanan tidak pernah memilih tingkat 3"
+
+#: ../rules/base.xml.in.h:530
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr "Alt Kanan, Shift+Right Alt adalah Multi_Key"
+
+#: ../rules/base.xml.in.h:531
+msgid "Right Ctrl"
+msgstr "Ctrl Kanan"
+
+#: ../rules/base.xml.in.h:532
+msgid "Right Ctrl (while pressed)"
+msgstr "Ctrl Kanan (ketika ditekan)"
+
+#: ../rules/base.xml.in.h:533
+msgid "Right Ctrl as Right Alt"
+msgstr "Ctrl Kanan bertindak seperti Alt Kanan"
+
+#: ../rules/base.xml.in.h:534
+msgid "Right Shift"
+msgstr "Shift Kanan"
+
+#: ../rules/base.xml.in.h:535
+msgid "Right Win"
+msgstr "Win Kanan"
+
+#: ../rules/base.xml.in.h:536
+msgid "Right Win (while pressed)"
+msgstr "Win Kanan (ketika ditekan)"
+
+#: ../rules/base.xml.in.h:537
+msgid "Right hand"
+msgstr "Tangan Kanan"
+
+#: ../rules/base.xml.in.h:538
+msgid "Right handed Dvorak"
+msgstr "Right handed Dvorak"
+
+#: ../rules/base.xml.in.h:539
+msgid "Romania"
+msgstr "Rumania"
+
+#: ../rules/base.xml.in.h:540
+msgid "Romanian keyboard with German letters"
+msgstr "Keyboard Rumania dengan huruf Jerman"
+
+#: ../rules/base.xml.in.h:541
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Keyboard Rumania dengan huruf Jerman, hapus tombol mati"
+
+#: ../rules/base.xml.in.h:542
+msgid "Rou"
+msgstr "Rou"
+
+#: ../rules/base.xml.in.h:543
+msgid "Rus"
+msgstr "Rus"
+
+#: ../rules/base.xml.in.h:544
+msgid "Russia"
+msgstr "Rusia"
+
+#: ../rules/base.xml.in.h:545
+msgid "Russian"
+msgstr "Rusia"
+
+#: ../rules/base.xml.in.h:546
+msgid "Russian phonetic"
+msgstr "Russian phonetic"
+
+#: ../rules/base.xml.in.h:547
+msgid "Russian phonetic Dvorak"
+msgstr "Russian phonetic Dvorak"
+
+#: ../rules/base.xml.in.h:548
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Russian phonetic, hapus tombol mati"
+
+#: ../rules/base.xml.in.h:549
+msgid "Russian with Kazakh"
+msgstr "Rusia dengan Kazakh"
+
+#: ../rules/base.xml.in.h:550
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
+
+#: ../rules/base.xml.in.h:551
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:552
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:553
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:554
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:555
+msgid "SRB"
+msgstr "SRB"
+
+#: ../rules/base.xml.in.h:556
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:557
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
+
+#: ../rules/base.xml.in.h:558
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:559
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:560
+msgid "Scroll Lock"
+msgstr "Scroll Lock"
+
+#: ../rules/base.xml.in.h:561
+msgid "ScrollLock"
+msgstr "ScrollLock"
+
+#: ../rules/base.xml.in.h:562
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+#: ../rules/base.xml.in.h:563
+msgid "Semi-colon on third level"
+msgstr "Semi-kolon pada level ketiga"
+
+#: ../rules/base.xml.in.h:564
+msgid "Serbia"
+msgstr "Serbia"
+
+#: ../rules/base.xml.in.h:565
+msgid "Shift cancels CapsLock"
+msgstr "Shift membatalkan CapsLock"
+
+#: ../rules/base.xml.in.h:566
+msgid "Shift does not cancel NumLock, chooses 3d level instead"
+msgstr "Shift tidak membatalkan NumLock, lebih memilih level ketiga"
+
+#: ../rules/base.xml.in.h:567
+msgid "Shift with numeric keypad keys works as in MS Windows"
+msgstr "Shit dengan keypad numerik bekerja sesuai pada MS Windows"
+
+#: ../rules/base.xml.in.h:568
+msgid "Shift+CapsLock"
+msgstr "Shift+CapsLock"
+
+#: ../rules/base.xml.in.h:569
+msgid "Simple"
+msgstr "Sederhana"
+
+#: ../rules/base.xml.in.h:570
+msgid "Slovakia"
+msgstr "Slovakia"
+
+#: ../rules/base.xml.in.h:571
+msgid "Slovenia"
+msgstr "Slovenia"
+
+#: ../rules/base.xml.in.h:572
+msgid "South Africa"
+msgstr "Afrika Selatan"
+
+#: ../rules/base.xml.in.h:573
+msgid "Southern Uzbek"
+msgstr "Uzbek Selatan"
+
+#: ../rules/base.xml.in.h:574
+msgid "Spain"
+msgstr "Spanyol"
+
+#: ../rules/base.xml.in.h:575
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
+msgstr "Tombol spesial (Ctrl+Alt+&lt;key&gt;) ditangani pada server"
+
+#: ../rules/base.xml.in.h:576
+msgid "SrL"
+msgstr "Srl"
+
+#: ../rules/base.xml.in.h:577
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#: ../rules/base.xml.in.h:578
+msgid "Standard"
+msgstr "Standard"
+
+#: ../rules/base.xml.in.h:579
+msgid "Standard (Cedilla)"
+msgstr "Standard (Cedilla)"
+
+#: ../rules/base.xml.in.h:580
+msgid "Standard Phonetic"
+msgstr "Fonetik Standar"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:582
+msgid "Standard RSTU"
+msgstr "Standard RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:584
+msgid "Standard RSTU on Russian layout"
+msgstr "Standard RSTU pada layout Rusia"
+
+#: ../rules/base.xml.in.h:585
+msgid "Sun Type 5/6"
+msgstr "Sun Type 5/6"
+
+#: ../rules/base.xml.in.h:586
+msgid "Sun dead keys"
+msgstr "Tombol mati Matahari"
+
+#: ../rules/base.xml.in.h:587
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:588
+msgid "Svdvorak"
+msgstr "Svdvorak"
+
+#: ../rules/base.xml.in.h:589
+msgid "Svk"
+msgstr "Svk"
+
+#: ../rules/base.xml.in.h:590
+msgid "Svn"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:591
+msgid "Swap Ctrl and CapsLock"
+msgstr "Tukar Ctrl dan CapsLock"
+
+#: ../rules/base.xml.in.h:592
+msgid "Swap ESC and CapsLock"
+msgstr "Tujar ESC dan CapsLock"
+
+#: ../rules/base.xml.in.h:593
+msgid "Swe"
+msgstr "Swe"
+
+#: ../rules/base.xml.in.h:594
+msgid "Sweden"
+msgstr "Swedia"
+
+#: ../rules/base.xml.in.h:595
+msgid "Switzerland"
+msgstr "Switzerland"
+
+#: ../rules/base.xml.in.h:596
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
+
+#: ../rules/base.xml.in.h:597
+msgid "Syr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:598
+msgid "Syria"
+msgstr "Syria"
+
+#: ../rules/base.xml.in.h:599
+msgid "Syriac"
+msgstr "Syriac"
+
+#: ../rules/base.xml.in.h:600
+msgid "Syriac phonetic"
+msgstr "Syriac phonetic"
+
+#: ../rules/base.xml.in.h:601
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:602
+msgid "Tajikistan"
+msgstr "Tajikistan"
+
+#: ../rules/base.xml.in.h:603
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../rules/base.xml.in.h:604
+msgid "Tamil TAB Typewriter"
+msgstr "Tamil TAB Typewriter"
+
+#: ../rules/base.xml.in.h:605
+msgid "Tamil TSCII Typewriter"
+msgstr "Tamil TSCII Typewriter"
+
+#: ../rules/base.xml.in.h:606
+msgid "Tamil Unicode"
+msgstr "Tamil Unicode"
+
+#: ../rules/base.xml.in.h:607
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
+
+#: ../rules/base.xml.in.h:608
+msgid "Tatar"
+msgstr "Tatar"
+
+#: ../rules/base.xml.in.h:609
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../rules/base.xml.in.h:610
+msgid "Tha"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:611
+msgid "Thailand"
+msgstr "Thailand"
+
+#: ../rules/base.xml.in.h:612
+msgid "Tibetan"
+msgstr "Tibetan"
+
+#: ../rules/base.xml.in.h:613
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibetan (with ASCII numerals)"
+
+#: ../rules/base.xml.in.h:614
+msgid "Tifinagh"
+msgstr "Tifinagh"
+
+#: ../rules/base.xml.in.h:615
+msgid "Tifinagh Alternative"
+msgstr "Tifinagh Alternative"
+
+#: ../rules/base.xml.in.h:616
+msgid "Tifinagh Alternative Phonetic"
+msgstr "Tifinagh Alternative Phonetic"
+
+#: ../rules/base.xml.in.h:617
+msgid "Tifinagh Extended"
+msgstr "Tifinagh Extended"
+
+#: ../rules/base.xml.in.h:618
+msgid "Tifinagh Extended Phonetic"
+msgstr "Tifinagh Alternative Phonetic"
+
+#: ../rules/base.xml.in.h:619
+msgid "Tifinagh Phonetic"
+msgstr "Tifinagh Phonetic"
+
+#: ../rules/base.xml.in.h:620
+msgid "Tilde (~) variant"
+msgstr "Varian tilde (~)"
+
+#: ../rules/base.xml.in.h:621
+msgid "Tjk"
+msgstr "Tjk"
+
+#: ../rules/base.xml.in.h:622
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr "Ke tombol dalam papan ketik Dvorak."
+
+#: ../rules/base.xml.in.h:623
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr "Ke tombol dalam papan ketik Qwerty."
+
+#: ../rules/base.xml.in.h:624
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:625
+msgid "Traditional Phonetic"
+msgstr "Fonetik Tradisional"
+
+#: ../rules/base.xml.in.h:626
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: ../rules/base.xml.in.h:627
+msgid "Trust Slimline"
+msgstr "Trust Slimline"
+
+#: ../rules/base.xml.in.h:628
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: ../rules/base.xml.in.h:629
+msgid "Tur"
+msgstr "Tur"
+
+#: ../rules/base.xml.in.h:630
+msgid "Turkey"
+msgstr "Turki"
+
+#: ../rules/base.xml.in.h:631
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+#: ../rules/base.xml.in.h:632
+msgid "Typewriter"
+msgstr "Typewriter"
+
+#: ../rules/base.xml.in.h:633
+msgid "UCW layout (accented letters only)"
+msgstr "UCW layout (accented letters only)"
+
+#: ../rules/base.xml.in.h:634
+msgid "US keyboard with Bosnian digraphs"
+msgstr "Keyboard Amerika dengan Bosnia digraphs"
+
+#: ../rules/base.xml.in.h:635
+msgid "US keyboard with Bosnian letters"
+msgstr "Keyboard Amerika dengan huruf Bosnia"
+
+#: ../rules/base.xml.in.h:636
+msgid "US keyboard with Croatian digraphs"
+msgstr "Keyboard Amerika dengan Kroasia digraphs"
+
+#: ../rules/base.xml.in.h:637
+msgid "US keyboard with Croatian letters"
+msgstr "Keyboard Amerika dengan huruf Kroasia"
+
+#: ../rules/base.xml.in.h:638
+msgid "US keyboard with Estonian letters"
+msgstr "Keyboard Amerika dengan huruf Estonia"
+
+#: ../rules/base.xml.in.h:639
+msgid "US keyboard with Lithuanian letters"
+msgstr "Keyboard Amerika dengan huruf Lituania"
+
+#: ../rules/base.xml.in.h:640
+msgid "US keyboard with Slovenian letters"
+msgstr "Keyboard Amerika dengan huruf Slovenia"
+
+#: ../rules/base.xml.in.h:641
+msgid "USA"
+msgstr "USA"
+
+#: ../rules/base.xml.in.h:642
+msgid "Udmurt"
+msgstr "Udmurt"
+
+#: ../rules/base.xml.in.h:643
+msgid "Ukr"
+msgstr "Ukr"
+
+#: ../rules/base.xml.in.h:644
+msgid "Ukraine"
+msgstr "Ukraina"
+
+#: ../rules/base.xml.in.h:645
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Tambahan unicode (panah dan operator matematika)"
+
+#: ../rules/base.xml.in.h:646
+msgid "Unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Tambahan unicode (panah dan operator matematika). Operator matematika pada tingkat standar"
+
+#: ../rules/base.xml.in.h:647
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:648
+msgid "United Kingdom"
+msgstr "Inggris Raya"
+
+#: ../rules/base.xml.in.h:649
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
+
+#: ../rules/base.xml.in.h:650
+msgid "Urdu, Alternative phonetic"
+msgstr "Urdu, Fonetik alternatif"
+
+#: ../rules/base.xml.in.h:651
+msgid "Urdu, Phonetic"
+msgstr "Urdu, Fonetik"
+
+#: ../rules/base.xml.in.h:652
+msgid "Urdu, Winkeys"
+msgstr "Urdu, Tombol Win"
+
+#: ../rules/base.xml.in.h:653
+msgid "Use Bosnian digraphs"
+msgstr "Gunakan diagraph Bosnia"
+
+#: ../rules/base.xml.in.h:654
+msgid "Use Croatian digraphs"
+msgstr "Gunakan diagraph Kroasia"
+
+#: ../rules/base.xml.in.h:655
+msgid "Use guillemets for quotes"
+msgstr "Gunakan guillemets untuk tanda petik"
+
+#: ../rules/base.xml.in.h:656
+msgid "Use keyboard LED to show alternative layout"
+msgstr "Gunakan keyboard LED untuk menunjukkan layout alternatif"
+
+#: ../rules/base.xml.in.h:657
+msgid "Using space key to input non-breakable space character"
+msgstr "Menggunakan spasi untuk input karakter spasi yang tidak pecah"
+
+#: ../rules/base.xml.in.h:658
+msgid "Usual space at any level"
+msgstr "Tombol spasi biasa pada semua tingkat"
+
+#: ../rules/base.xml.in.h:659
+msgid "Uzb"
+msgstr "Uzb"
+
+#: ../rules/base.xml.in.h:660
+msgid "Uzbekistan"
+msgstr "Uzbekistan"
+
+#: ../rules/base.xml.in.h:661
+msgid "Vietnam"
+msgstr "Vietnam"
+
+#: ../rules/base.xml.in.h:662
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "ViewSonic KU-306 Internet Keyboard"
+
+#: ../rules/base.xml.in.h:663
+msgid "Vnm"
+msgstr "Vnm"
+
+#: ../rules/base.xml.in.h:664
+msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgstr "Wang 724 keypad dengan tambahan unicode (panah and operator matematika). "
+
+#: ../rules/base.xml.in.h:665
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Wang 724 keypad dengan tambahan unicode (panah and operator matematika). Operator matematika pada tingkat standar"
+
+#: ../rules/base.xml.in.h:666
+msgid "Wang model 724 azerty"
+msgstr "Wang model 724 azerty"
+
+#: ../rules/base.xml.in.h:667
+msgid "Western"
+msgstr "Western"
+
+#: ../rules/base.xml.in.h:668
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:669
+msgid "Winkeys"
+msgstr "Tombol Win"
+
+#: ../rules/base.xml.in.h:670
+msgid "With &lt;\\|&gt; key"
+msgstr "Dengan &lt;\\|&gt; key;tombol"
+
+#: ../rules/base.xml.in.h:671
+msgid "With EuroSign on 5"
+msgstr "Dengan tanda Euro pada 5"
+
+#: ../rules/base.xml.in.h:672
+msgid "With guillemets"
+msgstr "Dengan guillemets"
+
+#: ../rules/base.xml.in.h:673
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
+
+#: ../rules/base.xml.in.h:674
+msgid "Yakut"
+msgstr "Yakut"
+
+#: ../rules/base.xml.in.h:675
+msgid "Yoruba"
+msgstr "Yoruba"
+
+#: ../rules/base.xml.in.h:676
+msgid "Z and ZHE swapped"
+msgstr "menukar Z dan ZHE "
+
+#: ../rules/base.xml.in.h:677
+msgid "Zar"
+msgstr "Zar"
+
+#: ../rules/base.xml.in.h:678
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:679
+msgid "azerty/digits"
+msgstr "azerty/angka"
+
+#: ../rules/base.xml.in.h:680
+msgid "digits"
+msgstr "digit"
+
+#: ../rules/base.xml.in.h:681
+msgid "displaced semicolon and quote (obsolete)"
+msgstr "ganti titik koma dan tanda kutip (kuno)"
+
+#: ../rules/base.xml.in.h:682
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:683
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:684
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, ditambah Backslash"
+
+#: ../rules/base.xml.in.h:685
+msgid "qwerty/digits"
+msgstr "qwertz/angka"
+
+#: ../rules/base.xml.in.h:686
+msgid "qwertz"
+msgstr "qwertz"
+
+#~ msgid "Brazilian ABNT2"
+#~ msgstr "Brazilian ABNT2"
+
+#~ msgid "Japanese 106-key"
+#~ msgstr "Japanese 106-key"
+
+#~ msgid "Kir"
+#~ msgstr "Kir"
+
+#~ msgid "Korean 106-key"
+#~ msgstr "Korean 106-key"
+
+#~ msgid "Super is mapped to Win keys"
+#~ msgstr "Super dipetakan ke tombol Win"
+
+#~ msgid "US keyboard with Slovenian digraphs"
+#~ msgstr "Keyboard Amerika dengan Slovenia digraph"
+
+#~ msgid "Unicode"
+#~ msgstr "Unicode"
+
+#~ msgid "Use Slovenian digraphs"
+#~ msgstr "Gunakan diagraph Slovenia "
+
+#~ msgid "Add the EuroSign to the 2 key."
+#~ msgstr "Tambah tanda Euro ke tombol 2"
+
+#~ msgid "Add the EuroSign to the 4 key."
+#~ msgstr "Tambah tanda Euro ke tombol 4"
+
+#~ msgid "Add the EuroSign to the 5 key."
+#~ msgstr "Tambah tanda Euro ke tombol 5"
+
+#~ msgid "Add the EuroSign to the E key."
+#~ msgstr "Tambah tanda Euro ke tombol E"
+
+#~ msgid "Alt+Ctrl change layout."
+#~ msgstr "Alt+Ctrl mengubah layout."
+
+#~ msgid "Alt+Shift change layout."
+#~ msgstr "Alt+Shift mengubah layout."
+
+#~ msgid "CapsLock LED shows alternative layout."
+#~ msgstr "CapsLock LED menunjukkan layout alternatif."
+
+#~ msgid "CapsLock just locks the Shift modifier."
+#~ msgstr "CapsLock hanya mengunci modifier Shift."
+
+#~ msgid "CapsLock key changes layout."
+#~ msgstr "Tombol CapsLock mengubah layout."
+
+#~ msgid "Ctrl+Shift change layout."
+#~ msgstr "Ctrl+Shift mengubah layout."
+
+#~ msgid "Hewlett-Packard Internet Keyboard 5181"
+#~ msgstr "Hewlett-Packard Internet Keyboard 5181"
+
+#~ msgid "Hewlett-Packard Internet Keyboard 5185"
+#~ msgstr "Hewlett-Packard Internet Keyboard 5185"
+
+#~ msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+#~ msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
+
+#~ msgid "IBM Rapid Access II (alternate option)"
+#~ msgstr "IBM Rapid Access II (pilihan alternatif)"
+
+#~ msgid "LCtrl+LShift change layout."
+#~ msgstr "LCtrl+LShift mengubah layout."
+
+#~ msgid "Layout switching"
+#~ msgstr "Layout switching"
+
+#~ msgid "Left Alt key changes layout."
+#~ msgstr "Alt Kiri mengubah layout."
+
+#~ msgid "Left Ctrl key changes layout."
+#~ msgstr "Ctrl Kiri mengubah layout."
+
+#~ msgid "Left Shift key changes layout."
+#~ msgstr "Shift Kiri mengubah layout."
+
+#~ msgid "Left Win-key changes layout."
+#~ msgstr "Tombol Win Kiri mengubah layout."
+
+#~ msgid "Left Win-key is Compose."
+#~ msgstr "Tombol Win Kiri adaalah Compose."
+
+#~ msgid "Legacy keypad"
+#~ msgstr "Legacy keypad"
+
+#~ msgid "Menu is Compose."
+#~ msgstr "Menu adalah Compose"
+
+#~ msgid "Neostyle"
+#~ msgstr "Neostyle"
+
+#~ msgid "NumLock LED shows alternative layout."
+#~ msgstr "NumLock LED menunjukkan layout alternatif."
+
+#~ msgid "Press Left Alt key to choose 3rd level."
+#~ msgstr "Tekan Alt Kiri untuk memilih tingkat 3."
+
+#~ msgid "Press Left Win-key to choose 3rd level."
+#~ msgstr "Tekan tombol Win Kiri untuk memilih tingkat 3."
+
+#~ msgid "Press Right Alt key to choose 3rd level."
+#~ msgstr "Tekan Alt Kanan untuk memilih tingkat 3."
+
+#~ msgid "Press Right Ctrl to choose 3rd level."
+#~ msgstr "Tekan Ctrl Kanan untuk memilih tingkat 3."
+
+#~ msgid "Press Right Win-key to choose 3rd level."
+#~ msgstr "Tekan tombol Win Kanan untuk memilih tingkat 3."
+
+#~ msgid "Press any of Alt keys to choose 3rd level."
+#~ msgstr "Tekan tombol Alt manasaja untuk memilih tingkat 3."
+
+#~ msgid "Press any of Win-keys to choose 3rd level."
+#~ msgstr "Tekan tombol Win manasaja untuk memilih tingkat 3."
+
+#~ msgid "Right Alt is Compose."
+#~ msgstr "Alt Kanan adalah Compose"
+
+#~ msgid "Right Alt key changes layout."
+#~ msgstr "Alt Kanan mengubah layout."
+
+#~ msgid "Right Ctrl key changes layout."
+#~ msgstr "Ctrl Kanan mengubah layout."
+
+#~ msgid "Right Shift key changes layout."
+#~ msgstr "Shift Kanan mengubah layout."
+
+#~ msgid "Right Win-key changes layout."
+#~ msgstr "Tombol Win Kanan mengubah layout."
+
+#~ msgid "Right Win-key is Compose."
+#~ msgstr "Tombol Win Kanan adalah Compose."
+
+#~ msgid "ScrollLock LED shows alternative layout."
+#~ msgstr "ScrollLock LED menunjukkan layout alternatif."
+
+#~ msgid "Shift+CapsLock changes layout."
+#~ msgstr "Shift+CapsLock mengubah layout."
+
+#~ msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+#~ msgstr "Tukar keycode dari 2 tombol ketika keyboard Mac salah terdeteksi oleh kernel."
+
+#~ msgid "Third level choosers"
+#~ msgstr "Pilihan tingkat 3"
+
+#~ msgid "Urdu"
+#~ msgstr "Urdu"
diff --git a/xorg-server/xkbdata.src/po/it.po b/xorg-server/xkbdata.src/po/it.po
index a128f32fc..ad3302c78 100644
--- a/xorg-server/xkbdata.src/po/it.po
+++ b/xorg-server/xkbdata.src/po/it.po
@@ -1,18 +1,42 @@
# Italian translation for xkeyboard-config
-# Copyright (C) Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
# This file is distributed under the same license as the xkeyboard-config package.
-# Luca Ferretti <elle.uca@infinito.it>, 2005-2008.
#
-# legacy --> vecchia maniera
-# dead keys --> tasti muti
-# eliminate dead keys --> tasti muti esclusi
+# Il file rules.xml è composto da tre parti
+# <modelList> - elenca i modelli di tastiera riconosciuti
+# <layoutList> - elenca le disposizioni di tastiera applicabili
+# e le loro varianti
+# <optionList> - elenca le opzioni selezionabili per le disposizioni
+# (opzioni visibili per esempio nel sottodialogo "Altre opzioni"
+# dello strumento di preferenze Tastiera di GNOME)
+#
#
+# Per i modelli in genere non serve usare particolari traduzioni, visto che
+# è il nome proprio con cui il vendor commercializza il prodotto
+#
+# Le disposizioni spesso sono i nomi della lingua, ma sono presenti anche casi
+# in cui la variante è descritta nel modo in cui "appare" la tastiera
+#
+# Le opzioni sarebbero facili, se non fosse che mentre nel file XML originale
+# sono disposte in maniera gerarchica, qui nel PO vengono spalmate qua e là
+# per colpa dell'ordinamento alfabetico. Per questo ho riportato i vari gruppi
+# come appaiono, basta cercare optionList
+#
+# ## Glossario ##
+#
+# legacy --> vecchia maniera
+# dead keys --> tasti muti
+# eliminate dead keys --> tasti muti esclusi
+# to map --> applicare
+# non-breakable --> non interrompibile ??
+#
+# Luca Ferretti <elle.uca@infinito.it>, 2005, 2006, 2007, 2008, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config 1.2-pre1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-15 21:41+0000\n"
-"PO-Revision-Date: 2008-01-16 16:40+0100\n"
+"Project-Id-Version: xkeyboard-config 1.6pre1\n"
+"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
+"POT-Creation-Date: 2009-05-12 23:49+0100\n"
+"PO-Revision-Date: 2009-05-13 21:28+0200\n"
"Last-Translator: Luca Ferretti <elle.uca@infinito.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
"MIME-Version: 1.0\n"
@@ -39,133 +63,154 @@ msgstr "Alternativa, tasti muti Sun (vecchia maniera)"
msgid "(Legacy) Alternative, eliminate dead keys"
msgstr "Alternativa, tasti muti rimossi (vecchia maniera)"
-#: ../rules/base.xml.in.h:5
-msgid "(Legacy) Dvorak"
-msgstr "Dvorak (vecchia maniera)"
-
# 1.2
-#: ../rules/base.xml.in.h:6
+#: ../rules/base.xml.in.h:5
msgid "101/104 key Compatible"
msgstr "Compatibile 101/104 tasti"
-#: ../rules/base.xml.in.h:7 ../rules/sun.xml.in.h:2
+#: ../rules/base.xml.in.h:6
msgid "101/qwerty/comma/Dead keys"
msgstr "101/qwerty/virgola/tasti muti"
-#: ../rules/base.xml.in.h:8 ../rules/sun.xml.in.h:3
+#: ../rules/base.xml.in.h:7
msgid "101/qwerty/comma/Eliminate dead keys"
msgstr "101/qwerty/virgola/tasti muti esclusi"
-#: ../rules/base.xml.in.h:9 ../rules/sun.xml.in.h:4
+#: ../rules/base.xml.in.h:8
msgid "101/qwerty/dot/Dead keys"
msgstr "101/qwerty/punto/tasti muti"
-#: ../rules/base.xml.in.h:10 ../rules/sun.xml.in.h:5
+#: ../rules/base.xml.in.h:9
msgid "101/qwerty/dot/Eliminate dead keys"
msgstr "101/qwerty/punto/tasti muti esclusi"
-#: ../rules/base.xml.in.h:11 ../rules/sun.xml.in.h:6
+#: ../rules/base.xml.in.h:10
msgid "101/qwertz/comma/Dead keys"
msgstr "101/qwertz/virgola/tasti muti"
-#: ../rules/base.xml.in.h:12
+#: ../rules/base.xml.in.h:11
msgid "101/qwertz/comma/Eliminate dead keys"
msgstr "101/qwertz/virgola/tasti muti esclusi"
-#: ../rules/base.xml.in.h:13 ../rules/sun.xml.in.h:7
+#: ../rules/base.xml.in.h:12
msgid "101/qwertz/dot/Dead keys"
msgstr "101/qwertz/punto/tasti muti"
-#: ../rules/base.xml.in.h:14 ../rules/sun.xml.in.h:8
+#: ../rules/base.xml.in.h:13
msgid "101/qwertz/dot/Eliminate dead keys"
msgstr "101/qwertz/punto/tasti muti esclusi"
-#: ../rules/base.xml.in.h:15 ../rules/sun.xml.in.h:9
+#: ../rules/base.xml.in.h:14
msgid "102/qwerty/comma/Dead keys"
msgstr "102/qwerty/virgola/tasti muti"
-#: ../rules/base.xml.in.h:16 ../rules/sun.xml.in.h:10
+#: ../rules/base.xml.in.h:15
msgid "102/qwerty/comma/Eliminate dead keys"
msgstr "102/qwerty/virgola/tasti muti esclusi"
-#: ../rules/base.xml.in.h:17 ../rules/sun.xml.in.h:11
+#: ../rules/base.xml.in.h:16
msgid "102/qwerty/dot/Dead keys"
msgstr "102/qwerty/punto/tasti muti"
-#: ../rules/base.xml.in.h:18 ../rules/sun.xml.in.h:12
+#: ../rules/base.xml.in.h:17
msgid "102/qwerty/dot/Eliminate dead keys"
msgstr "102/qwerty/punto/tasti muti esclusi"
-#: ../rules/base.xml.in.h:19 ../rules/sun.xml.in.h:13
+#: ../rules/base.xml.in.h:18
msgid "102/qwertz/comma/Dead keys"
msgstr "102/qwertz/virgola/tasti muti"
-#: ../rules/base.xml.in.h:20 ../rules/sun.xml.in.h:14
+#: ../rules/base.xml.in.h:19
msgid "102/qwertz/comma/Eliminate dead keys"
msgstr "102/qwertz/virgola/tasti muti esclusi"
-#: ../rules/base.xml.in.h:21 ../rules/sun.xml.in.h:15
+#: ../rules/base.xml.in.h:20
msgid "102/qwertz/dot/Dead keys"
-msgstr "102/qwertyz/punto/tasti muti"
+msgstr "102/qwertz/punto/tasti muti"
-#: ../rules/base.xml.in.h:22 ../rules/sun.xml.in.h:16
+#: ../rules/base.xml.in.h:21
msgid "102/qwertz/dot/Eliminate dead keys"
-msgstr "102/qwertyz/punto/tasti muti esclusi"
+msgstr "102/qwertz/punto/tasti muti esclusi"
+# 1.5
+#: ../rules/base.xml.in.h:22
+msgid "2"
+msgstr "2"
+
+# 1.5
#: ../rules/base.xml.in.h:23
+msgid "4"
+msgstr "4"
+
+# 1.5
+#: ../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:24
+#: ../rules/base.xml.in.h:26
msgid "A4Tech KBS-8"
msgstr "A4Tech KBS-8"
-#: ../rules/base.xml.in.h:25
+#: ../rules/base.xml.in.h:27
msgid "A4Tech Wireless Desktop RFKB-23"
msgstr "A4Tech Wireless Desktop RFKB-23"
-#: ../rules/base.xml.in.h:26
+#: ../rules/base.xml.in.h:28
msgid "ACPI Standard"
msgstr "Standard ACPI"
-#: ../rules/base.xml.in.h:27
+# 1.5
+#: ../rules/base.xml.in.h:29
+msgid "ATM/phone-style"
+msgstr "ATM/tipo telefono"
+
+#: ../rules/base.xml.in.h:30
msgid "Acer AirKey V"
msgstr "Acer AirKey V"
-#: ../rules/base.xml.in.h:28
+#: ../rules/base.xml.in.h:31
msgid "Acer C300"
msgstr "Acer C300"
-#: ../rules/base.xml.in.h:29
+#: ../rules/base.xml.in.h:32
msgid "Acer Ferrari 4000"
msgstr "Acer Ferrari 4000"
-#: ../rules/base.xml.in.h:30
+#: ../rules/base.xml.in.h:33
msgid "Acer Laptop"
msgstr "Portatile Acer"
-#: ../rules/base.xml.in.h:31
-msgid "Add the EuroSign to the 2 key."
-msgstr "Aggiungere il simbolo € al tasto 2."
-
-#: ../rules/base.xml.in.h:32
-msgid "Add the EuroSign to the 4 key."
-msgstr "Aggiungere il simbolo € al tasto 4."
-
-#: ../rules/base.xml.in.h:33
-msgid "Add the EuroSign to the 5 key."
-msgstr "Aggiungere il simbolo € al tasto 5."
-
+# 1.5
#: ../rules/base.xml.in.h:34
-msgid "Add the EuroSign to the E key."
-msgstr "Aggiungere il simbolo € al tasto E."
+msgid "Add the standard behavior to Menu key"
+msgstr "Aggiungere il comportamento standard al tasto Menu"
+# 1.5
+#
+# optionList: esperanto
+#
+# <b>Adding Esperanto circumflexes (supersigno)</b>
+# (*) To the corresponding key in a Qwerty keyboard.
+# ( ) To the corresponding key in a Dvorak keyboard.
#: ../rules/base.xml.in.h:35
-msgid "Add the standard behavior to Menu key."
-msgstr "Aggiungere il comportamento standard al tasto Menu."
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "Aggiunta dei circonflessi Esperanto (supersigno)"
+# 1.5
+# optionList: eurosign
+# descrizione: Special shortcuts for the Euro character
+#
+# <b>Adding EuroSign to certain keys</b>
+# [*] E
+# [ ] 2
+# [*] 4
+# [ ] 5
#: ../rules/base.xml.in.h:36
-msgid "Adding the EuroSign to certain keys"
+msgid "Adding EuroSign to certain keys"
msgstr "Aggiunta del simbolo € a determinati tasti"
#: ../rules/base.xml.in.h:37
@@ -195,2856 +240,3186 @@ msgstr "ALB"
msgid "Albania"
msgstr "Albania"
-# 1.2
+# 1.5
#: ../rules/base.xml.in.h:43
-msgid "Alt and Meta are on the Alt keys."
-msgstr "Alt e Meta sono sui tasti Alt."
+msgid "Alt and Meta are on Alt keys"
+msgstr "Alt e Meta sono sui tasti Alt"
+# 1.5
+# to map, pare che in termini matematici voglia dire applicare
#: ../rules/base.xml.in.h:44
-msgid "Alt is mapped to the right Win-key and Super to Menu."
-msgstr "Alt è mappato sul tasto Win destro e Super su Menu."
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr "Alt è applicato al tasto Win destro, Super al tasto Menu"
-# 1.2
+# 1.5
#: ../rules/base.xml.in.h:45
-msgid "Alt+CapsLock changes layout."
-msgstr "Alt+BlocMaiusc cambia la disposizione."
+msgid "Alt+CapsLock"
+msgstr "Alt+BlocMaiusc"
-# 1.2
+# 1.5
#: ../rules/base.xml.in.h:46
-msgid "Alt+Ctrl change layout."
-msgstr "Alt+Ctrl cambia la dispozizione."
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
-# 1.2
+# 1.5
#: ../rules/base.xml.in.h:47
-msgid "Alt+Shift change layout."
-msgstr "Alt+Maiusc cambia la disposizione."
+msgid "Alt+Shift"
+msgstr "Alt+Maiusc"
+# 1.5
#: ../rules/base.xml.in.h:48
+msgid "Alt+Space"
+msgstr "Alt+Spazio"
+
+#: ../rules/base.xml.in.h:49
msgid "Alt-Q"
msgstr "Alt-Q"
-# Using special PC keys (Win, Menu) to work as standard X keys
-# (Super, Hyper, etc.)
-#: ../rules/base.xml.in.h:49
+# optionList: altwin
+# descrizione: Using special PC keys (Win, Menu) to work as standard X keys
+# (Super, Hyper, etc.)
+#
+# <b>Alt/Win key behavior</b>
+# (*) Add the standard behavior to Menu key
+# ( ) Alt and Meta are on Alt keys
+# ( ) Control is mapped to Win keys (and the usual Ctrl keys)
+# ( ) Control is mapped to Alt keys, Alt is mapped to Win keys
+# ( ) Meta is mapped to Win keys
+# ( ) Meta is mapped to Left Win
+# ( ) Super is mapped to Win keys
+# ( ) Hyper is mapped to Win-keys
+# ( ) Alt is mapped to Right Win, Super to Menu
+# ( ) Left Alt is swapped with Left Win
+#
+#: ../rules/base.xml.in.h:50
msgid "Alt/Win key behavior"
msgstr "Comportamento tasto Alt/Win"
-#: ../rules/base.xml.in.h:50
+#: ../rules/base.xml.in.h:51
msgid "Alternative"
msgstr "Alternativa"
# 1.2
-#: ../rules/base.xml.in.h:51
+#: ../rules/base.xml.in.h:52
msgid "Alternative Eastern"
msgstr "Alternativa orientale"
# 1.2
-#: ../rules/base.xml.in.h:52
+#: ../rules/base.xml.in.h:53
msgid "Alternative Phonetic"
msgstr "Alternativa fonetica"
-#: ../rules/base.xml.in.h:53
+#: ../rules/base.xml.in.h:54
msgid "Alternative international (former us_intl)"
msgstr "Internazionale alternativa (in precedenza us_intl)"
-#: ../rules/base.xml.in.h:54
+#: ../rules/base.xml.in.h:55
msgid "Alternative, Sun dead keys"
msgstr "Alternativa, tasti muti Sun"
-#: ../rules/base.xml.in.h:55
+#: ../rules/base.xml.in.h:56
msgid "Alternative, eliminate dead keys"
msgstr "Alternativa, tasti muti rimossi"
# 1.2
-#: ../rules/base.xml.in.h:56
+#: ../rules/base.xml.in.h:57
msgid "Alternative, latin-9 only"
msgstr "Alternativa, solo latin-9"
# Andorra
-#: ../rules/base.xml.in.h:57
+#: ../rules/base.xml.in.h:58
msgid "And"
msgstr "AND"
-#: ../rules/base.xml.in.h:58
+#: ../rules/base.xml.in.h:59
msgid "Andorra"
msgstr "Andorra"
-#: ../rules/base.xml.in.h:59
+# 1.5
+#: ../rules/base.xml.in.h:60
+msgid "Any Alt key"
+msgstr "Ogni tasto Alt"
+
+# 1.5
+#: ../rules/base.xml.in.h:61
+msgid "Any Win key"
+msgstr "Ogni tanto Win"
+
+# 1.5
+#: ../rules/base.xml.in.h:62
+msgid "Any Win key (while pressed)"
+msgstr "Ogni tasto Win (mentre è premuto)"
+
+#: ../rules/base.xml.in.h:63
msgid "Apostrophe (') variant"
msgstr "Variante apostrofo (')"
-#: ../rules/base.xml.in.h:60
+#: ../rules/base.xml.in.h:64
msgid "Apple"
msgstr "Apple"
-#: ../rules/base.xml.in.h:61
+#: ../rules/base.xml.in.h:65
msgid "Apple Laptop"
msgstr "Portatile Apple"
-#: ../rules/base.xml.in.h:62
+#: ../rules/base.xml.in.h:66
msgid "Ara"
msgstr "Ara"
# nel senso di layout/disposizione e usato nell'elenco di nazioni.
-#: ../rules/base.xml.in.h:63
+#: ../rules/base.xml.in.h:67
msgid "Arabic"
msgstr "Araba"
-#: ../rules/base.xml.in.h:64
+#: ../rules/base.xml.in.h:68
msgid "Arm"
msgstr "ARM"
# UE
-#: ../rules/base.xml.in.h:65
+#: ../rules/base.xml.in.h:69
msgid "Armenia"
msgstr "Armenia"
-#: ../rules/base.xml.in.h:66
+# 1.5
+#
+# punto sottoscritto stando a http://it.wikipedia.org/wiki/Diacritico
+# Grazie a Daniele Forsi
+#
+#: ../rules/base.xml.in.h:70
+msgid "Asturian variant with bottom-dot H and bottom-dot L"
+msgstr "Variante asturiana con H punto sottoscritto e L punto sottoscritto"
+
+#: ../rules/base.xml.in.h:71
msgid "Asus Laptop"
msgstr "Portatile Asus"
-#: ../rules/base.xml.in.h:67
+# 1.5
+#: ../rules/base.xml.in.h:72
+msgid "At bottom left"
+msgstr "In basso a sinistra"
+
+# 1.5
+#: ../rules/base.xml.in.h:73
+msgid "At left of 'A'"
+msgstr "A sinistra di \"A\""
+
+#: ../rules/base.xml.in.h:74
msgid "Aze"
msgstr "AZE"
# UE
-#: ../rules/base.xml.in.h:68
+#: ../rules/base.xml.in.h:75
msgid "Azerbaijan"
msgstr "Azerbaigian"
-#: ../rules/base.xml.in.h:69
+# 1.5
+#: ../rules/base.xml.in.h:76
msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr "Azona RF2300 Internet Keyboard wireless"
+msgstr "Azona RF2300 wireless Internet Keyboard"
-#: ../rules/base.xml.in.h:70
+#: ../rules/base.xml.in.h:77
msgid "BTC 5090"
msgstr "BTC 5090"
-#: ../rules/base.xml.in.h:71
+#: ../rules/base.xml.in.h:78
msgid "BTC 5113RF Multimedia"
msgstr "BTC 5113RF Multimedia"
-#: ../rules/base.xml.in.h:72
+#: ../rules/base.xml.in.h:79
msgid "BTC 5126T"
msgstr "BTC 5126T"
-#: ../rules/base.xml.in.h:73
+#: ../rules/base.xml.in.h:80
msgid "BTC 6301URF"
msgstr "BTC 6301URF"
-#: ../rules/base.xml.in.h:74
+#: ../rules/base.xml.in.h:81
msgid "BTC 9000"
msgstr "BTC 9000"
-#: ../rules/base.xml.in.h:75
+#: ../rules/base.xml.in.h:82
msgid "BTC 9000A"
msgstr "BTC 9000A"
-#: ../rules/base.xml.in.h:76
+#: ../rules/base.xml.in.h:83
msgid "BTC 9001AH"
msgstr "BTC 9001AH"
-#: ../rules/base.xml.in.h:77
+#: ../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"
+
+# 1.6
+# variante lituana
+#: ../rules/base.xml.in.h:86
+msgid "Baltic+"
+msgstr "Baltic+"
+
# codice 3 lettere per bangladesh
-#: ../rules/base.xml.in.h:78
+#: ../rules/base.xml.in.h:87
msgid "Ban"
msgstr "BGD"
# UE
-#: ../rules/base.xml.in.h:79
+#: ../rules/base.xml.in.h:88
msgid "Bangladesh"
msgstr "Bangladesh"
# codice tre lettere per belgio
-#: ../rules/base.xml.in.h:80 ../rules/sun.xml.in.h:22
+#: ../rules/base.xml.in.h:89
msgid "Bel"
msgstr "BEL"
# UE
-#: ../rules/base.xml.in.h:81
+#: ../rules/base.xml.in.h:90
msgid "Belarus"
msgstr "Bielorussia"
# UE
-#: ../rules/base.xml.in.h:82
+#: ../rules/base.xml.in.h:91
msgid "Belgium"
msgstr "Belgio"
-#: ../rules/base.xml.in.h:83
+#: ../rules/base.xml.in.h:92
msgid "BenQ X-Touch"
msgstr "BenQ X-Touch"
+#: ../rules/base.xml.in.h:93
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:94
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
+
# variante per india
-#: ../rules/base.xml.in.h:84
+#: ../rules/base.xml.in.h:95
msgid "Bengali"
msgstr "Bengali"
-# variante per bengali, credo sia fonetico (crf ww.bengalinux.org)
-#: ../rules/base.xml.in.h:85
+# variante per bengali, credo sia fonetico (crf www.bengalinux.org)
+#: ../rules/base.xml.in.h:96
msgid "Bengali Probhat"
msgstr "Bengali probhat"
# variante francese
-#: ../rules/base.xml.in.h:86
+#: ../rules/base.xml.in.h:97
msgid "Bepo, ergonomic, Dvorak way"
msgstr "Bepo, ergonomica, tipo Dvorak"
# variante francese
-#: ../rules/base.xml.in.h:87
+#: ../rules/base.xml.in.h:98
msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
msgstr "Bepo, ergonomica, tipo Dvorak, solo latin-9"
# codice tre lettere per bulgaria
-#: ../rules/base.xml.in.h:88 ../rules/sun.xml.in.h:24
+#: ../rules/base.xml.in.h:99
msgid "Bgr"
msgstr "BGR"
# Codice tre lettere per buthan
-#: ../rules/base.xml.in.h:89
+#: ../rules/base.xml.in.h:100
msgid "Bhu"
msgstr "BTN"
# UE
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:101
msgid "Bhutan"
msgstr "Bhutan"
# 1.2
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:102
msgid "Biblical Hebrew (Tiro)"
msgstr "Ebreo biblico (Tiro)"
# codice tre lettere per bosnia-erz
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:103
msgid "Bih"
msgstr "BIH"
# codice tre lettere per bielorussia
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:104
msgid "Blr"
msgstr "BLR"
# UE
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:105
msgid "Bosnia and Herzegovina"
msgstr "Bosnia-Erzegovina"
-# 1.2
-#: ../rules/base.xml.in.h:95
-msgid "Both Alt keys together change layout."
-msgstr "I tasti Alt insieme cambiano la disposizione."
-
-# 1.2
-#: ../rules/base.xml.in.h:96
-msgid "Both Ctrl keys together change layout."
-msgstr "I tasti Ctrl insieme cambiano la disposizione."
+# 1.5
+#: ../rules/base.xml.in.h:106
+msgid "Both Alt keys together"
+msgstr "Entrambi i tasti Alt insieme"
-# 1.2
-#: ../rules/base.xml.in.h:97
-msgid "Both Shift keys together change layout."
-msgstr "I tasti Maiusc insieme cambiano la disposizione."
+# 1.5
+#: ../rules/base.xml.in.h:107
+msgid "Both Ctrl keys together"
+msgstr "Entrambi i tasti Ctrl insieme"
-# 1.2
-#: ../rules/base.xml.in.h:98
-msgid "Both Win-keys switch layout while pressed."
-msgstr "I tasti Win commutano la disposizione mentre premuti."
+# 1.5
+#: ../rules/base.xml.in.h:108
+msgid "Both Shift keys together"
+msgstr "Entrambi i tasti Maiusc insieme"
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:109
msgid "Bra"
msgstr "BRA"
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:110
msgid "Braille"
msgstr "Braille"
# UE
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:111
msgid "Brazil"
msgstr "Brasile"
-#: ../rules/base.xml.in.h:102
-msgid "Brazilian ABNT2"
-msgstr "Brasiliana ABNT2"
+# 1.5
+# bre in iso639
+#: ../rules/base.xml.in.h:112
+msgid "Breton"
+msgstr "Bretone"
# Braille, shortDesc
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:113
msgid "Brl"
msgstr "Brl"
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:114
msgid "Brother Internet Keyboard"
msgstr "Brother Internet Keyboard"
# variante araba
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:115
msgid "Buckwalter"
msgstr "Buckwalter"
# UE
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:116
msgid "Bulgaria"
msgstr "Bulgaria"
+# 1.5
+# variante pakistana
+#: ../rules/base.xml.in.h:117
+msgid "CRULP"
+msgstr "CRULP"
+
# 1.2
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:118
msgid "Cambodia"
msgstr "Cambogia"
-#: ../rules/base.xml.in.h:108 ../rules/sun.xml.in.h:29
+#: ../rules/base.xml.in.h:119
msgid "Can"
msgstr "CAN"
# UE
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:120
msgid "Canada"
msgstr "Canada"
-# 1.2
-#: ../rules/base.xml.in.h:110
-msgid "Caps Lock is Compose."
-msgstr "BlocMaiusc è Compose."
+# 1.5
+#
+# Nota: talvota appare staccato, talvota attaccato
+# non so se per differenzaire il segnale dal pulsante (fisico)
+# nel dubbio separo anche in traduzione
+#: ../rules/base.xml.in.h:121
+msgid "Caps Lock"
+msgstr "Blocca Maiusc"
-# 1.2
-#: ../rules/base.xml.in.h:111
-msgid "CapsLock LED shows alternative layout."
-msgstr "Il LED BlocMaiusc mostra la disposizione alternativa."
+# 1.5
+#: ../rules/base.xml.in.h:122
+msgid "CapsLock"
+msgstr "BlocMaiusc"
-# 1.2
-#: ../rules/base.xml.in.h:112
-msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
-msgstr "BlocMaiusc agisce come Maiusc con il blocco. Maiusc \"mette in pausa\" BlocMaiusc."
+# 1.5
+# per come appare, tradurre il "to" è superfluo
+#: ../rules/base.xml.in.h:123
+msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
+msgstr "BlocMaiusc (prima disposizione), Maiusc+BlocMaiusc (ultima disposizione)"
-# 1.2
-#: ../rules/base.xml.in.h:113
-msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
-msgstr "BlocMaiusc agisce come Maiusc con il blocco. Maiusc non ha effetto su BlocMaiusc."
+# 1.5
+#: ../rules/base.xml.in.h:124
+msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
+msgstr "BlocMaiusc (mentre è premuto), Alt+BlocMaiusc esegue l'azione blocca maiuscole originale"
-#: ../rules/base.xml.in.h:114
-msgid "CapsLock just locks the Shift modifier."
-msgstr "BlocMaiusc semplicemente blocca il modificatore Maiusc."
+# 1.5
+#: ../rules/base.xml.in.h:125
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
+msgstr "BlocMaiusc agisce come Maiusc con il blocco. Maiusc \"mette in pausa\" BlocMaiusc"
+
+# 1.5
+#: ../rules/base.xml.in.h:126
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock"
+msgstr "BlocMaiusc agisce come Maiusc con il blocco. Maiusc non ha effetto su BlocMaiusc"
-#: ../rules/base.xml.in.h:115 ../rules/sun.xml.in.h:33
+# optionList: caps
+# descrizione: CapsLock tweaks. "Internal" capitalization means capitalization
+# using some internal tables. Otherwise "as Shift" - means using next group
+#
+# <b>CapsLock key behavior</b>
+# (*) CapsLock uses internal capitalization. Shift "pauses" CapsLock
+# ( ) CapsLock uses internal capitalization. Shift doesn't affect CapsLock
+# ( ) CapsLock acts as Shift with locking. Shift "pauses" CapsLock
+# ( ) CapsLock acts as Shift with locking. Shift doesn't affect CapsLock
+# ( ) CapsLock toggles normal capitalization of alphabetic characters
+# ( ) Swap ESC and CapsLock
+# ( ) Make CapsLock an additional ESC
+# ( ) Make CapsLock an additional Backspace
+# ( ) CapsLock toggles Shift so all keys are affected
+#: ../rules/base.xml.in.h:127
msgid "CapsLock key behavior"
msgstr "Comportamento tasto BlocMaiusc"
-# 1.2
-#: ../rules/base.xml.in.h:116
-msgid "CapsLock key changes layout."
-msgstr "Il tasto BlocMaiusc cambia la disposizione."
-
-#: ../rules/base.xml.in.h:117
-msgid "CapsLock toggles Shift so all keys are affected."
-msgstr "BlocMaiusc commuta Maiusc cosicché tutti i tasti ne sono modificati."
+# 1.5
+#: ../rules/base.xml.in.h:128
+msgid "CapsLock toggles Shift so all keys are affected"
+msgstr "BlocMaiusc commuta Maiusc così da avere effetto su tutti i tasti"
-#: ../rules/base.xml.in.h:118
-msgid "CapsLock toggles normal capitalization of alphabetic characters."
-msgstr "BlocMaiusc commuta l'uso normale delle lettere maiuscole dei caratteri alfabetici."
+# 1.5
+#: ../rules/base.xml.in.h:129
+msgid "CapsLock toggles normal capitalization of alphabetic characters"
+msgstr "BlocMaiusc commuta l'uso normale delle lettere maiuscole dei caratteri alfabetici"
-# 1.2
+# 1.5
#
# "Internal" capitalization means capitalization using some internal tables.
# Otherwise "as Shift" - means using next group.
-#: ../rules/base.xml.in.h:119
-msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
-msgstr "BlocMaiusc attiva l'uso interno delle lettere maiuscole. Maiusc \"mette in pausa\" BlocMaiusc."
+#: ../rules/base.xml.in.h:130
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
+msgstr "BlocMaiusc fa uso interno delle lettere maiuscole. Maiusc \"mette in pausa\" BlocMaiusc"
-# 1.2
-#: ../rules/base.xml.in.h:120
-msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
-msgstr "BlocMaiusc attiva l'uso interno delle lettere maiuscole. Maiusc non ha effetto su BlocMaiusc."
+# 1.5
+#: ../rules/base.xml.in.h:131
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
+msgstr "BlocMaiusc fa uso interno delle lettere maiuscole. Maiusc non ha effetto su BlocMaiusc"
# FIXME... trovare traduzione middle-dot
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:132
msgid "Catalan variant with middle-dot L"
msgstr "Variante catalano con L middle-dot"
+# 1.5
+#
+# variante romena (wikipedia mette la gl)
+#: ../rules/base.xml.in.h:133
+msgid "Cedilla"
+msgstr "Cediglia"
+
# codice tre lettere per la svizzera
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:134
msgid "Che"
msgstr "CHE"
-#: ../rules/base.xml.in.h:123
+# 1.5
+#
+# variante USA
+#: ../rules/base.xml.in.h:135
+msgid "Cherokee"
+msgstr "Cherokee"
+
+# 1.6
+#: ../rules/base.xml.in.h:136
+msgid "Cherry B.UNLIMITED"
+msgstr "Cherry B.UNLIMITED"
+
+#: ../rules/base.xml.in.h:137
msgid "Cherry Blue Line CyBo@rd"
msgstr "Cherry Blue Line CyBo@rd"
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:138
msgid "Cherry Blue Line CyBo@rd (alternate option)"
msgstr "Cherry Blue Line CyBo@rd (opzione alternativa)"
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:139
msgid "Cherry CyBo@rd USB-Hub"
msgstr "Cherry CyBo@rd USB-Hub"
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:140
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Expert"
+
+#: ../rules/base.xml.in.h:141
msgid "Cherry CyMotion Master Linux"
msgstr "Cherry CyMotion Master Linux"
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:142
msgid "Cherry CyMotion Master XPress"
msgstr "Cherry CyMotion Master XPress"
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:143
msgid "Chicony Internet Keyboard"
msgstr "Chicony Internet Keyboard"
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:144
msgid "Chicony KB-9885"
msgstr "Chicony KB-9885"
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:145
msgid "Chicony KU-0108"
msgstr "Chicony KU-0108"
+#: ../rules/base.xml.in.h:146
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0420"
+
# UE
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:147
msgid "China"
msgstr "Cina"
# variante russa
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:148
msgid "Chuvash"
msgstr "Chuvash"
# variante russa
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:149
msgid "Chuvash Latin"
msgstr "Chuvash latin"
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:150
msgid "Classic"
msgstr "Classica"
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:151
msgid "Classic Dvorak"
msgstr "Dvorak classica"
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:152
msgid "Classmate PC"
msgstr "Classmate PC"
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:153
msgid "CloGaelach"
msgstr "CloGaelach"
# variante USA
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:154
msgid "Colemak"
msgstr "Colemak"
-# variante romena (da tradurre??)
-#: ../rules/base.xml.in.h:139
-msgid "Commabelow"
-msgstr "Commabelow"
-
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:155
msgid "Compaq Easy Access Keyboard"
msgstr "Compaq tastiera Easy Access"
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:156
msgid "Compaq Internet Keyboard (13 keys)"
msgstr "Compaq Internet Keyboard (13 tasti)"
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:157
msgid "Compaq Internet Keyboard (18 keys)"
msgstr "Compaq Internet Keyboard (18 tasti)"
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:158
msgid "Compaq Internet Keyboard (7 keys)"
msgstr "Compaq Internet Keyboard (7 tasti)"
-#: ../rules/base.xml.in.h:144
+#: ../rules/base.xml.in.h:159
msgid "Compaq iPaq Keyboard"
msgstr "Compaq tastiera iPaq"
-#: ../rules/base.xml.in.h:145
+# optionList: compose
+# descrizione: Tweaking the position of the "Compose" key: mapping to
+# existing PC keys
+#
+#
+# <b>Compose key position</b>
+# [*] Right Alt
+# [ ] Left Win
+# [*] Right Win
+# [ ] Menu
+# [*] Right Ctrl
+# [ ] Caps Lock
+# [*] Less-than/Greater-than
+#
+#: ../rules/base.xml.in.h:160
msgid "Compose key position"
msgstr "Posizione tasto Compose"
-#: ../rules/base.xml.in.h:146
+#: ../rules/base.xml.in.h:161
msgid "Congo, Democratic Republic of the"
msgstr "Congo, Repubblica Democratica del"
-# 1.2
-#: ../rules/base.xml.in.h:147
-msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
-msgstr "Control è mappato sul tasto Win (a sui tipici tasti Ctrl)."
+# 1.6
+#: ../rules/base.xml.in.h:162
+msgid "Control + Alt + Backspace"
+msgstr "Control + Alt + Backspace"
+
+# 1.5
+#: ../rules/base.xml.in.h:163
+msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
+msgstr "Control è applicato ai tasti Alt, Alt è applicato ai tasti Win"
+
+# 1.5
+#: ../rules/base.xml.in.h:164
+msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
+msgstr "Control è applicato ai tasti Win (e ai soliti tasti Ctrl)"
+
+# 1.6
+# variante rumena
+#: ../rules/base.xml.in.h:165
+msgid "Crimean Tatar (Dobruca-1 Q)"
+msgstr "Tatar crimea (Dobruca-1 Q)"
+
+# 1.6
+#: ../rules/base.xml.in.h:166
+msgid "Crimean Tatar (Dobruca-2 Q)"
+msgstr "Tatar crimea (Dobruca-2 Q)"
+
+# 1.6
+#: ../rules/base.xml.in.h:167
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Tatar crimea (turca Alt-Q)"
+
+# 1.6
+#: ../rules/base.xml.in.h:168
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Tatar crimea (turca F)"
+
+# 1.6
+#: ../rules/base.xml.in.h:169
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Tatar crimea (turca Q)"
# UE
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:170
msgid "Croatia"
msgstr "Croazia"
# 1.2
-#: ../rules/base.xml.in.h:149
-msgid "Ctrl key at bottom left"
-msgstr "Il tasto Ctrl è in basso a sinistra."
-
-# 1.2
-#: ../rules/base.xml.in.h:150
-msgid "Ctrl key at left of 'A'"
-msgstr "Il tasto Ctrl è a sinistra di «A»"
-
-# 1.2
-#: ../rules/base.xml.in.h:151
+# optionList: ctrl
+# descrizione: Tweaking the position of the "Ctrl" key
+#
+# <b>Ctrl key position</b>
+# (*) Make CapsLock an additional Ctrl
+# ( ) Swap Ctrl and CapsLock
+# ( ) At left of 'A'
+# ( ) At bottom left
+# ( ) Right Ctrl as Right Alt
+#
+#: ../rules/base.xml.in.h:171
msgid "Ctrl key position"
msgstr "Posizione tasto Ctrl"
-# 1.2
-#: ../rules/base.xml.in.h:152
-msgid "Ctrl+Shift change layout."
-msgstr "Ctrl+Maiusc cambia la disposizione."
+# 1.5
+#: ../rules/base.xml.in.h:172
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Maiusc"
# UE
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:173
msgid "Cyrillic"
msgstr "Cirillico"
# 1.2
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:174
msgid "Cyrillic with guillemets"
msgstr "Cirillico con caporali («»)"
-#: ../rules/base.xml.in.h:155
+# 1.5
+#: ../rules/base.xml.in.h:175
msgid "Cyrillic, Z and ZHE swapped"
-msgstr "Cirillico, Z e ZHE invertiti"
+msgstr "Cirillico, Z e ZHE scambiati"
-#: ../rules/base.xml.in.h:156 ../rules/sun.xml.in.h:39
+#: ../rules/base.xml.in.h:176
msgid "Cze"
msgstr "CZE"
# UE
-#: ../rules/base.xml.in.h:157
+#: ../rules/base.xml.in.h:177
msgid "Czechia"
-msgstr "Repubblica ceca"
+msgstr "Repubblica Ceca"
+
+# 1.6
+# variante per lingua Kalmyk
+#: ../rules/base.xml.in.h:178
+msgid "DOS"
+msgstr "DOS"
# shortDesc per Congo, usato codice ISO
-#: ../rules/base.xml.in.h:158
+#: ../rules/base.xml.in.h:179
msgid "DRC"
msgstr "COD"
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:180
msgid "DTK2000"
msgstr "DTK2000"
-# variante tedesca... any info?
-#: ../rules/base.xml.in.h:160 ../rules/sun.xml.in.h:42
+# 1.5
+# breve per Danimarca, usato codice iso3166
+#: ../rules/base.xml.in.h:181
+msgid "Dan"
+msgstr "DNK"
+
+# variante tedesca...
+#
+# rispetto alla tedesca normale cambiano due caratteri, ` e ^
+# ah, le tastiere tedesche non hanno le lettere accentate, per cui
+# probabilemente 'sta cosa è importate per il Compose
+#: ../rules/base.xml.in.h:182
msgid "Dead acute"
-msgstr ""
+msgstr "Acuto muto"
-# variante tedesce... any info?
-#: ../rules/base.xml.in.h:161 ../rules/sun.xml.in.h:43
+# variante tedesca...
+#
+# rispetto alla tedesca normale cambia un carattere, ^
+# ah, le tastiere tedesche non hanno le lettere accentate, per cui
+# probabilemente 'sta cosa è importate per il Compose
+#: ../rules/base.xml.in.h:183
msgid "Dead grave acute"
-msgstr ""
+msgstr "Acuto grave muto"
-# in Misc Compat Options
-#: ../rules/base.xml.in.h:162
-msgid "Default numeric keypad keys."
-msgstr "Tasti predefiniti nel tastierino numerico."
+# 1.5
+#: ../rules/base.xml.in.h:184
+msgid "Default numeric keypad keys"
+msgstr "Tasti predefiniti nel tastierino numerico"
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:185
msgid "Dell"
msgstr "Dell"
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:186
msgid "Dell 101-key PC"
msgstr "Dell 101 tasti PC"
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:187
msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
msgstr "Dell portatile Inspiron 6xxx/8xxx"
-#: ../rules/base.xml.in.h:166
+#: ../rules/base.xml.in.h:188
msgid "Dell Laptop/notebook Precision M series"
msgstr "Dell portatile serie Precision M"
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:189
msgid "Dell Latitude series laptop"
msgstr "Dell portatile serie Latitude"
-#: ../rules/base.xml.in.h:168
+#: ../rules/base.xml.in.h:190
msgid "Dell Precision M65"
msgstr "Dell Precision M65"
-#: ../rules/base.xml.in.h:169
-msgid "Dell USB Multimedia Keybard"
+#: ../rules/base.xml.in.h:191
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
+
+#: ../rules/base.xml.in.h:192
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
+
+#: ../rules/base.xml.in.h:193
+msgid "Dell USB Multimedia Keyboard"
msgstr "Dell tastiera USB multimediale"
# UE
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:194
msgid "Denmark"
msgstr "Danimarca"
# codice tre lettere per germania<
-#: ../rules/base.xml.in.h:171 ../rules/sun.xml.in.h:44
+#: ../rules/base.xml.in.h:195
msgid "Deu"
msgstr "DEU"
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:196
msgid "Dexxa Wireless Desktop Keyboard"
msgstr "Dexxa tastiera Wireless Desktop"
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:197
msgid "Diamond 9801 / 9802 series"
msgstr "Diamond serie 9801/9802"
-# codice tre lettere per danimarca
-#: ../rules/base.xml.in.h:174 ../rules/sun.xml.in.h:46
-msgid "Dnk"
-msgstr "DNK"
-
-#: ../rules/base.xml.in.h:175 ../rules/sun.xml.in.h:48
+#: ../rules/base.xml.in.h:198
msgid "Dvorak"
msgstr "Dvorak"
-#: ../rules/base.xml.in.h:176
+# 1.5
+#: ../rules/base.xml.in.h:199
+msgid "Dvorak (UK Punctuation)"
+msgstr "Dvorak (punteggiatura UK)"
+
+#: ../rules/base.xml.in.h:200
msgid "Dvorak international"
msgstr "Dvorak internazionale"
-#: ../rules/base.xml.in.h:177
-msgid "Dvorak, Polish quotes on key \"1/!\""
-msgstr ""
+# 1.6
+# variante polacca
+#: ../rules/base.xml.in.h:201
+msgid "Dvorak, Polish quotes on key 1"
+msgstr "Dvorak, virgolette polacche sul tasto 1"
-#: ../rules/base.xml.in.h:178
+# 1.5
+#
+# da controllare..
+#: ../rules/base.xml.in.h:202
msgid "Dvorak, Polish quotes on quotemark key"
-msgstr ""
+msgstr "Dvorak, virgolette polacche sul tasto quotemark"
-#: ../rules/base.xml.in.h:179
+# 1.5
+#: ../rules/base.xml.in.h:203
+msgid "E"
+msgstr "E"
+
+#: ../rules/base.xml.in.h:204
msgid "Eastern"
msgstr "Orientale"
-#: ../rules/base.xml.in.h:180 ../rules/sun.xml.in.h:49
+# 1.5
+#: ../rules/base.xml.in.h:205
msgid "Eliminate dead keys"
-msgstr "Tasti muti rimossi"
+msgstr "Tasti muti esclusi"
-#: ../rules/base.xml.in.h:181
+# 1.5
+#: ../rules/base.xml.in.h:206
+msgid "Enable extra typographic characters"
+msgstr "Abilitare caratteri tipografici aggiuntivi"
+
+# 1.6
+# variante canadese
+#: ../rules/base.xml.in.h:207
+msgid "English"
+msgstr "Inglese"
+
+#: ../rules/base.xml.in.h:208
msgid "Ennyah DKB-1008"
msgstr "Ennyah DKB-1008"
-# codice tre lettere per esperanto
-#: ../rules/base.xml.in.h:182
+# 1.6
+# lasciato enter, come nome di segnale
+# sono due uno è enter, l'altro return
+#: ../rules/base.xml.in.h:209
+msgid "Enter on keypad"
+msgstr "Enter sul tastierino numerico"
+
+# 1.5
+# descrizione breve per Esperanto, usato codice iso639 tre lettere
+#: ../rules/base.xml.in.h:210
msgid "Epo"
-msgstr ""
+msgstr "EPO"
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:211
msgid "Ergonomic"
msgstr "Ergonomica"
# codice tre lettere per spagna
-#: ../rules/base.xml.in.h:184 ../rules/sun.xml.in.h:50
+#: ../rules/base.xml.in.h:212
msgid "Esp"
msgstr "ESP"
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:213
msgid "Esperanto"
msgstr "Esperanto"
# codice tre lettere per estonia
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:214
msgid "Est"
msgstr "EST"
# UE
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:215
msgid "Estonia"
msgstr "Estonia"
# codice tre lettere per etiopia
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:216
msgid "Eth"
msgstr "ETH"
# UE
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:217
msgid "Ethiopia"
msgstr "Etiopia"
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:218
msgid "Evdev-managed keyboard"
msgstr "Tastiera gestita da Evdev"
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:219
msgid "Everex STEPnote"
msgstr "Everex STEPnote"
# Ewe: variante del Ghana
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:220
msgid "Ewe"
msgstr "Ewe"
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:221
msgid "Extended"
msgstr "Estesa"
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:222
+msgid "Extended - Winkeys"
+msgstr "Estesa - tasti Win"
+
+#: ../rules/base.xml.in.h:223
msgid "Extended Backslash"
msgstr "Backslash esteso"
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:224
msgid "F-letter (F) variant"
msgstr "Variante lettera-F (F)"
+#: ../rules/base.xml.in.h:225
+msgid "FL90"
+msgstr "FL90"
+
# codice tre lettere per isole Faroe
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:226
msgid "Fao"
msgstr "FRO"
-# ????
-#: ../rules/base.xml.in.h:197
+# 1.5
+#: ../rules/base.xml.in.h:227
msgid "Faroe Islands"
-msgstr "Isole Føroyar"
+msgstr "Isole Fær Øer"
-#: ../rules/base.xml.in.h:198 ../rules/sun.xml.in.h:51
+#: ../rules/base.xml.in.h:228
msgid "Fin"
msgstr "FIN"
# UE
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:229
msgid "Finland"
msgstr "Finlandia"
#. This assumes the KP_ abstract symbols are actually useful for some apps
#. The description needs to be rewritten
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:232
msgid "Four-level key with abstract separators"
-msgstr "Tasto di quarto livllo con separatori astratti"
+msgstr "Tasto di quarto livello con separatori astratti"
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:233
msgid "Four-level key with comma"
msgstr "Tasto di quarto livello con virgola"
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:234
msgid "Four-level key with dot"
msgstr "Tasto di quarto livello con punto"
+# 1.5
+#: ../rules/base.xml.in.h:235
+msgid "Four-level key with dot, latin-9 restriction"
+msgstr "Tasto di quarto livello con punto, restrizione latin-9"
+
# http://en.wikipedia.org/wiki/Momayyez
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:236
msgid "Four-level key with momayyez"
msgstr "Tasto di quarto livello con momayyez"
-#: ../rules/base.xml.in.h:206 ../rules/sun.xml.in.h:53
+#: ../rules/base.xml.in.h:237
msgid "Fra"
msgstr "FRA"
# UE
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:238
msgid "France"
msgstr "Francia"
-#: ../rules/base.xml.in.h:208 ../rules/sun.xml.in.h:55
+#: ../rules/base.xml.in.h:239
msgid "French"
msgstr "Francese"
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:240
msgid "French (Macintosh)"
msgstr "Francese (Macintosh)"
-#: ../rules/base.xml.in.h:210 ../rules/sun.xml.in.h:56
+#: ../rules/base.xml.in.h:241
msgid "French (legacy)"
msgstr "Francese (vecchia maniera)"
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:242
msgid "French Dvorak"
-msgstr "Francese dvorak"
+msgstr "Francese Dvorak"
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:243
msgid "French, Sun dead keys"
msgstr "Francese, tasti muti Sun"
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:244
msgid "French, eliminate dead keys"
msgstr "Francese, tasti muti rimossi"
-#: ../rules/base.xml.in.h:214
-msgid "Fujitsu-Siemens Computers AMILO A1667G laptop"
-msgstr "Portatile Fujitsu-Siemens Computers AMILO A1667G"
+# 1.5
+#: ../rules/base.xml.in.h:245
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Portatile AMILO Fujitsu-Siemens Computers"
# Fula: variante del Ghana
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:246
msgid "Fula"
msgstr "Fula"
# Codice tre lettere per U.K.
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:247
msgid "GBr"
msgstr "GBR"
# Ga: variante del ghana
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:248
msgid "Ga"
msgstr "Ga"
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:249
msgid "Generic 101-key PC"
msgstr "Generica 101 tasti PC"
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:250
msgid "Generic 102-key (Intl) PC"
msgstr "Generica 102 tasti (Intl) PC"
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:251
msgid "Generic 104-key PC"
msgstr "Generica 104 tasti PC"
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:252
msgid "Generic 105-key (Intl) PC"
msgstr "Generica 105 tasti (Intl) PC"
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:253
msgid "Genius Comfy KB-12e"
msgstr "Genius Comfy KB-12e"
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:254
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:224
+#: ../rules/base.xml.in.h:255
msgid "Genius Comfy KB-21e-Scroll"
msgstr "Genius Comfy KB-21e-Scroll"
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:256
msgid "Genius KB-19e NB"
msgstr "Genius KB-19e NB"
-#: ../rules/base.xml.in.h:226
+# 1.6
+#: ../rules/base.xml.in.h:257
+msgid "Genius KKB-2050HS"
+msgstr "Genius KKB-2050HS"
+
+#: ../rules/base.xml.in.h:258
msgid "Geo"
msgstr "GEO"
# UE
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:259
msgid "Georgia"
msgstr "Georgia"
# Curiosamente è una variante delle tastiere italiane...
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:260
msgid "Georgian"
msgstr "Georgiana"
# Questa invece variante delle tastiere francesi
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:261
msgid "Georgian AZERTY Tskapo"
-msgstr "Geogiana AZERI Tskapo"
+msgstr "Georgiana AZERTY Tskapo"
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:262
msgid "German (Macintosh)"
msgstr "Tedesca (Macintosh)"
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:263
msgid "German, Sun dead keys"
msgstr "Tedesca, tasti muti Sun"
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:264
msgid "German, eliminate dead keys"
msgstr "Tedesca, tasti muti rimossi"
# UE
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:265
msgid "Germany"
msgstr "Germania"
# shortDesc per Ghana, usato codice ISO
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:266
msgid "Gha"
msgstr "GHA"
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:267
msgid "Ghana"
msgstr "Ghana"
# codice tre lettere per grecia
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:268
msgid "Gre"
msgstr "GRC"
# UE
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:269
msgid "Greece"
msgstr "Grecia"
-#: ../rules/base.xml.in.h:238
+# 1.5
+# variante olpc2 per USA
+#: ../rules/base.xml.in.h:270
msgid "Group toggle on multiply/divide key"
-msgstr ""
+msgstr "Commuta gruppo sul tasto moltiplica/dividi"
# shortDesc per Guinea, usato codice ISO
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:271
msgid "Gui"
msgstr "GIN"
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:272
msgid "Guinea"
msgstr "Guinea"
# Gujarati: variante india
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:273
msgid "Gujarati"
msgstr "Gujarati"
# Gurmukhi: variante india
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:274
msgid "Gurmukhi"
msgstr "Gurmukhi"
-#: ../rules/base.xml.in.h:243
+# Gurmukhi: variante india
+#: ../rules/base.xml.in.h:275
+msgid "Gurmukhi Jhelum"
+msgstr "Gurmukhi Jhelum"
+
+#: ../rules/base.xml.in.h:276
msgid "Gyration"
msgstr "Gyration"
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:277
msgid "Happy Hacking Keyboard"
msgstr "Happy Hacking Keyboard"
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:278
msgid "Happy Hacking Keyboard for Mac"
msgstr "Happy Hacking Keyboard per Mac"
# Hausa: variante Ghana
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:279
msgid "Hausa"
msgstr "Hausa"
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:280
msgid "Hewlett-Packard Internet Keyboard"
msgstr "Hewlett-Packard Internet Keyboard"
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:281
msgid "Hewlett-Packard Omnibook 500 FA"
msgstr "Hewlett-Packard Omnibook 500 FA"
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:282
msgid "Hewlett-Packard Omnibook 5xx"
msgstr "Hewlett-Packard Omnibook 5xx"
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:283
msgid "Hewlett-Packard Omnibook 6000/6100"
msgstr "Hewlett-Packard Omnibook 6000/6100"
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:284
msgid "Hewlett-Packard Omnibook XE3 GC"
msgstr "Hewlett-Packard Omnibook XE3 GC"
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:285
msgid "Hewlett-Packard Omnibook XE3 GF"
msgstr "Hewlett-Packard Omnibook XE3 GF"
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:286
msgid "Hewlett-Packard Omnibook XT1000"
msgstr "Hewlett-Packard Omnibook XT1000"
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:287
msgid "Hewlett-Packard Pavilion ZT11xx"
msgstr "Hewlett-Packard Pavillion ZT11xx"
-#: ../rules/base.xml.in.h:255
-msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
-msgstr "Hewlett-Packard Multimedia Keyboard SK-2501"
+#: ../rules/base.xml.in.h:288
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavillion dv5"
-#: ../rules/base.xml.in.h:256
-msgid "Hewlett-Packard SK-2505 Internet Keyboard"
-msgstr "Hewlett-Packard Internet Keyboard SK-2505"
+#: ../rules/base.xml.in.h:289
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Hewlett-Packard Multimedia Keyboard SK-250x"
+
+#: ../rules/base.xml.in.h:290
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
+
+# 1.5
+#: ../rules/base.xml.in.h:291
+msgid "Hexadecimal"
+msgstr "Esadecimale"
# Hindi Bolnagri: variante India
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:292
msgid "Hindi Bolnagri"
msgstr "Hindi Bolnagri"
-#: ../rules/base.xml.in.h:258
+# 1.6
+# variante indiana
+#: ../rules/base.xml.in.h:293
+msgid "Hindi Wx"
+msgstr "Hindi Wx"
+
+# 1.5
+#
+# variante ukraina
+#: ../rules/base.xml.in.h:294
+msgid "Homophonic"
+msgstr "Omofonica"
+
+#: ../rules/base.xml.in.h:295
msgid "Honeywell Euroboard"
msgstr "Honeywell Euroboard"
# codice tre lettere per croazia
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:296
msgid "Hrv"
msgstr "HRV"
-#: ../rules/base.xml.in.h:260 ../rules/sun.xml.in.h:59
+#: ../rules/base.xml.in.h:297
msgid "Hun"
msgstr "HUN"
# UE
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:298
msgid "Hungary"
msgstr "Ungheria"
-#: ../rules/base.xml.in.h:262
-msgid "Hyper is mapped to the Win-keys."
-msgstr "Hyper è mappato sul tasto Win."
+# 1.5
+#: ../rules/base.xml.in.h:299
+msgid "Hyper is mapped to Win-keys"
+msgstr "Hyper è applicato ai tasti Win"
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:300
msgid "IBM (LST 1205-92)"
msgstr "IBM (LST 1205-92)"
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:301
msgid "IBM Rapid Access"
msgstr "IBM Rapid Access"
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:302
msgid "IBM Rapid Access II"
msgstr "IBM Rapid Access II"
-#: ../rules/base.xml.in.h:266
-msgid "IBM Rapid Access II (alternate option)"
-msgstr "IBM Rapid Access II (opzione alternativa)"
+#: ../rules/base.xml.in.h:303
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:304
msgid "IBM ThinkPad 560Z/600/600E/A22E"
msgstr "IBM ThinkPad 560Z/600/600E/A22E"
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:305
msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-#: ../rules/base.xml.in.h:269
-msgid "IBM ThinkPad R60/T60/Z60m/Z60t/R61/T61/Z61m/Z61t"
-msgstr "IBM ThinkPad R60/T60/Z60m/Z60t/R61/T61/Z61m/Z61t"
+#: ../rules/base.xml.in.h:306
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
+
+#: ../rules/base.xml.in.h:307
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
-#: ../rules/base.xml.in.h:270 ../rules/sun.xml.in.h:61
+#: ../rules/base.xml.in.h:308
msgid "ISO Alternate"
msgstr "ISO alternativa"
# UE
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:309
msgid "Iceland"
-msgstr "Islandia"
+msgstr "Islanda"
# Igbo: variante Nigeria
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:310
msgid "Igbo"
msgstr "Igbo"
-#: ../rules/base.xml.in.h:273
+# variante LatAm
+#: ../rules/base.xml.in.h:311
+msgid "Include dead tilde"
+msgstr "Tilde muta inclusa"
+
+#: ../rules/base.xml.in.h:312
msgid "Ind"
msgstr "IND"
# UE
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:313
msgid "India"
msgstr "India"
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:314
msgid "International (AltGr dead keys)"
msgstr "Internazionale (tasti muti AltGr)"
-#: ../rules/base.xml.in.h:276 ../rules/sun.xml.in.h:62
+#: ../rules/base.xml.in.h:315
msgid "International (with dead keys)"
msgstr "Internazionale (con tasti muti)"
# Inuktitut: variante canadese
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:316
msgid "Inuktitut"
msgstr "Inuktitut"
# UE
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:317
msgid "Iran"
msgstr "Iran"
# UE
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:318
msgid "Iraq"
msgstr "Iraq"
# UE
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:319
msgid "Ireland"
msgstr "Irlanda"
# codice tre lettere per irlanda
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:320
msgid "Irl"
msgstr "IRL"
# codice tre lettere per Iran
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:321
msgid "Irn"
msgstr "IRN"
# codice tre lettere per iraq
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:322
msgid "Irq"
msgstr "IRQ"
# Codice tre lettere per islanda<
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:323
msgid "Isl"
msgstr "ISL"
# codice tre lettere per israele<
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:324
msgid "Isr"
msgstr "ISR"
# UE
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:325
msgid "Israel"
msgstr "Israele"
-#: ../rules/base.xml.in.h:287 ../rules/sun.xml.in.h:63
+#: ../rules/base.xml.in.h:326
msgid "Ita"
msgstr "ITA"
# UE
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:327
msgid "Italy"
msgstr "Italia"
# UE
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:328
msgid "Japan"
msgstr "Giappone"
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:329
msgid "Japan (PC-98xx Series)"
-msgstr "Jappone (Serie PC-98xx)"
-
-#: ../rules/base.xml.in.h:291
-msgid "Japanese 106-key"
-msgstr "Giapponese 106 tasti"
+msgstr "Giappone (Serie PC-98xx)"
-#: ../rules/base.xml.in.h:292
+# optionList: japan
+# descrizione:
+#
+# <b>Japanese keyboard options</b>
+# [*] Kana Lock key is locking
+# [ ] NICOLA-F style Backspace
+#: ../rules/base.xml.in.h:330
msgid "Japanese keyboard options"
msgstr "Opzioni tastiera giapponese"
-#: ../rules/base.xml.in.h:293 ../rules/sun.xml.in.h:66
+#: ../rules/base.xml.in.h:331
msgid "Jpn"
msgstr "JPN"
+# 1.5
+# variante russa, in iso639 è XAL
+#: ../rules/base.xml.in.h:332
+msgid "Kalmyk"
+msgstr "Kalmyk"
+
# Kana: variante giappone
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:333
msgid "Kana"
msgstr "Kana"
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:334
msgid "Kana Lock key is locking"
msgstr "Il tasto Kana Lock sta bloccando"
# variante india
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:335
msgid "Kannada"
msgstr "Kannada"
# Kashubian: variante polonia
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:336
msgid "Kashubian"
msgstr "Kashubian"
# shortDesc per Kazakistan
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:337
msgid "Kaz"
msgstr "KAZ"
-#: ../rules/base.xml.in.h:299
-#, fuzzy
+#: ../rules/base.xml.in.h:338
msgid "Kazakh with Russian"
msgstr "Kazaka con russo"
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:339
msgid "Kazakhstan"
msgstr "Kazakistan"
+# 1.6
+#: ../rules/base.xml.in.h:340
+msgid "Key sequence to kill the X server"
+msgstr "Sequenza di tasti per terminare il server X"
+
+# 1.5
+# optionList: lv3
+# descrizione: The key combination used to choose the 3rd (and 4th, together
+# with Shift) level of symbols
+#
+# <b>Key to choose 3rd level</b>
+# [*] Right Ctrl
+# [ ] Menu
+# [*] Any Win key
+# [ ] Left Win
+# [*] Right Win
+# [ ] Any Alt key
+# [*] Left Alt
+# [ ] Right Alt
+# [*] Right Alt, Shift+Right Alt key is Multi_Key
+# [ ] Right Alt key never chooses 3rd level
+#
+#: ../rules/base.xml.in.h:341
+msgid "Key to choose 3rd level"
+msgstr "Tasto per scegliere il terzo livello"
+
+# 1.5
+# optionList: grp
+# descrizione: The key combination used to switch between groups
+#
+# <b>Key(s) to change layout</b>
+# [*] Right Alt (while pressed)
+# [ ] Left Alt (while pressed)
+# [ ] Left Win (while pressed)
+# [ ] Right Win (while pressed)
+# [ ] Any Win key (while pressed)
+# [*] CapsLock (while pressed), Alt+CapsLock does the original capslock action
+# [*] Right Ctrl (while pressed)
+# [ ] Right Alt
+# [*] Left Alt
+# [ ] CapsLock
+# [*] Shift+CapsLock
+# [ ] CapsLock (to first layout), Shift+CapsLock (to last layout)
+# [*] Left Win (to first layout), Right Win/Menu (to last layout)
+# [ ] Alt+CapsLock
+# [*] Both Shift keys together
+# [ ] Both Alt keys together
+# [*] Both Ctrl keys together
+# [ ] Ctrl+Shift
+# [*] Left Ctrl+Left Shift
+# [ ] Alt+Ctrl
+# [*] Alt+Shift
+# [ ] Alt+Space
+# [*] Menu
+# [ ] Left Win
+# [*] Right Win
+# [ ] Left Shift
+# [*] Right Shift
+# [ ] Left Ctrl
+# [*] Right Ctrl
+#
+#: ../rules/base.xml.in.h:342
+msgid "Key(s) to change layout"
+msgstr "Tasto o tasti per cambiare disposizione"
+
# variante iraniana senza numeri
# forse anche variante per altra lingua
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:343
msgid "Keypad"
msgstr "Tastierino"
-# 1.2
-#: ../rules/base.xml.in.h:302
-msgid "Keypad with unicode additions (arrows and math operators)"
-msgstr "Tastierino con aggiunte unicode (frecce e operatori matematici)"
-
-# 1.2
-#: ../rules/base.xml.in.h:303
-msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Tastierino con aggiunte unicode (frecce e operatori matematici). Operatori matematici sul livello predefinito."
-
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:344
msgid "Keytronic FlexPro"
msgstr "Keytronic FlexPro"
+# 1.6
+# shortDesc per Kyrgyzstan
+#: ../rules/base.xml.in.h:345
+msgid "Kgz"
+msgstr "KGZ"
+
# shortDesc per Cambogia, usato codide ISO
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:346
msgid "Khm"
msgstr "KHM"
# Komi: variante russa
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:347
msgid "Komi"
msgstr "Komi"
# shortDesc per corea del sud, usato codice iso
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:348
msgid "Kor"
msgstr "KOR"
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:349
msgid "Korea, Republic of"
msgstr "Corea, Repubblica di"
-#: ../rules/base.xml.in.h:309
-msgid "Korean 106-key"
-msgstr "Coreana 106 tasti"
+# variante canadese
+#: ../rules/base.xml.in.h:350
+msgid "Ktunaxa"
+msgstr "Ktunaxa"
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:351
msgid "Kurdish, (F)"
msgstr "Curda, (F)"
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:352
msgid "Kurdish, Arabic-Latin"
msgstr "Curda, arabo-latina"
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:353
msgid "Kurdish, Latin Alt-Q"
msgstr "Curda, latina Alt-Q"
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:354
msgid "Kurdish, Latin Q"
msgstr "Curda, latina Q"
-# codice tre lettere per Kirghizistan
-#: ../rules/base.xml.in.h:314
-msgid "Kyr"
-msgstr "KGZ"
-
# UE
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:355
msgid "Kyrgyzstan"
msgstr "Kirghizistan"
-# Short description per Latin American ??
-#: ../rules/base.xml.in.h:316
+# 1.5
+# Short description per Latin American
+# include una lunga serie di nazioni: AR, Bo, CL, CO, CR, CU, DO...
+#
+#: ../rules/base.xml.in.h:356
msgid "LAm"
-msgstr ""
+msgstr "LatAm"
-#: ../rules/base.xml.in.h:317
-msgid "LCtrl+LShift change layout."
-msgstr "Ctrl sin. + Maiusc sin. cambia la disposizione."
+# 1.5
+# variante lituana
+#: ../rules/base.xml.in.h:357
+msgid "LEKP"
+msgstr "LEKP"
-#: ../rules/base.xml.in.h:318
+# 1.5
+# variante lituana
+#: ../rules/base.xml.in.h:358
+msgid "LEKPa"
+msgstr "LEKPa"
+
+#: ../rules/base.xml.in.h:359
msgid "Lao"
msgstr "LAO"
# UE
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:360
msgid "Laos"
msgstr "Laos"
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:361
msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
msgstr "Compaq Laptop tastiera per portatile (es. Armada)"
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:362
msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
msgstr "Compaq Internet Keyboard per portatile (es. Presario)"
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:363
msgid "Laptop/notebook eMachines m68xx"
-msgstr "Portatie eMachines m68xx"
+msgstr "Portatile eMachines m68xx"
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:364
msgid "Latin"
msgstr "Latino"
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:365
msgid "Latin American"
msgstr "Latino americano"
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:366
msgid "Latin Unicode"
msgstr "Latino Unicode"
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:367
msgid "Latin Unicode qwerty"
msgstr "Latino Unicode qwerty"
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:368
msgid "Latin qwerty"
msgstr "Latino qwerty"
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:369
msgid "Latin unicode"
msgstr "Latino unicode"
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:370
msgid "Latin unicode qwerty"
-msgstr "Latino unicode qwery"
+msgstr "Latino unicode qwerty"
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:371
msgid "Latin with guillemets"
msgstr "Latino con caporali («»)"
# UE
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:372
msgid "Latvia"
msgstr "Lettonia"
-#: ../rules/base.xml.in.h:332
-msgid "Layout switching"
-msgstr "Commutazione di disposizione"
+# 1.5
+# descr breve per Lettonia, usato codice iso3166
+#: ../rules/base.xml.in.h:373
+msgid "Lav"
+msgstr "LVA"
-#: ../rules/base.xml.in.h:333
-msgid "Left Alt is swapped with left Win-key."
-msgstr ""
+# 1.5
+#: ../rules/base.xml.in.h:374
+msgid "Left Alt"
+msgstr "Alt sinistro"
-#: ../rules/base.xml.in.h:334
-msgid "Left Alt key changes layout."
-msgstr "Il tasto Alt sinistro cambia la disposizione."
+# 1.5
+#: ../rules/base.xml.in.h:375
+msgid "Left Alt (while pressed)"
+msgstr "Alt sinistro (mentre è premuto)"
-#: ../rules/base.xml.in.h:335
-msgid "Left Alt key switches layout while pressed."
-msgstr "Il tasto Alt sinistro commuta la disposizione mentre è premuto."
+# 1.5
+#: ../rules/base.xml.in.h:376
+msgid "Left Alt is swapped with Left Win"
+msgstr "Alt sinistro è scambiato con Win sinistro"
-#: ../rules/base.xml.in.h:336
-msgid "Left Ctrl key changes layout."
-msgstr "Il tasto Ctrl sinistro cambia la disposizione."
+# 1.5
+#: ../rules/base.xml.in.h:377
+msgid "Left Ctrl"
+msgstr "Ctrl sinistro"
-#: ../rules/base.xml.in.h:337
-msgid "Left Shift key changes layout."
-msgstr "Il tasto Maiusc sinistro cambia la disposizione."
+# 1.5
+#: ../rules/base.xml.in.h:378
+msgid "Left Ctrl+Left Shift"
+msgstr "Ctrl sinistro+Maiusc sinistro"
-#: ../rules/base.xml.in.h:338
-msgid "Left Win-key changes layout."
-msgstr "Il tasto Win sinistro cambia la disposizione."
+# 1.5
+#: ../rules/base.xml.in.h:379
+msgid "Left Shift"
+msgstr "Maiusc sinistro"
-# Tweaking the position of the "Compose" key: mapping to existing PC keys
-#: ../rules/base.xml.in.h:339
-msgid "Left Win-key is Compose."
-msgstr "Tasto Win sinistro è Compose."
+# 1.5
+#: ../rules/base.xml.in.h:380
+msgid "Left Win"
+msgstr "Win sinistro"
-#: ../rules/base.xml.in.h:340
-msgid "Left Win-key switches layout while pressed."
-msgstr "Il tasto Win sinistro commuta la disposizione mentre è premuto."
+# 1.5
+#: ../rules/base.xml.in.h:381
+msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgstr "Win sinistro (prima disposizione), Win/Menu destro (ultima disposizione)"
+
+# 1.5
+#: ../rules/base.xml.in.h:382
+msgid "Left Win (while pressed)"
+msgstr "Win sinistro (mentre è premuto)"
# UE
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:383
msgid "Left hand"
msgstr "Mano sinistra"
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:384
msgid "Left handed Dvorak"
msgstr "Dvorak mancina"
-#: ../rules/base.xml.in.h:343
-msgid "Legacy Wang 724 keypad"
-msgstr ""
+# 1.5
+#: ../rules/base.xml.in.h:385
+msgid "Legacy"
+msgstr "Vecchia maniera"
+
+# 1.5
+#: ../rules/base.xml.in.h:386
+msgid "Legacy Wang 724"
+msgstr "Wang 724 vecchia maniera"
+# 1.5
#. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:388
msgid "Legacy key with comma"
-msgstr ""
+msgstr "Tasto vecchia maniera con virgola"
-#: ../rules/base.xml.in.h:346
+# 1.5
+#: ../rules/base.xml.in.h:389
msgid "Legacy key with dot"
-msgstr ""
+msgstr "Tasto vecchia maniera con punto"
-#: ../rules/base.xml.in.h:347
-msgid "Legacy keypad"
-msgstr ""
+# 1.5
+#: ../rules/base.xml.in.h:390
+msgid "Less-than/Greater-than"
+msgstr "Minore-di/Maggiore-di"
# UE
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:391
msgid "Lithuania"
msgstr "Lituania"
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:392
msgid "Logitech Access Keyboard"
msgstr "Logitech Access Keyboard"
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:393
msgid "Logitech Cordless Desktop"
msgstr "Logitech Cordless Desktop"
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:394
msgid "Logitech Cordless Desktop (alternate option)"
msgstr "Logitech Cordless Desktop (opzione alternativa)"
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:395
msgid "Logitech Cordless Desktop EX110"
msgstr "Logitech Cordless Desktop EX110"
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:396
msgid "Logitech Cordless Desktop LX-300"
msgstr "Logitech Cordless Desktop LX-300"
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:397
msgid "Logitech Cordless Desktop Navigator"
msgstr "Logitech Cordless Desktop Navigator"
-#: ../rules/base.xml.in.h:355
-msgid "Logitech Cordless Desktop Pro (alternate option2)"
+#: ../rules/base.xml.in.h:398
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:399
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
msgstr "Logitech Cordless Desktop Pro (opzione alternativa 2)"
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:400
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:401
msgid "Logitech Cordless Freedom/Desktop Navigator"
msgstr "Logitech Cordless Freedom/Desktop Navigator"
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:402
msgid "Logitech G15 extra keys via G15daemon"
msgstr "Tasti aggiuntivi Logitech attraverso G15daemon"
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:403
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech tastiera generica"
+
+#: ../rules/base.xml.in.h:404
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech Internet 350 Keyboard"
+
+#: ../rules/base.xml.in.h:405
msgid "Logitech Internet Keyboard"
msgstr "Logitech Internet Keyboard"
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:406
msgid "Logitech Internet Navigator Keyboard"
msgstr "Logitech Internet Navigator Keyboard"
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:407
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Media Elite Keyboard"
+
+#: ../rules/base.xml.in.h:408
msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:409
msgid "Logitech Ultra-X Keyboard"
msgstr "Logitech Ultra-X Keyboard"
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:410
msgid "Logitech diNovo Edge Keyboard"
msgstr "Logitech diNovo Edge Keyboard"
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:411
msgid "Logitech diNovo Keyboard"
msgstr "Logitech diNovo Keyboard"
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:412
msgid "Logitech iTouch"
msgstr "Logitech iTouch"
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:413
msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
msgstr "Logitech iTouch Cordless Keyboard (modello Y-RB6)"
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:414
msgid "Logitech iTouch Internet Navigator Keyboard SE"
msgstr "Logitech iTouch Internet Navigator Keyboard SE"
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:415
msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+# 1.5
+# codice iso639: dsb
+# FIXME tradotto come in iso-codes, ma inferiore nun se po' vede...
+#: ../rules/base.xml.in.h:416
+msgid "Lower Sorbian"
+msgstr "Sorabo inferiore"
+
+# 1.5
+# FIXME tradotto come in iso-codes, ma inferiore nun se po' vede...
+#: ../rules/base.xml.in.h:417
+msgid "Lower Sorbian (qwertz)"
+msgstr "Sorabo inferiore (qwertz)"
+
# codice tre lettere per lituania
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:418
msgid "Ltu"
msgstr "LTU"
-# codice tre lettere per lavtia<
-#: ../rules/base.xml.in.h:369
-msgid "Lva"
-msgstr "LVA"
-
# variante della Georgia
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:419
msgid "MESS"
msgstr "MESS"
# shortDesc per Montenegro, usato ISO
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:420
msgid "MNE"
msgstr "MNE"
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:421
msgid "MacBook/MacBook Pro"
msgstr "MacBook/MacBook Pro"
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:422
msgid "MacBook/MacBook Pro (Intl)"
msgstr "MacBook/MacBook Pro (Intl)"
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:423
msgid "Macedonia"
msgstr "Macedonia"
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:424
msgid "Macintosh"
msgstr "Macintosh"
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:425
msgid "Macintosh Old"
msgstr "Macintosh Old"
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:426
msgid "Macintosh, Sun dead keys"
msgstr "Macintosh, tasti muti Sun"
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:427
msgid "Macintosh, eliminate dead keys"
msgstr "Macintosh, tasti muti rimossi"
-#: ../rules/base.xml.in.h:379
-msgid "Make CapsLock an additional Ctrl."
-msgstr "Rendere BlocMaiusc un Ctrl aggiuntivo."
+# 1.5
+#: ../rules/base.xml.in.h:428
+msgid "Make CapsLock an additional Backspace"
+msgstr "Rendere BlocMaiusc un Backspace aggiuntivo"
+
+# 1.5
+#: ../rules/base.xml.in.h:429
+msgid "Make CapsLock an additional Ctrl"
+msgstr "Rendere BlocMaiusc un Ctrl aggiuntivo"
+
+# 1.5
+#: ../rules/base.xml.in.h:430
+msgid "Make CapsLock an additional ESC"
+msgstr "Rendere BlocMaiusc un ESC aggiuntivo"
# codice tre lettere per maldive
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:431
msgid "Mal"
msgstr "MDV"
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:432
msgid "Malayalam"
msgstr "Malayalam"
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:433
msgid "Malayalam Lalitha"
msgstr "Malayalam Lalitha"
# UE
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:434
msgid "Maldives"
msgstr "Maldive"
# UE
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:435
msgid "Malta"
msgstr "Malta"
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:436
msgid "Maltese keyboard with US layout"
msgstr "Tastiera maltese con disposizione US"
-#: ../rules/base.xml.in.h:386
+#: ../rules/base.xml.in.h:437
msgid "Mao"
msgstr "Mao"
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:438
msgid "Maori"
msgstr "Maori"
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:439
msgid "Memorex MX1998"
msgstr "Memorex MX1998"
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:440
msgid "Memorex MX2500 EZ-Access Keyboard"
msgstr "Memorex MX2500 EZ-Access Keyboard"
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:441
msgid "Memorex MX2750"
msgstr "Memorex MX2750"
-#: ../rules/base.xml.in.h:391
-msgid "Menu is Compose."
-msgstr "Menu opera come Compose."
+# 1,5
+# il tasto Menu
+#: ../rules/base.xml.in.h:442
+msgid "Menu"
+msgstr "Menu"
-#: ../rules/base.xml.in.h:392
-msgid "Menu key changes layout."
-msgstr "Il tasto Menu cambia la disposizione."
+# 1.5
+#: ../rules/base.xml.in.h:443
+msgid "Meta is mapped to Left Win"
+msgstr "Meta è applicato al tasto Win sinistro"
-#: ../rules/base.xml.in.h:393
-msgid "Meta is mapped to the Win-keys."
-msgstr "Meta è mappato sul tasto Win."
+# 1.5
+#: ../rules/base.xml.in.h:444
+msgid "Meta is mapped to Win keys"
+msgstr "Meta è applicato ai tasti Win"
-#: ../rules/base.xml.in.h:394
-msgid "Meta is mapped to the left Win-key."
-msgstr "Meta è mappato sul tasto Win sinistro."
+#: ../rules/base.xml.in.h:445
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Comfort Curve Keyboard 2000"
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:446
msgid "Microsoft Internet Keyboard"
msgstr "Microsoft Internet Keyboard"
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:447
msgid "Microsoft Internet Keyboard Pro, Swedish"
msgstr "Microsoft Internet Keyboard Pro, svedese"
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:448
msgid "Microsoft Natural"
msgstr "Microsoft Natural"
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:449
msgid "Microsoft Natural Keyboard Elite"
msgstr "Microsoft Natural Keyboard Elite"
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:450
msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:451
msgid "Microsoft Natural Keyboard Pro OEM"
msgstr "Microsoft Natural Keyboard Pro OEM"
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:452
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:402
+#: ../rules/base.xml.in.h:453
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+
+#: ../rules/base.xml.in.h:454
msgid "Microsoft Office Keyboard"
msgstr "Microsoft Office Keyboard"
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:455
msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
-#: ../rules/base.xml.in.h:404 ../rules/sun.xml.in.h:72
+# optionList: (vari)
+# descrizione: (nessuna)
+#
+# <b>Miscellaneous compatibility options</b>
+# [*] Default numeric keypad keys
+# [ ] Numeric keypad keys work as with Mac
+# [*] Shift with numeric keypad keys works as in MS Windows
+# [ ] Shift does not cancel NumLock, chooses 3d level instead
+#
+# [*] Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server
+#
+# [ ] Shift cancels CapsLock
+#
+# [*] Enable extra typographic characters
+#
+#: ../rules/base.xml.in.h:456
msgid "Miscellaneous compatibility options"
msgstr "Opzioni varie di compatibilità"
# codice tre lettere per macedonia
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:457
msgid "Mkd"
msgstr "MKD"
# codice tre lettere per malta
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:458
msgid "Mlt"
msgstr "MLT"
# codice tre lettere per birmania
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:459
msgid "Mmr"
msgstr "MMR"
# codice tre lettere per mongolia
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:460
msgid "Mng"
msgstr "MNG"
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:461
msgid "Mongolia"
msgstr "Mongolia"
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:462
msgid "Montenegro"
msgstr "Montenegro"
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:463
msgid "Morocco"
msgstr "Marocco"
-#: ../rules/base.xml.in.h:412 ../rules/sun.xml.in.h:73
+#: ../rules/base.xml.in.h:464
msgid "Multilingual"
msgstr "Multilingue"
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:465
msgid "Multilingual, first part"
msgstr "Multilingue, prima parte"
-#: ../rules/base.xml.in.h:414 ../rules/sun.xml.in.h:74
+#: ../rules/base.xml.in.h:466
msgid "Multilingual, second part"
msgstr "Multilingue, seconda parte"
# UE
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:467
msgid "Myanmar"
msgstr "Birmania"
-# opzioni tastiera giapponese
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:468
msgid "NICOLA-F style Backspace"
msgstr "Backspace stile NICOLA-F"
-# variante tastiera tedesca
-#: ../rules/base.xml.in.h:417
-msgid "Neostyle"
-msgstr "Neostyle"
+# 1.5
+# variante pakistana
+#: ../rules/base.xml.in.h:469
+msgid "NLA"
+msgstr "NLA"
+
+# 1.5
+# variante brasiliana
+#: ../rules/base.xml.in.h:470
+msgid "Nativo"
+msgstr "Nativo"
+
+# 1.5
+# variante brasiliana
+#: ../rules/base.xml.in.h:471
+msgid "Nativo for Esperanto"
+msgstr "Nativo per Esperanto"
+
+# 1.5
+# variante brasiliana
+#: ../rules/base.xml.in.h:472
+msgid "Nativo for USA keyboards"
+msgstr "Nativo per tastiere USA"
+
+# 1.5
+# variante tetheska.... ehm tedesca
+#: ../rules/base.xml.in.h:473
+msgid "Neo 2"
+msgstr "Neo 2"
# shortDesc per Nepal, usato ISO
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:474
msgid "Nep"
msgstr "NPL"
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:475
msgid "Nepal"
msgstr "Nepal"
# UE
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:476
msgid "Netherlands"
msgstr "Paesi Bassi"
# shortDesc per Nigeria, usato ISO
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:477
msgid "Nig"
msgstr "NGA"
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:478
msgid "Nigeria"
msgstr "Nigeria"
# codice tre lettere per paesi bassi
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:479
msgid "Nld"
msgstr "NLD"
+# 1.5
+#: ../rules/base.xml.in.h:480
+msgid "Non-breakable space character at fourth level"
+msgstr "Carattere Spazio non-interrompibile al quarto livello"
+
+# 1.5
+#: ../rules/base.xml.in.h:481
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Carattere Spazio non-interrompibile al quarto livello, carattere Spazio sottile non-interrompibile al sesto livello"
+
+# 1.5
+#: ../rules/base.xml.in.h:482
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
+msgstr "Carattere Spazio non-interrompibile al quarto livello, carattere Spazio sottile non-interrompibile al sesto livello (attraverso Ctrl+Maiusc)"
+
+# 1.5
+#: ../rules/base.xml.in.h:483
+msgid "Non-breakable space character at second level"
+msgstr "Carattere Spazio non-interrompibile al secondo livello"
+
+# 1.5
+#: ../rules/base.xml.in.h:484
+msgid "Non-breakable space character at third level"
+msgstr "Carattere Spazio non-interrompibile al terzo livello"
+
+# 1.5
+#: ../rules/base.xml.in.h:485
+msgid "Non-breakable space character at third level, nothing at fourth level"
+msgstr "Carattere Spazio non-interrompibile al terzo livello, niente al quarto livello"
+
+# 1.5
+#: ../rules/base.xml.in.h:486
+msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Carattere Spazio non-interrompibile al terzo livello, carattere Spazio sottile non-interrompibile al quarto livello"
+
# codice tre lettere per norvegia
-#: ../rules/base.xml.in.h:424 ../rules/sun.xml.in.h:75
+#: ../rules/base.xml.in.h:487
msgid "Nor"
msgstr "NOR"
-#: ../rules/base.xml.in.h:425
+#: ../rules/base.xml.in.h:488
msgid "Northern Saami"
msgstr "Saami settentrinale"
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:489
msgid "Northern Saami, eliminate dead keys"
msgstr "Saami settentrionale, tasti muti rimossi"
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:490
msgid "Northgate OmniKey 101"
msgstr "Northgate OmniKey 101"
# UE
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:491
msgid "Norway"
msgstr "Norvegia"
-#: ../rules/base.xml.in.h:429
-msgid "NumLock LED shows alternative layout."
-msgstr "Il LED di BlocNum mostra la disposizione alternativa."
+# 1.5
+#: ../rules/base.xml.in.h:492
+msgid "NumLock"
+msgstr "BlocNum"
-#: ../rules/base.xml.in.h:430
+# 1.5
+# optionList: kpdl
+# descrizione: Select a keypad KPDL key variant
+#
+# <b>Numeric keypad delete key behaviour</b>
+# (*) Legacy key with dot
+# ( ) Legacy key with comma
+# ( ) Four-level key with dot
+# ( ) Four-level key with dot, latin-9 restriction
+# ( ) Four-level key with comma
+# ( ) Four-level key with momayyez
+# ( ) Four-level key with abstract separators
+# ( ) Semi-colon on third level
+#: ../rules/base.xml.in.h:493
msgid "Numeric keypad delete key behaviour"
-msgstr "Comportamento tasto canc su tastierino numerico"
+msgstr "Comportamento tasto Canc su tastierino numerico"
-#: ../rules/base.xml.in.h:431
-msgid "Numeric keypad keys work as with Mac."
-msgstr "I tasti del tastierino numerico operano come nei Mac."
+# 1.5
+#: ../rules/base.xml.in.h:494
+msgid "Numeric keypad keys work as with Mac"
+msgstr "I tasti del tastierino numerico operano come nei Mac"
-#: ../rules/base.xml.in.h:432
+# optionList: keypad
+# descrizione: Select a keypad type
+#
+# <b>Numeric keypad layout selection</b>
+# (*) Legacy
+# ( ) Unicode additions (arrows and math operators)
+# ( ) Unicode additions (arrows and math operators). Math operators on default level
+# ( ) Legacy Wang 724
+# ( ) Wang 724 keypad with unicode additions (arrows and math operators)
+# ( ) Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level
+# ( ) Hexadecimal
+# ( ) ATM/phone-style
+#
+#: ../rules/base.xml.in.h:495
msgid "Numeric keypad layout selection"
msgstr "Selezione disposizione tastierino numerico"
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:496
msgid "OADG 109A"
msgstr "OADG 109A"
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:497
msgid "OLPC"
msgstr "OLPC"
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:498
msgid "OLPC Dari"
msgstr "OLPC Dari"
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:499
msgid "OLPC Pashto"
msgstr "OLPC Pashto"
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:500
msgid "OLPC Southern Uzbek"
msgstr "OLPC Uzbeco meridionale"
+# 1.6
+# variante francese
+#: ../rules/base.xml.in.h:501
+msgid "Occitan"
+msgstr "Occitana"
+
# Variante irlandese
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:502
msgid "Ogham"
msgstr "Ogham"
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:503
msgid "Ogham IS434"
msgstr "Ogham IS434"
# variante bangladesh
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:504
msgid "Oriya"
msgstr "Oriya"
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:505
msgid "Ortek MCK-800 MM/Internet keyboard"
msgstr "Ortek MCK-800 MM/Internet keyboard"
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:506
msgid "Ossetian"
msgstr "Osseta"
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:507
msgid "Ossetian, Winkeys"
msgstr "Osseta, Winkeys"
-#: ../rules/base.xml.in.h:444
+# 1.5
+#: ../rules/base.xml.in.h:508
+msgid "Ossetian, legacy"
+msgstr "Osseta, vecchia maniera"
+
+#: ../rules/base.xml.in.h:509
msgid "PC-98xx Series"
msgstr "Serie PC-98xx"
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:510
msgid "Pak"
msgstr "PAK"
# UE
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:511
msgid "Pakistan"
msgstr "Pakistan"
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:512
msgid "Pashto"
msgstr "Pashto"
# Variante tailandese
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:513
msgid "Pattachote"
msgstr "Pattachote"
-#: ../rules/base.xml.in.h:449 ../rules/sun.xml.in.h:78
+#: ../rules/base.xml.in.h:514
msgid "Phonetic"
msgstr "Fonetico"
-#: ../rules/base.xml.in.h:450 ../rules/sun.xml.in.h:79
+# 1.6
+# variante russa
+#: ../rules/base.xml.in.h:515
+msgid "Phonetic Winkeys"
+msgstr "Fonetica tasti Win"
+
+#: ../rules/base.xml.in.h:516
msgid "Pol"
msgstr "POL"
# UE
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:517
msgid "Poland"
msgstr "Polonia"
# Variante greca
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:518
msgid "Polytonic"
msgstr "Politonica"
# UE
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:519
msgid "Portugal"
msgstr "Portogallo"
-#: ../rules/base.xml.in.h:454
-msgid "Press Left Alt key to choose 3rd level."
-msgstr "Premere il tasto Alt sinistro per scegliere il 3° livello."
-
-#: ../rules/base.xml.in.h:455
-msgid "Press Left Win-key to choose 3rd level."
-msgstr "Premere il tasto Win sinistro per scegliere il 3° livello."
-
-#: ../rules/base.xml.in.h:456
-msgid "Press Menu key to choose 3rd level."
-msgstr "Premere il tasto Menu per scegliere il 3° livello."
-
-#: ../rules/base.xml.in.h:457
-msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
-msgstr "Premere il tasto Alt destro per scegliere il 3° livello. Maiusc + Alt destro è Multi_Key."
-
-#: ../rules/base.xml.in.h:458
-msgid "Press Right Alt key to choose 3rd level."
-msgstr "Premere il tasto Alt destro per scegliere il 3° livello."
-
-#: ../rules/base.xml.in.h:459
-msgid "Press Right Ctrl to choose 3rd level."
-msgstr "Premere il tasto Ctrl destro per scegliere il 3° livello."
-
-#: ../rules/base.xml.in.h:460
-msgid "Press Right Win-key to choose 3rd level."
-msgstr "Premere il tasto Win destro per scegliere il 3° livello."
-
-#: ../rules/base.xml.in.h:461
-msgid "Press any of Alt keys to choose 3rd level."
-msgstr "Premere uno dei tasti Alt per scegliere il 3° livello."
-
-#: ../rules/base.xml.in.h:462
-msgid "Press any of Win-keys to choose 3rd level."
-msgstr "Premere uno dei tast Win per scegliere il 3° livello."
-
# Variante iraniana con numeri (fila alta e tastierino numerico)
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:520
msgid "Pro"
msgstr "Pro"
# Variante iraniana con numeri in fila alte e lettere sul tastierino
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:521
msgid "Pro Keypad"
msgstr "Pro con tastierino"
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:522
msgid "Probhat"
msgstr "Probhat"
-#: ../rules/base.xml.in.h:466
+# 1.5
+#: ../rules/base.xml.in.h:523
+msgid "Programmer Dvorak"
+msgstr "Dvorak per programmatori"
+
+#: ../rules/base.xml.in.h:524
msgid "Propeller Voyager (KTEZ-1000)"
msgstr "Propeller Voyager (KTEZ-1000)"
# codice tre lettere per portogallo
-#: ../rules/base.xml.in.h:467 ../rules/sun.xml.in.h:88
+#: ../rules/base.xml.in.h:525
msgid "Prt"
msgstr "PRT"
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:526
msgid "QTronix Scorpius 98N+"
msgstr "QTronix Scorpius 98N+"
-#: ../rules/base.xml.in.h:469
-msgid "R-Alt switches layout while pressed."
-msgstr "Il tasto Alt destro commuta la disposizione mentre è premuto."
-
-#: ../rules/base.xml.in.h:470
-msgid "Right Alt is Compose."
-msgstr "Alt destro è Compose."
-
-#: ../rules/base.xml.in.h:471
-msgid "Right Alt key changes layout."
-msgstr "Il tasto Alt destro cambia la disposizione."
+# 1.5
+#: ../rules/base.xml.in.h:527
+msgid "Right Alt"
+msgstr "Alt destro"
-#: ../rules/base.xml.in.h:472 ../rules/sun.xml.in.h:90
-msgid "Right Alt key never chooses 3rd level."
-msgstr ""
+# 1.5
+#: ../rules/base.xml.in.h:528
+msgid "Right Alt (while pressed)"
+msgstr "Alt destro (mentre è premuto)"
-#: ../rules/base.xml.in.h:473
-msgid "Right Ctrl is Compose."
-msgstr "Ctrl destro è Compose."
+# 1.5
+#: ../rules/base.xml.in.h:529
+msgid "Right Alt key never chooses 3rd level"
+msgstr "Il tasto Alt destro non sceglie mai il terzo livello"
-#: ../rules/base.xml.in.h:474
-msgid "Right Ctrl key changes layout."
-msgstr "Il tasto Ctrl destro cambia la disposizione."
+# 1.5
+#: ../rules/base.xml.in.h:530
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr "Alt destro, il tasto Maiusc+Alt destro è Multi_Key"
-#: ../rules/base.xml.in.h:475
-msgid "Right Ctrl key switches layout while pressed."
-msgstr "Il tasto Ctrl destro commuta la disposizione mentre è premuto."
+# 1.5
+#: ../rules/base.xml.in.h:531
+msgid "Right Ctrl"
+msgstr "Ctrl destro"
-#: ../rules/base.xml.in.h:476
-msgid "Right Ctrl key works as Right Alt."
-msgstr "I tasto Ctrl destro opera come il tasto Alt destro."
+# 1.5
+#: ../rules/base.xml.in.h:532
+msgid "Right Ctrl (while pressed)"
+msgstr "Ctrl destro (mentre è premuto)"
-#: ../rules/base.xml.in.h:477
-msgid "Right Shift key changes layout."
-msgstr "Il tasto Maiusc destro cambia la disposizione."
+# 1.5
+#: ../rules/base.xml.in.h:533
+msgid "Right Ctrl as Right Alt"
+msgstr "Ctrl destro come Alt destro"
-#: ../rules/base.xml.in.h:478
-msgid "Right Win-key changes layout."
-msgstr "Il tasto Win destro cambia la disposizione."
+# 1.5
+#: ../rules/base.xml.in.h:534
+msgid "Right Shift"
+msgstr "Maiusc destro"
-# Tweaking the position of the "Compose" key: mapping to existing PC keys
-#: ../rules/base.xml.in.h:479
-msgid "Right Win-key is Compose."
-msgstr "Tasto Win destro è Compose."
+# 1.5
+#: ../rules/base.xml.in.h:535
+msgid "Right Win"
+msgstr "Win destro"
-#: ../rules/base.xml.in.h:480
-msgid "Right Win-key switches layout while pressed."
-msgstr "Il tasto Win destro commuta la disposizione mentre è premuto."
+# 1.5
+#: ../rules/base.xml.in.h:536
+msgid "Right Win (while pressed)"
+msgstr "Win destro (mentre è premuto)"
-#: ../rules/base.xml.in.h:481
+#: ../rules/base.xml.in.h:537
msgid "Right hand"
msgstr "Mano destra"
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:538
msgid "Right handed Dvorak"
msgstr "Dvorak destrorsa"
# UE
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:539
msgid "Romania"
msgstr "Romania"
-#: ../rules/base.xml.in.h:484
+#: ../rules/base.xml.in.h:540
msgid "Romanian keyboard with German letters"
msgstr "Tastiera rumena con lettere tedesche"
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:541
msgid "Romanian keyboard with German letters, eliminate dead keys"
msgstr "Tastiera rumena con lettere tedesche, tasti muti rimossi"
# codice tre lettere per romania
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:542
msgid "Rou"
msgstr "ROU"
# codice tre lettere per russia
-#: ../rules/base.xml.in.h:487 ../rules/sun.xml.in.h:95
+#: ../rules/base.xml.in.h:543
msgid "Rus"
msgstr "RUS"
# UE
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:544
msgid "Russia"
msgstr "Russia"
-#: ../rules/base.xml.in.h:489 ../rules/sun.xml.in.h:96
+#: ../rules/base.xml.in.h:545
msgid "Russian"
msgstr "Russa"
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:546
msgid "Russian phonetic"
msgstr "Fonetica russa"
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:547
msgid "Russian phonetic Dvorak"
msgstr "Dvorak fonetica russa"
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:548
msgid "Russian phonetic, eliminate dead keys"
msgstr "Fonetica russa, tasti muti rimossi"
-#: ../rules/base.xml.in.h:493
+#: ../rules/base.xml.in.h:549
msgid "Russian with Kazakh"
msgstr "Russa con kazaca"
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:550
msgid "SILVERCREST Multimedia Wireless Keyboard"
msgstr "SILVERCREST Multimedia Wireless Keyboard"
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:551
msgid "SK-1300"
msgstr "SK-1300"
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:552
msgid "SK-2500"
msgstr "SK-2500"
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:553
msgid "SK-6200"
msgstr "SK-6200"
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:554
msgid "SK-7100"
msgstr "SK-7100"
# shortDesc per Serbia, usato codice ISO
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:555
msgid "SRB"
msgstr "SRB"
-#: ../rules/base.xml.in.h:500
+#: ../rules/base.xml.in.h:556
msgid "SVEN Ergonomic 2500"
msgstr "SVEN Ergonomic 2500"
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:557
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
+
+#: ../rules/base.xml.in.h:558
msgid "Samsung SDM 4500P"
msgstr "Samsung SDM 4500P"
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:559
msgid "Samsung SDM 4510P"
msgstr "Samsung SDM 4510P"
-#: ../rules/base.xml.in.h:503
-msgid "ScrollLock LED shows alternative layout."
-msgstr ""
+# 1.6
+# non so perché messo nella forma estesa
+# ma ripropongo anche in italiano
+#: ../rules/base.xml.in.h:560
+msgid "Scroll Lock"
+msgstr "Blocca scorrimento"
-#: ../rules/base.xml.in.h:504
+# 1.5
+#: ../rules/base.xml.in.h:561
+msgid "ScrollLock"
+msgstr "BlocScorr"
+
+# 1.5
+# variante canadese
+# No ISO code in ISO639-2, only draft ISO693-3
+#: ../rules/base.xml.in.h:562
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+# 1.5
+#
+# parte di Numeric keypad delete key behaviour
+# vedi descrizione compelta in altro commento
+#: ../rules/base.xml.in.h:563
+msgid "Semi-colon on third level"
+msgstr "Punto e virgola sul terzo livello"
+
+#: ../rules/base.xml.in.h:564
msgid "Serbia"
msgstr "Serbia"
-#: ../rules/base.xml.in.h:505
-msgid "Shift cancels CapsLock."
-msgstr "Maiusc annulla BlocMaiusc."
+# 1.5
+#: ../rules/base.xml.in.h:565
+msgid "Shift cancels CapsLock"
+msgstr "Maiusc annulla BlocMaiusc"
-#: ../rules/base.xml.in.h:506
-msgid "Shift with numeric keypad keys works as in MS Windows."
-msgstr "Maiusc con i tasti del tastierino numerico opera come in MS Windows."
+# 1.5
+#: ../rules/base.xml.in.h:566
+msgid "Shift does not cancel NumLock, chooses 3d level instead"
+msgstr "Maiusc non annulla BlocNum, invece sceglie il terzo livello"
-#: ../rules/base.xml.in.h:507
-msgid "Shift+CapsLock changes layout."
-msgstr "Maiusc+BlocMaiusc cambia la disposizione."
+# 1.5
+#: ../rules/base.xml.in.h:567
+msgid "Shift with numeric keypad keys works as in MS Windows"
+msgstr "Maiusc con i tasti del tastierino numerico opera come in MS Windows"
+
+# 1.5
+#: ../rules/base.xml.in.h:568
+msgid "Shift+CapsLock"
+msgstr "Maiusc+BlocMaiusc"
+
+# 1.5
+# variante greca
+#: ../rules/base.xml.in.h:569
+msgid "Simple"
+msgstr "Semplice"
# UE
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:570
msgid "Slovakia"
msgstr "Slovacchia"
# UE
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:571
msgid "Slovenia"
msgstr "Slovenia"
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:572
msgid "South Africa"
msgstr "Sud Africa"
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:573
msgid "Southern Uzbek"
msgstr "Uzbeko meridionale"
-#: ../rules/base.xml.in.h:512
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:513
-msgid "Space key outputs non-breakable space character at fourth level."
-msgstr ""
-
-#: ../rules/base.xml.in.h:514
-msgid "Space key outputs non-breakable space character at second level."
-msgstr ""
-
-#: ../rules/base.xml.in.h:515
-msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
-msgstr ""
-
-#: ../rules/base.xml.in.h:516
-msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:517
-msgid "Space key outputs non-breakable space character at third level."
-msgstr ""
-
-#: ../rules/base.xml.in.h:518
-msgid "Space key outputs usual space at any level."
-msgstr ""
-
# UE
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:574
msgid "Spain"
msgstr "Spagna"
-#: ../rules/base.xml.in.h:520 ../rules/sun.xml.in.h:103
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
-msgstr "Tasti speciali (Ctrl+Alt+&lt;tasto&gt;) gestiti da un server."
+# 1.5
+#: ../rules/base.xml.in.h:575
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
+msgstr "Tasti speciali (Ctrl+Alt+&lt;tasto&gt;) gestiti in un server"
# codice tre lettere per SriLanka
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:576
msgid "SrL"
msgstr "LKA"
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:577
msgid "Sri Lanka"
msgstr "Sri Lanka"
-#: ../rules/base.xml.in.h:523 ../rules/sun.xml.in.h:104
+#: ../rules/base.xml.in.h:578
msgid "Standard"
msgstr "Standard"
-#: ../rules/base.xml.in.h:524
+# 1.5
+#: ../rules/base.xml.in.h:579
msgid "Standard (Cedilla)"
-msgstr ""
+msgstr "Standard (cediglia)"
-#: ../rules/base.xml.in.h:525
-msgid "Standard (Commabelow)"
-msgstr ""
+# 1.6
+# variante bulgara
+#: ../rules/base.xml.in.h:580
+msgid "Standard Phonetic"
+msgstr "Fonetica standard"
#. RSTU 2019-91
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:582
msgid "Standard RSTU"
msgstr "RSTU standard"
#. RSTU 2019-91
-#: ../rules/base.xml.in.h:529
+#: ../rules/base.xml.in.h:584
msgid "Standard RSTU on Russian layout"
msgstr "RSTU standard su disposizione russa"
-#: ../rules/base.xml.in.h:530 ../rules/sun.xml.in.h:112
+#: ../rules/base.xml.in.h:585
+msgid "Sun Type 5/6"
+msgstr "Sun Type 5/6"
+
+#: ../rules/base.xml.in.h:586
msgid "Sun dead keys"
msgstr "Tasti muti Sun"
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:587
msgid "Super Power Multimedia Keyboard"
msgstr "Super Power Multimedia Keyboard"
-#: ../rules/base.xml.in.h:532
-msgid "Super is mapped to the Win-keys."
-msgstr "Super è mappato sui tasti Win."
-
-#: ../rules/base.xml.in.h:533
+# 1.5
+#: ../rules/base.xml.in.h:588
msgid "Svdvorak"
-msgstr ""
+msgstr "Svdvorak"
# codice tre lettere per repubblica slovacca
-#: ../rules/base.xml.in.h:534 ../rules/sun.xml.in.h:113
+#: ../rules/base.xml.in.h:589
msgid "Svk"
msgstr "SVK"
# codice tre lettere per slovenia
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:590
msgid "Svn"
msgstr "SVN"
-#: ../rules/base.xml.in.h:536
-msgid "Swap Ctrl and CapsLock."
-msgstr "Invertire Ctrl e BlocMaiusc."
-
-#: ../rules/base.xml.in.h:537
-msgid "Swap ESC and CapsLock."
-msgstr "Invertire ESC e BlocMaiusc."
+# 1.5
+#: ../rules/base.xml.in.h:591
+msgid "Swap Ctrl and CapsLock"
+msgstr "Scambiare Ctrl e BlocMaiusc"
-#: ../rules/base.xml.in.h:538
-msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-msgstr ""
+# 1.5
+#: ../rules/base.xml.in.h:592
+msgid "Swap ESC and CapsLock"
+msgstr "Scambiare ESC e BlocMaiusc"
-#: ../rules/base.xml.in.h:539 ../rules/sun.xml.in.h:115
+#: ../rules/base.xml.in.h:593
msgid "Swe"
msgstr "SWE"
# UE
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:594
msgid "Sweden"
msgstr "Svezia"
# UE
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:595
msgid "Switzerland"
msgstr "Svizzera"
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:596
msgid "Symplon PaceBook (tablet PC)"
msgstr "Symplon PaceBook (tablet PC)"
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:597
msgid "Syr"
msgstr "SYR"
# UE
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:598
msgid "Syria"
msgstr "Siria"
# L'aggettivo per Siria in iglese EU sarebbe Syrian
#
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:599
msgid "Syriac"
msgstr "Siriano"
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:600
msgid "Syriac phonetic"
msgstr "Siriano fonetico"
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:601
msgid "TIS-820.2538"
msgstr "TIS-820.2538"
# UE
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:602
msgid "Tajikistan"
msgstr "Tagikistan"
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:603
msgid "Tamil"
msgstr "Tamil"
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:604
msgid "Tamil TAB Typewriter"
msgstr "Tamil TAB macchina per scrivere"
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:605
msgid "Tamil TSCII Typewriter"
msgstr "Tamil TSCII macchina per scrivere"
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:606
msgid "Tamil Unicode"
msgstr "Tamil Unicode"
-# UE
-#: ../rules/base.xml.in.h:553
-#, fuzzy
+#: ../rules/base.xml.in.h:607
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
+
+# 1.5
+# variante russa, come lingua stado a iso639 sarebbe tatarico
+#: ../rules/base.xml.in.h:608
msgid "Tatar"
-msgstr "Malta"
+msgstr "Tatar"
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:609
msgid "Telugu"
msgstr "Telegu"
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:610
msgid "Tha"
msgstr "THA"
# UE
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:611
msgid "Thailand"
msgstr "Thailandia"
-#: ../rules/base.xml.in.h:557 ../rules/sun.xml.in.h:119
-msgid "Third level choosers"
-msgstr "Selettore terzo livello"
-
-#: ../rules/base.xml.in.h:558
+# 1.5
+#: ../rules/base.xml.in.h:612
msgid "Tibetan"
-msgstr ""
+msgstr "Tibetana"
-#: ../rules/base.xml.in.h:559
+# 1.5
+#: ../rules/base.xml.in.h:613
msgid "Tibetan (with ASCII numerals)"
-msgstr ""
+msgstr "Tibetana (con numeri ASCII)"
-#: ../rules/base.xml.in.h:560
+# 1.5
+# variante marocchina, corrispondente al codice iso639 BER (berbero)
+#: ../rules/base.xml.in.h:614
msgid "Tifinagh"
-msgstr ""
+msgstr "Tifinagh"
-#: ../rules/base.xml.in.h:561
-#, fuzzy
+# 1.5
+# variante marocchina
+#: ../rules/base.xml.in.h:615
msgid "Tifinagh Alternative"
-msgstr "Alternativa"
+msgstr "Tifinagh alternativa"
-#: ../rules/base.xml.in.h:562
+# 1.5
+# variante marocchina
+#: ../rules/base.xml.in.h:616
msgid "Tifinagh Alternative Phonetic"
-msgstr ""
+msgstr "Tifinagh alternativa fonetica"
-#: ../rules/base.xml.in.h:563
-#, fuzzy
+# 1.5
+# variante marocchina
+#: ../rules/base.xml.in.h:617
msgid "Tifinagh Extended"
-msgstr "Estesa"
+msgstr "Tifinagh estesa"
-#: ../rules/base.xml.in.h:564
+# 1.5
+# variante marocchina
+#: ../rules/base.xml.in.h:618
msgid "Tifinagh Extended Phonetic"
-msgstr ""
+msgstr "Tifinagh estesa fonetica"
-#: ../rules/base.xml.in.h:565
-#, fuzzy
+# 1.5
+# variante marocchina
+#: ../rules/base.xml.in.h:619
msgid "Tifinagh Phonetic"
-msgstr "Fonetico"
+msgstr "Tifinagh fonetica"
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:620
msgid "Tilde (~) variant"
msgstr "Variante tilde (~)"
# codice tre lettere per tajikistan
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:621
msgid "Tjk"
msgstr "TJK"
-#: ../rules/base.xml.in.h:568
+# 1.5
+#: ../rules/base.xml.in.h:622
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr "Al tasto corrispondente in una tastiera Dvorak."
+
+# 1.5
+#: ../rules/base.xml.in.h:623
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr "Al tasto corrispondente in una tastiera Qwerty."
+
+#: ../rules/base.xml.in.h:624
msgid "Toshiba Satellite S3000"
msgstr "Toshiba Satellite S3000"
-#: ../rules/base.xml.in.h:569
+# 1.6
+# variante bulgara
+#: ../rules/base.xml.in.h:625
+msgid "Traditional Phonetic"
+msgstr "Fonetica tradizionale"
+
+#: ../rules/base.xml.in.h:626
msgid "Trust Direct Access Keyboard"
msgstr "Trust Direct Access Keyboard"
-#: ../rules/base.xml.in.h:570
+# 1.6
+#: ../rules/base.xml.in.h:627
+msgid "Trust Slimline"
+msgstr "Trust Slimline"
+
+#: ../rules/base.xml.in.h:628
msgid "Trust Wireless Keyboard Classic"
msgstr "Trust Wireless Keyboard Classic"
-#: ../rules/base.xml.in.h:571 ../rules/sun.xml.in.h:120
+#: ../rules/base.xml.in.h:629
msgid "Tur"
msgstr "TUR"
-#: ../rules/base.xml.in.h:572
-#, fuzzy
+# 1.5
+#: ../rules/base.xml.in.h:630
msgid "Turkey"
-msgstr "TUR"
+msgstr "Turca"
+
+# 1.6
+# non controllato su UE
+#: ../rules/base.xml.in.h:631
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
# Non sono sicuro vada tradotto
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:632
msgid "Typewriter"
msgstr "Macchina per scrivere"
-#: ../rules/base.xml.in.h:574
+# 1.5
+#: ../rules/base.xml.in.h:633
+msgid "UCW layout (accented letters only)"
+msgstr "Disposizione UCW (solo lettere accentate)"
+
+#: ../rules/base.xml.in.h:634
msgid "US keyboard with Bosnian digraphs"
msgstr "Tastiera USA con digrammi bosniaci"
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:635
msgid "US keyboard with Bosnian letters"
msgstr "Tastiera USA con lettere bosniache"
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:636
msgid "US keyboard with Croatian digraphs"
msgstr "Tastiera USA con digrammi croati"
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:637
msgid "US keyboard with Croatian letters"
msgstr "Tastiera USA con lettere croate"
-#: ../rules/base.xml.in.h:578
-#, fuzzy
+# 1.5
+#: ../rules/base.xml.in.h:638
msgid "US keyboard with Estonian letters"
-msgstr "Tastiera USA con lettere bosniache"
+msgstr "Tastiera USA con lettere estoni"
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:639
msgid "US keyboard with Lithuanian letters"
msgstr "Tastiera USA con lettere lituane"
-# o slovacchi?
-#: ../rules/base.xml.in.h:580
-msgid "US keyboard with Slovenian digraphs"
-msgstr "Tastiera USA con digrammi sloveni"
-
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:640
msgid "US keyboard with Slovenian letters"
msgstr "Tastiera USA con lettere slovene"
-#: ../rules/base.xml.in.h:582 ../rules/sun.xml.in.h:126
+#: ../rules/base.xml.in.h:641
msgid "USA"
msgstr "USA"
-#: ../rules/base.xml.in.h:583
-#, fuzzy
+# 1.5
+# variante russa
+#: ../rules/base.xml.in.h:642
msgid "Udmurt"
-msgstr "Urdu"
+msgstr "Udmurt"
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:643
msgid "Ukr"
msgstr "UKR"
# UE
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:644
msgid "Ukraine"
msgstr "Ucraina"
+# 1.5
+#: ../rules/base.xml.in.h:645
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Aggiunte unicode (frecce e operatori matematici)"
+
+# 1.5
+#: ../rules/base.xml.in.h:646
+msgid "Unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Aggiunte unicode (frecce e operatori matematici). Operatori matematici sul livello predefinito"
+
# Sarà da tradurre? -Luca
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:647
msgid "UnicodeExpert"
msgstr "UnicodeEsperto"
# UE
-#: ../rules/base.xml.in.h:587 ../rules/sun.xml.in.h:127
+#: ../rules/base.xml.in.h:648
msgid "United Kingdom"
msgstr "Regno Unito"
-#: ../rules/base.xml.in.h:588
-msgid "Urdu"
-msgstr "Urdu"
+#: ../rules/base.xml.in.h:649
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
-#: ../rules/base.xml.in.h:589
+# 1.5
+#: ../rules/base.xml.in.h:650
+msgid "Urdu, Alternative phonetic"
+msgstr "Urdu, alternativa fonetica"
+
+# 1.5
+#: ../rules/base.xml.in.h:651
+msgid "Urdu, Phonetic"
+msgstr "Urdu, fonetica"
+
+# 1.5
+#: ../rules/base.xml.in.h:652
+msgid "Urdu, Winkeys"
+msgstr "Urdu, tasti Win"
+
+#: ../rules/base.xml.in.h:653
msgid "Use Bosnian digraphs"
msgstr "Usa digrammi bosniaci"
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:654
msgid "Use Croatian digraphs"
msgstr "Usa digrammi croati"
-#: ../rules/base.xml.in.h:591
-msgid "Use Slovenian digraphs"
-msgstr "Usa digrammi sloveni"
-
-#: ../rules/base.xml.in.h:592
-#, fuzzy
+# 1.5
+#: ../rules/base.xml.in.h:655
msgid "Use guillemets for quotes"
-msgstr "Usa caporali («») per virgolette (\"\")"
+msgstr "Usa caporali per virgolette"
-# Using startard LEDs to indicate the alternative (not first) group(s)
-#: ../rules/base.xml.in.h:593
-#, fuzzy
-msgid "Use keyboard LED to show alternative layout."
-msgstr "Usare LED della tastiera per mostrare il gruppo alternativo."
+# 1.5
+# optionList: grp_lkd
+# descrizione: Using startard LEDs to indicate the alternative (not first) group(s)
+#
+# <b>Use keyboard LED to show alternative layout</b>
+# [*] NumLock
+# [ ] CapsLock
+# [*] ScrollLock
+#
+#: ../rules/base.xml.in.h:656
+msgid "Use keyboard LED to show alternative layout"
+msgstr "Usare i LED della tastiera per mostrare il gruppo alternativo"
-#: ../rules/base.xml.in.h:594
+# 1.5
+# optionList: nbsp
+# descrizione: Let space output nobreakspace for the desired level
+#
+# <b>Using space key to input non-breakable space character</b><
+# (*) Usual space at any level
+# ( ) Non-breakable space character at second level
+# ( ) Non-breakable space character at third level
+# ( ) Non-breakable space character at third level, nothing at fourth level
+# ( ) Non-breakable space character at third level, thin non-breakable space character at fourth level
+# ( ) Non-breakable space character at fourth level
+# ( ) Non-breakable space character at fourth level, thin non-breakable space character at sixth level
+# ( ) Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)
+#
+#: ../rules/base.xml.in.h:657
msgid "Using space key to input non-breakable space character"
-msgstr ""
+msgstr "Uso del tasto Spazio per inserire carattere di spazio non-interrompibile"
-#: ../rules/base.xml.in.h:595
+# 1.5
+#: ../rules/base.xml.in.h:658
+msgid "Usual space at any level"
+msgstr "Solito Spazio a ogni livello"
+
+#: ../rules/base.xml.in.h:659
msgid "Uzb"
msgstr "UZB"
# UE
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:660
msgid "Uzbekistan"
msgstr "Uzbekistan"
# UE
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:661
msgid "Vietnam"
msgstr "Vietnam"
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:662
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "ViewSonic KU-306 Internet Keyboard"
+
+#: ../rules/base.xml.in.h:663
msgid "Vnm"
msgstr "VNK"
-#: ../rules/base.xml.in.h:599
+# 1.5
+#: ../rules/base.xml.in.h:664
msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
-msgstr ""
+msgstr "Tastierino Wang 724 con aggiunte unicode (frecce e operatori matematici)"
-#: ../rules/base.xml.in.h:600
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr ""
+# 1.5
+#: ../rules/base.xml.in.h:665
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Tastierino Wang 724 con aggiunte unicode (frecce e operatori matematici). Operatori matematici sul livello predefinito"
-#: ../rules/base.xml.in.h:601
+# 1.5
+# variante belga
+#: ../rules/base.xml.in.h:666
msgid "Wang model 724 azerty"
-msgstr ""
+msgstr "Wang modello 724 azerty"
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:667
msgid "Western"
-msgstr ""
+msgstr "Occidentale"
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:668
msgid "Winbook Model XP5"
msgstr "Winbook Model XP5"
# variante bielorussa
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:669
msgid "Winkeys"
msgstr "Tasti Win"
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:670
msgid "With &lt;\\|&gt; key"
msgstr "Con tasti &lt;\\|&gt;"
-#: ../rules/base.xml.in.h:606
-#, fuzzy
+# 1.5
+#: ../rules/base.xml.in.h:671
msgid "With EuroSign on 5"
-msgstr "Aggiungere il simbolo € al tasto 5."
+msgstr "Con simbolo € sul 5"
-# i caporali sono «» li aggiungo? -Luca
-#
-# Con caporali («»)
-#
-#: ../rules/base.xml.in.h:607
-#, fuzzy
+# 1.5
+#: ../rules/base.xml.in.h:672
msgid "With guillemets"
-msgstr "Con caporali («»)"
+msgstr "Con caporali"
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:673
msgid "Yahoo! Internet Keyboard"
msgstr "Yahoo! Internet Keyboard"
-#: ../rules/base.xml.in.h:609
+# 1.5
+# codice iso sah
+#: ../rules/base.xml.in.h:674
+msgid "Yakut"
+msgstr "Yakut"
+
+# 1.5
+# codice iso yor, yo
+#: ../rules/base.xml.in.h:675
msgid "Yoruba"
-msgstr ""
+msgstr "Yoruba"
-#: ../rules/base.xml.in.h:610
+# 1.5
+#: ../rules/base.xml.in.h:676
msgid "Z and ZHE swapped"
-msgstr "Z e ZHE invertiti"
+msgstr "Z e ZHE scambiati"
-#: ../rules/base.xml.in.h:611
+# 1.5
+# descrione breve per sudafrica, usato iso3166 3 caratteri
+#: ../rules/base.xml.in.h:677
msgid "Zar"
-msgstr ""
+msgstr "ZAF"
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:678
msgid "azerty"
msgstr "azerty"
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:679
msgid "azerty/digits"
msgstr "azerty/cifre"
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:680
msgid "digits"
msgstr "cifre"
-#: ../rules/base.xml.in.h:615
+# 1.5
+# variante esperanto
+#
+# to diplace: 1) spostare, rimuovere; dislocare
+# 2) rimpiazzare, sostituire
+# 3) soppiantare
+#
+# sarà corretto spostate???
+#: ../rules/base.xml.in.h:681
msgid "displaced semicolon and quote (obsolete)"
-msgstr ""
+msgstr "Punto e virgola e virgolette spostate (obsoleta)"
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:682
msgid "lyx"
msgstr "lyx"
-#: ../rules/base.xml.in.h:617 ../rules/sun.xml.in.h:132
+#: ../rules/base.xml.in.h:683
msgid "qwerty"
-msgstr "querty"
+msgstr "qwerty"
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:684
msgid "qwerty, extended Backslash"
msgstr "qwerty, backslash esteso"
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:685
msgid "qwerty/digits"
msgstr "querty/cifre"
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:686
msgid "qwertz"
msgstr "qwertz"
-# Non sono sicuro vada tradotto
-#: ../rules/sun.xml.in.h:1
-#, fuzzy
-msgid "\"Typewriter\""
-msgstr "Macchina per scrivere"
-
-#: ../rules/sun.xml.in.h:17
-#, fuzzy
-msgid "Acts as Shift with locking. Shift cancels Caps."
-msgstr "BlocMaiusc agisce come Maiusc con il blocco. Maiusc annulla BlocMaiusc."
-
-#: ../rules/sun.xml.in.h:18
-#, fuzzy
-msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
-msgstr "BlocMaiusc agisce come Maiusc con il blocco. Maiusc non annulla BlocMaiusc."
-
-#: ../rules/sun.xml.in.h:19
-#, fuzzy
-msgid "Alt+Control changes group"
-msgstr "Alt+Ctrl cambia il gruppo."
-
-#: ../rules/sun.xml.in.h:20
-#, fuzzy
-msgid "Alt+Shift changes group"
-msgstr "Alt+Maiusc cambia il gruppo."
-
-#: ../rules/sun.xml.in.h:21
-msgid "Basic"
-msgstr ""
-
-# UE
-#: ../rules/sun.xml.in.h:23
-#, fuzzy
-msgid "Belgian"
-msgstr "Belgio"
-
-#: ../rules/sun.xml.in.h:25
-#, fuzzy
-msgid "Both Alt keys together change group"
-msgstr "I tasti Alt insieme cambiano gruppo."
-
-#: ../rules/sun.xml.in.h:26
-#, fuzzy
-msgid "Both Ctrl keys together change group"
-msgstr "I tasti Ctrl insieme cambiano gruppo."
-
-#: ../rules/sun.xml.in.h:27
-#, fuzzy
-msgid "Both Shift keys together change group"
-msgstr "I tasti Maiusc insieme cambiano gruppo."
-
-# UE
-#: ../rules/sun.xml.in.h:28
-msgid "Bulgarian"
-msgstr "Bulgara"
-
-# UE
-#: ../rules/sun.xml.in.h:30
-msgid "Canadian"
-msgstr "Canadese"
-
-#: ../rules/sun.xml.in.h:31
-msgid "Caps Lock is Compose"
-msgstr "BlocMaiusc è Compose"
-
-#: ../rules/sun.xml.in.h:32
-msgid "Caps Lock key changes group"
-msgstr "Il tasto BlocMaiusc cambia il gruppo"
-
-#: ../rules/sun.xml.in.h:34
-#, fuzzy
-msgid "Caps_Lock LED shows alternative group"
-msgstr "Il LED BlocMaiusc mostra il gruppo alternativo."
+#~ msgid "Brazilian ABNT2"
+#~ msgstr "Brasiliana ABNT2"
-#: ../rules/sun.xml.in.h:35
-msgid "Control Key Position"
-msgstr "Posizione tasto Control"
+#~ msgid "Japanese 106-key"
+#~ msgstr "Giapponese 106 tasti"
-#: ../rules/sun.xml.in.h:36
-msgid "Control key at bottom left"
-msgstr "Il tasto Control è in basso a sinistra"
+# 1.5
+# shortDesc per Kyrgyzstan, usato codice iso3166
+#~ msgid "Kir"
+#~ msgstr "KGZ"
-#: ../rules/sun.xml.in.h:37
-msgid "Control key at left of 'A'"
-msgstr "Il tasto Control è a sinistra di «A»"
+#~ msgid "Korean 106-key"
+#~ msgstr "Coreana 106 tasti"
-#: ../rules/sun.xml.in.h:38
-msgid "Control+Shift changes group"
-msgstr "Control+Maiusc cambia il gruppo"
+# 1.5
+#~ msgid "Super is mapped to Win keys"
+#~ msgstr "Super è applicato ai tasti Win"
-# UE
-#: ../rules/sun.xml.in.h:40
-msgid "Czech"
-msgstr ""
-
-#: ../rules/sun.xml.in.h:41
-msgid "Danish"
-msgstr ""
-
-# codice tre lettere per germania<
-#: ../rules/sun.xml.in.h:45
-msgid "DeuCH"
-msgstr ""
-
-#: ../rules/sun.xml.in.h:47
-msgid "Dvo"
-msgstr ""
-
-#: ../rules/sun.xml.in.h:52
-msgid "Finnish"
-msgstr ""
-
-#: ../rules/sun.xml.in.h:54
-msgid "FraCH"
-msgstr ""
-
-# UE
-#: ../rules/sun.xml.in.h:57
-msgid "German"
-msgstr ""
-
-# questo shift non indica il tasto maiusc.
-# Cfr la capplet di GNOME per le opzioni relative.
-#: ../rules/sun.xml.in.h:58
-msgid "Group Shift/Lock behavior"
-msgstr "Comportamento cambio/blocco del gruppo"
-
-# UE
-#: ../rules/sun.xml.in.h:60
-msgid "Hungarian"
-msgstr "Ungherese"
-
-# UE
-#: ../rules/sun.xml.in.h:64
-msgid "Italian"
-msgstr "Italiana"
-
-# UE
-#: ../rules/sun.xml.in.h:65
-msgid "Japanese"
-msgstr "Giapponese"
-
-#: ../rules/sun.xml.in.h:67
-msgid "Left Alt key changes group"
-msgstr "Il tasto Alt sinistro cambia il gruppo"
-
-#: ../rules/sun.xml.in.h:68
-msgid "Left Alt key switches group while pressed"
-msgstr "Il tasto Alt sinistro commuta il gruppo mentre è premuto"
-
-#: ../rules/sun.xml.in.h:69
-msgid "Left Ctrl key changes group"
-msgstr "Il tasto Ctrl sinistro cambia il gruppo"
-
-#: ../rules/sun.xml.in.h:70
-msgid "Left Shift key changes group"
-msgstr "Il tasto Maiusc sinistro cambia il gruppo"
-
-#: ../rules/sun.xml.in.h:71
-msgid "Make CapsLock an additional Control"
-msgstr "Rendere BlocMaiusc un Control aggiuntivo"
-
-# UE
-#: ../rules/sun.xml.in.h:76
-msgid "Norwegian"
-msgstr ""
-
-#: ../rules/sun.xml.in.h:77
-#, fuzzy
-msgid "Num_Lock LED shows alternative group"
-msgstr "Il LED BloccaNum mostra il gruppo alternativo."
-
-#: ../rules/sun.xml.in.h:80
-#, fuzzy
-msgid "Polish"
-msgstr "POL"
-
-#: ../rules/sun.xml.in.h:81
-msgid "Polish with Polish quotes on key \"1/!\""
-msgstr ""
-
-#: ../rules/sun.xml.in.h:82
-msgid "Portuguese"
-msgstr "Portoghese"
-
-#: ../rules/sun.xml.in.h:83
-msgid "Press Left Alt key to choose 3rd level"
-msgstr "Premere il tasto Alt sinistro per scegliere il 3° livello"
-
-#: ../rules/sun.xml.in.h:84
-msgid "Press Right Alt key to choose 3rd level"
-msgstr "Premere il tasto Alt destro per scegliere il 3° livello"
-
-#: ../rules/sun.xml.in.h:85
-#, fuzzy
-msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
-msgstr "Premere il tasto Alt destro per scegliere il 3° livello."
-
-#: ../rules/sun.xml.in.h:86
-msgid "Press Right Control to choose 3rd level"
-msgstr "Premere il tasto Control destro per scegliere il 3° livello"
-
-#: ../rules/sun.xml.in.h:87
-msgid "Press any of Alt keys to choose 3rd level"
-msgstr "Premere uno dei tasti Alt per scegliere il 3° livello"
-
-#: ../rules/sun.xml.in.h:89
-msgid "Right Alt key changes group"
-msgstr "Il tasto Alt destro cambia il gruppo"
-
-#: ../rules/sun.xml.in.h:91
-msgid "Right Alt switches group while pressed"
-msgstr "Il tasto Alt destro commuta il gruppo mentre è premuto"
-
-#: ../rules/sun.xml.in.h:92
-msgid "Right Control key works as Right Alt"
-msgstr "I tasto Control destro opera come il tasto Alt destro"
-
-#: ../rules/sun.xml.in.h:93
-msgid "Right Ctrl key changes group"
-msgstr "Il tasto Ctrl destro cambia il gruppo"
-
-#: ../rules/sun.xml.in.h:94
-msgid "Right Shift key changes group"
-msgstr "Il tasto Maiusc destro cambia il gruppo"
-
-#: ../rules/sun.xml.in.h:97
-msgid "Scroll Lock changes group"
-msgstr "BlocMaiusc cambia il gruppo"
-
-#: ../rules/sun.xml.in.h:98
-#, fuzzy
-msgid "Scroll_Lock LED shows alternative group"
-msgstr "Il LED BlocScorr mostra il gruppo alternativo."
-
-#: ../rules/sun.xml.in.h:99
-#, fuzzy
-msgid "Shift with numpad keys works as in MS Windows"
-msgstr "Maiusc assieme ai tasti numerici opera come in MS Windows."
-
-#: ../rules/sun.xml.in.h:100
-msgid "Shift+CapsLock changes group"
-msgstr "Maiusc+BlocMaiusc cambia la disposizione."
-
-#: ../rules/sun.xml.in.h:101
-msgid "Slovak"
-msgstr ""
-
-#: ../rules/sun.xml.in.h:102
-msgid "Spanish"
-msgstr "Spagnola"
-
-#: ../rules/sun.xml.in.h:105
-msgid "Sun Type 4"
-msgstr ""
-
-#: ../rules/sun.xml.in.h:106
-msgid "Sun Type 5"
-msgstr ""
-
-#: ../rules/sun.xml.in.h:107
-msgid "Sun Type 5 European"
-msgstr ""
-
-#: ../rules/sun.xml.in.h:108
-msgid "Sun Type 5 Unix"
-msgstr ""
-
-#: ../rules/sun.xml.in.h:109
-msgid "Sun Type 6"
-msgstr ""
-
-#: ../rules/sun.xml.in.h:110
-msgid "Sun Type 6 Unix"
-msgstr ""
-
-#: ../rules/sun.xml.in.h:111
-msgid "Sun Type 6 with Euro key"
-msgstr ""
-
-#: ../rules/sun.xml.in.h:114
-msgid "Swap Control and Caps Lock"
-msgstr "Invertire Control e BlocMaiusc."
-
-#: ../rules/sun.xml.in.h:116
-msgid "Swedish"
-msgstr ""
-
-#: ../rules/sun.xml.in.h:117
-msgid "Swiss French"
-msgstr ""
-
-# UE
-#: ../rules/sun.xml.in.h:118
-msgid "Swiss German"
-msgstr ""
-
-# UE
-#: ../rules/sun.xml.in.h:121
-msgid "Turkish"
-msgstr "Turco"
-
-# UE
-#: ../rules/sun.xml.in.h:122
-#, fuzzy
-msgid "Turkish (F)"
-msgstr "Turco"
-
-#: ../rules/sun.xml.in.h:123
-msgid "Turkish Alt-Q Layout"
-msgstr ""
-
-#: ../rules/sun.xml.in.h:124
-msgid "U.S. English"
-msgstr "Inglese americano"
-
-#: ../rules/sun.xml.in.h:125
-msgid "U.S. English w/ ISO9995-3"
-msgstr "Inglese americano w/ ISO9995-3"
-
-# Using startard LEDs to indicate the alternative (not first) group(s)
-#: ../rules/sun.xml.in.h:128
-#, fuzzy
-msgid "Use keyboard LED to show alternative group"
-msgstr "Usare LED della tastiera per mostrare il gruppo alternativo."
+# o slovacchi?
+#~ msgid "US keyboard with Slovenian digraphs"
+#~ msgstr "Tastiera USA con digrammi sloveni"
-# "Internal" capitalization means capitalization using some internal tables.
-# Otherwise "as Shift" - means using next group.
-#: ../rules/sun.xml.in.h:129
-#, fuzzy
-msgid "Uses internal capitalization. Shift cancels Caps."
-msgstr "BlocMaiusc attiva l'uso interno delle lettere maiuscole. Maiusc annulla BlocMaiusc."
-
-#: ../rules/sun.xml.in.h:130
-#, fuzzy
-msgid "Uses internal capitalization. Shift doesn't cancel Caps."
-msgstr "BlocMaiusc attiva l'uso interno delle lettere maiuscole. Maiusc non annulla BlocMaiusc."
-
-#: ../rules/sun.xml.in.h:131
-msgid "bksl"
-msgstr ""
+# 1.5
+#~ msgid "Unicode"
+#~ msgstr "Unicode"
-#: ../rules/sun.xml.in.h:133
-msgid "type4"
-msgstr ""
+#~ msgid "Use Slovenian digraphs"
+#~ msgstr "Usa digrammi sloveni"
diff --git a/xorg-server/xkbdata.src/po/ko.po b/xorg-server/xkbdata.src/po/ko.po
index 0c696ea48..09cf830b2 100644
--- a/xorg-server/xkbdata.src/po/ko.po
+++ b/xorg-server/xkbdata.src/po/ko.po
@@ -1,2817 +1,3132 @@
+# xkeyboard-config Korean translation
# This file is distributed under the same license as the xkeyboard-config package.
-# Changwoo Ryu <cwryu@ddebian.org>, 2007, 2008.
+# Changwoo Ryu <cwryu@ddebian.org>, 2007, 2008, 2009.
#
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config 1.2-pre1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-15 21:41+0000\n"
-"PO-Revision-Date: 2008-01-23 20:50+0900\n"
+"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-01-14 18:59+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\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/base.xml.in.h:1 ../rules/evdev.xml.in.h:1
msgid "(F)"
msgstr "(F)"
-#: ../rules/base.xml.in.h:2
+#: ../rules/base.xml.in.h:2 ../rules/evdev.xml.in.h:2
msgid "(Legacy) Alternative"
-msgstr "(구형) 다른 버전"
+msgstr "(구형 방식) 다른 버전"
-#: ../rules/base.xml.in.h:3
+#: ../rules/base.xml.in.h:3 ../rules/evdev.xml.in.h:3
msgid "(Legacy) Alternative, Sun dead keys"
-msgstr "(구형) 다른 버전, 썬 데드키"
+msgstr "(구형 방식) 다른 버전, 썬 데드키"
-#: ../rules/base.xml.in.h:4
+#: ../rules/base.xml.in.h:4 ../rules/evdev.xml.in.h:4
msgid "(Legacy) Alternative, eliminate dead keys"
-msgstr "(구형) 다른 버전, 데드키 없음"
+msgstr "(구형 방식) 다른 버전, 데드키 없음"
-#: ../rules/base.xml.in.h:5
-msgid "(Legacy) Dvorak"
-msgstr "(구형) 드보락"
-
-#: ../rules/base.xml.in.h:6
+#: ../rules/base.xml.in.h:5 ../rules/evdev.xml.in.h:5
msgid "101/104 key Compatible"
msgstr "101/104키 호환"
-#: ../rules/base.xml.in.h:7 ../rules/sun.xml.in.h:2
+#: ../rules/base.xml.in.h:6 ../rules/evdev.xml.in.h:6
msgid "101/qwerty/comma/Dead keys"
msgstr "101/QWERTY/쉼표/데드키"
-#: ../rules/base.xml.in.h:8 ../rules/sun.xml.in.h:3
+#: ../rules/base.xml.in.h:7 ../rules/evdev.xml.in.h:7
msgid "101/qwerty/comma/Eliminate dead keys"
msgstr "101/QWERTY/쉼표/데드키 없음"
-#: ../rules/base.xml.in.h:9 ../rules/sun.xml.in.h:4
+#: ../rules/base.xml.in.h:8 ../rules/evdev.xml.in.h:8
msgid "101/qwerty/dot/Dead keys"
msgstr "101/QWERTY/점/데드키"
-#: ../rules/base.xml.in.h:10 ../rules/sun.xml.in.h:5
+#: ../rules/base.xml.in.h:9 ../rules/evdev.xml.in.h:9
msgid "101/qwerty/dot/Eliminate dead keys"
msgstr "101/QWERTY/점/데드키 없음"
-#: ../rules/base.xml.in.h:11 ../rules/sun.xml.in.h:6
+#: ../rules/base.xml.in.h:10 ../rules/evdev.xml.in.h:10
msgid "101/qwertz/comma/Dead keys"
msgstr "101/QWERTZ/쉼표/데드키"
-#: ../rules/base.xml.in.h:12
+#: ../rules/base.xml.in.h:11 ../rules/evdev.xml.in.h:11
msgid "101/qwertz/comma/Eliminate dead keys"
msgstr "101/QWERTZ/쉼표/데드키 없음"
-#: ../rules/base.xml.in.h:13 ../rules/sun.xml.in.h:7
+#: ../rules/base.xml.in.h:12 ../rules/evdev.xml.in.h:12
msgid "101/qwertz/dot/Dead keys"
msgstr "101/QWERTZ/점/데드키"
-#: ../rules/base.xml.in.h:14 ../rules/sun.xml.in.h:8
+#: ../rules/base.xml.in.h:13 ../rules/evdev.xml.in.h:13
msgid "101/qwertz/dot/Eliminate dead keys"
msgstr "101/QWERTZ/점/데드키 없음"
-#: ../rules/base.xml.in.h:15 ../rules/sun.xml.in.h:9
+#: ../rules/base.xml.in.h:14 ../rules/evdev.xml.in.h:14
msgid "102/qwerty/comma/Dead keys"
msgstr "102/QWERTY/쉼표/데드키"
-#: ../rules/base.xml.in.h:16 ../rules/sun.xml.in.h:10
+#: ../rules/base.xml.in.h:15 ../rules/evdev.xml.in.h:15
msgid "102/qwerty/comma/Eliminate dead keys"
msgstr "102/QWERTY/쉼표/데드키 없음"
-#: ../rules/base.xml.in.h:17 ../rules/sun.xml.in.h:11
+#: ../rules/base.xml.in.h:16 ../rules/evdev.xml.in.h:16
msgid "102/qwerty/dot/Dead keys"
msgstr "102/QWERTY/점/데드키"
-#: ../rules/base.xml.in.h:18 ../rules/sun.xml.in.h:12
+#: ../rules/base.xml.in.h:17 ../rules/evdev.xml.in.h:17
msgid "102/qwerty/dot/Eliminate dead keys"
msgstr "102/QWERTY/점/데드키 없음"
-#: ../rules/base.xml.in.h:19 ../rules/sun.xml.in.h:13
+#: ../rules/base.xml.in.h:18 ../rules/evdev.xml.in.h:18
msgid "102/qwertz/comma/Dead keys"
msgstr "102/QWERTZ/쉼표/데드키"
-#: ../rules/base.xml.in.h:20 ../rules/sun.xml.in.h:14
+#: ../rules/base.xml.in.h:19 ../rules/evdev.xml.in.h:19
msgid "102/qwertz/comma/Eliminate dead keys"
msgstr "102/QWERTZ/쉼표/데드키 없음"
-#: ../rules/base.xml.in.h:21 ../rules/sun.xml.in.h:15
+#: ../rules/base.xml.in.h:20 ../rules/evdev.xml.in.h:20
msgid "102/qwertz/dot/Dead keys"
msgstr "102/QWERTZ/점/데드키"
-#: ../rules/base.xml.in.h:22 ../rules/sun.xml.in.h:16
+#: ../rules/base.xml.in.h:21 ../rules/evdev.xml.in.h:21
msgid "102/qwertz/dot/Eliminate dead keys"
msgstr "102/QWERTZ/점/데드키 없음"
-#: ../rules/base.xml.in.h:23
+#: ../rules/base.xml.in.h:22 ../rules/evdev.xml.in.h:22
+msgid "2"
+msgstr "2"
+
+#: ../rules/base.xml.in.h:23 ../rules/evdev.xml.in.h:23
+msgid "4"
+msgstr "4"
+
+#: ../rules/base.xml.in.h:24 ../rules/evdev.xml.in.h:24
+msgid "5"
+msgstr "5"
+
+#: ../rules/base.xml.in.h:25 ../rules/evdev.xml.in.h:25
msgid "A4Tech KB-21"
msgstr "A4Tech KB-21"
-#: ../rules/base.xml.in.h:24
+#: ../rules/base.xml.in.h:26 ../rules/evdev.xml.in.h:26
msgid "A4Tech KBS-8"
msgstr "A4Tech KBS-8"
-#: ../rules/base.xml.in.h:25
+#: ../rules/base.xml.in.h:27 ../rules/evdev.xml.in.h:27
msgid "A4Tech Wireless Desktop RFKB-23"
msgstr "A4Tech Wireless Desktop RFKB-23"
-#: ../rules/base.xml.in.h:26
+#: ../rules/base.xml.in.h:28 ../rules/evdev.xml.in.h:28
msgid "ACPI Standard"
msgstr "ACPI 표준"
-#: ../rules/base.xml.in.h:27
+#: ../rules/base.xml.in.h:29 ../rules/evdev.xml.in.h:29
+msgid "ATM/phone-style"
+msgstr "ATM/전화기형태"
+
+#: ../rules/base.xml.in.h:30 ../rules/evdev.xml.in.h:30
msgid "Acer AirKey V"
msgstr "에이서 AirKey V"
-#: ../rules/base.xml.in.h:28
+#: ../rules/base.xml.in.h:31 ../rules/evdev.xml.in.h:31
msgid "Acer C300"
msgstr "에이서 C300"
-#: ../rules/base.xml.in.h:29
+#: ../rules/base.xml.in.h:32 ../rules/evdev.xml.in.h:32
msgid "Acer Ferrari 4000"
msgstr "에이서 Ferrari 4000"
-#: ../rules/base.xml.in.h:30
+#: ../rules/base.xml.in.h:33 ../rules/evdev.xml.in.h:33
msgid "Acer Laptop"
msgstr "에이서 노트북"
-#: ../rules/base.xml.in.h:31
-msgid "Add the EuroSign to the 2 key."
-msgstr "유로 기호를 2 키에 추가."
-
-#: ../rules/base.xml.in.h:32
-msgid "Add the EuroSign to the 4 key."
-msgstr "유로 기호를 4 키에 추가."
+#: ../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:33
-msgid "Add the EuroSign to the 5 key."
-msgstr "유로 기호를 5 키에 추가."
+#: ../rules/base.xml.in.h:35 ../rules/evdev.xml.in.h:35
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "에스페란토 곡절 악센트 (curcimflex) 추가"
-#: ../rules/base.xml.in.h:34
-msgid "Add the EuroSign to the E key."
-msgstr "유로 기호를 E 키에 추가."
+#: ../rules/base.xml.in.h:36 ../rules/evdev.xml.in.h:36
+msgid "Adding EuroSign to certain keys"
+msgstr "유로 기호를 특정 키에 추가"
-#: ../rules/base.xml.in.h:35
-msgid "Add the standard behavior to Menu key."
-msgstr "메뉴 키에 기본 동작 추가."
-
-#: ../rules/base.xml.in.h:36
-msgid "Adding the EuroSign to certain keys"
-msgstr "유로기호를 특정 키에 추가"
-
-#: ../rules/base.xml.in.h:37
+#: ../rules/base.xml.in.h:37 ../rules/evdev.xml.in.h:37
msgid "Advance Scorpius KI"
msgstr "Advance Scorpius KI"
-#: ../rules/base.xml.in.h:38
+#: ../rules/base.xml.in.h:38 ../rules/evdev.xml.in.h:38
msgid "Afg"
msgstr "아프가니스탄"
-#: ../rules/base.xml.in.h:39
+#: ../rules/base.xml.in.h:39 ../rules/evdev.xml.in.h:39
msgid "Afghanistan"
msgstr "아프가니스탄"
-#: ../rules/base.xml.in.h:40
+#: ../rules/base.xml.in.h:40 ../rules/evdev.xml.in.h:40
msgid "Akan"
msgstr "아칸"
-#: ../rules/base.xml.in.h:41
+#: ../rules/base.xml.in.h:41 ../rules/evdev.xml.in.h:41
msgid "Alb"
msgstr "알바니아"
-#: ../rules/base.xml.in.h:42
+#: ../rules/base.xml.in.h:42 ../rules/evdev.xml.in.h:42
msgid "Albania"
msgstr "알바니아"
-#: ../rules/base.xml.in.h:43
-msgid "Alt and Meta are on the Alt keys."
-msgstr "Alt와 Meta가 Alt 키에 있습니다."
+#: ../rules/base.xml.in.h:43 ../rules/evdev.xml.in.h:43
+msgid "Alt and Meta are on Alt keys"
+msgstr "Alt와 Meta를 Alt 키에"
+
+#: ../rules/base.xml.in.h:44 ../rules/evdev.xml.in.h:44
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr "Alt 키를 오른쪽 윈도우 키로 매핑, Super 키를 메뉴 키로 매핑"
-#: ../rules/base.xml.in.h:44
-msgid "Alt is mapped to the right Win-key and Super to Menu."
-msgstr "Alt 키가 윈도우 키로 매핑되고, Super 키가 메뉴 키로 매핑됩니다."
+#: ../rules/base.xml.in.h:45 ../rules/evdev.xml.in.h:45
+msgid "Alt+CapsLock"
+msgstr "Alt+CapsLock"
-#: ../rules/base.xml.in.h:45
-msgid "Alt+CapsLock changes layout."
-msgstr "Alt+CapsLock으로 배치를 바꿉니다."
+#: ../rules/base.xml.in.h:46 ../rules/evdev.xml.in.h:46
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
-#: ../rules/base.xml.in.h:46
-msgid "Alt+Ctrl change layout."
-msgstr "Alt+Ctrl로 배치를 바꿉니다."
+#: ../rules/base.xml.in.h:47 ../rules/evdev.xml.in.h:47
+msgid "Alt+Shift"
+msgstr "Alt+Shift"
-#: ../rules/base.xml.in.h:47
-msgid "Alt+Shift change layout."
-msgstr "Alt+Shift로 배치를 바꿉니다."
+#: ../rules/base.xml.in.h:48 ../rules/evdev.xml.in.h:48
+msgid "Alt+Space"
+msgstr "Alt+스페이스"
-#: ../rules/base.xml.in.h:48
+#: ../rules/base.xml.in.h:49 ../rules/evdev.xml.in.h:49
msgid "Alt-Q"
msgstr "Alt-Q"
-#: ../rules/base.xml.in.h:49
+#: ../rules/base.xml.in.h:50 ../rules/evdev.xml.in.h:50
msgid "Alt/Win key behavior"
msgstr "Alt/Win 키 동작"
-#: ../rules/base.xml.in.h:50
+#: ../rules/base.xml.in.h:51 ../rules/evdev.xml.in.h:51
msgid "Alternative"
msgstr "다른 버전"
-#: ../rules/base.xml.in.h:51
+#: ../rules/base.xml.in.h:52 ../rules/evdev.xml.in.h:52
msgid "Alternative Eastern"
msgstr "다른 동부"
-#: ../rules/base.xml.in.h:52
+#: ../rules/base.xml.in.h:53 ../rules/evdev.xml.in.h:53
msgid "Alternative Phonetic"
msgstr "다른 음성 기호 버전"
-#: ../rules/base.xml.in.h:53
+#: ../rules/base.xml.in.h:54 ../rules/evdev.xml.in.h:54
msgid "Alternative international (former us_intl)"
msgstr "다른 국제 버전 (예전 us_intl)"
-#: ../rules/base.xml.in.h:54
+#: ../rules/base.xml.in.h:55 ../rules/evdev.xml.in.h:55
msgid "Alternative, Sun dead keys"
msgstr "다른 버전, 썬 데드키"
-#: ../rules/base.xml.in.h:55
+#: ../rules/base.xml.in.h:56 ../rules/evdev.xml.in.h:56
msgid "Alternative, eliminate dead keys"
msgstr "다른 버전, 데드키 없음"
-#: ../rules/base.xml.in.h:56
+#: ../rules/base.xml.in.h:57 ../rules/evdev.xml.in.h:57
msgid "Alternative, latin-9 only"
msgstr "다른 버전, latin-9 전용"
-#: ../rules/base.xml.in.h:57
+#: ../rules/base.xml.in.h:58 ../rules/evdev.xml.in.h:58
msgid "And"
msgstr "안도라"
-#: ../rules/base.xml.in.h:58
+#: ../rules/base.xml.in.h:59 ../rules/evdev.xml.in.h:59
msgid "Andorra"
msgstr "안도라"
-#: ../rules/base.xml.in.h:59
+#: ../rules/base.xml.in.h:60 ../rules/evdev.xml.in.h:60
+msgid "Any Alt key"
+msgstr "모든 Alt 키"
+
+#: ../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:60
+#: ../rules/base.xml.in.h:64 ../rules/evdev.xml.in.h:64
msgid "Apple"
msgstr "애플"
-#: ../rules/base.xml.in.h:61
+#: ../rules/base.xml.in.h:65 ../rules/evdev.xml.in.h:65
msgid "Apple Laptop"
msgstr "애플 노트북"
-#: ../rules/base.xml.in.h:62
+#: ../rules/base.xml.in.h:66 ../rules/evdev.xml.in.h:66
msgid "Ara"
msgstr "아랍"
-#: ../rules/base.xml.in.h:63
+#: ../rules/base.xml.in.h:67 ../rules/evdev.xml.in.h:67
msgid "Arabic"
msgstr "아랍"
-#: ../rules/base.xml.in.h:64
+#: ../rules/base.xml.in.h:68 ../rules/evdev.xml.in.h:68
msgid "Arm"
msgstr "아르메니아"
-#: ../rules/base.xml.in.h:65
+#: ../rules/base.xml.in.h:69 ../rules/evdev.xml.in.h:69
msgid "Armenia"
msgstr "아르메니아"
-#: ../rules/base.xml.in.h:66
+#: ../rules/base.xml.in.h:70 ../rules/evdev.xml.in.h:70
+msgid "Asturian variant with bottom-dot H and bottom-dot L"
+msgstr "오스트리아 변형, 가운데점 H 및 가운데점 L 포함"
+
+#: ../rules/base.xml.in.h:71 ../rules/evdev.xml.in.h:71
msgid "Asus Laptop"
msgstr "에이서스 노트북"
-#: ../rules/base.xml.in.h:67
+#: ../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 "'A' 왼쪽에"
+
+#: ../rules/base.xml.in.h:74 ../rules/evdev.xml.in.h:74
msgid "Aze"
msgstr "아제르바이잔"
-#: ../rules/base.xml.in.h:68
+#: ../rules/base.xml.in.h:75 ../rules/evdev.xml.in.h:75
msgid "Azerbaijan"
msgstr "아제르바이잔"
-#: ../rules/base.xml.in.h:69
+#: ../rules/base.xml.in.h:76 ../rules/evdev.xml.in.h:76
msgid "Azona RF2300 wireless Internet Keyboard"
msgstr "Azona RF2300 무선 인터넷 키보드"
-#: ../rules/base.xml.in.h:70
+#: ../rules/base.xml.in.h:77 ../rules/evdev.xml.in.h:77
msgid "BTC 5090"
msgstr "BTC 5090"
-#: ../rules/base.xml.in.h:71
+#: ../rules/base.xml.in.h:78 ../rules/evdev.xml.in.h:78
msgid "BTC 5113RF Multimedia"
msgstr "BTC 5113RF 멀티미디어"
-#: ../rules/base.xml.in.h:72
+#: ../rules/base.xml.in.h:79 ../rules/evdev.xml.in.h:79
msgid "BTC 5126T"
msgstr "BTC 5126T"
-#: ../rules/base.xml.in.h:73
+#: ../rules/base.xml.in.h:80 ../rules/evdev.xml.in.h:80
msgid "BTC 6301URF"
msgstr "BTC 6301URF"
-#: ../rules/base.xml.in.h:74
+#: ../rules/base.xml.in.h:81 ../rules/evdev.xml.in.h:81
msgid "BTC 9000"
msgstr "BTC 9000"
-#: ../rules/base.xml.in.h:75
+#: ../rules/base.xml.in.h:82 ../rules/evdev.xml.in.h:82
msgid "BTC 9000A"
msgstr "BTC 9000A"
-#: ../rules/base.xml.in.h:76
+#: ../rules/base.xml.in.h:83 ../rules/evdev.xml.in.h:83
msgid "BTC 9001AH"
msgstr "BTC 9001AH"
-#: ../rules/base.xml.in.h:77
+#: ../rules/base.xml.in.h:84 ../rules/evdev.xml.in.h:84
msgid "BTC 9019U"
msgstr "BTC 9019U"
-#: ../rules/base.xml.in.h:78
+#: ../rules/base.xml.in.h:85 ../rules/evdev.xml.in.h:85
+msgid "BTC 9116U Mini Wireless Internet and Gaming"
+msgstr "BTC 9116U 미니 무선 인터넷/게임 키보드"
+
+#: ../rules/base.xml.in.h:86 ../rules/evdev.xml.in.h:86
msgid "Ban"
msgstr "방글라데시"
-#: ../rules/base.xml.in.h:79
+#: ../rules/base.xml.in.h:87 ../rules/evdev.xml.in.h:87
msgid "Bangladesh"
msgstr "방글라데시"
-#: ../rules/base.xml.in.h:80 ../rules/sun.xml.in.h:22
+#: ../rules/base.xml.in.h:88 ../rules/evdev.xml.in.h:88
msgid "Bel"
msgstr "벨기에"
-#: ../rules/base.xml.in.h:81
+#: ../rules/base.xml.in.h:89 ../rules/evdev.xml.in.h:89
msgid "Belarus"
msgstr "벨라루스"
-#: ../rules/base.xml.in.h:82
+#: ../rules/base.xml.in.h:90 ../rules/evdev.xml.in.h:90
msgid "Belgium"
msgstr "벨기에"
-#: ../rules/base.xml.in.h:83
+#: ../rules/base.xml.in.h:91 ../rules/evdev.xml.in.h:91
msgid "BenQ X-Touch"
msgstr "벤큐 X-Touch"
-#: ../rules/base.xml.in.h:84
+#: ../rules/base.xml.in.h:92 ../rules/evdev.xml.in.h:92
+msgid "BenQ X-Touch 730"
+msgstr "벤큐 X-Touch 730"
+
+#: ../rules/base.xml.in.h:93 ../rules/evdev.xml.in.h:93
+msgid "BenQ X-Touch 800"
+msgstr "벤큐 X-Touch 800"
+
+#: ../rules/base.xml.in.h:94 ../rules/evdev.xml.in.h:94
msgid "Bengali"
-msgstr "뱅골어"
+msgstr "벵골어"
-#: ../rules/base.xml.in.h:85
+#: ../rules/base.xml.in.h:95 ../rules/evdev.xml.in.h:95
msgid "Bengali Probhat"
-msgstr "뱅골어 프롭햇"
+msgstr "벵골어 프롭햇"
-#: ../rules/base.xml.in.h:86
+#: ../rules/base.xml.in.h:96 ../rules/evdev.xml.in.h:96
msgid "Bepo, ergonomic, Dvorak way"
msgstr "Bepo, ergonomic, 드보락 방식"
-#: ../rules/base.xml.in.h:87
+#: ../rules/base.xml.in.h:97 ../rules/evdev.xml.in.h:97
msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
msgstr "Bepo, ergonomic, 드보락 방식, latin-9 전용"
-#: ../rules/base.xml.in.h:88 ../rules/sun.xml.in.h:24
+#: ../rules/base.xml.in.h:98 ../rules/evdev.xml.in.h:98
msgid "Bgr"
msgstr "불가리아"
-#: ../rules/base.xml.in.h:89
+#: ../rules/base.xml.in.h:99 ../rules/evdev.xml.in.h:99
msgid "Bhu"
msgstr "부탄"
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:100 ../rules/evdev.xml.in.h:100
msgid "Bhutan"
msgstr "부탄"
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:101 ../rules/evdev.xml.in.h:101
msgid "Biblical Hebrew (Tiro)"
msgstr "성서 히브리어 (Tiro)"
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:102 ../rules/evdev.xml.in.h:102
msgid "Bih"
msgstr "보스니아 헤르체고비나"
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:103 ../rules/evdev.xml.in.h:103
msgid "Blr"
msgstr "벨라루스"
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:104 ../rules/evdev.xml.in.h:104
msgid "Bosnia and Herzegovina"
msgstr "보스니아 헤르체고비나"
-#: ../rules/base.xml.in.h:95
-msgid "Both Alt keys together change layout."
-msgstr "Alt 키 두 개로 배치를 바꿉니다."
+#: ../rules/base.xml.in.h:105 ../rules/evdev.xml.in.h:105
+msgid "Both Alt keys together"
+msgstr "Alt 키 2개 동시 누름"
-#: ../rules/base.xml.in.h:96
-msgid "Both Ctrl keys together change layout."
-msgstr "Ctrl 키 두 개로 배치를 바꿉니다."
+#: ../rules/base.xml.in.h:106 ../rules/evdev.xml.in.h:106
+msgid "Both Ctrl keys together"
+msgstr "Ctrl 키 2개 동시 누름"
-#: ../rules/base.xml.in.h:97
-msgid "Both Shift keys together change layout."
-msgstr "Shift 키 두 개로 배치를 바꿉니다."
+#: ../rules/base.xml.in.h:107 ../rules/evdev.xml.in.h:107
+msgid "Both Shift keys together"
+msgstr "Shift 키 2개 동시 누름"
-#: ../rules/base.xml.in.h:98
-msgid "Both Win-keys switch layout while pressed."
-msgstr "윈도우 키 두 개를 누르면 배치를 바꿉니다."
-
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:108 ../rules/evdev.xml.in.h:108
msgid "Bra"
msgstr "브라질"
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:109 ../rules/evdev.xml.in.h:109
msgid "Braille"
msgstr "점자"
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:110 ../rules/evdev.xml.in.h:110
msgid "Brazil"
msgstr "브라질"
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:111 ../rules/evdev.xml.in.h:111
msgid "Brazilian ABNT2"
msgstr "브라질 ABNT2"
+# http://ko.wikipedia.org/wiki/브르타뉴어
+#: ../rules/base.xml.in.h:112 ../rules/evdev.xml.in.h:112
+msgid "Breton"
+msgstr "브르타뉴어"
+
# Braille
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:113 ../rules/evdev.xml.in.h:113
msgid "Brl"
msgstr "점자"
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:114 ../rules/evdev.xml.in.h:114
msgid "Brother Internet Keyboard"
msgstr "브라더 인터넷 키보드"
-# 아랍 변형
-#: ../rules/base.xml.in.h:105
+# 아랍어 음역 방법 http://en.wikipedia.org/wiki/Buckwalter_transliteration
+#: ../rules/base.xml.in.h:115 ../rules/evdev.xml.in.h:115
msgid "Buckwalter"
-msgstr "Buckwalter"
+msgstr "버크월터"
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:116 ../rules/evdev.xml.in.h:116
msgid "Bulgaria"
msgstr "불가리아"
-#: ../rules/base.xml.in.h:107
+# 우르드어 관련 http://www.crulp.org/
+#: ../rules/base.xml.in.h:117 ../rules/evdev.xml.in.h:117
+msgid "CRULP"
+msgstr "CRULP"
+
+#: ../rules/base.xml.in.h:118 ../rules/evdev.xml.in.h:118
msgid "Cambodia"
msgstr "캄보디아"
-#: ../rules/base.xml.in.h:108 ../rules/sun.xml.in.h:29
+#: ../rules/base.xml.in.h:119 ../rules/evdev.xml.in.h:119
msgid "Can"
msgstr "캐나다"
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:120 ../rules/evdev.xml.in.h:120
msgid "Canada"
msgstr "캐나다"
-#: ../rules/base.xml.in.h:110
-msgid "Caps Lock is Compose."
-msgstr "Caps Lock 키가 조합 키입니다."
+#: ../rules/base.xml.in.h:121 ../rules/evdev.xml.in.h:121
+msgid "Caps Lock"
+msgstr "Caps Lock"
-#: ../rules/base.xml.in.h:111
-msgid "CapsLock LED shows alternative layout."
-msgstr "CapsLock LED가 다른 배치를 표시합니다."
+#: ../rules/base.xml.in.h:122 ../rules/evdev.xml.in.h:122
+msgid "CapsLock"
+msgstr "CapsLock"
-#: ../rules/base.xml.in.h:112
-msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
-msgstr "CapsLock이 Shift처럼 동작하고 상태 고정. Shift가 CapsLock을 \"일시 중지\"."
+#: ../rules/base.xml.in.h:123 ../rules/evdev.xml.in.h:123
+msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
+msgstr "CapsLock (1번으로), Shift+CapsLock (마지막으로)"
-#: ../rules/base.xml.in.h:113
-msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
-msgstr "CapsLock이 Shift처럼 동작하고 상태 고정. Shift가 CapsLock 상태에 영향 없음."
+#: ../rules/base.xml.in.h:124 ../rules/evdev.xml.in.h:124
+msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
+msgstr "CapsLock (누르고 있는 동안), Alt+CapsLock을 누르면 원래 CapsLock 기능"
-#: ../rules/base.xml.in.h:114
-msgid "CapsLock just locks the Shift modifier."
-msgstr "CapsLock이 Shift 상태를 고정하기만 합니다."
+#: ../rules/base.xml.in.h:125 ../rules/evdev.xml.in.h:125
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
+msgstr "CapsLock이 Shift처럼 동작하고 상태 고정, Shift가 CapsLock을 \"일시 중지\""
-#: ../rules/base.xml.in.h:115 ../rules/sun.xml.in.h:33
+#: ../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 "CapsLock이 Shift처럼 동작하고 상태 고정, Shift가 CapsLock 상태에 영향 없음"
+
+#: ../rules/base.xml.in.h:127 ../rules/evdev.xml.in.h:127
msgid "CapsLock key behavior"
msgstr "CapsLock 키 동작"
-#: ../rules/base.xml.in.h:116
-msgid "CapsLock key changes layout."
-msgstr "CapsLock 키로 배치를 바꿉니다."
-
-#: ../rules/base.xml.in.h:117
-msgid "CapsLock toggles Shift so all keys are affected."
-msgstr "CapsLock이 Shift 쌍태를 토글합니다. 즉 모든 키가 영향을 받습니다."
+#: ../rules/base.xml.in.h:128 ../rules/evdev.xml.in.h:128
+msgid "CapsLock toggles Shift so all keys are affected"
+msgstr "CapsLock이 Shift 상태를 토글, 즉 모든 키가 영향을 받음"
-#: ../rules/base.xml.in.h:118
-msgid "CapsLock toggles normal capitalization of alphabetic characters."
-msgstr "CapsLock이 일반적인 알파벳 대문자 상태를 토글합니다."
+#: ../rules/base.xml.in.h:129 ../rules/evdev.xml.in.h:129
+msgid "CapsLock toggles normal capitalization of alphabetic characters"
+msgstr "CapsLock이 일반적인 알파벳 대문자 상태를 토글"
-#: ../rules/base.xml.in.h:119
-msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
-msgstr "CapsLock이 내부 대문자 기능 사용. Shift가 CapsLock을 \"일시 중지\"."
+#: ../rules/base.xml.in.h:130 ../rules/evdev.xml.in.h:130
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
+msgstr "CapsLock이 내부 대문자 기능 사용. Shift가 CapsLock을 \"일시 중지\""
-#: ../rules/base.xml.in.h:120
-msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
-msgstr "CapsLock이 내부 대문자 기능 사용. Shift가 CapsLock 상태에 영향 없음."
+#: ../rules/base.xml.in.h:131 ../rules/evdev.xml.in.h:131
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
+msgstr "CapsLock이 내부 대문자 기능 사용. Shift가 CapsLock 상태에 영향 없음"
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:132 ../rules/evdev.xml.in.h:132
msgid "Catalan variant with middle-dot L"
msgstr "카탈로니아어 변형, 가운데점 L 포함"
-#: ../rules/base.xml.in.h:122
+#: ../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:123
+# 체로키어 - 아메리카 원주민 부족
+#: ../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 "체리 Blue Line CyBo@rd"
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:137 ../rules/evdev.xml.in.h:137
msgid "Cherry Blue Line CyBo@rd (alternate option)"
msgstr "체리 Blue Line CyBo@rd (다른 옵션)"
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:138 ../rules/evdev.xml.in.h:138
msgid "Cherry CyBo@rd USB-Hub"
msgstr "체리 CyBo@rd USB-Hub"
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:139 ../rules/evdev.xml.in.h:139
+msgid "Cherry CyMotion Expert"
+msgstr "체리 CyMotion Expert"
+
+#: ../rules/base.xml.in.h:140 ../rules/evdev.xml.in.h:140
msgid "Cherry CyMotion Master Linux"
msgstr "체리 CyMotion Master Linux"
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:141 ../rules/evdev.xml.in.h:141
msgid "Cherry CyMotion Master XPress"
msgstr "체리 CyMotion Master XPress"
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:142 ../rules/evdev.xml.in.h:142
msgid "Chicony Internet Keyboard"
msgstr "치코니 인터넷 키보드"
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:143 ../rules/evdev.xml.in.h:143
msgid "Chicony KB-9885"
msgstr "치코니 KB-9885"
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:144 ../rules/evdev.xml.in.h:144
msgid "Chicony KU-0108"
msgstr "치코니 KU-0108"
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:145 ../rules/evdev.xml.in.h:145
+msgid "Chicony KU-0420"
+msgstr "치코니 KU-0420"
+
+#: ../rules/base.xml.in.h:146 ../rules/evdev.xml.in.h:146
msgid "China"
msgstr "중국"
# http://ko.wikipedia.org/wiki/%EC%B6%94%EB%B0%94%EC%8B%9C%EC%96%B4
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:147 ../rules/evdev.xml.in.h:147
msgid "Chuvash"
msgstr "추바시어"
# http://ko.wikipedia.org/wiki/%EC%B6%94%EB%B0%94%EC%8B%9C%EC%96%B4
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:148 ../rules/evdev.xml.in.h:148
msgid "Chuvash Latin"
msgstr "추바시어 라틴"
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:149 ../rules/evdev.xml.in.h:149
msgid "Classic"
msgstr "클래식"
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:150 ../rules/evdev.xml.in.h:150
msgid "Classic Dvorak"
msgstr "클래식 드보락"
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:151 ../rules/evdev.xml.in.h:151
msgid "Classmate PC"
msgstr "클래스메이트 PC"
# 아일랜드 변형
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:152 ../rules/evdev.xml.in.h:152
msgid "CloGaelach"
msgstr "CloGaelach"
# Colemak: 상표명
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:153 ../rules/evdev.xml.in.h:153
msgid "Colemak"
msgstr "Colemak"
-#: ../rules/base.xml.in.h:139
-msgid "Commabelow"
-msgstr "아래 쉼표"
-
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:154 ../rules/evdev.xml.in.h:154
msgid "Compaq Easy Access Keyboard"
msgstr "컴팩 Easy Access 키보드"
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:155 ../rules/evdev.xml.in.h:155
msgid "Compaq Internet Keyboard (13 keys)"
msgstr "컴팩 인터넷 키보드 (13키)"
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:156 ../rules/evdev.xml.in.h:156
msgid "Compaq Internet Keyboard (18 keys)"
msgstr "컴팩 인터넷 키보드 (18키)"
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:157 ../rules/evdev.xml.in.h:157
msgid "Compaq Internet Keyboard (7 keys)"
msgstr "컴팩 인터넷 키보드 (7키)"
-#: ../rules/base.xml.in.h:144
+#: ../rules/base.xml.in.h:158 ../rules/evdev.xml.in.h:158
msgid "Compaq iPaq Keyboard"
msgstr "컴팩 iPaq 키보드"
-#: ../rules/base.xml.in.h:145
+#: ../rules/base.xml.in.h:159 ../rules/evdev.xml.in.h:159
msgid "Compose key position"
msgstr "조합 키 위치"
-#: ../rules/base.xml.in.h:146
+#: ../rules/base.xml.in.h:160 ../rules/evdev.xml.in.h:160
msgid "Congo, Democratic Republic of the"
msgstr "콩고 민주 공화국"
-#: ../rules/base.xml.in.h:147
-msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
-msgstr "Ctrl 키가 윈도우 키로 매핑됩니다 (그리고 보통 Ctrl 키로도 동작합니다)."
+#: ../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 "Ctrl 키를 윈도우 키로 매핑, Alt 키를 윈도우 키로 매핑"
+
+#: ../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 "Control 키를 윈도우 키로 매핑 (그리고 일반 Ctrl 키로도 동작)"
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:163 ../rules/evdev.xml.in.h:163
msgid "Croatia"
msgstr "크로아티아"
-#: ../rules/base.xml.in.h:149
-msgid "Ctrl key at bottom left"
-msgstr "맨 아래 왼쪽에 Ctrl 키"
-
-#: ../rules/base.xml.in.h:150
-msgid "Ctrl key at left of 'A'"
-msgstr "'A' 왼쪽에 Ctrl 키"
-
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:164 ../rules/evdev.xml.in.h:164
msgid "Ctrl key position"
msgstr "Ctrl 키 위치"
-#: ../rules/base.xml.in.h:152
-msgid "Ctrl+Shift change layout."
-msgstr "Ctrl+Shift로 배치를 바꿉니다."
+#: ../rules/base.xml.in.h:165 ../rules/evdev.xml.in.h:165
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:166 ../rules/evdev.xml.in.h:166
msgid "Cyrillic"
msgstr "키릴"
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:167 ../rules/evdev.xml.in.h:167
msgid "Cyrillic with guillemets"
msgstr "키릴, 각괄호 포함"
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:168 ../rules/evdev.xml.in.h:168
msgid "Cyrillic, Z and ZHE swapped"
msgstr "키릴, Z와 ZHE 뒤바꾸기"
-#: ../rules/base.xml.in.h:156 ../rules/sun.xml.in.h:39
+#: ../rules/base.xml.in.h:169 ../rules/evdev.xml.in.h:169
msgid "Cze"
msgstr "체코"
-#: ../rules/base.xml.in.h:157
+#: ../rules/base.xml.in.h:170 ../rules/evdev.xml.in.h:170
msgid "Czechia"
msgstr "체코"
-#: ../rules/base.xml.in.h:158
+#: ../rules/base.xml.in.h:171 ../rules/evdev.xml.in.h:171
msgid "DRC"
msgstr "DRC"
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:172 ../rules/evdev.xml.in.h:172
msgid "DTK2000"
msgstr "DTK2000"
-#: ../rules/base.xml.in.h:160 ../rules/sun.xml.in.h:42
+#: ../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:161 ../rules/sun.xml.in.h:43
+#: ../rules/base.xml.in.h:175 ../rules/evdev.xml.in.h:175
msgid "Dead grave acute"
msgstr "그레이브 어큐트 데드키"
-#: ../rules/base.xml.in.h:162
-msgid "Default numeric keypad keys."
-msgstr "기본 숫자판 키."
+#: ../rules/base.xml.in.h:176 ../rules/evdev.xml.in.h:176
+msgid "Default numeric keypad keys"
+msgstr "기본 숫자 키패드 키"
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:177 ../rules/evdev.xml.in.h:177
msgid "Dell"
msgstr "델"
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:178 ../rules/evdev.xml.in.h:178
msgid "Dell 101-key PC"
msgstr "델 101키 PC"
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:179 ../rules/evdev.xml.in.h:179
msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
msgstr "델 노트북 Inspiron 6xxx/8xxx"
-#: ../rules/base.xml.in.h:166
+#: ../rules/base.xml.in.h:180 ../rules/evdev.xml.in.h:180
msgid "Dell Laptop/notebook Precision M series"
msgstr "델 노트북 Precision M series"
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:181 ../rules/evdev.xml.in.h:181
msgid "Dell Latitude series laptop"
msgstr "델 Latitude 시리즈 노트북"
-#: ../rules/base.xml.in.h:168
+#: ../rules/base.xml.in.h:182 ../rules/evdev.xml.in.h:182
msgid "Dell Precision M65"
msgstr "델 Precision M65"
-#: ../rules/base.xml.in.h:169
-msgid "Dell USB Multimedia Keybard"
+#: ../rules/base.xml.in.h:183 ../rules/evdev.xml.in.h:183
+msgid "Dell SK-8125"
+msgstr "델 SK-8125"
+
+#: ../rules/base.xml.in.h:184 ../rules/evdev.xml.in.h:184
+msgid "Dell SK-8135"
+msgstr "델 SK-8135"
+
+#: ../rules/base.xml.in.h:185 ../rules/evdev.xml.in.h:185
+msgid "Dell USB Multimedia Keyboard"
msgstr "델 USB 멀티미디어 키보드"
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:186 ../rules/evdev.xml.in.h:186
msgid "Denmark"
msgstr "덴마크"
-#: ../rules/base.xml.in.h:171 ../rules/sun.xml.in.h:44
+#: ../rules/base.xml.in.h:187 ../rules/evdev.xml.in.h:187
msgid "Deu"
msgstr "독일"
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:188 ../rules/evdev.xml.in.h:188
msgid "Dexxa Wireless Desktop Keyboard"
msgstr "Dexxa Wireless Desktop 키보드"
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:189 ../rules/evdev.xml.in.h:189
msgid "Diamond 9801 / 9802 series"
msgstr "다이아몬드 9801 / 9802 시리즈"
-#: ../rules/base.xml.in.h:174 ../rules/sun.xml.in.h:46
-msgid "Dnk"
-msgstr "덴마크"
-
-#: ../rules/base.xml.in.h:175 ../rules/sun.xml.in.h:48
+#: ../rules/base.xml.in.h:190 ../rules/evdev.xml.in.h:190
msgid "Dvorak"
msgstr "드보락"
-#: ../rules/base.xml.in.h:176
+#: ../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:177
+#: ../rules/base.xml.in.h:193 ../rules/evdev.xml.in.h:193
msgid "Dvorak, Polish quotes on key \"1/!\""
msgstr "드보락, \"1/!\" 키에 폴란드어 따옴표"
-#: ../rules/base.xml.in.h:178
+#: ../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:179
+#: ../rules/base.xml.in.h:195 ../rules/evdev.xml.in.h:195
+msgid "E"
+msgstr "E"
+
+#: ../rules/base.xml.in.h:196 ../rules/evdev.xml.in.h:196
msgid "Eastern"
msgstr "동부"
-#: ../rules/base.xml.in.h:180 ../rules/sun.xml.in.h:49
+#: ../rules/base.xml.in.h:197 ../rules/evdev.xml.in.h:197
msgid "Eliminate dead keys"
msgstr "데드키 없음"
-#: ../rules/base.xml.in.h:181
+#: ../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 "Ennyah DKB-1008"
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:200 ../rules/evdev.xml.in.h:200
msgid "Epo"
msgstr "에스페란토"
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:201 ../rules/evdev.xml.in.h:201
msgid "Ergonomic"
msgstr "어고노믹"
-#: ../rules/base.xml.in.h:184 ../rules/sun.xml.in.h:50
+#: ../rules/base.xml.in.h:202 ../rules/evdev.xml.in.h:202
msgid "Esp"
msgstr "스페인"
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:203 ../rules/evdev.xml.in.h:203
msgid "Esperanto"
msgstr "에스페란토"
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:204 ../rules/evdev.xml.in.h:204
msgid "Est"
msgstr "에스토니아"
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:205 ../rules/evdev.xml.in.h:205
msgid "Estonia"
msgstr "에스토니아"
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:206 ../rules/evdev.xml.in.h:206
msgid "Eth"
msgstr "에티오피아"
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:207 ../rules/evdev.xml.in.h:207
msgid "Ethiopia"
msgstr "에티오피아"
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:208 ../rules/evdev.xml.in.h:208
msgid "Evdev-managed keyboard"
msgstr "evdev 관리 키보드"
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:209 ../rules/evdev.xml.in.h:209
msgid "Everex STEPnote"
msgstr "Everex STEPnote"
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:210 ../rules/evdev.xml.in.h:210
msgid "Ewe"
msgstr "Ewe"
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:211 ../rules/evdev.xml.in.h:211
msgid "Extended"
msgstr "확장"
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:212 ../rules/evdev.xml.in.h:212
msgid "Extended Backslash"
msgstr "확장 백슬래시"
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:213 ../rules/evdev.xml.in.h:213
msgid "F-letter (F) variant"
msgstr "F 글자 (F) 변형"
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:214 ../rules/evdev.xml.in.h:214
+msgid "FL90"
+msgstr "FL90"
+
+#: ../rules/base.xml.in.h:215 ../rules/evdev.xml.in.h:215
msgid "Fao"
msgstr "페로 제도"
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:216 ../rules/evdev.xml.in.h:216
msgid "Faroe Islands"
msgstr "페로 제도"
-#: ../rules/base.xml.in.h:198 ../rules/sun.xml.in.h:51
+#: ../rules/base.xml.in.h:217 ../rules/evdev.xml.in.h:217
msgid "Fin"
msgstr "핀란드"
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:218 ../rules/evdev.xml.in.h:218
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:202
+#: ../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:203
+#: ../rules/base.xml.in.h:222 ../rules/evdev.xml.in.h:222
msgid "Four-level key with comma"
msgstr "네번째 단계, 쉼표 사용"
-#: ../rules/base.xml.in.h:204
+#: ../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 "네번째 단계, 점 사용, latin-9 제한 사항"
+
# momayyez: http://en.wikipedia.org/wiki/Momayyez
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:225 ../rules/evdev.xml.in.h:225
msgid "Four-level key with momayyez"
msgstr "네번째 단계, 아랍식 쉼표 (momayyez) 사용"
-#: ../rules/base.xml.in.h:206 ../rules/sun.xml.in.h:53
+#: ../rules/base.xml.in.h:226 ../rules/evdev.xml.in.h:226
msgid "Fra"
msgstr "프랑스"
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:227 ../rules/evdev.xml.in.h:227
msgid "France"
msgstr "프랑스"
-#: ../rules/base.xml.in.h:208 ../rules/sun.xml.in.h:55
+#: ../rules/base.xml.in.h:228 ../rules/evdev.xml.in.h:228
msgid "French"
msgstr "프랑스어"
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:229 ../rules/evdev.xml.in.h:229
msgid "French (Macintosh)"
msgstr "프랑스어 (매킨토시)"
-#: ../rules/base.xml.in.h:210 ../rules/sun.xml.in.h:56
+#: ../rules/base.xml.in.h:230 ../rules/evdev.xml.in.h:230
msgid "French (legacy)"
-msgstr "프랑스어 (구형)"
+msgstr "프랑스어 (구형 방식)"
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:231 ../rules/evdev.xml.in.h:231
msgid "French Dvorak"
msgstr "프랑스어 드보락"
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:232 ../rules/evdev.xml.in.h:232
msgid "French, Sun dead keys"
msgstr "프랑스어, 썬 데드키"
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:233 ../rules/evdev.xml.in.h:233
msgid "French, eliminate dead keys"
msgstr "프랑스어, 데드키 없음"
-#: ../rules/base.xml.in.h:214
-msgid "Fujitsu-Siemens Computers AMILO A1667G laptop"
-msgstr "후지스-지멘스 컴퓨터 AMILO A1667G 노트북"
+#: ../rules/base.xml.in.h:234 ../rules/evdev.xml.in.h:234
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "후지스-지멘스 컴퓨터 AMILO 노트북"
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:235 ../rules/evdev.xml.in.h:235
msgid "Fula"
-msgstr "Fula"
+msgstr "풀라"
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:236 ../rules/evdev.xml.in.h:236
msgid "GBr"
-msgstr "GBr"
+msgstr "영국"
-#: ../rules/base.xml.in.h:217
+# 가나의 언어
+#: ../rules/base.xml.in.h:237 ../rules/evdev.xml.in.h:237
msgid "Ga"
-msgstr "Ga"
+msgstr "가어"
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:238 ../rules/evdev.xml.in.h:238
msgid "Generic 101-key PC"
msgstr "일반 101키 PC"
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:239 ../rules/evdev.xml.in.h:239
msgid "Generic 102-key (Intl) PC"
msgstr "일반 102키 (국제 버전) PC"
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:240 ../rules/evdev.xml.in.h:240
msgid "Generic 104-key PC"
msgstr "일반 104키 PC"
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:241 ../rules/evdev.xml.in.h:241
msgid "Generic 105-key (Intl) PC"
msgstr "일반 105키 (국제 버전) PC"
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:242 ../rules/evdev.xml.in.h:242
msgid "Genius Comfy KB-12e"
msgstr "Genius Comfy KB-12e"
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:243 ../rules/evdev.xml.in.h:243
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:224
+#: ../rules/base.xml.in.h:244 ../rules/evdev.xml.in.h:244
msgid "Genius Comfy KB-21e-Scroll"
msgstr "Genius Comfy KB-21e-Scroll"
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:245 ../rules/evdev.xml.in.h:245
msgid "Genius KB-19e NB"
msgstr "Genius KB-19e NB"
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:246 ../rules/evdev.xml.in.h:246
msgid "Geo"
msgstr "조지아"
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:247 ../rules/evdev.xml.in.h:247
msgid "Georgia"
msgstr "조지아"
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:248 ../rules/evdev.xml.in.h:248
msgid "Georgian"
msgstr "조지아"
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:249 ../rules/evdev.xml.in.h:249
msgid "Georgian AZERTY Tskapo"
msgstr "조지아 AZERTY Tskapo"
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:250 ../rules/evdev.xml.in.h:250
msgid "German (Macintosh)"
msgstr "독일어 (매킨토시)"
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:251 ../rules/evdev.xml.in.h:251
msgid "German, Sun dead keys"
msgstr "독일어, 썬 데드키"
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:252 ../rules/evdev.xml.in.h:252
msgid "German, eliminate dead keys"
msgstr "독일어, 데드키 없음"
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:253 ../rules/evdev.xml.in.h:253
msgid "Germany"
msgstr "독일"
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:254 ../rules/evdev.xml.in.h:254
msgid "Gha"
msgstr "가나"
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:255 ../rules/evdev.xml.in.h:255
msgid "Ghana"
msgstr "가나"
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:256 ../rules/evdev.xml.in.h:256
msgid "Gre"
msgstr "그리스"
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:257 ../rules/evdev.xml.in.h:257
msgid "Greece"
msgstr "그리스"
-#: ../rules/base.xml.in.h:238
+#: ../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:239
+#: ../rules/base.xml.in.h:259 ../rules/evdev.xml.in.h:259
msgid "Gui"
msgstr "기니"
# 기니공화국
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:260 ../rules/evdev.xml.in.h:260
msgid "Guinea"
msgstr "기니"
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:261 ../rules/evdev.xml.in.h:261
msgid "Gujarati"
msgstr "구자라트어"
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:262 ../rules/evdev.xml.in.h:262
msgid "Gurmukhi"
-msgstr "굴목키어"
+msgstr "구르무키 문자"
+
+# 젤룸 - 파키스탄 지역
+#: ../rules/base.xml.in.h:263 ../rules/evdev.xml.in.h:263
+msgid "Gurmukhi Jhelum"
+msgstr "구르무키 문자, 젤룸"
# 제조사 이름
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:264 ../rules/evdev.xml.in.h:264
msgid "Gyration"
msgstr "Gyration"
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:265 ../rules/evdev.xml.in.h:265
msgid "Happy Hacking Keyboard"
msgstr "해피해킹 키보드"
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:266 ../rules/evdev.xml.in.h:266
msgid "Happy Hacking Keyboard for Mac"
msgstr "해피해킹 키보드, 맥용"
# 나이지리아 변형
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:267 ../rules/evdev.xml.in.h:267
msgid "Hausa"
msgstr "하우사어"
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:268 ../rules/evdev.xml.in.h:268
msgid "Hewlett-Packard Internet Keyboard"
msgstr "휴렛팩커드 인터넷 키보드"
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:269 ../rules/evdev.xml.in.h:269
msgid "Hewlett-Packard Omnibook 500 FA"
msgstr "휴렛팩커드 Omnibook 500 FA"
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:270 ../rules/evdev.xml.in.h:270
msgid "Hewlett-Packard Omnibook 5xx"
msgstr "휴렛팩커드 Omnibook 5xx"
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:271 ../rules/evdev.xml.in.h:271
msgid "Hewlett-Packard Omnibook 6000/6100"
msgstr "휴렛팩커드 Omnibook 6000/6100"
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:272 ../rules/evdev.xml.in.h:272
msgid "Hewlett-Packard Omnibook XE3 GC"
msgstr "휴렛팩커드 Omnibook XE3 GC"
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:273 ../rules/evdev.xml.in.h:273
msgid "Hewlett-Packard Omnibook XE3 GF"
msgstr "휴렛팩커드 Omnibook XE3 GF"
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:274 ../rules/evdev.xml.in.h:274
msgid "Hewlett-Packard Omnibook XT1000"
msgstr "휴렛팩커드 Omnibook XT1000"
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:275 ../rules/evdev.xml.in.h:275
msgid "Hewlett-Packard Pavilion ZT11xx"
msgstr "휴렛팩커드 Pavilion ZT11xx"
-#: ../rules/base.xml.in.h:255
-msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
-msgstr "휴렛팩커드 SK-2501 멀티미디어 키보드"
+#: ../rules/base.xml.in.h:276 ../rules/evdev.xml.in.h:276
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "휴렛팩커드 Pavilion dv5"
+
+#: ../rules/base.xml.in.h:277 ../rules/evdev.xml.in.h:277
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "휴렛팩커드 SK-250x 멀티미디어 키보드"
-#: ../rules/base.xml.in.h:256
-msgid "Hewlett-Packard SK-2505 Internet Keyboard"
-msgstr "휴렛팩커드 SK-2505 인터넷 키보드"
+#: ../rules/base.xml.in.h:278 ../rules/evdev.xml.in.h:278
+msgid "Hewlett-Packard nx9020"
+msgstr "휴렛팩커드 nx9020"
+
+#: ../rules/base.xml.in.h:279 ../rules/evdev.xml.in.h:279
+msgid "Hexadecimal"
+msgstr "십육진법"
# Bolnagri: x input method 이름, http://indlinux.org/wiki/index.php/BolNagri
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:280 ../rules/evdev.xml.in.h:280
msgid "Hindi Bolnagri"
msgstr "힌두어 Bolnagri"
-#: ../rules/base.xml.in.h:258
+# 음악 용어, 상표인가?
+#: ../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 "하니웰 Euroboard"
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:283 ../rules/evdev.xml.in.h:283
msgid "Hrv"
msgstr "크로아티아"
-#: ../rules/base.xml.in.h:260 ../rules/sun.xml.in.h:59
+#: ../rules/base.xml.in.h:284 ../rules/evdev.xml.in.h:284
msgid "Hun"
msgstr "헝가리"
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:285 ../rules/evdev.xml.in.h:285
msgid "Hungary"
msgstr "헝가리"
-#: ../rules/base.xml.in.h:262
-msgid "Hyper is mapped to the Win-keys."
-msgstr "Hyper가 윈도우 키로 매핑됩니다."
+#: ../rules/base.xml.in.h:286 ../rules/evdev.xml.in.h:286
+msgid "Hyper is mapped to Win-keys"
+msgstr "Hyper 키를 윈도우 키로 매핑"
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:287 ../rules/evdev.xml.in.h:287
msgid "IBM (LST 1205-92)"
msgstr "IBM (LST 1205-92)"
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:288 ../rules/evdev.xml.in.h:288
msgid "IBM Rapid Access"
msgstr "IBM Rapid Access"
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:289 ../rules/evdev.xml.in.h:289
msgid "IBM Rapid Access II"
msgstr "IBM Rapid Access II"
-#: ../rules/base.xml.in.h:266
-msgid "IBM Rapid Access II (alternate option)"
-msgstr "IBM Rapid Access II (다른 옵션)"
+#: ../rules/base.xml.in.h:290 ../rules/evdev.xml.in.h:290
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:291 ../rules/evdev.xml.in.h:291
msgid "IBM ThinkPad 560Z/600/600E/A22E"
msgstr "IBM ThinkPad 560Z/600/600E/A22E"
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:292 ../rules/evdev.xml.in.h:292
msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
msgstr "IBM ThinkPad 560Z/600/600E/A22E, 국제 버전"
-#: ../rules/base.xml.in.h:269
-msgid "IBM ThinkPad R60/T60/Z60m/Z60t/R61/T61/Z61m/Z61t"
-msgstr "IBM ThinkPad R60/T60/Z60m/Z60t/R61/T61/Z61m/Z61t"
+#: ../rules/base.xml.in.h:293 ../rules/evdev.xml.in.h:293
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
-#: ../rules/base.xml.in.h:270 ../rules/sun.xml.in.h:61
+#: ../rules/base.xml.in.h:294 ../rules/evdev.xml.in.h:294
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+
+#: ../rules/base.xml.in.h:295 ../rules/evdev.xml.in.h:295
msgid "ISO Alternate"
msgstr "ISO 다른 버전"
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:296 ../rules/evdev.xml.in.h:296
msgid "Iceland"
msgstr "아이슬랜드"
# 나이지리아 변형
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:297 ../rules/evdev.xml.in.h:297
msgid "Igbo"
msgstr "이그보어"
-#: ../rules/base.xml.in.h:273
+#: ../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 "인도"
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:300 ../rules/evdev.xml.in.h:300
msgid "India"
msgstr "인도"
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:301 ../rules/evdev.xml.in.h:301
msgid "International (AltGr dead keys)"
msgstr "국제 버전 (AltGr 데드키)"
-#: ../rules/base.xml.in.h:276 ../rules/sun.xml.in.h:62
+#: ../rules/base.xml.in.h:302 ../rules/evdev.xml.in.h:302
msgid "International (with dead keys)"
msgstr "국제 버전 (데드키 포함)"
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:303 ../rules/evdev.xml.in.h:303
msgid "Inuktitut"
msgstr "이누이트어"
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:304 ../rules/evdev.xml.in.h:304
msgid "Iran"
msgstr "이란"
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:305 ../rules/evdev.xml.in.h:305
msgid "Iraq"
msgstr "이라크"
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:306 ../rules/evdev.xml.in.h:306
msgid "Ireland"
msgstr "아일랜드"
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:307 ../rules/evdev.xml.in.h:307
msgid "Irl"
msgstr "아일랜드"
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:308 ../rules/evdev.xml.in.h:308
msgid "Irn"
msgstr "아일랜드"
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:309 ../rules/evdev.xml.in.h:309
msgid "Irq"
msgstr "이라크"
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:310 ../rules/evdev.xml.in.h:310
msgid "Isl"
msgstr "아이슬랜드"
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:311 ../rules/evdev.xml.in.h:311
msgid "Isr"
msgstr "이스라엘"
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:312 ../rules/evdev.xml.in.h:312
msgid "Israel"
msgstr "이스라엘"
-#: ../rules/base.xml.in.h:287 ../rules/sun.xml.in.h:63
+#: ../rules/base.xml.in.h:313 ../rules/evdev.xml.in.h:313
msgid "Ita"
msgstr "이탈리아"
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:314 ../rules/evdev.xml.in.h:314
msgid "Italy"
msgstr "이탈리아"
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:315 ../rules/evdev.xml.in.h:315
msgid "Japan"
msgstr "일본"
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:316 ../rules/evdev.xml.in.h:316
msgid "Japan (PC-98xx Series)"
msgstr "일본 (PC-98xx 시리즈)"
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:317 ../rules/evdev.xml.in.h:317
msgid "Japanese 106-key"
msgstr "일본 106키"
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:318 ../rules/evdev.xml.in.h:318
msgid "Japanese keyboard options"
msgstr "일본어 키보드 옵션"
-#: ../rules/base.xml.in.h:293 ../rules/sun.xml.in.h:66
+#: ../rules/base.xml.in.h:319 ../rules/evdev.xml.in.h:319
msgid "Jpn"
msgstr "일본"
-#: ../rules/base.xml.in.h:294
+# http://ko.wikipedia.org/wiki/칼미크어
+#: ../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:295
+#: ../rules/base.xml.in.h:322 ../rules/evdev.xml.in.h:322
msgid "Kana Lock key is locking"
msgstr "Kana Lock 키 상태 고정"
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:323 ../rules/evdev.xml.in.h:323
msgid "Kannada"
msgstr "칸나다어"
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:324 ../rules/evdev.xml.in.h:324
msgid "Kashubian"
msgstr "카슈브어"
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:325 ../rules/evdev.xml.in.h:325
msgid "Kaz"
msgstr "카자흐스탄"
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:326 ../rules/evdev.xml.in.h:326
msgid "Kazakh with Russian"
msgstr "카자흐스탄, 러시아어 포함"
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:327 ../rules/evdev.xml.in.h:327
msgid "Kazakhstan"
msgstr "카자흐스탄"
-#: ../rules/base.xml.in.h:301
-msgid "Keypad"
-msgstr "키패드"
+#: ../rules/base.xml.in.h:328 ../rules/evdev.xml.in.h:328
+msgid "Key to choose 3rd level"
+msgstr "3번째 단계를 선택하는 키"
-#: ../rules/base.xml.in.h:302
-msgid "Keypad with unicode additions (arrows and math operators)"
-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:303
-msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "키패드 유니코드 추가 (화살표 및 수학 기호). 수학 기호를 기본 단계에."
+#: ../rules/base.xml.in.h:330 ../rules/evdev.xml.in.h:330
+msgid "Keypad"
+msgstr "키패드"
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:331 ../rules/evdev.xml.in.h:331
msgid "Keytronic FlexPro"
msgstr "Keytronic FlexPro"
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:332 ../rules/evdev.xml.in.h:332
msgid "Khm"
msgstr "캄보디아"
-# Komi: http://ko.wikipedia.org/wiki/%EC%BD%94%EB%AF%B8%EC%96%B4
-#: ../rules/base.xml.in.h:306
+# http://ko.wikipedia.org/wiki/키르기스어
+#: ../rules/base.xml.in.h:333 ../rules/evdev.xml.in.h:333
+msgid "Kir"
+msgstr "키르기스어"
+
+# http://ko.wikipedia.org/wiki/코미어
+#: ../rules/base.xml.in.h:334 ../rules/evdev.xml.in.h:334
msgid "Komi"
msgstr "코미어"
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:335 ../rules/evdev.xml.in.h:335
msgid "Kor"
msgstr "대한민국"
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:336 ../rules/evdev.xml.in.h:336
msgid "Korea, Republic of"
msgstr "대한민국"
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:337 ../rules/evdev.xml.in.h:337
msgid "Korean 106-key"
msgstr "한글 106키"
-#: ../rules/base.xml.in.h:310
+# 쿠테나이 - 아메리카 원주민 부족
+#: ../rules/base.xml.in.h:338 ../rules/evdev.xml.in.h:338
+msgid "Ktunaxa"
+msgstr "쿠테나이"
+
+#: ../rules/base.xml.in.h:339 ../rules/evdev.xml.in.h:339
msgid "Kurdish, (F)"
msgstr "쿠르드어, (F)"
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:340 ../rules/evdev.xml.in.h:340
msgid "Kurdish, Arabic-Latin"
msgstr "쿠르드어, 아랍어 라틴"
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:341 ../rules/evdev.xml.in.h:341
msgid "Kurdish, Latin Alt-Q"
msgstr "쿠르드어, 라틴 Alt-Q"
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:342 ../rules/evdev.xml.in.h:342
msgid "Kurdish, Latin Q"
msgstr "쿠르드어, 라틴 Q"
-#: ../rules/base.xml.in.h:314
-msgid "Kyr"
-msgstr "키르기지스탄"
-
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:343 ../rules/evdev.xml.in.h:343
msgid "Kyrgyzstan"
msgstr "키르기지스탄"
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:344 ../rules/evdev.xml.in.h:344
msgid "LAm"
msgstr "라틴 아메리카"
-#: ../rules/base.xml.in.h:317
-msgid "LCtrl+LShift change layout."
-msgstr "왼쪽Ctrl+왼쪽Shift로 배치를 바꿉니다."
+# 리투아니아어 레이아웃 이름 http://lekp.info/
+#: ../rules/base.xml.in.h:345 ../rules/evdev.xml.in.h:345
+msgid "LEKP"
+msgstr "LEKP"
+
+# 리투아니아어 레이아웃 이름 http://lekp.info/
+#: ../rules/base.xml.in.h:346 ../rules/evdev.xml.in.h:346
+msgid "LEKPa"
+msgstr "LEKPa"
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:347 ../rules/evdev.xml.in.h:347
msgid "Lao"
msgstr "라오스"
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:348 ../rules/evdev.xml.in.h:348
msgid "Laos"
msgstr "라오스"
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:349 ../rules/evdev.xml.in.h:349
msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
msgstr "노트북 컴팩 (Armada 등) 노트북 키보드"
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:350 ../rules/evdev.xml.in.h:350
msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
msgstr "노트북 컴팩 (Presario 등) 노트북 키보드"
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:351 ../rules/evdev.xml.in.h:351
msgid "Laptop/notebook eMachines m68xx"
msgstr "노트북 컴팩 eMachines m68xx"
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:352 ../rules/evdev.xml.in.h:352
msgid "Latin"
msgstr "라틴"
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:353 ../rules/evdev.xml.in.h:353
msgid "Latin American"
msgstr "라틴 아메리카"
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:354 ../rules/evdev.xml.in.h:354
msgid "Latin Unicode"
msgstr "라틴 유니코드"
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:355 ../rules/evdev.xml.in.h:355
msgid "Latin Unicode qwerty"
msgstr "라틴 유니코드 QWERTY"
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:356 ../rules/evdev.xml.in.h:356
msgid "Latin qwerty"
msgstr "라틴 QWERTY"
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:357 ../rules/evdev.xml.in.h:357
msgid "Latin unicode"
msgstr "라틴 유니코드"
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:358 ../rules/evdev.xml.in.h:358
msgid "Latin unicode qwerty"
msgstr "라틴 유니코드 QWERTY"
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:359 ../rules/evdev.xml.in.h:359
msgid "Latin with guillemets"
msgstr "라틴, 각괄호 포함"
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:360 ../rules/evdev.xml.in.h:360
msgid "Latvia"
msgstr "라트비아"
-#: ../rules/base.xml.in.h:332
-msgid "Layout switching"
-msgstr "배치 전환"
+#: ../rules/base.xml.in.h:361 ../rules/evdev.xml.in.h:361
+msgid "Lav"
+msgstr "라트비아어"
-#: ../rules/base.xml.in.h:333
-msgid "Left Alt is swapped with left Win-key."
-msgstr "왼쪽 Alt와 왼쪽 윈도우 키를 뒤바꿉니다."
+#: ../rules/base.xml.in.h:362 ../rules/evdev.xml.in.h:362
+msgid "Left Alt"
+msgstr "왼쪽 Alt"
-#: ../rules/base.xml.in.h:334
-msgid "Left Alt key changes layout."
-msgstr "왼쪽 Alt 키로 배치를 바꿉니다."
+#: ../rules/base.xml.in.h:363 ../rules/evdev.xml.in.h:363
+msgid "Left Alt (while pressed)"
+msgstr "왼쪽 Alt (누르고 있는 동안)"
-#: ../rules/base.xml.in.h:335
-msgid "Left Alt key switches layout while pressed."
-msgstr "왼쪽 Alt 키를 누르면 배치를 바꿉니다."
+#: ../rules/base.xml.in.h:364 ../rules/evdev.xml.in.h:364
+msgid "Left Alt is swapped with Left Win"
+msgstr "왼쪽 Alt와 왼쪽 윈도우 키 뒤바꾸기"
-#: ../rules/base.xml.in.h:336
-msgid "Left Ctrl key changes layout."
-msgstr "왼쪽 Ctrl 키로 배치를 바꿉니다."
+#: ../rules/base.xml.in.h:365 ../rules/evdev.xml.in.h:365
+msgid "Left Ctrl"
+msgstr "왼쪽 Ctrl"
-#: ../rules/base.xml.in.h:337
-msgid "Left Shift key changes layout."
-msgstr "왼쪽 Shift 키로 배치를 바꿉니다."
+#: ../rules/base.xml.in.h:366 ../rules/evdev.xml.in.h:366
+msgid "Left Ctrl+Left Shift"
+msgstr "왼쪽 Ctrl+왼쪽 Shift"
-#: ../rules/base.xml.in.h:338
-msgid "Left Win-key changes layout."
-msgstr "왼쪽 윈도우 키로 배치를 바꿉니다."
+#: ../rules/base.xml.in.h:367 ../rules/evdev.xml.in.h:367
+msgid "Left Shift"
+msgstr "왼쪽 Shift"
-#: ../rules/base.xml.in.h:339
-msgid "Left Win-key is Compose."
-msgstr "왼쪽 윈도우 키가 조합 키입니다."
+#: ../rules/base.xml.in.h:368 ../rules/evdev.xml.in.h:368
+msgid "Left Win"
+msgstr "왼쪽 윈도우"
-#: ../rules/base.xml.in.h:340
-msgid "Left Win-key switches layout while pressed."
-msgstr "왼쪽 윈도우 키를 누르면 배치를 바꿉니다."
+#: ../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 "왼쪽 윈도우 (1번으로), 오른쪽 윈도우/메뉴 (마지막으로)"
-#: ../rules/base.xml.in.h:341
+#: ../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 "왼손잡이"
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:372 ../rules/evdev.xml.in.h:372
msgid "Left handed Dvorak"
msgstr "왼손잡이 드보락"
-#: ../rules/base.xml.in.h:343
-msgid "Legacy Wang 724 keypad"
-msgstr "구식 Wang 724 키패드"
+#: ../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 "구형 방식 Wang 724 키패드"
#. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:376 ../rules/evdev.xml.in.h:376
msgid "Legacy key with comma"
-msgstr "구식 키, 쉼표 포함"
+msgstr "구형 방식 키, 쉼표 포함"
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:377 ../rules/evdev.xml.in.h:377
msgid "Legacy key with dot"
-msgstr "구식 키, 점 포함"
+msgstr "구형 방식 키, 점 포함"
-#: ../rules/base.xml.in.h:347
-msgid "Legacy keypad"
-msgstr "구식 키패드"
+#: ../rules/base.xml.in.h:378 ../rules/evdev.xml.in.h:378
+msgid "Less-than/Greater-than"
+msgstr "부등호"
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:379 ../rules/evdev.xml.in.h:379
msgid "Lithuania"
msgstr "리투아니아"
-#: ../rules/base.xml.in.h:349
+# 한국에서 광고하는 대로 음역
+#: ../rules/base.xml.in.h:380 ../rules/evdev.xml.in.h:380
msgid "Logitech Access Keyboard"
-msgstr "로지텍 Access 키보드"
+msgstr "로지텍 액세스 키보드"
-#: ../rules/base.xml.in.h:350
+# 한국에서 광고하는 대로 음역
+#: ../rules/base.xml.in.h:381 ../rules/evdev.xml.in.h:381
msgid "Logitech Cordless Desktop"
-msgstr "로지텍 Cordless Desktop"
+msgstr "로지텍 무선 데스크탑"
-#: ../rules/base.xml.in.h:351
+# 한국에서 광고하는 대로 음역
+#: ../rules/base.xml.in.h:382 ../rules/evdev.xml.in.h:382
msgid "Logitech Cordless Desktop (alternate option)"
-msgstr "로지텍 Cordless Desktop (다른 옵션)"
+msgstr "로지텍 무선 데스크탑 (다른 옵션)"
-#: ../rules/base.xml.in.h:352
+# 한국에서 광고하는 대로 음역
+#: ../rules/base.xml.in.h:383 ../rules/evdev.xml.in.h:383
msgid "Logitech Cordless Desktop EX110"
-msgstr "로지텍 Cordless Desktop EX110"
+msgstr "로지텍 무선 데스크탑 EX110"
-#: ../rules/base.xml.in.h:353
+# 한국에서 광고하는 대로 음역
+#: ../rules/base.xml.in.h:384 ../rules/evdev.xml.in.h:384
msgid "Logitech Cordless Desktop LX-300"
-msgstr "로지텍 Cordless Desktop LX-300"
+msgstr "로지텍 무선 데스크탑 LX-300"
-#: ../rules/base.xml.in.h:354
+# 한국에서 광고하는 대로 음역
+#: ../rules/base.xml.in.h:385 ../rules/evdev.xml.in.h:385
msgid "Logitech Cordless Desktop Navigator"
-msgstr "로지텍 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:355
+# 한국에서 광고하는 대로 음역
+#: ../rules/base.xml.in.h:387 ../rules/evdev.xml.in.h:387
msgid "Logitech Cordless Desktop Pro (alternate option2)"
-msgstr "로지텍 Cordless Desktop Pro (다른 옵션 2)"
+msgstr "로지텍 무선 데스크탑 프로 (다른 옵션 2)"
-#: ../rules/base.xml.in.h:356
+# 한국에서 광고하는 대로 음역
+#: ../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 "로지텍 Cordless Freedom/Desktop Navigator"
+msgstr "로지텍 무선 프리덤/데스크탑 내비게이터"
-#: ../rules/base.xml.in.h:357
+# 한국에서 광고하는 대로 음역
+#: ../rules/base.xml.in.h:390 ../rules/evdev.xml.in.h:390
msgid "Logitech G15 extra keys via G15daemon"
msgstr "로지텍 G15 추가 키, G15daemon 사용"
-#: ../rules/base.xml.in.h:358
+# 한국에서 광고하는 대로 음역
+#: ../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 "로지텍 인터넷 350 키보드"
+
+# 한국에서 광고하는 대로 음역
+#: ../rules/base.xml.in.h:393 ../rules/evdev.xml.in.h:393
msgid "Logitech Internet Keyboard"
msgstr "로지텍 인터넷 키보드"
-#: ../rules/base.xml.in.h:359
+# 한국에서 광고하는 대로 음역
+#: ../rules/base.xml.in.h:394 ../rules/evdev.xml.in.h:394
msgid "Logitech Internet Navigator Keyboard"
-msgstr "로지텍 Internet Navigator 키보드"
+msgstr "로지텍 인터넷 내비게이터 키보드"
-#: ../rules/base.xml.in.h:360
+# 한국에서 광고하는 대로 음역
+#: ../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 "로지텍 Ultra-X 무선 미디어 데스크탑 키보드"
+msgstr "로지텍 울트라 무선 미디어 데스크탑 키보드"
-#: ../rules/base.xml.in.h:361
+# 한국에서 광고하는 대로 음역
+#: ../rules/base.xml.in.h:397 ../rules/evdev.xml.in.h:397
msgid "Logitech Ultra-X Keyboard"
-msgstr "로지텍 Ultra-X 키보드"
+msgstr "로지텍 울트라 키보드"
-#: ../rules/base.xml.in.h:362
+# 한국에서 광고하는 대로 음역
+#: ../rules/base.xml.in.h:398 ../rules/evdev.xml.in.h:398
msgid "Logitech diNovo Edge Keyboard"
-msgstr "로지텍 diNovo Edge 키보드"
+msgstr "로지텍 디노보 엣지 키보드"
-#: ../rules/base.xml.in.h:363
+# 한국에서 광고하는 대로 음역
+#: ../rules/base.xml.in.h:399 ../rules/evdev.xml.in.h:399
msgid "Logitech diNovo Keyboard"
-msgstr "로지텍 diNovo 키보드"
+msgstr "로지텍 디노보 키보드"
-#: ../rules/base.xml.in.h:364
+# 한국에서 광고하는 대로 음역
+#: ../rules/base.xml.in.h:400 ../rules/evdev.xml.in.h:400
msgid "Logitech iTouch"
-msgstr "로지텍 iTouch"
+msgstr "로지텍 아이터치"
-#: ../rules/base.xml.in.h:365
+# 한국에서 광고하는 대로 음역
+#: ../rules/base.xml.in.h:401 ../rules/evdev.xml.in.h:401
msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "로지텍 iTouch Cordless 키보드 (모델 Y-RB6)"
+msgstr "로지텍 아이터치 무선 키보드 (모델 Y-RB6)"
-#: ../rules/base.xml.in.h:366
+# 한국에서 광고하는 대로 음역
+#: ../rules/base.xml.in.h:402 ../rules/evdev.xml.in.h:402
msgid "Logitech iTouch Internet Navigator Keyboard SE"
-msgstr "로지텍 iTouch Internet Navigator 키보드 SE"
+msgstr "로지텍 아이터치 인터넷 내비게이터 키보드 SE"
-#: ../rules/base.xml.in.h:367
+# 한국에서 광고하는 대로 음역
+#: ../rules/base.xml.in.h:403 ../rules/evdev.xml.in.h:403
msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-msgstr "로지텍 iTouch Internet Navigator 키보드 SE (USB)"
+msgstr "로지텍 아이터치 인터넷 내비게이터 키보드 SE (USB)"
+
+# http://ko.wikipedia.org/wiki/저지_소르브어
+#: ../rules/base.xml.in.h:404 ../rules/evdev.xml.in.h:404
+msgid "Lower Sorbian"
+msgstr "저지 소르브어"
+
+# http://ko.wikipedia.org/wiki/저지_소르브어
+#: ../rules/base.xml.in.h:405 ../rules/evdev.xml.in.h:405
+msgid "Lower Sorbian (qwertz)"
+msgstr "저지 소르브어 (QWERTZ)"
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:406 ../rules/evdev.xml.in.h:406
msgid "Ltu"
msgstr "리투아니아"
-#: ../rules/base.xml.in.h:369
-msgid "Lva"
-msgstr "라트비아"
-
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:407 ../rules/evdev.xml.in.h:407
msgid "MESS"
msgstr "MESS"
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:408 ../rules/evdev.xml.in.h:408
msgid "MNE"
-msgstr "MNE"
+msgstr "몬테네그로"
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:409 ../rules/evdev.xml.in.h:409
msgid "MacBook/MacBook Pro"
msgstr "MacBook/MacBook Pro"
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:410 ../rules/evdev.xml.in.h:410
msgid "MacBook/MacBook Pro (Intl)"
msgstr "MacBook/MacBook Pro (국제 버전)"
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:411 ../rules/evdev.xml.in.h:411
msgid "Macedonia"
msgstr "마케도니아"
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:412 ../rules/evdev.xml.in.h:412
msgid "Macintosh"
msgstr "매킨토시"
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:413 ../rules/evdev.xml.in.h:413
msgid "Macintosh Old"
msgstr "매킨토시 구형"
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:414 ../rules/evdev.xml.in.h:414
msgid "Macintosh, Sun dead keys"
msgstr "매킨토시, 썬 데드키"
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:415 ../rules/evdev.xml.in.h:415
msgid "Macintosh, eliminate dead keys"
msgstr "매킨토시, 데드키 없음"
-#: ../rules/base.xml.in.h:379
-msgid "Make CapsLock an additional Ctrl."
-msgstr "CapsLock을 또 하나의 Ctrl로 만듭니다."
+#: ../rules/base.xml.in.h:416 ../rules/evdev.xml.in.h:416
+msgid "Make CapsLock an additional Backspace"
+msgstr "CapsLock을 추가 백스페이스로 사용"
+
+#: ../rules/base.xml.in.h:417 ../rules/evdev.xml.in.h:417
+msgid "Make CapsLock an additional Ctrl"
+msgstr "CapsLock을 추가 Ctrl로 사용"
+
+#: ../rules/base.xml.in.h:418 ../rules/evdev.xml.in.h:418
+msgid "Make CapsLock an additional ESC"
+msgstr "CapsLock을 추가 ESC로 사용"
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:419 ../rules/evdev.xml.in.h:419
msgid "Mal"
msgstr "몰디브"
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:420 ../rules/evdev.xml.in.h:420
msgid "Malayalam"
msgstr "말라얄람어"
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:421 ../rules/evdev.xml.in.h:421
msgid "Malayalam Lalitha"
msgstr "말라얄람어 라리타"
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:422 ../rules/evdev.xml.in.h:422
msgid "Maldives"
msgstr "몰디브"
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:423 ../rules/evdev.xml.in.h:423
msgid "Malta"
msgstr "몰타"
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:424 ../rules/evdev.xml.in.h:424
msgid "Maltese keyboard with US layout"
msgstr "몰타 키보드, 미국식 배치"
-#: ../rules/base.xml.in.h:386
+#: ../rules/base.xml.in.h:425 ../rules/evdev.xml.in.h:425
msgid "Mao"
msgstr "마오리"
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:426 ../rules/evdev.xml.in.h:426
msgid "Maori"
msgstr "마오리"
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:427 ../rules/evdev.xml.in.h:427
msgid "Memorex MX1998"
msgstr "Memorex MX1998"
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:428 ../rules/evdev.xml.in.h:428
msgid "Memorex MX2500 EZ-Access Keyboard"
msgstr "Memorex MX2500 EZ-Access 키보드"
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:429 ../rules/evdev.xml.in.h:429
msgid "Memorex MX2750"
msgstr "Memorex MX2750"
-#: ../rules/base.xml.in.h:391
-msgid "Menu is Compose."
-msgstr "메뉴 키가 조합 키입니다."
+#: ../rules/base.xml.in.h:430 ../rules/evdev.xml.in.h:430
+msgid "Menu"
+msgstr "메뉴"
-#: ../rules/base.xml.in.h:392
-msgid "Menu key changes layout."
-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:393
-msgid "Meta is mapped to the Win-keys."
-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:394
-msgid "Meta is mapped to the left Win-key."
-msgstr "메타 키가 왼쪽 윈도우 키로 매핑됩니다."
+#: ../rules/base.xml.in.h:433 ../rules/evdev.xml.in.h:433
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "마이크로소프트 컴포트 커브 키보드 2000"
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:434 ../rules/evdev.xml.in.h:434
msgid "Microsoft Internet Keyboard"
msgstr "마이크로소프트 인터넷 키보드"
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:435 ../rules/evdev.xml.in.h:435
msgid "Microsoft Internet Keyboard Pro, Swedish"
msgstr "마이크로소프트 인터넷 키보드 프로, 스웨덴"
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:436 ../rules/evdev.xml.in.h:436
msgid "Microsoft Natural"
msgstr "마이크로소프트 내츄럴"
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:437 ../rules/evdev.xml.in.h:437
msgid "Microsoft Natural Keyboard Elite"
msgstr "마이크로소프트 내츄럴 키보드 엘리트"
-#: ../rules/base.xml.in.h:399
+#: ../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:400
+#: ../rules/base.xml.in.h:439 ../rules/evdev.xml.in.h:439
msgid "Microsoft Natural Keyboard Pro OEM"
msgstr "마이크로소프트 내츄럴 키보드 프로 OEM"
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:440 ../rules/evdev.xml.in.h:440
msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
msgstr "마이크로소프트 내츄럴 키보드 프로 USB / 마이크로소프트 인터넷 키보드 프로"
-#: ../rules/base.xml.in.h:402
+#: ../rules/base.xml.in.h:441 ../rules/evdev.xml.in.h:441
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "마이크로소프트 내츄럴 무선 어고노믹 키보드 7000"
+
+#: ../rules/base.xml.in.h:442 ../rules/evdev.xml.in.h:442
msgid "Microsoft Office Keyboard"
msgstr "마이크로소프트 오피스 키보드"
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:443 ../rules/evdev.xml.in.h:443
msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
msgstr "마이크로소프트 무선 멀티미디어 키보드 1.0A"
-#: ../rules/base.xml.in.h:404 ../rules/sun.xml.in.h:72
+#: ../rules/base.xml.in.h:444 ../rules/evdev.xml.in.h:444
msgid "Miscellaneous compatibility options"
msgstr "기타 호환성 옵션"
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:445 ../rules/evdev.xml.in.h:445
msgid "Mkd"
msgstr "마케도니아"
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:446 ../rules/evdev.xml.in.h:446
msgid "Mlt"
msgstr "몰타"
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:447 ../rules/evdev.xml.in.h:447
msgid "Mmr"
msgstr "미얀마"
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:448 ../rules/evdev.xml.in.h:448
msgid "Mng"
msgstr "몽골"
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:449 ../rules/evdev.xml.in.h:449
msgid "Mongolia"
msgstr "몽골"
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:450 ../rules/evdev.xml.in.h:450
msgid "Montenegro"
msgstr "몬테네그로"
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:451 ../rules/evdev.xml.in.h:451
msgid "Morocco"
msgstr "모로코"
-#: ../rules/base.xml.in.h:412 ../rules/sun.xml.in.h:73
+#: ../rules/base.xml.in.h:452 ../rules/evdev.xml.in.h:452
msgid "Multilingual"
msgstr "여러 언어 지원"
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:453 ../rules/evdev.xml.in.h:453
msgid "Multilingual, first part"
msgstr "여러 언어 지원, 첫번째"
-#: ../rules/base.xml.in.h:414 ../rules/sun.xml.in.h:74
+#: ../rules/base.xml.in.h:454 ../rules/evdev.xml.in.h:454
msgid "Multilingual, second part"
msgstr "여러 언어 지원, 두번째"
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:455 ../rules/evdev.xml.in.h:455
msgid "Myanmar"
msgstr "미얀마"
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:456 ../rules/evdev.xml.in.h:456
msgid "NICOLA-F style Backspace"
-msgstr "NICOLA-F 스타일 백스페이스"
-
-# 제조사
-#: ../rules/base.xml.in.h:417
-msgid "Neostyle"
-msgstr "Neostyle"
-
-#: ../rules/base.xml.in.h:418
+msgstr "NICOLA-F 방식 백스페이스"
+
+# 우르드어 키보드 형태
+#: ../rules/base.xml.in.h:457 ../rules/evdev.xml.in.h:457
+msgid "NLA"
+msgstr "NLA"
+
+# 아메리카 소수 언어
+#: ../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
+msgid "Nativo for Esperanto"
+msgstr "나티보, 에스페란토"
+
+# 아메리카 소수 언어
+#: ../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 "Neo 2"
+
+#: ../rules/base.xml.in.h:462 ../rules/evdev.xml.in.h:462
msgid "Nep"
msgstr "네팔"
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:463 ../rules/evdev.xml.in.h:463
msgid "Nepal"
msgstr "네팔"
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:464 ../rules/evdev.xml.in.h:464
msgid "Netherlands"
msgstr "네덜란드"
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:465 ../rules/evdev.xml.in.h:465
msgid "Nig"
msgstr "나이지리아"
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:466 ../rules/evdev.xml.in.h:466
msgid "Nigeria"
msgstr "나이지리아"
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:467 ../rules/evdev.xml.in.h:467
msgid "Nld"
msgstr "네덜란드"
-#: ../rules/base.xml.in.h:424 ../rules/sun.xml.in.h:75
+#: ../rules/base.xml.in.h:468 ../rules/evdev.xml.in.h:468
+msgid "Non-breakable space character at fourth level"
+msgstr "4번째 단계에서 강제 공백 문자"
+
+#: ../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 "4번째 단계에서 강제 공백 문자, 6번째 단계에서 얇은 강제 공백 문자"
+
+#: ../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 "4번째 단계에서 강제 공백 문자, 6번째 단계에서 얇은 강제 공백 문자 (Ctrl+Shift 사용)"
+
+#: ../rules/base.xml.in.h:471 ../rules/evdev.xml.in.h:471
+msgid "Non-breakable space character at second level"
+msgstr "2번째 단계에서 강제 공백 문자"
+
+#: ../rules/base.xml.in.h:472 ../rules/evdev.xml.in.h:472
+msgid "Non-breakable space character at third level"
+msgstr "3번째 단계에서 강제 공백 문자"
+
+#: ../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 "3번째 단계에서 강제 공백 문자, 4번째에서는 출력 없음."
+
+#: ../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 "3번째 단계에서 강제 공백 문자, 4번째에서는 얇은 강제 공백 문자."
+
+#: ../rules/base.xml.in.h:475 ../rules/evdev.xml.in.h:475
msgid "Nor"
msgstr "노르웨이"
-#: ../rules/base.xml.in.h:425
+#: ../rules/base.xml.in.h:476 ../rules/evdev.xml.in.h:476
msgid "Northern Saami"
msgstr "북 사오미"
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:477 ../rules/evdev.xml.in.h:477
msgid "Northern Saami, eliminate dead keys"
msgstr "북 사오미, 데드키 없음"
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:478 ../rules/evdev.xml.in.h:478
msgid "Northgate OmniKey 101"
msgstr "노스게이트 OmniKey 101"
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:479 ../rules/evdev.xml.in.h:479
msgid "Norway"
msgstr "노르웨이"
-#: ../rules/base.xml.in.h:429
-msgid "NumLock LED shows alternative layout."
-msgstr "NumLock LED가 다른 배치를 표시합니다."
+#: ../rules/base.xml.in.h:480 ../rules/evdev.xml.in.h:480
+msgid "NumLock"
+msgstr "NumLock"
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:481 ../rules/evdev.xml.in.h:481
msgid "Numeric keypad delete key behaviour"
msgstr "숫자 키패드의 Delete 키 동작"
-#: ../rules/base.xml.in.h:431
-msgid "Numeric keypad keys work as with Mac."
-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:432
+#: ../rules/base.xml.in.h:483 ../rules/evdev.xml.in.h:483
msgid "Numeric keypad layout selection"
msgstr "숫자 키패드 배치 선택"
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:484 ../rules/evdev.xml.in.h:484
msgid "OADG 109A"
msgstr "OADG 109A"
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:485 ../rules/evdev.xml.in.h:485
msgid "OLPC"
msgstr "OLPC"
# 아프가니스탄 공용어의 하나, http://ko.wikipedia.org/wiki/%EB%8B%A4%EB%A6%AC%EC%96%B4
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:486 ../rules/evdev.xml.in.h:486
msgid "OLPC Dari"
msgstr "OLPC 다리어"
# 아프가니스탄 공용어의 하나, http://ko.wikipedia.org/wiki/%ED%8C%8C%EC%8A%88%ED%86%A0%EC%96%B4
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:487 ../rules/evdev.xml.in.h:487
msgid "OLPC Pashto"
msgstr "OLPC 파슈토어"
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:488 ../rules/evdev.xml.in.h:488
msgid "OLPC Southern Uzbek"
msgstr "OLPC 남 우즈벡"
# 아일랜드 변형
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:489 ../rules/evdev.xml.in.h:489
msgid "Ogham"
msgstr "Ogham"
# 아일랜드 변형
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:490 ../rules/evdev.xml.in.h:490
msgid "Ogham IS434"
msgstr "Ogham IS434"
-# 인도 방언
-#: ../rules/base.xml.in.h:440
+# Oriya - 인도 방언
+#: ../rules/base.xml.in.h:491 ../rules/evdev.xml.in.h:491
msgid "Oriya"
-msgstr "Oriya"
+msgstr "오리야어"
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:492 ../rules/evdev.xml.in.h:492
msgid "Ortek MCK-800 MM/Internet keyboard"
msgstr "Ortek MCK-800 MM/Internet 키보드"
# 러시아 변형
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:493 ../rules/evdev.xml.in.h:493
msgid "Ossetian"
msgstr "Ossetian"
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:494 ../rules/evdev.xml.in.h:494
msgid "Ossetian, Winkeys"
msgstr "Ossetian, 윈도우 키"
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:495 ../rules/evdev.xml.in.h:495
+msgid "Ossetian, legacy"
+msgstr "Ossetian, 구형 방식 키"
+
+#: ../rules/base.xml.in.h:496 ../rules/evdev.xml.in.h:496
msgid "PC-98xx Series"
msgstr "PC-98xx 시리즈"
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:497 ../rules/evdev.xml.in.h:497
msgid "Pak"
msgstr "파키스탄"
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:498 ../rules/evdev.xml.in.h:498
msgid "Pakistan"
msgstr "파키스탄"
# 아프가니스탄
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:499 ../rules/evdev.xml.in.h:499
msgid "Pashto"
msgstr "파슈토어"
# 태국
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:500 ../rules/evdev.xml.in.h:500
msgid "Pattachote"
msgstr "Pattachote"
-#: ../rules/base.xml.in.h:449 ../rules/sun.xml.in.h:78
+#: ../rules/base.xml.in.h:501 ../rules/evdev.xml.in.h:501
msgid "Phonetic"
msgstr "음성 표기"
-#: ../rules/base.xml.in.h:450 ../rules/sun.xml.in.h:79
+#: ../rules/base.xml.in.h:502 ../rules/evdev.xml.in.h:502
msgid "Pol"
msgstr "폴란드"
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:503 ../rules/evdev.xml.in.h:503
msgid "Poland"
msgstr "폴란드"
# 그리스어 발음 표기 http://en.wikipedia.org/wiki/Polytonic_orthography
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:504 ../rules/evdev.xml.in.h:504
msgid "Polytonic"
msgstr "폴리토닉"
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:505 ../rules/evdev.xml.in.h:505
msgid "Portugal"
msgstr "포르투갈"
-#: ../rules/base.xml.in.h:454
-msgid "Press Left Alt key to choose 3rd level."
-msgstr "왼쪽 Alt 키를 누르면 3번째 단계를 선택합니다."
-
-#: ../rules/base.xml.in.h:455
-msgid "Press Left Win-key to choose 3rd level."
-msgstr "왼쪽 윈도우 키를 누르면 3번째 단계를 선택합니다."
-
-#: ../rules/base.xml.in.h:456
-msgid "Press Menu key to choose 3rd level."
-msgstr "메뉴 키를 누르면 3번째 단계를 선택합니다."
-
-#: ../rules/base.xml.in.h:457
-msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
-msgstr "오른쪽 Alt 키를 누르면 3번째 단계를 선택합니다. Shift+오른쪽 Alt 키가 Multi_Key입니다."
-
-#: ../rules/base.xml.in.h:458
-msgid "Press Right Alt key to choose 3rd level."
-msgstr "오른쪽 Alt 키를 누르면 3번째 단계를 선택합니다."
-
-#: ../rules/base.xml.in.h:459
-msgid "Press Right Ctrl to choose 3rd level."
-msgstr "오른쪽 Ctrl 키를 누르면 3번째 단계를 선택합니다."
-
-#: ../rules/base.xml.in.h:460
-msgid "Press Right Win-key to choose 3rd level."
-msgstr "오른쪽 윈도우 키를 누르면 3번째 단계를 선택합니다."
-
-#: ../rules/base.xml.in.h:461
-msgid "Press any of Alt keys to choose 3rd level."
-msgstr "아무 Alt 키를 누르면 3번째 단계를 선택합니다."
-
-#: ../rules/base.xml.in.h:462
-msgid "Press any of Win-keys to choose 3rd level."
-msgstr "아무 윈도우 키를 누르면 3번째 단계를 선택합니다."
-
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:506 ../rules/evdev.xml.in.h:506
msgid "Pro"
msgstr "프로"
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:507 ../rules/evdev.xml.in.h:507
msgid "Pro Keypad"
msgstr "프로 키보드"
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:508 ../rules/evdev.xml.in.h:508
msgid "Probhat"
msgstr "프롭햇"
-#: ../rules/base.xml.in.h:466
+#: ../rules/base.xml.in.h:509 ../rules/evdev.xml.in.h:509
+msgid "Programmer Dvorak"
+msgstr "프로그래머 드보락"
+
+#: ../rules/base.xml.in.h:510 ../rules/evdev.xml.in.h:510
msgid "Propeller Voyager (KTEZ-1000)"
msgstr "Propeller Voyager (KTEZ-1000)"
-#: ../rules/base.xml.in.h:467 ../rules/sun.xml.in.h:88
+#: ../rules/base.xml.in.h:511 ../rules/evdev.xml.in.h:511
msgid "Prt"
msgstr "포르투갈"
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:512 ../rules/evdev.xml.in.h:512
msgid "QTronix Scorpius 98N+"
msgstr "QTronix Scorpius 98N+"
-#: ../rules/base.xml.in.h:469
-msgid "R-Alt switches layout while pressed."
-msgstr "오른쪽 Alt 키를 누르면 배치를 바꿉니다."
+#: ../rules/base.xml.in.h:513 ../rules/evdev.xml.in.h:513
+msgid "Right Alt"
+msgstr "오른쪽 Alt"
-#: ../rules/base.xml.in.h:470
-msgid "Right Alt is Compose."
-msgstr "오른쪽 Alt가 조합 키입니다."
+#: ../rules/base.xml.in.h:514 ../rules/evdev.xml.in.h:514
+msgid "Right Alt (while pressed)"
+msgstr "오른쪽 Alt (누르고 있는 동안)"
-#: ../rules/base.xml.in.h:471
-msgid "Right Alt key changes layout."
-msgstr "오른쪽 Alt 키로 배치를 바꿉니다."
+#: ../rules/base.xml.in.h:515 ../rules/evdev.xml.in.h:515
+msgid "Right Alt key never chooses 3rd level"
+msgstr "오른쪽 Alt는 3번째 단계를 선택하지 않음"
-#: ../rules/base.xml.in.h:472 ../rules/sun.xml.in.h:90
-msgid "Right Alt key never chooses 3rd level."
-msgstr "오른쪽 Alt 키는 3번째 단계를 선택하지 않습니다."
+#: ../rules/base.xml.in.h:516 ../rules/evdev.xml.in.h:516
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr "오른쪽 Alt, Shift+오른쪽 Alt가 Multi_Key"
-#: ../rules/base.xml.in.h:473
-msgid "Right Ctrl is Compose."
-msgstr "오른쪽 Ctrl이 조합 키입니다."
+#: ../rules/base.xml.in.h:517 ../rules/evdev.xml.in.h:517
+msgid "Right Ctrl"
+msgstr "오른쪽 Ctrl"
-#: ../rules/base.xml.in.h:474
-msgid "Right Ctrl key changes layout."
-msgstr "오른쪽 Ctrl 키로 배치를 바꿉니다."
+#: ../rules/base.xml.in.h:518 ../rules/evdev.xml.in.h:518
+msgid "Right Ctrl (while pressed)"
+msgstr "오른쪽 Ctrl (누르고 있는 동안)"
-#: ../rules/base.xml.in.h:475
-msgid "Right Ctrl key switches layout while pressed."
-msgstr "오른쪽 Ctrl 키를 누르면 배치를 바꿉니다."
+#: ../rules/base.xml.in.h:519 ../rules/evdev.xml.in.h:519
+msgid "Right Ctrl as Right Alt"
+msgstr "오른쪽 Ctrl 키를 오른쪽 Alt 키로"
-#: ../rules/base.xml.in.h:476
-msgid "Right Ctrl key works as Right Alt."
-msgstr "오른쪽 Ctrl 키가 오른쪽 Alt로 동작합니다."
+#: ../rules/base.xml.in.h:520 ../rules/evdev.xml.in.h:520
+msgid "Right Shift"
+msgstr "오른쪽 Shift"
-#: ../rules/base.xml.in.h:477
-msgid "Right Shift key changes layout."
-msgstr "오른쪽 Shift 키로 배치를 바꿉니다."
+#: ../rules/base.xml.in.h:521 ../rules/evdev.xml.in.h:521
+msgid "Right Win"
+msgstr "오른쪽 윈도우"
-#: ../rules/base.xml.in.h:478
-msgid "Right Win-key changes layout."
-msgstr "오른쪽 윈도우 키로 배치를 바꿉니다."
+#: ../rules/base.xml.in.h:522 ../rules/evdev.xml.in.h:522
+msgid "Right Win (while pressed)"
+msgstr "오른쪽 윈도우 (누르고 있는 동안)"
-#: ../rules/base.xml.in.h:479
-msgid "Right Win-key is Compose."
-msgstr "오른쪽 윈도우 키가 조합 키입니다."
-
-#: ../rules/base.xml.in.h:480
-msgid "Right Win-key switches layout while pressed."
-msgstr "오른쪽 윈도우 키를 누르면 배치를 바꿉니다."
-
-#: ../rules/base.xml.in.h:481
+#: ../rules/base.xml.in.h:523 ../rules/evdev.xml.in.h:523
msgid "Right hand"
msgstr "오른손잡이"
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:524 ../rules/evdev.xml.in.h:524
msgid "Right handed Dvorak"
msgstr "오른손잡이 드보락"
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:525 ../rules/evdev.xml.in.h:525
msgid "Romania"
msgstr "루마니아"
-#: ../rules/base.xml.in.h:484
+#: ../rules/base.xml.in.h:526 ../rules/evdev.xml.in.h:526
msgid "Romanian keyboard with German letters"
msgstr "루마니아 키보드, 독일어 글자"
-#: ../rules/base.xml.in.h:485
+#: ../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:486
+#: ../rules/base.xml.in.h:528 ../rules/evdev.xml.in.h:528
msgid "Rou"
msgstr "루마니아"
-#: ../rules/base.xml.in.h:487 ../rules/sun.xml.in.h:95
+#: ../rules/base.xml.in.h:529 ../rules/evdev.xml.in.h:529
msgid "Rus"
msgstr "러시아"
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:530 ../rules/evdev.xml.in.h:530
msgid "Russia"
msgstr "러시아"
-#: ../rules/base.xml.in.h:489 ../rules/sun.xml.in.h:96
+#: ../rules/base.xml.in.h:531 ../rules/evdev.xml.in.h:531
msgid "Russian"
msgstr "러시아어"
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:532 ../rules/evdev.xml.in.h:532
msgid "Russian phonetic"
msgstr "러시아어 음성 표기"
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:533 ../rules/evdev.xml.in.h:533
msgid "Russian phonetic Dvorak"
msgstr "러시아어 음성 표기 드보락"
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:534 ../rules/evdev.xml.in.h:534
msgid "Russian phonetic, eliminate dead keys"
msgstr "러시아어 음성 표기, 데드키 없음"
-#: ../rules/base.xml.in.h:493
+#: ../rules/base.xml.in.h:535 ../rules/evdev.xml.in.h:535
msgid "Russian with Kazakh"
msgstr "러시아어, 카자흐 포함"
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:536 ../rules/evdev.xml.in.h:536
msgid "SILVERCREST Multimedia Wireless Keyboard"
msgstr "SILVERCREST Multimedia Wireless 키보드"
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:537 ../rules/evdev.xml.in.h:537
msgid "SK-1300"
msgstr "SK-1300"
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:538 ../rules/evdev.xml.in.h:538
msgid "SK-2500"
msgstr "SK-2500"
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:539 ../rules/evdev.xml.in.h:539
msgid "SK-6200"
msgstr "SK-6200"
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:540 ../rules/evdev.xml.in.h:540
msgid "SK-7100"
msgstr "SK-7100"
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:541 ../rules/evdev.xml.in.h:541
msgid "SRB"
msgstr "SRB"
-#: ../rules/base.xml.in.h:500
+#: ../rules/base.xml.in.h:542 ../rules/evdev.xml.in.h:542
msgid "SVEN Ergonomic 2500"
msgstr "SVEN Ergonomic 2500"
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:543 ../rules/evdev.xml.in.h:543
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
+
+#: ../rules/base.xml.in.h:544 ../rules/evdev.xml.in.h:544
msgid "Samsung SDM 4500P"
msgstr "삼성 SDM 4500P"
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:545 ../rules/evdev.xml.in.h:545
msgid "Samsung SDM 4510P"
msgstr "삼성 SDM 4510P"
-#: ../rules/base.xml.in.h:503
-msgid "ScrollLock LED shows alternative layout."
-msgstr "ScrollLock LED가 다른 배치를 표시합니다."
+#: ../rules/base.xml.in.h:546 ../rules/evdev.xml.in.h:546
+msgid "ScrollLock"
+msgstr "ScrollLock"
-#: ../rules/base.xml.in.h:504
+# 캐나다 소스 언어
+#: ../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 "3번째 단계에서 세미콜론"
+
+#: ../rules/base.xml.in.h:549 ../rules/evdev.xml.in.h:549
msgid "Serbia"
msgstr "세르비아"
-#: ../rules/base.xml.in.h:505
-msgid "Shift cancels CapsLock."
-msgstr "Shift를 누르면 CapsLock을 끕니다."
+#: ../rules/base.xml.in.h:550 ../rules/evdev.xml.in.h:550
+msgid "Shift cancels CapsLock"
+msgstr "Shift를 누르면 CapsLock 끄기"
+
+#: ../rules/base.xml.in.h:551 ../rules/evdev.xml.in.h:551
+msgid "Shift does not cancel NumLock, chooses 3d level instead"
+msgstr "Shift를 누르면 NumLock을 끄지 않고, 3번째 레벨을 선택"
-#: ../rules/base.xml.in.h:506
-msgid "Shift with numeric keypad keys works as in MS Windows."
-msgstr "Shift 키와 동시에 숫자 키패드 키를 누를 때 MS 윈도우즈와 동일하게 동작."
+#: ../rules/base.xml.in.h:552 ../rules/evdev.xml.in.h:552
+msgid "Shift with numeric keypad keys works as in MS Windows"
+msgstr "Shift와 동시에 숫자 키패드 키를 누르면 MS 윈도우즈와 동일하게 동작"
-#: ../rules/base.xml.in.h:507
-msgid "Shift+CapsLock changes layout."
-msgstr "Shift+CapsLock으로 배치를 바꿉니다."
+#: ../rules/base.xml.in.h:553 ../rules/evdev.xml.in.h:553
+msgid "Shift+CapsLock"
+msgstr "Shift+CapsLock"
-#: ../rules/base.xml.in.h:508
+#: ../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 "슬로바키아"
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:556 ../rules/evdev.xml.in.h:556
msgid "Slovenia"
msgstr "슬로베니아"
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:557 ../rules/evdev.xml.in.h:557
msgid "South Africa"
msgstr "남아공"
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:558 ../rules/evdev.xml.in.h:558
msgid "Southern Uzbek"
msgstr "남 우즈벡"
-#: ../rules/base.xml.in.h:512
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr "스페이스 키는 네번째 단계에서 강제 공백 출력, 여섯번째 단계에서 얇은 강제 공백"
-
-#: ../rules/base.xml.in.h:513
-msgid "Space key outputs non-breakable space character at fourth level."
-msgstr "스페이스 키는 네번째 단계에서 강제 공백 출력."
-
-#: ../rules/base.xml.in.h:514
-msgid "Space key outputs non-breakable space character at second level."
-msgstr "스페이스 키는 두번째 단계에서 강제 공백 출력."
-
-#: ../rules/base.xml.in.h:515
-msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
-msgstr "스페이스 키는 세번째 단계에서 강제 공백 출력, 네 번째에는 출력 없음."
-
-#: ../rules/base.xml.in.h:516
-msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr "스페이스 키는 세번째 단계에서 강제 공백 출력, 네 번째에는 얇은 강제 공백 출력."
-
-#: ../rules/base.xml.in.h:517
-msgid "Space key outputs non-breakable space character at third level."
-msgstr "스페이스 키는 세번째 단계에서 강제 공백 출력."
-
-#: ../rules/base.xml.in.h:518
-msgid "Space key outputs usual space at any level."
-msgstr "스페이스 키는 모든 단계에서 일반 공백 출력."
-
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:559 ../rules/evdev.xml.in.h:559
msgid "Spain"
msgstr "스페인"
-#: ../rules/base.xml.in.h:520 ../rules/sun.xml.in.h:103
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
-msgstr "특수 키 조합은 (Ctrl+Alt+&lt;키&gt;) 서버에서 처리합니다."
+#: ../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 "특수 키는 (Ctrl+Alt+&lt;키&gt;) 서버에서 처리"
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:561 ../rules/evdev.xml.in.h:561
msgid "SrL"
msgstr "스리랑카"
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:562 ../rules/evdev.xml.in.h:562
msgid "Sri Lanka"
msgstr "스리랑카"
-#: ../rules/base.xml.in.h:523 ../rules/sun.xml.in.h:104
+#: ../rules/base.xml.in.h:563 ../rules/evdev.xml.in.h:563
msgid "Standard"
msgstr "표준"
-#: ../rules/base.xml.in.h:524
+#: ../rules/base.xml.in.h:564 ../rules/evdev.xml.in.h:564
msgid "Standard (Cedilla)"
-msgstr "표준 (세딜라)"
-
-#: ../rules/base.xml.in.h:525
-msgid "Standard (Commabelow)"
-msgstr "표준 (아래 쉼표)"
+msgstr "표준 (세디유)"
#. RSTU 2019-91
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:566 ../rules/evdev.xml.in.h:566
msgid "Standard RSTU"
msgstr "표준 RSTU"
#. RSTU 2019-91
-#: ../rules/base.xml.in.h:529
+#: ../rules/base.xml.in.h:568 ../rules/evdev.xml.in.h:568
msgid "Standard RSTU on Russian layout"
msgstr "표준 RSTU 러시아어 배치"
-#: ../rules/base.xml.in.h:530 ../rules/sun.xml.in.h:112
+#: ../rules/base.xml.in.h:569 ../rules/evdev.xml.in.h:569
+msgid "Sun Type 5/6"
+msgstr "썬 타입 5/6"
+
+#: ../rules/base.xml.in.h:570 ../rules/evdev.xml.in.h:570
msgid "Sun dead keys"
msgstr "썬 데드키"
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:571 ../rules/evdev.xml.in.h:571
msgid "Super Power Multimedia Keyboard"
msgstr "Super Power 멀티미디어 키보드"
-#: ../rules/base.xml.in.h:532
-msgid "Super is mapped to the Win-keys."
-msgstr "Super 키가 윈도우 키로 매핑됩니다."
+#: ../rules/base.xml.in.h:572 ../rules/evdev.xml.in.h:572
+msgid "Super is mapped to Win keys"
+msgstr "Super 키를 윈도우 키로 매핑"
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:573 ../rules/evdev.xml.in.h:573
msgid "Svdvorak"
msgstr "슬로바키아 드보락"
-#: ../rules/base.xml.in.h:534 ../rules/sun.xml.in.h:113
+#: ../rules/base.xml.in.h:574 ../rules/evdev.xml.in.h:574
msgid "Svk"
msgstr "슬로바키아"
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:575 ../rules/evdev.xml.in.h:575
msgid "Svn"
msgstr "슬로베니아"
-#: ../rules/base.xml.in.h:536
-msgid "Swap Ctrl and CapsLock."
-msgstr "Ctrl과 CapsLock 뒤바꾸기."
-
-#: ../rules/base.xml.in.h:537
-msgid "Swap ESC and CapsLock."
-msgstr "ESC와 CapsLock 뒤바꾸기."
+#: ../rules/base.xml.in.h:576 ../rules/evdev.xml.in.h:576
+msgid "Swap Ctrl and CapsLock"
+msgstr "Ctrl과 CapsLock 뒤바꾸기"
-#: ../rules/base.xml.in.h:538
-msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-msgstr "맥 키보드를 커널이 잘못 검색했을 때 키 두개의 코드 뒤바꾸기."
+#: ../rules/base.xml.in.h:577 ../rules/evdev.xml.in.h:577
+msgid "Swap ESC and CapsLock"
+msgstr "ESC와 CapsLock 뒤바꾸기"
-#: ../rules/base.xml.in.h:539 ../rules/sun.xml.in.h:115
+#: ../rules/base.xml.in.h:578 ../rules/evdev.xml.in.h:578
msgid "Swe"
msgstr "스웨덴"
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:579 ../rules/evdev.xml.in.h:579
msgid "Sweden"
msgstr "스웨덴"
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:580 ../rules/evdev.xml.in.h:580
msgid "Switzerland"
msgstr "스위스"
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:581 ../rules/evdev.xml.in.h:581
msgid "Symplon PaceBook (tablet PC)"
msgstr "Symplon PaceBook (타블렛 PC)"
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:582 ../rules/evdev.xml.in.h:582
msgid "Syr"
msgstr "시리아"
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:583 ../rules/evdev.xml.in.h:583
msgid "Syria"
msgstr "시리아"
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:584 ../rules/evdev.xml.in.h:584
msgid "Syriac"
msgstr "시리아어"
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:585 ../rules/evdev.xml.in.h:585
msgid "Syriac phonetic"
msgstr "시리아어 음성 기호"
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:586 ../rules/evdev.xml.in.h:586
msgid "TIS-820.2538"
msgstr "TIS-820.2538"
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:587 ../rules/evdev.xml.in.h:587
msgid "Tajikistan"
msgstr "타지키스탄"
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:588 ../rules/evdev.xml.in.h:588
msgid "Tamil"
msgstr "타밀어"
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:589 ../rules/evdev.xml.in.h:589
msgid "Tamil TAB Typewriter"
msgstr "타밀어 TAB 타자기"
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:590 ../rules/evdev.xml.in.h:590
msgid "Tamil TSCII Typewriter"
msgstr "타밀어 TSCII 타자기"
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:591 ../rules/evdev.xml.in.h:591
msgid "Tamil Unicode"
msgstr "타밀어 유니코드"
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:592 ../rules/evdev.xml.in.h:592
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
+
+# http://ko.wikipedia.org/wiki/타타르어
+#: ../rules/base.xml.in.h:593 ../rules/evdev.xml.in.h:593
msgid "Tatar"
-msgstr "Tatar"
+msgstr "타타르어"
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:594 ../rules/evdev.xml.in.h:594
msgid "Telugu"
msgstr "텔루구어"
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:595 ../rules/evdev.xml.in.h:595
msgid "Tha"
msgstr "태국"
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:596 ../rules/evdev.xml.in.h:596
msgid "Thailand"
msgstr "태국"
-#: ../rules/base.xml.in.h:557 ../rules/sun.xml.in.h:119
-msgid "Third level choosers"
-msgstr "세번째 단계 선택 키"
-
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:597 ../rules/evdev.xml.in.h:597
msgid "Tibetan"
msgstr "티베트"
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:598 ../rules/evdev.xml.in.h:598
msgid "Tibetan (with ASCII numerals)"
msgstr "티베트 (ASCII 숫자 포함)"
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:599 ../rules/evdev.xml.in.h:599
msgid "Tifinagh"
msgstr "티피나그"
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:600 ../rules/evdev.xml.in.h:600
msgid "Tifinagh Alternative"
msgstr "티피나그 다른 버전"
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:601 ../rules/evdev.xml.in.h:601
msgid "Tifinagh Alternative Phonetic"
msgstr "티피나그 다른 음성 기호 버전"
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:602 ../rules/evdev.xml.in.h:602
msgid "Tifinagh Extended"
msgstr "티피나그 확장"
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:603 ../rules/evdev.xml.in.h:603
msgid "Tifinagh Extended Phonetic"
msgstr "티피나그 확장 음성 기호"
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:604 ../rules/evdev.xml.in.h:604
msgid "Tifinagh Phonetic"
msgstr "티피나그 음성 기호"
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:605 ../rules/evdev.xml.in.h:605
msgid "Tilde (~) variant"
msgstr "틸드 (~) 변형"
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:606 ../rules/evdev.xml.in.h:606
msgid "Tjk"
msgstr "타지키스탄"
-#: ../rules/base.xml.in.h:568
+#: ../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 "QWERTY 키보드에서 해당하는 키로."
+
+#: ../rules/base.xml.in.h:609 ../rules/evdev.xml.in.h:609
msgid "Toshiba Satellite S3000"
msgstr "도시바 Satellite S3000"
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:610 ../rules/evdev.xml.in.h:610
msgid "Trust Direct Access Keyboard"
msgstr "Trust Direct Access 키보드"
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:611 ../rules/evdev.xml.in.h:611
msgid "Trust Wireless Keyboard Classic"
msgstr "Trust Wireless Keyboard Classic"
-#: ../rules/base.xml.in.h:571 ../rules/sun.xml.in.h:120
+#: ../rules/base.xml.in.h:612 ../rules/evdev.xml.in.h:612
msgid "Tur"
msgstr "터키"
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:613 ../rules/evdev.xml.in.h:613
msgid "Turkey"
msgstr "터키"
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:614 ../rules/evdev.xml.in.h:614
msgid "Typewriter"
msgstr "타자기"
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:615 ../rules/evdev.xml.in.h:615
+msgid "UCW layout (accented letters only)"
+msgstr "UCW 배치 (악센트 문자만)"
+
+#: ../rules/base.xml.in.h:616 ../rules/evdev.xml.in.h:616
msgid "US keyboard with Bosnian digraphs"
msgstr "미국식 키보드, 보스니아 이중 글자 포함"
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:617 ../rules/evdev.xml.in.h:617
msgid "US keyboard with Bosnian letters"
msgstr "미국식 키보드, 보스니아 글자 포함"
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:618 ../rules/evdev.xml.in.h:618
msgid "US keyboard with Croatian digraphs"
msgstr "미국식 키보드, 크로아티아 이중 글자 포함"
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:619 ../rules/evdev.xml.in.h:619
msgid "US keyboard with Croatian letters"
msgstr "미국식 키보드, 크로아티아 글자 포함"
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:620 ../rules/evdev.xml.in.h:620
msgid "US keyboard with Estonian letters"
msgstr "미국식 키보드, 에스토니아 글자 포함"
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:621 ../rules/evdev.xml.in.h:621
msgid "US keyboard with Lithuanian letters"
msgstr "미국식 키보드, 리투아니아 글자 포함"
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:622 ../rules/evdev.xml.in.h:622
msgid "US keyboard with Slovenian digraphs"
msgstr "미국식 키보드, 슬로베니아 이중 글자 포함"
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:623 ../rules/evdev.xml.in.h:623
msgid "US keyboard with Slovenian letters"
msgstr "미국식 키보드, 슬로베니아 글자 포함"
-#: ../rules/base.xml.in.h:582 ../rules/sun.xml.in.h:126
+#: ../rules/base.xml.in.h:624 ../rules/evdev.xml.in.h:624
msgid "USA"
msgstr "미국"
-# http://ko.wikipedia.org/wiki/%EC%9A%B0%EB%93%9C%EB%AC%B4%EB%A5%B4%ED%8A%B8%EC%96%B4
-#: ../rules/base.xml.in.h:583
+# http://ko.wikipedia.org/wiki/우드무르트어
+#: ../rules/base.xml.in.h:625 ../rules/evdev.xml.in.h:625
msgid "Udmurt"
msgstr "우드무르트어"
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:626 ../rules/evdev.xml.in.h:626
msgid "Ukr"
msgstr "우크라이나"
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:627 ../rules/evdev.xml.in.h:627
msgid "Ukraine"
msgstr "우크라이나"
-#: ../rules/base.xml.in.h:586
+#: ../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 "UnicodeExpert"
-#: ../rules/base.xml.in.h:587 ../rules/sun.xml.in.h:127
+#: ../rules/base.xml.in.h:632 ../rules/evdev.xml.in.h:632
msgid "United Kingdom"
msgstr "영국"
-# 인도 방언
-#: ../rules/base.xml.in.h:588
-msgid "Urdu"
-msgstr "Urdu"
+# Unitek - 유니텍(unitech)이 아님
+#: ../rules/base.xml.in.h:633 ../rules/evdev.xml.in.h:633
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
-#: ../rules/base.xml.in.h:589
+# Urdu, 인도 방언
+#: ../rules/base.xml.in.h:634 ../rules/evdev.xml.in.h:634
+msgid "Urdu, Alternative phonetic"
+msgstr "우르두어, 다른 음성 기호 버전"
+
+# Urdu - 인도 방언
+#: ../rules/base.xml.in.h:635 ../rules/evdev.xml.in.h:635
+msgid "Urdu, Phonetic"
+msgstr "우르두어, 음성 표기"
+
+# Urdu - 인도 방언
+#: ../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:590
+#: ../rules/base.xml.in.h:638 ../rules/evdev.xml.in.h:638
msgid "Use Croatian digraphs"
msgstr "크로아티아 이중 글자 사용"
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:639 ../rules/evdev.xml.in.h:639
msgid "Use Slovenian digraphs"
msgstr "슬로베니아 이중 글자 사용"
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:640 ../rules/evdev.xml.in.h:640
msgid "Use guillemets for quotes"
msgstr "따옴표에 각괄호 사용"
-#: ../rules/base.xml.in.h:593
-msgid "Use keyboard LED to show alternative layout."
-msgstr "키보드 LED를 사용해 다른 배치 표시."
+#: ../rules/base.xml.in.h:641 ../rules/evdev.xml.in.h:641
+msgid "Use keyboard LED to show alternative layout"
+msgstr "키보드 LED에서 다른 키보드 배치 사용 표시"
-#: ../rules/base.xml.in.h:594
+#: ../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:595
+#: ../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:596
+#: ../rules/base.xml.in.h:645 ../rules/evdev.xml.in.h:645
msgid "Uzbekistan"
msgstr "우즈베키스탄"
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:646 ../rules/evdev.xml.in.h:646
msgid "Vietnam"
msgstr "베트남"
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:647 ../rules/evdev.xml.in.h:647
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "뷰소닉 KU-306 인터넷 키보드"
+
+#: ../rules/base.xml.in.h:648 ../rules/evdev.xml.in.h:648
msgid "Vnm"
msgstr "베트남"
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:649 ../rules/evdev.xml.in.h:649
msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
-msgstr "Wang 724 키패드 유니코드 추가 (화살표 및 수학 기호)"
+msgstr "Wang 724 키패드, 유니코드 추가 (화살표 및 수학 기호)"
-#: ../rules/base.xml.in.h:600
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Wang 724 키패드 유니코드 추가 (화살표 및 수학 기호). 수학 기호를 기본 단계에."
+#: ../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 "Wang 724 키패드, 유니코드 추가 (화살표 및 수학 기호), 수학 기호를 기본 단계에"
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:651 ../rules/evdev.xml.in.h:651
msgid "Wang model 724 azerty"
msgstr "Wang model 724 AZERTY"
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:652 ../rules/evdev.xml.in.h:652
msgid "Western"
msgstr "서부"
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:653 ../rules/evdev.xml.in.h:653
msgid "Winbook Model XP5"
msgstr "Winbook Model XP5"
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:654 ../rules/evdev.xml.in.h:654
msgid "Winkeys"
msgstr "윈도우 키"
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:655 ../rules/evdev.xml.in.h:655
msgid "With &lt;\\|&gt; key"
msgstr "&lt;\\|&gt; 키 포함"
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:656 ../rules/evdev.xml.in.h:656
msgid "With EuroSign on 5"
msgstr "유로 기호를 5 키에"
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:657 ../rules/evdev.xml.in.h:657
msgid "With guillemets"
msgstr "각괄호 포함"
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:658 ../rules/evdev.xml.in.h:658
msgid "Yahoo! Internet Keyboard"
msgstr "야후! 인터넷 키보드"
+# http://ko.wikipedia.org/wiki/야쿠트어
+#: ../rules/base.xml.in.h:659 ../rules/evdev.xml.in.h:659
+msgid "Yakut"
+msgstr "아쿠트어"
+
# 나이지리아 변형
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:660 ../rules/evdev.xml.in.h:660
msgid "Yoruba"
msgstr "요루바어"
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:661 ../rules/evdev.xml.in.h:661
msgid "Z and ZHE swapped"
msgstr "Z와 ZHE 뒤바꾸기"
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:662 ../rules/evdev.xml.in.h:662
msgid "Zar"
msgstr "남아공"
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:663 ../rules/evdev.xml.in.h:663
msgid "azerty"
msgstr "AZERTY"
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:664 ../rules/evdev.xml.in.h:664
msgid "azerty/digits"
msgstr "AZERTY/숫자"
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:665 ../rules/evdev.xml.in.h:665
msgid "digits"
msgstr "숫자"
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:666 ../rules/evdev.xml.in.h:666
msgid "displaced semicolon and quote (obsolete)"
msgstr "세미콜론과 따옴표 없애기 (없어진 기능)"
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:667 ../rules/evdev.xml.in.h:667
msgid "lyx"
msgstr "lyx"
-#: ../rules/base.xml.in.h:617 ../rules/sun.xml.in.h:132
+#: ../rules/base.xml.in.h:668 ../rules/evdev.xml.in.h:668
msgid "qwerty"
msgstr "QWERTY"
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:669 ../rules/evdev.xml.in.h:669
msgid "qwerty, extended Backslash"
msgstr "QWERTY, 백슬래시 확장"
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:670 ../rules/evdev.xml.in.h:670
msgid "qwerty/digits"
msgstr "QWERTY/숫자"
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:671 ../rules/evdev.xml.in.h:671
msgid "qwertz"
msgstr "QWERTZ"
-#: ../rules/sun.xml.in.h:1
-msgid "\"Typewriter\""
-msgstr "\"타자기\""
+#~ msgid "(Legacy) Dvorak"
+#~ msgstr "(구형) 드보락"
-#: ../rules/sun.xml.in.h:17
-msgid "Acts as Shift with locking. Shift cancels Caps."
-msgstr "Shift처럼 동작하고 상태를 고정. Shift를 누르면 대문자 상태 취소."
+#~ msgid "Add the EuroSign to the 2 key."
+#~ msgstr "유로 기호를 2 키에 추가."
-#: ../rules/sun.xml.in.h:18
-msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
-msgstr "Shift처럼 동작하고 상태를 고정. Shift는 대문자 상태 취소하지 않음."
+#~ msgid "Add the EuroSign to the 4 key."
+#~ msgstr "유로 기호를 4 키에 추가."
-#: ../rules/sun.xml.in.h:19
-msgid "Alt+Control changes group"
-msgstr "Alt+Ctrl로 그룹을 바꿉니다"
+#~ msgid "Add the EuroSign to the 5 key."
+#~ msgstr "유로 기호를 5 키에 추가."
-#: ../rules/sun.xml.in.h:20
-msgid "Alt+Shift changes group"
-msgstr "Alt+Shift로 그룹을 바꿉니다"
+#~ msgid "Add the EuroSign to the E key."
+#~ msgstr "유로 기호를 E 키에 추가."
-#: ../rules/sun.xml.in.h:21
-msgid "Basic"
-msgstr "기본"
+#~ msgid "Alt+Ctrl change layout."
+#~ msgstr "Alt+Ctrl로 배치를 바꿉니다."
-#: ../rules/sun.xml.in.h:23
-msgid "Belgian"
-msgstr "벨기에"
+#~ msgid "Alt+Shift change layout."
+#~ msgstr "Alt+Shift로 배치를 바꿉니다."
-#: ../rules/sun.xml.in.h:25
-msgid "Both Alt keys together change group"
-msgstr "Alt 키 두 개로 그룹을 바꿉니다"
+#~ msgid "Both Alt keys together change layout."
+#~ msgstr "Alt 키 두 개로 배치를 바꿉니다."
-#: ../rules/sun.xml.in.h:26
-msgid "Both Ctrl keys together change group"
-msgstr "Ctrl 키 두 개로 그룹을 바꿉니다"
+#~ msgid "Both Ctrl keys together change layout."
+#~ msgstr "Ctrl 키 두 개로 배치를 바꿉니다."
-#: ../rules/sun.xml.in.h:27
-msgid "Both Shift keys together change group"
-msgstr "Shift 키 두 개로 그룹을 바꿉니다"
+#~ msgid "Both Shift keys together change layout."
+#~ msgstr "Shift 키 두 개로 배치를 바꿉니다."
-#: ../rules/sun.xml.in.h:28
-msgid "Bulgarian"
-msgstr "불가리아어"
+#~ msgid "Caps Lock is Compose."
+#~ msgstr "Caps Lock 키가 조합 키입니다."
-#: ../rules/sun.xml.in.h:30
-msgid "Canadian"
-msgstr "캐나다"
+#~ msgid "CapsLock LED shows alternative layout."
+#~ msgstr "CapsLock LED가 다른 배치를 표시합니다."
-#: ../rules/sun.xml.in.h:31
-msgid "Caps Lock is Compose"
-msgstr "Caps Lock이 조합 키입니다"
+#~ msgid "CapsLock just locks the Shift modifier."
+#~ msgstr "CapsLock이 Shift 상태를 고정하기만 합니다."
-#: ../rules/sun.xml.in.h:32
-msgid "Caps Lock key changes group"
-msgstr "Caps Lock 키로 그룹을 바꿉니다"
+#~ msgid "CapsLock key changes layout."
+#~ msgstr "CapsLock 키로 배치를 바꿉니다."
-#: ../rules/sun.xml.in.h:34
-msgid "Caps_Lock LED shows alternative group"
-msgstr "Caps_Lock LED가 다른 그룹을 표시합니다"
+#~ msgid "Commabelow"
+#~ msgstr "아래 쉼표"
-#: ../rules/sun.xml.in.h:35
-msgid "Control Key Position"
-msgstr "Ctrl 키 위치"
+#~ msgid "Ctrl+Shift change layout."
+#~ msgstr "Ctrl+Shift로 배치를 바꿉니다."
-#: ../rules/sun.xml.in.h:36
-msgid "Control key at bottom left"
-msgstr "맨 아래 왼쪽에 Ctrl 키"
+#~ msgid "Dnk"
+#~ msgstr "덴마크"
-#: ../rules/sun.xml.in.h:37
-msgid "Control key at left of 'A'"
-msgstr "'A' 왼쪽에 Ctrl 키"
+#~ msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+#~ msgstr "휴렛팩커드 SK-2505 인터넷 키보드"
-#: ../rules/sun.xml.in.h:38
-msgid "Control+Shift changes group"
-msgstr "Ctrl+Shift로 그룹을 바꿉니다"
+#~ msgid "IBM Rapid Access II (alternate option)"
+#~ msgstr "IBM Rapid Access II (다른 옵션)"
-#: ../rules/sun.xml.in.h:40
-msgid "Czech"
-msgstr "체코"
+#~ msgid "Kyr"
+#~ msgstr "키르기지스탄"
-#: ../rules/sun.xml.in.h:41
-msgid "Danish"
-msgstr "덴마크어"
+#~ msgid "LCtrl+LShift change layout."
+#~ msgstr "왼쪽Ctrl+왼쪽Shift로 배치를 바꿉니다."
-#: ../rules/sun.xml.in.h:45
-msgid "DeuCH"
-msgstr "독일어 스위스"
+#~ msgid "Layout switching"
+#~ msgstr "배치 전환"
-#: ../rules/sun.xml.in.h:47
-msgid "Dvo"
-msgstr "드보락"
+#~ msgid "Left Alt key changes layout."
+#~ msgstr "왼쪽 Alt 키로 배치를 바꿉니다."
+
+#~ msgid "Left Alt key switches layout while pressed."
+#~ msgstr "왼쪽 Alt 키를 누르면 배치를 바꿉니다."
+
+#~ msgid "Left Ctrl key changes layout."
+#~ msgstr "왼쪽 Ctrl 키로 배치를 바꿉니다."
+
+#~ msgid "Left Shift key changes layout."
+#~ msgstr "왼쪽 Shift 키로 배치를 바꿉니다."
+
+#~ msgid "Left Win-key changes layout."
+#~ msgstr "왼쪽 윈도우 키로 배치를 바꿉니다."
+
+#~ msgid "Left Win-key is Compose."
+#~ msgstr "왼쪽 윈도우 키가 조합 키입니다."
-#: ../rules/sun.xml.in.h:52
-msgid "Finnish"
-msgstr "핀란드어"
+#~ msgid "Lva"
+#~ msgstr "라트비아"
-#: ../rules/sun.xml.in.h:54
-msgid "FraCH"
-msgstr "프랑스어 스위스"
+#~ msgid "Menu is Compose."
+#~ msgstr "메뉴 키가 조합 키입니다."
-#: ../rules/sun.xml.in.h:57
-msgid "German"
-msgstr "독일어"
+# 제조사
+#~ msgid "Neostyle"
+#~ msgstr "Neostyle"
+
+#~ msgid "NumLock LED shows alternative layout."
+#~ msgstr "NumLock LED가 다른 배치를 표시합니다."
+
+#~ msgid "Press Left Alt key to choose 3rd level."
+#~ msgstr "왼쪽 Alt 키를 누르면 3번째 단계를 선택합니다."
+
+#~ msgid "Press Left Win-key to choose 3rd level."
+#~ msgstr "왼쪽 윈도우 키를 누르면 3번째 단계를 선택합니다."
+
+#~ msgid "Press Right Alt key to choose 3rd level."
+#~ msgstr "오른쪽 Alt 키를 누르면 3번째 단계를 선택합니다."
+
+#~ msgid "Press Right Ctrl to choose 3rd level."
+#~ msgstr "오른쪽 Ctrl 키를 누르면 3번째 단계를 선택합니다."
+
+#~ msgid "Press Right Win-key to choose 3rd level."
+#~ msgstr "오른쪽 윈도우 키를 누르면 3번째 단계를 선택합니다."
+
+#~ msgid "Press any of Alt keys to choose 3rd level."
+#~ msgstr "아무 Alt 키를 누르면 3번째 단계를 선택합니다."
+
+#~ msgid "Press any of Win-keys to choose 3rd level."
+#~ msgstr "아무 윈도우 키를 누르면 3번째 단계를 선택합니다."
+
+#~ msgid "R-Alt switches layout while pressed."
+#~ msgstr "오른쪽 Alt 키를 누르면 배치를 바꿉니다."
+
+#~ msgid "Right Alt is Compose."
+#~ msgstr "오른쪽 Alt가 조합 키입니다."
+
+#~ msgid "Right Alt key changes layout."
+#~ msgstr "오른쪽 Alt 키로 배치를 바꿉니다."
+
+#~ msgid "Right Ctrl key changes layout."
+#~ msgstr "오른쪽 Ctrl 키로 배치를 바꿉니다."
+
+#~ msgid "Right Ctrl key switches layout while pressed."
+#~ msgstr "오른쪽 Ctrl 키를 누르면 배치를 바꿉니다."
+
+#~ msgid "Right Shift key changes layout."
+#~ msgstr "오른쪽 Shift 키로 배치를 바꿉니다."
+
+#~ msgid "Right Win-key changes layout."
+#~ msgstr "오른쪽 윈도우 키로 배치를 바꿉니다."
+
+#~ msgid "Right Win-key is Compose."
+#~ msgstr "오른쪽 윈도우 키가 조합 키입니다."
+
+#~ msgid "ScrollLock LED shows alternative layout."
+#~ msgstr "ScrollLock LED가 다른 배치를 표시합니다."
+
+#~ msgid "Shift+CapsLock changes layout."
+#~ msgstr "Shift+CapsLock으로 배치를 바꿉니다."
+
+#~ msgid "Standard (Commabelow)"
+#~ msgstr "표준 (아래 쉼표)"
+
+#~ msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+#~ msgstr "맥 키보드를 커널이 잘못 검색했을 때 키 두개의 코드 뒤바꾸기."
+
+#~ msgid "Third level choosers"
+#~ msgstr "세번째 단계 선택 키"
+
+# 인도 방언
+#~ msgid "Urdu"
+#~ msgstr "Urdu"
+
+#~ msgid "\"Typewriter\""
+#~ msgstr "\"타자기\""
+
+#~ msgid "Acts as Shift with locking. Shift cancels Caps."
+#~ msgstr "Shift처럼 동작하고 상태를 고정. Shift를 누르면 대문자 상태 취소."
+
+#~ msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
+#~ msgstr "Shift처럼 동작하고 상태를 고정. Shift는 대문자 상태 취소하지 않음."
+
+#~ msgid "Alt+Control changes group"
+#~ msgstr "Alt+Ctrl로 그룹을 바꿉니다"
+
+#~ msgid "Alt+Shift changes group"
+#~ msgstr "Alt+Shift로 그룹을 바꿉니다"
+
+#~ msgid "Basic"
+#~ msgstr "기본"
+
+#~ 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 LED가 다른 그룹을 표시합니다"
-#: ../rules/sun.xml.in.h:58
-msgid "Group Shift/Lock behavior"
-msgstr "그룹 바꾸기/고정 동작"
+#~ msgid "Control Key Position"
+#~ msgstr "Ctrl 키 위치"
-#: ../rules/sun.xml.in.h:60
-msgid "Hungarian"
-msgstr "헝가리어"
+#~ msgid "Control key at bottom left"
+#~ msgstr "맨 아래 왼쪽에 Ctrl 키"
-#: ../rules/sun.xml.in.h:64
-msgid "Italian"
-msgstr "이탈리아어"
+#~ msgid "Control key at left of 'A'"
+#~ msgstr "'A' 왼쪽에 Ctrl 키"
-#: ../rules/sun.xml.in.h:65
-msgid "Japanese"
-msgstr "일본어"
+#~ msgid "Control+Shift changes group"
+#~ msgstr "Ctrl+Shift로 그룹을 바꿉니다"
-#: ../rules/sun.xml.in.h:67
-msgid "Left Alt key changes group"
-msgstr "왼쪽 Alt 키로 그룹을 바꿉니다"
+#~ msgid "Czech"
+#~ msgstr "체코"
-#: ../rules/sun.xml.in.h:68
-msgid "Left Alt key switches group while pressed"
-msgstr "왼쪽 Alt 키를 누르면 그룹을 바꿉니다"
+#~ msgid "Danish"
+#~ msgstr "덴마크어"
-#: ../rules/sun.xml.in.h:69
-msgid "Left Ctrl key changes group"
-msgstr "왼쪽 Ctrl 키로 그룹을 바꿉니다"
+#~ msgid "DeuCH"
+#~ msgstr "독일어 스위스"
-#: ../rules/sun.xml.in.h:70
-msgid "Left Shift key changes group"
-msgstr "왼쪽 Shift 키로 그룹을 바꿉니다"
+#~ msgid "Dvo"
+#~ msgstr "드보락"
-#: ../rules/sun.xml.in.h:71
-msgid "Make CapsLock an additional Control"
-msgstr "CapsLock을 또 하나의 Ctrl로 만듭니다."
+#~ msgid "Finnish"
+#~ msgstr "핀란드어"
-#: ../rules/sun.xml.in.h:76
-msgid "Norwegian"
-msgstr "노르웨이어"
+#~ msgid "FraCH"
+#~ msgstr "프랑스어 스위스"
-#: ../rules/sun.xml.in.h:77
-msgid "Num_Lock LED shows alternative group"
-msgstr "Num_Lock LED가 다른 그룹을 표시합니다"
+#~ msgid "German"
+#~ msgstr "독일어"
-#: ../rules/sun.xml.in.h:80
-msgid "Polish"
-msgstr "폴란드어"
+#~ msgid "Group Shift/Lock behavior"
+#~ msgstr "그룹 바꾸기/고정 동작"
-#: ../rules/sun.xml.in.h:81
-msgid "Polish with Polish quotes on key \"1/!\""
-msgstr "폴란드어, \"1/!\" 키에 폴란드어 따옴표 포함"
+#~ msgid "Hungarian"
+#~ msgstr "헝가리어"
-#: ../rules/sun.xml.in.h:82
-msgid "Portuguese"
-msgstr "포르투갈어"
+#~ msgid "Italian"
+#~ msgstr "이탈리아어"
-#: ../rules/sun.xml.in.h:83
-msgid "Press Left Alt key to choose 3rd level"
-msgstr "왼쪽 Alt 키를 누르면 3번째 단계를 선택합니다"
+#~ msgid "Japanese"
+#~ msgstr "일본어"
-#: ../rules/sun.xml.in.h:84
-msgid "Press Right Alt key to choose 3rd level"
-msgstr "오른쪽 Alt 키를 누르면 3번째 단계를 선택합니다"
+#~ msgid "Left Alt key changes group"
+#~ msgstr "왼쪽 Alt 키로 그룹을 바꿉니다"
-#: ../rules/sun.xml.in.h:85
-msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
-msgstr "오른쪽 Alt 키를 누르면 3번째 단계를 선택합니다. Shift+오른쪽 Alt 키가 Multi_Key입니다"
+#~ msgid "Left Ctrl key changes group"
+#~ msgstr "왼쪽 Ctrl 키로 그룹을 바꿉니다"
-#: ../rules/sun.xml.in.h:86
-msgid "Press Right Control to choose 3rd level"
-msgstr "오른쪽 Ctrl 키를 누르면 3번째 단계를 선택합니다"
+#~ msgid "Left Shift key changes group"
+#~ msgstr "왼쪽 Shift 키로 그룹을 바꿉니다"
-#: ../rules/sun.xml.in.h:87
-msgid "Press any of Alt keys to choose 3rd level"
-msgstr "아무 Alt 키를 누르면 3번째 단계를 선택합니다"
+#~ msgid "Make CapsLock an additional Control"
+#~ msgstr "CapsLock을 또 하나의 Ctrl로 만듭니다."
-#: ../rules/sun.xml.in.h:89
-msgid "Right Alt key changes group"
-msgstr "오른쪽 Alt 키로 그룹을 바꿉니다"
+#~ msgid "Norwegian"
+#~ msgstr "노르웨이어"
-#: ../rules/sun.xml.in.h:91
-msgid "Right Alt switches group while pressed"
-msgstr "오른쪽 Alt 키를 누르면 그룹을 바꿉니다"
+#~ msgid "Num_Lock LED shows alternative group"
+#~ msgstr "Num_Lock LED가 다른 그룹을 표시합니다"
-#: ../rules/sun.xml.in.h:92
-msgid "Right Control key works as Right Alt"
-msgstr "오른쪽 Ctrl 키가 오른쪽 Alt로 동작합니다"
+#~ msgid "Polish"
+#~ msgstr "폴란드어"
-#: ../rules/sun.xml.in.h:93
-msgid "Right Ctrl key changes group"
-msgstr "오른쪽 Ctrl 키로 그룹을 바꿉니다"
+#~ msgid "Polish with Polish quotes on key \"1/!\""
+#~ msgstr "폴란드어, \"1/!\" 키에 폴란드어 따옴표 포함"
-#: ../rules/sun.xml.in.h:94
-msgid "Right Shift key changes group"
-msgstr "오른쪽 Shift 키로 그룹을 바꿉니다"
+#~ msgid "Portuguese"
+#~ msgstr "포르투갈어"
-#: ../rules/sun.xml.in.h:97
-msgid "Scroll Lock changes group"
-msgstr "Scroll Lock 키로 그룹을 바꿉니다"
+#~ msgid "Press Left Alt key to choose 3rd level"
+#~ msgstr "왼쪽 Alt 키를 누르면 3번째 단계를 선택합니다"
-#: ../rules/sun.xml.in.h:98
-msgid "Scroll_Lock LED shows alternative group"
-msgstr "Scroll_Lock LED가 다른 그룹을 표시합니다"
+#~ msgid "Press Right Alt key to choose 3rd level"
+#~ msgstr "오른쪽 Alt 키를 누르면 3번째 단계를 선택합니다"
-#: ../rules/sun.xml.in.h:99
-msgid "Shift with numpad keys works as in MS Windows"
-msgstr "Shift 키와 동시에 숫자 키를 누를 때 MS 윈도우즈와 동일하게 동작"
+#~ msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
+#~ msgstr "오른쪽 Alt 키를 누르면 3번째 단계를 선택합니다. Shift+오른쪽 Alt 키가 Multi_Key입니다"
-#: ../rules/sun.xml.in.h:100
-msgid "Shift+CapsLock changes group"
-msgstr "Shift+CapsLock으로 그룹을 바꿉니다"
+#~ msgid "Press Right Control to choose 3rd level"
+#~ msgstr "오른쪽 Ctrl 키를 누르면 3번째 단계를 선택합니다"
-#: ../rules/sun.xml.in.h:101
-msgid "Slovak"
-msgstr "슬로바키아어"
+#~ msgid "Press any of Alt keys to choose 3rd level"
+#~ msgstr "아무 Alt 키를 누르면 3번째 단계를 선택합니다"
-#: ../rules/sun.xml.in.h:102
-msgid "Spanish"
-msgstr "스페인어"
+#~ msgid "Right Alt key changes group"
+#~ msgstr "오른쪽 Alt 키로 그룹을 바꿉니다"
-#: ../rules/sun.xml.in.h:105
-msgid "Sun Type 4"
-msgstr "썬 타입 4"
+#~ msgid "Right Control key works as Right Alt"
+#~ msgstr "오른쪽 Ctrl 키가 오른쪽 Alt로 동작합니다"
-#: ../rules/sun.xml.in.h:106
-msgid "Sun Type 5"
-msgstr "썬 타입 5"
+#~ msgid "Right Ctrl key changes group"
+#~ msgstr "오른쪽 Ctrl 키로 그룹을 바꿉니다"
-#: ../rules/sun.xml.in.h:107
-msgid "Sun Type 5 European"
-msgstr "썬 타입 5 유럽"
+#~ msgid "Right Shift key changes group"
+#~ msgstr "오른쪽 Shift 키로 그룹을 바꿉니다"
-#: ../rules/sun.xml.in.h:108
-msgid "Sun Type 5 Unix"
-msgstr "썬 타입 5 유닉스"
+#~ msgid "Scroll Lock changes group"
+#~ msgstr "Scroll Lock 키로 그룹을 바꿉니다"
-#: ../rules/sun.xml.in.h:109
-msgid "Sun Type 6"
-msgstr "썬 타입 6"
+#~ msgid "Scroll_Lock LED shows alternative group"
+#~ msgstr "Scroll_Lock LED가 다른 그룹을 표시합니다"
-#: ../rules/sun.xml.in.h:110
-msgid "Sun Type 6 Unix"
-msgstr "썬 타입 6 유닉스"
+#~ msgid "Shift with numpad keys works as in MS Windows"
+#~ msgstr "Shift 키와 동시에 숫자 키를 누를 때 MS 윈도우즈와 동일하게 동작"
-#: ../rules/sun.xml.in.h:111
-msgid "Sun Type 6 with Euro key"
-msgstr "썬 타입 6 유로 키 포함"
+#~ msgid "Shift+CapsLock changes group"
+#~ msgstr "Shift+CapsLock으로 그룹을 바꿉니다"
-#: ../rules/sun.xml.in.h:114
-msgid "Swap Control and Caps Lock"
-msgstr "Ctrl과 Caps Lock 키 뒤바꾸기"
+#~ msgid "Slovak"
+#~ msgstr "슬로바키아어"
-#: ../rules/sun.xml.in.h:116
-msgid "Swedish"
-msgstr "스웨덴어"
+#~ msgid "Spanish"
+#~ msgstr "스페인어"
-#: ../rules/sun.xml.in.h:117
-msgid "Swiss French"
-msgstr "스위스 프랑스어"
+#~ msgid "Sun Type 4"
+#~ msgstr "썬 타입 4"
-#: ../rules/sun.xml.in.h:118
-msgid "Swiss German"
-msgstr "스위스 독일어"
+#~ msgid "Sun Type 5 European"
+#~ msgstr "썬 타입 5 유럽"
-#: ../rules/sun.xml.in.h:121
-msgid "Turkish"
-msgstr "터키어"
+#~ msgid "Sun Type 5 Unix"
+#~ msgstr "썬 타입 5 유닉스"
-#: ../rules/sun.xml.in.h:122
-msgid "Turkish (F)"
-msgstr "터키어 (F)"
+#~ msgid "Sun Type 6"
+#~ msgstr "썬 타입 6"
-#: ../rules/sun.xml.in.h:123
-msgid "Turkish Alt-Q Layout"
-msgstr "터키어 Alt-Q 배치"
+#~ msgid "Sun Type 6 Unix"
+#~ msgstr "썬 타입 6 유닉스"
-#: ../rules/sun.xml.in.h:124
-msgid "U.S. English"
-msgstr "미국 영어"
+#~ msgid "Sun Type 6 with Euro key"
+#~ msgstr "썬 타입 6 유로 키 포함"
-#: ../rules/sun.xml.in.h:125
-msgid "U.S. English w/ ISO9995-3"
-msgstr "미국 영어, ISO9995-3 사용"
+#~ msgid "Swap Control and Caps Lock"
+#~ msgstr "Ctrl과 Caps Lock 키 뒤바꾸기"
-#: ../rules/sun.xml.in.h:128
-msgid "Use keyboard LED to show alternative group"
-msgstr "키보드 LED를 사용해 다른 그룹 표시"
+#~ msgid "Swedish"
+#~ msgstr "스웨덴어"
-#: ../rules/sun.xml.in.h:129
-msgid "Uses internal capitalization. Shift cancels Caps."
-msgstr "내부 대소문자 사용. Shift키가 대문자 상태를 취소."
+#~ msgid "Swiss French"
+#~ msgstr "스위스 프랑스어"
-#: ../rules/sun.xml.in.h:130
-msgid "Uses internal capitalization. Shift doesn't cancel Caps."
-msgstr "내부 대소문자 사용. Shift키가 대문자 상태를 취소하지 않음."
+#~ msgid "Swiss German"
+#~ msgstr "스위스 독일어"
-#: ../rules/sun.xml.in.h:131
-msgid "bksl"
-msgstr "bksl"
+#~ msgid "Turkish"
+#~ msgstr "터키어"
-#: ../rules/sun.xml.in.h:133
-msgid "type4"
-msgstr "type4"
+#~ msgid "Turkish (F)"
+#~ msgstr "터키어 (F)"
+
+#~ msgid "Turkish Alt-Q Layout"
+#~ msgstr "터키어 Alt-Q 배치"
+
+#~ msgid "U.S. English"
+#~ msgstr "미국 영어"
+
+#~ msgid "U.S. English w/ ISO9995-3"
+#~ msgstr "미국 영어, ISO9995-3 사용"
+
+#~ msgid "Use keyboard LED to show alternative group"
+#~ msgstr "키보드 LED를 사용해 다른 그룹 표시"
+
+#~ msgid "Uses internal capitalization. Shift cancels Caps."
+#~ msgstr "내부 대소문자 사용. Shift키가 대문자 상태를 취소."
+
+#~ msgid "Uses internal capitalization. Shift doesn't cancel Caps."
+#~ msgstr "내부 대소문자 사용. Shift키가 대문자 상태를 취소하지 않음."
+
+#~ msgid "bksl"
+#~ msgstr "bksl"
+
+#~ msgid "type4"
+#~ msgstr "type4"
#~ msgid "Acer TravelMate 800"
#~ msgstr "에이서 TravelMate 800"
@@ -2819,9 +3134,6 @@ msgstr "type4"
#~ msgid "Adding the nobreakspace keysym to space key"
#~ msgstr "스페이스 키에 강제 공백 키심볼 추가"
-#~ msgid "BenQ X-Touch 800"
-#~ msgstr "벤큐 X-Touch 800"
-
#~ msgid "Dell SK-8125 USB Multimedia Keybard"
#~ msgstr "델 SK-8125 USB 멀티미디어 키보드"
@@ -2835,11 +3147,5 @@ msgstr "type4"
#~ msgid "Kotoistus"
#~ msgstr "Kotoistus"
-#~ msgid "Logitech Cordless Desktop Optical"
-#~ msgstr "로지텍 Cordless Desktop Optical"
-
-#~ msgid "Logitech Cordless Desktop iTouch"
-#~ msgstr "로지텍 Cordless Desktop iTouch"
-
#~ msgid "SCG"
#~ msgstr "세르비아 몬테네그로"
diff --git a/xorg-server/xkbdata.src/po/ky.po b/xorg-server/xkbdata.src/po/ky.po
new file mode 100644
index 000000000..d6c99c008
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/ky.po
@@ -0,0 +1,2682 @@
+# Translation of 'xkeyboard-config' messages to Kirghiz.
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# Ilyas Bakirov <just_ilyas@yahoo.com>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 1.1-pre1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-09-11 22:14+0100\n"
+"PO-Revision-Date: 2007-11-13 14:39+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 "(Legacy) Dvorak"
+msgstr "(Эскирген) Dvorak"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/104 key Compatible"
+msgstr "101/104 баскычтар менен жарамдуу"
+
+#: ../rules/base.xml.in.h:7 ../rules/sun.xml.in.h:2
+msgid "101/qwerty/comma/Dead keys"
+msgstr "pc101, qwerty, үтүр, атайын (dead keys) клавишалары менен"
+
+#: ../rules/base.xml.in.h:8 ../rules/sun.xml.in.h:3
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "pc101, qwerty, үтүр, атайын (dead keys) клавишаларсыз "
+
+#: ../rules/base.xml.in.h:9 ../rules/sun.xml.in.h:4
+msgid "101/qwerty/dot/Dead keys"
+msgstr "pc101, qwerty, чекит, атайын (dead keys) клавшилары менен"
+
+#: ../rules/base.xml.in.h:10 ../rules/sun.xml.in.h:5
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "pc101, qwerty, үтур, атайын (dead keys) клавишаларсыз"
+
+#: ../rules/base.xml.in.h:11 ../rules/sun.xml.in.h:6
+msgid "101/qwertz/comma/Dead keys"
+msgstr "pc101, qwertz, үтур, атайын (dead keys) клавишалары менен"
+
+#: ../rules/base.xml.in.h:12
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "pc101, qwertz, үтүр, атайын (dead keys) клавишаларсыз"
+
+#: ../rules/base.xml.in.h:13 ../rules/sun.xml.in.h:7
+msgid "101/qwertz/dot/Dead keys"
+msgstr "pc101, qwertz, чекит, атайын (dead keys) клавишалары менен"
+
+#: ../rules/base.xml.in.h:14 ../rules/sun.xml.in.h:8
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "pc101, qwertz, чекит, атайын (dead keys) клавишаларсыз"
+
+#: ../rules/base.xml.in.h:15 ../rules/sun.xml.in.h:9
+msgid "102/qwerty/comma/Dead keys"
+msgstr "pc102, qwerty, үтүр, атайын (dead keys) клавишалары менен"
+
+#: ../rules/base.xml.in.h:16 ../rules/sun.xml.in.h:10
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "pc102, qwerty, үтүр, атаыйн (dead keys) клавишаларсыз"
+
+#: ../rules/base.xml.in.h:17 ../rules/sun.xml.in.h:11
+msgid "102/qwerty/dot/Dead keys"
+msgstr "pc102, qwerty, чекит, атайын (dead keys) клавишалары менен"
+
+#: ../rules/base.xml.in.h:18 ../rules/sun.xml.in.h:12
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "pc102, qwerty, чекит, атайын (dead keys) клавишаларсыз"
+
+#: ../rules/base.xml.in.h:19 ../rules/sun.xml.in.h:13
+msgid "102/qwertz/comma/Dead keys"
+msgstr "pc102, qwertz, үтүр, атайын (dead keys) клавишалары менен"
+
+#: ../rules/base.xml.in.h:20 ../rules/sun.xml.in.h:14
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "pc102, qwertz, үтур, атайын (dead keys) клавишаларсыз"
+
+#: ../rules/base.xml.in.h:21 ../rules/sun.xml.in.h:15
+msgid "102/qwertz/dot/Dead keys"
+msgstr "pc102, qwertz, чекит, атайын (dead keys) клавишалары менен"
+
+#: ../rules/base.xml.in.h:22 ../rules/sun.xml.in.h:16
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "pc102, qwertz, чекит, атайын (dead keys) клавишаларсыз"
+
+#: ../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 стандарттуу"
+
+#: ../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 Laptop"
+msgstr "Acer ноутбугу"
+
+#: ../rules/base.xml.in.h:32
+msgid "Add the EuroSign to the 2 key."
+msgstr "2 денег клавишага Евро белгисин кошуу."
+
+#: ../rules/base.xml.in.h:33
+msgid "Add the EuroSign to the 5 key."
+msgstr "5 деген клавишага Евро белгисин кошуу."
+
+#: ../rules/base.xml.in.h:34
+msgid "Add the EuroSign to the E key."
+msgstr "E клавишасына Евро белгисин кошуу."
+
+#: ../rules/base.xml.in.h:35
+msgid "Add the standard behavior to Menu key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:36
+msgid "Adding the 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 the Alt keys."
+msgstr "Alt жана Meta Alt клавишаларда."
+
+#: ../rules/base.xml.in.h:44
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Alt оң Win клавишага орнотулган, Super болсо - Menu."
+
+#: ../rules/base.xml.in.h:45
+msgid "Alt+CapsLock changes layout."
+msgstr "Alt+CapsLock раскладканы алмаштырат."
+
+#: ../rules/base.xml.in.h:46
+msgid "Alt+Ctrl change layout."
+msgstr "Alt+Ctrl раскладканы алмаштырат."
+
+#: ../rules/base.xml.in.h:47
+msgid "Alt+Shift change layout."
+msgstr "Alt+Shift раскладканы алмаштырат."
+
+#: ../rules/base.xml.in.h:48
+msgid "Alt-Q"
+msgstr "Alt-Q"
+
+#: ../rules/base.xml.in.h:49
+msgid "Alt/Win key behavior"
+msgstr "Alt/Win клавишалары"
+
+#: ../rules/base.xml.in.h:50
+msgid "Alternative"
+msgstr "Альтернативдик"
+
+#: ../rules/base.xml.in.h:51
+msgid "Alternative Eastern"
+msgstr "Альтернативдик"
+
+#: ../rules/base.xml.in.h:52
+msgid "Alternative Phonetic"
+msgstr "Альтернативдүү фонетикалык"
+
+#: ../rules/base.xml.in.h:53
+msgid "Alternative international (former us_intl)"
+msgstr "Эларалык Альтернативдик (мурунку us_intl)"
+
+#: ../rules/base.xml.in.h:54
+msgid "Alternative, Sun dead keys"
+msgstr "Альтернативдик, атайын (dead keys) Sun клавишалары менен"
+
+#: ../rules/base.xml.in.h:55
+msgid "Alternative, eliminate dead keys"
+msgstr "Альтернативдик, атайын (dead keys) клавишаларсыз"
+
+#: ../rules/base.xml.in.h:56
+msgid "Alternative, latin-9 only"
+msgstr "Альтернативдик, latin-9 гана"
+
+#: ../rules/base.xml.in.h:57
+msgid "And"
+msgstr "Анд"
+
+#: ../rules/base.xml.in.h:58
+msgid "Andorra"
+msgstr "Андорра"
+
+#: ../rules/base.xml.in.h:59
+msgid "Apostrophe (') variant"
+msgstr "Вариант апостроф (') менен"
+
+#: ../rules/base.xml.in.h:60
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:61
+msgid "Apple Laptop"
+msgstr "Apple Ноутбугу"
+
+#: ../rules/base.xml.in.h:62
+msgid "Ara"
+msgstr "Ара"
+
+#: ../rules/base.xml.in.h:63
+msgid "Arabic"
+msgstr "Араб"
+
+#: ../rules/base.xml.in.h:64
+msgid "Arm"
+msgstr "Арм"
+
+#: ../rules/base.xml.in.h:65
+msgid "Armenia"
+msgstr "Армения"
+
+#: ../rules/base.xml.in.h:66
+msgid "Asus Laptop"
+msgstr "Asus ноутбугу"
+
+#: ../rules/base.xml.in.h:67
+msgid "Aze"
+msgstr "Азр"
+
+#: ../rules/base.xml.in.h:68
+msgid "Azerbaijan"
+msgstr "Азербайджан"
+
+#: ../rules/base.xml.in.h:69
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 wireless Internet Keyboard"
+
+#: ../rules/base.xml.in.h:70
+msgid "BTC 5090"
+msgstr "BTC 5090"
+
+#: ../rules/base.xml.in.h:71
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
+
+#: ../rules/base.xml.in.h:72
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
+
+#: ../rules/base.xml.in.h:73
+msgid "BTC 9000"
+msgstr "BTC 9000"
+
+#: ../rules/base.xml.in.h:74
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
+
+#: ../rules/base.xml.in.h:75
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
+
+#: ../rules/base.xml.in.h:76
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
+
+#: ../rules/base.xml.in.h:77
+msgid "Ban"
+msgstr "Бан"
+
+#: ../rules/base.xml.in.h:78
+msgid "Bangladesh"
+msgstr "Бангладеш"
+
+#: ../rules/base.xml.in.h:79 ../rules/sun.xml.in.h:22
+msgid "Bel"
+msgstr "Бел"
+
+#: ../rules/base.xml.in.h:80
+msgid "Belarus"
+msgstr "Беларусия"
+
+#: ../rules/base.xml.in.h:81
+msgid "Belgium"
+msgstr "Бельгия"
+
+#: ../rules/base.xml.in.h:82
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
+
+#: ../rules/base.xml.in.h:83
+msgid "Bengali"
+msgstr "Бенгальдык"
+
+#: ../rules/base.xml.in.h:84
+msgid "Bengali Probhat"
+msgstr "Бенгальдык Пробат"
+
+#: ../rules/base.xml.in.h:85
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Бепо, эргономикалык, Dvorak'ка окшош"
+
+#: ../rules/base.xml.in.h:86
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Бепо, эргономикалык, Dvorak'ка окшош, latin-9 гана"
+
+#: ../rules/base.xml.in.h:87 ../rules/sun.xml.in.h:24
+msgid "Bgr"
+msgstr "Болг"
+
+#: ../rules/base.xml.in.h:88
+msgid "Bhu"
+msgstr "Бут"
+
+#: ../rules/base.xml.in.h:89
+msgid "Bhutan"
+msgstr "Бутан"
+
+#: ../rules/base.xml.in.h:90
+msgid "Biblical Hebrew (Tiro)"
+msgstr "Библейдик иврит (Tiro)"
+
+#: ../rules/base.xml.in.h:91
+msgid "Bih"
+msgstr "Босн"
+
+#: ../rules/base.xml.in.h:92
+msgid "Blr"
+msgstr "Бел"
+
+#: ../rules/base.xml.in.h:93
+msgid "Bosnia and Herzegovina"
+msgstr "Босния жана Герциговиния"
+
+#: ../rules/base.xml.in.h:94
+msgid "Both Alt keys together change layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:95
+msgid "Both Ctrl keys together change layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:96
+msgid "Both Shift keys together change layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:97
+msgid "Both Win-keys switch layout while pressed."
+msgstr ""
+
+#: ../rules/base.xml.in.h:98
+msgid "Bra"
+msgstr "Бра"
+
+#: ../rules/base.xml.in.h:99
+msgid "Braille"
+msgstr "Браиил"
+
+#: ../rules/base.xml.in.h:100
+msgid "Brazil"
+msgstr "Бразилия"
+
+#: ../rules/base.xml.in.h:101
+msgid "Brazilian ABNT2"
+msgstr "Бразилдик ABNT2"
+
+#: ../rules/base.xml.in.h:102
+msgid "Brl"
+msgstr "Брл"
+
+#: ../rules/base.xml.in.h:103
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
+
+#: ../rules/base.xml.in.h:104
+msgid "Buckwalter"
+msgstr "Buckwalter"
+
+#: ../rules/base.xml.in.h:105
+msgid "Bulgaria"
+msgstr "Болгария"
+
+#: ../rules/base.xml.in.h:106
+msgid "Cambodia"
+msgstr "Камбоджия"
+
+#: ../rules/base.xml.in.h:107 ../rules/sun.xml.in.h:29
+msgid "Can"
+msgstr "Кан"
+
+#: ../rules/base.xml.in.h:108
+msgid "Canada"
+msgstr "Канада"
+
+#: ../rules/base.xml.in.h:109
+msgid "Caps Lock is Compose."
+msgstr "Caps Lock Compose клавишасы."
+
+#: ../rules/base.xml.in.h:110
+msgid "CapsLock LED shows alternative layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:111
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+msgstr ""
+
+#: ../rules/base.xml.in.h:112
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+msgstr ""
+
+#: ../rules/base.xml.in.h:113
+msgid "CapsLock just locks the Shift modifier."
+msgstr ""
+
+#: ../rules/base.xml.in.h:114 ../rules/sun.xml.in.h:33
+msgid "CapsLock key behavior"
+msgstr ""
+
+#: ../rules/base.xml.in.h:115
+msgid "CapsLock key changes layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:116
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr ""
+
+#: ../rules/base.xml.in.h:117
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr ""
+
+#: ../rules/base.xml.in.h:118
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+msgstr ""
+
+#: ../rules/base.xml.in.h:119
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+msgstr ""
+
+#: ../rules/base.xml.in.h:120
+msgid "Catalan variant with middle-dot L"
+msgstr ""
+
+#: ../rules/base.xml.in.h:121
+msgid "Che"
+msgstr "Че"
+
+#: ../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 (альтернативдик)"
+
+#: ../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 "China"
+msgstr "Кытай"
+
+#: ../rules/base.xml.in.h:130
+msgid "Chuvash"
+msgstr "Чуваш"
+
+#: ../rules/base.xml.in.h:131
+msgid "Chuvash Latin"
+msgstr "Чуваш латындык"
+
+#: ../rules/base.xml.in.h:132
+msgid "Classic Dvorak"
+msgstr "Классикалык Дровак"
+
+#: ../rules/base.xml.in.h:133
+msgid "Classmate PC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:134
+msgid "CloGaelach"
+msgstr ""
+
+#: ../rules/base.xml.in.h:135
+msgid "Colemak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:136
+msgid "Commabelow"
+msgstr ""
+
+#: ../rules/base.xml.in.h:137
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
+
+#: ../rules/base.xml.in.h:138
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq \"Интернет\" клавиатурасы (13 клавиша менен)"
+
+#: ../rules/base.xml.in.h:139
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq \"Интернет\" клавиатурасы (18 клавиша менен)"
+
+#: ../rules/base.xml.in.h:140
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq \"Интернет\" клавиатурасы (7 клавиша менен)"
+
+#: ../rules/base.xml.in.h:141
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
+
+#: ../rules/base.xml.in.h:142
+msgid "Compose key position"
+msgstr ""
+
+#: ../rules/base.xml.in.h:143
+msgid "Congo, Democratic Republic of the"
+msgstr ""
+
+#: ../rules/base.xml.in.h:144
+msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
+msgstr ""
+
+#: ../rules/base.xml.in.h:145
+msgid "Croatia"
+msgstr "Хорватия"
+
+#: ../rules/base.xml.in.h:146
+msgid "Ctrl key at bottom left"
+msgstr "Ctrl клавишасы төмөн сол жакта жайгашкан"
+
+#: ../rules/base.xml.in.h:147
+msgid "Ctrl key at left of 'A'"
+msgstr "Ctrl клавишасы 'Ф' клавишанын сол жагында"
+
+#: ../rules/base.xml.in.h:148
+msgid "Ctrl key position"
+msgstr "Ctrl клавишанын жайгашуусу"
+
+#: ../rules/base.xml.in.h:149
+msgid "Ctrl+Shift change layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:150
+msgid "Cyrillic"
+msgstr "Кириллица"
+
+#: ../rules/base.xml.in.h:151 ../rules/sun.xml.in.h:39
+msgid "Cze"
+msgstr "Чех"
+
+#: ../rules/base.xml.in.h:152
+msgid "Czechia"
+msgstr "Чехия"
+
+#: ../rules/base.xml.in.h:153
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:154
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:155 ../rules/sun.xml.in.h:42
+msgid "Dead acute"
+msgstr "Dead acute атайын символу"
+
+#: ../rules/base.xml.in.h:156 ../rules/sun.xml.in.h:43
+msgid "Dead grave acute"
+msgstr "Dead grave acute атайын символу"
+
+#: ../rules/base.xml.in.h:157
+msgid "Default numeric keypad keys."
+msgstr ""
+
+#: ../rules/base.xml.in.h:158
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:159
+msgid "Dell 101-key PC"
+msgstr "Dell 101-клавиша менен PC"
+
+#: ../rules/base.xml.in.h:160
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dell Inspiron 6xxx/8xxx ноутбугу"
+
+#: ../rules/base.xml.in.h:161
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell Precision M сериялуу ноутбугу"
+
+#: ../rules/base.xml.in.h:162
+msgid "Dell Latitude series laptop"
+msgstr "Dell Latitude сериялуу ноутбугу"
+
+#: ../rules/base.xml.in.h:163
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
+
+#: ../rules/base.xml.in.h:164
+msgid "Dell USB Multimedia Keybard"
+msgstr "Dell USB Multimedia Keybard"
+
+#: ../rules/base.xml.in.h:165
+msgid "Denmark"
+msgstr ""
+
+#: ../rules/base.xml.in.h:166 ../rules/sun.xml.in.h:44
+msgid "Deu"
+msgstr ""
+
+#: ../rules/base.xml.in.h:167
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:168
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 сериялары"
+
+#: ../rules/base.xml.in.h:169 ../rules/sun.xml.in.h:46
+msgid "Dnk"
+msgstr ""
+
+#: ../rules/base.xml.in.h:170 ../rules/sun.xml.in.h:48
+msgid "Dvorak"
+msgstr "Дровак"
+
+#: ../rules/base.xml.in.h:171
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr ""
+
+#: ../rules/base.xml.in.h:172
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:173
+msgid "Eastern"
+msgstr ""
+
+#: ../rules/base.xml.in.h:174 ../rules/sun.xml.in.h:49
+msgid "Eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:175
+msgid "Ennyah DKB-1008"
+msgstr ""
+
+#: ../rules/base.xml.in.h:176
+msgid "Epo"
+msgstr ""
+
+#: ../rules/base.xml.in.h:177
+msgid "Ergonomic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:178 ../rules/sun.xml.in.h:50
+msgid "Esp"
+msgstr ""
+
+#: ../rules/base.xml.in.h:179
+msgid "Esperanto"
+msgstr ""
+
+#: ../rules/base.xml.in.h:180
+msgid "Est"
+msgstr ""
+
+#: ../rules/base.xml.in.h:181
+msgid "Estonia"
+msgstr ""
+
+#: ../rules/base.xml.in.h:182
+msgid "Eth"
+msgstr ""
+
+#: ../rules/base.xml.in.h:183
+msgid "Ethiopia"
+msgstr ""
+
+#: ../rules/base.xml.in.h:184
+msgid "Evdev-managed keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:185
+msgid "Everex STEPnote"
+msgstr ""
+
+#: ../rules/base.xml.in.h:186
+msgid "Ewe"
+msgstr ""
+
+#: ../rules/base.xml.in.h:187
+msgid "Extended"
+msgstr ""
+
+#: ../rules/base.xml.in.h:188
+msgid "Extended Backslash"
+msgstr ""
+
+#: ../rules/base.xml.in.h:189
+msgid "F-letter (F) variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:190
+msgid "Fao"
+msgstr ""
+
+#: ../rules/base.xml.in.h:191
+msgid "Faroe Islands"
+msgstr ""
+
+#: ../rules/base.xml.in.h:192 ../rules/sun.xml.in.h:51
+msgid "Fin"
+msgstr ""
+
+#: ../rules/base.xml.in.h:193
+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:196
+msgid "Four-level key with abstract separators"
+msgstr ""
+
+#: ../rules/base.xml.in.h:197
+msgid "Four-level key with comma"
+msgstr ""
+
+#: ../rules/base.xml.in.h:198
+msgid "Four-level key with dot"
+msgstr ""
+
+#: ../rules/base.xml.in.h:199
+msgid "Four-level key with momayyez"
+msgstr ""
+
+#: ../rules/base.xml.in.h:200 ../rules/sun.xml.in.h:53
+msgid "Fra"
+msgstr ""
+
+#: ../rules/base.xml.in.h:201
+msgid "France"
+msgstr ""
+
+#: ../rules/base.xml.in.h:202 ../rules/sun.xml.in.h:55
+msgid "French"
+msgstr ""
+
+#: ../rules/base.xml.in.h:203
+msgid "French (Macintosh)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:204 ../rules/sun.xml.in.h:56
+msgid "French (legacy)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:205
+msgid "French Dvorak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:206
+msgid "French, Sun dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:207
+msgid "French, eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:208
+msgid "Fula"
+msgstr ""
+
+#: ../rules/base.xml.in.h:209
+msgid "GBr"
+msgstr ""
+
+#: ../rules/base.xml.in.h:210
+msgid "Ga"
+msgstr ""
+
+#: ../rules/base.xml.in.h:211
+msgid "Generic 101-key PC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:212
+msgid "Generic 102-key (Intl) PC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:213
+msgid "Generic 104-key PC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:214
+msgid "Generic 105-key (Intl) PC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:215
+msgid "Genius Comfy KB-12e"
+msgstr ""
+
+#: ../rules/base.xml.in.h:216
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr ""
+
+#: ../rules/base.xml.in.h:217
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr ""
+
+#: ../rules/base.xml.in.h:218
+msgid "Genius KB-19e NB"
+msgstr ""
+
+#: ../rules/base.xml.in.h:219
+msgid "Geo"
+msgstr ""
+
+#: ../rules/base.xml.in.h:220
+msgid "Georgia"
+msgstr ""
+
+#: ../rules/base.xml.in.h:221
+msgid "Georgian"
+msgstr ""
+
+#: ../rules/base.xml.in.h:222
+msgid "German (Macintosh)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:223
+msgid "German, Sun dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:224
+msgid "German, eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:225
+msgid "Germany"
+msgstr ""
+
+#: ../rules/base.xml.in.h:226
+msgid "Gha"
+msgstr ""
+
+#: ../rules/base.xml.in.h:227
+msgid "Ghana"
+msgstr ""
+
+#: ../rules/base.xml.in.h:228
+msgid "Gre"
+msgstr ""
+
+#: ../rules/base.xml.in.h:229
+msgid "Greece"
+msgstr ""
+
+#: ../rules/base.xml.in.h:230
+msgid "Gui"
+msgstr ""
+
+#: ../rules/base.xml.in.h:231
+msgid "Guinea"
+msgstr ""
+
+#: ../rules/base.xml.in.h:232
+msgid "Gujarati"
+msgstr ""
+
+#: ../rules/base.xml.in.h:233
+msgid "Gurmukhi"
+msgstr ""
+
+#: ../rules/base.xml.in.h:234
+msgid "Gyration"
+msgstr ""
+
+#: ../rules/base.xml.in.h:235
+msgid "Happy Hacking Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:236
+msgid "Happy Hacking Keyboard for Mac"
+msgstr ""
+
+#: ../rules/base.xml.in.h:237
+msgid "Hausa"
+msgstr ""
+
+#: ../rules/base.xml.in.h:238
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:239
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr ""
+
+#: ../rules/base.xml.in.h:240
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr ""
+
+#: ../rules/base.xml.in.h:241
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr ""
+
+#: ../rules/base.xml.in.h:242
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:243
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr ""
+
+#: ../rules/base.xml.in.h:244
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:245
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr ""
+
+#: ../rules/base.xml.in.h:246
+msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:247
+msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:248
+msgid "Hindi Bolnagri"
+msgstr ""
+
+#: ../rules/base.xml.in.h:249
+msgid "Honeywell Euroboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:250
+msgid "Hrv"
+msgstr ""
+
+#: ../rules/base.xml.in.h:251 ../rules/sun.xml.in.h:59
+msgid "Hun"
+msgstr ""
+
+#: ../rules/base.xml.in.h:252
+msgid "Hungary"
+msgstr ""
+
+#: ../rules/base.xml.in.h:253
+msgid "Hyper is mapped to the Win-keys."
+msgstr ""
+
+#: ../rules/base.xml.in.h:254
+msgid "IBM (LST 1205-92)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:255
+msgid "IBM Rapid Access"
+msgstr ""
+
+#: ../rules/base.xml.in.h:256
+msgid "IBM Rapid Access II"
+msgstr ""
+
+#: ../rules/base.xml.in.h:257
+msgid "IBM Rapid Access II (alternate option)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:258
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr ""
+
+#: ../rules/base.xml.in.h:259
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr ""
+
+#: ../rules/base.xml.in.h:260 ../rules/sun.xml.in.h:61
+msgid "ISO Alternate"
+msgstr ""
+
+#: ../rules/base.xml.in.h:261
+msgid "Iceland"
+msgstr ""
+
+#: ../rules/base.xml.in.h:262
+msgid "Igbo"
+msgstr ""
+
+#: ../rules/base.xml.in.h:263
+msgid "Ind"
+msgstr ""
+
+#: ../rules/base.xml.in.h:264
+msgid "India"
+msgstr ""
+
+#: ../rules/base.xml.in.h:265
+msgid "International (AltGr dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:266 ../rules/sun.xml.in.h:62
+msgid "International (with dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:267
+msgid "Inuktitut"
+msgstr ""
+
+#: ../rules/base.xml.in.h:268
+msgid "Iran"
+msgstr ""
+
+#: ../rules/base.xml.in.h:269
+msgid "Iraq"
+msgstr ""
+
+#: ../rules/base.xml.in.h:270
+msgid "Ireland"
+msgstr ""
+
+#: ../rules/base.xml.in.h:271
+msgid "Irl"
+msgstr ""
+
+#: ../rules/base.xml.in.h:272
+msgid "Irn"
+msgstr ""
+
+#: ../rules/base.xml.in.h:273
+msgid "Irq"
+msgstr ""
+
+#: ../rules/base.xml.in.h:274
+msgid "Isl"
+msgstr ""
+
+#: ../rules/base.xml.in.h:275
+msgid "Isr"
+msgstr ""
+
+#: ../rules/base.xml.in.h:276
+msgid "Israel"
+msgstr ""
+
+#: ../rules/base.xml.in.h:277 ../rules/sun.xml.in.h:63
+msgid "Ita"
+msgstr ""
+
+#: ../rules/base.xml.in.h:278
+msgid "Italy"
+msgstr ""
+
+#: ../rules/base.xml.in.h:279
+msgid "Japan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:280
+msgid "Japan (PC-98xx Series)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:281
+msgid "Japanese 106-key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:282
+msgid "Japanese keyboard options"
+msgstr ""
+
+#: ../rules/base.xml.in.h:283 ../rules/sun.xml.in.h:66
+msgid "Jpn"
+msgstr ""
+
+#: ../rules/base.xml.in.h:284
+msgid "Kana"
+msgstr ""
+
+#: ../rules/base.xml.in.h:285
+msgid "Kana Lock key is locking"
+msgstr ""
+
+#: ../rules/base.xml.in.h:286
+msgid "Kannada"
+msgstr ""
+
+#: ../rules/base.xml.in.h:287
+msgid "Kashubian"
+msgstr ""
+
+#: ../rules/base.xml.in.h:288
+msgid "Kaz"
+msgstr ""
+
+#: ../rules/base.xml.in.h:289
+msgid "Kazakh with Russian"
+msgstr ""
+
+#: ../rules/base.xml.in.h:290
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:291
+msgid "Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:292
+msgid "Keypad with unicode additions (arrows and math operators)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:293
+msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:294
+msgid "Keytronic FlexPro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:295
+msgid "Khm"
+msgstr ""
+
+#: ../rules/base.xml.in.h:296
+msgid "Kor"
+msgstr ""
+
+#: ../rules/base.xml.in.h:297
+msgid "Korea, Republic of"
+msgstr ""
+
+#: ../rules/base.xml.in.h:298
+msgid "Korean 106-key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:299
+msgid "Kotoistus"
+msgstr ""
+
+#: ../rules/base.xml.in.h:300
+msgid "Kurdish, (F)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:301
+msgid "Kurdish, Arabic-Latin"
+msgstr ""
+
+#: ../rules/base.xml.in.h:302
+msgid "Kurdish, Latin Alt-Q"
+msgstr ""
+
+#: ../rules/base.xml.in.h:303
+msgid "Kurdish, Latin Q"
+msgstr ""
+
+#: ../rules/base.xml.in.h:304
+msgid "Kyr"
+msgstr ""
+
+#: ../rules/base.xml.in.h:305
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:306
+msgid "LAm"
+msgstr ""
+
+#: ../rules/base.xml.in.h:307
+msgid "LCtrl+LShift change layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:308
+msgid "Lao"
+msgstr ""
+
+#: ../rules/base.xml.in.h:309
+msgid "Laos"
+msgstr ""
+
+#: ../rules/base.xml.in.h:310
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:311
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:312
+msgid "Laptop/notebook eMachines m68xx"
+msgstr ""
+
+#: ../rules/base.xml.in.h:313
+msgid "Latin"
+msgstr ""
+
+#: ../rules/base.xml.in.h:314
+msgid "Latin American"
+msgstr ""
+
+#: ../rules/base.xml.in.h:315
+msgid "Latin Unicode"
+msgstr ""
+
+#: ../rules/base.xml.in.h:316
+msgid "Latin Unicode qwerty"
+msgstr ""
+
+#: ../rules/base.xml.in.h:317
+msgid "Latin qwerty"
+msgstr ""
+
+#: ../rules/base.xml.in.h:318
+msgid "Latin with guillemets"
+msgstr ""
+
+#: ../rules/base.xml.in.h:319
+msgid "Latvia"
+msgstr ""
+
+#: ../rules/base.xml.in.h:320
+msgid "Layout switching"
+msgstr ""
+
+#: ../rules/base.xml.in.h:321
+msgid "Left Alt is swapped with left Win-key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:322
+msgid "Left Alt key changes layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:323
+msgid "Left Alt key switches layout while pressed."
+msgstr ""
+
+#: ../rules/base.xml.in.h:324
+msgid "Left Ctrl key changes layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:325
+msgid "Left Shift key changes layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:326
+msgid "Left Win-key changes layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:327
+msgid "Left Win-key is Compose."
+msgstr ""
+
+#: ../rules/base.xml.in.h:328
+msgid "Left Win-key switches layout while pressed."
+msgstr ""
+
+#: ../rules/base.xml.in.h:329
+msgid "Left hand"
+msgstr ""
+
+#: ../rules/base.xml.in.h:330
+msgid "Left handed Dvorak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:331
+msgid "Legacy Wang 724 keypad"
+msgstr ""
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:333
+msgid "Legacy key with comma"
+msgstr ""
+
+#: ../rules/base.xml.in.h:334
+msgid "Legacy key with dot"
+msgstr ""
+
+#: ../rules/base.xml.in.h:335
+msgid "Legacy keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:336
+msgid "Lithuania"
+msgstr ""
+
+#: ../rules/base.xml.in.h:337
+msgid "Logitech Access Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:338
+msgid "Logitech Cordless Desktop"
+msgstr ""
+
+#: ../rules/base.xml.in.h:339
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:340
+msgid "Logitech Cordless Desktop EX110"
+msgstr ""
+
+#: ../rules/base.xml.in.h:341
+msgid "Logitech Cordless Desktop LX-300"
+msgstr ""
+
+#: ../rules/base.xml.in.h:342
+msgid "Logitech Cordless Desktop Navigator"
+msgstr ""
+
+#: ../rules/base.xml.in.h:343
+msgid "Logitech Cordless Desktop Pro (alternate option2)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:344
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr ""
+
+#: ../rules/base.xml.in.h:345
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr ""
+
+#: ../rules/base.xml.in.h:346
+msgid "Logitech Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:347
+msgid "Logitech Internet Navigator Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:348
+msgid "Logitech Ultra-X Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:349
+msgid "Logitech diNovo Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:350
+msgid "Logitech iTouch"
+msgstr ""
+
+#: ../rules/base.xml.in.h:351
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:352
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr ""
+
+#: ../rules/base.xml.in.h:353
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:354
+msgid "Ltu"
+msgstr ""
+
+#: ../rules/base.xml.in.h:355
+msgid "Lva"
+msgstr ""
+
+#: ../rules/base.xml.in.h:356
+msgid "MESS"
+msgstr ""
+
+#: ../rules/base.xml.in.h:357
+msgid "MacBook/MacBook Pro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:358
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:359
+msgid "Macedonia"
+msgstr ""
+
+#: ../rules/base.xml.in.h:360
+msgid "Macintosh"
+msgstr ""
+
+#: ../rules/base.xml.in.h:361
+msgid "Macintosh Old"
+msgstr ""
+
+#: ../rules/base.xml.in.h:362
+msgid "Macintosh, Sun dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:363
+msgid "Macintosh, eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:364
+msgid "Make CapsLock an additional Ctrl."
+msgstr ""
+
+#: ../rules/base.xml.in.h:365
+msgid "Mal"
+msgstr ""
+
+#: ../rules/base.xml.in.h:366
+msgid "Malayalam"
+msgstr ""
+
+#: ../rules/base.xml.in.h:367
+msgid "Maldives"
+msgstr ""
+
+#: ../rules/base.xml.in.h:368
+msgid "Malta"
+msgstr ""
+
+#: ../rules/base.xml.in.h:369
+msgid "Maltese keyboard with US layout"
+msgstr ""
+
+#: ../rules/base.xml.in.h:370
+msgid "Mao"
+msgstr ""
+
+#: ../rules/base.xml.in.h:371
+msgid "Maori"
+msgstr ""
+
+#: ../rules/base.xml.in.h:372
+msgid "Memorex MX1998"
+msgstr ""
+
+#: ../rules/base.xml.in.h:373
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:374
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:375
+msgid "Menu is Compose."
+msgstr ""
+
+#: ../rules/base.xml.in.h:376
+msgid "Menu key changes layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:377
+msgid "Meta is mapped to the Win-keys."
+msgstr ""
+
+#: ../rules/base.xml.in.h:378
+msgid "Meta is mapped to the left Win-key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:379
+msgid "Microsoft Internet Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:380
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr ""
+
+#: ../rules/base.xml.in.h:381
+msgid "Microsoft Natural"
+msgstr ""
+
+#: ../rules/base.xml.in.h:382
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:383
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr ""
+
+#: ../rules/base.xml.in.h:384
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:385
+msgid "Microsoft Office Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:386
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr ""
+
+#: ../rules/base.xml.in.h:387 ../rules/sun.xml.in.h:72
+msgid "Miscellaneous compatibility options"
+msgstr ""
+
+#: ../rules/base.xml.in.h:388
+msgid "Mkd"
+msgstr ""
+
+#: ../rules/base.xml.in.h:389
+msgid "Mlt"
+msgstr ""
+
+#: ../rules/base.xml.in.h:390
+msgid "Mmr"
+msgstr ""
+
+#: ../rules/base.xml.in.h:391
+msgid "Mng"
+msgstr ""
+
+#: ../rules/base.xml.in.h:392
+msgid "Mongolia"
+msgstr ""
+
+#: ../rules/base.xml.in.h:393
+msgid "Morocco"
+msgstr ""
+
+#: ../rules/base.xml.in.h:394 ../rules/sun.xml.in.h:73
+msgid "Multilingual"
+msgstr ""
+
+#: ../rules/base.xml.in.h:395
+msgid "Multilingual, first part"
+msgstr ""
+
+#: ../rules/base.xml.in.h:396 ../rules/sun.xml.in.h:74
+msgid "Multilingual, second part"
+msgstr ""
+
+#: ../rules/base.xml.in.h:397
+msgid "Myanmar"
+msgstr ""
+
+#: ../rules/base.xml.in.h:398
+msgid "NICOLA-F style Backspace"
+msgstr ""
+
+#: ../rules/base.xml.in.h:399
+msgid "Neostyle"
+msgstr ""
+
+#: ../rules/base.xml.in.h:400
+msgid "Nep"
+msgstr ""
+
+#: ../rules/base.xml.in.h:401
+msgid "Nepal"
+msgstr ""
+
+#: ../rules/base.xml.in.h:402
+msgid "Netherlands"
+msgstr ""
+
+#: ../rules/base.xml.in.h:403
+msgid "Nig"
+msgstr ""
+
+#: ../rules/base.xml.in.h:404
+msgid "Nigeria"
+msgstr ""
+
+#: ../rules/base.xml.in.h:405
+msgid "Nld"
+msgstr ""
+
+#: ../rules/base.xml.in.h:406 ../rules/sun.xml.in.h:75
+msgid "Nor"
+msgstr ""
+
+#: ../rules/base.xml.in.h:407
+msgid "Northern Saami"
+msgstr ""
+
+#: ../rules/base.xml.in.h:408
+msgid "Northern Saami, eliminate dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:409
+msgid "Northgate OmniKey 101"
+msgstr ""
+
+#: ../rules/base.xml.in.h:410
+msgid "Norway"
+msgstr ""
+
+#: ../rules/base.xml.in.h:411
+msgid "NumLock LED shows alternative layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:412
+msgid "Numeric keypad delete key behaviour"
+msgstr ""
+
+#: ../rules/base.xml.in.h:413
+msgid "Numeric keypad keys work as with Mac."
+msgstr ""
+
+#: ../rules/base.xml.in.h:414
+msgid "Numeric keypad layout selection"
+msgstr ""
+
+#: ../rules/base.xml.in.h:415
+msgid "OADG 109A"
+msgstr ""
+
+#: ../rules/base.xml.in.h:416
+msgid "Ogham"
+msgstr ""
+
+#: ../rules/base.xml.in.h:417
+msgid "Ogham IS434"
+msgstr ""
+
+#: ../rules/base.xml.in.h:418
+msgid "Oriya"
+msgstr ""
+
+#: ../rules/base.xml.in.h:419
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:420
+msgid "Ossetian"
+msgstr "Осетиндик"
+
+#: ../rules/base.xml.in.h:421
+msgid "Ossetian, Winkeys"
+msgstr "Осетиндик Windows клавиатурасы"
+
+#: ../rules/base.xml.in.h:422
+msgid "PC-98xx Series"
+msgstr "PC-98xx"
+
+#: ../rules/base.xml.in.h:423
+msgid "Pak"
+msgstr "Пак"
+
+#: ../rules/base.xml.in.h:424
+msgid "Pakistan"
+msgstr "Пакистан"
+
+#: ../rules/base.xml.in.h:425
+msgid "Pashto"
+msgstr "Пуштундук"
+
+#: ../rules/base.xml.in.h:426
+msgid "Pattachote"
+msgstr "Паттачот"
+
+#: ../rules/base.xml.in.h:427 ../rules/sun.xml.in.h:78
+msgid "Phonetic"
+msgstr "Фонетикалык"
+
+#: ../rules/base.xml.in.h:428 ../rules/sun.xml.in.h:79
+msgid "Pol"
+msgstr "Польск"
+
+#: ../rules/base.xml.in.h:429
+msgid "Poland"
+msgstr "Польша"
+
+#: ../rules/base.xml.in.h:430
+msgid "Polytonic"
+msgstr "Полифоникалык"
+
+#: ../rules/base.xml.in.h:431
+msgid "Portugal"
+msgstr "Португалия"
+
+#: ../rules/base.xml.in.h:432
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "3-чү денгээлди тандоо сол Alt клавишанын басылышы менен."
+
+#: ../rules/base.xml.in.h:433
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "3-чү денгээлди тандоо сол Win клавишанын басылышы менен."
+
+#: ../rules/base.xml.in.h:434
+msgid "Press Menu key to choose 3rd level."
+msgstr "3-чү денгээлди тандоо Menu клавишанын басылышы менен."
+
+#: ../rules/base.xml.in.h:435
+msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:436
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "3-чү денгээлди тандоо оң Alt клавишанын басылышы менен."
+
+#: ../rules/base.xml.in.h:437
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "3-чү денгээлди тандоо оң Ctrl клавишанын басылышы менен."
+
+#: ../rules/base.xml.in.h:438
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "3-чү денгээлди тандоо оң Win клавишанын басылышы менен."
+
+#: ../rules/base.xml.in.h:439
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "3-чү денгээлди тандоо Alt клавишалардын бирөөсүнүн басылышы менен."
+
+#: ../rules/base.xml.in.h:440
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "3-чү денгээлди тандоо Win клавишалардын бирөөсүнүн басылышы менен."
+
+#: ../rules/base.xml.in.h:441
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:442
+msgid "Pro Keypad"
+msgstr "Pro кошумча панели менен"
+
+#: ../rules/base.xml.in.h:443
+msgid "Probhat"
+msgstr "Пробат"
+
+#: ../rules/base.xml.in.h:444
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:445 ../rules/sun.xml.in.h:88
+msgid "Prt"
+msgstr "Порт"
+
+#: ../rules/base.xml.in.h:446
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:447
+msgid "R-Alt switches layout while pressed."
+msgstr ""
+
+#: ../rules/base.xml.in.h:448
+msgid "Right Alt is Compose."
+msgstr ""
+
+#: ../rules/base.xml.in.h:449
+msgid "Right Alt key changes layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:450 ../rules/sun.xml.in.h:90
+msgid "Right Alt key never chooses 3rd level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:451
+msgid "Right Ctrl is Compose."
+msgstr "Оң Ctrl Compose клавишадай."
+
+#: ../rules/base.xml.in.h:452
+msgid "Right Ctrl key changes layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:453
+msgid "Right Ctrl key switches layout while pressed."
+msgstr ""
+
+#: ../rules/base.xml.in.h:454
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Оң Ctrl оң Alt клавишадай амал жасайт."
+
+#: ../rules/base.xml.in.h:455
+msgid "Right Shift key changes layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:456
+msgid "Right Win-key changes layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:457
+msgid "Right Win-key is Compose."
+msgstr "Оң Win Compose клавишадай."
+
+#: ../rules/base.xml.in.h:458
+msgid "Right Win-key switches layout while pressed."
+msgstr ""
+
+#: ../rules/base.xml.in.h:459
+msgid "Right hand"
+msgstr ""
+
+#: ../rules/base.xml.in.h:460
+msgid "Right handed Dvorak"
+msgstr "Dvorak оң колдуу адамдар үчүн"
+
+#: ../rules/base.xml.in.h:461
+msgid "Romania"
+msgstr "Румыния"
+
+#: ../rules/base.xml.in.h:462
+msgid "Romanian keyboard with German letters"
+msgstr "Румындык клавиатура немец ариптери менен"
+
+#: ../rules/base.xml.in.h:463
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Румындык клавиатура немец ариптери менен, атайын (dead keys) клавишаларсыз"
+
+#: ../rules/base.xml.in.h:464
+msgid "Rou"
+msgstr "Рум"
+
+#: ../rules/base.xml.in.h:465 ../rules/sun.xml.in.h:95
+msgid "Rus"
+msgstr "Рус"
+
+#: ../rules/base.xml.in.h:466
+msgid "Russia"
+msgstr "Россия"
+
+#: ../rules/base.xml.in.h:467 ../rules/sun.xml.in.h:96
+msgid "Russian"
+msgstr "Орусча"
+
+#: ../rules/base.xml.in.h:468
+msgid "Russian phonetic"
+msgstr "Орусча фонетикалык"
+
+#: ../rules/base.xml.in.h:469
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Орусча фонетикалык, атайын (dead keys) клавишаларсыз"
+
+#: ../rules/base.xml.in.h:470
+msgid "Russian with Kazakh"
+msgstr "Орусча Казакча менен"
+
+#: ../rules/base.xml.in.h:471
+msgid "SCG"
+msgstr "СМН"
+
+#: ../rules/base.xml.in.h:472
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
+
+#: ../rules/base.xml.in.h:473
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:474
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:475
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:476
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:477
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:478
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:479
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:480
+msgid "ScrollLock LED shows alternative layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:481
+msgid "Serbia and Montenegro"
+msgstr "Сербия жана Черногория"
+
+#: ../rules/base.xml.in.h:482
+msgid "Shift with numeric keypad keys works as in MS Windows."
+msgstr ""
+
+#: ../rules/base.xml.in.h:483
+msgid "Shift+CapsLock changes layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:484
+msgid "Slovakia"
+msgstr "Словакия"
+
+#: ../rules/base.xml.in.h:485
+msgid "Slovenia"
+msgstr "Словения"
+
+#: ../rules/base.xml.in.h:486
+msgid "South Africa"
+msgstr "Түштүк Африка"
+
+#: ../rules/base.xml.in.h:487
+msgid "Southern Uzbek"
+msgstr ""
+
+#: ../rules/base.xml.in.h:488
+msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:489
+msgid "Space key outputs non-breakable space character at fourth level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:490
+msgid "Space key outputs non-breakable space character at second level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:491
+msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:492
+msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:493
+msgid "Space key outputs non-breakable space character at third level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:494
+msgid "Space key outputs usual space at any level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:495
+msgid "Spain"
+msgstr "Испания"
+
+#: ../rules/base.xml.in.h:496 ../rules/sun.xml.in.h:103
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+msgstr "Атайын клавишалар (Ctrl+Alt+&lt;клв&gt;) сервер менен долборлонот."
+
+#: ../rules/base.xml.in.h:497
+msgid "SrL"
+msgstr "ШрЛ"
+
+#: ../rules/base.xml.in.h:498
+msgid "Sri Lanka"
+msgstr "Шри Ланка"
+
+#: ../rules/base.xml.in.h:499 ../rules/sun.xml.in.h:104
+msgid "Standard"
+msgstr "Стандарттык"
+
+#: ../rules/base.xml.in.h:500
+msgid "Standard (Commabelow)"
+msgstr ""
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:502
+msgid "Standard RSTU"
+msgstr "Стандарттык RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:504
+msgid "Standard RSTU on Russian layout"
+msgstr "Стандарттык RSTU, орусча"
+
+#: ../rules/base.xml.in.h:505 ../rules/sun.xml.in.h:112
+msgid "Sun dead keys"
+msgstr "Атайын (dead keys) Sun клавишалар"
+
+#: ../rules/base.xml.in.h:506
+msgid "Super Power Multimedia Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:507
+msgid "Super is mapped to the Win-keys."
+msgstr ""
+
+#: ../rules/base.xml.in.h:508
+msgid "Svdvorak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:509 ../rules/sun.xml.in.h:113
+msgid "Svk"
+msgstr "Слов"
+
+#: ../rules/base.xml.in.h:510
+msgid "Svn"
+msgstr "Cловен"
+
+#: ../rules/base.xml.in.h:511
+msgid "Swap Ctrl and CapsLock."
+msgstr "Ctrl жана CapsLock клавишаларды алмаштыруу."
+
+#: ../rules/base.xml.in.h:512
+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."
+
+#: ../rules/base.xml.in.h:513 ../rules/sun.xml.in.h:115
+msgid "Swe"
+msgstr "Швед"
+
+#: ../rules/base.xml.in.h:514
+msgid "Sweden"
+msgstr "Швеция"
+
+#: ../rules/base.xml.in.h:515
+msgid "Switzerland"
+msgstr "Швейцария"
+
+#: ../rules/base.xml.in.h:516
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (чөнтөк ПК)"
+
+#: ../rules/base.xml.in.h:517
+msgid "Syr"
+msgstr "Асс"
+
+#: ../rules/base.xml.in.h:518
+msgid "Syria"
+msgstr "Сирийдик"
+
+#: ../rules/base.xml.in.h:519
+msgid "Syriac"
+msgstr "Сирийдик"
+
+#: ../rules/base.xml.in.h:520
+msgid "Syriac phonetic"
+msgstr "Сирийдик фонетикалык"
+
+#: ../rules/base.xml.in.h:521
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:522
+msgid "Tajikistan"
+msgstr "Таджикистан"
+
+#: ../rules/base.xml.in.h:523
+msgid "Tamil"
+msgstr "Тамильдик"
+
+#: ../rules/base.xml.in.h:524
+msgid "Tamil TAB Typewriter"
+msgstr "Тамильдик \"Басма машинасы\" TAB"
+
+#: ../rules/base.xml.in.h:525
+msgid "Tamil TSCII Typewriter"
+msgstr ""
+
+#: ../rules/base.xml.in.h:526
+msgid "Tamil Unicode"
+msgstr ""
+
+#: ../rules/base.xml.in.h:527
+msgid "Tatar"
+msgstr ""
+
+#: ../rules/base.xml.in.h:528
+msgid "Telugu"
+msgstr ""
+
+#: ../rules/base.xml.in.h:529
+msgid "Tha"
+msgstr ""
+
+#: ../rules/base.xml.in.h:530
+msgid "Thailand"
+msgstr ""
+
+#: ../rules/base.xml.in.h:531 ../rules/sun.xml.in.h:119
+msgid "Third level choosers"
+msgstr ""
+
+#: ../rules/base.xml.in.h:532
+msgid "Tibetan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:533
+msgid "Tibetan (with ASCII numerals)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:534
+msgid "Tifinagh"
+msgstr ""
+
+#: ../rules/base.xml.in.h:535
+msgid "Tifinagh Alternative"
+msgstr ""
+
+#: ../rules/base.xml.in.h:536
+msgid "Tifinagh Alternative Phonetic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:537
+msgid "Tifinagh Extended"
+msgstr ""
+
+#: ../rules/base.xml.in.h:538
+msgid "Tifinagh Extended Phonetic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:539
+msgid "Tifinagh Phonetic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:540
+msgid "Tilde (~) variant"
+msgstr "Тильда (~) менен вариант"
+
+#: ../rules/base.xml.in.h:541
+msgid "Tjk"
+msgstr "Тадж"
+
+#: ../rules/base.xml.in.h:542
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:543
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: ../rules/base.xml.in.h:544
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: ../rules/base.xml.in.h:545 ../rules/sun.xml.in.h:120
+msgid "Tur"
+msgstr "Тур"
+
+#: ../rules/base.xml.in.h:546
+msgid "Turkey"
+msgstr "Турция"
+
+#: ../rules/base.xml.in.h:547
+msgid "Typewriter"
+msgstr "Басма машинасы"
+
+#: ../rules/base.xml.in.h:548 ../rules/sun.xml.in.h:124
+msgid "U.S. English"
+msgstr "Англис (АКШ)"
+
+#: ../rules/base.xml.in.h:549
+msgid "US keyboard with Bosnian digraphs"
+msgstr "АКШ клавиатурасы боснийдик диграфтар менен"
+
+#: ../rules/base.xml.in.h:550
+msgid "US keyboard with Bosnian letters"
+msgstr "АКШ клавиатурасы боснийдик ариптер менен"
+
+#: ../rules/base.xml.in.h:551
+msgid "US keyboard with Croatian digraphs"
+msgstr "АКШ клавиатурасы хорваттык диграфтар менен"
+
+#: ../rules/base.xml.in.h:552
+msgid "US keyboard with Croatian letters"
+msgstr "АКШ клавиатурасы хорваттык ариптер менен"
+
+#: ../rules/base.xml.in.h:553
+msgid "US keyboard with Lithuanian letters"
+msgstr "АКШ клавиатурасы литовдук ариптер менен"
+
+#: ../rules/base.xml.in.h:554
+msgid "US keyboard with Slovenian digraphs"
+msgstr "АКШ клавиатурасы словендик диграфтар менен"
+
+#: ../rules/base.xml.in.h:555
+msgid "US keyboard with Slovenian letters"
+msgstr "АКШ клавиатурасы словендик ариптер менен"
+
+#: ../rules/base.xml.in.h:556 ../rules/sun.xml.in.h:126
+msgid "USA"
+msgstr "АКШ"
+
+#: ../rules/base.xml.in.h:557
+msgid "Udmurt"
+msgstr ""
+
+#: ../rules/base.xml.in.h:558
+msgid "Ukr"
+msgstr "Укр"
+
+#: ../rules/base.xml.in.h:559
+msgid "Ukraine"
+msgstr "Украина"
+
+#: ../rules/base.xml.in.h:560
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:561 ../rules/sun.xml.in.h:127
+msgid "United Kingdom"
+msgstr "Англис (Улуу Британия)"
+
+#: ../rules/base.xml.in.h:562
+msgid "Urdu"
+msgstr "Урду"
+
+#: ../rules/base.xml.in.h:563
+msgid "Use Bosnian digraphs"
+msgstr "Боснийдик диаграфтарды колдонуу"
+
+#: ../rules/base.xml.in.h:564
+msgid "Use Croatian digraphs"
+msgstr "Хорваттык диаграфтарды колдонуу"
+
+#: ../rules/base.xml.in.h:565
+msgid "Use Slovenian digraphs"
+msgstr "Словендик диаграфтарды колдонуу"
+
+#: ../rules/base.xml.in.h:566
+msgid "Use guillemets for quotes"
+msgstr "Француздук тырмакчаларды тырмакчалардай колдонуу"
+
+#: ../rules/base.xml.in.h:567
+msgid "Use keyboard LED to show alternative layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:568
+msgid "Using space key to input non-breakable space character"
+msgstr ""
+
+#: ../rules/base.xml.in.h:569
+msgid "Uzb"
+msgstr "Өзб"
+
+#: ../rules/base.xml.in.h:570
+msgid "Uzbekistan"
+msgstr "Өзбекистан"
+
+#: ../rules/base.xml.in.h:571
+msgid "Vietnam"
+msgstr "Вьетнам"
+
+#: ../rules/base.xml.in.h:572
+msgid "Vnm"
+msgstr "Вьет"
+
+#: ../rules/base.xml.in.h:573
+msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:574
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:575
+msgid "Wang model 724 azerty"
+msgstr "Wang model 724 azerty"
+
+#: ../rules/base.xml.in.h:576
+msgid "Western"
+msgstr "Батыш"
+
+#: ../rules/base.xml.in.h:577
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:578
+msgid "Winkeys"
+msgstr "Windows клавиатурасы"
+
+#: ../rules/base.xml.in.h:579
+msgid "With &lt;\\|&gt; key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:580
+msgid "With EuroSign on 5"
+msgstr ""
+
+#: ../rules/base.xml.in.h:581
+msgid "With guillemets"
+msgstr "Француздук тырмакчалар менен"
+
+#: ../rules/base.xml.in.h:582
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
+
+#: ../rules/base.xml.in.h:583
+msgid "Yoruba"
+msgstr "Йоруба"
+
+#: ../rules/base.xml.in.h:584
+msgid "Z and ZHE swapped"
+msgstr "З жана Ж орундарын алмаштырган"
+
+#: ../rules/base.xml.in.h:585
+msgid "Zar"
+msgstr "ЮАР"
+
+#: ../rules/base.xml.in.h:586
+msgid "azerty"
+msgstr "azerty"
+
+#: ../rules/base.xml.in.h:587
+msgid "azerty/digits"
+msgstr "azerty/цифры"
+
+#: ../rules/base.xml.in.h:588
+msgid "digits"
+msgstr ""
+
+#: ../rules/base.xml.in.h:589
+msgid "displaced semicolon and quote (obsolete)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:590
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:591 ../rules/sun.xml.in.h:132
+msgid "qwerty"
+msgstr "qwerty"
+
+#: ../rules/base.xml.in.h:592
+msgid "qwerty, extended Backslash"
+msgstr "qwerty, Backslash кеңейтилген функциялары"
+
+#: ../rules/base.xml.in.h:593
+msgid "qwerty/digits"
+msgstr "qwerty/сандар"
+
+#: ../rules/base.xml.in.h:594
+msgid "qwertz"
+msgstr "qwertz"
+
+#: ../rules/sun.xml.in.h:1
+msgid "\"Typewriter\""
+msgstr "Басма машинасы"
+
+#: ../rules/sun.xml.in.h:17
+msgid "Acts as Shift with locking. Shift cancels Caps."
+msgstr "Shift блокировка менен амал жасайт.Shift Caps амалын убактылуу токтотот."
+
+#: ../rules/sun.xml.in.h:18
+msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
+msgstr "Shift блокировка менен амал жасайт. Shift Caps амалына тоскол болбойт."
+
+#: ../rules/sun.xml.in.h:19
+msgid "Alt+Control changes group"
+msgstr "Alt+Control группаны алмаштырат"
+
+#: ../rules/sun.xml.in.h:20
+msgid "Alt+Shift changes group"
+msgstr "Alt+Shift группаны алмаштырат"
+
+#: ../rules/sun.xml.in.h:21
+msgid "Basic"
+msgstr "Негизги"
+
+#: ../rules/sun.xml.in.h:23
+msgid "Belgian"
+msgstr "Бельгиялык"
+
+#: ../rules/sun.xml.in.h:25
+msgid "Both Alt keys together change group"
+msgstr "Эки Alt клавишалары бирге басылганда группаны алмаштырат"
+
+#: ../rules/sun.xml.in.h:26
+msgid "Both Ctrl keys together change group"
+msgstr "Эки Ctrl клавишалары бирге басылганда группаны алмаштырат"
+
+#: ../rules/sun.xml.in.h:27
+msgid "Both Shift keys together change group"
+msgstr "Эки Shift клавишалары бирге басылганда группаны алмаштырат"
+
+#: ../rules/sun.xml.in.h:28
+msgid "Bulgarian"
+msgstr "Болгардык"
+
+#: ../rules/sun.xml.in.h:30
+msgid "Canadian"
+msgstr "Канаддык"
+
+#: ../rules/sun.xml.in.h:31
+msgid "Caps Lock is Compose"
+msgstr "Caps Lock Compose клавишадай"
+
+#: ../rules/sun.xml.in.h:32
+msgid "Caps Lock key changes group"
+msgstr "Caps Lock клавишасы группаны алмаштырат"
+
+#: ../rules/sun.xml.in.h:34
+msgid "Caps_Lock LED shows alternative group"
+msgstr "Caps_Lock индикатору башка группаны көрсөтөт"
+
+#: ../rules/sun.xml.in.h:35
+msgid "Control Key Position"
+msgstr "Control клавишанын жайгашуусу"
+
+#: ../rules/sun.xml.in.h:36
+msgid "Control key at bottom left"
+msgstr "Control клавишасы төмөн сол жакта жайгашкан"
+
+#: ../rules/sun.xml.in.h:37
+msgid "Control key at left of 'A'"
+msgstr "Control клавишасы 'Ф' сол жагында"
+
+#: ../rules/sun.xml.in.h:38
+msgid "Control+Shift changes group"
+msgstr "Control+Shift группаны алмаштырат"
+
+#: ../rules/sun.xml.in.h:40
+msgid "Czech"
+msgstr "Чех"
+
+#: ../rules/sun.xml.in.h:41
+msgid "Danish"
+msgstr "Даттык"
+
+#: ../rules/sun.xml.in.h:45
+msgid "DeuCH"
+msgstr "НемШВ"
+
+#: ../rules/sun.xml.in.h:47
+msgid "Dvo"
+msgstr "Dvo"
+
+#: ../rules/sun.xml.in.h:52
+msgid "Finnish"
+msgstr "Финдик"
+
+#: ../rules/sun.xml.in.h:54
+msgid "FraCH"
+msgstr "ФраШВ"
+
+#: ../rules/sun.xml.in.h:57
+msgid "German"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:58
+msgid "Group Shift/Lock behavior"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:60
+msgid "Hungarian"
+msgstr "Венгердик"
+
+#: ../rules/sun.xml.in.h:64
+msgid "Italian"
+msgstr "Итальяндык"
+
+#: ../rules/sun.xml.in.h:65
+msgid "Japanese"
+msgstr "Япондук"
+
+#: ../rules/sun.xml.in.h:67
+msgid "Left Alt key changes group"
+msgstr "Сол Alt клавишасы группаны алмаштырат"
+
+#: ../rules/sun.xml.in.h:68
+msgid "Left Alt key switches group while pressed"
+msgstr "Сол Alt клавишасы убактылуу группаны алмаштырат"
+
+#: ../rules/sun.xml.in.h:69
+msgid "Left Ctrl key changes group"
+msgstr "Сол Ctrl клавишасы группаны алмаштырат"
+
+#: ../rules/sun.xml.in.h:70
+msgid "Left Shift key changes group"
+msgstr "Сол Shift клавишасы группаны алмаштырат"
+
+#: ../rules/sun.xml.in.h:71
+msgid "Make CapsLock an additional Control"
+msgstr "CapsLock кошумча Control клавиша катары колдонуу"
+
+#: ../rules/sun.xml.in.h:76
+msgid "Norwegian"
+msgstr "Норвеждик"
+
+#: ../rules/sun.xml.in.h:77
+msgid "Num_Lock LED shows alternative group"
+msgstr "Num_Lock индикатору кошумча группаны көрсөтөт"
+
+#: ../rules/sun.xml.in.h:80
+msgid "Polish"
+msgstr "Польдук"
+
+#: ../rules/sun.xml.in.h:81
+msgid "Polish with Polish quotes on key \"1/!\""
+msgstr "Польдук клавишалар польдук тырмакчалар менен \"1/!\""
+
+#: ../rules/sun.xml.in.h:82
+msgid "Portuguese"
+msgstr "Португалдык"
+
+#: ../rules/sun.xml.in.h:83
+msgid "Press Left Alt key to choose 3rd level"
+msgstr "3-чү денгээлди тандоо сол Alt клавишанын басылышы менен."
+
+#: ../rules/sun.xml.in.h:84
+msgid "Press Right Alt key to choose 3rd level"
+msgstr "3-чү денгээлди тандоо оң Alt клавишанын басылышы менен."
+
+#: ../rules/sun.xml.in.h:85
+msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
+msgstr "3-чү денгээлди тандоо сол Alt клавишанын басылышы менен.Shift жана оң Alt бирге Multi_Key катары амал жасайт"
+
+#: ../rules/sun.xml.in.h:86
+msgid "Press Right Control to choose 3rd level"
+msgstr "3-чү денгээлди тандоо оң Control клавишанын басылышы менен."
+
+#: ../rules/sun.xml.in.h:87
+msgid "Press any of Alt keys to choose 3rd level"
+msgstr "3-чү денгээлди тандоо Alt клавишалардан бирөөсүнүн басылышы менен."
+
+#: ../rules/sun.xml.in.h:89
+msgid "Right Alt key changes group"
+msgstr "Оң Alt клавишасы группаны алмаштырат"
+
+#: ../rules/sun.xml.in.h:91
+msgid "Right Alt switches group while pressed"
+msgstr "Оң Alt клавишасы басылганда убактылуу группаны алмаштырат"
+
+#: ../rules/sun.xml.in.h:92
+msgid "Right Control key works as Right Alt"
+msgstr "Оң Control оң Alt клавишадай"
+
+#: ../rules/sun.xml.in.h:93
+msgid "Right Ctrl key changes group"
+msgstr "Оң Ctrl клавишасы группаны алмаштырат"
+
+#: ../rules/sun.xml.in.h:94
+msgid "Right Shift key changes group"
+msgstr "Оң Shift клавишасы группаны алмаштырат"
+
+#: ../rules/sun.xml.in.h:97
+msgid "Scroll Lock changes group"
+msgstr "Scroll Lock клавишасы группаны алмаштырат"
+
+#: ../rules/sun.xml.in.h:98
+msgid "Scroll_Lock LED shows alternative group"
+msgstr "Scroll_Lock индикатору кошумча панелди көрсөтөт"
+
+#: ../rules/sun.xml.in.h:99
+msgid "Shift with numpad keys works as in MS Windows"
+msgstr "Shift клавишасы сандык клавиатурада MS Windows'тогу клавишадай амал жасайт"
+
+#: ../rules/sun.xml.in.h:100
+msgid "Shift+CapsLock changes group"
+msgstr "Shift жана Caps Lock клавишалары бирге басылганда группаны алмаштарыт"
+
+#: ../rules/sun.xml.in.h:101
+msgid "Slovak"
+msgstr "Словак"
+
+#: ../rules/sun.xml.in.h:102
+msgid "Spanish"
+msgstr "Испандык"
+
+#: ../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 Европейдик"
+
+#: ../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 Евро белгиси менен"
+
+#: ../rules/sun.xml.in.h:114
+msgid "Swap Control and Caps Lock"
+msgstr "Control жана Caps Lock клавишалардын ордун алмаштыруу"
+
+#: ../rules/sun.xml.in.h:116
+msgid "Swedish"
+msgstr "Шведдик"
+
+#: ../rules/sun.xml.in.h:117
+msgid "Swiss French"
+msgstr "Швейцариялык французча"
+
+#: ../rules/sun.xml.in.h:118
+msgid "Swiss German"
+msgstr "Швейцариялык немецче"
+
+#: ../rules/sun.xml.in.h:121
+msgid "Turkish"
+msgstr "Түркчө"
+
+#: ../rules/sun.xml.in.h:122
+msgid "Turkish (F)"
+msgstr "Түркчө (F) менен"
+
+#: ../rules/sun.xml.in.h:123
+msgid "Turkish Alt-Q Layout"
+msgstr "Түрк раскладкасы Alt-Q менен"
+
+#: ../rules/sun.xml.in.h:125
+msgid "U.S. English w/ ISO9995-3"
+msgstr "Англис (АКШ) ISO9995-3 менен"
+
+#: ../rules/sun.xml.in.h:128
+msgid "Use keyboard LED to show alternative group"
+msgstr "Клавиатурдук индикаторлорду кошумча группаларды көрсөтүү үчүн колдонуу"
+
+#: ../rules/sun.xml.in.h:129
+msgid "Uses internal capitalization. Shift cancels Caps."
+msgstr "Ички капитализацыяны ачат. Shift CapsLock амалын токтотот."
+
+#: ../rules/sun.xml.in.h:130
+msgid "Uses internal capitalization. Shift doesn't cancel Caps."
+msgstr "Ички капитализацыяны ачат. Shift CapsLock амалына таасир тийгизбейт."
+
+#: ../rules/sun.xml.in.h:131
+msgid "bksl"
+msgstr "bksl"
+
+#: ../rules/sun.xml.in.h:133
+msgid "type4"
+msgstr "type4"
diff --git a/xorg-server/xkbdata.src/po/lt.po b/xorg-server/xkbdata.src/po/lt.po
new file mode 100644
index 000000000..ae0242b0d
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/lt.po
@@ -0,0 +1,2781 @@
+# Lithuanian message catalog for xkeyboard-config.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the xkeyboard-config package.
+# Gintautas Miliauskas <gintautas@miliauskas.lt>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xkeyboard-config 1.6pre1\n"
+"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
+"POT-Creation-Date: 2009-05-12 23:49+0100\n"
+"PO-Revision-Date: 2009-05-26 12:47+0300\n"
+"Last-Translator: Gintautas Miliauskas <gintautas@miliauskas.lt>\n"
+"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\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 "(Legacy) Alternative"
+msgstr "(Senasis) alternatyvus"
+
+#: ../rules/base.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr "(Senasis) alternatyvus, su Sun tęsties ženklais"
+
+#: ../rules/base.xml.in.h:4
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "(Senasis) alternatyvus, be tęsties ženklų"
+
+#: ../rules/base.xml.in.h:5
+msgid "101/104 key Compatible"
+msgstr "101/104 klavišų suderinama"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/qwerty/comma/Dead keys"
+msgstr "101 klavišo, QWERTY, dešimtainis kablelis, su tęsties ženklais"
+
+#: ../rules/base.xml.in.h:7
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "101 klavišo, QWERTY, dešimtainis kablelis, be tęsties ženklų"
+
+#: ../rules/base.xml.in.h:8
+msgid "101/qwerty/dot/Dead keys"
+msgstr "101 klavišo, QWERTY, dešimtainis taškas, su tęsties ženklais"
+
+#: ../rules/base.xml.in.h:9
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "101 klavišo, QWERTY, dešimtainis taškas, be tęsties ženklų"
+
+#: ../rules/base.xml.in.h:10
+msgid "101/qwertz/comma/Dead keys"
+msgstr "101 klavišo, QWERTZ, dešimtainis kablelis, su tęsties ženklais"
+
+#: ../rules/base.xml.in.h:11
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "101 klavišo, QWERTZ, dešimtainis kablelis, be tęsties ženklų"
+
+#: ../rules/base.xml.in.h:12
+msgid "101/qwertz/dot/Dead keys"
+msgstr "101 klavišo, QWERTZ, dešimtainis taškas, su tęsties ženklais"
+
+#: ../rules/base.xml.in.h:13
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "101 klavišo, QWERTZ, dešimtainis taškas, be tęsties ženklų"
+
+#: ../rules/base.xml.in.h:14
+msgid "102/qwerty/comma/Dead keys"
+msgstr "102 klavišų, QWERTY, dešimtainis kablelis, su tęsties ženklais"
+
+#: ../rules/base.xml.in.h:15
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "102 klavišų, QWERTY, dešimtainis kablelis, be tęsties ženklų"
+
+#: ../rules/base.xml.in.h:16
+msgid "102/qwerty/dot/Dead keys"
+msgstr "102 klavišų, QWERTY, dešimtainis taškas, su tęsties ženklais"
+
+#: ../rules/base.xml.in.h:17
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "102 klavišų, QWERTY, dešimtainis taškas, be tęsties ženklų"
+
+#: ../rules/base.xml.in.h:18
+msgid "102/qwertz/comma/Dead keys"
+msgstr "102 klavišų, QWERTZ, dešimtainis kablelis, su tęsties ženklais"
+
+#: ../rules/base.xml.in.h:19
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "102 klavišų, QWERTZ, dešimtainis kablelis, be tęsties ženklų"
+
+#: ../rules/base.xml.in.h:20
+msgid "102/qwertz/dot/Dead keys"
+msgstr "102 klavišų, QWERTZ, dešimtainis taškas, su tęsties ženklais"
+
+#: ../rules/base.xml.in.h:21
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "102 klavišų, QWERTZ, dešimtainis taškas, be tęsties ženklų"
+
+#: ../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 "Įprastinė ACPI"
+
+#: ../rules/base.xml.in.h:29
+msgid "ATM/phone-style"
+msgstr "Bankomato/telefono tipo"
+
+#: ../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 nešiojamasis kompiuteris"
+
+#: ../rules/base.xml.in.h:34
+msgid "Add the standard behavior to Menu key"
+msgstr "Meniu klavišui priskirti standartinę veikseną"
+
+#: ../rules/base.xml.in.h:35
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "Esperanto cirkumfleksų („supersigno“) įvedimas"
+
+#: ../rules/base.xml.in.h:36
+msgid "Adding EuroSign to certain keys"
+msgstr "Euro ženklo įvedimas pasirinktais klavišais"
+
+#: ../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 "Afganistanas"
+
+#: ../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 "Albanija"
+
+#: ../rules/base.xml.in.h:43
+msgid "Alt and Meta are on Alt keys"
+msgstr "Alt ir Meta funkcijos priskirtos Alt klavišams"
+
+#: ../rules/base.xml.in.h:44
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr "Dešiniajam Win klavišui priskirti Alt funkciją, o Meniu klavišui – Super funkciją"
+
+#: ../rules/base.xml.in.h:45
+msgid "Alt+CapsLock"
+msgstr "Alt+Didž"
+
+#: ../rules/base.xml.in.h:46
+msgid "Alt+Ctrl"
+msgstr "Alt+Vald"
+
+#: ../rules/base.xml.in.h:47
+msgid "Alt+Shift"
+msgstr "Alt+Lyg2"
+
+#: ../rules/base.xml.in.h:48
+msgid "Alt+Space"
+msgstr "Alt+Tarpas"
+
+#: ../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 ir Win klavišų elgsena"
+
+#: ../rules/base.xml.in.h:51
+msgid "Alternative"
+msgstr "Alternatyvi"
+
+#: ../rules/base.xml.in.h:52
+msgid "Alternative Eastern"
+msgstr "Alternatyvi Rytų"
+
+#: ../rules/base.xml.in.h:53
+msgid "Alternative Phonetic"
+msgstr "Alternatyvi fonetinė"
+
+#: ../rules/base.xml.in.h:54
+msgid "Alternative international (former us_intl)"
+msgstr "Alternatyvi tarptautinė (anksčiau: us_intl)"
+
+#: ../rules/base.xml.in.h:55
+msgid "Alternative, Sun dead keys"
+msgstr "Alternatyvi, su Sun tęsties klavišais"
+
+#: ../rules/base.xml.in.h:56
+msgid "Alternative, eliminate dead keys"
+msgstr "Alternatyvi, be tęsties klavišų"
+
+#: ../rules/base.xml.in.h:57
+msgid "Alternative, latin-9 only"
+msgstr "Alternatyvi, tik latin-9 simboliai"
+
+#: ../rules/base.xml.in.h:58
+msgid "And"
+msgstr "And"
+
+#: ../rules/base.xml.in.h:59
+msgid "Andorra"
+msgstr "Andora"
+
+#: ../rules/base.xml.in.h:60
+msgid "Any Alt key"
+msgstr "Bet kuris Alt klavišas"
+
+#: ../rules/base.xml.in.h:61
+msgid "Any Win key"
+msgstr "Bet kuris Win klavišas"
+
+#: ../rules/base.xml.in.h:62
+msgid "Any Win key (while pressed)"
+msgstr "Bet kuris Win klavišas (kol paspaustas)"
+
+#: ../rules/base.xml.in.h:63
+msgid "Apostrophe (') variant"
+msgstr "Apostrofo (') variantas"
+
+#: ../rules/base.xml.in.h:64
+msgid "Apple"
+msgstr "Apple"
+
+#: ../rules/base.xml.in.h:65
+msgid "Apple Laptop"
+msgstr "Apple nešiojamasis kompiuteris"
+
+#: ../rules/base.xml.in.h:66
+msgid "Ara"
+msgstr "Ara"
+
+#: ../rules/base.xml.in.h:67
+msgid "Arabic"
+msgstr "Arabų"
+
+#: ../rules/base.xml.in.h:68
+msgid "Arm"
+msgstr "Arm"
+
+#: ../rules/base.xml.in.h:69
+msgid "Armenia"
+msgstr "Armėnija"
+
+#: ../rules/base.xml.in.h:70
+msgid "Asturian variant with bottom-dot H and bottom-dot L"
+msgstr "Asturiškasis variantas su taškais po H ir L raidėmis"
+
+#: ../rules/base.xml.in.h:71
+msgid "Asus Laptop"
+msgstr "Asus nešiojamasis kompiuteris"
+
+#: ../rules/base.xml.in.h:72
+msgid "At bottom left"
+msgstr "Apačioje kairėje"
+
+#: ../rules/base.xml.in.h:73
+msgid "At left of 'A'"
+msgstr "Kairėje nuo klavišo „A“"
+
+#: ../rules/base.xml.in.h:74
+msgid "Aze"
+msgstr "Aze"
+
+#: ../rules/base.xml.in.h:75
+msgid "Azerbaijan"
+msgstr "Azerbaidžanas"
+
+#: ../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 ""
+
+#: ../rules/base.xml.in.h:87
+msgid "Ban"
+msgstr "Ban"
+
+#: ../rules/base.xml.in.h:88
+msgid "Bangladesh"
+msgstr "Bangladešas"
+
+#: ../rules/base.xml.in.h:89
+msgid "Bel"
+msgstr "Bel"
+
+#: ../rules/base.xml.in.h:90
+msgid "Belarus"
+msgstr "Baltarusija"
+
+#: ../rules/base.xml.in.h:91
+msgid "Belgium"
+msgstr "Belgija"
+
+#: ../rules/base.xml.in.h:92
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
+
+#: ../rules/base.xml.in.h:93
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:94
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
+
+#: ../rules/base.xml.in.h:95
+msgid "Bengali"
+msgstr "Bengalų"
+
+#: ../rules/base.xml.in.h:96
+msgid "Bengali Probhat"
+msgstr "Bengalų Probhat"
+
+#: ../rules/base.xml.in.h:97
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr "Bepo, ergonominė pagal Dvoraką"
+
+#: ../rules/base.xml.in.h:98
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr "Bepo, ergonominė pagal Dvoraką, tik Latin-9"
+
+#: ../rules/base.xml.in.h:99
+msgid "Bgr"
+msgstr "Bgr"
+
+#: ../rules/base.xml.in.h:100
+msgid "Bhu"
+msgstr "Bhu"
+
+#: ../rules/base.xml.in.h:101
+msgid "Bhutan"
+msgstr "Butanas"
+
+#: ../rules/base.xml.in.h:102
+msgid "Biblical Hebrew (Tiro)"
+msgstr "Biblinė hebrajų"
+
+#: ../rules/base.xml.in.h:103
+msgid "Bih"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:104
+msgid "Blr"
+msgstr "Blr"
+
+#: ../rules/base.xml.in.h:105
+msgid "Bosnia and Herzegovina"
+msgstr "Bosnija ir Hercegovina"
+
+#: ../rules/base.xml.in.h:106
+msgid "Both Alt keys together"
+msgstr "Vienu metu paspausti abu Alternatyvos klavišai"
+
+#: ../rules/base.xml.in.h:107
+msgid "Both Ctrl keys together"
+msgstr "Vienu metu paspausti abu Valdymo (Ctrl) klavišai"
+
+#: ../rules/base.xml.in.h:108
+msgid "Both Shift keys together"
+msgstr "Vienu metu paspausti abu Antrojo lygio (Shift) klavišai"
+
+#: ../rules/base.xml.in.h:109
+msgid "Bra"
+msgstr "Bra"
+
+#: ../rules/base.xml.in.h:110
+msgid "Braille"
+msgstr "Brailio terminalas"
+
+#: ../rules/base.xml.in.h:111
+msgid "Brazil"
+msgstr "Brazilija"
+
+#: ../rules/base.xml.in.h:112
+msgid "Breton"
+msgstr "Bretonų"
+
+#: ../rules/base.xml.in.h:113
+msgid "Brl"
+msgstr "Brl"
+
+#: ../rules/base.xml.in.h:114
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
+
+#: ../rules/base.xml.in.h:115
+msgid "Buckwalter"
+msgstr "Buckwalter"
+
+#: ../rules/base.xml.in.h:116
+msgid "Bulgaria"
+msgstr "Bulgarija"
+
+#: ../rules/base.xml.in.h:117
+msgid "CRULP"
+msgstr "CRULP"
+
+#: ../rules/base.xml.in.h:118
+msgid "Cambodia"
+msgstr "Kambodža"
+
+#: ../rules/base.xml.in.h:119
+msgid "Can"
+msgstr "Can"
+
+#: ../rules/base.xml.in.h:120
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../rules/base.xml.in.h:121
+msgid "Caps Lock"
+msgstr "Didžiosios raidės"
+
+#: ../rules/base.xml.in.h:122
+msgid "CapsLock"
+msgstr "Didžiosios raidės"
+
+#: ../rules/base.xml.in.h:123
+msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
+msgstr "Didž (į pirmąjį išdėstymą), Lyg2+Didž (į paskutinį išdėstymą)"
+
+#: ../rules/base.xml.in.h:124
+msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
+msgstr "Didž (kol nuspaustas); Alt+Didž atlieka pirminę Didž klavišo funkciją"
+
+#: ../rules/base.xml.in.h:125
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
+msgstr "Didž klavišas veikia kaip įprasta; Lyg2 „pristabdo“ Didž veikseną"
+
+#: ../rules/base.xml.in.h:126
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock"
+msgstr "Didž klavišas veikia kaip įprasta; Lyg2 neįtakoja Didž veiksenos"
+
+#: ../rules/base.xml.in.h:127
+msgid "CapsLock key behavior"
+msgstr "Didžiųjų raidžių klavišo veiksena"
+
+#: ../rules/base.xml.in.h:128
+msgid "CapsLock toggles Shift so all keys are affected"
+msgstr "Didž klavišas veikia kaip nuolat nuspaustas Lyg2 (įtakoja visus klavišus)"
+
+#: ../rules/base.xml.in.h:129
+msgid "CapsLock toggles normal capitalization of alphabetic characters"
+msgstr "Didž klavišas įjungia įprastą raidžių vertimą didžiosiomis"
+
+#: ../rules/base.xml.in.h:130
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
+msgstr "Didž įjungia įtaisytąjį raidžių vertimą didžiosiomis. Lyg2 „pristabdo“ Didž klavišo veikimą"
+
+#: ../rules/base.xml.in.h:131
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
+msgstr "Didž įjungia įtaisytąjį raidžių vertimą didžiosiomis. Lyg2 neįtakoja Didž veiksenos"
+
+#: ../rules/base.xml.in.h:132
+msgid "Catalan variant with middle-dot L"
+msgstr "Kataloniškasis variantas su tašku L raidės centre"
+
+#: ../rules/base.xml.in.h:133
+msgid "Cedilla"
+msgstr "Sedilė"
+
+#: ../rules/base.xml.in.h:134
+msgid "Che"
+msgstr "Che"
+
+#: ../rules/base.xml.in.h:135
+msgid "Cherokee"
+msgstr "Čerokių"
+
+#: ../rules/base.xml.in.h:136
+msgid "Cherry B.UNLIMITED"
+msgstr ""
+
+#: ../rules/base.xml.in.h:137
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
+
+#: ../rules/base.xml.in.h:138
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (alternatyvus variantas)"
+
+#: ../rules/base.xml.in.h:139
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
+
+#: ../rules/base.xml.in.h:140
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Expert"
+
+#: ../rules/base.xml.in.h:141
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
+
+#: ../rules/base.xml.in.h:142
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
+
+#: ../rules/base.xml.in.h:143
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard"
+
+#: ../rules/base.xml.in.h:144
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
+
+#: ../rules/base.xml.in.h:145
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
+
+#: ../rules/base.xml.in.h:146
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0420"
+
+#: ../rules/base.xml.in.h:147
+msgid "China"
+msgstr "Kinija"
+
+#: ../rules/base.xml.in.h:148
+msgid "Chuvash"
+msgstr "Čuvašų"
+
+#: ../rules/base.xml.in.h:149
+msgid "Chuvash Latin"
+msgstr "Čuvašų, lotyniški rašmenys"
+
+#: ../rules/base.xml.in.h:150
+msgid "Classic"
+msgstr "Klasikinė"
+
+#: ../rules/base.xml.in.h:151
+msgid "Classic Dvorak"
+msgstr "Klasikinė Dvorako"
+
+#: ../rules/base.xml.in.h:152
+msgid "Classmate PC"
+msgstr "Classmate PC"
+
+#: ../rules/base.xml.in.h:153
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:154
+msgid "Colemak"
+msgstr "Colemak"
+
+#: ../rules/base.xml.in.h:155
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
+
+#: ../rules/base.xml.in.h:156
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 klavišų)"
+
+#: ../rules/base.xml.in.h:157
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 klavišų)"
+
+#: ../rules/base.xml.in.h:158
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 klavišai)"
+
+#: ../rules/base.xml.in.h:159
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq klaviatūra"
+
+#: ../rules/base.xml.in.h:160
+msgid "Compose key position"
+msgstr "Compose klavišo pozicija"
+
+#: ../rules/base.xml.in.h:161
+msgid "Congo, Democratic Republic of the"
+msgstr "Kongo demokratinė respublika"
+
+#: ../rules/base.xml.in.h:162
+msgid "Control + Alt + Backspace"
+msgstr ""
+
+#: ../rules/base.xml.in.h:163
+msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
+msgstr "Vald funkciją priskirti Alt klavišams, o Alt funkciją – Win klavišams"
+
+#: ../rules/base.xml.in.h:164
+msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
+msgstr "Vald funkciją priskirti Win klavišams bei įprastiems Vald klavišams"
+
+#: ../rules/base.xml.in.h:165
+msgid "Crimean Tatar (Dobruca-1 Q)"
+msgstr "Krymo totorių (Dobruca-1 Q)"
+
+#: ../rules/base.xml.in.h:166
+msgid "Crimean Tatar (Dobruca-2 Q)"
+msgstr "Krymo totorių (Dobruca-2 Q)"
+
+#: ../rules/base.xml.in.h:167
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Krymo totorių (turkiškas Alt-Q)"
+
+#: ../rules/base.xml.in.h:168
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Krymo totorių (turkiškas F)"
+
+#: ../rules/base.xml.in.h:169
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Krymo totorių (turkiškas Q)"
+
+#: ../rules/base.xml.in.h:170
+msgid "Croatia"
+msgstr "Kroatija"
+
+#: ../rules/base.xml.in.h:171
+msgid "Ctrl key position"
+msgstr "Valdymo (Ctrl) klavišo pozicija"
+
+#: ../rules/base.xml.in.h:172
+msgid "Ctrl+Shift"
+msgstr "Vald+Lyg2"
+
+#: ../rules/base.xml.in.h:173
+msgid "Cyrillic"
+msgstr "Kiriliškasis"
+
+#: ../rules/base.xml.in.h:174
+msgid "Cyrillic with guillemets"
+msgstr "Kiriliškasis, su kampinėmis kabutėmis"
+
+#: ../rules/base.xml.in.h:175
+msgid "Cyrillic, Z and ZHE swapped"
+msgstr "Kriliškasis, raidės Z ir Ž sukeistos"
+
+#: ../rules/base.xml.in.h:176
+msgid "Cze"
+msgstr "Cze"
+
+#: ../rules/base.xml.in.h:177
+msgid "Czechia"
+msgstr "Čekija"
+
+#: ../rules/base.xml.in.h:178
+msgid "DOS"
+msgstr ""
+
+#: ../rules/base.xml.in.h:179
+msgid "DRC"
+msgstr "DRC"
+
+#: ../rules/base.xml.in.h:180
+msgid "DTK2000"
+msgstr "DTK2000"
+
+#: ../rules/base.xml.in.h:181
+msgid "Dan"
+msgstr "Dan"
+
+#: ../rules/base.xml.in.h:182
+msgid "Dead acute"
+msgstr "Tęsties ženklas – dešininis kirtis"
+
+#: ../rules/base.xml.in.h:183
+msgid "Dead grave acute"
+msgstr "Tęsties ženklai – kairinis ir dešininis kirtis"
+
+#: ../rules/base.xml.in.h:184
+msgid "Default numeric keypad keys"
+msgstr "Numatytieji skaitmenų srities klavišai"
+
+#: ../rules/base.xml.in.h:185
+msgid "Dell"
+msgstr "Dell"
+
+#: ../rules/base.xml.in.h:186
+msgid "Dell 101-key PC"
+msgstr "Dell 101 klavišo PC klaviatūra"
+
+#: ../rules/base.xml.in.h:187
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dell Inspiron 6xxx/8xxx serijos skreitinukas"
+
+#: ../rules/base.xml.in.h:188
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell Precision M serijos skreitinukas"
+
+#: ../rules/base.xml.in.h:189
+msgid "Dell Latitude series laptop"
+msgstr "Dell Latitude serijos skreitinukas"
+
+#: ../rules/base.xml.in.h:190
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
+
+#: ../rules/base.xml.in.h:191
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
+
+#: ../rules/base.xml.in.h:192
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
+
+#: ../rules/base.xml.in.h:193
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Dell USB Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:194
+msgid "Denmark"
+msgstr "Danija"
+
+#: ../rules/base.xml.in.h:195
+msgid "Deu"
+msgstr "Deu"
+
+#: ../rules/base.xml.in.h:196
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:197
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 serija"
+
+#: ../rules/base.xml.in.h:198
+msgid "Dvorak"
+msgstr "Dvorako"
+
+#: ../rules/base.xml.in.h:199
+msgid "Dvorak (UK Punctuation)"
+msgstr "Dvorako (JK skyryba)"
+
+#: ../rules/base.xml.in.h:200
+msgid "Dvorak international"
+msgstr "Dvorako tarptautinis"
+
+#: ../rules/base.xml.in.h:201
+#, fuzzy
+msgid "Dvorak, Polish quotes on key 1"
+msgstr "Dvorako, lenkiškos kabutės ant klavišo \"1/!\""
+
+#: ../rules/base.xml.in.h:202
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr "Dvorako, lenkiškos kabutės ant kabučių klavišo"
+
+#: ../rules/base.xml.in.h:203
+msgid "E"
+msgstr "E"
+
+#: ../rules/base.xml.in.h:204
+msgid "Eastern"
+msgstr "Rytų"
+
+#: ../rules/base.xml.in.h:205
+msgid "Eliminate dead keys"
+msgstr "Be tęsties ženklų"
+
+#: ../rules/base.xml.in.h:206
+msgid "Enable extra typographic characters"
+msgstr "Įjungti papildomus tipografinius simbolius"
+
+#: ../rules/base.xml.in.h:207
+msgid "English"
+msgstr ""
+
+#: ../rules/base.xml.in.h:208
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
+
+#: ../rules/base.xml.in.h:209
+#, fuzzy
+msgid "Enter on keypad"
+msgstr "Pro, Skaitmenų sritis"
+
+#: ../rules/base.xml.in.h:210
+msgid "Epo"
+msgstr "Epo"
+
+#: ../rules/base.xml.in.h:211
+msgid "Ergonomic"
+msgstr "Ergonominis"
+
+#: ../rules/base.xml.in.h:212
+msgid "Esp"
+msgstr "Esp"
+
+#: ../rules/base.xml.in.h:213
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../rules/base.xml.in.h:214
+msgid "Est"
+msgstr "Est"
+
+#: ../rules/base.xml.in.h:215
+msgid "Estonia"
+msgstr "Estija"
+
+#: ../rules/base.xml.in.h:216
+msgid "Eth"
+msgstr "Eth"
+
+#: ../rules/base.xml.in.h:217
+msgid "Ethiopia"
+msgstr "Etiopija"
+
+#: ../rules/base.xml.in.h:218
+msgid "Evdev-managed keyboard"
+msgstr "Evdev valdoma klaviatūra"
+
+#: ../rules/base.xml.in.h:219
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
+
+#: ../rules/base.xml.in.h:220
+msgid "Ewe"
+msgstr "Ewe"
+
+#: ../rules/base.xml.in.h:221
+msgid "Extended"
+msgstr "Išplėstasis"
+
+#: ../rules/base.xml.in.h:222
+#, fuzzy
+msgid "Extended - Winkeys"
+msgstr "Išplėstasis"
+
+#: ../rules/base.xml.in.h:223
+msgid "Extended Backslash"
+msgstr "Išplėstas kairinis brūkšnys"
+
+#: ../rules/base.xml.in.h:224
+msgid "F-letter (F) variant"
+msgstr "F raidės (F) variantas"
+
+#: ../rules/base.xml.in.h:225
+msgid "FL90"
+msgstr "FL90"
+
+#: ../rules/base.xml.in.h:226
+msgid "Fao"
+msgstr "Fao"
+
+#: ../rules/base.xml.in.h:227
+msgid "Faroe Islands"
+msgstr "Farerai"
+
+#: ../rules/base.xml.in.h:228
+msgid "Fin"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:229
+msgid "Finland"
+msgstr "Suomija"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:232
+msgid "Four-level key with abstract separators"
+msgstr "Keturių lygių, su abstrakčiais skyrikliais"
+
+#: ../rules/base.xml.in.h:233
+msgid "Four-level key with comma"
+msgstr "Keturių lygių, pirmajame kablelis"
+
+#: ../rules/base.xml.in.h:234
+msgid "Four-level key with dot"
+msgstr "Keturių lygių, pirmajame taškas"
+
+#: ../rules/base.xml.in.h:235
+msgid "Four-level key with dot, latin-9 restriction"
+msgstr "Keturių lygių, pirmajame taškas, Latin-9 ribojimas"
+
+#: ../rules/base.xml.in.h:236
+msgid "Four-level key with momayyez"
+msgstr "Keturių lygių, pirmajame persiškas skyriklis (momayyez)"
+
+#: ../rules/base.xml.in.h:237
+msgid "Fra"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:238
+msgid "France"
+msgstr "Prancūzija"
+
+#: ../rules/base.xml.in.h:239
+msgid "French"
+msgstr "Prancūzų"
+
+#: ../rules/base.xml.in.h:240
+msgid "French (Macintosh)"
+msgstr "Prancūzų (Macintosh)"
+
+#: ../rules/base.xml.in.h:241
+msgid "French (legacy)"
+msgstr "Prancūzų (senasis)"
+
+#: ../rules/base.xml.in.h:242
+msgid "French Dvorak"
+msgstr "Prancūziškas Dvorako"
+
+#: ../rules/base.xml.in.h:243
+msgid "French, Sun dead keys"
+msgstr "Prancūzų, su Sun tęsties ženklais"
+
+#: ../rules/base.xml.in.h:244
+msgid "French, eliminate dead keys"
+msgstr "Prancūzų, be tęsties ženklų"
+
+#: ../rules/base.xml.in.h:245
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Fujitsu-Siemens Computers AMILO skreitinukas"
+
+#: ../rules/base.xml.in.h:246
+msgid "Fula"
+msgstr "Fula"
+
+#: ../rules/base.xml.in.h:247
+msgid "GBr"
+msgstr "GBr"
+
+#: ../rules/base.xml.in.h:248
+msgid "Ga"
+msgstr "Ga"
+
+#: ../rules/base.xml.in.h:249
+msgid "Generic 101-key PC"
+msgstr "Įprastinė PC 101 klavišo"
+
+#: ../rules/base.xml.in.h:250
+msgid "Generic 102-key (Intl) PC"
+msgstr "Įprastinė PC 102 klavišų (europinė)"
+
+#: ../rules/base.xml.in.h:251
+msgid "Generic 104-key PC"
+msgstr "Įprastinė PC 104 klavišų"
+
+#: ../rules/base.xml.in.h:252
+msgid "Generic 105-key (Intl) PC"
+msgstr "Įprastinė PC 105 klavišų (europinė)"
+
+#: ../rules/base.xml.in.h:253
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:254
+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:255
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
+
+#: ../rules/base.xml.in.h:256
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
+
+#: ../rules/base.xml.in.h:257
+#, fuzzy
+msgid "Genius KKB-2050HS"
+msgstr "Genius Comfy KB-12e"
+
+#: ../rules/base.xml.in.h:258
+msgid "Geo"
+msgstr "Geo"
+
+#: ../rules/base.xml.in.h:259
+msgid "Georgia"
+msgstr "Gruzija"
+
+#: ../rules/base.xml.in.h:260
+msgid "Georgian"
+msgstr "Gruzinų"
+
+#: ../rules/base.xml.in.h:261
+msgid "Georgian AZERTY Tskapo"
+msgstr "Gruzinų AZERTY Tskapo"
+
+#: ../rules/base.xml.in.h:262
+msgid "German (Macintosh)"
+msgstr "Vokiečių (Macintosh)"
+
+#: ../rules/base.xml.in.h:263
+msgid "German, Sun dead keys"
+msgstr "Vokiečių, su Sun tęsties ženklais"
+
+#: ../rules/base.xml.in.h:264
+msgid "German, eliminate dead keys"
+msgstr "Vokiečių, be tęsties ženklų"
+
+#: ../rules/base.xml.in.h:265
+msgid "Germany"
+msgstr "Vokietija"
+
+#: ../rules/base.xml.in.h:266
+msgid "Gha"
+msgstr "Gha"
+
+#: ../rules/base.xml.in.h:267
+msgid "Ghana"
+msgstr "Gana"
+
+#: ../rules/base.xml.in.h:268
+msgid "Gre"
+msgstr "Gre"
+
+#: ../rules/base.xml.in.h:269
+msgid "Greece"
+msgstr "Graikija"
+
+#: ../rules/base.xml.in.h:270
+msgid "Group toggle on multiply/divide key"
+msgstr "Grupė perjungiama daugybos/dalybos klavišu"
+
+#: ../rules/base.xml.in.h:271
+msgid "Gui"
+msgstr "Gui"
+
+#: ../rules/base.xml.in.h:272
+msgid "Guinea"
+msgstr "Gvinėja"
+
+#: ../rules/base.xml.in.h:273
+msgid "Gujarati"
+msgstr "Gudžarati"
+
+#: ../rules/base.xml.in.h:274
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../rules/base.xml.in.h:275
+msgid "Gurmukhi Jhelum"
+msgstr "Gurmukhi Jhelum"
+
+#: ../rules/base.xml.in.h:276
+msgid "Gyration"
+msgstr "Gyration"
+
+#: ../rules/base.xml.in.h:277
+msgid "Happy Hacking Keyboard"
+msgstr "Happy Hacking Keyboard"
+
+#: ../rules/base.xml.in.h:278
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Happy Hacking Keyboard for Mac"
+
+#: ../rules/base.xml.in.h:279
+msgid "Hausa"
+msgstr "Hausa"
+
+#: ../rules/base.xml.in.h:280
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
+
+#: ../rules/base.xml.in.h:281
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
+
+#: ../rules/base.xml.in.h:282
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
+
+#: ../rules/base.xml.in.h:283
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
+
+#: ../rules/base.xml.in.h:284
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
+
+#: ../rules/base.xml.in.h:285
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
+
+#: ../rules/base.xml.in.h:286
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
+
+#: ../rules/base.xml.in.h:287
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
+
+#: ../rules/base.xml.in.h:288
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
+
+#: ../rules/base.xml.in.h:289
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-250x Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:290
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
+
+#: ../rules/base.xml.in.h:291
+msgid "Hexadecimal"
+msgstr "Šešioliktainė"
+
+#: ../rules/base.xml.in.h:292
+msgid "Hindi Bolnagri"
+msgstr "Hindi Bolnagri"
+
+#: ../rules/base.xml.in.h:293
+msgid "Hindi Wx"
+msgstr ""
+
+#: ../rules/base.xml.in.h:294
+msgid "Homophonic"
+msgstr "Homofoninė"
+
+#: ../rules/base.xml.in.h:295
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
+
+#: ../rules/base.xml.in.h:296
+msgid "Hrv"
+msgstr "Hrv"
+
+#: ../rules/base.xml.in.h:297
+msgid "Hun"
+msgstr "Hun"
+
+#: ../rules/base.xml.in.h:298
+msgid "Hungary"
+msgstr "Vengrija"
+
+#: ../rules/base.xml.in.h:299
+msgid "Hyper is mapped to Win-keys"
+msgstr "Win klavišams priskirti Hyper funkciją"
+
+#: ../rules/base.xml.in.h:300
+msgid "IBM (LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:301
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
+
+#: ../rules/base.xml.in.h:302
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
+
+#: ../rules/base.xml.in.h:303
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
+
+#: ../rules/base.xml.in.h:304
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+
+#: ../rules/base.xml.in.h:305
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E (europinė)"
+
+#: ../rules/base.xml.in.h:306
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
+
+#: ../rules/base.xml.in.h:307
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+
+#: ../rules/base.xml.in.h:308
+msgid "ISO Alternate"
+msgstr "ISO alternatyvusis"
+
+#: ../rules/base.xml.in.h:309
+msgid "Iceland"
+msgstr "Islandija"
+
+#: ../rules/base.xml.in.h:310
+msgid "Igbo"
+msgstr "Igbo"
+
+#: ../rules/base.xml.in.h:311
+msgid "Include dead tilde"
+msgstr "Tildė veikia kaip tęsties ženklas"
+
+#: ../rules/base.xml.in.h:312
+msgid "Ind"
+msgstr "Ind"
+
+#: ../rules/base.xml.in.h:313
+msgid "India"
+msgstr "Indija"
+
+#: ../rules/base.xml.in.h:314
+msgid "International (AltGr dead keys)"
+msgstr "Tarptautinis (tęsties ženklai pasiekiami per Lyg3 klavišą)"
+
+#: ../rules/base.xml.in.h:315
+msgid "International (with dead keys)"
+msgstr "Tarptautinis (su tęsties ženklais)"
+
+#: ../rules/base.xml.in.h:316
+msgid "Inuktitut"
+msgstr "Inuktitutas"
+
+#: ../rules/base.xml.in.h:317
+msgid "Iran"
+msgstr "Iranas"
+
+#: ../rules/base.xml.in.h:318
+msgid "Iraq"
+msgstr "Irakas"
+
+#: ../rules/base.xml.in.h:319
+msgid "Ireland"
+msgstr "Airija"
+
+#: ../rules/base.xml.in.h:320
+msgid "Irl"
+msgstr "Irl"
+
+#: ../rules/base.xml.in.h:321
+msgid "Irn"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:322
+msgid "Irq"
+msgstr "Irq"
+
+#: ../rules/base.xml.in.h:323
+msgid "Isl"
+msgstr "Isl"
+
+#: ../rules/base.xml.in.h:324
+msgid "Isr"
+msgstr "Isr"
+
+#: ../rules/base.xml.in.h:325
+msgid "Israel"
+msgstr "Izraelis"
+
+#: ../rules/base.xml.in.h:326
+msgid "Ita"
+msgstr "Ita"
+
+#: ../rules/base.xml.in.h:327
+msgid "Italy"
+msgstr "Italija"
+
+#: ../rules/base.xml.in.h:328
+msgid "Japan"
+msgstr "Japonija"
+
+#: ../rules/base.xml.in.h:329
+msgid "Japan (PC-98xx Series)"
+msgstr "Japoniška (PC-98xx serijos)"
+
+#: ../rules/base.xml.in.h:330
+msgid "Japanese keyboard options"
+msgstr "Nuostatos japoniškai klaviatūrai"
+
+#: ../rules/base.xml.in.h:331
+msgid "Jpn"
+msgstr "Jpn"
+
+#: ../rules/base.xml.in.h:332
+msgid "Kalmyk"
+msgstr "Kalmukų"
+
+#: ../rules/base.xml.in.h:333
+msgid "Kana"
+msgstr "Kana"
+
+#: ../rules/base.xml.in.h:334
+msgid "Kana Lock key is locking"
+msgstr "Kana Lock klavišas fiksuojantis"
+
+#: ../rules/base.xml.in.h:335
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../rules/base.xml.in.h:336
+msgid "Kashubian"
+msgstr "Kašubų"
+
+#: ../rules/base.xml.in.h:337
+msgid "Kaz"
+msgstr "Kaz"
+
+#: ../rules/base.xml.in.h:338
+msgid "Kazakh with Russian"
+msgstr "Kazachų, su rusiškomis raidėmis"
+
+#: ../rules/base.xml.in.h:339
+msgid "Kazakhstan"
+msgstr "Kazachstanas"
+
+#: ../rules/base.xml.in.h:340
+msgid "Key sequence to kill the X server"
+msgstr ""
+
+#: ../rules/base.xml.in.h:341
+msgid "Key to choose 3rd level"
+msgstr "Klavišai trečiajam lygiui pasirinkti"
+
+#: ../rules/base.xml.in.h:342
+msgid "Key(s) to change layout"
+msgstr "Klavišai išdėstymui pakeisti"
+
+#: ../rules/base.xml.in.h:343
+msgid "Keypad"
+msgstr "Skaitmenų sritis"
+
+#: ../rules/base.xml.in.h:344
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
+
+#: ../rules/base.xml.in.h:345
+#, fuzzy
+msgid "Kgz"
+msgstr "Kaz"
+
+#: ../rules/base.xml.in.h:346
+msgid "Khm"
+msgstr "Khm"
+
+#: ../rules/base.xml.in.h:347
+msgid "Komi"
+msgstr "Komija"
+
+#: ../rules/base.xml.in.h:348
+msgid "Kor"
+msgstr "Kor"
+
+#: ../rules/base.xml.in.h:349
+msgid "Korea, Republic of"
+msgstr "Korėjos respublika"
+
+#: ../rules/base.xml.in.h:350
+msgid "Ktunaxa"
+msgstr "Kutenajų"
+
+#: ../rules/base.xml.in.h:351
+msgid "Kurdish, (F)"
+msgstr "Kurdų, (F)"
+
+#: ../rules/base.xml.in.h:352
+msgid "Kurdish, Arabic-Latin"
+msgstr "Kurdų, arabų-lotynų"
+
+#: ../rules/base.xml.in.h:353
+msgid "Kurdish, Latin Alt-Q"
+msgstr "Kurdų (lotyniškas Alt-Q)"
+
+#: ../rules/base.xml.in.h:354
+msgid "Kurdish, Latin Q"
+msgstr "Kurdų (lotyniškas Q)"
+
+#: ../rules/base.xml.in.h:355
+msgid "Kyrgyzstan"
+msgstr "Kirgizija"
+
+#: ../rules/base.xml.in.h:356
+msgid "LAm"
+msgstr "LAm"
+
+#: ../rules/base.xml.in.h:357
+msgid "LEKP"
+msgstr "LEKP"
+
+#: ../rules/base.xml.in.h:358
+msgid "LEKPa"
+msgstr "LEKPa"
+
+#: ../rules/base.xml.in.h:359
+msgid "Lao"
+msgstr "Lao"
+
+#: ../rules/base.xml.in.h:360
+msgid "Laos"
+msgstr "Laosas"
+
+#: ../rules/base.xml.in.h:361
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Skreitinuko Compaq (pvz., Armada) klaviatūra"
+
+#: ../rules/base.xml.in.h:362
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Skreitinukas Compaq (pvz., Presario), internetinė klaviatūra"
+
+#: ../rules/base.xml.in.h:363
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Skreitinukas eMachines m68xx"
+
+#: ../rules/base.xml.in.h:364
+msgid "Latin"
+msgstr "Lotyniškasis"
+
+#: ../rules/base.xml.in.h:365
+msgid "Latin American"
+msgstr "Lotynų Amerika"
+
+#: ../rules/base.xml.in.h:366
+msgid "Latin Unicode"
+msgstr "Lotyniškasis unikodinis"
+
+#: ../rules/base.xml.in.h:367
+msgid "Latin Unicode qwerty"
+msgstr "Lotyniškasis unikodinis, QWERTY"
+
+#: ../rules/base.xml.in.h:368
+msgid "Latin qwerty"
+msgstr "Lotyniškasis QWERTY"
+
+#: ../rules/base.xml.in.h:369
+msgid "Latin unicode"
+msgstr "Lotyniškasis unikodinis"
+
+#: ../rules/base.xml.in.h:370
+msgid "Latin unicode qwerty"
+msgstr "Lotyniškasis unikodinis, raidės Z ir Ž sukeistos"
+
+#: ../rules/base.xml.in.h:371
+msgid "Latin with guillemets"
+msgstr "Lotyniškasis, su kampinėmis kabutėmis"
+
+#: ../rules/base.xml.in.h:372
+msgid "Latvia"
+msgstr "Latvija"
+
+#: ../rules/base.xml.in.h:373
+msgid "Lav"
+msgstr "Lav"
+
+#: ../rules/base.xml.in.h:374
+msgid "Left Alt"
+msgstr "Kairysis Alt"
+
+#: ../rules/base.xml.in.h:375
+msgid "Left Alt (while pressed)"
+msgstr "Kairysis Alt (kol nuspaustas)"
+
+#: ../rules/base.xml.in.h:376
+msgid "Left Alt is swapped with Left Win"
+msgstr "Kairysis Alt sukeistas su kairiuoju Win"
+
+#: ../rules/base.xml.in.h:377
+msgid "Left Ctrl"
+msgstr "Kairysis Vald"
+
+#: ../rules/base.xml.in.h:378
+msgid "Left Ctrl+Left Shift"
+msgstr "Kairysis Vald+kairysis Lyg2"
+
+#: ../rules/base.xml.in.h:379
+msgid "Left Shift"
+msgstr "Kairysis Lyg2"
+
+#: ../rules/base.xml.in.h:380
+msgid "Left Win"
+msgstr "Kairysis Win"
+
+#: ../rules/base.xml.in.h:381
+msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgstr "Kairysis Win (į pirmąjį išdėstymą), dešinysis Win/Meniu (į paskutinį išdėstymą)"
+
+#: ../rules/base.xml.in.h:382
+msgid "Left Win (while pressed)"
+msgstr "Kairysis Win (kol nuspaustas)"
+
+#: ../rules/base.xml.in.h:383
+msgid "Left hand"
+msgstr "Kairei rankai"
+
+#: ../rules/base.xml.in.h:384
+msgid "Left handed Dvorak"
+msgstr "Dvorako kairiarankiams"
+
+#: ../rules/base.xml.in.h:385
+msgid "Legacy"
+msgstr "Senasis"
+
+#: ../rules/base.xml.in.h:386
+msgid "Legacy Wang 724"
+msgstr "Senasis Wang 724"
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:388
+msgid "Legacy key with comma"
+msgstr "Paveldėtasis klavišas su kableliu"
+
+#: ../rules/base.xml.in.h:389
+msgid "Legacy key with dot"
+msgstr "Paveldėtasis klavišas su tašku"
+
+#: ../rules/base.xml.in.h:390
+msgid "Less-than/Greater-than"
+msgstr "Mažiau/Daugiau"
+
+#: ../rules/base.xml.in.h:391
+msgid "Lithuania"
+msgstr "Lietuva"
+
+#: ../rules/base.xml.in.h:392
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
+
+#: ../rules/base.xml.in.h:393
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
+
+#: ../rules/base.xml.in.h:394
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (alternatyvus variantas)"
+
+#: ../rules/base.xml.in.h:395
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
+
+#: ../rules/base.xml.in.h:396
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
+
+#: ../rules/base.xml.in.h:397
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
+
+#: ../rules/base.xml.in.h:398
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:399
+#, fuzzy
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgstr "Logitech Cordless Desktop Pro (alternatyvus variantas2)"
+
+#: ../rules/base.xml.in.h:400
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:401
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
+
+#: ../rules/base.xml.in.h:402
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15 (papildomi klavišai G15daemon pagalba)"
+
+#: ../rules/base.xml.in.h:403
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech Generic Keyboard"
+
+#: ../rules/base.xml.in.h:404
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech Internet 350 Keyboard"
+
+#: ../rules/base.xml.in.h:405
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:406
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
+
+#: ../rules/base.xml.in.h:407
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Media Elite Keyboard"
+
+#: ../rules/base.xml.in.h:408
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
+
+#: ../rules/base.xml.in.h:409
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
+
+#: ../rules/base.xml.in.h:410
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge Keyboard"
+
+#: ../rules/base.xml.in.h:411
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Keyboard"
+
+#: ../rules/base.xml.in.h:412
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
+
+#: ../rules/base.xml.in.h:413
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (modelis Y-RB6)"
+
+#: ../rules/base.xml.in.h:414
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
+
+#: ../rules/base.xml.in.h:415
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+
+#: ../rules/base.xml.in.h:416
+msgid "Lower Sorbian"
+msgstr "Žemutinių sorbų"
+
+#: ../rules/base.xml.in.h:417
+msgid "Lower Sorbian (qwertz)"
+msgstr "Žemutinių sorbų (QWERTZ)"
+
+#: ../rules/base.xml.in.h:418
+msgid "Ltu"
+msgstr "Ltu"
+
+#: ../rules/base.xml.in.h:419
+msgid "MESS"
+msgstr "MESS"
+
+#: ../rules/base.xml.in.h:420
+msgid "MNE"
+msgstr "MNE"
+
+#: ../rules/base.xml.in.h:421
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
+
+#: ../rules/base.xml.in.h:422
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (europinė)"
+
+#: ../rules/base.xml.in.h:423
+msgid "Macedonia"
+msgstr "Makedonija"
+
+#: ../rules/base.xml.in.h:424
+msgid "Macintosh"
+msgstr "Macintosh"
+
+#: ../rules/base.xml.in.h:425
+msgid "Macintosh Old"
+msgstr "Macintosh (senoji)"
+
+#: ../rules/base.xml.in.h:426
+msgid "Macintosh, Sun dead keys"
+msgstr "Macintosh, su Sun tęsties ženklais"
+
+#: ../rules/base.xml.in.h:427
+msgid "Macintosh, eliminate dead keys"
+msgstr "Macintosh, be tęsties ženklų"
+
+#: ../rules/base.xml.in.h:428
+msgid "Make CapsLock an additional Backspace"
+msgstr "Didžiųjų raidžių klavišą paversti papildomu Naikinimo kairėn (Backspace) klavišu"
+
+#: ../rules/base.xml.in.h:429
+msgid "Make CapsLock an additional Ctrl"
+msgstr "Didžiųjų raidžių klavišą paversti papildomu Valdymo klavišu"
+
+#: ../rules/base.xml.in.h:430
+msgid "Make CapsLock an additional ESC"
+msgstr "Didžiųjų raidžių klavišą paversti papildomu Grįžimo (Esc) klavišu"
+
+#: ../rules/base.xml.in.h:431
+msgid "Mal"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:432
+msgid "Malayalam"
+msgstr "Malajalių"
+
+#: ../rules/base.xml.in.h:433
+msgid "Malayalam Lalitha"
+msgstr "Malajalių Lalitha"
+
+#: ../rules/base.xml.in.h:434
+msgid "Maldives"
+msgstr "Maldyvai"
+
+#: ../rules/base.xml.in.h:435
+msgid "Malta"
+msgstr "Malta"
+
+#: ../rules/base.xml.in.h:436
+msgid "Maltese keyboard with US layout"
+msgstr "Maltiečių klaviatūra su JAV išdėstymu"
+
+#: ../rules/base.xml.in.h:437
+msgid "Mao"
+msgstr "Mao"
+
+#: ../rules/base.xml.in.h:438
+msgid "Maori"
+msgstr "Maorių"
+
+#: ../rules/base.xml.in.h:439
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
+
+#: ../rules/base.xml.in.h:440
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
+
+#: ../rules/base.xml.in.h:441
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
+
+#: ../rules/base.xml.in.h:442
+msgid "Menu"
+msgstr "Meniu"
+
+#: ../rules/base.xml.in.h:443
+msgid "Meta is mapped to Left Win"
+msgstr "Kairiajam Win klavišui priskirti Meta funkciją"
+
+#: ../rules/base.xml.in.h:444
+msgid "Meta is mapped to Win keys"
+msgstr "Win klavišams priskirti Meta funkciją"
+
+#: ../rules/base.xml.in.h:445
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Comfort Curve Keyboard 2000"
+
+#: ../rules/base.xml.in.h:446
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
+
+#: ../rules/base.xml.in.h:447
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, Švediška"
+
+#: ../rules/base.xml.in.h:448
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
+
+#: ../rules/base.xml.in.h:449
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural Keyboard Elite"
+
+#: ../rules/base.xml.in.h:450
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:451
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
+
+#: ../rules/base.xml.in.h:452
+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:453
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+
+#: ../rules/base.xml.in.h:454
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
+
+#: ../rules/base.xml.in.h:455
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+
+#: ../rules/base.xml.in.h:456
+msgid "Miscellaneous compatibility options"
+msgstr "Įvairios suderinamumo nuostatos"
+
+#: ../rules/base.xml.in.h:457
+msgid "Mkd"
+msgstr "Mkd"
+
+#: ../rules/base.xml.in.h:458
+msgid "Mlt"
+msgstr "Mlt"
+
+#: ../rules/base.xml.in.h:459
+msgid "Mmr"
+msgstr "Mmr"
+
+#: ../rules/base.xml.in.h:460
+msgid "Mng"
+msgstr "Mng"
+
+#: ../rules/base.xml.in.h:461
+msgid "Mongolia"
+msgstr "Mongolija"
+
+#: ../rules/base.xml.in.h:462
+msgid "Montenegro"
+msgstr "Juodkalnija"
+
+#: ../rules/base.xml.in.h:463
+msgid "Morocco"
+msgstr "Marokas"
+
+#: ../rules/base.xml.in.h:464
+msgid "Multilingual"
+msgstr "Daugiakalbis"
+
+#: ../rules/base.xml.in.h:465
+msgid "Multilingual, first part"
+msgstr "Daugiakalbis, pirmoji dalis"
+
+#: ../rules/base.xml.in.h:466
+msgid "Multilingual, second part"
+msgstr "Daugiakalbis, antroji dalis"
+
+#: ../rules/base.xml.in.h:467
+msgid "Myanmar"
+msgstr "Mianmaras"
+
+#: ../rules/base.xml.in.h:468
+msgid "NICOLA-F style Backspace"
+msgstr "NICOLA-F tipo naikinimas kairėn"
+
+#: ../rules/base.xml.in.h:469
+msgid "NLA"
+msgstr "NLA"
+
+#: ../rules/base.xml.in.h:470
+msgid "Nativo"
+msgstr "Nativo"
+
+#: ../rules/base.xml.in.h:471
+msgid "Nativo for Esperanto"
+msgstr "Nativo Esperanto"
+
+#: ../rules/base.xml.in.h:472
+msgid "Nativo for USA keyboards"
+msgstr "Nativo JAV klaviatūroms"
+
+#: ../rules/base.xml.in.h:473
+msgid "Neo 2"
+msgstr "Neo 2"
+
+#: ../rules/base.xml.in.h:474
+msgid "Nep"
+msgstr "Nep"
+
+#: ../rules/base.xml.in.h:475
+msgid "Nepal"
+msgstr "Nepalas"
+
+#: ../rules/base.xml.in.h:476
+msgid "Netherlands"
+msgstr "Nyderlandai"
+
+#: ../rules/base.xml.in.h:477
+msgid "Nig"
+msgstr "Nig"
+
+#: ../rules/base.xml.in.h:478
+msgid "Nigeria"
+msgstr "Nigerija"
+
+#: ../rules/base.xml.in.h:479
+msgid "Nld"
+msgstr "Nld"
+
+#: ../rules/base.xml.in.h:480
+msgid "Non-breakable space character at fourth level"
+msgstr "Jungiamasis tarpas ketvirtajame lygyje"
+
+#: ../rules/base.xml.in.h:481
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Jungiamasis tarpas ketvirtajame lygyje, siauras jungiamasis tarpas šeštajame lygyje"
+
+#: ../rules/base.xml.in.h:482
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
+msgstr "Jungiamasis tarpas ketvirtajame lygyje, siauras jungiamasis tarpas šeštajame lygyje (Vald+Lyg2)"
+
+#: ../rules/base.xml.in.h:483
+msgid "Non-breakable space character at second level"
+msgstr "Jungiamasis tarpas antrajame lygyje"
+
+#: ../rules/base.xml.in.h:484
+msgid "Non-breakable space character at third level"
+msgstr "Jungiamasis tarpas trečiajame lygyje"
+
+#: ../rules/base.xml.in.h:485
+msgid "Non-breakable space character at third level, nothing at fourth level"
+msgstr "Jungiamasis tarpas trečiajame lygyje, ketvirtajame lygyje nieko"
+
+#: ../rules/base.xml.in.h:486
+msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Jungiamasis tarpas trečiajame lygyje, siauras jungiamasis tarpas ketvirtajame lygyje"
+
+#: ../rules/base.xml.in.h:487
+msgid "Nor"
+msgstr "Nor"
+
+#: ../rules/base.xml.in.h:488
+msgid "Northern Saami"
+msgstr "Šiaurės samių"
+
+#: ../rules/base.xml.in.h:489
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Šiaurės samių, be tęsties ženklų"
+
+#: ../rules/base.xml.in.h:490
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
+
+#: ../rules/base.xml.in.h:491
+msgid "Norway"
+msgstr "Norvegija"
+
+#: ../rules/base.xml.in.h:492
+msgid "NumLock"
+msgstr "Skaitmenys"
+
+#: ../rules/base.xml.in.h:493
+msgid "Numeric keypad delete key behaviour"
+msgstr "Skaitmenų srities Šalinimo klavišo veiksena"
+
+#: ../rules/base.xml.in.h:494
+msgid "Numeric keypad keys work as with Mac"
+msgstr "Skaitmenų srities klavišai veikia kaip Mac'e"
+
+#: ../rules/base.xml.in.h:495
+msgid "Numeric keypad layout selection"
+msgstr "Skaitmenų srities išdėstymo parinkimas"
+
+#: ../rules/base.xml.in.h:496
+msgid "OADG 109A"
+msgstr "OADG 109A"
+
+#: ../rules/base.xml.in.h:497
+msgid "OLPC"
+msgstr "OLPC"
+
+#: ../rules/base.xml.in.h:498
+msgid "OLPC Dari"
+msgstr "OLPC Dari"
+
+#: ../rules/base.xml.in.h:499
+msgid "OLPC Pashto"
+msgstr "OLPC Puštu"
+
+#: ../rules/base.xml.in.h:500
+msgid "OLPC Southern Uzbek"
+msgstr "OLPC Pietų Uzbekijos"
+
+#: ../rules/base.xml.in.h:501
+msgid "Occitan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:502
+msgid "Ogham"
+msgstr "Ogham"
+
+#: ../rules/base.xml.in.h:503
+msgid "Ogham IS434"
+msgstr "Ogham IS434"
+
+#: ../rules/base.xml.in.h:504
+msgid "Oriya"
+msgstr "Orijų"
+
+#: ../rules/base.xml.in.h:505
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/Internet keyboard"
+
+#: ../rules/base.xml.in.h:506
+msgid "Ossetian"
+msgstr "Ossetian"
+
+#: ../rules/base.xml.in.h:507
+msgid "Ossetian, Winkeys"
+msgstr "Osetinų, Windows išdėstymas"
+
+#: ../rules/base.xml.in.h:508
+msgid "Ossetian, legacy"
+msgstr "Osetų, senasis"
+
+#: ../rules/base.xml.in.h:509
+msgid "PC-98xx Series"
+msgstr "PC-98xx Series"
+
+#: ../rules/base.xml.in.h:510
+msgid "Pak"
+msgstr "Pak"
+
+#: ../rules/base.xml.in.h:511
+msgid "Pakistan"
+msgstr "Pakistanas"
+
+#: ../rules/base.xml.in.h:512
+msgid "Pashto"
+msgstr "Puštu"
+
+#: ../rules/base.xml.in.h:513
+msgid "Pattachote"
+msgstr ""
+
+#: ../rules/base.xml.in.h:514
+msgid "Phonetic"
+msgstr "Fonetinis"
+
+#: ../rules/base.xml.in.h:515
+#, fuzzy
+msgid "Phonetic Winkeys"
+msgstr "Osetinų, Windows išdėstymas"
+
+#: ../rules/base.xml.in.h:516
+msgid "Pol"
+msgstr "Pol"
+
+#: ../rules/base.xml.in.h:517
+msgid "Poland"
+msgstr "Lenkija"
+
+#: ../rules/base.xml.in.h:518
+msgid "Polytonic"
+msgstr "Politoninis"
+
+#: ../rules/base.xml.in.h:519
+msgid "Portugal"
+msgstr "Portugalija"
+
+#: ../rules/base.xml.in.h:520
+msgid "Pro"
+msgstr "Pro"
+
+#: ../rules/base.xml.in.h:521
+msgid "Pro Keypad"
+msgstr "Pro, Skaitmenų sritis"
+
+#: ../rules/base.xml.in.h:522
+msgid "Probhat"
+msgstr ""
+
+#: ../rules/base.xml.in.h:523
+msgid "Programmer Dvorak"
+msgstr "Dvorako programuotojų"
+
+#: ../rules/base.xml.in.h:524
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
+
+#: ../rules/base.xml.in.h:525
+msgid "Prt"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:526
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
+
+#: ../rules/base.xml.in.h:527
+msgid "Right Alt"
+msgstr "Dešinysis Alt"
+
+#: ../rules/base.xml.in.h:528
+msgid "Right Alt (while pressed)"
+msgstr "Dešinysis Alt (kol nuspaustas)"
+
+#: ../rules/base.xml.in.h:529
+msgid "Right Alt key never chooses 3rd level"
+msgstr "Dešinysis Alt niekada neįjungia trečiojo lygio"
+
+#: ../rules/base.xml.in.h:530
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr "Dešinysis Alt, Lyg2+dešinysis Alt atlieka Multi_Key (Compose) funkciją"
+
+#: ../rules/base.xml.in.h:531
+msgid "Right Ctrl"
+msgstr "Dešinysis Vald"
+
+#: ../rules/base.xml.in.h:532
+msgid "Right Ctrl (while pressed)"
+msgstr "Dešinysis Vald (kol nuspaustas)"
+
+#: ../rules/base.xml.in.h:533
+msgid "Right Ctrl as Right Alt"
+msgstr "Dešiniajam Vald klavišui priskirti dešiniojo Alt funkciją"
+
+#: ../rules/base.xml.in.h:534
+msgid "Right Shift"
+msgstr "Dešinysis Lyg2"
+
+#: ../rules/base.xml.in.h:535
+msgid "Right Win"
+msgstr "Dešinysis Win"
+
+#: ../rules/base.xml.in.h:536
+msgid "Right Win (while pressed)"
+msgstr "Dešinysis Win (kol nuspaustas)"
+
+#: ../rules/base.xml.in.h:537
+msgid "Right hand"
+msgstr "Dešinei rankai"
+
+#: ../rules/base.xml.in.h:538
+msgid "Right handed Dvorak"
+msgstr "Dvorako dešiniarankiams"
+
+#: ../rules/base.xml.in.h:539
+msgid "Romania"
+msgstr "Rumunija"
+
+#: ../rules/base.xml.in.h:540
+msgid "Romanian keyboard with German letters"
+msgstr "Rumunų klaviatūra su vokiškomis raidėmis"
+
+#: ../rules/base.xml.in.h:541
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Rumunų klaviatūra su vokiškomis raidėmis, be tęsties ženklų"
+
+#: ../rules/base.xml.in.h:542
+msgid "Rou"
+msgstr "Rou"
+
+#: ../rules/base.xml.in.h:543
+msgid "Rus"
+msgstr "Rus"
+
+#: ../rules/base.xml.in.h:544
+msgid "Russia"
+msgstr "Rusija"
+
+#: ../rules/base.xml.in.h:545
+msgid "Russian"
+msgstr "Rusų"
+
+#: ../rules/base.xml.in.h:546
+msgid "Russian phonetic"
+msgstr "Rusų fonetinis"
+
+#: ../rules/base.xml.in.h:547
+msgid "Russian phonetic Dvorak"
+msgstr "Rusų fonetinis Dvorako"
+
+#: ../rules/base.xml.in.h:548
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Rusų fonetinis, be tęsties ženklų"
+
+#: ../rules/base.xml.in.h:549
+msgid "Russian with Kazakh"
+msgstr "Rusų, su kazachų raidėmis"
+
+#: ../rules/base.xml.in.h:550
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
+
+#: ../rules/base.xml.in.h:551
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:552
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:553
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:554
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:555
+msgid "SRB"
+msgstr "SRB"
+
+#: ../rules/base.xml.in.h:556
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:557
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
+
+#: ../rules/base.xml.in.h:558
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
+
+#: ../rules/base.xml.in.h:559
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:560
+#, fuzzy
+msgid "Scroll Lock"
+msgstr "Ekrano slinkimas"
+
+#: ../rules/base.xml.in.h:561
+msgid "ScrollLock"
+msgstr "Ekrano slinkimas"
+
+#: ../rules/base.xml.in.h:562
+#, fuzzy
+msgid "Secwepemctsin"
+msgstr "Šušvapų"
+
+#: ../rules/base.xml.in.h:563
+msgid "Semi-colon on third level"
+msgstr "Kabliataškis trečiąjame lygyje"
+
+#: ../rules/base.xml.in.h:564
+msgid "Serbia"
+msgstr "Serbija"
+
+#: ../rules/base.xml.in.h:565
+msgid "Shift cancels CapsLock"
+msgstr "Lyg2 atšaukia Didžiąsias raides"
+
+#: ../rules/base.xml.in.h:566
+msgid "Shift does not cancel NumLock, chooses 3d level instead"
+msgstr "Lyg2 neatšaukia didžiųjų raidžių, o įjungia 3-iąjį lygį"
+
+#: ../rules/base.xml.in.h:567
+msgid "Shift with numeric keypad keys works as in MS Windows"
+msgstr "Lyg2 su skaitmenų srities klavišais veikia kaip MS Windows sistemoje"
+
+#: ../rules/base.xml.in.h:568
+msgid "Shift+CapsLock"
+msgstr "Lyg2+Didž"
+
+#: ../rules/base.xml.in.h:569
+msgid "Simple"
+msgstr "Paprastasis"
+
+#: ../rules/base.xml.in.h:570
+msgid "Slovakia"
+msgstr "Slovakija"
+
+#: ../rules/base.xml.in.h:571
+msgid "Slovenia"
+msgstr "Slovėnija"
+
+#: ../rules/base.xml.in.h:572
+msgid "South Africa"
+msgstr "Pietų Afrika"
+
+#: ../rules/base.xml.in.h:573
+msgid "Southern Uzbek"
+msgstr "Pietų Uzbekijos"
+
+#: ../rules/base.xml.in.h:574
+msgid "Spain"
+msgstr "Ispanija"
+
+#: ../rules/base.xml.in.h:575
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
+msgstr "Specialiosios sekos (Vald+Alt+&lt;klavišas&gt;) apdorojamos serveryje"
+
+#: ../rules/base.xml.in.h:576
+msgid "SrL"
+msgstr "SrL"
+
+#: ../rules/base.xml.in.h:577
+msgid "Sri Lanka"
+msgstr "Šri lanka"
+
+#: ../rules/base.xml.in.h:578
+msgid "Standard"
+msgstr "Standartinis"
+
+#: ../rules/base.xml.in.h:579
+msgid "Standard (Cedilla)"
+msgstr "Standartinis (su sedile)"
+
+#: ../rules/base.xml.in.h:580
+#, fuzzy
+msgid "Standard Phonetic"
+msgstr "Urdu, fonetinis"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:582
+msgid "Standard RSTU"
+msgstr "Standartinis RSTU"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:584
+msgid "Standard RSTU on Russian layout"
+msgstr "Standartinis RSTU ant rusiško išdėstymo"
+
+#: ../rules/base.xml.in.h:585
+msgid "Sun Type 5/6"
+msgstr "Sun Type 5/6"
+
+#: ../rules/base.xml.in.h:586
+msgid "Sun dead keys"
+msgstr "Sun su tęsties ženklais"
+
+#: ../rules/base.xml.in.h:587
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:588
+msgid "Svdvorak"
+msgstr "Svdvorak"
+
+#: ../rules/base.xml.in.h:589
+msgid "Svk"
+msgstr "Svk"
+
+#: ../rules/base.xml.in.h:590
+msgid "Svn"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:591
+msgid "Swap Ctrl and CapsLock"
+msgstr "Sukeisti Valdymo ir Didžiųjų raidžių klavišus"
+
+#: ../rules/base.xml.in.h:592
+msgid "Swap ESC and CapsLock"
+msgstr "Sukeisti Grįžimo (Esc) ir Didžiųjų raidžių klavišus"
+
+#: ../rules/base.xml.in.h:593
+msgid "Swe"
+msgstr "Swe"
+
+#: ../rules/base.xml.in.h:594
+msgid "Sweden"
+msgstr "Švedija"
+
+#: ../rules/base.xml.in.h:595
+msgid "Switzerland"
+msgstr "Šveicarija"
+
+#: ../rules/base.xml.in.h:596
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (planšetinis kompiuteris)"
+
+#: ../rules/base.xml.in.h:597
+msgid "Syr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:598
+msgid "Syria"
+msgstr "Sirija"
+
+#: ../rules/base.xml.in.h:599
+msgid "Syriac"
+msgstr "Sirijos"
+
+#: ../rules/base.xml.in.h:600
+msgid "Syriac phonetic"
+msgstr "Sirijos fonetinis"
+
+#: ../rules/base.xml.in.h:601
+msgid "TIS-820.2538"
+msgstr "TIS-820.2538"
+
+#: ../rules/base.xml.in.h:602
+msgid "Tajikistan"
+msgstr "Tadžikistanas"
+
+#: ../rules/base.xml.in.h:603
+msgid "Tamil"
+msgstr "Tamilų"
+
+#: ../rules/base.xml.in.h:604
+msgid "Tamil TAB Typewriter"
+msgstr "Tamilų TAB rašomoji mašinėlė"
+
+#: ../rules/base.xml.in.h:605
+msgid "Tamil TSCII Typewriter"
+msgstr "Tamilų TSCII rašomoji mašinėlė"
+
+#: ../rules/base.xml.in.h:606
+msgid "Tamil Unicode"
+msgstr "Tamilų unikodinis"
+
+#: ../rules/base.xml.in.h:607
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
+
+#: ../rules/base.xml.in.h:608
+msgid "Tatar"
+msgstr "Totorių"
+
+#: ../rules/base.xml.in.h:609
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../rules/base.xml.in.h:610
+msgid "Tha"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:611
+msgid "Thailand"
+msgstr "Tailandas"
+
+#: ../rules/base.xml.in.h:612
+msgid "Tibetan"
+msgstr "Tibetiečių"
+
+#: ../rules/base.xml.in.h:613
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibetiečių (su ASCII skaitmenimis)"
+
+#: ../rules/base.xml.in.h:614
+msgid "Tifinagh"
+msgstr "Berberų"
+
+#: ../rules/base.xml.in.h:615
+msgid "Tifinagh Alternative"
+msgstr "Berberų alternatyvusis"
+
+#: ../rules/base.xml.in.h:616
+msgid "Tifinagh Alternative Phonetic"
+msgstr "Berberų alternatyvusis fonetinis"
+
+#: ../rules/base.xml.in.h:617
+msgid "Tifinagh Extended"
+msgstr "Berberų išplėstasis"
+
+#: ../rules/base.xml.in.h:618
+msgid "Tifinagh Extended Phonetic"
+msgstr "Berberų išplėstasis fonetinis"
+
+#: ../rules/base.xml.in.h:619
+msgid "Tifinagh Phonetic"
+msgstr "Berberų fonetinis"
+
+#: ../rules/base.xml.in.h:620
+msgid "Tilde (~) variant"
+msgstr "Tildės (~) variantas"
+
+#: ../rules/base.xml.in.h:621
+msgid "Tjk"
+msgstr "Tjk"
+
+#: ../rules/base.xml.in.h:622
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr "Ant atitinkamų Dvorako klaviatūros klavišų"
+
+#: ../rules/base.xml.in.h:623
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr "Ant atitinkamų QWERTY klaviatūros klavišų"
+
+#: ../rules/base.xml.in.h:624
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:625
+#, fuzzy
+msgid "Traditional Phonetic"
+msgstr "Berberų fonetinis"
+
+#: ../rules/base.xml.in.h:626
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
+
+#: ../rules/base.xml.in.h:627
+msgid "Trust Slimline"
+msgstr ""
+
+#: ../rules/base.xml.in.h:628
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
+
+#: ../rules/base.xml.in.h:629
+msgid "Tur"
+msgstr "Tur"
+
+#: ../rules/base.xml.in.h:630
+msgid "Turkey"
+msgstr "Turkija"
+
+#: ../rules/base.xml.in.h:631
+#, fuzzy
+msgid "Turkmenistan"
+msgstr "Tadžikistanas"
+
+#: ../rules/base.xml.in.h:632
+msgid "Typewriter"
+msgstr "Spausdinimo mašinėlės išdėstymas"
+
+#: ../rules/base.xml.in.h:633
+msgid "UCW layout (accented letters only)"
+msgstr "UCW išdėstymas (tik raidės su diakritikais)"
+
+#: ../rules/base.xml.in.h:634
+msgid "US keyboard with Bosnian digraphs"
+msgstr "JAV klaviatūra su bosniškais dviraidžiais"
+
+#: ../rules/base.xml.in.h:635
+msgid "US keyboard with Bosnian letters"
+msgstr "JAV klaviatūra su bosniškais rašmenimis"
+
+#: ../rules/base.xml.in.h:636
+msgid "US keyboard with Croatian digraphs"
+msgstr "JAV klaviatūra su kroatiškais dviraidžiais"
+
+#: ../rules/base.xml.in.h:637
+msgid "US keyboard with Croatian letters"
+msgstr "JAV klaviatūra su kroatiškais rašmenimis"
+
+#: ../rules/base.xml.in.h:638
+msgid "US keyboard with Estonian letters"
+msgstr "JAV klaviatūra su estiškais rašmenimis"
+
+#: ../rules/base.xml.in.h:639
+msgid "US keyboard with Lithuanian letters"
+msgstr "JAV klaviatūra su lietuviškais rašmenimis"
+
+#: ../rules/base.xml.in.h:640
+msgid "US keyboard with Slovenian letters"
+msgstr "JAV klaviatūra su slovėniškais rašmenimis"
+
+#: ../rules/base.xml.in.h:641
+msgid "USA"
+msgstr "JAV"
+
+#: ../rules/base.xml.in.h:642
+msgid "Udmurt"
+msgstr "Udmurtų"
+
+#: ../rules/base.xml.in.h:643
+msgid "Ukr"
+msgstr "Ukr"
+
+#: ../rules/base.xml.in.h:644
+msgid "Ukraine"
+msgstr "Ukraina"
+
+#: ../rules/base.xml.in.h:645
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Unikodiniai priedai (rodyklės ir matematiniai operatoriai)"
+
+#: ../rules/base.xml.in.h:646
+msgid "Unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Unikodiniai priedai (rodyklės ir matematiniai operatoriai). Matematiniai operatoriai numatytame lygyje"
+
+#: ../rules/base.xml.in.h:647
+msgid "UnicodeExpert"
+msgstr "UnicodeExpert"
+
+#: ../rules/base.xml.in.h:648
+msgid "United Kingdom"
+msgstr "Jungtinė karalystė"
+
+#: ../rules/base.xml.in.h:649
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
+
+#: ../rules/base.xml.in.h:650
+msgid "Urdu, Alternative phonetic"
+msgstr "Urdu, alternatyvus fonetinis"
+
+#: ../rules/base.xml.in.h:651
+msgid "Urdu, Phonetic"
+msgstr "Urdu, fonetinis"
+
+#: ../rules/base.xml.in.h:652
+msgid "Urdu, Winkeys"
+msgstr "Urdu, Windows išdėstymas"
+
+#: ../rules/base.xml.in.h:653
+msgid "Use Bosnian digraphs"
+msgstr "Bosniški dviraidžiai"
+
+#: ../rules/base.xml.in.h:654
+msgid "Use Croatian digraphs"
+msgstr "Kroatiški dviraidžiai"
+
+#: ../rules/base.xml.in.h:655
+msgid "Use guillemets for quotes"
+msgstr "Kampinės kabutės"
+
+#: ../rules/base.xml.in.h:656
+msgid "Use keyboard LED to show alternative layout"
+msgstr "Klaviatūros diodu indikuoti nepagrindinius išdėstymus"
+
+#: ../rules/base.xml.in.h:657
+msgid "Using space key to input non-breakable space character"
+msgstr "Tarpo klavišo naudojimas jungiamajam tarpui įvesti"
+
+#: ../rules/base.xml.in.h:658
+msgid "Usual space at any level"
+msgstr "Įprastas tarpas visuose lygiuose"
+
+#: ../rules/base.xml.in.h:659
+msgid "Uzb"
+msgstr "Uzb"
+
+#: ../rules/base.xml.in.h:660
+msgid "Uzbekistan"
+msgstr "Uzbekistanas"
+
+#: ../rules/base.xml.in.h:661
+msgid "Vietnam"
+msgstr "Vietnamas"
+
+#: ../rules/base.xml.in.h:662
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "ViewSonic KU-306 Internet Keyboard"
+
+#: ../rules/base.xml.in.h:663
+msgid "Vnm"
+msgstr "Vnm"
+
+#: ../rules/base.xml.in.h:664
+msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+msgstr "Wang 724 skaitmenų sritis su unikodiniais priedais (rodyklėmis ir matematiniais operatoriais)"
+
+#: ../rules/base.xml.in.h:665
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Wang 724 skaitmenų sritis su unikodiniais priedais (rodyklėmis ir matematiniais operatoriais). Matematiniai operatoriai numatytame lygyje"
+
+#: ../rules/base.xml.in.h:666
+msgid "Wang model 724 azerty"
+msgstr "Wang 724, AZERTY modelis"
+
+#: ../rules/base.xml.in.h:667
+msgid "Western"
+msgstr "Vakarietiškasis"
+
+#: ../rules/base.xml.in.h:668
+msgid "Winbook Model XP5"
+msgstr "Winbook XP5 modelis"
+
+#: ../rules/base.xml.in.h:669
+msgid "Winkeys"
+msgstr "Windows išdėstymas"
+
+#: ../rules/base.xml.in.h:670
+msgid "With &lt;\\|&gt; key"
+msgstr "Su &lt;\\|&gt; klavišu"
+
+#: ../rules/base.xml.in.h:671
+msgid "With EuroSign on 5"
+msgstr "Euro ženklas ant klavišo 5"
+
+#: ../rules/base.xml.in.h:672
+msgid "With guillemets"
+msgstr "Su kampinėmis kabutėmis"
+
+#: ../rules/base.xml.in.h:673
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
+
+#: ../rules/base.xml.in.h:674
+msgid "Yakut"
+msgstr "Jakutų"
+
+#: ../rules/base.xml.in.h:675
+msgid "Yoruba"
+msgstr "Jorubų"
+
+#: ../rules/base.xml.in.h:676
+msgid "Z and ZHE swapped"
+msgstr "Raidės Z ir Ž sukeistos"
+
+#: ../rules/base.xml.in.h:677
+msgid "Zar"
+msgstr "Zar"
+
+#: ../rules/base.xml.in.h:678
+msgid "azerty"
+msgstr "AZERTY"
+
+#: ../rules/base.xml.in.h:679
+msgid "azerty/digits"
+msgstr "AZERTY/skaitmenys"
+
+#: ../rules/base.xml.in.h:680
+msgid "digits"
+msgstr "skaitmenys"
+
+#: ../rules/base.xml.in.h:681
+msgid "displaced semicolon and quote (obsolete)"
+msgstr "nukeltas kabliataškis ir kabutė (nenaudotina)"
+
+#: ../rules/base.xml.in.h:682
+msgid "lyx"
+msgstr "lyx"
+
+#: ../rules/base.xml.in.h:683
+msgid "qwerty"
+msgstr "QWERTY"
+
+#: ../rules/base.xml.in.h:684
+msgid "qwerty, extended Backslash"
+msgstr "QWERTY, išplėstas kairinis brūkšnys"
+
+#: ../rules/base.xml.in.h:685
+msgid "qwerty/digits"
+msgstr "QWERTY/skaitmenys"
+
+#: ../rules/base.xml.in.h:686
+msgid "qwertz"
+msgstr "QWERTZ"
+
+#~ msgid "Brazilian ABNT2"
+#~ msgstr "Brazilų ABNT2"
+
+#~ msgid "Japanese 106-key"
+#~ msgstr "Japoniška 106 klavišų"
+
+#~ msgid "Kir"
+#~ msgstr "Kir"
+
+#~ msgid "Korean 106-key"
+#~ msgstr "Korėjiečių 106 klavišų"
+
+#~ msgid "Super is mapped to Win keys"
+#~ msgstr "Win klavišams priskirti Super funkciją"
+
+#~ msgid "US keyboard with Slovenian digraphs"
+#~ msgstr "JAV klaviatūra su slovėniškais dviraidžiais"
+
+#~ msgid "Unicode"
+#~ msgstr "Unikodinis"
+
+#~ msgid "Use Slovenian digraphs"
+#~ msgstr "Slovėniški dviraidžiai"
diff --git a/xorg-server/xkbdata.src/po/nb.po b/xorg-server/xkbdata.src/po/nb.po
new file mode 100644
index 000000000..ce3b94416
--- /dev/null
+++ b/xorg-server/xkbdata.src/po/nb.po
@@ -0,0 +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 ""
diff --git a/xorg-server/xkbdata.src/po/sv.po b/xorg-server/xkbdata.src/po/sv.po
index 9847c17c9..ae54b0508 100644
--- a/xorg-server/xkbdata.src/po/sv.po
+++ b/xorg-server/xkbdata.src/po/sv.po
@@ -1,15 +1,15 @@
# Swedish messages for xkeyboard-config.
-# Copyright (C) 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
# This file is distributed under the same license as the xkeyboard-config package.
# Christian Rose <menthos@menthos.com>, 2004.
-# Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008.
+# Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009.
#
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config 1.4-pre1\n"
+"Project-Id-Version: xkeyboard-config 1.5\n"
"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2008-09-15 23:52+0100\n"
-"PO-Revision-Date: 2008-09-17 23:49+0100\n"
+"POT-Creation-Date: 2009-01-13 23:12+0000\n"
+"PO-Revision-Date: 2009-02-24 19:37+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"MIME-Version: 1.0\n"
@@ -101,63 +101,63 @@ msgid "102/qwertz/dot/Eliminate dead keys"
msgstr "102/qwertz/punkt/Eliminera stumma tangenter"
#: ../rules/base.xml.in.h:22 ../rules/evdev.xml.in.h:22
+msgid "2"
+msgstr "2"
+
+#: ../rules/base.xml.in.h:23 ../rules/evdev.xml.in.h:23
+msgid "4"
+msgstr "4"
+
+#: ../rules/base.xml.in.h:24 ../rules/evdev.xml.in.h:24
+msgid "5"
+msgstr "5"
+
+#: ../rules/base.xml.in.h:25 ../rules/evdev.xml.in.h:25
msgid "A4Tech KB-21"
msgstr "A4Tech KB-21"
-#: ../rules/base.xml.in.h:23 ../rules/evdev.xml.in.h:23
+#: ../rules/base.xml.in.h:26 ../rules/evdev.xml.in.h:26
msgid "A4Tech KBS-8"
msgstr "A4Tech KBS-8"
-#: ../rules/base.xml.in.h:24 ../rules/evdev.xml.in.h:24
+#: ../rules/base.xml.in.h:27 ../rules/evdev.xml.in.h:27
msgid "A4Tech Wireless Desktop RFKB-23"
msgstr "A4Tech Wireless Desktop RFKB-23"
-#: ../rules/base.xml.in.h:25 ../rules/evdev.xml.in.h:25
+#: ../rules/base.xml.in.h:28 ../rules/evdev.xml.in.h:28
msgid "ACPI Standard"
msgstr "ACPI-standard"
-#: ../rules/base.xml.in.h:26 ../rules/evdev.xml.in.h:26
-msgid "ATM/phone-style hexadecimal keypad"
-msgstr "ATM/telefonliknande hexadecimalt numeriskt tangentbord"
+#: ../rules/base.xml.in.h:29 ../rules/evdev.xml.in.h:29
+msgid "ATM/phone-style"
+msgstr "Bankomat/telefonliknande"
-#: ../rules/base.xml.in.h:27 ../rules/evdev.xml.in.h:27
+#: ../rules/base.xml.in.h:30 ../rules/evdev.xml.in.h:30
msgid "Acer AirKey V"
msgstr "Acer AirKey V"
-#: ../rules/base.xml.in.h:28 ../rules/evdev.xml.in.h:28
+#: ../rules/base.xml.in.h:31 ../rules/evdev.xml.in.h:31
msgid "Acer C300"
msgstr "Acer C300"
-#: ../rules/base.xml.in.h:29 ../rules/evdev.xml.in.h:29
+#: ../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:30 ../rules/evdev.xml.in.h:30
+#: ../rules/base.xml.in.h:33 ../rules/evdev.xml.in.h:33
msgid "Acer Laptop"
msgstr "Bärbar Acer-dator"
-#: ../rules/base.xml.in.h:31 ../rules/evdev.xml.in.h:31
-msgid "Add the EuroSign to the 2 key."
-msgstr "Lägg till eurotecknet till tangenten 2."
-
-#: ../rules/base.xml.in.h:32 ../rules/evdev.xml.in.h:32
-msgid "Add the EuroSign to the 4 key."
-msgstr "Lägg till eurotecknet till tangenten 4."
-
-#: ../rules/base.xml.in.h:33 ../rules/evdev.xml.in.h:33
-msgid "Add the EuroSign to the 5 key."
-msgstr "Lägg till eurotecknet till tangenten 5."
-
#: ../rules/base.xml.in.h:34 ../rules/evdev.xml.in.h:34
-msgid "Add the EuroSign to the E key."
-msgstr "Lägg till eurotecknet till tangenten E."
+msgid "Add the standard behavior to Menu key"
+msgstr "Lägg till standardbeteendet till Meny-tangenten"
#: ../rules/base.xml.in.h:35 ../rules/evdev.xml.in.h:35
-msgid "Add the standard behavior to Menu key."
-msgstr "Lägg till standardbeteendet till Meny-tangenten."
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "Lägger till Esperanto-circumflex (supersigno)"
#: ../rules/base.xml.in.h:36 ../rules/evdev.xml.in.h:36
-msgid "Adding the EuroSign to certain keys"
+msgid "Adding EuroSign to certain keys"
msgstr "Lägger till eurotecknet till vissa tangenter"
#: ../rules/base.xml.in.h:37 ../rules/evdev.xml.in.h:37
@@ -185,2445 +185,2665 @@ msgid "Albania"
msgstr "Albanien"
#: ../rules/base.xml.in.h:43 ../rules/evdev.xml.in.h:43
-msgid "Alt and Meta are on the Alt keys."
-msgstr "Alt och Meta finns på Alt-tangenterna."
+msgid "Alt and Meta are on Alt keys"
+msgstr "Alt och Meta finns på Alt-tangenterna"
#: ../rules/base.xml.in.h:44 ../rules/evdev.xml.in.h:44
-msgid "Alt is mapped to the right Win-key and Super to Menu."
-msgstr "Alt är mappad till högra Win-tangenten och Super till Meny."
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr "Alt är mappad till högra Win-tangenten och Super till Meny"
#: ../rules/base.xml.in.h:45 ../rules/evdev.xml.in.h:45
-msgid "Alt+CapsLock changes layout."
-msgstr "Alt+CapsLock byter layout."
+msgid "Alt+CapsLock"
+msgstr "Alt+CapsLock"
#: ../rules/base.xml.in.h:46 ../rules/evdev.xml.in.h:46
-msgid "Alt+Ctrl change layout."
-msgstr "Alt+Ctrl byter layout."
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
#: ../rules/base.xml.in.h:47 ../rules/evdev.xml.in.h:47
-msgid "Alt+Shift change layout."
-msgstr "Alt+Shift byter layout."
+msgid "Alt+Shift"
+msgstr "Alt+Skift"
#: ../rules/base.xml.in.h:48 ../rules/evdev.xml.in.h:48
+msgid "Alt+Space"
+msgstr "Alt+Blanksteg"
+
+#: ../rules/base.xml.in.h:49 ../rules/evdev.xml.in.h:49
msgid "Alt-Q"
msgstr "Alt-Q"
-#: ../rules/base.xml.in.h:49 ../rules/evdev.xml.in.h:49
+#: ../rules/base.xml.in.h:50 ../rules/evdev.xml.in.h:50
msgid "Alt/Win key behavior"
msgstr "Alt/Win-tangentbeteende"
-#: ../rules/base.xml.in.h:50 ../rules/evdev.xml.in.h:50
+#: ../rules/base.xml.in.h:51 ../rules/evdev.xml.in.h:51
msgid "Alternative"
msgstr "Alternativ"
-#: ../rules/base.xml.in.h:51 ../rules/evdev.xml.in.h:51
+#: ../rules/base.xml.in.h:52 ../rules/evdev.xml.in.h:52
msgid "Alternative Eastern"
msgstr "Alternativ östlig"
-#: ../rules/base.xml.in.h:52 ../rules/evdev.xml.in.h:52
+#: ../rules/base.xml.in.h:53 ../rules/evdev.xml.in.h:53
msgid "Alternative Phonetic"
msgstr "Alternativ fonetisk"
-#: ../rules/base.xml.in.h:53 ../rules/evdev.xml.in.h:53
+#: ../rules/base.xml.in.h:54 ../rules/evdev.xml.in.h:54
msgid "Alternative international (former us_intl)"
msgstr "Alternativ internationell (tidigare us_intl)"
-#: ../rules/base.xml.in.h:54 ../rules/evdev.xml.in.h:54
+#: ../rules/base.xml.in.h:55 ../rules/evdev.xml.in.h:55
msgid "Alternative, Sun dead keys"
msgstr "Alternativ, Sun stumma tangenter"
-#: ../rules/base.xml.in.h:55 ../rules/evdev.xml.in.h:55
+#: ../rules/base.xml.in.h:56 ../rules/evdev.xml.in.h:56
msgid "Alternative, eliminate dead keys"
msgstr "Alternativ, eliminera stumma tangenter"
-#: ../rules/base.xml.in.h:56 ../rules/evdev.xml.in.h:56
+#: ../rules/base.xml.in.h:57 ../rules/evdev.xml.in.h:57
msgid "Alternative, latin-9 only"
msgstr "Alternativ, endast latin-9"
-#: ../rules/base.xml.in.h:57 ../rules/evdev.xml.in.h:57
+#: ../rules/base.xml.in.h:58 ../rules/evdev.xml.in.h:58
msgid "And"
msgstr "And"
-#: ../rules/base.xml.in.h:58 ../rules/evdev.xml.in.h:58
+#: ../rules/base.xml.in.h:59 ../rules/evdev.xml.in.h:59
msgid "Andorra"
msgstr "Andorra"
-#: ../rules/base.xml.in.h:59 ../rules/evdev.xml.in.h:59
+#: ../rules/base.xml.in.h:60 ../rules/evdev.xml.in.h:60
+msgid "Any Alt key"
+msgstr "Valfri Alt-tangent"
+
+#: ../rules/base.xml.in.h:61 ../rules/evdev.xml.in.h:61
+msgid "Any Win key"
+msgstr "Valfri Win-tangent"
+
+#: ../rules/base.xml.in.h:62 ../rules/evdev.xml.in.h:62
+msgid "Any Win key (while pressed)"
+msgstr "Valfri Win-tangent (då den trycks ned)"
+
+#: ../rules/base.xml.in.h:63 ../rules/evdev.xml.in.h:63
msgid "Apostrophe (') variant"
msgstr "Apostrof (') variant"
-#: ../rules/base.xml.in.h:60 ../rules/evdev.xml.in.h:60
+#: ../rules/base.xml.in.h:64 ../rules/evdev.xml.in.h:64
msgid "Apple"
msgstr "Apple"
-#: ../rules/base.xml.in.h:61 ../rules/evdev.xml.in.h:61
+#: ../rules/base.xml.in.h:65 ../rules/evdev.xml.in.h:65
msgid "Apple Laptop"
msgstr "Bärbar Apple-dator"
-#: ../rules/base.xml.in.h:62 ../rules/evdev.xml.in.h:62
+#: ../rules/base.xml.in.h:66 ../rules/evdev.xml.in.h:66
msgid "Ara"
msgstr "Ara"
-#: ../rules/base.xml.in.h:63 ../rules/evdev.xml.in.h:63
+#: ../rules/base.xml.in.h:67 ../rules/evdev.xml.in.h:67
msgid "Arabic"
msgstr "Arabisk"
-#: ../rules/base.xml.in.h:64 ../rules/evdev.xml.in.h:64
+#: ../rules/base.xml.in.h:68 ../rules/evdev.xml.in.h:68
msgid "Arm"
msgstr "Arm"
-#: ../rules/base.xml.in.h:65 ../rules/evdev.xml.in.h:65
+#: ../rules/base.xml.in.h:69 ../rules/evdev.xml.in.h:69
msgid "Armenia"
msgstr "Armenien"
-#: ../rules/base.xml.in.h:66 ../rules/evdev.xml.in.h:66
+#: ../rules/base.xml.in.h:70 ../rules/evdev.xml.in.h:70
msgid "Asturian variant with bottom-dot H and bottom-dot L"
msgstr "Asturisk variant med nederpunkts H och nederpunkts L"
-#: ../rules/base.xml.in.h:67 ../rules/evdev.xml.in.h:67
+#: ../rules/base.xml.in.h:71 ../rules/evdev.xml.in.h:71
msgid "Asus Laptop"
msgstr "Bärbar Asus-dator"
-#: ../rules/base.xml.in.h:68 ../rules/evdev.xml.in.h:68
+#: ../rules/base.xml.in.h:72 ../rules/evdev.xml.in.h:72
+msgid "At bottom left"
+msgstr "Nere till vänster"
+
+#: ../rules/base.xml.in.h:73 ../rules/evdev.xml.in.h:73
+msgid "At left of 'A'"
+msgstr "Vänster om \"A\""
+
+#: ../rules/base.xml.in.h:74 ../rules/evdev.xml.in.h:74
msgid "Aze"
msgstr "Aze"
-#: ../rules/base.xml.in.h:69 ../rules/evdev.xml.in.h:69
+#: ../rules/base.xml.in.h:75 ../rules/evdev.xml.in.h:75
msgid "Azerbaijan"
msgstr "Azerbajdzjan"
-#: ../rules/base.xml.in.h:70 ../rules/evdev.xml.in.h:70
+#: ../rules/base.xml.in.h:76 ../rules/evdev.xml.in.h:76
msgid "Azona RF2300 wireless Internet Keyboard"
msgstr "Azona RF2300 wireless Internet Keyboard"
-#: ../rules/base.xml.in.h:71 ../rules/evdev.xml.in.h:71
+#: ../rules/base.xml.in.h:77 ../rules/evdev.xml.in.h:77
msgid "BTC 5090"
msgstr "BTC 5090"
-#: ../rules/base.xml.in.h:72 ../rules/evdev.xml.in.h:72
+#: ../rules/base.xml.in.h:78 ../rules/evdev.xml.in.h:78
msgid "BTC 5113RF Multimedia"
msgstr "BTC 5113RF Multimedia"
-#: ../rules/base.xml.in.h:73 ../rules/evdev.xml.in.h:73
+#: ../rules/base.xml.in.h:79 ../rules/evdev.xml.in.h:79
msgid "BTC 5126T"
msgstr "BTC 5126T"
-#: ../rules/base.xml.in.h:74 ../rules/evdev.xml.in.h:74
+#: ../rules/base.xml.in.h:80 ../rules/evdev.xml.in.h:80
msgid "BTC 6301URF"
msgstr "BTC 6301URF"
-#: ../rules/base.xml.in.h:75 ../rules/evdev.xml.in.h:75
+#: ../rules/base.xml.in.h:81 ../rules/evdev.xml.in.h:81
msgid "BTC 9000"
msgstr "BTC 9000"
-#: ../rules/base.xml.in.h:76 ../rules/evdev.xml.in.h:76
+#: ../rules/base.xml.in.h:82 ../rules/evdev.xml.in.h:82
msgid "BTC 9000A"
msgstr "BTC 9000A"
-#: ../rules/base.xml.in.h:77 ../rules/evdev.xml.in.h:77
+#: ../rules/base.xml.in.h:83 ../rules/evdev.xml.in.h:83
msgid "BTC 9001AH"
msgstr "BTC 9001AH"
-#: ../rules/base.xml.in.h:78 ../rules/evdev.xml.in.h:78
+#: ../rules/base.xml.in.h:84 ../rules/evdev.xml.in.h:84
msgid "BTC 9019U"
msgstr "BTC 9019U"
-#: ../rules/base.xml.in.h:79 ../rules/evdev.xml.in.h:79
-msgid "Baltic+"
-msgstr "Baltisk+"
+#: ../rules/base.xml.in.h:85 ../rules/evdev.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:80 ../rules/evdev.xml.in.h:80
+#: ../rules/base.xml.in.h:86 ../rules/evdev.xml.in.h:86
msgid "Ban"
msgstr "Ban"
-#: ../rules/base.xml.in.h:81 ../rules/evdev.xml.in.h:81
+#: ../rules/base.xml.in.h:87 ../rules/evdev.xml.in.h:87
msgid "Bangladesh"
msgstr "Bangladesh"
-#: ../rules/base.xml.in.h:82 ../rules/evdev.xml.in.h:82
+#: ../rules/base.xml.in.h:88 ../rules/evdev.xml.in.h:88
msgid "Bel"
msgstr "Bel"
-#: ../rules/base.xml.in.h:83 ../rules/evdev.xml.in.h:83
+#: ../rules/base.xml.in.h:89 ../rules/evdev.xml.in.h:89
msgid "Belarus"
msgstr "Vitryssland"
-#: ../rules/base.xml.in.h:84 ../rules/evdev.xml.in.h:84
+#: ../rules/base.xml.in.h:90 ../rules/evdev.xml.in.h:90
msgid "Belgium"
msgstr "Belgien"
-#: ../rules/base.xml.in.h:85 ../rules/evdev.xml.in.h:85
+#: ../rules/base.xml.in.h:91 ../rules/evdev.xml.in.h:91
msgid "BenQ X-Touch"
msgstr "BenQ X-Touch"
-#: ../rules/base.xml.in.h:86 ../rules/evdev.xml.in.h:86
+#: ../rules/base.xml.in.h:92 ../rules/evdev.xml.in.h:92
msgid "BenQ X-Touch 730"
msgstr "BenQ X-Touch 730"
-#: ../rules/base.xml.in.h:87 ../rules/evdev.xml.in.h:87
+#: ../rules/base.xml.in.h:93 ../rules/evdev.xml.in.h:93
msgid "BenQ X-Touch 800"
msgstr "BenQ X-Touch 800"
-#: ../rules/base.xml.in.h:88 ../rules/evdev.xml.in.h:88
+#: ../rules/base.xml.in.h:94 ../rules/evdev.xml.in.h:94
msgid "Bengali"
msgstr "Bengalisk"
-#: ../rules/base.xml.in.h:89 ../rules/evdev.xml.in.h:89
+#: ../rules/base.xml.in.h:95 ../rules/evdev.xml.in.h:95
msgid "Bengali Probhat"
msgstr "Bengali Probhat"
-#: ../rules/base.xml.in.h:90 ../rules/evdev.xml.in.h:90
+#: ../rules/base.xml.in.h:96 ../rules/evdev.xml.in.h:96
msgid "Bepo, ergonomic, Dvorak way"
msgstr "Bepo, ergonomisk, Dvorak"
-#: ../rules/base.xml.in.h:91 ../rules/evdev.xml.in.h:91
+#: ../rules/base.xml.in.h:97 ../rules/evdev.xml.in.h:97
msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
msgstr "Bepo, ergonomisk, Dvorak, endast latin-9"
-#: ../rules/base.xml.in.h:92 ../rules/evdev.xml.in.h:92
+#: ../rules/base.xml.in.h:98 ../rules/evdev.xml.in.h:98
msgid "Bgr"
msgstr "Bgr"
-#: ../rules/base.xml.in.h:93 ../rules/evdev.xml.in.h:93
+#: ../rules/base.xml.in.h:99 ../rules/evdev.xml.in.h:99
msgid "Bhu"
msgstr "Bhu"
-#: ../rules/base.xml.in.h:94 ../rules/evdev.xml.in.h:94
+#: ../rules/base.xml.in.h:100 ../rules/evdev.xml.in.h:100
msgid "Bhutan"
msgstr "Bhutan"
-#: ../rules/base.xml.in.h:95 ../rules/evdev.xml.in.h:95
+#: ../rules/base.xml.in.h:101 ../rules/evdev.xml.in.h:101
msgid "Biblical Hebrew (Tiro)"
msgstr "Biblisk hebreisk (Tiro)"
-#: ../rules/base.xml.in.h:96 ../rules/evdev.xml.in.h:96
+#: ../rules/base.xml.in.h:102 ../rules/evdev.xml.in.h:102
msgid "Bih"
msgstr "Bih"
-#: ../rules/base.xml.in.h:97 ../rules/evdev.xml.in.h:97
+#: ../rules/base.xml.in.h:103 ../rules/evdev.xml.in.h:103
msgid "Blr"
msgstr "Blr"
-#: ../rules/base.xml.in.h:98 ../rules/evdev.xml.in.h:98
+#: ../rules/base.xml.in.h:104 ../rules/evdev.xml.in.h:104
msgid "Bosnia and Herzegovina"
msgstr "Bosnien och Herzegovina"
-#: ../rules/base.xml.in.h:99 ../rules/evdev.xml.in.h:99
-msgid "Both Alt keys together change layout."
-msgstr "Båda Alt-tangenterna tillsammans byter layout."
-
-#: ../rules/base.xml.in.h:100 ../rules/evdev.xml.in.h:100
-msgid "Both Ctrl keys together change layout."
-msgstr "Båda Ctrl-tangenterna tillsammans byter layout."
+#: ../rules/base.xml.in.h:105 ../rules/evdev.xml.in.h:105
+msgid "Both Alt keys together"
+msgstr "Båda Alt-tangenterna tillsammans"
-#: ../rules/base.xml.in.h:101 ../rules/evdev.xml.in.h:101
-msgid "Both Shift keys together change layout."
-msgstr "Båda Skift-tangenterna tillsammans byter layout."
+#: ../rules/base.xml.in.h:106 ../rules/evdev.xml.in.h:106
+msgid "Both Ctrl keys together"
+msgstr "Båda Ctrl-tangenterna tillsammans"
-#: ../rules/base.xml.in.h:102 ../rules/evdev.xml.in.h:102
-msgid "Both Win-keys switch layout while pressed."
-msgstr "Båda Win-tangenterna byter layout då de trycks ned."
+#: ../rules/base.xml.in.h:107 ../rules/evdev.xml.in.h:107
+msgid "Both Shift keys together"
+msgstr "Båda Skift-tangenterna tillsammans"
-#: ../rules/base.xml.in.h:103 ../rules/evdev.xml.in.h:103
+#: ../rules/base.xml.in.h:108 ../rules/evdev.xml.in.h:108
msgid "Bra"
msgstr "Bra"
-#: ../rules/base.xml.in.h:104 ../rules/evdev.xml.in.h:104
+#: ../rules/base.xml.in.h:109 ../rules/evdev.xml.in.h:109
msgid "Braille"
msgstr "Braille"
-#: ../rules/base.xml.in.h:105 ../rules/evdev.xml.in.h:105
+#: ../rules/base.xml.in.h:110 ../rules/evdev.xml.in.h:110
msgid "Brazil"
msgstr "Brasilien"
-#: ../rules/base.xml.in.h:106 ../rules/evdev.xml.in.h:106
+#: ../rules/base.xml.in.h:111 ../rules/evdev.xml.in.h:111
msgid "Brazilian ABNT2"
msgstr "Brasiliansk ABNT2"
-#: ../rules/base.xml.in.h:107 ../rules/evdev.xml.in.h:107
+#: ../rules/base.xml.in.h:112 ../rules/evdev.xml.in.h:112
+msgid "Breton"
+msgstr "Breton"
+
+#: ../rules/base.xml.in.h:113 ../rules/evdev.xml.in.h:113
msgid "Brl"
msgstr "Brl"
-#: ../rules/base.xml.in.h:108 ../rules/evdev.xml.in.h:108
+#: ../rules/base.xml.in.h:114 ../rules/evdev.xml.in.h:114
msgid "Brother Internet Keyboard"
msgstr "Brother Internettangentbord"
-#: ../rules/base.xml.in.h:109 ../rules/evdev.xml.in.h:109
+#: ../rules/base.xml.in.h:115 ../rules/evdev.xml.in.h:115
msgid "Buckwalter"
msgstr "Buckwalter"
-#: ../rules/base.xml.in.h:110 ../rules/evdev.xml.in.h:110
+#: ../rules/base.xml.in.h:116 ../rules/evdev.xml.in.h:116
msgid "Bulgaria"
msgstr "Bulgarien"
-#: ../rules/base.xml.in.h:111 ../rules/evdev.xml.in.h:111
+#: ../rules/base.xml.in.h:117 ../rules/evdev.xml.in.h:117
+msgid "CRULP"
+msgstr "CRULP"
+
+#: ../rules/base.xml.in.h:118 ../rules/evdev.xml.in.h:118
msgid "Cambodia"
msgstr "Cambodia"
-#: ../rules/base.xml.in.h:112 ../rules/evdev.xml.in.h:112
+#: ../rules/base.xml.in.h:119 ../rules/evdev.xml.in.h:119
msgid "Can"
msgstr "Can"
-#: ../rules/base.xml.in.h:113 ../rules/evdev.xml.in.h:113
+#: ../rules/base.xml.in.h:120 ../rules/evdev.xml.in.h:120
msgid "Canada"
msgstr "Kanada"
-#: ../rules/base.xml.in.h:114 ../rules/evdev.xml.in.h:114
-msgid "Caps Lock is Compose."
-msgstr "Caps Lock är Compose."
+#: ../rules/base.xml.in.h:121 ../rules/evdev.xml.in.h:121
+msgid "Caps Lock"
+msgstr "Caps Lock"
-#: ../rules/base.xml.in.h:115 ../rules/evdev.xml.in.h:115
-msgid "CapsLock LED shows alternative layout."
-msgstr "CapsLock-lampan visar alternativ layout."
+#: ../rules/base.xml.in.h:122 ../rules/evdev.xml.in.h:122
+msgid "CapsLock"
+msgstr "CapsLock"
-#: ../rules/base.xml.in.h:116 ../rules/evdev.xml.in.h:116
-msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
-msgstr "CapsLock fungerar som Skift med låsning. Skift \"pausar\" Caps Lock."
+#: ../rules/base.xml.in.h:123 ../rules/evdev.xml.in.h:123
+msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
+msgstr "CapsLock (till första layouten), Skift+CapsLock (till sista layouten)"
-#: ../rules/base.xml.in.h:117 ../rules/evdev.xml.in.h:117
-msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
-msgstr "CapsLock fungerar som Skift med låsning. Skift påverkar inte Caps Lock."
+#: ../rules/base.xml.in.h:124 ../rules/evdev.xml.in.h:124
+msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
+msgstr "CapsLock (när den trycks ned), Alt+CapsLock gör ursprunglig capslock-åtgärd"
-#: ../rules/base.xml.in.h:118 ../rules/evdev.xml.in.h:118
-msgid "CapsLock just locks the Shift modifier."
-msgstr "CapsLock låser bara Skift-modifieraren."
+#: ../rules/base.xml.in.h:125 ../rules/evdev.xml.in.h:125
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
+msgstr "CapsLock fungerar som Skift med låsning. Skift \"pausar\" Caps Lock"
-#: ../rules/base.xml.in.h:119 ../rules/evdev.xml.in.h:119
+#: ../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 "CapsLock fungerar som Skift med låsning. Skift påverkar inte CapsLock"
+
+#: ../rules/base.xml.in.h:127 ../rules/evdev.xml.in.h:127
msgid "CapsLock key behavior"
msgstr "Beteende för Caps Lock-tangenten"
-#: ../rules/base.xml.in.h:120 ../rules/evdev.xml.in.h:120
-msgid "CapsLock key changes layout."
-msgstr "CapsLock-tangenten byter layout."
-
-#: ../rules/base.xml.in.h:121 ../rules/evdev.xml.in.h:121
-msgid "CapsLock switch to first layout, Shift+CapsLock switch to last layout."
-msgstr "CapsLock växlar till första layouten, Skift+CapsLock växlar till sista layouten."
-
-#: ../rules/base.xml.in.h:122 ../rules/evdev.xml.in.h:122
-msgid "CapsLock toggles Shift so all keys are affected."
-msgstr "CapsLock växlar Skift så alla tangenter påverkas."
+#: ../rules/base.xml.in.h:128 ../rules/evdev.xml.in.h:128
+msgid "CapsLock toggles Shift so all keys are affected"
+msgstr "CapsLock växlar Skift så alla tangenter påverkas"
-#: ../rules/base.xml.in.h:123 ../rules/evdev.xml.in.h:123
-msgid "CapsLock toggles normal capitalization of alphabetic characters."
-msgstr "CapsLock växla normalt skiftläge på alfabetiska tecken."
+#: ../rules/base.xml.in.h:129 ../rules/evdev.xml.in.h:129
+msgid "CapsLock toggles normal capitalization of alphabetic characters"
+msgstr "CapsLock växlar normalt skiftläge på alfabetiska tecken"
-#: ../rules/base.xml.in.h:124 ../rules/evdev.xml.in.h:124
-msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
-msgstr "CapsLock använder intern skiftlägesstyrning. Skift \"pausar\" CapsLock."
+#: ../rules/base.xml.in.h:130 ../rules/evdev.xml.in.h:130
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
+msgstr "CapsLock använder intern skiftlägesstyrning. Skift \"pausar\" CapsLock"
-#: ../rules/base.xml.in.h:125 ../rules/evdev.xml.in.h:125
-msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
-msgstr "CapsLock använder intern skiftlägesstyrning. Skift påverkar inte CapsLock."
+#: ../rules/base.xml.in.h:131 ../rules/evdev.xml.in.h:131
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
+msgstr "CapsLock använder intern skiftlägesstyrning. Skift påverkar inte CapsLock"
-#: ../rules/base.xml.in.h:126 ../rules/evdev.xml.in.h:126
+#: ../rules/base.xml.in.h:132 ../rules/evdev.xml.in.h:132
msgid "Catalan variant with middle-dot L"
msgstr "Katalansk variant med mittenpunkts L"
-#: ../rules/base.xml.in.h:127 ../rules/evdev.xml.in.h:127
+#: ../rules/base.xml.in.h:133 ../rules/evdev.xml.in.h:133
msgid "Cedilla"
msgstr "Cedilj"
-#: ../rules/base.xml.in.h:128 ../rules/evdev.xml.in.h:128
+#: ../rules/base.xml.in.h:134 ../rules/evdev.xml.in.h:134
msgid "Che"
msgstr "Che"
-#: ../rules/base.xml.in.h:129 ../rules/evdev.xml.in.h:129
+#: ../rules/base.xml.in.h:135 ../rules/evdev.xml.in.h:135
msgid "Cherokee"
msgstr "Cherokee"
-#: ../rules/base.xml.in.h:130 ../rules/evdev.xml.in.h:130
+#: ../rules/base.xml.in.h:136 ../rules/evdev.xml.in.h:136
msgid "Cherry Blue Line CyBo@rd"
msgstr "Cherry Blue Line CyBo@rd"
-#: ../rules/base.xml.in.h:131 ../rules/evdev.xml.in.h:131
+#: ../rules/base.xml.in.h:137 ../rules/evdev.xml.in.h:137
msgid "Cherry Blue Line CyBo@rd (alternate option)"
msgstr "Cherry Blue Line CyBo@rd (alternativ)"
-#: ../rules/base.xml.in.h:132 ../rules/evdev.xml.in.h:132
+#: ../rules/base.xml.in.h:138 ../rules/evdev.xml.in.h:138
msgid "Cherry CyBo@rd USB-Hub"
msgstr "Cherry CyBo@rd USB-hubb"
-#: ../rules/base.xml.in.h:133 ../rules/evdev.xml.in.h:133
+#: ../rules/base.xml.in.h:139 ../rules/evdev.xml.in.h:139
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Expert"
+
+#: ../rules/base.xml.in.h:140 ../rules/evdev.xml.in.h:140
msgid "Cherry CyMotion Master Linux"
msgstr "Cherry CyMotion Master Linux"
-#: ../rules/base.xml.in.h:134 ../rules/evdev.xml.in.h:134
+#: ../rules/base.xml.in.h:141 ../rules/evdev.xml.in.h:141
msgid "Cherry CyMotion Master XPress"
msgstr "Cherry CyMotion Master XPress"
-#: ../rules/base.xml.in.h:135 ../rules/evdev.xml.in.h:135
+#: ../rules/base.xml.in.h:142 ../rules/evdev.xml.in.h:142
msgid "Chicony Internet Keyboard"
msgstr "Chicony Internettangentbord"
-#: ../rules/base.xml.in.h:136 ../rules/evdev.xml.in.h:136
+#: ../rules/base.xml.in.h:143 ../rules/evdev.xml.in.h:143
msgid "Chicony KB-9885"
msgstr "Chicony KB-9885"
-#: ../rules/base.xml.in.h:137 ../rules/evdev.xml.in.h:137
+#: ../rules/base.xml.in.h:144 ../rules/evdev.xml.in.h:144
msgid "Chicony KU-0108"
msgstr "Chicony KU-0108"
-#: ../rules/base.xml.in.h:138 ../rules/evdev.xml.in.h:138
+#: ../rules/base.xml.in.h:145 ../rules/evdev.xml.in.h:145
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0420"
+
+#: ../rules/base.xml.in.h:146 ../rules/evdev.xml.in.h:146
msgid "China"
msgstr "Kina"
-#: ../rules/base.xml.in.h:139 ../rules/evdev.xml.in.h:139
+#: ../rules/base.xml.in.h:147 ../rules/evdev.xml.in.h:147
msgid "Chuvash"
msgstr "Tjuvasjiska"
-#: ../rules/base.xml.in.h:140 ../rules/evdev.xml.in.h:140
+#: ../rules/base.xml.in.h:148 ../rules/evdev.xml.in.h:148
msgid "Chuvash Latin"
msgstr "Tjuvasjiska latin"
-#: ../rules/base.xml.in.h:141 ../rules/evdev.xml.in.h:141
+#: ../rules/base.xml.in.h:149 ../rules/evdev.xml.in.h:149
msgid "Classic"
msgstr "Klassisk"
-#: ../rules/base.xml.in.h:142 ../rules/evdev.xml.in.h:142
+#: ../rules/base.xml.in.h:150 ../rules/evdev.xml.in.h:150
msgid "Classic Dvorak"
msgstr "Klassisk Dvorak"
-#: ../rules/base.xml.in.h:143 ../rules/evdev.xml.in.h:143
+#: ../rules/base.xml.in.h:151 ../rules/evdev.xml.in.h:151
msgid "Classmate PC"
msgstr "Classmate PC"
-#: ../rules/base.xml.in.h:144 ../rules/evdev.xml.in.h:144
+#: ../rules/base.xml.in.h:152 ../rules/evdev.xml.in.h:152
msgid "CloGaelach"
msgstr "CloGaelach"
-#: ../rules/base.xml.in.h:145 ../rules/evdev.xml.in.h:145
+#: ../rules/base.xml.in.h:153 ../rules/evdev.xml.in.h:153
msgid "Colemak"
msgstr "Colemak"
-#: ../rules/base.xml.in.h:146 ../rules/evdev.xml.in.h:146
+#: ../rules/base.xml.in.h:154 ../rules/evdev.xml.in.h:154
msgid "Compaq Easy Access Keyboard"
msgstr "Compaq Easy Access-tangentbord"
-#: ../rules/base.xml.in.h:147 ../rules/evdev.xml.in.h:147
+#: ../rules/base.xml.in.h:155 ../rules/evdev.xml.in.h:155
msgid "Compaq Internet Keyboard (13 keys)"
msgstr "Compaq Internettangentbord (13 tangenter)"
-#: ../rules/base.xml.in.h:148 ../rules/evdev.xml.in.h:148
+#: ../rules/base.xml.in.h:156 ../rules/evdev.xml.in.h:156
msgid "Compaq Internet Keyboard (18 keys)"
msgstr "Compaq Internettangentbord (18 tangenter)"
-#: ../rules/base.xml.in.h:149 ../rules/evdev.xml.in.h:149
+#: ../rules/base.xml.in.h:157 ../rules/evdev.xml.in.h:157
msgid "Compaq Internet Keyboard (7 keys)"
msgstr "Compaq Internettangentbord (7 tangenter)"
-#: ../rules/base.xml.in.h:150 ../rules/evdev.xml.in.h:150
+#: ../rules/base.xml.in.h:158 ../rules/evdev.xml.in.h:158
msgid "Compaq iPaq Keyboard"
msgstr "Compaq iPaq-tangentbord"
-#: ../rules/base.xml.in.h:151 ../rules/evdev.xml.in.h:151
+#: ../rules/base.xml.in.h:159 ../rules/evdev.xml.in.h:159
msgid "Compose key position"
msgstr "Position för Compose-tangenten"
-#: ../rules/base.xml.in.h:152 ../rules/evdev.xml.in.h:152
+#: ../rules/base.xml.in.h:160 ../rules/evdev.xml.in.h:160
msgid "Congo, Democratic Republic of the"
msgstr "Kongo, Demokratiska republiken"
-#: ../rules/base.xml.in.h:153 ../rules/evdev.xml.in.h:153
-msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
-msgstr "Control är mappat till Win-tangenterna (och de vanliga Ctrl-tangenterna)."
+#: ../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 "Control är mappad till Win-tangenterna, Alt-tangenten är mappad till Win-tangenterna"
-#: ../rules/base.xml.in.h:154 ../rules/evdev.xml.in.h:154
+#: ../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 "Control är mappad till Win-tangenterna (och de vanliga Ctrl-tangenterna)"
+
+#: ../rules/base.xml.in.h:163 ../rules/evdev.xml.in.h:163
msgid "Croatia"
msgstr "Kroatien"
-#: ../rules/base.xml.in.h:155 ../rules/evdev.xml.in.h:155
-msgid "Ctrl key at bottom left"
-msgstr "Ctrl-tangenten nere till vänster"
-
-#: ../rules/base.xml.in.h:156 ../rules/evdev.xml.in.h:156
-msgid "Ctrl key at left of 'A'"
-msgstr "Ctrl-tangenten till vänster om \"A\""
-
-#: ../rules/base.xml.in.h:157 ../rules/evdev.xml.in.h:157
+#: ../rules/base.xml.in.h:164 ../rules/evdev.xml.in.h:164
msgid "Ctrl key position"
msgstr "Position för Ctrl-tangenten"
-#: ../rules/base.xml.in.h:158 ../rules/evdev.xml.in.h:158
-msgid "Ctrl+Shift change layout."
-msgstr "Ctrl+Skift byter layout."
+#: ../rules/base.xml.in.h:165 ../rules/evdev.xml.in.h:165
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Skift"
-#: ../rules/base.xml.in.h:159 ../rules/evdev.xml.in.h:159
+#: ../rules/base.xml.in.h:166 ../rules/evdev.xml.in.h:166
msgid "Cyrillic"
msgstr "Kyrillisk"
-#: ../rules/base.xml.in.h:160 ../rules/evdev.xml.in.h:160
+#: ../rules/base.xml.in.h:167 ../rules/evdev.xml.in.h:167
msgid "Cyrillic with guillemets"
msgstr "Kyrillisk med gåsögon"
-#: ../rules/base.xml.in.h:161 ../rules/evdev.xml.in.h:161
+#: ../rules/base.xml.in.h:168 ../rules/evdev.xml.in.h:168
msgid "Cyrillic, Z and ZHE swapped"
msgstr "Kyrillisk, Z och ZHE utbytta"
-#: ../rules/base.xml.in.h:162 ../rules/evdev.xml.in.h:162
+#: ../rules/base.xml.in.h:169 ../rules/evdev.xml.in.h:169
msgid "Cze"
msgstr "Cze"
-#: ../rules/base.xml.in.h:163 ../rules/evdev.xml.in.h:163
+#: ../rules/base.xml.in.h:170 ../rules/evdev.xml.in.h:170
msgid "Czechia"
msgstr "Tjeckien"
-#: ../rules/base.xml.in.h:164 ../rules/evdev.xml.in.h:164
+#: ../rules/base.xml.in.h:171 ../rules/evdev.xml.in.h:171
msgid "DRC"
msgstr "DRC"
-#: ../rules/base.xml.in.h:165 ../rules/evdev.xml.in.h:165
+#: ../rules/base.xml.in.h:172 ../rules/evdev.xml.in.h:172
msgid "DTK2000"
msgstr "DTK2000"
-#: ../rules/base.xml.in.h:166 ../rules/evdev.xml.in.h:166
+#: ../rules/base.xml.in.h:173 ../rules/evdev.xml.in.h:173
msgid "Dan"
msgstr "Dan"
-#: ../rules/base.xml.in.h:167 ../rules/evdev.xml.in.h:167
+#: ../rules/base.xml.in.h:174 ../rules/evdev.xml.in.h:174
msgid "Dead acute"
msgstr "Stum akut accent"
-#: ../rules/base.xml.in.h:168 ../rules/evdev.xml.in.h:168
+#: ../rules/base.xml.in.h:175 ../rules/evdev.xml.in.h:175
msgid "Dead grave acute"
msgstr "Stum grav och akut accent"
-#: ../rules/base.xml.in.h:169 ../rules/evdev.xml.in.h:169
-msgid "Default numeric keypad keys."
-msgstr "Standardtangenter för numeriskt tangentbord."
+#: ../rules/base.xml.in.h:176 ../rules/evdev.xml.in.h:176
+msgid "Default numeric keypad keys"
+msgstr "Standardtangenter för numeriskt tangentbord"
-#: ../rules/base.xml.in.h:170 ../rules/evdev.xml.in.h:170
+#: ../rules/base.xml.in.h:177 ../rules/evdev.xml.in.h:177
msgid "Dell"
msgstr "Dell"
-#: ../rules/base.xml.in.h:171 ../rules/evdev.xml.in.h:171
+#: ../rules/base.xml.in.h:178 ../rules/evdev.xml.in.h:178
msgid "Dell 101-key PC"
msgstr "Dell 101-tangenters PC"
-#: ../rules/base.xml.in.h:172 ../rules/evdev.xml.in.h:172
+#: ../rules/base.xml.in.h:179 ../rules/evdev.xml.in.h:179
msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
msgstr "Bärbar Dell Inspiron 6xxx/8xxx"
-#: ../rules/base.xml.in.h:173 ../rules/evdev.xml.in.h:173
+#: ../rules/base.xml.in.h:180 ../rules/evdev.xml.in.h:180
msgid "Dell Laptop/notebook Precision M series"
msgstr "Bärbar Dell Precision M series"
-#: ../rules/base.xml.in.h:174 ../rules/evdev.xml.in.h:174
+#: ../rules/base.xml.in.h:181 ../rules/evdev.xml.in.h:181
msgid "Dell Latitude series laptop"
msgstr "Bärbar Dell Latitude-serien"
-#: ../rules/base.xml.in.h:175 ../rules/evdev.xml.in.h:175
+#: ../rules/base.xml.in.h:182 ../rules/evdev.xml.in.h:182
msgid "Dell Precision M65"
msgstr "Dell Precision M65"
-#: ../rules/base.xml.in.h:176 ../rules/evdev.xml.in.h:176
+#: ../rules/base.xml.in.h:183 ../rules/evdev.xml.in.h:183
msgid "Dell SK-8125"
msgstr "Dell SK-8125"
-#: ../rules/base.xml.in.h:177 ../rules/evdev.xml.in.h:177
+#: ../rules/base.xml.in.h:184 ../rules/evdev.xml.in.h:184
msgid "Dell SK-8135"
msgstr "Dell SK-8135"
-#: ../rules/base.xml.in.h:178 ../rules/evdev.xml.in.h:178
+#: ../rules/base.xml.in.h:185 ../rules/evdev.xml.in.h:185
msgid "Dell USB Multimedia Keyboard"
msgstr "Dell USB-multimediatangentbord"
-#: ../rules/base.xml.in.h:179 ../rules/evdev.xml.in.h:179
+#: ../rules/base.xml.in.h:186 ../rules/evdev.xml.in.h:186
msgid "Denmark"
msgstr "Danmark"
-#: ../rules/base.xml.in.h:180 ../rules/evdev.xml.in.h:180
+#: ../rules/base.xml.in.h:187 ../rules/evdev.xml.in.h:187
msgid "Deu"
msgstr "Deu"
-#: ../rules/base.xml.in.h:181 ../rules/evdev.xml.in.h:181
+#: ../rules/base.xml.in.h:188 ../rules/evdev.xml.in.h:188
msgid "Dexxa Wireless Desktop Keyboard"
msgstr "Dexxa trådlöst skrivbordstangentbord"
-#: ../rules/base.xml.in.h:182 ../rules/evdev.xml.in.h:182
+#: ../rules/base.xml.in.h:189 ../rules/evdev.xml.in.h:189
msgid "Diamond 9801 / 9802 series"
msgstr "Diamond 9801/9802-serien"
-#: ../rules/base.xml.in.h:183 ../rules/evdev.xml.in.h:183
+#: ../rules/base.xml.in.h:190 ../rules/evdev.xml.in.h:190
msgid "Dvorak"
msgstr "Dvorak"
-#: ../rules/base.xml.in.h:184 ../rules/evdev.xml.in.h:184
+#: ../rules/base.xml.in.h:191 ../rules/evdev.xml.in.h:191
msgid "Dvorak (UK Punctuation)"
msgstr "Dvorak (brittisk-engelska skiljetecken)"
-#: ../rules/base.xml.in.h:185 ../rules/evdev.xml.in.h:185
+#: ../rules/base.xml.in.h:192 ../rules/evdev.xml.in.h:192
msgid "Dvorak international"
msgstr "Dvorak internationell"
-#: ../rules/base.xml.in.h:186 ../rules/evdev.xml.in.h:186
+#: ../rules/base.xml.in.h:193 ../rules/evdev.xml.in.h:193
msgid "Dvorak, Polish quotes on key \"1/!\""
msgstr "Dvorak, polska citattecken på tangent \"1/!\""
-#: ../rules/base.xml.in.h:187 ../rules/evdev.xml.in.h:187
+#: ../rules/base.xml.in.h:194 ../rules/evdev.xml.in.h:194
msgid "Dvorak, Polish quotes on quotemark key"
msgstr "Dvorak, polska citattecken på citattangent"
-#: ../rules/base.xml.in.h:188 ../rules/evdev.xml.in.h:188
+#: ../rules/base.xml.in.h:195 ../rules/evdev.xml.in.h:195
+msgid "E"
+msgstr "E"
+
+#: ../rules/base.xml.in.h:196 ../rules/evdev.xml.in.h:196
msgid "Eastern"
msgstr "Östlig"
-#: ../rules/base.xml.in.h:189 ../rules/evdev.xml.in.h:189
+#: ../rules/base.xml.in.h:197 ../rules/evdev.xml.in.h:197
msgid "Eliminate dead keys"
msgstr "Eliminera stumma tangenter"
-#: ../rules/base.xml.in.h:190 ../rules/evdev.xml.in.h:190
+#: ../rules/base.xml.in.h:198 ../rules/evdev.xml.in.h:198
+msgid "Enable extra typographic characters"
+msgstr "Aktivera extra typografiska tecken"
+
+#: ../rules/base.xml.in.h:199 ../rules/evdev.xml.in.h:199
msgid "Ennyah DKB-1008"
msgstr "Ennyah DKB-1008"
-#: ../rules/base.xml.in.h:191 ../rules/evdev.xml.in.h:191
+#: ../rules/base.xml.in.h:200 ../rules/evdev.xml.in.h:200
msgid "Epo"
msgstr "Epo"
-#: ../rules/base.xml.in.h:192 ../rules/evdev.xml.in.h:192
+#: ../rules/base.xml.in.h:201 ../rules/evdev.xml.in.h:201
msgid "Ergonomic"
msgstr "Ergonomisk"
-#: ../rules/base.xml.in.h:193 ../rules/evdev.xml.in.h:193
+#: ../rules/base.xml.in.h:202 ../rules/evdev.xml.in.h:202
msgid "Esp"
msgstr "Esp"
-#: ../rules/base.xml.in.h:194 ../rules/evdev.xml.in.h:194
+#: ../rules/base.xml.in.h:203 ../rules/evdev.xml.in.h:203
msgid "Esperanto"
msgstr "Esperanto"
-#: ../rules/base.xml.in.h:195 ../rules/evdev.xml.in.h:195
+#: ../rules/base.xml.in.h:204 ../rules/evdev.xml.in.h:204
msgid "Est"
msgstr "Est"
-#: ../rules/base.xml.in.h:196 ../rules/evdev.xml.in.h:196
+#: ../rules/base.xml.in.h:205 ../rules/evdev.xml.in.h:205
msgid "Estonia"
msgstr "Estland"
-#: ../rules/base.xml.in.h:197 ../rules/evdev.xml.in.h:197
+#: ../rules/base.xml.in.h:206 ../rules/evdev.xml.in.h:206
msgid "Eth"
msgstr "Eth"
-#: ../rules/base.xml.in.h:198 ../rules/evdev.xml.in.h:198
+#: ../rules/base.xml.in.h:207 ../rules/evdev.xml.in.h:207
msgid "Ethiopia"
msgstr "Etiopien"
-#: ../rules/base.xml.in.h:199 ../rules/evdev.xml.in.h:199
+#: ../rules/base.xml.in.h:208 ../rules/evdev.xml.in.h:208
msgid "Evdev-managed keyboard"
msgstr "Evdev-hanterat tangentbord"
-#: ../rules/base.xml.in.h:200 ../rules/evdev.xml.in.h:200
+#: ../rules/base.xml.in.h:209 ../rules/evdev.xml.in.h:209
msgid "Everex STEPnote"
msgstr "Everex STEPnote"
-#: ../rules/base.xml.in.h:201 ../rules/evdev.xml.in.h:201
+#: ../rules/base.xml.in.h:210 ../rules/evdev.xml.in.h:210
msgid "Ewe"
msgstr "Ewe"
-#: ../rules/base.xml.in.h:202 ../rules/evdev.xml.in.h:202
+#: ../rules/base.xml.in.h:211 ../rules/evdev.xml.in.h:211
msgid "Extended"
msgstr "Utökad"
-#: ../rules/base.xml.in.h:203 ../rules/evdev.xml.in.h:203
+#: ../rules/base.xml.in.h:212 ../rules/evdev.xml.in.h:212
msgid "Extended Backslash"
msgstr "Utökat omvänt snedstreck"
-#: ../rules/base.xml.in.h:204 ../rules/evdev.xml.in.h:204
+#: ../rules/base.xml.in.h:213 ../rules/evdev.xml.in.h:213
msgid "F-letter (F) variant"
msgstr "F-bokstavs (F) variant"
-#: ../rules/base.xml.in.h:205 ../rules/evdev.xml.in.h:205
+#: ../rules/base.xml.in.h:214 ../rules/evdev.xml.in.h:214
+msgid "FL90"
+msgstr "FL90"
+
+#: ../rules/base.xml.in.h:215 ../rules/evdev.xml.in.h:215
msgid "Fao"
msgstr "Fao"
-#: ../rules/base.xml.in.h:206 ../rules/evdev.xml.in.h:206
+#: ../rules/base.xml.in.h:216 ../rules/evdev.xml.in.h:216
msgid "Faroe Islands"
msgstr "Färöarna"
-#: ../rules/base.xml.in.h:207 ../rules/evdev.xml.in.h:207
+#: ../rules/base.xml.in.h:217 ../rules/evdev.xml.in.h:217
msgid "Fin"
msgstr "Fin"
-#: ../rules/base.xml.in.h:208 ../rules/evdev.xml.in.h:208
+#: ../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:211 ../rules/evdev.xml.in.h:211
+#: ../rules/base.xml.in.h:221 ../rules/evdev.xml.in.h:221
msgid "Four-level key with abstract separators"
msgstr "Fjärdenivåstangent med abstrakta avgränsare"
-#: ../rules/base.xml.in.h:212 ../rules/evdev.xml.in.h:212
+#: ../rules/base.xml.in.h:222 ../rules/evdev.xml.in.h:222
msgid "Four-level key with comma"
msgstr "Fjärdenivåstangent med komma"
-#: ../rules/base.xml.in.h:213 ../rules/evdev.xml.in.h:213
+#: ../rules/base.xml.in.h:223 ../rules/evdev.xml.in.h:223
msgid "Four-level key with dot"
msgstr "Fjärdenivåstangent med punkt"
-#: ../rules/base.xml.in.h:214 ../rules/evdev.xml.in.h:214
+#: ../rules/base.xml.in.h:224 ../rules/evdev.xml.in.h:224
+msgid "Four-level key with dot, latin-9 restriction"
+msgstr "Fjärdenivåstangent med punkt, latin-9-begränsning"
+
+#: ../rules/base.xml.in.h:225 ../rules/evdev.xml.in.h:225
msgid "Four-level key with momayyez"
msgstr "Fjärdenivåstangent med momayyez"
-#: ../rules/base.xml.in.h:215 ../rules/evdev.xml.in.h:215
+#: ../rules/base.xml.in.h:226 ../rules/evdev.xml.in.h:226
msgid "Fra"
msgstr "Fra"
-#: ../rules/base.xml.in.h:216 ../rules/evdev.xml.in.h:216
+#: ../rules/base.xml.in.h:227 ../rules/evdev.xml.in.h:227
msgid "France"
msgstr "Frankrike"
-#: ../rules/base.xml.in.h:217 ../rules/evdev.xml.in.h:217
+#: ../rules/base.xml.in.h:228 ../rules/evdev.xml.in.h:228
msgid "French"
msgstr "Fransk"
-#: ../rules/base.xml.in.h:218 ../rules/evdev.xml.in.h:218
+#: ../rules/base.xml.in.h:229 ../rules/evdev.xml.in.h:229
msgid "French (Macintosh)"
msgstr "Fransk (Macintosh)"
-#: ../rules/base.xml.in.h:219 ../rules/evdev.xml.in.h:219
+#: ../rules/base.xml.in.h:230 ../rules/evdev.xml.in.h:230
msgid "French (legacy)"
msgstr "Fransk (äldre)"
-#: ../rules/base.xml.in.h:220 ../rules/evdev.xml.in.h:220
+#: ../rules/base.xml.in.h:231 ../rules/evdev.xml.in.h:231
msgid "French Dvorak"
msgstr "Fransk Dvorak"
-#: ../rules/base.xml.in.h:221 ../rules/evdev.xml.in.h:221
+#: ../rules/base.xml.in.h:232 ../rules/evdev.xml.in.h:232
msgid "French, Sun dead keys"
msgstr "Fransk, Sun stumma tangenter"
-#: ../rules/base.xml.in.h:222 ../rules/evdev.xml.in.h:222
+#: ../rules/base.xml.in.h:233 ../rules/evdev.xml.in.h:233
msgid "French, eliminate dead keys"
msgstr "Fransk, eliminera stumma tangenter"
-#: ../rules/base.xml.in.h:223 ../rules/evdev.xml.in.h:223
-msgid "Fujitsu-Siemens Computers AMILO A1667G laptop"
-msgstr "Fujitsu-Siemens Computers AMILO A1667G"
+#: ../rules/base.xml.in.h:234 ../rules/evdev.xml.in.h:234
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Fujitsu-Siemens Computers AMILO bärbar dator"
-#: ../rules/base.xml.in.h:224 ../rules/evdev.xml.in.h:224
+#: ../rules/base.xml.in.h:235 ../rules/evdev.xml.in.h:235
msgid "Fula"
msgstr "Fula"
-#: ../rules/base.xml.in.h:225 ../rules/evdev.xml.in.h:225
+#: ../rules/base.xml.in.h:236 ../rules/evdev.xml.in.h:236
msgid "GBr"
msgstr "GBr"
-#: ../rules/base.xml.in.h:226 ../rules/evdev.xml.in.h:226
+#: ../rules/base.xml.in.h:237 ../rules/evdev.xml.in.h:237
msgid "Ga"
msgstr "Ga"
-#: ../rules/base.xml.in.h:227 ../rules/evdev.xml.in.h:227
+#: ../rules/base.xml.in.h:238 ../rules/evdev.xml.in.h:238
msgid "Generic 101-key PC"
msgstr "Allmän 101-tangenters PC"
-#: ../rules/base.xml.in.h:228 ../rules/evdev.xml.in.h:228
+#: ../rules/base.xml.in.h:239 ../rules/evdev.xml.in.h:239
msgid "Generic 102-key (Intl) PC"
msgstr "Allmän 102-tangenters (internationell) PC"
-#: ../rules/base.xml.in.h:229 ../rules/evdev.xml.in.h:229
+#: ../rules/base.xml.in.h:240 ../rules/evdev.xml.in.h:240
msgid "Generic 104-key PC"
msgstr "Allmän 104-tangenters PC"
-#: ../rules/base.xml.in.h:230 ../rules/evdev.xml.in.h:230
+#: ../rules/base.xml.in.h:241 ../rules/evdev.xml.in.h:241
msgid "Generic 105-key (Intl) PC"
msgstr "Allmän 105-tangenters (internationell) PC"
-#: ../rules/base.xml.in.h:231 ../rules/evdev.xml.in.h:231
+#: ../rules/base.xml.in.h:242 ../rules/evdev.xml.in.h:242
msgid "Genius Comfy KB-12e"
msgstr "Genius Comfy KB-12e"
-#: ../rules/base.xml.in.h:232 ../rules/evdev.xml.in.h:232
+#: ../rules/base.xml.in.h:243 ../rules/evdev.xml.in.h:243
msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
msgstr "Genius Comfy KB-16M / Genius MM-tangentbord KWD-910"
-#: ../rules/base.xml.in.h:233 ../rules/evdev.xml.in.h:233
+#: ../rules/base.xml.in.h:244 ../rules/evdev.xml.in.h:244
msgid "Genius Comfy KB-21e-Scroll"
msgstr "Genius Comfy KB-21e-Scroll"
-#: ../rules/base.xml.in.h:234 ../rules/evdev.xml.in.h:234
+#: ../rules/base.xml.in.h:245 ../rules/evdev.xml.in.h:245
msgid "Genius KB-19e NB"
msgstr "Genius KB-19e NB"
-#: ../rules/base.xml.in.h:235 ../rules/evdev.xml.in.h:235
+#: ../rules/base.xml.in.h:246 ../rules/evdev.xml.in.h:246
msgid "Geo"
msgstr "Geo"
-#: ../rules/base.xml.in.h:236 ../rules/evdev.xml.in.h:236
+#: ../rules/base.xml.in.h:247 ../rules/evdev.xml.in.h:247
msgid "Georgia"
msgstr "Georgien"
-#: ../rules/base.xml.in.h:237 ../rules/evdev.xml.in.h:237
+#: ../rules/base.xml.in.h:248 ../rules/evdev.xml.in.h:248
msgid "Georgian"
msgstr "Georgisk"
-#: ../rules/base.xml.in.h:238 ../rules/evdev.xml.in.h:238
+#: ../rules/base.xml.in.h:249 ../rules/evdev.xml.in.h:249
msgid "Georgian AZERTY Tskapo"
msgstr "Georgian AZERTY Tskapo"
-#: ../rules/base.xml.in.h:239 ../rules/evdev.xml.in.h:239
+#: ../rules/base.xml.in.h:250 ../rules/evdev.xml.in.h:250
msgid "German (Macintosh)"
msgstr "Tysk (Macintosh)"
-#: ../rules/base.xml.in.h:240 ../rules/evdev.xml.in.h:240
+#: ../rules/base.xml.in.h:251 ../rules/evdev.xml.in.h:251
msgid "German, Sun dead keys"
msgstr "Tysk, Sun stumma tangenter"
-#: ../rules/base.xml.in.h:241 ../rules/evdev.xml.in.h:241
+#: ../rules/base.xml.in.h:252 ../rules/evdev.xml.in.h:252
msgid "German, eliminate dead keys"
msgstr "Tysk, eliminera stumma tangenter"
-#: ../rules/base.xml.in.h:242 ../rules/evdev.xml.in.h:242
+#: ../rules/base.xml.in.h:253 ../rules/evdev.xml.in.h:253
msgid "Germany"
msgstr "Tyskland"
-#: ../rules/base.xml.in.h:243 ../rules/evdev.xml.in.h:243
+#: ../rules/base.xml.in.h:254 ../rules/evdev.xml.in.h:254
msgid "Gha"
msgstr "Gha"
-#: ../rules/base.xml.in.h:244 ../rules/evdev.xml.in.h:244
+#: ../rules/base.xml.in.h:255 ../rules/evdev.xml.in.h:255
msgid "Ghana"
msgstr "Ghana"
-#: ../rules/base.xml.in.h:245 ../rules/evdev.xml.in.h:245
+#: ../rules/base.xml.in.h:256 ../rules/evdev.xml.in.h:256
msgid "Gre"
msgstr "Gre"
-#: ../rules/base.xml.in.h:246 ../rules/evdev.xml.in.h:246
+#: ../rules/base.xml.in.h:257 ../rules/evdev.xml.in.h:257
msgid "Greece"
msgstr "Grekland"
-#: ../rules/base.xml.in.h:247 ../rules/evdev.xml.in.h:247
+#: ../rules/base.xml.in.h:258 ../rules/evdev.xml.in.h:258
msgid "Group toggle on multiply/divide key"
msgstr "Gruppväxling på multiplicera/dividera-tangent"
-#: ../rules/base.xml.in.h:248 ../rules/evdev.xml.in.h:248
+#: ../rules/base.xml.in.h:259 ../rules/evdev.xml.in.h:259
msgid "Gui"
msgstr "Gui"
-#: ../rules/base.xml.in.h:249 ../rules/evdev.xml.in.h:249
+#: ../rules/base.xml.in.h:260 ../rules/evdev.xml.in.h:260
msgid "Guinea"
msgstr "Guinea"
-#: ../rules/base.xml.in.h:250 ../rules/evdev.xml.in.h:250
+#: ../rules/base.xml.in.h:261 ../rules/evdev.xml.in.h:261
msgid "Gujarati"
msgstr "Gujaratisk"
-#: ../rules/base.xml.in.h:251 ../rules/evdev.xml.in.h:251
+#: ../rules/base.xml.in.h:262 ../rules/evdev.xml.in.h:262
msgid "Gurmukhi"
msgstr "Gurmukhisk"
-#: ../rules/base.xml.in.h:252 ../rules/evdev.xml.in.h:252
+#: ../rules/base.xml.in.h:263 ../rules/evdev.xml.in.h:263
msgid "Gurmukhi Jhelum"
msgstr "Gurmukhi Jhelum"
-#: ../rules/base.xml.in.h:253 ../rules/evdev.xml.in.h:253
+#: ../rules/base.xml.in.h:264 ../rules/evdev.xml.in.h:264
msgid "Gyration"
msgstr "Gyration"
-#: ../rules/base.xml.in.h:254 ../rules/evdev.xml.in.h:254
+#: ../rules/base.xml.in.h:265 ../rules/evdev.xml.in.h:265
msgid "Happy Hacking Keyboard"
msgstr "Happy Hacking-tangentbord"
-#: ../rules/base.xml.in.h:255 ../rules/evdev.xml.in.h:255
+#: ../rules/base.xml.in.h:266 ../rules/evdev.xml.in.h:266
msgid "Happy Hacking Keyboard for Mac"
msgstr "Happy Hacking-tangentbord för Mac"
-#: ../rules/base.xml.in.h:256 ../rules/evdev.xml.in.h:256
+#: ../rules/base.xml.in.h:267 ../rules/evdev.xml.in.h:267
msgid "Hausa"
msgstr "Hausa"
-#: ../rules/base.xml.in.h:257 ../rules/evdev.xml.in.h:257
+#: ../rules/base.xml.in.h:268 ../rules/evdev.xml.in.h:268
msgid "Hewlett-Packard Internet Keyboard"
msgstr "Hewlett-Packard Internettangentbord"
-#: ../rules/base.xml.in.h:258 ../rules/evdev.xml.in.h:258
-msgid "Hewlett-Packard Internet Keyboard 5181"
-msgstr "Hewlett-Packard Internet Keyboard 5181"
-
-#: ../rules/base.xml.in.h:259 ../rules/evdev.xml.in.h:259
-msgid "Hewlett-Packard Internet Keyboard 5185"
-msgstr "Hewlett-Packard Internet Keyboard 5185"
-
-#: ../rules/base.xml.in.h:260 ../rules/evdev.xml.in.h:260
+#: ../rules/base.xml.in.h:269 ../rules/evdev.xml.in.h:269
msgid "Hewlett-Packard Omnibook 500 FA"
msgstr "Hewlett-Packard Omnibook 500 FA"
-#: ../rules/base.xml.in.h:261 ../rules/evdev.xml.in.h:261
+#: ../rules/base.xml.in.h:270 ../rules/evdev.xml.in.h:270
msgid "Hewlett-Packard Omnibook 5xx"
msgstr "Hewlett-Packard Omnibook 5xx"
-#: ../rules/base.xml.in.h:262 ../rules/evdev.xml.in.h:262
+#: ../rules/base.xml.in.h:271 ../rules/evdev.xml.in.h:271
msgid "Hewlett-Packard Omnibook 6000/6100"
msgstr "Hewlett-Packard Omnibook 6000/6100"
-#: ../rules/base.xml.in.h:263 ../rules/evdev.xml.in.h:263
+#: ../rules/base.xml.in.h:272 ../rules/evdev.xml.in.h:272
msgid "Hewlett-Packard Omnibook XE3 GC"
msgstr "Hewlett-Packard Omnibook XE3 GC"
-#: ../rules/base.xml.in.h:264 ../rules/evdev.xml.in.h:264
+#: ../rules/base.xml.in.h:273 ../rules/evdev.xml.in.h:273
msgid "Hewlett-Packard Omnibook XE3 GF"
msgstr "Hewlett-Packard Omnibook XE3 GF"
-#: ../rules/base.xml.in.h:265 ../rules/evdev.xml.in.h:265
+#: ../rules/base.xml.in.h:274 ../rules/evdev.xml.in.h:274
msgid "Hewlett-Packard Omnibook XT1000"
msgstr "Hewlett-Packard Omnibook XT1000"
-#: ../rules/base.xml.in.h:266 ../rules/evdev.xml.in.h:266
+#: ../rules/base.xml.in.h:275 ../rules/evdev.xml.in.h:275
msgid "Hewlett-Packard Pavilion ZT11xx"
msgstr "Hewlett-Packard Pavilion ZT11xx"
-#: ../rules/base.xml.in.h:267 ../rules/evdev.xml.in.h:267
-msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-2501 multimediatangentbord"
+#: ../rules/base.xml.in.h:276 ../rules/evdev.xml.in.h:276
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
-#: ../rules/base.xml.in.h:268 ../rules/evdev.xml.in.h:268
-msgid "Hewlett-Packard SK-2505 Internet Keyboard"
-msgstr "Hewlett-Packard SK-2505 Internettangentbord"
+#: ../rules/base.xml.in.h:277 ../rules/evdev.xml.in.h:277
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-250x Multimedia Keyboard"
-#: ../rules/base.xml.in.h:269 ../rules/evdev.xml.in.h:269
+#: ../rules/base.xml.in.h:278 ../rules/evdev.xml.in.h:278
msgid "Hewlett-Packard nx9020"
msgstr "Hewlett-Packard nx9020"
-#: ../rules/base.xml.in.h:270 ../rules/evdev.xml.in.h:270
+#: ../rules/base.xml.in.h:279 ../rules/evdev.xml.in.h:279
+msgid "Hexadecimal"
+msgstr "Hexadecimal"
+
+#: ../rules/base.xml.in.h:280 ../rules/evdev.xml.in.h:280
msgid "Hindi Bolnagri"
msgstr "Hindi bolnagri"
-#: ../rules/base.xml.in.h:271 ../rules/evdev.xml.in.h:271
+#: ../rules/base.xml.in.h:281 ../rules/evdev.xml.in.h:281
msgid "Homophonic"
msgstr "Homofonisk"
-#: ../rules/base.xml.in.h:272 ../rules/evdev.xml.in.h:272
+#: ../rules/base.xml.in.h:282 ../rules/evdev.xml.in.h:282
msgid "Honeywell Euroboard"
msgstr "Honeywell Euroboard"
-#: ../rules/base.xml.in.h:273 ../rules/evdev.xml.in.h:273
+#: ../rules/base.xml.in.h:283 ../rules/evdev.xml.in.h:283
msgid "Hrv"
msgstr "Hrv"
-#: ../rules/base.xml.in.h:274 ../rules/evdev.xml.in.h:274
+#: ../rules/base.xml.in.h:284 ../rules/evdev.xml.in.h:284
msgid "Hun"
msgstr "Hun"
-#: ../rules/base.xml.in.h:275 ../rules/evdev.xml.in.h:275
+#: ../rules/base.xml.in.h:285 ../rules/evdev.xml.in.h:285
msgid "Hungary"
msgstr "Ungern"
-#: ../rules/base.xml.in.h:276 ../rules/evdev.xml.in.h:276
-msgid "Hyper is mapped to the Win-keys."
-msgstr "Hyper är mappat till Win-tangenterna."
+#: ../rules/base.xml.in.h:286 ../rules/evdev.xml.in.h:286
+msgid "Hyper is mapped to Win-keys"
+msgstr "Hyper är mappad till Win-tangenterna"
-#: ../rules/base.xml.in.h:277 ../rules/evdev.xml.in.h:277
+#: ../rules/base.xml.in.h:287 ../rules/evdev.xml.in.h:287
msgid "IBM (LST 1205-92)"
msgstr "IBM (LST 1205-92)"
-#: ../rules/base.xml.in.h:278 ../rules/evdev.xml.in.h:278
+#: ../rules/base.xml.in.h:288 ../rules/evdev.xml.in.h:288
msgid "IBM Rapid Access"
msgstr "IBM Rapid Access"
-#: ../rules/base.xml.in.h:279 ../rules/evdev.xml.in.h:279
+#: ../rules/base.xml.in.h:289 ../rules/evdev.xml.in.h:289
msgid "IBM Rapid Access II"
msgstr "IBM Rapid Access II"
-#: ../rules/base.xml.in.h:280 ../rules/evdev.xml.in.h:280
-msgid "IBM Rapid Access II (alternate option)"
-msgstr "IBM Rapid Access II (alternativ)"
-
-#: ../rules/base.xml.in.h:281 ../rules/evdev.xml.in.h:281
+#: ../rules/base.xml.in.h:290 ../rules/evdev.xml.in.h:290
msgid "IBM Space Saver"
msgstr "IBM Space Saver"
-#: ../rules/base.xml.in.h:282 ../rules/evdev.xml.in.h:282
+#: ../rules/base.xml.in.h:291 ../rules/evdev.xml.in.h:291
msgid "IBM ThinkPad 560Z/600/600E/A22E"
msgstr "IBM ThinkPad 560Z/600/600E/A22E"
-#: ../rules/base.xml.in.h:283 ../rules/evdev.xml.in.h:283
+#: ../rules/base.xml.in.h:292 ../rules/evdev.xml.in.h:292
msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-#: ../rules/base.xml.in.h:284 ../rules/evdev.xml.in.h:284
+#: ../rules/base.xml.in.h:293 ../rules/evdev.xml.in.h:293
msgid "IBM ThinkPad R60/T60/R61/T61"
msgstr "IBM ThinkPad R60/T60/R61/T61"
-#: ../rules/base.xml.in.h:285 ../rules/evdev.xml.in.h:285
+#: ../rules/base.xml.in.h:294 ../rules/evdev.xml.in.h:294
msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
-#: ../rules/base.xml.in.h:286 ../rules/evdev.xml.in.h:286
+#: ../rules/base.xml.in.h:295 ../rules/evdev.xml.in.h:295
msgid "ISO Alternate"
msgstr "ISO-alternativ"
-#: ../rules/base.xml.in.h:287 ../rules/evdev.xml.in.h:287
+#: ../rules/base.xml.in.h:296 ../rules/evdev.xml.in.h:296
msgid "Iceland"
msgstr "Island"
-#: ../rules/base.xml.in.h:288 ../rules/evdev.xml.in.h:288
+#: ../rules/base.xml.in.h:297 ../rules/evdev.xml.in.h:297
msgid "Igbo"
msgstr "Igbo"
-#: ../rules/base.xml.in.h:289 ../rules/evdev.xml.in.h:289
+#: ../rules/base.xml.in.h:298 ../rules/evdev.xml.in.h:298
+msgid "Include dead tilde"
+msgstr "Inkludera dött tilde-tecken"
+
+#: ../rules/base.xml.in.h:299 ../rules/evdev.xml.in.h:299
msgid "Ind"
msgstr "Ind"
-#: ../rules/base.xml.in.h:290 ../rules/evdev.xml.in.h:290
+#: ../rules/base.xml.in.h:300 ../rules/evdev.xml.in.h:300
msgid "India"
msgstr "Indien"
-#: ../rules/base.xml.in.h:291 ../rules/evdev.xml.in.h:291
+#: ../rules/base.xml.in.h:301 ../rules/evdev.xml.in.h:301
msgid "International (AltGr dead keys)"
msgstr "Internationell (AltGr med stumma tangenter)"
-#: ../rules/base.xml.in.h:292 ../rules/evdev.xml.in.h:292
+#: ../rules/base.xml.in.h:302 ../rules/evdev.xml.in.h:302
msgid "International (with dead keys)"
msgstr "Internationell (med stumma tangenter)"
-#: ../rules/base.xml.in.h:293 ../rules/evdev.xml.in.h:293
+#: ../rules/base.xml.in.h:303 ../rules/evdev.xml.in.h:303
msgid "Inuktitut"
msgstr "Inuktitut"
-#: ../rules/base.xml.in.h:294 ../rules/evdev.xml.in.h:294
+#: ../rules/base.xml.in.h:304 ../rules/evdev.xml.in.h:304
msgid "Iran"
msgstr "Iran"
-#: ../rules/base.xml.in.h:295 ../rules/evdev.xml.in.h:295
+#: ../rules/base.xml.in.h:305 ../rules/evdev.xml.in.h:305
msgid "Iraq"
msgstr "Irak"
-#: ../rules/base.xml.in.h:296 ../rules/evdev.xml.in.h:296
+#: ../rules/base.xml.in.h:306 ../rules/evdev.xml.in.h:306
msgid "Ireland"
msgstr "Irland"
-#: ../rules/base.xml.in.h:297 ../rules/evdev.xml.in.h:297
+#: ../rules/base.xml.in.h:307 ../rules/evdev.xml.in.h:307
msgid "Irl"
msgstr "Irl"
-#: ../rules/base.xml.in.h:298 ../rules/evdev.xml.in.h:298
+#: ../rules/base.xml.in.h:308 ../rules/evdev.xml.in.h:308
msgid "Irn"
msgstr "Irn"
-#: ../rules/base.xml.in.h:299 ../rules/evdev.xml.in.h:299
+#: ../rules/base.xml.in.h:309 ../rules/evdev.xml.in.h:309
msgid "Irq"
msgstr "Irk"
-#: ../rules/base.xml.in.h:300 ../rules/evdev.xml.in.h:300
+#: ../rules/base.xml.in.h:310 ../rules/evdev.xml.in.h:310
msgid "Isl"
msgstr "Isl"
-#: ../rules/base.xml.in.h:301 ../rules/evdev.xml.in.h:301
+#: ../rules/base.xml.in.h:311 ../rules/evdev.xml.in.h:311
msgid "Isr"
msgstr "Isr"
-#: ../rules/base.xml.in.h:302 ../rules/evdev.xml.in.h:302
+#: ../rules/base.xml.in.h:312 ../rules/evdev.xml.in.h:312
msgid "Israel"
msgstr "Israel"
-#: ../rules/base.xml.in.h:303 ../rules/evdev.xml.in.h:303
+#: ../rules/base.xml.in.h:313 ../rules/evdev.xml.in.h:313
msgid "Ita"
msgstr "Ita"
-#: ../rules/base.xml.in.h:304 ../rules/evdev.xml.in.h:304
+#: ../rules/base.xml.in.h:314 ../rules/evdev.xml.in.h:314
msgid "Italy"
msgstr "Italien"
-#: ../rules/base.xml.in.h:305 ../rules/evdev.xml.in.h:305
+#: ../rules/base.xml.in.h:315 ../rules/evdev.xml.in.h:315
msgid "Japan"
msgstr "Japan"
-#: ../rules/base.xml.in.h:306 ../rules/evdev.xml.in.h:306
+#: ../rules/base.xml.in.h:316 ../rules/evdev.xml.in.h:316
msgid "Japan (PC-98xx Series)"
msgstr "Japan (PC-98xx-serien)"
-#: ../rules/base.xml.in.h:307 ../rules/evdev.xml.in.h:307
+#: ../rules/base.xml.in.h:317 ../rules/evdev.xml.in.h:317
msgid "Japanese 106-key"
msgstr "Japansk 106-tangenters"
-#: ../rules/base.xml.in.h:308 ../rules/evdev.xml.in.h:308
+#: ../rules/base.xml.in.h:318 ../rules/evdev.xml.in.h:318
msgid "Japanese keyboard options"
msgstr "Tangentbordsalternativ för japanska"
-#: ../rules/base.xml.in.h:309 ../rules/evdev.xml.in.h:309
+#: ../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 "Kalmyk"
+
# Även kanaresisk (äldre form)
-#: ../rules/base.xml.in.h:310 ../rules/evdev.xml.in.h:310
+#: ../rules/base.xml.in.h:321 ../rules/evdev.xml.in.h:321
msgid "Kana"
msgstr "Kana"
-#: ../rules/base.xml.in.h:311 ../rules/evdev.xml.in.h:311
+#: ../rules/base.xml.in.h:322 ../rules/evdev.xml.in.h:322
msgid "Kana Lock key is locking"
msgstr "Kana Lock-tangent låser"
# Även kanaresisk (äldre form)
-#: ../rules/base.xml.in.h:312 ../rules/evdev.xml.in.h:312
+#: ../rules/base.xml.in.h:323 ../rules/evdev.xml.in.h:323
msgid "Kannada"
msgstr "Kannada"
-#: ../rules/base.xml.in.h:313 ../rules/evdev.xml.in.h:313
+#: ../rules/base.xml.in.h:324 ../rules/evdev.xml.in.h:324
msgid "Kashubian"
msgstr "Kashubian"
-#: ../rules/base.xml.in.h:314 ../rules/evdev.xml.in.h:314
+#: ../rules/base.xml.in.h:325 ../rules/evdev.xml.in.h:325
msgid "Kaz"
msgstr "Kaz"
-#: ../rules/base.xml.in.h:315 ../rules/evdev.xml.in.h:315
+#: ../rules/base.xml.in.h:326 ../rules/evdev.xml.in.h:326
msgid "Kazakh with Russian"
msgstr "Kazakisk med ryska"
-#: ../rules/base.xml.in.h:316 ../rules/evdev.xml.in.h:316
+#: ../rules/base.xml.in.h:327 ../rules/evdev.xml.in.h:327
msgid "Kazakhstan"
msgstr "Kazakstan"
-#: ../rules/base.xml.in.h:317 ../rules/evdev.xml.in.h:317
-msgid "Keypad"
-msgstr "Knappsats"
+#: ../rules/base.xml.in.h:328 ../rules/evdev.xml.in.h:328
+msgid "Key to choose 3rd level"
+msgstr "Tangent för att välja tredje nivå"
-#: ../rules/base.xml.in.h:318 ../rules/evdev.xml.in.h:318
-msgid "Keypad with unicode additions (arrows and math operators)"
-msgstr "Numeriskt tangentbord med unicode-tillägg (pilar och matematikoperatorer)"
+#: ../rules/base.xml.in.h:329 ../rules/evdev.xml.in.h:329
+msgid "Key(s) to change layout"
+msgstr "Tangent(er) för att byta layout"
-#: ../rules/base.xml.in.h:319 ../rules/evdev.xml.in.h:319
-msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Numeriskt tangentbord med unicode-tillägg (pilar och matematikoperatorer). Matematikoperatorer på standardnivå."
+#: ../rules/base.xml.in.h:330 ../rules/evdev.xml.in.h:330
+msgid "Keypad"
+msgstr "Knappsats"
-#: ../rules/base.xml.in.h:320 ../rules/evdev.xml.in.h:320
+#: ../rules/base.xml.in.h:331 ../rules/evdev.xml.in.h:331
msgid "Keytronic FlexPro"
msgstr "Keytronic FlexPro"
-#: ../rules/base.xml.in.h:321 ../rules/evdev.xml.in.h:321
+#: ../rules/base.xml.in.h:332 ../rules/evdev.xml.in.h:332
msgid "Khm"
msgstr "Khm"
-#: ../rules/base.xml.in.h:322 ../rules/evdev.xml.in.h:322
+#: ../rules/base.xml.in.h:333 ../rules/evdev.xml.in.h:333
msgid "Kir"
msgstr "Kir"
-#: ../rules/base.xml.in.h:323 ../rules/evdev.xml.in.h:323
+#: ../rules/base.xml.in.h:334 ../rules/evdev.xml.in.h:334
msgid "Komi"
msgstr "Komi"
-#: ../rules/base.xml.in.h:324 ../rules/evdev.xml.in.h:324
+#: ../rules/base.xml.in.h:335 ../rules/evdev.xml.in.h:335
msgid "Kor"
msgstr "Kor"
-#: ../rules/base.xml.in.h:325 ../rules/evdev.xml.in.h:325
+#: ../rules/base.xml.in.h:336 ../rules/evdev.xml.in.h:336
msgid "Korea, Republic of"
msgstr "Korea, Republiken"
-#: ../rules/base.xml.in.h:326 ../rules/evdev.xml.in.h:326
+#: ../rules/base.xml.in.h:337 ../rules/evdev.xml.in.h:337
msgid "Korean 106-key"
msgstr "Koreansk 106-tangenters"
-#: ../rules/base.xml.in.h:327 ../rules/evdev.xml.in.h:327
+#: ../rules/base.xml.in.h:338 ../rules/evdev.xml.in.h:338
msgid "Ktunaxa"
msgstr "Ktunaxa"
-#: ../rules/base.xml.in.h:328 ../rules/evdev.xml.in.h:328
+#: ../rules/base.xml.in.h:339 ../rules/evdev.xml.in.h:339
msgid "Kurdish, (F)"
msgstr "Kurdisk, (F)"
-#: ../rules/base.xml.in.h:329 ../rules/evdev.xml.in.h:329
+#: ../rules/base.xml.in.h:340 ../rules/evdev.xml.in.h:340
msgid "Kurdish, Arabic-Latin"
msgstr "Kurdisk, Arabisk-Latin"
-#: ../rules/base.xml.in.h:330 ../rules/evdev.xml.in.h:330
+#: ../rules/base.xml.in.h:341 ../rules/evdev.xml.in.h:341
msgid "Kurdish, Latin Alt-Q"
msgstr "Kurdisk, Latin Alt-Q"
-#: ../rules/base.xml.in.h:331 ../rules/evdev.xml.in.h:331
+#: ../rules/base.xml.in.h:342 ../rules/evdev.xml.in.h:342
msgid "Kurdish, Latin Q"
msgstr "Kurdisk, Latin Q"
-#: ../rules/base.xml.in.h:332 ../rules/evdev.xml.in.h:332
+#: ../rules/base.xml.in.h:343 ../rules/evdev.xml.in.h:343
msgid "Kyrgyzstan"
msgstr "Kirgizistan"
-#: ../rules/base.xml.in.h:333 ../rules/evdev.xml.in.h:333
+#: ../rules/base.xml.in.h:344 ../rules/evdev.xml.in.h:344
msgid "LAm"
msgstr "LAm"
-#: ../rules/base.xml.in.h:334 ../rules/evdev.xml.in.h:334
-msgid "LCtrl+LShift change layout."
-msgstr "Vänster Ctrl + vänster Skift byter layout."
-
-#: ../rules/base.xml.in.h:335 ../rules/evdev.xml.in.h:335
+#: ../rules/base.xml.in.h:345 ../rules/evdev.xml.in.h:345
msgid "LEKP"
msgstr "LEKP"
-#: ../rules/base.xml.in.h:336 ../rules/evdev.xml.in.h:336
+#: ../rules/base.xml.in.h:346 ../rules/evdev.xml.in.h:346
msgid "LEKPa"
msgstr "LEKPa"
-#: ../rules/base.xml.in.h:337 ../rules/evdev.xml.in.h:337
+#: ../rules/base.xml.in.h:347 ../rules/evdev.xml.in.h:347
msgid "Lao"
msgstr "Lao"
-#: ../rules/base.xml.in.h:338 ../rules/evdev.xml.in.h:338
+#: ../rules/base.xml.in.h:348 ../rules/evdev.xml.in.h:348
msgid "Laos"
msgstr "Laos"
-#: ../rules/base.xml.in.h:339 ../rules/evdev.xml.in.h:339
+#: ../rules/base.xml.in.h:349 ../rules/evdev.xml.in.h:349
msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
msgstr "Laptop-tangentbord för bärbar Compaq-dator (t.ex. Armada)"
-#: ../rules/base.xml.in.h:340 ../rules/evdev.xml.in.h:340
+#: ../rules/base.xml.in.h:350 ../rules/evdev.xml.in.h:350
msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
msgstr "Internettangentbord för bärbar Compaq-dator (t.ex. Presario)"
-#: ../rules/base.xml.in.h:341 ../rules/evdev.xml.in.h:341
+#: ../rules/base.xml.in.h:351 ../rules/evdev.xml.in.h:351
msgid "Laptop/notebook eMachines m68xx"
msgstr "Bärbar eMachines m68xx"
-#: ../rules/base.xml.in.h:342 ../rules/evdev.xml.in.h:342
+#: ../rules/base.xml.in.h:352 ../rules/evdev.xml.in.h:352
msgid "Latin"
msgstr "Latin"
-#: ../rules/base.xml.in.h:343 ../rules/evdev.xml.in.h:343
+#: ../rules/base.xml.in.h:353 ../rules/evdev.xml.in.h:353
msgid "Latin American"
msgstr "Latin Amerikansk"
-#: ../rules/base.xml.in.h:344 ../rules/evdev.xml.in.h:344
+#: ../rules/base.xml.in.h:354 ../rules/evdev.xml.in.h:354
msgid "Latin Unicode"
msgstr "Latin Unicode"
-#: ../rules/base.xml.in.h:345 ../rules/evdev.xml.in.h:345
+#: ../rules/base.xml.in.h:355 ../rules/evdev.xml.in.h:355
msgid "Latin Unicode qwerty"
msgstr "Latin Unicode qwerty"
-#: ../rules/base.xml.in.h:346 ../rules/evdev.xml.in.h:346
+#: ../rules/base.xml.in.h:356 ../rules/evdev.xml.in.h:356
msgid "Latin qwerty"
msgstr "Latin qwerty"
-#: ../rules/base.xml.in.h:347 ../rules/evdev.xml.in.h:347
+#: ../rules/base.xml.in.h:357 ../rules/evdev.xml.in.h:357
msgid "Latin unicode"
msgstr "Latin unicode"
-#: ../rules/base.xml.in.h:348 ../rules/evdev.xml.in.h:348
+#: ../rules/base.xml.in.h:358 ../rules/evdev.xml.in.h:358
msgid "Latin unicode qwerty"
msgstr "Latin unicode qwerty"
-#: ../rules/base.xml.in.h:349 ../rules/evdev.xml.in.h:349
+#: ../rules/base.xml.in.h:359 ../rules/evdev.xml.in.h:359
msgid "Latin with guillemets"
msgstr "Latin med gåsögon"
-#: ../rules/base.xml.in.h:350 ../rules/evdev.xml.in.h:350
+#: ../rules/base.xml.in.h:360 ../rules/evdev.xml.in.h:360
msgid "Latvia"
msgstr "Lettland"
-#: ../rules/base.xml.in.h:351 ../rules/evdev.xml.in.h:351
+#: ../rules/base.xml.in.h:361 ../rules/evdev.xml.in.h:361
msgid "Lav"
msgstr "Lav"
-#: ../rules/base.xml.in.h:352 ../rules/evdev.xml.in.h:352
-msgid "Layout switching"
-msgstr "Layoutväxling"
+#: ../rules/base.xml.in.h:362 ../rules/evdev.xml.in.h:362
+msgid "Left Alt"
+msgstr "Vänster alt"
-#: ../rules/base.xml.in.h:353 ../rules/evdev.xml.in.h:353
-msgid "Left Alt is swapped with left Win-key."
-msgstr "Vänster Alt är mappat till vänster Win-tangent."
+#: ../rules/base.xml.in.h:363 ../rules/evdev.xml.in.h:363
+msgid "Left Alt (while pressed)"
+msgstr "Vänster Alt (då den trycks ned)"
-#: ../rules/base.xml.in.h:354 ../rules/evdev.xml.in.h:354
-msgid "Left Alt key changes layout."
-msgstr "Vänster Alt-tangent byter layout."
+#: ../rules/base.xml.in.h:364 ../rules/evdev.xml.in.h:364
+msgid "Left Alt is swapped with Left Win"
+msgstr "Vänster Alt är utbytt med vänster Win-tangent"
-#: ../rules/base.xml.in.h:355 ../rules/evdev.xml.in.h:355
-msgid "Left Alt key switches layout while pressed."
-msgstr "Vänster Alt-tangent byter layout då den trycks ned."
+#: ../rules/base.xml.in.h:365 ../rules/evdev.xml.in.h:365
+msgid "Left Ctrl"
+msgstr "Vänster Ctrl"
-#: ../rules/base.xml.in.h:356 ../rules/evdev.xml.in.h:356
-msgid "Left Ctrl key changes layout."
-msgstr "Vänster Ctrl-tangent byter layout."
+#: ../rules/base.xml.in.h:366 ../rules/evdev.xml.in.h:366
+msgid "Left Ctrl+Left Shift"
+msgstr "Vänster ctrl+vänster skift"
-#: ../rules/base.xml.in.h:357 ../rules/evdev.xml.in.h:357
-msgid "Left Shift key changes layout."
-msgstr "Vänster Skift-tangent byter layout."
+#: ../rules/base.xml.in.h:367 ../rules/evdev.xml.in.h:367
+msgid "Left Shift"
+msgstr "Vänster skift"
-#: ../rules/base.xml.in.h:358 ../rules/evdev.xml.in.h:358
-msgid "Left Win-key changes layout."
-msgstr "Vänster Win-tangent byter layout."
+#: ../rules/base.xml.in.h:368 ../rules/evdev.xml.in.h:368
+msgid "Left Win"
+msgstr "Vänster Win-tangent"
-#: ../rules/base.xml.in.h:359 ../rules/evdev.xml.in.h:359
-msgid "Left Win-key is Compose."
-msgstr "Vänster Win-tangent är Compose."
+#: ../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 "Vänster Win (till första layouten), Höger Win/Meny (till sista layouten)"
-#: ../rules/base.xml.in.h:360 ../rules/evdev.xml.in.h:360
-msgid "Left Win-key switches layout while pressed."
-msgstr "Vänster Win-tangent byter layout då den trycks ned."
+#: ../rules/base.xml.in.h:370 ../rules/evdev.xml.in.h:370
+msgid "Left Win (while pressed)"
+msgstr "Vänster Win-tangent (då den trycks ned)"
-#: ../rules/base.xml.in.h:361 ../rules/evdev.xml.in.h:361
+#: ../rules/base.xml.in.h:371 ../rules/evdev.xml.in.h:371
msgid "Left hand"
msgstr "Vänsterhänt"
-#: ../rules/base.xml.in.h:362 ../rules/evdev.xml.in.h:362
+#: ../rules/base.xml.in.h:372 ../rules/evdev.xml.in.h:372
msgid "Left handed Dvorak"
msgstr "Vänsterhänt Dvorak"
-#: ../rules/base.xml.in.h:363 ../rules/evdev.xml.in.h:363
+#: ../rules/base.xml.in.h:373 ../rules/evdev.xml.in.h:373
msgid "Legacy"
msgstr "Äldre"
-#: ../rules/base.xml.in.h:364 ../rules/evdev.xml.in.h:364
-msgid "Legacy Wang 724 keypad"
-msgstr "Äldre Wang 724 numeriskt tangentbord"
+#: ../rules/base.xml.in.h:374 ../rules/evdev.xml.in.h:374
+msgid "Legacy Wang 724"
+msgstr "Gammalt Wang 724"
#. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:366 ../rules/evdev.xml.in.h:366
+#: ../rules/base.xml.in.h:376 ../rules/evdev.xml.in.h:376
msgid "Legacy key with comma"
msgstr "Äldre tangent med komma"
-#: ../rules/base.xml.in.h:367 ../rules/evdev.xml.in.h:367
+#: ../rules/base.xml.in.h:377 ../rules/evdev.xml.in.h:377
msgid "Legacy key with dot"
msgstr "Äldre tangent med punkt"
-#: ../rules/base.xml.in.h:368 ../rules/evdev.xml.in.h:368
-msgid "Legacy keypad"
-msgstr "Äldre numeriskt tangentbord"
-
-#: ../rules/base.xml.in.h:369 ../rules/evdev.xml.in.h:369
-msgid "Less-than/Greater-than is Compose."
-msgstr "Mindre än/Större än är Compose."
+#: ../rules/base.xml.in.h:378 ../rules/evdev.xml.in.h:378
+msgid "Less-than/Greater-than"
+msgstr "Mindre än/Större än"
-#: ../rules/base.xml.in.h:370 ../rules/evdev.xml.in.h:370
+#: ../rules/base.xml.in.h:379 ../rules/evdev.xml.in.h:379
msgid "Lithuania"
msgstr "Litauen"
-#: ../rules/base.xml.in.h:371 ../rules/evdev.xml.in.h:371
+#: ../rules/base.xml.in.h:380 ../rules/evdev.xml.in.h:380
msgid "Logitech Access Keyboard"
msgstr "Logitech Access Keyboard"
-#: ../rules/base.xml.in.h:372 ../rules/evdev.xml.in.h:372
+#: ../rules/base.xml.in.h:381 ../rules/evdev.xml.in.h:381
msgid "Logitech Cordless Desktop"
msgstr "Logitech Cordless Desktop"
-#: ../rules/base.xml.in.h:373 ../rules/evdev.xml.in.h:373
+#: ../rules/base.xml.in.h:382 ../rules/evdev.xml.in.h:382
msgid "Logitech Cordless Desktop (alternate option)"
msgstr "Logitech Cordless Desktop (alternativ)"
-#: ../rules/base.xml.in.h:374 ../rules/evdev.xml.in.h:374
+#: ../rules/base.xml.in.h:383 ../rules/evdev.xml.in.h:383
msgid "Logitech Cordless Desktop EX110"
msgstr "Logitech Cordless Desktop EX110"
-#: ../rules/base.xml.in.h:375 ../rules/evdev.xml.in.h:375
+#: ../rules/base.xml.in.h:384 ../rules/evdev.xml.in.h:384
msgid "Logitech Cordless Desktop LX-300"
msgstr "Logitech Cordless Desktop LX-300"
-#: ../rules/base.xml.in.h:376 ../rules/evdev.xml.in.h:376
+#: ../rules/base.xml.in.h:385 ../rules/evdev.xml.in.h:385
msgid "Logitech Cordless Desktop Navigator"
msgstr "Logitech Cordless Desktop Navigator"
-#: ../rules/base.xml.in.h:377 ../rules/evdev.xml.in.h:377
+#: ../rules/base.xml.in.h:386 ../rules/evdev.xml.in.h:386
msgid "Logitech Cordless Desktop Optical"
msgstr "Logitech Cordless Desktop Optical"
-#: ../rules/base.xml.in.h:378 ../rules/evdev.xml.in.h:378
+#: ../rules/base.xml.in.h:387 ../rules/evdev.xml.in.h:387
msgid "Logitech Cordless Desktop Pro (alternate option2)"
msgstr "Logitech Cordless Desktop Pro (alternativ2)"
-#: ../rules/base.xml.in.h:379 ../rules/evdev.xml.in.h:379
+#: ../rules/base.xml.in.h:388 ../rules/evdev.xml.in.h:388
msgid "Logitech Cordless Desktop iTouch"
msgstr "Logitech Cordless Desktop iTouch"
-#: ../rules/base.xml.in.h:380 ../rules/evdev.xml.in.h:380
+#: ../rules/base.xml.in.h:389 ../rules/evdev.xml.in.h:389
msgid "Logitech Cordless Freedom/Desktop Navigator"
msgstr "Logitech Cordless Freedom/Desktop Navigator"
-#: ../rules/base.xml.in.h:381 ../rules/evdev.xml.in.h:381
+#: ../rules/base.xml.in.h:390 ../rules/evdev.xml.in.h:390
msgid "Logitech G15 extra keys via G15daemon"
msgstr "Logitech G15 extratangenter via G15daemon"
-#: ../rules/base.xml.in.h:382 ../rules/evdev.xml.in.h:382
+#: ../rules/base.xml.in.h:391 ../rules/evdev.xml.in.h:391
msgid "Logitech Generic Keyboard"
msgstr "Logitech Generic Keyboard"
-#: ../rules/base.xml.in.h:383 ../rules/evdev.xml.in.h:383
+#: ../rules/base.xml.in.h:392 ../rules/evdev.xml.in.h:392
msgid "Logitech Internet 350 Keyboard"
msgstr "Logitech Internet 350 Keyboard"
-#: ../rules/base.xml.in.h:384 ../rules/evdev.xml.in.h:384
+#: ../rules/base.xml.in.h:393 ../rules/evdev.xml.in.h:393
msgid "Logitech Internet Keyboard"
msgstr "Logitech Internettangentbord"
-#: ../rules/base.xml.in.h:385 ../rules/evdev.xml.in.h:385
+#: ../rules/base.xml.in.h:394 ../rules/evdev.xml.in.h:394
msgid "Logitech Internet Navigator Keyboard"
msgstr "Logitech Internet Navigator-tangentbord"
-#: ../rules/base.xml.in.h:386 ../rules/evdev.xml.in.h:386
+#: ../rules/base.xml.in.h:395 ../rules/evdev.xml.in.h:395
msgid "Logitech Media Elite Keyboard"
msgstr "Logitech Media Elite Keyboard"
-#: ../rules/base.xml.in.h:387 ../rules/evdev.xml.in.h:387
+#: ../rules/base.xml.in.h:396 ../rules/evdev.xml.in.h:396
msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
-#: ../rules/base.xml.in.h:388 ../rules/evdev.xml.in.h:388
+#: ../rules/base.xml.in.h:397 ../rules/evdev.xml.in.h:397
msgid "Logitech Ultra-X Keyboard"
msgstr "Logitech Ultra-X Keyboard"
-#: ../rules/base.xml.in.h:389 ../rules/evdev.xml.in.h:389
+#: ../rules/base.xml.in.h:398 ../rules/evdev.xml.in.h:398
msgid "Logitech diNovo Edge Keyboard"
msgstr "Logitech diNovo Edge Keyboard"
-#: ../rules/base.xml.in.h:390 ../rules/evdev.xml.in.h:390
+#: ../rules/base.xml.in.h:399 ../rules/evdev.xml.in.h:399
msgid "Logitech diNovo Keyboard"
msgstr "Logitech diNovo Keyboard"
-#: ../rules/base.xml.in.h:391 ../rules/evdev.xml.in.h:391
+#: ../rules/base.xml.in.h:400 ../rules/evdev.xml.in.h:400
msgid "Logitech iTouch"
msgstr "Logitech iTouch"
-#: ../rules/base.xml.in.h:392 ../rules/evdev.xml.in.h:392
+#: ../rules/base.xml.in.h:401 ../rules/evdev.xml.in.h:401
msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
msgstr "Logitech iTouch Cordless Keyboard (modell Y-RB6)"
-#: ../rules/base.xml.in.h:393 ../rules/evdev.xml.in.h:393
+#: ../rules/base.xml.in.h:402 ../rules/evdev.xml.in.h:402
msgid "Logitech iTouch Internet Navigator Keyboard SE"
msgstr "Logitech iTouch Internet Navigator Keyboard SE"
-#: ../rules/base.xml.in.h:394 ../rules/evdev.xml.in.h:394
+#: ../rules/base.xml.in.h:403 ../rules/evdev.xml.in.h:403
msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-#: ../rules/base.xml.in.h:395 ../rules/evdev.xml.in.h:395
+#: ../rules/base.xml.in.h:404 ../rules/evdev.xml.in.h:404
+msgid "Lower Sorbian"
+msgstr "Lågsorbiska"
+
+#: ../rules/base.xml.in.h:405 ../rules/evdev.xml.in.h:405
+msgid "Lower Sorbian (qwertz)"
+msgstr "Lågsorbiska (qwertz)"
+
+#: ../rules/base.xml.in.h:406 ../rules/evdev.xml.in.h:406
msgid "Ltu"
msgstr "Ltu"
-#: ../rules/base.xml.in.h:396 ../rules/evdev.xml.in.h:396
+#: ../rules/base.xml.in.h:407 ../rules/evdev.xml.in.h:407
msgid "MESS"
msgstr "MESS"
-#: ../rules/base.xml.in.h:397 ../rules/evdev.xml.in.h:397
+#: ../rules/base.xml.in.h:408 ../rules/evdev.xml.in.h:408
msgid "MNE"
msgstr "MNE"
-#: ../rules/base.xml.in.h:398 ../rules/evdev.xml.in.h:398
+#: ../rules/base.xml.in.h:409 ../rules/evdev.xml.in.h:409
msgid "MacBook/MacBook Pro"
msgstr "MacBook/MacBook Pro"
-#: ../rules/base.xml.in.h:399 ../rules/evdev.xml.in.h:399
+#: ../rules/base.xml.in.h:410 ../rules/evdev.xml.in.h:410
msgid "MacBook/MacBook Pro (Intl)"
msgstr "MacBook/MacBook Pro (Intl)"
-#: ../rules/base.xml.in.h:400 ../rules/evdev.xml.in.h:400
+#: ../rules/base.xml.in.h:411 ../rules/evdev.xml.in.h:411
msgid "Macedonia"
msgstr "Makedonien"
-#: ../rules/base.xml.in.h:401 ../rules/evdev.xml.in.h:401
+#: ../rules/base.xml.in.h:412 ../rules/evdev.xml.in.h:412
msgid "Macintosh"
msgstr "Macintosh"
-#: ../rules/base.xml.in.h:402 ../rules/evdev.xml.in.h:402
+#: ../rules/base.xml.in.h:413 ../rules/evdev.xml.in.h:413
msgid "Macintosh Old"
msgstr "Macintosh gammal"
-#: ../rules/base.xml.in.h:403 ../rules/evdev.xml.in.h:403
+#: ../rules/base.xml.in.h:414 ../rules/evdev.xml.in.h:414
msgid "Macintosh, Sun dead keys"
msgstr "Macintosh, Sun stumma tangenter"
-#: ../rules/base.xml.in.h:404 ../rules/evdev.xml.in.h:404
+#: ../rules/base.xml.in.h:415 ../rules/evdev.xml.in.h:415
msgid "Macintosh, eliminate dead keys"
msgstr "Macintosh, eliminera stumma tangenter"
-#: ../rules/base.xml.in.h:405 ../rules/evdev.xml.in.h:405
-msgid "Make CapsLock an additional Ctrl."
-msgstr "Gör CapsLock till ytterligare en Ctrl-tangent."
+#: ../rules/base.xml.in.h:416 ../rules/evdev.xml.in.h:416
+msgid "Make CapsLock an additional Backspace"
+msgstr "Gör CapsLock till ytterligare en backstegstangent"
-#: ../rules/base.xml.in.h:406 ../rules/evdev.xml.in.h:406
+#: ../rules/base.xml.in.h:417 ../rules/evdev.xml.in.h:417
+msgid "Make CapsLock an additional Ctrl"
+msgstr "Gör CapsLock till ytterligare en Ctrl-tangent"
+
+#: ../rules/base.xml.in.h:418 ../rules/evdev.xml.in.h:418
+msgid "Make CapsLock an additional ESC"
+msgstr "Gör CapsLock till ytterligare en ESC-tangent"
+
+#: ../rules/base.xml.in.h:419 ../rules/evdev.xml.in.h:419
msgid "Mal"
msgstr "Mal"
-#: ../rules/base.xml.in.h:407 ../rules/evdev.xml.in.h:407
+#: ../rules/base.xml.in.h:420 ../rules/evdev.xml.in.h:420
msgid "Malayalam"
msgstr "Malayalam"
-#: ../rules/base.xml.in.h:408 ../rules/evdev.xml.in.h:408
+#: ../rules/base.xml.in.h:421 ../rules/evdev.xml.in.h:421
msgid "Malayalam Lalitha"
msgstr "Malayalam Lalitha"
-#: ../rules/base.xml.in.h:409 ../rules/evdev.xml.in.h:409
+#: ../rules/base.xml.in.h:422 ../rules/evdev.xml.in.h:422
msgid "Maldives"
msgstr "Maldiverna"
-#: ../rules/base.xml.in.h:410 ../rules/evdev.xml.in.h:410
+#: ../rules/base.xml.in.h:423 ../rules/evdev.xml.in.h:423
msgid "Malta"
msgstr "Malta"
-#: ../rules/base.xml.in.h:411 ../rules/evdev.xml.in.h:411
+#: ../rules/base.xml.in.h:424 ../rules/evdev.xml.in.h:424
msgid "Maltese keyboard with US layout"
msgstr "Maltesiskt tangentbord med USA-layout"
-#: ../rules/base.xml.in.h:412 ../rules/evdev.xml.in.h:412
+#: ../rules/base.xml.in.h:425 ../rules/evdev.xml.in.h:425
msgid "Mao"
msgstr "Mao"
-#: ../rules/base.xml.in.h:413 ../rules/evdev.xml.in.h:413
+#: ../rules/base.xml.in.h:426 ../rules/evdev.xml.in.h:426
msgid "Maori"
msgstr "Maori"
-#: ../rules/base.xml.in.h:414 ../rules/evdev.xml.in.h:414
+#: ../rules/base.xml.in.h:427 ../rules/evdev.xml.in.h:427
msgid "Memorex MX1998"
msgstr "Memorex MX1998"
-#: ../rules/base.xml.in.h:415 ../rules/evdev.xml.in.h:415
+#: ../rules/base.xml.in.h:428 ../rules/evdev.xml.in.h:428
msgid "Memorex MX2500 EZ-Access Keyboard"
msgstr "Memorex MX2500 EZ-Access-tangentbord"
-#: ../rules/base.xml.in.h:416 ../rules/evdev.xml.in.h:416
+#: ../rules/base.xml.in.h:429 ../rules/evdev.xml.in.h:429
msgid "Memorex MX2750"
msgstr "Memorex MX2750"
-#: ../rules/base.xml.in.h:417 ../rules/evdev.xml.in.h:417
-msgid "Menu is Compose."
-msgstr "Meny är Compose."
+#: ../rules/base.xml.in.h:430 ../rules/evdev.xml.in.h:430
+msgid "Menu"
+msgstr "Meny"
-#: ../rules/base.xml.in.h:418 ../rules/evdev.xml.in.h:418
-msgid "Menu key changes layout."
-msgstr "Meny-tangenten byter layout."
+#: ../rules/base.xml.in.h:431 ../rules/evdev.xml.in.h:431
+msgid "Meta is mapped to Left Win"
+msgstr "Meta är mappad till vänster Win-tangent"
-#: ../rules/base.xml.in.h:419 ../rules/evdev.xml.in.h:419
-msgid "Meta is mapped to the Win-keys."
-msgstr "Meta är mappat till Win-tangenterna."
+#: ../rules/base.xml.in.h:432 ../rules/evdev.xml.in.h:432
+msgid "Meta is mapped to Win keys"
+msgstr "Meta är mappad till Win-tangenterna"
-#: ../rules/base.xml.in.h:420 ../rules/evdev.xml.in.h:420
-msgid "Meta is mapped to the left Win-key."
-msgstr "Meta är mappat till vänster Win-tangent."
+#: ../rules/base.xml.in.h:433 ../rules/evdev.xml.in.h:433
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Comfort Curve Keyboard 2000"
-#: ../rules/base.xml.in.h:421 ../rules/evdev.xml.in.h:421
+#: ../rules/base.xml.in.h:434 ../rules/evdev.xml.in.h:434
msgid "Microsoft Internet Keyboard"
msgstr "Microsoft Internet Keyboard"
-#: ../rules/base.xml.in.h:422 ../rules/evdev.xml.in.h:422
+#: ../rules/base.xml.in.h:435 ../rules/evdev.xml.in.h:435
msgid "Microsoft Internet Keyboard Pro, Swedish"
msgstr "Microsoft Internet Keyboard Pro, svensk"
-#: ../rules/base.xml.in.h:423 ../rules/evdev.xml.in.h:423
+#: ../rules/base.xml.in.h:436 ../rules/evdev.xml.in.h:436
msgid "Microsoft Natural"
msgstr "Microsoft Natural"
-#: ../rules/base.xml.in.h:424 ../rules/evdev.xml.in.h:424
+#: ../rules/base.xml.in.h:437 ../rules/evdev.xml.in.h:437
msgid "Microsoft Natural Keyboard Elite"
msgstr "Microsoft Natural Keyboard Elite"
-#: ../rules/base.xml.in.h:425 ../rules/evdev.xml.in.h:425
+#: ../rules/base.xml.in.h:438 ../rules/evdev.xml.in.h:438
msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-#: ../rules/base.xml.in.h:426 ../rules/evdev.xml.in.h:426
+#: ../rules/base.xml.in.h:439 ../rules/evdev.xml.in.h:439
msgid "Microsoft Natural Keyboard Pro OEM"
msgstr "Microsoft Natural Keyboard Pro OEM"
-#: ../rules/base.xml.in.h:427 ../rules/evdev.xml.in.h:427
+#: ../rules/base.xml.in.h:440 ../rules/evdev.xml.in.h:440
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:428 ../rules/evdev.xml.in.h:428
+#: ../rules/base.xml.in.h:441 ../rules/evdev.xml.in.h:441
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+
+#: ../rules/base.xml.in.h:442 ../rules/evdev.xml.in.h:442
msgid "Microsoft Office Keyboard"
msgstr "Microsoft Office-tangentbord"
-#: ../rules/base.xml.in.h:429 ../rules/evdev.xml.in.h:429
+#: ../rules/base.xml.in.h:443 ../rules/evdev.xml.in.h:443
msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
-#: ../rules/base.xml.in.h:430 ../rules/evdev.xml.in.h:430
+#: ../rules/base.xml.in.h:444 ../rules/evdev.xml.in.h:444
msgid "Miscellaneous compatibility options"
msgstr "Diverse kompatibilitetsalternativ"
-#: ../rules/base.xml.in.h:431 ../rules/evdev.xml.in.h:431
+#: ../rules/base.xml.in.h:445 ../rules/evdev.xml.in.h:445
msgid "Mkd"
msgstr "Mkd"
-#: ../rules/base.xml.in.h:432 ../rules/evdev.xml.in.h:432
+#: ../rules/base.xml.in.h:446 ../rules/evdev.xml.in.h:446
msgid "Mlt"
msgstr "Mlt"
-#: ../rules/base.xml.in.h:433 ../rules/evdev.xml.in.h:433
+#: ../rules/base.xml.in.h:447 ../rules/evdev.xml.in.h:447
msgid "Mmr"
msgstr "Mmr"
-#: ../rules/base.xml.in.h:434 ../rules/evdev.xml.in.h:434
+#: ../rules/base.xml.in.h:448 ../rules/evdev.xml.in.h:448
msgid "Mng"
msgstr "Mng"
-#: ../rules/base.xml.in.h:435 ../rules/evdev.xml.in.h:435
+#: ../rules/base.xml.in.h:449 ../rules/evdev.xml.in.h:449
msgid "Mongolia"
msgstr "Mongoliet"
-#: ../rules/base.xml.in.h:436 ../rules/evdev.xml.in.h:436
+#: ../rules/base.xml.in.h:450 ../rules/evdev.xml.in.h:450
msgid "Montenegro"
msgstr "Montenegro"
-#: ../rules/base.xml.in.h:437 ../rules/evdev.xml.in.h:437
+#: ../rules/base.xml.in.h:451 ../rules/evdev.xml.in.h:451
msgid "Morocco"
msgstr "Marocko"
-#: ../rules/base.xml.in.h:438 ../rules/evdev.xml.in.h:438
+#: ../rules/base.xml.in.h:452 ../rules/evdev.xml.in.h:452
msgid "Multilingual"
msgstr "Flerspråkig"
-#: ../rules/base.xml.in.h:439 ../rules/evdev.xml.in.h:439
+#: ../rules/base.xml.in.h:453 ../rules/evdev.xml.in.h:453
msgid "Multilingual, first part"
msgstr "Flerspråkig, första delen"
-#: ../rules/base.xml.in.h:440 ../rules/evdev.xml.in.h:440
+#: ../rules/base.xml.in.h:454 ../rules/evdev.xml.in.h:454
msgid "Multilingual, second part"
msgstr "Flerspråkig, andra delen"
-#: ../rules/base.xml.in.h:441 ../rules/evdev.xml.in.h:441
+#: ../rules/base.xml.in.h:455 ../rules/evdev.xml.in.h:455
msgid "Myanmar"
msgstr "Myanmar"
-#: ../rules/base.xml.in.h:442 ../rules/evdev.xml.in.h:442
+#: ../rules/base.xml.in.h:456 ../rules/evdev.xml.in.h:456
msgid "NICOLA-F style Backspace"
msgstr "Backsteg i NICOLA-F-stil"
-#: ../rules/base.xml.in.h:443 ../rules/evdev.xml.in.h:443
-msgid "Neostyle"
-msgstr "Neostyle"
+#: ../rules/base.xml.in.h:457 ../rules/evdev.xml.in.h:457
+msgid "NLA"
+msgstr "NLA"
-#: ../rules/base.xml.in.h:444 ../rules/evdev.xml.in.h:444
+#: ../rules/base.xml.in.h:458 ../rules/evdev.xml.in.h:458
+msgid "Nativo"
+msgstr "Nativo"
+
+#: ../rules/base.xml.in.h:459 ../rules/evdev.xml.in.h:459
+msgid "Nativo for Esperanto"
+msgstr "Nativo för Esperanto"
+
+#: ../rules/base.xml.in.h:460 ../rules/evdev.xml.in.h:460
+msgid "Nativo for USA keyboards"
+msgstr "Nativo för amerikanska tangentbord"
+
+#: ../rules/base.xml.in.h:461 ../rules/evdev.xml.in.h:461
+msgid "Neo 2"
+msgstr "Neo 2"
+
+#: ../rules/base.xml.in.h:462 ../rules/evdev.xml.in.h:462
msgid "Nep"
msgstr "Nep"
-#: ../rules/base.xml.in.h:445 ../rules/evdev.xml.in.h:445
+#: ../rules/base.xml.in.h:463 ../rules/evdev.xml.in.h:463
msgid "Nepal"
msgstr "Nepal"
-#: ../rules/base.xml.in.h:446 ../rules/evdev.xml.in.h:446
+#: ../rules/base.xml.in.h:464 ../rules/evdev.xml.in.h:464
msgid "Netherlands"
msgstr "Nederländerna"
-#: ../rules/base.xml.in.h:447 ../rules/evdev.xml.in.h:447
+#: ../rules/base.xml.in.h:465 ../rules/evdev.xml.in.h:465
msgid "Nig"
msgstr "Nig"
-#: ../rules/base.xml.in.h:448 ../rules/evdev.xml.in.h:448
+#: ../rules/base.xml.in.h:466 ../rules/evdev.xml.in.h:466
msgid "Nigeria"
msgstr "Nigeria"
-#: ../rules/base.xml.in.h:449 ../rules/evdev.xml.in.h:449
+#: ../rules/base.xml.in.h:467 ../rules/evdev.xml.in.h:467
msgid "Nld"
msgstr "Nld"
-#: ../rules/base.xml.in.h:450 ../rules/evdev.xml.in.h:450
+#: ../rules/base.xml.in.h:468 ../rules/evdev.xml.in.h:468
+msgid "Non-breakable space character at fourth level"
+msgstr "Icke-brytande blankstegstecken på fjärde nivån"
+
+#: ../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 "Icke-brytande blankstegstecken på fjärde nivån, tunt icke-brytande blankstegstecken på sjätte nivån"
+
+#: ../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 "Icke-brytande blankstegstecken på fjärde nivån, tunt icke-brytande blankstegstecken på sjätte nivån (via Ctrl+Skift)"
+
+#: ../rules/base.xml.in.h:471 ../rules/evdev.xml.in.h:471
+msgid "Non-breakable space character at second level"
+msgstr "Icke-brytande blankstegstecken på andra nivån"
+
+#: ../rules/base.xml.in.h:472 ../rules/evdev.xml.in.h:472
+msgid "Non-breakable space character at third level"
+msgstr "Icke-brytande blankstegstecken på tredje nivån"
+
+#: ../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 "Icke-brytande blankstegstecken på tredje nivån, ingenting på fjärde nivån"
+
+#: ../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 "Icke-brytande blankstegstecken på tredje nivån, tunt icke-brytande blankstegstecken på fjärde nivån"
+
+#: ../rules/base.xml.in.h:475 ../rules/evdev.xml.in.h:475
msgid "Nor"
msgstr "Nor"
-#: ../rules/base.xml.in.h:451 ../rules/evdev.xml.in.h:451
+#: ../rules/base.xml.in.h:476 ../rules/evdev.xml.in.h:476
msgid "Northern Saami"
msgstr "Nordsamisk"
-#: ../rules/base.xml.in.h:452 ../rules/evdev.xml.in.h:452
+#: ../rules/base.xml.in.h:477 ../rules/evdev.xml.in.h:477
msgid "Northern Saami, eliminate dead keys"
msgstr "Nordsamisk, eliminera stumma tangenter"
-#: ../rules/base.xml.in.h:453 ../rules/evdev.xml.in.h:453
+#: ../rules/base.xml.in.h:478 ../rules/evdev.xml.in.h:478
msgid "Northgate OmniKey 101"
msgstr "Northgate OmniKey 101"
-#: ../rules/base.xml.in.h:454 ../rules/evdev.xml.in.h:454
+#: ../rules/base.xml.in.h:479 ../rules/evdev.xml.in.h:479
msgid "Norway"
msgstr "Norge"
-#: ../rules/base.xml.in.h:455 ../rules/evdev.xml.in.h:455
-msgid "NumLock LED shows alternative layout."
-msgstr "NumLock-lampan visar alternativ layout."
+#: ../rules/base.xml.in.h:480 ../rules/evdev.xml.in.h:480
+msgid "NumLock"
+msgstr "NumLock"
# KONTROLLERA DENNA
-#: ../rules/base.xml.in.h:456 ../rules/evdev.xml.in.h:456
+#: ../rules/base.xml.in.h:481 ../rules/evdev.xml.in.h:481
msgid "Numeric keypad delete key behaviour"
msgstr "Beteende för Delete-tangent på numeriskt tangentbord"
-#: ../rules/base.xml.in.h:457 ../rules/evdev.xml.in.h:457
-msgid "Numeric keypad keys work as with Mac."
-msgstr "Tangenter på det numeriska tangentbordet fungerar som på Mac."
+#: ../rules/base.xml.in.h:482 ../rules/evdev.xml.in.h:482
+msgid "Numeric keypad keys work as with Mac"
+msgstr "Tangenter på det numeriska tangentbordet fungerar som på Mac"
-#: ../rules/base.xml.in.h:458 ../rules/evdev.xml.in.h:458
+#: ../rules/base.xml.in.h:483 ../rules/evdev.xml.in.h:483
msgid "Numeric keypad layout selection"
msgstr "Layoutval för numeriskt tangentbord"
-#: ../rules/base.xml.in.h:459 ../rules/evdev.xml.in.h:459
+#: ../rules/base.xml.in.h:484 ../rules/evdev.xml.in.h:484
msgid "OADG 109A"
msgstr "OADG 109A"
-#: ../rules/base.xml.in.h:460 ../rules/evdev.xml.in.h:460
+#: ../rules/base.xml.in.h:485 ../rules/evdev.xml.in.h:485
msgid "OLPC"
msgstr "OLPC"
-#: ../rules/base.xml.in.h:461 ../rules/evdev.xml.in.h:461
+#: ../rules/base.xml.in.h:486 ../rules/evdev.xml.in.h:486
msgid "OLPC Dari"
msgstr "OLPC Dari"
-#: ../rules/base.xml.in.h:462 ../rules/evdev.xml.in.h:462
+#: ../rules/base.xml.in.h:487 ../rules/evdev.xml.in.h:487
msgid "OLPC Pashto"
msgstr "OLPC Pashto"
-#: ../rules/base.xml.in.h:463 ../rules/evdev.xml.in.h:463
+#: ../rules/base.xml.in.h:488 ../rules/evdev.xml.in.h:488
msgid "OLPC Southern Uzbek"
msgstr "OLPC Södra Uzbekistan"
-#: ../rules/base.xml.in.h:464 ../rules/evdev.xml.in.h:464
+#: ../rules/base.xml.in.h:489 ../rules/evdev.xml.in.h:489
msgid "Ogham"
msgstr "Ogham"
-#: ../rules/base.xml.in.h:465 ../rules/evdev.xml.in.h:465
+#: ../rules/base.xml.in.h:490 ../rules/evdev.xml.in.h:490
msgid "Ogham IS434"
msgstr "Ogham IS434"
-#: ../rules/base.xml.in.h:466 ../rules/evdev.xml.in.h:466
+#: ../rules/base.xml.in.h:491 ../rules/evdev.xml.in.h:491
msgid "Oriya"
msgstr "Oriya"
-#: ../rules/base.xml.in.h:467 ../rules/evdev.xml.in.h:467
+#: ../rules/base.xml.in.h:492 ../rules/evdev.xml.in.h:492
msgid "Ortek MCK-800 MM/Internet keyboard"
msgstr "Ortek MCK-800 MM/Internet-tangentbord"
-#: ../rules/base.xml.in.h:468 ../rules/evdev.xml.in.h:468
+#: ../rules/base.xml.in.h:493 ../rules/evdev.xml.in.h:493
msgid "Ossetian"
msgstr "Ossetisk"
-#: ../rules/base.xml.in.h:469 ../rules/evdev.xml.in.h:469
+#: ../rules/base.xml.in.h:494 ../rules/evdev.xml.in.h:494
msgid "Ossetian, Winkeys"
msgstr "Ossetisk, Win-tangenter"
-#: ../rules/base.xml.in.h:470 ../rules/evdev.xml.in.h:470
+#: ../rules/base.xml.in.h:495 ../rules/evdev.xml.in.h:495
msgid "Ossetian, legacy"
msgstr "Ossetisk, äldre"
-#: ../rules/base.xml.in.h:471 ../rules/evdev.xml.in.h:471
+#: ../rules/base.xml.in.h:496 ../rules/evdev.xml.in.h:496
msgid "PC-98xx Series"
msgstr "PC-98xx-serien"
-#: ../rules/base.xml.in.h:472 ../rules/evdev.xml.in.h:472
+#: ../rules/base.xml.in.h:497 ../rules/evdev.xml.in.h:497
msgid "Pak"
msgstr "Pak"
-#: ../rules/base.xml.in.h:473 ../rules/evdev.xml.in.h:473
+#: ../rules/base.xml.in.h:498 ../rules/evdev.xml.in.h:498
msgid "Pakistan"
msgstr "Pakistan"
-#: ../rules/base.xml.in.h:474 ../rules/evdev.xml.in.h:474
+#: ../rules/base.xml.in.h:499 ../rules/evdev.xml.in.h:499
msgid "Pashto"
msgstr "Pashto"
-#: ../rules/base.xml.in.h:475 ../rules/evdev.xml.in.h:475
+#: ../rules/base.xml.in.h:500 ../rules/evdev.xml.in.h:500
msgid "Pattachote"
msgstr "Pattachote"
-#: ../rules/base.xml.in.h:476 ../rules/evdev.xml.in.h:476
+#: ../rules/base.xml.in.h:501 ../rules/evdev.xml.in.h:501
msgid "Phonetic"
msgstr "Fonetisk"
-#: ../rules/base.xml.in.h:477 ../rules/evdev.xml.in.h:477
+#: ../rules/base.xml.in.h:502 ../rules/evdev.xml.in.h:502
msgid "Pol"
msgstr "Pol"
-#: ../rules/base.xml.in.h:478 ../rules/evdev.xml.in.h:478
+#: ../rules/base.xml.in.h:503 ../rules/evdev.xml.in.h:503
msgid "Poland"
msgstr "Polen"
-#: ../rules/base.xml.in.h:479 ../rules/evdev.xml.in.h:479
+#: ../rules/base.xml.in.h:504 ../rules/evdev.xml.in.h:504
msgid "Polytonic"
msgstr "Polytonic"
-#: ../rules/base.xml.in.h:480 ../rules/evdev.xml.in.h:480
+#: ../rules/base.xml.in.h:505 ../rules/evdev.xml.in.h:505
msgid "Portugal"
msgstr "Portugal"
-#: ../rules/base.xml.in.h:481 ../rules/evdev.xml.in.h:481
-msgid "Press Left Alt key to choose 3rd level."
-msgstr "Tryck vänster Alt-tangent för att välja tredjenivå."
-
-#: ../rules/base.xml.in.h:482 ../rules/evdev.xml.in.h:482
-msgid "Press Left Win-key to choose 3rd level."
-msgstr "Tryck vänster Win-tangent för att välja tredjenivå."
-
-#: ../rules/base.xml.in.h:483 ../rules/evdev.xml.in.h:483
-msgid "Press Menu key to choose 3rd level."
-msgstr "Tryck Meny-tangenten för att välja tredjenivå."
-
-#: ../rules/base.xml.in.h:484 ../rules/evdev.xml.in.h:484
-msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
-msgstr "Tryck höger Alt-tangent för att välja tredjenivå. Skft+höger Alt-tangent är Multi_Key."
-
-#: ../rules/base.xml.in.h:485 ../rules/evdev.xml.in.h:485
-msgid "Press Right Alt key to choose 3rd level."
-msgstr "Tryck höger Alt-tangent för att välja tredjenivå."
-
-#: ../rules/base.xml.in.h:486 ../rules/evdev.xml.in.h:486
-msgid "Press Right Ctrl to choose 3rd level."
-msgstr "Tryck höger Ctrl-tangent för att välja tredjenivå."
-
-#: ../rules/base.xml.in.h:487 ../rules/evdev.xml.in.h:487
-msgid "Press Right Win-key to choose 3rd level."
-msgstr "Tryck höger Win-tangent för att välja tredjenivå."
-
-#: ../rules/base.xml.in.h:488 ../rules/evdev.xml.in.h:488
-msgid "Press any of Alt keys to choose 3rd level."
-msgstr "Tryck valfri Alt-tangent för att välja tredjenivå."
-
-#: ../rules/base.xml.in.h:489 ../rules/evdev.xml.in.h:489
-msgid "Press any of Win-keys to choose 3rd level."
-msgstr "Tryck valfri Win-tangent för att välja tredjenivå."
-
-#: ../rules/base.xml.in.h:490 ../rules/evdev.xml.in.h:490
+#: ../rules/base.xml.in.h:506 ../rules/evdev.xml.in.h:506
msgid "Pro"
msgstr "Pro"
-#: ../rules/base.xml.in.h:491 ../rules/evdev.xml.in.h:491
+#: ../rules/base.xml.in.h:507 ../rules/evdev.xml.in.h:507
msgid "Pro Keypad"
msgstr "Pro Keypad"
-#: ../rules/base.xml.in.h:492 ../rules/evdev.xml.in.h:492
+#: ../rules/base.xml.in.h:508 ../rules/evdev.xml.in.h:508
msgid "Probhat"
msgstr "Probhat"
-#: ../rules/base.xml.in.h:493 ../rules/evdev.xml.in.h:493
+#: ../rules/base.xml.in.h:509 ../rules/evdev.xml.in.h:509
msgid "Programmer Dvorak"
msgstr "Dvorak för programmerare"
-#: ../rules/base.xml.in.h:494 ../rules/evdev.xml.in.h:494
+#: ../rules/base.xml.in.h:510 ../rules/evdev.xml.in.h:510
msgid "Propeller Voyager (KTEZ-1000)"
msgstr "Propeller Voyager (KTEZ-1000)"
-#: ../rules/base.xml.in.h:495 ../rules/evdev.xml.in.h:495
+#: ../rules/base.xml.in.h:511 ../rules/evdev.xml.in.h:511
msgid "Prt"
msgstr "Prt"
-#: ../rules/base.xml.in.h:496 ../rules/evdev.xml.in.h:496
+#: ../rules/base.xml.in.h:512 ../rules/evdev.xml.in.h:512
msgid "QTronix Scorpius 98N+"
msgstr "QTronix Scorpius 98N+"
-#: ../rules/base.xml.in.h:497 ../rules/evdev.xml.in.h:497
-msgid "R-Alt switches layout while pressed."
-msgstr "Höger Alt-tangent byter layout då den trycks ned."
-
-#: ../rules/base.xml.in.h:498 ../rules/evdev.xml.in.h:498
-msgid "Right Alt is Compose."
-msgstr "Höger Alt är Compose."
-
-#: ../rules/base.xml.in.h:499 ../rules/evdev.xml.in.h:499
-msgid "Right Alt key changes layout."
-msgstr "Höger Alt-tangent byter layout."
+#: ../rules/base.xml.in.h:513 ../rules/evdev.xml.in.h:513
+msgid "Right Alt"
+msgstr "Höger Alt"
-#: ../rules/base.xml.in.h:500 ../rules/evdev.xml.in.h:500
-msgid "Right Alt key never chooses 3rd level."
-msgstr "Höger Alt-tangent väljer aldrig tredje nivån."
+#: ../rules/base.xml.in.h:514 ../rules/evdev.xml.in.h:514
+msgid "Right Alt (while pressed)"
+msgstr "Höger Alt-tangent (då den trycks ned)"
-#: ../rules/base.xml.in.h:501 ../rules/evdev.xml.in.h:501
-msgid "Right Ctrl is Compose."
-msgstr "Höger Ctrl är Compose."
+#: ../rules/base.xml.in.h:515 ../rules/evdev.xml.in.h:515
+msgid "Right Alt key never chooses 3rd level"
+msgstr "Höger Alt-tangent väljer aldrig tredje nivån"
-#: ../rules/base.xml.in.h:502 ../rules/evdev.xml.in.h:502
-msgid "Right Ctrl key changes layout."
-msgstr "Höger Ctrl-tangent byter layout."
+#: ../rules/base.xml.in.h:516 ../rules/evdev.xml.in.h:516
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr "Höger Alt-tangent, Skift+Höger Alt-tangent är Multi_Key"
-#: ../rules/base.xml.in.h:503 ../rules/evdev.xml.in.h:503
-msgid "Right Ctrl key switches layout while pressed."
-msgstr "Höger Ctrl-tangent byter layout då den trycks ned."
+#: ../rules/base.xml.in.h:517 ../rules/evdev.xml.in.h:517
+msgid "Right Ctrl"
+msgstr "Höger Ctrl"
-#: ../rules/base.xml.in.h:504 ../rules/evdev.xml.in.h:504
-msgid "Right Ctrl key works as Right Alt."
-msgstr "Höger Ctrl-tangent fungerar som höger Alt."
+#: ../rules/base.xml.in.h:518 ../rules/evdev.xml.in.h:518
+msgid "Right Ctrl (while pressed)"
+msgstr "Höger Ctrl-tangent (då den trycks ned)"
-#: ../rules/base.xml.in.h:505 ../rules/evdev.xml.in.h:505
-msgid "Right Shift key changes layout."
-msgstr "Höger Skift-tangent byter layout."
+#: ../rules/base.xml.in.h:519 ../rules/evdev.xml.in.h:519
+msgid "Right Ctrl as Right Alt"
+msgstr "Höger Ctrl-tangent fungerar som höger Alt"
-#: ../rules/base.xml.in.h:506 ../rules/evdev.xml.in.h:506
-msgid "Right Win-key changes layout."
-msgstr "Höger Win-tangent byter layout."
+#: ../rules/base.xml.in.h:520 ../rules/evdev.xml.in.h:520
+msgid "Right Shift"
+msgstr "Höger skift"
-#: ../rules/base.xml.in.h:507 ../rules/evdev.xml.in.h:507
-msgid "Right Win-key is Compose."
-msgstr "Höger Win-tangent är Compose."
+#: ../rules/base.xml.in.h:521 ../rules/evdev.xml.in.h:521
+msgid "Right Win"
+msgstr "Höger Win-tangent"
-#: ../rules/base.xml.in.h:508 ../rules/evdev.xml.in.h:508
-msgid "Right Win-key switches layout while pressed."
-msgstr "Höger Win-tangent byter layout då den trycks ned."
+#: ../rules/base.xml.in.h:522 ../rules/evdev.xml.in.h:522
+msgid "Right Win (while pressed)"
+msgstr "Höger Win-tangent (då den trycks ned)"
-#: ../rules/base.xml.in.h:509 ../rules/evdev.xml.in.h:509
+#: ../rules/base.xml.in.h:523 ../rules/evdev.xml.in.h:523
msgid "Right hand"
msgstr "Högerhänt"
-#: ../rules/base.xml.in.h:510 ../rules/evdev.xml.in.h:510
+#: ../rules/base.xml.in.h:524 ../rules/evdev.xml.in.h:524
msgid "Right handed Dvorak"
msgstr "Högerhänt Dvorak"
-#: ../rules/base.xml.in.h:511 ../rules/evdev.xml.in.h:511
+#: ../rules/base.xml.in.h:525 ../rules/evdev.xml.in.h:525
msgid "Romania"
msgstr "Rumänien"
-#: ../rules/base.xml.in.h:512 ../rules/evdev.xml.in.h:512
+#: ../rules/base.xml.in.h:526 ../rules/evdev.xml.in.h:526
msgid "Romanian keyboard with German letters"
msgstr "Rumänskt tangentbord med tyska bokstäver"
-#: ../rules/base.xml.in.h:513 ../rules/evdev.xml.in.h:513
+#: ../rules/base.xml.in.h:527 ../rules/evdev.xml.in.h:527
msgid "Romanian keyboard with German letters, eliminate dead keys"
msgstr "Rumänskt tangentbord med tyska bokstäver, eliminera stumma tangenter"
-#: ../rules/base.xml.in.h:514 ../rules/evdev.xml.in.h:514
+#: ../rules/base.xml.in.h:528 ../rules/evdev.xml.in.h:528
msgid "Rou"
msgstr "Rou"
-#: ../rules/base.xml.in.h:515 ../rules/evdev.xml.in.h:515
+#: ../rules/base.xml.in.h:529 ../rules/evdev.xml.in.h:529
msgid "Rus"
msgstr "Rus"
-#: ../rules/base.xml.in.h:516 ../rules/evdev.xml.in.h:516
+#: ../rules/base.xml.in.h:530 ../rules/evdev.xml.in.h:530
msgid "Russia"
msgstr "Ryssland"
-#: ../rules/base.xml.in.h:517 ../rules/evdev.xml.in.h:517
+#: ../rules/base.xml.in.h:531 ../rules/evdev.xml.in.h:531
msgid "Russian"
msgstr "Rysk"
-#: ../rules/base.xml.in.h:518 ../rules/evdev.xml.in.h:518
+#: ../rules/base.xml.in.h:532 ../rules/evdev.xml.in.h:532
msgid "Russian phonetic"
msgstr "Rysk fonetiskt"
-#: ../rules/base.xml.in.h:519 ../rules/evdev.xml.in.h:519
+#: ../rules/base.xml.in.h:533 ../rules/evdev.xml.in.h:533
msgid "Russian phonetic Dvorak"
msgstr "Rysk fonetisk dvorak"
-#: ../rules/base.xml.in.h:520 ../rules/evdev.xml.in.h:520
+#: ../rules/base.xml.in.h:534 ../rules/evdev.xml.in.h:534
msgid "Russian phonetic, eliminate dead keys"
msgstr "Rysk fonetiskt, eliminera stumma tangenter"
-#: ../rules/base.xml.in.h:521 ../rules/evdev.xml.in.h:521
+#: ../rules/base.xml.in.h:535 ../rules/evdev.xml.in.h:535
msgid "Russian with Kazakh"
msgstr "Ryska med kazakiska"
-#: ../rules/base.xml.in.h:522 ../rules/evdev.xml.in.h:522
+#: ../rules/base.xml.in.h:536 ../rules/evdev.xml.in.h:536
msgid "SILVERCREST Multimedia Wireless Keyboard"
msgstr "SILVERCREST Multimedia Wireless Keyboard"
-#: ../rules/base.xml.in.h:523 ../rules/evdev.xml.in.h:523
+#: ../rules/base.xml.in.h:537 ../rules/evdev.xml.in.h:537
msgid "SK-1300"
msgstr "SK-1300"
-#: ../rules/base.xml.in.h:524 ../rules/evdev.xml.in.h:524
+#: ../rules/base.xml.in.h:538 ../rules/evdev.xml.in.h:538
msgid "SK-2500"
msgstr "SK-2500"
-#: ../rules/base.xml.in.h:525 ../rules/evdev.xml.in.h:525
+#: ../rules/base.xml.in.h:539 ../rules/evdev.xml.in.h:539
msgid "SK-6200"
msgstr "SK-6200"
-#: ../rules/base.xml.in.h:526 ../rules/evdev.xml.in.h:526
+#: ../rules/base.xml.in.h:540 ../rules/evdev.xml.in.h:540
msgid "SK-7100"
msgstr "SK-7100"
-#: ../rules/base.xml.in.h:527 ../rules/evdev.xml.in.h:527
+#: ../rules/base.xml.in.h:541 ../rules/evdev.xml.in.h:541
msgid "SRB"
msgstr "SRB"
-#: ../rules/base.xml.in.h:528 ../rules/evdev.xml.in.h:528
+#: ../rules/base.xml.in.h:542 ../rules/evdev.xml.in.h:542
msgid "SVEN Ergonomic 2500"
msgstr "SVEN Ergonomic 2500"
-#: ../rules/base.xml.in.h:529 ../rules/evdev.xml.in.h:529
+#: ../rules/base.xml.in.h:543 ../rules/evdev.xml.in.h:543
msgid "SVEN Slim 303"
msgstr "SVEN Slim 303"
-#: ../rules/base.xml.in.h:530 ../rules/evdev.xml.in.h:530
+#: ../rules/base.xml.in.h:544 ../rules/evdev.xml.in.h:544
msgid "Samsung SDM 4500P"
msgstr "Samsung SDM 4500P"
-#: ../rules/base.xml.in.h:531 ../rules/evdev.xml.in.h:531
+#: ../rules/base.xml.in.h:545 ../rules/evdev.xml.in.h:545
msgid "Samsung SDM 4510P"
msgstr "Samsung SDM 4510P"
-#: ../rules/base.xml.in.h:532 ../rules/evdev.xml.in.h:532
-msgid "ScrollLock LED shows alternative layout."
-msgstr "ScrollLock-lampan visar alternativ layout."
+#: ../rules/base.xml.in.h:546 ../rules/evdev.xml.in.h:546
+msgid "ScrollLock"
+msgstr "ScrollLock"
-#: ../rules/base.xml.in.h:533 ../rules/evdev.xml.in.h:533
+#: ../rules/base.xml.in.h:547 ../rules/evdev.xml.in.h:547
msgid "Secwepemctsin"
msgstr "Secwepemctsin"
-#: ../rules/base.xml.in.h:534 ../rules/evdev.xml.in.h:534
+#: ../rules/base.xml.in.h:548 ../rules/evdev.xml.in.h:548
+msgid "Semi-colon on third level"
+msgstr "Semikolon på tredje nivå"
+
+#: ../rules/base.xml.in.h:549 ../rules/evdev.xml.in.h:549
msgid "Serbia"
msgstr "Serbien"
-#: ../rules/base.xml.in.h:535 ../rules/evdev.xml.in.h:535
-msgid "Shift cancels CapsLock."
-msgstr "Skift avbryter CapsLock."
+#: ../rules/base.xml.in.h:550 ../rules/evdev.xml.in.h:550
+msgid "Shift cancels CapsLock"
+msgstr "Skift avbryter CapsLock"
-#: ../rules/base.xml.in.h:536 ../rules/evdev.xml.in.h:536
-msgid "Shift with numeric keypad keys works as in MS Windows."
-msgstr "Skift med tangenterna på numeriska tangentbordet fungerar som i MS Windows."
+#: ../rules/base.xml.in.h:551 ../rules/evdev.xml.in.h:551
+msgid "Shift does not cancel NumLock, chooses 3d level instead"
+msgstr "Skift avbryter inte NumLock, väljer tredje nivån istället"
-#: ../rules/base.xml.in.h:537 ../rules/evdev.xml.in.h:537
-msgid "Shift+CapsLock changes layout."
-msgstr "Skift+CapsLock-tangenten byter layout."
+#: ../rules/base.xml.in.h:552 ../rules/evdev.xml.in.h:552
+msgid "Shift with numeric keypad keys works as in MS Windows"
+msgstr "Skift med tangenterna på numeriska tangentbordet fungerar som i MS Windows"
-#: ../rules/base.xml.in.h:538 ../rules/evdev.xml.in.h:538
+#: ../rules/base.xml.in.h:553 ../rules/evdev.xml.in.h:553
+msgid "Shift+CapsLock"
+msgstr "Skift+CapsLock"
+
+#: ../rules/base.xml.in.h:554 ../rules/evdev.xml.in.h:554
msgid "Simple"
msgstr "Enkel"
-#: ../rules/base.xml.in.h:539 ../rules/evdev.xml.in.h:539
+#: ../rules/base.xml.in.h:555 ../rules/evdev.xml.in.h:555
msgid "Slovakia"
msgstr "Slovakien"
-#: ../rules/base.xml.in.h:540 ../rules/evdev.xml.in.h:540
+#: ../rules/base.xml.in.h:556 ../rules/evdev.xml.in.h:556
msgid "Slovenia"
msgstr "Slovenien"
-#: ../rules/base.xml.in.h:541 ../rules/evdev.xml.in.h:541
+#: ../rules/base.xml.in.h:557 ../rules/evdev.xml.in.h:557
msgid "South Africa"
msgstr "Sydafrika"
-#: ../rules/base.xml.in.h:542 ../rules/evdev.xml.in.h:542
+#: ../rules/base.xml.in.h:558 ../rules/evdev.xml.in.h:558
msgid "Southern Uzbek"
msgstr "Södra Uzbekistan"
-#: ../rules/base.xml.in.h:543 ../rules/evdev.xml.in.h:543
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr "Blankstegstangenten skriver ut icke-brytande blanksteg på fjärde nivån, tunt icke-brytande blankstegstecken på sjätte nivån"
-
-#: ../rules/base.xml.in.h:544 ../rules/evdev.xml.in.h:544
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift"
-msgstr "Blankstegstangenten skriver ut icke-brytande blanksteg på fjärde nivån, tunt icke-brytande blankstegstecken på sjätte nivån (via Ctrl+Skift"
-
-#: ../rules/base.xml.in.h:545 ../rules/evdev.xml.in.h:545
-msgid "Space key outputs non-breakable space character at fourth level."
-msgstr "Blankstegstangenten skriver ut icke-brytande blanksteg på fjärde nivån."
-
-#: ../rules/base.xml.in.h:546 ../rules/evdev.xml.in.h:546
-msgid "Space key outputs non-breakable space character at second level."
-msgstr "Blankstegstangenten skriver ut icke-brytande blanksteg på andra nivån."
-
-#: ../rules/base.xml.in.h:547 ../rules/evdev.xml.in.h:547
-msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
-msgstr "Blankstegstangenten skriver ut icke-brytande blanksteg på tredje nivån, ingenting på fjärde nivån."
-
-#: ../rules/base.xml.in.h:548 ../rules/evdev.xml.in.h:548
-msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr "Blankstegstangenten skriver ut icke-brytande blanksteg på tredje nivån, tunt icke-brytande blankstegstecken på fjärde nivån"
-
-#: ../rules/base.xml.in.h:549 ../rules/evdev.xml.in.h:549
-msgid "Space key outputs non-breakable space character at third level."
-msgstr "Blankstegstangenten skriver ut icke-brytande blanksteg på tredje nivån."
-
-#: ../rules/base.xml.in.h:550 ../rules/evdev.xml.in.h:550
-msgid "Space key outputs usual space at any level."
-msgstr "Blankstegstangenten skriver ut blanksteg på alla nivåer."
-
-#: ../rules/base.xml.in.h:551 ../rules/evdev.xml.in.h:551
+#: ../rules/base.xml.in.h:559 ../rules/evdev.xml.in.h:559
msgid "Spain"
msgstr "Spanien"
-#: ../rules/base.xml.in.h:552 ../rules/evdev.xml.in.h:552
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
-msgstr "Specialtangenter (Ctrl+Alt+&lt;tangent&gt;) hanteras i en server."
+#: ../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 "Specialtangenter (Ctrl+Alt+&lt;tangent&gt;) hanteras i en server"
-#: ../rules/base.xml.in.h:553 ../rules/evdev.xml.in.h:553
+#: ../rules/base.xml.in.h:561 ../rules/evdev.xml.in.h:561
msgid "SrL"
msgstr "SrL"
-#: ../rules/base.xml.in.h:554 ../rules/evdev.xml.in.h:554
+#: ../rules/base.xml.in.h:562 ../rules/evdev.xml.in.h:562
msgid "Sri Lanka"
msgstr "Sri Lanka"
-#: ../rules/base.xml.in.h:555 ../rules/evdev.xml.in.h:555
+#: ../rules/base.xml.in.h:563 ../rules/evdev.xml.in.h:563
msgid "Standard"
msgstr "Standard"
-#: ../rules/base.xml.in.h:556 ../rules/evdev.xml.in.h:556
+#: ../rules/base.xml.in.h:564 ../rules/evdev.xml.in.h:564
msgid "Standard (Cedilla)"
msgstr "Standard (Cedilj)"
#. RSTU 2019-91
-#: ../rules/base.xml.in.h:558 ../rules/evdev.xml.in.h:558
+#: ../rules/base.xml.in.h:566 ../rules/evdev.xml.in.h:566
msgid "Standard RSTU"
msgstr "Standard RSTU"
#. RSTU 2019-91
-#: ../rules/base.xml.in.h:560 ../rules/evdev.xml.in.h:560
+#: ../rules/base.xml.in.h:568 ../rules/evdev.xml.in.h:568
msgid "Standard RSTU on Russian layout"
msgstr "Standard RSTU på rysk layout"
-#: ../rules/base.xml.in.h:561 ../rules/evdev.xml.in.h:561
+#: ../rules/base.xml.in.h:569 ../rules/evdev.xml.in.h:569
msgid "Sun Type 5/6"
msgstr "Sun Type 5/6"
-#: ../rules/base.xml.in.h:562 ../rules/evdev.xml.in.h:562
+#: ../rules/base.xml.in.h:570 ../rules/evdev.xml.in.h:570
msgid "Sun dead keys"
msgstr "Sun stumma tangenter"
-#: ../rules/base.xml.in.h:563 ../rules/evdev.xml.in.h:563
+#: ../rules/base.xml.in.h:571 ../rules/evdev.xml.in.h:571
msgid "Super Power Multimedia Keyboard"
msgstr "Super Power Multimedia Keyboard"
-#: ../rules/base.xml.in.h:564 ../rules/evdev.xml.in.h:564
-msgid "Super is mapped to the Win-keys."
-msgstr "Super-tangenten är mappad till Win-tangenterna."
+#: ../rules/base.xml.in.h:572 ../rules/evdev.xml.in.h:572
+msgid "Super is mapped to Win keys"
+msgstr "Super-tangenten är mappad till Win-tangenterna"
-#: ../rules/base.xml.in.h:565 ../rules/evdev.xml.in.h:565
+#: ../rules/base.xml.in.h:573 ../rules/evdev.xml.in.h:573
msgid "Svdvorak"
msgstr "Svdvorak"
-#: ../rules/base.xml.in.h:566 ../rules/evdev.xml.in.h:566
+#: ../rules/base.xml.in.h:574 ../rules/evdev.xml.in.h:574
msgid "Svk"
msgstr "Svk"
-#: ../rules/base.xml.in.h:567 ../rules/evdev.xml.in.h:567
+#: ../rules/base.xml.in.h:575 ../rules/evdev.xml.in.h:575
msgid "Svn"
msgstr "Svn"
-#: ../rules/base.xml.in.h:568 ../rules/evdev.xml.in.h:568
-msgid "Swap Ctrl and CapsLock."
-msgstr "Byt Ctrl och CapsLock."
-
-#: ../rules/base.xml.in.h:569 ../rules/evdev.xml.in.h:569
-msgid "Swap ESC and CapsLock."
-msgstr "Byt ESC och CapsLock."
+#: ../rules/base.xml.in.h:576 ../rules/evdev.xml.in.h:576
+msgid "Swap Ctrl and CapsLock"
+msgstr "Byt Ctrl och CapsLock"
-#: ../rules/base.xml.in.h:570 ../rules/evdev.xml.in.h:570
-msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-msgstr "Byt tangentkoder för två tangenter när Mac-tangentbord identifieras fel av kärnan."
+#: ../rules/base.xml.in.h:577 ../rules/evdev.xml.in.h:577
+msgid "Swap ESC and CapsLock"
+msgstr "Byt ESC och CapsLock"
-#: ../rules/base.xml.in.h:571 ../rules/evdev.xml.in.h:571
+#: ../rules/base.xml.in.h:578 ../rules/evdev.xml.in.h:578
msgid "Swe"
msgstr "Swe"
-#: ../rules/base.xml.in.h:572 ../rules/evdev.xml.in.h:572
+#: ../rules/base.xml.in.h:579 ../rules/evdev.xml.in.h:579
msgid "Sweden"
msgstr "Sverige"
-#: ../rules/base.xml.in.h:573 ../rules/evdev.xml.in.h:573
+#: ../rules/base.xml.in.h:580 ../rules/evdev.xml.in.h:580
msgid "Switzerland"
msgstr "Schweiz"
-#: ../rules/base.xml.in.h:574 ../rules/evdev.xml.in.h:574
+#: ../rules/base.xml.in.h:581 ../rules/evdev.xml.in.h:581
msgid "Symplon PaceBook (tablet PC)"
msgstr "Symplon PaceBook (tablet PC)"
-#: ../rules/base.xml.in.h:575 ../rules/evdev.xml.in.h:575
+#: ../rules/base.xml.in.h:582 ../rules/evdev.xml.in.h:582
msgid "Syr"
msgstr "Syr"
-#: ../rules/base.xml.in.h:576 ../rules/evdev.xml.in.h:576
+#: ../rules/base.xml.in.h:583 ../rules/evdev.xml.in.h:583
msgid "Syria"
msgstr "Syrien"
-#: ../rules/base.xml.in.h:577 ../rules/evdev.xml.in.h:577
+#: ../rules/base.xml.in.h:584 ../rules/evdev.xml.in.h:584
msgid "Syriac"
msgstr "Syrisk"
-#: ../rules/base.xml.in.h:578 ../rules/evdev.xml.in.h:578
+#: ../rules/base.xml.in.h:585 ../rules/evdev.xml.in.h:585
msgid "Syriac phonetic"
msgstr "Syrisk fonetisk"
-#: ../rules/base.xml.in.h:579 ../rules/evdev.xml.in.h:579
+#: ../rules/base.xml.in.h:586 ../rules/evdev.xml.in.h:586
msgid "TIS-820.2538"
msgstr "TIS-820.2538"
-#: ../rules/base.xml.in.h:580 ../rules/evdev.xml.in.h:580
+#: ../rules/base.xml.in.h:587 ../rules/evdev.xml.in.h:587
msgid "Tajikistan"
msgstr "Tajikistan"
-#: ../rules/base.xml.in.h:581 ../rules/evdev.xml.in.h:581
+#: ../rules/base.xml.in.h:588 ../rules/evdev.xml.in.h:588
msgid "Tamil"
msgstr "Tamilsk"
-#: ../rules/base.xml.in.h:582 ../rules/evdev.xml.in.h:582
+#: ../rules/base.xml.in.h:589 ../rules/evdev.xml.in.h:589
msgid "Tamil TAB Typewriter"
msgstr "Tamil TAB Typewriter"
-#: ../rules/base.xml.in.h:583 ../rules/evdev.xml.in.h:583
+#: ../rules/base.xml.in.h:590 ../rules/evdev.xml.in.h:590
msgid "Tamil TSCII Typewriter"
msgstr "Tamil TSCII Typewriter"
-#: ../rules/base.xml.in.h:584 ../rules/evdev.xml.in.h:584
+#: ../rules/base.xml.in.h:591 ../rules/evdev.xml.in.h:591
msgid "Tamil Unicode"
msgstr "Tamilisk Unicode"
-#: ../rules/base.xml.in.h:585 ../rules/evdev.xml.in.h:585
+#: ../rules/base.xml.in.h:592 ../rules/evdev.xml.in.h:592
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
+
+#: ../rules/base.xml.in.h:593 ../rules/evdev.xml.in.h:593
msgid "Tatar"
msgstr "Tatar"
-#: ../rules/base.xml.in.h:586 ../rules/evdev.xml.in.h:586
+#: ../rules/base.xml.in.h:594 ../rules/evdev.xml.in.h:594
msgid "Telugu"
msgstr "Telugo"
-#: ../rules/base.xml.in.h:587 ../rules/evdev.xml.in.h:587
+#: ../rules/base.xml.in.h:595 ../rules/evdev.xml.in.h:595
msgid "Tha"
msgstr "Tha"
-#: ../rules/base.xml.in.h:588 ../rules/evdev.xml.in.h:588
+#: ../rules/base.xml.in.h:596 ../rules/evdev.xml.in.h:596
msgid "Thailand"
msgstr "Thailand"
-#: ../rules/base.xml.in.h:589 ../rules/evdev.xml.in.h:589
-msgid "Third level choosers"
-msgstr "Tredjenivåsväljare"
-
-#: ../rules/base.xml.in.h:590 ../rules/evdev.xml.in.h:590
+#: ../rules/base.xml.in.h:597 ../rules/evdev.xml.in.h:597
msgid "Tibetan"
msgstr "Tibetisk"
-#: ../rules/base.xml.in.h:591 ../rules/evdev.xml.in.h:591
+#: ../rules/base.xml.in.h:598 ../rules/evdev.xml.in.h:598
msgid "Tibetan (with ASCII numerals)"
msgstr "Tibetisk (med ASCII-taltecken)"
-#: ../rules/base.xml.in.h:592 ../rules/evdev.xml.in.h:592
+#: ../rules/base.xml.in.h:599 ../rules/evdev.xml.in.h:599
msgid "Tifinagh"
msgstr "Tifinagh"
-#: ../rules/base.xml.in.h:593 ../rules/evdev.xml.in.h:593
+#: ../rules/base.xml.in.h:600 ../rules/evdev.xml.in.h:600
msgid "Tifinagh Alternative"
msgstr "Tifinagh alternativ"
-#: ../rules/base.xml.in.h:594 ../rules/evdev.xml.in.h:594
+#: ../rules/base.xml.in.h:601 ../rules/evdev.xml.in.h:601
msgid "Tifinagh Alternative Phonetic"
msgstr "Tifinagh alternativ fonetisk"
-#: ../rules/base.xml.in.h:595 ../rules/evdev.xml.in.h:595
+#: ../rules/base.xml.in.h:602 ../rules/evdev.xml.in.h:602
msgid "Tifinagh Extended"
msgstr "Tifinagh utökad"
-#: ../rules/base.xml.in.h:596 ../rules/evdev.xml.in.h:596
+#: ../rules/base.xml.in.h:603 ../rules/evdev.xml.in.h:603
msgid "Tifinagh Extended Phonetic"
msgstr "Tifinagh utökad fonetisk"
-#: ../rules/base.xml.in.h:597 ../rules/evdev.xml.in.h:597
+#: ../rules/base.xml.in.h:604 ../rules/evdev.xml.in.h:604
msgid "Tifinagh Phonetic"
msgstr "Tifinagh fonetisk"
-#: ../rules/base.xml.in.h:598 ../rules/evdev.xml.in.h:598
+#: ../rules/base.xml.in.h:605 ../rules/evdev.xml.in.h:605
msgid "Tilde (~) variant"
msgstr "Tilde (~) variant"
-#: ../rules/base.xml.in.h:599 ../rules/evdev.xml.in.h:599
+#: ../rules/base.xml.in.h:606 ../rules/evdev.xml.in.h:606
msgid "Tjk"
msgstr "Tjk"
-#: ../rules/base.xml.in.h:600 ../rules/evdev.xml.in.h:600
+#: ../rules/base.xml.in.h:607 ../rules/evdev.xml.in.h:607
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr "Till motsvarande tangent på ett Dvorak-tangentbord."
+
+#: ../rules/base.xml.in.h:608 ../rules/evdev.xml.in.h:608
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr "Till motsvarande tangent på ett Qwerty-tangentbord."
+
+#: ../rules/base.xml.in.h:609 ../rules/evdev.xml.in.h:609
msgid "Toshiba Satellite S3000"
msgstr "Toshiba Satellite S3000"
-#: ../rules/base.xml.in.h:601 ../rules/evdev.xml.in.h:601
+#: ../rules/base.xml.in.h:610 ../rules/evdev.xml.in.h:610
msgid "Trust Direct Access Keyboard"
msgstr "Trust Direct Access-tangentbord"
-#: ../rules/base.xml.in.h:602 ../rules/evdev.xml.in.h:602
+#: ../rules/base.xml.in.h:611 ../rules/evdev.xml.in.h:611
msgid "Trust Wireless Keyboard Classic"
msgstr "Trust Wireless Keyboard Classic"
-#: ../rules/base.xml.in.h:603 ../rules/evdev.xml.in.h:603
+#: ../rules/base.xml.in.h:612 ../rules/evdev.xml.in.h:612
msgid "Tur"
msgstr "Tur"
-#: ../rules/base.xml.in.h:604 ../rules/evdev.xml.in.h:604
+#: ../rules/base.xml.in.h:613 ../rules/evdev.xml.in.h:613
msgid "Turkey"
msgstr "Turkiet"
-#: ../rules/base.xml.in.h:605 ../rules/evdev.xml.in.h:605
+#: ../rules/base.xml.in.h:614 ../rules/evdev.xml.in.h:614
msgid "Typewriter"
msgstr "Skrivmaskin"
-#: ../rules/base.xml.in.h:606 ../rules/evdev.xml.in.h:606
+#: ../rules/base.xml.in.h:615 ../rules/evdev.xml.in.h:615
msgid "UCW layout (accented letters only)"
msgstr "UCW-layout (endast bokstäver med accenter)"
-#: ../rules/base.xml.in.h:607 ../rules/evdev.xml.in.h:607
+#: ../rules/base.xml.in.h:616 ../rules/evdev.xml.in.h:616
msgid "US keyboard with Bosnian digraphs"
msgstr "USA-tangentbord med bosniska digrafer"
-#: ../rules/base.xml.in.h:608 ../rules/evdev.xml.in.h:608
+#: ../rules/base.xml.in.h:617 ../rules/evdev.xml.in.h:617
msgid "US keyboard with Bosnian letters"
msgstr "USA-tangentbord med bosniska bokstäver"
-#: ../rules/base.xml.in.h:609 ../rules/evdev.xml.in.h:609
+#: ../rules/base.xml.in.h:618 ../rules/evdev.xml.in.h:618
msgid "US keyboard with Croatian digraphs"
msgstr "USA-tangentbord med kroatiska digrafer"
-#: ../rules/base.xml.in.h:610 ../rules/evdev.xml.in.h:610
+#: ../rules/base.xml.in.h:619 ../rules/evdev.xml.in.h:619
msgid "US keyboard with Croatian letters"
msgstr "USA-tangentbord med kroatiska bokstäver"
-#: ../rules/base.xml.in.h:611 ../rules/evdev.xml.in.h:611
+#: ../rules/base.xml.in.h:620 ../rules/evdev.xml.in.h:620
msgid "US keyboard with Estonian letters"
msgstr "USA-tangentbord med estniska bokstäver"
-#: ../rules/base.xml.in.h:612 ../rules/evdev.xml.in.h:612
+#: ../rules/base.xml.in.h:621 ../rules/evdev.xml.in.h:621
msgid "US keyboard with Lithuanian letters"
msgstr "USA-tangentbord med litauiska bokstäver"
-#: ../rules/base.xml.in.h:613 ../rules/evdev.xml.in.h:613
+#: ../rules/base.xml.in.h:622 ../rules/evdev.xml.in.h:622
msgid "US keyboard with Slovenian digraphs"
msgstr "USA-tangentbord med slovenska digrafer"
-#: ../rules/base.xml.in.h:614 ../rules/evdev.xml.in.h:614
+#: ../rules/base.xml.in.h:623 ../rules/evdev.xml.in.h:623
msgid "US keyboard with Slovenian letters"
msgstr "USA-tangentbord med slovenska bokstäver"
-#: ../rules/base.xml.in.h:615 ../rules/evdev.xml.in.h:615
+#: ../rules/base.xml.in.h:624 ../rules/evdev.xml.in.h:624
msgid "USA"
msgstr "USA"
-#: ../rules/base.xml.in.h:616 ../rules/evdev.xml.in.h:616
+#: ../rules/base.xml.in.h:625 ../rules/evdev.xml.in.h:625
msgid "Udmurt"
msgstr "Udmurt"
-#: ../rules/base.xml.in.h:617 ../rules/evdev.xml.in.h:617
+#: ../rules/base.xml.in.h:626 ../rules/evdev.xml.in.h:626
msgid "Ukr"
msgstr "Ukr"
-#: ../rules/base.xml.in.h:618 ../rules/evdev.xml.in.h:618
+#: ../rules/base.xml.in.h:627 ../rules/evdev.xml.in.h:627
msgid "Ukraine"
msgstr "Ukraina"
-#: ../rules/base.xml.in.h:619 ../rules/evdev.xml.in.h:619
+#: ../rules/base.xml.in.h:628 ../rules/evdev.xml.in.h:628
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../rules/base.xml.in.h:629 ../rules/evdev.xml.in.h:629
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Unicode-tillägg (pilar och matematikoperatorer)"
+
+#: ../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 "Unicode-tillägg (pilar och matematikoperatorer). Matematikoperatorer på standardnivå"
+
+#: ../rules/base.xml.in.h:631 ../rules/evdev.xml.in.h:631
msgid "UnicodeExpert"
msgstr "UnicodeExpert"
-#: ../rules/base.xml.in.h:620 ../rules/evdev.xml.in.h:620
+#: ../rules/base.xml.in.h:632 ../rules/evdev.xml.in.h:632
msgid "United Kingdom"
msgstr "Storbritannien"
-#: ../rules/base.xml.in.h:621 ../rules/evdev.xml.in.h:621
-msgid "Urdu"
-msgstr "Urdu"
+#: ../rules/base.xml.in.h:633 ../rules/evdev.xml.in.h:633
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
-#: ../rules/base.xml.in.h:622 ../rules/evdev.xml.in.h:622
+#: ../rules/base.xml.in.h:634 ../rules/evdev.xml.in.h:634
+msgid "Urdu, Alternative phonetic"
+msgstr "Urdu, alternativ fonetisk"
+
+#: ../rules/base.xml.in.h:635 ../rules/evdev.xml.in.h:635
+msgid "Urdu, Phonetic"
+msgstr "Urdu, fonetisk"
+
+#: ../rules/base.xml.in.h:636 ../rules/evdev.xml.in.h:636
+msgid "Urdu, Winkeys"
+msgstr "Urdu, Win-tangenter"
+
+#: ../rules/base.xml.in.h:637 ../rules/evdev.xml.in.h:637
msgid "Use Bosnian digraphs"
msgstr "Använd bosniska digrafer"
-#: ../rules/base.xml.in.h:623 ../rules/evdev.xml.in.h:623
+#: ../rules/base.xml.in.h:638 ../rules/evdev.xml.in.h:638
msgid "Use Croatian digraphs"
msgstr "Använd kroatiska digrafer"
-#: ../rules/base.xml.in.h:624 ../rules/evdev.xml.in.h:624
+#: ../rules/base.xml.in.h:639 ../rules/evdev.xml.in.h:639
msgid "Use Slovenian digraphs"
msgstr "Använd slovenska digrafer"
-#: ../rules/base.xml.in.h:625 ../rules/evdev.xml.in.h:625
+#: ../rules/base.xml.in.h:640 ../rules/evdev.xml.in.h:640
msgid "Use guillemets for quotes"
msgstr "Använd gåsögon för citattecken"
-#: ../rules/base.xml.in.h:626 ../rules/evdev.xml.in.h:626
-msgid "Use keyboard LED to show alternative layout."
-msgstr "Använd tangentbordslampa för att visa alternativ layout."
+#: ../rules/base.xml.in.h:641 ../rules/evdev.xml.in.h:641
+msgid "Use keyboard LED to show alternative layout"
+msgstr "Använd tangentbordslampa för att visa alternativ layout"
-#: ../rules/base.xml.in.h:627 ../rules/evdev.xml.in.h:627
+#: ../rules/base.xml.in.h:642 ../rules/evdev.xml.in.h:642
msgid "Using space key to input non-breakable space character"
msgstr "Använder blankstegstangenten för att mata in icke-brytande blankstegstecken"
-#: ../rules/base.xml.in.h:628 ../rules/evdev.xml.in.h:628
+#: ../rules/base.xml.in.h:643 ../rules/evdev.xml.in.h:643
+msgid "Usual space at any level"
+msgstr "Vanligt blanksteg på alla nivåer"
+
+#: ../rules/base.xml.in.h:644 ../rules/evdev.xml.in.h:644
msgid "Uzb"
msgstr "Uzb"
-#: ../rules/base.xml.in.h:629 ../rules/evdev.xml.in.h:629
+#: ../rules/base.xml.in.h:645 ../rules/evdev.xml.in.h:645
msgid "Uzbekistan"
msgstr "Uzbekistan"
-#: ../rules/base.xml.in.h:630 ../rules/evdev.xml.in.h:630
+#: ../rules/base.xml.in.h:646 ../rules/evdev.xml.in.h:646
msgid "Vietnam"
msgstr "Vietnam"
-#: ../rules/base.xml.in.h:631 ../rules/evdev.xml.in.h:631
+#: ../rules/base.xml.in.h:647 ../rules/evdev.xml.in.h:647
msgid "ViewSonic KU-306 Internet Keyboard"
msgstr "ViewSonic KU-306 internettangentbord"
-#: ../rules/base.xml.in.h:632 ../rules/evdev.xml.in.h:632
+#: ../rules/base.xml.in.h:648 ../rules/evdev.xml.in.h:648
msgid "Vnm"
msgstr "Vnm"
-#: ../rules/base.xml.in.h:633 ../rules/evdev.xml.in.h:633
+#: ../rules/base.xml.in.h:649 ../rules/evdev.xml.in.h:649
msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
msgstr "Wang 724 numeriskt tangentbord med unicode-tillägg (pilar och matematikoperatorer)"
-#: ../rules/base.xml.in.h:634 ../rules/evdev.xml.in.h:634
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Wang 724 numeriskt tangentbord med unicode-tillägg (pilar och matematikoperatorer). Matematikoperatorer på standardnivå."
+#: ../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 "Wang 724 numeriskt tangentbord med unicode-tillägg (pilar och matematikoperatorer). Matematikoperatorer på standardnivå"
-#: ../rules/base.xml.in.h:635 ../rules/evdev.xml.in.h:635
+#: ../rules/base.xml.in.h:651 ../rules/evdev.xml.in.h:651
msgid "Wang model 724 azerty"
msgstr "Wang modell 724 azerty"
-#: ../rules/base.xml.in.h:636 ../rules/evdev.xml.in.h:636
+#: ../rules/base.xml.in.h:652 ../rules/evdev.xml.in.h:652
msgid "Western"
msgstr "Västlig"
-#: ../rules/base.xml.in.h:637 ../rules/evdev.xml.in.h:637
+#: ../rules/base.xml.in.h:653 ../rules/evdev.xml.in.h:653
msgid "Winbook Model XP5"
msgstr "Winbook Model XP5"
-#: ../rules/base.xml.in.h:638 ../rules/evdev.xml.in.h:638
+#: ../rules/base.xml.in.h:654 ../rules/evdev.xml.in.h:654
msgid "Winkeys"
msgstr "Win-tangenter"
-#: ../rules/base.xml.in.h:639 ../rules/evdev.xml.in.h:639
+#: ../rules/base.xml.in.h:655 ../rules/evdev.xml.in.h:655
msgid "With &lt;\\|&gt; key"
msgstr "Med &lt;\\|&gt;-tangent"
-#: ../rules/base.xml.in.h:640 ../rules/evdev.xml.in.h:640
+#: ../rules/base.xml.in.h:656 ../rules/evdev.xml.in.h:656
msgid "With EuroSign on 5"
msgstr "Med eurotecknet till tangenten 5"
-#: ../rules/base.xml.in.h:641 ../rules/evdev.xml.in.h:641
+#: ../rules/base.xml.in.h:657 ../rules/evdev.xml.in.h:657
msgid "With guillemets"
msgstr "Med gåsögon"
-#: ../rules/base.xml.in.h:642 ../rules/evdev.xml.in.h:642
+#: ../rules/base.xml.in.h:658 ../rules/evdev.xml.in.h:658
msgid "Yahoo! Internet Keyboard"
msgstr "Yahoo! Internettangentbord"
-#: ../rules/base.xml.in.h:643 ../rules/evdev.xml.in.h:643
+#: ../rules/base.xml.in.h:659 ../rules/evdev.xml.in.h:659
msgid "Yakut"
msgstr "Jakutiska"
-#: ../rules/base.xml.in.h:644 ../rules/evdev.xml.in.h:644
+#: ../rules/base.xml.in.h:660 ../rules/evdev.xml.in.h:660
msgid "Yoruba"
msgstr "Yoruba"
-#: ../rules/base.xml.in.h:645 ../rules/evdev.xml.in.h:645
+#: ../rules/base.xml.in.h:661 ../rules/evdev.xml.in.h:661
msgid "Z and ZHE swapped"
msgstr "Z och ZHE utbytta"
-#: ../rules/base.xml.in.h:646 ../rules/evdev.xml.in.h:646
+#: ../rules/base.xml.in.h:662 ../rules/evdev.xml.in.h:662
msgid "Zar"
msgstr "Zar"
-#: ../rules/base.xml.in.h:647 ../rules/evdev.xml.in.h:647
+#: ../rules/base.xml.in.h:663 ../rules/evdev.xml.in.h:663
msgid "azerty"
msgstr "azerty"
-#: ../rules/base.xml.in.h:648 ../rules/evdev.xml.in.h:648
+#: ../rules/base.xml.in.h:664 ../rules/evdev.xml.in.h:664
msgid "azerty/digits"
msgstr "azerty/siffror"
-#: ../rules/base.xml.in.h:649 ../rules/evdev.xml.in.h:649
+#: ../rules/base.xml.in.h:665 ../rules/evdev.xml.in.h:665
msgid "digits"
msgstr "siffror"
-#: ../rules/base.xml.in.h:650 ../rules/evdev.xml.in.h:650
+#: ../rules/base.xml.in.h:666 ../rules/evdev.xml.in.h:666
msgid "displaced semicolon and quote (obsolete)"
msgstr "flyttat semikolon och citattecken (föråldrat)"
-#: ../rules/base.xml.in.h:651 ../rules/evdev.xml.in.h:651
+#: ../rules/base.xml.in.h:667 ../rules/evdev.xml.in.h:667
msgid "lyx"
msgstr "lyx"
-#: ../rules/base.xml.in.h:652 ../rules/evdev.xml.in.h:652
+#: ../rules/base.xml.in.h:668 ../rules/evdev.xml.in.h:668
msgid "qwerty"
msgstr "qwerty"
-#: ../rules/base.xml.in.h:653 ../rules/evdev.xml.in.h:653
+#: ../rules/base.xml.in.h:669 ../rules/evdev.xml.in.h:669
msgid "qwerty, extended Backslash"
msgstr "qwerty, utökat omvänt snedstreck"
-#: ../rules/base.xml.in.h:654 ../rules/evdev.xml.in.h:654
+#: ../rules/base.xml.in.h:670 ../rules/evdev.xml.in.h:670
msgid "qwerty/digits"
msgstr "qwerty/siffror"
-#: ../rules/base.xml.in.h:655 ../rules/evdev.xml.in.h:655
+#: ../rules/base.xml.in.h:671 ../rules/evdev.xml.in.h:671
msgid "qwertz"
msgstr "qwertz"
+#~ msgid "Add the EuroSign to the 2 key."
+#~ msgstr "Lägg till eurotecknet till tangenten 2."
+
+#~ msgid "Add the EuroSign to the 4 key."
+#~ msgstr "Lägg till eurotecknet till tangenten 4."
+
+#~ msgid "Add the EuroSign to the 5 key."
+#~ msgstr "Lägg till eurotecknet till tangenten 5."
+
+#~ msgid "Add the EuroSign to the E key."
+#~ msgstr "Lägg till eurotecknet till tangenten E."
+
+#~ msgid "Alt+Ctrl change layout."
+#~ msgstr "Alt+Ctrl byter layout."
+
+#~ msgid "Alt+Shift change layout."
+#~ msgstr "Alt+Shift byter layout."
+
+#~ msgid "Baltic+"
+#~ msgstr "Baltisk+"
+
+#~ msgid "Both Alt keys together change layout."
+#~ msgstr "Båda Alt-tangenterna tillsammans byter layout."
+
+#~ msgid "Both Ctrl keys together change layout."
+#~ msgstr "Båda Ctrl-tangenterna tillsammans byter layout."
+
+#~ msgid "Both Shift keys together change layout."
+#~ msgstr "Båda Skift-tangenterna tillsammans byter layout."
+
+#~ msgid "Caps Lock is Compose."
+#~ msgstr "Caps Lock är Compose."
+
+#~ msgid "CapsLock LED shows alternative layout."
+#~ msgstr "CapsLock-lampan visar alternativ layout."
+
+#~ msgid "CapsLock just locks the Shift modifier."
+#~ msgstr "CapsLock låser bara Skift-modifieraren."
+
+#~ msgid "CapsLock key changes layout."
+#~ msgstr "CapsLock-tangenten byter layout."
+
+#~ msgid "Ctrl+Shift change layout."
+#~ msgstr "Ctrl+Skift byter layout."
+
+#~ msgid "Hewlett-Packard Internet Keyboard 5181"
+#~ msgstr "Hewlett-Packard Internet Keyboard 5181"
+
+#~ msgid "Hewlett-Packard Internet Keyboard 5185"
+#~ msgstr "Hewlett-Packard Internet Keyboard 5185"
+
+#~ msgid "Hewlett-Packard SK-2505 Internet Keyboard"
+#~ msgstr "Hewlett-Packard SK-2505 Internettangentbord"
+
+#~ msgid "IBM Rapid Access II (alternate option)"
+#~ msgstr "IBM Rapid Access II (alternativ)"
+
+#~ msgid "LCtrl+LShift change layout."
+#~ msgstr "Vänster Ctrl + vänster Skift byter layout."
+
+#~ msgid "Layout switching"
+#~ msgstr "Layoutväxling"
+
+#~ msgid "Left Alt key changes layout."
+#~ msgstr "Vänster Alt-tangent byter layout."
+
+#~ msgid "Left Alt key switches layout while pressed."
+#~ msgstr "Vänster Alt-tangent byter layout då den trycks ned."
+
+#~ msgid "Left Ctrl key changes layout."
+#~ msgstr "Vänster Ctrl-tangent byter layout."
+
+#~ msgid "Left Shift key changes layout."
+#~ msgstr "Vänster Skift-tangent byter layout."
+
+#~ msgid "Left Win-key changes layout."
+#~ msgstr "Vänster Win-tangent byter layout."
+
+#~ msgid "Left Win-key is Compose."
+#~ msgstr "Vänster Win-tangent är Compose."
+
+#~ msgid "Legacy keypad"
+#~ msgstr "Äldre numeriskt tangentbord"
+
+#~ msgid "Menu is Compose."
+#~ msgstr "Meny är Compose."
+
+#~ msgid "Neostyle"
+#~ msgstr "Neostyle"
+
+#~ msgid "NumLock LED shows alternative layout."
+#~ msgstr "NumLock-lampan visar alternativ layout."
+
+#~ msgid "Press Left Alt key to choose 3rd level."
+#~ msgstr "Tryck vänster Alt-tangent för att välja tredjenivå."
+
+#~ msgid "Press Left Win-key to choose 3rd level."
+#~ msgstr "Tryck vänster Win-tangent för att välja tredjenivå."
+
+#~ msgid "Press Right Alt key to choose 3rd level."
+#~ msgstr "Tryck höger Alt-tangent för att välja tredjenivå."
+
+#~ msgid "Press Right Ctrl to choose 3rd level."
+#~ msgstr "Tryck höger Ctrl-tangent för att välja tredjenivå."
+
+#~ msgid "Press Right Win-key to choose 3rd level."
+#~ msgstr "Tryck höger Win-tangent för att välja tredjenivå."
+
+#~ msgid "Press any of Alt keys to choose 3rd level."
+#~ msgstr "Tryck valfri Alt-tangent för att välja tredjenivå."
+
+#~ msgid "Press any of Win-keys to choose 3rd level."
+#~ msgstr "Tryck valfri Win-tangent för att välja tredjenivå."
+
+#~ msgid "R-Alt switches layout while pressed."
+#~ msgstr "Höger Alt-tangent byter layout då den trycks ned."
+
+#~ msgid "Right Alt is Compose."
+#~ msgstr "Höger Alt är Compose."
+
+#~ msgid "Right Alt key changes layout."
+#~ msgstr "Höger Alt-tangent byter layout."
+
+#~ msgid "Right Ctrl is Compose."
+#~ msgstr "Höger Ctrl är Compose."
+
+#~ msgid "Right Ctrl key changes layout."
+#~ msgstr "Höger Ctrl-tangent byter layout."
+
+#~ msgid "Right Ctrl key switches layout while pressed."
+#~ msgstr "Höger Ctrl-tangent byter layout då den trycks ned."
+
+#~ msgid "Right Shift key changes layout."
+#~ msgstr "Höger Skift-tangent byter layout."
+
+#~ msgid "Right Win-key changes layout."
+#~ msgstr "Höger Win-tangent byter layout."
+
+#~ msgid "Right Win-key is Compose."
+#~ msgstr "Höger Win-tangent är Compose."
+
+#~ msgid "ScrollLock LED shows alternative layout."
+#~ msgstr "ScrollLock-lampan visar alternativ layout."
+
+#~ msgid "Shift+CapsLock changes layout."
+#~ msgstr "Skift+CapsLock-tangenten byter layout."
+
+#~ msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+#~ msgstr "Byt tangentkoder för två tangenter när Mac-tangentbord identifieras fel av kärnan."
+
+#~ msgid "Third level choosers"
+#~ msgstr "Tredjenivåsväljare"
+
+#~ msgid "Urdu"
+#~ msgstr "Urdu"
+
#~ msgid "(Legacy) Dvorak"
#~ msgstr "(Äldre) Dvorak"
@@ -2660,24 +2880,12 @@ msgstr "qwertz"
#~ msgid "Belgian"
#~ msgstr "Belgisk"
-#~ msgid "Both Alt keys together change group"
-#~ msgstr "Båda Alt-tangenterna tillsammans byter grupp"
-
-#~ msgid "Both Ctrl keys together change group"
-#~ msgstr "Båda Ctrl-tangenterna tillsammans byter grupp"
-
-#~ msgid "Both Shift keys together change group"
-#~ msgstr "Båda Skift-tangenterna tillsammans byter grupp"
-
#~ msgid "Bulgarian"
#~ msgstr "Bulgarisk"
#~ msgid "Canadian"
#~ msgstr "Kanadensisk"
-#~ msgid "Caps Lock is Compose"
-#~ msgstr "Caps Lock är Compose"
-
#~ msgid "Caps Lock key changes group"
#~ msgstr "Caps Lock-tangenten byter grupp"
@@ -2732,9 +2940,6 @@ msgstr "qwertz"
#~ msgid "Left Alt key changes group"
#~ msgstr "Vänster Alt-tangent byter grupp"
-#~ msgid "Left Alt key switches group while pressed"
-#~ msgstr "Vänster Alt-tangent byter grupp då den trycks ned"
-
#~ msgid "Left Ctrl key changes group"
#~ msgstr "Vänster Ctrl-tangent byter grupp"
@@ -2777,9 +2982,6 @@ msgstr "qwertz"
#~ msgid "Right Alt key changes group"
#~ msgstr "Höger Alt-tangent byter grupp"
-#~ msgid "Right Alt switches group while pressed"
-#~ msgstr "Höger Alt-tangent byter grupp då den trycks ned"
-
#~ msgid "Right Control key works as Right Alt"
#~ msgstr "Höger Control-tangent fungerar som höger Alt"
@@ -2930,9 +3132,6 @@ msgstr "qwertz"
#~ msgid "Arb"
#~ msgstr "Arb"
-#~ msgid "Ben"
-#~ msgstr "Ben"
-
#~ msgid "Bosnian"
#~ msgstr "Bosnisk"
@@ -2966,9 +3165,6 @@ msgstr "qwertz"
#~ msgid "Hindi"
#~ msgstr "Hindisk"
-#~ msgid "Hungarian (qwerty)"
-#~ msgstr "Ungersk (qwerty)"
-
#~ msgid "INSCRIPT layout"
#~ msgstr "INSCRIPT-layout"
@@ -3272,18 +3468,6 @@ msgstr "qwertz"
#~ msgid "Default XKB setting"
#~ msgstr "XKB-standardinställning"
-#~ msgid "Right Control"
-#~ msgstr "Höger ctrl"
-
-#~ msgid "Left Control"
-#~ msgstr "Vänster ctrl"
-
-#~ msgid "Right Shift"
-#~ msgstr "Höger skift"
-
-#~ msgid "Left Shift"
-#~ msgstr "Vänster skift"
-
#~ msgid "Grave"
#~ msgstr "Allvarlig"
@@ -3479,9 +3663,6 @@ msgstr "qwertz"
#~ msgid "Alt - Right Control"
#~ msgstr "Alt - höger ctrl"
-#~ msgid "Alt - Left Shift"
-#~ msgstr "Alt - vänster skift"
-
#~ msgid "Alt - Right Shift"
#~ msgstr "Alt - höger skift"
diff --git a/xorg-server/xkbdata.src/po/vi.po b/xorg-server/xkbdata.src/po/vi.po
index 64f851e24..69d7fb7b5 100644
--- a/xorg-server/xkbdata.src/po/vi.po
+++ b/xorg-server/xkbdata.src/po/vi.po
@@ -1,2630 +1,2754 @@
# Vietnamese translation for X Keyboard Config.
-# Copyright © 2008 Free Software Foundation, Inc.
+# Copyright © 2009 Free Software Foundation, Inc.
# This file is distributed under the same license as the xkeyboard-config package.
# Phan Vinh Thinh <teppi82@gmail.com>, 2005.
-# Clytie Siddall <clytie@riverland.net.au>, 2007-2008.
+# Clytie Siddall <clytie@riverland.net.au>, 2007-2009.
#
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config 1.4-pre1\n"
+"Project-Id-Version: xkeyboard-config 1.6pre1\n"
"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2008-09-15 23:52+0100\n"
-"PO-Revision-Date: 2008-09-21 21:38+0930\n"
+"POT-Creation-Date: 2009-05-12 23:49+0100\n"
+"PO-Revision-Date: 2009-05-13 20:36+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\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"
-"X-Generator: LocFactoryEditor 1.7b3\n"
+"X-Generator: LocFactoryEditor 1.8\n"
-#: ../rules/base.xml.in.h:1 ../rules/evdev.xml.in.h:1
+#: ../rules/base.xml.in.h:1
msgid "(F)"
msgstr "(F)"
-#: ../rules/base.xml.in.h:2 ../rules/evdev.xml.in.h:2
+#: ../rules/base.xml.in.h:2
msgid "(Legacy) Alternative"
msgstr "(Thừa tự) Tương đương"
-#: ../rules/base.xml.in.h:3 ../rules/evdev.xml.in.h:3
+#: ../rules/base.xml.in.h:3
msgid "(Legacy) Alternative, Sun dead keys"
msgstr "(Thừa tự) Tương đương, phím chết Sun"
-#: ../rules/base.xml.in.h:4 ../rules/evdev.xml.in.h:4
+#: ../rules/base.xml.in.h:4
msgid "(Legacy) Alternative, eliminate dead keys"
msgstr "(Thừa tự) Tương đương, phím chết loại trừ"
-#: ../rules/base.xml.in.h:5 ../rules/evdev.xml.in.h:5
+#: ../rules/base.xml.in.h:5
msgid "101/104 key Compatible"
msgstr "Tương thích với kiểu 101/104 phím"
-#: ../rules/base.xml.in.h:6 ../rules/evdev.xml.in.h:6
+#: ../rules/base.xml.in.h:6
msgid "101/qwerty/comma/Dead keys"
msgstr "101/qwerty/dấu phẩy/Phím chết"
-#: ../rules/base.xml.in.h:7 ../rules/evdev.xml.in.h:7
+#: ../rules/base.xml.in.h:7
msgid "101/qwerty/comma/Eliminate dead keys"
msgstr "101/qwerty/dấu phẩy/Phím chết loại trừ"
-#: ../rules/base.xml.in.h:8 ../rules/evdev.xml.in.h:8
+#: ../rules/base.xml.in.h:8
msgid "101/qwerty/dot/Dead keys"
msgstr "101/qwerty/dấu chấm/Phím chết"
-#: ../rules/base.xml.in.h:9 ../rules/evdev.xml.in.h:9
+#: ../rules/base.xml.in.h:9
msgid "101/qwerty/dot/Eliminate dead keys"
msgstr "101/qwerty/dấu chấm/Phím chết loại trừ"
-#: ../rules/base.xml.in.h:10 ../rules/evdev.xml.in.h:10
+#: ../rules/base.xml.in.h:10
msgid "101/qwertz/comma/Dead keys"
msgstr "101/qwertz/dấu phẩy/Phím chết"
-#: ../rules/base.xml.in.h:11 ../rules/evdev.xml.in.h:11
+#: ../rules/base.xml.in.h:11
msgid "101/qwertz/comma/Eliminate dead keys"
msgstr "101/qwertz/dấu phẩy/Phím chết loại trừ"
-#: ../rules/base.xml.in.h:12 ../rules/evdev.xml.in.h:12
+#: ../rules/base.xml.in.h:12
msgid "101/qwertz/dot/Dead keys"
msgstr "101/qwertz/dấu chấm/Phím chết"
-#: ../rules/base.xml.in.h:13 ../rules/evdev.xml.in.h:13
+#: ../rules/base.xml.in.h:13
msgid "101/qwertz/dot/Eliminate dead keys"
msgstr "101/qwertz/dấu chấm/Phím chết loại trừ"
-#: ../rules/base.xml.in.h:14 ../rules/evdev.xml.in.h:14
+#: ../rules/base.xml.in.h:14
msgid "102/qwerty/comma/Dead keys"
msgstr "102/qwerty/dấu phẩy/Phím chết"
-#: ../rules/base.xml.in.h:15 ../rules/evdev.xml.in.h:15
+#: ../rules/base.xml.in.h:15
msgid "102/qwerty/comma/Eliminate dead keys"
msgstr "102/qwerty/dấu phẩy/Phím chết loại trừ"
-#: ../rules/base.xml.in.h:16 ../rules/evdev.xml.in.h:16
+#: ../rules/base.xml.in.h:16
msgid "102/qwerty/dot/Dead keys"
msgstr "102/qwerty/dấu chấm/Phím chết"
-#: ../rules/base.xml.in.h:17 ../rules/evdev.xml.in.h:17
+#: ../rules/base.xml.in.h:17
msgid "102/qwerty/dot/Eliminate dead keys"
msgstr "102/qwerty/dấu chấm/Phím chết loại trừ"
-#: ../rules/base.xml.in.h:18 ../rules/evdev.xml.in.h:18
+#: ../rules/base.xml.in.h:18
msgid "102/qwertz/comma/Dead keys"
msgstr "102/qwertz/dấu phẩy/Phím chết"
-#: ../rules/base.xml.in.h:19 ../rules/evdev.xml.in.h:19
+#: ../rules/base.xml.in.h:19
msgid "102/qwertz/comma/Eliminate dead keys"
msgstr "102/qwertz/dấu phẩy/Phím chết loại trừ"
-#: ../rules/base.xml.in.h:20 ../rules/evdev.xml.in.h:20
+#: ../rules/base.xml.in.h:20
msgid "102/qwertz/dot/Dead keys"
msgstr "102/qwertz/dấu chấm/Phím chết"
-#: ../rules/base.xml.in.h:21 ../rules/evdev.xml.in.h:21
+#: ../rules/base.xml.in.h:21
msgid "102/qwertz/dot/Eliminate dead keys"
msgstr "102/qwertz/dấu chấm/Phím chết loại trừ"
-#: ../rules/base.xml.in.h:22 ../rules/evdev.xml.in.h:22
+#: ../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:23 ../rules/evdev.xml.in.h:23
+#: ../rules/base.xml.in.h:26
msgid "A4Tech KBS-8"
msgstr "A4Tech KBS-8"
-#: ../rules/base.xml.in.h:24 ../rules/evdev.xml.in.h:24
+#: ../rules/base.xml.in.h:27
msgid "A4Tech Wireless Desktop RFKB-23"
msgstr "Không dây Để bàn RFKB-23 A4Tech"
-#: ../rules/base.xml.in.h:25 ../rules/evdev.xml.in.h:25
+#: ../rules/base.xml.in.h:28
msgid "ACPI Standard"
msgstr "ACPI Tiêu chuẩn"
-#: ../rules/base.xml.in.h:26 ../rules/evdev.xml.in.h:26
-msgid "ATM/phone-style hexadecimal keypad"
-msgstr "Vùng phím thập lục kiểu điện thoại/ATM"
+#: ../rules/base.xml.in.h:29
+msgid "ATM/phone-style"
+msgstr "Kiểu điện thoại/ATM"
-#: ../rules/base.xml.in.h:27 ../rules/evdev.xml.in.h:27
+#: ../rules/base.xml.in.h:30
msgid "Acer AirKey V"
msgstr "Acer AirKey V"
-#: ../rules/base.xml.in.h:28 ../rules/evdev.xml.in.h:28
+#: ../rules/base.xml.in.h:31
msgid "Acer C300"
msgstr "Acer C300"
-#: ../rules/base.xml.in.h:29 ../rules/evdev.xml.in.h:29
+#: ../rules/base.xml.in.h:32
msgid "Acer Ferrari 4000"
msgstr "Acer Ferrari 4000"
-#: ../rules/base.xml.in.h:30 ../rules/evdev.xml.in.h:30
+#: ../rules/base.xml.in.h:33
msgid "Acer Laptop"
msgstr "Xách tay Acer"
-#: ../rules/base.xml.in.h:31 ../rules/evdev.xml.in.h:31
-msgid "Add the EuroSign to the 2 key."
-msgstr "Thêm ký hiệu đồng Euro vào phím 2."
-
-#: ../rules/base.xml.in.h:32 ../rules/evdev.xml.in.h:32
-msgid "Add the EuroSign to the 4 key."
-msgstr "Thêm ký hiệu đồng Euro vào phím 4."
+#: ../rules/base.xml.in.h:34
+msgid "Add the standard behavior to Menu key"
+msgstr "Thêm ứng xử tiêu chuẩn vào phím trình đơn."
-#: ../rules/base.xml.in.h:33 ../rules/evdev.xml.in.h:33
-msgid "Add the EuroSign to the 5 key."
-msgstr "Thêm ký hiệu đồng Euro vào phím 5."
-
-#: ../rules/base.xml.in.h:34 ../rules/evdev.xml.in.h:34
-msgid "Add the EuroSign to the E key."
-msgstr "Thêm ký hiệu đồng Euro vào phím E."
+#: ../rules/base.xml.in.h:35
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "Đang thêm các dấu mũ tiếng Ét-pe-ran-tô (supersigno)"
-#: ../rules/base.xml.in.h:35 ../rules/evdev.xml.in.h:35
-msgid "Add the standard behavior to Menu key."
-msgstr "Thêm tính năng cơ bản vào phím Menu."
+#: ../rules/base.xml.in.h:36
+msgid "Adding EuroSign to certain keys"
+msgstr "Đang thêm ký hiệu đồng Euro vào một số phím nào đó"
-#: ../rules/base.xml.in.h:36 ../rules/evdev.xml.in.h:36
-msgid "Adding the EuroSign to certain keys"
-msgstr "Thêm ký hiệu đồng Euro vào các phím chắc chắn"
-
-#: ../rules/base.xml.in.h:37 ../rules/evdev.xml.in.h:37
+#: ../rules/base.xml.in.h:37
msgid "Advance Scorpius KI"
msgstr "Nâng cao Scorpius KI"
-#: ../rules/base.xml.in.h:38 ../rules/evdev.xml.in.h:38
+#: ../rules/base.xml.in.h:38
msgid "Afg"
msgstr "Afg"
-#: ../rules/base.xml.in.h:39 ../rules/evdev.xml.in.h:39
+#: ../rules/base.xml.in.h:39
msgid "Afghanistan"
msgstr "A Phú Hãn"
-#: ../rules/base.xml.in.h:40 ../rules/evdev.xml.in.h:40
+#: ../rules/base.xml.in.h:40
msgid "Akan"
msgstr "Akan"
-#: ../rules/base.xml.in.h:41 ../rules/evdev.xml.in.h:41
+#: ../rules/base.xml.in.h:41
msgid "Alb"
msgstr "Alb"
-#: ../rules/base.xml.in.h:42 ../rules/evdev.xml.in.h:42
+#: ../rules/base.xml.in.h:42
msgid "Albania"
msgstr "Al-ba-ni-a"
-#: ../rules/base.xml.in.h:43 ../rules/evdev.xml.in.h:43
-msgid "Alt and Meta are on the Alt keys."
-msgstr "Alt và Meta trên phím các Alt"
+#: ../rules/base.xml.in.h:43
+msgid "Alt and Meta are on Alt keys"
+msgstr "Alt và Meta nằm trên các phím Alt"
+
+#: ../rules/base.xml.in.h:44
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr "Ánh xạ Alt sang phím Win bên phải và Super sang phím trình đơn"
-#: ../rules/base.xml.in.h:44 ../rules/evdev.xml.in.h:44
-msgid "Alt is mapped to the right Win-key and Super to Menu."
-msgstr "Ánh xạ Alt sang phím Win bên phải và Super sang Menu."
+#: ../rules/base.xml.in.h:45
+msgid "Alt+CapsLock"
+msgstr "Alt+CapsLock"
-#: ../rules/base.xml.in.h:45 ../rules/evdev.xml.in.h:45
-msgid "Alt+CapsLock changes layout."
-msgstr "Alt+CapsLock thay đổi ngôn ngữ nhập."
+#: ../rules/base.xml.in.h:46
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
-#: ../rules/base.xml.in.h:46 ../rules/evdev.xml.in.h:46
-msgid "Alt+Ctrl change layout."
-msgstr "Alt+Ctrl thay đổi ngôn ngữ nhập."
+#: ../rules/base.xml.in.h:47
+msgid "Alt+Shift"
+msgstr "Alt+Shift"
-#: ../rules/base.xml.in.h:47 ../rules/evdev.xml.in.h:47
-msgid "Alt+Shift change layout."
-msgstr "Alt+Shift thay đổi ngôn ngữ nhập."
+#: ../rules/base.xml.in.h:48
+msgid "Alt+Space"
+msgstr "Alt+Space"
-#: ../rules/base.xml.in.h:48 ../rules/evdev.xml.in.h:48
+#: ../rules/base.xml.in.h:49
msgid "Alt-Q"
msgstr "Alt-Q"
-#: ../rules/base.xml.in.h:49 ../rules/evdev.xml.in.h:49
+#: ../rules/base.xml.in.h:50
msgid "Alt/Win key behavior"
-msgstr "Các làm việc của Alt/Win"
+msgstr "Ứng xử phím Alt/Win"
-#: ../rules/base.xml.in.h:50 ../rules/evdev.xml.in.h:50
+#: ../rules/base.xml.in.h:51
msgid "Alternative"
msgstr "Tương đương"
-#: ../rules/base.xml.in.h:51 ../rules/evdev.xml.in.h:51
+#: ../rules/base.xml.in.h:52
msgid "Alternative Eastern"
msgstr "Đông tương đương"
-#: ../rules/base.xml.in.h:52 ../rules/evdev.xml.in.h:52
+#: ../rules/base.xml.in.h:53
msgid "Alternative Phonetic"
msgstr "Ngữ âm tương đương"
-#: ../rules/base.xml.in.h:53 ../rules/evdev.xml.in.h:53
+#: ../rules/base.xml.in.h:54
msgid "Alternative international (former us_intl)"
msgstr "Quốc tế tương đương (cũ us_intl)"
-#: ../rules/base.xml.in.h:54 ../rules/evdev.xml.in.h:54
+#: ../rules/base.xml.in.h:55
msgid "Alternative, Sun dead keys"
msgstr "Tương đương, phím chết Sun"
-#: ../rules/base.xml.in.h:55 ../rules/evdev.xml.in.h:55
+#: ../rules/base.xml.in.h:56
msgid "Alternative, eliminate dead keys"
msgstr "Tương đương, phím chết loại trừ"
-#: ../rules/base.xml.in.h:56 ../rules/evdev.xml.in.h:56
+#: ../rules/base.xml.in.h:57
msgid "Alternative, latin-9 only"
msgstr "Tương đương, chỉ Latin-9"
# Literal: don't translate/Nghĩa chữ : đừng dịch
-#: ../rules/base.xml.in.h:57 ../rules/evdev.xml.in.h:57
+#: ../rules/base.xml.in.h:58
msgid "And"
msgstr "And"
-#: ../rules/base.xml.in.h:58 ../rules/evdev.xml.in.h:58
+#: ../rules/base.xml.in.h:59
msgid "Andorra"
msgstr "An-đoa-ra"
-#: ../rules/base.xml.in.h:59 ../rules/evdev.xml.in.h:59
+#: ../rules/base.xml.in.h:60
+msgid "Any Alt key"
+msgstr "Bất kỳ phím Alt"
+
+#: ../rules/base.xml.in.h:61
+msgid "Any Win key"
+msgstr "Bất kỳ phím Win"
+
+#: ../rules/base.xml.in.h:62
+msgid "Any Win key (while pressed)"
+msgstr "Bất kỳ phím Win (trong khi bấm)"
+
+#: ../rules/base.xml.in.h:63
msgid "Apostrophe (') variant"
msgstr "Phương án hô ngữ (')"
# Name: don't translate/Tên: đừng dịch
-#: ../rules/base.xml.in.h:60 ../rules/evdev.xml.in.h:60
+#: ../rules/base.xml.in.h:64
msgid "Apple"
msgstr "Apple"
-#: ../rules/base.xml.in.h:61 ../rules/evdev.xml.in.h:61
+#: ../rules/base.xml.in.h:65
msgid "Apple Laptop"
msgstr "Xách tay Apple"
-#: ../rules/base.xml.in.h:62 ../rules/evdev.xml.in.h:62
+#: ../rules/base.xml.in.h:66
msgid "Ara"
msgstr "Ara"
-#: ../rules/base.xml.in.h:63 ../rules/evdev.xml.in.h:63
+#: ../rules/base.xml.in.h:67
msgid "Arabic"
msgstr "Ả Rập"
-#: ../rules/base.xml.in.h:64 ../rules/evdev.xml.in.h:64
+#: ../rules/base.xml.in.h:68
msgid "Arm"
msgstr "Arm"
-#: ../rules/base.xml.in.h:65 ../rules/evdev.xml.in.h:65
+#: ../rules/base.xml.in.h:69
msgid "Armenia"
msgstr "Ác-mê-ni"
-#: ../rules/base.xml.in.h:66 ../rules/evdev.xml.in.h:66
+#: ../rules/base.xml.in.h:70
msgid "Asturian variant with bottom-dot H and bottom-dot L"
msgstr "Biến thế Ax-tu-ri có H chấm dưới và L chấm dưới"
-#: ../rules/base.xml.in.h:67 ../rules/evdev.xml.in.h:67
+#: ../rules/base.xml.in.h:71
msgid "Asus Laptop"
msgstr "Xách tay Asus"
-#: ../rules/base.xml.in.h:68 ../rules/evdev.xml.in.h:68
+#: ../rules/base.xml.in.h:72
+msgid "At bottom left"
+msgstr "Dưới trái"
+
+#: ../rules/base.xml.in.h:73
+msgid "At left of 'A'"
+msgstr "Bên trái của 'A'"
+
+#: ../rules/base.xml.in.h:74
msgid "Aze"
msgstr "Aze"
-#: ../rules/base.xml.in.h:69 ../rules/evdev.xml.in.h:69
+#: ../rules/base.xml.in.h:75
msgid "Azerbaijan"
msgstr "A-xơ-bai-gian"
-#: ../rules/base.xml.in.h:70 ../rules/evdev.xml.in.h:70
+#: ../rules/base.xml.in.h:76
msgid "Azona RF2300 wireless Internet Keyboard"
msgstr "Bàn phím không dây Internet Azona RF2300"
-#: ../rules/base.xml.in.h:71 ../rules/evdev.xml.in.h:71
+#: ../rules/base.xml.in.h:77
msgid "BTC 5090"
msgstr "BTC 5090"
-#: ../rules/base.xml.in.h:72 ../rules/evdev.xml.in.h:72
+#: ../rules/base.xml.in.h:78
msgid "BTC 5113RF Multimedia"
msgstr "BTC 5113RF Phim nhạc"
-#: ../rules/base.xml.in.h:73 ../rules/evdev.xml.in.h:73
+#: ../rules/base.xml.in.h:79
msgid "BTC 5126T"
msgstr "BTC 5126T"
-#: ../rules/base.xml.in.h:74 ../rules/evdev.xml.in.h:74
+#: ../rules/base.xml.in.h:80
msgid "BTC 6301URF"
msgstr "BTC 6301URF"
-#: ../rules/base.xml.in.h:75 ../rules/evdev.xml.in.h:75
+#: ../rules/base.xml.in.h:81
msgid "BTC 9000"
msgstr "BTC 9000"
-#: ../rules/base.xml.in.h:76 ../rules/evdev.xml.in.h:76
+#: ../rules/base.xml.in.h:82
msgid "BTC 9000A"
msgstr "BTC 9000A"
-#: ../rules/base.xml.in.h:77 ../rules/evdev.xml.in.h:77
+#: ../rules/base.xml.in.h:83
msgid "BTC 9001AH"
msgstr "BTC 9001AH"
-#: ../rules/base.xml.in.h:78 ../rules/evdev.xml.in.h:78
+#: ../rules/base.xml.in.h:84
msgid "BTC 9019U"
msgstr "BTC 9019U"
-#: ../rules/base.xml.in.h:79 ../rules/evdev.xml.in.h:79
+#: ../rules/base.xml.in.h:85
+msgid "BTC 9116U Mini Wireless Internet and Gaming"
+msgstr "BTC 9116U Internet và Chạy trò Không dây Nhỏ"
+
+#: ../rules/base.xml.in.h:86
msgid "Baltic+"
msgstr "Ban-tích+"
-#: ../rules/base.xml.in.h:80 ../rules/evdev.xml.in.h:80
+#: ../rules/base.xml.in.h:87
msgid "Ban"
msgstr "Ban"
-#: ../rules/base.xml.in.h:81 ../rules/evdev.xml.in.h:81
+#: ../rules/base.xml.in.h:88
msgid "Bangladesh"
msgstr "Băng-la-đexợ"
-#: ../rules/base.xml.in.h:82 ../rules/evdev.xml.in.h:82
+#: ../rules/base.xml.in.h:89
msgid "Bel"
msgstr "Bel"
-#: ../rules/base.xml.in.h:83 ../rules/evdev.xml.in.h:83
+#: ../rules/base.xml.in.h:90
msgid "Belarus"
msgstr "Bê-la-rút"
-#: ../rules/base.xml.in.h:84 ../rules/evdev.xml.in.h:84
+#: ../rules/base.xml.in.h:91
msgid "Belgium"
msgstr "Bỉ"
-#: ../rules/base.xml.in.h:85 ../rules/evdev.xml.in.h:85
+#: ../rules/base.xml.in.h:92
msgid "BenQ X-Touch"
msgstr "BenQ X-Touch"
-#: ../rules/base.xml.in.h:86 ../rules/evdev.xml.in.h:86
+#: ../rules/base.xml.in.h:93
msgid "BenQ X-Touch 730"
msgstr "BenQ X-Touch 730"
-#: ../rules/base.xml.in.h:87 ../rules/evdev.xml.in.h:87
+#: ../rules/base.xml.in.h:94
msgid "BenQ X-Touch 800"
msgstr "BenQ X-Touch 800"
-#: ../rules/base.xml.in.h:88 ../rules/evdev.xml.in.h:88
+#: ../rules/base.xml.in.h:95
msgid "Bengali"
msgstr "Ben-ga-li"
-#: ../rules/base.xml.in.h:89 ../rules/evdev.xml.in.h:89
+#: ../rules/base.xml.in.h:96
msgid "Bengali Probhat"
msgstr "Ben-ga-li Probhat"
-#: ../rules/base.xml.in.h:90 ../rules/evdev.xml.in.h:90
+#: ../rules/base.xml.in.h:97
msgid "Bepo, ergonomic, Dvorak way"
msgstr "Bepo, tối ưu nhân tố, cách Dvorak"
-#: ../rules/base.xml.in.h:91 ../rules/evdev.xml.in.h:91
+#: ../rules/base.xml.in.h:98
msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
msgstr "Bepo, tối ưu nhân tố, cách Dvorak, chỉ Latin-9"
-#: ../rules/base.xml.in.h:92 ../rules/evdev.xml.in.h:92
+#: ../rules/base.xml.in.h:99
msgid "Bgr"
msgstr "Bgr"
-#: ../rules/base.xml.in.h:93 ../rules/evdev.xml.in.h:93
+#: ../rules/base.xml.in.h:100
msgid "Bhu"
msgstr "Bhu"
-#: ../rules/base.xml.in.h:94 ../rules/evdev.xml.in.h:94
+#: ../rules/base.xml.in.h:101
msgid "Bhutan"
msgstr "Bhu-tan"
-#: ../rules/base.xml.in.h:95 ../rules/evdev.xml.in.h:95
+#: ../rules/base.xml.in.h:102
msgid "Biblical Hebrew (Tiro)"
msgstr "Do Thái kinh thánh (Tiro)"
-#: ../rules/base.xml.in.h:96 ../rules/evdev.xml.in.h:96
+#: ../rules/base.xml.in.h:103
msgid "Bih"
msgstr "Bih"
-#: ../rules/base.xml.in.h:97 ../rules/evdev.xml.in.h:97
+#: ../rules/base.xml.in.h:104
msgid "Blr"
msgstr "Blr"
-#: ../rules/base.xml.in.h:98 ../rules/evdev.xml.in.h:98
+#: ../rules/base.xml.in.h:105
msgid "Bosnia and Herzegovina"
msgstr "Bô-xni-a và Héc-xê-gô-vi-na"
-#: ../rules/base.xml.in.h:99 ../rules/evdev.xml.in.h:99
-msgid "Both Alt keys together change layout."
-msgstr "Nhấn đồng thời hai phím Alt thay đổi ngôn ngữ nhập."
-
-#: ../rules/base.xml.in.h:100 ../rules/evdev.xml.in.h:100
-msgid "Both Ctrl keys together change layout."
-msgstr "Nhấn đồng thời hai phím Ctrl thay đổi ngôn ngữ nhập."
+#: ../rules/base.xml.in.h:106
+msgid "Both Alt keys together"
+msgstr "Cả hai phím Alt với nhau"
-#: ../rules/base.xml.in.h:101 ../rules/evdev.xml.in.h:101
-msgid "Both Shift keys together change layout."
-msgstr "Nhấn đồng thời hai phím Shift thay đổi ngôn ngữ nhập."
+#: ../rules/base.xml.in.h:107
+msgid "Both Ctrl keys together"
+msgstr "Cả hai phím Ctrl với nhau"
-#: ../rules/base.xml.in.h:102 ../rules/evdev.xml.in.h:102
-msgid "Both Win-keys switch layout while pressed."
-msgstr "Cả hai phím Win chuyển ngôn ngữ nhập khi nhấn."
+#: ../rules/base.xml.in.h:108
+msgid "Both Shift keys together"
+msgstr "Cả hai phím Shift với nhau"
-#: ../rules/base.xml.in.h:103 ../rules/evdev.xml.in.h:103
+#: ../rules/base.xml.in.h:109
msgid "Bra"
msgstr "Bra"
-#: ../rules/base.xml.in.h:104 ../rules/evdev.xml.in.h:104
+#: ../rules/base.xml.in.h:110
msgid "Braille"
msgstr "Chữ nổi"
-#: ../rules/base.xml.in.h:105 ../rules/evdev.xml.in.h:105
+#: ../rules/base.xml.in.h:111
msgid "Brazil"
msgstr "Bra-xin"
-#: ../rules/base.xml.in.h:106 ../rules/evdev.xml.in.h:106
-msgid "Brazilian ABNT2"
-msgstr "ABNT2 của Bra-xin"
+#: ../rules/base.xml.in.h:112
+msgid "Breton"
+msgstr "Bợ-re-ton"
-#: ../rules/base.xml.in.h:107 ../rules/evdev.xml.in.h:107
+#: ../rules/base.xml.in.h:113
msgid "Brl"
msgstr "Brl"
-#: ../rules/base.xml.in.h:108 ../rules/evdev.xml.in.h:108
+#: ../rules/base.xml.in.h:114
msgid "Brother Internet Keyboard"
msgstr "Bàn phím Internet Brother"
-#: ../rules/base.xml.in.h:109 ../rules/evdev.xml.in.h:109
+#: ../rules/base.xml.in.h:115
msgid "Buckwalter"
msgstr "Buckwalter"
-#: ../rules/base.xml.in.h:110 ../rules/evdev.xml.in.h:110
+#: ../rules/base.xml.in.h:116
msgid "Bulgaria"
msgstr "Bun-ga-ri"
-#: ../rules/base.xml.in.h:111 ../rules/evdev.xml.in.h:111
+#: ../rules/base.xml.in.h:117
+msgid "CRULP"
+msgstr "CRULP"
+
+#: ../rules/base.xml.in.h:118
msgid "Cambodia"
msgstr "Căm Bốt"
-#: ../rules/base.xml.in.h:112 ../rules/evdev.xml.in.h:112
+#: ../rules/base.xml.in.h:119
msgid "Can"
msgstr "Can"
-#: ../rules/base.xml.in.h:113 ../rules/evdev.xml.in.h:113
+#: ../rules/base.xml.in.h:120
msgid "Canada"
msgstr "Ca-na-da"
-#: ../rules/base.xml.in.h:114 ../rules/evdev.xml.in.h:114
-msgid "Caps Lock is Compose."
-msgstr "Caps Lock là Soạn thảo."
+#: ../rules/base.xml.in.h:121
+msgid "Caps Lock"
+msgstr "Caps Lock"
+
+#: ../rules/base.xml.in.h:122
+msgid "CapsLock"
+msgstr "CapsLock"
-#: ../rules/base.xml.in.h:115 ../rules/evdev.xml.in.h:115
-msgid "CapsLock LED shows alternative layout."
-msgstr "Đèn CapsLock cho biết ngôn ngữ nhập tương đương."
+#: ../rules/base.xml.in.h:123
+msgid "CapsLock (to first layout), Shift+CapsLock (to last layout)"
+msgstr "CapsLock (tới bố trí đầu tiên), Shift+CapsLock (tới bố trí cuối cùng)"
-#: ../rules/base.xml.in.h:116 ../rules/evdev.xml.in.h:116
-msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
-msgstr "CapsLock hoạt động như Shift với việc khóa. Shift « tạm dừng » CapsLock."
+#: ../rules/base.xml.in.h:124
+msgid "CapsLock (while pressed), Alt+CapsLock does the original capslock action"
+msgstr "CapsLock (trong khi bấm), Alt+CapsLock thì làm việc gốc khoá chữ hoa"
-#: ../rules/base.xml.in.h:117 ../rules/evdev.xml.in.h:117
-msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
-msgstr "CapsLock hoạt động như Shift với việc khóa. Shift không có tác động CapsLock."
+#: ../rules/base.xml.in.h:125
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock"
+msgstr "CapsLock hoạt động như Shift mà cũng khoá. Shift « tạm dừng » CapsLock."
-#: ../rules/base.xml.in.h:118 ../rules/evdev.xml.in.h:118
-msgid "CapsLock just locks the Shift modifier."
-msgstr "CapsLock khóa tính năng của Shift."
+#: ../rules/base.xml.in.h:126
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock"
+msgstr "CapsLock hoạt động như Shift mà cũng khoá. Shift không có tác động CapsLock."
-#: ../rules/base.xml.in.h:119 ../rules/evdev.xml.in.h:119
+#: ../rules/base.xml.in.h:127
msgid "CapsLock key behavior"
msgstr "Đặc điểm của phím CapsLock"
-#: ../rules/base.xml.in.h:120 ../rules/evdev.xml.in.h:120
-msgid "CapsLock key changes layout."
-msgstr "CapsLock thay đổi ngôn ngữ nhập."
-
-#: ../rules/base.xml.in.h:121 ../rules/evdev.xml.in.h:121
-msgid "CapsLock switch to first layout, Shift+CapsLock switch to last layout."
-msgstr "CapsLock chuyển đổi sang bố trí đầu tiên, Shift+CapsLock chuyển đổi sang bố trí cuối cùng."
-
-#: ../rules/base.xml.in.h:122 ../rules/evdev.xml.in.h:122
-msgid "CapsLock toggles Shift so all keys are affected."
-msgstr "CapsLock bật tắt Shift vì thế mọi phím đều bị ảnh hưởng."
+#: ../rules/base.xml.in.h:128
+msgid "CapsLock toggles Shift so all keys are affected"
+msgstr "CapsLock bật tắt Shift thì mọi phím đều bị ảnh hưởng"
-#: ../rules/base.xml.in.h:123 ../rules/evdev.xml.in.h:123
-msgid "CapsLock toggles normal capitalization of alphabetic characters."
-msgstr "CapsLock bật tắt viết hoa thông thường của các ký tự chữ cái."
+#: ../rules/base.xml.in.h:129
+msgid "CapsLock toggles normal capitalization of alphabetic characters"
+msgstr "CapsLock bật tắt viết hoa thông thường của các ký tự chữ cái"
-#: ../rules/base.xml.in.h:124 ../rules/evdev.xml.in.h:124
-msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
-msgstr "CapsLock sử dụng viết hoa nội bộ. Shift « tạm dừng » CapsLock."
+#: ../rules/base.xml.in.h:130
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock"
+msgstr "CapsLock sử dụng chức năng viết hoa nội bộ. Shift « tạm dừng » CapsLock."
-#: ../rules/base.xml.in.h:125 ../rules/evdev.xml.in.h:125
-msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
-msgstr "CapsLock sử dụng viết hoa nội bộ. Shift không có tác động CapsLock."
+#: ../rules/base.xml.in.h:131
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock"
+msgstr "CapsLock sử dụng chức năng viết hoa nội bộ. Shift không có tác động CapsLock."
-#: ../rules/base.xml.in.h:126 ../rules/evdev.xml.in.h:126
+#: ../rules/base.xml.in.h:132
msgid "Catalan variant with middle-dot L"
msgstr "Biến thể Ca-ta-lan có chữ L chấm giữa"
# Tên bố trí bàn phím ?
-#: ../rules/base.xml.in.h:127 ../rules/evdev.xml.in.h:127
+#: ../rules/base.xml.in.h:133
msgid "Cedilla"
msgstr "Cedilla"
-#: ../rules/base.xml.in.h:128 ../rules/evdev.xml.in.h:128
+#: ../rules/base.xml.in.h:134
msgid "Che"
msgstr "Che"
-#: ../rules/base.xml.in.h:129 ../rules/evdev.xml.in.h:129
+#: ../rules/base.xml.in.h:135
msgid "Cherokee"
msgstr "Che-rô-khi"
-#: ../rules/base.xml.in.h:130 ../rules/evdev.xml.in.h:130
+#: ../rules/base.xml.in.h:136
+msgid "Cherry B.UNLIMITED"
+msgstr "Cherry B.VÔ_HẠN"
+
+#: ../rules/base.xml.in.h:137
msgid "Cherry Blue Line CyBo@rd"
msgstr "Cherry Blue Line CyBo@rd"
-#: ../rules/base.xml.in.h:131 ../rules/evdev.xml.in.h:131
+#: ../rules/base.xml.in.h:138
msgid "Cherry Blue Line CyBo@rd (alternate option)"
msgstr "Cherry Blue Line CyBo@rd (luân phiên tùy chọn)"
-#: ../rules/base.xml.in.h:132 ../rules/evdev.xml.in.h:132
+#: ../rules/base.xml.in.h:139
msgid "Cherry CyBo@rd USB-Hub"
msgstr "Cherry CyBo@rd Cái Nối USB"
-#: ../rules/base.xml.in.h:133 ../rules/evdev.xml.in.h:133
+#: ../rules/base.xml.in.h:140
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Expert"
+
+#: ../rules/base.xml.in.h:141
msgid "Cherry CyMotion Master Linux"
msgstr "Cherry CyMotion Master Linux"
-#: ../rules/base.xml.in.h:134 ../rules/evdev.xml.in.h:134
+#: ../rules/base.xml.in.h:142
msgid "Cherry CyMotion Master XPress"
msgstr "Cherry CyMotion Master XPress"
-#: ../rules/base.xml.in.h:135 ../rules/evdev.xml.in.h:135
+#: ../rules/base.xml.in.h:143
msgid "Chicony Internet Keyboard"
msgstr "Bàn phím Internet Chicony"
-#: ../rules/base.xml.in.h:136 ../rules/evdev.xml.in.h:136
+#: ../rules/base.xml.in.h:144
msgid "Chicony KB-9885"
msgstr "Chicony KB-9885"
-#: ../rules/base.xml.in.h:137 ../rules/evdev.xml.in.h:137
+#: ../rules/base.xml.in.h:145
msgid "Chicony KU-0108"
msgstr "Chicony KU-0108"
-#: ../rules/base.xml.in.h:138 ../rules/evdev.xml.in.h:138
+#: ../rules/base.xml.in.h:146
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0420"
+
+#: ../rules/base.xml.in.h:147
msgid "China"
msgstr "Trung Quốc"
-#: ../rules/base.xml.in.h:139 ../rules/evdev.xml.in.h:139
+#: ../rules/base.xml.in.h:148
msgid "Chuvash"
msgstr "Chu-vasợ"
-#: ../rules/base.xml.in.h:140 ../rules/evdev.xml.in.h:140
+#: ../rules/base.xml.in.h:149
msgid "Chuvash Latin"
msgstr "Chu-vasợ La-tinh"
-#: ../rules/base.xml.in.h:141 ../rules/evdev.xml.in.h:141
+#: ../rules/base.xml.in.h:150
msgid "Classic"
msgstr "Kinh điển"
-#: ../rules/base.xml.in.h:142 ../rules/evdev.xml.in.h:142
+#: ../rules/base.xml.in.h:151
msgid "Classic Dvorak"
msgstr "Dvorak kinh điển"
-#: ../rules/base.xml.in.h:143 ../rules/evdev.xml.in.h:143
+#: ../rules/base.xml.in.h:152
msgid "Classmate PC"
msgstr "Classmate PC"
-#: ../rules/base.xml.in.h:144 ../rules/evdev.xml.in.h:144
+#: ../rules/base.xml.in.h:153
msgid "CloGaelach"
msgstr "CloGaelach"
-#: ../rules/base.xml.in.h:145 ../rules/evdev.xml.in.h:145
+#: ../rules/base.xml.in.h:154
msgid "Colemak"
msgstr "Colemak"
-#: ../rules/base.xml.in.h:146 ../rules/evdev.xml.in.h:146
+#: ../rules/base.xml.in.h:155
msgid "Compaq Easy Access Keyboard"
msgstr "Bàn phím Truy cập Dễ dàng của Compaq"
-#: ../rules/base.xml.in.h:147 ../rules/evdev.xml.in.h:147
+#: ../rules/base.xml.in.h:156
msgid "Compaq Internet Keyboard (13 keys)"
msgstr "Bàn phím Internet Compaq (13 phím)"
-#: ../rules/base.xml.in.h:148 ../rules/evdev.xml.in.h:148
+#: ../rules/base.xml.in.h:157
msgid "Compaq Internet Keyboard (18 keys)"
msgstr "Bàn phím Internet Compaq (18 phím)"
-#: ../rules/base.xml.in.h:149 ../rules/evdev.xml.in.h:149
+#: ../rules/base.xml.in.h:158
msgid "Compaq Internet Keyboard (7 keys)"
msgstr "Bàn phím Internet Compaq (7 phím)"
-#: ../rules/base.xml.in.h:150 ../rules/evdev.xml.in.h:150
+#: ../rules/base.xml.in.h:159
msgid "Compaq iPaq Keyboard"
msgstr "Bàn phím iPaq Compaq"
-#: ../rules/base.xml.in.h:151 ../rules/evdev.xml.in.h:151
+#: ../rules/base.xml.in.h:160
msgid "Compose key position"
msgstr "Vị trí phím Soạn thảo"
-#: ../rules/base.xml.in.h:152 ../rules/evdev.xml.in.h:152
+#: ../rules/base.xml.in.h:161
msgid "Congo, Democratic Republic of the"
msgstr "Cộng Hoà Dân Chủ Công-gô"
-#: ../rules/base.xml.in.h:153 ../rules/evdev.xml.in.h:153
-msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
-msgstr "Control được ánh xạ tới các phím Win (và các phím Ctrl thường dùng)"
+#: ../rules/base.xml.in.h:162
+msgid "Control + Alt + Backspace"
+msgstr "Control + Alt + Backspace"
-#: ../rules/base.xml.in.h:154 ../rules/evdev.xml.in.h:154
-msgid "Croatia"
-msgstr "Cợ-rô-a-ti-a"
+#: ../rules/base.xml.in.h:163
+msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
+msgstr "Control ánh xạ tới các phím Alt, Alt ánh xạ tới các phím Win"
+
+#: ../rules/base.xml.in.h:164
+msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
+msgstr "Control ánh xạ tới các phím Win (và các phím Ctrl thường dùng)"
+
+#: ../rules/base.xml.in.h:165
+msgid "Crimean Tatar (Dobruca-1 Q)"
+msgstr "Ta-tă Cợ-ri-mia (Dobruca-1 Q)"
+
+#: ../rules/base.xml.in.h:166
+msgid "Crimean Tatar (Dobruca-2 Q)"
+msgstr "Ta-tă Cợ-ri-mia (Dobruca-2 Q)"
-#: ../rules/base.xml.in.h:155 ../rules/evdev.xml.in.h:155
-msgid "Ctrl key at bottom left"
-msgstr "Phím Ctrl ở phía dưới bên trái"
+#: ../rules/base.xml.in.h:167
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Ta-tă Cợ-ri-mia (Thổ Nhĩ Kỳ Alt-Q)"
-#: ../rules/base.xml.in.h:156 ../rules/evdev.xml.in.h:156
-msgid "Ctrl key at left of 'A'"
-msgstr "Phím Ctrl ở bên trái của 'A'"
+#: ../rules/base.xml.in.h:168
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Ta-tă Cợ-ri-mia (Thổ Nhĩ Kỳ F)"
-#: ../rules/base.xml.in.h:157 ../rules/evdev.xml.in.h:157
+#: ../rules/base.xml.in.h:169
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Ta-tă Cợ-ri-mia (Thổ Nhĩ Kỳ Q)"
+
+#: ../rules/base.xml.in.h:170
+msgid "Croatia"
+msgstr "Cợ-rô-a-ti-a"
+
+#: ../rules/base.xml.in.h:171
msgid "Ctrl key position"
msgstr "Vị trí phím Ctrl"
-#: ../rules/base.xml.in.h:158 ../rules/evdev.xml.in.h:158
-msgid "Ctrl+Shift change layout."
-msgstr "Control+Shift thay đổi ngôn ngữ nhập vào."
+#: ../rules/base.xml.in.h:172
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
-#: ../rules/base.xml.in.h:159 ../rules/evdev.xml.in.h:159
+#: ../rules/base.xml.in.h:173
msgid "Cyrillic"
msgstr "Ki-rin"
-#: ../rules/base.xml.in.h:160 ../rules/evdev.xml.in.h:160
+#: ../rules/base.xml.in.h:174
msgid "Cyrillic with guillemets"
msgstr "Ki-rin với « chim uria »"
-#: ../rules/base.xml.in.h:161 ../rules/evdev.xml.in.h:161
+#: ../rules/base.xml.in.h:175
msgid "Cyrillic, Z and ZHE swapped"
msgstr "Ki-rin, đổi chỗ Z và ZHE"
-#: ../rules/base.xml.in.h:162 ../rules/evdev.xml.in.h:162
+#: ../rules/base.xml.in.h:176
msgid "Cze"
msgstr "Cze"
-#: ../rules/base.xml.in.h:163 ../rules/evdev.xml.in.h:163
+#: ../rules/base.xml.in.h:177
msgid "Czechia"
msgstr "Séc"
-#: ../rules/base.xml.in.h:164 ../rules/evdev.xml.in.h:164
+#: ../rules/base.xml.in.h:178
+msgid "DOS"
+msgstr "DOS"
+
+#: ../rules/base.xml.in.h:179
msgid "DRC"
msgstr "DRC"
-#: ../rules/base.xml.in.h:165 ../rules/evdev.xml.in.h:165
+#: ../rules/base.xml.in.h:180
msgid "DTK2000"
msgstr "DTK2000"
-#: ../rules/base.xml.in.h:166 ../rules/evdev.xml.in.h:166
+#: ../rules/base.xml.in.h:181
msgid "Dan"
msgstr "Dan"
-#: ../rules/base.xml.in.h:167 ../rules/evdev.xml.in.h:167
+#: ../rules/base.xml.in.h:182
msgid "Dead acute"
msgstr "Chết sắc"
-#: ../rules/base.xml.in.h:168 ../rules/evdev.xml.in.h:168
+#: ../rules/base.xml.in.h:183
msgid "Dead grave acute"
msgstr "Chết huyền sắc"
-#: ../rules/base.xml.in.h:169 ../rules/evdev.xml.in.h:169
-msgid "Default numeric keypad keys."
-msgstr "Các phím vùng số mặc định."
+#: ../rules/base.xml.in.h:184
+msgid "Default numeric keypad keys"
+msgstr "Các phím vùng số mặc định"
-#: ../rules/base.xml.in.h:170 ../rules/evdev.xml.in.h:170
+#: ../rules/base.xml.in.h:185
msgid "Dell"
msgstr "Dell"
-#: ../rules/base.xml.in.h:171 ../rules/evdev.xml.in.h:171
+#: ../rules/base.xml.in.h:186
msgid "Dell 101-key PC"
msgstr "Dell PC 101 phím"
-#: ../rules/base.xml.in.h:172 ../rules/evdev.xml.in.h:172
+#: ../rules/base.xml.in.h:187
msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
msgstr "Xách tay Dell Inspiron 6xxx/8xxx"
-#: ../rules/base.xml.in.h:173 ../rules/evdev.xml.in.h:173
+#: ../rules/base.xml.in.h:188
msgid "Dell Laptop/notebook Precision M series"
msgstr "Xách tay Dell dãy Precision M"
-#: ../rules/base.xml.in.h:174 ../rules/evdev.xml.in.h:174
+#: ../rules/base.xml.in.h:189
msgid "Dell Latitude series laptop"
msgstr "Xách tay Dell dãy Latitude"
-#: ../rules/base.xml.in.h:175 ../rules/evdev.xml.in.h:175
+#: ../rules/base.xml.in.h:190
msgid "Dell Precision M65"
msgstr "Dell Precision M65"
-#: ../rules/base.xml.in.h:176 ../rules/evdev.xml.in.h:176
+#: ../rules/base.xml.in.h:191
msgid "Dell SK-8125"
msgstr "Dell SK-8125"
-#: ../rules/base.xml.in.h:177 ../rules/evdev.xml.in.h:177
+#: ../rules/base.xml.in.h:192
msgid "Dell SK-8135"
msgstr "Dell SK-8135"
-#: ../rules/base.xml.in.h:178 ../rules/evdev.xml.in.h:178
+#: ../rules/base.xml.in.h:193
msgid "Dell USB Multimedia Keyboard"
msgstr "Bàn phím đa phương tiện USB Dell"
-#: ../rules/base.xml.in.h:179 ../rules/evdev.xml.in.h:179
+#: ../rules/base.xml.in.h:194
msgid "Denmark"
msgstr "Đan Mạch"
-#: ../rules/base.xml.in.h:180 ../rules/evdev.xml.in.h:180
+#: ../rules/base.xml.in.h:195
msgid "Deu"
msgstr "Deu"
-#: ../rules/base.xml.in.h:181 ../rules/evdev.xml.in.h:181
+#: ../rules/base.xml.in.h:196
msgid "Dexxa Wireless Desktop Keyboard"
msgstr "Bàn phím Không dây Dexxa cho Desktop"
-#: ../rules/base.xml.in.h:182 ../rules/evdev.xml.in.h:182
+#: ../rules/base.xml.in.h:197
msgid "Diamond 9801 / 9802 series"
msgstr "Sê ri Diamond 9801 / 9802"
-#: ../rules/base.xml.in.h:183 ../rules/evdev.xml.in.h:183
+#: ../rules/base.xml.in.h:198
msgid "Dvorak"
msgstr "Dvorak"
-#: ../rules/base.xml.in.h:184 ../rules/evdev.xml.in.h:184
+#: ../rules/base.xml.in.h:199
msgid "Dvorak (UK Punctuation)"
msgstr "Dvorak (dấu chấm câu Quốc Anh)"
-#: ../rules/base.xml.in.h:185 ../rules/evdev.xml.in.h:185
+#: ../rules/base.xml.in.h:200
msgid "Dvorak international"
msgstr "Dvorak quốc tế"
-#: ../rules/base.xml.in.h:186 ../rules/evdev.xml.in.h:186
-msgid "Dvorak, Polish quotes on key \"1/!\""
-msgstr "Dvorak, dấu ngoặc Polish trên phím \"1/!\""
+#: ../rules/base.xml.in.h:201
+msgid "Dvorak, Polish quotes on key 1"
+msgstr "Dvorak, dấu ngoặc tiếng Ba Lan trên phím 1"
-#: ../rules/base.xml.in.h:187 ../rules/evdev.xml.in.h:187
+#: ../rules/base.xml.in.h:202
msgid "Dvorak, Polish quotes on quotemark key"
msgstr "Dvorak, dấu ngoặc Polish trên phím đánh dấu ngoặc"
-#: ../rules/base.xml.in.h:188 ../rules/evdev.xml.in.h:188
+#: ../rules/base.xml.in.h:203
+msgid "E"
+msgstr "E"
+
+#: ../rules/base.xml.in.h:204
msgid "Eastern"
msgstr "Đông"
-#: ../rules/base.xml.in.h:189 ../rules/evdev.xml.in.h:189
+#: ../rules/base.xml.in.h:205
msgid "Eliminate dead keys"
msgstr "Phím chết loại trừ"
-#: ../rules/base.xml.in.h:190 ../rules/evdev.xml.in.h:190
+#: ../rules/base.xml.in.h:206
+msgid "Enable extra typographic characters"
+msgstr "Bật thêm ký tự thuật in máy"
+
+#: ../rules/base.xml.in.h:207
+msgid "English"
+msgstr "Anh"
+
+#: ../rules/base.xml.in.h:208
msgid "Ennyah DKB-1008"
msgstr "Ennyah DKB-1008"
-#: ../rules/base.xml.in.h:191 ../rules/evdev.xml.in.h:191
+#: ../rules/base.xml.in.h:209
+msgid "Enter on keypad"
+msgstr "Enter trên vùng phím"
+
+#: ../rules/base.xml.in.h:210
msgid "Epo"
msgstr "Epo"
-#: ../rules/base.xml.in.h:192 ../rules/evdev.xml.in.h:192
+#: ../rules/base.xml.in.h:211
msgid "Ergonomic"
msgstr "Tối ưu nhân tố"
-#: ../rules/base.xml.in.h:193 ../rules/evdev.xml.in.h:193
+#: ../rules/base.xml.in.h:212
msgid "Esp"
msgstr "Esp"
-#: ../rules/base.xml.in.h:194 ../rules/evdev.xml.in.h:194
+#: ../rules/base.xml.in.h:213
msgid "Esperanto"
msgstr "Ét-pe-ran-tô"
-#: ../rules/base.xml.in.h:195 ../rules/evdev.xml.in.h:195
+#: ../rules/base.xml.in.h:214
msgid "Est"
msgstr "Est"
-#: ../rules/base.xml.in.h:196 ../rules/evdev.xml.in.h:196
+#: ../rules/base.xml.in.h:215
msgid "Estonia"
msgstr "Ex-tô-ni-a"
-#: ../rules/base.xml.in.h:197 ../rules/evdev.xml.in.h:197
+#: ../rules/base.xml.in.h:216
msgid "Eth"
msgstr "Eth"
-#: ../rules/base.xml.in.h:198 ../rules/evdev.xml.in.h:198
+#: ../rules/base.xml.in.h:217
msgid "Ethiopia"
msgstr "Ê-ti-ô-pi"
-#: ../rules/base.xml.in.h:199 ../rules/evdev.xml.in.h:199
+#: ../rules/base.xml.in.h:218
msgid "Evdev-managed keyboard"
msgstr "Bàn phím quản lý bằng Evdev"
-#: ../rules/base.xml.in.h:200 ../rules/evdev.xml.in.h:200
+#: ../rules/base.xml.in.h:219
msgid "Everex STEPnote"
msgstr "Everex STEPnote"
-#: ../rules/base.xml.in.h:201 ../rules/evdev.xml.in.h:201
+#: ../rules/base.xml.in.h:220
msgid "Ewe"
msgstr "Ewe"
-#: ../rules/base.xml.in.h:202 ../rules/evdev.xml.in.h:202
+#: ../rules/base.xml.in.h:221
msgid "Extended"
msgstr "Mở rộng"
-#: ../rules/base.xml.in.h:203 ../rules/evdev.xml.in.h:203
+#: ../rules/base.xml.in.h:222
+msgid "Extended - Winkeys"
+msgstr "Mở rộng — Winkeys"
+
+#: ../rules/base.xml.in.h:223
msgid "Extended Backslash"
msgstr "Gạch chéo ngược Mở rộng"
-#: ../rules/base.xml.in.h:204 ../rules/evdev.xml.in.h:204
+#: ../rules/base.xml.in.h:224
msgid "F-letter (F) variant"
msgstr "Phương án chữ cái F (F)"
-#: ../rules/base.xml.in.h:205 ../rules/evdev.xml.in.h:205
+#: ../rules/base.xml.in.h:225
+msgid "FL90"
+msgstr "FL90"
+
+#: ../rules/base.xml.in.h:226
msgid "Fao"
msgstr "Fao"
-#: ../rules/base.xml.in.h:206 ../rules/evdev.xml.in.h:206
+#: ../rules/base.xml.in.h:227
msgid "Faroe Islands"
msgstr "Quần Đảo Pha-rô"
-#: ../rules/base.xml.in.h:207 ../rules/evdev.xml.in.h:207
+#: ../rules/base.xml.in.h:228
msgid "Fin"
msgstr "Fin"
-#: ../rules/base.xml.in.h:208 ../rules/evdev.xml.in.h:208
+#: ../rules/base.xml.in.h:229
msgid "Finland"
msgstr "Phần Lan"
#. This assumes the KP_ abstract symbols are actually useful for some apps
#. The description needs to be rewritten
-#: ../rules/base.xml.in.h:211 ../rules/evdev.xml.in.h:211
+#: ../rules/base.xml.in.h:232
msgid "Four-level key with abstract separators"
msgstr "Phím bốn bậc có bộ phân cách ảo"
-#: ../rules/base.xml.in.h:212 ../rules/evdev.xml.in.h:212
+#: ../rules/base.xml.in.h:233
msgid "Four-level key with comma"
msgstr "Phím bốn bậc có dấu phẩy"
-#: ../rules/base.xml.in.h:213 ../rules/evdev.xml.in.h:213
+#: ../rules/base.xml.in.h:234
msgid "Four-level key with dot"
msgstr "Phím bốn bậc có chấm"
-#: ../rules/base.xml.in.h:214 ../rules/evdev.xml.in.h:214
+#: ../rules/base.xml.in.h:235
+msgid "Four-level key with dot, latin-9 restriction"
+msgstr "Phím bốn bậc có chấm, sự hạn chế latin-9"
+
+#: ../rules/base.xml.in.h:236
msgid "Four-level key with momayyez"
msgstr "Phím bốn bậc có momayyez"
-#: ../rules/base.xml.in.h:215 ../rules/evdev.xml.in.h:215
+#: ../rules/base.xml.in.h:237
msgid "Fra"
msgstr "Fra"
-#: ../rules/base.xml.in.h:216 ../rules/evdev.xml.in.h:216
+#: ../rules/base.xml.in.h:238
msgid "France"
msgstr "Pháp"
-#: ../rules/base.xml.in.h:217 ../rules/evdev.xml.in.h:217
+#: ../rules/base.xml.in.h:239
msgid "French"
msgstr "Pháp"
-#: ../rules/base.xml.in.h:218 ../rules/evdev.xml.in.h:218
+#: ../rules/base.xml.in.h:240
msgid "French (Macintosh)"
msgstr "Pháp (Macintosh)"
-#: ../rules/base.xml.in.h:219 ../rules/evdev.xml.in.h:219
+#: ../rules/base.xml.in.h:241
msgid "French (legacy)"
msgstr "Pháp (di sản)"
-#: ../rules/base.xml.in.h:220 ../rules/evdev.xml.in.h:220
+#: ../rules/base.xml.in.h:242
msgid "French Dvorak"
msgstr "Pháp Dvorak"
-#: ../rules/base.xml.in.h:221 ../rules/evdev.xml.in.h:221
+#: ../rules/base.xml.in.h:243
msgid "French, Sun dead keys"
msgstr "Pháp, phím chết Sun"
-#: ../rules/base.xml.in.h:222 ../rules/evdev.xml.in.h:222
+#: ../rules/base.xml.in.h:244
msgid "French, eliminate dead keys"
msgstr "Pháp, phím chết loại trừ"
-#: ../rules/base.xml.in.h:223 ../rules/evdev.xml.in.h:223
-msgid "Fujitsu-Siemens Computers AMILO A1667G laptop"
-msgstr "Máy tính xách tay AMILO A1667G Fujitsu-Siemens"
+#: ../rules/base.xml.in.h:245
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Máy tính xách tay AMILO Fujitsu-Siemens"
-#: ../rules/base.xml.in.h:224 ../rules/evdev.xml.in.h:224
+#: ../rules/base.xml.in.h:246
msgid "Fula"
msgstr "Fula"
-#: ../rules/base.xml.in.h:225 ../rules/evdev.xml.in.h:225
+#: ../rules/base.xml.in.h:247
msgid "GBr"
msgstr "GBr"
-#: ../rules/base.xml.in.h:226 ../rules/evdev.xml.in.h:226
+#: ../rules/base.xml.in.h:248
msgid "Ga"
msgstr "Ga"
-#: ../rules/base.xml.in.h:227 ../rules/evdev.xml.in.h:227
+#: ../rules/base.xml.in.h:249
msgid "Generic 101-key PC"
msgstr "PC chung 101 phím"
-#: ../rules/base.xml.in.h:228 ../rules/evdev.xml.in.h:228
+#: ../rules/base.xml.in.h:250
msgid "Generic 102-key (Intl) PC"
msgstr "PC chung 102 phím (Intl)"
-#: ../rules/base.xml.in.h:229 ../rules/evdev.xml.in.h:229
+#: ../rules/base.xml.in.h:251
msgid "Generic 104-key PC"
msgstr "PC chung 104 phím"
-#: ../rules/base.xml.in.h:230 ../rules/evdev.xml.in.h:230
+#: ../rules/base.xml.in.h:252
msgid "Generic 105-key (Intl) PC"
msgstr "PC chung 105 phím (Intl)"
# Name: don't translate/Tên: đừng dịch
-#: ../rules/base.xml.in.h:231 ../rules/evdev.xml.in.h:231
+#: ../rules/base.xml.in.h:253
msgid "Genius Comfy KB-12e"
msgstr "Genius Comfy KB-12e"
-#: ../rules/base.xml.in.h:232 ../rules/evdev.xml.in.h:232
+#: ../rules/base.xml.in.h:254
msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
msgstr "Genius Tiện lợi KB-16M / Bàn phím Genius MM KWD-910"
-#: ../rules/base.xml.in.h:233 ../rules/evdev.xml.in.h:233
+#: ../rules/base.xml.in.h:255
msgid "Genius Comfy KB-21e-Scroll"
msgstr "Genius Comfy KB-21e-Scroll"
# Name: don't translate/Tên: đừng dịch
-#: ../rules/base.xml.in.h:234 ../rules/evdev.xml.in.h:234
+#: ../rules/base.xml.in.h:256
msgid "Genius KB-19e NB"
msgstr "Genius KB-19e NB"
-#: ../rules/base.xml.in.h:235 ../rules/evdev.xml.in.h:235
+# Name: don't translate/Tên: đừng dịch
+#: ../rules/base.xml.in.h:257
+msgid "Genius KKB-2050HS"
+msgstr "Genius KKB-2050HS"
+
+#: ../rules/base.xml.in.h:258
msgid "Geo"
msgstr "Geo"
-#: ../rules/base.xml.in.h:236 ../rules/evdev.xml.in.h:236
+#: ../rules/base.xml.in.h:259
msgid "Georgia"
msgstr "Gi-oa-gi-a"
-#: ../rules/base.xml.in.h:237 ../rules/evdev.xml.in.h:237
+#: ../rules/base.xml.in.h:260
msgid "Georgian"
msgstr "Gi-oa-gi-a"
-#: ../rules/base.xml.in.h:238 ../rules/evdev.xml.in.h:238
+#: ../rules/base.xml.in.h:261
msgid "Georgian AZERTY Tskapo"
msgstr "Gi-oa-gi-a AZERTY Tskapo"
-#: ../rules/base.xml.in.h:239 ../rules/evdev.xml.in.h:239
+#: ../rules/base.xml.in.h:262
msgid "German (Macintosh)"
msgstr "Đức (Macintosh)"
-#: ../rules/base.xml.in.h:240 ../rules/evdev.xml.in.h:240
+#: ../rules/base.xml.in.h:263
msgid "German, Sun dead keys"
msgstr "Đức, phím chết Sun"
-#: ../rules/base.xml.in.h:241 ../rules/evdev.xml.in.h:241
+#: ../rules/base.xml.in.h:264
msgid "German, eliminate dead keys"
msgstr "Đức, phím chết loại trừ"
-#: ../rules/base.xml.in.h:242 ../rules/evdev.xml.in.h:242
+#: ../rules/base.xml.in.h:265
msgid "Germany"
msgstr "Đức"
-#: ../rules/base.xml.in.h:243 ../rules/evdev.xml.in.h:243
+#: ../rules/base.xml.in.h:266
msgid "Gha"
msgstr "Gha"
-#: ../rules/base.xml.in.h:244 ../rules/evdev.xml.in.h:244
+#: ../rules/base.xml.in.h:267
msgid "Ghana"
msgstr "Gha-na"
-#: ../rules/base.xml.in.h:245 ../rules/evdev.xml.in.h:245
+#: ../rules/base.xml.in.h:268
msgid "Gre"
msgstr "Gre"
-#: ../rules/base.xml.in.h:246 ../rules/evdev.xml.in.h:246
+#: ../rules/base.xml.in.h:269
msgid "Greece"
msgstr "Hy Lạp"
-#: ../rules/base.xml.in.h:247 ../rules/evdev.xml.in.h:247
+#: ../rules/base.xml.in.h:270
msgid "Group toggle on multiply/divide key"
msgstr "Bật/tắt bó với phím nhân/chia"
-#: ../rules/base.xml.in.h:248 ../rules/evdev.xml.in.h:248
+#: ../rules/base.xml.in.h:271
msgid "Gui"
msgstr "Gui"
-#: ../rules/base.xml.in.h:249 ../rules/evdev.xml.in.h:249
+#: ../rules/base.xml.in.h:272
msgid "Guinea"
msgstr "Ghi-nê"
-#: ../rules/base.xml.in.h:250 ../rules/evdev.xml.in.h:250
+#: ../rules/base.xml.in.h:273
msgid "Gujarati"
msgstr "Gu-gia-ra-ti"
-#: ../rules/base.xml.in.h:251 ../rules/evdev.xml.in.h:251
+#: ../rules/base.xml.in.h:274
msgid "Gurmukhi"
msgstr "Gổ-mu-khi"
-#: ../rules/base.xml.in.h:252 ../rules/evdev.xml.in.h:252
+#: ../rules/base.xml.in.h:275
msgid "Gurmukhi Jhelum"
msgstr "Gổ-mu-khi Jhelum"
-#: ../rules/base.xml.in.h:253 ../rules/evdev.xml.in.h:253
+#: ../rules/base.xml.in.h:276
msgid "Gyration"
msgstr "Sự chuyển hồi"
-#: ../rules/base.xml.in.h:254 ../rules/evdev.xml.in.h:254
+#: ../rules/base.xml.in.h:277
msgid "Happy Hacking Keyboard"
msgstr "Bàn phím Happy Hacking"
-#: ../rules/base.xml.in.h:255 ../rules/evdev.xml.in.h:255
+#: ../rules/base.xml.in.h:278
msgid "Happy Hacking Keyboard for Mac"
msgstr "Bàn phím Happy Hacking cho Mac"
-#: ../rules/base.xml.in.h:256 ../rules/evdev.xml.in.h:256
+#: ../rules/base.xml.in.h:279
msgid "Hausa"
msgstr "Hau-xa"
-#: ../rules/base.xml.in.h:257 ../rules/evdev.xml.in.h:257
+#: ../rules/base.xml.in.h:280
msgid "Hewlett-Packard Internet Keyboard"
msgstr "Bàn phím Internet Hewlett-Packard"
-#: ../rules/base.xml.in.h:258 ../rules/evdev.xml.in.h:258
-msgid "Hewlett-Packard Internet Keyboard 5181"
-msgstr "Bàn phím Internet Hewlett-Packard 5181"
-
-#: ../rules/base.xml.in.h:259 ../rules/evdev.xml.in.h:259
-msgid "Hewlett-Packard Internet Keyboard 5185"
-msgstr "Bàn phím Internet Hewlett-Packard 5185"
-
-#: ../rules/base.xml.in.h:260 ../rules/evdev.xml.in.h:260
+#: ../rules/base.xml.in.h:281
msgid "Hewlett-Packard Omnibook 500 FA"
msgstr "Hewlett-Packard Omnibook 500 FA"
-#: ../rules/base.xml.in.h:261 ../rules/evdev.xml.in.h:261
+#: ../rules/base.xml.in.h:282
msgid "Hewlett-Packard Omnibook 5xx"
msgstr "Hewlett-Packard Omnibook 5xx"
-#: ../rules/base.xml.in.h:262 ../rules/evdev.xml.in.h:262
+#: ../rules/base.xml.in.h:283
msgid "Hewlett-Packard Omnibook 6000/6100"
msgstr "Hewlett-Packard Omnibook 6000/6100"
-#: ../rules/base.xml.in.h:263 ../rules/evdev.xml.in.h:263
+#: ../rules/base.xml.in.h:284
msgid "Hewlett-Packard Omnibook XE3 GC"
msgstr "Hewlett-Packard Omnibook XE3 GC"
-#: ../rules/base.xml.in.h:264 ../rules/evdev.xml.in.h:264
+#: ../rules/base.xml.in.h:285
msgid "Hewlett-Packard Omnibook XE3 GF"
msgstr "Hewlett-Packard Omnibook XE3 GF"
-#: ../rules/base.xml.in.h:265 ../rules/evdev.xml.in.h:265
+#: ../rules/base.xml.in.h:286
msgid "Hewlett-Packard Omnibook XT1000"
msgstr "Hewlett-Packard Omnibook XT1000"
-#: ../rules/base.xml.in.h:266 ../rules/evdev.xml.in.h:266
+#: ../rules/base.xml.in.h:287
msgid "Hewlett-Packard Pavilion ZT11xx"
msgstr "Hewlett-Packard Pavilion ZT11xx"
-#: ../rules/base.xml.in.h:267 ../rules/evdev.xml.in.h:267
-msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
-msgstr "Bàn phím phim nhạc Hewlett-Packard SK-2501"
+#: ../rules/base.xml.in.h:288
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
-#: ../rules/base.xml.in.h:268 ../rules/evdev.xml.in.h:268
-msgid "Hewlett-Packard SK-2505 Internet Keyboard"
-msgstr "Bàn phím Internet Hewlett-Packard SK-2505"
+#: ../rules/base.xml.in.h:289
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Bàn phím phim nhạc Hewlett-Packard SK-250x"
-#: ../rules/base.xml.in.h:269 ../rules/evdev.xml.in.h:269
+#: ../rules/base.xml.in.h:290
msgid "Hewlett-Packard nx9020"
msgstr "Hewlett-Packard nx9020"
-#: ../rules/base.xml.in.h:270 ../rules/evdev.xml.in.h:270
+#: ../rules/base.xml.in.h:291
+msgid "Hexadecimal"
+msgstr "Thập lục"
+
+#: ../rules/base.xml.in.h:292
msgid "Hindi Bolnagri"
msgstr "Hin-đi Bolnagri"
-#: ../rules/base.xml.in.h:271 ../rules/evdev.xml.in.h:271
+#: ../rules/base.xml.in.h:293
+msgid "Hindi Wx"
+msgstr "Hin-đi Wx"
+
+#: ../rules/base.xml.in.h:294
msgid "Homophonic"
msgstr "Cùng một chủ điệu"
-#: ../rules/base.xml.in.h:272 ../rules/evdev.xml.in.h:272
+#: ../rules/base.xml.in.h:295
msgid "Honeywell Euroboard"
msgstr "Honeywell Euroboard"
-#: ../rules/base.xml.in.h:273 ../rules/evdev.xml.in.h:273
+#: ../rules/base.xml.in.h:296
msgid "Hrv"
msgstr "Hrv"
-#: ../rules/base.xml.in.h:274 ../rules/evdev.xml.in.h:274
+#: ../rules/base.xml.in.h:297
msgid "Hun"
msgstr "Hun"
-#: ../rules/base.xml.in.h:275 ../rules/evdev.xml.in.h:275
+#: ../rules/base.xml.in.h:298
msgid "Hungary"
msgstr "Hun-ga-ri"
-#: ../rules/base.xml.in.h:276 ../rules/evdev.xml.in.h:276
-msgid "Hyper is mapped to the Win-keys."
-msgstr "Hyper được gắn tới các phím Win."
+#: ../rules/base.xml.in.h:299
+msgid "Hyper is mapped to Win-keys"
+msgstr "Hyper ánh xạ tới các phím Win"
-#: ../rules/base.xml.in.h:277 ../rules/evdev.xml.in.h:277
+#: ../rules/base.xml.in.h:300
msgid "IBM (LST 1205-92)"
msgstr "IBM (LST 1205-92)"
-#: ../rules/base.xml.in.h:278 ../rules/evdev.xml.in.h:278
+#: ../rules/base.xml.in.h:301
msgid "IBM Rapid Access"
msgstr "Truy cập nhanh IBM"
-#: ../rules/base.xml.in.h:279 ../rules/evdev.xml.in.h:279
+#: ../rules/base.xml.in.h:302
msgid "IBM Rapid Access II"
msgstr "Truy cập nhanh IBM II"
-#: ../rules/base.xml.in.h:280 ../rules/evdev.xml.in.h:280
-msgid "IBM Rapid Access II (alternate option)"
-msgstr "Truy cập nhanh IBM II (luân phiên tùy chọn)"
-
-#: ../rules/base.xml.in.h:281 ../rules/evdev.xml.in.h:281
+#: ../rules/base.xml.in.h:303
msgid "IBM Space Saver"
msgstr "IBM Space Saver"
-#: ../rules/base.xml.in.h:282 ../rules/evdev.xml.in.h:282
+#: ../rules/base.xml.in.h:304
msgid "IBM ThinkPad 560Z/600/600E/A22E"
msgstr "IBM ThinkPad 560Z/600/600E/A22E"
-#: ../rules/base.xml.in.h:283 ../rules/evdev.xml.in.h:283
+#: ../rules/base.xml.in.h:305
msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
msgstr "IBM ThinkPad 560Z/600/600E/A22E, quốc tế"
-#: ../rules/base.xml.in.h:284 ../rules/evdev.xml.in.h:284
+#: ../rules/base.xml.in.h:306
msgid "IBM ThinkPad R60/T60/R61/T61"
msgstr "IBM ThinkPad R60/T60/R61/T61"
-#: ../rules/base.xml.in.h:285 ../rules/evdev.xml.in.h:285
+#: ../rules/base.xml.in.h:307
msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
-#: ../rules/base.xml.in.h:286 ../rules/evdev.xml.in.h:286
+#: ../rules/base.xml.in.h:308
msgid "ISO Alternate"
msgstr "ISO Xen kẽ"
-#: ../rules/base.xml.in.h:287 ../rules/evdev.xml.in.h:287
+#: ../rules/base.xml.in.h:309
msgid "Iceland"
msgstr "Băng Đảo"
-#: ../rules/base.xml.in.h:288 ../rules/evdev.xml.in.h:288
+#: ../rules/base.xml.in.h:310
msgid "Igbo"
msgstr "Ig-bô"
-#: ../rules/base.xml.in.h:289 ../rules/evdev.xml.in.h:289
+#: ../rules/base.xml.in.h:311
+msgid "Include dead tilde"
+msgstr "Bao gồm dấu sóng chết"
+
+#: ../rules/base.xml.in.h:312
msgid "Ind"
msgstr "Ind"
-#: ../rules/base.xml.in.h:290 ../rules/evdev.xml.in.h:290
+#: ../rules/base.xml.in.h:313
msgid "India"
msgstr "Ấn Độ"
-#: ../rules/base.xml.in.h:291 ../rules/evdev.xml.in.h:291
+#: ../rules/base.xml.in.h:314
msgid "International (AltGr dead keys)"
msgstr "Quốc tế (với phím chết AltGr)"
-#: ../rules/base.xml.in.h:292 ../rules/evdev.xml.in.h:292
+#: ../rules/base.xml.in.h:315
msgid "International (with dead keys)"
msgstr "Quốc tế (với phím chết)"
-#: ../rules/base.xml.in.h:293 ../rules/evdev.xml.in.h:293
+#: ../rules/base.xml.in.h:316
msgid "Inuktitut"
msgstr "I-nukh-ti-tu-th"
-#: ../rules/base.xml.in.h:294 ../rules/evdev.xml.in.h:294
+#: ../rules/base.xml.in.h:317
msgid "Iran"
msgstr "I-rắn"
-#: ../rules/base.xml.in.h:295 ../rules/evdev.xml.in.h:295
+#: ../rules/base.xml.in.h:318
msgid "Iraq"
msgstr "I-rắc"
-#: ../rules/base.xml.in.h:296 ../rules/evdev.xml.in.h:296
+#: ../rules/base.xml.in.h:319
msgid "Ireland"
msgstr "Ái-nhĩ-lan"
-#: ../rules/base.xml.in.h:297 ../rules/evdev.xml.in.h:297
+#: ../rules/base.xml.in.h:320
msgid "Irl"
msgstr "Irl"
-#: ../rules/base.xml.in.h:298 ../rules/evdev.xml.in.h:298
+#: ../rules/base.xml.in.h:321
msgid "Irn"
msgstr "Irn"
-#: ../rules/base.xml.in.h:299 ../rules/evdev.xml.in.h:299
+#: ../rules/base.xml.in.h:322
msgid "Irq"
msgstr "Irq"
-#: ../rules/base.xml.in.h:300 ../rules/evdev.xml.in.h:300
+#: ../rules/base.xml.in.h:323
msgid "Isl"
msgstr "Isl"
-#: ../rules/base.xml.in.h:301 ../rules/evdev.xml.in.h:301
+#: ../rules/base.xml.in.h:324
msgid "Isr"
msgstr "Isr"
-#: ../rules/base.xml.in.h:302 ../rules/evdev.xml.in.h:302
+#: ../rules/base.xml.in.h:325
msgid "Israel"
msgstr "Do Thái"
-#: ../rules/base.xml.in.h:303 ../rules/evdev.xml.in.h:303
+#: ../rules/base.xml.in.h:326
msgid "Ita"
msgstr "Ita"
-#: ../rules/base.xml.in.h:304 ../rules/evdev.xml.in.h:304
+#: ../rules/base.xml.in.h:327
msgid "Italy"
msgstr "Ý"
-#: ../rules/base.xml.in.h:305 ../rules/evdev.xml.in.h:305
+#: ../rules/base.xml.in.h:328
msgid "Japan"
msgstr "Nhật Bản"
-#: ../rules/base.xml.in.h:306 ../rules/evdev.xml.in.h:306
+#: ../rules/base.xml.in.h:329
msgid "Japan (PC-98xx Series)"
msgstr "Nhật (dãy PC-98xx)"
-#: ../rules/base.xml.in.h:307 ../rules/evdev.xml.in.h:307
-msgid "Japanese 106-key"
-msgstr "Nhật bản 106 phím"
-
-#: ../rules/base.xml.in.h:308 ../rules/evdev.xml.in.h:308
+#: ../rules/base.xml.in.h:330
msgid "Japanese keyboard options"
msgstr "Tùy chọn bàn phím tiếng Nhật"
-#: ../rules/base.xml.in.h:309 ../rules/evdev.xml.in.h:309
+#: ../rules/base.xml.in.h:331
msgid "Jpn"
msgstr "Jpn"
-#: ../rules/base.xml.in.h:310 ../rules/evdev.xml.in.h:310
+#: ../rules/base.xml.in.h:332
+msgid "Kalmyk"
+msgstr "Kalmyk"
+
+#: ../rules/base.xml.in.h:333
msgid "Kana"
msgstr "Kana"
-#: ../rules/base.xml.in.h:311 ../rules/evdev.xml.in.h:311
+#: ../rules/base.xml.in.h:334
msgid "Kana Lock key is locking"
msgstr "Phím Kana Lock sẽ khoá"
-#: ../rules/base.xml.in.h:312 ../rules/evdev.xml.in.h:312
+#: ../rules/base.xml.in.h:335
msgid "Kannada"
msgstr "Kannada"
-#: ../rules/base.xml.in.h:313 ../rules/evdev.xml.in.h:313
+#: ../rules/base.xml.in.h:336
msgid "Kashubian"
msgstr "Kha-su-bi"
-#: ../rules/base.xml.in.h:314 ../rules/evdev.xml.in.h:314
+#: ../rules/base.xml.in.h:337
msgid "Kaz"
msgstr "Kaz"
-#: ../rules/base.xml.in.h:315 ../rules/evdev.xml.in.h:315
+#: ../rules/base.xml.in.h:338
msgid "Kazakh with Russian"
msgstr "Kha-xắc với tiếng Nga"
-#: ../rules/base.xml.in.h:316 ../rules/evdev.xml.in.h:316
+#: ../rules/base.xml.in.h:339
msgid "Kazakhstan"
msgstr "Kha-xắc-x-tanh"
-#: ../rules/base.xml.in.h:317 ../rules/evdev.xml.in.h:317
-msgid "Keypad"
-msgstr "Vùng phím"
+#: ../rules/base.xml.in.h:340
+msgid "Key sequence to kill the X server"
+msgstr "Dãy phím để giết trình phục vụ X"
+
+#: ../rules/base.xml.in.h:341
+msgid "Key to choose 3rd level"
+msgstr "Phím để chọn cấp ba"
-#: ../rules/base.xml.in.h:318 ../rules/evdev.xml.in.h:318
-msgid "Keypad with unicode additions (arrows and math operators)"
-msgstr "Vùng phím có phần thêm Unicode (các mũi tên và toán tử toán học)"
+#: ../rules/base.xml.in.h:342
+msgid "Key(s) to change layout"
+msgstr "(Các) phím để chuyển đổi bố trí"
-#: ../rules/base.xml.in.h:319 ../rules/evdev.xml.in.h:319
-msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Vùng phím có phần thêm Unicode (các mũi tên và toán tử toán học). Bậc mặc định thì nhập các toán tử toán học."
+#: ../rules/base.xml.in.h:343
+msgid "Keypad"
+msgstr "Vùng phím"
-#: ../rules/base.xml.in.h:320 ../rules/evdev.xml.in.h:320
+#: ../rules/base.xml.in.h:344
msgid "Keytronic FlexPro"
msgstr "Keytronic FlexPro"
-#: ../rules/base.xml.in.h:321 ../rules/evdev.xml.in.h:321
+#: ../rules/base.xml.in.h:345
+msgid "Kgz"
+msgstr "Kgz"
+
+#: ../rules/base.xml.in.h:346
msgid "Khm"
msgstr "Khm"
-#: ../rules/base.xml.in.h:322 ../rules/evdev.xml.in.h:322
-msgid "Kir"
-msgstr "Kir"
-
-#: ../rules/base.xml.in.h:323 ../rules/evdev.xml.in.h:323
+#: ../rules/base.xml.in.h:347
msgid "Komi"
msgstr "Komi"
-#: ../rules/base.xml.in.h:324 ../rules/evdev.xml.in.h:324
+#: ../rules/base.xml.in.h:348
msgid "Kor"
msgstr "Kor"
-#: ../rules/base.xml.in.h:325 ../rules/evdev.xml.in.h:325
+#: ../rules/base.xml.in.h:349
msgid "Korea, Republic of"
msgstr "Cộng Hoà Nam Hàn"
-#: ../rules/base.xml.in.h:326 ../rules/evdev.xml.in.h:326
-msgid "Korean 106-key"
-msgstr "Hàn 106 phím"
-
-#: ../rules/base.xml.in.h:327 ../rules/evdev.xml.in.h:327
+#: ../rules/base.xml.in.h:350
msgid "Ktunaxa"
msgstr "Ktunaxa"
-#: ../rules/base.xml.in.h:328 ../rules/evdev.xml.in.h:328
+#: ../rules/base.xml.in.h:351
msgid "Kurdish, (F)"
msgstr "Kuổ-đít (F)"
-#: ../rules/base.xml.in.h:329 ../rules/evdev.xml.in.h:329
+#: ../rules/base.xml.in.h:352
msgid "Kurdish, Arabic-Latin"
msgstr "Kuổ-đít, A Rập/La-tinh"
-#: ../rules/base.xml.in.h:330 ../rules/evdev.xml.in.h:330
+#: ../rules/base.xml.in.h:353
msgid "Kurdish, Latin Alt-Q"
msgstr "Kuổ-đít, La-tinh Alt-Q"
-#: ../rules/base.xml.in.h:331 ../rules/evdev.xml.in.h:331
+#: ../rules/base.xml.in.h:354
msgid "Kurdish, Latin Q"
msgstr "Kuổ-đít, La-tinh Q"
-#: ../rules/base.xml.in.h:332 ../rules/evdev.xml.in.h:332
+#: ../rules/base.xml.in.h:355
msgid "Kyrgyzstan"
msgstr "Kyr-gi-x-tanh"
-#: ../rules/base.xml.in.h:333 ../rules/evdev.xml.in.h:333
+#: ../rules/base.xml.in.h:356
msgid "LAm"
msgstr "LAm"
-#: ../rules/base.xml.in.h:334 ../rules/evdev.xml.in.h:334
-msgid "LCtrl+LShift change layout."
-msgstr "Ctrl+Shift bên trái thay đổi ngôn ngữ nhập vào."
-
-#: ../rules/base.xml.in.h:335 ../rules/evdev.xml.in.h:335
+#: ../rules/base.xml.in.h:357
msgid "LEKP"
msgstr "LEKP"
-#: ../rules/base.xml.in.h:336 ../rules/evdev.xml.in.h:336
+#: ../rules/base.xml.in.h:358
msgid "LEKPa"
msgstr "LEKPa"
-#: ../rules/base.xml.in.h:337 ../rules/evdev.xml.in.h:337
+#: ../rules/base.xml.in.h:359
msgid "Lao"
msgstr "Lào"
-#: ../rules/base.xml.in.h:338 ../rules/evdev.xml.in.h:338
+#: ../rules/base.xml.in.h:360
msgid "Laos"
msgstr "Lào"
-#: ../rules/base.xml.in.h:339 ../rules/evdev.xml.in.h:339
+#: ../rules/base.xml.in.h:361
msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
msgstr "Bàn phím nhỏ gọn cho máy xách tay/notebook Compaq (ví dụ Armada)"
-#: ../rules/base.xml.in.h:340 ../rules/evdev.xml.in.h:340
+#: ../rules/base.xml.in.h:362
msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
msgstr "Bàn phím Internet cho máy xách tay/notebook Compaq (ví dụ Presario)"
-#: ../rules/base.xml.in.h:341 ../rules/evdev.xml.in.h:341
+#: ../rules/base.xml.in.h:363
msgid "Laptop/notebook eMachines m68xx"
msgstr "Xách tay eMachines m68xx"
-#: ../rules/base.xml.in.h:342 ../rules/evdev.xml.in.h:342
+#: ../rules/base.xml.in.h:364
msgid "Latin"
msgstr "La-tinh"
-#: ../rules/base.xml.in.h:343 ../rules/evdev.xml.in.h:343
+#: ../rules/base.xml.in.h:365
msgid "Latin American"
msgstr "La-tinh Mỹ"
-#: ../rules/base.xml.in.h:344 ../rules/evdev.xml.in.h:344
+#: ../rules/base.xml.in.h:366
msgid "Latin Unicode"
msgstr "La-tinh Unicode"
-#: ../rules/base.xml.in.h:345 ../rules/evdev.xml.in.h:345
+#: ../rules/base.xml.in.h:367
msgid "Latin Unicode qwerty"
msgstr "La-tinh Unicode qwerty"
-#: ../rules/base.xml.in.h:346 ../rules/evdev.xml.in.h:346
+#: ../rules/base.xml.in.h:368
msgid "Latin qwerty"
msgstr "La-tinh qwerty"
-#: ../rules/base.xml.in.h:347 ../rules/evdev.xml.in.h:347
+#: ../rules/base.xml.in.h:369
msgid "Latin unicode"
msgstr "La-tinh Unicode"
-#: ../rules/base.xml.in.h:348 ../rules/evdev.xml.in.h:348
+#: ../rules/base.xml.in.h:370
msgid "Latin unicode qwerty"
msgstr "La-tinh Unicode QWERTY"
-#: ../rules/base.xml.in.h:349 ../rules/evdev.xml.in.h:349
+#: ../rules/base.xml.in.h:371
msgid "Latin with guillemets"
msgstr "La-tinh với « chim uria »"
-#: ../rules/base.xml.in.h:350 ../rules/evdev.xml.in.h:350
+#: ../rules/base.xml.in.h:372
msgid "Latvia"
msgstr "Lát-via"
-#: ../rules/base.xml.in.h:351 ../rules/evdev.xml.in.h:351
+#: ../rules/base.xml.in.h:373
msgid "Lav"
msgstr "Lav"
-#: ../rules/base.xml.in.h:352 ../rules/evdev.xml.in.h:352
-msgid "Layout switching"
-msgstr "Chuyển đổi ngôn ngữ nhập"
+#: ../rules/base.xml.in.h:374
+msgid "Left Alt"
+msgstr "Alt trái"
-#: ../rules/base.xml.in.h:353 ../rules/evdev.xml.in.h:353
-msgid "Left Alt is swapped with left Win-key."
-msgstr "Alt bên trái được trao đổi với phím Win bên trái."
+#: ../rules/base.xml.in.h:375
+msgid "Left Alt (while pressed)"
+msgstr "Alt trái (trong khi bấm)"
-#: ../rules/base.xml.in.h:354 ../rules/evdev.xml.in.h:354
-msgid "Left Alt key changes layout."
-msgstr "Phím Alt bên trái thay đổi ngôn ngữ nhập vào."
+#: ../rules/base.xml.in.h:376
+msgid "Left Alt is swapped with Left Win"
+msgstr "Alt bên trái được trao đổi với phím Win bên trái"
-#: ../rules/base.xml.in.h:355 ../rules/evdev.xml.in.h:355
-msgid "Left Alt key switches layout while pressed."
-msgstr "Phím Alt bên trái chuyển đổi ngôn ngữ khi được nhấn."
+#: ../rules/base.xml.in.h:377
+msgid "Left Ctrl"
+msgstr "Ctrl trái"
-#: ../rules/base.xml.in.h:356 ../rules/evdev.xml.in.h:356
-msgid "Left Ctrl key changes layout."
-msgstr "Phím Ctrl bên trái thay đổi ngôn ngữ nhập vào."
+#: ../rules/base.xml.in.h:378
+msgid "Left Ctrl+Left Shift"
+msgstr "Ctrl trái+Shift trái"
-#: ../rules/base.xml.in.h:357 ../rules/evdev.xml.in.h:357
-msgid "Left Shift key changes layout."
-msgstr "Phím Shift bên trái thay đổi ngôn ngữ nhập vào."
+#: ../rules/base.xml.in.h:379
+msgid "Left Shift"
+msgstr "Shift trái"
-#: ../rules/base.xml.in.h:358 ../rules/evdev.xml.in.h:358
-msgid "Left Win-key changes layout."
-msgstr "Phím Win bên trái thay đổi ngôn ngữ nhập vào."
+#: ../rules/base.xml.in.h:380
+msgid "Left Win"
+msgstr "Win trái"
-#: ../rules/base.xml.in.h:359 ../rules/evdev.xml.in.h:359
-msgid "Left Win-key is Compose."
-msgstr "Phím Win bên trái là Soạn thảo."
+#: ../rules/base.xml.in.h:381
+msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgstr "Win trái (tới bố trí đầu tiên), Win phải/Trình đơn (tới bố trí cuối cùng)"
-#: ../rules/base.xml.in.h:360 ../rules/evdev.xml.in.h:360
-msgid "Left Win-key switches layout while pressed."
-msgstr "Phím Win bên trái chuyển đổi ngôn ngữ khi được nhấn."
+#: ../rules/base.xml.in.h:382
+msgid "Left Win (while pressed)"
+msgstr "Win trái (trong khi bấm)"
-#: ../rules/base.xml.in.h:361 ../rules/evdev.xml.in.h:361
+#: ../rules/base.xml.in.h:383
msgid "Left hand"
msgstr "Thuận tay trái"
-#: ../rules/base.xml.in.h:362 ../rules/evdev.xml.in.h:362
+#: ../rules/base.xml.in.h:384
msgid "Left handed Dvorak"
msgstr "Dvorak thuận tay trái"
-#: ../rules/base.xml.in.h:363 ../rules/evdev.xml.in.h:363
+#: ../rules/base.xml.in.h:385
msgid "Legacy"
msgstr "Thừa tự"
-#: ../rules/base.xml.in.h:364 ../rules/evdev.xml.in.h:364
-msgid "Legacy Wang 724 keypad"
-msgstr "Vùng phím Wang 724 thừa tự"
+#: ../rules/base.xml.in.h:386
+msgid "Legacy Wang 724"
+msgstr "Wang 724 thừa tự"
#. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:366 ../rules/evdev.xml.in.h:366
+#: ../rules/base.xml.in.h:388
msgid "Legacy key with comma"
msgstr "Phím thừa tự có dấu phẩy"
-#: ../rules/base.xml.in.h:367 ../rules/evdev.xml.in.h:367
+#: ../rules/base.xml.in.h:389
msgid "Legacy key with dot"
msgstr "Phím thừa tự có chấm"
-#: ../rules/base.xml.in.h:368 ../rules/evdev.xml.in.h:368
-msgid "Legacy keypad"
-msgstr "Vùng phím thừa tự"
-
-#: ../rules/base.xml.in.h:369 ../rules/evdev.xml.in.h:369
-msgid "Less-than/Greater-than is Compose."
-msgstr "Nhỏ/Lớn hơn là Soạn thảo."
+#: ../rules/base.xml.in.h:390
+msgid "Less-than/Greater-than"
+msgstr "Nhỏ/Lớn hơn"
-#: ../rules/base.xml.in.h:370 ../rules/evdev.xml.in.h:370
+#: ../rules/base.xml.in.h:391
msgid "Lithuania"
msgstr "Li-tu-a-ni"
-#: ../rules/base.xml.in.h:371 ../rules/evdev.xml.in.h:371
+#: ../rules/base.xml.in.h:392
msgid "Logitech Access Keyboard"
msgstr "Bàn phím Truy cập Logitech"
-#: ../rules/base.xml.in.h:372 ../rules/evdev.xml.in.h:372
+#: ../rules/base.xml.in.h:393
msgid "Logitech Cordless Desktop"
msgstr "Logitech Cordless Desktop"
-#: ../rules/base.xml.in.h:373 ../rules/evdev.xml.in.h:373
+#: ../rules/base.xml.in.h:394
msgid "Logitech Cordless Desktop (alternate option)"
msgstr "Logitech Cordless Desktop (tùy chọn thay thế)"
-#: ../rules/base.xml.in.h:374 ../rules/evdev.xml.in.h:374
+#: ../rules/base.xml.in.h:395
msgid "Logitech Cordless Desktop EX110"
msgstr "Logitech Cordless Desktop EX110"
-#: ../rules/base.xml.in.h:375 ../rules/evdev.xml.in.h:375
+#: ../rules/base.xml.in.h:396
msgid "Logitech Cordless Desktop LX-300"
msgstr "Logitech Cordless Desktop LX-300"
-#: ../rules/base.xml.in.h:376 ../rules/evdev.xml.in.h:376
+#: ../rules/base.xml.in.h:397
msgid "Logitech Cordless Desktop Navigator"
msgstr "Logitech Cordless Desktop Navigator"
-#: ../rules/base.xml.in.h:377 ../rules/evdev.xml.in.h:377
+#: ../rules/base.xml.in.h:398
msgid "Logitech Cordless Desktop Optical"
msgstr "Logitech Cordless Desktop Optical"
-#: ../rules/base.xml.in.h:378 ../rules/evdev.xml.in.h:378
-msgid "Logitech Cordless Desktop Pro (alternate option2)"
-msgstr "Logitech Cordless Desktop Pro (luân phiên tùy chọn2)"
+#: ../rules/base.xml.in.h:399
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgstr "Logitech Cordless Desktop Pro (luân phiên tùy chọn 2)"
-#: ../rules/base.xml.in.h:379 ../rules/evdev.xml.in.h:379
+#: ../rules/base.xml.in.h:400
msgid "Logitech Cordless Desktop iTouch"
msgstr "Logitech Cordless Desktop iTouch"
-#: ../rules/base.xml.in.h:380 ../rules/evdev.xml.in.h:380
+#: ../rules/base.xml.in.h:401
msgid "Logitech Cordless Freedom/Desktop Navigator"
msgstr "Logitech Cordless Freedom/Desktop Navigator"
-#: ../rules/base.xml.in.h:381 ../rules/evdev.xml.in.h:381
+#: ../rules/base.xml.in.h:402
msgid "Logitech G15 extra keys via G15daemon"
msgstr "Logitech G15 các phím thêm thông qua G15daemon"
-#: ../rules/base.xml.in.h:382 ../rules/evdev.xml.in.h:382
+#: ../rules/base.xml.in.h:403
msgid "Logitech Generic Keyboard"
msgstr "Bàn phím chung Logitech"
-#: ../rules/base.xml.in.h:383 ../rules/evdev.xml.in.h:383
+#: ../rules/base.xml.in.h:404
msgid "Logitech Internet 350 Keyboard"
msgstr "Bàn phím Internet Logitech 350"
-#: ../rules/base.xml.in.h:384 ../rules/evdev.xml.in.h:384
+#: ../rules/base.xml.in.h:405
msgid "Logitech Internet Keyboard"
msgstr "Bàn phím Internet Logitech"
-#: ../rules/base.xml.in.h:385 ../rules/evdev.xml.in.h:385
+#: ../rules/base.xml.in.h:406
msgid "Logitech Internet Navigator Keyboard"
msgstr "Bàn phím Logitech Internet Navigator"
-#: ../rules/base.xml.in.h:386 ../rules/evdev.xml.in.h:386
+#: ../rules/base.xml.in.h:407
msgid "Logitech Media Elite Keyboard"
msgstr "Bàn phím Logitech Media Elite"
-#: ../rules/base.xml.in.h:387 ../rules/evdev.xml.in.h:387
+#: ../rules/base.xml.in.h:408
msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
msgstr "Bàn phím Logitech Ultra-X Cordless Media Desktop"
-#: ../rules/base.xml.in.h:388 ../rules/evdev.xml.in.h:388
+#: ../rules/base.xml.in.h:409
msgid "Logitech Ultra-X Keyboard"
msgstr "Bàn phím Logitech Ultra-X"
-#: ../rules/base.xml.in.h:389 ../rules/evdev.xml.in.h:389
+#: ../rules/base.xml.in.h:410
msgid "Logitech diNovo Edge Keyboard"
msgstr "Bàn phím Logitech diNovo Edge"
-#: ../rules/base.xml.in.h:390 ../rules/evdev.xml.in.h:390
+#: ../rules/base.xml.in.h:411
msgid "Logitech diNovo Keyboard"
msgstr "Bàn phím Logitech diNovo"
-#: ../rules/base.xml.in.h:391 ../rules/evdev.xml.in.h:391
+#: ../rules/base.xml.in.h:412
msgid "Logitech iTouch"
msgstr "Logitech iTouch"
-#: ../rules/base.xml.in.h:392 ../rules/evdev.xml.in.h:392
+#: ../rules/base.xml.in.h:413
msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
msgstr "Bàn phím Không dây Logitech iTouch (mẫu mã Y-RB6)"
-#: ../rules/base.xml.in.h:393 ../rules/evdev.xml.in.h:393
+#: ../rules/base.xml.in.h:414
msgid "Logitech iTouch Internet Navigator Keyboard SE"
msgstr "Bàn phím Logitech iTouch Internet Navigator SE"
-#: ../rules/base.xml.in.h:394 ../rules/evdev.xml.in.h:394
+#: ../rules/base.xml.in.h:415
msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
msgstr "Bàn phím Logitech iTouch Internet Navigator SE (USB)"
-#: ../rules/base.xml.in.h:395 ../rules/evdev.xml.in.h:395
+#: ../rules/base.xml.in.h:416
+msgid "Lower Sorbian"
+msgstr "Xoa-bi Thấp"
+
+#: ../rules/base.xml.in.h:417
+msgid "Lower Sorbian (qwertz)"
+msgstr "Xoa-bi Thấp (qwertz)"
+
+#: ../rules/base.xml.in.h:418
msgid "Ltu"
msgstr "Ltu"
-#: ../rules/base.xml.in.h:396 ../rules/evdev.xml.in.h:396
+#: ../rules/base.xml.in.h:419
msgid "MESS"
msgstr "MESS"
-#: ../rules/base.xml.in.h:397 ../rules/evdev.xml.in.h:397
+#: ../rules/base.xml.in.h:420
msgid "MNE"
msgstr "MNE"
-#: ../rules/base.xml.in.h:398 ../rules/evdev.xml.in.h:398
+#: ../rules/base.xml.in.h:421
msgid "MacBook/MacBook Pro"
msgstr "MacBook/MacBook Pro"
-#: ../rules/base.xml.in.h:399 ../rules/evdev.xml.in.h:399
+#: ../rules/base.xml.in.h:422
msgid "MacBook/MacBook Pro (Intl)"
msgstr "MacBook/MacBook Pro (quốc tế)"
-#: ../rules/base.xml.in.h:400 ../rules/evdev.xml.in.h:400
+#: ../rules/base.xml.in.h:423
msgid "Macedonia"
msgstr "Ma-xê-đô-ni-a"
-#: ../rules/base.xml.in.h:401 ../rules/evdev.xml.in.h:401
+#: ../rules/base.xml.in.h:424
msgid "Macintosh"
msgstr "Macintosh"
-#: ../rules/base.xml.in.h:402 ../rules/evdev.xml.in.h:402
+#: ../rules/base.xml.in.h:425
msgid "Macintosh Old"
msgstr "Macintosh Cũ"
-#: ../rules/base.xml.in.h:403 ../rules/evdev.xml.in.h:403
+#: ../rules/base.xml.in.h:426
msgid "Macintosh, Sun dead keys"
msgstr "Macintosh, phím chết Sun"
-#: ../rules/base.xml.in.h:404 ../rules/evdev.xml.in.h:404
+#: ../rules/base.xml.in.h:427
msgid "Macintosh, eliminate dead keys"
msgstr "Macintosh, phím chết loại trừ"
-#: ../rules/base.xml.in.h:405 ../rules/evdev.xml.in.h:405
-msgid "Make CapsLock an additional Ctrl."
-msgstr "Dùng CapsLock làm một Ctrl bổ sung."
+#: ../rules/base.xml.in.h:428
+msgid "Make CapsLock an additional Backspace"
+msgstr "Đặt CapsLock làm một phím Xoá lùi bổ sung"
+
+#: ../rules/base.xml.in.h:429
+msgid "Make CapsLock an additional Ctrl"
+msgstr "Đặt CapsLock làm một phím Ctrl bổ sung"
+
+#: ../rules/base.xml.in.h:430
+msgid "Make CapsLock an additional ESC"
+msgstr "Đặt CapsLock làm một phím ESC bổ sung"
-#: ../rules/base.xml.in.h:406 ../rules/evdev.xml.in.h:406
+#: ../rules/base.xml.in.h:431
msgid "Mal"
msgstr "Mal"
-#: ../rules/base.xml.in.h:407 ../rules/evdev.xml.in.h:407
+#: ../rules/base.xml.in.h:432
msgid "Malayalam"
msgstr "Malayalam"
-#: ../rules/base.xml.in.h:408 ../rules/evdev.xml.in.h:408
+#: ../rules/base.xml.in.h:433
msgid "Malayalam Lalitha"
msgstr "Malayalam Lalitha"
-#: ../rules/base.xml.in.h:409 ../rules/evdev.xml.in.h:409
+#: ../rules/base.xml.in.h:434
msgid "Maldives"
msgstr "Man-đi-vơ-xợ"
-#: ../rules/base.xml.in.h:410 ../rules/evdev.xml.in.h:410
+#: ../rules/base.xml.in.h:435
msgid "Malta"
msgstr "Man-tợ"
-#: ../rules/base.xml.in.h:411 ../rules/evdev.xml.in.h:411
+#: ../rules/base.xml.in.h:436
msgid "Maltese keyboard with US layout"
msgstr "Bàn phím Man-tợ có bố trí Mỹ"
-#: ../rules/base.xml.in.h:412 ../rules/evdev.xml.in.h:412
+#: ../rules/base.xml.in.h:437
msgid "Mao"
msgstr "Mao"
-#: ../rules/base.xml.in.h:413 ../rules/evdev.xml.in.h:413
+#: ../rules/base.xml.in.h:438
msgid "Maori"
msgstr "Mao-ri"
-#: ../rules/base.xml.in.h:414 ../rules/evdev.xml.in.h:414
+#: ../rules/base.xml.in.h:439
msgid "Memorex MX1998"
msgstr "Memorex MX1998"
-#: ../rules/base.xml.in.h:415 ../rules/evdev.xml.in.h:415
+#: ../rules/base.xml.in.h:440
msgid "Memorex MX2500 EZ-Access Keyboard"
msgstr "Bàn phím Memorex MX2500 EZ-Access"
-#: ../rules/base.xml.in.h:416 ../rules/evdev.xml.in.h:416
+#: ../rules/base.xml.in.h:441
msgid "Memorex MX2750"
msgstr "Memorex MX2750"
-#: ../rules/base.xml.in.h:417 ../rules/evdev.xml.in.h:417
-msgid "Menu is Compose."
-msgstr "Menu là Soạn thảo."
+#: ../rules/base.xml.in.h:442
+msgid "Menu"
+msgstr "Trình đơn"
-#: ../rules/base.xml.in.h:418 ../rules/evdev.xml.in.h:418
-msgid "Menu key changes layout."
-msgstr "Phím Menu thay đổi ngôn ngữ nhập vào."
+#: ../rules/base.xml.in.h:443
+msgid "Meta is mapped to Left Win"
+msgstr "Meta ánh xạ tới Win trái"
-#: ../rules/base.xml.in.h:419 ../rules/evdev.xml.in.h:419
-msgid "Meta is mapped to the Win-keys."
-msgstr "Meta được gắn với các phím Win."
+#: ../rules/base.xml.in.h:444
+msgid "Meta is mapped to Win keys"
+msgstr "Meta ánh xạ tới các phím Win"
-#: ../rules/base.xml.in.h:420 ../rules/evdev.xml.in.h:420
-msgid "Meta is mapped to the left Win-key."
-msgstr "Meta được gắn với phím Win bên trái."
+#: ../rules/base.xml.in.h:445
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Comfort Curve Keyboard 2000"
-#: ../rules/base.xml.in.h:421 ../rules/evdev.xml.in.h:421
+#: ../rules/base.xml.in.h:446
msgid "Microsoft Internet Keyboard"
msgstr "Bàn phím Internet Microsoft"
-#: ../rules/base.xml.in.h:422 ../rules/evdev.xml.in.h:422
+#: ../rules/base.xml.in.h:447
msgid "Microsoft Internet Keyboard Pro, Swedish"
msgstr "Bàn phím Internet Microsoft Pro, Thụy Điển"
-#: ../rules/base.xml.in.h:423 ../rules/evdev.xml.in.h:423
+#: ../rules/base.xml.in.h:448
msgid "Microsoft Natural"
msgstr "Microsoft Natural"
-#: ../rules/base.xml.in.h:424 ../rules/evdev.xml.in.h:424
+#: ../rules/base.xml.in.h:449
msgid "Microsoft Natural Keyboard Elite"
msgstr "Microsoft Natural Keyboard Elite"
-#: ../rules/base.xml.in.h:425 ../rules/evdev.xml.in.h:425
+#: ../rules/base.xml.in.h:450
msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-#: ../rules/base.xml.in.h:426 ../rules/evdev.xml.in.h:426
+#: ../rules/base.xml.in.h:451
msgid "Microsoft Natural Keyboard Pro OEM"
msgstr "Microsoft Natural Keyboard Pro OEM"
-#: ../rules/base.xml.in.h:427 ../rules/evdev.xml.in.h:427
+#: ../rules/base.xml.in.h:452
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:428 ../rules/evdev.xml.in.h:428
+#: ../rules/base.xml.in.h:453
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+
+#: ../rules/base.xml.in.h:454
msgid "Microsoft Office Keyboard"
msgstr "Bàn phím Văn phòng Microsoft"
-#: ../rules/base.xml.in.h:429 ../rules/evdev.xml.in.h:429
+#: ../rules/base.xml.in.h:455
msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
-#: ../rules/base.xml.in.h:430 ../rules/evdev.xml.in.h:430
+#: ../rules/base.xml.in.h:456
msgid "Miscellaneous compatibility options"
msgstr "Tùy chọn tương thích khác"
-#: ../rules/base.xml.in.h:431 ../rules/evdev.xml.in.h:431
+#: ../rules/base.xml.in.h:457
msgid "Mkd"
msgstr "Mkd"
-#: ../rules/base.xml.in.h:432 ../rules/evdev.xml.in.h:432
+#: ../rules/base.xml.in.h:458
msgid "Mlt"
msgstr "Mlt"
-#: ../rules/base.xml.in.h:433 ../rules/evdev.xml.in.h:433
+#: ../rules/base.xml.in.h:459
msgid "Mmr"
msgstr "Mmr"
-#: ../rules/base.xml.in.h:434 ../rules/evdev.xml.in.h:434
+#: ../rules/base.xml.in.h:460
msgid "Mng"
msgstr "Mng"
-#: ../rules/base.xml.in.h:435 ../rules/evdev.xml.in.h:435
+#: ../rules/base.xml.in.h:461
msgid "Mongolia"
msgstr "Mông Cổ"
-#: ../rules/base.xml.in.h:436 ../rules/evdev.xml.in.h:436
+#: ../rules/base.xml.in.h:462
msgid "Montenegro"
msgstr "Mon-te-nê-gợ-rô"
-#: ../rules/base.xml.in.h:437 ../rules/evdev.xml.in.h:437
+#: ../rules/base.xml.in.h:463
msgid "Morocco"
msgstr "Ma Rốc"
-#: ../rules/base.xml.in.h:438 ../rules/evdev.xml.in.h:438
+#: ../rules/base.xml.in.h:464
msgid "Multilingual"
msgstr "Đa ngôn ngữ"
-#: ../rules/base.xml.in.h:439 ../rules/evdev.xml.in.h:439
+#: ../rules/base.xml.in.h:465
msgid "Multilingual, first part"
msgstr "Đa ngôn ngữ, phần đầu"
-#: ../rules/base.xml.in.h:440 ../rules/evdev.xml.in.h:440
+#: ../rules/base.xml.in.h:466
msgid "Multilingual, second part"
msgstr "Đa ngôn ngữ, phần hai"
-#: ../rules/base.xml.in.h:441 ../rules/evdev.xml.in.h:441
+#: ../rules/base.xml.in.h:467
msgid "Myanmar"
msgstr "Miến Điện"
-#: ../rules/base.xml.in.h:442 ../rules/evdev.xml.in.h:442
+#: ../rules/base.xml.in.h:468
msgid "NICOLA-F style Backspace"
msgstr "Xoá lùi kiểu NICOLA-F"
-# Name or category? Tên hay phân loại?
-#: ../rules/base.xml.in.h:443 ../rules/evdev.xml.in.h:443
-msgid "Neostyle"
-msgstr "Neostyle"
+#: ../rules/base.xml.in.h:469
+msgid "NLA"
+msgstr "NLA"
+
+#: ../rules/base.xml.in.h:470
+msgid "Nativo"
+msgstr "Nativo"
+
+#: ../rules/base.xml.in.h:471
+msgid "Nativo for Esperanto"
+msgstr "Nativo cho Ét-pe-ran-tô"
+
+#: ../rules/base.xml.in.h:472
+msgid "Nativo for USA keyboards"
+msgstr "Nativo cho bàn phím Mỹ"
-#: ../rules/base.xml.in.h:444 ../rules/evdev.xml.in.h:444
+#: ../rules/base.xml.in.h:473
+msgid "Neo 2"
+msgstr "Neo 2"
+
+#: ../rules/base.xml.in.h:474
msgid "Nep"
msgstr "Nep"
-#: ../rules/base.xml.in.h:445 ../rules/evdev.xml.in.h:445
+#: ../rules/base.xml.in.h:475
msgid "Nepal"
msgstr "Ne-pan"
-#: ../rules/base.xml.in.h:446 ../rules/evdev.xml.in.h:446
+#: ../rules/base.xml.in.h:476
msgid "Netherlands"
msgstr "Hà Lan"
-#: ../rules/base.xml.in.h:447 ../rules/evdev.xml.in.h:447
+#: ../rules/base.xml.in.h:477
msgid "Nig"
msgstr "Nig"
-#: ../rules/base.xml.in.h:448 ../rules/evdev.xml.in.h:448
+#: ../rules/base.xml.in.h:478
msgid "Nigeria"
msgstr "Ni-gê-ri-a"
-#: ../rules/base.xml.in.h:449 ../rules/evdev.xml.in.h:449
+#: ../rules/base.xml.in.h:479
msgid "Nld"
msgstr "Nld"
-#: ../rules/base.xml.in.h:450 ../rules/evdev.xml.in.h:450
+#: ../rules/base.xml.in.h:480
+msgid "Non-breakable space character at fourth level"
+msgstr "Ký tự dấu cách không thể ngắt ở bậc thứ tư"
+
+#: ../rules/base.xml.in.h:481
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Ký tự dấu cách không thể ngắt ở bậc thứ tư, ký tự dấu cách không thể ngắt mảnh ở bậc thứ sáu"
+
+#: ../rules/base.xml.in.h:482
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
+msgstr "Ký tự dấu cách không thể ngắt ở bậc thứ tư, ký tự dấu cách không thể ngắt mảnh ở bậc thứ sáu (dùng Ctrl+Shift)"
+
+#: ../rules/base.xml.in.h:483
+msgid "Non-breakable space character at second level"
+msgstr "Ký tự dấu cách không thể ngắt ở bậc thứ hai"
+
+#: ../rules/base.xml.in.h:484
+msgid "Non-breakable space character at third level"
+msgstr "Ký tự dấu cách không thể ngắt ở bậc thứ ba"
+
+#: ../rules/base.xml.in.h:485
+msgid "Non-breakable space character at third level, nothing at fourth level"
+msgstr "Ký tự dấu cách không thể ngắt ở bậc thứ ba, không nhập gì ở bậc thứ tư"
+
+#: ../rules/base.xml.in.h:486
+msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Ký tự dấu cách không thể ngắt ở bậc thứ ba, ký tự dấu cách không thể ngắt mảnh ở bậc thứ tư"
+
+#: ../rules/base.xml.in.h:487
msgid "Nor"
msgstr "Nor"
-#: ../rules/base.xml.in.h:451 ../rules/evdev.xml.in.h:451
+#: ../rules/base.xml.in.h:488
msgid "Northern Saami"
msgstr "Bắc Xa-mi"
-#: ../rules/base.xml.in.h:452 ../rules/evdev.xml.in.h:452
+#: ../rules/base.xml.in.h:489
msgid "Northern Saami, eliminate dead keys"
msgstr "Bắc Xa-mi, phím chết loại trừ"
-#: ../rules/base.xml.in.h:453 ../rules/evdev.xml.in.h:453
+#: ../rules/base.xml.in.h:490
msgid "Northgate OmniKey 101"
msgstr "Northgate OmniKey 101"
-#: ../rules/base.xml.in.h:454 ../rules/evdev.xml.in.h:454
+#: ../rules/base.xml.in.h:491
msgid "Norway"
msgstr "Na Uy"
-#: ../rules/base.xml.in.h:455 ../rules/evdev.xml.in.h:455
-msgid "NumLock LED shows alternative layout."
-msgstr "Đèn NumLock cho biết ngôn ngữ tương đương."
+#: ../rules/base.xml.in.h:492
+msgid "NumLock"
+msgstr "NumLock"
-#: ../rules/base.xml.in.h:456 ../rules/evdev.xml.in.h:456
+#: ../rules/base.xml.in.h:493
msgid "Numeric keypad delete key behaviour"
msgstr "Ứng xử phím xoá của vùng số"
-#: ../rules/base.xml.in.h:457 ../rules/evdev.xml.in.h:457
-msgid "Numeric keypad keys work as with Mac."
-msgstr "Phím vùng số hoạt động như trên Mac."
+#: ../rules/base.xml.in.h:494
+msgid "Numeric keypad keys work as with Mac"
+msgstr "Phím vùng số hoạt động như trên Mac"
-#: ../rules/base.xml.in.h:458 ../rules/evdev.xml.in.h:458
+#: ../rules/base.xml.in.h:495
msgid "Numeric keypad layout selection"
msgstr "Chọn bố trí vùng phím số"
-#: ../rules/base.xml.in.h:459 ../rules/evdev.xml.in.h:459
+#: ../rules/base.xml.in.h:496
msgid "OADG 109A"
msgstr "OADG 109A"
-#: ../rules/base.xml.in.h:460 ../rules/evdev.xml.in.h:460
+#: ../rules/base.xml.in.h:497
msgid "OLPC"
msgstr "OLPC"
-#: ../rules/base.xml.in.h:461 ../rules/evdev.xml.in.h:461
+#: ../rules/base.xml.in.h:498
msgid "OLPC Dari"
msgstr "OLPC Dari"
-#: ../rules/base.xml.in.h:462 ../rules/evdev.xml.in.h:462
+#: ../rules/base.xml.in.h:499
msgid "OLPC Pashto"
msgstr "OLPC Pas-tô"
-#: ../rules/base.xml.in.h:463 ../rules/evdev.xml.in.h:463
+#: ../rules/base.xml.in.h:500
msgid "OLPC Southern Uzbek"
msgstr "OLPC Nam Ux-béc"
-#: ../rules/base.xml.in.h:464 ../rules/evdev.xml.in.h:464
+#: ../rules/base.xml.in.h:501
+msgid "Occitan"
+msgstr "Óc-khi-tanh"
+
+#: ../rules/base.xml.in.h:502
msgid "Ogham"
msgstr "Og-âm"
-#: ../rules/base.xml.in.h:465 ../rules/evdev.xml.in.h:465
+#: ../rules/base.xml.in.h:503
msgid "Ogham IS434"
msgstr "Ogam IS434"
-#: ../rules/base.xml.in.h:466 ../rules/evdev.xml.in.h:466
+#: ../rules/base.xml.in.h:504
msgid "Oriya"
msgstr "Ô-ri-a"
-#: ../rules/base.xml.in.h:467 ../rules/evdev.xml.in.h:467
+#: ../rules/base.xml.in.h:505
msgid "Ortek MCK-800 MM/Internet keyboard"
msgstr "Bàn phím Ortek MCK-800 MM/Internet"
-#: ../rules/base.xml.in.h:468 ../rules/evdev.xml.in.h:468
+#: ../rules/base.xml.in.h:506
msgid "Ossetian"
msgstr "O-xét"
-#: ../rules/base.xml.in.h:469 ../rules/evdev.xml.in.h:469
+#: ../rules/base.xml.in.h:507
msgid "Ossetian, Winkeys"
msgstr "O-xét, phím Win"
-#: ../rules/base.xml.in.h:470 ../rules/evdev.xml.in.h:470
+#: ../rules/base.xml.in.h:508
msgid "Ossetian, legacy"
msgstr "O-xét, thừa tự"
-#: ../rules/base.xml.in.h:471 ../rules/evdev.xml.in.h:471
+#: ../rules/base.xml.in.h:509
msgid "PC-98xx Series"
msgstr "Sê ri PC-98xx"
-#: ../rules/base.xml.in.h:472 ../rules/evdev.xml.in.h:472
+#: ../rules/base.xml.in.h:510
msgid "Pak"
msgstr "Pak"
-#: ../rules/base.xml.in.h:473 ../rules/evdev.xml.in.h:473
+#: ../rules/base.xml.in.h:511
msgid "Pakistan"
msgstr "Pa-khi-x-tanh"
-#: ../rules/base.xml.in.h:474 ../rules/evdev.xml.in.h:474
+#: ../rules/base.xml.in.h:512
msgid "Pashto"
msgstr "Pas-tô"
-#: ../rules/base.xml.in.h:475 ../rules/evdev.xml.in.h:475
+#: ../rules/base.xml.in.h:513
msgid "Pattachote"
msgstr "Pa-ta-chô-te"
-#: ../rules/base.xml.in.h:476 ../rules/evdev.xml.in.h:476
+#: ../rules/base.xml.in.h:514
msgid "Phonetic"
msgstr "Ngữ âm"
-#: ../rules/base.xml.in.h:477 ../rules/evdev.xml.in.h:477
+#: ../rules/base.xml.in.h:515
+msgid "Phonetic Winkeys"
+msgstr "Winkeys ngữ âm"
+
+#: ../rules/base.xml.in.h:516
msgid "Pol"
msgstr "Pol"
-#: ../rules/base.xml.in.h:478 ../rules/evdev.xml.in.h:478
+#: ../rules/base.xml.in.h:517
msgid "Poland"
msgstr "Phần Lan"
-#: ../rules/base.xml.in.h:479 ../rules/evdev.xml.in.h:479
+#: ../rules/base.xml.in.h:518
msgid "Polytonic"
msgstr "Nhiều âm"
-#: ../rules/base.xml.in.h:480 ../rules/evdev.xml.in.h:480
+#: ../rules/base.xml.in.h:519
msgid "Portugal"
msgstr "Bồ Đào Nha"
-#: ../rules/base.xml.in.h:481 ../rules/evdev.xml.in.h:481
-msgid "Press Left Alt key to choose 3rd level."
-msgstr "Nhấn phím Alt bên trái để chọn ngôn ngữ thứ 3."
-
-#: ../rules/base.xml.in.h:482 ../rules/evdev.xml.in.h:482
-msgid "Press Left Win-key to choose 3rd level."
-msgstr "Nhấn phím Win bên trái để chọn ngôn ngữ thứ 3."
-
-#: ../rules/base.xml.in.h:483 ../rules/evdev.xml.in.h:483
-msgid "Press Menu key to choose 3rd level."
-msgstr "Nhấn phím Menu để chọn ngôn ngữ thứ 3."
-
-#: ../rules/base.xml.in.h:484 ../rules/evdev.xml.in.h:484
-msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
-msgstr "Nhấn phím Alt bên phải để chọn ngôn ngữ thứ 3, phím Shift+Right Alt là Multi_Key."
-
-#: ../rules/base.xml.in.h:485 ../rules/evdev.xml.in.h:485
-msgid "Press Right Alt key to choose 3rd level."
-msgstr "Nhấn phím Alt bên phải để chọn ngôn ngữ thứ 3."
-
-#: ../rules/base.xml.in.h:486 ../rules/evdev.xml.in.h:486
-msgid "Press Right Ctrl to choose 3rd level."
-msgstr "Nhấn phím Control bên phải để chọn ngôn ngữ thứ 3."
-
-#: ../rules/base.xml.in.h:487 ../rules/evdev.xml.in.h:487
-msgid "Press Right Win-key to choose 3rd level."
-msgstr "Nhấn phím Win bên phải để chọn ngôn ngữ thứ 3."
-
-#: ../rules/base.xml.in.h:488 ../rules/evdev.xml.in.h:488
-msgid "Press any of Alt keys to choose 3rd level."
-msgstr "Nhấn phím Alt bất kỳ để chọn ngôn ngữ thứ 3."
-
-#: ../rules/base.xml.in.h:489 ../rules/evdev.xml.in.h:489
-msgid "Press any of Win-keys to choose 3rd level."
-msgstr "Nhấn phím Win bất kỳ để chọn ngôn ngữ thứ 3."
-
-#: ../rules/base.xml.in.h:490 ../rules/evdev.xml.in.h:490
+#: ../rules/base.xml.in.h:520
msgid "Pro"
msgstr "Pro"
-#: ../rules/base.xml.in.h:491 ../rules/evdev.xml.in.h:491
+#: ../rules/base.xml.in.h:521
msgid "Pro Keypad"
msgstr "Vùng phím Pro"
-#: ../rules/base.xml.in.h:492 ../rules/evdev.xml.in.h:492
+#: ../rules/base.xml.in.h:522
msgid "Probhat"
msgstr "Probhat"
-#: ../rules/base.xml.in.h:493 ../rules/evdev.xml.in.h:493
+#: ../rules/base.xml.in.h:523
msgid "Programmer Dvorak"
msgstr "Programmer Dvorak"
-#: ../rules/base.xml.in.h:494 ../rules/evdev.xml.in.h:494
+#: ../rules/base.xml.in.h:524
msgid "Propeller Voyager (KTEZ-1000)"
msgstr "Propeller Voyager (KTEZ-1000)"
-#: ../rules/base.xml.in.h:495 ../rules/evdev.xml.in.h:495
+#: ../rules/base.xml.in.h:525
msgid "Prt"
msgstr "Prt"
-#: ../rules/base.xml.in.h:496 ../rules/evdev.xml.in.h:496
+#: ../rules/base.xml.in.h:526
msgid "QTronix Scorpius 98N+"
msgstr "QTronix Scorpius 98N+"
-#: ../rules/base.xml.in.h:497 ../rules/evdev.xml.in.h:497
-msgid "R-Alt switches layout while pressed."
-msgstr "Phím Alt bên phải chuyển đổi ngôn ngữ nhập vào khi được nhấn."
-
-#: ../rules/base.xml.in.h:498 ../rules/evdev.xml.in.h:498
-msgid "Right Alt is Compose."
-msgstr "Alt bên phải là Soạn thảo."
-
-#: ../rules/base.xml.in.h:499 ../rules/evdev.xml.in.h:499
-msgid "Right Alt key changes layout."
-msgstr "Phím Alt bên phải thay đổi ngôn ngữ nhập."
+#: ../rules/base.xml.in.h:527
+msgid "Right Alt"
+msgstr "Alt phải"
-#: ../rules/base.xml.in.h:500 ../rules/evdev.xml.in.h:500
-msgid "Right Alt key never chooses 3rd level."
-msgstr "Phím Alt bên phải không bao giờ chọn ngôn ngữ thứ 3."
+#: ../rules/base.xml.in.h:528
+msgid "Right Alt (while pressed)"
+msgstr "Alt phải (trong khi bấm)"
-#: ../rules/base.xml.in.h:501 ../rules/evdev.xml.in.h:501
-msgid "Right Ctrl is Compose."
-msgstr "Ctrl bên phải là Soạn thảo."
+#: ../rules/base.xml.in.h:529
+msgid "Right Alt key never chooses 3rd level"
+msgstr "Phím Alt bên phải không bao giờ chọn bậc thứ 3"
-#: ../rules/base.xml.in.h:502 ../rules/evdev.xml.in.h:502
-msgid "Right Ctrl key changes layout."
-msgstr "Phím Ctrl bên phải thay đổi ngôn ngữ nhập."
+#: ../rules/base.xml.in.h:530
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr "Alt phải, phím Shift+Right Alt là Multi_Key"
-#: ../rules/base.xml.in.h:503 ../rules/evdev.xml.in.h:503
-msgid "Right Ctrl key switches layout while pressed."
-msgstr "Phím Ctrl bên phải chuyển đổi ngôn ngữ nhập vào khi được nhấn."
+#: ../rules/base.xml.in.h:531
+msgid "Right Ctrl"
+msgstr "Ctrl phải"
-#: ../rules/base.xml.in.h:504 ../rules/evdev.xml.in.h:504
-msgid "Right Ctrl key works as Right Alt."
-msgstr "Phím Ctrl bên phải làm việc như Alt bên phải."
+#: ../rules/base.xml.in.h:532
+msgid "Right Ctrl (while pressed)"
+msgstr "Ctrl phải (trong khi bấm)"
-#: ../rules/base.xml.in.h:505 ../rules/evdev.xml.in.h:505
-msgid "Right Shift key changes layout."
-msgstr "Phím Shift bên phải thay đổi ngôn ngữ nhập."
+#: ../rules/base.xml.in.h:533
+msgid "Right Ctrl as Right Alt"
+msgstr "Ctrl phải làm Alt phải"
-#: ../rules/base.xml.in.h:506 ../rules/evdev.xml.in.h:506
-msgid "Right Win-key changes layout."
-msgstr "Phím Win bên phải thay đổi ngôn ngữ nhập."
+#: ../rules/base.xml.in.h:534
+msgid "Right Shift"
+msgstr "Shift phải"
-#: ../rules/base.xml.in.h:507 ../rules/evdev.xml.in.h:507
-msgid "Right Win-key is Compose."
-msgstr "Phím Win bên phải là Soạn thảo."
+#: ../rules/base.xml.in.h:535
+msgid "Right Win"
+msgstr "Win phải"
-#: ../rules/base.xml.in.h:508 ../rules/evdev.xml.in.h:508
-msgid "Right Win-key switches layout while pressed."
-msgstr "Phím Win bên phải chuyển đổi ngôn ngữ nhập vào khi được nhấn."
+#: ../rules/base.xml.in.h:536
+msgid "Right Win (while pressed)"
+msgstr "Win phải (trong khi bấm)"
-#: ../rules/base.xml.in.h:509 ../rules/evdev.xml.in.h:509
+#: ../rules/base.xml.in.h:537
msgid "Right hand"
msgstr "Thuận tay phải"
-#: ../rules/base.xml.in.h:510 ../rules/evdev.xml.in.h:510
+#: ../rules/base.xml.in.h:538
msgid "Right handed Dvorak"
msgstr "Dvorak thuận tay phải"
-#: ../rules/base.xml.in.h:511 ../rules/evdev.xml.in.h:511
+#: ../rules/base.xml.in.h:539
msgid "Romania"
msgstr "Rô-ma-ni"
-#: ../rules/base.xml.in.h:512 ../rules/evdev.xml.in.h:512
+#: ../rules/base.xml.in.h:540
msgid "Romanian keyboard with German letters"
msgstr "Bàn phím Rô-ma-ni với các chữ cái Đức"
-#: ../rules/base.xml.in.h:513 ../rules/evdev.xml.in.h:513
+#: ../rules/base.xml.in.h:541
msgid "Romanian keyboard with German letters, eliminate dead keys"
msgstr "Bàn phím Rô-ma-ni với các chữ cái Đức, các phím chết loại trừ"
-#: ../rules/base.xml.in.h:514 ../rules/evdev.xml.in.h:514
+#: ../rules/base.xml.in.h:542
msgid "Rou"
msgstr "Rou"
-#: ../rules/base.xml.in.h:515 ../rules/evdev.xml.in.h:515
+#: ../rules/base.xml.in.h:543
msgid "Rus"
msgstr "Nga"
-#: ../rules/base.xml.in.h:516 ../rules/evdev.xml.in.h:516
+#: ../rules/base.xml.in.h:544
msgid "Russia"
msgstr "Nga"
-#: ../rules/base.xml.in.h:517 ../rules/evdev.xml.in.h:517
+#: ../rules/base.xml.in.h:545
msgid "Russian"
msgstr "Nga"
-#: ../rules/base.xml.in.h:518 ../rules/evdev.xml.in.h:518
+#: ../rules/base.xml.in.h:546
msgid "Russian phonetic"
msgstr "Nga ngữ âm"
-#: ../rules/base.xml.in.h:519 ../rules/evdev.xml.in.h:519
+#: ../rules/base.xml.in.h:547
msgid "Russian phonetic Dvorak"
msgstr "Nga ngữ âm Dvorak"
-#: ../rules/base.xml.in.h:520 ../rules/evdev.xml.in.h:520
+#: ../rules/base.xml.in.h:548
msgid "Russian phonetic, eliminate dead keys"
msgstr "Nga ngữ âm, phím chết loại trừ"
-#: ../rules/base.xml.in.h:521 ../rules/evdev.xml.in.h:521
+#: ../rules/base.xml.in.h:549
msgid "Russian with Kazakh"
msgstr "Nga có Kha-xắc"
-#: ../rules/base.xml.in.h:522 ../rules/evdev.xml.in.h:522
+#: ../rules/base.xml.in.h:550
msgid "SILVERCREST Multimedia Wireless Keyboard"
msgstr "Bàn phím Không dây Đa phương tiện SILVERCREST"
-#: ../rules/base.xml.in.h:523 ../rules/evdev.xml.in.h:523
+#: ../rules/base.xml.in.h:551
msgid "SK-1300"
msgstr "SK-1300"
-#: ../rules/base.xml.in.h:524 ../rules/evdev.xml.in.h:524
+#: ../rules/base.xml.in.h:552
msgid "SK-2500"
msgstr "SK-2500"
-#: ../rules/base.xml.in.h:525 ../rules/evdev.xml.in.h:525
+#: ../rules/base.xml.in.h:553
msgid "SK-6200"
msgstr "SK-6200"
-#: ../rules/base.xml.in.h:526 ../rules/evdev.xml.in.h:526
+#: ../rules/base.xml.in.h:554
msgid "SK-7100"
msgstr "SK-7100"
-#: ../rules/base.xml.in.h:527 ../rules/evdev.xml.in.h:527
+#: ../rules/base.xml.in.h:555
msgid "SRB"
msgstr "SRB"
-#: ../rules/base.xml.in.h:528 ../rules/evdev.xml.in.h:528
+#: ../rules/base.xml.in.h:556
msgid "SVEN Ergonomic 2500"
msgstr "SVEN Ergonomic 2500"
-#: ../rules/base.xml.in.h:529 ../rules/evdev.xml.in.h:529
+#: ../rules/base.xml.in.h:557
msgid "SVEN Slim 303"
msgstr "SVEN Slim 303"
-#: ../rules/base.xml.in.h:530 ../rules/evdev.xml.in.h:530
+#: ../rules/base.xml.in.h:558
msgid "Samsung SDM 4500P"
msgstr "Samsung SDM 4500P"
-#: ../rules/base.xml.in.h:531 ../rules/evdev.xml.in.h:531
+#: ../rules/base.xml.in.h:559
msgid "Samsung SDM 4510P"
msgstr "Samsung SDM 4510P"
-#: ../rules/base.xml.in.h:532 ../rules/evdev.xml.in.h:532
-msgid "ScrollLock LED shows alternative layout."
-msgstr "Đèn ScrollLock cho biết ngôn ngữ tương đương."
+#: ../rules/base.xml.in.h:560
+msgid "Scroll Lock"
+msgstr "Scroll Lock"
-#: ../rules/base.xml.in.h:533 ../rules/evdev.xml.in.h:533
+#: ../rules/base.xml.in.h:561
+msgid "ScrollLock"
+msgstr "ScrollLock"
+
+#: ../rules/base.xml.in.h:562
msgid "Secwepemctsin"
msgstr "Secwepemctsin"
-#: ../rules/base.xml.in.h:534 ../rules/evdev.xml.in.h:534
+#: ../rules/base.xml.in.h:563
+msgid "Semi-colon on third level"
+msgstr "Dấu chấm phẩy ở cấp ba"
+
+#: ../rules/base.xml.in.h:564
msgid "Serbia"
msgstr "Xéc-bi"
-#: ../rules/base.xml.in.h:535 ../rules/evdev.xml.in.h:535
-msgid "Shift cancels CapsLock."
-msgstr "Shift thôi CapsLock."
+#: ../rules/base.xml.in.h:565
+msgid "Shift cancels CapsLock"
+msgstr "Shift thôi CapsLock"
-#: ../rules/base.xml.in.h:536 ../rules/evdev.xml.in.h:536
-msgid "Shift with numeric keypad keys works as in MS Windows."
-msgstr "Shift với các phím vùng số làm việc như trong MS Windows."
+#: ../rules/base.xml.in.h:566
+msgid "Shift does not cancel NumLock, chooses 3d level instead"
+msgstr "Shift không thôi Numlock, chọn cấp ba để thay thế"
-#: ../rules/base.xml.in.h:537 ../rules/evdev.xml.in.h:537
-msgid "Shift+CapsLock changes layout."
-msgstr "Shift+CapsLock thay đổi ngôn ngữ nhập."
+#: ../rules/base.xml.in.h:567
+msgid "Shift with numeric keypad keys works as in MS Windows"
+msgstr "Shift với các phím vùng số làm việc như trong MS Windows"
-#: ../rules/base.xml.in.h:538 ../rules/evdev.xml.in.h:538
+#: ../rules/base.xml.in.h:568
+msgid "Shift+CapsLock"
+msgstr "Shift+CapsLock"
+
+#: ../rules/base.xml.in.h:569
msgid "Simple"
msgstr "Đơn giản"
-#: ../rules/base.xml.in.h:539 ../rules/evdev.xml.in.h:539
+#: ../rules/base.xml.in.h:570
msgid "Slovakia"
msgstr "Xlô-vác"
-#: ../rules/base.xml.in.h:540 ../rules/evdev.xml.in.h:540
+#: ../rules/base.xml.in.h:571
msgid "Slovenia"
msgstr "Xlô-ven"
-#: ../rules/base.xml.in.h:541 ../rules/evdev.xml.in.h:541
+#: ../rules/base.xml.in.h:572
msgid "South Africa"
msgstr "Nam Phi"
-#: ../rules/base.xml.in.h:542 ../rules/evdev.xml.in.h:542
+#: ../rules/base.xml.in.h:573
msgid "Southern Uzbek"
msgstr "Nam Ux-béc"
-#: ../rules/base.xml.in.h:543 ../rules/evdev.xml.in.h:543
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr "Phím dài nhập ký tự dấu cách không thể ngắt ở bậc thứ tư, ký tự dấu cách không thể ngắt mảnh ở bậc thứ sáu."
-
-#: ../rules/base.xml.in.h:544 ../rules/evdev.xml.in.h:544
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift"
-msgstr "Phím dài nhập ký tự dấu cách không thể ngắt ở bậc thứ tư, ký tự dấu cách không thể ngắt mảnh ở bậc thứ sáu (dùng Ctrl+Shift)."
-
-#: ../rules/base.xml.in.h:545 ../rules/evdev.xml.in.h:545
-msgid "Space key outputs non-breakable space character at fourth level."
-msgstr "Phím dài nhập ký tự dấu cách không thể ngắt ở bậc thứ tư."
-
-#: ../rules/base.xml.in.h:546 ../rules/evdev.xml.in.h:546
-msgid "Space key outputs non-breakable space character at second level."
-msgstr "Phím dài nhập ký tự dấu cách không thể ngắt ở bậc thứ hai."
-
-#: ../rules/base.xml.in.h:547 ../rules/evdev.xml.in.h:547
-msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
-msgstr "Phím dài nhập ký tự dấu cách không thể ngắt ở bậc thứ ba, không nhập gì ở bậc thứ tư."
-
-#: ../rules/base.xml.in.h:548 ../rules/evdev.xml.in.h:548
-msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr "Phím dài nhập ký tự dấu cách không thể ngắt ở bậc thứ ba, ký tự dấu cách không thể ngắt mảnh ở bậc thứ tư."
-
-#: ../rules/base.xml.in.h:549 ../rules/evdev.xml.in.h:549
-msgid "Space key outputs non-breakable space character at third level."
-msgstr "Phím dài nhập ký tự dấu cách không thể ngắt ở bậc thứ ba."
-
-#: ../rules/base.xml.in.h:550 ../rules/evdev.xml.in.h:550
-msgid "Space key outputs usual space at any level."
-msgstr "Phím dài nhập ký tự dấu cách bình thường ở mọi bậc."
-
-#: ../rules/base.xml.in.h:551 ../rules/evdev.xml.in.h:551
+#: ../rules/base.xml.in.h:574
msgid "Spain"
msgstr "Tây Ban Nha"
-#: ../rules/base.xml.in.h:552 ../rules/evdev.xml.in.h:552
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
-msgstr "Điều khiển các phím đặt biệt (Ctrl+Alt+&lt;key&gt;) trên một máy chủ."
+#: ../rules/base.xml.in.h:575
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
+msgstr "Các ký tự đặc biệt (Ctrl+Alt+&lt;key&gt;) được xử lý bằng một trình phục vụ"
-#: ../rules/base.xml.in.h:553 ../rules/evdev.xml.in.h:553
+#: ../rules/base.xml.in.h:576
msgid "SrL"
msgstr "SrL"
-#: ../rules/base.xml.in.h:554 ../rules/evdev.xml.in.h:554
+#: ../rules/base.xml.in.h:577
msgid "Sri Lanka"
msgstr "Tích-lan"
-#: ../rules/base.xml.in.h:555 ../rules/evdev.xml.in.h:555
+#: ../rules/base.xml.in.h:578
msgid "Standard"
msgstr "Tiêu chuẩn"
-#: ../rules/base.xml.in.h:556 ../rules/evdev.xml.in.h:556
+#: ../rules/base.xml.in.h:579
msgid "Standard (Cedilla)"
msgstr "Chuẩn (dấu móc dưới)"
+#: ../rules/base.xml.in.h:580
+msgid "Standard Phonetic"
+msgstr "Ngữ âm tiêu chuẩn"
+
#. RSTU 2019-91
-#: ../rules/base.xml.in.h:558 ../rules/evdev.xml.in.h:558
+#: ../rules/base.xml.in.h:582
msgid "Standard RSTU"
msgstr "RSTU chuẩn"
#. RSTU 2019-91
-#: ../rules/base.xml.in.h:560 ../rules/evdev.xml.in.h:560
+#: ../rules/base.xml.in.h:584
msgid "Standard RSTU on Russian layout"
msgstr "RSTU chuẩn trên bố trí tiếng Nga"
-#: ../rules/base.xml.in.h:561 ../rules/evdev.xml.in.h:561
+#: ../rules/base.xml.in.h:585
msgid "Sun Type 5/6"
msgstr "Sun kiểu 5/6"
-#: ../rules/base.xml.in.h:562 ../rules/evdev.xml.in.h:562
+#: ../rules/base.xml.in.h:586
msgid "Sun dead keys"
msgstr "Phím chết Sun"
-#: ../rules/base.xml.in.h:563 ../rules/evdev.xml.in.h:563
+#: ../rules/base.xml.in.h:587
msgid "Super Power Multimedia Keyboard"
msgstr "Bàn phím Phim nhạc Siêu Năng Lực"
-#: ../rules/base.xml.in.h:564 ../rules/evdev.xml.in.h:564
-msgid "Super is mapped to the Win-keys."
-msgstr "Super được ánh xạ tới các phím Win."
-
-#: ../rules/base.xml.in.h:565 ../rules/evdev.xml.in.h:565
+#: ../rules/base.xml.in.h:588
msgid "Svdvorak"
msgstr "Svdvorak"
-#: ../rules/base.xml.in.h:566 ../rules/evdev.xml.in.h:566
+#: ../rules/base.xml.in.h:589
msgid "Svk"
msgstr "Svk"
-#: ../rules/base.xml.in.h:567 ../rules/evdev.xml.in.h:567
+#: ../rules/base.xml.in.h:590
msgid "Svn"
msgstr "Svn"
-#: ../rules/base.xml.in.h:568 ../rules/evdev.xml.in.h:568
-msgid "Swap Ctrl and CapsLock."
-msgstr "Trao đổi Ctrl và CapsLock."
+#: ../rules/base.xml.in.h:591
+msgid "Swap Ctrl and CapsLock"
+msgstr "Trao đổi Ctrl và CapsLock"
-#: ../rules/base.xml.in.h:569 ../rules/evdev.xml.in.h:569
-msgid "Swap ESC and CapsLock."
+#: ../rules/base.xml.in.h:592
+msgid "Swap ESC and CapsLock"
msgstr "Trao đổi ESC và CapsLock"
-#: ../rules/base.xml.in.h:570 ../rules/evdev.xml.in.h:570
-msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-msgstr "Trao đổi mã phím của hai phím khi bàn phím Mac bị hạt nhân phát hiện sai."
-
-#: ../rules/base.xml.in.h:571 ../rules/evdev.xml.in.h:571
+#: ../rules/base.xml.in.h:593
msgid "Swe"
msgstr "Swe"
-#: ../rules/base.xml.in.h:572 ../rules/evdev.xml.in.h:572
+#: ../rules/base.xml.in.h:594
msgid "Sweden"
msgstr "Thuỵ Điển"
-#: ../rules/base.xml.in.h:573 ../rules/evdev.xml.in.h:573
+#: ../rules/base.xml.in.h:595
msgid "Switzerland"
msgstr "Thuỵ Sĩ"
-#: ../rules/base.xml.in.h:574 ../rules/evdev.xml.in.h:574
+#: ../rules/base.xml.in.h:596
msgid "Symplon PaceBook (tablet PC)"
msgstr "Symplon PaceBook (tablet PC)"
-#: ../rules/base.xml.in.h:575 ../rules/evdev.xml.in.h:575
+#: ../rules/base.xml.in.h:597
msgid "Syr"
msgstr "Syr"
-#: ../rules/base.xml.in.h:576 ../rules/evdev.xml.in.h:576
+#: ../rules/base.xml.in.h:598
msgid "Syria"
msgstr "Xy-ri"
-#: ../rules/base.xml.in.h:577 ../rules/evdev.xml.in.h:577
+#: ../rules/base.xml.in.h:599
msgid "Syriac"
msgstr "Xi-ri"
-#: ../rules/base.xml.in.h:578 ../rules/evdev.xml.in.h:578
+#: ../rules/base.xml.in.h:600
msgid "Syriac phonetic"
msgstr "Xy-ri ngữ âm"
-#: ../rules/base.xml.in.h:579 ../rules/evdev.xml.in.h:579
+#: ../rules/base.xml.in.h:601
msgid "TIS-820.2538"
msgstr "TIS-820.2538"
-#: ../rules/base.xml.in.h:580 ../rules/evdev.xml.in.h:580
+#: ../rules/base.xml.in.h:602
msgid "Tajikistan"
msgstr "Ta-gikh-x-tanh"
-#: ../rules/base.xml.in.h:581 ../rules/evdev.xml.in.h:581
+#: ../rules/base.xml.in.h:603
msgid "Tamil"
msgstr "Ta-min"
-#: ../rules/base.xml.in.h:582 ../rules/evdev.xml.in.h:582
+#: ../rules/base.xml.in.h:604
msgid "Tamil TAB Typewriter"
msgstr "Ta-min TAB máy chữ"
-#: ../rules/base.xml.in.h:583 ../rules/evdev.xml.in.h:583
+#: ../rules/base.xml.in.h:605
msgid "Tamil TSCII Typewriter"
msgstr "Ta-min TSCII máy chữ"
-#: ../rules/base.xml.in.h:584 ../rules/evdev.xml.in.h:584
+#: ../rules/base.xml.in.h:606
msgid "Tamil Unicode"
msgstr "Ta-min Unicode"
-#: ../rules/base.xml.in.h:585 ../rules/evdev.xml.in.h:585
+#: ../rules/base.xml.in.h:607
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
+
+#: ../rules/base.xml.in.h:608
msgid "Tatar"
msgstr "Ta-tă"
-#: ../rules/base.xml.in.h:586 ../rules/evdev.xml.in.h:586
+#: ../rules/base.xml.in.h:609
msgid "Telugu"
msgstr "Te-lu-gu"
-#: ../rules/base.xml.in.h:587 ../rules/evdev.xml.in.h:587
+#: ../rules/base.xml.in.h:610
msgid "Tha"
msgstr "Tha"
-#: ../rules/base.xml.in.h:588 ../rules/evdev.xml.in.h:588
+#: ../rules/base.xml.in.h:611
msgid "Thailand"
msgstr "Thái Lan"
-#: ../rules/base.xml.in.h:589 ../rules/evdev.xml.in.h:589
-msgid "Third level choosers"
-msgstr "Trình chọn ngôn ngữ thứ ba"
-
-#: ../rules/base.xml.in.h:590 ../rules/evdev.xml.in.h:590
+#: ../rules/base.xml.in.h:612
msgid "Tibetan"
msgstr "Tây Tạng"
-#: ../rules/base.xml.in.h:591 ../rules/evdev.xml.in.h:591
+#: ../rules/base.xml.in.h:613
msgid "Tibetan (with ASCII numerals)"
msgstr "Tây Tạng (có chữ số ASCII)"
-#: ../rules/base.xml.in.h:592 ../rules/evdev.xml.in.h:592
+#: ../rules/base.xml.in.h:614
msgid "Tifinagh"
msgstr "Ti-phi-nac"
-#: ../rules/base.xml.in.h:593 ../rules/evdev.xml.in.h:593
+#: ../rules/base.xml.in.h:615
msgid "Tifinagh Alternative"
msgstr "Ti-phi-nac tương đương"
-#: ../rules/base.xml.in.h:594 ../rules/evdev.xml.in.h:594
+#: ../rules/base.xml.in.h:616
msgid "Tifinagh Alternative Phonetic"
msgstr "Ti-phi-nac ngữ âm tương đương"
-#: ../rules/base.xml.in.h:595 ../rules/evdev.xml.in.h:595
+#: ../rules/base.xml.in.h:617
msgid "Tifinagh Extended"
msgstr "Ti-phi-nac mở rộng"
-#: ../rules/base.xml.in.h:596 ../rules/evdev.xml.in.h:596
+#: ../rules/base.xml.in.h:618
msgid "Tifinagh Extended Phonetic"
msgstr "Ti-phi-nac mở rộng ngữ âm"
-#: ../rules/base.xml.in.h:597 ../rules/evdev.xml.in.h:597
+#: ../rules/base.xml.in.h:619
msgid "Tifinagh Phonetic"
msgstr "Ti-phi-nac ngữ âm"
-#: ../rules/base.xml.in.h:598 ../rules/evdev.xml.in.h:598
+#: ../rules/base.xml.in.h:620
msgid "Tilde (~) variant"
msgstr "Phương án dấu sóng (~)"
-#: ../rules/base.xml.in.h:599 ../rules/evdev.xml.in.h:599
+#: ../rules/base.xml.in.h:621
msgid "Tjk"
msgstr "Tjk"
-#: ../rules/base.xml.in.h:600 ../rules/evdev.xml.in.h:600
+#: ../rules/base.xml.in.h:622
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr "Tới phím tương ứng trên một bàn phím Dvorak."
+
+#: ../rules/base.xml.in.h:623
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr "Tới phím tương ứng trên một bàn phím Qwerty."
+
+#: ../rules/base.xml.in.h:624
msgid "Toshiba Satellite S3000"
msgstr "Toshiba Satellite S3000"
-#: ../rules/base.xml.in.h:601 ../rules/evdev.xml.in.h:601
+#: ../rules/base.xml.in.h:625
+msgid "Traditional Phonetic"
+msgstr "Ngữ âm truyền thống"
+
+#: ../rules/base.xml.in.h:626
msgid "Trust Direct Access Keyboard"
msgstr "Bàn phím Truy cập Thẳng Tin tưởng"
-#: ../rules/base.xml.in.h:602 ../rules/evdev.xml.in.h:602
+#: ../rules/base.xml.in.h:627
+msgid "Trust Slimline"
+msgstr "Trust Slimline"
+
+#: ../rules/base.xml.in.h:628
msgid "Trust Wireless Keyboard Classic"
msgstr "Bàn Phím Cổ điển Không dây Tin tưởng"
-#: ../rules/base.xml.in.h:603 ../rules/evdev.xml.in.h:603
+#: ../rules/base.xml.in.h:629
msgid "Tur"
msgstr "Tur"
-#: ../rules/base.xml.in.h:604 ../rules/evdev.xml.in.h:604
+#: ../rules/base.xml.in.h:630
msgid "Turkey"
msgstr "Thổ Nhĩ Kỳ"
-#: ../rules/base.xml.in.h:605 ../rules/evdev.xml.in.h:605
+#: ../rules/base.xml.in.h:631
+msgid "Turkmenistan"
+msgstr "Thổ-kh-me-ni-x-tanh"
+
+#: ../rules/base.xml.in.h:632
msgid "Typewriter"
msgstr "Máy chữ"
-#: ../rules/base.xml.in.h:606 ../rules/evdev.xml.in.h:606
+#: ../rules/base.xml.in.h:633
msgid "UCW layout (accented letters only)"
msgstr "Bố trí UCW (chỉ chữ có dấu)"
-#: ../rules/base.xml.in.h:607 ../rules/evdev.xml.in.h:607
+#: ../rules/base.xml.in.h:634
msgid "US keyboard with Bosnian digraphs"
msgstr "Bàn phím Mỹ với các chữ ghép Bo-x-ni-a"
-#: ../rules/base.xml.in.h:608 ../rules/evdev.xml.in.h:608
+#: ../rules/base.xml.in.h:635
msgid "US keyboard with Bosnian letters"
msgstr "Bàn phím Mỹ với các chữ cái Bo-x-ni-a"
-#: ../rules/base.xml.in.h:609 ../rules/evdev.xml.in.h:609
+#: ../rules/base.xml.in.h:636
msgid "US keyboard with Croatian digraphs"
msgstr "Bàn phím Mỹ với các chữ ghép Cợ-rô-a-ti-a"
-#: ../rules/base.xml.in.h:610 ../rules/evdev.xml.in.h:610
+#: ../rules/base.xml.in.h:637
msgid "US keyboard with Croatian letters"
msgstr "Bàn phím Mỹ với các chữ cái Croát-chi-a"
-#: ../rules/base.xml.in.h:611 ../rules/evdev.xml.in.h:611
+#: ../rules/base.xml.in.h:638
msgid "US keyboard with Estonian letters"
msgstr "Bàn phím Mỹ với các chữ cái E-x-tô-ni-a"
-#: ../rules/base.xml.in.h:612 ../rules/evdev.xml.in.h:612
+#: ../rules/base.xml.in.h:639
msgid "US keyboard with Lithuanian letters"
msgstr "Bàn phím Mỹ với các chữ cái Li-tu-a-nia"
-#: ../rules/base.xml.in.h:613 ../rules/evdev.xml.in.h:613
-msgid "US keyboard with Slovenian digraphs"
-msgstr "Bàn phím Mỹ với các chữ ghép Xlô-ven"
-
-#: ../rules/base.xml.in.h:614 ../rules/evdev.xml.in.h:614
+#: ../rules/base.xml.in.h:640
msgid "US keyboard with Slovenian letters"
msgstr "Bàn phím Mỹ với các chữ cái Xlô-ven"
-#: ../rules/base.xml.in.h:615 ../rules/evdev.xml.in.h:615
+#: ../rules/base.xml.in.h:641
msgid "USA"
msgstr "Mỹ"
-#: ../rules/base.xml.in.h:616 ../rules/evdev.xml.in.h:616
+#: ../rules/base.xml.in.h:642
msgid "Udmurt"
msgstr "U-đ-muổt"
-#: ../rules/base.xml.in.h:617 ../rules/evdev.xml.in.h:617
+#: ../rules/base.xml.in.h:643
msgid "Ukr"
msgstr "Ukr"
-#: ../rules/base.xml.in.h:618 ../rules/evdev.xml.in.h:618
+#: ../rules/base.xml.in.h:644
msgid "Ukraine"
msgstr "U-cợ-rainh"
-#: ../rules/base.xml.in.h:619 ../rules/evdev.xml.in.h:619
+#: ../rules/base.xml.in.h:645
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Phần thêm Unicode (các mũi tên và toán tử toán học)"
+
+#: ../rules/base.xml.in.h:646
+msgid "Unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Phần thêm Unicode (các mũi tên và toán tử toán học). Bậc mặc định thì nhập các toán tử toán học."
+
+#: ../rules/base.xml.in.h:647
msgid "UnicodeExpert"
msgstr "Unicode Chuyên môn"
-#: ../rules/base.xml.in.h:620 ../rules/evdev.xml.in.h:620
+#: ../rules/base.xml.in.h:648
msgid "United Kingdom"
msgstr "Vương Quốc Anh"
-#: ../rules/base.xml.in.h:621 ../rules/evdev.xml.in.h:621
-msgid "Urdu"
-msgstr "Ua-đu"
+#: ../rules/base.xml.in.h:649
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
+
+#: ../rules/base.xml.in.h:650
+msgid "Urdu, Alternative phonetic"
+msgstr "Urdu, Ngữ âm xen kẽ"
+
+#: ../rules/base.xml.in.h:651
+msgid "Urdu, Phonetic"
+msgstr "Urdu, Ngữ âm"
-#: ../rules/base.xml.in.h:622 ../rules/evdev.xml.in.h:622
+#: ../rules/base.xml.in.h:652
+msgid "Urdu, Winkeys"
+msgstr "Urdu, Phím Win"
+
+#: ../rules/base.xml.in.h:653
msgid "Use Bosnian digraphs"
msgstr "Dùng chữ ghép Bo-x-ni-a"
-#: ../rules/base.xml.in.h:623 ../rules/evdev.xml.in.h:623
+#: ../rules/base.xml.in.h:654
msgid "Use Croatian digraphs"
msgstr "Dùng chữ ghép Cợ-rô-a-ti-a"
-#: ../rules/base.xml.in.h:624 ../rules/evdev.xml.in.h:624
-msgid "Use Slovenian digraphs"
-msgstr "Dùng chữ ghép Xlô-ven"
-
-#: ../rules/base.xml.in.h:625 ../rules/evdev.xml.in.h:625
+#: ../rules/base.xml.in.h:655
msgid "Use guillemets for quotes"
msgstr "Dùng « chim uria » làm dấu trích dẫn"
-#: ../rules/base.xml.in.h:626 ../rules/evdev.xml.in.h:626
-msgid "Use keyboard LED to show alternative layout."
-msgstr "Sử dụng đèn bàn phím để chỉ ra ngôn ngữ tương đương."
+#: ../rules/base.xml.in.h:656
+msgid "Use keyboard LED to show alternative layout"
+msgstr "Sử dụng đèn bàn phím để chỉ ra bố trí xen kẽ"
-#: ../rules/base.xml.in.h:627 ../rules/evdev.xml.in.h:627
+#: ../rules/base.xml.in.h:657
msgid "Using space key to input non-breakable space character"
msgstr "Dùng phím dài để nhập ký tự dấu cách không thể ngắt"
-#: ../rules/base.xml.in.h:628 ../rules/evdev.xml.in.h:628
+#: ../rules/base.xml.in.h:658
+msgid "Usual space at any level"
+msgstr "Dấu cách bình thường ở mọi bậc"
+
+#: ../rules/base.xml.in.h:659
msgid "Uzb"
msgstr "Uzb"
-#: ../rules/base.xml.in.h:629 ../rules/evdev.xml.in.h:629
+#: ../rules/base.xml.in.h:660
msgid "Uzbekistan"
msgstr "Uz-be-khi-xtanh"
-#: ../rules/base.xml.in.h:630 ../rules/evdev.xml.in.h:630
+#: ../rules/base.xml.in.h:661
msgid "Vietnam"
msgstr "Việt Nam"
-#: ../rules/base.xml.in.h:631 ../rules/evdev.xml.in.h:631
+#: ../rules/base.xml.in.h:662
msgid "ViewSonic KU-306 Internet Keyboard"
msgstr "Bàn phím Internet ViewSonic KU-306"
-#: ../rules/base.xml.in.h:632 ../rules/evdev.xml.in.h:632
+#: ../rules/base.xml.in.h:663
msgid "Vnm"
msgstr "Vnm"
-#: ../rules/base.xml.in.h:633 ../rules/evdev.xml.in.h:633
+#: ../rules/base.xml.in.h:664
msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
msgstr "Vùng phím Wang 724 có phần thêm Unicode (các mũi tên và toán tử toán học)"
-#: ../rules/base.xml.in.h:634 ../rules/evdev.xml.in.h:634
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
+#: ../rules/base.xml.in.h:665
+msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
msgstr "Vùng phím Wang 724 có phần thêm Unicode (các mũi tên và toán tử toán học). Mặc định thì nhập toán tử toán học."
-#: ../rules/base.xml.in.h:635 ../rules/evdev.xml.in.h:635
+#: ../rules/base.xml.in.h:666
msgid "Wang model 724 azerty"
msgstr "Wang mô hình 724 azerty"
-#: ../rules/base.xml.in.h:636 ../rules/evdev.xml.in.h:636
+#: ../rules/base.xml.in.h:667
msgid "Western"
msgstr "Phương Tây"
-#: ../rules/base.xml.in.h:637 ../rules/evdev.xml.in.h:637
+#: ../rules/base.xml.in.h:668
msgid "Winbook Model XP5"
msgstr "Winbook kiểu mẫu XP5"
-#: ../rules/base.xml.in.h:638 ../rules/evdev.xml.in.h:638
+#: ../rules/base.xml.in.h:669
msgid "Winkeys"
msgstr "Phím Win"
-#: ../rules/base.xml.in.h:639 ../rules/evdev.xml.in.h:639
+#: ../rules/base.xml.in.h:670
msgid "With &lt;\\|&gt; key"
msgstr "Với phím &lt;\\|&gt;"
-#: ../rules/base.xml.in.h:640 ../rules/evdev.xml.in.h:640
+#: ../rules/base.xml.in.h:671
msgid "With EuroSign on 5"
msgstr "Thêm ký hiệu đồng Euro vào phím 5."
-#: ../rules/base.xml.in.h:641 ../rules/evdev.xml.in.h:641
+#: ../rules/base.xml.in.h:672
msgid "With guillemets"
msgstr "Với « chim uria »"
-#: ../rules/base.xml.in.h:642 ../rules/evdev.xml.in.h:642
+#: ../rules/base.xml.in.h:673
msgid "Yahoo! Internet Keyboard"
msgstr "Bàn phím Internet Yahoo!"
-#: ../rules/base.xml.in.h:643 ../rules/evdev.xml.in.h:643
+#: ../rules/base.xml.in.h:674
msgid "Yakut"
msgstr "Ya-khú-th"
-#: ../rules/base.xml.in.h:644 ../rules/evdev.xml.in.h:644
+#: ../rules/base.xml.in.h:675
msgid "Yoruba"
msgstr "Yoa-ru-ba"
-#: ../rules/base.xml.in.h:645 ../rules/evdev.xml.in.h:645
+#: ../rules/base.xml.in.h:676
msgid "Z and ZHE swapped"
msgstr "Đổi chỗ Z và ZHE"
-#: ../rules/base.xml.in.h:646 ../rules/evdev.xml.in.h:646
+#: ../rules/base.xml.in.h:677
msgid "Zar"
msgstr "Zar"
-#: ../rules/base.xml.in.h:647 ../rules/evdev.xml.in.h:647
+#: ../rules/base.xml.in.h:678
msgid "azerty"
msgstr "azerty"
-#: ../rules/base.xml.in.h:648 ../rules/evdev.xml.in.h:648
+#: ../rules/base.xml.in.h:679
msgid "azerty/digits"
msgstr "azerty/chữ số"
-#: ../rules/base.xml.in.h:649 ../rules/evdev.xml.in.h:649
+#: ../rules/base.xml.in.h:680
msgid "digits"
msgstr "chữ số"
-#: ../rules/base.xml.in.h:650 ../rules/evdev.xml.in.h:650
+#: ../rules/base.xml.in.h:681
msgid "displaced semicolon and quote (obsolete)"
msgstr "dấu chấm phẩy và dấu trích dẫn bị dịch (quá cũ)"
-#: ../rules/base.xml.in.h:651 ../rules/evdev.xml.in.h:651
+#: ../rules/base.xml.in.h:682
msgid "lyx"
msgstr "lyx"
-#: ../rules/base.xml.in.h:652 ../rules/evdev.xml.in.h:652
+#: ../rules/base.xml.in.h:683
msgid "qwerty"
msgstr "qwerty"
-#: ../rules/base.xml.in.h:653 ../rules/evdev.xml.in.h:653
+#: ../rules/base.xml.in.h:684
msgid "qwerty, extended Backslash"
msgstr "qwerty, Gạch ngược mở rộng"
-#: ../rules/base.xml.in.h:654 ../rules/evdev.xml.in.h:654
+#: ../rules/base.xml.in.h:685
msgid "qwerty/digits"
msgstr "qwerty/chữ số"
-#: ../rules/base.xml.in.h:655 ../rules/evdev.xml.in.h:655
+#: ../rules/base.xml.in.h:686
msgid "qwertz"
msgstr "qwertz"
diff --git a/xorg-server/xkbdata.src/rules/Makefile.am b/xorg-server/xkbdata.src/rules/Makefile.am
index bdd8c70fb..5d6e8b4bf 100644
--- a/xorg-server/xkbdata.src/rules/Makefile.am
+++ b/xorg-server/xkbdata.src/rules/Makefile.am
@@ -21,32 +21,64 @@ install-data-hook:
endif
base_parts_no_compat = base.hdr.part base.lists.part \
-HDR base.m_k.part HDR base.l1_k.part HDR base.l_k.part \
+HDR base.m_k.part \
+HDR base.l1_k.part \
+HDR base.l_k.part \
HDR base.ml_g.part \
-HDR base.m_g.part HDR base.mlv_s.part HDR base.ml_s.part \
-HDR base.ml1_s.part HDR \
-HDR base.l2_s.part HDR base.l3_s.part HDR base.l4_s.part HDR HDR HDR \
-HDR base.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \
+HDR base.m_g.part \
+HDR base.mlv_s.part \
+HDR base.ml_s.part \
+HDR base.ml1_s.part \
+HDR \
+HDR base.l2_s.part \
+HDR base.l3_s.part \
+HDR base.l4_s.part \
+HDR HDR HDR \
+HDR base.m_s.part \
+HDR base.ml_c.part \
+HDR base.ml1_c.part \
HDR base.m_t.part \
-HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \
-HDR base.o_s.part HDR base.o_c.part HDR base.o_t.part
+HDR base.l1o_s.part \
+HDR base.l2o_s.part \
+HDR base.l3o_s.part \
+HDR base.l4o_s.part \
+HDR base.o_s.part \
+HDR base.o_c.part \
+HDR base.o_t.part
evdev_parts_no_compat = base.hdr.part base.lists.part \
-HDR evdev.m_k.part HDR base.l1_k.part HDR base.l_k.part \
+HDR evdev.m_k.part \
+HDR base.l1_k.part \
+HDR base.l_k.part \
HDR base.ml_g.part \
-HDR base.m_g.part HDR base.mlv_s.part HDR base.ml_s.part \
-HDR base.ml1_s.part HDR \
-HDR base.l2_s.part HDR base.l3_s.part HDR base.l4_s.part HDR HDR HDR \
-HDR evdev.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \
+HDR base.m_g.part \
+HDR base.mlv_s.part \
+HDR base.ml_s.part \
+HDR base.ml1_s.part \
+HDR \
+HDR base.l2_s.part \
+HDR base.l3_s.part \
+HDR base.l4_s.part \
+HDR HDR HDR \
+HDR evdev.m_s.part \
+HDR base.ml_c.part \
+HDR base.ml1_c.part \
HDR base.m_t.part \
-HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \
-HDR base.o_s.part HDR base.o_c.part HDR base.o_t.part
+HDR base.l1o_s.part \
+HDR base.l2o_s.part \
+HDR base.l3o_s.part \
+HDR base.l4o_s.part \
+HDR base.o_s.part \
+HDR base.o_c.part \
+HDR base.o_t.part
if USE_COMPAT_RULES
base_parts = base.hdr.part base.lists.part \
compat/base.lists.part \
-HDR base.m_k.part HDR base.l1_k.part \
-HDR base.l_k.part HDR base.o_k.part \
+HDR base.m_k.part \
+HDR base.l1_k.part \
+HDR base.l_k.part \
+HDR base.o_k.part \
HDR base.ml_g.part \
HDR base.m_g.part \
HDR compat/base.mlv_s.part base.mlv_s.part \
@@ -59,16 +91,25 @@ HDR compat/base.l4_s.part base.l4_s.part \
HDR compat/base.l2v2_s.part \
HDR compat/base.l3v3_s.part \
HDR compat/base.l4v4_s.part \
-HDR base.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \
+HDR base.m_s.part \
+HDR base.ml_c.part \
+HDR base.ml1_c.part \
HDR base.m_t.part \
-HDR base.lo_s.part HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \
+HDR base.lo_s.part \
+HDR base.l1o_s.part \
+HDR base.l2o_s.part \
+HDR base.l3o_s.part \
+HDR base.l4o_s.part \
HDR compat/base.o_s.part base.o_s.part \
-HDR base.o_c.part HDR base.o_t.part
+HDR base.o_c.part \
+HDR base.o_t.part
evdev_parts = base.hdr.part base.lists.part \
compat/base.lists.part \
-HDR evdev.m_k.part HDR base.l1_k.part \
-HDR base.l_k.part HDR base.o_k.part \
+HDR evdev.m_k.part \
+HDR base.l1_k.part \
+HDR base.l_k.part \
+HDR base.o_k.part \
HDR base.ml_g.part \
HDR base.m_g.part \
HDR compat/base.mlv_s.part base.mlv_s.part \
@@ -81,16 +122,25 @@ HDR compat/base.l4_s.part base.l4_s.part \
HDR compat/base.l2v2_s.part \
HDR compat/base.l3v3_s.part \
HDR compat/base.l4v4_s.part \
-HDR evdev.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \
+HDR evdev.m_s.part \
+HDR base.ml_c.part \
+HDR base.ml1_c.part \
HDR base.m_t.part \
-HDR base.lo_s.part HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \
+HDR base.lo_s.part \
+HDR base.l1o_s.part \
+HDR base.l2o_s.part \
+HDR base.l3o_s.part \
+HDR base.l4o_s.part \
HDR compat/base.o_s.part base.o_s.part \
-HDR base.o_c.part HDR base.o_t.part
+HDR base.o_c.part \
+HDR base.o_t.part
else
base_parts = $(base_parts_no_compat)
evdev_parts = $(base_parts_no_compat)
endif
+base_parts_compat_dist = base.o_k.part base.lo_s.part
+
rules_files = base evdev xfree98
lst_files = base.lst evdev.lst
@@ -104,33 +154,24 @@ base: $(base_parts_no_compat)
evdev: $(evdev_parts_no_compat)
HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(evdev_parts)
-all_rules_files = $(rules_files) $(lst_files) \
-xkb.dtd README \
- sgi \
- sgi.lst \
- sun \
- sun.lst \
- xfree98 \
- xfree98.lst \
- xorg \
- xorg-it.lst \
- xorg.lst \
- xorg.xml
-
-rules_DATA = $(all_rules_files)
+dist_files = xkb.dtd README
+
+rules_DATA = $(rules_files) $(lst_files) $(dist_files)
xml_in_files = base.xml.in evdev.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
-evdev.xml.in: base.xml.in
+$(srcdir)/evdev.xml.in: base.xml.in
cp $< $@
-EXTRA_DIST= $(all_rules_files) $(xml_in_files) \
+EXTRA_DIST= $(xml_in_files) xfree98 \
$(base_parts_no_compat) \
$(evdev_parts_no_compat) \
- xml2lst.pl merge.sh
+ $(base_parts_compat_dist) \
+ xml2lst.pl merge.sh $(dist_files)
-DISTCLEANFILES=base.xml base.lst evdev.xml evdev.lst
+CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst
+MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in
rulesdir = $(xkb_base)/rules
xmldir = $(rulesdir)
diff --git a/xorg-server/xkbdata.src/rules/Makefile.in b/xorg-server/xkbdata.src/rules/Makefile.in
index a5184f2ba..bc498f1d1 100644
--- a/xorg-server/xkbdata.src/rules/Makefile.in
+++ b/xorg-server/xkbdata.src/rules/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -46,10 +42,11 @@ SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -60,14 +57,14 @@ am__installdirs = "$(DESTDIR)$(rulesdir)" "$(DESTDIR)$(xmldir)"
rulesDATA_INSTALL = $(INSTALL_DATA)
xmlDATA_INSTALL = $(INSTALL_DATA)
DATA = $(rules_DATA) $(xml_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -80,10 +77,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -97,43 +90,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -153,15 +127,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -169,6 +143,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -192,38 +167,74 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
SUBDIRS = compat
base_parts_no_compat = base.hdr.part base.lists.part \
-HDR base.m_k.part HDR base.l1_k.part HDR base.l_k.part \
+HDR base.m_k.part \
+HDR base.l1_k.part \
+HDR base.l_k.part \
HDR base.ml_g.part \
-HDR base.m_g.part HDR base.mlv_s.part HDR base.ml_s.part \
-HDR base.ml1_s.part HDR \
-HDR base.l2_s.part HDR base.l3_s.part HDR base.l4_s.part HDR HDR HDR \
-HDR base.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \
+HDR base.m_g.part \
+HDR base.mlv_s.part \
+HDR base.ml_s.part \
+HDR base.ml1_s.part \
+HDR \
+HDR base.l2_s.part \
+HDR base.l3_s.part \
+HDR base.l4_s.part \
+HDR HDR HDR \
+HDR base.m_s.part \
+HDR base.ml_c.part \
+HDR base.ml1_c.part \
HDR base.m_t.part \
-HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \
-HDR base.o_s.part HDR base.o_c.part HDR base.o_t.part
+HDR base.l1o_s.part \
+HDR base.l2o_s.part \
+HDR base.l3o_s.part \
+HDR base.l4o_s.part \
+HDR base.o_s.part \
+HDR base.o_c.part \
+HDR base.o_t.part
evdev_parts_no_compat = base.hdr.part base.lists.part \
-HDR evdev.m_k.part HDR base.l1_k.part HDR base.l_k.part \
+HDR evdev.m_k.part \
+HDR base.l1_k.part \
+HDR base.l_k.part \
HDR base.ml_g.part \
-HDR base.m_g.part HDR base.mlv_s.part HDR base.ml_s.part \
-HDR base.ml1_s.part HDR \
-HDR base.l2_s.part HDR base.l3_s.part HDR base.l4_s.part HDR HDR HDR \
-HDR evdev.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \
+HDR base.m_g.part \
+HDR base.mlv_s.part \
+HDR base.ml_s.part \
+HDR base.ml1_s.part \
+HDR \
+HDR base.l2_s.part \
+HDR base.l3_s.part \
+HDR base.l4_s.part \
+HDR HDR HDR \
+HDR evdev.m_s.part \
+HDR base.ml_c.part \
+HDR base.ml1_c.part \
HDR base.m_t.part \
-HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \
-HDR base.o_s.part HDR base.o_c.part HDR base.o_t.part
+HDR base.l1o_s.part \
+HDR base.l2o_s.part \
+HDR base.l3o_s.part \
+HDR base.l4o_s.part \
+HDR base.o_s.part \
+HDR base.o_c.part \
+HDR base.o_t.part
@USE_COMPAT_RULES_FALSE@base_parts = $(base_parts_no_compat)
@USE_COMPAT_RULES_TRUE@base_parts = base.hdr.part base.lists.part \
@USE_COMPAT_RULES_TRUE@compat/base.lists.part \
-@USE_COMPAT_RULES_TRUE@HDR base.m_k.part HDR base.l1_k.part \
-@USE_COMPAT_RULES_TRUE@HDR base.l_k.part HDR base.o_k.part \
+@USE_COMPAT_RULES_TRUE@HDR base.m_k.part \
+@USE_COMPAT_RULES_TRUE@HDR base.l1_k.part \
+@USE_COMPAT_RULES_TRUE@HDR base.l_k.part \
+@USE_COMPAT_RULES_TRUE@HDR base.o_k.part \
@USE_COMPAT_RULES_TRUE@HDR base.ml_g.part \
@USE_COMPAT_RULES_TRUE@HDR base.m_g.part \
@USE_COMPAT_RULES_TRUE@HDR compat/base.mlv_s.part base.mlv_s.part \
@@ -236,17 +247,26 @@ HDR base.o_s.part HDR base.o_c.part HDR base.o_t.part
@USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_s.part \
@USE_COMPAT_RULES_TRUE@HDR compat/base.l3v3_s.part \
@USE_COMPAT_RULES_TRUE@HDR compat/base.l4v4_s.part \
-@USE_COMPAT_RULES_TRUE@HDR base.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \
+@USE_COMPAT_RULES_TRUE@HDR base.m_s.part \
+@USE_COMPAT_RULES_TRUE@HDR base.ml_c.part \
+@USE_COMPAT_RULES_TRUE@HDR base.ml1_c.part \
@USE_COMPAT_RULES_TRUE@HDR base.m_t.part \
-@USE_COMPAT_RULES_TRUE@HDR base.lo_s.part HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \
+@USE_COMPAT_RULES_TRUE@HDR base.lo_s.part \
+@USE_COMPAT_RULES_TRUE@HDR base.l1o_s.part \
+@USE_COMPAT_RULES_TRUE@HDR base.l2o_s.part \
+@USE_COMPAT_RULES_TRUE@HDR base.l3o_s.part \
+@USE_COMPAT_RULES_TRUE@HDR base.l4o_s.part \
@USE_COMPAT_RULES_TRUE@HDR compat/base.o_s.part base.o_s.part \
-@USE_COMPAT_RULES_TRUE@HDR base.o_c.part HDR base.o_t.part
+@USE_COMPAT_RULES_TRUE@HDR base.o_c.part \
+@USE_COMPAT_RULES_TRUE@HDR base.o_t.part
@USE_COMPAT_RULES_FALSE@evdev_parts = $(base_parts_no_compat)
@USE_COMPAT_RULES_TRUE@evdev_parts = base.hdr.part base.lists.part \
@USE_COMPAT_RULES_TRUE@compat/base.lists.part \
-@USE_COMPAT_RULES_TRUE@HDR evdev.m_k.part HDR base.l1_k.part \
-@USE_COMPAT_RULES_TRUE@HDR base.l_k.part HDR base.o_k.part \
+@USE_COMPAT_RULES_TRUE@HDR evdev.m_k.part \
+@USE_COMPAT_RULES_TRUE@HDR base.l1_k.part \
+@USE_COMPAT_RULES_TRUE@HDR base.l_k.part \
+@USE_COMPAT_RULES_TRUE@HDR base.o_k.part \
@USE_COMPAT_RULES_TRUE@HDR base.ml_g.part \
@USE_COMPAT_RULES_TRUE@HDR base.m_g.part \
@USE_COMPAT_RULES_TRUE@HDR compat/base.mlv_s.part base.mlv_s.part \
@@ -259,26 +279,34 @@ HDR base.o_s.part HDR base.o_c.part HDR base.o_t.part
@USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_s.part \
@USE_COMPAT_RULES_TRUE@HDR compat/base.l3v3_s.part \
@USE_COMPAT_RULES_TRUE@HDR compat/base.l4v4_s.part \
-@USE_COMPAT_RULES_TRUE@HDR evdev.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \
+@USE_COMPAT_RULES_TRUE@HDR evdev.m_s.part \
+@USE_COMPAT_RULES_TRUE@HDR base.ml_c.part \
+@USE_COMPAT_RULES_TRUE@HDR base.ml1_c.part \
@USE_COMPAT_RULES_TRUE@HDR base.m_t.part \
-@USE_COMPAT_RULES_TRUE@HDR base.lo_s.part HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \
+@USE_COMPAT_RULES_TRUE@HDR base.lo_s.part \
+@USE_COMPAT_RULES_TRUE@HDR base.l1o_s.part \
+@USE_COMPAT_RULES_TRUE@HDR base.l2o_s.part \
+@USE_COMPAT_RULES_TRUE@HDR base.l3o_s.part \
+@USE_COMPAT_RULES_TRUE@HDR base.l4o_s.part \
@USE_COMPAT_RULES_TRUE@HDR compat/base.o_s.part base.o_s.part \
-@USE_COMPAT_RULES_TRUE@HDR base.o_c.part HDR base.o_t.part
+@USE_COMPAT_RULES_TRUE@HDR base.o_c.part \
+@USE_COMPAT_RULES_TRUE@HDR base.o_t.part
+base_parts_compat_dist = base.o_k.part base.lo_s.part
rules_files = base evdev xfree98
lst_files = base.lst evdev.lst
-all_rules_files = $(rules_files) $(lst_files) \
-xkb.dtd README
-
-rules_DATA = $(all_rules_files)
+dist_files = xkb.dtd README
+rules_DATA = $(rules_files) $(lst_files) $(dist_files)
xml_in_files = base.xml.in evdev.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
-EXTRA_DIST = $(all_rules_files) $(xml_in_files) \
+EXTRA_DIST = $(xml_in_files) xfree98 \
$(base_parts_no_compat) \
$(evdev_parts_no_compat) \
- xml2lst.pl merge.sh
+ $(base_parts_compat_dist) \
+ xml2lst.pl merge.sh $(dist_files)
-DISTCLEANFILES = base.xml base.lst evdev.xml evdev.lst
+CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst
+MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in
rulesdir = $(xkb_base)/rules
xmldir = $(rulesdir)
all: all-recursive
@@ -288,8 +316,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -313,10 +341,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-rulesDATA: $(rules_DATA)
@$(NORMAL_INSTALL)
- test -z "$(rulesdir)" || $(mkdir_p) "$(DESTDIR)$(rulesdir)"
+ test -z "$(rulesdir)" || $(MKDIR_P) "$(DESTDIR)$(rulesdir)"
@list='$(rules_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -333,7 +360,7 @@ uninstall-rulesDATA:
done
install-xmlDATA: $(xml_DATA)
@$(NORMAL_INSTALL)
- test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)"
+ test -z "$(xmldir)" || $(MKDIR_P) "$(DESTDIR)$(xmldir)"
@list='$(xml_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -380,8 +407,7 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -425,8 +451,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -451,8 +477,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -462,13 +488,12 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -482,22 +507,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -511,7 +535,7 @@ distdir: $(DISTFILES)
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -519,6 +543,8 @@ distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -529,7 +555,7 @@ all-am: Makefile $(DATA)
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(rulesdir)" "$(DESTDIR)$(xmldir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
install-exec: install-exec-recursive
@@ -548,14 +574,15 @@ install-strip:
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-recursive
clean-am: clean-generic mostlyclean-am
@@ -578,12 +605,20 @@ install-data-am: install-rulesDATA install-xmlDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -602,23 +637,24 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-info-am uninstall-rulesDATA uninstall-xmlDATA
+uninstall-am: uninstall-rulesDATA uninstall-xmlDATA
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-data-am install-strip
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- clean clean-generic clean-recursive ctags ctags-recursive \
- distclean distclean-generic distclean-recursive distclean-tags \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic ctags \
+ ctags-recursive distclean distclean-generic distclean-tags \
distdir dvi dvi-am html html-am info info-am install \
install-am install-data install-data-am install-data-hook \
- install-exec install-exec-am install-info install-info-am \
- install-man install-rulesDATA install-strip install-xmlDATA \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
+ install-man install-pdf install-pdf-am install-ps \
+ install-ps-am install-rulesDATA install-strip install-xmlDATA \
installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-info-am uninstall-rulesDATA \
- uninstall-xmlDATA
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am uninstall-rulesDATA uninstall-xmlDATA
# extra_rules_file = $(xkb_rules_symlink)
@@ -646,7 +682,7 @@ base: $(base_parts_no_compat)
evdev: $(evdev_parts_no_compat)
HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(evdev_parts)
-evdev.xml.in: base.xml.in
+$(srcdir)/evdev.xml.in: base.xml.in
cp $< $@
@INTLTOOL_XML_NOMERGE_RULE@
diff --git a/xorg-server/xkbdata.src/rules/base.l1o_s.part b/xorg-server/xkbdata.src/rules/base.l1o_s.part
index 5544d5386..592fab272 100644
--- a/xorg-server/xkbdata.src/rules/base.l1o_s.part
+++ b/xorg-server/xkbdata.src/rules/base.l1o_s.part
@@ -1 +1,2 @@
$threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1
+ * misc:typo = +typo(base):1
diff --git a/xorg-server/xkbdata.src/rules/base.l2o_s.part b/xorg-server/xkbdata.src/rules/base.l2o_s.part
index 3ffd6a8b0..aac680e9d 100644
--- a/xorg-server/xkbdata.src/rules/base.l2o_s.part
+++ b/xorg-server/xkbdata.src/rules/base.l2o_s.part
@@ -1 +1,2 @@
$threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2
+ * misc:typo = +typo(base):2
diff --git a/xorg-server/xkbdata.src/rules/base.l3o_s.part b/xorg-server/xkbdata.src/rules/base.l3o_s.part
index aa327eb42..1010e2e03 100644
--- a/xorg-server/xkbdata.src/rules/base.l3o_s.part
+++ b/xorg-server/xkbdata.src/rules/base.l3o_s.part
@@ -1 +1,2 @@
$threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3
+ * misc:typo = +typo(base):3
diff --git a/xorg-server/xkbdata.src/rules/base.l4o_s.part b/xorg-server/xkbdata.src/rules/base.l4o_s.part
index 79682503e..49650ad9c 100644
--- a/xorg-server/xkbdata.src/rules/base.l4o_s.part
+++ b/xorg-server/xkbdata.src/rules/base.l4o_s.part
@@ -1 +1,2 @@
$threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4
+ * misc:typo = +typo(base):4
diff --git a/xorg-server/xkbdata.src/rules/base.lists.part b/xorg-server/xkbdata.src/rules/base.lists.part
index b08ab24fe..d2e8383df 100644
--- a/xorg-server/xkbdata.src/rules/base.lists.part
+++ b/xorg-server/xkbdata.src/rules/base.lists.part
@@ -12,7 +12,7 @@
! $msmodels = microsoft microsoft7000 microsoftpro microsoftprousb microsoftprose
// PC geometries - they have special geometry but symbols are mostly pc105
-! $pcgeometries = abnt2 latitude jp106 kr106
+! $pcgeometries = latitude
// Layouts that provide further specializations for the OLPC
! $olpclayouts = af am ara br ca es et it kh kz in mn np ru th tr us
@@ -26,42 +26,44 @@
! $azerty = be fr
! $qwertz = al cz de hr hu ro si sk
-! $inetkbds = a4techKB21 a4techKBS8 a4_rfkb23 \
- acer_c300 acer_ferrari4k acer_laptop \
- acpi airkey \
- apple armada asus_laptop azonaRF2300 \
+! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \
+ airkey \
+ apple armada azonaRF2300 \
benqx brother \
- btc5113rf btc5126t btc6301urf btc9000 btc9000a btc9001ah btc5090 btc9019u \
- cherryblue cherrybluea cherryblueb cherrycyboard \
- chicony chicony0108 chicony9885 \
+ btc5113rf btc9000 btc9000a btc9001ah btc5090 btc9019u \
+ cherryblue cherrybluea cherryblueb \
+ cherrycyboard cherrycmexpert \
+ chicony chicony0108 chicony0420 chicony9885 \
+ compalfl90 \
compaqeak8 compaqik7 compaqik13 compaqik18 \
cymotionlinux \
- dell dellm65 inspiron precision_m dellusbmm dtk2000 \
- emachines ennyah_dkb1008 evdev fscaa1667g \
- genius geniuscomfy geniuscomfy2 geniuskb19e \
+ dell dellm65 inspiron dellusbmm \
+ emachines ennyah_dkb1008 evdev \
+ genius geniuscomfy2 \
gyration honeywell_euroboard \
- hp2501 hp2505 hp5xx hp500fa hp5181 hp5185 \
+ hp250x hp5xx hp500fa hpdv5 \
hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \
- ibm_spacesaver ipaq inspiron intel latitude \
+ ibm_spacesaver ipaq inspiron intel \
logiaccess logicda logicink \
logiex110 logiclx300 \
logiinkse logiinkseusb logiitc logiik \
logitech_base itouch logiultrax \
logitech_g15 \
logidinovo logidinovoedge \
- microsoft7000 microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \
+ microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \
microsoftoffice microsoftmult \
mx1998 mx2500 mx2750 \
oretec \
+ pc105 \
presario propeller \
qtronix \
- rapidaccess rapidaccess2 rapidaccess2a thinkpad thinkpad60 \
+ rapidaccess rapidaccess2 thinkpad60 \
samsung4500 samsung4510 \
- scorpius silvercrest \
- sk1300 sk2500 sk6200 sk7100 sp_inet \
+ silvercrest \
+ sk1300 sk2500 sk6200 sk7100 \
sven sven303 symplon \
toshiba_s3000 trust trustda \
- yahoo
+ unitekkb1925 yahoo
// all layouts with 3rd and 4th groups
! $threelevellayouts = al az \
@@ -73,7 +75,6 @@
gb gr \
hu \
ie ir is it \
- kg \
latam \
lk lt \
mn mt \
@@ -86,3 +87,7 @@
vn \
za
+! $evdevkbds = ibm_spacesaver
+
+! $thinkpads = thinkpad thinkpad60 thinkpadz60
+
diff --git a/xorg-server/xkbdata.src/rules/base.lo_s.part b/xorg-server/xkbdata.src/rules/base.lo_s.part
new file mode 100644
index 000000000..dee7b6daa
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.lo_s.part
@@ -0,0 +1,2 @@
+ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle)
+ * misc:typo = +typo(base)
diff --git a/xorg-server/xkbdata.src/rules/base.m_g.part b/xorg-server/xkbdata.src/rules/base.m_g.part
index 7c0751d7b..36525754c 100644
--- a/xorg-server/xkbdata.src/rules/base.m_g.part
+++ b/xorg-server/xkbdata.src/rules/base.m_g.part
@@ -2,6 +2,7 @@
$msmodels = microsoft(natural)
dell101 = dell(dell101)
dellm65 = dell(dellm65)
+ latitude = dell(latitude)
flexpro = keytronic(FlexPro)
hp6000 = hp(omnibook)
omnikey101 = northgate(omnikey101)
diff --git a/xorg-server/xkbdata.src/rules/base.m_k.part b/xorg-server/xkbdata.src/rules/base.m_k.part
index a39d4c881..b6433b2c8 100644
--- a/xorg-server/xkbdata.src/rules/base.m_k.part
+++ b/xorg-server/xkbdata.src/rules/base.m_k.part
@@ -4,13 +4,10 @@
sun5 = sun(type5_euro)
sun6 = sun(type6_usb)
pc98 = xfree98(pc98)
- abnt2 = xfree86(abnt2)
- jp106 = xfree86(jp106)
evdev = evdev
olpc = evdev
macintosh_hhk = macintosh(hhk)
macintosh_old = macintosh(old)
- $macbooks = macintosh+macintosh(goodmap)
$macs = macintosh
thinkpadz60 = xfree86(thinkpadz60)
* = xfree86
diff --git a/xorg-server/xkbdata.src/rules/base.m_s.part b/xorg-server/xkbdata.src/rules/base.m_s.part
index f066cc077..13621e79c 100644
--- a/xorg-server/xkbdata.src/rules/base.m_s.part
+++ b/xorg-server/xkbdata.src/rules/base.m_s.part
@@ -1,8 +1,25 @@
+ 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)
+ acpi = +inet(acpi_common)
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)
- hpnx9020 = +inet(hp5185)
+ 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)
@@ -11,19 +28,22 @@
logiclx300 = +inet(logiex110)
logii350 = +inet(logiex110)
logimel = +inet(logiex110)
- vsonku306 = +inet(microsoftprooem)
- $inetkbds = +inet(%m)
- acer_tm_800 = +inet(acer_laptop)
- benqx730 = +inet(benqx)
- benqx800 = +inet(benqx)
- dell8125 = +inet(dellusbmm)
- dell8135 = +inet(dellusbmm)
- ltcd = +inet(logicda)
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)
+ trust_slimline = +inet(media_nav_acpi_common)
+ vsonku306 = +inet(microsoftprooem)
+ $inetkbds = +inet(%m)
$maclaptop = +inet(apple)+level3(enter_switch)
$macs = +inet(apple)
- thinkpadz60 = +inet(thinkpad60)
diff --git a/xorg-server/xkbdata.src/rules/base.ml1_s.part b/xorg-server/xkbdata.src/rules/base.ml1_s.part
index 8e0eeef4f..c45b9805e 100644
--- a/xorg-server/xkbdata.src/rules/base.ml1_s.part
+++ b/xorg-server/xkbdata.src/rules/base.ml1_s.part
@@ -6,5 +6,5 @@
macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1])
$macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1])
- thinkpad br = pc+%l[1](thinkpad)
+ $thinkpads br = pc+%l[1](thinkpad)
* * = pc+%l[1]%(v[1])
diff --git a/xorg-server/xkbdata.src/rules/base.ml_s.part b/xorg-server/xkbdata.src/rules/base.ml_s.part
index 570c5ef77..7e9b2d63e 100644
--- a/xorg-server/xkbdata.src/rules/base.ml_s.part
+++ b/xorg-server/xkbdata.src/rules/base.ml_s.part
@@ -3,10 +3,10 @@
amiga $nonlatin = xfree68_vndr/amiga(usa1)+%l%(v):2
amiga * = xfree68_vndr/amiga(usa1)+%l%(v)
classmate us = pc+%l(classmate)
- sun4 $nonlatin = latin+sun_vndr/us(sun4)+%l%(v):2
- sun4 * = latin+sun_vndr/us(sun4)+%l%(v)
- sun5 $nonlatin = latin+sun_vndr/us(sun5)+%l%(v):2
- sun5 * = latin+sun_vndr/us(sun5)+%l%(v)
+ sun4 $nonlatin = latin+sun_vndr/us(type4)+%l%(v):2
+ sun4 * = latin+sun_vndr/us(type4)+%l%(v)
+ sun5 $nonlatin = latin+sun_vndr/us(type5)+%l%(v):2
+ sun5 * = latin+sun_vndr/us(type5)+%l%(v)
sun6 us = sun_vndr/us(type6)
sun6 en_US = sun_vndr/us(type6)+iso9995-3(basic)
sun6 * = sun_vndr/us(type6)+%l%(v)
@@ -20,6 +20,6 @@
$macs $macvendorlayouts = pc+macintosh_vndr/%l%(v)
olpc $olpclayouts = olpc+%l%(m)
olpc * = olpc+%l%(v)
- thinkpad br = pc+br(thinkpad)
+ $thinkpads br = pc+br(thinkpad)
* $nonlatin = pc+us+%l%(v):2
* * = pc+%l%(v)
diff --git a/xorg-server/xkbdata.src/rules/base.o_c.part b/xorg-server/xkbdata.src/rules/base.o_c.part
index 9ce5410ed..8898e3b50 100644
--- a/xorg-server/xkbdata.src/rules/base.o_c.part
+++ b/xorg-server/xkbdata.src/rules/base.o_c.part
@@ -3,4 +3,5 @@
grp_led:scroll = +ledscroll(group_lock)
grp:caps_toggle = +ledcaps(group_lock)
japan:kana_lock = +japan(kana_lock)
+ caps:shiftlock = +ledcaps(shift_lock)
diff --git a/xorg-server/xkbdata.src/rules/base.o_k.part b/xorg-server/xkbdata.src/rules/base.o_k.part
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/base.o_k.part
diff --git a/xorg-server/xkbdata.src/rules/base.o_s.part b/xorg-server/xkbdata.src/rules/base.o_s.part
index 2e1e38cd2..d3078bfc5 100644
--- a/xorg-server/xkbdata.src/rules/base.o_s.part
+++ b/xorg-server/xkbdata.src/rules/base.o_s.part
@@ -1,9 +1,9 @@
altwin:menu = +altwin(menu)
altwin:meta_alt = +altwin(meta_alt)
altwin:ctrl_win = +altwin(ctrl_win)
+ altwin:ctrl_alt_win = +altwin(ctrl_alt_win)
altwin:meta_win = +altwin(meta_win)
altwin:left_meta_win = +altwin(left_meta_win)
- altwin:super_win = +altwin(super_win)
altwin:hyper_win = +altwin(hyper_win)
altwin:alt_super_win = +altwin(alt_super_win)
altwin:swap_lalt_lwin = +altwin(swap_lalt_lwin)
@@ -22,9 +22,11 @@
grp:caps_switch = +capslock(groupshift)
grp:shift_caps_toggle = +group(shift_caps_toggle)
grp:shift_caps_switch = +group(shift_caps_switch)
+ grp:win_menu_switch = +group(win_menu_switch)
grp:alt_caps_toggle = +group(alt_caps_toggle)
grp:ctrl_alt_toggle = +group(ctrl_alt_toggle)
grp:alt_shift_toggle = +group(alt_shift_toggle)
+ grp:alt_space_toggle = +group(alt_space_toggle)
grp:menu_toggle = +group(menu_toggle)
grp:lwin_toggle = +group(lwin_toggle)
grp:rwin_toggle = +group(rwin_toggle)
@@ -34,6 +36,7 @@
grp:lctrl_toggle = +group(lctrl_toggle)
grp:rctrl_toggle = +group(rctrl_toggle)
grp:lalt_toggle = +group(lalt_toggle)
+ grp:sclk_toggle = +group(sclk_toggle)
lv3:switch = +level3(switch)
lv3:ralt_switch = +level3(ralt_switch)
lv3:ralt_switch_multikey = +level3(ralt_switch_multikey)
@@ -44,9 +47,12 @@
lv3:win_switch = +level3(win_switch)
lv3:lwin_switch = +level3(lwin_switch)
lv3:rwin_switch = +level3(rwin_switch)
+ lv3:enter_switch = +level3(enter_switch)
caps:capslock = +capslock(capslock)
caps:shiftlock = +capslock(shiftlock)
caps:swapescape = +capslock(swapescape)
+ caps:escape = +capslock(escape)
+ caps:backspace = +capslock(backspace)
ctrl:nocaps = +ctrl(nocaps)
ctrl:swapcaps = +ctrl(swapcaps)
ctrl:ctrl_ac = +ctrl(ctrl_ac)
@@ -70,7 +76,8 @@
keypad:oss_wang = +keypad(oss_wang)
keypad:future = +keypad(future)
keypad:future_wang = +keypad(future_wang)
- keypad:phone_hex = +keypad(phone_hex)
+ keypad:hex = +keypad(ops)+keypad(hex)
+ keypad:atm = +keypad(ops)+keypad(hex)+keypad(atm)
nbsp:none = +nbsp(none)
nbsp:level2 = +nbsp(level2)
nbsp:level3 = +nbsp(level3)
@@ -87,5 +94,10 @@
kpdl:commaoss = +kpdl(commaoss)
kpdl:momayyezoss = +kpdl(momayyezoss)
kpdl:kposs = +kpdl(kposs)
+ kpdl:semi = +kpdl(semi)
shift:breaks_caps = +shift(breaks_caps)
+ esperanto:qwerty = +epo(qwerty)
+ esperanto:dvorak = +epo(dvorak)
+ terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp)
+
diff --git a/xorg-server/xkbdata.src/rules/base.o_t.part b/xorg-server/xkbdata.src/rules/base.o_t.part
index 440f9efe3..e0d4b15ed 100644
--- a/xorg-server/xkbdata.src/rules/base.o_t.part
+++ b/xorg-server/xkbdata.src/rules/base.o_t.part
@@ -5,3 +5,4 @@
numpad:pc = +numpad(pc)
numpad:mac = +numpad(mac)
numpad:microsoft = +numpad(microsoft)
+ numpad:shift3 = +numpad(shift3)
diff --git a/xorg-server/xkbdata.src/rules/base.xml.in b/xorg-server/xkbdata.src/rules/base.xml.in
index 8d0aa921c..996cde84f 100644
--- a/xorg-server/xkbdata.src/rules/base.xml.in
+++ b/xorg-server/xkbdata.src/rules/base.xml.in
@@ -88,13 +88,6 @@
</model>
<model>
<configItem>
- <name>jp106</name>
- <_description>Japanese 106-key</_description>
- <vendor>Generic</vendor>
- </configItem>
- </model>
- <model>
- <configItem>
<name>pc98</name>
<_description>PC-98xx Series</_description>
<vendor>Generic</vendor>
@@ -123,13 +116,6 @@
</model>
<model>
<configItem>
- <name>abnt2</name>
- <_description>Brazilian ABNT2</_description>
- <vendor>Generic</vendor>
- </configItem>
- </model>
- <model>
- <configItem>
<name>airkey</name>
<_description>Acer AirKey V</_description>
<vendor>Acer</vendor>
@@ -221,6 +207,12 @@
</model>
<model>
<configItem>
+ <name>btc9116u</name>
+ <_description>BTC 9116U Mini Wireless Internet and Gaming</_description>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>cherryblue</name>
<_description>Cherry Blue Line CyBo@rd</_description>
</configItem>
@@ -248,6 +240,20 @@
</model>
<model>
<configItem>
+ <name>cherrycmexpert</name>
+ <_description>Cherry CyMotion Expert</_description>
+ <vendor>Cherry</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
+ <name>cherrybunlim</name>
+ <_description>Cherry B.UNLIMITED</_description>
+ <vendor>Cherry</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>chicony</name>
<_description>Chicony Internet Keyboard</_description>
<vendor>Chicony</vendor>
@@ -262,6 +268,13 @@
</model>
<model>
<configItem>
+ <name>chicony0420</name>
+ <_description>Chicony KU-0420</_description>
+ <vendor>Chicony</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>chicony9885</name>
<_description>Chicony KB-9885</_description>
<vendor>Chicony</vendor>
@@ -395,7 +408,7 @@
<model>
<configItem>
<name>fscaa1667g</name>
- <_description>Fujitsu-Siemens Computers AMILO A1667G laptop</_description>
+ <_description>Fujitsu-Siemens Computers AMILO laptop</_description>
<vendor>Fujitsu-Siemens</vendor>
</configItem>
</model>
@@ -429,6 +442,13 @@
</model>
<model>
<configItem>
+ <name>geniuskkb2050hs</name>
+ <_description>Genius KKB-2050HS</_description>
+ <vendor>Genius</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>gyration</name>
<_description>Gyration</_description>
<vendor>Gyration</vendor>
@@ -457,15 +477,8 @@
</model>
<model>
<configItem>
- <name>hp2501</name>
- <_description>Hewlett-Packard SK-2501 Multimedia Keyboard</_description>
- <vendor>Hewlett-Packard</vendor>
- </configItem>
- </model>
- <model>
- <configItem>
- <name>hp2505</name>
- <_description>Hewlett-Packard SK-2505 Internet Keyboard</_description>
+ <name>hp250x</name>
+ <_description>Hewlett-Packard SK-250x Multimedia Keyboard</_description>
<vendor>Hewlett-Packard</vendor>
</configItem>
</model>
@@ -492,6 +505,13 @@
</model>
<model>
<configItem>
+ <name>hpdv5</name>
+ <_description>Hewlett-Packard Pavilion dv5</_description>
+ <vendor>Hewlett-Packard</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>hpzt11xx</name>
<_description>Hewlett-Packard Pavilion ZT11xx</_description>
<vendor>Hewlett-Packard</vendor>
@@ -513,20 +533,6 @@
</model>
<model>
<configItem>
- <name>hp5181</name>
- <_description>Hewlett-Packard Internet Keyboard 5181</_description>
- <vendor>Hewlett-Packard</vendor>
- </configItem>
- </model>
- <model>
- <configItem>
- <name>hp5185</name>
- <_description>Hewlett-Packard Internet Keyboard 5185</_description>
- <vendor>Hewlett-Packard</vendor>
- </configItem>
- </model>
- <model>
- <configItem>
<name>hpnx9020</name>
<_description>Hewlett-Packard nx9020</_description>
<vendor>Hewlett-Packard</vendor>
@@ -562,13 +568,6 @@
</model>
<model>
<configItem>
- <name>rapidaccess2a</name>
- <_description>IBM Rapid Access II (alternate option)</_description>
- <vendor>IBM</vendor>
- </configItem>
- </model>
- <model>
- <configItem>
<name>thinkpad</name>
<_description>IBM ThinkPad 560Z/600/600E/A22E</_description>
<vendor>IBM</vendor>
@@ -668,7 +667,7 @@
<model>
<configItem>
<name>logicdpa2</name>
- <_description>Logitech Cordless Desktop Pro (alternate option2)</_description>
+ <_description>Logitech Cordless Desktop Pro (alternate option 2)</_description>
<vendor>Logitech</vendor>
</configItem>
</model>
@@ -856,6 +855,13 @@
</model>
<model>
<configItem>
+ <name>microsoftccurve2k</name>
+ <_description>Microsoft Comfort Curve Keyboard 2000</_description>
+ <vendor>Microsoft Inc.</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>oretec</name>
<_description>Ortek MCK-800 MM/Internet keyboard</_description>
<vendor>Ortek</vendor>
@@ -968,6 +974,13 @@
</model>
<model>
<configItem>
+ <name>trust_slimline</name>
+ <_description>Trust Slimline</_description>
+ <vendor>Trust</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>yahoo</name>
<_description>Yahoo! Internet Keyboard</_description>
<vendor>Yahoo!</vendor>
@@ -1066,13 +1079,6 @@
</model>
<model>
<configItem>
- <name>kr106</name>
- <_description>Korean 106-key</_description>
- <vendor>Generic</vendor>
- </configItem>
- </model>
- <model>
- <configItem>
<name>evdev</name>
<_description>Evdev-managed keyboard</_description>
<vendor>Generic</vendor>
@@ -1127,6 +1133,27 @@
<vendor>Sun Microsystems</vendor>
</configItem>
</model>
+ <model>
+ <configItem>
+ <name>targa_v811</name>
+ <_description>Targa Visionary 811</_description>
+ <vendor>Targa</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
+ <name>unitekkb1925</name>
+ <_description>Unitek KB-1925</_description>
+ <vendor>Unitek Group</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
+ <name>compalfl90</name>
+ <_description>FL90</_description>
+ <vendor>Compal Electronics Inc.</vendor>
+ </configItem>
+ </model>
</modelList>
<layoutList>
<layout>
@@ -1451,6 +1478,24 @@
<variantList>
<variant>
<configItem>
+ <name>oss</name>
+ <_description>Alternative</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>oss_latin9</name>
+ <_description>Alternative, latin-9 only</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>oss_sundeadkeys</name>
+ <_description>Alternative, Sun dead keys</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>iso-alternate</name>
<_description>ISO Alternate</_description>
</configItem>
@@ -1598,8 +1643,22 @@
</variant>
<variant>
<configItem>
- <name>urd</name>
- <_description>Urdu</_description>
+ <name>urd-phonetic</name>
+ <_description>Urdu, Phonetic</_description>
+ <languageList><iso639Id>urd</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>urd-phonetic3</name>
+ <_description>Urdu, Alternative phonetic</_description>
+ <languageList><iso639Id>urd</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>urd-winkeys</name>
+ <_description>Urdu, Winkeys</_description>
<languageList><iso639Id>urd</iso639Id></languageList>
</configItem>
</variant>
@@ -1610,6 +1669,13 @@
<languageList><iso639Id>hin</iso639Id></languageList>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>hin-wx</name>
+ <_description>Hindi Wx</_description>
+ <languageList><iso639Id>hin</iso639Id></languageList>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -1698,7 +1764,15 @@
<variant>
<configItem>
<name>phonetic</name>
- <_description>Phonetic</_description>
+ <_description>Traditional Phonetic</_description>
+ </configItem>
+ </variant>
+ </variantList>
+ <variantList>
+ <variant>
+ <configItem>
+ <name>bas_phonetic</name>
+ <_description>Standard Phonetic</_description>
</configItem>
</variant>
</variantList>
@@ -1827,6 +1901,13 @@
<_description>Ktunaxa</_description>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>eng</name>
+ <_description>English</_description>
+ <languageList><iso639Id>eng</iso639Id></languageList>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -2157,7 +2238,8 @@
<configItem>
<name>smi</name>
<_description>Northern Saami</_description>
- <languageList><iso639Id>smi</iso639Id></languageList>
+ <languageList><iso639Id>smi</iso639Id>
+ <iso639Id>sme</iso639Id></languageList>
</configItem>
</variant>
<variant>
@@ -2262,6 +2344,19 @@
</variant>
<variant>
<configItem>
+ <name>bre</name>
+ <_description>Breton</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>oci</name>
+ <_description>Occitan</_description>
+ <languageList><iso639Id>oci</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>geo</name>
<_description>Georgian AZERTY Tskapo</_description>
<languageList><iso639Id>geo</iso639Id></languageList>
@@ -2418,7 +2513,7 @@
<variant>
<configItem>
<name>neo</name>
- <_description>Neostyle</_description>
+ <_description>Neo 2</_description>
</configItem>
</variant>
<variant>
@@ -2433,6 +2528,26 @@
<_description>Macintosh, eliminate dead keys</_description>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>dsb</name>
+ <_description>Lower Sorbian</_description>
+ <languageList><iso639Id>dsb</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>dsb_qwertz</name>
+ <_description>Lower Sorbian (qwertz)</_description>
+ <languageList><iso639Id>dsb</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>qwerty</name>
+ <_description>qwerty</_description>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -2714,11 +2829,18 @@
<layout>
<configItem>
<name>kg</name>
- <_shortDescription>Kir</_shortDescription>
+ <_shortDescription>Kgz</_shortDescription>
<_description>Kyrgyzstan</_description>
<languageList><iso639Id>kir</iso639Id></languageList>
</configItem>
- <variantList/>
+ <variantList>
+ <variant>
+ <configItem>
+ <name>phonetic</name>
+ <_description>Phonetic</_description>
+ </configItem>
+ </variant>
+ </variantList>
</layout>
<layout>
<configItem>
@@ -2787,6 +2909,8 @@
<iso3166Id>PE</iso3166Id>
<iso3166Id>PR</iso3166Id>
<iso3166Id>PY</iso3166Id>
+ <iso3166Id>SV</iso3166Id>
+ <iso3166Id>US</iso3166Id>
<iso3166Id>UY</iso3166Id>
<iso3166Id>VE</iso3166Id>
</countryList>
@@ -2801,6 +2925,12 @@
</variant>
<variant>
<configItem>
+ <name>deadtilde</name>
+ <_description>Include dead tilde</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>sundeadkeys</name>
<_description>Sun dead keys</_description>
</configItem>
@@ -3060,7 +3190,7 @@
<variant>
<configItem>
<name>dvorak_altquotes</name>
- <_description>Dvorak, Polish quotes on key "1/!"</_description>
+ <_description>Dvorak, Polish quotes on key 1</_description>
</configItem>
</variant>
<variant>
@@ -3170,6 +3300,34 @@
<_description>Winkeys</_description>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>crh_f</name>
+ <_description>Crimean Tatar (Turkish F)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>crh_alt</name>
+ <_description>Crimean Tatar (Turkish Alt-Q)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>crh_dobruca1</name>
+ <_description>Crimean Tatar (Dobruca-1 Q)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>crh_dobruca2</name>
+ <_description>Crimean Tatar (Dobruca-2 Q)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -3188,6 +3346,12 @@
</variant>
<variant>
<configItem>
+ <name>phonetic_winkeys</name>
+ <_description>Phonetic Winkeys</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>typewriter</name>
<_description>Typewriter</_description>
</configItem>
@@ -3254,6 +3418,19 @@
<languageList><iso639Id>sah</iso639Id></languageList>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>xal</name>
+ <_description>Kalmyk</_description>
+ <languageList><iso639Id>xal</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>dos</name>
+ <_description>DOS</_description>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -3324,18 +3501,6 @@
</variant>
<variant>
<configItem>
- <name>unicode</name>
- <_description>Use Slovenian digraphs</_description>
- </configItem>
- </variant>
- <variant>
- <configItem>
- <name>unicodeus</name>
- <_description>US keyboard with Slovenian digraphs</_description>
- </configItem>
- </variant>
- <variant>
- <configItem>
<name>us</name>
<_description>US keyboard with Slovenian letters</_description>
</configItem>
@@ -3386,6 +3551,12 @@
</variant>
<variant>
<configItem>
+ <name>deadtilde</name>
+ <_description>Include dead tilde</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>sundeadkeys</name>
<_description>Sun dead keys</_description>
</configItem>
@@ -3580,7 +3751,14 @@
<_description>Tajikistan</_description>
<languageList><iso639Id>tgk</iso639Id></languageList>
</configItem>
- <variantList/>
+ <variantList>
+ <variant>
+ <configItem>
+ <name>legacy</name>
+ <_description>Legacy</_description>
+ </configItem>
+ </variant>
+ </variantList>
</layout>
<layout>
<configItem>
@@ -3681,6 +3859,27 @@
<_description>International (with dead keys)</_description>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>crh</name>
+ <_description>Crimean Tatar (Turkish Q)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>crh_f</name>
+ <_description>Crimean Tatar (Turkish F)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>crh_alt</name>
+ <_description>Crimean Tatar (Turkish Alt-Q)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -3711,8 +3910,8 @@
</variant>
<variant>
<configItem>
- <name>unicode</name>
- <_description>Unicode</_description>
+ <name>legacy</name>
+ <_description>Legacy</_description>
</configItem>
</variant>
<variant>
@@ -3735,6 +3934,27 @@
<_description>Homophonic</_description>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>crh</name>
+ <_description>Crimean Tatar (Turkish Q)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>crh_f</name>
+ <_description>Crimean Tatar (Turkish F)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>crh_alt</name>
+ <_description>Crimean Tatar (Turkish Alt-Q)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -3747,6 +3967,12 @@
<variantList>
<variant>
<configItem>
+ <name>extd</name>
+ <_description>Extended - Winkeys</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>intl</name>
<_description>International (with dead keys)</_description>
</configItem>
@@ -3791,6 +4017,27 @@
<_description>Latin</_description>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>crh</name>
+ <_description>Crimean Tatar (Turkish Q)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>crh_f</name>
+ <_description>Crimean Tatar (Turkish F)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>crh_alt</name>
+ <_description>Crimean Tatar (Turkish Alt-Q)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -3875,6 +4122,20 @@
<variantList>
<variant>
<configItem>
+ <name>urd-crulp</name>
+ <_description>CRULP</_description>
+ <languageList><iso639Id>urd</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>urd-nla</name>
+ <_description>NLA</_description>
+ <languageList><iso639Id>urd</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>ara</name>
<_description>Arabic</_description>
<languageList><iso639Id>ara</iso639Id></languageList>
@@ -3965,7 +4226,16 @@
</layout>
<layout>
<configItem>
- <name>braille</name>
+ <name>sn</name>
+ <shortDescription>Sen</shortDescription>
+ <description>Senegal</description>
+ <languageList><iso639Id>wol</iso639Id></languageList>
+ </configItem>
+ <variantList/>
+ </layout>
+ <layout>
+ <configItem>
+ <name>brai</name>
<_shortDescription>Brl</_shortDescription>
<_description>Braille</_description>
</configItem>
@@ -3984,174 +4254,208 @@
</variant>
</variantList>
</layout>
+ <layout>
+ <configItem>
+ <name>tm</name>
+ <shortDescription>Tkm</shortDescription>
+ <_description>Turkmenistan</_description>
+ <languageList><iso639Id>tuk</iso639Id></languageList>
+ </configItem>
+ <variantList>
+ <variant>
+ <configItem>
+ <name>alt</name>
+ <_description>Alt-Q</_description>
+ </configItem>
+ </variant>
+ </variantList>
+ </layout>
</layoutList>
<optionList>
<group allowMultipleSelection="true">
<!-- The key combination used to switch between groups -->
<configItem>
<name>grp</name>
- <_description>Layout switching</_description>
+ <_description>Key(s) to change layout</_description>
</configItem>
<option>
<configItem>
<name>grp:switch</name>
- <_description>R-Alt switches layout while pressed.</_description>
+ <_description>Right Alt (while pressed)</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:lswitch</name>
- <_description>Left Alt key switches layout while pressed.</_description>
+ <_description>Left Alt (while pressed)</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:lwin_switch</name>
- <_description>Left Win-key switches layout while pressed.</_description>
+ <_description>Left Win (while pressed)</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:rwin_switch</name>
- <_description>Right Win-key switches layout while pressed.</_description>
+ <_description>Right Win (while pressed)</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:win_switch</name>
- <_description>Both Win-keys switch layout while pressed.</_description>
+ <_description>Any Win key (while pressed)</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:caps_switch</name>
- <_description>CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action.</_description>
+ <_description>CapsLock (while pressed), Alt+CapsLock does the original capslock action</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:rctrl_switch</name>
- <_description>Right Ctrl key switches layout while pressed.</_description>
+ <_description>Right Ctrl (while pressed)</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:toggle</name>
- <_description>Right Alt key changes layout.</_description>
+ <_description>Right Alt</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:lalt_toggle</name>
- <_description>Left Alt key changes layout.</_description>
+ <_description>Left Alt</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:caps_toggle</name>
- <_description>CapsLock key changes layout.</_description>
+ <_description>CapsLock</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:shift_caps_toggle</name>
- <_description>Shift+CapsLock changes layout.</_description>
+ <_description>Shift+CapsLock</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:shift_caps_switch</name>
- <_description>CapsLock switch to first layout, Shift+CapsLock switch to last layout.</_description>
+ <_description>CapsLock (to first layout), Shift+CapsLock (to last layout)</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>grp:win_menu_switch</name>
+ <_description>Left Win (to first layout), Right Win/Menu (to last layout)</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:alt_caps_toggle</name>
- <_description>Alt+CapsLock changes layout.</_description>
+ <_description>Alt+CapsLock</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:shifts_toggle</name>
- <_description>Both Shift keys together change layout.</_description>
+ <_description>Both Shift keys together</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:alts_toggle</name>
- <_description>Both Alt keys together change layout.</_description>
+ <_description>Both Alt keys together</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:ctrls_toggle</name>
- <_description>Both Ctrl keys together change layout.</_description>
+ <_description>Both Ctrl keys together</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:ctrl_shift_toggle</name>
- <_description>Ctrl+Shift change layout.</_description>
+ <_description>Ctrl+Shift</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:lctrl_lshift_toggle</name>
- <_description>LCtrl+LShift change layout.</_description>
+ <_description>Left Ctrl+Left Shift</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:ctrl_alt_toggle</name>
- <_description>Alt+Ctrl change layout.</_description>
+ <_description>Alt+Ctrl</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:alt_shift_toggle</name>
- <_description>Alt+Shift change layout.</_description>
+ <_description>Alt+Shift</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>grp:alt_space_toggle</name>
+ <_description>Alt+Space</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:menu_toggle</name>
- <_description>Menu key changes layout.</_description>
+ <_description>Menu</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:lwin_toggle</name>
- <_description>Left Win-key changes layout.</_description>
+ <_description>Left Win</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:rwin_toggle</name>
- <_description>Right Win-key changes layout.</_description>
+ <_description>Right Win</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:lshift_toggle</name>
- <_description>Left Shift key changes layout.</_description>
+ <_description>Left Shift</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:rshift_toggle</name>
- <_description>Right Shift key changes layout.</_description>
+ <_description>Right Shift</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:lctrl_toggle</name>
- <_description>Left Ctrl key changes layout.</_description>
+ <_description>Left Ctrl</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:rctrl_toggle</name>
- <_description>Right Ctrl key changes layout.</_description>
+ <_description>Right Ctrl</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>grp:sclk_toggle</name>
+ <_description>Scroll Lock</_description>
</configItem>
</option>
</group>
@@ -4160,66 +4464,72 @@
level of symbols -->
<configItem>
<name>lv3</name>
- <_description>Third level choosers</_description>
+ <_description>Key to choose 3rd level</_description>
</configItem>
<option>
<configItem>
<name>lv3:switch</name>
- <_description>Press Right Ctrl to choose 3rd level.</_description>
+ <_description>Right Ctrl</_description>
</configItem>
</option>
<option>
<configItem>
<name>lv3:menu_switch</name>
- <_description>Press Menu key to choose 3rd level.</_description>
+ <_description>Menu</_description>
</configItem>
</option>
<option>
<configItem>
<name>lv3:win_switch</name>
- <_description>Press any of Win-keys to choose 3rd level.</_description>
+ <_description>Any Win key</_description>
</configItem>
</option>
<option>
<configItem>
<name>lv3:lwin_switch</name>
- <_description>Press Left Win-key to choose 3rd level.</_description>
+ <_description>Left Win</_description>
</configItem>
</option>
<option>
<configItem>
<name>lv3:rwin_switch</name>
- <_description>Press Right Win-key to choose 3rd level.</_description>
+ <_description>Right Win</_description>
</configItem>
</option>
<option>
<configItem>
<name>lv3:alt_switch</name>
- <_description>Press any of Alt keys to choose 3rd level.</_description>
+ <_description>Any Alt key</_description>
</configItem>
</option>
<option>
<configItem>
<name>lv3:lalt_switch</name>
- <_description>Press Left Alt key to choose 3rd level.</_description>
+ <_description>Left Alt</_description>
</configItem>
</option>
<option>
<configItem>
<name>lv3:ralt_switch</name>
- <_description>Press Right Alt key to choose 3rd level.</_description>
+ <_description>Right Alt</_description>
</configItem>
</option>
<option>
<configItem>
<name>lv3:ralt_switch_multikey</name>
- <_description>Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key.</_description>
+ <_description>Right Alt, Shift+Right Alt key is Multi_Key</_description>
</configItem>
</option>
<option>
<configItem>
<name>lv3:ralt_alt</name>
- <_description>Right Alt key never chooses 3rd level.</_description>
+ <_description>Right Alt key never chooses 3rd level</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>lv3:enter_switch</name>
+ <_description>Enter on keypad</_description>
</configItem>
</option>
</group>
@@ -4232,31 +4542,31 @@
<option>
<configItem>
<name>ctrl:nocaps</name>
- <_description>Make CapsLock an additional Ctrl.</_description>
+ <_description>Make CapsLock an additional Ctrl</_description>
</configItem>
</option>
<option>
<configItem>
<name>ctrl:swapcaps</name>
- <_description>Swap Ctrl and CapsLock.</_description>
+ <_description>Swap Ctrl and CapsLock</_description>
</configItem>
</option>
<option>
<configItem>
<name>ctrl:ctrl_ac</name>
- <_description>Ctrl key at left of 'A'</_description>
+ <_description>At left of 'A'</_description>
</configItem>
</option>
<option>
<configItem>
<name>ctrl:ctrl_aa</name>
- <_description>Ctrl key at bottom left</_description>
+ <_description>At bottom left</_description>
</configItem>
</option>
<option>
<configItem>
<name>ctrl:ctrl_ra</name>
- <_description>Right Ctrl key works as Right Alt.</_description>
+ <_description>Right Ctrl as Right Alt</_description>
</configItem>
</option>
</group>
@@ -4264,24 +4574,24 @@
<!-- Using startard LEDs to indicate the alternative (not first) group(s) -->
<configItem>
<name>grp_led</name>
- <_description>Use keyboard LED to show alternative layout.</_description>
+ <_description>Use keyboard LED to show alternative layout</_description>
</configItem>
<option>
<configItem>
<name>grp_led:num</name>
- <_description>NumLock LED shows alternative layout.</_description>
+ <_description>NumLock</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp_led:caps</name>
- <_description>CapsLock LED shows alternative layout.</_description>
+ <_description>CapsLock</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp_led:scroll</name>
- <_description>ScrollLock LED shows alternative layout.</_description>
+ <_description>ScrollLock</_description>
</configItem>
</option>
</group>
@@ -4294,25 +4604,25 @@
<option>
<configItem>
<name>keypad:legacy</name>
- <_description>Legacy keypad</_description>
+ <_description>Legacy</_description>
</configItem>
</option>
<option>
<configItem>
<name>keypad:oss</name>
- <_description>Keypad with unicode additions (arrows and math operators)</_description>
+ <_description>Unicode additions (arrows and math operators)</_description>
</configItem>
</option>
<option>
<configItem>
<name>keypad:future</name>
- <_description>Keypad with unicode additions (arrows and math operators). Math operators on default level.</_description>
+ <_description>Unicode additions (arrows and math operators). Math operators on default level</_description>
</configItem>
</option>
<option>
<configItem>
<name>keypad:legacy_wang</name>
- <_description>Legacy Wang 724 keypad</_description>
+ <_description>Legacy Wang 724</_description>
</configItem>
</option>
<option>
@@ -4324,14 +4634,20 @@
<option>
<configItem>
<name>keypad:future_wang</name>
- <_description>Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level.</_description>
+ <_description>Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level</_description>
</configItem>
</option>
<option>
<configItem>
- <name>keypad:phone_hex</name>
- <_description>ATM/phone-style hexadecimal keypad</_description>
- </configItem>
+ <name>keypad:hex</name>
+ <_description>Hexadecimal</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>keypad:atm</name>
+ <_description>ATM/phone-style</_description>
+ </configItem>
</option>
</group>
<!-- This option should override the KPDL key defined in keypad; I hope it's declared in the right place -->
@@ -4387,6 +4703,12 @@
<_description>Four-level key with abstract separators</_description>
</configItem>
</option>
+ <option>
+ <configItem>
+ <name>kpdl:semi</name>
+ <_description>Semi-colon on third level</_description>
+ </configItem>
+ </option>
</group>
<group allowMultipleSelection="false">
<!-- CapsLock tweaks.
@@ -4399,43 +4721,55 @@
<option>
<configItem>
<name>caps:internal</name>
- <_description>CapsLock uses internal capitalization. Shift "pauses" CapsLock.</_description>
+ <_description>CapsLock uses internal capitalization. Shift "pauses" CapsLock</_description>
</configItem>
</option>
<option>
<configItem>
<name>caps:internal_nocancel</name>
- <_description>CapsLock uses internal capitalization. Shift doesn't affect CapsLock.</_description>
+ <_description>CapsLock uses internal capitalization. Shift doesn't affect CapsLock</_description>
</configItem>
</option>
<option>
<configItem>
<name>caps:shift</name>
- <_description>CapsLock acts as Shift with locking. Shift "pauses" CapsLock.</_description>
+ <_description>CapsLock acts as Shift with locking. Shift "pauses" CapsLock</_description>
</configItem>
</option>
<option>
<configItem>
<name>caps:shift_nocancel</name>
- <_description>CapsLock acts as Shift with locking. Shift doesn't affect CapsLock.</_description>
+ <_description>CapsLock acts as Shift with locking. Shift doesn't affect CapsLock</_description>
</configItem>
</option>
<option>
<configItem>
<name>caps:capslock</name>
- <_description>CapsLock toggles normal capitalization of alphabetic characters.</_description>
+ <_description>CapsLock toggles normal capitalization of alphabetic characters</_description>
</configItem>
</option>
<option>
<configItem>
<name>caps:swapescape</name>
- <_description>Swap ESC and CapsLock.</_description>
+ <_description>Swap ESC and CapsLock</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>caps:escape</name>
+ <_description>Make CapsLock an additional ESC</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>caps:backspace</name>
+ <_description>Make CapsLock an additional Backspace</_description>
</configItem>
</option>
<option>
<configItem>
<name>caps:shiftlock</name>
- <_description>CapsLock toggles Shift so all keys are affected.</_description>
+ <_description>CapsLock toggles Shift so all keys are affected</_description>
</configItem>
</option>
</group>
@@ -4448,55 +4782,55 @@
<option>
<configItem>
<name>altwin:menu</name>
- <_description>Add the standard behavior to Menu key.</_description>
+ <_description>Add the standard behavior to Menu key</_description>
</configItem>
</option>
<option>
<configItem>
<name>altwin:meta_alt</name>
- <_description>Alt and Meta are on the Alt keys.</_description>
+ <_description>Alt and Meta are on Alt keys</_description>
</configItem>
</option>
<option>
<configItem>
<name>altwin:ctrl_win</name>
- <_description>Control is mapped to the Win-keys (and the usual Ctrl keys).</_description>
+ <_description>Control is mapped to Win keys (and the usual Ctrl keys)</_description>
</configItem>
</option>
<option>
<configItem>
- <name>altwin:meta_win</name>
- <_description>Meta is mapped to the Win-keys.</_description>
+ <name>altwin:ctrl_alt_win</name>
+ <_description>Control is mapped to Alt keys, Alt is mapped to Win keys</_description>
</configItem>
</option>
<option>
<configItem>
- <name>altwin:left_meta_win</name>
- <_description>Meta is mapped to the left Win-key.</_description>
+ <name>altwin:meta_win</name>
+ <_description>Meta is mapped to Win keys</_description>
</configItem>
</option>
<option>
<configItem>
- <name>altwin:super_win</name>
- <_description>Super is mapped to the Win-keys.</_description>
+ <name>altwin:left_meta_win</name>
+ <_description>Meta is mapped to Left Win</_description>
</configItem>
</option>
<option>
<configItem>
<name>altwin:hyper_win</name>
- <_description>Hyper is mapped to the Win-keys.</_description>
+ <_description>Hyper is mapped to Win-keys</_description>
</configItem>
</option>
<option>
<configItem>
<name>altwin:alt_super_win</name>
- <_description>Alt is mapped to the right Win-key and Super to Menu.</_description>
+ <_description>Alt is mapped to Right Win, Super to Menu</_description>
</configItem>
</option>
<option>
<configItem>
<name>altwin:swap_lalt_lwin</name>
- <_description>Left Alt is swapped with left Win-key.</_description>
+ <_description>Left Alt is swapped with Left Win</_description>
</configItem>
</option>
</group>
@@ -4509,43 +4843,43 @@
<option>
<configItem>
<name>compose:ralt</name>
- <_description>Right Alt is Compose.</_description>
+ <_description>Right Alt</_description>
</configItem>
</option>
<option>
<configItem>
<name>compose:lwin</name>
- <_description>Left Win-key is Compose.</_description>
+ <_description>Left Win</_description>
</configItem>
</option>
<option>
<configItem>
<name>compose:rwin</name>
- <_description>Right Win-key is Compose.</_description>
+ <_description>Right Win</_description>
</configItem>
</option>
<option>
<configItem>
<name>compose:menu</name>
- <_description>Menu is Compose.</_description>
+ <_description>Menu</_description>
</configItem>
</option>
<option>
<configItem>
<name>compose:rctrl</name>
- <_description>Right Ctrl is Compose.</_description>
+ <_description>Right Ctrl</_description>
</configItem>
</option>
<option>
<configItem>
<name>compose:caps</name>
- <_description>Caps Lock is Compose.</_description>
+ <_description>Caps Lock</_description>
</configItem>
</option>
<option>
<configItem>
<name>compose:102</name>
- <_description>Less-than/Greater-than is Compose.</_description>
+ <_description>Less-than/Greater-than</_description>
</configItem>
</option>
</group>
@@ -4557,37 +4891,43 @@
<option>
<configItem>
<name>numpad:pc</name>
- <_description>Default numeric keypad keys.</_description>
+ <_description>Default numeric keypad keys</_description>
</configItem>
</option>
<option>
<configItem>
<name>numpad:mac</name>
- <_description>Numeric keypad keys work as with Mac.</_description>
+ <_description>Numeric keypad keys work as with Mac</_description>
</configItem>
</option>
<option>
<configItem>
<name>numpad:microsoft</name>
- <_description>Shift with numeric keypad keys works as in MS Windows.</_description>
+ <_description>Shift with numeric keypad keys works as in MS Windows</_description>
</configItem>
</option>
<option>
<configItem>
- <name>srvrkeys:none</name>
- <_description>Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server.</_description>
+ <name>numpad:shift3</name>
+ <_description>Shift does not cancel NumLock, chooses 3d level instead</_description>
</configItem>
</option>
<option>
<configItem>
- <name>apple:badmap</name>
- <_description>Swap keycodes of two keys when Mac keyboards are misdetected by kernel.</_description>
+ <name>srvrkeys:none</name>
+ <_description>Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server</_description>
</configItem>
</option>
<option>
<configItem>
<name>shift:breaks_caps</name>
- <_description>Shift cancels CapsLock.</_description>
+ <_description>Shift cancels CapsLock</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>misc:typo</name>
+ <_description>Enable extra typographic characters</_description>
</configItem>
</option>
</group>
@@ -4595,30 +4935,30 @@
<!-- Special shortcuts for the Euro character -->
<configItem>
<name>eurosign</name>
- <_description>Adding the EuroSign to certain keys</_description>
+ <_description>Adding EuroSign to certain keys</_description>
</configItem>
<option>
<configItem>
<name>eurosign:e</name>
- <_description>Add the EuroSign to the E key.</_description>
+ <_description>E</_description>
</configItem>
</option>
<option>
<configItem>
<name>eurosign:2</name>
- <_description>Add the EuroSign to the 2 key.</_description>
+ <_description>2</_description>
</configItem>
</option>
<option>
<configItem>
<name>eurosign:4</name>
- <_description>Add the EuroSign to the 4 key.</_description>
+ <_description>4</_description>
</configItem>
</option>
<option>
<configItem>
<name>eurosign:5</name>
- <_description>Add the EuroSign to the 5 key.</_description>
+ <_description>5</_description>
</configItem>
</option>
</group>
@@ -4631,49 +4971,49 @@
<option>
<configItem>
<name>nbsp:none</name>
- <_description>Space key outputs usual space at any level.</_description>
+ <_description>Usual space at any level</_description>
</configItem>
</option>
<option>
<configItem>
<name>nbsp:level2</name>
- <_description>Space key outputs non-breakable space character at second level.</_description>
+ <_description>Non-breakable space character at second level</_description>
</configItem>
</option>
<option>
<configItem>
<name>nbsp:level3</name>
- <_description>Space key outputs non-breakable space character at third level.</_description>
+ <_description>Non-breakable space character at third level</_description>
</configItem>
</option>
<option>
<configItem>
<name>nbsp:level3s</name>
- <_description>Space key outputs non-breakable space character at third level, nothing at fourth level.</_description>
+ <_description>Non-breakable space character at third level, nothing at fourth level</_description>
</configItem>
</option>
<option>
<configItem>
<name>nbsp:level3n</name>
- <_description>Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level</_description>
+ <_description>Non-breakable space character at third level, thin non-breakable space character at fourth level</_description>
</configItem>
</option>
<option>
<configItem>
<name>nbsp:level4</name>
- <_description>Space key outputs non-breakable space character at fourth level.</_description>
+ <_description>Non-breakable space character at fourth level</_description>
</configItem>
</option>
<option>
<configItem>
<name>nbsp:level4n</name>
- <_description>Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level</_description>
+ <_description>Non-breakable space character at fourth level, thin non-breakable space character at sixth level</_description>
</configItem>
</option>
<option>
<configItem>
<name>nbsp:level4nl</name>
- <_description>Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)</_description>
+ <_description>Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)</_description>
</configItem>
</option>
</group>
@@ -4695,5 +5035,35 @@
</configItem>
</option>
</group>
+ <group allowMultipleSelection="false">
+ <configItem>
+ <name>esperanto</name>
+ <_description>Adding Esperanto circumflexes (supersigno)</_description>
+ </configItem>
+ <option>
+ <configItem>
+ <name>esperanto:qwerty</name>
+ <_description>To the corresponding key in a Qwerty keyboard.</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>esperanto:dvorak</name>
+ <_description>To the corresponding key in a Dvorak keyboard.</_description>
+ </configItem>
+ </option>
+ </group>
+ <group allowMultipleSelection="true">
+ <configItem>
+ <name>terminate</name>
+ <_description>Key sequence to kill the X server</_description>
+ </configItem>
+ <option>
+ <configItem>
+ <name>terminate:ctrl_alt_bksp</name>
+ <_description>Control + Alt + Backspace</_description>
+ </configItem>
+ </option>
+ </group>
</optionList>
</xkbConfigRegistry>
diff --git a/xorg-server/xkbdata.src/rules/compat/Makefile.am b/xorg-server/xkbdata.src/rules/compat/Makefile.am
index 331265ae1..20bf3d9a1 100644
--- a/xorg-server/xkbdata.src/rules/compat/Makefile.am
+++ b/xorg-server/xkbdata.src/rules/compat/Makefile.am
@@ -1,14 +1,28 @@
transform_files=layoutRename.lst variantRename.lst
-transform_scripts=ln_s.sh lnv_s.sh ml_s.sh mlv_s.sh ml1_s.sh ml1v_s.sh ml1v1_s.sh
+transform_scripts= \
+ln_s.sh \
+lnv_s.sh \
+ml_s.sh \
+mlv_s.sh \
+ml1_s.sh \
+ml1v_s.sh \
+ml1v1_s.sh
dist_parts=base.o_s.part
-scripts=base.l2_s.part base.l3_s.part base.l4_s.part \
-base.l2v2_s.part base.l3v3_s.part base.l4v4_s.part \
-base.ml_s.part base.ml1_s.part \
-base.mlv_s.part base.ml1v1_s.part \
+scripts= \
+base.l2_s.part \
+base.l3_s.part \
+base.l4_s.part \
+base.l2v2_s.part \
+base.l3v3_s.part \
+base.l4v4_s.part \
+base.ml_s.part \
+base.ml1_s.part \
+base.mlv_s.part \
+base.ml1v1_s.part \
base.ml_s.part
if USE_COMPAT_RULES
diff --git a/xorg-server/xkbdata.src/rules/compat/Makefile.in b/xorg-server/xkbdata.src/rules/compat/Makefile.in
index 10fa254b1..1488a728d 100644
--- a/xorg-server/xkbdata.src/rules/compat/Makefile.in
+++ b/xorg-server/xkbdata.src/rules/compat/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -48,8 +44,6 @@ DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -62,10 +56,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -79,43 +69,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -135,15 +106,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -151,6 +122,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -174,17 +146,36 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
transform_files = layoutRename.lst variantRename.lst
-transform_scripts = ln_s.sh lnv_s.sh ml_s.sh mlv_s.sh ml1_s.sh ml1v_s.sh ml1v1_s.sh
+transform_scripts = \
+ln_s.sh \
+lnv_s.sh \
+ml_s.sh \
+mlv_s.sh \
+ml1_s.sh \
+ml1v_s.sh \
+ml1v1_s.sh
+
dist_parts = base.o_s.part
-scripts = base.l2_s.part base.l3_s.part base.l4_s.part \
-base.l2v2_s.part base.l3v3_s.part base.l4v4_s.part \
-base.ml_s.part base.ml1_s.part \
-base.mlv_s.part base.ml1v1_s.part \
+scripts = \
+base.l2_s.part \
+base.l3_s.part \
+base.l4_s.part \
+base.l2v2_s.part \
+base.l3v3_s.part \
+base.l4v4_s.part \
+base.ml_s.part \
+base.ml1_s.part \
+base.mlv_s.part \
+base.ml1v1_s.part \
base.ml_s.part
@USE_COMPAT_RULES_FALSE@noinst_SCRIPTS =
@@ -198,8 +189,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -223,7 +214,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
tags: TAGS
TAGS:
@@ -232,22 +222,21 @@ CTAGS:
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -307,12 +296,20 @@ info-am:
install-data-am:
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -331,16 +328,19 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
base.l2_s.part: ln_s.sh $(transform_files)
diff --git a/xorg-server/xkbdata.src/rules/compat/ln_s.sh b/xorg-server/xkbdata.src/rules/compat/ln_s.sh
index 00c2f593c..7e17d8851 100644
--- a/xorg-server/xkbdata.src/rules/compat/ln_s.sh
+++ b/xorg-server/xkbdata.src/rules/compat/ln_s.sh
@@ -8,7 +8,11 @@ OUTFILE=base.l${variant}_s.part
> $OUTFILE
awk '{
- printf " %s = +%s%%(v['${variant}']):'${variant}'\n", $1, $2;
+ if (index($2, "(") == 0) {
+ printf " %s = +%s%%(v['${variant}']):'${variant}'\n", $1, $2;
+ } else {
+ printf " %s = +%s:'${variant}'\n", $1, $2;
+ }
}' < $INDIR/layoutRename.lst >> $OUTFILE
awk '{
diff --git a/xorg-server/xkbdata.src/rules/compat/ml1_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1_s.sh
index 210d1b655..327de2d9c 100644
--- a/xorg-server/xkbdata.src/rules/compat/ml1_s.sh
+++ b/xorg-server/xkbdata.src/rules/compat/ml1_s.sh
@@ -6,7 +6,11 @@ OUTFILE=base.ml1_s.part
> $OUTFILE
awk '{
- printf " * %s = pc+%s%%(v[1])\n", $1, $2;
+ if (index($2, "(") == 0) {
+ printf " * %s = pc+%s%%(v[1])\n", $1, $2;
+ } else {
+ printf " * %s = pc+%s\n", $1, $2;
+ }
}' < $INDIR/layoutRename.lst >> $OUTFILE
awk '{
diff --git a/xorg-server/xkbdata.src/rules/compat/variantRename.lst b/xorg-server/xkbdata.src/rules/compat/variantRename.lst
index e6a99e9de..f85a2d0a8 100644
--- a/xorg-server/xkbdata.src/rules/compat/variantRename.lst
+++ b/xorg-server/xkbdata.src/rules/compat/variantRename.lst
@@ -14,6 +14,7 @@ gur basic in guru
ie laptop ie basic
ie CloGaelachLaptop ie CloGaelach
il si1452 ie basic
+in urd in urd-phonetic
iu basic ca ike
lo basic la basic
kan basic in kan
@@ -30,6 +31,7 @@ ro academic ro std
ro std_comma ro std
ro comma ro basic
ru os ru os_legacy
+pk urd pk urd-phonetic
sapmi basic no smi
sapmi nodeadkeys no smi_nodeadkeys
sapmi sefi fi smi
diff --git a/xorg-server/xkbdata.src/rules/evdev.m_k.part b/xorg-server/xkbdata.src/rules/evdev.m_k.part
index 9bae15336..8fa8f8dad 100644
--- a/xorg-server/xkbdata.src/rules/evdev.m_k.part
+++ b/xorg-server/xkbdata.src/rules/evdev.m_k.part
@@ -1,4 +1,2 @@
pc98 = evdev(pc98)
- abnt2 = evdev(abnt2)
- jp106 = evdev(jp106)
* = evdev
diff --git a/xorg-server/xkbdata.src/rules/evdev.m_s.part b/xorg-server/xkbdata.src/rules/evdev.m_s.part
index fd6590d9d..516c976ad 100644
--- a/xorg-server/xkbdata.src/rules/evdev.m_s.part
+++ b/xorg-server/xkbdata.src/rules/evdev.m_s.part
@@ -1 +1,2 @@
- * = +inet(evdev)
+ $evdevkbds = +inet(evdev)+inet(%m)
+ * = +inet(evdev)
diff --git a/xorg-server/xkbdata.src/rules/evdev.xml.in b/xorg-server/xkbdata.src/rules/evdev.xml.in
index 8d0aa921c..996cde84f 100644
--- a/xorg-server/xkbdata.src/rules/evdev.xml.in
+++ b/xorg-server/xkbdata.src/rules/evdev.xml.in
@@ -88,13 +88,6 @@
</model>
<model>
<configItem>
- <name>jp106</name>
- <_description>Japanese 106-key</_description>
- <vendor>Generic</vendor>
- </configItem>
- </model>
- <model>
- <configItem>
<name>pc98</name>
<_description>PC-98xx Series</_description>
<vendor>Generic</vendor>
@@ -123,13 +116,6 @@
</model>
<model>
<configItem>
- <name>abnt2</name>
- <_description>Brazilian ABNT2</_description>
- <vendor>Generic</vendor>
- </configItem>
- </model>
- <model>
- <configItem>
<name>airkey</name>
<_description>Acer AirKey V</_description>
<vendor>Acer</vendor>
@@ -221,6 +207,12 @@
</model>
<model>
<configItem>
+ <name>btc9116u</name>
+ <_description>BTC 9116U Mini Wireless Internet and Gaming</_description>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>cherryblue</name>
<_description>Cherry Blue Line CyBo@rd</_description>
</configItem>
@@ -248,6 +240,20 @@
</model>
<model>
<configItem>
+ <name>cherrycmexpert</name>
+ <_description>Cherry CyMotion Expert</_description>
+ <vendor>Cherry</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
+ <name>cherrybunlim</name>
+ <_description>Cherry B.UNLIMITED</_description>
+ <vendor>Cherry</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>chicony</name>
<_description>Chicony Internet Keyboard</_description>
<vendor>Chicony</vendor>
@@ -262,6 +268,13 @@
</model>
<model>
<configItem>
+ <name>chicony0420</name>
+ <_description>Chicony KU-0420</_description>
+ <vendor>Chicony</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>chicony9885</name>
<_description>Chicony KB-9885</_description>
<vendor>Chicony</vendor>
@@ -395,7 +408,7 @@
<model>
<configItem>
<name>fscaa1667g</name>
- <_description>Fujitsu-Siemens Computers AMILO A1667G laptop</_description>
+ <_description>Fujitsu-Siemens Computers AMILO laptop</_description>
<vendor>Fujitsu-Siemens</vendor>
</configItem>
</model>
@@ -429,6 +442,13 @@
</model>
<model>
<configItem>
+ <name>geniuskkb2050hs</name>
+ <_description>Genius KKB-2050HS</_description>
+ <vendor>Genius</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>gyration</name>
<_description>Gyration</_description>
<vendor>Gyration</vendor>
@@ -457,15 +477,8 @@
</model>
<model>
<configItem>
- <name>hp2501</name>
- <_description>Hewlett-Packard SK-2501 Multimedia Keyboard</_description>
- <vendor>Hewlett-Packard</vendor>
- </configItem>
- </model>
- <model>
- <configItem>
- <name>hp2505</name>
- <_description>Hewlett-Packard SK-2505 Internet Keyboard</_description>
+ <name>hp250x</name>
+ <_description>Hewlett-Packard SK-250x Multimedia Keyboard</_description>
<vendor>Hewlett-Packard</vendor>
</configItem>
</model>
@@ -492,6 +505,13 @@
</model>
<model>
<configItem>
+ <name>hpdv5</name>
+ <_description>Hewlett-Packard Pavilion dv5</_description>
+ <vendor>Hewlett-Packard</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>hpzt11xx</name>
<_description>Hewlett-Packard Pavilion ZT11xx</_description>
<vendor>Hewlett-Packard</vendor>
@@ -513,20 +533,6 @@
</model>
<model>
<configItem>
- <name>hp5181</name>
- <_description>Hewlett-Packard Internet Keyboard 5181</_description>
- <vendor>Hewlett-Packard</vendor>
- </configItem>
- </model>
- <model>
- <configItem>
- <name>hp5185</name>
- <_description>Hewlett-Packard Internet Keyboard 5185</_description>
- <vendor>Hewlett-Packard</vendor>
- </configItem>
- </model>
- <model>
- <configItem>
<name>hpnx9020</name>
<_description>Hewlett-Packard nx9020</_description>
<vendor>Hewlett-Packard</vendor>
@@ -562,13 +568,6 @@
</model>
<model>
<configItem>
- <name>rapidaccess2a</name>
- <_description>IBM Rapid Access II (alternate option)</_description>
- <vendor>IBM</vendor>
- </configItem>
- </model>
- <model>
- <configItem>
<name>thinkpad</name>
<_description>IBM ThinkPad 560Z/600/600E/A22E</_description>
<vendor>IBM</vendor>
@@ -668,7 +667,7 @@
<model>
<configItem>
<name>logicdpa2</name>
- <_description>Logitech Cordless Desktop Pro (alternate option2)</_description>
+ <_description>Logitech Cordless Desktop Pro (alternate option 2)</_description>
<vendor>Logitech</vendor>
</configItem>
</model>
@@ -856,6 +855,13 @@
</model>
<model>
<configItem>
+ <name>microsoftccurve2k</name>
+ <_description>Microsoft Comfort Curve Keyboard 2000</_description>
+ <vendor>Microsoft Inc.</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>oretec</name>
<_description>Ortek MCK-800 MM/Internet keyboard</_description>
<vendor>Ortek</vendor>
@@ -968,6 +974,13 @@
</model>
<model>
<configItem>
+ <name>trust_slimline</name>
+ <_description>Trust Slimline</_description>
+ <vendor>Trust</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>yahoo</name>
<_description>Yahoo! Internet Keyboard</_description>
<vendor>Yahoo!</vendor>
@@ -1066,13 +1079,6 @@
</model>
<model>
<configItem>
- <name>kr106</name>
- <_description>Korean 106-key</_description>
- <vendor>Generic</vendor>
- </configItem>
- </model>
- <model>
- <configItem>
<name>evdev</name>
<_description>Evdev-managed keyboard</_description>
<vendor>Generic</vendor>
@@ -1127,6 +1133,27 @@
<vendor>Sun Microsystems</vendor>
</configItem>
</model>
+ <model>
+ <configItem>
+ <name>targa_v811</name>
+ <_description>Targa Visionary 811</_description>
+ <vendor>Targa</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
+ <name>unitekkb1925</name>
+ <_description>Unitek KB-1925</_description>
+ <vendor>Unitek Group</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
+ <name>compalfl90</name>
+ <_description>FL90</_description>
+ <vendor>Compal Electronics Inc.</vendor>
+ </configItem>
+ </model>
</modelList>
<layoutList>
<layout>
@@ -1451,6 +1478,24 @@
<variantList>
<variant>
<configItem>
+ <name>oss</name>
+ <_description>Alternative</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>oss_latin9</name>
+ <_description>Alternative, latin-9 only</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>oss_sundeadkeys</name>
+ <_description>Alternative, Sun dead keys</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>iso-alternate</name>
<_description>ISO Alternate</_description>
</configItem>
@@ -1598,8 +1643,22 @@
</variant>
<variant>
<configItem>
- <name>urd</name>
- <_description>Urdu</_description>
+ <name>urd-phonetic</name>
+ <_description>Urdu, Phonetic</_description>
+ <languageList><iso639Id>urd</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>urd-phonetic3</name>
+ <_description>Urdu, Alternative phonetic</_description>
+ <languageList><iso639Id>urd</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>urd-winkeys</name>
+ <_description>Urdu, Winkeys</_description>
<languageList><iso639Id>urd</iso639Id></languageList>
</configItem>
</variant>
@@ -1610,6 +1669,13 @@
<languageList><iso639Id>hin</iso639Id></languageList>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>hin-wx</name>
+ <_description>Hindi Wx</_description>
+ <languageList><iso639Id>hin</iso639Id></languageList>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -1698,7 +1764,15 @@
<variant>
<configItem>
<name>phonetic</name>
- <_description>Phonetic</_description>
+ <_description>Traditional Phonetic</_description>
+ </configItem>
+ </variant>
+ </variantList>
+ <variantList>
+ <variant>
+ <configItem>
+ <name>bas_phonetic</name>
+ <_description>Standard Phonetic</_description>
</configItem>
</variant>
</variantList>
@@ -1827,6 +1901,13 @@
<_description>Ktunaxa</_description>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>eng</name>
+ <_description>English</_description>
+ <languageList><iso639Id>eng</iso639Id></languageList>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -2157,7 +2238,8 @@
<configItem>
<name>smi</name>
<_description>Northern Saami</_description>
- <languageList><iso639Id>smi</iso639Id></languageList>
+ <languageList><iso639Id>smi</iso639Id>
+ <iso639Id>sme</iso639Id></languageList>
</configItem>
</variant>
<variant>
@@ -2262,6 +2344,19 @@
</variant>
<variant>
<configItem>
+ <name>bre</name>
+ <_description>Breton</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>oci</name>
+ <_description>Occitan</_description>
+ <languageList><iso639Id>oci</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>geo</name>
<_description>Georgian AZERTY Tskapo</_description>
<languageList><iso639Id>geo</iso639Id></languageList>
@@ -2418,7 +2513,7 @@
<variant>
<configItem>
<name>neo</name>
- <_description>Neostyle</_description>
+ <_description>Neo 2</_description>
</configItem>
</variant>
<variant>
@@ -2433,6 +2528,26 @@
<_description>Macintosh, eliminate dead keys</_description>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>dsb</name>
+ <_description>Lower Sorbian</_description>
+ <languageList><iso639Id>dsb</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>dsb_qwertz</name>
+ <_description>Lower Sorbian (qwertz)</_description>
+ <languageList><iso639Id>dsb</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>qwerty</name>
+ <_description>qwerty</_description>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -2714,11 +2829,18 @@
<layout>
<configItem>
<name>kg</name>
- <_shortDescription>Kir</_shortDescription>
+ <_shortDescription>Kgz</_shortDescription>
<_description>Kyrgyzstan</_description>
<languageList><iso639Id>kir</iso639Id></languageList>
</configItem>
- <variantList/>
+ <variantList>
+ <variant>
+ <configItem>
+ <name>phonetic</name>
+ <_description>Phonetic</_description>
+ </configItem>
+ </variant>
+ </variantList>
</layout>
<layout>
<configItem>
@@ -2787,6 +2909,8 @@
<iso3166Id>PE</iso3166Id>
<iso3166Id>PR</iso3166Id>
<iso3166Id>PY</iso3166Id>
+ <iso3166Id>SV</iso3166Id>
+ <iso3166Id>US</iso3166Id>
<iso3166Id>UY</iso3166Id>
<iso3166Id>VE</iso3166Id>
</countryList>
@@ -2801,6 +2925,12 @@
</variant>
<variant>
<configItem>
+ <name>deadtilde</name>
+ <_description>Include dead tilde</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>sundeadkeys</name>
<_description>Sun dead keys</_description>
</configItem>
@@ -3060,7 +3190,7 @@
<variant>
<configItem>
<name>dvorak_altquotes</name>
- <_description>Dvorak, Polish quotes on key "1/!"</_description>
+ <_description>Dvorak, Polish quotes on key 1</_description>
</configItem>
</variant>
<variant>
@@ -3170,6 +3300,34 @@
<_description>Winkeys</_description>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>crh_f</name>
+ <_description>Crimean Tatar (Turkish F)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>crh_alt</name>
+ <_description>Crimean Tatar (Turkish Alt-Q)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>crh_dobruca1</name>
+ <_description>Crimean Tatar (Dobruca-1 Q)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>crh_dobruca2</name>
+ <_description>Crimean Tatar (Dobruca-2 Q)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -3188,6 +3346,12 @@
</variant>
<variant>
<configItem>
+ <name>phonetic_winkeys</name>
+ <_description>Phonetic Winkeys</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>typewriter</name>
<_description>Typewriter</_description>
</configItem>
@@ -3254,6 +3418,19 @@
<languageList><iso639Id>sah</iso639Id></languageList>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>xal</name>
+ <_description>Kalmyk</_description>
+ <languageList><iso639Id>xal</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>dos</name>
+ <_description>DOS</_description>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -3324,18 +3501,6 @@
</variant>
<variant>
<configItem>
- <name>unicode</name>
- <_description>Use Slovenian digraphs</_description>
- </configItem>
- </variant>
- <variant>
- <configItem>
- <name>unicodeus</name>
- <_description>US keyboard with Slovenian digraphs</_description>
- </configItem>
- </variant>
- <variant>
- <configItem>
<name>us</name>
<_description>US keyboard with Slovenian letters</_description>
</configItem>
@@ -3386,6 +3551,12 @@
</variant>
<variant>
<configItem>
+ <name>deadtilde</name>
+ <_description>Include dead tilde</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>sundeadkeys</name>
<_description>Sun dead keys</_description>
</configItem>
@@ -3580,7 +3751,14 @@
<_description>Tajikistan</_description>
<languageList><iso639Id>tgk</iso639Id></languageList>
</configItem>
- <variantList/>
+ <variantList>
+ <variant>
+ <configItem>
+ <name>legacy</name>
+ <_description>Legacy</_description>
+ </configItem>
+ </variant>
+ </variantList>
</layout>
<layout>
<configItem>
@@ -3681,6 +3859,27 @@
<_description>International (with dead keys)</_description>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>crh</name>
+ <_description>Crimean Tatar (Turkish Q)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>crh_f</name>
+ <_description>Crimean Tatar (Turkish F)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>crh_alt</name>
+ <_description>Crimean Tatar (Turkish Alt-Q)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -3711,8 +3910,8 @@
</variant>
<variant>
<configItem>
- <name>unicode</name>
- <_description>Unicode</_description>
+ <name>legacy</name>
+ <_description>Legacy</_description>
</configItem>
</variant>
<variant>
@@ -3735,6 +3934,27 @@
<_description>Homophonic</_description>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>crh</name>
+ <_description>Crimean Tatar (Turkish Q)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>crh_f</name>
+ <_description>Crimean Tatar (Turkish F)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>crh_alt</name>
+ <_description>Crimean Tatar (Turkish Alt-Q)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -3747,6 +3967,12 @@
<variantList>
<variant>
<configItem>
+ <name>extd</name>
+ <_description>Extended - Winkeys</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>intl</name>
<_description>International (with dead keys)</_description>
</configItem>
@@ -3791,6 +4017,27 @@
<_description>Latin</_description>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>crh</name>
+ <_description>Crimean Tatar (Turkish Q)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>crh_f</name>
+ <_description>Crimean Tatar (Turkish F)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>crh_alt</name>
+ <_description>Crimean Tatar (Turkish Alt-Q)</_description>
+ <languageList><iso639Id>crh</iso639Id></languageList>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -3875,6 +4122,20 @@
<variantList>
<variant>
<configItem>
+ <name>urd-crulp</name>
+ <_description>CRULP</_description>
+ <languageList><iso639Id>urd</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>urd-nla</name>
+ <_description>NLA</_description>
+ <languageList><iso639Id>urd</iso639Id></languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>ara</name>
<_description>Arabic</_description>
<languageList><iso639Id>ara</iso639Id></languageList>
@@ -3965,7 +4226,16 @@
</layout>
<layout>
<configItem>
- <name>braille</name>
+ <name>sn</name>
+ <shortDescription>Sen</shortDescription>
+ <description>Senegal</description>
+ <languageList><iso639Id>wol</iso639Id></languageList>
+ </configItem>
+ <variantList/>
+ </layout>
+ <layout>
+ <configItem>
+ <name>brai</name>
<_shortDescription>Brl</_shortDescription>
<_description>Braille</_description>
</configItem>
@@ -3984,174 +4254,208 @@
</variant>
</variantList>
</layout>
+ <layout>
+ <configItem>
+ <name>tm</name>
+ <shortDescription>Tkm</shortDescription>
+ <_description>Turkmenistan</_description>
+ <languageList><iso639Id>tuk</iso639Id></languageList>
+ </configItem>
+ <variantList>
+ <variant>
+ <configItem>
+ <name>alt</name>
+ <_description>Alt-Q</_description>
+ </configItem>
+ </variant>
+ </variantList>
+ </layout>
</layoutList>
<optionList>
<group allowMultipleSelection="true">
<!-- The key combination used to switch between groups -->
<configItem>
<name>grp</name>
- <_description>Layout switching</_description>
+ <_description>Key(s) to change layout</_description>
</configItem>
<option>
<configItem>
<name>grp:switch</name>
- <_description>R-Alt switches layout while pressed.</_description>
+ <_description>Right Alt (while pressed)</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:lswitch</name>
- <_description>Left Alt key switches layout while pressed.</_description>
+ <_description>Left Alt (while pressed)</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:lwin_switch</name>
- <_description>Left Win-key switches layout while pressed.</_description>
+ <_description>Left Win (while pressed)</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:rwin_switch</name>
- <_description>Right Win-key switches layout while pressed.</_description>
+ <_description>Right Win (while pressed)</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:win_switch</name>
- <_description>Both Win-keys switch layout while pressed.</_description>
+ <_description>Any Win key (while pressed)</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:caps_switch</name>
- <_description>CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action.</_description>
+ <_description>CapsLock (while pressed), Alt+CapsLock does the original capslock action</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:rctrl_switch</name>
- <_description>Right Ctrl key switches layout while pressed.</_description>
+ <_description>Right Ctrl (while pressed)</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:toggle</name>
- <_description>Right Alt key changes layout.</_description>
+ <_description>Right Alt</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:lalt_toggle</name>
- <_description>Left Alt key changes layout.</_description>
+ <_description>Left Alt</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:caps_toggle</name>
- <_description>CapsLock key changes layout.</_description>
+ <_description>CapsLock</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:shift_caps_toggle</name>
- <_description>Shift+CapsLock changes layout.</_description>
+ <_description>Shift+CapsLock</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:shift_caps_switch</name>
- <_description>CapsLock switch to first layout, Shift+CapsLock switch to last layout.</_description>
+ <_description>CapsLock (to first layout), Shift+CapsLock (to last layout)</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>grp:win_menu_switch</name>
+ <_description>Left Win (to first layout), Right Win/Menu (to last layout)</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:alt_caps_toggle</name>
- <_description>Alt+CapsLock changes layout.</_description>
+ <_description>Alt+CapsLock</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:shifts_toggle</name>
- <_description>Both Shift keys together change layout.</_description>
+ <_description>Both Shift keys together</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:alts_toggle</name>
- <_description>Both Alt keys together change layout.</_description>
+ <_description>Both Alt keys together</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:ctrls_toggle</name>
- <_description>Both Ctrl keys together change layout.</_description>
+ <_description>Both Ctrl keys together</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:ctrl_shift_toggle</name>
- <_description>Ctrl+Shift change layout.</_description>
+ <_description>Ctrl+Shift</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:lctrl_lshift_toggle</name>
- <_description>LCtrl+LShift change layout.</_description>
+ <_description>Left Ctrl+Left Shift</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:ctrl_alt_toggle</name>
- <_description>Alt+Ctrl change layout.</_description>
+ <_description>Alt+Ctrl</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:alt_shift_toggle</name>
- <_description>Alt+Shift change layout.</_description>
+ <_description>Alt+Shift</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>grp:alt_space_toggle</name>
+ <_description>Alt+Space</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:menu_toggle</name>
- <_description>Menu key changes layout.</_description>
+ <_description>Menu</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:lwin_toggle</name>
- <_description>Left Win-key changes layout.</_description>
+ <_description>Left Win</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:rwin_toggle</name>
- <_description>Right Win-key changes layout.</_description>
+ <_description>Right Win</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:lshift_toggle</name>
- <_description>Left Shift key changes layout.</_description>
+ <_description>Left Shift</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:rshift_toggle</name>
- <_description>Right Shift key changes layout.</_description>
+ <_description>Right Shift</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:lctrl_toggle</name>
- <_description>Left Ctrl key changes layout.</_description>
+ <_description>Left Ctrl</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp:rctrl_toggle</name>
- <_description>Right Ctrl key changes layout.</_description>
+ <_description>Right Ctrl</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>grp:sclk_toggle</name>
+ <_description>Scroll Lock</_description>
</configItem>
</option>
</group>
@@ -4160,66 +4464,72 @@
level of symbols -->
<configItem>
<name>lv3</name>
- <_description>Third level choosers</_description>
+ <_description>Key to choose 3rd level</_description>
</configItem>
<option>
<configItem>
<name>lv3:switch</name>
- <_description>Press Right Ctrl to choose 3rd level.</_description>
+ <_description>Right Ctrl</_description>
</configItem>
</option>
<option>
<configItem>
<name>lv3:menu_switch</name>
- <_description>Press Menu key to choose 3rd level.</_description>
+ <_description>Menu</_description>
</configItem>
</option>
<option>
<configItem>
<name>lv3:win_switch</name>
- <_description>Press any of Win-keys to choose 3rd level.</_description>
+ <_description>Any Win key</_description>
</configItem>
</option>
<option>
<configItem>
<name>lv3:lwin_switch</name>
- <_description>Press Left Win-key to choose 3rd level.</_description>
+ <_description>Left Win</_description>
</configItem>
</option>
<option>
<configItem>
<name>lv3:rwin_switch</name>
- <_description>Press Right Win-key to choose 3rd level.</_description>
+ <_description>Right Win</_description>
</configItem>
</option>
<option>
<configItem>
<name>lv3:alt_switch</name>
- <_description>Press any of Alt keys to choose 3rd level.</_description>
+ <_description>Any Alt key</_description>
</configItem>
</option>
<option>
<configItem>
<name>lv3:lalt_switch</name>
- <_description>Press Left Alt key to choose 3rd level.</_description>
+ <_description>Left Alt</_description>
</configItem>
</option>
<option>
<configItem>
<name>lv3:ralt_switch</name>
- <_description>Press Right Alt key to choose 3rd level.</_description>
+ <_description>Right Alt</_description>
</configItem>
</option>
<option>
<configItem>
<name>lv3:ralt_switch_multikey</name>
- <_description>Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key.</_description>
+ <_description>Right Alt, Shift+Right Alt key is Multi_Key</_description>
</configItem>
</option>
<option>
<configItem>
<name>lv3:ralt_alt</name>
- <_description>Right Alt key never chooses 3rd level.</_description>
+ <_description>Right Alt key never chooses 3rd level</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>lv3:enter_switch</name>
+ <_description>Enter on keypad</_description>
</configItem>
</option>
</group>
@@ -4232,31 +4542,31 @@
<option>
<configItem>
<name>ctrl:nocaps</name>
- <_description>Make CapsLock an additional Ctrl.</_description>
+ <_description>Make CapsLock an additional Ctrl</_description>
</configItem>
</option>
<option>
<configItem>
<name>ctrl:swapcaps</name>
- <_description>Swap Ctrl and CapsLock.</_description>
+ <_description>Swap Ctrl and CapsLock</_description>
</configItem>
</option>
<option>
<configItem>
<name>ctrl:ctrl_ac</name>
- <_description>Ctrl key at left of 'A'</_description>
+ <_description>At left of 'A'</_description>
</configItem>
</option>
<option>
<configItem>
<name>ctrl:ctrl_aa</name>
- <_description>Ctrl key at bottom left</_description>
+ <_description>At bottom left</_description>
</configItem>
</option>
<option>
<configItem>
<name>ctrl:ctrl_ra</name>
- <_description>Right Ctrl key works as Right Alt.</_description>
+ <_description>Right Ctrl as Right Alt</_description>
</configItem>
</option>
</group>
@@ -4264,24 +4574,24 @@
<!-- Using startard LEDs to indicate the alternative (not first) group(s) -->
<configItem>
<name>grp_led</name>
- <_description>Use keyboard LED to show alternative layout.</_description>
+ <_description>Use keyboard LED to show alternative layout</_description>
</configItem>
<option>
<configItem>
<name>grp_led:num</name>
- <_description>NumLock LED shows alternative layout.</_description>
+ <_description>NumLock</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp_led:caps</name>
- <_description>CapsLock LED shows alternative layout.</_description>
+ <_description>CapsLock</_description>
</configItem>
</option>
<option>
<configItem>
<name>grp_led:scroll</name>
- <_description>ScrollLock LED shows alternative layout.</_description>
+ <_description>ScrollLock</_description>
</configItem>
</option>
</group>
@@ -4294,25 +4604,25 @@
<option>
<configItem>
<name>keypad:legacy</name>
- <_description>Legacy keypad</_description>
+ <_description>Legacy</_description>
</configItem>
</option>
<option>
<configItem>
<name>keypad:oss</name>
- <_description>Keypad with unicode additions (arrows and math operators)</_description>
+ <_description>Unicode additions (arrows and math operators)</_description>
</configItem>
</option>
<option>
<configItem>
<name>keypad:future</name>
- <_description>Keypad with unicode additions (arrows and math operators). Math operators on default level.</_description>
+ <_description>Unicode additions (arrows and math operators). Math operators on default level</_description>
</configItem>
</option>
<option>
<configItem>
<name>keypad:legacy_wang</name>
- <_description>Legacy Wang 724 keypad</_description>
+ <_description>Legacy Wang 724</_description>
</configItem>
</option>
<option>
@@ -4324,14 +4634,20 @@
<option>
<configItem>
<name>keypad:future_wang</name>
- <_description>Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level.</_description>
+ <_description>Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level</_description>
</configItem>
</option>
<option>
<configItem>
- <name>keypad:phone_hex</name>
- <_description>ATM/phone-style hexadecimal keypad</_description>
- </configItem>
+ <name>keypad:hex</name>
+ <_description>Hexadecimal</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>keypad:atm</name>
+ <_description>ATM/phone-style</_description>
+ </configItem>
</option>
</group>
<!-- This option should override the KPDL key defined in keypad; I hope it's declared in the right place -->
@@ -4387,6 +4703,12 @@
<_description>Four-level key with abstract separators</_description>
</configItem>
</option>
+ <option>
+ <configItem>
+ <name>kpdl:semi</name>
+ <_description>Semi-colon on third level</_description>
+ </configItem>
+ </option>
</group>
<group allowMultipleSelection="false">
<!-- CapsLock tweaks.
@@ -4399,43 +4721,55 @@
<option>
<configItem>
<name>caps:internal</name>
- <_description>CapsLock uses internal capitalization. Shift "pauses" CapsLock.</_description>
+ <_description>CapsLock uses internal capitalization. Shift "pauses" CapsLock</_description>
</configItem>
</option>
<option>
<configItem>
<name>caps:internal_nocancel</name>
- <_description>CapsLock uses internal capitalization. Shift doesn't affect CapsLock.</_description>
+ <_description>CapsLock uses internal capitalization. Shift doesn't affect CapsLock</_description>
</configItem>
</option>
<option>
<configItem>
<name>caps:shift</name>
- <_description>CapsLock acts as Shift with locking. Shift "pauses" CapsLock.</_description>
+ <_description>CapsLock acts as Shift with locking. Shift "pauses" CapsLock</_description>
</configItem>
</option>
<option>
<configItem>
<name>caps:shift_nocancel</name>
- <_description>CapsLock acts as Shift with locking. Shift doesn't affect CapsLock.</_description>
+ <_description>CapsLock acts as Shift with locking. Shift doesn't affect CapsLock</_description>
</configItem>
</option>
<option>
<configItem>
<name>caps:capslock</name>
- <_description>CapsLock toggles normal capitalization of alphabetic characters.</_description>
+ <_description>CapsLock toggles normal capitalization of alphabetic characters</_description>
</configItem>
</option>
<option>
<configItem>
<name>caps:swapescape</name>
- <_description>Swap ESC and CapsLock.</_description>
+ <_description>Swap ESC and CapsLock</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>caps:escape</name>
+ <_description>Make CapsLock an additional ESC</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>caps:backspace</name>
+ <_description>Make CapsLock an additional Backspace</_description>
</configItem>
</option>
<option>
<configItem>
<name>caps:shiftlock</name>
- <_description>CapsLock toggles Shift so all keys are affected.</_description>
+ <_description>CapsLock toggles Shift so all keys are affected</_description>
</configItem>
</option>
</group>
@@ -4448,55 +4782,55 @@
<option>
<configItem>
<name>altwin:menu</name>
- <_description>Add the standard behavior to Menu key.</_description>
+ <_description>Add the standard behavior to Menu key</_description>
</configItem>
</option>
<option>
<configItem>
<name>altwin:meta_alt</name>
- <_description>Alt and Meta are on the Alt keys.</_description>
+ <_description>Alt and Meta are on Alt keys</_description>
</configItem>
</option>
<option>
<configItem>
<name>altwin:ctrl_win</name>
- <_description>Control is mapped to the Win-keys (and the usual Ctrl keys).</_description>
+ <_description>Control is mapped to Win keys (and the usual Ctrl keys)</_description>
</configItem>
</option>
<option>
<configItem>
- <name>altwin:meta_win</name>
- <_description>Meta is mapped to the Win-keys.</_description>
+ <name>altwin:ctrl_alt_win</name>
+ <_description>Control is mapped to Alt keys, Alt is mapped to Win keys</_description>
</configItem>
</option>
<option>
<configItem>
- <name>altwin:left_meta_win</name>
- <_description>Meta is mapped to the left Win-key.</_description>
+ <name>altwin:meta_win</name>
+ <_description>Meta is mapped to Win keys</_description>
</configItem>
</option>
<option>
<configItem>
- <name>altwin:super_win</name>
- <_description>Super is mapped to the Win-keys.</_description>
+ <name>altwin:left_meta_win</name>
+ <_description>Meta is mapped to Left Win</_description>
</configItem>
</option>
<option>
<configItem>
<name>altwin:hyper_win</name>
- <_description>Hyper is mapped to the Win-keys.</_description>
+ <_description>Hyper is mapped to Win-keys</_description>
</configItem>
</option>
<option>
<configItem>
<name>altwin:alt_super_win</name>
- <_description>Alt is mapped to the right Win-key and Super to Menu.</_description>
+ <_description>Alt is mapped to Right Win, Super to Menu</_description>
</configItem>
</option>
<option>
<configItem>
<name>altwin:swap_lalt_lwin</name>
- <_description>Left Alt is swapped with left Win-key.</_description>
+ <_description>Left Alt is swapped with Left Win</_description>
</configItem>
</option>
</group>
@@ -4509,43 +4843,43 @@
<option>
<configItem>
<name>compose:ralt</name>
- <_description>Right Alt is Compose.</_description>
+ <_description>Right Alt</_description>
</configItem>
</option>
<option>
<configItem>
<name>compose:lwin</name>
- <_description>Left Win-key is Compose.</_description>
+ <_description>Left Win</_description>
</configItem>
</option>
<option>
<configItem>
<name>compose:rwin</name>
- <_description>Right Win-key is Compose.</_description>
+ <_description>Right Win</_description>
</configItem>
</option>
<option>
<configItem>
<name>compose:menu</name>
- <_description>Menu is Compose.</_description>
+ <_description>Menu</_description>
</configItem>
</option>
<option>
<configItem>
<name>compose:rctrl</name>
- <_description>Right Ctrl is Compose.</_description>
+ <_description>Right Ctrl</_description>
</configItem>
</option>
<option>
<configItem>
<name>compose:caps</name>
- <_description>Caps Lock is Compose.</_description>
+ <_description>Caps Lock</_description>
</configItem>
</option>
<option>
<configItem>
<name>compose:102</name>
- <_description>Less-than/Greater-than is Compose.</_description>
+ <_description>Less-than/Greater-than</_description>
</configItem>
</option>
</group>
@@ -4557,37 +4891,43 @@
<option>
<configItem>
<name>numpad:pc</name>
- <_description>Default numeric keypad keys.</_description>
+ <_description>Default numeric keypad keys</_description>
</configItem>
</option>
<option>
<configItem>
<name>numpad:mac</name>
- <_description>Numeric keypad keys work as with Mac.</_description>
+ <_description>Numeric keypad keys work as with Mac</_description>
</configItem>
</option>
<option>
<configItem>
<name>numpad:microsoft</name>
- <_description>Shift with numeric keypad keys works as in MS Windows.</_description>
+ <_description>Shift with numeric keypad keys works as in MS Windows</_description>
</configItem>
</option>
<option>
<configItem>
- <name>srvrkeys:none</name>
- <_description>Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server.</_description>
+ <name>numpad:shift3</name>
+ <_description>Shift does not cancel NumLock, chooses 3d level instead</_description>
</configItem>
</option>
<option>
<configItem>
- <name>apple:badmap</name>
- <_description>Swap keycodes of two keys when Mac keyboards are misdetected by kernel.</_description>
+ <name>srvrkeys:none</name>
+ <_description>Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server</_description>
</configItem>
</option>
<option>
<configItem>
<name>shift:breaks_caps</name>
- <_description>Shift cancels CapsLock.</_description>
+ <_description>Shift cancels CapsLock</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>misc:typo</name>
+ <_description>Enable extra typographic characters</_description>
</configItem>
</option>
</group>
@@ -4595,30 +4935,30 @@
<!-- Special shortcuts for the Euro character -->
<configItem>
<name>eurosign</name>
- <_description>Adding the EuroSign to certain keys</_description>
+ <_description>Adding EuroSign to certain keys</_description>
</configItem>
<option>
<configItem>
<name>eurosign:e</name>
- <_description>Add the EuroSign to the E key.</_description>
+ <_description>E</_description>
</configItem>
</option>
<option>
<configItem>
<name>eurosign:2</name>
- <_description>Add the EuroSign to the 2 key.</_description>
+ <_description>2</_description>
</configItem>
</option>
<option>
<configItem>
<name>eurosign:4</name>
- <_description>Add the EuroSign to the 4 key.</_description>
+ <_description>4</_description>
</configItem>
</option>
<option>
<configItem>
<name>eurosign:5</name>
- <_description>Add the EuroSign to the 5 key.</_description>
+ <_description>5</_description>
</configItem>
</option>
</group>
@@ -4631,49 +4971,49 @@
<option>
<configItem>
<name>nbsp:none</name>
- <_description>Space key outputs usual space at any level.</_description>
+ <_description>Usual space at any level</_description>
</configItem>
</option>
<option>
<configItem>
<name>nbsp:level2</name>
- <_description>Space key outputs non-breakable space character at second level.</_description>
+ <_description>Non-breakable space character at second level</_description>
</configItem>
</option>
<option>
<configItem>
<name>nbsp:level3</name>
- <_description>Space key outputs non-breakable space character at third level.</_description>
+ <_description>Non-breakable space character at third level</_description>
</configItem>
</option>
<option>
<configItem>
<name>nbsp:level3s</name>
- <_description>Space key outputs non-breakable space character at third level, nothing at fourth level.</_description>
+ <_description>Non-breakable space character at third level, nothing at fourth level</_description>
</configItem>
</option>
<option>
<configItem>
<name>nbsp:level3n</name>
- <_description>Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level</_description>
+ <_description>Non-breakable space character at third level, thin non-breakable space character at fourth level</_description>
</configItem>
</option>
<option>
<configItem>
<name>nbsp:level4</name>
- <_description>Space key outputs non-breakable space character at fourth level.</_description>
+ <_description>Non-breakable space character at fourth level</_description>
</configItem>
</option>
<option>
<configItem>
<name>nbsp:level4n</name>
- <_description>Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level</_description>
+ <_description>Non-breakable space character at fourth level, thin non-breakable space character at sixth level</_description>
</configItem>
</option>
<option>
<configItem>
<name>nbsp:level4nl</name>
- <_description>Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)</_description>
+ <_description>Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)</_description>
</configItem>
</option>
</group>
@@ -4695,5 +5035,35 @@
</configItem>
</option>
</group>
+ <group allowMultipleSelection="false">
+ <configItem>
+ <name>esperanto</name>
+ <_description>Adding Esperanto circumflexes (supersigno)</_description>
+ </configItem>
+ <option>
+ <configItem>
+ <name>esperanto:qwerty</name>
+ <_description>To the corresponding key in a Qwerty keyboard.</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>esperanto:dvorak</name>
+ <_description>To the corresponding key in a Dvorak keyboard.</_description>
+ </configItem>
+ </option>
+ </group>
+ <group allowMultipleSelection="true">
+ <configItem>
+ <name>terminate</name>
+ <_description>Key sequence to kill the X server</_description>
+ </configItem>
+ <option>
+ <configItem>
+ <name>terminate:ctrl_alt_bksp</name>
+ <_description>Control + Alt + Backspace</_description>
+ </configItem>
+ </option>
+ </group>
</optionList>
</xkbConfigRegistry>
diff --git a/xorg-server/xkbdata.src/rules/merge.sh b/xorg-server/xkbdata.src/rules/merge.sh
index 8dfde5546..b18af7c3d 100644
--- a/xorg-server/xkbdata.src/rules/merge.sh
+++ b/xorg-server/xkbdata.src/rules/merge.sh
@@ -1,5 +1,6 @@
-#!/bin/bash
+#!/bin/sh
+INDIR=`dirname $0`
DEST=$1
shift
@@ -11,12 +12,14 @@ 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
+ 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 $i >> $DEST;
+ cat $INDIR/$i >> $DEST || exit 1
fi
done < $HDR
diff --git a/xorg-server/xkbdata.src/semantics/Makefile.in b/xorg-server/xkbdata.src/semantics/Makefile.in
index c1481f10e..e410713f8 100644
--- a/xorg-server/xkbdata.src/semantics/Makefile.in
+++ b/xorg-server/xkbdata.src/semantics/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -18,15 +18,11 @@
# Replaces Imake's MakeXkbDir() rule
# svu: taken from xkbdata
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -63,8 +59,6 @@ DATA = $(dist_dir_DATA) $(dist_semantics_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -77,10 +71,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -94,43 +84,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -150,15 +121,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -166,6 +137,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -189,8 +161,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
semanticsdir = $(xkb_base)/semantics
@@ -209,8 +185,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -234,10 +210,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_dirDATA: $(dist_dir_DATA)
@$(NORMAL_INSTALL)
- test -z "$(dirdir)" || $(mkdir_p) "$(DESTDIR)$(dirdir)"
+ test -z "$(dirdir)" || $(MKDIR_P) "$(DESTDIR)$(dirdir)"
@list='$(dist_dir_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -254,7 +229,7 @@ uninstall-dist_dirDATA:
done
install-dist_semanticsDATA: $(dist_semantics_DATA)
@$(NORMAL_INSTALL)
- test -z "$(semanticsdir)" || $(mkdir_p) "$(DESTDIR)$(semanticsdir)"
+ test -z "$(semanticsdir)" || $(MKDIR_P) "$(DESTDIR)$(semanticsdir)"
@list='$(dist_semantics_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -277,23 +252,21 @@ CTAGS:
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/..
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -309,7 +282,7 @@ check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(semanticsdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -356,12 +329,20 @@ info-am:
install-data-am: install-dist_dirDATA install-dist_semanticsDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -380,19 +361,21 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_dirDATA uninstall-dist_semanticsDATA \
- uninstall-info-am
+uninstall-am: uninstall-dist_dirDATA uninstall-dist_semanticsDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_dirDATA install-dist_semanticsDATA install-exec \
- install-exec-am install-info install-info-am install-man \
+ install-dist_dirDATA install-dist_semanticsDATA install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_dirDATA uninstall-dist_semanticsDATA \
- uninstall-info-am
+ uninstall-dist_dirDATA uninstall-dist_semanticsDATA
$(subdir).dir: $(dir_data)
diff --git a/xorg-server/xkbdata.src/symbols/Makefile.am b/xorg-server/xkbdata.src/symbols/Makefile.am
index 371d1aa3e..d033a159c 100644
--- a/xorg-server/xkbdata.src/symbols/Makefile.am
+++ b/xorg-server/xkbdata.src/symbols/Makefile.am
@@ -6,7 +6,7 @@ ad af al \
am ara az \
be bd \
bg br ba \
-bt by braille \
+bt by brai \
ca cd \
ch cn cz \
de dk \
@@ -24,13 +24,14 @@ mm mn mt mv \
ng nl no np \
pc pk pl pt \
ro rs ru \
-se si sk \
+se si sk sn \
sy th \
-tj tr \
+terminate \
+tj tm tr \
ua us uz vn \
za \
altwin capslock compose ctrl eurosign group inet \
-keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl
+keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl typo
dir_data = $(dist_symbols_DATA)
diff --git a/xorg-server/xkbdata.src/symbols/Makefile.in b/xorg-server/xkbdata.src/symbols/Makefile.in
index 98c3d027e..67faac258 100644
--- a/xorg-server/xkbdata.src/symbols/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -18,15 +18,11 @@
# Replaces Imake's MakeXkbDir() rule
# svu: taken from xkbdata
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -52,10 +48,11 @@ SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -66,14 +63,14 @@ am__installdirs = "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(symbolsdir)"
dist_dirDATA_INSTALL = $(INSTALL_DATA)
dist_symbolsDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_dir_DATA) $(dist_symbols_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -86,10 +83,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -103,43 +96,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -159,15 +133,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -175,6 +149,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -198,8 +173,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
@@ -209,7 +188,7 @@ ad af al \
am ara az \
be bd \
bg br ba \
-bt by braille \
+bt by brai \
ca cd \
ch cn cz \
de dk \
@@ -227,13 +206,14 @@ mm mn mt mv \
ng nl no np \
pc pk pl pt \
ro rs ru \
-se si sk \
+se si sk sn \
sy th \
-tj tr \
+terminate \
+tj tm tr \
ua us uz vn \
za \
altwin capslock compose ctrl eurosign group inet \
-keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl
+keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl typo
dir_data = $(dist_symbols_DATA)
dist_dir_DATA = $(subdir).dir
@@ -246,8 +226,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -271,10 +251,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_dirDATA: $(dist_dir_DATA)
@$(NORMAL_INSTALL)
- test -z "$(dirdir)" || $(mkdir_p) "$(DESTDIR)$(dirdir)"
+ test -z "$(dirdir)" || $(MKDIR_P) "$(DESTDIR)$(dirdir)"
@list='$(dist_dir_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -291,7 +270,7 @@ uninstall-dist_dirDATA:
done
install-dist_symbolsDATA: $(dist_symbols_DATA)
@$(NORMAL_INSTALL)
- test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+ test -z "$(symbolsdir)" || $(MKDIR_P) "$(DESTDIR)$(symbolsdir)"
@list='$(dist_symbols_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -338,8 +317,7 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -383,8 +361,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -409,8 +387,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -420,13 +398,12 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -440,23 +417,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/..
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -470,7 +445,7 @@ distdir: $(DISTFILES)
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -478,6 +453,8 @@ distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -488,7 +465,7 @@ all-am: Makefile $(DATA)
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(symbolsdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
install-exec: install-exec-recursive
@@ -535,12 +512,20 @@ info-am:
install-data-am: install-dist_dirDATA install-dist_symbolsDATA
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -559,24 +544,25 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-dist_dirDATA uninstall-dist_symbolsDATA \
- uninstall-info-am
+uninstall-am: uninstall-dist_dirDATA uninstall-dist_symbolsDATA
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- clean clean-generic clean-recursive ctags ctags-recursive \
- distclean distclean-generic distclean-recursive distclean-tags \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic ctags \
+ ctags-recursive distclean distclean-generic distclean-tags \
distdir dvi dvi-am html html-am info info-am install \
install-am install-data install-data-am install-dist_dirDATA \
- install-dist_symbolsDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ install-dist_symbolsDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am uninstall-dist_dirDATA \
- uninstall-dist_symbolsDATA uninstall-info-am
+ uninstall-dist_symbolsDATA
$(subdir).dir: $(dir_data)
diff --git a/xorg-server/xkbdata.src/symbols/altwin b/xorg-server/xkbdata.src/symbols/altwin
index a3c633a0f..64e8a3577 100644
--- a/xorg-server/xkbdata.src/symbols/altwin
+++ b/xorg-server/xkbdata.src/symbols/altwin
@@ -18,6 +18,18 @@ xkb_symbols "ctrl_win" {
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> { [ 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 ] };
@@ -37,13 +49,6 @@ xkb_symbols "left_meta_win" {
};
partial modifier_keys
-xkb_symbols "super_win" {
- key <LWIN> { [ Super_L ] };
- key <RWIN> { [ Super_R ] };
- modifier_map Mod4 { Super_L, Super_R };
-};
-
-partial modifier_keys
xkb_symbols "hyper_win" {
key <LWIN> { [ Hyper_L ] };
key <RWIN> { [ Hyper_R ] };
diff --git a/xorg-server/xkbdata.src/symbols/ara b/xorg-server/xkbdata.src/symbols/ara
index a42fc6981..9fa40e981 100644
--- a/xorg-server/xkbdata.src/symbols/ara
+++ b/xorg-server/xkbdata.src/symbols/ara
@@ -31,7 +31,7 @@ xkb_symbols "basic" {
key <AD02> { [ Arabic_sad, Arabic_fathatan ] };
key <AD03> { [ Arabic_theh, Arabic_damma ] };
key <AD04> { [ Arabic_qaf, Arabic_dammatan ] };
- key <AD05> { [ Arabic_feh, VoidSymbol ] };
+ key <AD05> { [ Arabic_feh, 0x100fef9 ] };
key <AD06> { [ Arabic_ghain, Arabic_hamzaunderalef ] };
key <AD07> { [ Arabic_ain, grave ] };
key <AD08> { [ Arabic_ha, division ] };
@@ -44,7 +44,7 @@ xkb_symbols "basic" {
key <AC02> { [ Arabic_seen, Arabic_kasratan ] };
key <AC03> { [ Arabic_yeh, bracketright ] };
key <AC04> { [ Arabic_beh, bracketleft ] };
- key <AC05> { [ Arabic_lam, VoidSymbol ] };
+ key <AC05> { [ Arabic_lam, 0x100fef7 ] };
key <AC06> { [ Arabic_alef, Arabic_hamzaonalef ] };
key <AC07> { [ Arabic_teh, Arabic_tatweel ] };
key <AC08> { [ Arabic_noon, Arabic_comma ] };
@@ -57,7 +57,7 @@ xkb_symbols "basic" {
key <AB02> { [ Arabic_hamza, Arabic_sukun ] };
key <AB03> { [Arabic_hamzaonwaw, braceright ] };
key <AB04> { [ Arabic_ra, braceleft ] };
- key <AB05> { [ VoidSymbol, VoidSymbol ] };
+ key <AB05> { [ 0x100fefb, 0x100fef5 ] };
key <AB06> { [Arabic_alefmaksura, Arabic_maddaonalef ] };
key <AB07> { [Arabic_tehmarbuta, apostrophe ] };
key <AB08> { [ Arabic_waw, comma ] };
diff --git a/xorg-server/xkbdata.src/symbols/be b/xorg-server/xkbdata.src/symbols/be
index 6e22f8a11..b3c4e53e5 100644
--- a/xorg-server/xkbdata.src/symbols/be
+++ b/xorg-server/xkbdata.src/symbols/be
@@ -27,6 +27,7 @@ xkb_symbols "basic" {
key <AD01> { [ a, A, at, Greek_OMEGA ] };
key <AD02> { [ z, Z, lstroke, Lstroke ] };
key <AD03> { [ e, E, EuroSign, cent ] };
+ key <AD09> { [ o, O, oe, OE ] }; // o O œ Œ
key <AD11> { [dead_circumflex, dead_diaeresis, bracketleft, dead_abovering ] };
key <AD12> { [ dollar, asterisk, bracketright, dead_macron ] };
@@ -46,6 +47,126 @@ xkb_symbols "basic" {
include "level3(ralt_switch)"
};
+
+// Variant of the fr(oss) layout for Belgium
+// Copyright © 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+//
+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
+// │ ³ ≤ │ 1 ≥ │ 2 É │ 3 ˘ │ 4 — │ 5 – │ 6 ™ │ 7 È │ 8 ¡ │ 9 Ç │ 0 À │ ° Ø │ _ ± ┃ ⌫ Retour┃
+// │ ² ¹ │ & | │ é @ │ " # │ ' ¸ │ ( ˇ │ § ^ │ è ` │ ! ~ │ ç { │ à } │ ) ø │ - ‑ ┃ arrière┃
+// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
+// ┃ ┃ A Æ │ Z  │ E ¢ │ R Ê │ T Þ │ Y Ÿ │ U Û │ I Î │ O Œ │ P Ô │ ¨ ˚ │ * ̨ ┃Entrée ┃
+// ┃Tab ↹ ┃ a æ │ z â │ e € │ r ê │ t þ │ y ÿ │ u û │ i î │ o œ │ p ô │ ^ [ │ $ ] ┃ ⏎ ┃
+// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓ ┃
+// ┃ ┃ Q Ä │ S „ │ D Ë │ F ‚ │ G ¥ │ H Ð │ J Ü │ K Ï │ L Ł │ M Ö │ % Ù │ £ ̄ ┃ ┃
+// ┃Maj ⇬ ┃ q ä │ s ß │ d ë │ f ‘ │ g ’ │ h ð │ j ü │ k ï │ l ł │ m ö │ ù ' │ µ ` ┃ ┃
+// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
+// ┃ ┃ > ≠ │ W “ │ X ” │ C ® │ V ← │ B ↑ │ N → │ ? … │ . . │ / ∕ │ + − ┃ ┃
+// ┃Shift ⇧┃ < \ │ w « │ x » │ c © │ v ⍽ │ b ↓ │ n ¬ │ , ¿ │ ; × │ : ÷ │ = ~ ┃Shift ⇧ ┃
+// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
+// ┃ ┃ ┃ ┃ ␣ Espace insécable ⍽ ┃ ┃ ┃ ┃
+// ┃Ctrl ┃Meta ┃Alt ┃ ␣ Espace ␣ ┃AltGr ⇮┃Menu ┃Ctrl ┃
+// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
+partial alphanumeric_keys
+xkb_symbols "oss" {
+
+ include "fr(oss)"
+ include "be(oss_frbe)"
+
+ name[Group1]="Belgium - Alternative";
+};
+
+partial alphanumeric_keys
+xkb_symbols "oss_frbe" {
+ // First row
+ key <TLDE> { [ twosuperior, threesuperior, onesuperior, lessthanequal ] }; // ² ³ ¹ ≤
+ key <AE01> { [ ampersand, 1, bar, greaterthanequal ] }; // & 1 | ≥
+ key <AE02> { [ eacute, 2, at, Eacute ] }; // é 2 @ É
+ key <AE04> { [ apostrophe, 4, dead_cedilla, 0x1002014 ] }; // ' 4 ¸ — (tiret cadratin)
+ key <AE05> { [ parenleft, 5, dead_caron, 0x1002013 ] }; // ( 5 ˇ – (tiret demi-cadratin)
+ key <AE06> { [ section, 6, asciicircum, trademark ] }; // § 6 ^ ™
+ key <AE08> { [ exclam, 8, asciitilde, exclamdown ] }; // ! 8 ~ ¡
+ key <AE09> { [ ccedilla, 9, braceleft, Ccedilla ] }; // ç 9 { Ç
+ key <AE10> { [ agrave, 0, braceright, Agrave ] }; // à 0 } À
+ key <AE11> { [ parenright, degree, oslash, Ooblique ] }; // ) ° ø Ø
+ key <AE12> { [ minus, underscore, 0x1002011, plusminus ] }; // - _ - (tiret insécable) ±
+
+ // Second row
+ key <AD11> { [ dead_circumflex, dead_diaeresis, bracketleft, dead_abovering ] }; // ^ ̈ [ ˚
+ key <AD12> { [ dollar, asterisk, bracketright, dead_ogonek ] }; // $ * ] ̨
+
+ // Third row
+ key <AC09> { [ l, L, dead_stroke ] }; // l L ł Ł
+ key <BKSL> { [ mu, sterling, dead_grave, dead_macron ] }; // µ £ ` ̄
+
+ // Fourth row
+ key <LSGT> { [ less, greater, backslash, notequal ] }; // < > \ ≠
+ key <AB10> { [ equal, plus, dead_tilde, 0x1002212 ] }; // = + ~ −
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "oss_latin9" {
+
+ // Restricts the be(oss) layout to latin9 symbols
+
+ include "fr(oss_latin9)"
+ include "be(oss_frbe)"
+ include "keypad(oss_latin9)"
+
+ name[Group1]="Belgium - Alternative, latin-9 only";
+
+ // First row
+ key <TLDE> { [ twosuperior, threesuperior, onesuperior, less ] }; // ² ³ ¹ <
+ key <AE01> { [ ampersand, 1, bar, greater ] }; // & 1 | >
+ key <AE04> { [ apostrophe, 4, dead_cedilla, minus ] }; // ' 4 ¸ -
+ key <AE05> { [ parenleft, 5, dead_caron, minus ] }; // ( 5 ˇ -
+ key <AE06> { [ section, 6, asciicircum, asciicircum ] }; // § 6 ^ ^
+ key <AE12> { [ minus, underscore, minus, plusminus ] }; // - _ - ±
+
+ // Second row
+ key <AD12> { [ dollar, asterisk, bracketright, dead_cedilla ] }; // $ * ] ¸
+
+ // Third row
+ key <AC09> { [ l, L, l, L ] }; // l L l L
+ key <BKSL> { [ mu, sterling, dead_grave, dead_circumflex ] }; // µ £ ` ^
+
+ // Fourth row
+ key <LSGT> { [ less, greater, backslash, equal ] }; // < > \ =
+ key <AB10> { [ equal, plus, dead_tilde, minus ] }; // = + ~ -
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "oss_Sundeadkeys" {
+
+ // Modifies the basic be(oss) layout to use the Sun dead keys
+
+ include "be(oss)"
+
+ // First row
+ key <AE04> { [ apostrophe, 4, SunFA_Cedilla, 0x1002014 ] }; // ' 4 ¸ — (tiret cadratin)
+
+ // Second row
+ key <AD11> { [ SunFA_Circum, SunFA_Diaeresis, bracketleft, dead_abovering ] }; // ^ ̈ [ ˚
+
+ //Third row
+ key <AC11> { [ ugrave, percent, SunFA_Acute, Ugrave ] }; // ù % ' Ù
+ key <BKSL> { [ mu, sterling, SunFA_Grave, dead_macron ] }; // µ £ ` ̄
+
+ // Fourth row
+ key <AB10> { [ equal, plus, SunFA_Tilde, 0x1002212 ] }; // = + ~ −
+};
+
+partial alphanumeric_keys
+xkb_symbols "oss_sundeadkeys" {
+
+ include "be(oss_Sundeadkeys)"
+
+ name[Group1]="Belgium - Alternative, Sun dead keys";
+};
+
+
partial alphanumeric_keys
xkb_symbols "iso-alternate" {
include "be(basic)"
diff --git a/xorg-server/xkbdata.src/symbols/bg b/xorg-server/xkbdata.src/symbols/bg
index 8c4913c86..4e4ca079f 100644
--- a/xorg-server/xkbdata.src/symbols/bg
+++ b/xorg-server/xkbdata.src/symbols/bg
@@ -1,9 +1,5 @@
-// $XKeyboardConfig$
-
-// based on a keyboard map:
-//
//////////////////////////////////////////////////////////////////////////
-// Copyright (C) 1999, 2000 by Anton Zinoviev <anton@lml.bas.bg>
+// Copyright (C) 1999, 2000, 2005 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
@@ -13,14 +9,13 @@
// use.
//
//////////////////////////////////////////////////////////////////////////
-// Version 1.6r1
+// Version 1.9-BAN
partial default alphanumeric_keys
xkb_symbols "bds" {
-// BDS is the Bulgarian Institute for Standardization
-
name[Group1]= "Bulgaria";
+key.type[Group1] = "TWO_LEVEL";
key <TLDE> { [ parenleft, parenright ] };
key <AE01> { [ 1, exclam ] };
key <AE02> { [ 2, question ] };
@@ -32,10 +27,11 @@ xkb_symbols "bds" {
key <AE08> { [ 8, slash ] };
key <AE09> { [ 9, emdash ] };
key <AE10> { [ 0, numerosign ] };
- key <AE11> { [ minus, I ] };
- key <AE12> { [ period, V ] };
+ key <AE11> { [ minus, dollar ] };
+ key <AE12> { [ period, EuroSign ] };
key <AD01> { [ comma, Cyrillic_yeru ] };
+key.type[Group1] = "ALPHABETIC";
key <AD02> { [ Cyrillic_u, Cyrillic_U ] };
key <AD03> { [ Cyrillic_ie, Cyrillic_IE ] };
key <AD04> { [ Cyrillic_i, Cyrillic_I ] };
@@ -46,9 +42,11 @@ xkb_symbols "bds" {
key <AD09> { [ Cyrillic_de, Cyrillic_DE ] };
key <AD10> { [ Cyrillic_ze, Cyrillic_ZE ] };
key <AD11> { [ Cyrillic_tse, Cyrillic_TSE ] };
+key.type[Group1] = "TWO_LEVEL";
key <AD12> { [ semicolon, section ] };
- key <AC01> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] };
+key.type[Group1] = "ALPHABETIC";
+ key <AC01> { [ Cyrillic_softsign, U045D ] };
key <AC02> { [ Cyrillic_ya, Cyrillic_YA ] };
key <AC03> { [ Cyrillic_a, Cyrillic_A ] };
key <AC04> { [ Cyrillic_o, Cyrillic_O ] };
@@ -59,7 +57,6 @@ xkb_symbols "bds" {
key <AC09> { [ Cyrillic_ve, Cyrillic_VE ] };
key <AC10> { [ Cyrillic_em, Cyrillic_EM ] };
key <AC11> { [ Cyrillic_che, Cyrillic_CHE ] };
- key <BKSL> { [ apostrophe, Cyrillic_YERU ] };
key <AB01> { [ Cyrillic_yu, Cyrillic_YU ] };
key <AB02> { [ Cyrillic_shorti, Cyrillic_SHORTI ] };
@@ -72,14 +69,22 @@ xkb_symbols "bds" {
key <AB09> { [ Cyrillic_el, Cyrillic_EL ] };
key <AB10> { [ Cyrillic_be, Cyrillic_BE ] };
+key.type[Group1] = "TWO_LEVEL";
+ key <BKSL> { [ doublelowquotemark,leftdoublequotemark ] };
+
+ key <LSGT> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] };
+
// End alphanumeric section
+ key <KPDL> { type[Group1] = "KEYPAD",
+ [ KP_Delete, KP_Separator ] };
+
};
partial alphanumeric_keys
xkb_symbols "phonetic" {
- name[Group1]= "Bulgaria - Phonetic";
+ name[Group1]= "Bulgaria - Traditional Phonetic";
key <TLDE> { [ Cyrillic_che, Cyrillic_CHE ] };
key <AE01> { [ 1, exclam ] };
@@ -135,3 +140,73 @@ xkb_symbols "phonetic" {
// End alphanumeric section
};
+
+partial alphanumeric_keys
+xkb_symbols "bas_phonetic" {
+ name[Group1]= "Bulgaria - Standard Phonetic";
+
+key.type[Group1] = "ALPHABETIC";
+ key <TLDE> { [ Cyrillic_yu, Cyrillic_YU ] };
+key.type[Group1] = "TWO_LEVEL";
+ key <AE01> { [ 1, exclam ] };
+ key <AE02> { [ 2, at ] };
+ key <AE03> { [ 3, numerosign ] };
+ key <AE04> { [ 4, dollar ] };
+ key <AE05> { [ 5, percent ] };
+ key <AE06> { [ 6, EuroSign ] };
+ key <AE07> { [ 7, section ] };
+ key <AE08> { [ 8, asterisk ] };
+ key <AE09> { [ 9, parenleft ] };
+ key <AE10> { [ 0, parenright ] };
+ key <AE11> { [ minus, emdash ] };
+ key <AE12> { [ equal, plus ] };
+
+key.type[Group1] = "ALPHABETIC";
+ key <LatQ> { [ Cyrillic_che, Cyrillic_CHE ] };
+ key <LatW> { [ Cyrillic_sha, Cyrillic_SHA ] };
+ key <LatE> { [ Cyrillic_ie, Cyrillic_IE ] };
+ key <LatR> { [ Cyrillic_er, Cyrillic_ER ] };
+ key <LatT> { [ Cyrillic_te, Cyrillic_TE ] };
+ key <LatY> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN ] };
+ key <LatU> { [ Cyrillic_u, Cyrillic_U ] };
+ key <LatI> { [ Cyrillic_i, Cyrillic_I ] };
+ key <LatO> { [ Cyrillic_o, Cyrillic_O ] };
+ key <LatP> { [ Cyrillic_pe, Cyrillic_PE ] };
+ key <AD11> { [ Cyrillic_ya, Cyrillic_YA ] };
+ key <AD12> { [ Cyrillic_shcha, Cyrillic_SHCHA ] };
+
+ key <LatA> { [ Cyrillic_a, Cyrillic_A ] };
+ key <LatS> { [ Cyrillic_es, Cyrillic_ES ] };
+ key <LatD> { [ Cyrillic_de, Cyrillic_DE ] };
+ key <LatF> { [ Cyrillic_ef, Cyrillic_EF ] };
+ key <LatG> { [ Cyrillic_ghe, Cyrillic_GHE ] };
+ key <LatH> { [ Cyrillic_ha, Cyrillic_HA ] };
+ key <LatJ> { [ Cyrillic_shorti, Cyrillic_SHORTI ] };
+ key <LatK> { [ Cyrillic_ka, Cyrillic_KA ] };
+ key <LatL> { [ Cyrillic_el, Cyrillic_EL ] };
+key.type[Group1] = "TWO_LEVEL";
+ key <AC10> { [ semicolon, colon ] };
+ key <AC11> { [ apostrophe, quotedbl ] };
+key.type[Group1] = "ALPHABETIC";
+ key <BKSL> { [ Cyrillic_softsign, U045D ] };
+
+ key <LatZ> { [ Cyrillic_ze, Cyrillic_ZE ] };
+ key <LatX> { [ Cyrillic_zhe, Cyrillic_ZHE ] };
+ key <LatC> { [ Cyrillic_tse, Cyrillic_TSE ] };
+ key <LatV> { [ Cyrillic_ve, Cyrillic_VE ] };
+ key <LatB> { [ Cyrillic_be, Cyrillic_BE ] };
+ key <LatN> { [ Cyrillic_en, Cyrillic_EN ] };
+ key <LatM> { [ Cyrillic_em, Cyrillic_EM ] };
+key.type[Group1] = "TWO_LEVEL";
+ key <AB08> { [ comma, doublelowquotemark ] };
+ key <AB09> { [ period, leftdoublequotemark ] };
+ key <AB10> { [ slash, question ] };
+
+ key <LSGT> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] };
+
+ // End alphanumeric section
+
+ key <KPDL> { type[Group1] = "KEYPAD",
+ [ KP_Delete, KP_Separator ] };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/brai b/xorg-server/xkbdata.src/symbols/brai
new file mode 100644
index 000000000..e89bed24f
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/brai
@@ -0,0 +1,62 @@
+// $XKeyboardConfig$
+
+// 10-dot patterns on the home row + v and n
+partial default alphanumeric_keys
+xkb_symbols "home_row" {
+ include "brai(keypad)"
+
+ name[Group1]="Braille";
+
+ key <AC04> { [ braille_dot_1 ] };
+ key <AC03> { [ braille_dot_2 ] };
+ key <AC02> { [ braille_dot_3 ] };
+ key <AC07> { [ braille_dot_4 ] };
+ key <AC08> { [ braille_dot_5 ] };
+ key <AC09> { [ braille_dot_6 ] };
+ key <AC01> { [ braille_dot_7 ] };
+ key <AC10> { [ braille_dot_8 ] };
+ key <AB04> { [ braille_dot_9 ] };
+ key <AB06> { [ braille_dot_10 ] };
+};
+
+// 6-dot patterns for the left hand
+partial alphanumeric_keys
+xkb_symbols "left_hand" {
+ include "brai(keypad)"
+
+ name[Group1]="Braille - Left hand";
+
+ key <AC03> { [ braille_dot_1 ] };
+ key <AC02> { [ braille_dot_2 ] };
+ key <AC01> { [ braille_dot_3 ] };
+ key <AC04> { [ braille_dot_4 ] };
+ key <AB05> { [ braille_dot_5 ] };
+ key <AB04> { [ braille_dot_6 ] };
+};
+
+// 6-dot patterns for the right hand
+partial alphanumeric_keys
+xkb_symbols "right_hand" {
+ include "brai(keypad)"
+
+ name[Group1]="Braille - Right hand";
+
+ key <AC07> { [ braille_dot_1 ] };
+ key <AB05> { [ braille_dot_2 ] };
+ key <AB06> { [ braille_dot_3 ] };
+ key <AC08> { [ braille_dot_4 ] };
+ key <AC09> { [ braille_dot_5 ] };
+ key <AC10> { [ braille_dot_6 ] };
+};
+
+// 6-dot patterns on the keypad
+partial hidden keypad_keys
+xkb_symbols "keypad" {
+ key <KP4> { [ braille_dot_1 ] };
+ key <KP1> { [ braille_dot_2 ] };
+ key <KP0> { [ braille_dot_3 ] };
+ key <KP5> { [ braille_dot_4 ] };
+ key <KP6> { [ braille_dot_5 ] };
+ key <KPAD> { [ braille_dot_6 ] };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/ca b/xorg-server/xkbdata.src/symbols/ca
index c198fafd9..818a8ff7b 100644
--- a/xorg-server/xkbdata.src/symbols/ca
+++ b/xorg-server/xkbdata.src/symbols/ca
@@ -476,9 +476,16 @@ xkb_symbols "shs" {
// OLPC Section
xkb_symbols "olpc" {
- include "fr"
-
- key <AE03> { [ 3, slash, ograve, Ograve ] };
+ include "ca(fr)"
+
+ key <AE02> { [ 2, quotedbl, ograve, Ograve ] };
+ key <AE03> { [ 3, slash, at, VoidSymbol ] };
+
+ key <AD03> { [ e, E, EuroSign, VoidSymbol] };
+
+ key <AB09> { [ period, period, 0x1002010 ] };
+
+ key <I219> { [ guillemotleft, guillemotright, degree, VoidSymbol ] };
};
partial alphanumeric_keys
@@ -509,3 +516,10 @@ xkb_symbols "kut" {
//MODIFIER LETTER RIGHT HALF RING
key <AC10> { [ semicolon, colon,U02BE,U02BE ] };
};
+
+partial alphanumeric_keys
+xkb_symbols "eng" {
+ name[Group1] = "Canada - English";
+ include "us(basic)"
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/capslock b/xorg-server/xkbdata.src/symbols/capslock
index 735e148cb..58599c6e6 100644
--- a/xorg-server/xkbdata.src/symbols/capslock
+++ b/xorg-server/xkbdata.src/symbols/capslock
@@ -2,19 +2,19 @@
default partial hidden modifier_keys
xkb_symbols "capslock" {
- key <CAPS> { [ Caps_Lock ] };
+ replace key <CAPS> { [ Caps_Lock ] };
modifier_map Lock { Caps_Lock };
};
partial hidden modifier_keys
xkb_symbols "shiftlock" {
- key <CAPS> { [ Shift_Lock ] };
+ replace key <CAPS> { [ Shift_Lock ] };
modifier_map Shift { Shift_Lock };
};
partial hidden modifier_keys
xkb_symbols "grouplock" {
- key <CAPS> { [ ISO_Next_Group, Caps_Lock ] };
+ replace key <CAPS> { [ ISO_Next_Group, Caps_Lock ] };
};
partial hidden modifier_keys
@@ -31,3 +31,13 @@ xkb_symbols "groupshift" {
};
};
+partial hidden modifier_keys
+xkb_symbols "escape" {
+ key <CAPS> { [ Escape ] };
+};
+
+partial hidden modifier_keys
+xkb_symbols "backspace" {
+ key <CAPS> { [ BackSpace ] };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/compose b/xorg-server/xkbdata.src/symbols/compose
index 72e92efc3..521d93eb9 100644
--- a/xorg-server/xkbdata.src/symbols/compose
+++ b/xorg-server/xkbdata.src/symbols/compose
@@ -29,7 +29,7 @@ xkb_symbols "rctrl" {
partial modifier_keys
xkb_symbols "caps" {
- key <CAPS> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+ replace key <CAPS> { type="TWO_LEVEL", [ Multi_key, Multi_key ] };
};
partial modifier_keys
diff --git a/xorg-server/xkbdata.src/symbols/ctrl b/xorg-server/xkbdata.src/symbols/ctrl
index ca3b8bdc1..e9c4efff5 100644
--- a/xorg-server/xkbdata.src/symbols/ctrl
+++ b/xorg-server/xkbdata.src/symbols/ctrl
@@ -5,15 +5,15 @@
// eliminate the caps lock key completely (replace with control)
partial modifier_keys
xkb_symbols "nocaps" {
- key <CAPS> { symbols[Group1]= [ Control_L, Control_L ] };
+ replace key <CAPS> { [ Control_L, Control_L ] };
modifier_map Control { <CAPS>, <LCTL> };
};
// swap the caps lock key with the left control key
partial modifier_keys
xkb_symbols "swapcaps" {
- key <CAPS> { symbols[Group1]= [ Control_L ] };
- key <LCTL> { symbols[Group1]= [ Caps_Lock ] };
+ replace key <CAPS> { [ Control_L ] };
+ replace key <LCTL> { [ Caps_Lock ] };
};
// moves the control key to the middle row and the caps lock
@@ -21,8 +21,8 @@ xkb_symbols "swapcaps" {
// file has defined appropriate aliases for the keys in question.
partial modifier_keys
xkb_symbols "ctrl_ac" {
- key <AC00> { symbols[Group1]= [ Control_L ] };
- key <AA00> { symbols[Group1]= [ Caps_Lock ] };
+ replace key <AC00> { [ Control_L ] };
+ replace key <AA00> { [ Caps_Lock ] };
};
// Moves the control key to the bottom row and the caps lock
@@ -30,8 +30,8 @@ xkb_symbols "ctrl_ac" {
// file has defined appropriate aliases for the keys in question.
partial modifier_keys
xkb_symbols "ctrl_aa" {
- key <AA00> { symbols[Group1]= [ Control_L ] };
- key <AC00> { symbols[Group1]= [ Caps_Lock ] };
+ replace key <AA00> { [ Control_L ] };
+ replace key <AC00> { [ Caps_Lock ] };
};
// Right Ctrl works as Right Alt
diff --git a/xorg-server/xkbdata.src/symbols/de b/xorg-server/xkbdata.src/symbols/de
index 3674182dc..25f883ee7 100644
--- a/xorg-server/xkbdata.src/symbols/de
+++ b/xorg-server/xkbdata.src/symbols/de
@@ -32,12 +32,21 @@ xkb_symbols "basic" {
key <AD11> { [udiaeresis, Udiaeresis, dead_diaeresis, dead_abovering ] };
key <AD12> { [ plus, asterisk, dead_tilde, dead_macron ] };
- key <AC10> { [odiaeresis, Odiaeresis, dead_doubleacute, dead_doubleacute ] };
- key <AC11> { [adiaeresis, Adiaeresis, dead_circumflex, dead_caron] };
- key <TLDE> { [dead_circumflex, degree, notsign, notsign ] };
+ key <AC02> { [ s, S, U017F, U1E9E ] };
+ key <AC07> { [ j, J, dead_belowdot, dead_abovedot ] };
+ key <AC10> { [odiaeresis, Odiaeresis, dead_doubleacute, dead_belowdot ] };
+ key <AC11> { [adiaeresis, Adiaeresis, dead_circumflex, dead_caron ] };
+ key <TLDE> { [dead_circumflex, degree, U2032, U2033 ] };
key <BKSL> { [numbersign, apostrophe, dead_grave, dead_breve ] };
- key <AB01> { [ y, Y, guillemotleft, less ] };
+ key <AB01> { [ y, Y, guillemotright, U203A ] };
+ key <AB02> { [ x, X, guillemotleft, U2039 ] };
+ key <AB04> { [ v, V, doublelowquotemark, singlelowquotemark ] };
+ key <AB05> { [ b, B, leftdoublequotemark, leftsinglequotemark ] };
+ key <AB06> { [ n, N, rightdoublequotemark, rightsinglequotemark ] };
+ key <AB08> { [ comma, semicolon, periodcentered, multiply ] };
+ key <AB09> { [ period, colon, U2026, division ] };
+ key <AB10> { [ minus, underscore, endash, emdash ] };
include "kpdl(comma)"
@@ -53,7 +62,7 @@ xkb_symbols "nodeadkeys" {
name[Group1]="Germany - Eliminate dead keys";
key <TLDE> { [asciicircum, degree, notsign, notsign ] };
- key <AE12> { [apostrophe, grave, cedilla, cedilla ] };
+ key <AE12> { [ acute, grave, cedilla, cedilla ] };
key <AD11> { [udiaeresis, Udiaeresis, diaeresis, diaeresis ] };
key <AD12> { [ plus, asterisk, asciitilde, macron ] };
key <AC10> { [odiaeresis, Odiaeresis, doubleacute, doubleacute ] };
@@ -203,110 +212,179 @@ xkb_symbols "sundeadkeys" {
};
-// German NEO Eurokeys-Style
+// German NEO-Layout Version 2.0rc1 (rev: 1331)
// adopted 2004 by Hanno Behrens <Hanno.Behrens@gmx.de>
// inspired by Dvorak/de-ergo http://www.goebel-consult.de/de-ergo/
+//
+// Authors:
+// <lucky at zankt dot net>
+// Benjamin Kellermann <Benjamin dot Kellermann at gmx dot Germany>
+// Erik Streb <mail at erikstreb dot de>
+// and many other contributers
+//
+// http://www.neo-layout.org
-partial alphanumeric_keys
-xkb_symbols "neo" {
-
- include "us(dvorak)"
-
- name[Group1]= "Germany - Neostyle";
-
- key <TLDE> { [ dead_circumflex, degree, notsign, paragraph ] };
-
- key <AE01> { [ 1, exclam, exclamdown, onesuperior ] };
- key <AE02> { [ 2, quotedbl, dead_diaeresis, twosuperior ] };
- key <AE03> { [ 3, paragraph, sterling, threesuperior ] };
- key <AE04> { [ 4, dollar, currency, onequarter ] };
- key <AE05> { [ 5, percent, bar, onehalf ] };
- key <AE06> { [ 6, ampersand, brokenbar, threequarters ] };
- key <AE07> { [ 7, slash, braceleft, division ] };
- key <AE08> { [ 8, parenleft, bracketleft, guillemotleft ] };
- key <AE09> { [ 9, parenright, bracketright, guillemotright ] };
- key <AE10> { [ 0, equal, braceright ] };
- key <AE11> { [ minus, underscore, hyphen, diaeresis ] };
- key <AE12> { [ dead_acute,dead_grave, dead_cedilla, dead_ogonek ] };
-
- key <AD01> { [ q, Q, at ] };
- key <AD02> { [ v, V, masculine, ordfeminine ] };
- key <AD03> { [ l, L, lstroke, Lstroke ] };
- key <AD04> { [ c, C, ccedilla,copyright ] };
- key <AD05> { [ w, W, Greek_omega, Greek_OMEGA ] };
- key <AD06> { [ k, K, Greek_kappa, Greek_KAPPA ] };
- key <AD07> { [ h, H, Greek_epsilon, Greek_EPSILON ] };
- key <AD08> { [ g, G, Greek_gamma, Greek_GAMMA ] };
- key <AD09> { [ f, F, ordfeminine ] };
- key <AD10> { [ j, J, Greek_iota, Greek_IOTA ] };
- key <AD11> { [ ssharp, question, backslash, questiondown ] };
- key <AD12> { [ plus, asterisk, dead_tilde, plusminus ] };
-
- key <AC01> { [ u, U, Greek_delta, Greek_DELTA ] };
- key <AC02> { [ i, I, idotless, Iabovedot ] };
- key <AC03> { [ a, A, at, Greek_alpha ] };
- key <AC04> { [ e, E, EuroSign, cent ] };
- key <AC05> { [ o, O, oslash, Ooblique ] };
- key <AC06> { [ s, S, Greek_sigma, Greek_SIGMA ] };
- key <AC07> { [ n, N, Greek_nu, Greek_NU ] };
- key <AC08> { [ r, R, registered,trademark ] };
- key <AC09> { [ t, T, thorn, THORN ] }; //Greek_theta, Greek_THETA/tcedilla, Tcedilla
- key <AC10> { [ d, D, eth, ETH ] };
- key <AC11> { [ y, Y, yen ] };
- key <BKSL> { [ numbersign, apostrophe, grave ] };
-
-
- key <LSGT> { [ less, greater, guillemotleft, guillemotright ] };
- key <AB01> { [ odiaeresis, Odiaeresis, oe, OE ] };
- key <AB02> { [ udiaeresis,Udiaeresis, apostrophe, asciitilde ] };
- key <AB03> { [ adiaeresis, Adiaeresis, ae, AE ] };
- key <AB04> { [ p, P, thorn, THORN ] };
- key <AB05> { [ z, Z, Greek_zeta, Greek_ZETA ] };
- key <AB06> { [ b, B, Greek_beta, Greek_BETA ] };
- key <AB07> { [ m, M, mu, Greek_MU ] };
- key <AB08> { [ comma, semicolon, dead_cedilla, cedilla ] };
- key <AB09> { [ period, colon, periodcentered ] };
- key <AB10> { [ x, X, multiply ] };
-
- key <SPCE> { [ space, space, nobreakspace, nobreakspace ] };
-
-
- // End "Editing" section, begin "Keypad"
-// key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
-
-// Ungrab cancels server/keyboard/pointer grabs
-// key <KPDV> { [KP_Divide, KP_Divide, division] };
-
-// ClsGrb kills whichever client has a grab in effect
-// key <KPMU> { [KP_Multiply, KP_Multiply, periodcentered] };
-
-// -VMode switches to the previous video mode
-// key <KPSU> { [ KP_Subtract, KP_Subtract, notsign] };
-
- key <KP7> { [ KP_Home, KP_7, seveneighths, oneeighth ] };
- key <KP8> { [ KP_Up, KP_8, uparrow, fiveeighths ] };
- key <KP9> { [ KP_Prior, KP_9, threeeighths, threeeighths ] };
-
-// +VMode switches to the next video mode
-// key <KPAD> { [ KP_Add, KP_Add, plusminus ] };
-
- key <KP4> { [ KP_Left, KP_4, leftarrow, onequarter ] };
- key <KP5> { [ KP_Begin, KP_5, dagger, onehalf ] };
- key <KP6> { [ KP_Right, KP_6, rightarrow, threequarters ] };
- key <KP1> { [ KP_End, KP_1, onesuperior, onesuperior ] };
- key <KP2> { [ KP_Down, KP_2, downarrow, twosuperior ] };
- key <KP3> { [ KP_Next, KP_3, threesuperior, threesuperior ] };
- key <KPEN> { [ KP_Enter ] };
- key <KPEQ> { [ KP_Equal ] };
+partial alphanumeric_keys modifier_keys keypad_keys
+xkb_symbols "neo" {
- key <KP0> { [ KP_Insert, KP_0, percent, degree ] };
- key <KPDL> { [ KP_Delete, KP_Decimal, periodcentered, comma ] };
- // End "Keypad" section
+ name[Group1]= "Germany - Neo 2";
+
+ // Levels in Neo jargon
+ // --------------------------------------------------------------
+ // Ebene 1: normal
+ // Ebene 2: Shift
+ // Ebene 3: Mod3
+ // Ebene 4: Mod4 (for marking something use Shift+Mod4)
+ // Ebene 5: Shift+Mod3
+ // Ebene 6: Mod3+Mod4 (in this order)
+ // Compose (not a level): Mod3+Tab
+ // Feststelltaste (Capslock): Mod3+Mod3
+ //
+ // Levels in Xkbmap jargon to be found here in the definitions.
+ // These are the levels used, and Xorg's translations with type="EIGHT_LEVEL":
+ // --------------------------------------------------------------
+ // Modifier: None Shift Mod3 Shift+Mod3 Mod4 Shift+Mod4 Mod3+Mod4
+ // Xorg calls it: Level1 Level2 Level3 Level4 Level5 Level6 Level7
+ // Neo calls it: Ebene1 Ebene2 Ebene3 Ebene5 Ebene4 Ebene4+Shift Ebene6
+
+ // Modifier definitions
+ // --------------------------------------------------------------
+ // Definition of the so called Neo-Mod3
+ key.type[Group1]="THREE_LEVEL";
+ key <BKSL> { [ ISO_Level3_Shift, ISO_Level3_Shift, Caps_Lock ] };
+ key <CAPS> { [ ISO_Level3_Shift, ISO_Level3_Shift, Caps_Lock ] };
+
+ // Definition of the so called Neo-Mod4
+ key.type[Group1]="ONE_LEVEL";
+ key <LSGT> { [ ISO_Level5_Shift ]};
+ key <RALT> { [ ISO_Level5_Shift ]};
+ modifier_map Mod3 { <LSGT>, <RALT> };
+ // Attention: ^^^ This is a X server variable, not the Neo-Mod3.
+
+ key.type[Group1]="EIGHT_LEVEL_ALPHABETIC" ;
+
+ // Tab as Multi_key (Compose)
+ // --------------------------------------------------------------
+ key <TAB> { [ Tab, ISO_Left_Tab, Multi_key ] };
+
+ // number row
+ // --------------------------------------------------------------
+ key <TLDE> { [ dead_circumflex, dead_tilde, dead_abovering, dead_breve, dead_caron, NoSymbol, dead_macron ] };
+
+ key <AE01> { [ 1, degree, onesuperior, onesubscript, ordfeminine, NoSymbol, notsign ] };
+ key <AE02> { [ 2, section, twosuperior, twosubscript, masculine, NoSymbol, logicalor ] };
+ key <AE03> { [ 3, U2113, threesuperior, threesubscript, numerosign, NoSymbol, logicaland ] };
+ key <AE04> { [ 4, guillemotright, U203A, dagger, Prior, Prior, U22A5 ] };
+ key <AE05> { [ 5, guillemotleft, U2039, femalesymbol, periodcentered, NoSymbol, U2221 ] };
+ key <AE06> { [ 6, EuroSign, cent, malesymbol, sterling, NoSymbol, U2225 ] };
+
+ key <AE07> { [ 7, dollar, yen, Greek_kappa, currency, NoSymbol, rightarrow ] };
+ key <AE08> { [ 8, doublelowquotemark, singlelowquotemark, leftanglebracket, NoSymbol, NoSymbol, U221E ] };
+ key <AE09> { [ 9, leftdoublequotemark, leftsinglequotemark, rightanglebracket, slash, NoSymbol, U220B ] };
+ key <AE10> { [ 0, rightdoublequotemark, rightsinglequotemark, zerosubscript, asterisk, NoSymbol, emptyset ] };
+
+ key <AE11> { [ minus, emdash, NoSymbol, U2011, minus, NoSymbol, hyphen ] };
+ key <AE12> { [ dead_grave, NoSymbol, dead_diaeresis, dead_dasia, U030F, NoSymbol, NoSymbol ] };
+
+ key <BKSP> { [ BackSpace, BackSpace, BackSpace, BackSpace, BackSpace, BackSpace, BackSpace ] };
+
+ // top row
+ // --------------------------------------------------------------
+ // xvlcwkhgfqß
+ key <AD01> { [ x, X, ellipsis, Greek_xi, U22EE, NoSymbol, Greek_XI ] };
+ key <AD02> { [ v, V, underscore, NoSymbol, BackSpace, BackSpace, U2259 ] };
+ key <AD03> { [ l, L, bracketleft, Greek_lambda, Up, Up, Greek_LAMBDA ] };
+ key <AD04> { [ c, C, bracketright, Greek_chi, Delete, Delete, U2102 ] };
+ key <AD05> { [ w, W, asciicircum, Greek_omega, Insert, Insert, Greek_OMEGA ] };
+
+ key <AD06> { [ k, K, exclam, U03F0, exclamdown, NoSymbol, radical ] };
+ key <AD07> { [ h, H, less, Greek_psi, 7, NoSymbol, Greek_PSI ] };
+ key <AD08> { [ g, G, greater, Greek_gamma, 8, NoSymbol, Greek_GAMMA ] };
+ key <AD09> { [ f, F, equal, Greek_phi, 9, NoSymbol, Greek_PHI ] };
+ key <AD10> { [ q, Q, ampersand, U03D5, plus, NoSymbol, U211A ] };
+ key <AD11> { [ ssharp, U1E9E, U017F, Greek_finalsmallsigma, NoSymbol, NoSymbol, jot ] };
+
+ key <AD12> { [ dead_acute, dead_cedilla, dead_stroke, dead_psili, dead_doubleacute,NoSymbol, dead_abovedot ] };
+
+ // middle row
+ // --------------------------------------------------------------
+ // uiaeosnrtdy
+ key <AC01> { [ u, U, backslash, NoSymbol, Home, Home, U222E ] };
+ key <AC02> { [ i, I, slash, Greek_iota, Left, Left, integral ] };
+ key <AC03> { [ a, A, braceleft, Greek_alpha, Down, Down, U2200 ] };
+ key <AC04> { [ e, E, braceright, Greek_epsilon, Right, Right, U2203 ] };
+ key <AC05> { [ o, O, asterisk, Greek_omicron, End, End, elementof ] };
+
+ key <AC06> { [ s, S, question, Greek_sigma, questiondown, NoSymbol, Greek_SIGMA ] };
+ key <AC07> { [ n, N, parenleft, Greek_nu, 4, NoSymbol, U2115 ] };
+ key <AC08> { [ r, R, parenright, U03F1, 5, NoSymbol, U211D ] };
+ key <AC09> { [ t, T, minus, Greek_tau, 6, NoSymbol, partialderivative ] };
+ key <AC10> { [ d, D, colon, Greek_delta, comma, NoSymbol, Greek_DELTA ] };
+ key <AC11> { [ y, Y, at, Greek_upsilon, period, NoSymbol, nabla ] };
+
+ // bottom row
+ // --------------------------------------------------------------
+ // üöäpzbm,.j
+ key <AB01> { [ udiaeresis, Udiaeresis, numbersign, NoSymbol, Escape, Escape, U211C ] };
+ key <AB02> { [ odiaeresis, Odiaeresis, dollar, NoSymbol, Tab, Tab, U2111 ] };
+ key <AB03> { [ adiaeresis, Adiaeresis, bar, Greek_eta, Next, Next, U2135 ] };
+ key <AB04> { [ p, P, asciitilde, Greek_pi, Return, Return, Greek_PI ] };
+ key <AB05> { [ z, Z, grave, Greek_zeta, NoSymbol, NoSymbol, U2124 ] };
+
+ key <AB06> { [ b, B, plus, Greek_beta, colon, NoSymbol, U21D0 ] };
+ key <AB07> { [ m, M, percent, Greek_mu, 1, NoSymbol, ifonlyif ] };
+ key <AB08> { [ comma, endash, quotedbl, Greek_rho, 2, NoSymbol, U21D2 ] };
+ key <AB09> { [ period, enfilledcircbullet, apostrophe, U03D1, 3, NoSymbol, Greek_THETA ] };
+ key <AB10> { [ j, J, semicolon, Greek_theta, semicolon, NoSymbol, variation ] };
+
+ // Space key
+ // --------------------------------------------------------------
+ key <SPCE> { [ space, space, space, nobreakspace, 0, NoSymbol, U202F ] };
+
+ // Keypad
+ // ===========
+
+ // Num-Lock is no longer used with Neo:
+ //key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD";
+
+ // the former Numlock key:
+ key <NMLK> { [ Tab, ISO_Left_Tab, equal, approxeq, notequal, NoSymbol, identical ] };
+
+ // topmost row
+ // --------------------------------------------------------------
+ key <KPDV> { [ KP_Divide, KP_Divide, division, U2223, U2300, NoSymbol, U2044 ] };
+ key <KPMU> { [ KP_Multiply, KP_Multiply, U22C5, multiply, U2299, NoSymbol, U2297 ] };
+ key <KPSU> { [ KP_Subtract, KP_Subtract, U2212, U2216, U2296, NoSymbol, U2238 ] };
+
+ // top row
+ // --------------------------------------------------------------
+ key <KP7> { [ KP_7, U2714, U2195, U226A, KP_Home, KP_Home, upstile ] };
+ key <KP8> { [ KP_8, U2718, uparrow, intersection, KP_Up, KP_Up, U22C2 ] };
+ key <KP9> { [ KP_9, NoSymbol, U20D7, U226B, KP_Prior, KP_Prior, U2309 ] };
+ key <KPAD> { [ KP_Add, KP_Add, plusminus, U2213, U2295, NoSymbol, U2214 ] };
+
+ // middle row
+ // --------------------------------------------------------------
+ key <KP4> { [ KP_4, club, leftarrow, includedin, KP_Left, KP_Left, U2286 ] };
+ key <KP5> { [ KP_5, EuroSign, brokenbar, U22B6, KP_Begin, KP_Begin, U22B7 ] };
+ key <KP6> { [ KP_6, NoSymbol, rightarrow, includes, KP_Right, KP_Right, U2287 ] };
+
+ // bottom row
+ // --------------------------------------------------------------
+ key <KP1> { [ KP_1, diamond, U2194, lessthanequal,KP_End, KP_End, downstile ] };
+ key <KP2> { [ KP_2, heart, downarrow, union, KP_Down, KP_Down, U22C3 ] };
+ key <KP3> { [ KP_3, U2660, U21CC, greaterthanequal,KP_Next, KP_Next, U230B ] };
+ key <KPEN> { [ KP_Enter, KP_Enter, KP_Enter, KP_Enter, KP_Enter, KP_Enter, KP_Enter ] };
+ key <KPEQ> { [ KP_Equal ] };
+
+ // bottommost row
+ // --------------------------------------------------------------
+ key <KP0> { [ KP_0, U2423, percent, U2030, KP_Insert, KP_Insert, U25A1 ] };
+ key <KPDL> { [ KP_Decimal, comma, period, apostrophe, KP_Delete, KP_Delete, quotedbl ] };
- include "level3(ralt_switch)"
};
-
+
// Copied from macintosh_vndr/de
// olh@suse.de very close to MacOS map
@@ -354,3 +432,66 @@ xkb_symbols "mac_nodeadkeys" {
key <BKSL> { [ numbersign, apostrophe, grave ] };
};
+
+partial alphanumeric_keys
+xkb_symbols "dsb"
+{
+ name[Group1] = "Germany - Lower Sorbian";
+ include "latin(basic)"
+ include "level3(ralt_switch)"
+ include "kpdl(comma)"
+ key <AB01> { [ z, Z, zcaron, Zcaron ] };
+ key <AB02> { [ x, X, zacute, Zacute ] };
+ key <AB03> { [ c, C, cacute, Cacute ] };
+ key <AB04> { [ v, V, ccaron, Ccaron ] };
+ key <AB06> { [ n, N, nacute, Nacute ] };
+ key <AC02> { [ s, S, sacute, Sacute ] };
+ key <AC03> { [ d, D, scaron, Scaron ] };
+ key <AC04> { [ f, F ] };
+ key <AD01> { [ q, Q ] };
+ key <AD02> { [ w, W ] };
+ key <AD03> { [ e, E, ecaron, Ecaron ] };
+ key <AD04> { [ r, R, racute, Racute ] };
+ key <AD05> { [ t, T, U20B5, EuroSign ] };
+ key <AD09> { [ o, O, oacute, Oacute ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "dsb_qwertz"
+{
+ name[Group1] = "Germany - Lower Sorbian (qwertz)";
+ include "latin(basic)"
+ include "level3(ralt_switch)"
+ include "kpdl(comma)"
+ key <AB01> { [ y, Y ] };
+ key <AB02> { [ x, X ] };
+ key <AB03> { [ c, C, cacute, Cacute ] };
+ key <AB04> { [ v, V, ccaron, Ccaron ] };
+ key <AB06> { [ n, N, nacute, Nacute ] };
+ key <AC02> { [ s, S, sacute, Sacute ] };
+ key <AC03> { [ d, D, scaron, Scaron ] };
+ key <AC04> { [ f, F ] };
+ key <AD01> { [ q, Q ] };
+ key <AD02> { [ w, W ] };
+ key <AD03> { [ e, E, ecaron, Ecaron ] };
+ key <AD04> { [ r, R, racute, Racute ] };
+ key <AD05> { [ t, T, U20B5, EuroSign ] };
+ key <AD06> { [ z, Z, zcaron, Zcaron ] };
+ key <AD07> { [ u, U, zacute, Zacute ] };
+ key <AD09> { [ o, O, oacute, Oacute ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "qwerty" {
+
+ // This layout should work exactly as a de with the exception
+ // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).
+ // 2008 by Matej Košík <kosik@fiit.stuba.sk>
+
+ include "de(basic)"
+
+ name[Group1] = "Germany - qwerty";
+
+ key <AB01> { [ z, Z, leftarrow, yen ] };
+ key <AD06> { [ y, Y, guillemotleft, less ] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.in
index 38a6a7ecb..6a4f87404 100644
--- a/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_symbols_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
symbolsdir = $(xkb_base)/symbols/digital_vndr
@@ -199,8 +175,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -224,10 +200,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_symbolsDATA: $(dist_symbols_DATA)
@$(NORMAL_INSTALL)
- test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+ test -z "$(symbolsdir)" || $(MKDIR_P) "$(DESTDIR)$(symbolsdir)"
@list='$(dist_symbols_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -250,22 +225,21 @@ CTAGS:
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -281,7 +255,7 @@ check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(symbolsdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -327,12 +301,20 @@ info-am:
install-data-am: install-dist_symbolsDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -351,17 +333,21 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+uninstall-am: uninstall-dist_symbolsDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_symbolsDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ install-dist_symbolsDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_symbolsDATA uninstall-info-am
+ uninstall-dist_symbolsDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/symbols/epo b/xorg-server/xkbdata.src/symbols/epo
index a1c9c6098..c9b2d57b2 100644
--- a/xorg-server/xkbdata.src/symbols/epo
+++ b/xorg-server/xkbdata.src/symbols/epo
@@ -113,3 +113,29 @@ xkb_symbols "legacy" {
include "level3(ralt_switch)"
};
+
+// Add Esperanto supersignos to the corresponding key in a Qwerty keyboard.
+// This is a generic "component" that is not used to the other layouts in this
+// file but it is meant to be applied to any layout. If you have any questions
+// ask J. Pablo Fernández <pupeno@pupeno.com>.
+partial
+xkb_symbols "qwerty" {
+ key <AB03> { [ NoSymbol, NoSymbol, ccircumflex, Ccircumflex ] };
+ key <AC05> { [ NoSymbol, NoSymbol, gcircumflex, Gcircumflex ] };
+ key <AC06> { [ NoSymbol, NoSymbol, hcircumflex, Hcircumflex ] };
+ key <AC07> { [ NoSymbol, NoSymbol, jcircumflex, Jcircumflex ] };
+ key <AC02> { [ NoSymbol, NoSymbol, scircumflex, Scircumflex ] };
+ key <AD07> { [ NoSymbol, NoSymbol, ubreve, Ubreve ] };
+};
+
+// Add Esperanto supersignos to the corresponding key in a Dvorak keyboard.
+// Same comment as the Qwerty one above applies.
+partial
+xkb_symbols "dvorak" {
+ key <AD08> { [ NoSymbol, NoSymbol, ccircumflex, Ccircumflex ] };
+ key <AD07> { [ NoSymbol, NoSymbol, gcircumflex, Gcircumflex ] };
+ key <AC07> { [ NoSymbol, NoSymbol, hcircumflex, Hcircumflex ] };
+ key <AB03> { [ NoSymbol, NoSymbol, jcircumflex, Jcircumflex ] };
+ key <AC10> { [ NoSymbol, NoSymbol, scircumflex, Scircumflex ] };
+ key <AC04> { [ NoSymbol, NoSymbol, ubreve, Ubreve ] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/es b/xorg-server/xkbdata.src/symbols/es
index 404e6db61..96ccc6fed 100644
--- a/xorg-server/xkbdata.src/symbols/es
+++ b/xorg-server/xkbdata.src/symbols/es
@@ -193,3 +193,13 @@ xkb_symbols "olpc" {
include "level3(ralt_switch)"
};
+
+partial alphanumeric_keys
+xkb_symbols "deadtilde" {
+
+ include "es(basic)"
+
+ name[Group1]="Spain - Include dead tilde";
+
+ key <AE04> { [ 4, dollar, dead_tilde, dollar ] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/et b/xorg-server/xkbdata.src/symbols/et
index e6d1ba722..f3d4a98db 100644
--- a/xorg-server/xkbdata.src/symbols/et
+++ b/xorg-server/xkbdata.src/symbols/et
@@ -55,11 +55,11 @@ xkb_symbols "olpc" {
key <AC09> { [ 0x01001208, VoidSymbol ] }; // l
key <AC10> { [ 0x01001362, 0x01001361 ] }; // :;
- key <AC11> { [ apostrophe, quotedbl ] }; // '"
+ key <AC11> { [ 0x01001366, 0x01001365 ] }; // '"
key <AB01> { [ 0x010012D8, 0x010012E0 ] }; // z
key <AB02> { [ 0x010012A0, 0x010012D0 ] }; // x
- key <AB03> { [ c, C ] }; // c
+ key <AB03> { [ 0x01001278, VoidSymbol ] }; // c
key <AB04> { [ 0x01001238, 0x01001268 ] }; // v
key <AB05> { [ 0x01001260, VoidSymbol ] }; // b
key <AB06> { [ 0x01001290, 0x01001298 ] }; // n
@@ -67,9 +67,9 @@ xkb_symbols "olpc" {
key <AB08> { [ 0x01001363, VoidSymbol ] }; // <
key <AB09> { [ 0x01001364, VoidSymbol ] }; // >
- key <AB10> { [ VoidSymbol, question ] }; // ?
+ key <AB10> { [ 0x01001367, VoidSymbol ] }; // ?
- key <BKSL> { [ backslash, VoidSymbol ] }; // bksl
+ key <BKSL> { [ VoidSymbol, 0x01002010 ] }; // bksl
include "group(olpc)"
};
diff --git a/xorg-server/xkbdata.src/symbols/fi b/xorg-server/xkbdata.src/symbols/fi
index 4fffb833d..ce9a3663f 100644
--- a/xorg-server/xkbdata.src/symbols/fi
+++ b/xorg-server/xkbdata.src/symbols/fi
@@ -4,11 +4,37 @@
// $XFree86: xc/programs/xkbcomp/symbols/fi,v 1.9 2003/01/29 17:17:31 dawes Exp $
// Troy Korjuslommi,
-// Jan 6, 2006,
-// May 5, 2006.
-// May 6, 2006.
-// May 12, 2006.
-// Oct 10, 2007.
+// Jan 6, 2006
+// May 5, 2006
+// May 6, 2006
+// May 12, 2006
+// Oct 10, 2007
+// Nov 11, 2008
+// Nov 29, 2008
+// Dec 31, 2008
+// Jan 22, 2009
+//
+//
+// Jan 22, 2009
+// Submit requests to change all remaining Uxxxx values to named versions
+// in keysymdef.h.
+// ezh : U0292: LATIN SMALL LETTER EZH
+// Ezh : U01B7: LATIN CAPITAL LETTER EZH
+// permille : U2030: PER MILLE SIGN
+//
+// Dec 31, 2008
+// U0326 replaced with dead_belowcomma.
+//
+// Nov 29, 2008
+// dead_belowcomma has been added to keysymdef.h, so the U0326 can be replaced with
+// it, as long as the version of X11 is built with the new keysymdef.h file.
+//
+// Nov 11, 2008.
+// (a) Changed <AC10> level 4 from Ooblique to Oslash. The two names are synonyms. Since level 3 is already
+// specified as oslash, the change adds consistency.
+// (b) The new Finnish keyboard standard (SFS 5966) reserves <AB10> level 4 for U0326, the combining comma below.
+// Removed the previous dead_abovedot entry there and replaced it with U0326, which can be replaced
+// with dead_commabelow if that is added to keysymdef.h.
//
// Oct 10, 2007.
// -Changed space column 3 to nobreakspace (from space).
@@ -56,8 +82,8 @@ xkb_symbols "kotoistus" {
key <AE05> { [ 5, percent, U2030, leftdoublequotemark ] };
key <AE06> { [ 6, ampersand, singlelowquotemark, doublelowquotemark ] };
key <AE07> { [ 7, slash, braceleft, NoSymbol ] };
- key <AE08> { [ 8, parenleft, bracketleft, NoSymbol ] };
- key <AE09> { [ 9, parenright, bracketright, NoSymbol ] };
+ key <AE08> { [ 8, parenleft, bracketleft, less ] };
+ key <AE09> { [ 9, parenright, bracketright, greater ] };
key <AE10> { [ 0, equal, braceright, degree ] };
key <AE11> { [ plus, question, backslash, questiondown ] };
key <AE12> { [ dead_acute, dead_grave, dead_cedilla, dead_ogonek ] };
@@ -68,7 +94,7 @@ xkb_symbols "kotoistus" {
key <AD05> { [ t, T, thorn, THORN ] };
key <AD06> { [ y, Y, y, Y ] };
key <AD07> { [ u, U, u, U ] };
- key <AD08> { [ i, I, idotless, NoSymbol ] };
+ key <AD08> { [ i, I, idotless, bar ] };
key <AD09> { [ o, O, oe, OE ] };
key <AD10> { [ p, P, dead_horn, dead_hook ] };
key <AD11> { [ aring, Aring, dead_doubleacute, dead_abovering ] };
@@ -82,7 +108,7 @@ xkb_symbols "kotoistus" {
key <AC07> { [ j, J, j, J ] };
key <AC08> { [ k, K, kra, NoSymbol ] };
key <AC09> { [ l, L, dead_stroke, NoSymbol ] };
- key <AC10> { [ odiaeresis, Odiaeresis, oslash, Ooblique ] };
+ key <AC10> { [ odiaeresis, Odiaeresis, oslash, Oslash ] };
key <AC11> { [ adiaeresis, Adiaeresis, ae, AE ] };
key <BKSL> { [ apostrophe, asterisk, dead_caron, dead_breve ] };
key <LSGT> { [ less, greater, bar, NoSymbol ] };
@@ -95,7 +121,7 @@ xkb_symbols "kotoistus" {
key <AB07> { [ m, M, mu, emdash ] };
key <AB08> { [ comma, semicolon, rightsinglequotemark, leftsinglequotemark ] };
key <AB09> { [ period, colon, dead_belowdot, dead_abovedot ] };
- key <AB10> { [ minus, underscore, endash, dead_abovedot ] };
+ key <AB10> { [ minus, underscore, endash, dead_belowcomma ] };
include "nbsp(level3)"
diff --git a/xorg-server/xkbdata.src/symbols/fr b/xorg-server/xkbdata.src/symbols/fr
index bdbce1baf..0d621a802 100644
--- a/xorg-server/xkbdata.src/symbols/fr
+++ b/xorg-server/xkbdata.src/symbols/fr
@@ -388,7 +388,7 @@ xkb_symbols "latin9" {
// French uses a comma as decimal separator, but keyboards are labeled with a period
// Will take effect when KP_Decimal is mapped to the locale decimal separator
- key <KPDL> { [ KP_Delete, period, KP_Delete, KP_Decimal ] };
+ key <KPDL> { [ KP_Delete, KP_Decimal, KP_Delete, KP_Decimal ] };
include "level3(ralt_switch)"
};
@@ -430,98 +430,98 @@ xkb_symbols "latin9_nodeadkeys" {
};
// Bépo : Improved ergonomic french keymap using Dvorak method.
-// Built by community on 'Dvorak Fr' mailing list :
-// dvorak-fr@gpl.insa-lyon.fr and on its wiki : http://gpl.insa-lyon.fr/Dvorak-Fr/ .
-// XOrg integration in 2006 by Frédéric Boiteux <fboiteux @ free.fr>
+// Built by community on 'Dvorak Fr / Bépo' :
+// see http://www.clavier-dvorak.org/wiki/ to join and help.
+// XOrg integration (1.0rc2 version) in 2008
+// by Frédéric Boiteux <fboiteux at free dot fr>
//
-// Bépo layout (6.2.1.1 version) for a pc105 keyboard (french) :
+// Bépo layout (1.0rc2 version) for a pc105 keyboard (french) :
// ┌────┐
// │ S A│ S = Shift, A = AltGr + Shift
// │ s a│ s = normal, a = AltGr
// └────┘
//
// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
-// │ $ │ 1 ¹ │ 2 ² │ 3 ³ │ 4 ° │ 5 ˚ │ 6 │ 7 │ 8 │ 9 │ 0 │ ^ │ µ ┃ ⌫ Retour┃
-// │ @ # │ _ { │ " } │ « < │ » > │ ( [ │ ) ] │ + ± │ - ¬ │ * × │ / ÷ │ = ¯ │ % ┃ arrière┃
+// │ # ¶ │ 1 „ │ 2 “ │ 3 ” │ 4 ≤ │ 5 ≥ │ 6 │ 7 ¬ │ 8 ¼ │ 9 ½ │ 0 ¾ │ ° ′ │ ` ″ ┃ ⌫ Retour┃
+// │ $ – │ " — │ « < │ » > │ ( [ │ ) ] │ @ ^ │ + ± │ - − │ / ÷ │ * × │ = ≠ │ % ‰ ┃ arrière┃
// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
-// ┃ ┃ B │ É ˊ │ P ¶ │ O Œ │ È ` │ Ç │ V │ D Ð │ L │ F │ J │ Z ┃Entrée ┃
-// ┃Tab ↹ ┃ b | │ é & │ p § │ o œ │ è ` │ ç │ v │ d ð │ l £ │ f ª │ j │ z ┃ ⏎ ┃
+// ┃ ┃ B ¦ │ É ˝ │ P § │ O Œ │ È ` │ ! │ V │ D Ð │ L │ J IJ │ Z Ə │ W ┃Entrée ┃
+// ┃Tab ↹ ┃ b | │ é ˊ │ p & │ o œ │ è ` │ ˆ ¡ │ v ˇ │ d ð │ l / │ j ij │ z ə │ w ̆ ┃ ⏎ ┃
// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓ ┃
-// ┃ ┃ A Æ │ U Ù │ I ˇ │ E │ ? │ C ¢ │ T Þ │ S │ N │ R │ M │ ! ┃ ┃
-// ┃Maj ⇬ ┃ a æ │ u ù │ i ̈ │ e € │ , ¿ │ c © │ t þ │ s ß │ n │ r ® │ m º │ ˆ ¡ ┃ ┃
+// ┃ ┃ A Æ │ U Ù │ I ˙ │ E ¤ │ ; ̛ │ C ſ │ T Þ │ S ẞ │ R ™ │ N │ M º │ Ç , ┃ ┃
+// ┃Maj ⇬ ┃ a æ │ u ù │ i ̈ │ e € │ , ’ │ c © │ t þ │ s ß │ r ® │ n ˜ │ m ¯ │ ç ¸ ┃ ┃
// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
-// ┃ ┃ ù │ À ˜ │ H │ Y │ : · │ K │ ; │ Q │ G │ X │ W ┃ ┃
-// ┃Shift ⇧┃ ê / │ à ~ │ h ! │ y ¥ │ . \ │ k │ ' │ q │ g │ x │ w ┃Shift ⇧ ┃
+// ┃ ┃ Ê │ À │ Y ‘ │ X ’ │ : · │ K │ ? ̉ │ Q ̣ │ G │ H ‡ │ F ª ┃ ┃
+// ┃Shift ⇧┃ ê / │ à \ │ y { │ x } │ . … │ k ~ │ ' ¿ │ q ˚ │ g µ │ h † │ f ˛ ┃Shift ⇧ ┃
// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
-// ┃ ┃ ┃ ┃ ⍽ Espace insécable ␣ ┃ ┃ ┃ ┃
-// ┃Ctrl ┃Meta ┃Alt ┃ ␣ Espace ␣ ┃AltGr ⇮┃Menu ┃Ctrl ┃
+// ┃ ┃ ┃ ┃ Espace inséc. Espace inséc. fin ┃ ┃ ┃ ┃
+// ┃Ctrl ┃Meta ┃Alt ┃ ␣ (Espace) _ ␣ ┃AltGr ⇮┃Menu ┃Ctrl ┃
// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
partial alphanumeric_keys
xkb_symbols "bepo" {
+ include "level3(ralt_switch)"
include "keypad(oss)"
name[Group1]= "France - Bepo, ergonomic, Dvorak way";
// First row
- key <TLDE> { [ at, dollar, numbersign ] }; // @ $ #
- key <AE01> { [ underscore, 1, braceleft, onesuperior ] }; // _ 1 { ¹
- key <AE02> { [ quotedbl, 2, braceright, twosuperior ] }; // " 2 } ²
- key <AE03> { [ guillemotleft, 3, less, threesuperior ] }; // « 3 < ³
- key <AE04> { [ guillemotright, 4, greater, degree ] }; // » 4 > °
- key <AE05> { [ parenleft, 5, bracketleft, dead_abovering ] }; // ( 5 [ ˚
- key <AE06> { [ parenright, 6, bracketright ] }; // ) 6 ]
- key <AE07> { [ plus, 7, plusminus ] }; // + 7 ±
- key <AE08> { [ minus, 8, notsign ] }; // - 8 ¬
- key <AE09> { [ asterisk, 9, multiply ] }; // * 9 ×
- key <AE10> { [ slash, 0, division ] }; // / 0 ÷
- key <AE11> { [ equal, asciicircum, macron ] }; // = ^ ¯
- key <AE12> { [ percent, mu ] }; // % µ
+ key <TLDE> { [ dollar, numbersign, endash, paragraph ] }; // $ # – ¶
+ key <AE01> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ quotedbl, 1, emdash, doublelowquotemark ] }; // " 1 — „
+ key <AE02> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ guillemotleft, 2, less, leftdoublequotemark ] }; // « 2 < “
+ key <AE03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ guillemotright, 3, greater, rightdoublequotemark ] }; // » 3 > ”
+ key <AE04> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ parenleft, 4, bracketleft, lessthanequal ] }; // ( 4 [ ≤
+ key <AE05> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ parenright, 5, bracketright, greaterthanequal ] }; // ) 5 ] ≥
+ key <AE06> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ at, 6, asciicircum ] }; // @ 6 ^
+ key <AE07> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ plus, 7, plusminus, notsign ] }; // + 7 ± ¬
+ key <AE08> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ minus, 8, U2212, onequarter ] }; // - 8 − ¼
+ key <AE09> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ slash, 9, division, onehalf ] }; // / 9 ÷ ½
+ key <AE10> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ asterisk, 0, multiply, threequarters ] }; // * 0 × ¾
+ key <AE11> { [ equal, degree, notequal, minutes ] }; // = ° ≠ ′
+ key <AE12> { [ percent, grave, U2030, seconds ] }; // % ` ‰ ″
// Second row
- key <AD01> { [ b, B, bar ] }; // b B |
- key <AD02> { [ eacute, Eacute, ampersand, dead_acute ] }; // é É & ˊ
- key <AD03> { [ p, P, section, paragraph ] }; // p P § ¶
+ key <AD01> { [ b, B, bar, brokenbar ] }; // b B | ¦
+ key <AD02> { [ eacute, Eacute, dead_acute, dead_doubleacute ] }; // é É ˊ ˝
+ key <AD03> { [ p, P, ampersand, section ] }; // p P & §
key <AD04> { [ o, O, oe, OE ] }; // o O œ Œ
- key <AD05> { [ egrave, Egrave, grave, dead_grave ] }; // è È ` `
- key <AD06> { [ ccedilla, Ccedilla ] }; // ç Ç
- key <AD07> { [ v, V ] }; // v V
+ key <AD05> { [ egrave, Egrave, dead_grave, grave ] }; // è È ` `
+ key <AD06> { [ dead_circumflex, exclam, exclamdown ] }; // ^ ! ¡
+ key <AD07> { [ v, V, dead_caron ] }; // v V ˇ
key <AD08> { [ d, D, eth, ETH ] }; // d D ð Ð
- key <AD09> { [ l, L, sterling ] }; // l L £
- key <AD10> { [ f, F, ordfeminine ] }; // f F ª
- key <AD11> { [ j, J ] }; // j J
- key <AD12> { [ z, Z ] }; // z Z
+ key <AD09> { [ l, L, dead_stroke ] }; // l L /
+ key <AD10> { [ j, J, U0133, U0132 ] }; // j J ij IJ
+ key <AD11> { [ z, Z, schwa, SCHWA ] }; // z Z ə Ə
+ key <AD12> { [ w, W, dead_breve ] }; // w W ̆
// Third row
key <AC01> { [ a, A, ae, AE ] }; // a A æ Æ
key <AC02> { [ u, U, ugrave, Ugrave ] }; // u U ù Ù
- key <AC03> { [ i, I, dead_diaeresis, dead_caron ] }; // i I ̈ ˇ
- key <AC04> { [ e, E, EuroSign ] }; // e E €
- key <AC05> { [ comma, question, questiondown ] }; // , ? ¿
- key <AC06> { [ c, C, copyright, cent ] }; // c C © ¢
- key <AC07> { [ t, T, thorn, Thorn ] }; // t T þ Þ
- key <AC08> { [ s, S, ssharp ] }; // s S ß
- key <AC09> { [ n, N ] }; // n N
- key <AC10> { [ r, R, registered ] }; // r R ®
- key <AC11> { [ m, M, masculine ] }; // m M º
- key <BKSL> { [ dead_circumflex, exclam, exclamdown ] }; // ^ ! ¡
+ key <AC03> { [ i, I, dead_diaeresis, dead_abovedot ] }; // i I ̈ ˙
+ key <AC04> { [ e, E, EuroSign, dead_currency ] }; // e E € ¤
+ key <AC05> { [ comma, semicolon, rightsinglequotemark, dead_horn ] }; // , ; ’ ̛
+ key <AC06> { [ c, C, copyright, U017F ] }; // c C © ſ
+ key <AC07> { [ t, T, thorn, THORN ] }; // t T þ Þ
+ key <AC08> { [ s, S, ssharp, U1E9E ] }; // s S ß ẞ
+ key <AC09> { [ r, R, registered, trademark ] }; // r R ® ™
+ key <AC10> { [ n, N, dead_tilde ] }; // n N ~
+ key <AC11> { [ m, M, dead_macron, masculine ] }; // m M ̄ º
+ key <BKSL> { [ ccedilla, Ccedilla, dead_cedilla, dead_belowcomma ] }; // ç Ç ¸ ,
// Fourth row
- key <LSGT> { [ ecircumflex, ugrave, slash ] }; // ê ù /
- key <AB01> { [ agrave, Agrave, asciitilde, dead_tilde ] }; // à À ~ ~
- key <AB02> { [ h, H, exclam ] }; // h H !
- key <AB03> { [ y, Y, yen ] }; // y Y ¥
- key <AB04> { [ period, colon, backslash, periodcentered ] }; // . : \ ·
- key <AB05> { [ k, K ] }; // k K
- key <AB06> { [ apostrophe, semicolon ] }; // ' ;
- key <AB07> { [ q, Q, oslash, Ooblique ] }; // q Q ø Ø
- key <AB08> { [ g, G ] }; // g G
- key <AB09> { [ x, X ] }; // x X
- key <AB10> { [ w, W ] }; // w W
-
- key <SPCE> { [ space, nobreakspace, space, space ] }; // ␣ ⍽ (espace insécable) ␣ ␣
-
- include "level3(ralt_switch)"
+ key <LSGT> { [ ecircumflex, Ecircumflex, slash ] }; // ê Ê /
+ key <AB01> { [ agrave, Agrave, backslash ] }; // à À \
+ key <AB02> { [ y, Y, braceleft, leftsinglequotemark ] }; // y Y { ‘
+ key <AB03> { [ x, X, braceright, rightsinglequotemark ] }; // x X } ’
+ key <AB04> { [ period, colon, ellipsis, periodcentered ] }; // . : … ·
+ key <AB05> { [ k, K, asciitilde ] }; // k K ~
+ key <AB06> { [ apostrophe, question, questiondown, dead_hook ] }; // ' ? ¿ ̉
+ key <AB07> { [ q, Q, dead_abovering, dead_belowdot ] }; // q Q ˚ ̣
+ key <AB08> { [ g, G, mu ] }; // g G µ
+ key <AB09> { [ h, H, dagger, doubledagger ] }; // h H † ‡
+ key <AB10> { [ f, F, dead_ogonek, ordfeminine ] }; // f F ̨ ª
+
+ key <SPCE> { [ space, nobreakspace, underscore, U202F ] }; // ␣ (espace insécable) _ (espace insécable fin)
};
partial alphanumeric_keys
@@ -529,12 +529,44 @@ xkb_symbols "bepo_latin9" {
// Restricts the fr(bepo) layout to latin9 symbols
- include "keypad(oss_latin9)"
include "fr(bepo)"
+ include "keypad(oss_latin9)"
name[Group1]="France - Bepo, ergonomic, Dvorak way, latin-9 only";
- // at now, no difference (oss keypad excepted), but will change !
+ key <TLDE> { [ dollar, numbersign, dollar, paragraph ] }; // $ # $ ¶
+
+ key <AE01> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ quotedbl, 1 ] }; // " 1
+ key <AE02> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ guillemotleft, 2, less ] }; // « 2 <
+ key <AE03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ guillemotright, 3, greater ] }; // » 3 >
+ key <AE04> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ parenleft, 4, bracketleft ] }; // ( 4 [
+ key <AE05> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ parenright, 5, bracketright ] }; // ) 5 ]
+ key <AE08> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ minus, 8, minus, onequarter ] }; // - 8 - ¼
+ key <AE11> { [ equal, degree ] }; // = °
+ key <AE12> { [ percent, grave ] }; // % `
+
+ key <AD01> { [ b, B, bar ] }; // b B |
+ key <AD02> { [ eacute, Eacute, dead_acute ] }; // é É ˊ
+ key <AD10> { [ j, J ] }; // j J
+ key <AD11> { [ z, Z ] }; // z Z
+ key <AD12> { [ w, W ] }; // w W
+
+ key <AC03> { [ i, I, dead_diaeresis ] }; // i I ̈
+ key <AC05> { [ comma, semicolon, comma, dead_horn ] }; // , ; , ̛
+ key <AC06> { [ c, C, copyright ] }; // c C ©
+ key <AC08> { [ s, S, ssharp ] }; // s S ß
+ key <AC09> { [ r, R, registered ] }; // r R ®
+ key <AC11> { [ m, M, macron, masculine ] }; // m M ̄ º
+
+ key <AB02> { [ y, Y, braceleft ] }; // y Y {
+ key <AB03> { [ x, X, braceright ] }; // x X }
+ key <AB04> { [ period, colon ] }; // . :
+ key <AB09> { [ h, H ] }; // h H
+ key <AB10> { [ f, F, f, ordfeminine ] }; // f F ª
+
+ // Note : on a besoin de redéfinir les niveaux 3 et 4,
+ // donc nbsp(level2) ne suffit pas !
+ key <SPCE> { [ space, nobreakspace, underscore, nobreakspace ] }; // ␣ (espace insécable) _ (espace insécable)
};
// Author : Francis Leboutte, http://www.algo.be/ergo/dvorak-fr.html
@@ -641,6 +673,193 @@ xkb_symbols "dvorak" {
key <SPCE> { [ space, space, nobreakspace, nobreakspace ] };
};
+// C'WHERTY: Breton keyboard. Ar c'hlavier brezhoneg.
+// Copyright © 2009 Dominique Pellé <dominique.pelle@gmail.com>
+// Version: 0.1
+//
+// ┌────┐
+// │ S A│ S = Reol = Shift, A = ArErl + Pennlizherenn = AltGr + Shift
+// │ s a│ s = normal, a = AltGr
+// └────┘
+//
+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
+// │ $ Γ │ 1 Δ │ 2 Θ │ 3 Λ │ 4 Ξ │ 5 Π │ 6 Σ │ 7 Φ │ 8 Ψ │ 9 Ç │ 0 Ω │ ° ß │ + ¬ ┃ ⌫ Souzañ┃
+// │ ² ˙ │ & ¯ │ é ´ │ " # │ ' { │ ( [ │ - | │ è ` │ - \ │ ç ± │ à @ │ ) ] │ = } ┃ ┃
+// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
+// ┃Toalenn┃ C'h │ W ω │ E ε │ R ρ │ T τ │ Y ψ │ U υ │ I ι │ O OE│ P π │ ¨ ¥ │ * £ ┃Enankañ┃
+// ┃ ↹ ┃ c'h │ w │ e € │ r │ t │ y │ u │ i ı │ o oe│ p │ ^ « │ / » ┃ ⏎ ┃
+// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓ ┃
+// ┃Prenn ┃ A Æ │ S σ │ D δ │ F φ │ G γ │ H η │ J ς │ K κ │ L λ │ M μ │ Ù ® │ ! ¡ ┃ ┃
+// ┃Pennli ⇬┃ a æ │ s │ d $ │ f │ g │ h │ j │ k │ l │ m │ ù ŭ │ ? ¿ ┃ ┃
+// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
+// ┃ ┃ Q θ │ Z ζ │ X ξ │ C χ │ V │ B β │ N ν │ CH │ Ñ │ : © │ ; ┃ ┃
+// ┃Shift ⇧┃ q < │ z > │ x │ c ¢ │ v │ b │ n │ ch │ ñ │ . │ , ┃Shift ⇧ ┃
+// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
+// ┃ ┃ ┃ ┃ ⍽ Espace insécable ␣ ┃ ┃ ┃ ┃
+// ┃Reol ┃Meta ┃Erl ┃ ␣ Espace ␣ ┃ArErl ⇮┃Menu ┃Reol ┃
+// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
+partial alphanumeric_keys
+xkb_symbols "bre" {
+
+ include "keypad(oss)"
+
+ name[Group1]= "France - Breton";
+
+ // First row
+ key <TLDE> { [ twosuperior, dead_tilde, dead_abovedot, Greek_GAMMA ] };
+ key <AE01> { [ ampersand, 1, dead_macron, Greek_DELTA ] };
+ key <AE02> { [ eacute, 2, dead_acute, Greek_THETA ] };
+ key <AE03> { [ quotedbl, 3, numbersign, Greek_LAMDA ] };
+ key <AE04> { [ apostrophe, 4, braceleft, Greek_XI ] };
+ key <AE05> { [ parenleft, 5, bracketleft, Greek_PI ] };
+ key <AE06> { [ minus, 6, bar, Greek_SIGMA ] };
+ key <AE07> { [ egrave, 7, dead_grave, Greek_PHI ] };
+ key <AE08> { [ underscore, 8, backslash, Greek_PSI ] };
+ key <AE09> { [ ccedilla, 9, plusminus, Ccedilla ] };
+ key <AE10> { [ agrave, 0, at, Greek_OMEGA ] };
+ key <AE11> { [ parenright, dead_abovering, bracketright, ssharp ] };
+ key <AE12> { [ equal, plus, braceright, notsign ] };
+
+ // Second row
+ // Handling the C'H key correctly requires an inputmethod (XIM)
+ // See https://bugs.freedesktop.org/show_bug.cgi?id=19506
+ // key <AD01> { [ trigraph_c_h, trigraph_C_h, trigraph_C_H, Greek_alpha ] };
+ key <AD01> { [ UF8FD, UF8FE, UF8FF, Greek_alpha ] };
+ key <AD02> { [ w, W, Greek_omega, Greek_omega ] };
+ key <AD03> { [ e, E, EuroSign, Greek_epsilon ] };
+ key <AD04> { [ r, R, Greek_rho, Greek_rho ] };
+ key <AD05> { [ t, T, Greek_tau, Greek_tau ] };
+ key <AD06> { [ y, Y, Greek_psi, Greek_psi ] };
+ key <AD07> { [ u, U, Greek_upsilon, Greek_upsilon ] };
+ key <AD08> { [ i, I, idotless, Greek_iota ] };
+ key <AD09> { [ o, O, oe, OE ] };
+ key <AD10> { [ p, P, Greek_pi, Greek_pi ] };
+ key <AD11> { [ dead_circumflex, dead_diaeresis, guillemotleft, yen ] };
+ key <AD12> { [ slash, asterisk, guillemotright, sterling ] };
+
+ // Third row
+ key <AC01> { [ a, A, ae, AE ] };
+ key <AC02> { [ s, S, Greek_sigma, Greek_sigma ] };
+ key <AC03> { [ d, D, dollar, Greek_delta ] };
+ key <AC04> { [ f, F, Greek_phi, Greek_phi ] };
+ key <AC05> { [ g, G, Greek_gamma, Greek_gamma ] };
+ key <AC06> { [ h, H, Greek_eta, Greek_eta ] };
+ key <AC07> { [ j, J, Greek_finalsmallsigma, Greek_finalsmallsigma ] };
+ key <AC08> { [ k, K, Greek_kappa, Greek_kappa ] };
+ key <AC09> { [ l, L, Greek_lamda, Greek_lambda ] };
+ key <AC10> { [ m, M, Greek_mu, Greek_mu ] };
+ key <AC11> { [ ugrave, Ugrave, ubreve, registered ] };
+ key <BKSL> { [ question, exclam, questiondown, exclamdown ] };
+
+ // Fourth row
+ key <LSGT> { [ q, Q, less, Greek_theta ] };
+ key <AB01> { [ z, Z, greater, Greek_zeta ] };
+ key <AB02> { [ x, X, Greek_xi, Greek_xi ] };
+ key <AB03> { [ c, C, cent, Greek_chi ] };
+ key <AB04> { [ v, V ] };
+ key <AB05> { [ b, B, Greek_beta, Greek_beta ] };
+ key <AB06> { [ n, N, Greek_nu, Greek_nu ] };
+ // Handling the CH key correctly requires an inputmethod (XIM)
+ // See https://bugs.freedesktop.org/show_bug.cgi?id=19506
+ // key <AB07> { [ digraph_ch, digraph_Ch, digraph_CH, Greek_omicron ] };
+ key <AB07> { [ UF8FA, UF8FB, UF8FC, Greek_omicron ] };
+ key <AB08> { [ ntilde, Ntilde ] };
+ key <AB09> { [ period, colon, section, copyright ] };
+ key <AB10> { [ comma, semicolon, percent ] };
+
+ key <SPCE> { [ space, nobreakspace, space, nobreakspace ] };
+
+ include "level3(ralt_switch)"
+};
+
+// Occitan layout
+// Author : 2009 Thomas Metz <tmetz @ free.fr>
+// Derivated from the layout defined at http://www.panoccitan.org
+// Version: 0.1
+// From OSS french keyboard :
+// - add á, í, ò, ó et ú, Á, Í, Ò, Ó, Ú, ñ, Ñ
+// - change position of æ, ü, î, û, œ, ô, ö, ï, â, ë
+//
+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
+// │ ³ ¸ │ 1 ̨ │ 2 É │ 3 ˘ │ 4 — │ 5 – │ 6 ‑ │ 7 È │ 8 ™ │ 9 Ç │ 0 À │ ° ≠ │ + ± ┃ ⌫ Retour┃
+// │ ² ¹ │ & ˇ │ é ~ │ " # │ ' { │ ( [ │ - | │ è ` │ _ \ │ ç ^ │ à @ │ ) ] │ = } ┃ arrière┃
+// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
+// ┃ ┃ A Á │ Z Æ │ E ¢ │ R Ê │ T Ë │ Y Û │ U Ú │ I Í │ O Ó │ P Ò │ ¨ Œ │ £ Ø ┃Entrée ┃
+// ┃Tab ↹ ┃ a á │ z æ │ e € │ r ê │ t ë │ y û │ u ú │ i í │ o ó │ p ò │ ^ œ │ $ ø ┃ ⏎ ┃
+// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓ ┃
+// ┃ ┃ Q Ä │ S „ │ D Â │ F ‚ │ G ¥ │ H Ü │ J Î │ K Ï │ L Ô │ M Ö │ % Ù │ µ ̄ ┃ ┃
+// ┃Maj ⇬ ┃ q ä │ s ß │ d â │ f ‘ │ g ’ │ h ü │ j î │ k ï │ l ô │ m ö │ ù ' │ * ` ┃ ┃
+// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
+// ┃ ┃ > ≥ │ W “ │ X ” │ C ® │ V ← │ B ↑ │ N Ñ │ ? … │ . . │ / ∕ │ § − ┃ ┃
+// ┃Shift ⇧┃ < ≤ │ w « │ x » │ c © │ v → │ b ↓ │ n ñ │ , ¿ │ ; × │ : ÷ │ ! ¡ ┃Shift ⇧ ┃
+// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
+// ┃ ┃ ┃ ┃ ␣ Espace fine insécable ⍽ ┃ ┃ ┃ ┃
+// ┃Ctrl ┃Meta ┃Alt ┃ ␣ Espace Espace insécable ⍽ ┃AltGr ⇮┃Menu ┃Ctrl ┃
+// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
+partial alphanumeric_keys
+xkb_symbols "oci" {
+
+ include "keypad(oss)"
+
+ name[Group1]= "France - Occitan";
+
+ // First row
+ key <TLDE> { [ twosuperior, threesuperior, onesuperior, dead_cedilla ] }; // ² ³ ¹ ¸
+ key <AE01> { [ ampersand, 1, dead_caron, dead_ogonek ] }; // & 1 ˇ ̨
+ key <AE02> { [ eacute, 2, asciitilde, Eacute ] }; // é 2 ~ É
+ key <AE03> { [ quotedbl, 3, numbersign, dead_breve ] }; // " 3 # ˘
+ key <AE04> { [ apostrophe, 4, braceleft, 0x1002014 ] }; // ' 4 { — (tiret cadratin)
+ key <AE05> { [ parenleft, 5, bracketleft, 0x1002013 ] }; // ( 5 [ – (tiret demi-cadratin)
+ key <AE06> { [ minus, 6, bar, 0x1002011 ] }; // - 6 | ‑ (tiret insécable)
+ key <AE07> { [ egrave, 7, grave, Egrave ] }; // è 7 ` È
+ key <AE08> { [ underscore, 8, backslash, trademark ] }; // _ 8 \ ™
+ key <AE09> { [ ccedilla, 9, asciicircum, Ccedilla ] }; // ç 9 ^ Ç
+ key <AE10> { [ agrave, 0, at, Agrave ] }; // à 0 @ À
+ key <AE11> { [ parenright, degree, bracketright, notequal ] }; // ) ° ] ≠
+ key <AE12> { [ equal, plus, braceright, plusminus ] }; // = + } ±
+
+ // Second row
+ key <AD01> { [ a, A, aacute, Aacute ] }; // a A á Á
+ key <AD02> { [ z, Z, ae, AE ] }; // z Z æ Æ
+ key <AD03> { [ e, E, EuroSign, cent ] }; // e E € ¢
+ key <AD04> { [ r, R, ecircumflex, Ecircumflex ] }; // r R ê Ê
+ key <AD05> { [ t, T, ediaeresis, Ediaeresis ] }; // t T ë Ë
+ key <AD06> { [ y, Y, ucircumflex, Ucircumflex ] }; // y Y û Û
+ key <AD07> { [ u, U, uacute, Uacute ] }; // u U ú Ú
+ key <AD08> { [ i, I, iacute, Iacute ] }; // i I í Í
+ key <AD09> { [ o, O, oacute, Oacute ] }; // o O ó Ó
+ key <AD10> { [ p, P, ograve, Ograve ] }; // p P ò Ò
+ key <AD11> { [ dead_circumflex, dead_diaeresis, oe, OE ] }; // ^ ̈ ̃ œ Œ
+ key <AD12> { [ dollar, sterling, oslash, Ooblique ] }; // $ £ ø Ø
+
+ // Third row
+ key <AC01> { [ q, Q, adiaeresis, Adiaeresis ] }; // q Q ä Ä
+ key <AC02> { [ s, S, ssharp, doublelowquotemark ] }; // s S ß „
+ key <AC03> { [ d, D, acircumflex, Acircumflex ] }; // d D â Â
+ key <AC04> { [ f, F, leftsinglequotemark, singlelowquotemark ] }; // f F ‘ ‚
+ key <AC05> { [ g, G, rightsinglequotemark, yen ] }; // g G ’ ¥
+ key <AC06> { [ h, H, udiaeresis, Udiaeresis ] }; // h H ü Ü
+ key <AC07> { [ j, J, icircumflex, Icircumflex] }; // j J î Î
+ key <AC08> { [ k, K, idiaeresis, Idiaeresis] }; // k K ï Ï
+ key <AC09> { [ l, L, ocircumflex, Ocircumflex ] }; // l L ô Ô
+ key <AC10> { [ m, M, odiaeresis, Odiaeresis ] }; // m M ö Ö
+ key <AC11> { [ ugrave, percent, dead_acute, Ugrave ] }; // ù % ' Ù
+ key <BKSL> { [ asterisk, mu, dead_grave, dead_macron ] }; // * µ ` ̄
+
+ // Fourth row
+ key <LSGT> { [ less, greater, lessthanequal, greaterthanequal ] }; // < > ≤ ≥
+ key <AB01> { [ w, W, guillemotleft, leftdoublequotemark ] }; // w W « “
+ key <AB02> { [ x, X, guillemotright, rightdoublequotemark ] }; // x X » ”
+ key <AB03> { [ c, C, copyright, registered ] }; // c C © ®
+ key <AB04> { [ v, V, rightarrow, leftarrow ] }; // v V → ←
+ key <AB05> { [ b, B, downarrow, uparrow ] }; // b B ↓ ↑
+ key <AB06> { [ n, N, ntilde, Ntilde ] }; // n N ñ Ñ
+ key <AB07> { [ comma, question, questiondown, 0x1002026 ] }; // , ? ¿ …
+ key <AB08> { [ semicolon, period, multiply, 0x10022C5 ] }; // ; . × ⋅
+ key <AB09> { [ colon, slash, division, 0x1002215 ] }; // : / ÷ ∕
+ key <AB10> { [ exclam, section, exclamdown, 0x1002212 ] }; // ! § ¡ −
+};
+
// Marc.Shapiro@inria.fr 19-sep-1998
// modifications : Etienne Herlent <eherlent@linux-france.org> june 2000
// adapted to the new input layer :
diff --git a/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.in
index 3c7824624..2680b63b6 100644
--- a/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_symbols_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
symbolsdir = $(xkb_base)/symbols/fujitsu_vndr
@@ -198,8 +174,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -223,10 +199,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_symbolsDATA: $(dist_symbols_DATA)
@$(NORMAL_INSTALL)
- test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+ test -z "$(symbolsdir)" || $(MKDIR_P) "$(DESTDIR)$(symbolsdir)"
@list='$(dist_symbols_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -249,22 +224,21 @@ CTAGS:
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -280,7 +254,7 @@ check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(symbolsdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -326,12 +300,20 @@ info-am:
install-data-am: install-dist_symbolsDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -350,17 +332,21 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+uninstall-am: uninstall-dist_symbolsDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_symbolsDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ install-dist_symbolsDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_symbolsDATA uninstall-info-am
+ uninstall-dist_symbolsDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/symbols/gb b/xorg-server/xkbdata.src/symbols/gb
index a2a048ef4..bfb54820c 100644
--- a/xorg-server/xkbdata.src/symbols/gb
+++ b/xorg-server/xkbdata.src/symbols/gb
@@ -61,6 +61,50 @@ xkb_symbols "intl" {
include "level3(ralt_switch)"
};
+partial alphanumeric_keys
+xkb_symbols "extd" {
+ // Clone of the Microsoft "United Kingdom - Extended" layout, which
+ // includes dead keys for: grave; diaeresis; circumflex; tilde; and
+ // accute. It also enables direct access to accute characters using
+ // the Multi_key (Alt Gr).
+ //
+ // Taken from...
+ // "Windows Keyboard Layouts"
+ // http://msdn.microsoft.com/en-us/goglobal/bb964651.aspx
+ //
+ // -- Jonathan Miles <jon@cybah.co.uk>
+
+ include "latin"
+
+ name[Group1]="United Kingdom - Extended - Winkeys";
+
+ // Alphanumeric section
+ key <TLDE> { [ dead_grave, notsign, brokenbar, NoSymbol ] };
+
+ key <AE02> { [ 2, quotedbl, dead_diaeresis, onehalf ] };
+ key <AE03> { [ 3, sterling, threesuperior, onethird ] };
+ key <AE04> { [ 4, dollar, EuroSign, onequarter ] };
+ key <AE06> { [ 6, asciicircum, dead_circumflex, NoSymbol ] };
+
+ key <AD02> { [ w, W, wacute, Wacute ] };
+ key <AD03> { [ e, E, eacute, Eacute ] };
+ key <AD06> { [ y, Y, yacute, Yacute ] };
+ key <AD07> { [ u, U, uacute, Uacute ] };
+ key <AD08> { [ i, I, iacute, Iacute ] };
+ key <AD09> { [ o, O, oacute, Oacute ] };
+
+ key <AC01> { [ a, A, aacute, Aacute ] };
+ key <AC11> { [ apostrophe, at, dead_acute, NoSymbol ] };
+
+ key <AB03> { [ c, C, ccedilla, Ccedilla ] };
+
+ key <BKSL> { [ numbersign, asciitilde, dead_tilde, NoSymbol ] };
+ key <LSGT> { [ backslash, bar, NoSymbol, NoSymbol ] };
+ // End alphanumeric section
+
+ include "level3(ralt_switch)"
+};
+
// Describe the differences between the US Colemak layout
// and a UK variant. By Andy Buckley (andy@insectnation.org)
@@ -93,11 +137,12 @@ xkb_symbols "dvorak" {
name[Group1]="United Kingdom - Dvorak";
- key <BKSL> { [ numbersign, asciitilde ] };
+ key <AD01> { [ apostrophe, at ] };
key <AE02> { [ 2, quotedbl, twosuperior, NoSymbol ] };
key <AE03> { [ 3, sterling, threesuperior, NoSymbol ] };
+ key <BKSL> { [ numbersign, asciitilde ] };
key <LSGT> { [ backslash, bar ] };
- key <AD01> { [ apostrophe, at ] };
+ key <TLDE> { [ grave, notsign, bar, bar ] };
};
// Dvorak letter positions, but punctuation all in the normal UK positions.
diff --git a/xorg-server/xkbdata.src/symbols/gr b/xorg-server/xkbdata.src/symbols/gr
index 5d7efc1a3..4ededb3ff 100644
--- a/xorg-server/xkbdata.src/symbols/gr
+++ b/xorg-server/xkbdata.src/symbols/gr
@@ -12,10 +12,13 @@
default partial alphanumeric_keys alternate_group
xkb_symbols "basic" {
name[Group1] = "Greece";
+
include "eurosign(e)"
include "eurosign(5)"
include "gr(simple)"
include "kpdl(comma)"
+ include "level3(ralt_switch)"
+
key <AB01> { [ NoSymbol, NoSymbol, U037D, U03FF ] };
key <AB02> { [ NoSymbol, NoSymbol, rightarrow, leftarrow ] };
key <AB03> { [ NoSymbol, NoSymbol, copyright ] };
diff --git a/xorg-server/xkbdata.src/symbols/group b/xorg-server/xkbdata.src/symbols/group
index eaa6858c6..1b23e31c2 100644
--- a/xorg-server/xkbdata.src/symbols/group
+++ b/xorg-server/xkbdata.src/symbols/group
@@ -135,6 +135,26 @@ xkb_symbols "shift_caps_switch" {
key <CAPS> { [ ISO_First_Group, ISO_Last_Group ] };
};
+// using the group(win_menu_switch) map, pressing:
+// LWIN selects the first group
+// RWIN or MENU selects the last group
+partial modifier_keys
+xkb_symbols "win_menu_switch" {
+ virtual_modifiers AltGr;
+ key <LWIN> {
+ virtualMods= AltGr,
+ symbols[Group1] = [ ISO_First_Group ]
+ };
+ key <MENU> {
+ virtualMods= AltGr,
+ symbols[Group1] = [ ISO_Last_Group ]
+ };
+ key <RWIN> {
+ virtualMods= AltGr,
+ symbols[Group1] = [ ISO_Last_Group ]
+ };
+};
+
// using the group(ctrl_alt_toggle) map, pressing:
// Control_L+Alt_L locks the previous group
// Control_R+Alt_R locks the next group
@@ -319,3 +339,22 @@ xkb_symbols "olpc" {
key <I219> { [ ISO_Next_Group, ISO_Prev_Group ] };
};
+partial modifier_keys
+xkb_symbols "alt_space_toggle" {
+ key <SPCE> {
+ type[Group1]="PC_ALT_LEVEL2",
+ symbols[Group1]= [ space, ISO_Next_Group ]
+ };
+};
+
+// using the group(sclk_toggle) map, pressing the Scroll Lock key
+// toggles groups.
+partial modifier_keys
+xkb_symbols "sclk_toggle" {
+ virtual_modifiers AltGr;
+ key <SCLK> {
+ virtualMods= AltGr,
+ symbols[Group1] = [ ISO_Next_Group ]
+ };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.in
index e37fe49a5..61fa05a1d 100644
--- a/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_symbols_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
symbolsdir = $(xkb_base)/symbols/hp_vndr
@@ -198,8 +174,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -223,10 +199,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_symbolsDATA: $(dist_symbols_DATA)
@$(NORMAL_INSTALL)
- test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+ test -z "$(symbolsdir)" || $(MKDIR_P) "$(DESTDIR)$(symbolsdir)"
@list='$(dist_symbols_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -249,22 +224,21 @@ CTAGS:
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -280,7 +254,7 @@ check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(symbolsdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -326,12 +300,20 @@ info-am:
install-data-am: install-dist_symbolsDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -350,17 +332,21 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+uninstall-am: uninstall-dist_symbolsDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_symbolsDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ install-dist_symbolsDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_symbolsDATA uninstall-info-am
+ uninstall-dist_symbolsDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/symbols/in b/xorg-server/xkbdata.src/symbols/in
index 59e575de1..bb616fdd8 100644
--- a/xorg-server/xkbdata.src/symbols/in
+++ b/xorg-server/xkbdata.src/symbols/in
@@ -969,9 +969,21 @@ xkb_symbols "tel" {
};
partial alphanumeric_keys
-xkb_symbols "urd" {
- include "pk(urd)"
- name[Group1]= "India - Urdu";
+xkb_symbols "urd-phonetic" {
+ include "pk(urd-phonetic)"
+ name[Group1]= "India - Urdu, Phonetic";
+};
+
+partial alphanumeric_keys
+xkb_symbols "urd-phonetic3" {
+ include "pk(urd-crulp)"
+ name[Group1]= "India - Urdu, Alternative phonetic";
+};
+
+partial alphanumeric_keys
+xkb_symbols "urd-winkeys" {
+ include "pk(urd-nla)"
+ name[Group1]= "India - Urdu, Winkeys";
};
// based on a keyboard map from an 'xkb/symbols/gur' file
@@ -1177,3 +1189,70 @@ xkb_symbols "olpc" {
include "group(olpc)"
};
+
+partial alphanumeric_keys
+xkb_symbols "hin-wx" {
+
+ name[Group1]= "India - Hindi Wx";
+
+ key <TLDE> { [ grave, asciitilde, 2, 3 ] };
+
+ key <AE01> { [ 0x1000967, exclam ] };
+ key <AE02> { [ 0x1000968, at ] };
+ key <AE03> { [ 0x1000969 , numbersign ] };
+ key <AE04> { [ 0x100096A , dollar ] };
+ key <AE05> { [ 0x100096B , percent ] };
+ key <AE06> { [ 0x100096C , asciicircum ] };
+ key <AE07> { [ 0x100096D , ampersand ] };
+ key <AE08> { [ 0x100096e , asterisk ] };
+ key <AE09> { [ 0x100096F, parenleft ] };
+ key <AE10> { [ 0x1000966, parenright ] };
+ key <AE11> { [ minus, underscore ] };
+ key <AE12> { [ equal, plus ] };
+
+
+ key <AD01> { [ 0x1000943, 0x1000944, 0x100090B, 0x1000960] };
+ key <AD02> { [ 0x1000924, 0x1000925 ] };
+ key <AD03> { [ 0x1000947, 0x1000948, 0x100090F, 0x1000910] };
+ key <AD04> { [ 0x1000930, 0x1000937 ] };
+ key <AD05> { [ 0x100091F, 0x1000920 ] };
+
+
+ key <AD06> { [ 0x100092F ] };
+ key <AD07> { [ 0x1000941, 0x1000942, 0x1000909, 0x100090A ] };
+ key <AD08> { [ 0x100093F, 0x1000940, 0x1000907, 0x1000908 ] };
+ key <AD09> { [ 0x100094B, 0x100094C, 0x1000913, 0x1000914] };
+ key <AD10> { [ 0x100092A, 0x100092B ] };
+ key <AD11> { [ bracketleft, braceleft ] };
+ key <AD12> { [ bracketright, braceright ] };
+ key <BKSL> { [ backslash, bar, 0x1000964, 0x1000965 ] };
+
+ key <AC01> { [ 0x100094D, 0x100093E, 0x1000905,0x1000906 ] };
+ key <AC02> { [ 0x1000938, 0x1000936 ] };
+ key <AC03> { [ 0x1000921, 0x1000922 ] };
+ key <AC04> { [ 0x1000919, 0x100091E ] };
+ key <AC05> { [ 0x1000917, 0x1000918 ] };
+
+
+ key <AC06> { [ 0x1000939, 0x1000903 ] };
+ key <AC07> { [ 0x100091C, 0x100091D ] };
+ key <AC08> { [ 0x1000915, 0x1000916 ] };
+ key <AC09> { [ 0x1000932, 0x1000962, 0x1000933, 0x100090C] };
+ key <AC10> { [ semicolon, colon ] };
+ key <AC11> { [ quoteright, quotedbl ] };
+ key <BKSL> { [ backslash, bar ] };
+
+ key <AB01> { [ 0x1000901, 0x100093C, 0x100093D, 0x1000950] };
+ key <AB02> { [ 0x1000926, 0x1000927 ] };
+ key <AB03> { [ 0x100091A, 0x100091B ] };
+ key <AB04> { [ 0x1000935, dead_V ] };
+ key <AB05> { [ 0x100092C, 0x100092D ] };
+ key <AB06> { [ 0x1000928, 0x1000923 ] };
+ key <AB07> { [ 0x100092E, 0x1000902 ] };
+ key <AB08> { [ comma, less ] };
+ key <AB09> { [ period, greater ] };
+ key <AB10> { [ slash, question ] };
+
+ include "level3(ralt_switch)"
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/inet b/xorg-server/xkbdata.src/symbols/inet
index 54ec2418c..a159021f8 100644
--- a/xorg-server/xkbdata.src/symbols/inet
+++ b/xorg-server/xkbdata.src/symbols/inet
@@ -23,6 +23,7 @@
// Very common set of media keys
partial hidden alphanumeric_keys
xkb_symbols "media_common" {
+ key <I01> { [ XF86AudioMedia ] };
key <I10> { [ XF86AudioPrev ] };
key <I19> { [ XF86AudioNext ] };
key <I20> { [ XF86AudioMute ] };
@@ -30,21 +31,62 @@ xkb_symbols "media_common" {
key <I24> { [ XF86AudioStop, XF86Eject ] };
key <I2E> { [ XF86AudioLowerVolume ] };
key <I30> { [ XF86AudioRaiseVolume ] };
+ key <K5A> { [ XF86Eject ] };
};
// popular web navigation combination
partial hidden alphanumeric_keys
xkb_symbols "nav_common" {
- key <I69> { [ XF86Forward ] };
- key <I6A> { [ XF86Back ] };
+ key <I21> { [ XF86Calculator ] };
+ key <I32> { [ XF86WWW ] };
+ key <I65> { [ XF86Search ] };
+ key <I66> { [ XF86Favorites ] };
+ key <I67> { [ XF86Reload ] };
+ key <I68> { [ XF86Stop ] };
+ key <I69> { [ XF86Forward ] };
+ key <I6A> { [ XF86Back ] };
+ key <I6B> { [ XF86MyComputer ] };
+ key <I6C> { [ XF86Mail ] };
+ key <I6D> { [ XF86AudioMedia ] };
};
+// ACPI Standard
+partial hidden alphanumeric_keys
+xkb_symbols "acpi_common" {
+ key <I5E> { [ XF86PowerOff ] };
+ key <I5F> { [ XF86Standby ] };
+ key <I63> { [ XF86WakeUp ] };
+ key <I74> { [ XF86Battery ] };
+ key <I76> { [ XF86WLAN ] };
+ key <I16> { [ XF86Sleep ] };
+};
+
+// Combined sections, for simplicity
partial hidden alphanumeric_keys
xkb_symbols "media_nav_common" {
include "inet(media_common)"
include "inet(nav_common)"
};
+partial hidden alphanumeric_keys
+xkb_symbols "media_nav_acpi_common" {
+ include "inet(media_common)"
+ include "inet(nav_common)"
+ include "inet(acpi_common)"
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "nav_acpi_common" {
+ include "inet(nav_common)"
+ include "inet(acpi_common)"
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "media_acpi_common" {
+ include "inet(media_common)"
+ include "inet(acpi_common)"
+};
+
// Evdev Standardized Keycodes
partial alphanumeric_keys
xkb_symbols "evdev" {
@@ -65,7 +107,9 @@ xkb_symbols "evdev" {
key <HELP> { [ Help ] };
key <LNFD> { [ Linefeed ] };
- key <HZTG> { [ Zenkaku_Hankaku ] };
+// Commented out because HZTG has same keycode as TLDE
+// key <HZTG> { [ Zenkaku_Hankaku ] };
+
key <HKTG> { [ Hiragana_Katakana ] };
key <HENK> { [ Henkan ] };
key <MUHE> { [ Muhenkan ] };
@@ -113,7 +157,7 @@ xkb_symbols "evdev" {
// key <I178> { [ ] }; // KEY_ISO
key <I179> { [ XF86Tools ] };
key <I180> { [ XF86HomePage ] };
- key <I181> { [ XF86Refresh ] };
+ key <I181> { [ XF86Reload ] };
key <I182> { [ XF86Close ] };
// key <I183> { [ ] }; // KEY_MOVE
// key <I184> { [ ] }; // KEY_EDIT
@@ -127,7 +171,7 @@ xkb_symbols "evdev" {
key <I209> { [ XF86AudioPause ] };
key <I210> { [ XF86Launch3 ] };
key <I211> { [ XF86Launch4 ] };
- key <I213> { [ XF86Standby ] };
+ key <I213> { [ XF86Suspend ] };
key <I214> { [ XF86Close ] };
key <I215> { [ XF86AudioPlay ] };
key <I216> { [ XF86Forward ] };
@@ -158,64 +202,24 @@ xkb_symbols "evdev" {
key <I241> { [ XF86MailForward ] };
key <I242> { [ XF86Save ] };
key <I243> { [ XF86Documents ] };
-// key <I244> { [ ] }; // KEY_BATTERY
-// key <I245> { [ ] }; // KEY_BLUETOOTH
-// key <I246> { [ ] }; // KEY_WLAN
+ key <I244> { [ XF86Battery ] };
+ key <I245> { [ XF86Bluetooth ] };
+ key <I246> { [ XF86WLAN ] };
// key <I249> { [ ] }; // KEY_VIDEO_NEXT -- drive next video source
// key <I250> { [ ] }; // KEY_VIDEO_PREV -- drive previous video source
// key <I251> { [ ] }; // KEY_BRIGHTNESS_CYCLE -- bright up, max++ == min
// key <I252> { [ ] }; // KEY_BRIGHTNESS_ZERO -- brightness off
// key <I253> { [ ] }; // KEY_DISPLAY_OFF -- turn off display
+// key <I254> { [ ] }; // KEY_WIMAX
+ key <I255> { [ XF86Hibernate ] }; // KEY_HIBERNATE
};
-// A4Tech KB-21
-partial alphanumeric_keys
-xkb_symbols "a4techKB21" {
- include "inet(media_nav_common)"
- key <I32> { [ XF86HomePage ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Refresh ] };
- key <I68> { [ XF86Stop ] };
- key <I6B> { [ XF86MyComputer ] };
- key <I6C> { [ XF86Mail ] };
-};
-
-// A4 KBS-8. Contributed by ojo at force dot sk
-partial alphanumeric_keys
-xkb_symbols "a4techKBS8" {
- include "inet(a4techKB21)"
- key <I21> { [ XF86Calculator ] };
- key <I5F> { [ XF86Standby ] };
- key <I6D> { [ XF86AudioMedia ] };
-};
-
-// A4Tech Wireless Desktop (RFKB-23)
-partial alphanumeric_keys
-xkb_symbols "a4_rfkb23" {
- include "inet(media_common)"
- key <I21> { [ XF86Calculator ] };
- key <I32> { [ XF86HomePage ] };
- key <I32> { [ XF86WWW ] };
- key <I5F> { [ XF86Sleep ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Refresh ] };
- key <I68> { [ XF86Stop ] };
-// should they be swapped?
- key <I69> { [ XF86Back ] };
- key <I6A> { [ XF86Forward ] };
-
- key <I6B> { [ XF86MyComputer ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
-};
-
// Acer AirKey V
partial alphanumeric_keys
xkb_symbols "airkey" {
+ include "inet(acpi_common)"
key <I13> { [ XF86AudioNext ] };
key <I15> { [ XF86AudioPlay, XF86AudioPause ] };
key <I16> { [ XF86Mail ] };
@@ -226,22 +230,18 @@ xkb_symbols "airkey" {
key <I2D> { [ XF86AudioRaiseVolume ] };
key <I2F> { [ XF86Terminal ] };
key <I31> { [ XF86AudioStop, XF86Eject ] };
- key <I5E> { [ XF86PowerOff ] };
- key <I63> { [ XF86Standby ] };
};
// Acer C300 Laptop
partial alphanumeric_keys
xkb_symbols "acer_c300" {
-
+ include "inet(nav_common)"
key <I17> { [ F14 ] };
key <I1F> { [ F13 ] };
key <I20> { [ XF86AudioMute ] };
key <I2E> { [ XF86AudioLowerVolume ] };
key <I30> { [ XF86AudioRaiseVolume ] };
- key <I32> { [ XF86Mail ] };
key <I5E> { [ XF86Launch2 ] };
- key <I6C> { [ XF86WWW ] };
key <I75> { [ Help ] };
key <XFER> { [ XF86Launch1 ] };
};
@@ -250,12 +250,10 @@ xkb_symbols "acer_c300" {
// From Alex Dubov <oakad@yahoo.com>
partial alphanumeric_keys
xkb_symbols "acer_ferrari4k" {
- include "inet(media_common)"
+ include "inet(media_nav_common)"
key <I24> { [ dollar ] };
key <I25> { [ EuroSign ] };
key <I26> { [ XF86Display ] };
- key <I32> { [ XF86WWW ] }; //"Saturn" button
- key <I6C> { [ XF86Mail ] }; //"mail" button
// Missing keycodes - set-up with setkeycodes
key <I70> { [ Help ] };
key <I71> { [ XF86Launch1 ] };
@@ -271,17 +269,14 @@ xkb_symbols "acer_ferrari4k" {
// (Not all these keys will be available on every Acer laptop)
partial alphanumeric_keys
xkb_symbols "acer_laptop" {
- include "inet(media_common)"
+ include "inet(media_nav_acpi_common)"
key <I17> { [ XF86Launch2 ] }; // "P" or "P2" (HAL)
key <I1F> { [ XF86Launch1 ] }; // "e" or "P1" (HAL)
// Hotkeys (Function)
// Launch Keys
// Device keys
- key <I32> { [ XF86WWW ] }; // "Saturn" button
key <I56> { [ XF86Display ] }; // Fn+F5 (HAL)
- key <I5F> { [ XF86Sleep ] }; // Fn+F4
- key <I6C> { [ XF86Mail ] }; // "mail" button
key <I71> { [ XF86Launch4 ] }; // Fn+F3 (HAL)
key <I72> { [ XF86LaunchB ] }; // Bluetooth (HAL)
key <I73> { [ XF86LaunchA ] }; // Wireless (HAL)
@@ -299,74 +294,33 @@ xkb_symbols "acer_laptop" {
// key <K5E> { [ dollar ] }; // Dollar (HAL)
};
-// Asus
-partial alphanumeric_keys
-xkb_symbols "asus_laptop" {
- include "inet(media_common)"
- key <I32> { [ XF86WWW ] };
- key <I6C> { [ XF86Mail ] };
-};
-
// Azona
// Azona RF2300 wireless Internet Keyboard
partial alphanumeric_keys
xkb_symbols "azonaRF2300" {
// From Radics Laszlo <garaboncias@mailbox.hu>
- include "inet(nav_common)"
- key <I02> { [ XF86WWW ] };
+ include "inet(nav_acpi_common)"
+ key <I02> { [ XF86HomePage ] };
key <I17> { [ XF86AudioStop ] };
key <I1E> { [ XF86AudioRaiseVolume ] };
key <I1F> { [ XF86AudioPlay, XF86AudioPause ] };
- key <I21> { [ XF86Calculator ] };
key <I22> { [ XF86AudioNext ] };
key <I24> { [ XF86AudioPrev ] };
key <I25> { [ XF86AudioLowerVolume ] };
key <I26> { [ XF86AudioMute ] };
key <I3C> { [ XF86Copy ] };
- key <I5F> { [ XF86Standby ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86Favorites ] };
- key <I6C> { [ XF86Mail ] };
key <I78> { [ XF86Cut ] };
// key <RCTL> { [ XF86Paste ] };
};
-// ACPI Standard
-partial alphanumeric_keys
-xkb_symbols "acpi" {
- key <I5E> { [ XF86PowerOff ] };
- key <I5F> { [ XF86Standby ] };
- key <I63> { [ XF86WakeUp ] };
-};
-
-
-// Advance
-
-// Advance Scorpius KI
-partial alphanumeric_keys
-xkb_symbols "scorpius" {
- include "inet(media_nav_common)"
- key <I21> { [ XF86Calculator ] };
- key <I32> { [ XF86HomePage ] };
- key <I5E> { [ XF86PowerOff ] };
- key <I5F> { [ XF86Standby ] };
- key <I63> { [ XF86WakeUp ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Reload ] };
- key <I68> { [ XF86Stop ] };
- key <I6B> { [ XF86MyComputer ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
-};
-
// Brother
// Brother Internet Keyboard
partial alphanumeric_keys
xkb_symbols "brother" {
+ include "inet(acpi_common)"
key <I10> { [ XF86ScrollUp ] };
key <I12> { [ XF86AudioPlay, XF86AudioPause ] };
key <I17> { [ XF86AudioPrev ] };
@@ -382,9 +336,6 @@ xkb_symbols "brother" {
key <I2E> { [ XF86AudioNext ] };
key <I30> { [ XF86AudioRaiseVolume ] };
key <I32> { [ XF86ZoomIn ] };
- key <I5E> { [ XF86PowerOff ] };
- key <I5F> { [ XF86Standby ] };
- key <I63> { [ XF86WakeUp ] };
key <I68> { [ XF86AudioLowerVolume ] };
};
@@ -394,6 +345,7 @@ xkb_symbols "brother" {
// BTC 5113RF Multimedia
partial alphanumeric_keys
xkb_symbols "btc5113rf" {
+ include "inet(acpi_common)"
key <I10> { [ XF86AudioStop ] };
key <I12> { [ XF86AudioMute ] };
key <I19> { [ XF86AudioPlay, XF86AudioPause ] };
@@ -406,30 +358,13 @@ xkb_symbols "btc5113rf" {
key <I26> { [ XF86Back ] };
key <I30> { [ XF86WWW ] };
key <I32> { [ XF86Search ] };
- key <I5E> { [ XF86PowerOff ] };
- key <I5F> { [ XF86Standby ] };
- key <I63> { [ XF86WakeUp ] };
-};
-
-// BTC 5126T
-partial alphanumeric_keys
-xkb_symbols "btc5126t" {
- key <I32> { [ XF86WWW ] };
- key <I5F> { [ XF86Standby ] };
- key <I6C> { [ XF86Mail ] };
};
-// BTC 6301URF
-partial alphanumeric_keys
-xkb_symbols "btc6301urf" {
- include "inet(media_nav_common)"
- include "inet(btc5126t)"
- key <I66> { [ XF86Favorites ] };
-};
// BTC 9000
partial alphanumeric_keys
xkb_symbols "btc9000" {
+ include "inet(acpi_common)"
key <I10> { [ XF86AudioStop ] };
key <I12> { [ XF86AudioMute ] };
key <I19> { [ XF86AudioPlay, XF86AudioPause ] };
@@ -443,14 +378,12 @@ xkb_symbols "btc9000" {
key <I2E> { [ XF86Mail ] };
key <I30> { [ XF86HomePage ] };
key <I32> { [ XF86Search ] };
- key <I5E> { [ XF86PowerOff ] };
- key <I5F> { [ XF86Standby ] };
- key <I63> { [ XF86WakeUp ] };
};
// BTC 9000A
partial alphanumeric_keys
xkb_symbols "btc9000a" {
+ include "inet(acpi_common)"
key <I10> { [ XF86AudioStop ] };
key <I12> { [ XF86AudioMute ] };
key <I19> { [ XF86AudioPlay, XF86AudioPause ] };
@@ -464,14 +397,12 @@ xkb_symbols "btc9000a" {
key <I2E> { [ Help ] };
key <I30> { [ XF86WWW ] };
key <I32> { [ XF86Search ] };
- key <I5E> { [ XF86PowerOff ] };
- key <I5F> { [ XF86Standby ] };
- key <I63> { [ XF86WakeUp ] };
};
// BTC 9001AH
xkb_symbols "btc9001ah" {
- key <I02> { [ XF86WWW ] };
+ include "inet(acpi_common)"
+ key <I02> { [ XF86HomePage ] };
key <I17> { [ XF86AudioStop ] };
key <I1E> { [ XF86AudioRaiseVolume ] };
key <I1F> { [ XF86AudioPlay, XF86AudioPause ] };
@@ -479,7 +410,6 @@ xkb_symbols "btc9001ah" {
key <I24> { [ XF86AudioPrev ] };
key <I25> { [ XF86AudioLowerVolume ] };
key <I26> { [ XF86AudioMute ] };
- key <I5F> { [ XF86PowerOff ] };
key <I6C> { [ XF86Mail ] };
key <RWIN> { [ XF86Eject ] };
};
@@ -487,26 +417,17 @@ xkb_symbols "btc9001ah" {
// BTC 5090
partial alphanumeric_keys
xkb_symbols "btc5090" {
- include "inet(media_common)"
+ include "inet(media_nav_acpi_common)"
key <I26> { [ XF86Start ] };
- key <I32> { [ XF86WWW ] };
key <I33> { [ XF86Eject ] };
- key <I5E> { [ XF86PowerOff ] };
- key <I5F> { [ XF86Standby ] };
- key <I63> { [ XF86WakeUp ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86Favorites ] };
};
// BTC 9019U
partial alphanumeric_keys
xkb_symbols "btc9019u" {
- include "inet(media_common)"
+ include "inet(media_nav_acpi_common)"
key <FK17> { [ XF86Search ] };
key <I02> { [ XF86HomePage ] };
- key <I5F> { [ XF86Sleep ] };
- key <I66> { [ XF86Favorites ] };
- key <I6C> { [ XF86Mail ] };
key <K6C> { [ XF86Eject ] };
};
@@ -521,16 +442,11 @@ xkb_symbols "cherryblue" {
key <I17> { [ XF86AudioStop ] };
key <I1E> { [ XF86AudioRaiseVolume ] };
key <I1F> { [ XF86AudioPlay, XF86AudioPause ] };
- key <I21> { [ XF86Calculator ] };
key <I22> { [ XF86AudioNext ] };
key <I24> { [ XF86AudioPrev ] };
key <I25> { [ XF86AudioLowerVolume ] };
key <I26> { [ XF86AudioMute ] };
key <I63> { [ XF86Standby ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86MyComputer ] };
- key <I68> { [ XF86Stop ] };
- key <I6C> { [ XF86Mail ] };
key <PRSC> { [ XF86Terminal ] };
key <XFER> { [ XF86Go ] };
};
@@ -549,18 +465,12 @@ xkb_symbols "cherryblueb" {
key <I17> { [ XF86Cut ] };
key <I18> { [ XF86Paste ] };
key <I1E> { [ XF86AudioRaiseVolume ] };
- key <I21> { [ XF86Calculator ] };
key <I25> { [ XF86AudioLowerVolume ] };
key <I26> { [ XF86AudioMute ] };
key <I2C> { [ XF86Book ] };
key <I32> { [ XF86Finance ] };
key <I63> { [ XF86Standby ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86MyComputer ] };
key <I67> { [ XF86AudioRewind ] };
- key <I68> { [ XF86Stop ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
key <I70> { [ XF86Eject ] };
key <I71> { [ XF86Book ] };
key <I72> { [ XF86Book ] };
@@ -571,41 +481,35 @@ xkb_symbols "cherryblueb" {
// Cherry Blue Line CyBo@rd (alternate option)
partial alphanumeric_keys
xkb_symbols "cherrybluea" {
- include "inet(media_nav_common)"
- key <I21> { [ XF86Calculator ] };
- key <I32> { [ XF86HomePage ] };
- key <I5F> { [ XF86Standby ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86MyComputer ] };
- key <I67> { [ XF86Reload ] };
- key <I68> { [ XF86Stop ] };
- key <I6B> { [ XF86Terminal ] };
- key <I6C> { [ XF86Mail ] };
+ include "inet(media_nav_acpi_common)"
key <I6D> { [ XF86Go ] };
};
// Cherry CyBo@rd USB-Hub
partial alphanumeric_keys
xkb_symbols "cherrycyboard" {
- include "inet(media_nav_common)"
+ include "inet(media_nav_acpi_common)"
key <FK17> { [ XF86Search ] };
key <I02> { [ XF86HomePage ] };
- key <I21> { [ XF86Calculator ] };
- key <I5F> { [ XF86Standby ] };
- key <I66> { [ XF86MyComputer ] };
- key <I67> { [ XF86Reload ] };
- key <I68> { [ XF86Stop ] };
- key <I6C> { [ XF86Mail ] };
key <K67> { [ XF86Terminal ] };
key <XFER> { [ XF86AudioMedia ] };
};
+// Cherry CyMotion Expert
+partial alphanumeric_keys
+xkb_symbols "cherrycmexpert" {
+ include "inet(cherryblueb)"
+ include "inet(acpi_common)"
+ key <FK15> { [ XF86Mail ] };
+};
+
// Chicony
// Chicony Internet Keyboard
partial alphanumeric_keys
xkb_symbols "chicony" {
+ include "inet(acpi_common)"
key <I12> { [ XF86AudioMute ] };
key <I17> { [ XF86Mail ] };
key <I19> { [ XF86AudioLowerVolume ] };
@@ -619,8 +523,7 @@ xkb_symbols "chicony" {
key <I26> { [ XF86LaunchB ] };
key <I2E> { [ XF86LaunchC ] };
key <I30> { [ XF86LaunchA ] };
- key <I32> { [ XF86HomePage ] };
- key <I5E> { [ XF86PowerOff ] };
+ key <I32> { [ XF86WWW ] };
key <I5F> { [ XF86ContrastAdjust ] };
key <I63> { [ XF86BrightnessAdjust ] };
};
@@ -629,12 +532,20 @@ xkb_symbols "chicony" {
partial alphanumeric_keys
xkb_symbols "chicony0108" {
include "inet(cherrycyboard)"
- key <I66> { [ XF86New ] };
+};
+
+// Chicony KU-0420 AKA Targus Slim Internet Media USB Keyboard
+partial alphanumeric_keys
+xkb_symbols "chicony0420" {
+ include "inet(media_nav_acpi_common)"
+ key <I01> { [ XF86AudioMedia ] };
+ key <K67> { [ XF86MyComputer ] };
};
// Chicony KB-9885
partial alphanumeric_keys
xkb_symbols "chicony9885" {
+ include "inet(acpi_common)"
key <I12> { [ XF86AudioMute ] };
key <I17> { [ XF86Mail ] };
key <I19> { [ XF86AudioLowerVolume ] };
@@ -649,9 +560,6 @@ xkb_symbols "chicony9885" {
key <I2E> { [ XF86LaunchC ] };
key <I30> { [ XF86LaunchA ] };
key <I32> { [ XF86WWW ] };
- key <I5E> { [ XF86PowerOff ] };
- key <I5F> { [ XF86Standby ] };
- key <I63> { [ XF86WakeUp ] };
};
@@ -685,19 +593,18 @@ xkb_symbols "compaqik7" {
// Compaq Internet Keyboard (13 keys)
partial alphanumeric_keys
xkb_symbols "compaqik13" {
- include "inet(media_common)"
+ include "inet(media_acpi_common)"
key <I1E> { [ XF86Mail ] };
key <I1F> { [ XF86Go ] };
key <I21> { [ XF86Search ] };
key <I23> { [ XF86WWW ] };
key <I32> { [ XF86Shop ] };
- key <I5F> { [ XF86Standby ] };
};
// Compaq Internet Keyboard (18 keys)
partial alphanumeric_keys
xkb_symbols "compaqik18" {
- include "inet(media_common)"
+ include "inet(media_acpi_common)"
key <I12> { [ XF86LightBulb ] };
key <I18> { [ XF86Eject ] };
key <I1E> { [ XF86Mail ] };
@@ -707,7 +614,6 @@ xkb_symbols "compaqik18" {
key <I25> { [ XF86VendorHome ] };
key <I26> { [ XF86Community ] };
key <I32> { [ XF86Shop ] };
- key <I5F> { [ XF86Standby ] };
key <I68> { [ Print ] };
};
@@ -715,13 +621,12 @@ xkb_symbols "compaqik18" {
// Laptop/notebook Compaq (eg. Armada, Evo) Laptop Keyboard
partial alphanumeric_keys
xkb_symbols "armada" {
- include "inet(media_common)"
+ include "inet(media_acpi_common)"
key <I1A> { [ XF86Search ] };
key <I1E> { [ XF86Mail ] };
key <I1F> { [ XF86HomePage ] };
key <I23> { [ XF86WWW ] };
key <I59> { [ XF86Launch2 ] }; // Battery Monitor
- key <I5F> { [ XF86Standby ] };
key <I6F> { [ XF86AudioMedia ] };
key <I75> { [ XF86Launch0 ] }; // Info Center
};
@@ -729,14 +634,13 @@ xkb_symbols "armada" {
// Laptop/notebook Compaq (eg. Presario) Internet Keyboard
partial alphanumeric_keys
xkb_symbols "presario" {
- include "inet(media_common)"
+ include "inet(media_acpi_common)"
key <I14> { [ XF86Q ] };
key <I18> { [ XF86Launch2 ] };
key <I1E> { [ XF86Mail ] };
key <I1F> { [ XF86Launch1 ] };
key <I23> { [ XF86WWW ] };
key <I32> { [ XF86Shop ] };
- key <I5F> { [ XF86Standby ] };
key <I75> { [ XF86AudioMedia ] };
};
@@ -757,10 +661,10 @@ xkb_symbols "ipaq" {
partial alphanumeric_keys
xkb_symbols "dell" {
+ include "inet(acpi_common)"
key <I12> { [ XF86Mail ] };
key <I1E> { [ XF86Search ] };
key <I26> { [ XF86HomePage ] };
- key <I5F> { [ XF86Standby ] };
};
// Dell Precision M65
@@ -771,22 +675,6 @@ xkb_symbols "dellm65" {
key <LWIN> { [ Super_L ] };
};
-// Genius KB-19e NB
-partial alphanumeric_keys
-xkb_symbols "geniuskb19e" {
- include "inet(media_nav_common)"
- key <I21> { [ XF86Calculator ] };
- key <I32> { [ XF86HomePage ] };
- key <I5F> { [ XF86Sleep ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Refresh ] };
- key <I68> { [ XF86Stop ] };
- key <I6B> { [ XF86MyComputer ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
-};
-
// Laptop/notebook Dell Inspiron 8xxx
partial alphanumeric_keys
xkb_symbols "inspiron" {
@@ -799,158 +687,55 @@ xkb_symbols "inspiron" {
key <XFER> { [ XF86AudioPlay, XF86AudioPause ] };
};
-partial alphanumeric_keys
-xkb_symbols "latitude" {
- include "inet(media_common)"
-};
-
-// Laptop/notebook Dell Precision-M series
-partial alphanumeric_keys
-xkb_symbols "precision_m" {
- // Describes the extra keys on a Precision M series
- // From Olivier Lahaye <olivier dot lahaye at motorola dot com>
- include "inet(media_common)"
- key <I32> { [ XF86HomePage ] };
-};
-
// DELL USB Multimedia Keyboard (former 8135, generalized, superset of 8125)
partial alphanumeric_keys
xkb_symbols "dellusbmm" {
// Describes the extra keys on a SK-8135 Multimedia keyboard
// From Olivier Lahaye <olivier dot lahaye at motorola dot com>
- include "inet(media_nav_common)"
+ include "inet(media_nav_acpi_common)"
key <I02> { [ XF86HomePage ] };
- key <I21> { [ XF86Calculator ] };
- key <I67> { [ XF86Reload ] };
- key <I68> { [ XF86Stop ] };
- key <I6C> { [ XF86Mail ] };
key <K67> { [ XF86MyComputer ] };
key <XFER> { [ XF86AudioMedia ] };
};
-// Dexxa
-
-// Dexxa Wireless Desktop Keyboard
-partial alphanumeric_keys
-xkb_symbols "dexxa" {
- include "inet(media_common)"
- key <I32> { [ XF86WWW ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Reload ] };
- key <I6C> { [ XF86Mail ] };
-};
-
-
// Diamond
// Diamond 9801 / 9802 series
partial alphanumeric_keys
xkb_symbols "diamond" {
- include "inet(media_nav_common)"
- key <I21> { [ XF86Calculator ] };
- key <I32> { [ XF86HomePage ] };
- key <I5E> { [ XF86PowerOff ] };
- key <I5F> { [ XF86Standby ] };
- key <I63> { [ XF86WakeUp ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Reload ] };
- key <I68> { [ XF86Stop ] };
- key <I6B> { [ XF86MyComputer ] };
- key <I6C> { [ XF86Mail ] };
+ include "inet(media_nav_acpi_common)"
key <I6D> { [ XF86Go ] };
};
-// DTK
-
-// DTK2000
-partial alphanumeric_keys
-xkb_symbols "dtk2000" {
- // Describes the extra keys on a DTK2000 Internet keyboard.
- // From Radics Laszlo <garaboncias@mailbox.hu>
- include "inet(media_nav_common)"
- key <I21> { [ XF86Calculator ] };
- key <I32> { [ XF86HomePage ] };
- key <I5E> { [ XF86PowerOff ] };
- key <I5F> { [ XF86Sleep ] };
- key <I63> { [ XF86WakeUp ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Refresh ] };
- key <I68> { [ XF86Stop ] };
- key <I6B> { [ XF86MyComputer ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
-};
-
// Ennyah
// Ennyah DKB-1008
partial alphanumeric_keys
xkb_symbols "ennyah_dkb1008" {
- include "inet(media_nav_common)"
- key <I32> { [ XF86HomePage ] };
- key <I5E> { [ XF86PowerOff ] };
- key <I5F> { [ XF86Standby ] };
- key <I63> { [ XF86WakeUp ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Refresh ] };
- key <I68> { [ XF86Stop ] };
- key <I6C> { [ XF86Mail ] };
+ include "inet(media_nav_acpi_common)"
key <XFER> { [ XF86AudioMedia ] };
};
-// Fujitsu-Siemens Computers
-
-// Fujitsu-Siemens Computers AMILO A1667G laptop
-partial alphanumeric_keys
-xkb_symbols "fscaa1667g" {
- include "inet(media_common)"
- key <I32> { [ XF86WWW ] };
- key <I6C> { [ XF86Mail ] };
-};
-
-
// Genius
// Genius Comfy KB-16M / Genius MM Keyboard KWD-910
partial alphanumeric_keys
xkb_symbols "genius" {
+ include "inet(media_acpi_common)"
key <I12> { [ XF86AudioRaiseVolume ] };
key <I17> { [ XF86Calculator ] };
key <I19> { [ XF86AudioLowerVolume ] };
key <I1E> { [ XF86Forward ] };
- key <I20> { [ XF86AudioMute ] };
key <I21> { [ XF86AudioNext ] };
- key <I22> { [ XF86AudioPlay, XF86AudioPause ] };
key <I23> { [ XF86AudioPrev ] };
- key <I24> { [ XF86AudioStop ] };
key <I25> { [ XF86Back ] };
key <I26> { [ XF86ScreenSaver ] };
key <I2E> { [ XF86Mail ] };
key <I30> { [ XF86Eject ] };
key <I32> { [ XF86WWW ] };
- key <I5F> { [ XF86Standby ] };
- key <I63> { [ XF86WakeUp ] };
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "geniuscomfy" {
- // Describes the extra keys on a Genius Comfy KB-12e
- // From Jurica Vukadin <jura@webit.hr>
- include "inet(media_nav_common)"
- key <I21> { [ XF86Calculator ] };
- key <I32> { [ XF86WWW ] };
- key <I5F> { [ XF86Sleep ] };
- key <I6B> { [ XF86MyComputer ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
};
@@ -959,12 +744,8 @@ partial alphanumeric_keys
xkb_symbols "geniuscomfy2" {
// Describes the extra keys on a Genius Comfy KB-21e-Scroll
// From Radics Laszlo <garaboncias@mailbox.hu>
- include "inet(geniuscomfy)"
+ include "inet(media_nav_acpi_common)"
key <I23> { [ Return ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Refresh ] };
- key <I68> { [ XF86Stop ] };
};
// Gyration
@@ -973,7 +754,7 @@ partial alphanumeric_keys
xkb_symbols "gyration" {
include "inet(nav_common)"
key <FK16> { [ XF86Reload ] };
- key <I02> { [ XF86WWW ] };
+ key <I02> { [ XF86HomePage ] };
key <I17> { [ XF86AudioStop ] };
key <I1E> { [ XF86AudioRaiseVolume ] };
key <I1F> { [ XF86AudioPlay, XF86AudioPause ] };
@@ -981,10 +762,6 @@ xkb_symbols "gyration" {
key <I24> { [ XF86AudioPrev ] };
key <I25> { [ XF86AudioLowerVolume ] };
key <I26> { [ XF86AudioMute ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86Favorites ] };
- key <I68> { [ XF86Stop ] };
- key <I6C> { [ XF86Mail ] };
};
@@ -993,17 +770,27 @@ xkb_symbols "gyration" {
// Hewlett-Packard Internet Keyboard
partial alphanumeric_keys
xkb_symbols "hpi6" {
- include "inet(media_common)"
+ include "inet(media_nav_acpi_common)"
+ key <I02> { [ XF86HomePage ] };
key <I12> { [ XF86Search ] };
+ key <I14> { [ XF86VendorHome ] };
+ key <I15> { [ XF86Community ] };
+ key <I16> { [ XF86AudioMedia ] };
+ key <I18> { [ XF86Eject ] };
+ key <I1E> { [ XF86Shop ] };
+ key <I1F> { [ XF86Launch1 ] };
key <I26> { [ Help ] };
- key <I5F> { [ XF86Standby ] };
+ key <I27> { [ XF86Finance ] };
+ key <I39> { [ Print ] };
+ key <I75> { [ Help ] };
};
-// Hewlett-Packard SK-2501 Multimedia Keyboard
+// Hewlett-Packard SK-2501, SK-2505 Multimedia Keyboard
partial alphanumeric_keys
-xkb_symbols "hp2501" {
+xkb_symbols "hp250x" {
key <I12> { [ XF86Tools ] };
key <I17> { [ XF86Search ] };
+ key <I18> { [ XF86Eject ] };
key <I1E> { [ XF86Mail ] };
key <I20> { [ XF86AudioMute ] };
key <I21> { [ XF86Launch5 ] };
@@ -1017,57 +804,6 @@ xkb_symbols "hp2501" {
key <I32> { [ XF86WWW ] };
};
-// Hewlett-Packard SK-2505 Internet Keyboard
-partial alphanumeric_keys
-xkb_symbols "hp2505" {
- include "inet(media_common)"
- key <I18> { [ XF86Eject ] };
- key <I1E> { [ XF86Mail ] };
- key <I25> { [ XF86Standby ] };
- key <I32> { [ XF86WWW ] };
-};
-
-// Hewlett-Packard 5181 Internet Keyboard
-partial alphanumeric_keys
-xkb_symbols "hp5181" {
- include "inet(media_common)"
- key <I12> { [ XF86Search ] };
- key <I14> { [ XF86VendorHome ] };
- key <I15> { [ XF86Community ] };
- key <I16> { [ XF86AudioMedia ] };
- key <I18> { [ XF86Eject ] };
- key <I1E> { [ XF86Shop ] };
- key <I1F> { [ XF86Launch1 ] };
- key <I26> { [ Help ] };
- key <I27> { [ XF86Finance ] };
- key <I32> { [ XF86HomePage ] };
- key <I39> { [ Print ] };
- key <I5F> { [ XF86Standby ] };
- key <I6C> { [ XF86Mail ] };
-};
-
-// Hewlett-Packard 5185 Internet Keyboard
-partial alphanumeric_keys
-xkb_symbols "hp5185" {
- include "inet(media_common)"
- key <I02> { [ XF86WWW ] };
- key <I12> { [ XF86Go ] };
- key <I14> { [ XF86VendorHome ] };
- key <I15> { [ XF86Community ] };
- key <I16> { [ XF86AudioMedia ] };
- key <I18> { [ XF86Eject ] };
- key <I1E> { [ XF86Shop ] };
- key <I1F> { [ XF86Pictures ] };
- key <I26> { [ Help ] };
- key <I27> { [ XF86Finance ] };
- key <I32> { [ XF86WWW ] };
- key <I39> { [ Print ] };
- key <I5F> { [ XF86Standby ] };
- key <I65> { [ XF86Search ] };
- key <I6C> { [ XF86Mail ] };
- key <I75> { [ Help ] };
-};
-
// Hewlett-Packard Omnibook XE3 GC, GD, GE and Pavilion N5xxx
partial alphanumeric_keys
xkb_symbols "hpxe3gc" {
@@ -1088,9 +824,7 @@ xkb_symbols "hpxe3gf" {
// Describes the OneTouch buttons on HP Omnibook XE3 GF models.
// See http://sourceforge.net/projects/omke for details on enabling
// these keys
- include "inet(media_common)"
- key <I32> { [ XF86WWW ] };
- key <I6C> { [ XF86Mail ] };
+ include "inet(media_nav_common)"
key <I73> { [ Help ] };
key <I74> { [ XF86Launch1 ] };
};
@@ -1101,9 +835,7 @@ xkb_symbols "hpxt1000" {
// Describes the OneTouch buttons on HP Omnibook XT1000 models.
// See http://sourceforge.net/projects/omke for details on enabling
// these keys
- include "inet(media_common)"
- key <I32> { [ XF86WWW ] };
- key <I6C> { [ XF86Mail ] };
+ include "inet(media_nav_common)"
key <I71> { [ XF86Launch3 ] };
key <I72> { [ Help ] };
key <I73> { [ XF86Launch2 ] };
@@ -1116,25 +848,34 @@ xkb_symbols "hpzt11xx" {
// Describes the OneTouch buttons on HP Pavilion ZT11xx models.
// See http://sourceforge.net/projects/omke for details on enabling
// these keys
- include "inet(media_common)"
- key <I32> { [ XF86WWW ] };
- key <I6C> { [ XF86Mail ] };
+ include "inet(media_nav_common)"
key <I71> { [ XF86Launch3 ] };
key <I72> { [ Help ] };
key <I73> { [ XF86Launch2 ] };
key <I74> { [ XF86Launch1 ] };
};
+// Hewlett-Packard Pavilion dv5
+partial alphanumeric_keys
+xkb_symbols "hpdv5" {
+ // Describes the OneTouch buttons on HP Pavilion dv5 models.
+ // See http://sourceforge.net/projects/omke for details on enabling
+ // these keys
+ include "inet(media_common)"
+ key <I12> { [ XF86ScreenSaver ] };
+ key <I32> { [ XF86WWW ] };
+ key <I75> { [ Help ] };
+ key <K6D> { [ XF86Launch1 ] };
+};
+
// Hewlett-Packard Omnibook XE4xxx and ZE4xxx
partial alphanumeric_keys
xkb_symbols "hpxe4xxx" {
// Describes the OneTouch buttons on HP Omnibook XE4xxx and ZE4xxx
- // See http://sourceforge.net/projects/omke for details on enabling
// models.
+ // See http://sourceforge.net/projects/omke for details on enabling
// these keys
- include "inet(media_common)"
- key <I32> { [ XF86WWW ] };
- key <I6C> { [ XF86Mail ] };
+ include "inet(media_nav_common)"
key <I70> { [ Help ] };
key <I71> { [ XF86Launch2 ] };
key <I73> { [ XF86Launch1 ] };
@@ -1164,7 +905,6 @@ xkb_symbols "hp5xx" {
// Honeywell
-
// Honeywell Euroboard
partial alphanumeric_keys
xkb_symbols "honeywell_euroboard" {
@@ -1214,6 +954,7 @@ xkb_symbols "rapidaccess" {
// IBM Rapid Access II
partial alphanumeric_keys
xkb_symbols "rapidaccess2" {
+ include "inet(acpi_common)"
key <I12> { [ XF86AudioNext ] };
key <I17> { [ XF86Favorites ] };
key <I1E> { [ XF86AudioMute ] };
@@ -1227,75 +968,40 @@ xkb_symbols "rapidaccess2" {
key <I2E> { [ XF86Search ] };
key <I30> { [ XF86MyComputer ] };
key <I32> { [ XF86VendorHome ] };
- key <I5F> { [ XF86Standby ] };
-};
-
-// IBM Rapid Access II (alternate option)
-partial alphanumeric_keys
-xkb_symbols "rapidaccess2a" {
- key <I12> { [ XF86AudioNext ] };
- key <I17> { [ XF86Favorites ] };
- key <I1E> { [ XF86AudioMute ] };
- key <I20> { [ XF86AudioStop ] };
- key <I21> { [ XF86AudioLowerVolume ] };
- key <I22> { [ XF86AudioPlay, XF86AudioPause ] };
- key <I23> { [ XF86AudioRaiseVolume ] };
- key <I24> { [ XF86AudioPrev ] };
- key <I25> { [ XF86WWW ] };
- key <I26> { [ XF86Shop ] };
- key <I2E> { [ Help ] };
- key <I30> { [ XF86Option ] };
- key <I32> { [ XF86VendorHome ] };
- key <I5F> { [ XF86Standby ] };
- key <MENU> { [ Menu ] };
};
-// IBM ThinkPad 41
-partial alphanumeric_keys
-xkb_symbols "thinkpad" {
- include "inet(media_nav_common)"
-};
-
-
// IBM ThinkPad 60 series
partial alphanumeric_keys
xkb_symbols "thinkpad60" {
include "inet(media_nav_common)"
-
key <I1F> { [ XF86VendorHome ] };
};
-
// IBM Space Saver
partial alphanumeric_keys
xkb_symbols "ibm_spacesaver" {
- key <NMLK> { [ Num_Lock, Num_Lock ] };
+ key <NMLK> {
+ type="ONE_LEVEL",
+ symbols[Group1]= [ Num_Lock ]
+ };
};
// Logitech
// Logitech common definitions
-partial alphanumeric_keys
+partial hidden alphanumeric_keys
xkb_symbols "logitech_base" {
-
- include "inet(media_nav_common)"
- key <I01> { [ XF86AudioMedia ] };
- key <I02> { [ XF86WWW ] };
+ include "inet(media_nav_acpi_common)"
+ key <I02> { [ XF86HomePage ] };
key <I15> { [ XF86Community ] };
key <I16> { [ XF86ScrollClick ] };
key <I21> { [ XF86VendorHome ] };
- key <I32> { [ XF86HomePage ] };
key <I3B> { [ XF86New ] };
key <I3C> { [ XF86Reply ] };
key <I43> { [ XF86MyComputer ] };
key <I44> { [ XF86Documents ] };
key <I57> { [ XF86Pictures ] };
key <I58> { [ XF86Music ] };
- key <I5F> { [ XF86Standby ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86Favorites ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
};
// Logitech second set of common keys
@@ -1322,12 +1028,10 @@ xkb_symbols "logitech_set3" {
partial alphanumeric_keys
xkb_symbols "logiaccess" {
include "inet(logitech_base)"
-
key <FK13> { [ XF86MailForward ] };
key <FK14> { [ XF86Send ] };
key <I11> { [ XF86Messenger ] };
key <I12> { [ XF86WebCam ] };
- key <I65> { [ XF86Search ] };
};
// Logitech Cordless Desktop (alternate option)
@@ -1351,16 +1055,13 @@ xkb_symbols "logicink" {
partial alphanumeric_keys
xkb_symbols "logiex110" {
include "inet(logitech_base)"
-
key <I2F> { [ XF86Close ] }; // Close
- key <I21> { [ XF86Calculator ] };
// Extended function keys
// In the Console before starting X
// Using setkeycodes e03b 212 e03c 213 e03d 214 e03e 215 e03f 216 e040 217
// setkeycodes e041 218 e042 219 e043 220 e044 221 e057 222 e058 223 6d 206
// *=keys that are there but need different symbol names.
-
key <I3B> { [ Help ] }; // F1
key <FK13> { [ XF86Word ] }; // F2
key <FK14> { [ XF86Excel ] }; // F3
@@ -1379,7 +1080,6 @@ xkb_symbols "logiex110" {
partial alphanumeric_keys
xkb_symbols "logiinkse" {
include "inet(logitech_base)"
-
key <FK13> { [ XF86MailForward ] }; // F3
key <FK14> { [ XF86Send ] }; // F4
key <FK15> { [ Undo ] }; // F5
@@ -1403,7 +1103,6 @@ xkb_symbols "logiinkseusb" {
partial alphanumeric_keys
xkb_symbols "logiitc" {
include "inet(logitech_base)"
-
key <I2F> { [ XF86AudioRaiseVolume ] };
// Just to override RaiseVolume from logitech_base,
@@ -1416,7 +1115,6 @@ xkb_symbols "logiitc" {
partial alphanumeric_keys
xkb_symbols "logiik" {
include "inet(logitech_base)"
-
key <I12> { [ Find ] };
key <I17> { [ Print ] };
key <I18> { [ XF86Favorites ] };
@@ -1436,7 +1134,6 @@ xkb_symbols "logiik" {
partial alphanumeric_keys
xkb_symbols "itouch" {
include "inet(logitech_base)"
-
key <I1F> { [ XF86AudioMute ] };
key <I2B> { [ XF86AudioLowerVolume ] };
key <I2D> { [ XF86AudioRaiseVolume ] };
@@ -1455,13 +1152,11 @@ xkb_symbols "logiultraxc" {
partial alphanumeric_keys
xkb_symbols "logidinovo" {
- include "inet(media_common)"
+ include "inet(media_nav_common)"
key <I02> { [ XF86HomePage ] };
key <I12> { [ XF86Standby ] };
key <I17> { [ XF86Search ] };
key <I21> { [ XF86AudioRaiseVolume ] };
- key <I66> { [ XF86Start ] };
- key <I6C> { [ XF86Mail ] };
key <K66> { [ XF86AudioLowerVolume ] };
key <KPDC> { [ XF86AudioMute ] };
key <XFER> { [ XF86AudioMedia ] };
@@ -1469,20 +1164,60 @@ xkb_symbols "logidinovo" {
partial alphanumeric_keys
xkb_symbols "logidinovoedge" {
- include "inet(media_common)"
+ include "inet(media_acpi_common)"
key <I02> { [ XF86HomePage ] };
- key <I5F> { [ XF86Standby ] };
key <I6C> { [ XF86Mail ] };
key <FK17> { [ XF86Search ] };
key <XFER> { [ XF86AudioMedia ] };
};
+partial alphanumeric_keys
+xkb_symbols "logitech_g15" {
+ include "inet(media_nav_acpi_common)"
+ key <AE13> { [ XF86Messenger ] };
+ key <HKTG> { [ XF86Launch7 ] };
+ key <I02> { [ XF86Launch9 ] };
+ key <I04> { [ XF86Phone ] };
+ key <I08> { [ XF86LaunchD ] };
+ key <I09> { [ XF86Support ] };
+ key <I0F> { [ XF86LaunchF ] };
+ key <I16> { [ XF86LogOff ] };
+ key <I18> { [ XF86Launch5 ] };
+ key <I21> { [ XF86Travel ] };
+ key <I23> { [ XF86Spell ] };
+ key <I31> { [ XF86Launch4 ] };
+ key <I3C> { [ XF86Music ] };
+ key <I42> { [ XF86Forward ] };
+ key <I43> { [ XF86Send ] };
+ key <I57> { [ XF86Save ] };
+ key <I64> { [ XF86Pictures ] };
+ key <I67> { [ XF86LaunchA ] };
+ key <I76> { [ XF86iTouch ] };
+ key <I77> { [ XF86Launch3 ] };
+ key <I79> { [ XF86ToDoList ] };
+ key <I7B> { [ XF86Calculator ] };
+ key <K5A> { [ XF86VendorHome ] };
+ key <K5D> { [ XF86Away ] };
+ key <K5E> { [ XF86WebCam ] };
+ key <K5F> { [ XF86Launch0 ] };
+ key <K63> { [ XF86Launch6 ] };
+ key <K6D> { [ XF86Calendar ] };
+ key <K71> { [ XF86LaunchB ] };
+ key <K72> { [ XF86LaunchC ] };
+ key <K74> { [ XF86WWW ] };
+ key <K75> { [ XF86LaunchE ] };
+ key <MDSW> { [ XF86Launch1 ] };
+ key <NFER> { [ XF86Launch2 ] };
+ key <XFER> { [ XF86Launch8 ] };
+};
+
+
// Memorex
// Memorex MX1998
partial alphanumeric_keys
xkb_symbols "mx1998" {
- include "inet(media_common)"
+ include "inet(media_acpi_common)"
key <DOWN> { [ XF86ScrollDown ] };
key <I12> { [ XF86AudioRewind ] };
key <I17> { [ XF86Close ] };
@@ -1494,8 +1229,6 @@ xkb_symbols "mx1998" {
key <I26> { [ Menu ] };
key <I32> { [ XF86WWW ] };
key <I57> { [ XF86WakeUp ] };
- key <I5E> { [ XF86PowerOff ] };
- key <I5F> { [ XF86Standby ] };
key <I68> { [ XF86DOS ] };
key <I7A> { [ XF86ScreenSaver ] };
key <UP> { [ XF86ScrollUp ] };
@@ -1504,7 +1237,7 @@ xkb_symbols "mx1998" {
// Memorex MX2500 EZ-Access Keyboard
partial alphanumeric_keys
xkb_symbols "mx2500" {
- include "inet(media_common)"
+ include "inet(media_nav_acpi_common)"
key <I12> { [ XF86Clear ] };
key <I13> { [ XF86Phone ] };
key <I14> { [ XF86DOS ] };
@@ -1512,30 +1245,16 @@ xkb_symbols "mx2500" {
key <I18> { [ XF86Xfer ] };
key <I1E> { [ XF86Eject ] };
key <I1F> { [ XF86Documents ] };
- key <I21> { [ XF86Calculator ] };
key <I26> { [ XF86News ] };
- key <I32> { [ XF86WWW ] };
- key <I5E> { [ XF86PowerOff ] };
- key <I5F> { [ XF86Standby ] };
key <I6B> { [ XF86WakeUp ] };
- key <I6C> { [ XF86Mail ] };
key <I6D> { [ XF86RotateWindows ] };
- key <LWIN> { [ Meta_L ] };
- key <MENU> { [ Menu ] };
- key <RWIN> { [ Meta_R ] };
};
// Memorex MX2750
partial alphanumeric_keys
xkb_symbols "mx2750" {
- include "inet(media_nav_common)"
+ include "inet(media_nav_acpi_common)"
key <I32> { [ XF86Launch0 ] };
- key <I5E> { [ XF86PowerOff ] };
- key <I5F> { [ XF86Standby ] };
- key <I63> { [ XF86WakeUp ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86Favorites ] };
- key <I6C> { [ XF86Mail ] };
};
@@ -1549,17 +1268,12 @@ xkb_symbols "microsoft7000" {
key <I09> { [ XF86New ] };
key <I0A> { [ Redo ] };
key <I0E> { [ XF86MailForward ] };
- key <I21> { [ XF86Calculator ] };
key <I2F> { [ XF86Close ] };
- key <I32> { [ XF86HomePage ] };
key <I39> { [ Print ] };
key <I55> { [ XF86Save ] };
key <I5A> { [ XF86Send ] };
key <I62> { [ Help ] };
key <I64> { [ XF86Reply ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86Favorites ] };
- key <I6C> { [ XF86Mail ] };
key <I76> { [ parenleft ] };
key <I7B> { [ parenright ] };
key <K59> { [ KP_Equal ] };
@@ -1571,34 +1285,8 @@ xkb_symbols "microsoft7000" {
// Microsoft Internet Keyboard
partial alphanumeric_keys
xkb_symbols "microsoftinet" {
- include "inet(nav_common)"
- key <I21> { [ XF86Calculator ] };
- key <I32> { [ XF86WWW ] };
- key <I5F> { [ XF86Standby ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86Favorites ] };
+ include "inet(nav_acpi_common)"
key <I68> { [ XF86AudioStop ] };
- key <I6B> { [ XF86MyComputer ] };
- key <I6C> { [ XF86Mail ] };
-};
-
-// Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro
-partial alphanumeric_keys
-xkb_symbols "microsoftpro" {
- include "inet(media_nav_common)"
- key <I21> { [ XF86Calculator ] };
- key <I32> { [ XF86HomePage ] };
- key <I5F> { [ XF86Standby ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Reload ] };
- key <I68> { [ XF86Stop ] };
- key <I6B> { [ XF86MyComputer ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
-// Internet Section -- Left Side
-// Multimedia Section -- Right Side
-// My Computer Section -- Far Right
};
// Microsoft Natural Keyboard Pro USB
@@ -1611,16 +1299,11 @@ partial alphanumeric_keys
key <I17> { [ XF86AudioStop ] };
key <I1E> { [ XF86AudioRaiseVolume ] };
key <I1F> { [ XF86AudioPlay, XF86AudioPause ] };
- key <I21> { [ XF86Calculator ] };
key <I22> { [ XF86AudioNext ] };
key <I24> { [ XF86AudioPrev ] };
key <I25> { [ XF86AudioLowerVolume ] };
key <I26> { [ XF86AudioMute ] };
key <I63> { [ XF86Standby ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86Favorites ] };
- key <I68> { [ XF86Stop ] };
- key <I6C> { [ XF86Mail ] };
// Internet Section -- Left Side
// Multimedia Section -- Right Side
// My Computer Section -- Far Right
@@ -1633,14 +1316,8 @@ partial alphanumeric_keys
xkb_symbols "microsoftprooem" {
include "inet(media_nav_common)"
key <FK17> { [ XF86Search ] };
- key <I01> { [ XF86AudioMedia ] };
key <I02> { [ XF86HomePage ] };
- key <I21> { [ XF86Calculator ] };
key <I63> { [ XF86Standby ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Reload ] };
- key <I68> { [ XF86Stop ] };
- key <I6C> { [ XF86Mail ] };
key <K67> { [ XF86MyComputer ] };
// Internet Section -- Left Side
// Multimedia Section -- Right Side
@@ -1656,16 +1333,12 @@ xkb_symbols "microsoftprose" {
key <I17> { [ XF86AudioStop ] };
key <I1E> { [ XF86AudioRaiseVolume ] };
key <I1F> { [ XF86AudioPlay, XF86AudioPause ] };
- key <I21> { [ XF86Calculator ] };
key <I22> { [ XF86AudioNext ] };
key <I24> { [ XF86AudioPrev ] };
key <I25> { [ XF86AudioLowerVolume ] };
key <I26> { [ XF86AudioMute ] };
key <I63> { [ XF86Standby ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86Favorites ] };
key <I68> { [ XF86AudioStop ] };
- key <I6C> { [ XF86Mail ] };
key <PRSC> { [ XF86MyComputer ] };
key <XFER> { [ XF86AudioMedia ] };
};
@@ -1673,12 +1346,11 @@ xkb_symbols "microsoftprose" {
// Microsoft Office Keyboard
partial alphanumeric_keys
xkb_symbols "microsoftoffice" {
- include "inet(nav_common)"
+ include "inet(nav_acpi_common)"
key <BRK> { [ XF86Calendar ] };
key <END> { [ Undo ] };
- key <I02> { [ XF86WWW ] };
+ key <I02> { [ XF86HomePage ] };
key <I1E> { [ XF86AudioLowerVolume ] };
- key <I21> { [ XF86Calculator ] };
key <I25> { [ XF86AudioRaiseVolume ] };
key <I26> { [ XF86AudioMute ] };
key <I3C> { [ XF86Cut ] };
@@ -1686,15 +1358,13 @@ xkb_symbols "microsoftoffice" {
key <I54> { [ XF86ApplicationLeft ] };
key <I55> { [ XF86TaskPane ] };
key <I56> { [ XF86Spell ] };
- key <I57> { [ XF86HomePage ] };
+ key <I57> { [ XF86WWW ] };
key <I58> { [ XF86New ] };
key <I59> { [ XF86Open ] };
key <I5A> { [ XF86Close ] };
- key <I5F> { [ XF86Standby ] };
key <I62> { [ Help ] };
key <I64> { [ XF86Save ] };
key <I67> { [ Print ] };
- key <I6C> { [ XF86Mail ] };
key <I6D> { [ XF86OfficeHome ] };
key <I70> { [ Redo ] };
key <I71> { [ XF86Reply ] };
@@ -1708,7 +1378,7 @@ xkb_symbols "microsoftoffice" {
// Microsoft Wireless Multimedia Keyboard 1.0A
partial alphanumeric_keys
xkb_symbols "microsoftmult" {
- include "inet(media_common)"
+ include "inet(media_nav_acpi_common)"
key <AE13> { [ XF86Messenger ] };
key <FK14> { [ XF86New ] };
key <FK15> { [ XF86Open ] };
@@ -1717,32 +1387,24 @@ xkb_symbols "microsoftmult" {
key <I07> { [ Redo ] };
key <I08> { [ Undo ] };
key <I16> { [ XF86LogOff ] };
- key <I21> { [ XF86Calculator ] };
key <I23> { [ XF86Spell ] };
- key <I32> { [ XF86HomePage ] };
key <I3B> { [ Help ] };
key <I3C> { [ XF86Music ] };
key <I42> { [ XF86Forward ] };
key <I43> { [ XF86Send ] };
key <I57> { [ XF86Save ] };
key <I58> { [ Print ] };
- key <I5F> { [ XF86Sleep ] };
key <I64> { [ XF86Pictures ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
key <I80> { [ XF86Documents ] };
-// Control Section -- Far Right
-// F-Locked Function keys
-// Internet Section -- Right Side
-// Multimedia Section -- Centre
-// My Computer Section -- Left Side
};
+
// Oretec
// Oretec MCK-800 MM/Internet keyboard
partial alphanumeric_keys
xkb_symbols "oretec" {
+ include "inet(acpi_common)"
key <I10> { [ XF86ScrollUp ] };
key <I12> { [ XF86AudioPlay, XF86AudioPause ] };
key <I17> { [ XF86AudioPrev ] };
@@ -1758,9 +1420,6 @@ xkb_symbols "oretec" {
key <I2E> { [ XF86AudioNext ] };
key <I30> { [ XF86AudioRaiseVolume ] };
key <I32> { [ XF86ZoomIn ] };
- key <I5E> { [ XF86PowerOff ] };
- key <I5F> { [ XF86Standby ] };
- key <I63> { [ XF86WakeUp ] };
key <I68> { [ XF86AudioLowerVolume ] };
};
@@ -1818,7 +1477,7 @@ xkb_symbols "qtronix" {
// Samsung SDM 4500P
partial alphanumeric_keys
xkb_symbols "samsung4500" {
- include "inet(media_common)"
+ include "inet(media_nav_acpi_common)"
key <AE13> { [ XF86Launch4 ] };
key <I02> { [ XF86Launch1 ] };
key <I04> { [ XF86Launch3 ] };
@@ -1827,21 +1486,17 @@ xkb_symbols "samsung4500" {
key <I0A> { [ XF86Book ] };
key <I18> { [ XF86Eject ] };
key <I26> { [ Help ] };
- key <I32> { [ XF86WWW ] };
key <I59> { [ XF86Explorer ] };
- key <I5F> { [ XF86Standby ] };
- key <I6C> { [ XF86Mail ] };
key <NFER> { [ XF86Launch2 ] };
};
// Samsung SDM 4510P
partial alphanumeric_keys
xkb_symbols "samsung4510" {
- include "inet(media_common)"
+ include "inet(media_acpi_common)"
key <I02> { [ XF86Launch1 ] };
key <I04> { [ XF86Launch3 ] };
key <I18> { [ XF86Eject ] };
- key <I5F> { [ XF86Standby ] };
key <NFER> { [ XF86Launch2 ] };
};
@@ -1863,24 +1518,23 @@ xkb_symbols "sk1300" {
// SK-2500
partial alphanumeric_keys
xkb_symbols "sk2500" {
- include "inet(media_common)"
+ include "inet(media_nav_common)"
key <I12> { [ XF86AudioRewind ] };
key <I17> { [ XF86Close ] };
key <I18> { [ XF86Eject ] };
key <I18> { [ XF86Eject ] };
key <I19> { [ XF86Forward ] };
key <I1E> { [ XF86AudioRecord ] };
- key <I21> { [ XF86Calculator ] };
key <I23> { [ XF86Xfer ] };
key <I25> { [ XF86PowerOff ] };
key <I26> { [ Menu ] };
- key <I32> { [ XF86WWW ] };
key <I7A> { [ XF86ScreenSaver ] };
};
// SK-6200
partial alphanumeric_keys
xkb_symbols "sk6200" {
+ include "inet(acpi_common)"
key <I12> { [ XF86Favorites ] };
key <I14> { [ XF86AudioLowerVolume ] };
key <I16> { [ XF86AudioRaiseVolume ] };
@@ -1893,8 +1547,6 @@ xkb_symbols "sk6200" {
key <I23> { [ XF86AudioPrev ] };
key <I24> { [ XF86AudioStop ] };
key <I32> { [ XF86Mail ] };
- key <I5E> { [ XF86PowerOff ] };
- key <I5F> { [ XF86Standby ] };
};
// SK-7100
@@ -1916,6 +1568,7 @@ xkb_symbols "sk7100" {
// SVEN Ergonomic 2500
partial alphanumeric_keys
xkb_symbols "sven" {
+ include "inet(acpi_common)"
key <I10> { [ XF86AudioPlay, XF86AudioPause ] };
key <I12> { [ XF86Forward ] };
key <I17> { [ XF86AudioRaiseVolume ] };
@@ -1936,10 +1589,7 @@ xkb_symbols "sven" {
key <I30> { [ XF86Favorites ] };
key <I31> { [ XF86ScrollUp ] };
key <I32> { [ XF86ScrollDown ] };
- key <I5E> { [ XF86PowerOff ] };
- key <I5F> { [ XF86Standby ] };
key <I62> { [ XF86AudioNext ] };
- key <I63> { [ XF86WakeUp ] };
key <I68> { [ XF86Back ] };
};
@@ -1957,6 +1607,7 @@ xkb_symbols "sven303" {
// Symplon PaceBook (tablet PC)
partial alphanumeric_keys
xkb_symbols "symplon" {
+ include "inet(nav_acpi_common)"
key <HOME> { [ XF86RotationPB ] };
key <I13> { [ XF86SplitScreen ] };
key <I14> { [ XF86Support ] };
@@ -1964,10 +1615,7 @@ xkb_symbols "symplon" {
key <I21> { [ XF86User2KB ] };
key <I25> { [ XF86RotationKB ] };
key <I26> { [ XF86MenuKB ] };
- key <I32> { [ XF86WWW ] };
- key <I5F> { [ XF86Standby ] };
key <I6B> { [ XF86User1KB ] };
- key <I6C> { [ XF86Mail ] };
key <PAUS> { [ XF86UserPB ] };
key <UP> { [ XF86MenuPB ] };
};
@@ -1994,14 +1642,9 @@ xkb_symbols "toshiba_s3000" {
// Trust Wireless Keyboard Classic
partial alphanumeric_keys
xkb_symbols "trust" {
- include "inet(media_nav_common)"
+ include "inet(media_nav_acpi_common)"
key <I11> { [ XF86ScreenSaver ] };
key <I1E> { [ XF86Eject ] };
- key <I21> { [ XF86Calculator ] };
- key <I32> { [ XF86WWW ] };
- key <I5F> { [ XF86Standby ] };
- key <I63> { [ XF86WakeUp ] };
- key <I6C> { [ XF86Mail ] };
};
@@ -2013,7 +1656,6 @@ xkb_symbols "trustda" {
key <I17> { [ XF86Close ] };
key <I18> { [ XF86Eject ] };
key <I1E> { [ XF86AudioRecord ] };
- key <I21> { [ XF86Calculator ] };
key <I23> { [ XF86Xfer ] };
key <I25> { [ XF86Standby ] };
key <I26> { [ Help ] };
@@ -2027,6 +1669,7 @@ xkb_symbols "trustda" {
// Yahoo! Internet Keyboard
partial alphanumeric_keys
xkb_symbols "yahoo" {
+ include "inet(acpi_common)"
key <I11> { [ XF86AudioPrev ] };
key <I12> { [ XF86AudioPlay, XF86AudioPause ] };
key <I1E> { [ XF86AudioStop ] };
@@ -2040,28 +1683,11 @@ xkb_symbols "yahoo" {
key <I26> { [ Help ] };
key <I27> { [ XF86Mail ] };
key <I28> { [ XF86WWW ] };
- key <I5E> { [ XF86PowerOff ] };
- key <I5F> { [ XF86Standby ] };
- key <I63> { [ XF86WakeUp ] };
-};
-
-// Super Power Internet Keyboard
-
-// Super Power Multimedia Keyboard
-xkb_symbols "sp_inet" {
- include "inet(media_nav_common)"
- key <I32> { [ XF86HomePage ] };
- key <I5E> { [ XF86PowerOff ] };
- key <I5F> { [ XF86Standby ] };
- key <I63> { [ XF86WakeUp ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Refresh ] };
- key <I68> { [ XF86Stop ] };
- key <I6C> { [ XF86Mail ] };
};
// Apple keyboards (macbooks, powerbooks, powermac G5, etc)
-partial xkb_symbols "apple" {
+partial alphanumeric_keys
+xkb_symbols "apple" {
// Really brightness up/down
key <II65> { [ XF86BrightnessAdjust ] };
key <I54> { [ XF86BrightnessAdjust ] };
@@ -2073,6 +1699,7 @@ partial xkb_symbols "apple" {
key <I57> { [ XF86Launch0 ] };
key <I58> { [ XF86Launch1 ] };
key <I59> { [ XF86Launch2 ] };
+ key <I5E> { [ XF86PowerOff ] };
key <K5D> { [ F13 ] };
key <K5E> { [ F14 ] };
key <K5F> { [ F15 ] };
@@ -2083,41 +1710,27 @@ partial xkb_symbols "apple" {
partial alphanumeric_keys
xkb_symbols "cymotionlinux" {
- include "inet(media_nav_common)"
- key <FK17> { [ XF86Search ] };
- key <I02> { [ XF86WWW ] };
- key <I05> { [ Redo ] };
+ include "inet(media_nav_acpi_common)"
key <I07> { [ Undo ] };
+ key <I0A> { [ Redo ] };
key <I0F> { [ XF86ScrollDown ] };
key <I17> { [ XF86Launch2 ] };
key <I1F> { [ XF86Launch1 ] };
- key <I21> { [ XF86Calculator ] };
key <I28> { [ XF86MenuKB ] };
key <I2B> { [ XF86Launch3 ] };
key <I3C> { [ XF86Cut ] };
- key <I47> { [ XF86PowerOff ] };
- key <I63> { [ XF86Standby ] };
- key <I67> { [ XF86Reload ] };
- key <I68> { [ XF86Stop ] };
- key <I6C> { [ XF86Mail ] };
key <I78> { [ XF86Copy ] };
key <K65> { [ XF86Paste ] };
- key <K68> { [ XF86Standby ] };
key <K6C> { [ XF86Eject ] };
key <K75> { [ XF86ScrollUp ] };
- key <RWIN> { [ at ] };
key <XFER> { [ XF86AudioMedia ] };
};
partial alphanumeric_keys
xkb_symbols "silvercrest" {
- include "inet(media_nav_common)"
+ include "inet(media_nav_acpi_common)"
key <I02> { [ XF86HomePage ] };
key <I21> { [ XF86Launch2 ] };
- key <I5F> { [ XF86Standby ] };
- key <I66> { [ XF86Favorites ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
key <K67> { [ XF86Launch1 ] };
};
@@ -2125,12 +1738,8 @@ xkb_symbols "silvercrest" {
partial alphanumeric_keys
xkb_symbols "emachines" {
- include "inet(media_common)"
+ include "inet(media_nav_acpi_common)"
key <I32> { [ XF86iTouch ] };
- key <I5F> { [ XF86Sleep ] };
- key <I65> { [ XF86Search ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
key <KP0> { [ KP_0 ] };
key <KP1> { [ KP_1 ] };
key <KP2> { [ KP_2 ] };
@@ -2159,70 +1768,11 @@ xkb_symbols "emachines" {
// setkeycodes e075 171 # KEY_CONFIG from /usr/include/linux/input.h
partial alphanumeric_keys
xkb_symbols "benqx" {
- include "inet(media_nav_common)"
+ include "inet(media_nav_acpi_common)"
key <I02> { [ XF86ModeLock ] };
key <I21> { [ XF86WWW ] };
key <I2B> { [ XF86Go ] };
key <I31> { [ XF86Calendar ] };
- key <I32> { [ XF86WWW ] };
- key <I5E> { [ XF86PowerOff ] };
- key <I5F> { [ XF86ScreenSaver ] };
- key <I63> { [ XF86WakeUp ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86Favorites ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "logitech_g15" {
-
- include "inet(media_common)"
- key <AE13> { [ XF86Messenger ] };
-
- key <HKTG> { [ XF86Launch7 ] };
-
- key <I02> { [ XF86Launch9 ] };
- key <I04> { [ XF86Phone ] };
- key <I08> { [ XF86LaunchD ] };
- key <I09> { [ XF86Support ] };
- key <I0F> { [ XF86LaunchF ] };
- key <I16> { [ XF86LogOff ] };
- key <I18> { [ XF86Launch5 ] };
- key <I21> { [ XF86Travel ] };
- key <I23> { [ XF86Spell ] };
- key <I31> { [ XF86Launch4 ] };
- key <I32> { [ XF86HomePage ] };
- key <I3C> { [ XF86Music ] };
- key <I42> { [ XF86Forward ] };
- key <I43> { [ XF86Send ] };
- key <I57> { [ XF86Save ] };
- key <I5F> { [ XF86Sleep ] };
- key <I64> { [ XF86Pictures ] };
- key <I67> { [ XF86LaunchA ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
- key <I76> { [ XF86iTouch ] };
- key <I77> { [ XF86Launch3 ] };
- key <I79> { [ XF86ToDoList ] };
- key <I7B> { [ XF86Calculator ] };
-
- key <K5A> { [ XF86VendorHome ] };
- key <K5D> { [ XF86Away ] };
- key <K5E> { [ XF86WebCam ] };
- key <K5F> { [ XF86Launch0 ] };
- key <K63> { [ XF86Launch6 ] };
- key <K6D> { [ XF86Calendar ] };
- key <K71> { [ XF86LaunchB ] };
- key <K72> { [ XF86LaunchC ] };
- key <K74> { [ XF86WWW ] };
- key <K75> { [ XF86LaunchE ] };
-
- key <MDSW> { [ XF86Launch1 ] };
- key <NFER> { [ XF86Launch2 ] };
-
- key <XFER> { [ XF86Launch8 ] };
-
};
// Intel
@@ -2234,3 +1784,30 @@ xkb_symbols "classmate" {
key <I30> { [ XF86AudioRaiseVolume ] };
};
+// Unitek
+
+partial alphanumeric_keys
+xkb_symbols "unitekkb1925" {
+ include "inet(media_nav_common)"
+ key <I0C> { [ XF86AudioMute ] };
+ key <I11> { [ XF86PowerOff ] };
+ key <I12> { [ XF86Sleep ] };
+ key <I16> { [ XF86WakeUp ] };
+ key <I18> { [ XF86Search ] };
+ key <I1A> { [ XF86Reload ] };
+};
+
+// Compal
+
+// Compal FL90
+partial alphanumeric_keys
+xkb_symbols "compalfl90" {
+ include "inet(media_nav_acpi_common)"
+ key <I54> { [ XF86MonBrightnessUp ] };
+ key <II65> { [ XF86MonBrightnessDown ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "pc105" {
+ include "inet(media_nav_acpi_common)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/it b/xorg-server/xkbdata.src/symbols/it
index 92fa50a87..e91a9f804 100644
--- a/xorg-server/xkbdata.src/symbols/it
+++ b/xorg-server/xkbdata.src/symbols/it
@@ -169,7 +169,7 @@ xkb_symbols "geo" {
// OLPC Section
xkb_symbols "olpc" {
- include "basic"
+ include "it(basic)"
key <AE12> { [ igrave, asciicircum, asciitilde, dead_tilde ] };
key <BKSL> { [ ugrave, section, Egrave, dead_breve ] };
diff --git a/xorg-server/xkbdata.src/symbols/keypad b/xorg-server/xkbdata.src/symbols/keypad
index 9c56d0a82..fa2d72fbb 100644
--- a/xorg-server/xkbdata.src/symbols/keypad
+++ b/xorg-server/xkbdata.src/symbols/keypad
@@ -494,47 +494,87 @@ xkb_symbols "ossnumber_wang" {
key <KP0> { [ KP_Insert, KP_0, apostrophe, 0x1002195 ] }; // <insert> 0 ' ↕
};
-// ATM/phone-style hexadecimal numpad
-// by Roland Kaufmann <rlndkfmn at gmail dot com>
-// License: BSD
-// Main numbers follows the traditions from ATMs and phones with
-// numbers increasing downwards to the right. (It is easier to
-// change the keyboard layout than to reprogram your local ATM;
-// also cell-phones are becoming more common while calculators are
-// becoming more rare).
-// Third-level gives the letters used in hexadecimal numbers, or
-// columns in small spreadsheets. Equal is added to start formulas
-// (most numpads don't have their own equal key), comma as a list
-// separator and colon to enter times and ranges.
+// Standard base "pc" layout only contains cursor keys, and then gets
+// augmented with the digits later. If you define your own layout for
+// the numpad you can inherit the cursors, but you'll have to define
+// the digits yourself. This module can be included in the rules to
+// define math operators; these are the variants used in computer
+// languages that are based on ASCII. NoSymbol doesn't mean that
+// nothing is bound to the key but that no assignment is done here.
+// srvr_ctrl(stdkeypad) and keypad(x11) declare the operator keys to
+// be of type CTRL+ALT in order to assign server control events to
+// them, but it uses the second level which is overwritten if we have
+// more than one definition (shift state) for the key. Instead, here
+// the commands are put at the fourth level.
partial keypad_keys
-xkb_symbols "phone_hex" {
- // NumLock, Enter
- include "keypad(core)"
+xkb_symbols "ops" {
+ key <KPDV> { [ NoSymbol, slash, NoSymbol, XF86_Ungrab ] };
+ key <KPMU> { [ NoSymbol, asterisk, NoSymbol, XF86_ClearGrab ] };
+ key <KPSU> { [ NoSymbol, minus, NoSymbol, XF86_Prev_VMode ] };
+ key <KPAD> { [ NoSymbol, plus, NoSymbol, XF86_Next_VMode ] };
+ key <KPEQ> { [ NoSymbol, equal ] };
+};
+// Hexadecimal Numpad, by Roland Kaufmann <rlndkfmn at gmail dot com>
+// License: BSD (also covers variant with ATM digit order)
+// Third-level gives the letters used in hexadecimal numbers, or
+// columns in small spreadsheets. As a bonus, having 'e' available at
+// the center of the keyboard makes it easy to enter floating point
+// numbers in scientific notation.
+// Equal is added to start formulas (most numpads on PCs don't have
+// their own equal key), comma as a list separator (as most
+// programming languages wants period as a decimal separator) and
+// colon to enter times and ranges. Someone also may want to represent
+// multiplication and division in prose using x and colon.
+// Two first levels are specified as NoSymbol to not override any
+// previous specification. Combine this with another keypad specifier,
+// e.g. "legacy".
+partial keypad_keys
+xkb_symbols "hex" {
key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
- // None NumLock AltGr
+ // None NumLock AltGr
// symbol row
- key <KPDV> { [ KP_Divide, slash, parenleft ] };
- key <KPMU> { [ KP_Multiply, asterisk, parenright ] };
- key <KPSU> { [ KP_Subtract, minus, dollar ] };
+ key <KPDV> { [ NoSymbol, NoSymbol, parenleft ] };
+ key <KPMU> { [ NoSymbol, NoSymbol, parenright ] };
+ key <KPSU> { [ NoSymbol, NoSymbol, dollar ] };
// upper row
- key <KP7> { [ KP_Home, KP_1, A ] };
- key <KP8> { [ KP_Up, KP_2, B ] };
- key <KP9> { [ KP_Prior, KP_3, C ] };
+ key <KP7> { [ NoSymbol, NoSymbol, a ] };
+ key <KP8> { [ NoSymbol, NoSymbol, b ] };
+ key <KP9> { [ NoSymbol, NoSymbol, c ] };
// home row
- key <KP4> { [ KP_Left, KP_4, D ] };
- key <KP5> { [ KP_Begin, KP_5, E ] };
- key <KP6> { [ KP_Right, KP_6, F ] };
- key <KPAD> { [ KP_Add, plus, comma ] };
+ key <KP4> { [ NoSymbol, NoSymbol, d ] };
+ key <KP5> { [ NoSymbol, NoSymbol, e ] };
+ key <KP6> { [ NoSymbol, NoSymbol, f ] };
+ key <KPAD> { [ NoSymbol, NoSymbol, comma ] };
// lower row
- key <KP1> { [ KP_End, KP_7, equal ] };
- key <KP2> { [ KP_Down, KP_8, x ] };
- key <KP3> { [ KP_Next, KP_9, colon ] };
+ key <KP1> { [ NoSymbol, NoSymbol, equal ] };
+ key <KP2> { [ NoSymbol, NoSymbol, x ] };
+ key <KP3> { [ NoSymbol, NoSymbol, colon ] };
// decimal row
- key <KP0> { [ KP_Insert, KP_0, backslash ] };
+ key <KP0> { [ NoSymbol, NoSymbol, backslash ] };
+};
+
+// Main numbers follows the traditions from ATMs and phones with
+// numbers increasing downwards to the right. (It is easier to
+// change the keyboard layout than to reprogram your local ATM;
+// also cell-phones are becoming more common while calculators are
+// becoming more rare).
+// First level is left unspecified, so it may be combined with another
+// layout, e.g. "legacy".
+partial keypad_keys
+xkb_symbols "atm" {
+ // upper row
+ key <KP7> { [ NoSymbol, KP_1 ] };
+ key <KP8> { [ NoSymbol, KP_2 ] };
+ key <KP9> { [ NoSymbol, KP_3 ] };
+
+ // lower row
+ key <KP1> { [ NoSymbol, KP_7 ] };
+ key <KP2> { [ NoSymbol, KP_8 ] };
+ key <KP3> { [ NoSymbol, KP_9 ] };
};
diff --git a/xorg-server/xkbdata.src/symbols/kg b/xorg-server/xkbdata.src/symbols/kg
index 24f5a1516..be5424799 100644
--- a/xorg-server/xkbdata.src/symbols/kg
+++ b/xorg-server/xkbdata.src/symbols/kg
@@ -1,28 +1,135 @@
// $XKeyboardConfig$
-// based on
-// russian standard keyboard
-// Yury Fedorov <yury-fedorov@prime-task.com>
-// Last Changes 2004/10/25 by Yury Fedorov <yury-fedorov@prime-task.com>
+// Kirghiz (aka Kyrgyz) Standard Keyboard
//
-// $XFree86: xc/programs/xkbcomp/symbols/pc/kg,v 0.0 Exp $
+// Standard - Phonetic
+// ______________- ________________
+// ё1234567890өң ё1234567890яю
+// Ё!"№;%:?*()ӨҢ Ё!"№;%:?-()ЯЮ
+//
+// йцукенгшщзхъү өүертыуиопчшъ
+// фывапролджэ асдфгңйклэь
+// ячсмитьбю.(,) зхжвбнмцщ.(,)
-partial default alphanumeric_keys
-xkb_symbols "basic" {
+// Authors:
+// Timur Jamakeev <ztimur [at] gmail.com>
+// Ilyas Bakirov <just_ilyas [at] yahoo.com>
+// Yury Fedorov <yury-fedorov [at] prime-task.com>
+// Emil Asanov <a7 [at] on.kg>
+// Ulan Melisbek <ulan.melisbek [at] gmail.com>
- include "ru(winkeys)"
- name[Group1]= "Kyrgyzstan";
+// Kyrgyz standard keyboard
+partial default alphanumeric_keys
+xkb_symbols "basic" {
- key.type[group1]="FOUR_LEVEL_ALPHABETIC";
+ name[Group1]= "Kyrgyzstan";
- key <AC07> { [ Cyrillic_o, Cyrillic_O,
- Cyrillic_o_bar, Cyrillic_O_bar ] };
- key <AD03> { [ Cyrillic_u, Cyrillic_U,
- Cyrillic_u_straight, Cyrillic_U_straight ] };
- key <AD06> { [ Cyrillic_en, Cyrillic_EN,
- Cyrillic_en_descender, Cyrillic_EN_descender ] };
+ key <AE01> { [ 1, exclam ] };
+ key <AE02> { [ 2, quotedbl ] };
+ key <AE03> { [ 3, numerosign ] };
+ key <AE04> { [ 4, semicolon ] };
+ key <AE05> { [ 5, percent ] };
+ key <AE06> { [ 6, colon ] };
+ key <AE07> { [ 7, question ] };
+ key <AE08> { [ 8, asterisk ] };
+ key <AE09> { [ 9, parenleft ] };
+ key <AE10> { [ 0, parenright ] };
+ key <AE11> { [ Cyrillic_o_bar, Cyrillic_O_bar ] };
+ key <AE12> { [ Cyrillic_en_descender, Cyrillic_EN_descender ] };
+ key <BKSL> { [ Cyrillic_u_straight, Cyrillic_U_straight ] };
+ key <AB10> { [ period, comma ] };
+ key <LSGT> { [ slash, bar ] };
- include "level3(ralt_switch)"
+ key <TLDE> { [ Cyrillic_io, Cyrillic_IO ] };
+ key <AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI ] };
+ key <AD02> { [ Cyrillic_tse, Cyrillic_TSE ] };
+ key <AD03> { [ Cyrillic_u, Cyrillic_U ] };
+ key <AD04> { [ Cyrillic_ka, Cyrillic_KA ] };
+ key <AD05> { [ Cyrillic_ie, Cyrillic_IE ] };
+ key <AD06> { [ Cyrillic_en, Cyrillic_EN ] };
+ key <AD07> { [ Cyrillic_ghe, Cyrillic_GHE ] };
+ key <AD08> { [ Cyrillic_sha, Cyrillic_SHA ] };
+ key <AD09> { [ Cyrillic_shcha, Cyrillic_SHCHA ] };
+ key <AD10> { [ Cyrillic_ze, Cyrillic_ZE ] };
+ key <AD11> { [ Cyrillic_ha, Cyrillic_HA ] };
+ key <AD12> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN ] };
+ key <AC01> { [ Cyrillic_ef, Cyrillic_EF ] };
+ key <AC02> { [ Cyrillic_yeru, Cyrillic_YERU ] };
+ key <AC03> { [ Cyrillic_ve, Cyrillic_VE ] };
+ key <AC04> { [ Cyrillic_a, Cyrillic_A ] };
+ key <AC05> { [ Cyrillic_pe, Cyrillic_PE ] };
+ key <AC06> { [ Cyrillic_er, Cyrillic_ER ] };
+ key <AC07> { [ Cyrillic_o, Cyrillic_O ] };
+ key <AC08> { [ Cyrillic_el, Cyrillic_EL ] };
+ key <AC09> { [ Cyrillic_de, Cyrillic_DE ] };
+ key <AC10> { [ Cyrillic_zhe, Cyrillic_ZHE ] };
+ key <AC11> { [ Cyrillic_e, Cyrillic_E ] };
+ key <AB01> { [ Cyrillic_ya, Cyrillic_YA ] };
+ key <AB02> { [ Cyrillic_che, Cyrillic_CHE ] };
+ key <AB03> { [ Cyrillic_es, Cyrillic_ES ] };
+ key <AB04> { [ Cyrillic_em, Cyrillic_EM ] };
+ key <AB05> { [ Cyrillic_i, Cyrillic_I ] };
+ key <AB06> { [ Cyrillic_te, Cyrillic_TE ] };
+ key <AB07> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] };
+ key <AB08> { [ Cyrillic_be, Cyrillic_BE ] };
+ key <AB09> { [ Cyrillic_yu, Cyrillic_YU ] };
};
+// Kyrgyz phonetic layout
+partial alphanumeric_keys
+xkb_symbols "phonetic" {
+
+ name[Group1]="Kyrgyzstan - Phonetic";
+
+ key <AE01> { [ 1, exclam ] };
+ key <AE02> { [ 2, quotedbl ] };
+ key <AE03> { [ 3, numerosign ] };
+ key <AE04> { [ 4, semicolon ] };
+ key <AE05> { [ 5, percent ] };
+ key <AE06> { [ 6, colon ] };
+ key <AE07> { [ 7, question ] };
+ key <AE08> { [ 8, minus ] };
+ key <AE09> { [ 9, parenleft ] };
+ key <AE10> { [ 0, parenright ] };
+ key <AE11> { [ Cyrillic_ya, Cyrillic_YA ] };
+ key <AE12> { [ Cyrillic_yu, Cyrillic_YU ] };
+
+ key <AD11> { [ Cyrillic_che, Cyrillic_CHE ] };
+ key <AD12> { [ Cyrillic_sha, Cyrillic_SHA ] };
+ key <BKSL> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN ] };
+ key <AB09> { [ Cyrillic_shcha, Cyrillic_SHCHA ] };
+ key <AB10> { [ period, comma ] };
+ key <AB08> { [ Cyrillic_tse, Cyrillic_TSE ] };
+ key <AC10> { [ Cyrillic_e, Cyrillic_E ] };
+ key <AC11> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] };
+ key <TLDE> { [ Cyrillic_io, Cyrillic_IO ] };
+
+ key <LatQ> { [ Cyrillic_o_bar, Cyrillic_O_bar ] };
+ key <LatZ> { [ Cyrillic_ze, Cyrillic_ZE ] };
+ key <LatS> { [ Cyrillic_es, Cyrillic_ES ] };
+ key <LatA> { [ Cyrillic_a, Cyrillic_A ] };
+ key <LatW> { [ Cyrillic_u_straight, Cyrillic_U_straight ] };
+ key <LatC> { [ Cyrillic_zhe, Cyrillic_ZHE ] };
+ key <LatX> { [ Cyrillic_ha, Cyrillic_HA ] };
+ key <LatD> { [ Cyrillic_de, Cyrillic_DE ] };
+ key <LatE> { [ Cyrillic_ie, Cyrillic_IE ] };
+ key <LatV> { [ Cyrillic_ve, Cyrillic_VE ] };
+ key <LatF> { [ Cyrillic_ef, Cyrillic_EF ] };
+ key <LatT> { [ Cyrillic_te, Cyrillic_TE ] };
+ key <LatR> { [ Cyrillic_er, Cyrillic_ER ] };
+ key <LatN> { [ Cyrillic_en, Cyrillic_EN ] };
+ key <LatB> { [ Cyrillic_be, Cyrillic_BE ] };
+ key <LatH> { [ Cyrillic_en_descender, Cyrillic_EN_descender ] };
+ key <LatG> { [ Cyrillic_ghe, Cyrillic_GHE ] };
+ key <LatY> { [ Cyrillic_yeru, Cyrillic_YERU ] };
+ key <LatM> { [ Cyrillic_em, Cyrillic_EM ] };
+ key <LatJ> { [ Cyrillic_shorti, Cyrillic_SHORTI ] };
+ key <LatU> { [ Cyrillic_u, Cyrillic_U ] };
+ key <LatK> { [ Cyrillic_ka, Cyrillic_KA ] };
+ key <LatI> { [ Cyrillic_i, Cyrillic_I ] };
+ key <LatO> { [ Cyrillic_o, Cyrillic_O ] };
+ key <LatL> { [ Cyrillic_el, Cyrillic_EL ] };
+ key <LatP> { [ Cyrillic_pe, Cyrillic_PE ] };
+
+};
diff --git a/xorg-server/xkbdata.src/symbols/kpdl b/xorg-server/xkbdata.src/symbols/kpdl
index ffcfcd9f0..a8bdfb7f9 100644
--- a/xorg-server/xkbdata.src/symbols/kpdl
+++ b/xorg-server/xkbdata.src/symbols/kpdl
@@ -86,3 +86,20 @@ xkb_symbols "kposs" {
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/xkbdata.src/symbols/kr b/xorg-server/xkbdata.src/symbols/kr
index 10de5fef5..4c2fa9673 100644
--- a/xorg-server/xkbdata.src/symbols/kr
+++ b/xorg-server/xkbdata.src/symbols/kr
@@ -3,15 +3,15 @@
default alphanumeric_keys
xkb_symbols "kr106" {
- name[Group1]= "Korea, Republic of";
include "us"
+ name[Group1]= "Korea, Republic of";
include "kr(koreankeys)"
};
alphanumeric_keys
xkb_symbols "kr104" {
- name[Group1]= "Korea, Republic of - 101/104 key Compatible";
include "us"
+ name[Group1]= "Korea, Republic of - 101/104 key Compatible";
include "kr(koreankeys)"
include "kr(koreankeys_raltctl)"
};
diff --git a/xorg-server/xkbdata.src/symbols/latam b/xorg-server/xkbdata.src/symbols/latam
index 02372d8b9..29ec743dc 100644
--- a/xorg-server/xkbdata.src/symbols/latam
+++ b/xorg-server/xkbdata.src/symbols/latam
@@ -61,3 +61,12 @@ xkb_symbols "nodeadkeys" {
key <AB10> { [ minus, underscore, dead_belowdot, abovedot ] };
};
+partial alphanumeric_keys
+xkb_symbols "deadtilde" {
+
+ include "latam(basic)"
+
+ name[Group1]="Latin American - Include dead tilde";
+
+ key <AD12> { [ plus, asterisk, dead_tilde, dead_macron ] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/level3 b/xorg-server/xkbdata.src/symbols/level3
index d4e112913..79fdcea03 100644
--- a/xorg-server/xkbdata.src/symbols/level3
+++ b/xorg-server/xkbdata.src/symbols/level3
@@ -136,7 +136,7 @@ xkb_symbols "rwin_switch" {
// 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 hidden modifier_keys
+partial modifier_keys
xkb_symbols "enter_switch" {
key <KPEN> {
type[Group1]="ONE_LEVEL",
diff --git a/xorg-server/xkbdata.src/symbols/lt b/xorg-server/xkbdata.src/symbols/lt
index 6e7a43c7e..d535da7d3 100644
--- a/xorg-server/xkbdata.src/symbols/lt
+++ b/xorg-server/xkbdata.src/symbols/lt
@@ -110,6 +110,8 @@ xkb_symbols "std" {
key <LSGT> {[ less, greater, endash ]};
+ include "kpdl(comma)"
+
include "level3(ralt_switch)"
};
@@ -158,11 +160,16 @@ xkb_symbols "ibm" {
include "level3(ralt_switch)"
};
-
-
// LEKP, LEKPa and Baltic+ layouts 1.0 for Linux.
// Copyright (c) 2007 Tautrimas Pajarskas
// For more info go to http://lekp.info
+//
+// LEKP and LEKPa layouts are licensed under the Creative Commons
+// Attribution-Noncommercial-Share Alike 3.0 License.
+// To view a copy of this license, visit
+// http://creativecommons.org/licenses/by-nc-sa/3.0/ or send
+// a letter to Creative Commons, 171 Second Street, Suite 300,
+// San Francisco, California, 94105, USA.
partial alphanumeric_keys modifier_keys
xkb_symbols "lekp" {
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in
index 90b2eb576..801f8ab0d 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_symbols_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
symbolsdir = $(xkb_base)/symbols/macintosh_vndr
@@ -202,8 +178,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -227,10 +203,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_symbolsDATA: $(dist_symbols_DATA)
@$(NORMAL_INSTALL)
- test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+ test -z "$(symbolsdir)" || $(MKDIR_P) "$(DESTDIR)$(symbolsdir)"
@list='$(dist_symbols_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -253,22 +228,21 @@ CTAGS:
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -284,7 +258,7 @@ check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(symbolsdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -330,12 +304,20 @@ info-am:
install-data-am: install-dist_symbolsDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -354,17 +336,21 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+uninstall-am: uninstall-dist_symbolsDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_symbolsDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ install-dist_symbolsDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_symbolsDATA uninstall-info-am
+ uninstall-dist_symbolsDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.in
index 30b4c87c1..6f96e6797 100644
--- a/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_symbols_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
symbolsdir = $(xkb_base)/symbols/nec_vndr
@@ -198,8 +174,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -223,10 +199,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_symbolsDATA: $(dist_symbols_DATA)
@$(NORMAL_INSTALL)
- test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+ test -z "$(symbolsdir)" || $(MKDIR_P) "$(DESTDIR)$(symbolsdir)"
@list='$(dist_symbols_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -249,22 +224,21 @@ CTAGS:
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -280,7 +254,7 @@ check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(symbolsdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -326,12 +300,20 @@ info-am:
install-data-am: install-dist_symbolsDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -350,17 +332,21 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+uninstall-am: uninstall-dist_symbolsDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_symbolsDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ install-dist_symbolsDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_symbolsDATA uninstall-info-am
+ uninstall-dist_symbolsDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/symbols/pc b/xorg-server/xkbdata.src/symbols/pc
index 444e3c1ac..9f3da6640 100644
--- a/xorg-server/xkbdata.src/symbols/pc
+++ b/xorg-server/xkbdata.src/symbols/pc
@@ -19,10 +19,7 @@ xkb_symbols "pc105" {
include "pc(editing)"
include "keypad(x11)"
- key <BKSP> {
- type="CTRL+ALT",
- symbols[Group1]= [ BackSpace, Terminate_Server ]
- };
+ key <BKSP> { [ BackSpace ] };
key <TAB> { [ Tab, ISO_Left_Tab ] };
key <RTRN> { [ Return ] };
@@ -35,11 +32,13 @@ xkb_symbols "pc105" {
key <LCTL> { [ Control_L ] };
key <LWIN> { [ Super_L ] };
+ modifier_map Mod4 { <LWIN> };
key <RTSH> { [ Shift_R ] };
key <RCTL> { [ Control_R ] };
key <RWIN> { [ Super_R ] };
+ modifier_map Mod4 { <RWIN> };
key <MENU> { [ Menu ] };
diff --git a/xorg-server/xkbdata.src/symbols/pk b/xorg-server/xkbdata.src/symbols/pk
index 43ee86241..320e1c2a7 100644
--- a/xorg-server/xkbdata.src/symbols/pk
+++ b/xorg-server/xkbdata.src/symbols/pk
@@ -7,81 +7,197 @@
//Notice:
//Alt key combinations are yet to be put in. The unavailable keys are those which do not have a corresponding //glyph in unicode.
+// based on a keyboard map from an 'xkb/symbols/ur' file
+// $XFree86$
+
partial default alphanumeric_keys
-xkb_symbols "urd" {
+xkb_symbols "urd-phonetic" {
+
name[Group1]= "Pakistan";
- // Keys '~' - '='
- // All keys checked and complete
- key <TLDE> { [ 0x10006d4 ] };
- key <AE01> { [ 0x1000661, exclam ] };
- key <AE02> { [ 0x1000662, 0x1000040 ] };
- key <AE03> { [ 0x1000663, 0x1000023 ] };
- key <AE04> { [ 0x10006f4, 0x1000024 ] };
- key <AE05> { [ 0x10006f5, 0x1000025 ] };
- key <AE06> { [ 0x1000666, 0x100005e ] };
- key <AE07> { [ 0x1000667, 0x1000026 ] };
- key <AE08> { [ 0x1000668, asterisk ] };
- key <AE09> { [ 0x1000669, parenleft ] };
- key <AE10> { [ 0x1000660, parenright ] };
- key <AE11> { [ minus, 0x100005f ] };
- key <AE12> { [ equal, plus ] };
+ key <TLDE> { [ 0x100064b , 0x100007E, 0x100200C ] };
+ key <AE01> { [ 0x1000031 , 0x1000021 ] };
+ key <AE02> { [ 0x1000032 , 0x1000040 ] };
+ key <AE03> { [ 0x1000033 , 0x1000023 ] };
+ key <AE04> { [ 0x1000034 , 0x1000024 ] };
+ key <AE05> { [ 0x1000035 , 0x1000025 ] };
+ key <AE06> { [ 0x1000036 , 0x100005E ] };
+ key <AE07> { [ 0x1000037 , 0x1000026 ] };
+ key <AE08> { [ 0x1000038 , 0x100002A ] };
+ key <AE09> { [ 0x1000039 , 0x1000029 ] };
+ key <AE10> { [ 0x1000030 , 0x1000028 ] };
+ key <AE11> { [ 0x100002D , 0x100005F ] };
+ key <AE12> { [ 0x100003D , 0x100002B ] };
+ key <AD01> { [ 0x1000642 , 0x1000652, 0x100200D ] };
+ key <AD02> { [ 0x1000648 , 0x1000624, 0x100200C ] };
+ key <AD03> { [ 0x1000639 , 0x1000670 ] };
+ key <AD04> { [ 0x1000631 , 0x1000691 ] };
+ key <AD05> { [ 0x100062a , 0x1000679 ] };
+ key <AD06> { [ 0x10006d2 , 0x100064E ] };
+ key <AD07> { [ 0x1000621 , 0x1000626 ] };
+ key <AD08> { [ 0x10006cc , 0x1000650 ] };
+ key <AD09> { [ 0x10006c1 , 0x10006c3 ] };
+ key <AD10> { [ 0x100067e , 0x100064f ] };
+ key <AD11> { [ 0x100005d , 0x100007D ] };
+ key <AD12> { [ 0x100005b , 0x100007B ] };
- //Keys 'Q' - ']'
- //Checked but incomplete with three shift sequences not available
- key <AD01> { [ Arabic_qaf, 0x10006e1 ] };
- key <AD02> { [ 0x1000648, 0x100fdf9 ] }; //shift key not available
- key <AD03> { [ 0x1000639, 0x100fdf7 ] }; //shift key not available
- key <AD04> { [ 0x1000631, 0x1000691 ] };
- key <AD05> { [ Arabic_teh, 0x1000679 ] };
- key <AD06> { [ 0x10006d2, 0x100fe7c ] };
- key <AD07> { [ 0x1000621, 0x100064c ] };
- key <AD08> { [ 0x10006cc, 0x1000656 ] }; //shift key not available
- key <AD09> { [ 0x1000647, 0x1000629 ] };
- key <AD10> { [ 0x100067e, 0x100064f ] };
- key <AD12> { [ bracketright, braceright ] };
- key <AD11> { [ bracketleft, braceleft ] };
+ key <AC01> { [ 0x1000627 , 0x1000622 ] };
+ key <AC02> { [ 0x1000633 , 0x1000635 ] };
+ key <AC03> { [ 0x100062f , 0x1000688 ] };
+ key <AC04> { [ 0x1000641 , 0x1000651 ] };
+ key <AC05> { [ 0x10006af , 0x100063a ] };
+ key <AC06> { [ 0x100062D, 0x10006BE ] };
+ key <AC07> { [ 0x100062c , 0x1000636 ] };
+ key <AC08> { [ 0x10006a9 , 0x100062e ] };
+ key <AC09> { [ 0x1000644 , 0x1000654 ] };
+ key <AC10> { [ 0x100061b , 0x100003a ] };
+ key <AC11> { [ 0x1000027 , 0x1000022 ] };
+ key <BKSL> { [ 0x100005C, 0x100007C ] };
+ key <LSGT> { [ bar , brokenbar ] };
+ key <AB01> { [ 0x1000632 , 0x1000630, 0x100200E ] };
+ key <AB02> { [ 0x1000634 , 0x1000698, 0x100202A ] };
+ key <AB03> { [ 0x1000686 , 0x100062b, 0x100202D ] };
+ key <AB04> { [ 0x1000637 , 0x1000638, 0x100202C ] };
+ key <AB05> { [ 0x1000628 , 0x100002e, 0x100202E ] };
+ key <AB06> { [ 0x1000646 , 0x10006ba, 0x100202B ] };
+ key <AB07> { [ 0x1000645 , 0x1000658, 0x100200F ] };
+ key <AB08> { [ 0x100060c , 0x100003c ] };
+ key <AB09> { [ 0x10006d4 , 0x100003E ] };
+ key <AB10> { [ 0x100002f , 0x100061f ] };
- // Keys 'A' - '''
- // Checked but incomplete with two shift sequences not available
- key <AC01> { [ 0x1000627, 0x1000622 ] };
- key <AC02> { [ Arabic_seen, 0x1000635 ] };
- key <AC03> { [ 0x100062f, 0x1000688 ] };
- key <AC04> { [ 0x1000641, 0x1000670 ] };
- key <AC05> { [ 0x10006af, 0x100063a ] };
- key <AC06> { [ 0x10006be, 0x100062d ] };
- key <AC07> { [ 0x100062c, 0x1000636 ] };
- key <AC08> { [ 0x10006a9, 0x100062e ] };
- key <AC09> { [ 0x1000644, 0x1000612 ] };//shift key not available
- key <AC10> { [ 0x100061b, 0x100003a ] };
- key <AC11> { [ 0x1000027 ] }; // shift key not available
-
-
- // These two are fine
- key <BKSL> { [ backslash, bar ] };
- key <SPCE> { [ space ] };
+// key <RALT> { [ Mode_switch, Multi_key ] };
+ include "level3(ralt_switch)"
- // Keys: 'Z' - '/'
- //Keys checked with two shift sequences not available
- key <AB01> { [ Arabic_zain, Arabic_thal ] };
- key <AB02> { [ 0x1000634, 0x1000698 ] };
- key <AB03> { [ 0x1000686 , 0x100062b ] };
- key <AB04> { [ 0x1000637, 0x1000638 ] };
- key <AB05> { [ 0x1000628, 0x1000628 ] };//shift key unavailable
- key <AB06> { [ 0x1000646, 0x10006ba ] };
- key <AB07> { [ 0x1000645, 0x1000645 ] };//shift key not available
- key <AB08> { [ 0x100060c, 0x100064e ] };
- key <AB09> { [ 0x10006d4, 0x1000650 ] };
- key <AB10> { [ slash, Arabic_question_mark ] };
-
- //End alphanumeric key mappings
-
- //Begin modifier mappings
-
- modifier_map Shift {Shift_L, Shift_R };
- modifier_map Lock {Caps_Lock };
+ // End alphanumeric section
+};
+
+partial alphanumeric_keys
+xkb_symbols "urd-crulp" {
+
+ name[Group1]= "Pakistan - CRULP";
+// www.crulp.org phonetic v1.1
+
+ key <TLDE> { [ 0x100007E , 0x100064B ] };
+ key <AE01> { [ 0x10006F1 , 0x1000031, 0x1000021 ] };
+ key <AE02> { [ 0x10006F2 , 0x1000032, 0x1000040 ] };
+ key <AE03> { [ 0x10006F3 , 0x1000033, 0x1000023 ] };
+ key <AE04> { [ 0x10006F4 , 0x1000034 ] };
+ key <AE05> { [ 0x10006F5 , 0x1000035, 0x100066A ] };
+ key <AE06> { [ 0x10006F6 , 0x1000036 ] };
+ key <AE07> { [ 0x10006F7 , 0x1000037, 0x1000026 ] };
+ key <AE08> { [ 0x10006F8 , 0x1000038, 0x100002A ] };
+ key <AE09> { [ 0x10006F9 , 0x1000039, 0x1000029 ] };
+ key <AE10> { [ 0x10006F0 , 0x1000030, 0x1000028 ] };
+ key <AE11> { [ 0x100002D , 0x100005F ] };
+ key <AE12> { [ 0x100003D , 0x100002B ] };
+ key <AD01> { [ 0x1000642 , 0x1000652 ] };
+ key <AD02> { [ 0x1000648 , 0x1000651, 0x1000602 ] };
+ key <AD03> { [ 0x1000639 , 0x1000670, 0x1000656 ] };
+ key <AD04> { [ 0x1000631 , 0x1000691, 0x1000613 ] };
+ key <AD05> { [ 0x100062a , 0x1000679, 0x1000614 ] };
+ key <AD06> { [ 0x10006d2 , 0x100064E, 0x1000601 ] };
+ key <AD07> { [ 0x1000621 , 0x1000626, 0x1000654 ] };
+ key <AD08> { [ 0x10006cc , 0x1000650, 0x1000611 ] };
+ key <AD09> { [ 0x10006c1 , 0x10006c3 ] };
+ key <AD10> { [ 0x100067e , 0x100064f, 0x1000657 ] };
+ key <AD11> { [ 0x100005d , 0x100007D ] };
+ key <AD12> { [ 0x100005b , 0x100007B ] };
+
+ key <AC01> { [ 0x1000627 , 0x1000622, 0x100FDF2 ] };
+ key <AC02> { [ 0x1000633 , 0x1000635, 0x1000610 ] };
+ key <AC03> { [ 0x100062f , 0x1000688, 0x100FDFA ] };
+ key <AC04> { [ 0x1000641 , 0x1000651 ] };
+ key <AC05> { [ 0x10006af , 0x100063a ] };
+ key <AC06> { [ 0x100062D, 0x10006BE, 0x1000612 ] };
+ key <AC07> { [ 0x100062c , 0x1000636, 0x100FDFB ] };
+ key <AC08> { [ 0x10006a9 , 0x100062e ] };
+ key <AC09> { [ 0x1000644 , 0x1000654 ] };
+ key <AC10> { [ 0x100061b , 0x100003a ] };
+ key <AC11> { [ 0x1000027 , 0x1000022 ] };
+ key <BKSL> { [ 0x100005C, 0x100007C ] };
+
+ key <LSGT> { [ bar , brokenbar ] };
+ key <AB01> { [ 0x1000632 , 0x1000630, 0x100060F ] };
+ key <AB02> { [ 0x1000634 , 0x1000698, 0x100060E ] };
+ key <AB03> { [ 0x1000686 , 0x100062b, 0x1000603 ] };
+ key <AB04> { [ 0x1000637 , 0x1000638 ] };
+ key <AB05> { [ 0x1000628 , 0x100002e, 0x100FDFD ] };
+ key <AB06> { [ 0x1000646 , 0x10006ba, 0x1000600 ] };
+ key <AB07> { [ 0x1000645 , 0x1000658 ] };
+ key <AB08> { [ 0x100060c , 0x100003c, 0x100003C ] };
+ key <AB09> { [ 0x10006d4 , 0x100066B, 0x100003E ] };
+ key <AB10> { [ 0x100002f , 0x100061F ] };
+
+// key <RALT> { [ Mode_switch, Multi_key ] };
+
+ include "level3(ralt_switch)"
+
+ // End alphanumeric section
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "urd-nla" {
+ name[Group1]= "Pakistan - NLA";
+// www.nla.gov.pk
+
+ key <TLDE> { [ 0x1000060 , 0x100007E, 0x100200C ] };
+ key <AE01> { [ 0x1000031 , 0x1000021 ] };
+ key <AE02> { [ 0x1000032 , 0x1000040 ] };
+ key <AE03> { [ 0x1000033 , 0x1000023 ] };
+ key <AE04> { [ 0x1000034 , 0x1000024 ] };
+ key <AE05> { [ 0x1000035 , 0x100066A ] };
+ key <AE06> { [ 0x1000036 , 0x100005E ] };
+ key <AE07> { [ 0x1000037 , 0x10006D6 ] };
+ key <AE08> { [ 0x1000038 , 0x100066D ] };
+ key <AE09> { [ 0x1000039 , 0x1000029 ] };
+ key <AE10> { [ 0x1000030 , 0x1000028 ] };
+ key <AE11> { [ 0x100002D , 0x100005F ] };
+ key <AE12> { [ 0x100003D , 0x100002B ] };
+ key <AD01> { [ 0x1000637 , 0x1000638, 0x100200D ] };
+ key <AD02> { [ 0x1000635 , 0x1000636, 0x100200C ] };
+ key <AD03> { [ 0x10006BE , 0x1000630 ] };
+ key <AD04> { [ 0x100062F , 0x1000688 ] };
+ key <AD05> { [ 0x1000679 , 0x100062B ] };
+ key <AD06> { [ 0x100067E , 0x1000651 ] };
+ key <AD07> { [ 0x100062A , 0x10006C3 ] };
+ key <AD08> { [ 0x1000628 , 0x1000640 ] };
+ key <AD09> { [ 0x100062C , 0x1000686 ] };
+ key <AD10> { [ 0x100062D , 0x100062E ] };
+ key <AD11> { [ 0x100005d , 0x100007D ] };
+ key <AD12> { [ 0x100005b , 0x100007B ] };
+
+ key <AC01> { [ 0x1000645 , 0x1000698 ] };
+ key <AC02> { [ 0x1000648 , 0x1000632 ] };
+ key <AC03> { [ 0x1000631 , 0x1000691 ] };
+ key <AC04> { [ 0x1000646 , 0x10006BA ] };
+ key <AC05> { [ 0x1000644 , 0x10006C2 ] };
+ key <AC06> { [ 0x10006C1 , 0x1000621 ] };
+ key <AC07> { [ 0x1000627 , 0x1000622 ] };
+ key <AC08> { [ 0x10006a9 , 0x10006AF ] };
+ key <AC09> { [ 0x10006CC , 0x100064A ] };
+ key <AC10> { [ 0x100061b , 0x100003a ] };
+ key <AC11> { [ 0x1000027 , 0x1000022 ] };
+ key <BKSL> { [ 0x100005C , 0x100007C ] };
+
+ key <LSGT> { [ bar , brokenbar ] };
+ key <AB01> { [ 0x1000642 , 0x100200D, 0x100200E ] };
+ key <AB02> { [ 0x1000641 , 0x100200C, 0x100202A ] };
+ key <AB03> { [ 0x10006D2 , 0x10006D3, 0x100202D ] };
+ key <AB04> { [ 0x1000633 , 0x100200E, 0x100202C ] };
+ key <AB05> { [ 0x1000634 , 0x1000624, 0x100202E ] };
+ key <AB06> { [ 0x100063A , 0x1000626, 0x100202B ] };
+ key <AB07> { [ 0x1000639 , 0x100200F, 0x100200F ] };
+ key <AB08> { [ 0x100060c , 0x100003E ] };
+ key <AB09> { [ 0x10006d4 , 0x100003C ] };
+ key <AB10> { [ 0x100002F , 0x100061f ] };
+
+
+ include "level3(ralt_switch)"
+
+ // End alphanumeric section
};
partial alphanumeric_keys
diff --git a/xorg-server/xkbdata.src/symbols/pl b/xorg-server/xkbdata.src/symbols/pl
index 58b96e5dc..6eb8b1c56 100644
--- a/xorg-server/xkbdata.src/symbols/pl
+++ b/xorg-server/xkbdata.src/symbols/pl
@@ -11,11 +11,14 @@ xkb_symbols "basic" {
name[Group1]="Poland";
+ key <AD01> { [ q, Q ] };
+ key <AD02> { [ w, W ] };
key <AD03> { [ e, E, eogonek, Eogonek ] };
key <AD09> { [ o, O, oacute, Oacute ] };
key <AC01> { [ a, A, aogonek, Aogonek ] };
key <AC02> { [ s, S, sacute, Sacute ] };
+ key <AC04> { [ f, F ] };
key <AB01> { [ z, Z, zabovedot, Zabovedot ] };
key <AB02> { [ x, X, zacute, Zacute ] };
@@ -50,12 +53,15 @@ xkb_symbols "qwertz" {
key <AE11> { [ plus, question, dead_diaeresis, questiondown ] };
key <AE12> { [apostrophe, asterisk, dead_cedilla, dead_ogonek ] };
+ key <AD01> { [ q, Q ] };
+ key <AD02> { [ w, W ] };
key <AD03> { [ e, E, EuroSign, cent ] };
key <AD11> { [ zabovedot, nacute, division, dead_abovering ] };
key <AD12> { [ sacute, cacute, multiply, dead_macron ] };
key <AC02> { [ s, S, dstroke, section ] };
key <AC03> { [ d, D, Dstroke, ETH ] };
+ key <AC04> { [ f, F ] };
key <AC08> { [ k, K, kra, ampersand ] };
key <AC09> { [ l, L, lstroke, Lstroke ] };
key <AC10> { [ lstroke, Lstroke, dollar, dead_doubleacute ] };
@@ -124,7 +130,7 @@ partial alphanumeric_keys
xkb_symbols "dvorak_altquotes" {
include "pl(dvorak)"
- name[Group1] = "Poland - Dvorak, Polish quotes on key 1/!";
+ name[Group1] = "Poland - Dvorak, Polish quotes on key 1";
key <AE01> { [ 1, exclam, doublelowquotemark, rightdoublequotemark ] };
};
@@ -136,6 +142,8 @@ xkb_symbols "csb" {
name[Group1]="Poland - Kashubian";
+ key <AD01> { [ q, Q ] };
+ key <AD02> { [ w, W ] };
key <AD03> { [ e, E, eacute, Eacute ] };
key <AD04> { [ r, R, ediaeresis, Ediaeresis ] };
key <AD06> { [ y, Y, EuroSign, cent ] };
@@ -146,6 +154,7 @@ xkb_symbols "csb" {
key <AC01> { [ a, A, aogonek, Aogonek ] };
key <AC02> { [ s, S, atilde, Atilde ] };
+ key <AC04> { [ f, F ] };
key <AC09> { [ l, L, lstroke, Lstroke ] };
key <AB01> { [ z, Z, zabovedot, Zabovedot ] };
diff --git a/xorg-server/xkbdata.src/symbols/ro b/xorg-server/xkbdata.src/symbols/ro
index e4ed70585..b2842bd79 100644
--- a/xorg-server/xkbdata.src/symbols/ro
+++ b/xorg-server/xkbdata.src/symbols/ro
@@ -193,3 +193,43 @@ xkb_symbols "winkeys" {
include "level3(ralt_switch)"
};
+
+// Crimean Tatar (Crimean Turkish) layouts.
+partial
+xkb_symbols "crh_f" {
+ include "tr(crh_f)"
+
+ name[Group1]="Romania - Crimean Tatar (Turkish F)";
+};
+
+partial
+xkb_symbols "crh_alt" {
+ include "tr(crh_alt)"
+
+ name[Group1]="Romania - Crimean Tatar (Turkish Alt-Q)";
+};
+
+partial
+xkb_symbols "crh_dobruca1" {
+ include "tr(crh)"
+
+ name[Group1]="Romania - Crimean Tatar (Dobruca-1 Q)";
+
+ key <AD05> { [ t, T, tcedilla, Tcedilla ] };
+ key <AD10> { [ p, P, abreve, Abreve ] };
+
+ key <AC04> { [ f, F, ibreve, Ibreve ] };
+ key <AC07> { [ iacute, Iacute, j, J ] };
+
+ key <AB07> { [ m, M, trademark, masculine ] };
+};
+
+partial
+xkb_symbols "crh_dobruca2" {
+ include "ro(crh_dobruca1)"
+
+ name[Group1]="Romania - Crimean Tatar (Dobruca-2 Q)";
+
+ key <AC04> { [ f, F, iacute, Iacute ] };
+ key <AC07> { [ ibreve, Ibreve, j, J ] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/rs b/xorg-server/xkbdata.src/symbols/rs
index 673b143fb..b34e0dd06 100644
--- a/xorg-server/xkbdata.src/symbols/rs
+++ b/xorg-server/xkbdata.src/symbols/rs
@@ -19,7 +19,7 @@ xkb_symbols "basic" {
name[Group1]= "Serbia";
- include "rs(level3)"
+ include "rs(cyrlevel3)"
include "rs(common)"
include "rs(cyralpha)"
include "level3(ralt_switch)"
@@ -33,7 +33,7 @@ xkb_symbols "latin" {
include "latin(type3)"
include "rs(latalpha)"
- include "rs(level3)"
+ include "rs(latlevel3)"
include "rs(common)"
include "level3(ralt_switch)"
};
@@ -149,7 +149,7 @@ xkb_symbols "twoletter" {
};
partial hidden alphanumeric_keys
-xkb_symbols "level3" {
+xkb_symbols "latlevel3" {
key <TLDE> { [ any,any, notsign, notsign ] }; // ` ~
key <AE01> { [ any,any, dead_tilde, asciitilde ] }; // 1 !
key <AE02> { [ any,any, dead_caron, caron ] }; // 2 @
@@ -203,6 +203,46 @@ xkb_symbols "level3" {
};
+partial hidden alphanumeric_keys
+xkb_symbols "cyrlevel3" {
+ key <TLDE> { [ any,any, degree, notsign ] }; // ` ~
+ key <AE03> { [ any,any, dead_circumflex, NoSymbol ] }; // 3 #
+ key <AE07> { [ any,any, dead_grave, NoSymbol ] }; // 7 &
+ key <AE08> { [ any,any, dead_doublegrave, NoSymbol ] }; // 8 *
+ key <AE09> { [ any,any, dead_acute, NoSymbol ] }; // 9 (
+ key <AE10> { [ any,any, dead_invertedbreve, NoSymbol ] }; // 0 )
+ key <AE11> { [ any,any, dead_macron, NoSymbol ] }; // - _
+
+ key <AD01> { [ any,any, backslash, NoSymbol ] }; // q
+ key <AD02> { [ any,any, bar, NoSymbol ] }; // w
+ key <AD03> { [ any,any, EuroSign, sterling ] }; // e
+ key <AD04> { [ any,any, paragraph, registered ] }; // r
+ key <AD05> { [ any,any, ellipsis, NoSymbol ] }; // t // ALPHABETIC
+ key <AD06> { [ any,any, leftarrow, yen ] }; // y
+ key <AD07> { [ any,any, downarrow, uparrow ] }; // u
+ key <AD08> { [ any,any, rightarrow, NoSymbol ] }; // i
+ key <AD09> { [ any,any, section, NoSymbol ] }; // o // ALPHABETIC
+ key <AD11> { [ any,any, division, NoSymbol ] }; // [
+ key <AD12> { [ any,any, multiply, NoSymbol ] }; // ]
+
+ key <AC02> { [ any,any, doublelowquotemark, guillemotright ] }; // s
+ key <AC03> { [ any,any, leftdoublequotemark, guillemotleft ] }; // d
+ key <AC04> { [ any,any, bracketleft, NoSymbol ] }; // f
+ key <AC05> { [ any,any, bracketright, NoSymbol ] }; // g
+ key <BKSL> { [ any,any, currency, NoSymbol ] }; // \
+
+ key <AB01> { [ any,any, leftsinglequotemark, NoSymbol ] }; // z
+ key <AB02> { [ any,any, rightsinglequotemark,NoSymbol ] }; // x
+ key <AB03> { [ any,any, cent, copyright ] }; // c
+ key <AB04> { [ any,any, at, NoSymbol ] }; // v
+ key <AB05> { [ any,any, braceleft, NoSymbol ] }; // b
+ key <AB06> { [ any,any, braceright, NoSymbol ] }; // n
+ key <AB07> { [ any,any, asciicircum, NoSymbol ] }; // m
+ key <AB08> { [ any,any, less, NoSymbol ] }; // , <
+ key <AB09> { [ any,any, greater, NoSymbol ] }; // . >
+ key <AB10> { [ any,any, emdash, endash ] }; // / ?
+};
+
partial alphanumeric_keys
xkb_symbols "latinunicode" {
// This mapping supports the Unicode characters 0x1c4-0x1cc (dz, lj, and nj
diff --git a/xorg-server/xkbdata.src/symbols/ru b/xorg-server/xkbdata.src/symbols/ru
index 110453bf1..e7317c771 100644
--- a/xorg-server/xkbdata.src/symbols/ru
+++ b/xorg-server/xkbdata.src/symbols/ru
@@ -111,18 +111,21 @@ partial alphanumeric_keys
xkb_symbols "typewriter" {
include "ru(common)"
name[Group1]= "Russia - Typewriter";
- key <TLDE> { [ apostrophe, quotedbl ] };
- key <AE01> { [ exclam, 1 ] };
- key <AE02> { [ numerosign, 2 ] };
+ key <TLDE> { [ bar, plus ] };
+ key <AE01> { [ numerosign, 1 ] };
+ key <AE02> { [ minus, 2 ] };
key <AE03> { [ slash, 3 ] };
- key <AE04> { [ semicolon, 4 ] };
+ key <AE04> { [ quotedbl, 4 ] };
key <AE05> { [ colon, 5 ] };
key <AE06> { [ comma, 6 ] };
key <AE07> { [ period, 7 ] };
key <AE08> { [ underscore, 8 ] };
key <AE09> { [ question, 9 ] };
key <AE10> { [ percent, 0 ] };
- key <BKSL> { [ parenleft, parenright ] };
+ key <AE11> { [ exclam, equal ] };
+ key <AE12> { [ semicolon, backslash ] };
+
+ key <BKSL> { [ parenright, parenleft ] };
key <AD12> { [Cyrillic_hardsign,Cyrillic_HARDSIGN ] };
key <AB10> { [ Cyrillic_io, Cyrillic_IO ] };
@@ -143,6 +146,7 @@ xkb_symbols "phonetic" {
key <AE08> { [ 8, asterisk ] };
key <AE09> { [ 9, parenleft ] };
key <AE10> { [ 0, parenright ] };
+ key <AE11> { [ minus, underscore ] };
key <AB09> { [ period, greater ] };
key <AB10> { [ slash, question ] };
@@ -186,6 +190,18 @@ xkb_symbols "phonetic" {
};
partial alphanumeric_keys
+xkb_symbols "phonetic_winkeys" {
+
+ include "ru(phonetic)"
+ name[Group1]= "Russia - Phonetic Winkeys";
+
+ key <LatX> { [ Cyrillic_ha, Cyrillic_HA ] };
+ key <LatH> { [ Cyrillic_che, Cyrillic_CHE ] };
+ key <AE12> { [ Cyrillic_softsign, Cyrillic_softsign ] };
+
+};
+
+partial alphanumeric_keys
xkb_symbols "tt" {
include "ru(winkeys)"
name[Group1]= "Russia - Tatar";
@@ -365,3 +381,60 @@ xkb_symbols "sah" {
include "level3(ralt_switch)"
};
+
+
+//Kalmyk language layout
+//based on the Kalmyk language layout: http://soft.oyrat.org/
+//Nikolay Korneev <halmg@oyrat.org>
+//Toli Miron <mirontoli@gmail.com>
+
+partial alphanumeric_keys
+xkb_symbols "xal" {
+ include "ru(winkeys)"
+
+ name[Group1]= "Russia - Kalmyk";
+
+ key.type[group1]="FOUR_LEVEL";
+
+ key <AE01> { [ question, exclam, 1 ] };
+ key <AE02> { [ numerosign, quotedbl, 2 ] };
+ key <AE03> { [ Cyrillic_u_straight, Cyrillic_U_straight, 3 ] };
+ key <AE04> { [ Cyrillic_schwa, Cyrillic_SCHWA, 4 ] };
+ key <AE05> { [ asterisk, percent, 5 ] };
+ key <AE06> { [ Cyrillic_en_descender, Cyrillic_EN_descender, 6 ] };
+ key <AE07> { [ Cyrillic_o_bar, Cyrillic_O_bar, 7 ] };
+ key <AE08> { [ Cyrillic_shha, Cyrillic_SHHA, 8 ] };
+ key <AE09> { [ Cyrillic_zhe_descender, Cyrillic_ZHE_descender, 9 ] };
+ key <AE10> { [ semicolon, colon, 0 ] };
+
+ key <TLDE> { [ parenleft, parenright, Cyrillic_io, Cyrillic_IO ] };
+
+ key <AD02> { [ Cyrillic_tse, Cyrillic_TSE, dollar ] };
+ key <AD03> { [ Cyrillic_u, Cyrillic_U, EuroSign ] };
+ key <AD04> { [ Cyrillic_ka, Cyrillic_KA, registered ] };
+ key <AD05> { [ Cyrillic_ie, Cyrillic_IE, trademark ] };
+ key <AD11> { [ Cyrillic_ha, Cyrillic_HA, bracketleft ] };
+ key <AD12> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN, bracketright ] };
+ key <AC11> { [ Cyrillic_e, Cyrillic_E, apostrophe ] };
+ key <AB03> { [ Cyrillic_es, Cyrillic_ES, copyright ] };
+ key <AB08> { [ Cyrillic_be, Cyrillic_BE, less ] };
+ key <AB09> { [ Cyrillic_yu, Cyrillic_YU, greater ] };
+
+ include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "dos" {
+
+ include "ru(common)"
+
+ name[Group1]= "Russia - DOS";
+
+ key <TLDE> { [ parenright, parenleft ] };
+ key <AE04> { [ 4, currency ] };
+ key <AE09> { [ 9, question ] };
+ key <AE10> { [ 0, percent ] };
+
+ key <AB10> { [ Cyrillic_io, Cyrillic_IO ] };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/se b/xorg-server/xkbdata.src/symbols/se
index 427b89996..9b32fd6b3 100644
--- a/xorg-server/xkbdata.src/symbols/se
+++ b/xorg-server/xkbdata.src/symbols/se
@@ -28,6 +28,7 @@ xkb_symbols "se" {
key <SPCE> { [ space, space, space, nobreakspace ] };
+ key <LSGT> { [ less, greater, bar, bar ] };
include "kpdl(comma)"
include "level3(ralt_switch)"
diff --git a/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.in
index 9993b5a89..0af827346 100644
--- a/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_symbols_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
symbolsdir = $(xkb_base)/symbols/sgi_vndr
@@ -198,8 +174,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -223,10 +199,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_symbolsDATA: $(dist_symbols_DATA)
@$(NORMAL_INSTALL)
- test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+ test -z "$(symbolsdir)" || $(MKDIR_P) "$(DESTDIR)$(symbolsdir)"
@list='$(dist_symbols_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -249,22 +224,21 @@ CTAGS:
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -280,7 +254,7 @@ check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(symbolsdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -326,12 +300,20 @@ info-am:
install-data-am: install-dist_symbolsDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -350,17 +332,21 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+uninstall-am: uninstall-dist_symbolsDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_symbolsDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ install-dist_symbolsDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_symbolsDATA uninstall-info-am
+ uninstall-dist_symbolsDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/symbols/si b/xorg-server/xkbdata.src/symbols/si
index 8e49cac51..ced6d2fe7 100644
--- a/xorg-server/xkbdata.src/symbols/si
+++ b/xorg-server/xkbdata.src/symbols/si
@@ -7,6 +7,8 @@ xkb_symbols "basic" {
name[Group1]="Slovenia";
include "rs(latin)"
+
+ key <TLDE> { type[Group1]="TWO_LEVEL", [ cedilla, diaeresis ] };
};
partial alphanumeric_keys
@@ -15,6 +17,8 @@ xkb_symbols "us" {
name[Group1]= "Slovenia - US keyboard with Slovenian letters";
include "rs(latinyz)"
+
+ key <TLDE> { type[Group1]="TWO_LEVEL", [ cedilla, diaeresis ] };
};
@@ -24,20 +28,6 @@ xkb_symbols "alternatequotes" {
name[Group1]= "Slovenia - Use guillemets for quotes";
include "rs(latinalternatequotes)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "unicode" {
-
- name[Group1]= "Slovenia - Use Slovenian digraphs";
-
- include "rs(latinunicode)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "unicodeus" {
-
- name[Group1]= "Slovenia - US keyboard with Slovenian digraphs";
- include "rs(latinunicodeyz)"
+ key <TLDE> { type[Group1]="TWO_LEVEL", [ cedilla, diaeresis ] };
};
diff --git a/xorg-server/xkbdata.src/symbols/sn b/xorg-server/xkbdata.src/symbols/sn
new file mode 100644
index 000000000..90ffe6111
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sn
@@ -0,0 +1,42 @@
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+ include "latin"
+
+ name[Group1]="Senegal";
+
+ key <AE01> { [ ampersand, 1, bar, NoSymbol ] };
+ key <AE02> { [ eacute, 2, asciitilde, Eacute ] };
+ key <AE03> { [ quotedbl, 3, numbersign, cedilla ] };
+ key <AE04> { [apostrophe, 4, braceleft, acute ] };
+ key <AE05> { [ parenleft, 5, bracketleft, diaeresis ] };
+ key <AE06> { [ minus, 6, bar, brokenbar ] };
+ key <AE07> { [ egrave, 7, dead_grave, Egrave ] };
+ key <AE08> { [underscore, 8, backslash, macron ] };
+ key <AE09> { [ ccedilla, 9, asciicircum, Ccedilla ] };
+ key <AE10> { [ agrave, 0, at, Agrave ] };
+ key <AE11> { [parenright, degree, bracketright, ydiaeresis ] };
+ key <AE12> { [ equal, plus, braceright,threequarters ] };
+
+ key <AD01> { [ a, A, ae, AE ] };
+ key <AD02> { [ z, Z, guillemotleft, less ] };
+ key <AD03> { [ e, E, EuroSign, cent ] };
+ key <AD11> { [ eng, ENG, bracketleft, bracketright ] };
+ key <AD12> { [ dollar, sterling, currency, ecircumflex ] };
+
+ key <AC01> { [ q, Q, at, Greek_OMEGA ] };
+ key <AC10> { [ m, M, mu, masculine ] };
+ key <AC11> { [ ntilde, Ntilde, acute, dead_acute ] };
+ key <TLDE> { [twosuperior, percent, notsign, notsign ] };
+
+ key <BKSL> { [ mu, sterling, grave, dead_grave ] };
+ key <AB01> { [ w, W, lstroke, Lstroke ] };
+ key <AB07> { [ comma, question, questiondown, NoSymbol ] };
+ key <AB08> { [ semicolon, period, horizconnector, multiply ] };
+ key <AB09> { [ colon, slash, periodcentered, division ] };
+ key <AB10> { [ exclam, section, exclamdown, NoSymbol ] };
+
+ key <LSGT> { [ less, greater, bar, NoSymbol ] };
+
+ include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.in
index ffac4c57c..52cd9085f 100644
--- a/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_symbols_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
symbolsdir = $(xkb_base)/symbols/sony_vndr
@@ -198,8 +174,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -223,10 +199,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_symbolsDATA: $(dist_symbols_DATA)
@$(NORMAL_INSTALL)
- test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+ test -z "$(symbolsdir)" || $(MKDIR_P) "$(DESTDIR)$(symbolsdir)"
@list='$(dist_symbols_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -249,22 +224,21 @@ CTAGS:
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -280,7 +254,7 @@ check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(symbolsdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -326,12 +300,20 @@ info-am:
install-data-am: install-dist_symbolsDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -350,17 +332,21 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+uninstall-am: uninstall-dist_symbolsDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_symbolsDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ install-dist_symbolsDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_symbolsDATA uninstall-info-am
+ uninstall-dist_symbolsDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/symbols/srvr_ctrl b/xorg-server/xkbdata.src/symbols/srvr_ctrl
index 712f763e6..cf7012b4d 100644
--- a/xorg-server/xkbdata.src/symbols/srvr_ctrl
+++ b/xorg-server/xkbdata.src/symbols/srvr_ctrl
@@ -13,11 +13,6 @@ xkb_symbols "xfree86" {
partial keypad_keys
xkb_symbols "stdkeypad" {
- key <BKSP> {
- type="CTRL+ALT",
- symbols[Group1]= [ BackSpace, Terminate_Server ]
- };
-
// Ungrab cancels server/keyboard/pointer grabs
key <KPDV> {
type="CTRL+ALT",
@@ -127,8 +122,6 @@ xkb_symbols "no_srvr_keys" {
key <FK11> { [ F11, F11 ] };
key <FK12> { [ F12, F12 ] };
- key <BKSP> { [ BackSpace, BackSpace ] };
-
key <KPDV> { [ KP_Divide, KP_Divide ] };
key <KPMU> { [ KP_Multiply, KP_Multiply ] };
key <KPSU> { [ KP_Subtract, KP_Subtract ] };
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.in
index 3fc8cbccc..8db5fff20 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_symbols_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
symbolsdir = $(xkb_base)/symbols/sun_vndr
@@ -203,8 +179,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -228,10 +204,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_symbolsDATA: $(dist_symbols_DATA)
@$(NORMAL_INSTALL)
- test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+ test -z "$(symbolsdir)" || $(MKDIR_P) "$(DESTDIR)$(symbolsdir)"
@list='$(dist_symbols_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -254,22 +229,21 @@ CTAGS:
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -285,7 +259,7 @@ check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(symbolsdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -331,12 +305,20 @@ info-am:
install-data-am: install-dist_symbolsDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -355,17 +337,21 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+uninstall-am: uninstall-dist_symbolsDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_symbolsDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ install-dist_symbolsDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_symbolsDATA uninstall-info-am
+ uninstall-dist_symbolsDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/symbols/symbols.dir b/xorg-server/xkbdata.src/symbols/symbols.dir
index 917a260a8..e68960ad3 100644
--- a/xorg-server/xkbdata.src/symbols/symbols.dir
+++ b/xorg-server/xkbdata.src/symbols/symbols.dir
@@ -1,114 +1,203 @@
--dp----- a------- mn(basic)
---p----- a------- mn(olpc)
---p----- -m------ compose(ralt)
---p----- -m------ compose(lwin)
---p----- -m------ compose(rwin)
---p----- -m------ compose(menu)
---p----- -m------ compose(rctrl)
---p----- -m------ compose(caps)
---p----- -m------ compose(102)
--d------ -------- de(basic)
---p----- a------- de(nodeadkeys)
---p----- a------- de(deadgraveacute)
---p----- a------- de(deadacute)
---p----- a------- de(ro)
---p----- a------- de(ro_nodeadkeys)
---p----- a------- de(dvorak)
---p----- a------- de(Sundeadkeys)
---p----- a------- de(sundeadkeys)
---p----- a------- de(neo)
---p----- a------- de(mac)
---p----- a------- de(mac_nodeadkeys)
---p----- -------- nbsp1(none)
---p----- -------- nbsp1(level2)
---p----- -------- nbsp1(level3)
---p----- -------- nbsp1(level3s)
---p----- -------- nbsp1(level3n)
---p----- -------- nbsp1(level4)
---p----- -------- nbsp1(level4n)
---p----- -------- nbsp1(level4nl)
--dp----- a------- il(basic)
---p----- a------- il(lyx)
---p----- a------- il(phonetic)
---p----- a------- il(biblical)
--dp----- a------- ro(basic)
---p----- a------- ro(cedilla)
---p----- a------- ro(std)
---p----- a------- ro(std_cedilla)
---p----- a------- ro(winkeys)
---p----- -------- eurosign(e)
---p----- -------- eurosign(2)
---p----- -------- eurosign(4)
---p----- -------- eurosign(5)
--dp----- a------- me(basic)
---p----- a------- me(cyrillic)
---p----- a------- me(cyrillicyz)
---p----- a------- me(latinunicode)
---p----- a------- me(latinyz)
---p----- a------- me(latinunicodeyz)
--------- -------- me(cyrillicalternatequotes)
--------- -------- me(latinalternatequotes)
--dp----- a------- mm(basic)
--dp----- a------- ma(arabic)
---p----- a------- ma(french)
---p----- a------- ma(tifinagh)
---p----- a------- ma(tifinagh-phonetic)
---p----- a------- ma(tifinagh-extended)
---p----- a------- ma(tifinagh-extended-phonetic)
---p----- a------- ma(tifinagh-alt)
---p----- a------- ma(tifinagh-alt-phonetic)
--dp----- a------- fi(kotoistus)
---p----- a------- fi(classic)
-h-p----- a------- fi(fi)
---p----- a------- fi(nodeadkeys)
--------- -------- fi(smi)
---p----- a------- fi(mac)
--dp----- a------- bt(basic)
--dp----- a------- ie(basic)
---p----- a------- ie(CloGaelach)
---p----- a------- ie(UnicodeExpert)
---p----- a------- ie(ogam)
---p----- a------- ie(ogam_is434)
--dp----- a------- be(basic)
---p----- a------- be(iso-alternate)
---p----- a------- be(sundeadkeys)
---p----- a------- be(Sundeadkeys)
---p----- a------- be(nodeadkeys)
---p----- a------- be(wang)
---p----- --kf---- srvr_ctrl(xfree86)
---p----- --k----- srvr_ctrl(stdkeypad)
---p----- ---f---- srvr_ctrl(fkey2vt)
---p----- --kf---- srvr_ctrl(no_srvr_keys)
--dp----- a------- ba(basic)
---p----- a------- ba(us)
---p----- a------- ba(alternatequotes)
---p----- a------- ba(unicode)
---p----- a------- ba(unicodeus)
+-dp----- a------- am(basic)
+--p----- a------- am(olpc)
+-------- -------- am(phonetic)
+--p----- a------- am(phonetic-alt)
+--p----- a------- am(eastern)
+--p----- a------- am(western)
+--p----- a------- am(eastern-alt)
+-dp----- -m------ terminate(ctrl_alt_bksp)
+-dp----- a------- fr(basic)
+--p----- a------- fr(Sundeadkeys)
+--p----- a------- fr(sundeadkeys)
+--p----- a------- fr(nodeadkeys)
+--p----- a------- fr(oss)
+--p----- a------- fr(oss_latin9)
+--p----- a------- fr(oss_Sundeadkeys)
+--p----- a------- fr(oss_sundeadkeys)
+--p----- a------- fr(oss_nodeadkeys)
+--p----- a------- fr(latin9)
+--p----- a------- fr(latin9_Sundeadkeys)
+--p----- a------- fr(latin9_sundeadkeys)
+--p----- a------- fr(latin9_nodeadkeys)
+--p----- a------- fr(bepo)
+--p----- a------- fr(bepo_latin9)
+--p----- am------ fr(dvorak)
+--p----- a------- fr(bre)
+--p----- a------- fr(oci)
+--p----- a------- fr(mac)
+--p----- a------- fr(geo)
-dp----- a------- ng(basic)
--p----- a------- ng(yoruba)
--p----- a------- ng(igbo)
--p----- a------- ng(hausa)
--p----- a------- ng(olpc)
+-dp----- a------- np(basic)
+--p----- a------- np(olpc)
+-dp----- a------- nl(basic)
+--p----- a------- nl(std)
+--p----- a------- nl(Sundeadkeys)
+--p----- a------- nl(sundeadkeys)
+--p----- a------- nl(mac)
+-dp----- a------- ad(basic)
+-dp----- a------- ua(unicode)
+--p----- a------- ua(legacy)
+--p----- a------- ua(winkeys)
+--p----- a------- ua(typewriter)
+--p----- a------- ua(phonetic)
+--p----- a------- ua(rstu)
+--p----- a------- ua(rstu_ru)
+--p----- a------- ua(homophonic)
+--p----- -------- ua(crh)
+--p----- -------- ua(crh_f)
+--p----- -------- ua(crh_alt)
+-dp----- a------- rs(basic)
+--p----- a------- rs(latin)
+--p----- a------- rs(yz)
+h-p----- a------- rs(common)
+h-p----- a------- rs(cyralpha)
+h-p----- a------- rs(latalpha)
+h-p----- a------- rs(twoletter)
+h-p----- a------- rs(latlevel3)
+h-p----- a------- rs(cyrlevel3)
+--p----- a------- rs(latinunicode)
+--p----- a------- rs(latinyz)
+--p----- a------- rs(latinunicodeyz)
+-------- -------- rs(alternatequotes)
+-------- -------- rs(latinalternatequotes)
+-dp----- a------- cd(basic)
+-dp----- a------- epo(basic)
+--p----- a------- epo(legacy)
+--p----- -------- epo(qwerty)
+--p----- -------- epo(dvorak)
+-dp----- a------- tj(basic)
+-------- -------- tj(legacy)
-dp----- a------- af(basic)
--p----- a------- af(ps)
--p----- a------- af(uz)
--p----- a------- af(olpc-ps)
--p----- a------- af(olpc-fa)
--p----- a------- af(olpc-uz)
--dp----- a------- dk(basic)
---p----- a------- dk(nodeadkeys)
---p----- a------- dk(mac)
---p----- a------- dk(mac_nodeadkeys)
---p----- a------- dk(dvorak)
+-dp----- a------- ch(basic)
+--p----- a------- ch(de)
+--p----- a------- ch(de_Sundeadkeys)
+--p----- a------- ch(de_sundeadkeys)
+--p----- a------- ch(de_nodeadkeys)
+--p----- a------- ch(fr)
+--p----- a------- ch(fr_Sundeadkeys)
+--p----- a------- ch(fr_sundeadkeys)
+--p----- a------- ch(fr_nodeadkeys)
+--p----- a------- ch(de_mac)
+--p----- a------- ch(fr_mac)
+-dp----- am------ pc(pc105)
+h-p----- a------- pc(function)
+h-p----- a------- pc(editing)
+-dp----- a------- pl(basic)
+--p----- a------- pl(qwertz)
+--p----- a------- pl(dvorak)
+--p----- a------- pl(dvorak_quotes)
+--p----- a------- pl(dvorak_altquotes)
+--p----- a------- pl(csb)
+--p----- a------- pl(ru_phonetic_dvorak)
+-dp----- a------- th(basic)
+--p----- a------- th(pat)
+--p----- a------- th(tis)
+--p----- a------- th(olpc)
+-dp----- a------- no(basic)
+--p----- a------- no(nodeadkeys)
+--p----- a------- no(dvorak)
+--p----- a------- no(smi)
+--p----- a------- no(smi_nodeadkeys)
+--p----- a------- no(mac)
+--p----- a------- no(mac_nodeadkeys)
+-dp----- a------- iq(basic)
+--p----- a------- iq(ku)
+--p----- a------- iq(ku_f)
+--p----- a------- iq(ku_alt)
+--p----- a------- iq(ku_ara)
+-dp----- am------ lt(basic)
+--p----- am------ lt(us)
+--p----- am------ lt(std)
+--p----- am------ lt(ibm)
+--p----- am------ lt(lekp)
+--p----- am------ lt(lekpa)
+--p----- am------ lt(balticplus)
+--p----- --k----- kpdl(dot)
+--p----- --k----- kpdl(comma)
+--p----- --k----- kpdl(dotoss)
+--p----- --k----- kpdl(dotoss_latin9)
+--p----- --k----- kpdl(commaoss)
+--p----- --k----- kpdl(momayyezoss)
+--p----- --k----- kpdl(kposs)
+--p----- --k----- kpdl(semi)
+-dp----- a------- il(basic)
+--p----- a------- il(lyx)
+--p----- a------- il(phonetic)
+--p----- a------- il(biblical)
+-dp----- a------- sn(basic)
+-dp----- a------- in(deva)
+--p----- a------- in(bolnagri)
+--p----- a------- in(ben)
+-------- -------- in(ben_probhat)
+--p----- a------- in(guj)
+--p----- a------- in(kan)
+--p----- a------- in(mal)
+--p----- a------- in(mal_lalitha)
+--p----- a------- in(ori)
+--p----- a------- in(tam)
+--p----- a------- in(tam_unicode)
+--p----- a------- in(tam_TSCII)
+--p----- a------- in(tam_TAB)
+--p----- a------- in(tel)
+--p----- a------- in(urd-phonetic)
+--p----- a------- in(urd-phonetic3)
+--p----- a------- in(urd-winkeys)
+--p----- a------- in(guru)
+--p----- a------- in(jhelum)
+--p----- a------- in(olpc)
+--p----- a------- in(hin-wx)
-dp----- a------- fo(basic)
--p----- a------- fo(nodeadkeys)
--dp----- a---g--- gr(basic)
---p----- a---g--- gr(simple)
-h-p----- a---g--- gr(bare)
---p----- a---g--- gr(extended)
---p----- a---g--- gr(polytonic)
---p----- a---g--- gr(nodeadkeys)
--------- -------- sony_vndr/us(nwp5461)
+-dp----- a------- hr(basic)
+--p----- a------- hr(us)
+--p----- a------- hr(alternatequotes)
+--p----- a------- hr(unicode)
+--p----- a------- hr(unicodeus)
+-dp----- a------- by(basic)
+--p----- a------- by(winkeys)
+--p----- a------- by(latin)
+-dp----- -------- tr(basic)
+--p----- -------- tr(f)
+--p----- -------- tr(alt)
+--p----- a------- tr(Sundeadkeys)
+--p----- a------- tr(sundeadkeys)
+--p----- -------- tr(ku)
+--p----- -------- tr(ku_f)
+--p----- -------- tr(ku_alt)
+--p----- -------- tr(intl)
+--p----- a------- tr(olpc)
+--p----- -------- tr(crh)
+--p----- -------- tr(crh_f)
+--p----- -------- tr(crh_alt)
+-dp----- a------- gn(basic)
+-dp----- a------- es(basic)
+--p----- a------- es(Sundeadkeys)
+--p----- a------- es(sundeadkeys)
+--p----- a------- es(nodeadkeys)
+--p----- a------- es(dvorak)
+--p----- a------- es(cat)
+--p----- a------- es(ast)
+--p----- a------- es(mac)
+--p----- a------- es(olpc)
+--p----- a------- es(deadtilde)
+-dp----- a------- cz(basic)
+-------- -------- cz(bksl)
+--p----- a------- cz(qwerty)
+-------- -------- cz(qwerty_bksl)
+--p----- a---g--- cz(ucw)
+-dp----- a------- bd(basic)
+-------- -------- bd(probhat)
+-dp----- a------- kh(basic)
+--p----- a------- kh(olpc)
-dp----- -------- hu(basic)
--p----- -------- hu(standard)
--p----- -------- hu(nodeadkeys)
@@ -137,23 +226,51 @@ h-p----- --k----- hu(def_dot)
h-p----- a------- hu(def_dead)
h-p----- a------- hu(def_nodead)
h-p----- a------- hu(def_common)
--------- -------- sun_vndr/de(type4)
--------- -------- sun_vndr/fi(basic)
--------- -------- sun_vndr/ko(type4)
--------- -------- sun_vndr/ko(type5)
---p----- -------- sun_vndr/ko(type6)
--------- -------- sun_vndr/tw(type4)
--------- -------- sun_vndr/tw(type5)
---p----- -------- sun_vndr/tw(type6)
--------- -------- sun_vndr/dk(type4)
--------- -------- sun_vndr/dk(type5)
--------- -------- sun_vndr/gr(type5)
--dp----- a------- sun_vndr/hu(type5)
--------- -------- sun_vndr/cz(type5)
--dp----- -------- sun_vndr/solaris(defaults)
---p----- -------- sun_vndr/solaris(keynames)
---p----- -------- sun_vndr/solaris(xf86keynames)
+-dp----- a------- ir(basic)
+h-p----- a------- ir(part_pro)
+h-p----- a------- ir(part_keypad)
+--p----- a------- ir(pro)
+--p----- a------- ir(keypad)
+--p----- a------- ir(pro_keypad)
+--p----- a------- ir(ku)
+--p----- a------- ir(ku_f)
+--p----- a------- ir(ku_alt)
+--p----- a------- ir(ku_ara)
+-dp----- a------- mt(basic)
+--p----- a------- mt(us)
+-------- -------- sgi_vndr/jp(jp106)
+-------- -------- sgi_vndr/jp(alternate106)
+-dp----- a------- pk(urd-phonetic)
+--p----- a------- pk(urd-crulp)
+--p----- a------- pk(urd-nla)
+--p----- a------- pk(ara)
+--p----- a------- pk(olpc)
+-------- -------- sun_vndr/fr(type4)
+-------- -------- sun_vndr/fr(type5)
+-------- -------- sun_vndr/fr(type6)
+-------- -------- sun_vndr/nl(type4)
+-------- -------- sun_vndr/tuv(type4basic)
+-------- -------- sun_vndr/tuv(type4)
+-------- -------- sun_vndr/tuv(type5basic)
+-------- -------- sun_vndr/tuv(type5)
+-------- -------- sun_vndr/pl(type5)
+-------- -------- sun_vndr/no(type4)
+-------- -------- sun_vndr/no(type5)
+-------- -------- sun_vndr/usb(sun_usb)
-dp----- a------- sun_vndr/lt(type5)
+-------- -------- sun_vndr/tr(basic)
+-------- -------- sun_vndr/tr(type6Q)
+-------- -------- sun_vndr/tr(type6F)
+--p----- -------- sun_vndr/es(type4)
+--p----- -------- sun_vndr/es(type5)
+--p----- -------- sun_vndr/es(type6)
+-------- -------- sun_vndr/cz(type5)
+-dp----- a------- sun_vndr/hu(type5)
+-------- -------- sun_vndr/sw(type4de)
+-------- -------- sun_vndr/sw(type4fr)
+-------- -------- sun_vndr/sw(type5fr)
+-------- -------- sun_vndr/sw(type5de)
+-------- -------- sun_vndr/gr(type5)
-------- -------- sun_vndr/jp(basic)
-------- -------- sun_vndr/jp(type4)
-------- -------- sun_vndr/jp(type5)
@@ -163,30 +280,18 @@ h-p----- a------- hu(def_common)
-------- -------- sun_vndr/jp(J3100)
-------- -------- sun_vndr/jp(Muhenkan_x86)
--p----- -------- sun_vndr/jp(type7)
--------- -------- sun_vndr/no(type4)
--------- -------- sun_vndr/no(type5)
--dp----- a------- sun_vndr/lv(type5)
--------- -------- sun_vndr/pl(type5)
-------- -------- sun_vndr/gb(type4)
--p----- -------- sun_vndr/gb(type5)
--p----- -------- sun_vndr/gb(type6)
--------- -------- sun_vndr/tr(basic)
--------- -------- sun_vndr/tr(type6Q)
--------- -------- sun_vndr/tr(type6F)
--------- -------- sun_vndr/pt(type4)
--------- -------- sun_vndr/pt(type5)
---p----- -------- sun_vndr/pt(type6)
--------- -------- sun_vndr/sw(type4de)
--------- -------- sun_vndr/sw(type4fr)
--------- -------- sun_vndr/sw(type5fr)
--------- -------- sun_vndr/sw(type5de)
--------- -------- sun_vndr/fr(type4)
--------- -------- sun_vndr/fr(type5)
--------- -------- sun_vndr/fr(type6)
--------- -------- sun_vndr/nl(type4)
-------- -------- sun_vndr/se(type4)
-------- -------- sun_vndr/se(type5)
--p----- -------- sun_vndr/se(type6)
+-------- -------- sun_vndr/dk(type4)
+-------- -------- sun_vndr/dk(type5)
+-------- -------- sun_vndr/pt(type4)
+-------- -------- sun_vndr/pt(type5)
+--p----- -------- sun_vndr/pt(type6)
+-------- -------- sun_vndr/cs(type5)
h------- -------- sun_vndr/us(sunbasic)
h------- -------- sun_vndr/us(left_funkeys)
h------- -------- sun_vndr/us(volumekeys)
@@ -202,31 +307,49 @@ h------- -------- sun_vndr/us(volumekeys)
-------- -------- sun_vndr/us(pc104)
-------- -------- sun_vndr/us(pc101currency)
-------- -------- sun_vndr/us(US101A_Sun)
---p----- -------- sun_vndr/es(type4)
---p----- -------- sun_vndr/es(type5)
---p----- -------- sun_vndr/es(type6)
+-------- -------- sun_vndr/de(type4)
+-dp----- -------- sun_vndr/solaris(defaults)
+--p----- -------- sun_vndr/solaris(keynames)
+--p----- -------- sun_vndr/solaris(xf86keynames)
-------- -------- sun_vndr/it(type4)
-------- -------- sun_vndr/it(type5)
--p----- -------- sun_vndr/it(type6)
--------- -------- sun_vndr/tuv(type4basic)
--------- -------- sun_vndr/tuv(type4)
--------- -------- sun_vndr/tuv(type5basic)
--------- -------- sun_vndr/tuv(type5)
--------- -------- sun_vndr/cs(type5)
--------- -------- sun_vndr/usb(sun_usb)
+-------- -------- sun_vndr/tw(type4)
+-------- -------- sun_vndr/tw(type5)
+--p----- -------- sun_vndr/tw(type6)
-------- -------- sun_vndr/ru(basic)
--p----- -------- sun_vndr/ru(type6)
--dp----- a------- az(latin)
---p----- a------- az(cyrillic)
--dp----- a------- ge(basic)
---p----- a------- ge(qwerty)
---p----- a------- ge(ergonomic)
---p----- a------- ge(mess)
---p----- a------- ge(ru)
---p----- a------- ge(os)
--------- -------- hp_vndr/us(hil)
--dp----- a------- et(basic)
---p----- a------- et(olpc)
+-dp----- a------- sun_vndr/lv(type5)
+-------- -------- sun_vndr/ko(type4)
+-------- -------- sun_vndr/ko(type5)
+--p----- -------- sun_vndr/ko(type6)
+-------- -------- sun_vndr/fi(basic)
+-dp----- a------- ro(basic)
+--p----- a------- ro(cedilla)
+--p----- a------- ro(std)
+--p----- a------- ro(std_cedilla)
+--p----- a------- ro(winkeys)
+--p----- -------- ro(crh_f)
+--p----- -------- ro(crh_alt)
+--p----- -------- ro(crh_dobruca1)
+--p----- -------- ro(crh_dobruca2)
+-dp----- a------- mm(basic)
+-dp----- a------- ee(basic)
+--p----- a------- ee(nodeadkeys)
+--p----- a------- ee(dvorak)
+--p----- a------- ee(us)
+hdp----- -m------ capslock(capslock)
+h-p----- -m------ capslock(shiftlock)
+h-p----- -m------ capslock(grouplock)
+h-p----- -m------ capslock(swapescape)
+h-p----- -m------ capslock(groupshift)
+h-p----- -m------ capslock(escape)
+h-p----- -m------ capslock(backspace)
+-dp----- a------- is(basic)
+--p----- a------- is(Sundeadkeys)
+--p----- a------- is(nodeadkeys)
+--p----- a------- is(mac)
+--p----- a------- is(dvorak)
-d------ -------- br(abnt2)
--p----- a------- br(nodeadkeys)
--p----- a------- br(thinkpad)
@@ -235,78 +358,69 @@ h------- -------- sun_vndr/us(volumekeys)
--p----- a------- br(nativo)
--p----- a------- br(nativo-us)
--p----- a------- br(nativo-epo)
--dp----- a------- kz(basic)
---p----- a------- kz(ruskaz)
---p----- a------- kz(kazrus)
---p----- a------- kz(olpc)
---p----- --k----- kpdl(dot)
---p----- --k----- kpdl(comma)
---p----- --k----- kpdl(dotoss)
---p----- --k----- kpdl(dotoss_latin9)
---p----- --k----- kpdl(commaoss)
---p----- --k----- kpdl(momayyezoss)
---p----- --k----- kpdl(kposs)
--dp----- a------- kh(basic)
---p----- a------- kh(olpc)
--dp----- a------- cn(basic)
---p----- a------- cn(tib)
---p----- a------- cn(tib_asciinum)
---p----- -m------ altwin(meta_alt)
---p----- -m------ altwin(ctrl_win)
---p----- -m------ altwin(meta_win)
---p----- -m------ altwin(left_meta_win)
---p----- -m------ altwin(super_win)
---p----- -m------ altwin(hyper_win)
---p----- -m------ altwin(menu)
---p----- -m------ altwin(alt_super_win)
---p----- -m------ altwin(swap_lalt_lwin)
---p----- -m------ ctrl(nocaps)
---p----- -m------ ctrl(swapcaps)
---p----- -m------ ctrl(ctrl_ac)
---p----- -m------ ctrl(ctrl_aa)
---p----- -m------ ctrl(ctrl_ra)
--dp----- a------- lk(sin_phonetic)
---p----- a------- lk(tam_unicode)
---p----- a------- lk(tam_TAB)
--dp----- a------- cz(basic)
--------- -------- cz(bksl)
---p----- a------- cz(qwerty)
--------- -------- cz(qwerty_bksl)
---p----- a---g--- cz(ucw)
--dp----- a------- bg(bds)
---p----- a------- bg(phonetic)
--dp----- a------- sk(basic)
--------- -------- sk(bksl)
---p----- a------- sk(qwerty)
--------- -------- sk(qwerty_bksl)
--dp----- am------ lt(basic)
---p----- am------ lt(us)
---p----- am------ lt(std)
---p----- am------ lt(ibm)
---p----- am------ lt(lekp)
---p----- am------ lt(lekpa)
---p----- am------ lt(balticplus)
--------- -------- fujitsu_vndr/jp
--------- -------- fujitsu_vndr/us
--dp----- a------- gn(basic)
--dp----- a------- rs(basic)
---p----- a------- rs(latin)
---p----- a------- rs(yz)
-h-p----- a------- rs(common)
-h-p----- a------- rs(cyralpha)
-h-p----- a------- rs(latalpha)
-h-p----- a------- rs(twoletter)
-h-p----- a------- rs(level3)
---p----- a------- rs(latinunicode)
---p----- a------- rs(latinyz)
---p----- a------- rs(latinunicodeyz)
--------- -------- rs(alternatequotes)
--------- -------- rs(latinalternatequotes)
+-dp----- -------- latin(basic)
+--p----- -------- latin(type2)
+--p----- -------- latin(type3)
+--p----- -------- latin(type4)
+--p----- -------- latin(nodeadkeys)
+--p----- -------- latin(type2_nodeadkeys)
+--p----- -------- latin(type3_nodeadkeys)
+--p----- -------- latin(type4_nodeadkeys)
+-dp----- a------- mao(basic)
+-dp----- a---g--- gr(basic)
+--p----- a---g--- gr(simple)
+h-p----- a---g--- gr(bare)
+--p----- a---g--- gr(extended)
+--p----- a---g--- gr(polytonic)
+--p----- a---g--- gr(nodeadkeys)
-dp----- a------- jp(106)
h-p----- a------- jp(common)
--p----- a------- jp(OADG109A)
--p----- a------- jp(kana)
--p----- a------- jp(nicola_f_bs)
+-d------ a------- kr(kr106)
+-------- a------- kr(kr104)
+h-p----- ---f---- kr(koreankeys)
+h-p----- ---f---- kr(koreankeys_raltctl)
+-dp----- a------- ara(basic)
+--p----- a------- ara(qwerty)
+--p----- a------- ara(azerty)
+--p----- a------- ara(digits)
+--p----- a------- ara(qwerty_digits)
+--p----- a------- ara(azerty_digits)
+--p----- a------- ara(buckwalter)
+--p----- a------- ara(olpc)
+-d------ -------- xfree68_vndr/ataritt(us)
+-------- -------- xfree68_vndr/ataritt(de)
+-d------ -------- xfree68_vndr/amiga(usa1)
+-dp----- a------- gb(basic)
+--p----- a------- gb(intl)
+--p----- a------- gb(extd)
+--p----- a------- gb(colemak)
+--p----- a------- gb(dvorak)
+--p----- a------- gb(dvorakukp)
+--p----- a------- gb(mac)
+--p----- -------- eurosign(e)
+--p----- -------- eurosign(2)
+--p----- -------- eurosign(4)
+--p----- -------- eurosign(5)
+-dp----- -------- typo(base)
+-dp----- -m------ level3(ralt_switch)
+--p----- -m------ level3(ralt_alt)
+--p----- -m------ level3(ralt_switch_multikey)
+h-p----- -m------ level3(ralt_switch_for_alts_toggle)
+--p----- -m------ level3(alt_switch)
+--p----- -m------ level3(lalt_switch)
+--p----- -m------ level3(switch)
+--p----- -m------ level3(menu_switch)
+--p----- -m------ level3(win_switch)
+--p----- -m------ level3(lwin_switch)
+--p----- -m------ level3(rwin_switch)
+--p----- -m------ level3(enter_switch)
+--p----- --kf---- srvr_ctrl(xfree86)
+--p----- --k----- srvr_ctrl(stdkeypad)
+--p----- ---f---- srvr_ctrl(fkey2vt)
+--p----- --kf---- srvr_ctrl(no_srvr_keys)
h-p----- --k----- keypad(overlay)
h-p----- --k----- keypad(overlay1)
h-p----- --k----- keypad(overlay2)
@@ -327,162 +441,76 @@ hdp----- --k----- keypad(x11)
--p----- --k----- keypad(legacynumber_wang)
--p----- --k----- keypad(ossnumber)
--p----- --k----- keypad(ossnumber_wang)
---p----- --k----- keypad(phone_hex)
--dp----- a------- hr(basic)
---p----- a------- hr(us)
---p----- a------- hr(alternatequotes)
---p----- a------- hr(unicode)
---p----- a------- hr(unicodeus)
--dp----- a------- latam(basic)
---p----- a------- latam(Sundeadkeys)
---p----- a------- latam(sundeadkeys)
---p----- a------- latam(nodeadkeys)
--dp----- a------- sy(basic)
---p----- a------- sy(syc)
---p----- a------- sy(syc_phonetic)
---p----- a------- sy(ku)
---p----- a------- sy(ku_f)
---p----- a------- sy(ku_alt)
--dp----- a------- am(basic)
---p----- a------- am(olpc)
--------- -------- am(phonetic)
---p----- a------- am(phonetic-alt)
---p----- a------- am(eastern)
---p----- a------- am(western)
---p----- a------- am(eastern-alt)
---p----- -m------ level5(rctrl_switch)
--d------ a------- kr(kr106)
--------- a------- kr(kr104)
-h-p----- ---f---- kr(koreankeys)
-h-p----- ---f---- kr(koreankeys_raltctl)
--d------ -------- xfree68_vndr/amiga(usa1)
--d------ -------- xfree68_vndr/ataritt(us)
--------- -------- xfree68_vndr/ataritt(de)
--dp----- a------- no(basic)
---p----- a------- no(nodeadkeys)
---p----- a------- no(dvorak)
---p----- a------- no(smi)
---p----- a------- no(smi_nodeadkeys)
---p----- a------- no(mac)
---p----- a------- no(mac_nodeadkeys)
--dp----- a------- mv(basic)
--dp----- -------- latin(basic)
---p----- -------- latin(type2)
---p----- -------- latin(type3)
---p----- -------- latin(type4)
---p----- -------- latin(nodeadkeys)
---p----- -------- latin(type2_nodeadkeys)
---p----- -------- latin(type3_nodeadkeys)
---p----- -------- latin(type4_nodeadkeys)
--dp----- a------- ua(basic)
---p----- a------- ua(winkeys)
---p----- a------- ua(unicode)
---p----- a------- ua(typewriter)
---p----- a------- ua(phonetic)
---p----- a------- ua(rstu)
---p----- a------- ua(rstu_ru)
---p----- a------- ua(homophonic)
--dp----- a------- al(basic)
--dp----- a------- iq(basic)
---p----- a------- iq(ku)
---p----- a------- iq(ku_f)
---p----- a------- iq(ku_alt)
---p----- a------- iq(ku_ara)
--dp----- am------ pc(pc105)
-h-p----- a------- pc(function)
-h-p----- a------- pc(editing)
--dp----- am------ lv(basic)
---p----- am------ lv(apostrophe)
---p----- am------ lv(tilde)
---p----- am------ lv(fkey)
--dp----- a------- si(basic)
---p----- a------- si(us)
---p----- a------- si(alternatequotes)
---p----- a------- si(unicode)
---p----- a------- si(unicodeus)
--dp----- a------- by(basic)
---p----- a------- by(winkeys)
---p----- a------- by(latin)
--dp----- -m------ level3(ralt_switch)
---p----- -m------ level3(ralt_alt)
---p----- -m------ level3(ralt_switch_multikey)
-h-p----- -m------ level3(ralt_switch_for_alts_toggle)
---p----- -m------ level3(alt_switch)
---p----- -m------ level3(lalt_switch)
---p----- -m------ level3(switch)
---p----- -m------ level3(menu_switch)
---p----- -m------ level3(win_switch)
---p----- -m------ level3(lwin_switch)
---p----- -m------ level3(rwin_switch)
-h-p----- -m------ level3(enter_switch)
+--p----- --k----- keypad(ops)
+--p----- --k----- keypad(hex)
+--p----- --k----- keypad(atm)
+-dp----- a------- se(basic)
+--p----- a------- se(se)
+--p----- a------- se(nodeadkeys)
+--p----- a------- se(dvorak)
+--p----- a------- se(rus)
+--p----- a------- se(rus_nodeadkeys)
+-------- -------- se(smi)
+--p----- a------- se(mac)
+--p----- a------- se(svdvorak)
+-dp----- a------- dk(basic)
+--p----- a------- dk(nodeadkeys)
+--p----- a------- dk(mac)
+--p----- a------- dk(mac_nodeadkeys)
+--p----- a------- dk(dvorak)
+-dp----- a------- cn(basic)
+--p----- a------- cn(tib)
+--p----- a------- cn(tib_asciinum)
+-dp----- a------- uz(cyrillic)
+--p----- a------- uz(latin)
+--p----- -------- uz(crh)
+--p----- -------- uz(crh_f)
+--p----- -------- uz(crh_alt)
+-dp----- a------- sk(basic)
+-------- -------- sk(bksl)
+--p----- a------- sk(qwerty)
+-------- -------- sk(qwerty_bksl)
+-dp----- a------- me(basic)
+--p----- a------- me(cyrillic)
+--p----- a------- me(cyrillicyz)
+--p----- a------- me(latinunicode)
+--p----- a------- me(latinyz)
+--p----- a------- me(latinunicodeyz)
+-------- -------- me(cyrillicalternatequotes)
+-------- -------- me(latinalternatequotes)
+-dp----- a------- mk(basic)
+--p----- a------- mk(nodeadkeys)
+-dp----- a------- mn(basic)
+--p----- a------- mn(olpc)
+--p----- -m------ altwin(meta_alt)
+--p----- -m------ altwin(ctrl_win)
+--p----- -m------ altwin(ctrl_alt_win)
+--p----- -m------ altwin(meta_win)
+--p----- -m------ altwin(left_meta_win)
+--p----- -m------ altwin(hyper_win)
+--p----- -m------ altwin(menu)
+--p----- -m------ altwin(alt_super_win)
+--p----- -m------ altwin(swap_lalt_lwin)
-------- am------ olpc(olpc)
--dp----- a------- pl(basic)
---p----- a------- pl(qwertz)
---p----- a------- pl(dvorak)
---p----- a------- pl(dvorak_quotes)
---p----- a------- pl(dvorak_altquotes)
---p----- a------- pl(csb)
---p----- a------- pl(ru_phonetic_dvorak)
--dp----- a------- gb(basic)
---p----- a------- gb(intl)
---p----- a------- gb(colemak)
---p----- a------- gb(dvorak)
---p----- a------- gb(dvorakukp)
---p----- a------- gb(mac)
--dp----- a------- in(deva)
---p----- a------- in(bolnagri)
---p----- a------- in(ben)
--------- -------- in(ben_probhat)
---p----- a------- in(guj)
---p----- a------- in(kan)
---p----- a------- in(mal)
---p----- a------- in(mal_lalitha)
---p----- a------- in(ori)
---p----- a------- in(tam)
---p----- a------- in(tam_unicode)
---p----- a------- in(tam_TSCII)
---p----- a------- in(tam_TAB)
---p----- a------- in(tel)
---p----- a------- in(urd)
---p----- a------- in(guru)
---p----- a------- in(jhelum)
---p----- a------- in(olpc)
---p----- -m------ shift(breaks_caps)
--dp----- a------- braille(home_row)
---p----- a------- braille(left_hand)
---p----- a------- braille(right_hand)
-h-p----- --k----- braille(keypad)
--dp----- a------- ch(basic)
---p----- a------- ch(de)
---p----- a------- ch(de_Sundeadkeys)
---p----- a------- ch(de_sundeadkeys)
---p----- a------- ch(de_nodeadkeys)
---p----- a------- ch(fr)
---p----- a------- ch(fr_Sundeadkeys)
---p----- a------- ch(fr_sundeadkeys)
---p----- a------- ch(fr_nodeadkeys)
---p----- a------- ch(de_mac)
---p----- a------- ch(fr_mac)
--------- -------- sgi_vndr/jp(jp106)
--------- -------- sgi_vndr/jp(alternate106)
--dp----- a------- macintosh_vndr/de(basic)
---p----- a------- macintosh_vndr/de(Sundeadkeys)
---p----- a------- macintosh_vndr/de(sundeadkeys)
---p----- a------- macintosh_vndr/de(nodeadkeys)
--dp----- a------- macintosh_vndr/fi(basic)
---p----- a------- macintosh_vndr/fi(nodeadkeys)
---p----- a------- macintosh_vndr/dk(basic)
--dp----- a------- macintosh_vndr/dk(full)
---p----- a------- macintosh_vndr/dk(nodeadkeys)
---p----- a------- macintosh_vndr/dk(macbookpro)
--dp----- a------- macintosh_vndr/latam(basic)
--dp----- a------- macintosh_vndr/no(basic)
---p----- a------- macintosh_vndr/no(nodeadkeys)
--dp----- a------- macintosh_vndr/gb(basic)
+-d------ -------- macintosh_vndr/fr(extended)
+-------- -------- macintosh_vndr/fr(nodeadkeys)
+-dp----- a------- macintosh_vndr/nl(basic)
--p----- a------- macintosh_vndr/ch(extended)
--p----- a------- macintosh_vndr/ch(de)
--p----- a------- macintosh_vndr/ch(fr)
--p----- a------- macintosh_vndr/ch(nodeadkeys)
+-dp----- a------- macintosh_vndr/no(basic)
+--p----- a------- macintosh_vndr/no(nodeadkeys)
+-dp----- a------- macintosh_vndr/es(basic)
+-dp----- a------- macintosh_vndr/is(basic)
+--p----- a------- macintosh_vndr/is(nodeadkeys)
+-dp----- a------- macintosh_vndr/gb(basic)
+-dp----- a------- macintosh_vndr/se(basic)
+--p----- a------- macintosh_vndr/se(nodeadkeys)
+--p----- a------- macintosh_vndr/dk(basic)
+-dp----- a------- macintosh_vndr/dk(full)
+--p----- a------- macintosh_vndr/dk(nodeadkeys)
+--p----- a------- macintosh_vndr/dk(macbookpro)
-dp----- -m------ macintosh_vndr/apple(extended)
--p----- -m------ macintosh_vndr/apple(laptop)
--p----- -m------ macintosh_vndr/apple(laptop_bad_switch)
@@ -490,31 +518,17 @@ h-p----- --k----- braille(keypad)
--p----- a------- macintosh_vndr/pt(Sundeadkeys)
--p----- a------- macintosh_vndr/pt(sundeadkeys)
--p----- a------- macintosh_vndr/pt(nodeadkeys)
--d------ -------- macintosh_vndr/fr(extended)
--------- -------- macintosh_vndr/fr(nodeadkeys)
--dp----- a------- macintosh_vndr/nl(basic)
--dp----- a------- macintosh_vndr/se(basic)
---p----- a------- macintosh_vndr/se(nodeadkeys)
-------- -------- macintosh_vndr/us(extended)
h------- -------- macintosh_vndr/us(oldmac)
--dp----- a------- macintosh_vndr/es(basic)
+-dp----- a------- macintosh_vndr/de(basic)
+--p----- a------- macintosh_vndr/de(Sundeadkeys)
+--p----- a------- macintosh_vndr/de(sundeadkeys)
+--p----- a------- macintosh_vndr/de(nodeadkeys)
-------- -------- macintosh_vndr/it(extended)
--dp----- a------- macintosh_vndr/is(basic)
---p----- a------- macintosh_vndr/is(nodeadkeys)
--dp----- a------- bd(basic)
--------- -------- bd(probhat)
--dp----- -------- tr(basic)
---p----- -------- tr(f)
---p----- -------- tr(alt)
---p----- a------- tr(Sundeadkeys)
---p----- a------- tr(sundeadkeys)
---p----- -------- tr(ku)
---p----- -------- tr(ku_f)
---p----- -------- tr(ku_alt)
---p----- -------- tr(intl)
---p----- a------- tr(olpc)
--dp----- a------- tj(basic)
--dp----- a------- mao(basic)
+-dp----- a------- macintosh_vndr/latam(basic)
+-dp----- a------- macintosh_vndr/fi(basic)
+--p----- a------- macintosh_vndr/fi(nodeadkeys)
+--p----- -m------ level5(rctrl_switch)
-dp----- a------- pt(basic)
--p----- a------- pt(Sundeadkeys)
--p----- a------- pt(sundeadkeys)
@@ -525,14 +539,81 @@ h------- -------- macintosh_vndr/us(oldmac)
--p----- a------- pt(nativo)
--p----- a------- pt(nativo-us)
--p----- a------- pt(nativo-epo)
--dp----- a------- ara(basic)
---p----- a------- ara(qwerty)
---p----- a------- ara(azerty)
---p----- a------- ara(digits)
---p----- a------- ara(qwerty_digits)
---p----- a------- ara(azerty_digits)
---p----- a------- ara(buckwalter)
---p----- a------- ara(olpc)
+-dp----- a------- ge(basic)
+--p----- a------- ge(qwerty)
+--p----- a------- ge(ergonomic)
+--p----- a------- ge(mess)
+--p----- a------- ge(ru)
+--p----- a------- ge(os)
+-------- -------- sony_vndr/us(nwp5461)
+-dp----- am------ za(basic)
+-------- -------- hp_vndr/us(hil)
+-dp----- a------- ie(basic)
+--p----- a------- ie(CloGaelach)
+--p----- a------- ie(UnicodeExpert)
+--p----- a------- ie(ogam)
+--p----- a------- ie(ogam_is434)
+--p----- -m------ group(switch)
+--p----- -m------ group(lswitch)
+--p----- -m------ group(win_switch)
+--p----- -m------ group(lwin_switch)
+--p----- -m------ group(rwin_switch)
+--p----- -m------ group(rctrl_switch)
+--p----- -m------ group(toggle)
+--p----- -m------ group(shifts_toggle)
+--p----- -m------ group(ctrl_shift_toggle)
+--p----- -m------ group(lctrl_lshift_toggle)
+--p----- -m------ group(shift_caps_toggle)
+--p----- -m------ group(shift_caps_switch)
+--p----- -m------ group(win_menu_switch)
+--p----- -m------ group(ctrl_alt_toggle)
+--p----- -m------ group(alt_shift_toggle)
+--p----- -m------ group(menu_toggle)
+--p----- -m------ group(lwin_toggle)
+--p----- -m------ group(rwin_toggle)
+--p----- -m------ group(ctrls_toggle)
+--p----- -m------ group(alts_toggle)
+--p----- -m------ group(lshift_toggle)
+--p----- -m------ group(rshift_toggle)
+--p----- -m------ group(lalt_toggle)
+--p----- -m------ group(lctrl_toggle)
+--p----- -m------ group(rctrl_toggle)
+--p----- -m------ group(alt_caps_toggle)
+h-p----- -m------ group(olpc)
+--p----- -m------ group(alt_space_toggle)
+--p----- -m------ group(sclk_toggle)
+-dp----- am------ us(basic)
+--p----- a------- us(euro)
+--p----- a------- us(intl)
+--p----- a------- us(alt-intl)
+--p----- a------- us(dvorak)
+--p----- a------- us(dvorak-intl)
+--p----- a------- us(dvorak-l)
+--p----- a------- us(dvorak-r)
+--p----- a------- us(dvorak-classic)
+--p----- a------- us(dvp)
+--p----- a------- us(rus)
+--p----- a------- us(mac)
+--p----- a------- us(colemak)
+--p----- a------- us(altgr-intl)
+--p----- a------- us(classmate)
+--p----- a------- us(classmate-intl)
+--p----- a------- us(classmate-alt-intl)
+--p----- a------- us(classmate-altgr-intl)
+--p----- a------- us(olpc)
+--p----- a------- us(olpc2)
+--p----- am------ us(chr)
+-dp----- a------- et(basic)
+--p----- a------- et(olpc)
+-d------ -------- nec_vndr/jp(pc98)
+-dp----- a------- ma(arabic)
+--p----- a------- ma(french)
+--p----- a------- ma(tifinagh)
+--p----- a------- ma(tifinagh-phonetic)
+--p----- a------- ma(tifinagh-extended)
+--p----- a------- ma(tifinagh-extended-phonetic)
+--p----- a------- ma(tifinagh-alt)
+--p----- a------- ma(tifinagh-alt-phonetic)
-dp----- -------- ca(fr)
-------- -------- ca(fr-dvorak)
--p----- -------- ca(fr-legacy)
@@ -543,26 +624,59 @@ h------- -------- macintosh_vndr/us(oldmac)
--p----- a------- ca(shs)
-------- -------- ca(olpc)
--p----- a------- ca(kut)
--d------ -------- nec_vndr/jp(pc98)
+--p----- a------- ca(eng)
+--p----- -------- nbsp(none)
+--p----- -------- nbsp(level2)
+--p----- -------- nbsp(level3)
+--p----- -------- nbsp(level3s)
+--p----- -------- nbsp(level3n)
+--p----- -------- nbsp(level4)
+--p----- -------- nbsp(level4n)
+--p----- -------- nbsp(level4nl)
+-dp----- a------- ba(basic)
+--p----- a------- ba(us)
+--p----- a------- ba(alternatequotes)
+--p----- a------- ba(unicode)
+--p----- a------- ba(unicodeus)
+-dp----- a------- vn(basic)
+-d------ -------- de(basic)
+--p----- a------- de(nodeadkeys)
+--p----- a------- de(deadgraveacute)
+--p----- a------- de(deadacute)
+--p----- a------- de(ro)
+--p----- a------- de(ro_nodeadkeys)
+--p----- a------- de(dvorak)
+--p----- a------- de(Sundeadkeys)
+--p----- a------- de(sundeadkeys)
+--p----- amk----- de(neo)
+--p----- a------- de(mac)
+--p----- a------- de(mac_nodeadkeys)
+--p----- a------- de(dsb)
+--p----- a------- de(dsb_qwertz)
+--p----- a------- de(qwerty)
+-dp----- a------- it(basic)
+--p----- a------- it(nodeadkeys)
+--p----- a------- it(mac)
+--p----- a------- it(geo)
+-------- -------- it(olpc)
+-dp----- a------- bg(bds)
+--p----- a------- bg(phonetic)
+--p----- a------- bg(bas_phonetic)
h-p----- a------- inet(media_common)
h-p----- a------- inet(nav_common)
+h-p----- a------- inet(acpi_common)
h-p----- a------- inet(media_nav_common)
+h-p----- a------- inet(media_nav_acpi_common)
+h-p----- a------- inet(nav_acpi_common)
+h-p----- a------- inet(media_acpi_common)
--p----- a------- inet(evdev)
---p----- a------- inet(a4techKB21)
---p----- a------- inet(a4techKBS8)
---p----- a------- inet(a4_rfkb23)
--p----- a------- inet(airkey)
--p----- a------- inet(acer_c300)
--p----- a------- inet(acer_ferrari4k)
--p----- a------- inet(acer_laptop)
---p----- a------- inet(asus_laptop)
--p----- a------- inet(azonaRF2300)
---p----- a------- inet(acpi)
---p----- a------- inet(scorpius)
--p----- a------- inet(brother)
--p----- a------- inet(btc5113rf)
---p----- a------- inet(btc5126t)
---p----- a------- inet(btc6301urf)
--p----- a------- inet(btc9000)
--p----- a------- inet(btc9000a)
-------- -------- inet(btc9001ah)
@@ -572,8 +686,10 @@ h-p----- a------- inet(media_nav_common)
--p----- a------- inet(cherryblueb)
--p----- a------- inet(cherrybluea)
--p----- a------- inet(cherrycyboard)
+--p----- a------- inet(cherrycmexpert)
--p----- a------- inet(chicony)
--p----- a------- inet(chicony0108)
+--p----- a------- inet(chicony0420)
--p----- a------- inet(chicony9885)
--p----- a------- inet(compaqeak8)
--p----- a------- inet(compaqik7)
@@ -584,40 +700,29 @@ h-p----- a------- inet(media_nav_common)
--p----- a------- inet(ipaq)
--p----- a------- inet(dell)
--p----- a------- inet(dellm65)
---p----- a------- inet(geniuskb19e)
--p----- a------- inet(inspiron)
---p----- a------- inet(latitude)
---p----- a------- inet(precision_m)
--p----- a------- inet(dellusbmm)
---p----- a------- inet(dexxa)
--p----- a------- inet(diamond)
---p----- a------- inet(dtk2000)
--p----- a------- inet(ennyah_dkb1008)
---p----- a------- inet(fscaa1667g)
--p----- a------- inet(genius)
---p----- a------- inet(geniuscomfy)
--p----- a------- inet(geniuscomfy2)
--p----- a------- inet(gyration)
--p----- a------- inet(hpi6)
---p----- a------- inet(hp2501)
---p----- a------- inet(hp2505)
---p----- a------- inet(hp5181)
---p----- a------- inet(hp5185)
+--p----- a------- inet(hp250x)
--p----- a------- inet(hpxe3gc)
--p----- a------- inet(hpxe3gf)
--p----- a------- inet(hpxt1000)
--p----- a------- inet(hpzt11xx)
+--p----- a------- inet(hpdv5)
--p----- a------- inet(hpxe4xxx)
--p----- a------- inet(hp500fa)
--p----- a------- inet(hp5xx)
--p----- a------- inet(honeywell_euroboard)
--p----- a------- inet(rapidaccess)
--p----- a------- inet(rapidaccess2)
---p----- a------- inet(rapidaccess2a)
---p----- a------- inet(thinkpad)
--p----- a------- inet(thinkpad60)
--p----- a------- inet(ibm_spacesaver)
---p----- a------- inet(logitech_base)
+h-p----- a------- inet(logitech_base)
h-p----- a------- inet(logitech_set3)
--p----- a------- inet(logiaccess)
--p----- a------- inet(logicda)
@@ -631,12 +736,12 @@ h-p----- a------- inet(logitech_set3)
--p----- a------- inet(logiultraxc)
--p----- a------- inet(logidinovo)
--p----- a------- inet(logidinovoedge)
+--p----- a------- inet(logitech_g15)
--p----- a------- inet(mx1998)
--p----- a------- inet(mx2500)
--p----- a------- inet(mx2750)
--p----- a------- inet(microsoft7000)
--p----- a------- inet(microsoftinet)
---p----- a------- inet(microsoftpro)
--p----- a------- inet(microsoftprousb)
--p----- a------- inet(microsoftprooem)
--p----- a------- inet(microsoftprose)
@@ -658,167 +763,31 @@ h-p----- a------- inet(logitech_set3)
--p----- a------- inet(trust)
--p----- a------- inet(trustda)
--p----- a------- inet(yahoo)
--------- -------- inet(sp_inet)
---p----- -------- inet(apple)
+--p----- a------- inet(apple)
--p----- a------- inet(cymotionlinux)
--p----- a------- inet(silvercrest)
--p----- a------- inet(emachines)
--p----- a------- inet(benqx)
---p----- a------- inet(logitech_g15)
--p----- a------- inet(classmate)
--dp----- a------- ir(basic)
-h-p----- a------- ir(part_pro)
-h-p----- a------- ir(part_keypad)
---p----- a------- ir(pro)
---p----- a------- ir(keypad)
---p----- a------- ir(pro_keypad)
---p----- a------- ir(ku)
---p----- a------- ir(ku_f)
---p----- a------- ir(ku_alt)
---p----- a------- ir(ku_ara)
--dp----- a------- fr(basic)
---p----- a------- fr(Sundeadkeys)
---p----- a------- fr(sundeadkeys)
---p----- a------- fr(nodeadkeys)
---p----- a------- fr(oss)
---p----- a------- fr(oss_latin9)
---p----- a------- fr(oss_Sundeadkeys)
---p----- a------- fr(oss_sundeadkeys)
---p----- a------- fr(oss_nodeadkeys)
---p----- a------- fr(latin9)
---p----- a------- fr(latin9_Sundeadkeys)
---p----- a------- fr(latin9_sundeadkeys)
---p----- a------- fr(latin9_nodeadkeys)
---p----- a------- fr(bepo)
---p----- a------- fr(bepo_latin9)
---p----- am------ fr(dvorak)
---p----- a------- fr(mac)
---p----- a------- fr(geo)
---p----- -------- nbsp(none)
---p----- -------- nbsp(level2)
---p----- -------- nbsp(level3)
---p----- -------- nbsp(level3s)
---p----- -------- nbsp(level3n)
---p----- -------- nbsp(level4)
---p----- -------- nbsp(level4n)
---p----- -------- nbsp(level4nl)
--dp----- a------- nl(basic)
---p----- a------- nl(std)
---p----- a------- nl(Sundeadkeys)
---p----- a------- nl(sundeadkeys)
---p----- a------- nl(mac)
--dp----- a------- cd(basic)
--dp----- a------- se(basic)
---p----- a------- se(se)
---p----- a------- se(nodeadkeys)
---p----- a------- se(dvorak)
---p----- a------- se(rus)
---p----- a------- se(rus_nodeadkeys)
--------- -------- se(smi)
---p----- a------- se(mac)
---p----- a------- se(svdvorak)
--dp----- am------ us(basic)
---p----- a------- us(euro)
---p----- a------- us(intl)
---p----- a------- us(alt-intl)
---p----- a------- us(dvorak)
---p----- a------- us(dvorak-intl)
---p----- a------- us(dvorak-l)
---p----- a------- us(dvorak-r)
---p----- a------- us(dvorak-classic)
---p----- a------- us(dvp)
---p----- a------- us(rus)
---p----- a------- us(mac)
---p----- a------- us(colemak)
---p----- a------- us(altgr-intl)
---p----- a------- us(classmate)
---p----- a------- us(classmate-intl)
---p----- a------- us(classmate-alt-intl)
---p----- a------- us(classmate-altgr-intl)
---p----- a------- us(olpc)
---p----- a------- us(olpc2)
---p----- am------ us(chr)
--dp----- a------- la(basic)
---p----- -m------ group(switch)
---p----- -m------ group(lswitch)
---p----- -m------ group(win_switch)
---p----- -m------ group(lwin_switch)
---p----- -m------ group(rwin_switch)
---p----- -m------ group(rctrl_switch)
---p----- -m------ group(toggle)
---p----- -m------ group(shifts_toggle)
---p----- -m------ group(ctrl_shift_toggle)
---p----- -m------ group(lctrl_lshift_toggle)
---p----- -m------ group(shift_caps_toggle)
---p----- -m------ group(shift_caps_switch)
---p----- -m------ group(ctrl_alt_toggle)
---p----- -m------ group(alt_shift_toggle)
---p----- -m------ group(menu_toggle)
---p----- -m------ group(lwin_toggle)
---p----- -m------ group(rwin_toggle)
---p----- -m------ group(ctrls_toggle)
---p----- -m------ group(alts_toggle)
---p----- -m------ group(lshift_toggle)
---p----- -m------ group(rshift_toggle)
---p----- -m------ group(lalt_toggle)
---p----- -m------ group(lctrl_toggle)
---p----- -m------ group(rctrl_toggle)
---p----- -m------ group(alt_caps_toggle)
-h-p----- -m------ group(olpc)
--dp----- am------ za(basic)
--dp----- a------- vn(basic)
--dp----- a------- es(basic)
---p----- a------- es(Sundeadkeys)
---p----- a------- es(sundeadkeys)
---p----- a------- es(nodeadkeys)
---p----- a------- es(dvorak)
---p----- a------- es(cat)
---p----- a------- es(ast)
---p----- a------- es(mac)
---p----- a------- es(olpc)
--dp----- a------- it(basic)
---p----- a------- it(nodeadkeys)
---p----- a------- it(mac)
---p----- a------- it(geo)
--------- -------- it(olpc)
--dp----- a------- th(basic)
---p----- a------- th(pat)
---p----- a------- th(tis)
---p----- a------- th(olpc)
--dp----- a------- pk(urd)
---p----- a------- pk(ara)
---p----- a------- pk(olpc)
--dp----- a------- is(basic)
---p----- a------- is(Sundeadkeys)
---p----- a------- is(nodeadkeys)
---p----- a------- is(mac)
---p----- a------- is(dvorak)
--dp----- a------- np(basic)
---p----- a------- np(olpc)
--dp----- a------- kg(basic)
--dp----- a------- ad(basic)
--dp----- a------- mt(basic)
---p----- a------- mt(us)
--dp----- a------- ru(winkeys)
-h-p----- a------- ru(common)
---p----- a------- ru(legacy)
---p----- a------- ru(olpc)
---p----- a------- ru(typewriter)
---p----- a------- ru(phonetic)
---p----- a------- ru(tt)
---p----- a------- ru(os_legacy)
---p----- a------- ru(os_winkeys)
---p----- a------- ru(cv)
---p----- a------- ru(udm)
---p----- a------- ru(cv_latin)
---p----- a------- ru(kom)
---p----- a------- ru(sah)
--d------ -------- digital_vndr/lk(common)
--------- -------- digital_vndr/lk(lk401)
+--p----- a------- inet(unitekkb1925)
+--p----- a------- inet(compalfl90)
+--p----- a------- inet(pc105)
+-dp----- a------- latam(basic)
+--p----- a------- latam(Sundeadkeys)
+--p----- a------- latam(sundeadkeys)
+--p----- a------- latam(nodeadkeys)
+--p----- a------- latam(deadtilde)
+-dp----- a------- sy(basic)
+--p----- a------- sy(syc)
+--p----- a------- sy(syc_phonetic)
+--p----- a------- sy(ku)
+--p----- a------- sy(ku_f)
+--p----- a------- sy(ku_alt)
+-dp----- a------- lk(sin_phonetic)
+--p----- a------- lk(tam_unicode)
+--p----- a------- lk(tam_TAB)
-------- -------- digital_vndr/pc(pc)
-------- -------- digital_vndr/pc(pc104)
--------- -------- digital_vndr/vt(vt105)
--------- -------- digital_vndr/vt(vt108)
-------- -------- digital_vndr/us(us)
-------- -------- digital_vndr/us(vt105-tw)
-------- -------- digital_vndr/us(vt105-dp)
@@ -834,21 +803,79 @@ h-p----- a------- ru(common)
-------- -------- digital_vndr/us(pcxalka)
-------- -------- digital_vndr/us(lk44x)
-------- -------- digital_vndr/us(pc104)
--dp----- a------- epo(basic)
---p----- a------- epo(legacy)
-hdp----- -m------ capslock(capslock)
-h-p----- -m------ capslock(shiftlock)
-h-p----- -m------ capslock(grouplock)
-h-p----- -m------ capslock(swapescape)
-h-p----- -m------ capslock(groupshift)
--dp----- a------- mk(basic)
---p----- a------- mk(nodeadkeys)
--dp----- a------- uz(cyrillic)
---p----- a------- uz(latin)
--dp----- a------- ee(basic)
---p----- a------- ee(nodeadkeys)
---p----- a------- ee(dvorak)
---p----- a------- ee(us)
+-d------ -------- digital_vndr/lk(common)
+-------- -------- digital_vndr/lk(lk401)
+-------- -------- digital_vndr/vt(vt105)
+-------- -------- digital_vndr/vt(vt108)
+-dp----- a------- be(basic)
+--p----- a------- be(oss)
+--p----- a------- be(oss_frbe)
+--p----- a------- be(oss_latin9)
+--p----- a------- be(oss_Sundeadkeys)
+--p----- a------- be(oss_sundeadkeys)
+--p----- a------- be(iso-alternate)
+--p----- a------- be(sundeadkeys)
+--p----- a------- be(Sundeadkeys)
+--p----- a------- be(nodeadkeys)
+--p----- a------- be(wang)
+-dp----- a------- mv(basic)
+-dp----- a------- ru(winkeys)
+h-p----- a------- ru(common)
+--p----- a------- ru(legacy)
+--p----- a------- ru(olpc)
+--p----- a------- ru(typewriter)
+--p----- a------- ru(phonetic)
+--p----- a------- ru(phonetic_winkeys)
+--p----- a------- ru(tt)
+--p----- a------- ru(os_legacy)
+--p----- a------- ru(os_winkeys)
+--p----- a------- ru(cv)
+--p----- a------- ru(udm)
+--p----- a------- ru(cv_latin)
+--p----- a------- ru(kom)
+--p----- a------- ru(sah)
+--p----- a------- ru(xal)
+--p----- a------- ru(dos)
+-dp----- am------ lv(basic)
+--p----- am------ lv(apostrophe)
+--p----- am------ lv(tilde)
+--p----- am------ lv(fkey)
+-dp----- a------- si(basic)
+--p----- a------- si(us)
+--p----- a------- si(alternatequotes)
+-dp----- a------- bt(basic)
+--p----- -m------ compose(ralt)
+--p----- -m------ compose(lwin)
+--p----- -m------ compose(rwin)
+--p----- -m------ compose(menu)
+--p----- -m------ compose(rctrl)
+--p----- -m------ compose(caps)
+--p----- -m------ compose(102)
+-dp----- a------- az(latin)
+--p----- a------- az(cyrillic)
+--p----- -m------ ctrl(nocaps)
+--p----- -m------ ctrl(swapcaps)
+--p----- -m------ ctrl(ctrl_ac)
+--p----- -m------ ctrl(ctrl_aa)
+--p----- -m------ ctrl(ctrl_ra)
+-dp----- a------- brai(home_row)
+--p----- a------- brai(left_hand)
+--p----- a------- brai(right_hand)
+h-p----- --k----- brai(keypad)
+-dp----- -------- tm(basic)
+--p----- -------- tm(alt)
+-dp----- a------- kz(basic)
+--p----- a------- kz(ruskaz)
+--p----- a------- kz(kazrus)
+--p----- a------- kz(olpc)
+-dp----- a------- la(basic)
+-dp----- a------- fi(kotoistus)
+--p----- a------- fi(classic)
+h-p----- a------- fi(fi)
+--p----- a------- fi(nodeadkeys)
+-------- -------- fi(smi)
+--p----- a------- fi(mac)
+-dp----- a------- al(basic)
-dp----- a------- gh(basic)
--p----- a------- gh(akan)
--p----- a------- gh(ga)
@@ -856,3 +883,8 @@ h-p----- -m------ capslock(groupshift)
--p----- a------- gh(fula)
--p----- a------- gh(hausa)
--p----- a------- gh(generic)
+-------- -------- fujitsu_vndr/jp
+-------- -------- fujitsu_vndr/us
+-dp----- a------- kg(basic)
+--p----- a------- kg(phonetic)
+--p----- -m------ shift(breaks_caps)
diff --git a/xorg-server/xkbdata.src/symbols/terminate b/xorg-server/xkbdata.src/symbols/terminate
new file mode 100644
index 000000000..47e434d7f
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/terminate
@@ -0,0 +1,8 @@
+partial default modifier_keys
+xkb_symbols "ctrl_alt_bksp" {
+ key <BKSP> {
+ type="CTRL+ALT",
+ symbols[Group1] = [ NoSymbol, Terminate_Server ]
+ };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/tj b/xorg-server/xkbdata.src/symbols/tj
index f07b29001..0dcb29d43 100644
--- a/xorg-server/xkbdata.src/symbols/tj
+++ b/xorg-server/xkbdata.src/symbols/tj
@@ -1,78 +1,139 @@
// $XKeyboardConfig$
-// based on
-// Tajik keyboard
-// it is a Russian layout keyboard, with SHCHA replaced with
-// dead_cedilla/dead_macron
-// that allows to type the SHCHA with dead_cedilla + SHA
-// and all the extra Tajik keys:
-// dead_cedilla + KA, HA --> KA descender, HA descender
-// dead_macron + I, U, GHE --> I macron, U macron, GHE horizontal stroke
-// it requires proper dead_cedilla and dead_macron entries in Compose file
-// it also allows to use Mode_switch when in cyrillic mode to enter
-// special letters by doing Mode_switch + base letter
+// 17/07/2008
+// -------------------------------------------------------------
+// Standard Tojiki Keyboard Layout, Official Standard
+// -------------------------------------------------------------
+// Created by Victor Ibragimov <victor.ibragimov@gmail.com>
+// Tajik Fedora & Software Localization Team
+// -------------------------------------------------------------
+// DUAL INPUT METHOD
+// --------------------------------------------------------------------
+// -------------- Tajiki Official Keyboard Layout----------------------
+// --------------------------------------------------------------------
//
-// AEN <aen@logic.ru> (for the Russian layout)
-// Pablo Saratxaga <pablo@mandrakesoft> (for the dead keys changes)
-//
-// 2008-06-22
-// Changed so that RightAlt allows to type the extra Tajik keys and that
-// SHCHA is back to normal again
+partial default alphanumeric_keys
+xkb_symbols "basic"
+{
+ name[Group1] = "Tajikistan";
+
+ include "kpdl(comma)"
+ include "level3(ralt_switch)"
-partial default alphanumeric_keys
-xkb_symbols "basic" {
+ key <AB01> { [ Cyrillic_ya, Cyrillic_YA ] }; // я Я
+ key <AB02> { [ Cyrillic_che, Cyrillic_CHE ] }; // ч Ч
+ key <AB03> { [ Cyrillic_es, Cyrillic_ES ] }; // с С
+ key <AB04> { [ Cyrillic_em, Cyrillic_EM ] }; // м М
+ key <AB05> { [ Cyrillic_i, Cyrillic_I ] }; // и И
+ key <AB06> { [ Cyrillic_te, Cyrillic_TE ] }; // т Т
+ key <AB07> { [ 0x10004e3, 0x10004e2 ] }; // ӣ Ӣ
+ key <AB08> { [ Cyrillic_be, Cyrillic_BE ] }; // б Б
+ key <AB09> { [ Cyrillic_yu, Cyrillic_YU ] }; // ю Ю
+ key <AB10> { [ period, comma ] }; // . ,
+ key <AC01> { [ Cyrillic_ef, Cyrillic_EF ] }; // ф Ф
+ key <AC02> { [ 0x10004b7, 0x10004b6 ] }; // ҷ Ҷ
+ key <AC03> { [ Cyrillic_ve, Cyrillic_VE ] }; // в В
+ key <AC04> { [ Cyrillic_a, Cyrillic_A ] }; // а А
+ key <AC05> { [ Cyrillic_pe, Cyrillic_PE ] }; // п П
+ key <AC06> { [ Cyrillic_er, Cyrillic_ER ] }; // р Р
+ key <AC07> { [ Cyrillic_o, Cyrillic_O ] }; // о О
+ key <AC08> { [ Cyrillic_el, Cyrillic_EL ] }; // л Л
+ key <AC09> { [ Cyrillic_de, Cyrillic_DE ] }; // д Д
+ key <AC10> { [ Cyrillic_zhe, Cyrillic_ZHE ] }; // ж Ж
+ key <AC11> { [ Cyrillic_e, Cyrillic_E ] }; // э Э
+ key <AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; // й Й
+ key <AD02> { [ 0x100049b, 0x100049a ] }; // қ Қ
+ key <AD03> { [ Cyrillic_u, Cyrillic_U ] }; // у У
+ key <AD04> { [ Cyrillic_ka, Cyrillic_KA ] }; // к К
+ key <AD05> { [ Cyrillic_ie, Cyrillic_IE ] }; // е Е
+ key <AD06> { [ Cyrillic_en, Cyrillic_EN ] }; // н Н
+ key <AD07> { [ Cyrillic_ghe, Cyrillic_GHE ] }; // г Г
+ key <AD08> { [ Cyrillic_sha, Cyrillic_SHA ] }; // ш Ш
+ key <AD09> { [ 0x10004b3, 0x10004b2 ] }; // ҳ Ҳ
+ key <AD10> { [ Cyrillic_ze, Cyrillic_ZE ] }; // з З
+ key <AD11> { [ Cyrillic_ha, Cyrillic_HA ] }; // х Х
+ key <AD12> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; // ъ Ъ
+ key <AE01> { [ 1, exclam, 0x10000a7 ] }; // 1 ! §
+ key <AE02> { [ 2, quotedbl, 0x10000ab, 0x10000bb ] }; // 2 " « »
+ key <AE03> { [ 3, numerosign ] }; // 3 №
+ key <AE04> { [ 4, semicolon ] }; // 4 ;
+ key <AE05> { [ 5, percent ] }; // 5 %
+ key <AE06> { [ 6, colon, 0x1002013 ] }; // 6 : –
+ key <AE07> { [ 7, question, ampersand ] }; // 7 ? &
+ key <AE08> { [ 8, asterisk ] }; // 8 *
+ key <AE09> { [ 9, parenleft ] }; // 9 (
+ key <AE10> { [ 0, parenright, 0x10000b0 ] }; // 0 ) °
+ key <AE11> { [ 0x1000493, 0x1000492, minus, underscore ] }; // ғ Ғ - _
+ key <AE12> { [ 0x10004ef, 0x10004ee, equal, plus ] }; // ӯ Ӯ = +
+ key <BKSL> { [ backslash, slash ] }; // \ /
+ key <LSGT> { [ slash, bar ] }; // / |
+ key <TLDE> { [ Cyrillic_io, Cyrillic_IO ] }; // ё Ё
+};
- name[Group1]= "Tajikistan";
+// --------------------------------------------------------------------
+// -------------- Tojiki Rusi Keyboard Layout--------------------------
+// --------------------------------------------------------------------
+// AEN <aen@logic.ru>
+// 2001/12/23 by Leon Kanter <leon@blackcatlinux.com>
+// 2005/12/09 Valery Inozemtsev <shrek@altlinux.ru>
+// Pablo Saratxaga <pablo@mandrakesoft> (for the dead keys changes)
+// --------------------------------------------------------------------
- key <AB01> { [ Cyrillic_ya, Cyrillic_YA ] };
- key <AB02> { [ Cyrillic_che, Cyrillic_CHE, 0x010004b7, 0x010004b6 ] };
- key <AB03> { [ Cyrillic_es, Cyrillic_ES ] };
- key <AB04> { [ Cyrillic_em, Cyrillic_EM ] };
- key <AB05> { [ Cyrillic_i, Cyrillic_I, 0x010004e3, 0x010004e2 ] };
- key <AB06> { [ Cyrillic_te, Cyrillic_TE ] };
- key <AB07> { [Cyrillic_softsign,Cyrillic_SOFTSIGN ] };
- key <AB08> { [ Cyrillic_be, Cyrillic_BE ] };
- key <AB09> { [ Cyrillic_yu, Cyrillic_YU ] };
- key <AB10> { [ slash, question ] };
- key <AC01> { [ Cyrillic_ef, Cyrillic_EF ] };
- key <AC02> { [ Cyrillic_yeru, Cyrillic_YERU ] };
- key <AC03> { [ Cyrillic_ve, Cyrillic_VE ] };
- key <AC04> { [ Cyrillic_a, Cyrillic_A ] };
- key <AC05> { [ Cyrillic_pe, Cyrillic_PE ] };
- key <AC06> { [ Cyrillic_er, Cyrillic_ER ] };
- key <AC07> { [ Cyrillic_o, Cyrillic_O ] };
- key <AC08> { [ Cyrillic_el, Cyrillic_EL ] };
- key <AC09> { [ Cyrillic_de, Cyrillic_DE ] };
- key <AC10> { [ Cyrillic_zhe, Cyrillic_ZHE, 0x01000497, 0x01000496 ] };
- key <AC11> { [ Cyrillic_e, Cyrillic_E ] };
- key <AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI ] };
- key <AD02> { [ Cyrillic_tse, Cyrillic_TSE ] };
- key <AD03> { [ Cyrillic_u, Cyrillic_U, 0x010004ef, 0x010004ee ] };
- key <AD04> { [ Cyrillic_ka, Cyrillic_KA, 0x0100049b, 0x0100049a ] };
- key <AD05> { [ Cyrillic_ie, Cyrillic_IE ] };
- key <AD06> { [ Cyrillic_en, Cyrillic_EN ] };
- key <AD07> { [ Cyrillic_ghe, Cyrillic_GHE, 0x01000493, 0x01000492 ] };
- key <AD08> { [ Cyrillic_sha, Cyrillic_SHA, Cyrillic_shcha, Cyrillic_SHCHA] };
- key <AD09> { [ Cyrillic_shcha, Cyrillic_SHCHA ] };
- key <AD10> { [ Cyrillic_ze, Cyrillic_ZE ] };
- key <AD11> { [ Cyrillic_ha, Cyrillic_HA, 0x010004b3, 0x010004b2 ] };
- key <AD12> { [Cyrillic_hardsign,Cyrillic_HARDSIGN ] };
- key <AE01> { [ 1, exclam ] };
- key <AE02> { [ 2, quotedbl ] };
- key <AE03> { [ 3, apostrophe ] };
- key <AE04> { [ 4, asterisk ] };
- key <AE05> { [ 5, colon ] };
- key <AE06> { [ 6, comma ] };
- key <AE07> { [ 7, period ] };
- key <AE08> { [ 8, semicolon ] };
- key <AE09> { [ 9, parenleft ] };
- key <AE10> { [ 0, parenright ] };
- key <AE11> { [ minus, underscore ] };
- key <AE12> { [ equal, plus ] };
- key <LSGT> { [ bar, brokenbar ] };
- key <TLDE> { [ Cyrillic_io, Cyrillic_IO ] };
+xkb_symbols "legacy"
+{
+ name[Group1] = "Tajikistan - Legacy";
- // End alphanumeric section
+ include "kpdl(comma)"
+ include "level3(ralt_switch)"
+ key <AB01> { [ Cyrillic_ya, Cyrillic_YA ] }; // я Я
+ key <AB02> { [ Cyrillic_che, Cyrillic_CHE, 0x10004b7, 0x10004b6 ] }; // ч Ч ҷ Ҷ
+ key <AB03> { [ Cyrillic_es, Cyrillic_ES ] }; // с С
+ key <AB04> { [ Cyrillic_em, Cyrillic_EM ] }; // м М
+ key <AB05> { [ Cyrillic_i, Cyrillic_I, 0x10004e3, 0x10004e2 ] }; // и И ӣ Ӣ
+ key <AB06> { [ Cyrillic_te, Cyrillic_TE ] }; // т Т
+ key <AB07> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; // ь Ь
+ key <AB08> { [ Cyrillic_be, Cyrillic_BE ] }; // б Б
+ key <AB09> { [ Cyrillic_yu, Cyrillic_YU ] }; // ю Ю
+ key <AB10> { [ period, comma ] }; // . ,
+ key <AC01> { [ Cyrillic_ef, Cyrillic_EF ] }; // ф Ф
+ key <AC02> { [ Cyrillic_yeru, Cyrillic_YERU ] }; // ы Ы
+ key <AC03> { [ Cyrillic_ve, Cyrillic_VE ] }; // в В
+ key <AC04> { [ Cyrillic_a, Cyrillic_A ] }; // а А
+ key <AC05> { [ Cyrillic_pe, Cyrillic_PE ] }; // п П
+ key <AC06> { [ Cyrillic_er, Cyrillic_ER ] }; // р Р
+ key <AC07> { [ Cyrillic_o, Cyrillic_O ] }; // о О
+ key <AC08> { [ Cyrillic_el, Cyrillic_EL ] }; // л Л
+ key <AC09> { [ Cyrillic_de, Cyrillic_DE ] }; // д Д
+ key <AC10> { [ Cyrillic_zhe, Cyrillic_ZHE ] }; // ж Ж
+ key <AC11> { [ Cyrillic_e, Cyrillic_E ] }; // э Э
+ key <AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; // й Й
+ key <AD02> { [ Cyrillic_tse, Cyrillic_TSE ] }; // ц Ц
+ key <AD03> { [ Cyrillic_u, Cyrillic_U, 0x10004ef, 0x10004ee ] }; // у У ӯ Ӯ
+ key <AD04> { [ Cyrillic_ka, Cyrillic_KA, 0x100049b, 0x100049a ] }; // к К қ Қ
+ key <AD05> { [ Cyrillic_ie, Cyrillic_IE ] }; // е Е
+ key <AD06> { [ Cyrillic_en, Cyrillic_EN ] }; // н Н
+ key <AD07> { [ Cyrillic_ghe, Cyrillic_GHE, 0x1000493, 0x1000492 ] }; // г Г ғ Ғ
+ key <AD08> { [ Cyrillic_sha, Cyrillic_SHA ] }; // ш Ш
+ key <AD09> { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; // щ Щ
+ key <AD10> { [ Cyrillic_ze, Cyrillic_ZE ] }; // з З
+ key <AD11> { [ Cyrillic_ha, Cyrillic_HA, 0x10004b3, 0x10004b2 ] }; // х Х ҳ Ҳ
+ key <AD12> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; // ъ Ъ
+ key <AE01> { [ 1, exclam, 0x10000a7 ] }; // 1 ! §
+ key <AE02> { [ 2, quotedbl, 0x10000ab, 0x10000bb ] }; // 2 " « »
+ key <AE03> { [ 3, numerosign ] }; // 3 №
+ key <AE04> { [ 4, semicolon ] }; // 4 ;
+ key <AE05> { [ 5, percent ] }; // 5 %
+ key <AE06> { [ 6, colon, 0x1002013 ] }; // 6 : –
+ key <AE07> { [ 7, question, ampersand ] }; // 7 ? &
+ key <AE08> { [ 8, asterisk ] }; // 8 *
+ key <AE09> { [ 9, parenleft ] }; // 9 (
+ key <AE10> { [ 0, parenright ] }; // 0 )
+ key <AE11> { [ minus, underscore ] }; // - _
+ key <AE12> { [ equal, plus ] }; // = +
+ key <BKSL> { [ backslash, slash ] }; // \ /
+ key <LSGT> { [ slash, bar ] }; // / |
+ key <TLDE> { [ Cyrillic_io, Cyrillic_IO ] }; // ё Ё
};
+
diff --git a/xorg-server/xkbdata.src/symbols/tm b/xorg-server/xkbdata.src/symbols/tm
new file mode 100644
index 000000000..d66e277f0
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/tm
@@ -0,0 +1,50 @@
+// $XKeyboardConfig$
+
+// $XFree86: xc/programs/xkbcomp/symbols/tm,v 0.2 2009/04/02 14:32:05 pascal Exp $
+// Nazar Annagurban <nazar_xg@hotmail.com>, 2009
+
+// Default layout (based on Vista Turkmen layout)
+default partial
+xkb_symbols "basic" {
+ name[Group1]="Turkmenistan";
+
+ include "us"
+
+ key <TLDE> { [ zcaron, Zcaron, grave, asciitilde ] };
+
+ key <AD01> { [ adiaeresis, Adiaeresis, q, Q ] };
+ key <AD11> { [ ncaron, Ncaron, bracketleft, braceleft ] };
+ key <AD12> { [odiaeresis, Odiaeresis, bracketright, braceright ] };
+
+ key <AB02> { [udiaeresis, Udiaeresis, x, X ] };
+ key <AB03> { [ ccedilla, Ccedilla, c, C ] };
+ key <AB04> { [ yacute, Yacute, v, V ] };
+
+ key <BKSL> { [ scedilla, Scedilla, backslash, bar ] };
+
+ include "level3(ralt_switch)"
+};
+
+// Turkmen Alt-Q Layout
+// This layout provides turkmen letter via the AltGr key
+partial
+xkb_symbols "alt" {
+ name[Group1]="Turkmenistan - Alt-Q";
+
+ include "us"
+
+ key <AD06> { [ y, Y, yacute, Yacute ] };
+ key <AD07> { [ u, U, udiaeresis, Udiaeresis ] };
+ key <AD09> { [ o, O, odiaeresis, Odiaeresis ] };
+
+ key <AC01> { [ a, A, adiaeresis, Adiaeresis ] };
+ key <AC02> { [ s, S, scedilla, Scedilla ] };
+
+ key <AB01> { [ z, Z, zcaron, Zcaron ] };
+ key <AB03> { [ c, C, ccedilla, Ccedilla ] };
+ key <AB06> { [ n, N, ncaron, Ncaron ] };
+
+ include "level3(ralt_switch)"
+
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/tr b/xorg-server/xkbdata.src/symbols/tr
index 1fcf0cc56..68672aa11 100644
--- a/xorg-server/xkbdata.src/symbols/tr
+++ b/xorg-server/xkbdata.src/symbols/tr
@@ -268,8 +268,7 @@ xkb_symbols "intl" {
key <BKSL> { type[group1] = "FOUR_LEVEL",[ comma, semicolon, dead_grave, dead_grave ] };
key <LSGT> { type[group1] = "FOUR_LEVEL",[ less, greater, bar, brokenbar ] };
key <AB08> { [odiaeresis, Odiaeresis, multiply, VoidSymbol ] };
- key <AB09> { [ ccedilla, Ccedilla, periodcentered, division ]
-};
+ key <AB09> { [ ccedilla, Ccedilla, periodcentered, division ] };
key <AB10> { type[group1] = "FOUR_LEVEL",[ period, colon, dead_abovedot, dead_abovedot ] };
include "nbsp(level3)"
@@ -280,7 +279,76 @@ xkb_symbols "intl" {
partial alphanumeric_keys
xkb_symbols "olpc" {
name[Group1]= "Turkey";
+ include "tr(intl)"
+
+ key <AE01> { [ 1, exclam, VoidSymbol, VoidSymbol ] };
+ key <AE06> { [ 6, ampersand, VoidSymbol, VoidSymbol ] };
+ key <AE12> { type[group1] = "FOUR_LEVEL", [ minus, underscore, bar, VoidSymbol ] };
+
+
+ key <AB03> { [ c, C, leftdoublequotemark, VoidSymbol ] };
+ key <AB04> { [ v, V, rightdoublequotemark, VoidSymbol ] };
+ key <AB05> { [ b, B, VoidSymbol, VoidSymbol ] };
+ key <AB08> { [odiaeresis, Odiaeresis, VoidSymbol, VoidSymbol ] };
+
+ key <AB09> { [ ccedilla, Ccedilla, multiply, VoidSymbol ] };
+ key <AB10> { [ period, colon, division, dead_abovedot ] };
+
+ key <I219> { [ less, greater, VoidSymbol, VoidSymbol ] };
+
+};
+
+// Crimean Tatar (Crimean Turkish) layouts.
+// These layouts are currently experimental. In particular, the mapping of letter 'x',
+// included for foreign words and shortcuts, might change in the future...
+// Reşat SABIQ <tilde.birlik@gmail.com>, 2009
+
+// Crimean Tatar (Crimean Turkish) Q Layout
+partial
+xkb_symbols "crh" {
+
+ include "tr(basic)"
+
+ name[Group1]="Turkey - Crimean Tatar (Turkish Q)";
+
+ key <AE11> { [ x, X, asterisk, question ] };
+
+ key <AC04> { [ f, F, iacute, Iacute ] };
+ key <AC07> { [ j, J, ibreve, Ibreve ] };
+ key <TLDE> { [ quotedbl, backslash, less, degree ] };
+
+ key <AB02> { [ ntilde, Ntilde, guillemotright, greater ] };
+};
+
+// Crimean Tatar (Crimean Turkish) F Layout
+partial
+xkb_symbols "crh_f" {
+
include "tr(f)"
- key <I219> { [ less, greater, bar, brokenbar ] };
+ name[Group1]="Turkey - Crimean Tatar (Turkish F)";
+
+ key <AE11> { [ x, X, slash, question ] };
+
+ key <AD04> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC",
+ [ idotless, I, iacute, Iacute ] };
+
+ key <AC07> { [ k, K, ibreve, Ibreve ] };
+ key <TLDE> { [ plus, asterisk, backslash, plusminus ] };
+
+ key <BKSL> { [ ntilde, Ntilde, grave, dead_grave ] };
+};
+
+// Crimean Tatar (Crimean Turkish) Alt-Q Layout
+partial
+xkb_symbols "crh_alt" {
+
+ include "tr(alt)"
+
+ name[Group1]="Turkey - Crimean Tatar (Turkish Alt-Q)";
+
+ key <AC04> { [ f, F, iacute, Iacute ] };
+ key <AC07> { [ j, J, ibreve, Ibreve ] };
+
+ key <AB06> { [ n, N, ntilde, Ntilde ] };
};
diff --git a/xorg-server/xkbdata.src/symbols/typo b/xorg-server/xkbdata.src/symbols/typo
new file mode 100644
index 000000000..eb6fbc4ac
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/typo
@@ -0,0 +1,53 @@
+// $XKeyboardConfig$
+
+// 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/xkbdata.src/symbols/ua b/xorg-server/xkbdata.src/symbols/ua
index 73439cafd..150ada562 100644
--- a/xorg-server/xkbdata.src/symbols/ua
+++ b/xorg-server/xkbdata.src/symbols/ua
@@ -7,11 +7,51 @@
//
// $XFree86: xc/programs/xkbcomp/symbols/ua,v 1.4 2003/05/15 11:29:47 pascal Exp $
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
+// Unicode - 3d level added with some Unicode symbols (typographic quotes, m-dash, n-dash etc),
+// some often used cyrillics from other slavic languages and some ASCII symbols used often (slash, brackets...)
+partial default alphanumeric_keys
+xkb_symbols "unicode" {
+ include "ua(winkeys)"
+
name[Group1]= "Ukraine";
+ key <TLDE> { [ U2019, apostrophe, U0301, asciitilde ] }; // Apostrophe and Stress symbol
+ key <AE02> { [ 1, exclam, onesuperior ] };
+ key <AE02> { [ 2, quotedbl, twosuperior ] };
+ key <AE03> { [ 3, numerosign, U00A7, U20B4 ] }; // Paragraph and Hryvnia sign
+ key <AE04> { [ 4, semicolon, dollar, EuroSign ] };
+ key <AE05> { [ 5, percent, degree ] };
+ key <AE06> { [ 6, colon, less ] };
+ key <AE07> { [ 7, question, greater ] };
+ key <AE08> { [ 8, asterisk, enfilledcircbullet ] };
+ key <AE09> { [ 9, parenleft, bracketleft, braceleft ] };
+ key <AE10> { [ 0, parenright, bracketright, braceright] };
+ key <AE11> { [ minus, underscore, emdash, endash ] };
+ key <AE12> { [ equal, plus, notequal, plusminus ] };
+
+ key <AD03> { [ Cyrillic_u, Cyrillic_U, Byelorussian_shortu, Byelorussian_SHORTU ]};
+ key <AD04> { [ Cyrillic_ka, Cyrillic_KA, registered ] }; // Registered tm
+ key <AD05> { [ Cyrillic_ie, Cyrillic_IE, Cyrillic_io, Cyrillic_IO ] };
+ key <AD12> { [ Ukrainian_yi,Ukrainian_YI, Cyrillic_hardsign, Cyrillic_HARDSIGN ] };
+ key <AC02> { [ Ukrainian_i, Ukrainian_I, Cyrillic_yeru, Cyrillic_YERU ] };
+ key <AC11> { [ Ukrainian_ie,Ukrainian_IE, Cyrillic_e, Cyrillic_E ] };
+
+ key <BKSL> { [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN, backslash, bar ] };
+
+ key <AB03> { [ Cyrillic_es, Cyrillic_ES, copyright ] };
+ key <AB06> { [ Cyrillic_te, Cyrillic_TE, trademark ] };
+ key <AB08> { [ Cyrillic_be, Cyrillic_BE, guillemotleft, doublelowquotemark ] };
+ key <AB09> { [ Cyrillic_yu, Cyrillic_YU, guillemotright, leftdoublequotemark ] };
+ key <AB10> { [ period, comma, slash, ellipsis ] };
+
+ include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "legacy" {
+
+ name[Group1]= "Ukraine - Legacy";
+
key <TLDE> { [ apostrophe, asciitilde ] };
key <AE01> { [ 1, exclam ] };
key <AE02> { [ 2, quotedbl ] };
@@ -69,7 +109,7 @@ xkb_symbols "basic" {
partial alphanumeric_keys
xkb_symbols "winkeys" {
- include "ua(basic)"
+ include "ua(legacy)"
name[Group1]= "Ukraine - Winkeys";
@@ -82,50 +122,9 @@ xkb_symbols "winkeys" {
key <AB10> { [ period, comma ] };
};
-
-// Unicode - 3d level added with some Unicode symbols (typographic quotes, m-dash, n-dash etc),
-// some often used cyrillics from other slavic languages and some ASCII symbols used often (slash, brackets...)
-partial alphanumeric_keys
-xkb_symbols "unicode" {
- include "ua(winkeys)"
-
- name[Group1]= "Ukraine - Unicode";
-
- key <TLDE> { [ U2019, apostrophe, U0301, asciitilde ] }; // Apostrophe and Stress symbol
- key <AE02> { [ 1, exclam, onesuperior ] };
- key <AE02> { [ 2, quotedbl, twosuperior ] };
- key <AE03> { [ 3, numerosign, U00A7, U20B4 ] }; // Paragraph and Hryvnia sign
- key <AE04> { [ 4, semicolon, dollar, EuroSign ] };
- key <AE05> { [ 5, percent, degree ] };
- key <AE06> { [ 6, colon, less ] };
- key <AE07> { [ 7, question, greater ] };
- key <AE08> { [ 8, asterisk, enfilledcircbullet ] };
- key <AE09> { [ 9, parenleft, bracketleft, braceleft ] };
- key <AE10> { [ 0, parenright, bracketright, braceright] };
- key <AE11> { [ minus, underscore, emdash, endash ] };
- key <AE12> { [ equal, plus, notequal, plusminus ] };
-
- key <AD03> { [ Cyrillic_u, Cyrillic_U, Byelorussian_shortu, Byelorussian_SHORTU ]};
- key <AD04> { [ Cyrillic_ka, Cyrillic_KA, registered ] }; // Registered tm
- key <AD05> { [ Cyrillic_ie, Cyrillic_IE, Cyrillic_io, Cyrillic_IO ] };
- key <AD12> { [ Ukrainian_yi,Ukrainian_YI, Cyrillic_hardsign, Cyrillic_HARDSIGN ] };
- key <AC02> { [ Ukrainian_i, Ukrainian_I, Cyrillic_yeru, Cyrillic_YERU ] };
- key <AC11> { [ Ukrainian_ie,Ukrainian_IE, Cyrillic_e, Cyrillic_E ] };
-
- key <BKSL> { [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN, backslash, bar ] };
-
- key <AB03> { [ Cyrillic_es, Cyrillic_ES, copyright ] };
- key <AB06> { [ Cyrillic_te, Cyrillic_TE, trademark ] };
- key <AB08> { [ Cyrillic_be, Cyrillic_BE, guillemotleft, doublelowquotemark ] };
- key <AB09> { [ Cyrillic_yu, Cyrillic_YU, guillemotright, leftdoublequotemark ] };
- key <AB10> { [ period, comma, slash, ellipsis ] };
-
- include "level3(ralt_switch)"
-};
-
partial alphanumeric_keys
xkb_symbols "typewriter" {
- include "ua(basic)"
+ include "ua(legacy)"
name[Group1]= "Ukraine - Typewriter";
@@ -154,7 +153,7 @@ xkb_symbols "typewriter" {
partial alphanumeric_keys
xkb_symbols "phonetic" {
- include "ua(basic)"
+ include "ua(legacy)"
name[Group1]= "Ukraine - Phonetic";
@@ -200,7 +199,7 @@ xkb_symbols "phonetic" {
// Andrew Porokhnyak <aop@porokhnyak.org>
partial alphanumeric_keys
xkb_symbols "rstu" {
- include "ua(basic)"
+ include "ua(legacy)"
name[Group1]= "Ukraine - Standard RSTU";
@@ -257,7 +256,7 @@ key.type[group1]="ALPHABETIC";
//Existing layout "phonetic" used as template.
partial alphanumeric_keys
xkb_symbols "homophonic" {
- include "ua(basic)"
+ include "ua(legacy)"
name[Group1]= "Ukraine - Homophonic";
key <TLDE> { [ grave, underscore ] };
@@ -312,3 +311,24 @@ xkb_symbols "homophonic" {
key <AB10> { [ slash, question ] };
};
+// Crimean Tatar (Crimean Turkish) layouts.
+partial
+xkb_symbols "crh" {
+ include "tr(crh)"
+
+ name[Group1]="Ukraine - Crimean Tatar (Turkish Q)";
+};
+
+partial
+xkb_symbols "crh_f" {
+ include "tr(crh_f)"
+
+ name[Group1]="Ukraine - Crimean Tatar (Turkish F)";
+};
+
+partial
+xkb_symbols "crh_alt" {
+ include "tr(crh_alt)"
+
+ name[Group1]="Ukraine - Crimean Tatar (Turkish Alt-Q)";
+};
diff --git a/xorg-server/xkbdata.src/symbols/us b/xorg-server/xkbdata.src/symbols/us
index fb39c7200..20a1b57f4 100644
--- a/xorg-server/xkbdata.src/symbols/us
+++ b/xorg-server/xkbdata.src/symbols/us
@@ -62,7 +62,6 @@ xkb_symbols "basic" {
key <AB10> { [ slash, question ] };
key <BKSL> { [ backslash, bar ] };
- key <CAPS> { [ Caps_Lock ] };
// End alphanumeric section
};
diff --git a/xorg-server/xkbdata.src/symbols/uz b/xorg-server/xkbdata.src/symbols/uz
index c651ff0d5..b37a6ca3f 100644
--- a/xorg-server/xkbdata.src/symbols/uz
+++ b/xorg-server/xkbdata.src/symbols/uz
@@ -99,3 +99,24 @@ xkb_symbols "latin" {
key <AC11> { [0x010002BB, quotedbl] };
};
+// Crimean Tatar (Crimean Turkish) layouts.
+partial
+xkb_symbols "crh" {
+ include "tr(crh)"
+
+ name[Group1]="Uzbekistan - Crimean Tatar (Turkish Q)";
+};
+
+partial
+xkb_symbols "crh_f" {
+ include "tr(crh_f)"
+
+ name[Group1]="Uzbekistan - Crimean Tatar (Turkish F)";
+};
+
+partial
+xkb_symbols "crh_alt" {
+ include "tr(crh_alt)"
+
+ name[Group1]="Uzbekistan - Crimean Tatar (Turkish Alt-Q)";
+};
diff --git a/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.in
index 57e8c8866..a12008f3e 100644
--- a/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_symbols_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
symbolsdir = $(xkb_base)/symbols/xfree68_vndr
@@ -198,8 +174,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -223,10 +199,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_symbolsDATA: $(dist_symbols_DATA)
@$(NORMAL_INSTALL)
- test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+ test -z "$(symbolsdir)" || $(MKDIR_P) "$(DESTDIR)$(symbolsdir)"
@list='$(dist_symbols_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -249,22 +224,21 @@ CTAGS:
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -280,7 +254,7 @@ check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(symbolsdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -326,12 +300,20 @@ info-am:
install-data-am: install-dist_symbolsDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -350,17 +332,21 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+uninstall-am: uninstall-dist_symbolsDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_symbolsDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ install-dist_symbolsDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_symbolsDATA uninstall-info-am
+ uninstall-dist_symbolsDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/types/Makefile.in b/xorg-server/xkbdata.src/types/Makefile.in
index 1f2c42fdf..54285e41e 100644
--- a/xorg-server/xkbdata.src/types/Makefile.in
+++ b/xorg-server/xkbdata.src/types/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -18,15 +18,11 @@
# Replaces Imake's MakeXkbDir() rule
# svu: taken from xkbdata
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -63,8 +59,6 @@ DATA = $(dist_dir_DATA) $(dist_types_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -77,10 +71,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
@@ -94,43 +84,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -150,15 +121,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -166,6 +137,7 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -189,8 +161,12 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
typesdir = $(xkb_base)/types
@@ -211,8 +187,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -236,10 +212,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-dist_dirDATA: $(dist_dir_DATA)
@$(NORMAL_INSTALL)
- test -z "$(dirdir)" || $(mkdir_p) "$(DESTDIR)$(dirdir)"
+ test -z "$(dirdir)" || $(MKDIR_P) "$(DESTDIR)$(dirdir)"
@list='$(dist_dir_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -256,7 +231,7 @@ uninstall-dist_dirDATA:
done
install-dist_typesDATA: $(dist_types_DATA)
@$(NORMAL_INSTALL)
- test -z "$(typesdir)" || $(mkdir_p) "$(DESTDIR)$(typesdir)"
+ test -z "$(typesdir)" || $(MKDIR_P) "$(DESTDIR)$(typesdir)"
@list='$(dist_types_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -279,23 +254,21 @@ CTAGS:
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/..
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -311,7 +284,7 @@ check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(typesdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -358,12 +331,20 @@ info-am:
install-data-am: install-dist_dirDATA install-dist_typesDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -382,19 +363,21 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_dirDATA uninstall-dist_typesDATA \
- uninstall-info-am
+uninstall-am: uninstall-dist_dirDATA uninstall-dist_typesDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-dist_dirDATA install-dist_typesDATA install-exec \
- install-exec-am install-info install-info-am install-man \
+ install-dist_dirDATA install-dist_typesDATA install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-dist_dirDATA uninstall-dist_typesDATA \
- uninstall-info-am
+ uninstall-dist_dirDATA uninstall-dist_typesDATA
$(subdir).dir: $(dir_data)
diff --git a/xorg-server/xkbdata.src/types/numpad b/xorg-server/xkbdata.src/types/numpad
index 335e20bb1..a48e76a64 100644
--- a/xorg-server/xkbdata.src/types/numpad
+++ b/xorg-server/xkbdata.src/types/numpad
@@ -38,3 +38,35 @@ partial xkb_types "microsoft" {
include "extra(keypad)"
};
+// Swiss-German style numeric keypad: Shift and NumLock operates as
+// two independent modifiers; however, since we want shift state for
+// the cursor keys, only three levels are used from the key mappings.
+// Closest type is actually FOUR_LEVEL_X, but most numpad layouts uses
+// FOUR_LEVEL_MIXED_KEYPAD so that's the one we are going to override.
+partial xkb_types "shift3" {
+ type "FOUR_LEVEL_MIXED_KEYPAD" {
+ modifiers = Shift+NumLock+Control+Alt;
+
+ // NumLock Off => navigate using cursor keys
+ map[None] = Level1;
+
+ // NumLock Off + Shift pressed => select using cursor keys
+ preserve[Shift] = Shift;
+
+ // NumLock On => decimal digits
+ map[NumLock] = Level2;
+
+ // NumLock On + Shift pressed => auxiliary symbols,
+ // e.g. hexadecimal digits
+ map[Shift+NumLock] = Level3;
+
+ // Ctrl + Alt, regardless of NumLock and Shift => command keys
+ map[Control+Alt] = Level4;
+
+ // reverse map from levels to modifiers
+ level_name[Level1] = "Base";
+ level_name[Level2] = "NumLock";
+ level_name[Level3] = "Shift+NumLock";
+ level_name[Level4] = "Ctrl+Alt";
+ };
+};
diff --git a/xorg-server/xkbdata.src/types/types.dir b/xorg-server/xkbdata.src/types/types.dir
index a9fec034f..9e15cdc98 100644
--- a/xorg-server/xkbdata.src/types/types.dir
+++ b/xorg-server/xkbdata.src/types/types.dir
@@ -1,18 +1,19 @@
+-dp----- -------- pc(default)
-dp----- -------- mousekeys(default)
--p----- -------- caps(internal)
--p----- -------- caps(internal_nocancel)
--p----- -------- caps(shift)
--p----- -------- caps(shift_nocancel)
--d------ -------- default(default)
--d------ -------- complete(complete)
--dp----- -------- iso9995(default)
--d------ -------- basic(basic)
--dp----- -------- level5(default)
--dp----- -------- pc(default)
-dp----- -------- extra(default)
--p----- -------- extra(keypad)
--p----- -------- extra(mac_keypad)
+-d------ -------- default(default)
+-dp----- -------- iso9995(default)
+-d------ -------- complete(complete)
+-dp----- -------- level5(default)
-dp----- -------- cancel(Shift_Cancels_Caps)
+-d------ -------- basic(basic)
-dp----- -------- numpad(pc)
--p----- -------- numpad(mac)
--p----- -------- numpad(microsoft)
+--p----- -------- numpad(shift3)
diff --git a/xorg-server/xkbdata.src/xkeyboard-config.spec b/xorg-server/xkbdata.src/xkeyboard-config.spec
index 96c0b5afe..631d90142 100644
--- a/xorg-server/xkbdata.src/xkeyboard-config.spec
+++ b/xorg-server/xkbdata.src/xkeyboard-config.spec
@@ -1,6 +1,6 @@
Name: xkeyboard-config
Summary: XML-based XKB configuration registry
-Version: 1.4
+Version: 1.6
Release: 1
License: X11/MIT
Group: User Interface/X